commit:     0a79fc193e708d137b2935bd54475a8399d9642c
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 06:58:39 2021 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 06:58:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a79fc19

sys-cluster/neutron: 16.3.0 and 17.1.0 stable amd64/x86 with cleanup

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 sys-cluster/neutron/Manifest              |   6 -
 sys-cluster/neutron/neutron-16.2.0.ebuild | 230 ------------------------------
 sys-cluster/neutron/neutron-16.3.0.ebuild |   2 +-
 sys-cluster/neutron/neutron-17.0.0.ebuild | 227 -----------------------------
 sys-cluster/neutron/neutron-17.1.0.ebuild |   2 +-
 5 files changed, 2 insertions(+), 465 deletions(-)

diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index d8b09bdae5e..3d8259108d2 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -1,16 +1,10 @@
-DIST neutron-16.2.0.tar.gz 12771467 BLAKE2B 
d3dbfbffcf7321a195d3cadf0bd4864763f6a1c6c3022ec32d20ffeb1770d522446c78e2bad9c7dc281fdb67b445b3ecbf8908741dd7a42ebc1efde56af642bb
 SHA512 
d5c39296c925af8b69e23a3faf75e99e6d4d2e5b1daf0da7883a75bcce1e41990392aa90499510c7dee552178cb908c1cd80add48ac894015255842d15711641
 DIST neutron-16.3.0.tar.gz 12866714 BLAKE2B 
67436c96f52a6d1a60d8af13ce7d8d7b375def861ca83fddca0986649c7f2df6bae41763459feb2bba7e6cd16fab0c0c7ad970582be6d8798350efab11216a3d
 SHA512 
f1901b672925248e08a239fdaf4c691cfcae90d53858ab0eed46919464a2dad8d27e89c46fb47563744e2a569995f5fbc540c8b69eef0273d6a605ea13ef5051
-DIST neutron-17.0.0.tar.gz 12801363 BLAKE2B 
7297e5832e19f6543bbfdcaed7f4240ed54bb976dc40f0bc90ffbc00e8d5b97b4f194fd9c451f08f7f6c431c66f99562f0fce63456ff66418aad73c3effb3bac
 SHA512 
5a67896376110cdae407c4ba3b758b1b12883c1355e30e927e1c705c6ad3df5126c1555870f7e9b130b35663c5f748f33078c588b3c4b94750f47b5db58b0662
 DIST neutron-17.1.0.tar.gz 12910659 BLAKE2B 
30634389e9caf77e7bc36b61f26c8ff24013171f1dc0cef52e2ebb55363b526bb6146a578e21c027ef6902f8881985c5a06d4d0b98992e13720a8118cd876b05
 SHA512 
62bd2691878c93f9c51adfecf7f7aa6fbb51485a259a419e9797738626fb2527c167ea568cd54f5fdc60a5210c53fafb2b754817123742b27150ed1cfbffca2b
-DIST neutron-configs-16.2.0.tar.gz 24350 BLAKE2B 
8f6eeae762fa297651f07667387beac6677cfa9a6c0d13d3fc90ac09753022fd284fc56c53557ab83cda99ab4fe03acc2d2049e4bb62f9496b310b1cd6f42099
 SHA512 
b087b23a1aa19678d4b9a76ae82243d03fe82706712e8c37b759a8521062f79e83307769b4ba639f67aa402f8b03cdf12d3274d821c3f8ecfd17ded9f4f2c881
 DIST neutron-configs-16.3.0.tar.gz 24350 BLAKE2B 
8f6eeae762fa297651f07667387beac6677cfa9a6c0d13d3fc90ac09753022fd284fc56c53557ab83cda99ab4fe03acc2d2049e4bb62f9496b310b1cd6f42099
 SHA512 
b087b23a1aa19678d4b9a76ae82243d03fe82706712e8c37b759a8521062f79e83307769b4ba639f67aa402f8b03cdf12d3274d821c3f8ecfd17ded9f4f2c881
-DIST neutron-configs-17.0.0.tar.gz 30314 BLAKE2B 
885d00259fde0200f6a52d91b18e884012c04cb06e5e4ba6c72b77fbb0a8df30d50efd6db16faa009328eac9b7c5fb31854feb81595a542b4ac5d8172c8056b6
 SHA512 
cf85a563c417e1fb01f7d329c7021c20782fe67f64c5dfd542deed07e09d6a717e472976df8f1f4c3bb4a6a10e8d8b8300f18e1a3759358b3db12f77dad7bd5b
 DIST neutron-configs-17.1.0.tar.gz 30314 BLAKE2B 
885d00259fde0200f6a52d91b18e884012c04cb06e5e4ba6c72b77fbb0a8df30d50efd6db16faa009328eac9b7c5fb31854feb81595a542b4ac5d8172c8056b6
 SHA512 
cf85a563c417e1fb01f7d329c7021c20782fe67f64c5dfd542deed07e09d6a717e472976df8f1f4c3bb4a6a10e8d8b8300f18e1a3759358b3db12f77dad7bd5b
 DIST neutron-configs-2020.1.9999.tar.gz 24350 BLAKE2B 
8f6eeae762fa297651f07667387beac6677cfa9a6c0d13d3fc90ac09753022fd284fc56c53557ab83cda99ab4fe03acc2d2049e4bb62f9496b310b1cd6f42099
 SHA512 
b087b23a1aa19678d4b9a76ae82243d03fe82706712e8c37b759a8521062f79e83307769b4ba639f67aa402f8b03cdf12d3274d821c3f8ecfd17ded9f4f2c881
 DIST neutron-configs-2020.2.9999.tar.gz 30314 BLAKE2B 
885d00259fde0200f6a52d91b18e884012c04cb06e5e4ba6c72b77fbb0a8df30d50efd6db16faa009328eac9b7c5fb31854feb81595a542b4ac5d8172c8056b6
 SHA512 
cf85a563c417e1fb01f7d329c7021c20782fe67f64c5dfd542deed07e09d6a717e472976df8f1f4c3bb4a6a10e8d8b8300f18e1a3759358b3db12f77dad7bd5b
-DIST neutron-ml2-plugins-16.2.0.tar.gz 8887 BLAKE2B 
5887027ce4585a523bb3379c002acdde1faa9ed24d0c83c931f2a387b56e8baf8352ae9f82ba46c85a6a3e5b1d68792da1e1ca1fae9b6dde525e6f6c67849ac4
 SHA512 
4ae70fe3e386932e0327333d29dc526b5f0f0f800ac14d17faa4c1e3fc2dd8524760b84bbb4767e73e70647984aa50702e5e47dc42deb47f66c47c5e3e965111
 DIST neutron-ml2-plugins-16.3.0.tar.gz 8887 BLAKE2B 
5887027ce4585a523bb3379c002acdde1faa9ed24d0c83c931f2a387b56e8baf8352ae9f82ba46c85a6a3e5b1d68792da1e1ca1fae9b6dde525e6f6c67849ac4
 SHA512 
4ae70fe3e386932e0327333d29dc526b5f0f0f800ac14d17faa4c1e3fc2dd8524760b84bbb4767e73e70647984aa50702e5e47dc42deb47f66c47c5e3e965111
-DIST neutron-ml2-plugins-17.0.0.tar.gz 9011 BLAKE2B 
d9f8cb4d26699ca44a4cf4cd422bd88b9bb5a2138a80fec469021491d87b158502801c2ce79316f52a900877f7706dc93c2a5a5a33c868918effeaa6b65a7931
 SHA512 
a225310f0f54991a079d515512189b3c08de22c5b13d58960ef24498401fc54b0878ed879d895e696b789e703a0bb3f4a184eccbbfb9ac9fe9447086cb952b37
 DIST neutron-ml2-plugins-17.1.0.tar.gz 9011 BLAKE2B 
d9f8cb4d26699ca44a4cf4cd422bd88b9bb5a2138a80fec469021491d87b158502801c2ce79316f52a900877f7706dc93c2a5a5a33c868918effeaa6b65a7931
 SHA512 
a225310f0f54991a079d515512189b3c08de22c5b13d58960ef24498401fc54b0878ed879d895e696b789e703a0bb3f4a184eccbbfb9ac9fe9447086cb952b37
 DIST neutron-ml2-plugins-2020.1.9999.tar.gz 8887 BLAKE2B 
5887027ce4585a523bb3379c002acdde1faa9ed24d0c83c931f2a387b56e8baf8352ae9f82ba46c85a6a3e5b1d68792da1e1ca1fae9b6dde525e6f6c67849ac4
 SHA512 
4ae70fe3e386932e0327333d29dc526b5f0f0f800ac14d17faa4c1e3fc2dd8524760b84bbb4767e73e70647984aa50702e5e47dc42deb47f66c47c5e3e965111
 DIST neutron-ml2-plugins-2020.2.9999.tar.gz 9011 BLAKE2B 
d9f8cb4d26699ca44a4cf4cd422bd88b9bb5a2138a80fec469021491d87b158502801c2ce79316f52a900877f7706dc93c2a5a5a33c868918effeaa6b65a7931
 SHA512 
a225310f0f54991a079d515512189b3c08de22c5b13d58960ef24498401fc54b0878ed879d895e696b789e703a0bb3f4a184eccbbfb9ac9fe9447086cb952b37

diff --git a/sys-cluster/neutron/neutron-16.2.0.ebuild 
b/sys-cluster/neutron/neutron-16.2.0.ebuild
deleted file mode 100644
index 7aa084a661e..00000000000
--- a/sys-cluster/neutron/neutron-16.2.0.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 linux-info
-
-DESCRIPTION="A virtual network service for Openstack"
-HOMEPAGE="https://launchpad.net/neutron";
-if [[ ${PV} == *9999 ]];then
-       inherit git-r3
-       
SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/configs.tar.gz
 -> neutron-configs-${PV}.tar.gz
-       
https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/ml2_plugins.tar.gz
 -> neutron-ml2-plugins-${PV}.tar.gz"
-       EGIT_REPO_URI="https://github.com/openstack/neutron.git";
-       EGIT_BRANCH="stable/ussuri"
-else
-       
SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/configs.tar.gz
 -> neutron-configs-${PV}.tar.gz
-       
https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/ml2_plugins.tar.gz
 -> neutron-ml2-plugins-${PV}.tar.gz
-       https://tarballs.openstack.org/${PN}/${P}.tar.gz";
-       KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge 
server sqlite +mysql postgres"
-REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
-                                               compute-only? ( !mysql 
!postgres !sqlite !dhcp !l3 !metadata !server
-                                               || ( openvswitch linuxbridge ) 
)"
-
-CDEPEND=">=dev-python/pbr-4.0.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-       app-admin/sudo"
-
-RDEPEND="
-       ${CDEPEND}
-       >=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-       >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-       >=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-       >=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
-       >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-       >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-       !~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-       >=dev-python/pecan-1.3.2[${PYTHON_USEDEP}]
-       >=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-       >=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-       >=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-       >=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-       >=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-       >=dev-python/neutron-lib-2.2.0[${PYTHON_USEDEP}]
-       >=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
-       >=dev-python/tenacity-4.4.0[${PYTHON_USEDEP}]
-       compute-only? (
-               >=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
-       )
-       sqlite? (
-               >=dev-python/sqlalchemy-1.2.0[sqlite,${PYTHON_USEDEP}]
-       )
-       mysql? (
-               >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-               !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-               >=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
-       )
-       postgres? (
-               >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-               >=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
-       )
-       >=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
-       >=dev-python/keystoneauth-3.14.0[${PYTHON_USEDEP}]
-       >=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
-       >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-       >=dev-python/stevedore-1.20.1[${PYTHON_USEDEP}]
-       >=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-       >=dev-python/oslo-db-4.37.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-       >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-       >=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-       >=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-versionedobjects-1.35.1[${PYTHON_USEDEP}]
-       >=dev-python/osprofiler-2.3.0[${PYTHON_USEDEP}]
-       >=dev-python/os-ken-0.3.0[${PYTHON_USEDEP}]
-       >=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
-       >=dev-python/ovsdbapp-1.0.0[${PYTHON_USEDEP}]
-       >=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-       >=dev-python/pyroute2-0.5.7[${PYTHON_USEDEP}]
-       >=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
-       >=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
-       >=dev-python/openstacksdk-0.31.2[${PYTHON_USEDEP}]
-       >=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
-       >=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
-       >=dev-python/os-vif-1.15.1[${PYTHON_USEDEP}]
-       >=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
-       >=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
-       dev-python/pyudev[${PYTHON_USEDEP}]
-       sys-apps/iproute2
-       net-misc/iputils[arping]
-       net-misc/bridge-utils
-       net-firewall/ipset
-       net-firewall/iptables
-       net-firewall/ebtables
-       net-firewall/conntrack-tools
-       haproxy? ( net-proxy/haproxy )
-       openvswitch? ( net-misc/openvswitch )
-       ipv6? (
-               net-misc/radvd
-               >=net-misc/dibbler-1.0.1
-       )
-       dhcp? ( net-dns/dnsmasq[dhcp-tools] )
-       acct-group/neutron
-       acct-user/neutron"
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-       linux-info_pkg_setup
-       CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES 
IP_NF_TARGET_REJECT \
-       IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_DEFRAG_IPV4 NF_NAT 
NF_CONNTRACK \
-       IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
-       if linux_config_exists; then
-               for module in ${CONFIG_CHECK_MODULES}; do
-                       linux_chkconfig_present ${module} || ewarn "${module} 
needs to be enabled in kernel"
-               done
-       fi
-}
-
-pkg_config() {
-       fperms 0700 /var/log/neutron
-       fowners neutron:neutron /var/log neutron
-}
-
-src_prepare() {
-       sed -i '/^hacking/d' test-requirements.txt || die
-       # it's /bin/ip not /sbin/ip
-       sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
-       distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-       distutils-r1_python_install_all
-       if use server; then
-               newinitd "${FILESDIR}/neutron.initd" "neutron-server"
-               newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
-               dosym ../../plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
-       fi
-       if use dhcp; then
-               newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
-               newconfd "${FILESDIR}/neutron-dhcp-agent.confd" 
"neutron-dhcp-agent"
-       fi
-       if use l3; then
-               newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
-               newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
-       fi
-       if use metadata; then
-               newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
-               newconfd "${FILESDIR}/neutron-metadata-agent.confd" 
"neutron-metadata-agent"
-       fi
-       if use openvswitch; then
-               newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
-               newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" 
"neutron-openvswitch-agent"
-               newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
-               newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" 
"neutron-ovs-cleanup"
-       fi
-       if use linuxbridge; then
-               newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
-               newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" 
"neutron-linuxbridge-agent"
-       fi
-       diropts -m 755 -o neutron -g neutron
-       dodir /var/log/neutron /var/lib/neutron
-       keepdir /etc/neutron
-       insinto /etc/neutron
-       insopts -m 0640 -o neutron -g neutron
-
-       doins etc/*
-       # stupid renames
-       insinto /etc/neutron
-       doins -r "etc/neutron/plugins"
-       insopts -m 0640 -o root -g root
-       doins "etc/rootwrap.conf"
-       doins -r "etc/neutron/rootwrap.d"
-
-       #add sudoers definitions for user neutron
-       insinto /etc/sudoers.d/
-       insopts -m 0440 -o root -g root
-       newins "${FILESDIR}/neutron.sudoersd" neutron
-
-       # add generated configs
-       cd "${D}/etc/neutron" || die
-       unpack "neutron-configs-${PV}.tar.gz"
-       cd "${D}/etc/neutron/plugins/ml2" || die
-       unpack "neutron-ml2-plugins-${PV}.tar.gz"
-
-       # correcting perms
-       fowners neutron:neutron -R "/etc/neutron"
-       fperms o-rwx -R "/etc/neutron/"
-
-       #remove superfluous stuff
-       rm -R "${D}/usr/etc/"
-}
-
-python_install() {
-       distutils-r1_python_install
-       # copy migration conf file (not coppied on install via setup.py script)
-       python_moduleinto neutron/db/migration/alembic_migrations
-       python_domodule "neutron/db/migration/alembic_migrations/versions"
-}
-
-pkg_postinst() {
-       elog
-       elog "neutron-server's conf.d file may need updating to include 
additional ini files"
-       elog "We currently assume the ml2 plugin will be used but do not make 
assumptions"
-       elog "on if you will use openvswitch or linuxbridge (or something else)"
-       elog
-       elog "Other conf.d files may need updating too, but should be good for 
the default use case"
-       elog
-}

diff --git a/sys-cluster/neutron/neutron-16.3.0.ebuild 
b/sys-cluster/neutron/neutron-16.3.0.ebuild
index 1ec4c399736..b74b10580ef 100644
--- a/sys-cluster/neutron/neutron-16.3.0.ebuild
+++ b/sys-cluster/neutron/neutron-16.3.0.ebuild
@@ -19,7 +19,7 @@ else
        
SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/configs.tar.gz
 -> neutron-configs-${PV}.tar.gz
        
https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/ml2_plugins.tar.gz
 -> neutron-ml2-plugins-${PV}.tar.gz
        https://tarballs.openstack.org/${PN}/${P}.tar.gz";
-       KEYWORDS="~amd64 ~arm64 ~x86"
+       KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"

diff --git a/sys-cluster/neutron/neutron-17.0.0.ebuild 
b/sys-cluster/neutron/neutron-17.0.0.ebuild
deleted file mode 100644
index 08a0bdd7052..00000000000
--- a/sys-cluster/neutron/neutron-17.0.0.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 linux-info
-
-DESCRIPTION="A virtual network service for Openstack"
-HOMEPAGE="https://launchpad.net/neutron";
-if [[ ${PV} == *9999 ]];then
-       inherit git-r3
-       
SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/victoria/configs.tar.gz
 -> neutron-configs-${PV}.tar.gz
-       
https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/victoria/ml2_plugins.tar.gz
 -> neutron-ml2-plugins-${PV}.tar.gz"
-       EGIT_REPO_URI="https://github.com/openstack/neutron.git";
-       EGIT_BRANCH="stable/victoria"
-else
-       
SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/victoria/configs.tar.gz
 -> neutron-configs-${PV}.tar.gz
-       
https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/victoria/ml2_plugins.tar.gz
 -> neutron-ml2-plugins-${PV}.tar.gz
-       https://tarballs.openstack.org/${PN}/${P}.tar.gz";
-       KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge 
server sqlite +mysql postgres"
-REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
-                                               compute-only? ( !mysql 
!postgres !sqlite !dhcp !l3 !metadata !server
-                                               || ( openvswitch linuxbridge ) 
)"
-
-DEPEND="
-       >=dev-python/pbr-4.0.0[${PYTHON_USEDEP}]
-       app-admin/sudo
-"
-RDEPEND="
-       >=dev-python/pbr-4.0.0[${PYTHON_USEDEP}]
-       >=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-       >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-       >=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-       >=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
-       >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-       >=dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-       >=dev-python/pecan-1.3.2[${PYTHON_USEDEP}]
-       >=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-       >=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-       >=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-       >=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-       >=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-       >=dev-python/neutron-lib-2.6.0[${PYTHON_USEDEP}]
-       >=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
-       >=dev-python/tenacity-6.0.0[${PYTHON_USEDEP}]
-       compute-only? (
-               >=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
-       )
-       sqlite? (
-               >=dev-python/sqlalchemy-1.2.0[sqlite,${PYTHON_USEDEP}]
-       )
-       mysql? (
-               >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-               !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-               >=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
-       )
-       postgres? (
-               >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-               >=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
-       )
-       >=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
-       >=dev-python/keystoneauth-3.14.0[${PYTHON_USEDEP}]
-       >=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
-       >=dev-python/stevedore-1.20.1[${PYTHON_USEDEP}]
-       >=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-context-2.20.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-db-4.44.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-i18n-3.20.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-log-4.2.1[${PYTHON_USEDEP}]
-       >=dev-python/oslo-messaging-7.0.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-privsep-2.3.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-serialization-2.25.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-       >=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-utils-4.4.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-versionedobjects-1.35.1[${PYTHON_USEDEP}]
-       >=dev-python/osprofiler-2.3.0[${PYTHON_USEDEP}]
-       >=dev-python/os-ken-0.3.0[${PYTHON_USEDEP}]
-       >=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
-       >=dev-python/ovsdbapp-1.3.0[${PYTHON_USEDEP}]
-       >=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-       >=dev-python/pyroute2-0.5.13[${PYTHON_USEDEP}]
-       >=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
-       >=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
-       >=dev-python/openstacksdk-0.31.2[${PYTHON_USEDEP}]
-       >=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
-       >=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
-       >=dev-python/os-vif-1.15.1[${PYTHON_USEDEP}]
-       >=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
-       >=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
-       dev-python/pyudev[${PYTHON_USEDEP}]
-       sys-apps/iproute2
-       net-misc/iputils[arping]
-       net-misc/bridge-utils
-       net-firewall/ipset
-       net-firewall/iptables
-       net-firewall/ebtables
-       net-firewall/conntrack-tools
-       haproxy? ( net-proxy/haproxy )
-       openvswitch? ( net-misc/openvswitch )
-       ipv6? (
-               net-misc/radvd
-               >=net-misc/dibbler-1.0.1
-       )
-       dhcp? ( net-dns/dnsmasq[dhcp-tools] )
-       acct-group/neutron
-       acct-user/neutron"
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-       linux-info_pkg_setup
-       CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES 
IP_NF_TARGET_REJECT \
-       IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_DEFRAG_IPV4 NF_NAT 
NF_CONNTRACK \
-       IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
-       if linux_config_exists; then
-               for module in ${CONFIG_CHECK_MODULES}; do
-                       linux_chkconfig_present ${module} || ewarn "${module} 
needs to be enabled in kernel"
-               done
-       fi
-}
-
-pkg_config() {
-       fperms 0700 /var/log/neutron
-       fowners neutron:neutron /var/log neutron
-}
-
-src_prepare() {
-       sed -i '/^hacking/d' test-requirements.txt || die
-       # it's /bin/ip not /sbin/ip
-       sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
-       distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-       distutils-r1_python_install_all
-       if use server; then
-               newinitd "${FILESDIR}/neutron.initd" "neutron-server"
-               newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
-               dosym ../../plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
-       fi
-       if use dhcp; then
-               newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
-               newconfd "${FILESDIR}/neutron-dhcp-agent.confd" 
"neutron-dhcp-agent"
-       fi
-       if use l3; then
-               newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
-               newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
-       fi
-       if use metadata; then
-               newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
-               newconfd "${FILESDIR}/neutron-metadata-agent.confd" 
"neutron-metadata-agent"
-       fi
-       if use openvswitch; then
-               newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
-               newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" 
"neutron-openvswitch-agent"
-               newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
-               newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" 
"neutron-ovs-cleanup"
-       fi
-       if use linuxbridge; then
-               newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
-               newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" 
"neutron-linuxbridge-agent"
-       fi
-       diropts -m 755 -o neutron -g neutron
-       dodir /var/log/neutron /var/lib/neutron
-       keepdir /etc/neutron
-       insinto /etc/neutron
-       insopts -m 0640 -o neutron -g neutron
-
-       doins etc/*
-       # stupid renames
-       insinto /etc/neutron
-       doins -r "etc/neutron/plugins"
-       insopts -m 0640 -o root -g root
-       doins "etc/rootwrap.conf"
-       doins -r "etc/neutron/rootwrap.d"
-
-       #add sudoers definitions for user neutron
-       insinto /etc/sudoers.d/
-       insopts -m 0440 -o root -g root
-       newins "${FILESDIR}/neutron.sudoersd" neutron
-
-       # add generated configs
-       cd "${D}/etc/neutron" || die
-       unpack "neutron-configs-${PV}.tar.gz"
-       cd "${D}/etc/neutron/plugins/ml2" || die
-       unpack "neutron-ml2-plugins-${PV}.tar.gz"
-
-       # correcting perms
-       fowners neutron:neutron -R "/etc/neutron"
-       fperms o-rwx -R "/etc/neutron/"
-
-       #remove superfluous stuff
-       rm -R "${D}/usr/etc/"
-}
-
-python_install() {
-       distutils-r1_python_install
-       # copy migration conf file (not coppied on install via setup.py script)
-       python_moduleinto neutron/db/migration/alembic_migrations
-       python_domodule "neutron/db/migration/alembic_migrations/versions"
-}
-
-pkg_postinst() {
-       elog
-       elog "neutron-server's conf.d file may need updating to include 
additional ini files"
-       elog "We currently assume the ml2 plugin will be used but do not make 
assumptions"
-       elog "on if you will use openvswitch or linuxbridge (or something else)"
-       elog
-       elog "Other conf.d files may need updating too, but should be good for 
the default use case"
-       elog
-}

diff --git a/sys-cluster/neutron/neutron-17.1.0.ebuild 
b/sys-cluster/neutron/neutron-17.1.0.ebuild
index 7ba8c9f5087..7cb75c41457 100644
--- a/sys-cluster/neutron/neutron-17.1.0.ebuild
+++ b/sys-cluster/neutron/neutron-17.1.0.ebuild
@@ -19,7 +19,7 @@ else
        
SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/victoria/configs.tar.gz
 -> neutron-configs-${PV}.tar.gz
        
https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/victoria/ml2_plugins.tar.gz
 -> neutron-ml2-plugins-${PV}.tar.gz
        https://tarballs.openstack.org/${PN}/${P}.tar.gz";
-       KEYWORDS="~amd64 ~arm64 ~x86"
+       KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"

Reply via email to