gentoo resync : 15.06.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
commit: d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree: 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /sys-cluster
parent: e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)
105 files changed, 343 insertions, 3263 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 9c45688adb54..9875dc8511e9 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 1e86ee878ab4..73d7af5da216 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 10514 BLAKE2B d4f43c7ccba4ea386f6ca7f68b143ec55115c1c21a6cc170b8925de8a314d4a5529581727b873ca5507e037033688d6d25506f9ebae9700dff710160ee82fca6 SHA512 d15fcdecd4e79c990edb1a04df8330282b3b861fe525f8620e7a48fdaeb411649deabfaab4d8c4fa874a2614aa24b10b98251b14071462baf1e502ccb3d58331
-EBUILD ceph-15.2.12.ebuild 10863 BLAKE2B 5c0396ea965b1b642989d6c1d311ac87ebdb66a75f17d1c462ebd8df41b2d135009cbd25a7a95dba248811fd1bb04f80feca25aa719ffc05498aac7395c39c54 SHA512 63b2d038a3d274a7c2aeec8322898f2aeacd76a95ef2d848aec84161ba2e1ab5dbe23ee9a6677eba41065f210333100d1aed437ceef6fad6af4e32e5d84895d6
-EBUILD ceph-15.2.13.ebuild 10759 BLAKE2B 38a9753f4d0e7afa73f5f0833fbb0773c5c99d9109e1ace88dad7db84b25a44b7155019713bb46ed136fa85da204b6aeabdb6f539bcb8681ca896529d518190f SHA512 cd34e35f43eefb64c41bba52dffd94f0b172a3d13aab55173187e671a5c77f0e2476de75472fe29dfb7b7380f197332bc2d245e4e23f842710e0bba4efe3976b
-EBUILD ceph-16.2.4.ebuild 11959 BLAKE2B ae99609c4f5f303c42f23b8941a4acea81696ca47a00bb0f0cf1e39edab32b3ac2b1dd20e0493deccee71bde402bacce390656af5ad536b736d95cd6a1abcbf2 SHA512 0cca6494dd99fa508ea61b3f08aee6bb0d205860aa8b410ee773f9855edbc823655c58a2ac51edeb2c1199c1158adf526ddd11237d8cda29d3ac4568e99476dc
+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
 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.ebuild
index dd17dadcdbb7..39e5b14a1c87 100644
--- a/sys-cluster/ceph/ceph-14.2.21.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.21.ebuild
@@ -140,9 +140,6 @@ RDEPEND="${DEPEND}
 		<dev-python/pyjwt-2.0[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/routes[${PYTHON_USEDEP}]
-		diskprediction? (
-			$(python_gen_cond_dep '<dev-python/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7})
-		)
 		sci-libs/scikit-learn[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 	)
diff --git a/sys-cluster/ceph/ceph-15.2.12.ebuild b/sys-cluster/ceph/ceph-15.2.12.ebuild
index d90c82927bc0..c342da2cf406 100644
--- a/sys-cluster/ceph/ceph-15.2.12.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.12.ebuild
@@ -148,9 +148,6 @@ RDEPEND="${DEPEND}
 		dev-python/pyjwt[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/routes[${PYTHON_USEDEP}]
-		diskprediction? (
-			$(python_gen_cond_dep '<dev-python/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7})
-		)
 		sci-libs/scikit-learn[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 	)
diff --git a/sys-cluster/ceph/ceph-15.2.13.ebuild b/sys-cluster/ceph/ceph-15.2.13.ebuild
index 6eee7a8e23ee..be518dbedbaa 100644
--- a/sys-cluster/ceph/ceph-15.2.13.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.13.ebuild
@@ -148,9 +148,6 @@ RDEPEND="${DEPEND}
 		dev-python/pyjwt[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/routes[${PYTHON_USEDEP}]
-		diskprediction? (
-			$(python_gen_cond_dep '<dev-python/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7})
-		)
 		sci-libs/scikit-learn[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 	)
diff --git a/sys-cluster/ceph/ceph-16.2.4.ebuild b/sys-cluster/ceph/ceph-16.2.4-r1.ebuild
index 8775e532d158..99d57305e48a 100644
--- a/sys-cluster/ceph/ceph-16.2.4.ebuild
+++ b/sys-cluster/ceph/ceph-16.2.4-r1.ebuild
@@ -44,7 +44,7 @@ DEPEND="
 	virtual/libudev:=
 	app-arch/bzip2:=
 	app-arch/lz4:=
-	app-arch/snappy:=
+	<app-arch/snappy-1.1.9:=
 	app-arch/zstd:=
 	app-shells/bash:0
 	app-misc/jq:=
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index 3e9ed62531e2..a7e6985d5e7c 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1,13 +1,8 @@
 AUX cinder.initd 494 BLAKE2B f919de45b8e39b65d355f627fcd71a4c23a7bb550157d25811c1d1f3a84b9f1c1e7c596361ec5d2aab650f1ebf3f0f053e313f2e15be64995d1309a6eafc8a69 SHA512 be3c2e6798b08527487cfd2b1cd66a03d891526a45f52c97a536b15a08d46a4162e3b036dcae86911c7dba25c5d7f02e73a089d4dd720526bf38ecd0f44c59b0
 AUX cinder.sudoersd 86 BLAKE2B 1ea49d3cf3bc134ea0a2d5512c6e258f117187267bfa408fea0d2449a091068e5404812a0e693f226d895ec23766ed73aca36128d6f7b968ae44dc38b8ad948a SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1
-DIST cinder-16.2.1.tar.gz 5531297 BLAKE2B c517515df669e9aafbc1b8d80e8f422bbe6cf55ded044d03fd21142fafdc2e81f5f211c5ce3f39f2fd965f324194635efa7b53aee05113abff8f9d2f6438f3f9 SHA512 37fd7025f4490a35214bf4ac90b5b8ec9d21752ab54295403e6d485e429ffe8172c33e692e5f516156a58358b35da60fc7a8f7f25daa4b0d405db25beadd59b7
 DIST cinder-17.1.0.tar.gz 5823116 BLAKE2B 08f8c4e9acdd46d27ad5e35b8602dc7722ff0f08f577183860138f9085f6744abeccf6943d556419cc7584504c3245c19cfd4f17db4164cc8a4c144aa8c112bd SHA512 f3e91945e81e5bb7edefba62050d3750ae5ab870903e55f46e8f0a5d3c140eada1df466d5fcc6623df8ad9688cad3c6519c712494cd20b8cfeb4b992e8f516cc
-DIST cinder.conf.sample-16.2.1 183294 BLAKE2B 5d0f28b9ad200d912c42c34ca030a5ec3660c57db332677e1b66b314a2865187862c83baf78d122fc0af7f73fbf4f0c7f04b9253882d228dcb863bfc88e37e72 SHA512 faf712a3da37af05e642b3c14f98ce8d4e3db5b736b208d7ca8a18be02ac5626c94b4ed314bd0030d5fa3771b325ba0f24ec3a45188d27fd9de79c97b56e2626
 DIST cinder.conf.sample-17.1.0 186451 BLAKE2B efc75cf3c5e852d411d9c2ed2080eb554a5f81c9b39a2ee9cf44add21842c05ea5b03cc66747da2182d2efc73d83b55323cecd4aa34db99369bf62b5ed1795bc SHA512 ee60a62ec8490a38c995f9c4a9ede8eeec631745bdbc9bc6e1d195370687de5d99aa8754ea017f23e6a9542b987842c7ffd7cf203bfed37f2a7ddbe61a82d517
-DIST cinder.conf.sample-2020.1.9999 183294 BLAKE2B 5d0f28b9ad200d912c42c34ca030a5ec3660c57db332677e1b66b314a2865187862c83baf78d122fc0af7f73fbf4f0c7f04b9253882d228dcb863bfc88e37e72 SHA512 faf712a3da37af05e642b3c14f98ce8d4e3db5b736b208d7ca8a18be02ac5626c94b4ed314bd0030d5fa3771b325ba0f24ec3a45188d27fd9de79c97b56e2626
 DIST cinder.conf.sample-2020.2.9999 186451 BLAKE2B efc75cf3c5e852d411d9c2ed2080eb554a5f81c9b39a2ee9cf44add21842c05ea5b03cc66747da2182d2efc73d83b55323cecd4aa34db99369bf62b5ed1795bc SHA512 ee60a62ec8490a38c995f9c4a9ede8eeec631745bdbc9bc6e1d195370687de5d99aa8754ea017f23e6a9542b987842c7ffd7cf203bfed37f2a7ddbe61a82d517
-EBUILD cinder-16.2.1.ebuild 7619 BLAKE2B d57b44eb94dc5c8d801e5bf2e3f3feb5df7d15dbdba18be79bbf326149263fe2e80e59901de8b3fdc0607056c8c25eaa4949a6bfd95e3d1973d2758640279d05 SHA512 d53be5d96f7e52c78557c179439a8ad7c370973f76c76adac18a4731cc7a5a5422fde24b7799416971d7b31e2e786536ec931fe42442ec49c9fa4ec74e322cc5
 EBUILD cinder-17.1.0.ebuild 6809 BLAKE2B 7583efe00fe72f25668a460071eda75cd1b3edc6f612bd295066a47e49df514124b861f7a888c8b2e6c37dfa7e5adca1ac99e6276d0ad8fc4c9f83fefedd937f SHA512 9381a7aa1f25196ee487f4a2139cf7762a1c1db4c94e51290869110bf3bb358f03be015199ea3a7db2928039548812f81178acfc89c2876c23e2eaa16ca4e6d4
-EBUILD cinder-2020.1.9999.ebuild 7621 BLAKE2B f8ac30564c6916d6501f9cecd828682a78bcd7c65bd1e9ddb399cf3aaddc04b6e6f6be6486c5cf51eb60fb7d8f41cb5ac6bbe14672a17d8dc082f104b117b9a0 SHA512 92d7ca472f63c8da8120770d56aca91b3fcfc1e627c80f1befdce5dd7f3d476518a151e4535edc57e79938227dc3755db0f50612c40dc6a71a3f48f16a5d7b92
 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-16.2.1.ebuild b/sys-cluster/cinder/cinder-16.2.1.ebuild
deleted file mode 100644
index 3cae0967f247..000000000000
--- a/sys-cluster/cinder/cinder-16.2.1.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 linux-info
-
-DESCRIPTION="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/ussuri/cinder.conf.sample -> cinder.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/cinder.git"
-	EGIT_BRANCH="stable/ussuri"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ussuri/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 )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="${CDEPEND}
-	app-admin/sudo"
-
-#	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]  # do not include, upstream depricated
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.21.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.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-4.35.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.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-1.32.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-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.34.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.4.0[${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.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.5.2[${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-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/rtslib-fb-2.1.65[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${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.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/tabulate-0.8.5[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-vmware-2.35.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-3.0.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-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
-	>=dev-python/cursive-0.2.1[${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.1.9999.ebuild b/sys-cluster/cinder/cinder-2020.1.9999.ebuild
deleted file mode 100644
index 107c02739ee1..000000000000
--- a/sys-cluster/cinder/cinder-2020.1.9999.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 linux-info
-
-DESCRIPTION="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/ussuri/cinder.conf.sample -> cinder.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/cinder.git"
-	EGIT_BRANCH="stable/ussuri"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ussuri/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 )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="${CDEPEND}
-	app-admin/sudo"
-
-#	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]  # do not include, upstream depricated
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.21.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.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-4.35.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.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-1.32.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-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.34.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.4.0[${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.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.5.2[${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-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/rtslib-fb-2.1.65[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${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.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/tabulate-0.8.5[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-vmware-2.35.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-3.0.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-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
-	>=dev-python/cursive-0.2.1[${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/galera/Manifest b/sys-cluster/galera/Manifest
index a761a510217d..0f52c7dde5f0 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -14,5 +14,5 @@ EBUILD galera-25.3.28-r1.ebuild 1787 BLAKE2B dfe11ca3f23116f4d703a9e72ff09985919
 EBUILD galera-25.3.32.ebuild 1726 BLAKE2B 69be6fa5fb2fcc79d844497c5e2c374caeefb7307620a66b93333330705a44587c0eedfa0eac8194606513bf453f42739f440e9f2704869d87ae20d02b58482a SHA512 cd89402a39cdc67e2d441106148de15928faa89d63cb93af57242ab95917467569b2342488b96dac860693dc4798627afb977ce30621edfe92f08eab46817858
 EBUILD galera-26.4.6.ebuild 1883 BLAKE2B 1c25c650cc1aaa24e15b5fe91075174ffe45292d184c78a4ad2a03c6f57576a1d27c428ad9d827308678920027061836e26679e0daf6132b51dbc1278e9c7d7e SHA512 50d2c6b0efb9e3d912ada92de0f1034bad21307b355b9bd3eb1b6edb9fa9c69e086a2dd10a257804377f03b76c60bfd134f70d7d460a95677efce8990aaaee5e
 EBUILD galera-26.4.7.ebuild 1780 BLAKE2B 3d1481060258879c4b2efd30f3923f7f3fd7b37d177941ff1b2ec15606cd77f28e242baa94b8214460cf6301a4ab7f48984b0feab4850022dff56be693415761 SHA512 f28a2fb4215ae66a14d5fc640df8e1a9b124881da616ef74e7ce2d3050630c74753cb1edeaff3c843a04505c5a99d2ae02fbd2b2f829493bcaf89f60cec94fda
-EBUILD galera-26.4.8.ebuild 1911 BLAKE2B c2786640640c1de2afc021b2e81e499c872d2dc7f0c20196234a47bdca93673141a4f54db25b216ac6e1bfd52c70e8690c5a3ad138592f37ff2eb871e71cb5f3 SHA512 91334dae3bc5ee9de845bc3a2401339cde31e0b0392359d1035c9c4e1f0aa88901af5ded8303ba5d192a54831e277744b607bd7d8a711982764d41fb17744946
+EBUILD galera-26.4.8.ebuild 1910 BLAKE2B 983152d37f7d2a9f753df58e14158b93755a8f387ee7a2c039ff2d0127b6d0373f55bce2730e6e6cf0f09f96c08ee9b3a5ede4dd64c7671dce4d5bc7218b3790 SHA512 933bc33374551a894756bae0da0eee2d38d79244ba39159b88eeece9c52d389d772925e876b0fd0cb91db5f9e296c2ffb21f19d6b497f4be81ecfb2169ad8db6
 MISC metadata.xml 462 BLAKE2B 1b0826bcb2bd93caa5f017b3c530d3bea18daac9f457dc79d6436d21f41b8c33d2979469df870cbc68428ba0110d17013bf9cd82f4f46d9be43bf996f7815e0c SHA512 b99987e53ae976905d3e493b09cbe35161f90b8ebfc88c4a9616b8722b0a0005c2427d509e15fdd7bbb30977266188452b3b6ec7479a943bce3a5922410246e2
diff --git a/sys-cluster/galera/galera-26.4.8.ebuild b/sys-cluster/galera/galera-26.4.8.ebuild
index b7e719146836..4cfe520cc94b 100644
--- a/sys-cluster/galera/galera-26.4.8.ebuild
+++ b/sys-cluster/galera/galera-26.4.8.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2 BSD"
 
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="cpu_flags_x86_sse4_2 garbd test"
 
 # Tests are currently broken, see
diff --git a/sys-cluster/heat/Manifest b/sys-cluster/heat/Manifest
index 6458c627c95a..999b90ec92d1 100644
--- a/sys-cluster/heat/Manifest
+++ b/sys-cluster/heat/Manifest
@@ -1,12 +1,7 @@
 AUX heat.initd 463 BLAKE2B c855fe1b4fe73fe93874add659c49133d1f83653acbb37e7ab9927641883196abb620f53e6b31f5cc39e7c59875d4af29b3d5b14eb2a1d67556e7fbf129c7705 SHA512 d6685d7751dfd6ece714c2b96c2d07419f13556f6f3d065a108943cb3bc90c4a51b66313b3e53db4f47f0577c411e859c89984d4764462857eb1ca1990ca847c
-DIST heat.conf.sample-14.1.0 76935 BLAKE2B 7d664c9ec9a9efdcd851ed9f864cfa0d07dd68d3698243182f41d7df5f14711c14fb0e9390fb367ac3715f3b69dab09e4a6e0cb1c6a308470cdc9eba836726c3 SHA512 ccf53ac37ac5424c228ff430855fd5af65aa70df2ca3c21b04a64deec8a01a65be3d5b9367c512148e82f44eba327b31007b952d930820cb773219950d4398b0
 DIST heat.conf.sample-15.0.0 77233 BLAKE2B 4c15a617a667aa72af08038d90a3935e68298fd240a2aef6fd877843a1c9a149315cda2a6c322762d57edb8f9c189407fe71ee2f30fde57aa40a6d7f8c132249 SHA512 4d7a31c171849451475e1fcfb4961051ad88472ab5e13c2e8809386889f00a73200d2f6e7155aa59d1bd00eb28e43e94987e7bc1e496d1c9f2ed003f0a8d96e2
-DIST heat.conf.sample-2020.1.9999 76935 BLAKE2B 7d664c9ec9a9efdcd851ed9f864cfa0d07dd68d3698243182f41d7df5f14711c14fb0e9390fb367ac3715f3b69dab09e4a6e0cb1c6a308470cdc9eba836726c3 SHA512 ccf53ac37ac5424c228ff430855fd5af65aa70df2ca3c21b04a64deec8a01a65be3d5b9367c512148e82f44eba327b31007b952d930820cb773219950d4398b0
 DIST heat.conf.sample-2020.2.9999 77233 BLAKE2B 4c15a617a667aa72af08038d90a3935e68298fd240a2aef6fd877843a1c9a149315cda2a6c322762d57edb8f9c189407fe71ee2f30fde57aa40a6d7f8c132249 SHA512 4d7a31c171849451475e1fcfb4961051ad88472ab5e13c2e8809386889f00a73200d2f6e7155aa59d1bd00eb28e43e94987e7bc1e496d1c9f2ed003f0a8d96e2
-DIST openstack-heat-14.1.0.tar.gz 2356647 BLAKE2B 0b4d009fcb631929bdc1e9a429e3370a546fb1763ab66439cd3791b1437417ef18da46f4bae8397bc5a661e09acbceb09d2f32dc06a190852f67989b900035ac SHA512 b74795ae10d29348b47c91d8de2166999ab51caef42521d9347565414ba1f2bbd2870c54af9d3877fe11e1388c900e64ed780a0e22a1270adea6cb1cc4971e0b
 DIST openstack-heat-15.0.0.tar.gz 2391827 BLAKE2B 50e7881a4114ba2ed6ba9067a7879382b5b3d61e2db8f113190a6194f8d34d1b06734a1e3b532805cfad23999ed233ea9c8fc369e1b269828653f346e28ddff7 SHA512 dd17f5cabadd90ab88adea3782a29802b0b4467c46c40dbd41ce68c08e2425b2eec362833b79cb739e16e6d5b137256cc4955afd5bd143e3a2e613d3b428dd5d
-EBUILD heat-14.1.0.ebuild 6514 BLAKE2B ff4d46e3643d6ffbf94776143ae3d94df7a885fa4415601ff714458f0ac58bf6072cf94d271920f74605e5878e31d2cc21e446c3c763a90ef97d4b322552492c SHA512 bf9005648cddafc9575619f55fd8a761a7d754fc2dd23d024ac322df01563548a3cd04ea9e196f79b2cd76393c44a24beca40b62d6a051f904e032b75b167ec5
 EBUILD heat-15.0.0.ebuild 6482 BLAKE2B 0f01840cc0d43a488e1f43d473be48685984bec01ec4026d1be6a4e22ad727d46706ee363fb86de732d7e5fee0a5a73e2cae1f57ca0992becec76e76b8eeac8f SHA512 6cc68c41baa317937695545f3a38913d4fbe0703767d8e513c442b4a37c5e54cb31ef841ca4d57677dfd94886b85202697c723e7d263c9ee0bfd8b0129b61ac1
-EBUILD heat-2020.1.9999.ebuild 6516 BLAKE2B 314bbd701f5698601c7258c20c4c2dd6f376d23e527fe80a01a54b0c0bf0b473e4ec335a6e93f5f9253d5bb7440d42859804d845a14e6e02df047a8bd12514e7 SHA512 e91ca81ca8a3436a52209e5db38a471fc988f38d210edd0647c79a6b4096febe638ed4fa8a0ff95db4b96648646039ebfc060a6e25912dd06bb752c9e12e52b0
 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/heat-14.1.0.ebuild b/sys-cluster/heat/heat-14.1.0.ebuild
deleted file mode 100644
index 5da74af0bd4d..000000000000
--- a/sys-cluster/heat/heat-14.1.0.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 linux-info
-
-DESCRIPTION="A 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.ussuri -> heat.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/heat.git"
-	EGIT_BRANCH="stable/ussuri"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ussuri -> 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 )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=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/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-3.4.1[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.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-4.27.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.12.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${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.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.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.1.9999.ebuild b/sys-cluster/heat/heat-2020.1.9999.ebuild
deleted file mode 100644
index 7afdc9082c50..000000000000
--- a/sys-cluster/heat/heat-2020.1.9999.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 linux-info
-
-DESCRIPTION="A 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.ussuri -> heat.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/heat.git"
-	EGIT_BRANCH="stable/ussuri"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ussuri -> 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 )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=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/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-3.4.1[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.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-4.27.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.12.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${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.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.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/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index b2fd68436f26..4acc8e69d948 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -6,7 +6,7 @@ AUX keepalived.service.conf 47 BLAKE2B b6e32bf8c8a602186af776d85c6c457aad2408bec
 DIST keepalived-2.0.20.tar.gz 1036063 BLAKE2B 217dee8c6dcb148119822f3c6a0b57482e91a17671a35333d0dccf04a3f7c6606a1c9e0b3f2a3adeab838fd91b7c714a0bf11895fe0c7d90d836d3585620c8e2 SHA512 36bbc4aa0a1045486e608c9f4ed73f4335b871dae88beaed10d86445474c462136885225cd6b61219a36fca2ff43771623bc6d072e406cf684acc2ca8f2a38f6
 DIST keepalived-2.1.5.tar.gz 1081559 BLAKE2B 791de7f24d012d77fbf9573713ab158cd91c08b969982b5d6bb86e5e6ed347281378dd5106a05db2f37fd9ab2eb479c131333b4b8c6983671b18652122fdbe37 SHA512 107d071aa1546023a3eb7c2cba4707ab6fbb10af62984ab41c9358b5e28289f8f277456983fe8649a15a77939734d3af573b8b050500d9eb521b4b0537f97aa6
 DIST keepalived-2.2.2.tar.gz 1159896 BLAKE2B 42ff86b4aa7c0a45a3472102107701262b44b780987ed93f3dde7005f61699c1488fd92fccb75f77ef5dcc83461428bbad79cc59cd4648a824a8bfbe7fbd2c34 SHA512 05bb589c76faa4d3f734ecb1a3e5ac40af006fe5dce962bcd9617f192e59bb5336a911b148c1530fb864333da87c3d42a6fbf7d0ef074f6a53ce5a71db8ec706
-EBUILD keepalived-2.0.20.ebuild 2001 BLAKE2B 2207a4c15a10335c03f8277eafe2f29cdd6c593c7ec918c15824e526d7d509afa4dfb3cca36e600e727a956a088df4310f86111db96451fc64a883595ced705c SHA512 7c61d2129c2a64b7ac27daeb0264df6837780dec2bc81a79cb7951d99ffa450b279141802b3e693b80ea066a8a377a2f67561516ff34e40efefae51f68bfdc37
-EBUILD keepalived-2.1.5.ebuild 2001 BLAKE2B 2207a4c15a10335c03f8277eafe2f29cdd6c593c7ec918c15824e526d7d509afa4dfb3cca36e600e727a956a088df4310f86111db96451fc64a883595ced705c SHA512 7c61d2129c2a64b7ac27daeb0264df6837780dec2bc81a79cb7951d99ffa450b279141802b3e693b80ea066a8a377a2f67561516ff34e40efefae51f68bfdc37
-EBUILD keepalived-2.2.2.ebuild 2148 BLAKE2B 9919920dea2bce53487693d68fce791766eba82b66e38beffe5687f5d0cafbd5636647a313fb2972ccc43571b018bc0d4f9b6c7e7c0e9c386761038acc4ff776 SHA512 6c0001610733bec4fb151ceb45345bd3539d8d8cf75301e16a1112df1ea4fd913abe62b3e2a8c8ceb5a53551f289816ceed1c01f535cdeb6fdda54a982c932f6
+EBUILD keepalived-2.0.20.ebuild 2000 BLAKE2B 78bc40bc66c58f9c339de897dbeb6d45ae93b129f7ddbce9616f464307481394a45691ad258001153f5125f7cc87c6858039653d00308de96a269f5e5166d4f5 SHA512 ce3e6d6f63c3cc65a93950dfee0b64a1782b14c011cf64e2452d36858e8aa42487b15465868bf759f2b3101723ae834dd6bc6e1dda7d524164680a3076d828ca
+EBUILD keepalived-2.1.5.ebuild 2000 BLAKE2B 78bc40bc66c58f9c339de897dbeb6d45ae93b129f7ddbce9616f464307481394a45691ad258001153f5125f7cc87c6858039653d00308de96a269f5e5166d4f5 SHA512 ce3e6d6f63c3cc65a93950dfee0b64a1782b14c011cf64e2452d36858e8aa42487b15465868bf759f2b3101723ae834dd6bc6e1dda7d524164680a3076d828ca
+EBUILD keepalived-2.2.2.ebuild 2147 BLAKE2B f8df9357c8adfe8c50bd7746e7e807d727a971a5248a3ddedbe57bf2917dc5ac1659cf5d168d84df4674b8a095e9f8599ddb144d9412ce43109fef6daf27b992 SHA512 91265586dcc506d64cfcbc167a6418d23523bbb62937e324bc29c346ed23fe7881c84fb1362b1ae01cb2e1ba44d874366607221d501a805013b0ad24250a685d
 MISC metadata.xml 529 BLAKE2B e20e135a1037fe1ce32a4321858160594512de8c13bb8bf67655fc431c7d6ebf8806db518a09c59e6724842577647a23bb7f310638025a85c5ee8e5fee4ee877 SHA512 3925927d7e0866283769f5582e77bfadf1708162e6aae6a5d1a605fda4a2b4c3de631b96718f5ea69ed5335445523ea1ec1e121a1372641dbec751285cb35dd2
diff --git a/sys-cluster/keepalived/keepalived-2.0.20.ebuild b/sys-cluster/keepalived/keepalived-2.0.20.ebuild
index 89feaa62df58..5deb4e2046eb 100644
--- a/sys-cluster/keepalived/keepalived-2.0.20.ebuild
+++ b/sys-cluster/keepalived/keepalived-2.0.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://www.keepalived.org/software/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
-IUSE="+bfd dbus -json regex snmp"
+IUSE="+bfd dbus json regex snmp"
 
 RDEPEND="dev-libs/libnl:=
 	dev-libs/openssl:=
diff --git a/sys-cluster/keepalived/keepalived-2.1.5.ebuild b/sys-cluster/keepalived/keepalived-2.1.5.ebuild
index 89feaa62df58..5deb4e2046eb 100644
--- a/sys-cluster/keepalived/keepalived-2.1.5.ebuild
+++ b/sys-cluster/keepalived/keepalived-2.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://www.keepalived.org/software/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
-IUSE="+bfd dbus -json regex snmp"
+IUSE="+bfd dbus json regex snmp"
 
 RDEPEND="dev-libs/libnl:=
 	dev-libs/openssl:=
diff --git a/sys-cluster/keepalived/keepalived-2.2.2.ebuild b/sys-cluster/keepalived/keepalived-2.2.2.ebuild
index 395a98ee08f7..cf42b4616536 100644
--- a/sys-cluster/keepalived/keepalived-2.2.2.ebuild
+++ b/sys-cluster/keepalived/keepalived-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://www.keepalived.org/software/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="+bfd dbus -json regex snmp systemd"
+IUSE="+bfd dbus json regex snmp systemd"
 
 RDEPEND="dev-libs/libnl:=
 	dev-libs/openssl:=
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index 6ba87de84170..7f17000f21ed 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -1,20 +1,12 @@
 AUX kube-apiserver.confd 116 BLAKE2B 2cf2dff516674ba4dc0763985a070b75e23f9af51e7334eedcb2593855e7481d5969ed458d322ac29de0e9a9c7f9f041911ee7aeca750ff77ce04fd60bf3a3d3 SHA512 302b2a7ec715967c0aa7d1c177d4e55b26e37ebba8d04dd37ecf627d20042fe91cd7e6192ff9d71422129b0ea54a9eec6046f505af550548bd450998924f37ee
 AUX kube-apiserver.initd 541 BLAKE2B ddddc86735a9f90a0c232f2631ac21c028045783c737d041a808fb5012522844614a40059524c472b9b50fd077253b75e2bcf33d69518d71428fcb7e27143fba SHA512 2863ad6d1d238b5e9557874cd3f5413108ed9424604cf026e2fd8c2fd66ba867ca9a3d98f67fdac54f335bacddf0479547b28f71aaa1db6580beff49290de110
 AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511a4623f85f01830c5e40d4ad4e44fe0b3f90d4143042d82bd83b0a2b11517e89037755ef2ad7afeeb23401bb60 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e
-DIST kubernetes-1.18.18.tar.gz 32427845 BLAKE2B 10e04ac2097a01702ea227f217b2346378b17a4040ac677ecde592544febe204c443c0a722d34617a8cc7db7d7909a9f9b6cfd84bc3e36e7862a72273bc45ef3 SHA512 8305cff40d08a40c6c8e71e9056fac6b76856a6e39ac8d2e3952c155a8c70a9d7c269725d55df180dd906d0ff6d9c8b9e17a58b00a08c86438f1435058163fd3
 DIST kubernetes-1.18.19.tar.gz 32437793 BLAKE2B d5212b8eb29635d8269f91880420bbc9c16e472583ffd659a08362e80f79beb9fb48945a48dacf0f68b6b4383db0d1e615b432ea1687c015f78e4bc7aef94189 SHA512 aba80c2d5d2296bc2453a1519c29034a4f5e52373dc366186c295154960744f2d7fbae0b9cd1c64044bbb5cd9007b182dc4f60e57e991d28b3c8f0fc8cb279fb
-DIST kubernetes-1.19.10.tar.gz 33529312 BLAKE2B 8566eaf43beab26fe781e3520be147620a256d2b9fc895d51c3707dfb34c8e53667527bab23d6b1b5a64dee291893ec69a3bfa54b72da0e0e9a7f27acbd0c7d1 SHA512 7a69062be5a2fd0522f03077edb023e59f4887580f3018e4a3c1726c888d1123e3beb1adce58e7ff4b658bd3f1eb8e650f022f88c2d0abbc561acec164028cf5
 DIST kubernetes-1.19.11.tar.gz 33549052 BLAKE2B 5c17aae668a1e8c2eb656330a990786edf18a72d655ef23e55d9b02aa2a23ac07eeab5fdf4bfda2141e8ae2e9db3559bf8f402c8b984ae152aa955cff0ee3e22 SHA512 42a8c65eac4d4c2b9531fab578c9f605a1d57b3d892e2650ec87e3b1972e58f438dbf9f5c05ec2eb529218c43c8e391e3a294467c82ceffe94cc90b35e619242
-DIST kubernetes-1.20.6.tar.gz 34478669 BLAKE2B 82e3aac07e9f360cda6854f4ff51082e96648c1a78888a6dd43530b31404089cd1eaa2805fa9896dfa1bdef03ebdd04b6dda8ba948d8b16be28534390554da5e SHA512 b3df8266c597b3e2270e7caea24129ebc8fa258e32e747c1e48ede5ad0244c791f9da39bcaf7c08df8c1b314976742db23ecaa4623ab241f87a80d4834a0948f
 DIST kubernetes-1.20.7.tar.gz 34486823 BLAKE2B b0467ecb4527a6de3955185ea377248bbf0b83624af8afd4bf8f33cb2a5e33d0433ea98b3f984a38c59ad9fd6a8cf3e8124eadc81cbe337ca7bc4bce53d4f9ed SHA512 ccb8ac6f1d9535791386ee73ba5008180e1a77fcdc320363248037117547eb6c59d25c46ea1d5bb49043717e2b6a1796470b3b677229a7a40fd6cd1f4b8ab695
-DIST kubernetes-1.21.0.tar.gz 37484462 BLAKE2B 78ae44985eccf9e17d58ccb3f9c98dcc469059e17375b016d82df6d5ce02451e0bcac49cdd89d5ae82bd718191e83fbf6e128ae3a4d14569460febd0c027edf3 SHA512 f5928f5aad0ce1dee7db145a798c5038aa5ca085a09ba9a2da5cabb36c54f2adc86ec5948d4cf344544c45c29d18e7b9f04bf14c4a91aab637c7244fcf3f80d8
 DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
-EBUILD kube-apiserver-1.18.18.ebuild 975 BLAKE2B bef47882dfc4d6ff525c792b23a7578715f8868c1f7d1417adbf10688130ef79dc7a3f352b811bdd5f05857d3c16be2eca17cc7bbae0edef222a18f01fd2d1ad SHA512 e1d3c64092bb131439115024ab9fa5f51289fc0f29d7f2fdde32e184371a57b6a8b1a57dfc407358200ff573cb2fc6097f1c3dd579cf57f47528f0f581323dbe
-EBUILD kube-apiserver-1.18.19.ebuild 976 BLAKE2B 812d6dedcd0657a5132b6ddb630a82ad8bc017536beec23d688cd4bd2d30aae0804d3768e9ede78ada2691dd621cf9f96af132b9d265c8432d5624a3381c81e6 SHA512 0f5348ce253d37772042fb19f6bcd037cd0f88f8ce5ec146e8a927a594a72a52bfa7fd35e7b4906369705522aaebac4d669aed232dba59965c430e527cfac586
-EBUILD kube-apiserver-1.19.10.ebuild 1011 BLAKE2B e379517c1e19e309e5151e8919d04dcee5573c36da9cc6794c3b523da3b65e929a68dc10c86e22330e94f710005b07936fb252df8f2f7f730910705e92a56129 SHA512 c0bff494da8b557f348ca19d92d748a9490e03b7eef4cf80239a2ac01478cd3fbe3b8c477034e95d9b8405936daefe47cf47371378188a3a989368e3dade5b6d
-EBUILD kube-apiserver-1.19.11.ebuild 1012 BLAKE2B 06cc1b6c301fc5ee4e7e9aff9bfec6c0e51764494609e2c154ad8e0cb33cb1dcf493cd99fbb0ed8bcdb753db31b142ffa50d11e666d01e6f10352d41d3582c7a SHA512 9c46b95d73968b35414d69e16bb18b56fad6abe9d0aab2c84d855cd9dc1e75f53406d6fea8fa4da9971747bbb84c021227684898e7f4d3f6b9bd699a8c1f417c
-EBUILD kube-apiserver-1.20.6.ebuild 1011 BLAKE2B e379517c1e19e309e5151e8919d04dcee5573c36da9cc6794c3b523da3b65e929a68dc10c86e22330e94f710005b07936fb252df8f2f7f730910705e92a56129 SHA512 c0bff494da8b557f348ca19d92d748a9490e03b7eef4cf80239a2ac01478cd3fbe3b8c477034e95d9b8405936daefe47cf47371378188a3a989368e3dade5b6d
-EBUILD kube-apiserver-1.20.7.ebuild 1012 BLAKE2B 06cc1b6c301fc5ee4e7e9aff9bfec6c0e51764494609e2c154ad8e0cb33cb1dcf493cd99fbb0ed8bcdb753db31b142ffa50d11e666d01e6f10352d41d3582c7a SHA512 9c46b95d73968b35414d69e16bb18b56fad6abe9d0aab2c84d855cd9dc1e75f53406d6fea8fa4da9971747bbb84c021227684898e7f4d3f6b9bd699a8c1f417c
-EBUILD kube-apiserver-1.21.0.ebuild 1012 BLAKE2B d3f9db4f7631a00bee5bec5e14addbaa8f16c1fcdd499b434d5dc255acba09e0c6c537607e4a2ad3b9f027bc7a24000b44826eb8e25aa3fc5b4236695ea14f67 SHA512 643bd11525041d2507413fac4998100281c9b784a52cf814849d61bb374d17ff66644ca4c857968c08554eaa1f77481a0406bb8002695e72d1c8f677ee9326ab
-EBUILD kube-apiserver-1.21.1.ebuild 1012 BLAKE2B d3f9db4f7631a00bee5bec5e14addbaa8f16c1fcdd499b434d5dc255acba09e0c6c537607e4a2ad3b9f027bc7a24000b44826eb8e25aa3fc5b4236695ea14f67 SHA512 643bd11525041d2507413fac4998100281c9b784a52cf814849d61bb374d17ff66644ca4c857968c08554eaa1f77481a0406bb8002695e72d1c8f677ee9326ab
+EBUILD kube-apiserver-1.18.19.ebuild 975 BLAKE2B 46fc8c70b370b4ae9fe2a3a5f627bdf7f45626605daec2b36a9b6352624bb62a37c3dc9c338e2fe2ad59aa6005be64390b6ef2c3b69b71e0f0a58f4d102cf4c0 SHA512 a8e56862b198c338faff6d950db23c33c562f0da0981ac0e24524238070250012b5f25b64b6b956a042e0a029589461fec7bf12aa844f90b2bbd15f70f7c6022
+EBUILD kube-apiserver-1.19.11.ebuild 1011 BLAKE2B 566109dae1b25fd1d3c1c5a7d2553482a3cb30a286dc128163a3b3cd389623812111a9966b8c1650e31f47cf45ef5173cb8de1cd332674d3f33fafcf17897f0d SHA512 0749b4858729c72d1d5ea53d130180245de055eb7e03f8864fff208bca6d7fdd6073791d22c31fc4e14b47a36d2c02234a6507b2e5f438327662c9c87b6c52af
+EBUILD kube-apiserver-1.20.7.ebuild 1011 BLAKE2B 566109dae1b25fd1d3c1c5a7d2553482a3cb30a286dc128163a3b3cd389623812111a9966b8c1650e31f47cf45ef5173cb8de1cd332674d3f33fafcf17897f0d SHA512 0749b4858729c72d1d5ea53d130180245de055eb7e03f8864fff208bca6d7fdd6073791d22c31fc4e14b47a36d2c02234a6507b2e5f438327662c9c87b6c52af
+EBUILD kube-apiserver-1.21.1.ebuild 1011 BLAKE2B e12c4b1626234585bd58ceb9d8adf620a6277f2c41e9d880333d77a5c41a4250b470b13c2f000e99361fce1eb2e1cf2e02d9ecedfd0d47c306a744697a4900b8 SHA512 8928db8027f8022c2555a4aee889f8eb42d62bcc478cffd7eaa86e7a584b4f2d36f4e4ee445445c5c6989bdd96b665df0730ae7621db88a55a9f010c4695a280
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.18.18.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.18.18.ebuild
deleted file mode 100644
index b37dff4ea499..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.18.18.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="hardened"
-
-COMMON_DEPEND="
-	acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/kubernetes"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.18.19.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.18.19.ebuild
index 49d7e68c4096..d974386a034c 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.18.19.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.18.19.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="hardened"
 
 COMMON_DEPEND="
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.19.10.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.19.10.ebuild
deleted file mode 100644
index c7e9121eb778..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.19.10.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="
-	acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.15"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.19.11.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.19.11.ebuild
index eddbed5f2447..bdbcc2cd8a20 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.19.11.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.19.11.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.20.6.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.20.6.ebuild
deleted file mode 100644
index c7e9121eb778..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.20.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="
-	acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.15"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.20.7.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.20.7.ebuild
index eddbed5f2447..bdbcc2cd8a20 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.20.7.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.20.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.21.0.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.21.0.ebuild
deleted file mode 100644
index 4ad13d1aaaca..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.21.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="
-	acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.21.1.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.21.1.ebuild
index 4ad13d1aaaca..e5b9ef6d3840 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.21.1.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.21.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index c2c2a5ebf0bd..223c6f84fb78 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -1,20 +1,12 @@
 AUX kube-controller-manager.confd 142 BLAKE2B d8d35c62bf5c04cc3f440e8b5fb8acab2cf815b25ac4e91354e3fce756a1955e71ec762fab1091074ef4233fff22667aba50417c0d6a896055f8f52b6630bb4e SHA512 b0227a7431018a6742b3931fda0f14b4a040107ecd6821c84593180919ba8a5af9b99b7a507645a5488792f14accd686acc4cc6f70a5084bbdfcdd494021aafc
 AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544f214921672e60fffa2d6f77dbeb1912b3d1d138f867d8118cef5ae0843b75d3859ebfc71a4defc2b4cf66426a58101 SHA512 7e3baab9b034e7048ed3cda8d09444c76369874cecc0a747fb5484c482fef464adb5ccc25fcb4481fb4aff68415a60462f6cbee2138810316f0cf822637676c1
 AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
-DIST kubernetes-1.18.18.tar.gz 32427845 BLAKE2B 10e04ac2097a01702ea227f217b2346378b17a4040ac677ecde592544febe204c443c0a722d34617a8cc7db7d7909a9f9b6cfd84bc3e36e7862a72273bc45ef3 SHA512 8305cff40d08a40c6c8e71e9056fac6b76856a6e39ac8d2e3952c155a8c70a9d7c269725d55df180dd906d0ff6d9c8b9e17a58b00a08c86438f1435058163fd3
 DIST kubernetes-1.18.19.tar.gz 32437793 BLAKE2B d5212b8eb29635d8269f91880420bbc9c16e472583ffd659a08362e80f79beb9fb48945a48dacf0f68b6b4383db0d1e615b432ea1687c015f78e4bc7aef94189 SHA512 aba80c2d5d2296bc2453a1519c29034a4f5e52373dc366186c295154960744f2d7fbae0b9cd1c64044bbb5cd9007b182dc4f60e57e991d28b3c8f0fc8cb279fb
-DIST kubernetes-1.19.10.tar.gz 33529312 BLAKE2B 8566eaf43beab26fe781e3520be147620a256d2b9fc895d51c3707dfb34c8e53667527bab23d6b1b5a64dee291893ec69a3bfa54b72da0e0e9a7f27acbd0c7d1 SHA512 7a69062be5a2fd0522f03077edb023e59f4887580f3018e4a3c1726c888d1123e3beb1adce58e7ff4b658bd3f1eb8e650f022f88c2d0abbc561acec164028cf5
 DIST kubernetes-1.19.11.tar.gz 33549052 BLAKE2B 5c17aae668a1e8c2eb656330a990786edf18a72d655ef23e55d9b02aa2a23ac07eeab5fdf4bfda2141e8ae2e9db3559bf8f402c8b984ae152aa955cff0ee3e22 SHA512 42a8c65eac4d4c2b9531fab578c9f605a1d57b3d892e2650ec87e3b1972e58f438dbf9f5c05ec2eb529218c43c8e391e3a294467c82ceffe94cc90b35e619242
-DIST kubernetes-1.20.6.tar.gz 34478669 BLAKE2B 82e3aac07e9f360cda6854f4ff51082e96648c1a78888a6dd43530b31404089cd1eaa2805fa9896dfa1bdef03ebdd04b6dda8ba948d8b16be28534390554da5e SHA512 b3df8266c597b3e2270e7caea24129ebc8fa258e32e747c1e48ede5ad0244c791f9da39bcaf7c08df8c1b314976742db23ecaa4623ab241f87a80d4834a0948f
 DIST kubernetes-1.20.7.tar.gz 34486823 BLAKE2B b0467ecb4527a6de3955185ea377248bbf0b83624af8afd4bf8f33cb2a5e33d0433ea98b3f984a38c59ad9fd6a8cf3e8124eadc81cbe337ca7bc4bce53d4f9ed SHA512 ccb8ac6f1d9535791386ee73ba5008180e1a77fcdc320363248037117547eb6c59d25c46ea1d5bb49043717e2b6a1796470b3b677229a7a40fd6cd1f4b8ab695
-DIST kubernetes-1.21.0.tar.gz 37484462 BLAKE2B 78ae44985eccf9e17d58ccb3f9c98dcc469059e17375b016d82df6d5ce02451e0bcac49cdd89d5ae82bd718191e83fbf6e128ae3a4d14569460febd0c027edf3 SHA512 f5928f5aad0ce1dee7db145a798c5038aa5ca085a09ba9a2da5cabb36c54f2adc86ec5948d4cf344544c45c29d18e7b9f04bf14c4a91aab637c7244fcf3f80d8
 DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
-EBUILD kube-controller-manager-1.18.18.ebuild 966 BLAKE2B 8c9c1778634b786e9eeef0e554e512fb28abcd615cd7e1c7de19e4a55a5d1abccaac1da3efd9552234da0479519a1573e62a5eaf529092e1188aa7e455b52404 SHA512 b5544a072376fdf94fb8dfd39e3c940d47b656f31bc2027621c5c2ee1b071521c8a368d26f64070228c1488b4d0c910540e8c3cedda49a8b70e8a7b29e0eee66
-EBUILD kube-controller-manager-1.18.19.ebuild 967 BLAKE2B f3bd71d34cc101f228dfd1a9a96b342493f5546d6f408076908efb7e134bcc6bd9a898908fd85a71889a2d5360e96cf7f09ab1320db0d237240992250d8e5d51 SHA512 10cfe6208b1ee4252aeb659a15bd256177c8699aae94d0d2bacc51e617adad9b6ff9c297acedbdd2711b5c6cf979087a45620e0b14c5d9ee8e5a59749bb39463
-EBUILD kube-controller-manager-1.19.10.ebuild 1013 BLAKE2B ece69494aaf4069df77f5b59f69194bc9026ff0ff9c99c26d01871c79d79cdb9690b6ef0e23548aa9d949fc2a3d498d90ae3343d718d75f8c5fc064f15fc82f4 SHA512 b4cd7597206d1a0689ae8fc8592ecf2b438e386d8a65057b60aafc8fb2614d1ce0a16ef92d3e807c4dc93177786f93f9a10f00d0dfe091abd3a6c01ec34c5142
-EBUILD kube-controller-manager-1.19.11.ebuild 1014 BLAKE2B bf46369c9a72568037c40455a8342cc94c7f6a928bbd4012cadf2aed7c057f3f1490dc232e4aee7c2848e4591a10ebfcfb50b08170cfbc1015ffd8a0894ac2a9 SHA512 5c88fc9377e1244a97eb0b23458c1b7e935d749aea5b7f045a6e32607bd2dd9a04321167dd5d4915aa78aadd75798e388cd2cb40277b787daccbd750e765210f
-EBUILD kube-controller-manager-1.20.6.ebuild 1013 BLAKE2B ece69494aaf4069df77f5b59f69194bc9026ff0ff9c99c26d01871c79d79cdb9690b6ef0e23548aa9d949fc2a3d498d90ae3343d718d75f8c5fc064f15fc82f4 SHA512 b4cd7597206d1a0689ae8fc8592ecf2b438e386d8a65057b60aafc8fb2614d1ce0a16ef92d3e807c4dc93177786f93f9a10f00d0dfe091abd3a6c01ec34c5142
-EBUILD kube-controller-manager-1.20.7.ebuild 1014 BLAKE2B bf46369c9a72568037c40455a8342cc94c7f6a928bbd4012cadf2aed7c057f3f1490dc232e4aee7c2848e4591a10ebfcfb50b08170cfbc1015ffd8a0894ac2a9 SHA512 5c88fc9377e1244a97eb0b23458c1b7e935d749aea5b7f045a6e32607bd2dd9a04321167dd5d4915aa78aadd75798e388cd2cb40277b787daccbd750e765210f
-EBUILD kube-controller-manager-1.21.0.ebuild 1014 BLAKE2B fff067c08b078e53395d941ce9b944510376aa4f16d7534ab0512492ff94a4a458590d45176ae1d9f55921de7c80a0a38b017de4dfa00e7de19d07ed1b384449 SHA512 6554108b79864865e2e7e3921573925b99d4b1257c38fb81cff2f932ae74ed06c6e090c66a108c90348266c0146bfb34230b2543f41aee933104e7ef3e116d16
-EBUILD kube-controller-manager-1.21.1.ebuild 1014 BLAKE2B fff067c08b078e53395d941ce9b944510376aa4f16d7534ab0512492ff94a4a458590d45176ae1d9f55921de7c80a0a38b017de4dfa00e7de19d07ed1b384449 SHA512 6554108b79864865e2e7e3921573925b99d4b1257c38fb81cff2f932ae74ed06c6e090c66a108c90348266c0146bfb34230b2543f41aee933104e7ef3e116d16
+EBUILD kube-controller-manager-1.18.19.ebuild 966 BLAKE2B 2f0ddb82c8607d193aef1444912d82125578d41d62fc2b48b1512e2775903fccde7cd139c3c718b484f80fb6fa13567c33f78574a69a198ee6a459fd1ed7d68e SHA512 ba9c6f7a4bd05686357f7a7fb771c34bdc6dfdcb7bac2fbaf1fc6c977b9c5a05b65d55f188b8cc02583328baf80087d9b3f633f17a3f5f291cffaab542389c4f
+EBUILD kube-controller-manager-1.19.11.ebuild 1013 BLAKE2B 3c2b2e91482958bf1985544e059aa22a6e3ce2ece7d2a18f0c8959854370977d8f4459b4c5a331ef1cadfffa6076114a9d301346498dd6294ec63c3e38c5e06a SHA512 9576d01ca501bd09ea3717be93f5ab1ecd137c59866a8366ec1b0bfa5b544e8b463c902e40119487e0df63d6b7d9ea528a6f13a2abbe2b06df9094191972ba83
+EBUILD kube-controller-manager-1.20.7.ebuild 1013 BLAKE2B 3c2b2e91482958bf1985544e059aa22a6e3ce2ece7d2a18f0c8959854370977d8f4459b4c5a331ef1cadfffa6076114a9d301346498dd6294ec63c3e38c5e06a SHA512 9576d01ca501bd09ea3717be93f5ab1ecd137c59866a8366ec1b0bfa5b544e8b463c902e40119487e0df63d6b7d9ea528a6f13a2abbe2b06df9094191972ba83
+EBUILD kube-controller-manager-1.21.1.ebuild 1013 BLAKE2B 4590d4d6cb14abec9f934f70408129c8d4aa8da8e6ff7561089e57aa344feced5dfc761def4631228a0eb25caaa3f7bdbaf94b943e234c19b23ed8c3618fcc44 SHA512 d956b305015ddb278f46fefaffd53124fafe416ac155590108cc7496709f96caeae812b151bde8771fc2741be7adb16a10ee621b9362e8177b0ab8be8a90afd9
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.18.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.18.ebuild
deleted file mode 100644
index ff369dd8cd5f..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.18.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/kubernetes"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.19.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.19.ebuild
index fd520d1073ea..644054a9b231 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.19.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.19.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-controller-manager
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.10.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.10.ebuild
deleted file mode 100644
index 1ebd04eb6335..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.10.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.15"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.11.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.11.ebuild
index e61ad6675f61..a0e7c754582c 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.11.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.11.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-controller-manager
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.6.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.6.ebuild
deleted file mode 100644
index 1ebd04eb6335..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.15"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.7.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.7.ebuild
index e61ad6675f61..a0e7c754582c 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.7.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-controller-manager
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.21.0.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.21.0.ebuild
deleted file mode 100644
index 68d01d0642b7..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.21.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.21.1.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.21.1.ebuild
index 68d01d0642b7..7080ad786a90 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.21.1.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.21.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-controller-manager
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index a30b5e7598ec..dc7130e1e7ce 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -1,20 +1,12 @@
 AUX kube-proxy.confd 53 BLAKE2B 0cd5fc844dc21f63786ef21d972210ac02ea55165b05cef8810268f894e3466cea4d82c7882e56d6a0bf425311adbf6a55e3e3fe351b9a1a7ce1d9e1e087018b SHA512 4c8c34ae8668bcfa5167c2d2af006fc46b461a5dafb3ec5b64cb8cdf2a830c22ddb5cf806c93b1404f60dabf91b4153724947fa2d2c494376f20e637eeed5018
 AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe464d672d00ecf5b5fffd349a6affcd8ae3ea0ba06160be72f31cfa2d918c01050e83640fb9956917dc0 SHA512 088d91cd77e614f7857d65496f5b6d486741a8e3358b3e13bcd4203d35a76fa3aa390f658065e2826145525b6e83fcd33f8365a873e99b522f3ab7e8615ed364
 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
-DIST kubernetes-1.18.18.tar.gz 32427845 BLAKE2B 10e04ac2097a01702ea227f217b2346378b17a4040ac677ecde592544febe204c443c0a722d34617a8cc7db7d7909a9f9b6cfd84bc3e36e7862a72273bc45ef3 SHA512 8305cff40d08a40c6c8e71e9056fac6b76856a6e39ac8d2e3952c155a8c70a9d7c269725d55df180dd906d0ff6d9c8b9e17a58b00a08c86438f1435058163fd3
 DIST kubernetes-1.18.19.tar.gz 32437793 BLAKE2B d5212b8eb29635d8269f91880420bbc9c16e472583ffd659a08362e80f79beb9fb48945a48dacf0f68b6b4383db0d1e615b432ea1687c015f78e4bc7aef94189 SHA512 aba80c2d5d2296bc2453a1519c29034a4f5e52373dc366186c295154960744f2d7fbae0b9cd1c64044bbb5cd9007b182dc4f60e57e991d28b3c8f0fc8cb279fb
-DIST kubernetes-1.19.10.tar.gz 33529312 BLAKE2B 8566eaf43beab26fe781e3520be147620a256d2b9fc895d51c3707dfb34c8e53667527bab23d6b1b5a64dee291893ec69a3bfa54b72da0e0e9a7f27acbd0c7d1 SHA512 7a69062be5a2fd0522f03077edb023e59f4887580f3018e4a3c1726c888d1123e3beb1adce58e7ff4b658bd3f1eb8e650f022f88c2d0abbc561acec164028cf5
 DIST kubernetes-1.19.11.tar.gz 33549052 BLAKE2B 5c17aae668a1e8c2eb656330a990786edf18a72d655ef23e55d9b02aa2a23ac07eeab5fdf4bfda2141e8ae2e9db3559bf8f402c8b984ae152aa955cff0ee3e22 SHA512 42a8c65eac4d4c2b9531fab578c9f605a1d57b3d892e2650ec87e3b1972e58f438dbf9f5c05ec2eb529218c43c8e391e3a294467c82ceffe94cc90b35e619242
-DIST kubernetes-1.20.6.tar.gz 34478669 BLAKE2B 82e3aac07e9f360cda6854f4ff51082e96648c1a78888a6dd43530b31404089cd1eaa2805fa9896dfa1bdef03ebdd04b6dda8ba948d8b16be28534390554da5e SHA512 b3df8266c597b3e2270e7caea24129ebc8fa258e32e747c1e48ede5ad0244c791f9da39bcaf7c08df8c1b314976742db23ecaa4623ab241f87a80d4834a0948f
 DIST kubernetes-1.20.7.tar.gz 34486823 BLAKE2B b0467ecb4527a6de3955185ea377248bbf0b83624af8afd4bf8f33cb2a5e33d0433ea98b3f984a38c59ad9fd6a8cf3e8124eadc81cbe337ca7bc4bce53d4f9ed SHA512 ccb8ac6f1d9535791386ee73ba5008180e1a77fcdc320363248037117547eb6c59d25c46ea1d5bb49043717e2b6a1796470b3b677229a7a40fd6cd1f4b8ab695
-DIST kubernetes-1.21.0.tar.gz 37484462 BLAKE2B 78ae44985eccf9e17d58ccb3f9c98dcc469059e17375b016d82df6d5ce02451e0bcac49cdd89d5ae82bd718191e83fbf6e128ae3a4d14569460febd0c027edf3 SHA512 f5928f5aad0ce1dee7db145a798c5038aa5ca085a09ba9a2da5cabb36c54f2adc86ec5948d4cf344544c45c29d18e7b9f04bf14c4a91aab637c7244fcf3f80d8
 DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
-EBUILD kube-proxy-1.18.18.ebuild 892 BLAKE2B 6c1ee99fe5ec365d42060d191849745a6324e4dfc9d21dc3794dd2750e951e35c2202ed9bb70b136bcf7d4f7bcbf7eb12dba02af8264de29699b02fbad7dfb4e SHA512 a35e418cbdac12f0ab44f690f368ea302e50c182d08e86ffb6f6eb344e646ea2e2a95d075c3be479f8e7d7f9b876a2e1674a3a1c06d3b99719435cfc000791f7
-EBUILD kube-proxy-1.18.19.ebuild 893 BLAKE2B fb0815f05971fdcbf04f6b94850dcc5a3c1bd6692fcbf2c1bb6b5f9a5df5d21f25d44d4bafacd21ea9cd6cb5a52d47e9c6e26b9bf76c5139d3ba734b383c5c6b SHA512 5121058bbd622bfd4bb9b4a60a86ed6d7ed72ab581f72178a500d13a8a588404e639ae350242a22d4acc386209a2dce39103a5606ded2a6a677c201ce6f7a449
-EBUILD kube-proxy-1.19.10.ebuild 928 BLAKE2B 34644b672e168243d5589eca39c2bad64d5b5fdd41d022cad64a9d9792a14856e5ed55f7868739af44ee039d8184c2a57e0c076adf59498be9d961f312a3cb17 SHA512 0372233c7948b6206d4aada693a4093fc439dd7390de682b6a363fcf8a3e5915213065b30773cdbaa2e2557e3c19db721df1ce4239cf01ae88366fba525bfc68
-EBUILD kube-proxy-1.19.11.ebuild 929 BLAKE2B 81abfe44a4025e907542f6935af1c953920d3c730008b4db082800626542265955c07b4277e39d9b8517273fc89bb87e7ca29217dd68cad235d8138fb005232b SHA512 fe6d3657c95c46a1bc87f2c0abb9e8e98eeb11c8cd48810ae94a49739b04f401b32b00522c14a488d7f043d721cda9967937b1c177765cdfa07c9add4300a99c
-EBUILD kube-proxy-1.20.6.ebuild 928 BLAKE2B 34644b672e168243d5589eca39c2bad64d5b5fdd41d022cad64a9d9792a14856e5ed55f7868739af44ee039d8184c2a57e0c076adf59498be9d961f312a3cb17 SHA512 0372233c7948b6206d4aada693a4093fc439dd7390de682b6a363fcf8a3e5915213065b30773cdbaa2e2557e3c19db721df1ce4239cf01ae88366fba525bfc68
-EBUILD kube-proxy-1.20.7.ebuild 929 BLAKE2B 81abfe44a4025e907542f6935af1c953920d3c730008b4db082800626542265955c07b4277e39d9b8517273fc89bb87e7ca29217dd68cad235d8138fb005232b SHA512 fe6d3657c95c46a1bc87f2c0abb9e8e98eeb11c8cd48810ae94a49739b04f401b32b00522c14a488d7f043d721cda9967937b1c177765cdfa07c9add4300a99c
-EBUILD kube-proxy-1.21.0.ebuild 929 BLAKE2B 457168acecb296450df17416cccfa8c23a41236489150d3e47da3287b0e43d0e2ae1a24b4088685c7a9e40a71218a56ee30b718464e158874482b15a5dd335ac SHA512 8dbb6193562898f48c70a83d5b1ae8f3109f05bcab2208031f285bb8a90a3c828761b0144234ae2963eecb7dac10fccccf586d566b7314bcf4f14947064483bb
-EBUILD kube-proxy-1.21.1.ebuild 929 BLAKE2B 457168acecb296450df17416cccfa8c23a41236489150d3e47da3287b0e43d0e2ae1a24b4088685c7a9e40a71218a56ee30b718464e158874482b15a5dd335ac SHA512 8dbb6193562898f48c70a83d5b1ae8f3109f05bcab2208031f285bb8a90a3c828761b0144234ae2963eecb7dac10fccccf586d566b7314bcf4f14947064483bb
+EBUILD kube-proxy-1.18.19.ebuild 892 BLAKE2B 07e99c7043554ba3fe7d71838d72daccd1c753ce9db9d9619971b87a798d0d68c39b3b87bfbd3bbbe94d5f457cb9f1564d9ed1ec0c9bbe51b8cefd9ee43e3b4f SHA512 1b913f8b0f6ebcd62af8786e9b96f2be14778eb582a48ac2f4756ace84c90452246686ee1e75be448d945c666e63b1c5f6125200a704ebcf7fe6fab4e5dbd527
+EBUILD kube-proxy-1.19.11.ebuild 928 BLAKE2B 765fa0b999f93352690b0da19e0e4652165fab7bfe7f5a117e182a4513ec98a4cae1e6e2cc28e8fcafff62596dceef8c88d05908c9844b4a5596dca9ac94ca6f SHA512 57f6eafc77edfd06d0f6abdb0f870f4be2f8a0fecf0889db5afc5f9153951b63cfca87e5f0d8812c88e8f7c31b80c4d6ecbeb630a1a3d9effd8030564bb022e8
+EBUILD kube-proxy-1.20.7.ebuild 928 BLAKE2B 765fa0b999f93352690b0da19e0e4652165fab7bfe7f5a117e182a4513ec98a4cae1e6e2cc28e8fcafff62596dceef8c88d05908c9844b4a5596dca9ac94ca6f SHA512 57f6eafc77edfd06d0f6abdb0f870f4be2f8a0fecf0889db5afc5f9153951b63cfca87e5f0d8812c88e8f7c31b80c4d6ecbeb630a1a3d9effd8030564bb022e8
+EBUILD kube-proxy-1.21.1.ebuild 928 BLAKE2B 530e14d24d0bfcedef386d4e5c6b5089ef8428e814264d64d8611a2f3bbcf7be57176731f63ff8299a090c12e323c90e702ad6d99dfebffc4343ac15a3f4ff39 SHA512 ee958c9c6ea19156fbbc863d819bd52db1fae84e8e2d2cfc9a4d282fe0495e19bbadd24ae7f74c13b61cd3716c45001ba2cec471450c8db81ae5562cc3902ab2
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.18.18.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.18.18.ebuild
deleted file mode 100644
index 1d1531e7c387..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.18.18.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="hardened"
-
-RDEPEND="net-firewall/conntrack-tools
-	!sys-cluster/kubernetes"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.18.19.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.18.19.ebuild
index dc462bedf2c4..f12e156ccea8 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.18.19.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.18.19.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="hardened"
 
 RDEPEND="net-firewall/conntrack-tools
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.19.10.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.19.10.ebuild
deleted file mode 100644
index ddc12b2f8a73..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.19.10.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
-inherit go-module
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="net-firewall/conntrack-tools
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.15"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.19.11.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.19.11.ebuild
index d62b6c41d8fd..4860d8ae4993 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.19.11.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.19.11.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="net-firewall/conntrack-tools
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.20.6.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.20.6.ebuild
deleted file mode 100644
index ddc12b2f8a73..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.20.6.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
-inherit go-module
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="net-firewall/conntrack-tools
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.15"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.20.7.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.20.7.ebuild
index d62b6c41d8fd..4860d8ae4993 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.20.7.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.20.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="net-firewall/conntrack-tools
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.21.0.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.21.0.ebuild
deleted file mode 100644
index 6c8c309ffd31..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.21.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="net-firewall/conntrack-tools
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.21.1.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.21.1.ebuild
index 6c8c309ffd31..9248dbd26dcf 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.21.1.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.21.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="net-firewall/conntrack-tools
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index 1171c1e4503d..f51fe6fe02a2 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -1,20 +1,12 @@
 AUX kube-scheduler.confd 133 BLAKE2B 6b88dfc011173f183a88a16d078cbb5d96d46c269129b483d650fd7dd63376e366825f483178c26e931db226478ce9d0b85412fc264d4d600a8232d0bac149e7 SHA512 d7326f34b26aaebf4b5c25a03abcff3bc3d397382ad4fed0f4718ee425e71399febf6fec6dc817813490671692d3f1b454fd5d14d9c47c3d41b0d3405a01a6c2
 AUX kube-scheduler.initd 548 BLAKE2B dd9373f659b87fcf12dca20527aebdb304a60ec559fd9fb9efcd0db8b3c155fdba2ce8a59461cd15ed3b4294cc5b335093e12d2b8411e400927e1307b37bc6d8 SHA512 151ea6f5cc36de9b83f0e5365579e33eea8002f9a03f5f61d195a349236e6baf192f701d3fb591b769aa90e8e1e620d525b20c95a1e8cda58d062971d8f587a3
 AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a28e9a5b02361cf4833982d4489364bd1291faa136df275988f02ce78c7b785c9209a54aec5eea6180b9041da0 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6
-DIST kubernetes-1.18.18.tar.gz 32427845 BLAKE2B 10e04ac2097a01702ea227f217b2346378b17a4040ac677ecde592544febe204c443c0a722d34617a8cc7db7d7909a9f9b6cfd84bc3e36e7862a72273bc45ef3 SHA512 8305cff40d08a40c6c8e71e9056fac6b76856a6e39ac8d2e3952c155a8c70a9d7c269725d55df180dd906d0ff6d9c8b9e17a58b00a08c86438f1435058163fd3
 DIST kubernetes-1.18.19.tar.gz 32437793 BLAKE2B d5212b8eb29635d8269f91880420bbc9c16e472583ffd659a08362e80f79beb9fb48945a48dacf0f68b6b4383db0d1e615b432ea1687c015f78e4bc7aef94189 SHA512 aba80c2d5d2296bc2453a1519c29034a4f5e52373dc366186c295154960744f2d7fbae0b9cd1c64044bbb5cd9007b182dc4f60e57e991d28b3c8f0fc8cb279fb
-DIST kubernetes-1.19.10.tar.gz 33529312 BLAKE2B 8566eaf43beab26fe781e3520be147620a256d2b9fc895d51c3707dfb34c8e53667527bab23d6b1b5a64dee291893ec69a3bfa54b72da0e0e9a7f27acbd0c7d1 SHA512 7a69062be5a2fd0522f03077edb023e59f4887580f3018e4a3c1726c888d1123e3beb1adce58e7ff4b658bd3f1eb8e650f022f88c2d0abbc561acec164028cf5
 DIST kubernetes-1.19.11.tar.gz 33549052 BLAKE2B 5c17aae668a1e8c2eb656330a990786edf18a72d655ef23e55d9b02aa2a23ac07eeab5fdf4bfda2141e8ae2e9db3559bf8f402c8b984ae152aa955cff0ee3e22 SHA512 42a8c65eac4d4c2b9531fab578c9f605a1d57b3d892e2650ec87e3b1972e58f438dbf9f5c05ec2eb529218c43c8e391e3a294467c82ceffe94cc90b35e619242
-DIST kubernetes-1.20.6.tar.gz 34478669 BLAKE2B 82e3aac07e9f360cda6854f4ff51082e96648c1a78888a6dd43530b31404089cd1eaa2805fa9896dfa1bdef03ebdd04b6dda8ba948d8b16be28534390554da5e SHA512 b3df8266c597b3e2270e7caea24129ebc8fa258e32e747c1e48ede5ad0244c791f9da39bcaf7c08df8c1b314976742db23ecaa4623ab241f87a80d4834a0948f
 DIST kubernetes-1.20.7.tar.gz 34486823 BLAKE2B b0467ecb4527a6de3955185ea377248bbf0b83624af8afd4bf8f33cb2a5e33d0433ea98b3f984a38c59ad9fd6a8cf3e8124eadc81cbe337ca7bc4bce53d4f9ed SHA512 ccb8ac6f1d9535791386ee73ba5008180e1a77fcdc320363248037117547eb6c59d25c46ea1d5bb49043717e2b6a1796470b3b677229a7a40fd6cd1f4b8ab695
-DIST kubernetes-1.21.0.tar.gz 37484462 BLAKE2B 78ae44985eccf9e17d58ccb3f9c98dcc469059e17375b016d82df6d5ce02451e0bcac49cdd89d5ae82bd718191e83fbf6e128ae3a4d14569460febd0c027edf3 SHA512 f5928f5aad0ce1dee7db145a798c5038aa5ca085a09ba9a2da5cabb36c54f2adc86ec5948d4cf344544c45c29d18e7b9f04bf14c4a91aab637c7244fcf3f80d8
 DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
-EBUILD kube-scheduler-1.18.18.ebuild 950 BLAKE2B 50d52255a541215f588090cb9029c8b9d395b8561bb04d5558edfea37f3bae0c9ec3ff99219c7eeb0dd7c98b6285d696ee756d36003923d804f59b929ac588a5 SHA512 44f9f88d549d5c9001efb7e8e94cc4b56a1f5716b49e5f5686efe46e94e4c9b5857b1f78b710e24b5addf980b2c94729ffc9a97b248189b6a8b41737ea08025a
-EBUILD kube-scheduler-1.18.19.ebuild 951 BLAKE2B 9a79b2d2568fd0666080b980a2f47094ea036d8352345b4a0489f48a950946c88eb85ff7950234ecef0f43e3ae5885b254b19ad3a7d1adaeabb696ca42f32ab0 SHA512 d177752bc34802343e103bed6dadc1900766727c4b3251003df10b20ab744b4d44be1abc6297143b481872c7a74990f980bb39a65300ac8a5f5d46ed515b79ef
-EBUILD kube-scheduler-1.19.10.ebuild 986 BLAKE2B dfd44bf7514501fb504941a0d39760affed4d7a40b1de38569ede78e5882976ba99cebaf5470ad5286026373cc89e33cd13f48a4aeafedca34ec157e02ab70d8 SHA512 7ec037243377d2caf291d3c48ab3c4b7804a8c414d0527e13a0b9a4750a7ef2abee5eb580ce307937516878b79fc6795e5407c36188fc94c8eff9f98aac90ded
-EBUILD kube-scheduler-1.19.11.ebuild 987 BLAKE2B 2bb55884a676b43cd0678ed33f450622a4503b72e3f6a94c511b56c6c148bc8c606f79a07a0e4160c85a8369dffd3b09e3cd6e48b6fb06f4bc8b407fff01dd30 SHA512 f95df23f7b81dcd24ab696830e58eac93da20653e31b3486b2781540b4d138c5390503fb15b498a67ac6253c779e83677915f4f13f41c08a7d79acf6a9666485
-EBUILD kube-scheduler-1.20.6.ebuild 986 BLAKE2B dfd44bf7514501fb504941a0d39760affed4d7a40b1de38569ede78e5882976ba99cebaf5470ad5286026373cc89e33cd13f48a4aeafedca34ec157e02ab70d8 SHA512 7ec037243377d2caf291d3c48ab3c4b7804a8c414d0527e13a0b9a4750a7ef2abee5eb580ce307937516878b79fc6795e5407c36188fc94c8eff9f98aac90ded
-EBUILD kube-scheduler-1.20.7.ebuild 987 BLAKE2B 2bb55884a676b43cd0678ed33f450622a4503b72e3f6a94c511b56c6c148bc8c606f79a07a0e4160c85a8369dffd3b09e3cd6e48b6fb06f4bc8b407fff01dd30 SHA512 f95df23f7b81dcd24ab696830e58eac93da20653e31b3486b2781540b4d138c5390503fb15b498a67ac6253c779e83677915f4f13f41c08a7d79acf6a9666485
-EBUILD kube-scheduler-1.21.0.ebuild 987 BLAKE2B 60f25a20a95753c4a57a7962c98fbc8fa6d2948ed783b50ce281238b484355ffa037c5201bf02a4d1db8c3824cf07b0cadf4edf094e943506850582e8fb89cfd SHA512 def9c3a32e1b7fb792f029302d29cb4d5d19cb9c91b5f5011c98e6c4cf8d243aa5861ced10436e93c8f5b057eb0532137bc14182e14777977ca0393c636af3ec
-EBUILD kube-scheduler-1.21.1.ebuild 987 BLAKE2B 60f25a20a95753c4a57a7962c98fbc8fa6d2948ed783b50ce281238b484355ffa037c5201bf02a4d1db8c3824cf07b0cadf4edf094e943506850582e8fb89cfd SHA512 def9c3a32e1b7fb792f029302d29cb4d5d19cb9c91b5f5011c98e6c4cf8d243aa5861ced10436e93c8f5b057eb0532137bc14182e14777977ca0393c636af3ec
+EBUILD kube-scheduler-1.18.19.ebuild 950 BLAKE2B c7e4bf0bfca4b9e3fbf29ba120a85ebd3302c94500e57e3fd21193958ed9099627e51e178510d5a0d6974c1c07812495a60d3f595c25f6c2794667bddb06e4a3 SHA512 3da62f1f16b14858ce36d9506b009135aa1a627be5e466a782bc3784c605e494d4b618195bcc7e7bb760ace5574c8e7964bd99d2ec52fd81327c3a1259e18f8e
+EBUILD kube-scheduler-1.19.11.ebuild 986 BLAKE2B 9582a16c18d3c9045c63fe29390ea54fe3e9570cd6e8860277d840d43fec7981637a709e21b7219f71f18d2e26540be053b2c961f3d66d8942a1781592d786f9 SHA512 3f7b822a52db4aa4c5324984e8117811065a7836de643fce508e8f6155d9d05703555b5061e2da22c719c6e45e01863b1b1fe5ac742fdeb07507f089c8745aa8
+EBUILD kube-scheduler-1.20.7.ebuild 986 BLAKE2B 9582a16c18d3c9045c63fe29390ea54fe3e9570cd6e8860277d840d43fec7981637a709e21b7219f71f18d2e26540be053b2c961f3d66d8942a1781592d786f9 SHA512 3f7b822a52db4aa4c5324984e8117811065a7836de643fce508e8f6155d9d05703555b5061e2da22c719c6e45e01863b1b1fe5ac742fdeb07507f089c8745aa8
+EBUILD kube-scheduler-1.21.1.ebuild 986 BLAKE2B 2fd297a5e2a967da944d6fc98882330685cfe1dbaa2fb2188003099883cfad4dd8cefb8f9a1af2d44f98fecebf35c76213c9663993d3f0d4f0636851bfb00b4c SHA512 514528bd0183987f4e60f6df9eaee374844ad444d49f707ee33ebd14c5bce619941913705dc20b1abd513e87596f9ba29692176f998b2ee79d5035bc8b789939
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.18.18.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.18.18.ebuild
deleted file mode 100644
index 9e0b2abc985d..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.18.18.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/kubernetes"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.18.19.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.18.19.ebuild
index 68467bd70d77..8648b1e5c53f 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.18.19.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.18.19.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-scheduler
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.19.10.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.19.10.ebuild
deleted file mode 100644
index e25a81f904ce..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.19.10.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.15"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.19.11.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.19.11.ebuild
index 98230502bf76..71ae71f5f970 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.19.11.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.19.11.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-scheduler
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.20.6.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.20.6.ebuild
deleted file mode 100644
index e25a81f904ce..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.20.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.15"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.20.7.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.20.7.ebuild
index 98230502bf76..71ae71f5f970 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.20.7.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.20.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-scheduler
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.21.0.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.21.0.ebuild
deleted file mode 100644
index 0e9f9a6dd32b..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.21.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.21.1.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.21.1.ebuild
index 0e9f9a6dd32b..6200b79aaf8b 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.21.1.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.21.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-scheduler
diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index 1d4b74cb5964..7fbdbaa7c169 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -1,17 +1,9 @@
-DIST kubernetes-1.18.18.tar.gz 32427845 BLAKE2B 10e04ac2097a01702ea227f217b2346378b17a4040ac677ecde592544febe204c443c0a722d34617a8cc7db7d7909a9f9b6cfd84bc3e36e7862a72273bc45ef3 SHA512 8305cff40d08a40c6c8e71e9056fac6b76856a6e39ac8d2e3952c155a8c70a9d7c269725d55df180dd906d0ff6d9c8b9e17a58b00a08c86438f1435058163fd3
 DIST kubernetes-1.18.19.tar.gz 32437793 BLAKE2B d5212b8eb29635d8269f91880420bbc9c16e472583ffd659a08362e80f79beb9fb48945a48dacf0f68b6b4383db0d1e615b432ea1687c015f78e4bc7aef94189 SHA512 aba80c2d5d2296bc2453a1519c29034a4f5e52373dc366186c295154960744f2d7fbae0b9cd1c64044bbb5cd9007b182dc4f60e57e991d28b3c8f0fc8cb279fb
-DIST kubernetes-1.19.10.tar.gz 33529312 BLAKE2B 8566eaf43beab26fe781e3520be147620a256d2b9fc895d51c3707dfb34c8e53667527bab23d6b1b5a64dee291893ec69a3bfa54b72da0e0e9a7f27acbd0c7d1 SHA512 7a69062be5a2fd0522f03077edb023e59f4887580f3018e4a3c1726c888d1123e3beb1adce58e7ff4b658bd3f1eb8e650f022f88c2d0abbc561acec164028cf5
 DIST kubernetes-1.19.11.tar.gz 33549052 BLAKE2B 5c17aae668a1e8c2eb656330a990786edf18a72d655ef23e55d9b02aa2a23ac07eeab5fdf4bfda2141e8ae2e9db3559bf8f402c8b984ae152aa955cff0ee3e22 SHA512 42a8c65eac4d4c2b9531fab578c9f605a1d57b3d892e2650ec87e3b1972e58f438dbf9f5c05ec2eb529218c43c8e391e3a294467c82ceffe94cc90b35e619242
-DIST kubernetes-1.20.6.tar.gz 34478669 BLAKE2B 82e3aac07e9f360cda6854f4ff51082e96648c1a78888a6dd43530b31404089cd1eaa2805fa9896dfa1bdef03ebdd04b6dda8ba948d8b16be28534390554da5e SHA512 b3df8266c597b3e2270e7caea24129ebc8fa258e32e747c1e48ede5ad0244c791f9da39bcaf7c08df8c1b314976742db23ecaa4623ab241f87a80d4834a0948f
 DIST kubernetes-1.20.7.tar.gz 34486823 BLAKE2B b0467ecb4527a6de3955185ea377248bbf0b83624af8afd4bf8f33cb2a5e33d0433ea98b3f984a38c59ad9fd6a8cf3e8124eadc81cbe337ca7bc4bce53d4f9ed SHA512 ccb8ac6f1d9535791386ee73ba5008180e1a77fcdc320363248037117547eb6c59d25c46ea1d5bb49043717e2b6a1796470b3b677229a7a40fd6cd1f4b8ab695
-DIST kubernetes-1.21.0.tar.gz 37484462 BLAKE2B 78ae44985eccf9e17d58ccb3f9c98dcc469059e17375b016d82df6d5ce02451e0bcac49cdd89d5ae82bd718191e83fbf6e128ae3a4d14569460febd0c027edf3 SHA512 f5928f5aad0ce1dee7db145a798c5038aa5ca085a09ba9a2da5cabb36c54f2adc86ec5948d4cf344544c45c29d18e7b9f04bf14c4a91aab637c7244fcf3f80d8
 DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
-EBUILD kubeadm-1.18.18.ebuild 872 BLAKE2B 55dda0d985be0c38976b72f818e77d6e3dc3e89da5f9d3adf4d87939f5153467f6d98cabb89c22713bb48774ea8a413f26ddf5de3938245b1e402bdc9ef61645 SHA512 e49be0b2e02a5cc27366f16d86e472ea3caaa700586ec879f84d76c8d7ce0e24ca2dfe6bc6dc4b36c9dd771d501ff93178fffc4388a922b2ba2ad7f0b0ba6199
-EBUILD kubeadm-1.18.19.ebuild 873 BLAKE2B caa208d5cc70aeae8698a818fd5ba149796697eee8297966b71a6355b4feadb1b8b5a07ad0cd7bb4510dbeeed9bd30b78416a49a8d8c1d8d4b942bbccbd14458 SHA512 5482f2f8b4c9538894008358257e468f7ff8f1c2a936edb923775c955e1a8ceadf484987fb102b218548061480912f93af0351938fda9324b05f7d0bf15b5c81
-EBUILD kubeadm-1.19.10.ebuild 906 BLAKE2B 5efec4d82bb7d0197af8b423a5a503c2c00ebfd21aa1790aa4eef89968832811278b836ba256910df9b14010c64cbb367e2331dbfe74891045e872d40e6bfe14 SHA512 d7caf5711538385a89329ec6118ccacc05452549e06bf1fd54cae4e90e7508c5e7e0207cfc65e5d0e9a7a88964b122ba1649b1850a94c62ce914c7967e63535f
-EBUILD kubeadm-1.19.11.ebuild 907 BLAKE2B 5e04bb4a35a8a99082f8b6b656ce6498e2121ab448f2a02b109ea84cd50d99b71e24f39e6cb4f39de0212d45629c3e533b45a9073afb4a368b593ad8ad1c4b8f SHA512 8baef54420d2354ef809920131cd7ee027030020f4a239534fba3e838807e1b95092ea692feaf4b7dfdd4a297a37a21413bf3a5f0ec0eca603abad652890ab8d
-EBUILD kubeadm-1.20.6.ebuild 906 BLAKE2B 5efec4d82bb7d0197af8b423a5a503c2c00ebfd21aa1790aa4eef89968832811278b836ba256910df9b14010c64cbb367e2331dbfe74891045e872d40e6bfe14 SHA512 d7caf5711538385a89329ec6118ccacc05452549e06bf1fd54cae4e90e7508c5e7e0207cfc65e5d0e9a7a88964b122ba1649b1850a94c62ce914c7967e63535f
-EBUILD kubeadm-1.20.7.ebuild 907 BLAKE2B 5e04bb4a35a8a99082f8b6b656ce6498e2121ab448f2a02b109ea84cd50d99b71e24f39e6cb4f39de0212d45629c3e533b45a9073afb4a368b593ad8ad1c4b8f SHA512 8baef54420d2354ef809920131cd7ee027030020f4a239534fba3e838807e1b95092ea692feaf4b7dfdd4a297a37a21413bf3a5f0ec0eca603abad652890ab8d
-EBUILD kubeadm-1.21.0.ebuild 907 BLAKE2B 9afd971b3448c327ce26750d0d90ff79d4416a158e0cafb37bf834ef47056e9e087cc06cdeabeec88b9c1426cf0106c1e7c7e1945b8523e518ac8e69c51e87ff SHA512 0861a7d79b74f60623f11c7de08306732793ba1edcf185e7abc8e779757c744b94191f4a829932818468de05b350636a81d36344d3a128e404a7a1b33526a0d0
-EBUILD kubeadm-1.21.1.ebuild 907 BLAKE2B 9afd971b3448c327ce26750d0d90ff79d4416a158e0cafb37bf834ef47056e9e087cc06cdeabeec88b9c1426cf0106c1e7c7e1945b8523e518ac8e69c51e87ff SHA512 0861a7d79b74f60623f11c7de08306732793ba1edcf185e7abc8e779757c744b94191f4a829932818468de05b350636a81d36344d3a128e404a7a1b33526a0d0
+EBUILD kubeadm-1.18.19.ebuild 872 BLAKE2B 1f3aaf9c5520fada96580be3d4a31911514b21acb2aa311697b00454fa27badca0ab6b5daa5ca7f79311708f2902a0acdeb26eabb417476d168a67e403457091 SHA512 6cfd03238748f6b67c7c408f3184413afe075f5df7053d062a2a5f736b0206edde4bdd0b7f771004aed14a26104654ae32b78ffeb90059f06d52be1b7a321d7e
+EBUILD kubeadm-1.19.11.ebuild 906 BLAKE2B 9d23a85485ad61d17992dcd33f016f61567c83380b25c7f5792b93107a01c12648ff9f78a57bf1ca903a0173277c6ee940b33baeeda1eb8aded8b13eab0bb0db SHA512 d0473158b12a2a8332eba6b1306691750096a0eb3acd65d9db2c1adf7083275fd10ecce397a7045ca840da25a837db8e89645d5b3b3087cf93edee4efa688c2b
+EBUILD kubeadm-1.20.7.ebuild 906 BLAKE2B 9d23a85485ad61d17992dcd33f016f61567c83380b25c7f5792b93107a01c12648ff9f78a57bf1ca903a0173277c6ee940b33baeeda1eb8aded8b13eab0bb0db SHA512 d0473158b12a2a8332eba6b1306691750096a0eb3acd65d9db2c1adf7083275fd10ecce397a7045ca840da25a837db8e89645d5b3b3087cf93edee4efa688c2b
+EBUILD kubeadm-1.21.1.ebuild 906 BLAKE2B 976b6b81abac175c8b5d91ebb43e8c9bc30135ddd787992783860bca174e847bf371ad55c46b4b70a824dc0446853ec0735eb497f27cb80121c4a40cd50ec13f SHA512 9dcbc099f39ba5c0696bdab617cd67100d88809180e7bb08d671cceb903eb323f31e093e0d46cd42a4f9f7f281dfc6cd6ac82d5a398d88b7c3d41c95a5a76c9f
 MISC metadata.xml 917 BLAKE2B ead95efd60868ca415983905cf72f7a3b00dd7048fe6fad5caf52fa78ab1ce77109e3e29ac5708b5240dc27b58b69858ca23b6952f2b087f5e311359e9929010 SHA512 3be4ae4aec07e6cdfb6eb1aebabb71fd49e9e9dbf9a183c4a1b19c74f3419c32a01b537425f30844ad642e04d72411ecfafd19c2ebdb0df8715ae139d9145949
diff --git a/sys-cluster/kubeadm/kubeadm-1.18.18.ebuild b/sys-cluster/kubeadm/kubeadm-1.18.18.ebuild
deleted file mode 100644
index 8afd617dd1f9..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.18.18.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="hardened"
-
-RDEPEND="!sys-cluster/kubernetes"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/kubeadm
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.18.19.ebuild b/sys-cluster/kubeadm/kubeadm-1.18.19.ebuild
index b7becaae8f36..bcffeaaa9eaf 100644
--- a/sys-cluster/kubeadm/kubeadm-1.18.19.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.18.19.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubeadm/kubeadm-1.19.10.ebuild b/sys-cluster/kubeadm/kubeadm-1.19.10.ebuild
deleted file mode 100644
index 2d33afced967..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.19.10.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.15"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.19.11.ebuild b/sys-cluster/kubeadm/kubeadm-1.19.11.ebuild
index e8e9bef16ed9..55c40dd8fdf1 100644
--- a/sys-cluster/kubeadm/kubeadm-1.19.11.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.19.11.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubeadm/kubeadm-1.20.6.ebuild b/sys-cluster/kubeadm/kubeadm-1.20.6.ebuild
deleted file mode 100644
index 2d33afced967..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.20.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.15"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.20.7.ebuild b/sys-cluster/kubeadm/kubeadm-1.20.7.ebuild
index e8e9bef16ed9..55c40dd8fdf1 100644
--- a/sys-cluster/kubeadm/kubeadm-1.20.7.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.20.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubeadm/kubeadm-1.21.0.ebuild b/sys-cluster/kubeadm/kubeadm-1.21.0.ebuild
deleted file mode 100644
index b98e9b739641..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.21.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.21.1.ebuild b/sys-cluster/kubeadm/kubeadm-1.21.1.ebuild
index b98e9b739641..30a22698926b 100644
--- a/sys-cluster/kubeadm/kubeadm-1.21.1.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.21.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index 6c0b883b56c3..e96c6029be35 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,17 +1,9 @@
-DIST kubernetes-1.18.18.tar.gz 32427845 BLAKE2B 10e04ac2097a01702ea227f217b2346378b17a4040ac677ecde592544febe204c443c0a722d34617a8cc7db7d7909a9f9b6cfd84bc3e36e7862a72273bc45ef3 SHA512 8305cff40d08a40c6c8e71e9056fac6b76856a6e39ac8d2e3952c155a8c70a9d7c269725d55df180dd906d0ff6d9c8b9e17a58b00a08c86438f1435058163fd3
 DIST kubernetes-1.18.19.tar.gz 32437793 BLAKE2B d5212b8eb29635d8269f91880420bbc9c16e472583ffd659a08362e80f79beb9fb48945a48dacf0f68b6b4383db0d1e615b432ea1687c015f78e4bc7aef94189 SHA512 aba80c2d5d2296bc2453a1519c29034a4f5e52373dc366186c295154960744f2d7fbae0b9cd1c64044bbb5cd9007b182dc4f60e57e991d28b3c8f0fc8cb279fb
-DIST kubernetes-1.19.10.tar.gz 33529312 BLAKE2B 8566eaf43beab26fe781e3520be147620a256d2b9fc895d51c3707dfb34c8e53667527bab23d6b1b5a64dee291893ec69a3bfa54b72da0e0e9a7f27acbd0c7d1 SHA512 7a69062be5a2fd0522f03077edb023e59f4887580f3018e4a3c1726c888d1123e3beb1adce58e7ff4b658bd3f1eb8e650f022f88c2d0abbc561acec164028cf5
 DIST kubernetes-1.19.11.tar.gz 33549052 BLAKE2B 5c17aae668a1e8c2eb656330a990786edf18a72d655ef23e55d9b02aa2a23ac07eeab5fdf4bfda2141e8ae2e9db3559bf8f402c8b984ae152aa955cff0ee3e22 SHA512 42a8c65eac4d4c2b9531fab578c9f605a1d57b3d892e2650ec87e3b1972e58f438dbf9f5c05ec2eb529218c43c8e391e3a294467c82ceffe94cc90b35e619242
-DIST kubernetes-1.20.6.tar.gz 34478669 BLAKE2B 82e3aac07e9f360cda6854f4ff51082e96648c1a78888a6dd43530b31404089cd1eaa2805fa9896dfa1bdef03ebdd04b6dda8ba948d8b16be28534390554da5e SHA512 b3df8266c597b3e2270e7caea24129ebc8fa258e32e747c1e48ede5ad0244c791f9da39bcaf7c08df8c1b314976742db23ecaa4623ab241f87a80d4834a0948f
 DIST kubernetes-1.20.7.tar.gz 34486823 BLAKE2B b0467ecb4527a6de3955185ea377248bbf0b83624af8afd4bf8f33cb2a5e33d0433ea98b3f984a38c59ad9fd6a8cf3e8124eadc81cbe337ca7bc4bce53d4f9ed SHA512 ccb8ac6f1d9535791386ee73ba5008180e1a77fcdc320363248037117547eb6c59d25c46ea1d5bb49043717e2b6a1796470b3b677229a7a40fd6cd1f4b8ab695
-DIST kubernetes-1.21.0.tar.gz 37484462 BLAKE2B 78ae44985eccf9e17d58ccb3f9c98dcc469059e17375b016d82df6d5ce02451e0bcac49cdd89d5ae82bd718191e83fbf6e128ae3a4d14569460febd0c027edf3 SHA512 f5928f5aad0ce1dee7db145a798c5038aa5ca085a09ba9a2da5cabb36c54f2adc86ec5948d4cf344544c45c29d18e7b9f04bf14c4a91aab637c7244fcf3f80d8
 DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
-EBUILD kubectl-1.18.18.ebuild 871 BLAKE2B 989edf4c75a9e841fbad5223602146e128fa7d60fff7eee080b87f4263328359742d9c7368d6ffdd063a33ba4a5d907d3a2edbeddfa48ef4daa94bd06cbeb451 SHA512 f47a8cc3af8d9685608a232000c26b60d83c5669bc42a16077c9990014c0632deffe4af1970e086039a16aa98ea740cc6fb136139ae17418db1e9c490deaf6e6
-EBUILD kubectl-1.18.19.ebuild 872 BLAKE2B 6630bf8f8b331fdeae6f434d2d13699ffcfa38fa14ba897317a492997d153f1c9cea7dc57923d948ca6661b2077fe606bd34cd8523bcbd4a47f81a6c66aa766c SHA512 3fd64b13dfda775b85e8679d8f6cba25ea3d9bab6b040cd6653439a2f405b1745000ca242de4d5f13e431aa4b256c88c714dfea259866489977c2beaffe2688f
-EBUILD kubectl-1.19.10.ebuild 901 BLAKE2B 928a7f93d2de11e0f5671a40819a54d0ba59284e7036fc166d9af399495bc897fa9508e9b69f2d00e36c467135fc2fd61b642fe0a88a9aa21afc3ec4fc07c0f8 SHA512 0becacf2403f7b2baa65a4f482d7caf36414ebe328e57e2f88987d706698810aa69375e90e743d655e56fc4278016564b2578d2812b3d72785c8a80b4920f999
-EBUILD kubectl-1.19.11.ebuild 902 BLAKE2B 6f454846b9f0f28044dd85192f039fb6dedd3643d91e13c67b219a49cf011fa6c3c3eed9995b6c7ec0bfcca0150a7d2118d9a6c9d24d1da9de28dc06f6bd2bc0 SHA512 15c047f5caf38d5d6e550609c376ceb558542846077f7433d48261a8f60b9aaa9700a87dd63b52d0a4be0aa6453bd500171877ec038fdd4e010723d7582768e9
-EBUILD kubectl-1.20.6.ebuild 901 BLAKE2B 928a7f93d2de11e0f5671a40819a54d0ba59284e7036fc166d9af399495bc897fa9508e9b69f2d00e36c467135fc2fd61b642fe0a88a9aa21afc3ec4fc07c0f8 SHA512 0becacf2403f7b2baa65a4f482d7caf36414ebe328e57e2f88987d706698810aa69375e90e743d655e56fc4278016564b2578d2812b3d72785c8a80b4920f999
-EBUILD kubectl-1.20.7.ebuild 902 BLAKE2B 6f454846b9f0f28044dd85192f039fb6dedd3643d91e13c67b219a49cf011fa6c3c3eed9995b6c7ec0bfcca0150a7d2118d9a6c9d24d1da9de28dc06f6bd2bc0 SHA512 15c047f5caf38d5d6e550609c376ceb558542846077f7433d48261a8f60b9aaa9700a87dd63b52d0a4be0aa6453bd500171877ec038fdd4e010723d7582768e9
-EBUILD kubectl-1.21.0.ebuild 902 BLAKE2B 5907f4fb13676ce0fddae866a732043d9c965f1f201b65ed0077240fe1f7fd7df28ea180a2541085486f4c0f612e604bd6e357fe038edc72abff6538b276a57d SHA512 4b717de62be84d6237e8b87b8550687bf8451d1a635b06b2f07567fb00a13f62b4d16f488074e10d0eacdc9dd9020ef7e5e1469bad3993e4350c8adbf1b51223
-EBUILD kubectl-1.21.1.ebuild 902 BLAKE2B 5907f4fb13676ce0fddae866a732043d9c965f1f201b65ed0077240fe1f7fd7df28ea180a2541085486f4c0f612e604bd6e357fe038edc72abff6538b276a57d SHA512 4b717de62be84d6237e8b87b8550687bf8451d1a635b06b2f07567fb00a13f62b4d16f488074e10d0eacdc9dd9020ef7e5e1469bad3993e4350c8adbf1b51223
+EBUILD kubectl-1.18.19.ebuild 871 BLAKE2B 8358e454dd4e2bef7e0bebda1043376bd103079110b5edaecb2ad51249f812363cc245f51d5150e5f00a5aa8c384b5b32d05171327075fd7aa27d22dbca24c07 SHA512 43373bb937da14b667cc037665c2c36f79382c2f4c0c08f6af931067356f044d8c03579451ffb6fe096836e411579e8e02e1780b552c6d55ce4f625ba8fff3b5
+EBUILD kubectl-1.19.11.ebuild 901 BLAKE2B 83da76032ca52af1865dfb01c685a34b87a728dfe861d6aa831abab06ffbfedbe1b35de9406d5ebdc0391398766c91cad7d8cb3aa612cf60b9cf6ce4b143b62d SHA512 c1a867a99b5515a2130ce430adb20d0c8180d24b8ddfebbadc896e99221fbc137441ef08937df631b956d58fdddc691021479b2eadb71bd124b6d06952e8c366
+EBUILD kubectl-1.20.7.ebuild 901 BLAKE2B 83da76032ca52af1865dfb01c685a34b87a728dfe861d6aa831abab06ffbfedbe1b35de9406d5ebdc0391398766c91cad7d8cb3aa612cf60b9cf6ce4b143b62d SHA512 c1a867a99b5515a2130ce430adb20d0c8180d24b8ddfebbadc896e99221fbc137441ef08937df631b956d58fdddc691021479b2eadb71bd124b6d06952e8c366
+EBUILD kubectl-1.21.1.ebuild 901 BLAKE2B 9aefec009262faa0888202910542873bcee4eb1245658cfc33d71dbffe9c4e942967ccf9d274411ceb42d88f18f25292809679138205b93de18181d96b59ff04 SHA512 c9a161914ea33735b68cd899fffd96cf54dbb89c09c0ff79eb26b01c39936f809a9b0d3a86725199ca157de4f7c874c534514e90505a7e3c4fda872485d06c51
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kubectl/kubectl-1.18.18.ebuild b/sys-cluster/kubectl/kubectl-1.18.18.ebuild
deleted file mode 100644
index 019e60f6b742..000000000000
--- a/sys-cluster/kubectl/kubectl-1.18.18.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="hardened"
-
-RDEPEND="!sys-cluster/kubernetes"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubectl/kubectl-1.18.19.ebuild b/sys-cluster/kubectl/kubectl-1.18.19.ebuild
index 1e44048f862a..0addb3847796 100644
--- a/sys-cluster/kubectl/kubectl-1.18.19.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.18.19.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubectl/kubectl-1.19.10.ebuild b/sys-cluster/kubectl/kubectl-1.19.10.ebuild
deleted file mode 100644
index 1f18731b5eb7..000000000000
--- a/sys-cluster/kubectl/kubectl-1.19.10.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-DEPEND="!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.15"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubectl/kubectl-1.19.11.ebuild b/sys-cluster/kubectl/kubectl-1.19.11.ebuild
index 99f1f19c12d4..0c55d6b9e06a 100644
--- a/sys-cluster/kubectl/kubectl-1.19.11.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.19.11.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 DEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubectl/kubectl-1.20.6.ebuild b/sys-cluster/kubectl/kubectl-1.20.6.ebuild
deleted file mode 100644
index 1f18731b5eb7..000000000000
--- a/sys-cluster/kubectl/kubectl-1.20.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-DEPEND="!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.15"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubectl/kubectl-1.20.7.ebuild b/sys-cluster/kubectl/kubectl-1.20.7.ebuild
index 99f1f19c12d4..0c55d6b9e06a 100644
--- a/sys-cluster/kubectl/kubectl-1.20.7.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.20.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 DEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubectl/kubectl-1.21.0.ebuild b/sys-cluster/kubectl/kubectl-1.21.0.ebuild
deleted file mode 100644
index 5603ed030db7..000000000000
--- a/sys-cluster/kubectl/kubectl-1.21.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="hardened"
-
-DEPEND="!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubectl/kubectl-1.21.1.ebuild b/sys-cluster/kubectl/kubectl-1.21.1.ebuild
index 5603ed030db7..f944d97ebefa 100644
--- a/sys-cluster/kubectl/kubectl-1.21.1.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.21.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 DEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index 70da8261809b..6dc8342b06d1 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -3,20 +3,12 @@ AUX kubelet.env 547 BLAKE2B db9144a0e155450f08a665700edbb05f3fa093d209f72320fdbc
 AUX kubelet.initd 520 BLAKE2B 50edf888fed020a02f099189f8a5bdde54a4bfa2a00585489864c262d90ad8347763753f99eccec6fe6670c6fa016674dee4dea0fa838991abb503db97bd983a SHA512 c6b9bcdb6d063728ef2e9d67673ea29c0972e70e446be9c020cfd277a7bbcfc955a5ad7a72ab0ca1579a4d04b0fc4ac71ee20e6dba9d9a9a9099efcad3c139d0
 AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba83207ae89aae4f2e151a8b32e21b8d5e92229cccd7b7aa2676328d3d1a5fa80cadde65fe80a8cde10535d4 SHA512 05ce9ea16d2ddf8e255adb406556c37bc04dcfc457a132a78d31deaed78963f4e1f31555f781b706909c02815a04370d5c0e02614eb79d602b1cb827cf2471d5
 AUX kubelet.service 642 BLAKE2B 9f0fa5db48c09c2525cbc556cd520660302408a43aceb6c11da3a191b4b21607e824e46d9805b12b57a0ac7878c7da94d0cb86c69cd949814c77bb217973c6f1 SHA512 770cadae6afb68f0556c7c5969643642bbf09b596ff49d969d31b8d9f0d8907d6931eb7fb14485c78a3f75682e44e2355c7e51973a0dfdd1e665816f04ba21ae
-DIST kubernetes-1.18.18.tar.gz 32427845 BLAKE2B 10e04ac2097a01702ea227f217b2346378b17a4040ac677ecde592544febe204c443c0a722d34617a8cc7db7d7909a9f9b6cfd84bc3e36e7862a72273bc45ef3 SHA512 8305cff40d08a40c6c8e71e9056fac6b76856a6e39ac8d2e3952c155a8c70a9d7c269725d55df180dd906d0ff6d9c8b9e17a58b00a08c86438f1435058163fd3
 DIST kubernetes-1.18.19.tar.gz 32437793 BLAKE2B d5212b8eb29635d8269f91880420bbc9c16e472583ffd659a08362e80f79beb9fb48945a48dacf0f68b6b4383db0d1e615b432ea1687c015f78e4bc7aef94189 SHA512 aba80c2d5d2296bc2453a1519c29034a4f5e52373dc366186c295154960744f2d7fbae0b9cd1c64044bbb5cd9007b182dc4f60e57e991d28b3c8f0fc8cb279fb
-DIST kubernetes-1.19.10.tar.gz 33529312 BLAKE2B 8566eaf43beab26fe781e3520be147620a256d2b9fc895d51c3707dfb34c8e53667527bab23d6b1b5a64dee291893ec69a3bfa54b72da0e0e9a7f27acbd0c7d1 SHA512 7a69062be5a2fd0522f03077edb023e59f4887580f3018e4a3c1726c888d1123e3beb1adce58e7ff4b658bd3f1eb8e650f022f88c2d0abbc561acec164028cf5
 DIST kubernetes-1.19.11.tar.gz 33549052 BLAKE2B 5c17aae668a1e8c2eb656330a990786edf18a72d655ef23e55d9b02aa2a23ac07eeab5fdf4bfda2141e8ae2e9db3559bf8f402c8b984ae152aa955cff0ee3e22 SHA512 42a8c65eac4d4c2b9531fab578c9f605a1d57b3d892e2650ec87e3b1972e58f438dbf9f5c05ec2eb529218c43c8e391e3a294467c82ceffe94cc90b35e619242
-DIST kubernetes-1.20.6.tar.gz 34478669 BLAKE2B 82e3aac07e9f360cda6854f4ff51082e96648c1a78888a6dd43530b31404089cd1eaa2805fa9896dfa1bdef03ebdd04b6dda8ba948d8b16be28534390554da5e SHA512 b3df8266c597b3e2270e7caea24129ebc8fa258e32e747c1e48ede5ad0244c791f9da39bcaf7c08df8c1b314976742db23ecaa4623ab241f87a80d4834a0948f
 DIST kubernetes-1.20.7.tar.gz 34486823 BLAKE2B b0467ecb4527a6de3955185ea377248bbf0b83624af8afd4bf8f33cb2a5e33d0433ea98b3f984a38c59ad9fd6a8cf3e8124eadc81cbe337ca7bc4bce53d4f9ed SHA512 ccb8ac6f1d9535791386ee73ba5008180e1a77fcdc320363248037117547eb6c59d25c46ea1d5bb49043717e2b6a1796470b3b677229a7a40fd6cd1f4b8ab695
-DIST kubernetes-1.21.0.tar.gz 37484462 BLAKE2B 78ae44985eccf9e17d58ccb3f9c98dcc469059e17375b016d82df6d5ce02451e0bcac49cdd89d5ae82bd718191e83fbf6e128ae3a4d14569460febd0c027edf3 SHA512 f5928f5aad0ce1dee7db145a798c5038aa5ca085a09ba9a2da5cabb36c54f2adc86ec5948d4cf344544c45c29d18e7b9f04bf14c4a91aab637c7244fcf3f80d8
 DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
-EBUILD kubelet-1.18.18.ebuild 967 BLAKE2B 6bd0e20b204adbde178c2276a81d69b4d027f9b38ccf40f7641bf6d45fa1e746b59ef666dfc91ff1b14a332f6b8da266e431e39db020203c9f527222564847a8 SHA512 6654316a5b37260aec1f728619e485ab709938e8f2a006a5673085e97fabb4a259425cd903c7578c2d69d36287fa0db01f47f369030e30d1e55b926baf72b6c7
-EBUILD kubelet-1.18.19.ebuild 968 BLAKE2B f677dcad1302346ca4763a62da621f7f7f96b3927d298eb854cb842fb332cc4d21e3fdc8fd79f07f9b5843eb53cc523419d9c7a8ba29bf48b9545a1af0c37d95 SHA512 2d8118164c53702d34080ae0f68669cb95c146afa537dd5d0a3c97020a85cc52aba7e96621a8fd11b765a96cfd28f1b421632c5bb788e013fb5e306951bb5035
-EBUILD kubelet-1.19.10.ebuild 1003 BLAKE2B 8c7e0e91a3108a6fa20ffa4ca7ecc247cf19f3ca2fa22f4c69795abc4430c1068ec854bed768ccb8caede6427456d5f8b43ff1aa018a3f9a2875a62c32d5ced8 SHA512 55923ca8b0a637bf9e710be0f2f217ab17ab4aa37785c6da7c2d5d28b62dbfdf4f1df425f1b8770c2051335a57911b919188e8a587bc08a32058601e9fe456e9
-EBUILD kubelet-1.19.11.ebuild 1004 BLAKE2B ae16a92a877501f8a611ad0f34065652b0819d753277857698dc6cbb007eb273722b596a375047247d6f6625f124f7b5e7407e7b350fb8a4b6641afcc35f37e2 SHA512 0c0474deb8a6fa845e2bd0d0e27d432ca2f0888246454ea91feb265cb490a8c4b3722f79a19c3732f80df3b7ad9f87992ef92e8577b9520e9d92c18010a6714f
-EBUILD kubelet-1.20.6.ebuild 1003 BLAKE2B 8c7e0e91a3108a6fa20ffa4ca7ecc247cf19f3ca2fa22f4c69795abc4430c1068ec854bed768ccb8caede6427456d5f8b43ff1aa018a3f9a2875a62c32d5ced8 SHA512 55923ca8b0a637bf9e710be0f2f217ab17ab4aa37785c6da7c2d5d28b62dbfdf4f1df425f1b8770c2051335a57911b919188e8a587bc08a32058601e9fe456e9
-EBUILD kubelet-1.20.7.ebuild 1004 BLAKE2B ae16a92a877501f8a611ad0f34065652b0819d753277857698dc6cbb007eb273722b596a375047247d6f6625f124f7b5e7407e7b350fb8a4b6641afcc35f37e2 SHA512 0c0474deb8a6fa845e2bd0d0e27d432ca2f0888246454ea91feb265cb490a8c4b3722f79a19c3732f80df3b7ad9f87992ef92e8577b9520e9d92c18010a6714f
-EBUILD kubelet-1.21.0.ebuild 1004 BLAKE2B f88397138d1ad4d29a043f56763236cf87f6c219c6d4ee45fc9d45df3f1a6758a10ebdf6cfdb2757fd420595c5720e9d0bd3df0dbb159859cedfc40f2662f5dd SHA512 fdcb1d7d2e8959cfbe3e6c3d138cc2f20cea6024f3cb89959bb8a7f68d5e2188d1b5bffd299a9484c4e37e446e128470a1f56d9278c46ce2c539ccabf2444ce3
-EBUILD kubelet-1.21.1.ebuild 1004 BLAKE2B f88397138d1ad4d29a043f56763236cf87f6c219c6d4ee45fc9d45df3f1a6758a10ebdf6cfdb2757fd420595c5720e9d0bd3df0dbb159859cedfc40f2662f5dd SHA512 fdcb1d7d2e8959cfbe3e6c3d138cc2f20cea6024f3cb89959bb8a7f68d5e2188d1b5bffd299a9484c4e37e446e128470a1f56d9278c46ce2c539ccabf2444ce3
+EBUILD kubelet-1.18.19.ebuild 967 BLAKE2B d1d54a616a42fcef1f24483e2db99d09297ae0af42778816ebb487b33c4eae4940e6fa4b45158f85f5740ef90c05800b3ba97bd5938793d6915d9e6f451c10a4 SHA512 c5e4163bf6d69dbf6a8d19e00c92421ecd62494b99f3c4aea29319d6ae156da99e69a89e9bee5911a6644bf2e43e2ea505e5331809739e5b6c75eae9931020ef
+EBUILD kubelet-1.19.11.ebuild 1003 BLAKE2B afae3cd57239417bab7bc049af4f3fd1a7faf2fc6cd1d128ba15857c23944d4e72050dbf4b487feb4ac285511f0c4be217087a9ee8dd81971c8529f6d7029494 SHA512 ef137f406c76dff3d015b649304de4e4a8c131f81ac9543ef2ffb5a55b323f683b991b392022390e416b63562accefead8ccd592ba72e7253919afd42213891c
+EBUILD kubelet-1.20.7.ebuild 1003 BLAKE2B afae3cd57239417bab7bc049af4f3fd1a7faf2fc6cd1d128ba15857c23944d4e72050dbf4b487feb4ac285511f0c4be217087a9ee8dd81971c8529f6d7029494 SHA512 ef137f406c76dff3d015b649304de4e4a8c131f81ac9543ef2ffb5a55b323f683b991b392022390e416b63562accefead8ccd592ba72e7253919afd42213891c
+EBUILD kubelet-1.21.1.ebuild 1003 BLAKE2B ec935db07373229e5f1a47afb0700bfc1c57d98ce22096442ec9bd96c249f0b281988086e9680b61a865aa0a29328fcca1fded077adc36e3ed887e90482926b0 SHA512 57e849382861127150d322b947f22a7e84b4b4a19459a99fb48be480e109e5ff32a546139eb0ab191a149aa0c857d3f909ac21eaff3e41d2d9a95bcb88858a4f
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kubelet/kubelet-1.18.18.ebuild b/sys-cluster/kubelet/kubelet-1.18.18.ebuild
deleted file mode 100644
index 73b57ef2b5f0..000000000000
--- a/sys-cluster/kubelet/kubelet-1.18.18.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="hardened"
-
-RDEPEND="!sys-cluster/kubernetes"
-
-RESTRICT+=" test "
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.18.19.ebuild b/sys-cluster/kubelet/kubelet-1.18.19.ebuild
index 53a67a3c87c8..74f9eaab04bc 100644
--- a/sys-cluster/kubelet/kubelet-1.18.19.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.18.19.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubelet/kubelet-1.19.10.ebuild b/sys-cluster/kubelet/kubelet-1.19.10.ebuild
deleted file mode 100644
index e2dd171a1bba..000000000000
--- a/sys-cluster/kubelet/kubelet-1.19.10.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.15"
-
-RESTRICT+=" test "
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.19.11.ebuild b/sys-cluster/kubelet/kubelet-1.19.11.ebuild
index 78302b14a815..c91af0a8527a 100644
--- a/sys-cluster/kubelet/kubelet-1.19.11.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.19.11.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubelet/kubelet-1.20.6.ebuild b/sys-cluster/kubelet/kubelet-1.20.6.ebuild
deleted file mode 100644
index e2dd171a1bba..000000000000
--- a/sys-cluster/kubelet/kubelet-1.20.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.15"
-
-RESTRICT+=" test "
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.20.7.ebuild b/sys-cluster/kubelet/kubelet-1.20.7.ebuild
index 78302b14a815..c91af0a8527a 100644
--- a/sys-cluster/kubelet/kubelet-1.20.7.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.20.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubelet/kubelet-1.21.0.ebuild b/sys-cluster/kubelet/kubelet-1.21.0.ebuild
deleted file mode 100644
index 25f142b537a3..000000000000
--- a/sys-cluster/kubelet/kubelet-1.21.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test "
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.21.1.ebuild b/sys-cluster/kubelet/kubelet-1.21.1.ebuild
index 25f142b537a3..8f2f77250771 100644
--- a/sys-cluster/kubelet/kubelet-1.21.1.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.21.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/mpe2/Manifest b/sys-cluster/mpe2/Manifest
index a56ebef1c24b..a64c904096d3 100644
--- a/sys-cluster/mpe2/Manifest
+++ b/sys-cluster/mpe2/Manifest
@@ -1,5 +1,5 @@
 AUX slog2sdk-trace_rlog-makefile-fixes.patch 2734 BLAKE2B 490883779a9f04a55a4254213157c6192ddd635c40ff04a76aba08d88719186645df902093d82ca7540032a0d458a372f022ccb669fc7112185b05ec32ebb152 SHA512 6fee1a5b06cb1394a9263d856af3b5522c8b8f10bbd481b1f94644a93290718cb38c753efbeb426d3aed98827049c7c574e1e529dfb34e35134da672c34bd684
 AUX slog2sdk-trace_sample-makefile-fixes.patch 2746 BLAKE2B c77ac2581d8eb9d4f46e452d7543307fc863b0319dab001c6204399d05fe416cf429f8684d03cd17892c4240f0398798c58dba96ee24f99066571d64a580e534 SHA512 dd5f1f86a4a2abc9a5248856b0eddfc276f9bfb1376ac65f98ec28280d98fb6039e4425c5fe3a02b3ef38bd993a0440b200734520f25afef52feee7af9cd11f9
 DIST mpe2-1.0.6p1.tar.gz 9313216 BLAKE2B 0c04d4dc6ed6396140c1d34f2e715c38765999c812f5d04a2e1b3970ab2dfec9bc45ada49e8e2c53f46b745cf3605c508728a9e38cd73ca0cd320cc9c2ce72a4 SHA512 89aa4197aef4fdef14db032f058772c179bbb9055ad369338588a883ed9e75c825e396a1233d8dc079db605eeb1aa3a8ccd392c2df6ea0ccd89cd0433ba371b4
-EBUILD mpe2-1.0.6_p1-r2.ebuild 3810 BLAKE2B cb18fe538df8ac405aaf3b6197a74c10d964fa1fe88b40f54f54aed992d3f45f5a7e49a1ad64b31bba05bbdcecbc19e9a0a3050d5fe0048e90f4557d1fb4fbc9 SHA512 a56ed851f478770d15e7fda0aead7e220cdcafd08b58e4a341004500ec886356daa48575c4ee9dcaac1731ebd22f48c470fb2121e0a3de780420af64e7135021
+EBUILD mpe2-1.0.6_p1-r2.ebuild 3827 BLAKE2B 872cecf33b0d62d421c9eeedd91e3fc954f840edab0c17f622ce0d5c9d316492565e9d2c95818e4cfb323870f5020ac73b9c91d6d17775f4b30f8520dd885245 SHA512 520cf8cfcbc69a4736629bfef956948ba890806c78412140f6ef54264bd33bee917349ec5d7f04da84f498eb8e5c5af5f848f0e7bde50539d717aa3ce28c733a
 MISC metadata.xml 257 BLAKE2B 7384ec22c045377599221b8961bb3ff4febe50844c76a23d5084628c4568765831eee20ccc61b0c90d4f940688e9b68d33fd5db65321399f5caa0fdb7e023be0 SHA512 d01f4b592393076365e924fcc717c807172488f03a7b64542238616207fd00dacd096c383e68b9558142f7dab357578f91904f73acd41ce3a6ba7b7ef72b4980
diff --git a/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild b/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild
index fe48a351a0c8..71802728bcba 100644
--- a/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild
+++ b/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild
@@ -123,7 +123,7 @@ src_test() {
 		echo "MPD_SECRETWORD=junk" > "${T}"/mpd.conf || die
 		chmod 600 "${T}"/mpd.conf || die
 		export MPD_CONF_FILE="${T}/mpd.conf"
-		"${ROOT}"usr/bin/mpd -d --pidfile="${T}"/mpd.pid || die
+		"${EPREFIX%/}"/usr/bin/mpd -d --pidfile="${T}"/mpd.pid || die
 	elif [[ "${MPE_IMP}" == openmpi* ]] && [ -z "${MPE2_FORCE_OPENMPI_TEST}" ]; then
 		echo
 		einfo "Skipping tests for openmpi"
@@ -136,12 +136,12 @@ src_test() {
 	emake -j1 \
 		CC="${S}"/bin/mpecc \
 		FC="${S}"/bin/mpefc \
-		MPERUN="${ROOT}/usr/bin/mpiexec -n 4" \
+		MPERUN="${EPREFIX%/}/usr/bin/mpiexec -n 4" \
 		CLOG2TOSLOG2="${S}/src/slog2sdk/bin/clog2TOslog2" \
 		check;
 		rc=${?}
 	if [[ "${MPE_IMP}" == mpich2 ]]; then
-		"${ROOT}"usr/bin/mpdallexit || kill $(<"${T}"/mpd.pid)
+		"${EPREFIX%/}"/usr/bin/mpdallexit || kill $(<"${T}"/mpd.pid)
 	fi
 
 	return ${rc}
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index c4ade3d6c2bf..642ce5d1d409 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -6,22 +6,15 @@ AUX neutron-openvswitch-agent.confd 142 BLAKE2B 32c521f734854608173a41625bc037ee
 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-16.3.1.tar.gz 12880968 BLAKE2B 2915490523578f10f067682ad393c06bc7f793a736f94282e79e82e4f0108fa20a99d8a91f4344094de394316a71c4a5fdd2995db212ddd90fd7cdeddd00787b SHA512 8518f706d4bcb4bf44e2ef9b35b858f08f2e7ac20211944ca0d4df6e2be029817bc541f2fff497bd40b4a85621ee4aa8ac433fbdd19a5d8597df0725a377ae91
 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-16.3.1.tar.gz 24350 BLAKE2B 8f6eeae762fa297651f07667387beac6677cfa9a6c0d13d3fc90ac09753022fd284fc56c53557ab83cda99ab4fe03acc2d2049e4bb62f9496b310b1cd6f42099 SHA512 b087b23a1aa19678d4b9a76ae82243d03fe82706712e8c37b759a8521062f79e83307769b4ba639f67aa402f8b03cdf12d3274d821c3f8ecfd17ded9f4f2c881
 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.1.9999.tar.gz 24350 BLAKE2B 8f6eeae762fa297651f07667387beac6677cfa9a6c0d13d3fc90ac09753022fd284fc56c53557ab83cda99ab4fe03acc2d2049e4bb62f9496b310b1cd6f42099 SHA512 b087b23a1aa19678d4b9a76ae82243d03fe82706712e8c37b759a8521062f79e83307769b4ba639f67aa402f8b03cdf12d3274d821c3f8ecfd17ded9f4f2c881
 DIST neutron-configs-2020.2.9999.tar.gz 30314 BLAKE2B 885d00259fde0200f6a52d91b18e884012c04cb06e5e4ba6c72b77fbb0a8df30d50efd6db16faa009328eac9b7c5fb31854feb81595a542b4ac5d8172c8056b6 SHA512 cf85a563c417e1fb01f7d329c7021c20782fe67f64c5dfd542deed07e09d6a717e472976df8f1f4c3bb4a6a10e8d8b8300f18e1a3759358b3db12f77dad7bd5b
-DIST neutron-ml2-plugins-16.3.1.tar.gz 8887 BLAKE2B 5887027ce4585a523bb3379c002acdde1faa9ed24d0c83c931f2a387b56e8baf8352ae9f82ba46c85a6a3e5b1d68792da1e1ca1fae9b6dde525e6f6c67849ac4 SHA512 4ae70fe3e386932e0327333d29dc526b5f0f0f800ac14d17faa4c1e3fc2dd8524760b84bbb4767e73e70647984aa50702e5e47dc42deb47f66c47c5e3e965111
 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.1.9999.tar.gz 8887 BLAKE2B 5887027ce4585a523bb3379c002acdde1faa9ed24d0c83c931f2a387b56e8baf8352ae9f82ba46c85a6a3e5b1d68792da1e1ca1fae9b6dde525e6f6c67849ac4 SHA512 4ae70fe3e386932e0327333d29dc526b5f0f0f800ac14d17faa4c1e3fc2dd8524760b84bbb4767e73e70647984aa50702e5e47dc42deb47f66c47c5e3e965111
 DIST neutron-ml2-plugins-2020.2.9999.tar.gz 9011 BLAKE2B d9f8cb4d26699ca44a4cf4cd422bd88b9bb5a2138a80fec469021491d87b158502801c2ce79316f52a900877f7706dc93c2a5a5a33c868918effeaa6b65a7931 SHA512 a225310f0f54991a079d515512189b3c08de22c5b13d58960ef24498401fc54b0878ed879d895e696b789e703a0bb3f4a184eccbbfb9ac9fe9447086cb952b37
-EBUILD neutron-16.3.1.ebuild 8434 BLAKE2B 88f051d11d85ce9e908ad043e87b4e7e7a62335fa7526b198e010a32018e553cb375c7b9d8f44e9232d5d7e7533f44eedcb1e63f03e7fb0c6df9943ce803353b SHA512 4ba4ecf390628b5a72df8821677e525fb38552e0aaf3d47eb80703fb3f435436370d5031d1adca08874c3bea3cc149cec7f1b03f622f794111fc5fef79e00672
 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.1.9999.ebuild 8433 BLAKE2B 05813a35255dbb7e8c9e62d4d6ba849455e5945006843fb27babe335945036b18948d4c1d08bb75b3abc69d0f929b0dc53e25a2fa0783f81a3ef826e69a0fcd5 SHA512 0f7f4436b8ee80b0a392116a20f8a1e049b90562591af37d9a81dd47fdd0a74d1db4e67d717c292093744549a6fcb6f144361f30a5f32471c0ffede6f5bca3e2
 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/neutron-16.3.1.ebuild b/sys-cluster/neutron/neutron-16.3.1.ebuild
deleted file mode 100644
index b74b10580eff..000000000000
--- a/sys-cluster/neutron/neutron-16.3.1.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 linux-info
-
-DESCRIPTION="A virtual network service for Openstack"
-HOMEPAGE="https://launchpad.net/neutron"
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/configs.tar.gz -> neutron-configs-${PV}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz"
-	EGIT_REPO_URI="https://github.com/openstack/neutron.git"
-	EGIT_BRANCH="stable/ussuri"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/configs.tar.gz -> neutron-configs-${PV}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite +mysql postgres"
-REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
-						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
-						|| ( openvswitch linuxbridge ) )"
-
-CDEPEND=">=dev-python/pbr-4.0.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	>=dev-python/pecan-1.3.2[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/neutron-lib-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-4.4.0[${PYTHON_USEDEP}]
-	compute-only? (
-		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
-	)
-	sqlite? (
-		>=dev-python/sqlalchemy-1.2.0[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.37.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.35.1[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/os-ken-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/ovsdbapp-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pyroute2-0.5.7[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.31.2[${PYTHON_USEDEP}]
-	>=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/os-vif-1.15.1[${PYTHON_USEDEP}]
-	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
-	dev-python/pyudev[${PYTHON_USEDEP}]
-	sys-apps/iproute2
-	net-misc/iputils[arping]
-	net-misc/bridge-utils
-	net-firewall/ipset
-	net-firewall/iptables
-	net-firewall/ebtables
-	net-firewall/conntrack-tools
-	haproxy? ( net-proxy/haproxy )
-	openvswitch? ( net-misc/openvswitch )
-	ipv6? (
-		net-misc/radvd
-		>=net-misc/dibbler-1.0.1
-	)
-	dhcp? ( net-dns/dnsmasq[dhcp-tools] )
-	acct-group/neutron
-	acct-user/neutron"
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_DEFRAG_IPV4 NF_NAT NF_CONNTRACK \
-	IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
-		done
-	fi
-}
-
-pkg_config() {
-	fperms 0700 /var/log/neutron
-	fowners neutron:neutron /var/log neutron
-}
-
-src_prepare() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	# it's /bin/ip not /sbin/ip
-	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use server; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-server"
-		newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
-		dosym ../../plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
-	fi
-	if use dhcp; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
-		newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
-	fi
-	if use l3; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
-		newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
-	fi
-	if use metadata; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
-		newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
-	fi
-	if use openvswitch; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
-		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
-		newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
-		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
-	fi
-	if use linuxbridge; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
-		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
-	fi
-	diropts -m 755 -o neutron -g neutron
-	dodir /var/log/neutron /var/lib/neutron
-	keepdir /etc/neutron
-	insinto /etc/neutron
-	insopts -m 0640 -o neutron -g neutron
-
-	doins etc/*
-	# stupid renames
-	insinto /etc/neutron
-	doins -r "etc/neutron/plugins"
-	insopts -m 0640 -o root -g root
-	doins "etc/rootwrap.conf"
-	doins -r "etc/neutron/rootwrap.d"
-
-	#add sudoers definitions for user neutron
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/neutron.sudoersd" neutron
-
-	# add generated configs
-	cd "${D}/etc/neutron" || die
-	unpack "neutron-configs-${PV}.tar.gz"
-	cd "${D}/etc/neutron/plugins/ml2" || die
-	unpack "neutron-ml2-plugins-${PV}.tar.gz"
-
-	# correcting perms
-	fowners neutron:neutron -R "/etc/neutron"
-	fperms o-rwx -R "/etc/neutron/"
-
-	#remove superfluous stuff
-	rm -R "${D}/usr/etc/"
-}
-
-python_install() {
-	distutils-r1_python_install
-	# copy migration conf file (not coppied on install via setup.py script)
-	python_moduleinto neutron/db/migration/alembic_migrations
-	python_domodule "neutron/db/migration/alembic_migrations/versions"
-}
-
-pkg_postinst() {
-	elog
-	elog "neutron-server's conf.d file may need updating to include additional ini files"
-	elog "We currently assume the ml2 plugin will be used but do not make assumptions"
-	elog "on if you will use openvswitch or linuxbridge (or something else)"
-	elog
-	elog "Other conf.d files may need updating too, but should be good for the default use case"
-	elog
-}
diff --git a/sys-cluster/neutron/neutron-2020.1.9999.ebuild b/sys-cluster/neutron/neutron-2020.1.9999.ebuild
deleted file mode 100644
index b7172660e8fd..000000000000
--- a/sys-cluster/neutron/neutron-2020.1.9999.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 linux-info
-
-DESCRIPTION="A virtual network service for Openstack"
-HOMEPAGE="https://launchpad.net/neutron"
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/configs.tar.gz -> neutron-configs-${PV}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz"
-	EGIT_REPO_URI="https://github.com/openstack/neutron.git"
-	EGIT_BRANCH="stable/ussuri"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/configs.tar.gz -> neutron-configs-${PV}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite +mysql postgres"
-REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
-						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
-						|| ( openvswitch linuxbridge ) )"
-
-CDEPEND=">=dev-python/pbr-4.0.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	>=dev-python/pecan-1.3.2[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/neutron-lib-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-4.4.0[${PYTHON_USEDEP}]
-	compute-only? (
-		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
-	)
-	sqlite? (
-		>=dev-python/sqlalchemy-1.2.0[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.37.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.35.1[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/os-ken-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/ovsdbapp-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pyroute2-0.5.7[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.31.2[${PYTHON_USEDEP}]
-	>=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/os-vif-1.15.1[${PYTHON_USEDEP}]
-	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
-	dev-python/pyudev[${PYTHON_USEDEP}]
-	sys-apps/iproute2
-	net-misc/iputils[arping]
-	net-misc/bridge-utils
-	net-firewall/ipset
-	net-firewall/iptables
-	net-firewall/ebtables
-	net-firewall/conntrack-tools
-	haproxy? ( net-proxy/haproxy )
-	openvswitch? ( net-misc/openvswitch )
-	ipv6? (
-		net-misc/radvd
-		>=net-misc/dibbler-1.0.1
-	)
-	dhcp? ( net-dns/dnsmasq[dhcp-tools] )
-	acct-group/neutron
-	acct-user/neutron"
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_DEFRAG_IPV4 NF_NAT NF_CONNTRACK \
-	IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
-		done
-	fi
-}
-
-pkg_config() {
-	fperms 0700 /var/log/neutron
-	fowners neutron:neutron /var/log neutron
-}
-
-src_prepare() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	# it's /bin/ip not /sbin/ip
-	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use server; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-server"
-		newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
-		dosym ../../plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
-	fi
-	if use dhcp; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
-		newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
-	fi
-	if use l3; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
-		newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
-	fi
-	if use metadata; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
-		newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
-	fi
-	if use openvswitch; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
-		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
-		newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
-		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
-	fi
-	if use linuxbridge; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
-		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
-	fi
-	diropts -m 755 -o neutron -g neutron
-	dodir /var/log/neutron /var/lib/neutron
-	keepdir /etc/neutron
-	insinto /etc/neutron
-	insopts -m 0640 -o neutron -g neutron
-
-	doins etc/*
-	# stupid renames
-	insinto /etc/neutron
-	doins -r "etc/neutron/plugins"
-	insopts -m 0640 -o root -g root
-	doins "etc/rootwrap.conf"
-	doins -r "etc/neutron/rootwrap.d"
-
-	#add sudoers definitions for user neutron
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/neutron.sudoersd" neutron
-
-	# add generated configs
-	cd "${D}/etc/neutron" || die
-	unpack "neutron-configs-${PV}.tar.gz"
-	cd "${D}/etc/neutron/plugins/ml2" || die
-	unpack "neutron-ml2-plugins-${PV}.tar.gz"
-
-	# correcting perms
-	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
index 9747fbb1b3e4..ca4ad24c032c 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -3,17 +3,12 @@ AUX nova-sudoers 78 BLAKE2B d2df2db0a2905e3a6aec56dc70afab046933d675715c9c16f0e9
 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-21.2.0.tar.gz 9319254 BLAKE2B fb87dcffa40ae38f05ab82c7bd328a3b9e98101598b42ddce318315f431b0c26822ffdfc588ba9c5f60691ad2100201c08309bb0bf3b419b5a9fa4b13f232637 SHA512 c3ad8be452fe68b3552355c8be751823ef067107c4ad8a499fb222951ee429d65ea4e1d8bfa0dfe2a9135ae8140de3b191ee12c3a1df2260cdddd2be36cdbea2
 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.1.9999 191182 BLAKE2B 99999b1b42b9ecc6a7f404c9874c5065591dfd8e896c97d261307f7f3b5e935e12db1b4650182660cf1eb97bcfb993d41a1f89e079120adc00b339b5a4ac1c98 SHA512 af22ba8dcfbafdb07ba2785bdcb40efd201adb81d47bee15ee11bb76437bc7a5b7c88390f995432ffa92b64b849df754bd15264e97530334f3eac6f8f93e828d
 DIST nova.conf.sample-2020.2.9999 187107 BLAKE2B e577126b67f2cc1aa6597f89b1632007f726ad85875d5f27041d0f9ac88923b944fe7f45ae2b3332157713b5f93034dad4da2860917b025649a52d7d71986612 SHA512 4149f8f19a573e8717f521183ba330853742bb6731f0e9ef02842d3be1c188ea3a2cdbeb6043086869360b9b1174a17e221c4ad1f543f74220c46cf31b1ca970
-DIST nova.conf.sample-21.2.0 191182 BLAKE2B 99999b1b42b9ecc6a7f404c9874c5065591dfd8e896c97d261307f7f3b5e935e12db1b4650182660cf1eb97bcfb993d41a1f89e079120adc00b339b5a4ac1c98 SHA512 af22ba8dcfbafdb07ba2785bdcb40efd201adb81d47bee15ee11bb76437bc7a5b7c88390f995432ffa92b64b849df754bd15264e97530334f3eac6f8f93e828d
 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.1.9999.ebuild 7626 BLAKE2B 98608ff335503b676bc1dee5f04dddebfee3a2f955f7b93d68c85dff2b9edf6a2ce6471492487a6f9eddf0035b394f1a42e1770a1ef68863bc5c513efec4b1bf SHA512 bbc8d788b09d99f72aadc7c7d20085a4170ec151835415ed4529dc074c4ccf04eea06c2fe22c0a5ea933ec455bcc829c947e74018d425b7f8b82e0ae9a6add53
 EBUILD nova-2020.2.9999.ebuild 7491 BLAKE2B 6a19d8df373bb00317f19741efcb6c2c8877ecfbc8b4222118fbf483b36fcc69b70296a7ebedf755d4285360c7bc71334993bbc17fbe5ac9aad789bdcb6517e2 SHA512 9dc92dcef5c25660f42d71a54c987a8af350ecb47a81d45510fe50ad76dff3cec4ef1aa0770f2e834686d95943f1f53d7f1d8829bfb5415bbf17be45c8b01184
-EBUILD nova-21.2.0.ebuild 7649 BLAKE2B 95bf74ebcffa2993a89a68ad4d3549fffbb69e264f670f45044b90eb6e95294068d76a0e86afbeb55fd8dad5c55bfff0718f720d2f6fa1477995115d20858194 SHA512 282fd0cc09f3c16114cf59c20b8550e46ebdebcd98130ccef6753eb957d74b269c948817a735f1a1ab26c2d42ae32ea4f0bf1c06a4d01d8dc0bc6b2481d14a49
 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/nova-2020.1.9999.ebuild b/sys-cluster/nova/nova-2020.1.9999.ebuild
deleted file mode 100644
index b31efa129a2e..000000000000
--- a/sys-cluster/nova/nova-2020.1.9999.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-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/ussuri/nova.conf.sample -> nova.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/nova.git"
-	EGIT_BRANCH="stable/ussuri"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ussuri/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-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.20.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.4.1[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
-	!~dev-python/greenlet-0.4.14[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.13.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6.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.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.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.1.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.1.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.1.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.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/os-resource-classes-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/os-traits-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/os-vif-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/os-xenapi-0.3.3[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
-	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/pypowervm-1.1.15[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.16.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/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-21.2.0.ebuild b/sys-cluster/nova/nova-21.2.0.ebuild
deleted file mode 100644
index 191cc6e374ea..000000000000
--- a/sys-cluster/nova/nova-21.2.0.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-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/ussuri/nova.conf.sample -> nova.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/nova.git"
-	EGIT_BRANCH="stable/ussuri"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ussuri/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-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.20.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.4.1[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
-	!~dev-python/greenlet-0.4.14[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.13.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6.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.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.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.1.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.1.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.1.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.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/os-resource-classes-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/os-traits-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/os-vif-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/os-xenapi-0.3.3[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
-	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/pypowervm-1.1.15[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.16.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/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=(
-#	"${FILESDIR}/filename"
-#)
-
-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/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index a746608a607b..9f8493927f11 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -25,5 +25,6 @@ EBUILD openmpi-3.1.4.ebuild 5381 BLAKE2B 806722e9526f4659ac549e306c169d2647078a1
 EBUILD openmpi-4.0.2.ebuild 5321 BLAKE2B 09350d41a27b89cc1938e2ecc9330b5b9511cfda313ec1c46467ae148ecf2c752d301d1c21d9cb164550f9f792fdbd1d1684a1ed2285be59a85d7c5ce4b332cf SHA512 09b95d07f982900cd4d46eaaba11a316528d37c6ac48b1ce51fb94968481530e8283170405bb3c7c9272ae7c452f3cc8f57a55ddd645854c6c1c318f45363b35
 EBUILD openmpi-4.0.3.ebuild 5321 BLAKE2B 09350d41a27b89cc1938e2ecc9330b5b9511cfda313ec1c46467ae148ecf2c752d301d1c21d9cb164550f9f792fdbd1d1684a1ed2285be59a85d7c5ce4b332cf SHA512 09b95d07f982900cd4d46eaaba11a316528d37c6ac48b1ce51fb94968481530e8283170405bb3c7c9272ae7c452f3cc8f57a55ddd645854c6c1c318f45363b35
 EBUILD openmpi-4.0.4.ebuild 5321 BLAKE2B 09350d41a27b89cc1938e2ecc9330b5b9511cfda313ec1c46467ae148ecf2c752d301d1c21d9cb164550f9f792fdbd1d1684a1ed2285be59a85d7c5ce4b332cf SHA512 09b95d07f982900cd4d46eaaba11a316528d37c6ac48b1ce51fb94968481530e8283170405bb3c7c9272ae7c452f3cc8f57a55ddd645854c6c1c318f45363b35
+EBUILD openmpi-4.0.5-r1.ebuild 5441 BLAKE2B 3ee33cc55af1b87ae06bb9a7dba22b8e03bdbb6e0d5104f2de3e30d8cf84ee03828811ffede6fe18d066b4d97472cd5c4a878ea30b3406a1977ab3812c76f5c0 SHA512 bdad805c425f9cc5b03451be0d2d67397bf09aade29571ca37d4540700565175c4c628ff81099f1711e2c006a8a9ea6a0c64446ec23d109c55d203a6d1a3b5cc
 EBUILD openmpi-4.0.5.ebuild 5379 BLAKE2B 4f710429ea2e112c0c1500371c199e990da8b15aed1df010372efcef84cc09b740f1ed39cac64170136f7f6831e475cc4643ec4424abde0501744f9c34667174 SHA512 da2d5951249ae7c4c191c8aef70bd092dae49593db86f675578d182b4e04888b9db5d13bea062ccf2e9702a5bf210b3f51658de4770d71c97cc13246995a841a
-MISC metadata.xml 820 BLAKE2B b606cd3e91faba78d213cd55ef0f23f03085b78374b604dfa5f2f4ff3add9a6cc4c42b071579e30f9b72197c2b41dbb302d8f393881392f400296ff6b59fe0db SHA512 9025216b610924a248c80843da4e90e615078933d332ca06f4ac9c1fa46bf94a444c6b2704f1ad470f7beed797c66ee59cb961cd88e17c5b5c18d315a2233f5d
+MISC metadata.xml 960 BLAKE2B 6b4a60bb64814ddf030e39210ea97c613e2777a665355a5228bf30f128f1a51f958113093c071a9d4e89e40019eade71c68a5c2c32abfca5fa5f050fdb080c10 SHA512 e0c3b2fb31a353bebb1aaf752dee4a376aa8694522321d91851cd806a874ff20879ec2f1a1258c9379fcabdf5b75007900aa1073a3dd26f41070d9f02b4c042e
diff --git a/sys-cluster/openmpi/metadata.xml b/sys-cluster/openmpi/metadata.xml
index e319ff476a17..32314bce38b5 100644
--- a/sys-cluster/openmpi/metadata.xml
+++ b/sys-cluster/openmpi/metadata.xml
@@ -10,10 +10,12 @@
 		<flag name="cuda">Add GPU direct support</flag>
 		<flag name="heterogeneous">Enable features required for heterogeneous
 		platform support</flag>
-		<flag name="romio">Build the ROMIO MPI-IO component</flag>
+		<flag name="libompitrace">Enable support for contributed package libompitrace</flag>
 		<flag name="mpi-threads">Enable MPI_THREAD_MULTIPLE</flag>
 		<flag name="numa">Enable numactl to allow binding processes to CPUs</flag>
-		<flag name="vt">Enable bundled VampirTrace support</flag>
 		<flag name="pbs">Add support for the Portable Batch System (PBS)</flag>
+		<flag name="peruse">Enable PERUSE interface</flag>
+		<flag name="romio">Build the ROMIO MPI-IO component</flag>
+		<flag name="vt">Enable bundled VampirTrace support</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-cluster/openmpi/openmpi-4.0.5-r1.ebuild b/sys-cluster/openmpi/openmpi-4.0.5-r1.ebuild
new file mode 100644
index 000000000000..0f2a2af8b199
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-4.0.5-r1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED=fortran
+
+inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib multilib-minimal
+
+MY_P=${P/-mpi}
+S=${WORKDIR}/${MY_P}
+
+IUSE_OPENMPI_FABRICS="
+	openmpi_fabrics_ofed
+	openmpi_fabrics_knem
+	openmpi_fabrics_psm"
+
+IUSE_OPENMPI_RM="
+	openmpi_rm_pbs
+	openmpi_rm_slurm"
+
+IUSE_OPENMPI_OFED_FEATURES="
+	openmpi_ofed_features_control-hdr-padding
+	openmpi_ofed_features_udcm
+	openmpi_ofed_features_rdmacm
+	openmpi_ofed_features_dynamic-sl"
+
+DESCRIPTION="A high-performance message passing library (MPI)"
+HOMEPAGE="https://www.open-mpi.org"
+SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+IUSE="cma cuda cxx fortran heterogeneous ipv6 java libompitrace peruse romio
+	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
+
+REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
+	openmpi_rm_pbs? ( !openmpi_rm_slurm )
+	openmpi_fabrics_psm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )"
+
+CDEPEND="
+	!sys-cluster/mpich
+	!sys-cluster/mpich2
+	!sys-cluster/nullmpi
+	>=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads]
+	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+	>=sys-apps/hwloc-2.0.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
+	openmpi_fabrics_ofed? ( || ( sys-cluster/rdma-core sys-fabric/ofed:* ) )
+	openmpi_fabrics_knem? ( sys-cluster/knem )
+	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
+	openmpi_rm_pbs? ( sys-cluster/torque )
+	openmpi_rm_slurm? ( sys-cluster/slurm )
+	openmpi_ofed_features_rdmacm? ( || ( sys-cluster/rdma-core sys-fabric/librdmacm:* ) )"
+
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.6 )"
+
+DEPEND="${CDEPEND}
+	java? ( >=virtual/jdk-1.6 )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/mpi.h
+	/usr/include/openmpi/ompi/mpi/java/mpiJava.h
+)
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	java-pkg-opt-2_pkg_setup
+
+	elog
+	elog "OpenMPI has an overwhelming count of configuration options."
+	elog "Don't forget the EXTRA_ECONF environment variable can let you"
+	elog "specify configure options if you find them necessary."
+	elog
+}
+
+src_prepare() {
+	default
+
+	# Necessary for scalibility, see
+	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
+	echo 'oob_tcp_listen_mode = listen_thread' \
+		>> opal/etc/openmpi-mca-params.conf || die
+}
+
+multilib_src_configure() {
+	if use java; then
+		# We must always build with the right -source and -target
+		# flags. Passing flags to javac isn't explicitly supported here
+		# but we can cheat by overriding the configure test for javac.
+		export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
+	fi
+
+	local myconf=(
+		--enable-mpi-fortran=$(usex fortran all no)
+		--enable-orterun-prefix-by-default
+		--enable-pretty-print-stacktrace
+
+		--sysconfdir="${EPREFIX}/etc/${PN}"
+
+		--with-hwloc="${EPREFIX}/usr"
+		--with-hwloc-libdir="${EPREFIX}/usr/$(get_libdir)"
+		--with-libltdl="${EPREFIX}/usr"
+		--with-libevent="${EPREFIX}/usr"
+		--with-libevent-libdir="${EPREFIX}/usr/$(get_libdir)"
+
+		$(use_enable cxx mpi-cxx)
+		$(use_enable heterogeneous)
+		$(use_enable ipv6)
+		$(use_enable libompitrace)
+		$(use_enable peruse)
+		$(use_enable romio io-romio)
+
+		$(use_with cma)
+
+		$(multilib_native_use_enable java mpi-java)
+		$(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding)
+		$(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm)
+		$(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm)
+		$(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl)
+
+		$(multilib_native_use_with cuda cuda "${EPREFIX}"/opt/cuda)
+		$(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr)
+		$(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr)
+		$(multilib_native_use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr)
+		$(multilib_native_use_with openmpi_rm_pbs tm)
+		$(multilib_native_use_with openmpi_rm_slurm slurm)
+	)
+	ECONF_SOURCE=${S} econf "${myconf[@]}"
+}
+
+multilib_src_test() {
+	# Doesn't work with the default src_test as the dry run (-n) fails.
+	emake -j1 check
+}
+
+multilib_src_install() {
+	default
+
+	# fortran header cannot be wrapped (bug #540508), workaround part 1
+	if multilib_is_native_abi && use fortran; then
+		mkdir "${T}"/fortran || die
+		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
+	else
+		# some fortran files get installed unconditionally
+		rm \
+			"${ED}"/usr/include/mpif* \
+			"${ED}"/usr/bin/mpif* \
+			|| die
+	fi
+}
+
+multilib_src_install_all() {
+	# fortran header cannot be wrapped (bug #540508), workaround part 2
+	if use fortran; then
+		mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
+	fi
+
+	# Remove la files, no static libs are installed and we have pkg-config
+	find "${ED}" -name '*.la' -delete || die
+
+	if use java; then
+		local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
+		java-pkg_dojar "${mpi_jar}"
+		# We don't want to install the jar file twice
+		# so let's clean after ourselves.
+		rm "${mpi_jar}" || die
+	fi
+	einstalldocs
+}
diff --git a/sys-cluster/placement/Manifest b/sys-cluster/placement/Manifest
index c172830c0ee7..4028ebe68ff8 100644
--- a/sys-cluster/placement/Manifest
+++ b/sys-cluster/placement/Manifest
@@ -1,11 +1,6 @@
-DIST openstack-placement-3.0.0.tar.gz 502408 BLAKE2B daf5d3b441a10fc9d1be03df52e9df265cecc61d74fd1c5eff0b6acc36011fb3defb8d4233e597b4b1445fb56a77d746343f9021e5b0073272d7e30e830571b3 SHA512 b3735d8b74019c71c5eef9d5a4331c9370c1224d8caeaeb5fdbc81577778dc9795b729df00abc3e06175dc5c7f401daacbbd331aa9295e84cb76abd013d7aa2a
 DIST openstack-placement-4.0.0.tar.gz 502434 BLAKE2B 9c769d2ef78bad37ef6ac823c9b0fa29128bfea94626f6a4e9cd1ffa6e1e4d441e4b20353e97282823bc1638ee25499fa840b9d34600b1928271627d412c93cc SHA512 32ff30f7216ea56b073582c2e1c4b501229d941f3c6fc501245ab92544234774df63a9b9674ba5f1225d462ab205b2512185907e309e4135e01e1776d554b293
-DIST placement.conf.sample-2020.1.9999 26302 BLAKE2B 077c85c86b7b2fa83b8ac7f41a2fdf5e64bcc8c82f9252e2bb0c7be164944a9c11cb14eb3911f37945e5de8faa7e7a5e2de4df656ed80a0f208105a8c6db7cb0 SHA512 179913a1908bc688220d10d908d487fdf59bab56213051569fe4f8ac233242c9f9eca3ba4293a2f049c46e68eeca62aa7bc0ba0f61d9276247b166abb063eb3a
 DIST placement.conf.sample-2020.2.9999 26306 BLAKE2B 037ce73d52066fc2f2fe0542c10e3879c513ca23f127a03cd575cca0d21f7b2f4f36491c238897cacd962072797d9d2fd50be054c3ae09f95f5417ab9758b289 SHA512 640329729d0964b67a25837692f0db0f5e9682aff6bd1f3e124657c4bc0de7f6a9f65a5c17889cd6c0a0584d471c880865a59b939262ed8beac2ae452d0ea02a
-DIST placement.conf.sample-3.0.0 26302 BLAKE2B 077c85c86b7b2fa83b8ac7f41a2fdf5e64bcc8c82f9252e2bb0c7be164944a9c11cb14eb3911f37945e5de8faa7e7a5e2de4df656ed80a0f208105a8c6db7cb0 SHA512 179913a1908bc688220d10d908d487fdf59bab56213051569fe4f8ac233242c9f9eca3ba4293a2f049c46e68eeca62aa7bc0ba0f61d9276247b166abb063eb3a
 DIST placement.conf.sample-4.0.0 26306 BLAKE2B 037ce73d52066fc2f2fe0542c10e3879c513ca23f127a03cd575cca0d21f7b2f4f36491c238897cacd962072797d9d2fd50be054c3ae09f95f5417ab9758b289 SHA512 640329729d0964b67a25837692f0db0f5e9682aff6bd1f3e124657c4bc0de7f6a9f65a5c17889cd6c0a0584d471c880865a59b939262ed8beac2ae452d0ea02a
-EBUILD placement-2020.1.9999.ebuild 3435 BLAKE2B 8173219bc9b16f85ff1c1c157c7e00ae7256e6b5e07c53aa8b9ae89663f8d7599662850efbd0f47e9a5c820b16087bf4bcfaef27f28e31a7a6847874367a0228 SHA512 fcbd301eb249084468498d96e1385a1db312ecda5774721b3d36c87cc83e825e085bd5e3d0e6d00ea91c04433824543a23c8af99eefbd93f18846b93f93d805e
 EBUILD placement-2020.2.9999.ebuild 2790 BLAKE2B 3165ca6ae8a9954218b9891f9deb1d097ce795b036102a03349b08b9766c4c74ba071743f251073ac58c5d3be39ff72fc99f5dc38240bdbd106e521d43858f9a SHA512 49e4f3ae482c6a581dbe531d0238fb576c8475375490e3b51b38ec971081a1b0905ef9cb2d57e36da799c345053fbd87b7c32c0cc2d4c6ff8b353b1a7fd6f83d
-EBUILD placement-3.0.0.ebuild 3433 BLAKE2B 4761a686efe2e36e389bb9b37f08810b0616656f954fd8ef96d7753224a97fb3546aa6453e558d8fd6a6401b4817b2589aed9edc0895d4ac0c3611388b1dc33a SHA512 f8e54b76f4e8777996fe5586a4d6a2df9432284316aea4bbe180dbaa6291a88421d8ce8eec8435d0a3f489089cdf2d500f3546ce3eccb67d0e0ca0ad37c19bce
 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/placement-2020.1.9999.ebuild b/sys-cluster/placement/placement-2020.1.9999.ebuild
deleted file mode 100644
index 2f81e59177d4..000000000000
--- a/sys-cluster/placement/placement-2020.1.9999.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-
-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/ussuri/placement.conf.sample -> placement.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/placement.git"
-	EGIT_BRANCH="stable/ussuri"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/placement/ussuri/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/setuptools-21.0.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.2[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.3[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.1.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.1.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.2.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.2[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-36.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	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-2.6.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.2.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-3.0.0.ebuild b/sys-cluster/placement/placement-3.0.0.ebuild
deleted file mode 100644
index 01b7fd0082b0..000000000000
--- a/sys-cluster/placement/placement-3.0.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-
-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/ussuri/placement.conf.sample -> placement.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/placement.git"
-	EGIT_BRANCH="stable/ussuri"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/placement/ussuri/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/setuptools-21.0.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.2[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.3[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.1.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.1.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.2.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.2[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-36.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	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-2.6.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.2.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/sanlock/Manifest b/sys-cluster/sanlock/Manifest
index 67faed0969f1..d5da99ba867d 100644
--- a/sys-cluster/sanlock/Manifest
+++ b/sys-cluster/sanlock/Manifest
@@ -2,5 +2,5 @@ AUX sanlock-fence_sanlock-LDFLAGS.patch 504 BLAKE2B 11176057304ee5f841500921f1fa
 AUX sanlock.initd 249 BLAKE2B 18bafba28ab4449c7f25ab2d14b4ac2d3cc89cf79bfb8f802fd180584becde8a5b9d919ac9ab887a4ebdfe8ea64e53f30b3785bc32875ccd2e25fa99a9278081 SHA512 5ed7b2d96cb875e2db0914ec7232fe8443c05de69e07d214ffc0adfafac5123694173373f831c5acf46d11aa4fca304b88e6e4c4ee2fbe5b033d173eea5aec36
 AUX wdmd.initd 261 BLAKE2B 65b393f2f084896d3c17aa0345f9930badeec7a3ee4cc7e47bd0a35e47c18ea2bcf5afdc386c0da98988bc9fae479a68b504c244b55ab389ac7f5304c34282ae SHA512 9c7e980817c1c76868caff229b42a3d70e912abfd8c974bf5b856067bef79fbd3a5942b30bcb7d02869e2eba85e6f6ba3c861e9780046b01b25df1b39661b6c0
 DIST sanlock-3.8.2.tar.gz 266780 BLAKE2B 5248d08225bcc2a19594a3dcd3872c8c69ca8b217d31f6263f2717e4594180d4ba4685c9679ce2f31b6a2dcb4fe9f3e6a5dd5ac3ed073aea02599e7bbc04390c SHA512 2fa92e16eee4d2f3dac452400522f7e90b93b71349d322564d5957e2d87fb4bd69f0b5617b05f4b296c272d6da9a404fccadbbfff106354a0e302c436593eaac
-EBUILD sanlock-3.8.2.ebuild 2080 BLAKE2B eb5ae95303db97b55dd80107936f776ec02856fa82514213c614b104cbf762cdedeb84f3fad3b7ee103b38f279a2c8a332003cb7034ebac2253b26380a0b128c SHA512 b200d000895c830b1f34e809b76910c96d2318b0dfb7b19bbffe5c4a947cb489886a5bfae147c26a072d8310e4d2003793b6310fa31bdb2c67ed843675815189
+EBUILD sanlock-3.8.2.ebuild 2162 BLAKE2B 49264c2dc1d0cba149548ca16435426e5dccf9b9966da8538dbb770cd15b1d93e69e0cc5806865a13f9a0595aca7206a28bdeb89f592c64ff05f626f9e031ec9 SHA512 3504d179f274a424e82daeea0c144eb5ed3d35fd4c68bce64512c7ad404adb0c29642bd1cc450ad2786c4e6a36ca4f2f79844faef7017616fe1af37b922fa313
 MISC metadata.xml 368 BLAKE2B a15a411ea20eb7649f299e38704b394344194d7526f9bc92b27c0a26760d7dba05b1e5d483ff5f9ce73a6d1cd527a18ac905344a614c8dc31a0c1180b2be07e7 SHA512 2cc3ec3c99cfff2e0c576ab6c7b0a39460af875ba826ce0cf3c5a1a4f0f3def6170753c8d42af2fc7a139ad7f2135e309c3165bde83b4e7574292768c96e8086
diff --git a/sys-cluster/sanlock/sanlock-3.8.2.ebuild b/sys-cluster/sanlock/sanlock-3.8.2.ebuild
index 8426d4f6d3ca..baada07ab2ae 100644
--- a/sys-cluster/sanlock/sanlock-3.8.2.ebuild
+++ b/sys-cluster/sanlock/sanlock-3.8.2.ebuild
@@ -35,7 +35,7 @@ pkg_setup() {
 	if linux_config_exists; then
 		if ! linux_chkconfig_present SOFT_WATCHDOG; then
 			ewarn ""
-			ewarn "$warning"
+			ewarn "${warning}"
 			ewarn ""
 		fi
 	else
@@ -47,19 +47,29 @@ pkg_setup() {
 
 src_compile() {
 	for d in wdmd src fence_sanlock reset; do
-		cd $d; emake; cd ..
+		cd ${d} || die
+		emake
+		cd .. || die
 	done
+
 	if use python; then
-		cd python; python_foreach_impl emake; cd ..
+		cd python || die
+		python_foreach_impl emake
+		cd .. || die
 	fi
 }
 
 src_install() {
 	for d in wdmd src fence_sanlock reset; do
-		cd $d; emake DESTDIR="${D}" LIBDIR="${EROOT}usr/$(get_libdir)" install; cd ..
+		cd ${d} || die
+		emake DESTDIR="${D}" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+		cd .. || die
 	done
+
 	if use python; then
-		cd python; python_foreach_impl emake DESTDIR="${D}" install; cd ..
+		cd python || die
+		python_foreach_impl emake DESTDIR="${D}" install
+		cd .. || die
 	fi
 
 	# config
@@ -78,7 +88,7 @@ src_install() {
 
 	# systemd
 	systemd_newunit init.d/sanlock.service.native sanlock.service
-	sed -i 's,^ExecStartPre=,#ExecStartPre=,' init.d/wdmd.service.native
+	sed -i 's,^ExecStartPre=,#ExecStartPre=,' init.d/wdmd.service.native || die
 	systemd_newunit init.d/wdmd.service.native wdmd.service
 	systemd_dounit init.d/sanlk-resetd.service
 	#systemd_dounit ${FILESDIR}/fence_sanlockd.service
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index 7f64e783ce98..c74212813e7d 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -2,13 +2,10 @@ AUX swift-account.initd 867 BLAKE2B 12a01902f520b2c25261a229e1239c3f85ba05dd708e
 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.25.1.tar.gz 3161690 BLAKE2B 985bcb884f4de9a7a4fbb8e2e76ff416035ac4554d3135c04d679c1d88a8443b988b5a18b4f3f1864542c93109020bb77eef72836fd40e705a9293c8a481e4f0 SHA512 4943949a420fa174e30c178b07797af4dceb89174c2e13ac9db35ff66a648024c907b52b9cdba2f730bc587b4d712efa3da09e77ccca51bd537703fc3c17144b
 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.25.1.ebuild 3550 BLAKE2B a6b1ecaffa458adbec2fb65b94f12b0bceb61985c41eb48fd1eb73dae9586e73acd645e59959dce61016efd8de4ee3bb5c8e278f6ab77285614337624d7bde13 SHA512 39a8de0a0f32a1c47e8e0d78e6264e6e6ee9475fe805f20cc9da3285d75720f8de726adabc7025780b69b31f826b63e7fceaefdfef9fd088d03cffb498810ada
 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.1.9999.ebuild 3552 BLAKE2B 05fb421532a000eaa46dba8b41cde74da2423bec06cf7c596159f44efc21983eb9561aa0625b8b7300376b1c01442d17c554ce1cbab74a5d77e01fa70a0aa524 SHA512 8f337d966dee28ae4e42b99c5adbfb824c3af2094836d4e25eeeba7f2de796278d42763a8e9e425471858163b2e1adb4497149b6a7e40607209bb47145e556dc
 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/swift-2.25.1.ebuild b/sys-cluster/swift/swift-2.25.1.ebuild
deleted file mode 100644
index 38030d0f34f9..000000000000
--- a/sys-cluster/swift/swift-2.25.1.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_7 )
-
-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/ussuri"
-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="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${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-2020.1.9999.ebuild b/sys-cluster/swift/swift-2020.1.9999.ebuild
deleted file mode 100644
index aa87f6fac62e..000000000000
--- a/sys-cluster/swift/swift-2020.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_7 )
-
-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/ussuri"
-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="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${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/ucx/Manifest b/sys-cluster/ucx/Manifest
index c0b1aa6901de..689df6b630a8 100644
--- a/sys-cluster/ucx/Manifest
+++ b/sys-cluster/ucx/Manifest
@@ -1,9 +1,10 @@
+AUX ucx-1.10.0_rc5-drop-werror.patch 1822 BLAKE2B 4a0f9310f8cfd6691f0aac4d86570f60da05e5bc747445884b03618cf67fc583faa75f5789a2147dfa0ecf0c0bd651d87526bc3127a6b9eb092037a90927da22 SHA512 677f9c5a85e6971b7ed4dc9b9f71f69574797df048f6cde25a1c3e61700af71975c4ecbba73d6bcd8ccea582905701a4ea839cfa5b4b81312e09cd729317798e
 DIST ucx-1.10.0_rc5.tar.gz 2399950 BLAKE2B f6f78d2a3e0cd7f252354d59b9d667992c5f9f4d8ee4a41356decf4a1ed72382d8ce5213395bc6bacf1d8658f95808082cc0f825230857ddbbff19ed060efa5c SHA512 b772ad030e80bc5b0ab25d590117950d363f5f7ea1b7ed5ce0bba285d0a932205ee4d73705c094cef077c751b1cf8b6efdd4608c7df6b39d813771a0a31460ac
 DIST ucx-1.2.2.tar.gz 1513611 BLAKE2B 488b9b3cecc2c617b1209036e1342e4378459db6a5e93eab1d88dfe80cb0d9c8013c767413206f0fbd0105557ed89994ab510421068d709101336a7b3d2eac5e SHA512 515c382826310b9aa7179ab19ceb76a881a41e6786514219b7f703c6144fa57ca141bceb3b80523ae1b4e2a4b13e9abcb9df063612b376d894c5cd81cdc00571
 DIST ucx-1.3.0.tar.gz 1707317 BLAKE2B 740ab240663a26fde8abe631416dae6233febf3c587ba6bb7b27a9cb0aa041540ce71e106bb3c5618a719de66d479055961908b67125df61a4c7696999c0affb SHA512 0a2e32985e0225fc4ad15dbb1c422dba1d5552638e7329d67572924502e61e1a481ce30cde5ccc83c663fb4ec643df83efc08aed164dfbce6cf38d66a16b3e42
 DIST ucx-1.5.2.tar.gz 1844416 BLAKE2B 2e0296e34d8116a79c545fb3371dda1746517a18cc75f94da5d1f9420c7a74752839d5a3a07a61a2e91021baa87a26d02ab24554316351db9ba76721a18a5244 SHA512 7f11014eb26df342fc8f0914d323f08f4c19ea21e98e18f0a4ec18b7004299687f91daa8ee654ecee716ece6d4d6de5c9714c548768b1d44551b6be6195e2e9b
 DIST ucx-1.9.0.tar.gz 2467338 BLAKE2B 4d2d18c530f99a56baeb1dec88a7dba813970d3f501eb08f637dc7cefcfe5e564bc121e50c1842ea94e927a0fd657847c571241e3dd9601cdde207729d32d721 SHA512 2e8507e9cbba9ea445efdf8be5b5128dfc76cce30111805e9f7a5618bbbbb77d2bb449b6ad5e415f086b3156b63128306671d3a906583248cde720edb4241c67
-EBUILD ucx-1.10.0_rc5.ebuild 719 BLAKE2B 3927fd32521073fde66d525ce636e40e711f9a42fed7460559c2f9fbe70337135632543449250786758eb386f0afbb9545a896a43665d32fe921cebbd273ab8f SHA512 57efc7274dbb8b59bfe0552a009fda76232904240ff5757d7bd58b8460afd003c04dbd631fe291afc9fd5daa730c0ba07b3f3e0863a4e3138a405c92bb3a1b74
+EBUILD ucx-1.10.0_rc5.ebuild 780 BLAKE2B 53ead7ba1b78df6a996d8a00e3bcd43425062b4f036ebf94156a5822a90472ab4d9e94056d0ca7e4b377207e2ee9467fb6eb683ba0cfdb4e0f057adfbe3bbf29 SHA512 15aaf4479f078f1cda81bc13050e02cd974ab319a150103b406898f9c7edf34bb2743d1788b707db35f6ae47a2500f9f40b1b1a5d1a88a8206b341a9efb40d13
 EBUILD ucx-1.2.2-r1.ebuild 657 BLAKE2B 0296b5fb569ebe585f28ad21a93db38ae8f7e067485bd2bde52e59ef1c55550b4580bb5fb7e3d3749d834fb98deca7992fb27fde1935f7ee416512a6614711e5 SHA512 18f24525c15aeb5c58488577a1fa895d11bd37dca8d18508fa3db09f6be142f7afc147d8b0d6014abcfcc3f1651b23ffc2436a5db16021fcde0ae23277508e30
 EBUILD ucx-1.3.0.ebuild 521 BLAKE2B 424edb7396cd501bfebaace337b0ffdca591e784b020d1f59ac768c576bb45177ace636584ddee803112ebfaf34c3bff11316fde49aa12ba0e923cc266ab8b8e SHA512 505e9fd473b6011b65b32ef657f2dd328e00647409b5ad5e9f1b4aa10ceb734eeb25ee8eaf7b8d70b5b5cce199ce546bf60bb2978b574beec7987f8a2b497d88
 EBUILD ucx-1.5.2.ebuild 608 BLAKE2B d6cd8284f1ba783ea6ef3471d6779859c3af572834b387a123e1829fc01240ab6a476188d290cbc593a07c0af3129c8492594a0947db70e3dc50eb881d5da351 SHA512 03fae77ea4880763d65f7a5332800438c7dcf9a9c6345fa31f486c4770be249012c05791e39e2e8e8e96cc6d6abad967d539f9cc2f5e80950414e770294d543c
diff --git a/sys-cluster/ucx/files/ucx-1.10.0_rc5-drop-werror.patch b/sys-cluster/ucx/files/ucx-1.10.0_rc5-drop-werror.patch
new file mode 100644
index 000000000000..7a6894fe6194
--- /dev/null
+++ b/sys-cluster/ucx/files/ucx-1.10.0_rc5-drop-werror.patch
@@ -0,0 +1,55 @@
+https://bugs.gentoo.org/789762
+
+From 18df3302b256bce6f61d83a58b2afbc8d788ad5c Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 15 Jun 2021 01:40:48 +0000
+Subject: [PATCH] Drop -Werror
+
+---
+ bindings/java/src/main/native/Makefile.am | 2 +-
+ examples/Makefile.am                      | 2 +-
+ test/apps/sockaddr/Makefile.am            | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/bindings/java/src/main/native/Makefile.am b/bindings/java/src/main/native/Makefile.am
+index 73f9940..6616dae 100644
+--- a/bindings/java/src/main/native/Makefile.am
++++ b/bindings/java/src/main/native/Makefile.am
+@@ -64,7 +64,7 @@ libjucx_la_SOURCES = context.cc \
+                      ucs_constants.cc \
+                      worker.cc
+ 
+-libjucx_la_CXXFLAGS = -fPIC -DPIC -Werror -std=gnu++98
++libjucx_la_CXXFLAGS = -fPIC -DPIC -std=gnu++98
+ 
+ libjucx_la_LIBADD = $(topdir)/src/ucs/libucs.la \
+                     $(topdir)/src/uct/libuct.la \
+diff --git a/examples/Makefile.am b/examples/Makefile.am
+index 05cde27..76c3b18 100644
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -23,7 +23,7 @@ EXAMPLE_CUDA_CFLAGS = $(CFLAGS_PEDANTIC)
+ EXAMPLE_CUDA_CPPFLAGS =
+ endif
+ 
+-EXAMPLE_CCLD_FLAGS = -lucs -I$(includedir) -L$(libdir) -Wall -Werror -Wl,-rpath,$(libdir) \
++EXAMPLE_CCLD_FLAGS = -lucs -I$(includedir) -L$(libdir) -Wall -Wl,-rpath,$(libdir) \
+                      $(EXAMPLE_CUDA_LDFLAGS) $(EXAMPLE_CUDA_CPPFLAGS)
+ 
+ installcheck-local:
+diff --git a/test/apps/sockaddr/Makefile.am b/test/apps/sockaddr/Makefile.am
+index 7ce7a01..2e4ad47 100644
+--- a/test/apps/sockaddr/Makefile.am
++++ b/test/apps/sockaddr/Makefile.am
+@@ -12,7 +12,7 @@ noinst_HEADERS = \
+ 	sa_util.h
+ 
+ sa_CXXFLAGS = \
+-	-std=c++11 -g -Wall -Werror
++	-std=c++11 -Wall
+ 
+ sa_CPPFLAGS = $(BASE_CPPFLAGS)
+ 
+-- 
+2.32.0
+
diff --git a/sys-cluster/ucx/ucx-1.10.0_rc5.ebuild b/sys-cluster/ucx/ucx-1.10.0_rc5.ebuild
index 1d3c4a64a113..b1b15f27d9e1 100644
--- a/sys-cluster/ucx/ucx-1.10.0_rc5.ebuild
+++ b/sys-cluster/ucx/ucx-1.10.0_rc5.ebuild
@@ -5,14 +5,14 @@ EAPI=7
 
 inherit autotools
 
+MY_PV=${PV/_/-}
 DESCRIPTION="Unified Communication X"
 HOMEPAGE="https://www.openucx.org"
-
-MY_PV=${PV/_/-}
 SRC_URI="https://github.com/openucx/ucx/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
 
-SLOT="0"
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+numa +openmp"
 
@@ -22,7 +22,9 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10.0_rc5-drop-werror.patch
+)
 
 src_prepare() {
 	default
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index 03af79450380..cd8240a6a9ce 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -1,5 +1,5 @@
 AUX vzctl-4.9.4-glibc225-2.patch 1196 BLAKE2B 4560cb8fc78163b0c397cbf89545aca9c7005f67d31eb41b6dcc2d6c0ab064298655d30eeb958e007320828d5ef7bd7bcb89e44e1b7f5b36c7d327f866f66d6f SHA512 70ec27c9067bdd7fa1e3e2aa32b32649aca8a2d357ffa583c29132d7339f52bbc19195fc9be304f977ee82d96978f3a51bc9cca23d124ce4946c48b6129bd714
 AUX vzctl-4.9.4-glibc225.patch 406 BLAKE2B abee2fcb861f755bd75840eb29ee4921c8580f18d5243cb9ac19bf4fe25e44474cb490d0f673e80a3bff8f17b8c93dd96c3b8b0e2e38dbda5721262b2f610d16 SHA512 db7778a15785e6d9d22d1102cb341647834b6b9eeb4fc26b6cbaa86af7317931d3571a2b7f03a3b419338e11427482dd831374144a67dda2f2f4fe11ff020f45
 DIST vzctl-4.9.4.tar.bz2 550370 BLAKE2B 173d6cfe93b15aef6cb1903a5d711e29190964479c146625a3f9d2ff872161c51b7632213a5f0d47d5a14ec34d7d80499c1bc17f11cfbb80318c26630c05fd71 SHA512 651aa7882ba77442666a09441769f821a7374f417199380667b27c9980203597575dfe12ad5c261da22941b6a2bc6e032d3f9c2d88dcb03af6412634cc5b4706
-EBUILD vzctl-4.9.4.ebuild 2008 BLAKE2B 3323b0687ac64f350951bf64e04832d9ac58c235e820e7a9096a278a718e3d269fae9128b878e9e87c6fa86a6ffb0f7d91797c98818b940c0293b4904a6de260 SHA512 92dfe7ad31eafb659faaf6eb5b73f4ed91c9ef8e450494790168a009cd9b23e6c02c9e11e181374a7ea6665486f51f16f967581a6e5967b3043759d420c03354
+EBUILD vzctl-4.9.4.ebuild 1995 BLAKE2B e8b3ca10f38102ebfca465e20febba768130cfa2f62c75e3c63d7e641c64eb58e896bfcc03c5523080a93b667b14ca16c3d7cd841c281623ba878f3e308323e6 SHA512 044b1a5eaa1e3fef173a37f09f41a66b15f13018cf4488ab006953fc6bd138113923fca444b1f7538656e9547575f2b2fc7860082cde3fd47ade0d71f9b08ec6
 MISC metadata.xml 476 BLAKE2B 6036f242ec8f7fe818244fd4d01d5d89b548c66fa2834127c66dadb4fe3a9d06643fab4ccd297c780e7f470eae8bc73a5d04a03ed15fd732c79c38a841373809 SHA512 0530fde605015304c81e13ae82da0fcd230a97766dcd775632515d7368d701b3ecae16988ad6447d0e77a1ae9d08f31bd28a3e0e3f5ce0f03b915ff2ad453389
diff --git a/sys-cluster/vzctl/vzctl-4.9.4.ebuild b/sys-cluster/vzctl/vzctl-4.9.4.ebuild
index 7c9536d71828..c81f292bc9d1 100644
--- a/sys-cluster/vzctl/vzctl-4.9.4.ebuild
+++ b/sys-cluster/vzctl/vzctl-4.9.4.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=7
 
-inherit bash-completion-r1 toolchain-funcs optfeature udev
+inherit bash-completion-r1 optfeature udev
 
 DESCRIPTION="OpenVZ ConTainers control utility"
-HOMEPAGE="http://openvz.org/"
-SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2"
+HOMEPAGE="https://openvz.org/"
+SRC_URI="https://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc64 x86"
 IUSE="+ploop +vzmigrate"
author	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
commit	d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree	4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /sys-cluster
parent	e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)