gentoo resync : 20.06.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-06-20 14:45:01 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-06-20 14:45:01 +0100
commit: 34dea8e38f88007799629d0a56b12dec480b1d21 (patch)
tree: 6790873994b58030360328cf5897d934b3b03d16 /sys-cluster
parent: 7932d472a02d4c016ff7dff4b7a5479ab9d1883d (diff)
71 files changed, 25 insertions, 3363 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 0d6e73a66be8..059f8deb36e6 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 73d7af5da216..e3964d303426 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -48,8 +48,8 @@ DIST ceph-14.2.21.tar.gz 129272778 BLAKE2B f82f452e0f0c40a95ea1bdb3654c2d322caa3
 DIST ceph-15.2.12.tar.gz 148509713 BLAKE2B 4962e7d574b38592a874a1b3fa8610bb2d0afc8713d995d67a790c025bb086cb619cbbaec76482ec096b4c55b9f1df383f5bd4806a231bc88e70ac3efbac24b5 SHA512 08266a2e9a7ca5a37e03f340873571fd012c630dd898a87241cd97c29760b2bf41fe64c8883e7b08e0f83c26245072cd26e69ecb1db02378d1ec38335ba1cd0f
 DIST ceph-15.2.13.tar.gz 148542333 BLAKE2B 2e9668bcb0fd283ec4ab51b0c6142fc9a3b6310eb5d34e07da5e6b73b55dd7976db5ab9c78a93684ddc2f51873b1a17c4d31c5f5647b2d43a2826ee5362f7e5d SHA512 bde28c331c489db0845959f65c425146c317466a7793f56a83e2827dec35b8cd6f600bf9056151c1e6926cc0155deebbc8681c240ac9f37ad876b9a6afae96da
 DIST ceph-16.2.4.tar.gz 155840423 BLAKE2B a803ffa61ac9fd6d42790d6d8e12aa8df843968627df0051475355f3ba0dc1272afa3d9e2716115ad769b2f322d7bd239d99b89e51610e89ce9efe39af4f01ae SHA512 8904e7fcabd50276e4e86735fd85dba96f417c194c219025146f994707def7abe372528b0f2e862e274b2f405d7b791bac86b6cbb8d57cecd6f44023a2ffb6f6
-EBUILD ceph-14.2.21.ebuild 10406 BLAKE2B 3ea1503e4422a185a0fe7bcfd09a377a7443e13d573353a058b3695b6f19792b076f264dd7af5b09fa6c9423f267995838bf39553b41de1f31a6f6863547c896 SHA512 18f4fb7bce7380d2d85538a6c1f2665a16819024b99adc523b72992d9b06739e6b66211b9a15968a4840c2766e0a5bcef90aef559c562f2f2338a81562d8756d
-EBUILD ceph-15.2.12.ebuild 10755 BLAKE2B 54de38a70b8b89ad49a64da1806da59f76c5846a9f58453e4b2a598ae4a0317ade733b5105cac17e37334cf4271c7afeaec2810cbc48e349ad98e97dd82ffedf SHA512 6507708f5faa8cd04ca4d1b86350eeebb15a46bccdca24957cde01c20938cbf3462c9ff11252fda2b0a96285b3a26ab0347d39dc4e77e040aab0426e077c3982
-EBUILD ceph-15.2.13.ebuild 10651 BLAKE2B 2817fc528d3444b8ac0458dc609232241e2801700ac08f3c62d68ccc7fbce8b28c93340c7063a7ae216b120d5c9e155ac3fbb8069f053ac7273648f18c7b7296 SHA512 00cf781d8c1b246d03719131d6716e6ffde1d8d622d79a0766e05e87cf78380a121d1f2a152b9c6c4a8130fa6a70c396beff66ef2fe9bd2730e376385562a4bf
-EBUILD ceph-16.2.4-r1.ebuild 11966 BLAKE2B 9fe89eeb9341f1a12885296c25576a365461f30eca5d41b96dc46ca72ef2c12e7ef0040f5389322f61c4ce54ad2a65bdac8147b702db0735a45fe987cd12535b SHA512 86df6d02b9d60e4c44e13f8997e28ad51ee50bc16c48257bdae02546bd65f89db7ab9f9ef296d7a398ac640cb94c95184df97e45c7f4469049615d67227ee609
+EBUILD ceph-14.2.21-r1.ebuild 10411 BLAKE2B f57bf6a7d1d0f19f3d2ca22cd1da35c527e0a8c504d18e4a9495f5d37d4e6a4a751dc4d24df6dbc5e0f323ba203f54e8db043231fd418f325d1539c4ab273ccf SHA512 c6fe6f3fe697538687504c8581697821e6ab17ca7d0cd7371eab0de46925428fbf160d805605e3b4cdee7f3058bd1ae34ccc26621cb0958f5d6fb239a2b7b295
+EBUILD ceph-15.2.12-r1.ebuild 10760 BLAKE2B e0507e63c215d3626544f56fc97fc75c0a6c9671a66a5ed40c628a23d73289415314ffb3758f05692f52694140d38ed89ee559969d0182bef2fb8d2a5c9f1984 SHA512 c33b21dbf3640a6db042d310ea65be069d05314d29f21124bd64e060f276a5667870835d6f9280abafedff6a5cee6f66a7447137433e4ec97609f38859fbdafb
+EBUILD ceph-15.2.13-r1.ebuild 10656 BLAKE2B 354b75a73a93a34ae3a9e696305ab86004bcb890d287d98984facf5f3c5aa3d8be1d0a43959a0ad7acc13058b876d4696aeea2e0627963a9993ed9ffbc6e68c0 SHA512 d859c88361446ff4ec719e66d57db08e26d9fc1410845b796e623b0eb4465f2bc7661c6a76d1c93278bc0f839def201c1d4cac7118b44b1783494a114d7dde62
+EBUILD ceph-16.2.4-r2.ebuild 11971 BLAKE2B 398b54fb119f17f92acf7c0b6dda1dcc0896764c2cdeb8f2d1c0df6e1672ce72fdd43a32f7ab2eda39a44fa1a5e5839dc7df181a9ecf3ea9d3e41a1f8fe3c2fe SHA512 56fc87b57798eb9a6eb50f4400c2e0663ece9f9f003de0d5d4851c4a04103ba6dde809414b552e165cb9cc3667c462f572484df48323329f0c24d4b55d2ef29e
 MISC metadata.xml 2318 BLAKE2B f9cf86426b0d8ea87cb80cb03315e9b0b581f604b2e1f28011dd49ab885232184fbcb6e496e8305d92e2c45bea973b8627235115e6bc7b7590874ac2ce9a00cc SHA512 e4eb8fb92dfe9161c217d880db3733aec36efc74431f529b12212702abbf633647bb8a22bfe7864d7389e8ed893bc37518e228ce165140058f98aec534b8f3de
diff --git a/sys-cluster/ceph/ceph-14.2.21.ebuild b/sys-cluster/ceph/ceph-14.2.21-r1.ebuild
index 39e5b14a1c87..36597b47ed0a 100644
--- a/sys-cluster/ceph/ceph-14.2.21.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.21-r1.ebuild
@@ -83,7 +83,7 @@ DEPEND="
 		net-misc/curl:=[curl_ssl_openssl]
 	)
 	ssl? ( dev-libs/openssl:= )
-	system-boost? ( dev-libs/boost[threads,context,python,${PYTHON_USEDEP}] )
+	system-boost? ( dev-libs/boost:=[threads(+),context,python,${PYTHON_USEDEP}] )
 	xfs? ( sys-fs/xfsprogs:= )
 	zfs? ( sys-fs/zfs:= )
 	${PYTHON_DEPS}
diff --git a/sys-cluster/ceph/ceph-15.2.12.ebuild b/sys-cluster/ceph/ceph-15.2.12-r1.ebuild
index c342da2cf406..acb36e7d6617 100644
--- a/sys-cluster/ceph/ceph-15.2.12.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.12-r1.ebuild
@@ -87,7 +87,7 @@ DEPEND="
 	)
 	rbd-rwl? ( dev-libs/pmdk:= )
 	ssl? ( dev-libs/openssl:= )
-	system-boost? ( >=dev-libs/boost-1.72[threads,context,python,${PYTHON_USEDEP}] )
+	system-boost? ( >=dev-libs/boost-1.72:=[threads(+),context,python,${PYTHON_USEDEP}] )
 	uring? ( sys-libs/liburing:= )
 	xfs? ( sys-fs/xfsprogs:= )
 	zfs? ( sys-fs/zfs:= )
diff --git a/sys-cluster/ceph/ceph-15.2.13.ebuild b/sys-cluster/ceph/ceph-15.2.13-r1.ebuild
index be518dbedbaa..956a073ea870 100644
--- a/sys-cluster/ceph/ceph-15.2.13.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.13-r1.ebuild
@@ -87,7 +87,7 @@ DEPEND="
 	)
 	rbd-rwl? ( dev-libs/pmdk:= )
 	ssl? ( dev-libs/openssl:= )
-	system-boost? ( >=dev-libs/boost-1.72[threads,context,python,${PYTHON_USEDEP}] )
+	system-boost? ( >=dev-libs/boost-1.72:=[threads(+),context,python,${PYTHON_USEDEP}] )
 	uring? ( sys-libs/liburing:= )
 	xfs? ( sys-fs/xfsprogs:= )
 	zfs? ( sys-fs/zfs:= )
diff --git a/sys-cluster/ceph/ceph-16.2.4-r1.ebuild b/sys-cluster/ceph/ceph-16.2.4-r2.ebuild
index 99d57305e48a..f50a2c98925c 100644
--- a/sys-cluster/ceph/ceph-16.2.4-r1.ebuild
+++ b/sys-cluster/ceph/ceph-16.2.4-r2.ebuild
@@ -96,7 +96,7 @@ DEPEND="
 	rbd-rwl? ( dev-libs/pmdk:= )
 	ssl? ( dev-libs/openssl:= )
 	sqlite? ( dev-db/sqlite:= )
-	system-boost? ( >=dev-libs/boost-1.72[threads,context,python,${PYTHON_USEDEP}] )
+	system-boost? ( >=dev-libs/boost-1.72:=[threads(+),context,python,${PYTHON_USEDEP}] )
 	uring? ( sys-libs/liburing:= )
 	xfs? ( sys-fs/xfsprogs:= )
 	zbd? ( sys-block/libzbd:= )
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
deleted file mode 100644
index a7e6985d5e7c..000000000000
--- a/sys-cluster/cinder/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX cinder.initd 494 BLAKE2B f919de45b8e39b65d355f627fcd71a4c23a7bb550157d25811c1d1f3a84b9f1c1e7c596361ec5d2aab650f1ebf3f0f053e313f2e15be64995d1309a6eafc8a69 SHA512 be3c2e6798b08527487cfd2b1cd66a03d891526a45f52c97a536b15a08d46a4162e3b036dcae86911c7dba25c5d7f02e73a089d4dd720526bf38ecd0f44c59b0
-AUX cinder.sudoersd 86 BLAKE2B 1ea49d3cf3bc134ea0a2d5512c6e258f117187267bfa408fea0d2449a091068e5404812a0e693f226d895ec23766ed73aca36128d6f7b968ae44dc38b8ad948a SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1
-DIST cinder-17.1.0.tar.gz 5823116 BLAKE2B 08f8c4e9acdd46d27ad5e35b8602dc7722ff0f08f577183860138f9085f6744abeccf6943d556419cc7584504c3245c19cfd4f17db4164cc8a4c144aa8c112bd SHA512 f3e91945e81e5bb7edefba62050d3750ae5ab870903e55f46e8f0a5d3c140eada1df466d5fcc6623df8ad9688cad3c6519c712494cd20b8cfeb4b992e8f516cc
-DIST cinder.conf.sample-17.1.0 186451 BLAKE2B efc75cf3c5e852d411d9c2ed2080eb554a5f81c9b39a2ee9cf44add21842c05ea5b03cc66747da2182d2efc73d83b55323cecd4aa34db99369bf62b5ed1795bc SHA512 ee60a62ec8490a38c995f9c4a9ede8eeec631745bdbc9bc6e1d195370687de5d99aa8754ea017f23e6a9542b987842c7ffd7cf203bfed37f2a7ddbe61a82d517
-DIST cinder.conf.sample-2020.2.9999 186451 BLAKE2B efc75cf3c5e852d411d9c2ed2080eb554a5f81c9b39a2ee9cf44add21842c05ea5b03cc66747da2182d2efc73d83b55323cecd4aa34db99369bf62b5ed1795bc SHA512 ee60a62ec8490a38c995f9c4a9ede8eeec631745bdbc9bc6e1d195370687de5d99aa8754ea017f23e6a9542b987842c7ffd7cf203bfed37f2a7ddbe61a82d517
-EBUILD cinder-17.1.0.ebuild 6809 BLAKE2B 7583efe00fe72f25668a460071eda75cd1b3edc6f612bd295066a47e49df514124b861f7a888c8b2e6c37dfa7e5adca1ac99e6276d0ad8fc4c9f83fefedd937f SHA512 9381a7aa1f25196ee487f4a2139cf7762a1c1db4c94e51290869110bf3bb358f03be015199ea3a7db2928039548812f81178acfc89c2876c23e2eaa16ca4e6d4
-EBUILD cinder-2020.2.9999.ebuild 6811 BLAKE2B 264a2b84ad33fcd5453a2ce8a1eeea7847ba1d4c9a4430155e03dbf67fd341ae7eba8721d551c50d59dbb3b615834bf972ba89a382dc061c8299e88c431d4f94 SHA512 9daaa148725d3d18621d23b453b0a219899320304cbb42fd28ba5c6f3b006538b70d7a51918b836b24f0b649932eb90a98fd2067e2fdb0dbe005582024e3367d
-MISC metadata.xml 1102 BLAKE2B 9ae7e7c1dc78a29aaa42da894b86bb674c080636008e95ec57f7eb0a483006f1128d5aa42fe6a673611732063f8e5bfbee0e4596af4196f23065f362d92a6860 SHA512 ee165a4bbe18345bd11de0590ec389c7ad1055a052470666939f77b4c5dce220e1400effd1b89a44ca515dcebd15c392b4bc4aa8d76ce23116ae8b5525197b42
diff --git a/sys-cluster/cinder/cinder-17.1.0.ebuild b/sys-cluster/cinder/cinder-17.1.0.ebuild
deleted file mode 100644
index 1cce5217a7ae..000000000000
--- a/sys-cluster/cinder/cinder-17.1.0.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2021 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="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
-HOMEPAGE="https://launchpad.net/cinder"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/victoria/cinder.conf.sample -> cinder.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/cinder.git"
-	EGIT_BRANCH="stable/victoria"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/victoria/cinder.conf.sample -> cinder.conf.sample-${PV}
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
-
-DEPEND=">=dev-python/pbr-5.4.1[${PYTHON_USEDEP}]
-	app-admin/sudo"
-
-#	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]  # do not include, upstream depricated
-RDEPEND="
-	>=dev-python/pbr-5.4.1[${PYTHON_USEDEP}]
-	>=dev-python/decorator-4.1.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.26.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.15[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.12[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.21.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-6.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.44.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-6.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.44.1[${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-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.40.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.7.1[${PYTHON_USEDEP}]
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.9.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.15.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2015.7[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/rtslib-fb-2.1.65[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.3.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.3.0[sqlite,${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.3.0[sqlite,${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.13.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.31.0[${PYTHON_USEDEP}]
-	>=dev-python/tabulate-0.8.5[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-6.1.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.24.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-vmware-2.35.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-4.0.1[${PYTHON_USEDEP}]
-	>=dev-python/os-win-4.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
-	>=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
-	>=dev-python/castellan-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]
-	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/zstd-1.4.5.0[${PYTHON_USEDEP}]
-	iscsi? (
-		tgt? ( sys-block/tgt )
-		sys-block/open-iscsi
-	)
-	lvm? ( sys-fs/lvm2 )
-	memcached? ( net-misc/memcached )
-	app-emulation/qemu
-	sys-fs/sysfsutils
-	acct-user/cinder
-	acct-group/cinder"
-# qemu is needed for image conversion
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES=""
-	if use tcp; then
-		CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
-	fi
-	if use rdma; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
-	fi
-	if use infiniband; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
-	fi
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
-		done
-	fi
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	# only used for docs
-	sed -i '/^sphinx-feature-classification/d' requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
-	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /etc/cinder
-	dodir /etc/cinder/rootwrap.d
-
-	for svc in api scheduler volume; do
-		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
-	done
-
-	insinto /etc/cinder
-	insopts -m0640 -o cinder -g cinder
-	doins "etc/cinder/api-httpd.conf"
-	doins "etc/cinder/logging_sample.conf"
-	doins "etc/cinder/rootwrap.conf"
-	doins "etc/cinder/api-paste.ini"
-	doins "etc/cinder/resource_filters.json"
-	newins "${DISTDIR}/cinder.conf.sample-${PV}" "cinder.conf.sample"
-	insinto /etc/cinder/rootwrap.d
-	doins "etc/cinder/rootwrap.d/volume.filters"
-
-	dodir /var/log/cinder
-	fowners cinder:cinder /var/log/cinder
-
-	#add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/cinder.sudoersd" cinder
-	# stupid python
-	rm -r "${ED}"/usr/etc
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "Cinder needs tgtd to be installed and running to work with iscsi"
-		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
-	fi
-}
diff --git a/sys-cluster/cinder/cinder-2020.2.9999.ebuild b/sys-cluster/cinder/cinder-2020.2.9999.ebuild
deleted file mode 100644
index 7831e869f3ae..000000000000
--- a/sys-cluster/cinder/cinder-2020.2.9999.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2021 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="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
-HOMEPAGE="https://launchpad.net/cinder"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/victoria/cinder.conf.sample -> cinder.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/cinder.git"
-	EGIT_BRANCH="stable/victoria"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/victoria/cinder.conf.sample -> cinder.conf.sample-${PV}
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
-
-DEPEND=">=dev-python/pbr-5.4.1[${PYTHON_USEDEP}]
-	app-admin/sudo"
-
-#	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]  # do not include, upstream depricated
-RDEPEND="
-	>=dev-python/pbr-5.4.1[${PYTHON_USEDEP}]
-	>=dev-python/decorator-4.1.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.26.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.15[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.12[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.21.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-6.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.44.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-6.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.44.1[${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-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.40.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.7.1[${PYTHON_USEDEP}]
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.9.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.15.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2015.7[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/rtslib-fb-2.1.65[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.3.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.3.0[sqlite,${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.3.0[sqlite,${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.13.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.31.0[${PYTHON_USEDEP}]
-	>=dev-python/tabulate-0.8.5[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-6.1.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.24.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-vmware-2.35.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-4.0.1[${PYTHON_USEDEP}]
-	>=dev-python/os-win-4.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
-	>=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
-	>=dev-python/castellan-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]
-	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/zstd-1.4.5.0[${PYTHON_USEDEP}]
-	iscsi? (
-		tgt? ( sys-block/tgt )
-		sys-block/open-iscsi
-	)
-	lvm? ( sys-fs/lvm2 )
-	memcached? ( net-misc/memcached )
-	app-emulation/qemu
-	sys-fs/sysfsutils
-	acct-user/cinder
-	acct-group/cinder"
-# qemu is needed for image conversion
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES=""
-	if use tcp; then
-		CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
-	fi
-	if use rdma; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
-	fi
-	if use infiniband; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
-	fi
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
-		done
-	fi
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	# only used for docs
-	sed -i '/^sphinx-feature-classification/d' requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
-	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /etc/cinder
-	dodir /etc/cinder/rootwrap.d
-
-	for svc in api scheduler volume; do
-		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
-	done
-
-	insinto /etc/cinder
-	insopts -m0640 -o cinder -g cinder
-	doins "etc/cinder/api-httpd.conf"
-	doins "etc/cinder/logging_sample.conf"
-	doins "etc/cinder/rootwrap.conf"
-	doins "etc/cinder/api-paste.ini"
-	doins "etc/cinder/resource_filters.json"
-	newins "${DISTDIR}/cinder.conf.sample-${PV}" "cinder.conf.sample"
-	insinto /etc/cinder/rootwrap.d
-	doins "etc/cinder/rootwrap.d/volume.filters"
-
-	dodir /var/log/cinder
-	fowners cinder:cinder /var/log/cinder
-
-	#add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/cinder.sudoersd" cinder
-	# stupid python
-	rm -r "${ED}"/usr/etc
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "Cinder needs tgtd to be installed and running to work with iscsi"
-		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
-	fi
-}
diff --git a/sys-cluster/cinder/files/cinder.initd b/sys-cluster/cinder/files/cinder.initd
deleted file mode 100644
index b6a844a93c77..000000000000
--- a/sys-cluster/cinder/files/cinder.initd
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Starts ${SVCNAME} service for OpenStack"
-
-command=/usr/bin/${SVCNAME}
-command_background=yes
-command_args="--config-file /etc/cinder/cinder.conf --log-file ${CINDER_LOGDIR:-/var/log/cinder}/${SVCNAME}.log"
-command_user="${CINDER_USER:-cinder}"
-pidfile=/run/${SVCNAME}.pid
-required_files=/etc/cinder/cinder.conf
-retry="SIGTERM/30"
-
-depend() {
-	need net
-}
diff --git a/sys-cluster/cinder/files/cinder.sudoersd b/sys-cluster/cinder/files/cinder.sudoersd
deleted file mode 100644
index f44bab4a5778..000000000000
--- a/sys-cluster/cinder/files/cinder.sudoersd
+++ /dev/null
@@ -1,4 +0,0 @@
-Defaults:cinder !requiretty
-
-cinder ALL = (root) NOPASSWD: /usr/bin/cinder-rootwrap 
-
diff --git a/sys-cluster/cinder/metadata.xml b/sys-cluster/cinder/metadata.xml
deleted file mode 100644
index 826d615f68e7..000000000000
--- a/sys-cluster/cinder/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>prometheanfire@gentoo.org</email>
-    <name>Matthew Thode</name>
-  </maintainer>
-  <use>
-    <flag name="api">Installs the initscripts for the cinder api service</flag>
-    <flag name="iscsi">Allow using an iSCSI remote storage server as pool for disk image storage</flag>
-    <flag name="lvm">Allow using the Logical Volume Manager (<pkg>sys-fs/lvm2</pkg>) as pool for disk image storage</flag>
-    <flag name="memcached">Installs the memcached server</flag>
-    <flag name="rdma">Enable rdma storage backend support</flag>
-    <flag name="scheduler">Installs the initscripts for the cinder scheduler service</flag>
-    <flag name="tcp">Enables tcp support for the iscsi backend</flag>
-    <flag name="tgt">Enable tgt storage backend support</flag>
-    <flag name="volume">Installs the initscripts for the cinder volume service</flag>
-  </use>
-  <upstream>
-    <remote-id type="launchpad">cinder</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sys-cluster/ganglia-web/Manifest b/sys-cluster/ganglia-web/Manifest
index ba728b3bdc9d..a0190077f19b 100644
--- a/sys-cluster/ganglia-web/Manifest
+++ b/sys-cluster/ganglia-web/Manifest
@@ -1,3 +1,3 @@
 DIST ganglia-web-3.7.3.tar.gz 709356 BLAKE2B 8d5ac9eb8bd37ea040b08caa763797929acac3bd520c88af0e8fd3a9cfbc28d2a55e42d772ca1b6d5e87fe7dce6f4a6e7e15b836d06052c7e642885c727070cc SHA512 884b1ba168b8fe01aa865ae77df6995bb5a09a8b2d441189264283fc1c95b8a6fd0800488ad75e9c1cdd3694b9d6c1c33218ddad804ade2d6be948791b797a95
-EBUILD ganglia-web-3.7.3-r1.ebuild 1065 BLAKE2B a8087bf40205cd2b9fecbec4e8e97fb2a36ca15248d5d47754cb12ef0527d18b6563b4f0ee6bbfcf95f361644b3e2b1c26ebef8357d38252eb464ef7e4a300a4 SHA512 6ed8d9a4daeaf6cf0e11c9fd3fbb701561fd87a70ddaaa55ebce0d2f15338065971c4ec397e0a2953b59fde42a655dfeaa8fbb52ecbae5c5a072815a6e3fd2bc
+EBUILD ganglia-web-3.7.3-r2.ebuild 1068 BLAKE2B 4cfd37ff25d10a938f1a5ef1ad391e9c1d6708c4d584a6e5c82800e00063cc69129591944f1fe8b5f2479e39ca096232fcf65d1f9e12c3b9fcbf127227826fa4 SHA512 fc71fccf869cfb76c9534c3bf8bac0305dd71351a31989399551f5903a77eb4f016ff8454ecb12977f817d23ee28c0d70f329c4000352644a4fb98f950b1c317
 MISC metadata.xml 663 BLAKE2B 152cbfe1c070742e6618fcab10a75ded3d8c30e888e72c1d8d28a4745b3486d2041620cc64e31afdebaf9cb50adf2b8bec7e7ba0f719e1352a17e5444f4d061c SHA512 0f68c80efe81a8a6817d1417fa3c8f86cb3ba84ba490ceb0e9b50e33f10fb0612fc093a66487e5a9398021bb2dae4ebce3eabe3b73e3bdc05002900fc0106b8a
diff --git a/sys-cluster/ganglia-web/ganglia-web-3.7.3-r1.ebuild b/sys-cluster/ganglia-web/ganglia-web-3.7.3-r2.ebuild
index 764723fb60f9..319a295b9c57 100644
--- a/sys-cluster/ganglia-web/ganglia-web-3.7.3-r1.ebuild
+++ b/sys-cluster/ganglia-web/ganglia-web-3.7.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ RDEPEND="
 	${DEPEND}
 	${WEBAPP_DEPEND}
 	>=sys-cluster/ganglia-3.3.7[-minimal]
-	dev-lang/php:*[ctype,gd,json,xml]
+	dev-lang/php:*[ctype,gd,json(+),xml]
 	virtual/httpd-php
 	media-fonts/dejavu"
 
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 763e1cd15e74..8b3720d35849 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -12,10 +12,10 @@ DIST glusterfs-8.4.tar.gz 7833014 BLAKE2B c67f510c655465e9fbecaa7f391531543e37a2
 DIST glusterfs-8.5.tar.gz 7873397 BLAKE2B 6ababf15fda216c9a47c05859f7123847d711dd5a12e3ec2c5dcf8475f35830c9a32f7b21ad763ab1be59b06f1d93f83acc0cbb8f7635456a3638be73b162aa4 SHA512 e256141a76deb9a255be31422d76b0c81aad4a7e5b166d2be90a79d340ceb811cbff11f469166ef7582f40f58f47fb056aa05aafd4b35f094bf9c21a5c08f3bb
 DIST glusterfs-9.1.tar.gz 8206207 BLAKE2B dea099eb1d366704010247964c24de404fb09c00a375dde4af30a2af836d3b35689fab91a75268aa01dba45860eb50a6e0572913c059e53fb5799d2302c2f005 SHA512 2c26813f12fed7a0640cc470badc2b83f156b660ef475487a689dca6c3fa407192f4959aeaf7a981969a079cf5d2c7aace85ff818ea6133d5a085d90d226e1da
 DIST glusterfs-9.2.tar.gz 8212980 BLAKE2B 7fb42186c5d309c357f72e3037fc09d8b15f32770d74173dd4779bab91056d1ceb78a4a651fec2018faf1597357576d41593e9d7b04cf9af7f4742301b284b01 SHA512 34a0a1745029e2fad3c8fc6a044b4e4645f8cf11eddc3c8c8e94cce9733449248c577ce6066bc49010a65121d991daf67766393fe513ac694082f0efa1d4ef95
-EBUILD glusterfs-7.9.ebuild 5879 BLAKE2B 3ce9d8f2b643ebae7c6d611985a67b2d1a033bce3a4a8dee15266fefc862cf4f99914420616b27770e2cb650b1a031e9592d6f526f0f158b804b66076390ea17 SHA512 09a332a7215f08148a512dfbc4dae9d17a812ceb75ac02dc84d3c59b8b6b157ee0a3a96c6a858d9dd3963e5c17c216d9c33d1e67ab67f9bc93e12378635fdbbf
-EBUILD glusterfs-8.3.ebuild 5393 BLAKE2B 355898682abe9959bab05d84f82965ce6becb4552291fb6ae82b67c6b7116f7514d75f963da529cf98b0f4a19f92cd8eaee4b1772fdf09cf60d1f87ba17b9fde SHA512 fd7b898ffa4fb6d340599a34a005a64a237aa7184ba76fce052d4e94904c582ae00f031f8ead2b143d4e96e0bee991db70405795cd54ffdbcaef7f8469c6a188
-EBUILD glusterfs-8.4.ebuild 5393 BLAKE2B 355898682abe9959bab05d84f82965ce6becb4552291fb6ae82b67c6b7116f7514d75f963da529cf98b0f4a19f92cd8eaee4b1772fdf09cf60d1f87ba17b9fde SHA512 fd7b898ffa4fb6d340599a34a005a64a237aa7184ba76fce052d4e94904c582ae00f031f8ead2b143d4e96e0bee991db70405795cd54ffdbcaef7f8469c6a188
-EBUILD glusterfs-8.5.ebuild 5436 BLAKE2B 01f8f50b06fbfb310d4896db8dd4740ca004f6f6aa23e8f1ab45232366743a18098f5b4a6192fcc610bc25a9c5d86cb4524e4238aef31c07a32a79ce0432eba3 SHA512 3f735a25e9e300dc31bff6eb004393a0172943c6279a9004c2698f3c3cacee3c523521541b0c6ddb909e499ebc5d1797b8595e2433e3d8023331d69c60b7191c
-EBUILD glusterfs-9.1.ebuild 5418 BLAKE2B a5c1bf500d67d35cbf68df34cf96f441f385e16c7a2c04a3834050cfdaf6f9039ec6b98eb5c645af45888d8c27f12266a9976f79cf47d1025326c6c9cf0f8af5 SHA512 d020ae1f6981b5e1bfff52be7c63d9b1a57947e05695710ff125d229d2961148bb9d58a55928b45591302f3fe6c1ed9d61ecb7b52b4b1d2906eaab467f957275
-EBUILD glusterfs-9.2.ebuild 5475 BLAKE2B fede47057496f728c837b1ec65235b922b7c44e9b8e89ef444f72a9b027abe31ae3d7c46cea60daaee2fe6157f8a9989d3baf244d164548eb638f846def06657 SHA512 c8af2c524b82a65a0f3cc172323e6abecbcfcc5a391682993697a72227993ef7dd348871a9be1d048ed5473a7be8f5b6e091bcb3f75eb098596fb1ca40c48ac6
+EBUILD glusterfs-7.9-r1.ebuild 5882 BLAKE2B d4f8f6d53c25540c32af441d912fa39db975ac5be3e9edd5852c8bd6ef515999acfb19c3a5732d82151c3daaa089f772c5e2f4c72a4ee1bb70896097a9a858cc SHA512 3e86af7bc8355a114567e5561c290a0856fdbc88ea8e74666169d4e82d4d98fccdd91959003c7bf17f97bf66d89325ad9cec25d098a4557c7fcacf52c73899c9
+EBUILD glusterfs-8.3-r1.ebuild 5396 BLAKE2B c1fdc46069a53be15ba918d3e4ed8915610ac9d40f0d4cebba0c1f76df6fd2fbb1e3604bd7f1f4965a1dfff4d2744d188ba00604d745a3c4f4c800d895905f3d SHA512 b3cb370a53d9ea89327f6401777b68ece2ea5f6bf2aaffa67d745e53fef4d981636483553d04cb3bf63b1c53601765dfa7b71de372b6992bf2b0786755d565d0
+EBUILD glusterfs-8.4-r1.ebuild 5396 BLAKE2B c1fdc46069a53be15ba918d3e4ed8915610ac9d40f0d4cebba0c1f76df6fd2fbb1e3604bd7f1f4965a1dfff4d2744d188ba00604d745a3c4f4c800d895905f3d SHA512 b3cb370a53d9ea89327f6401777b68ece2ea5f6bf2aaffa67d745e53fef4d981636483553d04cb3bf63b1c53601765dfa7b71de372b6992bf2b0786755d565d0
+EBUILD glusterfs-8.5-r1.ebuild 5439 BLAKE2B 0460414bc4d2b072b4aa6204d194b8d8982fd590c76f26d64a68c3cd949b7f21ae643dfe7dec81753e6b50f1997f6896139c51bd4fcfb050bdfacd1dad95335e SHA512 0309259e9b55d0090262cbf231ae3c16713591355909f4f8b16f4e99e0256d93a9697bf1e41abf576898c39a17aa2952032cdd1235ae6dc7ab63c8572fa64996
+EBUILD glusterfs-9.1-r1.ebuild 5421 BLAKE2B 928f2dd64499dbe89becf8b78fb4d2e1f403aca8390c7b1e33b29c61350f4bcb7366078a8023990202f9dd2053429f12b10cd1e73486478b00a8b45e2d0239cd SHA512 b722622e81af6476112839003428c6204fc8347a1080a195cbbe20dfb5a78def2a1ddd1586c112417ae16610d3e6bb4bee0f0bed883f77e8a58b855cd37ec19c
+EBUILD glusterfs-9.2-r1.ebuild 5478 BLAKE2B 04855f5bc4b079c8e96c9678952a49e02f4b2ea074126289aca2bed5cf9db6e3ddba9697fe46eb9363570084d019231893fabe92fe0d8a2a06c7680b0c7b2414 SHA512 86c7540f00d02103ccc3ea5d8b20ad0a9136a3e2784ad7d6e8751bce5d1f47774d5748cf21ae8d18f9e3a051678225b0f8472d46d11ae1f6b5a126583f85b43c
 MISC metadata.xml 1516 BLAKE2B dc32b16a9cc12174d5cf6a82f8d45920392d43545a4ed9be1c6a0ec3bc50b7c51a647b049c1b74971e95a4de949c9205ad168bfc8f074ca4c535d2999b917d3a SHA512 04542d21102f1722d8f82e498f38e91316932d96f0a05eec74180e4ad133b83fd26d58d3591d2906995072c184822d7ed16357d741b7de99a0c7ff7571da6a08
diff --git a/sys-cluster/glusterfs/glusterfs-7.9.ebuild b/sys-cluster/glusterfs/glusterfs-7.9-r1.ebuild
index 606d9b72d06e..c06064e3dd84 100644
--- a/sys-cluster/glusterfs/glusterfs-7.9.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-7.9-r1.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 	!elibc_glibc? ( sys-libs/argp-standalone )
 	libtirpc? ( net-libs/libtirpc:= )
 	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-	dev-libs/openssl:=[-bindist]
+	dev-libs/openssl:=[-bindist(-)]
 "
 DEPEND="
 	${RDEPEND}
diff --git a/sys-cluster/glusterfs/glusterfs-8.3.ebuild b/sys-cluster/glusterfs/glusterfs-8.3-r1.ebuild
index eb0826d32139..c6fc8ce35bc6 100644
--- a/sys-cluster/glusterfs/glusterfs-8.3.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-8.3-r1.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
 	!elibc_glibc? ( sys-libs/argp-standalone )
 	libtirpc? ( net-libs/libtirpc:= )
 	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-	dev-libs/openssl:=[-bindist]
+	dev-libs/openssl:=[-bindist(-)]
 "
 DEPEND="
 	${RDEPEND}
diff --git a/sys-cluster/glusterfs/glusterfs-8.4.ebuild b/sys-cluster/glusterfs/glusterfs-8.4-r1.ebuild
index eb0826d32139..c6fc8ce35bc6 100644
--- a/sys-cluster/glusterfs/glusterfs-8.4.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-8.4-r1.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
 	!elibc_glibc? ( sys-libs/argp-standalone )
 	libtirpc? ( net-libs/libtirpc:= )
 	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-	dev-libs/openssl:=[-bindist]
+	dev-libs/openssl:=[-bindist(-)]
 "
 DEPEND="
 	${RDEPEND}
diff --git a/sys-cluster/glusterfs/glusterfs-8.5.ebuild b/sys-cluster/glusterfs/glusterfs-8.5-r1.ebuild
index 2a8426c43e14..147d96407341 100644
--- a/sys-cluster/glusterfs/glusterfs-8.5.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-8.5-r1.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
 	!elibc_glibc? ( sys-libs/argp-standalone )
 	libtirpc? ( net-libs/libtirpc:= )
 	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-	dev-libs/openssl:=[-bindist]
+	dev-libs/openssl:=[-bindist(-)]
 "
 DEPEND="
 	${RDEPEND}
diff --git a/sys-cluster/glusterfs/glusterfs-9.1.ebuild b/sys-cluster/glusterfs/glusterfs-9.1-r1.ebuild
index 1cd066e8303d..8f52fcdca644 100644
--- a/sys-cluster/glusterfs/glusterfs-9.1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-9.1-r1.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 	!elibc_glibc? ( sys-libs/argp-standalone )
 	libtirpc? ( net-libs/libtirpc:= )
 	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-	dev-libs/openssl:=[-bindist]
+	dev-libs/openssl:=[-bindist(-)]
 "
 DEPEND="
 	${RDEPEND}
diff --git a/sys-cluster/glusterfs/glusterfs-9.2.ebuild b/sys-cluster/glusterfs/glusterfs-9.2-r1.ebuild
index de88d7560193..153b9cf51ac0 100644
--- a/sys-cluster/glusterfs/glusterfs-9.2.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-9.2-r1.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 	!elibc_glibc? ( sys-libs/argp-standalone )
 	libtirpc? ( net-libs/libtirpc:= )
 	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-	dev-libs/openssl:=[-bindist]
+	dev-libs/openssl:=[-bindist(-)]
 "
 DEPEND="
 	${RDEPEND}
diff --git a/sys-cluster/gmqtt/Manifest b/sys-cluster/gmqtt/Manifest
index 9f7c637a985c..ac4a4d0834aa 100644
--- a/sys-cluster/gmqtt/Manifest
+++ b/sys-cluster/gmqtt/Manifest
@@ -250,8 +250,8 @@ DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062
 DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod 29 BLAKE2B 8502924d37d2cb283d252008e9727d55269eace4ec1b9e049294563a1d92b777e7333c946bc69c7f47167a36482c1c2084330dc68e9c33fdcb57113ac55e0ba7 SHA512 787ef0a1ab48d9faf632390dd7a89475a11a3c11d6b557cb9228111dfa7af591deb6a102cff6d6c981ab717f29bcfca64b26fcfd2cc4d213f4dac0ed24c6d625
 DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
 DIST github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod 40 BLAKE2B 844d63d9c10c55eb74504d88d5e6e85641f2c4bdbbc9b4f6728cd6b1e750d1eb333e91b6eadac635a80abf328c9423fa106b18337e89dc592876cd3f04a803e2 SHA512 daffe8f4148becee3a32c90ad21454cd48255409f3edff8681ea2074623c8aa02cbb4620b7ba52aabe4ac3c24a5f256b56fd71de1da45dcd7e4e8376699a422a
-DIST gmqtt-0.3.0.tar.gz 221559 BLAKE2B ed5eb2b8d90d600c21b40d14af60d5dac7d6d6ac781cb47697144061fbf699bc2b5ae636ec95da69904ff5bdb8f9e691c840555399ac9039b36af41d44b17081 SHA512 81d95d4531b2e16f9c2a984e033bd01e036b59f45098f69b0f67d0a7fd8ae0513ee7442f9fcfaf5728a01bc74e901589cd18f6e65b8f8e2e8d55a23dac27183e
 DIST gmqtt-0.3.1.tar.gz 222161 BLAKE2B 90ab83d8aa684029c3b1a20afd636155f391a568ba24536e72b44c7abdb548467bea617efdafa2d3623f032de89c81bddc679b9cef7626d6c56acd3aa2026d5e SHA512 b35a76e20821079c054c38792f09bedab5faef94851368953f4be55cd285806dec3efd4a63dafcc34601a8aa8e100a03a930cbec30484a09317f7f02da0dfdb2
+DIST gmqtt-0.3.2.tar.gz 224276 BLAKE2B 2d314b950525cd276c3b356ce87f59bb61680159da25d993906fcae6154d809c0697bbda196d862333841e315506a1e7fcfe4a01db582a806119450aa701fd14 SHA512 78124d256d88f9a6df21312db0d113301df24361081fe23c7742f0adac97c1cb80a57c985a270d11e3b28fec7db487f1c9ce540bbed6cfdf22489da73820dfc3
 DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
 DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.zip 111427 BLAKE2B 62d61989ac2e7f9b83238e9dbc3027600235213fb39846ce0bb45c84431d80fc3d570d27fba6538668e5a91a8e8331e4bbb081e9106a4409a191209be122fa7a SHA512 f4c1b9f826415b753235e6f71dfb0c2e25ae4dab4acfd632a6ace744e437ae0df9d86dafc79569c6184895e5398108a098a5e5eda57589046316ebc767571cdc
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
@@ -393,6 +393,6 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLA
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.zip 506912 BLAKE2B a38cb31fd8df49dae4ff187e67704b5586ba78a0dcfe5afa3b820f0ac80f7e12ba4bdb705caa97c6be85407fe97599d1244d2f56f0e9e36554ba43289d9f21d8 SHA512 3285ab90762ee6b771c95e1c842ab308f04ac366ddfa693040c49d8951bb01db33994eb69c2c9dfd6ab2b379b29cbfe31558ca6b6aafe3feea1e693b2a36d0cb
-EBUILD gmqtt-0.3.0.ebuild 20897 BLAKE2B d946ada16475bd10c03ef81ce5a9fa15c3e9a24dc17bfed3351adaf29cad96acd5beb38ecd9297f6e15228290affdb3f1f140926eac5952ca4e4ea59b7dd0487 SHA512 69fd8ca5469a80d4eea7e0ed1108fe9c13c6228607bddc162d9877f6f93162c496d3aa92b027702a71ecbffe84c3e66f1fc5e4d266215d64a8aa2230cb1343bc
 EBUILD gmqtt-0.3.1.ebuild 20897 BLAKE2B d946ada16475bd10c03ef81ce5a9fa15c3e9a24dc17bfed3351adaf29cad96acd5beb38ecd9297f6e15228290affdb3f1f140926eac5952ca4e4ea59b7dd0487 SHA512 69fd8ca5469a80d4eea7e0ed1108fe9c13c6228607bddc162d9877f6f93162c496d3aa92b027702a71ecbffe84c3e66f1fc5e4d266215d64a8aa2230cb1343bc
+EBUILD gmqtt-0.3.2.ebuild 20897 BLAKE2B d946ada16475bd10c03ef81ce5a9fa15c3e9a24dc17bfed3351adaf29cad96acd5beb38ecd9297f6e15228290affdb3f1f140926eac5952ca4e4ea59b7dd0487 SHA512 69fd8ca5469a80d4eea7e0ed1108fe9c13c6228607bddc162d9877f6f93162c496d3aa92b027702a71ecbffe84c3e66f1fc5e4d266215d64a8aa2230cb1343bc
 MISC metadata.xml 323 BLAKE2B 2c1e54583d9b6f6acb6ba40ef00bb2e96d3b3205ae48aa2d75b3b772719b17a532ca454085b64b63d73cfb3d1754090a9bf934194f3830b94fc6942c2c728621 SHA512 6046baaf9a29f5093a3ab32c4c0744fc64735130829636057e3623dccd247448f7d13d8cf0f7d8143ecae5c0c6d7d7e5a0c9a9a9c7311ceacfcbe6eebfb4ab21
diff --git a/sys-cluster/gmqtt/gmqtt-0.3.0.ebuild b/sys-cluster/gmqtt/gmqtt-0.3.2.ebuild
index 5163f6258531..5163f6258531 100644
--- a/sys-cluster/gmqtt/gmqtt-0.3.0.ebuild
+++ b/sys-cluster/gmqtt/gmqtt-0.3.2.ebuild
diff --git a/sys-cluster/heat/Manifest b/sys-cluster/heat/Manifest
deleted file mode 100644
index 999b90ec92d1..000000000000
--- a/sys-cluster/heat/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX heat.initd 463 BLAKE2B c855fe1b4fe73fe93874add659c49133d1f83653acbb37e7ab9927641883196abb620f53e6b31f5cc39e7c59875d4af29b3d5b14eb2a1d67556e7fbf129c7705 SHA512 d6685d7751dfd6ece714c2b96c2d07419f13556f6f3d065a108943cb3bc90c4a51b66313b3e53db4f47f0577c411e859c89984d4764462857eb1ca1990ca847c
-DIST heat.conf.sample-15.0.0 77233 BLAKE2B 4c15a617a667aa72af08038d90a3935e68298fd240a2aef6fd877843a1c9a149315cda2a6c322762d57edb8f9c189407fe71ee2f30fde57aa40a6d7f8c132249 SHA512 4d7a31c171849451475e1fcfb4961051ad88472ab5e13c2e8809386889f00a73200d2f6e7155aa59d1bd00eb28e43e94987e7bc1e496d1c9f2ed003f0a8d96e2
-DIST heat.conf.sample-2020.2.9999 77233 BLAKE2B 4c15a617a667aa72af08038d90a3935e68298fd240a2aef6fd877843a1c9a149315cda2a6c322762d57edb8f9c189407fe71ee2f30fde57aa40a6d7f8c132249 SHA512 4d7a31c171849451475e1fcfb4961051ad88472ab5e13c2e8809386889f00a73200d2f6e7155aa59d1bd00eb28e43e94987e7bc1e496d1c9f2ed003f0a8d96e2
-DIST openstack-heat-15.0.0.tar.gz 2391827 BLAKE2B 50e7881a4114ba2ed6ba9067a7879382b5b3d61e2db8f113190a6194f8d34d1b06734a1e3b532805cfad23999ed233ea9c8fc369e1b269828653f346e28ddff7 SHA512 dd17f5cabadd90ab88adea3782a29802b0b4467c46c40dbd41ce68c08e2425b2eec362833b79cb739e16e6d5b137256cc4955afd5bd143e3a2e613d3b428dd5d
-EBUILD heat-15.0.0.ebuild 6482 BLAKE2B 0f01840cc0d43a488e1f43d473be48685984bec01ec4026d1be6a4e22ad727d46706ee363fb86de732d7e5fee0a5a73e2cae1f57ca0992becec76e76b8eeac8f SHA512 6cc68c41baa317937695545f3a38913d4fbe0703767d8e513c442b4a37c5e54cb31ef841ca4d57677dfd94886b85202697c723e7d263c9ee0bfd8b0129b61ac1
-EBUILD heat-2020.2.9999.ebuild 6484 BLAKE2B 8192052f869029d535616851aff83817ff4060f0890ac5606eede9a0f40670314c268f825c8b3020f7c76352f61bf26dc57d11d809b196ce9f04b8c440633289 SHA512 04f4d575db61fb1a70aa284b62e006b577bbe96e79e83e54957d831874518818eb27067d20d9f88c03ad2a4e57876996ec79d64d8bcca07a803079a6467d5e2d
-MISC metadata.xml 631 BLAKE2B 566d35b5533177a6d8b0ef428c9bd1a320aace6b43e186139c4b53cde224c1bf488340be8b6bcac14bf6c7a51212952dc13940d34edc38e24d7d2fbea5ce0c68 SHA512 44e741975cc462454bfd08fce461b019c5ef141997f272796052f7f3aa7297646304cdc7d75a2ed01319bcba753475ba5861306c3ac74f3d97218bce60d42429
diff --git a/sys-cluster/heat/files/heat.initd b/sys-cluster/heat/files/heat.initd
deleted file mode 100644
index 295879ebea79..000000000000
--- a/sys-cluster/heat/files/heat.initd
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Starts ${SVCNAME} service for OpenStack"
-
-command=/usr/bin/${SVCNAME}
-command_user="${HEAT_USER:-heat}"
-command_background=yes
-command_args="--config-file /etc/heat/heat.conf --log-file ${HEAT_LOGDIR:-/var/log/heat}/${SVCNAME}.log"
-pidfile=/run/${SVCNAME}.pid
-required_files=/etc/heat/heat.conf
-
-depend() {
-    need net 
-}
diff --git a/sys-cluster/heat/heat-15.0.0.ebuild b/sys-cluster/heat/heat-15.0.0.ebuild
deleted file mode 100644
index 8f85d1f90391..000000000000
--- a/sys-cluster/heat/heat-15.0.0.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2021 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 CloudFormation-compatible openstack-native cloud orchestration engine."
-HOMEPAGE="https://launchpad.net/heat"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.victoria -> heat.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/heat.git"
-	EGIT_BRANCH="stable/victoria"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.victoria -> heat.conf.sample-${PV}
-		https://tarballs.openstack.org/${PN}/openstack-${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-	S="${WORKDIR}/openstack-${P}"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+mysql +memcached postgres sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND="
-	>=dev-python/pbr-5.4.0[${PYTHON_USEDEP}]
-	app-admin/sudo
-"
-RDEPEND="
-	>=dev-python/pbr-5.4.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/croniter-0.3.4[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.2.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.20.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/neutron-lib-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.11.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-6.0.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-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-2.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.37.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/aodhclient-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}]
-	>=dev-python/python-blazarclient-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-heatclient-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/python-ironicclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-magnumclient-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-manilaclient-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/python-mistralclient-3.1.0[${PYTHON_USEDEP}]
-	!~dev-python/python-mistralclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-monascaclient-1.12.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.14.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-octaviaclient-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/python-saharaclient-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-troveclient-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-vitrageclient-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-zaqarclient-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-zunclient-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.13.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-6.1.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${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/sqlalchemy-migrate-0.13.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/yaql-1.1.3[${PYTHON_USEDEP}]
-	acct-user/heat
-	acct-group/heat"
-
-PATCHES=(
-)
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	diropts -m0750 -o heat -g heat
-	keepdir /etc/heat
-	dodir /etc/heat/environment.d
-	dodir /etc/heat/templates
-
-	for svc in api api-cfn engine; do
-		newinitd "${FILESDIR}/heat.initd" heat-${svc}
-	done
-
-	insinto /etc/heat
-	insopts -m0640 -o heat -g heat
-	newins "${DISTDIR}/heat.conf.sample-${PV}" "heat.conf.sample"
-	doins "etc/heat/api-paste.ini"
-	insinto /etc/heat/templates
-	doins "etc/heat/templates/"*
-	insinto /etc/heat/environment.d
-	doins "etc/heat/environment.d/default.yaml"
-
-	dodir /var/log/heat
-	fowners heat:heat /var/log/heat
-	rm -r "${ED}"/usr/etc
-}
diff --git a/sys-cluster/heat/heat-2020.2.9999.ebuild b/sys-cluster/heat/heat-2020.2.9999.ebuild
deleted file mode 100644
index 4600c9c81943..000000000000
--- a/sys-cluster/heat/heat-2020.2.9999.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2021 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 CloudFormation-compatible openstack-native cloud orchestration engine."
-HOMEPAGE="https://launchpad.net/heat"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.victoria -> heat.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/heat.git"
-	EGIT_BRANCH="stable/victoria"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.victoria -> heat.conf.sample-${PV}
-		https://tarballs.openstack.org/${PN}/openstack-${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	S="${WORKDIR}/openstack-${P}"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+mysql +memcached postgres sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND="
-	>=dev-python/pbr-5.4.0[${PYTHON_USEDEP}]
-	app-admin/sudo
-"
-RDEPEND="
-	>=dev-python/pbr-5.4.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/croniter-0.3.4[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.2.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.20.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/neutron-lib-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.11.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-6.0.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-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-2.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.37.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/aodhclient-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}]
-	>=dev-python/python-blazarclient-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-heatclient-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/python-ironicclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-magnumclient-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-manilaclient-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/python-mistralclient-3.1.0[${PYTHON_USEDEP}]
-	!~dev-python/python-mistralclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-monascaclient-1.12.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.14.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-octaviaclient-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/python-saharaclient-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-troveclient-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-vitrageclient-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-zaqarclient-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-zunclient-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.13.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-6.1.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${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/sqlalchemy-migrate-0.13.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/yaql-1.1.3[${PYTHON_USEDEP}]
-	acct-user/heat
-	acct-group/heat"
-
-PATCHES=(
-)
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	diropts -m0750 -o heat -g heat
-	keepdir /etc/heat
-	dodir /etc/heat/environment.d
-	dodir /etc/heat/templates
-
-	for svc in api api-cfn engine; do
-		newinitd "${FILESDIR}/heat.initd" heat-${svc}
-	done
-
-	insinto /etc/heat
-	insopts -m0640 -o heat -g heat
-	newins "${DISTDIR}/heat.conf.sample-${PV}" "heat.conf.sample"
-	doins "etc/heat/api-paste.ini"
-	insinto /etc/heat/templates
-	doins "etc/heat/templates/"*
-	insinto /etc/heat/environment.d
-	doins "etc/heat/environment.d/default.yaml"
-
-	dodir /var/log/heat
-	fowners heat:heat /var/log/heat
-	rm -r "${ED}"/usr/etc
-}
diff --git a/sys-cluster/heat/metadata.xml b/sys-cluster/heat/metadata.xml
deleted file mode 100644
index f8a3eeab0b9a..000000000000
--- a/sys-cluster/heat/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<longdescription lang="en">
-		Heat is a service to orchestrate multiple composite cloud applications using
-		templates, through both an OpenStack-native REST API and a
-		CloudFormation-compatible Query API.
-	</longdescription>
-	<use>
-		<flag name="memcached">Installs the memcached server</flag>
-	</use>
-	<upstream>
-		<remote-id type="launchpad">heat</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
deleted file mode 100644
index 642ce5d1d409..000000000000
--- a/sys-cluster/neutron/Manifest
+++ /dev/null
@@ -1,20 +0,0 @@
-AUX neutron-dhcp-agent.confd 75 BLAKE2B edeefcfbed76388e4fcbbbe0454ca2d75c2f72cd0f347377470ab3884110398bf8fbef3c3da62a3b100eba27a3900db468fa9b0b71f3db523b6e2fe6e74a9668 SHA512 94cf300c9a9d0275e4fcab4ffdb7e29ca26b73c120d6ff683b48ea0e9c21e46123289522aedd295e4d5d28307133b50084541a90a48db456802d675eed6c2d3e
-AUX neutron-l3-agent.confd 73 BLAKE2B 0d5e11e1222fe06757b5cd0926674aae47d59a340be07d8fc4e9353d94392ccc80d2f2aa172b5ffb09ea7fddf4fffb59fe25b9d84db2460d7f3c1d2f924260d5 SHA512 4a902c5621abc124424bdad97de8959f63f7c846b4c7b9b3ccaab5522ff3e6938acf748df269980484228d4fc13d2f1e3e3670619207e3c88ea5dd5373699e0a
-AUX neutron-linuxbridge-agent.confd 133 BLAKE2B 3df5685ee81f177d3c6ff052db67a3f79e9d477b695b66b2000826413a12a664f8f3d7b49f9282e1dd6887e964c372c723a603c6d58f93191466005c465255bd SHA512 d87a21d307dbfcdadaf9655b194a9646dad26a3b138bb02977dcb372cf0a7585ca69fa4bd7085e63b4119daa25f5db314ac4d62839a4d7d106a85a795ac3d1d4
-AUX neutron-metadata-agent.confd 79 BLAKE2B 24cd05b5e8bc4dc8eb85401f95454e4cd0ee939fb89151e7d3dfc4dc6db5e917b699f9a6d518cd6a3528df0b9e88a826a03068a8150e67e33cc0cda50a215424 SHA512 a7a4af56141f1528f7f9ca222f88d400f7a5f6cba392a603121974f6429ecdb925996b1bd6631b589df70464f910deed688e287668ccb1d61fe1d6aa641272a1
-AUX neutron-openvswitch-agent.confd 142 BLAKE2B 32c521f734854608173a41625bc037eed86bbaa741e3f891f84e22d43a365422a9b44cbd787c71f8faa66c98ce5279087c419f197d54919a98e47268f5b21aa9 SHA512 277bc5fe0a55bfc5e6f95ddabee76340a7725d156ca1100bc0dbc6245929322e537129628b5cef353cfe689d14330a7c8e0cd9aff894f7d0b093d909c83fdd87
-AUX neutron-server.confd 70 BLAKE2B 88309872ce864e4dfa9072c1472bd6f1e8116f71106ff7e055f6386563ef1077b41f538a72e183ae00e700262d2bcf82434077f0b7e5753389077be3f276b178 SHA512 79f1a40486c37b2c3486b4ef015864f6b20ee89b05d788ce6ade8af934e2c160da9e0495d22e941a717072c1d8ca3b77963a3ec06f3ec25a3f8af8b24a4e40a0
-AUX neutron.initd 530 BLAKE2B 48900bdde5770a0b0db90490d6ae8541dafc96e3fa2aa1c8d75eab5f547be35fa5adb792db8960f71a98bbeb71d56b29e5f5166a47735ebe85804019aa4e1f11 SHA512 c9c7386ae8d97205859f02edb0c7d601059af78def3f232f87e676131c5e6fcdb6e880ccee5b1b15397b1dffe83446421145c90ed448f5e9d55994efd1629f92
-AUX neutron.sudoersd 117 BLAKE2B 30e903fd3d681b779ad7e4758b56bfd78df6165ae030f0a5017dccd1873570db450efd3e7b232f77d6d2e3fcb81cb64d9d44901802310ebe2d88f882d334acda SHA512 143f8a1faa7650bc66b2566d0bd62f71eb743231b9efc4c7df265e53d664418b23182e3f271b86845ed76c537b7f60157e87af59413cf659379f367924d14366
-DIST neutron-17.1.1.tar.gz 12925243 BLAKE2B f95068d1a85a508e447fc5de28ef6555252fdfe3deb8b0dd94a2e20f28663dc610bbb5e32fb69e0d80fbe9917c387b0c095fb43370ddfe2bbb05327553cb8e58 SHA512 cd707d4adaa6a6b606940370606fcef61a35af0d1f1108f24891d2f88611f4f2812c061d3b7a9540d4b6df882615a9366d39273184a791a911775e7c9f4402b8
-DIST neutron-17.1.2.tar.gz 12930231 BLAKE2B 865e849fb811b3abf8b589ea5752c9305962ed24bcd69a4998425a1d56abcadd87f224e883269b780655f252d40dd050805782080385d94163b5488ffbdbf52a SHA512 1320c96ba5b3b2de5feb313b564baa7308b3b964c628afa57e60ed8f541549b11ddaa0ea1e4025dc0265ad1d962f0961fdc93924fcdde98c9b7c3c23728a3ebd
-DIST neutron-configs-17.1.1.tar.gz 30314 BLAKE2B 885d00259fde0200f6a52d91b18e884012c04cb06e5e4ba6c72b77fbb0a8df30d50efd6db16faa009328eac9b7c5fb31854feb81595a542b4ac5d8172c8056b6 SHA512 cf85a563c417e1fb01f7d329c7021c20782fe67f64c5dfd542deed07e09d6a717e472976df8f1f4c3bb4a6a10e8d8b8300f18e1a3759358b3db12f77dad7bd5b
-DIST neutron-configs-17.1.2.tar.gz 30314 BLAKE2B 885d00259fde0200f6a52d91b18e884012c04cb06e5e4ba6c72b77fbb0a8df30d50efd6db16faa009328eac9b7c5fb31854feb81595a542b4ac5d8172c8056b6 SHA512 cf85a563c417e1fb01f7d329c7021c20782fe67f64c5dfd542deed07e09d6a717e472976df8f1f4c3bb4a6a10e8d8b8300f18e1a3759358b3db12f77dad7bd5b
-DIST neutron-configs-2020.2.9999.tar.gz 30314 BLAKE2B 885d00259fde0200f6a52d91b18e884012c04cb06e5e4ba6c72b77fbb0a8df30d50efd6db16faa009328eac9b7c5fb31854feb81595a542b4ac5d8172c8056b6 SHA512 cf85a563c417e1fb01f7d329c7021c20782fe67f64c5dfd542deed07e09d6a717e472976df8f1f4c3bb4a6a10e8d8b8300f18e1a3759358b3db12f77dad7bd5b
-DIST neutron-ml2-plugins-17.1.1.tar.gz 9011 BLAKE2B d9f8cb4d26699ca44a4cf4cd422bd88b9bb5a2138a80fec469021491d87b158502801c2ce79316f52a900877f7706dc93c2a5a5a33c868918effeaa6b65a7931 SHA512 a225310f0f54991a079d515512189b3c08de22c5b13d58960ef24498401fc54b0878ed879d895e696b789e703a0bb3f4a184eccbbfb9ac9fe9447086cb952b37
-DIST neutron-ml2-plugins-17.1.2.tar.gz 9011 BLAKE2B d9f8cb4d26699ca44a4cf4cd422bd88b9bb5a2138a80fec469021491d87b158502801c2ce79316f52a900877f7706dc93c2a5a5a33c868918effeaa6b65a7931 SHA512 a225310f0f54991a079d515512189b3c08de22c5b13d58960ef24498401fc54b0878ed879d895e696b789e703a0bb3f4a184eccbbfb9ac9fe9447086cb952b37
-DIST neutron-ml2-plugins-2020.2.9999.tar.gz 9011 BLAKE2B d9f8cb4d26699ca44a4cf4cd422bd88b9bb5a2138a80fec469021491d87b158502801c2ce79316f52a900877f7706dc93c2a5a5a33c868918effeaa6b65a7931 SHA512 a225310f0f54991a079d515512189b3c08de22c5b13d58960ef24498401fc54b0878ed879d895e696b789e703a0bb3f4a184eccbbfb9ac9fe9447086cb952b37
-EBUILD neutron-17.1.1.ebuild 8313 BLAKE2B c9d35e0376d141e9f7b183cac8585f922303f0d203173b96aeacb6cdc278441ad444d1a9b75fd093ba10d9d140691bd4c46b20091b2754051ccce4a79a938e7b SHA512 fe2f179c4505ee8794991f047521cde5cefb8058cf15ec1c45429ae16ad91ae712028e05a741225bbeeb053544b6abd4c304f2bd2d3f0a3e5546f8c9210d3320
-EBUILD neutron-17.1.2.ebuild 8315 BLAKE2B fa52a494ae8ac76d7fcb824243c8bad91afe71c109ef4c45c6126a0a08b81553c418d2531688b1dc2f5f2ca0d5a7318b21b8271c507fcac7088baaf4b79d6ef3 SHA512 c25ab2bb8f98080a2a7d29e509d09a9a2bf644ccf0ad9cd828ab5d4c4a887538da57eb884b0c3a5a3f1837998e8bdf050a1a7c1f0ebab0100f20d2539ebc3822
-EBUILD neutron-2020.2.9999.ebuild 8312 BLAKE2B 3f0f0cf2650fb39a72413d83572080c3183062d2eb741a5424252795c80a1e8a9d00e285fbbb44c20cebc3256c4bb03f0554009a47d6e9eb4cf113abf9109f39 SHA512 0e9f51194d66df4bff15e2b321851cf9df1de88088fac830e4fdea466a12dd64f3979da37772cc57ab7540c6d5f9591fe741800889ccd47fa1048af1a8b812bb
-MISC metadata.xml 1619 BLAKE2B 462b212e519778c98632ec3230e5f0d1a006a229edef034ed0d462559cb0c1763dafb997198241cca4f9c7cb056ebada214c82745dce35b269c2c27d554145a4 SHA512 8f9075719eeec3c3a939e8a1b05a5604bc1e801b227feb5775bfa9f2812e67c41165dc0b2b377685645d9fd9988523356ac77a8db8e73139ab3f035ae59b70ce
diff --git a/sys-cluster/neutron/files/neutron-dhcp-agent.confd b/sys-cluster/neutron/files/neutron-dhcp-agent.confd
deleted file mode 100644
index 75ddba5ebb7a..000000000000
--- a/sys-cluster/neutron/files/neutron-dhcp-agent.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-NEUTRON_CONFS=("/etc/neutron/neutron.conf" "/etc/neutron/dhcp_agent.ini")
-
diff --git a/sys-cluster/neutron/files/neutron-l3-agent.confd b/sys-cluster/neutron/files/neutron-l3-agent.confd
deleted file mode 100644
index 990278682fbd..000000000000
--- a/sys-cluster/neutron/files/neutron-l3-agent.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-NEUTRON_CONFS=("/etc/neutron/neutron.conf" "/etc/neutron/l3_agent.ini")
-
diff --git a/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd b/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd
deleted file mode 100644
index 9a2d52c70f8a..000000000000
--- a/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd
+++ /dev/null
@@ -1 +0,0 @@
-NEUTRON_CONFS=("/etc/neutron/neutron.conf" "/etc/neutron/plugins/ml2/ml2_conf.ini" "/etc/neutron/plugins/ml2/linuxbridge_agent.ini")
diff --git a/sys-cluster/neutron/files/neutron-metadata-agent.confd b/sys-cluster/neutron/files/neutron-metadata-agent.confd
deleted file mode 100644
index 6a78b7abe3c9..000000000000
--- a/sys-cluster/neutron/files/neutron-metadata-agent.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-NEUTRON_CONFS=("/etc/neutron/neutron.conf" "/etc/neutron/metadata_agent.ini")
-
diff --git a/sys-cluster/neutron/files/neutron-openvswitch-agent.confd b/sys-cluster/neutron/files/neutron-openvswitch-agent.confd
deleted file mode 100644
index 30b10b69bbfb..000000000000
--- a/sys-cluster/neutron/files/neutron-openvswitch-agent.confd
+++ /dev/null
@@ -1 +0,0 @@
-NEUTRON_CONFS=("/etc/neutron/neutron.conf" "/etc/neutron/plugins/ml2/ml2_conf.ini" "/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini")
diff --git a/sys-cluster/neutron/files/neutron-server.confd b/sys-cluster/neutron/files/neutron-server.confd
deleted file mode 100644
index 9b6b2e63f8bc..000000000000
--- a/sys-cluster/neutron/files/neutron-server.confd
+++ /dev/null
@@ -1 +0,0 @@
-NEUTRON_CONFS=("/etc/neutron/neutron.conf" "/etc/neutron/plugin.ini")
diff --git a/sys-cluster/neutron/files/neutron.initd b/sys-cluster/neutron/files/neutron.initd
deleted file mode 100644
index 26bf768ddff3..000000000000
--- a/sys-cluster/neutron/files/neutron.initd
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Starts ${SVCNAME} service for OpenStack"
-
-command=/usr/bin/"${SVCNAME}"
-command_background=yes
-command_user="${NEUTRON_USER:-neutron}"
-pidfile=/run/"${SVCNAME}".pid
-required_files=(${NEUTRON_CONFS[@]:-/etc/neutron/neutron.conf})
-command_args="${required_files[@]/#/--config-file } --log-file ${NEUTRON_LOGDIR:-/var/log/neutron}/${SVCNAME#*-}.log"
-retry="SIGTERM/15"
-
-depend() {
-	need net
-}
diff --git a/sys-cluster/neutron/files/neutron.sudoersd b/sys-cluster/neutron/files/neutron.sudoersd
deleted file mode 100644
index 0b7002374538..000000000000
--- a/sys-cluster/neutron/files/neutron.sudoersd
+++ /dev/null
@@ -1,4 +0,0 @@
-Defaults:neutron !requiretty
-
-neutron ALL = (root) NOPASSWD: /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf *
-
diff --git a/sys-cluster/neutron/metadata.xml b/sys-cluster/neutron/metadata.xml
deleted file mode 100644
index 22abebfb45e4..000000000000
--- a/sys-cluster/neutron/metadata.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>prometheanfire@gentoo.org</email>
-    <name>Matthew Thode</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>openstack@gentoo.org</email>
-    <name>Openstack</name>
-  </maintainer>
-  <longdescription lang="en">
-    Just like OpenStack Nova provides an API to dynamically request and
-  configure virtual servers, Neutron provides an API to dynamically request
-  and configure virtual networks. These networks connect "interfaces" from
-  other OpenStack services (e.g., vNICs from Nova VMs). The Neutron API
-  supports extensions to provide advanced network capabilities
-  (e.g., QoS, ACLs, network monitoring, etc).
-  </longdescription>
-  <use>
-    <flag name="compute-only">Only install things needed on compute hosts</flag>
-    <flag name="dhcp">Installs the initscripts for the neutron dhcp service</flag>
-    <flag name="haproxy">haproxy backend support</flag>
-    <flag name="l3">Installs the initscripts for the neutron l3 agent service</flag>
-    <flag name="metadata">Installs the initscripts for the neutron metadata agent service</flag>
-    <flag name="openvswitch">Installs the initscripts for the neutron openvswitch agent service</flag>
-    <flag name="linuxbridge">Installs the initscripts for the neutron linuxbridge agent service</flag>
-    <flag name="server">Installs the initscripts for the neutron server service</flag>
-  </use>
-  <upstream>
-    <remote-id type="launchpad">neutron</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sys-cluster/neutron/neutron-17.1.1.ebuild b/sys-cluster/neutron/neutron-17.1.1.ebuild
deleted file mode 100644
index 7cb75c41457e..000000000000
--- a/sys-cluster/neutron/neutron-17.1.1.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2021 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.2.ebuild b/sys-cluster/neutron/neutron-17.1.2.ebuild
deleted file mode 100644
index 7ba8c9f50879..000000000000
--- a/sys-cluster/neutron/neutron-17.1.2.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2021 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-2020.2.9999.ebuild b/sys-cluster/neutron/neutron-2020.2.9999.ebuild
deleted file mode 100644
index a73317fb3f88..000000000000
--- a/sys-cluster/neutron/neutron-2020.2.9999.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2021 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
-	chown neutron:neutron -R "/etc/neutron"
-	chmod 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/nova/Manifest b/sys-cluster/nova/Manifest
deleted file mode 100644
index ca4ad24c032c..000000000000
--- a/sys-cluster/nova/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX nova-compute.conf 144 BLAKE2B d7e7d6fc972243b49e82a70ee9798a9f44cf78709105b785073cfcf3de71d1e94de6574af6529363c1f5ff8f2029dcea2cb71aeab52964b73674cfc9d498accc SHA512 88d7207f4d7008e909c276f153e2abd66c2fb34fad85c90fe0bcc65a10f9c9c619ac315aee25e486e85896a2dfdc97eda4c9d2c78bd8b4117eaac7d8ebfb0270
-AUX nova-sudoers 78 BLAKE2B d2df2db0a2905e3a6aec56dc70afab046933d675715c9c16f0e960cd2c086df1def3a87ccd6ebd0719a16fc66a084e018e8b5b9e7b95be6f90abad6600509756 SHA512 22c0606c6335b2d1a03bd18a319a54f16f76f091b2e8416dbba05ce7c15890beff7f32f0322eb5ba3f2a5c750436cacbe0cee189b390b878e3f0c0df219ef984
-AUX nova.initd 747 BLAKE2B 2a20a632fcb66001e68f4d70fa11ba179db9b06a6f412115d7b89a7ac8cff0f897fc224e44e74f80f6b1ddfb7d44c8b399fc442ca2bc3b904a418d0765c240bd SHA512 938300464971847b0d14eb0e54c6443d0041a46d39b276642479cb3d0d9370480f7eb7aa8c20512609c5bf4f6fc54438b451ac4986ad7c93ef8ee5b966c7f2a3
-AUX openstack-scsi-disk.rules 134 BLAKE2B c1e3e150d93ab51b4da48caf2a0f83513fe63b5dde1e449a9c4c4dbfad65589b6326c799958736da86390142a914acbf9acf5b78bb1042e2c156eaf01cec8250 SHA512 6c3734d0b9ce9de887e15b1ddd5f5486dd1d0a55f463f9824ef067d3fe64a93d08ad2ef2b9d288f0dd42d570a5061e7a06976f7223df44b98bd321b73f9d036b
-AUX scsi-openscsi-link.sh 2777 BLAKE2B 84c14df2b1c49fe6210a4abf4387229aaa4fcd0c956b374b719285a20d8309f1bb58d51061084f34d284624d279bc64d53a629ec57702314c23e9b129c4a16b4 SHA512 3e7f6fc872f27b6a4d6c991346bd8eafcbc8f2b74439f1c77e93362e57fa1010ff002813cf21bf12d0550bfc165f79c70430862cd4ed5aaa15056777baf34409
-DIST nova-22.2.0.tar.gz 9271449 BLAKE2B c7b52f4d7e819152971c67f5f0a9f2b191e0235917efd04c799413ebfbf44500c64bae9ddd6082ef7b347c500d346f46fd07bad45a7fc4e5c397713867681dbe SHA512 acb9745b2bebd669f919a2d3d73e9dc5dad5aa3de49690daddd779fb6467139f857d67c6d8af3761f12db9bf6c5120d1af7bee3e73b3c0e0c44d6b41cafe7883
-DIST nova-22.2.1.tar.gz 9274586 BLAKE2B fb44f5cbd544c08d92aef48ef2858806245f1f36f2edc1a86a03189b460431add656d00dea830bf4fd324c79bf0d0e057b06836b25f554eea6416af3c2821bce SHA512 59df339bb00d4a7e087cc9caf6d6efcb1e5205ea8889502d00c4c22eb4acc6c0f19383de76f260382d56e145fad01088c3fd28f41d26441303e13b3b839ddcce
-DIST nova.conf.sample-2020.2.9999 187107 BLAKE2B e577126b67f2cc1aa6597f89b1632007f726ad85875d5f27041d0f9ac88923b944fe7f45ae2b3332157713b5f93034dad4da2860917b025649a52d7d71986612 SHA512 4149f8f19a573e8717f521183ba330853742bb6731f0e9ef02842d3be1c188ea3a2cdbeb6043086869360b9b1174a17e221c4ad1f543f74220c46cf31b1ca970
-DIST nova.conf.sample-22.2.0 187107 BLAKE2B e577126b67f2cc1aa6597f89b1632007f726ad85875d5f27041d0f9ac88923b944fe7f45ae2b3332157713b5f93034dad4da2860917b025649a52d7d71986612 SHA512 4149f8f19a573e8717f521183ba330853742bb6731f0e9ef02842d3be1c188ea3a2cdbeb6043086869360b9b1174a17e221c4ad1f543f74220c46cf31b1ca970
-DIST nova.conf.sample-22.2.1 187107 BLAKE2B e577126b67f2cc1aa6597f89b1632007f726ad85875d5f27041d0f9ac88923b944fe7f45ae2b3332157713b5f93034dad4da2860917b025649a52d7d71986612 SHA512 4149f8f19a573e8717f521183ba330853742bb6731f0e9ef02842d3be1c188ea3a2cdbeb6043086869360b9b1174a17e221c4ad1f543f74220c46cf31b1ca970
-EBUILD nova-2020.2.9999.ebuild 7491 BLAKE2B 6a19d8df373bb00317f19741efcb6c2c8877ecfbc8b4222118fbf483b36fcc69b70296a7ebedf755d4285360c7bc71334993bbc17fbe5ac9aad789bdcb6517e2 SHA512 9dc92dcef5c25660f42d71a54c987a8af350ecb47a81d45510fe50ad76dff3cec4ef1aa0770f2e834686d95943f1f53d7f1d8829bfb5415bbf17be45c8b01184
-EBUILD nova-22.2.0.ebuild 7489 BLAKE2B c762b4206bb0d8cbc326b66b65297b612b37634d05e95cb739c57c484cdd210ba9fa9639e7428ba0f220812a1832c80f64a7ad0437ed994041cacd4675b82b89 SHA512 015ea91cb59b4c98a147aba211384cbcd165eab6519c95bf6c4dbae59f0868ace7652c71e5b39d43e36b05dc8dea74b6b6c9e4a232098885cf83ee7b32ecbdfc
-EBUILD nova-22.2.1.ebuild 7491 BLAKE2B 6a19d8df373bb00317f19741efcb6c2c8877ecfbc8b4222118fbf483b36fcc69b70296a7ebedf755d4285360c7bc71334993bbc17fbe5ac9aad789bdcb6517e2 SHA512 9dc92dcef5c25660f42d71a54c987a8af350ecb47a81d45510fe50ad76dff3cec4ef1aa0770f2e834686d95943f1f53d7f1d8829bfb5415bbf17be45c8b01184
-MISC metadata.xml 1172 BLAKE2B aa85fe6bed1e40717884d721c2633c5f6d380914c69cb8a4a4c31b3e4c779db52b90fdaa5ee63b66ad9bc6694f666dd37dceeffb8de4676014ef3bb688476ef7 SHA512 bb506fa680b064c3d6a48710cac11efedc9e8a340603e234bf5c4c48aaab773e4527d7a8fc66ae36ec894230a1d02a5be995e521d222914f652e03b6f72642e4
diff --git a/sys-cluster/nova/files/nova-compute.conf b/sys-cluster/nova/files/nova-compute.conf
deleted file mode 100644
index 59c7aea2cd24..000000000000
--- a/sys-cluster/nova/files/nova-compute.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[DEFAULT]
-# mkisofs_cmd is needed as the default provider for the binary was remvoed as
-# a package from Gentoo.
-mkisofs_cmd = /usr/bin/mkisofs
diff --git a/sys-cluster/nova/files/nova-sudoers b/sys-cluster/nova/files/nova-sudoers
deleted file mode 100644
index f15b3285b7d4..000000000000
--- a/sys-cluster/nova/files/nova-sudoers
+++ /dev/null
@@ -1,3 +0,0 @@
-Defaults:nova !requiretty
-
-nova ALL = (root) NOPASSWD: /usr/bin/nova-rootwrap
diff --git a/sys-cluster/nova/files/nova.initd b/sys-cluster/nova/files/nova.initd
deleted file mode 100644
index 563c3a546b5f..000000000000
--- a/sys-cluster/nova/files/nova.initd
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-description="Starts ${SVCNAME} service for OpenStack"
-
-command="/usr/bin/${SVCNAME}"
-command_args="--config-file /etc/nova/nova.conf"
-pidfile=/run/${SVCNAME}.pid
-command_background=true
-required_files=/etc/nova/nova.conf
-if [ "$SVCNAME" = nova-compute ]; then
-	required_files="${required_files} /etc/nova/nova-compute.conf"
-	command_args="${command_args} --config-file /etc/nova/nova-compute.conf"
-fi
-start_stop_daemon_args="-u ${NOVA_USER:-nova}"
-retry="SIGTERM/15"
-
-depend() {
-	use net
-}
-
-start_pre() {
-	checkpath --directory --owner "${NOVA_USER:-nova}":"${NOVA_GROUP:-nova}" --mode 0775 "${NOVA_RUN:-/var/lock/nova}"
-}
diff --git a/sys-cluster/nova/files/openstack-scsi-disk.rules b/sys-cluster/nova/files/openstack-scsi-disk.rules
deleted file mode 100644
index ee44d5066291..000000000000
--- a/sys-cluster/nova/files/openstack-scsi-disk.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-KERNEL=="sd*", SUBSYSTEM=="block", ENV{ID_BUS}=="scsi", PROGRAM="/etc/nova/scsi-openscsi-link.sh %b $id", SYMLINK+="disk/by-path/%c"
-
diff --git a/sys-cluster/nova/files/scsi-openscsi-link.sh b/sys-cluster/nova/files/scsi-openscsi-link.sh
deleted file mode 100644
index 197eac4438e5..000000000000
--- a/sys-cluster/nova/files/scsi-openscsi-link.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/bash
-
-# Author: Geaaru
-# Date: October 23, 2014
-# Version: 0.1.0
-# License: GPL 2.0
-
-# Description: Script for udev symlink creation of
-#              scsi disk attached and visible under
-#              /dev/disk/by-path/ with name convention
-#              used in openstack LVM iscsi driver.
-#
-# Requirements: lsscsi (for retrieve LUN ID, I don't know how can i do that from udev/iscsiadm)
-
-# Rules for UDEV must in this format:
-# KERNEL=="sd*", BUS=="scsi", PROGRAM="/etc/nova/scsi-openscsi-link.sh %b",SYMLINK+="disk/by-path/%c"
-
-# NOTE: it seems that input params %b or others are not passed to script.
-#       I try to retrieve it from environment variables.
-
-if [[ -z "$DEVTYPE" || -z "$ID_BUS" ]] ; then
-	exit 1
-fi
-   
-echo "--------------------" >> /tmp/udev.log
-echo "ENV => `env`" >> /tmp/udev.log
-echo "--------------------" >> /tmp/udev.log
-
-if [[ $DEVTYPE != "disk" || $ID_BUS != "scsi" ]]; then
-        echo "EXIT 1" >> /tmp/udev.log
-        exit 1
-fi
-
-# ID_SCSI variable what identify ?
-
-HOST=`echo  "$DEVPATH" | awk '{ split($0, word, "/"); print substr(word[4], 5); }'`
-
-
-
-# Bins
-iscsiadm=/usr/sbin/iscsiadm
-lsscsi=/usr/bin/lsscsi
-
-[ -e /sys/class/iscsi_host ] || exit 1
-
-# Create file path like this:
-# /sys/class/iscsi_host/host11/device/session3/iscsi_session/session3/targetname
-file="/sys/class/iscsi_host/host${HOST}/device/session*/iscsi_session*/session*/targetname"
-
-target_iqn=$(cat ${file})
-
-if [ -z "${target_iqn}" ] ; then
-        echo "EXIT 2" >> /tmp/udev.log
-	exit 1
-fi
-
-# Retrieve target_port because I can't retrieve it with iscsi_id
-# /lib/udev/scsi_id -g -x /dev/sdg
-# ID_SCSI=1
-# ID_VENDOR=IET
-# ID_VENDOR_ENC=IET\x20\x20\x20\x20\x20
-# ID_MODEL=VIRTUAL-DISK
-# ID_MODEL_ENC=VIRTUAL-DISK
-# ID_REVISION=0001
-# ID_TYPE=disk
-# ID_SERIAL=1IET_00010001
-# ID_SERIAL_SHORT=IET_00010001
-# ID_SCSI_SERIAL=                              beaf11a
-
-# iscsiadm -m node | grep --colour=none  iqn.2014-09.org.openstack:vol-cinder-f48f0a69-e871-4c47-9cd3-3ccb8c811363 | cut -d',' -f 1
-
-tp_ispresent=$(${iscsiadm} -m node | grep --colour=none ${target_iqn} | wc -l)
-if [ x$tp_ispresent = x0 ] ; then
-      # Target is not present. Ignore it.
-        echo "EXIT 3" >> /tmp/udev.log
-      exit 1
-fi
-
-target_portal=$(${iscsiadm} -m node | grep --colour=none ${target_iqn} | cut -d',' -f 1)
-#target=$(${iscsiadm} -m node | grep --colour=none ${target_iqn} | cut -d' ' -f 1)
-#target_portal=$(echo ${target} | cut -d',' -f 1)
-target_lun=$(${lsscsi} | grep $DEVNAME | sed 's/.[0-9]*:[0-9]*:[0-9]*:\([0-9]*\).*/\1/')
-
-echo "TARGET_PORTAL=$target_portal" >> /tmp/udev.log
-echo "TARGET_LUN=$target_lun" >> /tmp/udev.log
-
-linkname="ip-${target_portal}-iscsi-${target_iqn}-lun-${target_lun}"
-
-echo "RETURN ${linkname}" >> /tmp/udev.log
-
-echo "${linkname}"
-
-exit 0
diff --git a/sys-cluster/nova/metadata.xml b/sys-cluster/nova/metadata.xml
deleted file mode 100644
index 25bcac3ecf41..000000000000
--- a/sys-cluster/nova/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>prometheanfire@gentoo.org</email>
-    <name>Matthew Thode</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>openstack@gentoo.org</email>
-    <name>Openstack</name>
-  </maintainer>
-  <longdescription lang="en">
-    Nova is a cloud computing fabric controller
-    (the main part of an IaaS system). It is written in Python.
-  </longdescription>
-  <use>
-    <flag name="compute">Installs the initscripts for the nova volume service</flag>
-    <flag name="compute-only">only install stuff needed for a compute host</flag>
-    <flag name="iscsi">Installs iscsi helper udev scripts</flag>
-    <flag name="memcached">Installs the memcached server</flag>
-    <flag name="novncproxy">Installs the initscripts for the nova novncproxy service</flag>
-    <flag name="openvswitch">Installs openvswitch for the neutron openvswitch support</flag>
-    <flag name="rabbitmq">Installs the rabbitmq server</flag>
-  </use>
-  <upstream>
-    <remote-id type="launchpad">nova</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sys-cluster/nova/nova-2020.2.9999.ebuild b/sys-cluster/nova/nova-2020.2.9999.ebuild
deleted file mode 100644
index dfcfea0843c0..000000000000
--- a/sys-cluster/nova/nova-2020.2.9999.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2021 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 multilib udev
-
-DESCRIPTION="Cloud computing fabric controller"
-HOMEPAGE="https://launchpad.net/nova"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/nova.conf.sample -> nova.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/nova.git"
-	EGIT_BRANCH="stable/victoria"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/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/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.2.19[${PYTHON_USEDEP}]
-	)
-	sqlite? (
-		>=dev-python/sqlalchemy-1.2.19[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.19[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
-	)
-	>=dev-python/decorator-4.1.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.15[${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.13.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.7.1[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-	!~dev-python/python-cinderclient-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.16.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.23.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/websockify-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-6.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.22.0[${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-4.5.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-10.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.33.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.40.1[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.2.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.35.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/os-resource-classes-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/os-traits-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/os-vif-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-4.2.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.4[${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.7.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-	>=dev-python/zVMCloudConnector-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.35.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.13[${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
-	)
-	acct-user/nova
-	acct-group/nova"
-
-#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
-}
-
-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/compute.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-22.2.0.ebuild b/sys-cluster/nova/nova-22.2.0.ebuild
deleted file mode 100644
index af5e82da954d..000000000000
--- a/sys-cluster/nova/nova-22.2.0.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2021 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 multilib udev
-
-DESCRIPTION="Cloud computing fabric controller"
-HOMEPAGE="https://launchpad.net/nova"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/nova.conf.sample -> nova.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/nova.git"
-	EGIT_BRANCH="stable/victoria"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/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/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.2.19[${PYTHON_USEDEP}]
-	)
-	sqlite? (
-		>=dev-python/sqlalchemy-1.2.19[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.19[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
-	)
-	>=dev-python/decorator-4.1.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.15[${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.13.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.7.1[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-	!~dev-python/python-cinderclient-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.16.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.23.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/websockify-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-6.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.22.0[${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-4.5.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-10.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.33.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.40.1[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.2.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.35.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/os-resource-classes-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/os-traits-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/os-vif-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-4.2.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.4[${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.7.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-	>=dev-python/zVMCloudConnector-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.35.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.13[${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
-	)
-	acct-user/nova
-	acct-group/nova"
-
-#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
-}
-
-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/compute.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-22.2.1.ebuild b/sys-cluster/nova/nova-22.2.1.ebuild
deleted file mode 100644
index dfcfea0843c0..000000000000
--- a/sys-cluster/nova/nova-22.2.1.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2021 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 multilib udev
-
-DESCRIPTION="Cloud computing fabric controller"
-HOMEPAGE="https://launchpad.net/nova"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/nova.conf.sample -> nova.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/nova.git"
-	EGIT_BRANCH="stable/victoria"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/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/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.2.19[${PYTHON_USEDEP}]
-	)
-	sqlite? (
-		>=dev-python/sqlalchemy-1.2.19[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.19[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
-	)
-	>=dev-python/decorator-4.1.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.15[${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.13.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.7.1[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-	!~dev-python/python-cinderclient-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.16.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.23.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/websockify-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-6.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.22.0[${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-4.5.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-10.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.33.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.40.1[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.2.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.35.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/os-resource-classes-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/os-traits-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/os-vif-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-4.2.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.4[${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.7.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-	>=dev-python/zVMCloudConnector-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.35.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.13[${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
-	)
-	acct-user/nova
-	acct-group/nova"
-
-#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
-}
-
-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/compute.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/openstack-meta/Manifest b/sys-cluster/openstack-meta/Manifest
deleted file mode 100644
index b5c794803449..000000000000
--- a/sys-cluster/openstack-meta/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-EBUILD openstack-meta-2020.1.1.ebuild 970 BLAKE2B deba810243857a2830b3e53dfc385465231d10f41ea07977a99161dabe53e0f541977a0ba692a0a23771b543c964033ba0dcee4da912af459301f5b09f7c2397 SHA512 f26946fc4e24b4c0553825e89617ae11a4e693aed412b6438d570abc110347e207761b12bb2d1eb8a5d258b001da1879e96dd946939a8511219e4eab595738a5
-EBUILD openstack-meta-2020.1.9999.ebuild 720 BLAKE2B 58fc952b499f4a29f619851382b2dd79f2e1df0911df77af0b5e9475afea04d893589cdec55c83be8bf2d61fcf732db1736301eae1f6053e79e0da0b5c394848 SHA512 e984cffa8bb323a48b714e8235c0bf1facc677f7ed5d80f88a9865b3182ecafc8b2a3d7f97f09c07df0a8a31c4682c6e66fb0b86ce1cf83bcca94064b0ebf2f5
-EBUILD openstack-meta-2020.2.0.ebuild 970 BLAKE2B a995f7d3631165f374453f73f1ee2ac04e2f63d37cadade3bbdc0993ba4745981af9ee4644c2095823dcc0ca9ef22b6ff783d00526e069e228fa50744be8879f SHA512 f749b1e2a443a321b52fd1dc9c90b58b791983bb1bc438dfcdb9a1f517db9cd81487e7f143604f27ced475e66563f9adb765be1003db398dab6142c522a82e4e
-EBUILD openstack-meta-2020.2.9999.ebuild 720 BLAKE2B 58fc952b499f4a29f619851382b2dd79f2e1df0911df77af0b5e9475afea04d893589cdec55c83be8bf2d61fcf732db1736301eae1f6053e79e0da0b5c394848 SHA512 e984cffa8bb323a48b714e8235c0bf1facc677f7ed5d80f88a9865b3182ecafc8b2a3d7f97f09c07df0a8a31c4682c6e66fb0b86ce1cf83bcca94064b0ebf2f5
-MISC metadata.xml 803 BLAKE2B 2a2110f98f5eb0b998d5377e524d7ec112631e64dfd59ced1ae0de1f2e6d82be469c8006e878b44a8e07aeba4d847ebfd9264e4f4d5a6bcdc823ea771f3f746b SHA512 7abe4ab88fd9f05a859007b341716303bf1218658675005428d4e9a698d43c75e29f912e762c0bcec2e921cdc0d67c5064503de0f00e47c389da993d32dcc198
diff --git a/sys-cluster/openstack-meta/metadata.xml b/sys-cluster/openstack-meta/metadata.xml
deleted file mode 100644
index c025fe8964f4..000000000000
--- a/sys-cluster/openstack-meta/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>prometheanfire@gentoo.org</email>
-    <name>Matthew Thode</name>
-  </maintainer>
-  <use>
-    <flag name="keystone">Installs Openstack Keystone</flag>
-    <flag name="swift">Installs Openstack Swift</flag>
-    <flag name="glance">Installs Openstack Glance</flag>
-    <flag name="cinder">Installs Openstack Cinder</flag>
-    <flag name="neutron">Installs Openstack Neutron</flag>
-    <flag name="nova">Installs Openstack Nova</flag>
-    <flag name="heat">Installs Openstack Heat</flag>
-    <flag name="placement">Installs Openstack Placement</flag>
-    <!-- <flag name="horizon">Installs Openstack Horizon</flag> -->
-  </use>
-</pkgmetadata>
diff --git a/sys-cluster/openstack-meta/openstack-meta-2020.1.1.ebuild b/sys-cluster/openstack-meta/openstack-meta-2020.1.1.ebuild
deleted file mode 100644
index d025763fa908..000000000000
--- a/sys-cluster/openstack-meta/openstack-meta-2020.1.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A openstack meta-package for installing the various openstack pieces"
-HOMEPAGE="https://openstack.org"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cinder glance heat keystone neutron nova placement swift"
-
-if [[ ${PV} != *9999 ]];then
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-DEPEND=""
-RDEPEND="
-	keystone? ( >=sys-auth/keystone-17.0.0
-								<sys-auth/keystone-18 )
-	swift? ( >=sys-cluster/swift-2.25.0
-						<sys-cluster/swift-2.26.0 )
-	neutron? ( >=sys-cluster/neutron-16.0.0
-						<sys-cluster/neutron-17 )
-	glance? ( >=app-admin/glance-20.0.0
-						<app-admin/glance-21 )
-	cinder? ( >=sys-cluster/cinder-16.0.0
-						<sys-cluster/cinder-17 )
-	nova? ( >=sys-cluster/nova-21.0.0
-						<sys-cluster/nova-22 )
-	heat? ( >=sys-cluster/heat-14.0.0
-						<sys-cluster/heat-15 )
-	placement? ( >=sys-cluster/placement-3.0.0
-								<sys-cluster/placement-4 )
-"
diff --git a/sys-cluster/openstack-meta/openstack-meta-2020.1.9999.ebuild b/sys-cluster/openstack-meta/openstack-meta-2020.1.9999.ebuild
deleted file mode 100644
index d214cba5b919..000000000000
--- a/sys-cluster/openstack-meta/openstack-meta-2020.1.9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A openstack meta-package for installing the various openstack pieces"
-HOMEPAGE="https://openstack.org"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cinder glance heat keystone neutron nova placement swift"
-
-if [[ ${PV} != *9999 ]];then
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-DEPEND=""
-RDEPEND="
-	keystone? ( ~sys-auth/keystone-${PV} )
-	swift? ( ~sys-cluster/swift-${PV} )
-	neutron? ( ~sys-cluster/neutron-${PV} )
-	glance? ( ~app-admin/glance-${PV} )
-	cinder? ( ~sys-cluster/cinder-${PV} )
-	nova? ( ~sys-cluster/nova-${PV} )
-	heat? ( ~sys-cluster/heat-${PV} )
-	placement? ( ~sys-cluster/placement-${PV} )
-"
diff --git a/sys-cluster/openstack-meta/openstack-meta-2020.2.0.ebuild b/sys-cluster/openstack-meta/openstack-meta-2020.2.0.ebuild
deleted file mode 100644
index 35f8d50288ec..000000000000
--- a/sys-cluster/openstack-meta/openstack-meta-2020.2.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A openstack meta-package for installing the various openstack pieces"
-HOMEPAGE="https://openstack.org"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cinder glance heat keystone neutron nova placement swift"
-
-if [[ ${PV} != *9999 ]];then
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-DEPEND=""
-RDEPEND="
-	keystone? ( >=sys-auth/keystone-18.0.0
-								<sys-auth/keystone-19 )
-	swift? ( >=sys-cluster/swift-2.26.0
-						<sys-cluster/swift-2.27.0 )
-	neutron? ( >=sys-cluster/neutron-17.0.0
-						<sys-cluster/neutron-18 )
-	glance? ( >=app-admin/glance-21.0.0
-						<app-admin/glance-22 )
-	cinder? ( >=sys-cluster/cinder-17.0.0
-						<sys-cluster/cinder-18 )
-	nova? ( >=sys-cluster/nova-22.0.0
-						<sys-cluster/nova-23 )
-	heat? ( >=sys-cluster/heat-15.0.0
-						<sys-cluster/heat-16 )
-	placement? ( >=sys-cluster/placement-4.0.0
-								<sys-cluster/placement-5 )
-"
diff --git a/sys-cluster/openstack-meta/openstack-meta-2020.2.9999.ebuild b/sys-cluster/openstack-meta/openstack-meta-2020.2.9999.ebuild
deleted file mode 100644
index d214cba5b919..000000000000
--- a/sys-cluster/openstack-meta/openstack-meta-2020.2.9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A openstack meta-package for installing the various openstack pieces"
-HOMEPAGE="https://openstack.org"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cinder glance heat keystone neutron nova placement swift"
-
-if [[ ${PV} != *9999 ]];then
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-DEPEND=""
-RDEPEND="
-	keystone? ( ~sys-auth/keystone-${PV} )
-	swift? ( ~sys-cluster/swift-${PV} )
-	neutron? ( ~sys-cluster/neutron-${PV} )
-	glance? ( ~app-admin/glance-${PV} )
-	cinder? ( ~sys-cluster/cinder-${PV} )
-	nova? ( ~sys-cluster/nova-${PV} )
-	heat? ( ~sys-cluster/heat-${PV} )
-	placement? ( ~sys-cluster/placement-${PV} )
-"
diff --git a/sys-cluster/placement/Manifest b/sys-cluster/placement/Manifest
deleted file mode 100644
index 4028ebe68ff8..000000000000
--- a/sys-cluster/placement/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST openstack-placement-4.0.0.tar.gz 502434 BLAKE2B 9c769d2ef78bad37ef6ac823c9b0fa29128bfea94626f6a4e9cd1ffa6e1e4d441e4b20353e97282823bc1638ee25499fa840b9d34600b1928271627d412c93cc SHA512 32ff30f7216ea56b073582c2e1c4b501229d941f3c6fc501245ab92544234774df63a9b9674ba5f1225d462ab205b2512185907e309e4135e01e1776d554b293
-DIST placement.conf.sample-2020.2.9999 26306 BLAKE2B 037ce73d52066fc2f2fe0542c10e3879c513ca23f127a03cd575cca0d21f7b2f4f36491c238897cacd962072797d9d2fd50be054c3ae09f95f5417ab9758b289 SHA512 640329729d0964b67a25837692f0db0f5e9682aff6bd1f3e124657c4bc0de7f6a9f65a5c17889cd6c0a0584d471c880865a59b939262ed8beac2ae452d0ea02a
-DIST placement.conf.sample-4.0.0 26306 BLAKE2B 037ce73d52066fc2f2fe0542c10e3879c513ca23f127a03cd575cca0d21f7b2f4f36491c238897cacd962072797d9d2fd50be054c3ae09f95f5417ab9758b289 SHA512 640329729d0964b67a25837692f0db0f5e9682aff6bd1f3e124657c4bc0de7f6a9f65a5c17889cd6c0a0584d471c880865a59b939262ed8beac2ae452d0ea02a
-EBUILD placement-2020.2.9999.ebuild 2790 BLAKE2B 3165ca6ae8a9954218b9891f9deb1d097ce795b036102a03349b08b9766c4c74ba071743f251073ac58c5d3be39ff72fc99f5dc38240bdbd106e521d43858f9a SHA512 49e4f3ae482c6a581dbe531d0238fb576c8475375490e3b51b38ec971081a1b0905ef9cb2d57e36da799c345053fbd87b7c32c0cc2d4c6ff8b353b1a7fd6f83d
-EBUILD placement-4.0.0.ebuild 2788 BLAKE2B 94306657e2060c1f19ea4220ee123fe79b7e251de0954a5bf8c56a7d1fcf46ff73e223be8d242c0cf0f41829ad9feb40561493b82c12d5b5941443ec7acf7f7d SHA512 3987bc996abe9691d77111a095cd02c346b7115e7b27426bfbe7e487ec8fbbef04177f19033f09596af1edc814ee082f314ff203f2d0d3d0f83f1a090e2da1e8
-MISC metadata.xml 590 BLAKE2B 52aa7d1deb487225f34afa59f668939abe56f4d377626b3cd6dc20c2c94fc1b104f2cac7047d7ba461c62c90515cd39e75b8a94d17a341dd8c549d6bdca6bee3 SHA512 188176cc3f839d3a53dbcaf38f74fc71f1c223f7e938bcc9627e71b2509b14e535647513a7c1bb2eb2d250a317b9e6f0ef906cf464e465697d5a26b4bb013f78
diff --git a/sys-cluster/placement/metadata.xml b/sys-cluster/placement/metadata.xml
deleted file mode 100644
index f4e191f8fbe8..000000000000
--- a/sys-cluster/placement/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>prometheanfire@gentoo.org</email>
-    <name>Matthew Thode</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>openstack@gentoo.org</email>
-    <name>Openstack</name>
-  </maintainer>
-  <longdescription lang="en">
-    OpenStack Placement provides an HTTP service for managing, selecting, and claiming providers of classes of inventory representing available resources in a cloud.
-  </longdescription>
-</pkgmetadata>
diff --git a/sys-cluster/placement/placement-2020.2.9999.ebuild b/sys-cluster/placement/placement-2020.2.9999.ebuild
deleted file mode 100644
index e54645cb04c1..000000000000
--- a/sys-cluster/placement/placement-2020.2.9999.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 )
-
-inherit distutils-r1
-
-DESCRIPTION="A HTTP service for managing, selecting, and claiming cloud resources."
-HOMEPAGE="https://github.com/openstack/placement"
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/placement/victoria/placement.conf.sample -> placement.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/placement.git"
-	EGIT_BRANCH="stable/victoria"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/placement/victoria/placement.conf.sample -> placement.conf.sample-${PV}
-	https://tarballs.openstack.org/${PN}/openstack-${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	S="${WORKDIR}/openstack-${P}"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="mysql postgres sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=">=dev-python/pbr-5.0.0[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/pbr-5.0.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
-	)
-	>=dev-python/keystonemiddleware-4.18.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-6.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.37.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.40.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-upgradecheck-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/os-resource-classes-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/os-traits-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}]
-	acct-user/placement
-	acct-group/placement"
-BDEPEND=""
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	diropts -m 0750 -o placement -g placement
-	insinto /etc/placement
-	insopts -m 0640 -o placement -g placement
-	newins "${DISTDIR}/placement.conf.sample-${PV}" placement.conf.sample
-
-	dobin tools/mysql-migrate-db.sh
-	dobin tools/postgresql-migrate-db.sh
-}
diff --git a/sys-cluster/placement/placement-4.0.0.ebuild b/sys-cluster/placement/placement-4.0.0.ebuild
deleted file mode 100644
index 5b83b21d629a..000000000000
--- a/sys-cluster/placement/placement-4.0.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 )
-
-inherit distutils-r1
-
-DESCRIPTION="A HTTP service for managing, selecting, and claiming cloud resources."
-HOMEPAGE="https://github.com/openstack/placement"
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/placement/victoria/placement.conf.sample -> placement.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/placement.git"
-	EGIT_BRANCH="stable/victoria"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/placement/victoria/placement.conf.sample -> placement.conf.sample-${PV}
-	https://tarballs.openstack.org/${PN}/openstack-${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-	S="${WORKDIR}/openstack-${P}"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="mysql postgres sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=">=dev-python/pbr-5.0.0[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/pbr-5.0.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
-	)
-	>=dev-python/keystonemiddleware-4.18.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-6.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.37.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.40.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-upgradecheck-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/os-resource-classes-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/os-traits-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}]
-	acct-user/placement
-	acct-group/placement"
-BDEPEND=""
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	diropts -m 0750 -o placement -g placement
-	insinto /etc/placement
-	insopts -m 0640 -o placement -g placement
-	newins "${DISTDIR}/placement.conf.sample-${PV}" placement.conf.sample
-
-	dobin tools/mysql-migrate-db.sh
-	dobin tools/postgresql-migrate-db.sh
-}
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
deleted file mode 100644
index c74212813e7d..000000000000
--- a/sys-cluster/swift/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX swift-account.initd 867 BLAKE2B 12a01902f520b2c25261a229e1239c3f85ba05dd708e0174806aeaef8049eb149033ec49de2a72441f834e1c1b640fd19bb0faa5952978972768774a91e4ac74 SHA512 7526cf09a582eba4607b22038e632c82eddd89fb6930ad00ca26f565b58682031eef0e1f4e0b2798d1e98b55a7309455fe2b68398d70cdf26c734c75f3f58087
-AUX swift-container.initd 877 BLAKE2B f45f04d6d6d4fefdf153d40d1480535cb6552daa812854328e845ff8afb96ffd4f947a0a38437ec401a10c493701f328667e1b7e314ea39510c957ec3e7be2bc SHA512 46ae66806db3cb8b9416ccde1a08f0f8af5dd1bbeeda23fc547f8ed29f979c554b47ff0c9ca13f8944ec8c3f4c2d0ffd0616bead4ac9b42078ffaf0ba238d52b
-AUX swift-object.initd 862 BLAKE2B 2a062873ab613e7d98d78758ccae793d8d952cb66922d900353a516738014cfe72f98a6830d0af523757e15b432b88f991753572a3e1b8e248af8e1bf43d2b70 SHA512 a977e3d81e22785b4999e5dbe6c51c020f98fe4ba08d52ff971477fca606a7fbd8e80f4c45ac6ba6afa213ddca7b81acc6238d91bb5c45635cc68c174575aa05
-AUX swift-proxy.initd 1379 BLAKE2B 56453a557c0abfd6b07f65778ef14d8920bedc4133e0efa1aa4a5466a72103e9b57b361f481e0b5cb816471161196755de7794bd3ea3d6f5120cc1f159489c22 SHA512 dd32e4249686b51d2ed6add8e2e91eb9e520c662ebdf068f68b4e52faf4d508d3c87e996c6c2f7ba2a7d1f5fdf639d08e1e6878cd4c9918408e007ccbd7c84ec
-DIST swift-2.26.0.tar.gz 3235050 BLAKE2B 33b46ebc3bd57b6ca6ccb65e96dd11a754fa1b4d314c60eafd23ad8b6bb7b8fee42ce26ccf0f388ad33599520a049a2d36832ba3d1ea01b0a07a8bee3f803569 SHA512 5e4620831bfc75f231fa468ce68438a23ad7b013eef4173aa596fd2e42bd4eb7e6b4182026fa71b6f4dd31d2cfccc4e70480a42a77f93b15bf6e50e9287ea460
-DIST swift-2.27.0.tar.gz 3464571 BLAKE2B 9495abc39b150615a8f7f1900573c643b4f2edd5c187c4d525c4ad7d7e0c2d54eeec0f9b3d8711ed2028cf4d606dee532bd8e4af4b3e1527f3cee5bcc8e62835 SHA512 c9abfa16cfb4964bd774a3dd50c847bf1912e5f87edc8693746e2dcb5863289b9afd2b69b0cc0940aa3fbb49694851b0b6418462367078d0c40d2b724b135467
-EBUILD swift-2.26.0.ebuild 3551 BLAKE2B 7d79373037f37579aa1d8d8019d2c8f3886bb7d326ccca9fdf4b9f7a4732dc7cdfddeefd1a19a570df05cf159cb6f8bee74e647c6131562df0a0bd1898075cb2 SHA512 f94a07835a79f4d8f1411fa9885955740281ad3b003df5aed6ffc5de525e776fff78f10e90f4ac0fb5b0a5586f1ab7ccb28e0837164501a6888be5715ecd85c5
-EBUILD swift-2.27.0.ebuild 3642 BLAKE2B ceaf12489692366095be856d60f5e27038b38e192acbe3705859871d7f5a7528585a614dbb0d223f3eaff40ab9f8d5bfe74198ea0d8eab7084d6cf54fd598405 SHA512 7cc862f1b610a7d5c3f02d232eb5c96538877b20edc746539efbea5b3115136de953284c1c171deb1159cf0c34d03fb920374df840348376f3eafee955576c3f
-EBUILD swift-2020.2.9999.ebuild 3553 BLAKE2B 3c493c7099d4be7105ef00b6fd2b8c8c5e0e1aa6f0f56299d9e3cd41779ee1a97df75154b6837201948065a7ebe113da3bb34d00a962b2a6e971e2999a0fb6c0 SHA512 3d4c9528e09c0b5374cac4f95a8f866ae30cc88e8e0091fd39c8e761606b60cfd85d22577340f85ce38fac7ca06359c698a6e4b335ed2f59f190dca360280af0
-EBUILD swift-2021.1.9999.ebuild 3643 BLAKE2B 0d8de5d8a465c21e2e39314cbaab8ecd88e2040b6dfc1abb1f4f52855fe3e21a510d236231dd6d167a1b69c888573a869cb04cc1d0a34af6980b6ea28e3f3b2d SHA512 e404553e06de853322088268c90042b67c3c0dd34f81a741aebe57c46718042ea8b2df948c6c4a120c224486dde9b9e189a315774cad41a176b9f7e6d8571b8c
-MISC metadata.xml 758 BLAKE2B 8b1f494e6c40f469c01b494154d32702dc9b848939ea67005d8065c39661fcb97b5ca9cdee524ca66f0e74af5f9c522ca236b628a9b0289eef4f808e5f32461e SHA512 94a6af6b29a7f968d1e23a70decb908b9de10f792f1bd0711b95ea18abf59595d42017da6f278ed4991695ebbe0941d8907c160412e20758697597179fc3bb19
diff --git a/sys-cluster/swift/files/swift-account.initd b/sys-cluster/swift/files/swift-account.initd
deleted file mode 100644
index 205280c76ae0..000000000000
--- a/sys-cluster/swift/files/swift-account.initd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-COMMAND=/usr/bin/swift-init
-PIDFILE=/run/swift/account-server.pid
-
-depend() {
-    after net
-}
-
-checkconfig() {
-    if [ ! -r /etc/swift/swift.conf ]; then
-        eerror "Missing required config file: /etc/swift/swift.conf"
-        return 1
-    fi
-    if [ ! -r /etc/swift/account-server.conf ]; then
-        eerror "Missing required config file: /etc/swift/account-server.conf"
-        return 1
-    fi
-    return 0
-}
-
-start() {
-    checkconfig || return $?
-    ebegin "Starting ${SVCNAME}"
-    start-stop-daemon --start --quiet -i --pidfile ${PIDFILE} ${COMMAND} -- account start
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping ${SVCNAME}"
-    start-stop-daemon --stop --quiet -i --pidfile ${PIDFILE} ${COMMAND} -- account stop
-    eend $?
-}
diff --git a/sys-cluster/swift/files/swift-container.initd b/sys-cluster/swift/files/swift-container.initd
deleted file mode 100644
index 051951af138d..000000000000
--- a/sys-cluster/swift/files/swift-container.initd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-COMMAND=/usr/bin/swift-init
-PIDFILE=/run/swift/container-server.pid
-
-depend() {
-    after net
-}
-
-checkconfig() {
-    if [ ! -r /etc/swift/swift.conf ]; then
-        eerror "Missing required config file: /etc/swift/swift.conf"
-        return 1
-    fi
-    if [ ! -r /etc/swift/container-server.conf ]; then
-        eerror "Missing required config file: /etc/swift/container-server.conf"
-        return 1
-    fi
-    return 0
-}
-
-start() {
-    checkconfig || return $?
-    ebegin "Starting ${SVCNAME}"
-    start-stop-daemon --start --quiet -i --pidfile ${PIDFILE} ${COMMAND} -- container start
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping ${SVCNAME}"
-    start-stop-daemon --stop --quiet -i --pidfile ${PIDFILE} ${COMMAND} -- container stop
-    eend $?
-}
diff --git a/sys-cluster/swift/files/swift-object.initd b/sys-cluster/swift/files/swift-object.initd
deleted file mode 100644
index 59ec78ca039a..000000000000
--- a/sys-cluster/swift/files/swift-object.initd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-COMMAND=/usr/bin/swift-init
-PIDFILE=/run/swift/object-server.pid
-
-depend() {
-    after net
-}
-
-checkconfig() {
-    if [ ! -r /etc/swift/swift.conf ]; then
-        eerror "Missing required config file: /etc/swift/swift.conf"
-        return 1
-    fi
-    if [ ! -r /etc/swift/object-server.conf ]; then
-        eerror "Missing required config file: /etc/swift/object-server.conf"
-        return 1
-    fi
-    return 0
-}
-
-start() {
-    checkconfig || return $?
-    ebegin "Starting ${SVCNAME}"
-    start-stop-daemon --start --quiet -i --pidfile ${PIDFILE} ${COMMAND} -- object start
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping ${SVCNAME}"
-    start-stop-daemon --stop --quiet -i --pidfile ${PIDFILE} ${COMMAND} -- object stop
-    eend $?
-}
diff --git a/sys-cluster/swift/files/swift-proxy.initd b/sys-cluster/swift/files/swift-proxy.initd
deleted file mode 100644
index cce9c32e335b..000000000000
--- a/sys-cluster/swift/files/swift-proxy.initd
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-COMMAND=/usr/bin/swift-init
-PIDFILE=/run/swift/proxy-server.pid
-
-depend() {
-    after net
-}
-
-opts="reload"
-
-checkconfig() {
-    if [ ! -r /etc/swift/swift.conf ]; then
-        eerror "Missing required config file: /etc/swift/swift.conf"
-        return 1
-    fi
-    if [ ! -r /etc/swift/proxy-server.conf ]; then
-        eerror "Missing required config file: /etc/swift/proxy-server.conf"
-        return 1
-    fi
-    return 0
-}
-
-start() {
-    checkconfig || return $?
-    ebegin "Starting ${SVCNAME}"
-    start-stop-daemon --start --quiet -i --pidfile ${PIDFILE} ${COMMAND} -- proxy start
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping ${SVCNAME}"
-    start-stop-daemon --stop --quiet -i --pidfile ${PIDFILE} ${COMMAND} -- proxy stop
-    eend $?
-}
-
-reload() {
-    checkconfig || return $?
-    ebegin "Reloading ${SVCNAME}"
-    start-stop-daemon --quiet -i ${COMMAND} -- proxy reload
-    eend $? "Failed to reload ${SVCNAME}"
-}
-
-restart() {
-    checkconfig || return $?
-    ebegin "Restarting ${SVCNAME}"
-    start-stop-daemon --quiet -i --pidfile ${PIDFILE} ${COMMAND} -- proxy restart
-    eend $? "Failed to restart ${SVCNAME}"
-}
-
-status() {
-    start-stop-daemon --quiet -i ${COMMAND} -- proxy status
-    eend $? "Failed to get status for ${SVCNAME}"
-}
diff --git a/sys-cluster/swift/metadata.xml b/sys-cluster/swift/metadata.xml
deleted file mode 100644
index 6a12c88d2a76..000000000000
--- a/sys-cluster/swift/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <use>
-    <flag name="account">adds swift account support</flag>
-    <flag name="container">adds swift container support</flag>
-    <flag name="memcached">adds memcached support</flag>
-    <flag name="object">adds swift object support</flag>
-    <flag name="proxy">adds swift proxy support</flag>
-  </use>
-  <maintainer type="person">
-    <email>prometheanfire@gentoo.org</email>
-    <name>Matthew Thode</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>openstack@gentoo.org</email>
-    <name>Openstack</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="launchpad">swift</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sys-cluster/swift/swift-2.26.0.ebuild b/sys-cluster/swift/swift-2.26.0.ebuild
deleted file mode 100644
index eb0e61b3e73e..000000000000
--- a/sys-cluster/swift/swift-2.26.0.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2021 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 highly available, distributed, and eventually consistent object/blob store"
-HOMEPAGE="https://launchpad.net/swift"
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/openstack/swift.git"
-	EGIT_BRANCH="stable/victoria"
-else
-	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="account container doc +memcached +object proxy"
-REQUIRED_USE="|| ( proxy account container object )"
-
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.8[${PYTHON_USEDEP}]
-	!~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
-	!~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	dev-python/pyxattr[${PYTHON_USEDEP}]
-	>=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.0.2[${PYTHON_USEDEP}]
-	memcached? ( net-misc/memcached )
-	net-misc/rsync[xattr]
-	acct-user/swift
-	acct-group/swift"
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
-	~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
-	~ZFS"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
-		done
-	fi
-}
-
-src_prepare() {
-	sed -i 's/xattr/pyxattr/g' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /etc/swift
-	insinto /etc/swift
-
-	newins "etc/swift.conf-sample" "swift.conf"
-	newins "etc/rsyncd.conf-sample" "rsyncd.conf"
-	newins "etc/mime.types-sample" "mime.types-sample"
-	newins "etc/memcache.conf-sample" "memcache.conf-sample"
-	newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample"
-	newins "etc/dispersion.conf-sample" "dispersion.conf-sample"
-
-	if use proxy; then
-		newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
-		newins "etc/proxy-server.conf-sample" "proxy-server.conf"
-		if use memcached; then
-			sed -i '/depend/a\    need memcached' "${D}/etc/init.d/swift-proxy"
-		fi
-	fi
-	if use account; then
-		newinitd "${FILESDIR}/swift-account.initd" "swift-account"
-		newins "etc/account-server.conf-sample" "account-server.conf"
-	fi
-	if use container; then
-		newinitd "${FILESDIR}/swift-container.initd" "swift-container"
-		newins "etc/container-server.conf-sample" "container-server.conf"
-	fi
-	if use object; then
-		newinitd "${FILESDIR}/swift-object.initd" "swift-object"
-		newins "etc/object-server.conf-sample" "object-server.conf"
-		newins "etc/object-expirer.conf-sample" "object-expirer.conf"
-	fi
-
-	if use doc; then
-		doman doc/manpages/*
-		dodoc -r doc/{s3api,saio,source}
-	fi
-
-	fowners root:swift "/etc/swift"
-	fperms 0750 /etc/swift
-}
-
-pkg_postinst() {
-	elog "Openstack swift will default to using insecure http unless a"
-	elog "certificate is created in /etc/swift/cert.crt and the associated key"
-	elog "in /etc/swift/cert.key.  These can be created with the following:"
-	elog "  * cd /etc/swift"
-	elog "  * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
-}
diff --git a/sys-cluster/swift/swift-2.27.0.ebuild b/sys-cluster/swift/swift-2.27.0.ebuild
deleted file mode 100644
index 80af007635e8..000000000000
--- a/sys-cluster/swift/swift-2.27.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_8 python3_9 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 linux-info
-
-DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store"
-HOMEPAGE="https://launchpad.net/swift"
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/openstack/swift.git"
-	EGIT_BRANCH="stable/victoria"
-else
-	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="account container doc +memcached +object proxy"
-REQUIRED_USE="|| ( proxy account container object )"
-
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.8[${PYTHON_USEDEP}]
-	!~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
-	!~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	dev-python/pyxattr[${PYTHON_USEDEP}]
-	>=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.0.2[${PYTHON_USEDEP}]
-	memcached? ( net-misc/memcached )
-	net-misc/rsync[xattr]
-	acct-user/swift
-	acct-group/swift"
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
-	~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
-	~ZFS"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
-		done
-	fi
-}
-
-src_prepare() {
-	sed -i 's/xattr/pyxattr/g' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /etc/swift
-	insinto /etc/swift
-
-	newins "etc/swift.conf-sample" "swift.conf"
-	newins "etc/rsyncd.conf-sample" "rsyncd.conf"
-	newins "etc/mime.types-sample" "mime.types-sample"
-	newins "etc/memcache.conf-sample" "memcache.conf-sample"
-	newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample"
-	newins "etc/dispersion.conf-sample" "dispersion.conf-sample"
-
-	if use proxy; then
-		newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
-		newins "etc/proxy-server.conf-sample" "proxy-server.conf"
-		if use memcached; then
-			sed -i '/depend/a\    need memcached' "${D}/etc/init.d/swift-proxy"
-		fi
-	fi
-	if use account; then
-		newinitd "${FILESDIR}/swift-account.initd" "swift-account"
-		newins "etc/account-server.conf-sample" "account-server.conf"
-	fi
-	if use container; then
-		newinitd "${FILESDIR}/swift-container.initd" "swift-container"
-		newins "etc/container-server.conf-sample" "container-server.conf"
-	fi
-	if use object; then
-		newinitd "${FILESDIR}/swift-object.initd" "swift-object"
-		newins "etc/object-server.conf-sample" "object-server.conf"
-		newins "etc/object-expirer.conf-sample" "object-expirer.conf"
-	fi
-
-	if use doc; then
-		doman doc/manpages/*
-		dodoc -r doc/{s3api,saio,source}
-	fi
-
-	fowners root:swift "/etc/swift"
-	fperms 0750 /etc/swift
-}
-
-pkg_postinst() {
-	elog "Openstack swift will default to using insecure http unless a"
-	elog "certificate is created in /etc/swift/cert.crt and the associated key"
-	elog "in /etc/swift/cert.key.  These can be created with the following:"
-	elog "  * cd /etc/swift"
-	elog "  * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
-}
diff --git a/sys-cluster/swift/swift-2020.2.9999.ebuild b/sys-cluster/swift/swift-2020.2.9999.ebuild
deleted file mode 100644
index b24cf5f48802..000000000000
--- a/sys-cluster/swift/swift-2020.2.9999.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2021 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 highly available, distributed, and eventually consistent object/blob store"
-HOMEPAGE="https://launchpad.net/swift"
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/openstack/swift.git"
-	EGIT_BRANCH="stable/victoria"
-else
-	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="account container doc +memcached +object proxy"
-REQUIRED_USE="|| ( proxy account container object )"
-
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.8[${PYTHON_USEDEP}]
-	!~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
-	!~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	dev-python/pyxattr[${PYTHON_USEDEP}]
-	>=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.0.2[${PYTHON_USEDEP}]
-	memcached? ( net-misc/memcached )
-	net-misc/rsync[xattr]
-	acct-user/swift
-	acct-group/swift"
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
-	~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
-	~ZFS"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
-		done
-	fi
-}
-
-src_prepare() {
-	sed -i 's/xattr/pyxattr/g' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /etc/swift
-	insinto /etc/swift
-
-	newins "etc/swift.conf-sample" "swift.conf"
-	newins "etc/rsyncd.conf-sample" "rsyncd.conf"
-	newins "etc/mime.types-sample" "mime.types-sample"
-	newins "etc/memcache.conf-sample" "memcache.conf-sample"
-	newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample"
-	newins "etc/dispersion.conf-sample" "dispersion.conf-sample"
-
-	if use proxy; then
-		newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
-		newins "etc/proxy-server.conf-sample" "proxy-server.conf"
-		if use memcached; then
-			sed -i '/depend/a\    need memcached' "${D}/etc/init.d/swift-proxy"
-		fi
-	fi
-	if use account; then
-		newinitd "${FILESDIR}/swift-account.initd" "swift-account"
-		newins "etc/account-server.conf-sample" "account-server.conf"
-	fi
-	if use container; then
-		newinitd "${FILESDIR}/swift-container.initd" "swift-container"
-		newins "etc/container-server.conf-sample" "container-server.conf"
-	fi
-	if use object; then
-		newinitd "${FILESDIR}/swift-object.initd" "swift-object"
-		newins "etc/object-server.conf-sample" "object-server.conf"
-		newins "etc/object-expirer.conf-sample" "object-expirer.conf"
-	fi
-
-	if use doc; then
-		doman doc/manpages/*
-		dodoc -r doc/{s3api,saio,source}
-	fi
-
-	fowners root:swift "/etc/swift"
-	fperms 0750 /etc/swift
-}
-
-pkg_postinst() {
-	elog "Openstack swift will default to using insecure http unless a"
-	elog "certificate is created in /etc/swift/cert.crt and the associated key"
-	elog "in /etc/swift/cert.key.  These can be created with the following:"
-	elog "  * cd /etc/swift"
-	elog "  * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
-}
diff --git a/sys-cluster/swift/swift-2021.1.9999.ebuild b/sys-cluster/swift/swift-2021.1.9999.ebuild
deleted file mode 100644
index bb3c5496848d..000000000000
--- a/sys-cluster/swift/swift-2021.1.9999.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_8 python3_9 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 linux-info
-
-DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store"
-HOMEPAGE="https://launchpad.net/swift"
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/openstack/swift.git"
-	EGIT_BRANCH="stable/wallaby"
-else
-	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="account container doc +memcached +object proxy"
-REQUIRED_USE="|| ( proxy account container object )"
-
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.8[${PYTHON_USEDEP}]
-	!~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
-	!~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	dev-python/pyxattr[${PYTHON_USEDEP}]
-	>=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.0.2[${PYTHON_USEDEP}]
-	memcached? ( net-misc/memcached )
-	net-misc/rsync[xattr]
-	acct-user/swift
-	acct-group/swift"
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
-	~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
-	~ZFS"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
-		done
-	fi
-}
-
-src_prepare() {
-	sed -i 's/xattr/pyxattr/g' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /etc/swift
-	insinto /etc/swift
-
-	newins "etc/swift.conf-sample" "swift.conf"
-	newins "etc/rsyncd.conf-sample" "rsyncd.conf"
-	newins "etc/mime.types-sample" "mime.types-sample"
-	newins "etc/memcache.conf-sample" "memcache.conf-sample"
-	newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample"
-	newins "etc/dispersion.conf-sample" "dispersion.conf-sample"
-
-	if use proxy; then
-		newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
-		newins "etc/proxy-server.conf-sample" "proxy-server.conf"
-		if use memcached; then
-			sed -i '/depend/a\    need memcached' "${D}/etc/init.d/swift-proxy"
-		fi
-	fi
-	if use account; then
-		newinitd "${FILESDIR}/swift-account.initd" "swift-account"
-		newins "etc/account-server.conf-sample" "account-server.conf"
-	fi
-	if use container; then
-		newinitd "${FILESDIR}/swift-container.initd" "swift-container"
-		newins "etc/container-server.conf-sample" "container-server.conf"
-	fi
-	if use object; then
-		newinitd "${FILESDIR}/swift-object.initd" "swift-object"
-		newins "etc/object-server.conf-sample" "object-server.conf"
-		newins "etc/object-expirer.conf-sample" "object-expirer.conf"
-	fi
-
-	if use doc; then
-		doman doc/manpages/*
-		dodoc -r doc/{s3api,saio,source}
-	fi
-
-	fowners root:swift "/etc/swift"
-	fperms 0750 /etc/swift
-}
-
-pkg_postinst() {
-	elog "Openstack swift will default to using insecure http unless a"
-	elog "certificate is created in /etc/swift/cert.crt and the associated key"
-	elog "in /etc/swift/cert.key.  These can be created with the following:"
-	elog "  * cd /etc/swift"
-	elog "  * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
-}
author	V3n3RiX <venerix@redcorelinux.org>	2021-06-20 14:45:01 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-06-20 14:45:01 +0100
commit	34dea8e38f88007799629d0a56b12dec480b1d21 (patch)
tree	6790873994b58030360328cf5897d934b3b03d16 /sys-cluster
parent	7932d472a02d4c016ff7dff4b7a5479ab9d1883d (diff)