commit:     9af79118a5a2bd51cc3a7369b6c93e155aef41af
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 26 22:29:39 2020 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Jan 26 22:40:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9af79118

sys-cluster/nova: cleanup

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

 sys-cluster/nova/Manifest                |   6 -
 sys-cluster/nova/nova-18.2.3.ebuild      | 252 ------------------------------
 sys-cluster/nova/nova-19.0.3.ebuild      | 254 -------------------------------
 sys-cluster/nova/nova-2018.2.9999.ebuild | 252 ------------------------------
 sys-cluster/nova/nova-2019.1.9999.ebuild | 247 ------------------------------
 sys-cluster/nova/nova-2019.2.9999.ebuild |   8 +-
 6 files changed, 4 insertions(+), 1015 deletions(-)

diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index bcc7de3f6e6..1514cf25095 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -1,9 +1,3 @@
-DIST nova-18.2.3.tar.gz 11450952 BLAKE2B 
1e0b0afefe8281ab9024394194697d3aea81169da7a003a07890dfc11bd38511d39315152dab1b9a1d17b2d1c8109102112b245957e727d053de7fd67ad0c757
 SHA512 
1dcb3fa2ea80afcd5739efad01f3d65723a754fc8d79639e54cd3fbd6e4e4125593799a123b4572c63f8c074a10c244d91814f15d2c7135066d55cd2a991f7fc
-DIST nova-19.0.3.tar.gz 11646820 BLAKE2B 
31aa6ef44609f5698f24168fc79cd9c6d5dd2c5b0da5eed277ccd8d1aa4ee7d6a07a1318bd7f964dd141dbca8f0297a2d677ad2fdf949fcc7a72970d099197e9
 SHA512 
4869d705c165a909e13b27ac383b7be52f9d5925fbe9d8779f773d0b1ce87b6ae7642c4551e01f57c24221e6fe120a3e2b5de41d73dfdcd73f82252b48a2af39
 DIST nova-20.0.1.tar.gz 11587774 BLAKE2B 
62f7b6d4ab83533e4462f16978a2f95ceca3d6594029f87dbb170f3abc19917a4449ec95b007adae16c2e290649a560404d12e738a83bc8ad4bbbc1a4554d074
 SHA512 
3c83a1061696bb6e830e1e518ceea5e5b6405673373df674926b8c01955ea71714bf484906db3dc556209fb895c052003b54477d6a2791df0905244abbf9abe0
-DIST nova.conf.sample-18.2.3 387334 BLAKE2B 
a51b8cdc644ee60390cde3a30ba8f64a339695887b57b2640da39b5a8d34dfec51664b1249955a6cf9202ae19e8e0a8bcd805d4b87d2f6c99a5a6294cc955577
 SHA512 
be9fbab15ea1cac6d3cd1d186aab904454ef17801f9f4b2f1a37c6e46b4c69fed22a7724846049ebd343beff7753d8db408abae52ad3fca0693d70414c6afc61
-DIST nova.conf.sample-19.0.3 387769 BLAKE2B 
2b4668e78765469c5ee518a8c340a09407a8f7e9bf3f87a6919b820db0ce2f38499827dbea58994490c8db3a648eef2c95521f7c62b3ae37606bb249492b4b12
 SHA512 
4facb96c111945f472654788e1ac3d52808b0c45e36c87b873cd1355d36b71922fa94b11d66ec5a8b250739072ecdec394dd4f852a8eb57dbd900c61c71ba770
 DIST nova.conf.sample-20.0.1 220110 BLAKE2B 
af98687c895ee091cc2e8d668eb50b52cc94618081f8a50b544faebed29b2b3a5dfa38309da70dcc6d0083792605b810081b50c15a6c960947e0c782f25717ab
 SHA512 
cc6cce95943b06d60dfc1f85b87d527662eeb57388dca4a6037078b517302b86fd7f752c6e9e43c59c10be83ac5955f21c08284bbc946ffe2171f5bfa6edff38
-DIST nova.conf.sample-2018.2.9999 387334 BLAKE2B 
a51b8cdc644ee60390cde3a30ba8f64a339695887b57b2640da39b5a8d34dfec51664b1249955a6cf9202ae19e8e0a8bcd805d4b87d2f6c99a5a6294cc955577
 SHA512 
be9fbab15ea1cac6d3cd1d186aab904454ef17801f9f4b2f1a37c6e46b4c69fed22a7724846049ebd343beff7753d8db408abae52ad3fca0693d70414c6afc61
-DIST nova.conf.sample-2019.1.9999 387769 BLAKE2B 
2b4668e78765469c5ee518a8c340a09407a8f7e9bf3f87a6919b820db0ce2f38499827dbea58994490c8db3a648eef2c95521f7c62b3ae37606bb249492b4b12
 SHA512 
4facb96c111945f472654788e1ac3d52808b0c45e36c87b873cd1355d36b71922fa94b11d66ec5a8b250739072ecdec394dd4f852a8eb57dbd900c61c71ba770
 DIST nova.conf.sample-2019.2.9999 220110 BLAKE2B 
af98687c895ee091cc2e8d668eb50b52cc94618081f8a50b544faebed29b2b3a5dfa38309da70dcc6d0083792605b810081b50c15a6c960947e0c782f25717ab
 SHA512 
cc6cce95943b06d60dfc1f85b87d527662eeb57388dca4a6037078b517302b86fd7f752c6e9e43c59c10be83ac5955f21c08284bbc946ffe2171f5bfa6edff38

diff --git a/sys-cluster/nova/nova-18.2.3.ebuild 
b/sys-cluster/nova/nova-18.2.3.ebuild
deleted file mode 100644
index c0f27aa09b1..00000000000
--- a/sys-cluster/nova/nova-18.2.3.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1 eutils linux-info multilib user
-
-DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) 
in Python"
-HOMEPAGE="https://launchpad.net/nova";
-
-if [[ ${PV} == *9999 ]];then
-       inherit git-r3
-       
SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/rocky/nova.conf.sample
 -> nova.conf.sample-${PV}"
-       EGIT_REPO_URI="https://github.com/openstack/nova.git";
-       EGIT_BRANCH="stable/rocky"
-else
-       
SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/rocky/nova.conf.sample
 -> nova.conf.sample-${PV}
-       https://tarballs.openstack.org/${PN}/${P}.tar.gz";
-       KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch 
postgres +rabbitmq sqlite"
-REQUIRED_USE="
-       !compute-only? ( || ( mysql postgres sqlite ) )
-       compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
-
-CDEPEND="
-       >=dev-python/setuptools-21.0.0[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.0.0[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.0.1[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.0.2[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.0.3[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.1.0[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.1.1[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.2.0[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.3.0[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.3.1[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.3.2[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-36.2.0[${PYTHON_USEDEP}]
-       >=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-       !~dev-python/pbr-2.1.0"
-DEPEND="
-       ${CDEPEND}
-       app-admin/sudo"
-
-RDEPEND="
-       ${CDEPEND}
-       compute-only? (
-               >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-       )
-       sqlite? (
-               >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-       )
-       mysql? (
-               >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-               !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-               >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-       )
-       postgres? (
-               >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-               >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.8[${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/jinja-2.10[${PYTHON_USEDEP}]
-       >=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
-       >=dev-python/lxml-2.4.1[${PYTHON_USEDEP}]
-       !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-       >=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-       >=dev-python/cryptography-1.2.1[${PYTHON_USEDEP}]
-       >=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
-       >=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
-       !~dev-python/greenlet-0.4.14[${PYTHON_USEDEP}]
-       >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-       >=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-       >=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-       <dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-       >=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-       >=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-       >=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-       >=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
-       >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-       !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-       virtual/python-enum34[${PYTHON_USEDEP}]
-       >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-       >=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-       <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-       >=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-       >=dev-python/keystoneauth-3.9.0[${PYTHON_USEDEP}]
-       >=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}]
-       >=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-       >=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-       >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-       >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-       >=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-       >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-       >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-messaging-6.3.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-policy-1.35.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-       >=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-       >=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
-       >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-       >=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-       >=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-       >=dev-python/os-brick-2.5.0[${PYTHON_USEDEP}]
-       >=dev-python/os-traits-0.4.0[${PYTHON_USEDEP}]
-       >=dev-python/os-vif-1.7.0[${PYTHON_USEDEP}]
-       !~dev-python/os-vif-1.8.0[${PYTHON_USEDEP}]
-       >=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
-       >=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
-       >=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}]
-       >=dev-python/os-xenapi-0.3.3[${PYTHON_USEDEP}]
-       >=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
-       >=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
-       >=dev-python/pypowervm-1.1.15[${PYTHON_USEDEP}]
-       >=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
-       >=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]
-       >=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
-       >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-       >=dev-python/zVMCloudConnector-1.1.1[${PYTHON_USEDEP}]
-       dev-python/libvirt-python[${PYTHON_USEDEP}]
-       app-emulation/libvirt[iscsi?]
-       novncproxy? ( www-apps/novnc )
-       sys-apps/iproute2
-       openvswitch? ( net-misc/openvswitch )
-       rabbitmq? ( net-misc/rabbitmq-server )
-       memcached? (
-               net-misc/memcached
-               >=dev-python/python-memcached-1.58
-       )
-       sys-fs/sysfsutils
-       sys-fs/multipath-tools
-       net-misc/bridge-utils
-       compute? (
-               app-cdr/cdrtools
-               sys-fs/dosfstools
-               app-emulation/qemu
-       )
-       iscsi? (
-               sys-fs/lsscsi
-               >=sys-block/open-iscsi-2.0.873-r1
-       )"
-
-#PATCHES=(
-#)
-
-pkg_setup() {
-       linux-info_pkg_setup
-       CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER 
IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-       IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER 
IP_NF_IPTABLES \
-       NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK 
NETFILTER_XTABLES \
-       ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
-       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
-       enewgroup nova
-       enewuser nova -1 -1 /var/lib/nova nova
-}
-
-python_prepare_all() {
-       sed -i '/^hacking/d' test-requirements.txt || die
-       distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-       distutils-r1_python_install_all
-
-       if use !compute-only; then
-               for svc in api conductor consoleauth network scheduler 
spicehtml5proxy xvpvncproxy; do
-                       newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
-               done
-       fi
-       use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
-       use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
-
-       diropts -m 0750 -o nova -g qemu
-       dodir /var/log/nova /var/lib/nova/instances
-       diropts -m 0750 -o nova -g nova
-
-       insinto /etc/nova
-       insopts -m 0640 -o nova -g nova
-       newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample"
-       doins "${FILESDIR}/nova-compute.conf"
-       doins "${S}/etc/nova/"*
-       # rootwrap filters
-       insopts -m 0644
-       insinto /etc/nova/rootwrap.d
-       doins "etc/nova/rootwrap.d/api-metadata.filters"
-       doins "etc/nova/rootwrap.d/compute.filters"
-       doins "etc/nova/rootwrap.d/network.filters"
-
-       # add sudoers definitions for user nova
-       insinto /etc/sudoers.d/
-       insopts -m 0600 -o root -g root
-       doins "${FILESDIR}/nova-sudoers"
-
-       if use iscsi ; then
-               # Install udev rules for handle iscsi disk with right links 
under /dev
-               udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 
60-openstack-scsi-disk.rules
-
-               insinto /etc/nova/
-               doins "${FILESDIR}/scsi-openscsi-link.sh"
-       fi
-}
-
-python_install() {
-       distutils-r1_python_install
-       # copy migration conf file (not coppied on install via setup.py script)
-       python_moduleinto db/sqlalchemy/migrate_repo
-       python_domodule nova/db/sqlalchemy/migrate_repo/migrate.cfg
-}
-
-pkg_postinst() {
-       if use iscsi ; then
-               elog "iscsid needs to be running if you want cinder to connect"
-       fi
-}

diff --git a/sys-cluster/nova/nova-19.0.3.ebuild 
b/sys-cluster/nova/nova-19.0.3.ebuild
deleted file mode 100644
index 62aa6375ef4..00000000000
--- a/sys-cluster/nova/nova-19.0.3.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1 eutils linux-info multilib user
-
-DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) 
in Python"
-HOMEPAGE="https://launchpad.net/nova";
-
-if [[ ${PV} == *9999 ]];then
-       inherit git-r3
-       
SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/stein/nova.conf.sample
 -> nova.conf.sample-${PV}"
-       EGIT_REPO_URI="https://github.com/openstack/nova.git";
-       EGIT_BRANCH="stable/stein"
-else
-       
SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/stein/nova.conf.sample
 -> nova.conf.sample-${PV}
-       https://tarballs.openstack.org/${PN}/${P}.tar.gz";
-       KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch 
postgres +rabbitmq sqlite"
-REQUIRED_USE="
-       !compute-only? ( || ( mysql postgres sqlite ) )
-       compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
-
-CDEPEND="
-       >=dev-python/setuptools-21.0.0[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.0.0[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.0.1[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.0.2[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.0.3[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.1.0[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.1.1[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.2.0[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.3.0[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.3.1[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.3.2[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-36.2.0[${PYTHON_USEDEP}]
-       >=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-       !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-       ${CDEPEND}
-       app-admin/sudo"
-
-RDEPEND="
-       ${CDEPEND}
-       compute-only? (
-               >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-       )
-       sqlite? (
-               >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-       )
-       mysql? (
-               >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-               !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-               >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-       )
-       postgres? (
-               >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-               >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.8[${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/jinja-2.10[${PYTHON_USEDEP}]
-       >=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
-       >=dev-python/lxml-2.4.1[${PYTHON_USEDEP}]
-       !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-       >=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-       >=dev-python/cryptography-1.2.1[${PYTHON_USEDEP}]
-       >=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
-       >=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
-       !~dev-python/greenlet-0.4.14[${PYTHON_USEDEP}]
-       >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-       >=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-       >=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-       <dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-       >=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-       >=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-       >=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-       >=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
-       >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-       !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-       virtual/python-enum34[${PYTHON_USEDEP}]
-       >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-       >=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-       <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-       >=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-       >=dev-python/keystoneauth-3.9.0[${PYTHON_USEDEP}]
-       >=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}]
-       >=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-       >=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-       >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-       >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-       >=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-       >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-serialization-1.21.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-upgradecheck-0.1.1[${PYTHON_USEDEP}]
-       !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-       >=dev-python/oslo-utils-3.37.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-db-4.44.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-messaging-6.3.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-policy-1.35.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-       >=dev-python/oslo-service-1.34.0[${PYTHON_USEDEP}]
-       >=dev-python/rfc3986-1.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-       >=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-       >=dev-python/oslo-versionedobjects-1.33.3[${PYTHON_USEDEP}]
-       >=dev-python/os-brick-2.6.1[${PYTHON_USEDEP}]
-       >=dev-python/os-resource-classes-0.1.0[${PYTHON_USEDEP}]
-       >=dev-python/os-traits-0.8.0[${PYTHON_USEDEP}]
-       >=dev-python/os-vif-1.14.0[${PYTHON_USEDEP}]
-       >=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
-       >=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
-       >=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}]
-       >=dev-python/os-xenapi-0.3.3[${PYTHON_USEDEP}]
-       >=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
-       >=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
-       >=dev-python/pypowervm-1.1.15[${PYTHON_USEDEP}]
-       >=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
-       >=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]
-       >=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
-       >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-       >=dev-python/zVMCloudConnector-1.1.1[${PYTHON_USEDEP}]
-       dev-python/libvirt-python[${PYTHON_USEDEP}]
-       app-emulation/libvirt[iscsi?]
-       app-emulation/spice-html5
-       novncproxy? ( www-apps/novnc )
-       sys-apps/iproute2
-       openvswitch? ( net-misc/openvswitch )
-       rabbitmq? ( net-misc/rabbitmq-server )
-       memcached? (
-               net-misc/memcached
-               >=dev-python/python-memcached-1.58
-       )
-       sys-fs/sysfsutils
-       sys-fs/multipath-tools
-       net-misc/bridge-utils
-       compute? (
-               app-cdr/cdrtools
-               sys-fs/dosfstools
-               app-emulation/qemu
-       )
-       iscsi? (
-               sys-fs/lsscsi
-               >=sys-block/open-iscsi-2.0.873-r1
-       )"
-
-#PATCHES=(
-#)
-
-pkg_setup() {
-       linux-info_pkg_setup
-       CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER 
IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-       IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER 
IP_NF_IPTABLES \
-       NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK 
NETFILTER_XTABLES \
-       ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
-       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
-       enewgroup nova
-       enewuser nova -1 -1 /var/lib/nova nova
-}
-
-python_prepare_all() {
-       sed -i '/^hacking/d' test-requirements.txt || die
-       distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-       distutils-r1_python_install_all
-
-       if use !compute-only; then
-               for svc in api conductor consoleauth network scheduler 
spicehtml5proxy xvpvncproxy; do
-                       newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
-               done
-       fi
-       use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
-       use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
-
-       diropts -m 0750 -o nova -g qemu
-       dodir /var/log/nova /var/lib/nova/instances
-       diropts -m 0750 -o nova -g nova
-
-       insinto /etc/nova
-       insopts -m 0640 -o nova -g nova
-       newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample"
-       doins "${FILESDIR}/nova-compute.conf"
-       doins "${S}/etc/nova/"*
-       # rootwrap filters
-       insopts -m 0644
-       insinto /etc/nova/rootwrap.d
-       doins "etc/nova/rootwrap.d/api-metadata.filters"
-       doins "etc/nova/rootwrap.d/compute.filters"
-       doins "etc/nova/rootwrap.d/network.filters"
-
-       # add sudoers definitions for user nova
-       insinto /etc/sudoers.d/
-       insopts -m 0600 -o root -g root
-       doins "${FILESDIR}/nova-sudoers"
-
-       if use iscsi ; then
-               # Install udev rules for handle iscsi disk with right links 
under /dev
-               udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 
60-openstack-scsi-disk.rules
-
-               insinto /etc/nova/
-               doins "${FILESDIR}/scsi-openscsi-link.sh"
-       fi
-       rm -r "${ED}/usr/etc"
-}
-
-python_install() {
-       distutils-r1_python_install
-       # copy migration conf file (not coppied on install via setup.py script)
-       python_moduleinto db/sqlalchemy/migrate_repo
-       python_domodule nova/db/sqlalchemy/migrate_repo/migrate.cfg
-}
-
-pkg_postinst() {
-       if use iscsi ; then
-               elog "iscsid needs to be running if you want cinder to connect"
-       fi
-}

diff --git a/sys-cluster/nova/nova-2018.2.9999.ebuild 
b/sys-cluster/nova/nova-2018.2.9999.ebuild
deleted file mode 100644
index fd27a7d13ab..00000000000
--- a/sys-cluster/nova/nova-2018.2.9999.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1 eutils linux-info multilib user
-
-DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) 
in Python"
-HOMEPAGE="https://launchpad.net/nova";
-
-if [[ ${PV} == *9999 ]];then
-       inherit git-r3
-       
SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/rocky/nova.conf.sample
 -> nova.conf.sample-${PV}"
-       EGIT_REPO_URI="https://github.com/openstack/nova.git";
-       EGIT_BRANCH="stable/rocky"
-else
-       
SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/rocky/nova.conf.sample
 -> nova.conf.sample-${PV}
-       https://tarballs.openstack.org/${PN}/${P}.tar.gz";
-       KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch 
postgres +rabbitmq sqlite"
-REQUIRED_USE="
-       !compute-only? ( || ( mysql postgres sqlite ) )
-       compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
-
-CDEPEND="
-       >=dev-python/setuptools-21.0.0[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.0.0[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.0.1[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.0.2[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.0.3[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.1.0[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.1.1[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.2.0[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.3.0[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.3.1[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.3.2[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-36.2.0[${PYTHON_USEDEP}]
-       >=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-       !~dev-python/pbr-2.1.0"
-DEPEND="
-       ${CDEPEND}
-       app-admin/sudo"
-
-RDEPEND="
-       ${CDEPEND}
-       compute-only? (
-               >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-       )
-       sqlite? (
-               >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-       )
-       mysql? (
-               >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-               !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-               >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-       )
-       postgres? (
-               >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-               >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.8[${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/jinja-2.10[${PYTHON_USEDEP}]
-       >=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
-       >=dev-python/lxml-2.4.1[${PYTHON_USEDEP}]
-       !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-       >=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-       >=dev-python/cryptography-1.2.1[${PYTHON_USEDEP}]
-       >=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
-       >=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
-       !~dev-python/greenlet-0.4.14[${PYTHON_USEDEP}]
-       >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-       >=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-       >=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-       <dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-       >=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-       >=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-       >=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-       >=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
-       >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-       !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-       virtual/python-enum34[${PYTHON_USEDEP}]
-       >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-       >=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-       <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-       >=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-       >=dev-python/keystoneauth-3.9.0[${PYTHON_USEDEP}]
-       >=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}]
-       >=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-       >=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-       >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-       >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-       >=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-       >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-       >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-messaging-6.3.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-policy-1.35.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-       >=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-       >=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
-       >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-       >=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-       >=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-       >=dev-python/os-brick-2.5.0[${PYTHON_USEDEP}]
-       >=dev-python/os-traits-0.4.0[${PYTHON_USEDEP}]
-       >=dev-python/os-vif-1.7.0[${PYTHON_USEDEP}]
-       !~dev-python/os-vif-1.8.0[${PYTHON_USEDEP}]
-       >=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
-       >=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
-       >=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}]
-       >=dev-python/os-xenapi-0.3.3[${PYTHON_USEDEP}]
-       >=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
-       >=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
-       >=dev-python/pypowervm-1.1.15[${PYTHON_USEDEP}]
-       >=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
-       >=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]
-       >=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
-       >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-       >=dev-python/zVMCloudConnector-1.1.1[${PYTHON_USEDEP}]
-       dev-python/libvirt-python[${PYTHON_USEDEP}]
-       app-emulation/libvirt[iscsi?]
-       novncproxy? ( www-apps/novnc )
-       sys-apps/iproute2
-       openvswitch? ( net-misc/openvswitch )
-       rabbitmq? ( net-misc/rabbitmq-server )
-       memcached? (
-               net-misc/memcached
-               >=dev-python/python-memcached-1.58
-       )
-       sys-fs/sysfsutils
-       sys-fs/multipath-tools
-       net-misc/bridge-utils
-       compute? (
-               app-cdr/cdrtools
-               sys-fs/dosfstools
-               app-emulation/qemu
-       )
-       iscsi? (
-               sys-fs/lsscsi
-               >=sys-block/open-iscsi-2.0.873-r1
-       )"
-
-#PATCHES=(
-#)
-
-pkg_setup() {
-       linux-info_pkg_setup
-       CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER 
IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-       IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER 
IP_NF_IPTABLES \
-       NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK 
NETFILTER_XTABLES \
-       ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
-       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
-       enewgroup nova
-       enewuser nova -1 -1 /var/lib/nova nova
-}
-
-python_prepare_all() {
-       sed -i '/^hacking/d' test-requirements.txt || die
-       distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-       distutils-r1_python_install_all
-
-       if use !compute-only; then
-               for svc in api conductor consoleauth network scheduler 
spicehtml5proxy xvpvncproxy; do
-                       newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
-               done
-       fi
-       use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
-       use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
-
-       diropts -m 0750 -o nova -g qemu
-       dodir /var/log/nova /var/lib/nova/instances
-       diropts -m 0750 -o nova -g nova
-
-       insinto /etc/nova
-       insopts -m 0640 -o nova -g nova
-       newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample"
-       doins "${FILESDIR}/nova-compute.conf"
-       doins "${S}/etc/nova/"*
-       # rootwrap filters
-       insopts -m 0644
-       insinto /etc/nova/rootwrap.d
-       doins "etc/nova/rootwrap.d/api-metadata.filters"
-       doins "etc/nova/rootwrap.d/compute.filters"
-       doins "etc/nova/rootwrap.d/network.filters"
-
-       # add sudoers definitions for user nova
-       insinto /etc/sudoers.d/
-       insopts -m 0600 -o root -g root
-       doins "${FILESDIR}/nova-sudoers"
-
-       if use iscsi ; then
-               # Install udev rules for handle iscsi disk with right links 
under /dev
-               udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 
60-openstack-scsi-disk.rules
-
-               insinto /etc/nova/
-               doins "${FILESDIR}/scsi-openscsi-link.sh"
-       fi
-}
-
-python_install() {
-       distutils-r1_python_install
-       # copy migration conf file (not coppied on install via setup.py script)
-       python_moduleinto db/sqlalchemy/migrate_repo
-       python_domodule nova/db/sqlalchemy/migrate_repo/migrate.cfg
-}
-
-pkg_postinst() {
-       if use iscsi ; then
-               elog "iscsid needs to be running if you want cinder to connect"
-       fi
-}

diff --git a/sys-cluster/nova/nova-2019.1.9999.ebuild 
b/sys-cluster/nova/nova-2019.1.9999.ebuild
deleted file mode 100644
index 1a8192dec6f..00000000000
--- a/sys-cluster/nova/nova-2019.1.9999.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1 eutils linux-info multilib user
-
-DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) 
in Python"
-HOMEPAGE="https://launchpad.net/nova";
-
-if [[ ${PV} == *9999 ]];then
-       inherit git-r3
-       
SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/stein/nova.conf.sample
 -> nova.conf.sample-${PV}"
-       EGIT_REPO_URI="https://github.com/openstack/nova.git";
-       EGIT_BRANCH="stable/stein"
-else
-       
SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/stein/nova.conf.sample
 -> nova.conf.sample-${PV}
-       https://tarballs.openstack.org/${PN}/${P}.tar.gz";
-       KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch 
postgres +rabbitmq sqlite"
-REQUIRED_USE="
-       !compute-only? ( || ( mysql postgres sqlite ) )
-       compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
-
-CDEPEND="
-       >=dev-python/setuptools-21.0.0[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.0.0[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.0.1[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.0.2[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.0.3[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.1.0[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.1.1[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.2.0[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.3.0[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.3.1[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-34.3.2[${PYTHON_USEDEP}]
-       !~dev-python/setuptools-36.2.0[${PYTHON_USEDEP}]
-       >=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-       !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-       ${CDEPEND}
-       app-admin/sudo"
-
-RDEPEND="
-       ${CDEPEND}
-       compute-only? (
-               >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-       )
-       sqlite? (
-               >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-       )
-       mysql? (
-               >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-               !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-               >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-       )
-       postgres? (
-               >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-               >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-               !~dev-python/sqlalchemy-1.1.8[${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/jinja-2.10[${PYTHON_USEDEP}]
-       >=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
-       >=dev-python/lxml-2.4.1[${PYTHON_USEDEP}]
-       !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-       >=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-       >=dev-python/cryptography-1.2.1[${PYTHON_USEDEP}]
-       >=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
-       >=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
-       !~dev-python/greenlet-0.4.14[${PYTHON_USEDEP}]
-       >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-       >=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-       >=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-       <dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-       >=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-       >=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-       >=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-       >=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
-       >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-       !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-       virtual/python-enum34[${PYTHON_USEDEP}]
-       >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-       >=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-       <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-       >=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-       >=dev-python/keystoneauth-3.9.0[${PYTHON_USEDEP}]
-       >=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}]
-       >=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-       >=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-       >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-       >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-       >=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-       >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-serialization-1.21.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-upgradecheck-0.1.1[${PYTHON_USEDEP}]
-       !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-       >=dev-python/oslo-utils-3.37.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-db-4.44.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-messaging-6.3.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-policy-1.35.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-       >=dev-python/oslo-service-1.34.0[${PYTHON_USEDEP}]
-       >=dev-python/rfc3986-1.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-       >=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-       >=dev-python/oslo-versionedobjects-1.33.3[${PYTHON_USEDEP}]
-       >=dev-python/os-brick-2.6.1[${PYTHON_USEDEP}]
-       >=dev-python/os-resource-classes-0.1.0[${PYTHON_USEDEP}]
-       >=dev-python/os-traits-0.8.0[${PYTHON_USEDEP}]
-       >=dev-python/os-vif-1.14.0[${PYTHON_USEDEP}]
-       >=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
-       >=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
-       >=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}]
-       >=dev-python/os-xenapi-0.3.3[${PYTHON_USEDEP}]
-       >=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
-       >=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
-       >=dev-python/pypowervm-1.1.15[${PYTHON_USEDEP}]
-       >=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
-       >=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]
-       >=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
-       >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-       >=dev-python/zVMCloudConnector-1.1.1[${PYTHON_USEDEP}]
-       dev-python/libvirt-python[${PYTHON_USEDEP}]
-       app-emulation/libvirt[iscsi?]
-       app-emulation/spice-html5
-       novncproxy? ( www-apps/novnc )
-       sys-apps/iproute2
-       openvswitch? ( net-misc/openvswitch )
-       rabbitmq? ( net-misc/rabbitmq-server )
-       memcached? (
-               net-misc/memcached
-               >=dev-python/python-memcached-1.58
-       )
-       sys-fs/sysfsutils
-       sys-fs/multipath-tools
-       net-misc/bridge-utils
-       compute? (
-               app-cdr/cdrtools
-               sys-fs/dosfstools
-               app-emulation/qemu
-       )
-       iscsi? (
-               sys-fs/lsscsi
-               >=sys-block/open-iscsi-2.0.873-r1
-       )"
-
-#PATCHES=(
-#)
-
-pkg_setup() {
-       linux-info_pkg_setup
-       CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER 
IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-       IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER 
IP_NF_IPTABLES \
-       NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK 
NETFILTER_XTABLES \
-       ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
-       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
-       enewgroup nova
-       enewuser nova -1 -1 /var/lib/nova nova
-}
-
-python_prepare_all() {
-       sed -i '/^hacking/d' test-requirements.txt || die
-       distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-       distutils-r1_python_install_all
-
-       if use !compute-only; then
-               for svc in api conductor consoleauth network scheduler 
spicehtml5proxy xvpvncproxy; do
-                       newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
-               done
-       fi
-       use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
-       use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
-
-       diropts -m 0750 -o nova -g qemu
-       dodir /var/log/nova /var/lib/nova/instances
-       diropts -m 0750 -o nova -g nova
-
-       insinto /etc/nova
-       insopts -m 0640 -o nova -g nova
-       newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample"
-       doins "${FILESDIR}/nova-compute.conf"
-       doins "${S}/etc/nova/"*
-       # rootwrap filters
-       insopts -m 0644
-       insinto /etc/nova/rootwrap.d
-       doins "etc/nova/rootwrap.d/api-metadata.filters"
-       doins "etc/nova/rootwrap.d/compute.filters"
-       doins "etc/nova/rootwrap.d/network.filters"
-
-       # add sudoers definitions for user nova
-       insinto /etc/sudoers.d/
-       insopts -m 0600 -o root -g root
-       doins "${FILESDIR}/nova-sudoers"
-
-       if use iscsi ; then
-               # Install udev rules for handle iscsi disk with right links 
under /dev
-               udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 
60-openstack-scsi-disk.rules
-
-               insinto /etc/nova/
-               doins "${FILESDIR}/scsi-openscsi-link.sh"
-       fi
-       rm -r "${ED}/usr/etc"
-}
-
-pkg_postinst() {
-       if use iscsi ; then
-               elog "iscsid needs to be running if you want cinder to connect"
-       fi
-}

diff --git a/sys-cluster/nova/nova-2019.2.9999.ebuild 
b/sys-cluster/nova/nova-2019.2.9999.ebuild
index 9d72a11b0ad..fb95e0d2d71 100644
--- a/sys-cluster/nova/nova-2019.2.9999.ebuild
+++ b/sys-cluster/nova/nova-2019.2.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1 eutils linux-info multilib user
+inherit distutils-r1 eutils linux-info multilib
 
 DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) 
in Python"
 HOMEPAGE="https://launchpad.net/nova";
@@ -145,7 +145,9 @@ RDEPEND="
        iscsi? (
                sys-fs/lsscsi
                >=sys-block/open-iscsi-2.0.873-r1
-       )"
+       )
+       acct-user/nova
+       acct-group/nova"
 
 #PATCHES=(
 #)
@@ -161,8 +163,6 @@ pkg_setup() {
                        linux_chkconfig_present ${module} || ewarn "${module} 
needs to be enabled in kernel"
                done
        fi
-       enewgroup nova
-       enewuser nova -1 -1 /var/lib/nova nova
 }
 
 python_prepare_all() {

Reply via email to