gentoo resync : 14.12.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-12-14 13:26:14 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-12-14 13:26:14 +0000
commit: 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree: 25413d1cb3a0cbfe36029db32398c0f333609215 /sys-cluster
parent: 9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)
50 files changed, 556 insertions, 991 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index b8b08eea3b00..2cb2188296ec 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 098621f8c829..4d8a7133b6d6 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -9,6 +9,7 @@ AUX ceph-14.2.0-dpdk-cflags.patch 1171 BLAKE2B a6815317d3828cee8d2476d6cc77b60d0
 AUX ceph-14.2.0-link-crc32-statically.patch 428 BLAKE2B d324855dab736eeecf5835e79c4f2fad9ea4d10aa29b2b03ab6274efa2f54a5cfdad710552662a49d5f61466e1cd9d6c2fc8a42373961e3334f39b806e647feb SHA512 3efe70f826ebc207f1ce8744483c9a82ebbf8f3cfa81c9cbb3152b40f5b540cc9cc21e6bd3370197bee9a27a01c3e3725754d044069bb760c3dbfbc97fe4276d
 AUX ceph-14.2.0-mgr-python-version.patch 685 BLAKE2B fbd36e0f5fe45be7cc58cf11b2b83613c2f7f7fdfd64d4f04729c36e5ebc110341aa4c5521d9be590bfb7a7812525130e773a346827461df0a108fbde359b161 SHA512 af0851913cf8b42bad71ece4e41017f71e91db19aeeebb5ea0306055d6d6d9e7eb9ba34224bb2583ca437d44827de8852727e8a9dd809d942d4c277ec3da3214
 AUX ceph-14.2.10-build-without-mgr.patch 3248 BLAKE2B a0d435b1e5572d29f5d961bdb5e27da10060777d02c07616cd57abf0a734af0595093f3ead54be6ea74e450543917df55657b08d5f04681468d166c7dd0570ab SHA512 e03cd8dd9f08f348805d04e554e8a4c9bb2d83e931d1ba27c4265084b899031ddee12e3cc289aa927994c35b75a1bc383a0ee6648c7f8fee6864d775bb800fbf
+AUX ceph-14.2.10-missing-includes.patch 634 BLAKE2B 2c12c908e74a93de06a8d554057a2b45cbf3969c0eee51402e31f713ecae7394d195e0a85433d90be944b9df4aee93259fd8a50663cad1c3a7a798defb71f5de SHA512 4b5cf3201b03e9c92260bf01966aa4f6992fe9ba76f2b2f4c3211bcd2f978a76e9b7d4820d79dfbbf9e3f98ccda1929ae92343397db29724120047ce0bbd25d2
 AUX ceph-14.2.10-python-warnings.patch 1536 BLAKE2B 49ce59204096e02f9e10037dcd365fdc6e95cabf69602592019470cc069835b139b6ac2664aff94ddf6226998fa63337db751b9daa7c9ec87eb4729063a34f4e SHA512 c9ebdfaa9d93ca8e287059f817df01294d0a523831e4212e534cfbcabfc70d4e11d154fce42931f8e65926cb7e5cff09dc9c8165268bf24010533e471e370aa1
 AUX ceph-14.2.11-systemd-unit-fix.patch 1110 BLAKE2B 6964fb2e9e09fef25020b8c0f3bdfc225864f3840c63349355111626260116a25c6eff9f3e34a1cdc7d5ddbf2517b8df768f4fb83a9f7d2088393c7dc6a91848 SHA512 c9d43af2d02e77c163b457603d0a519a0849eca4109b828a4e000b5e428679e81396f842f91a521d688f6c5867420a40fe893f529f9bbea9624bbcc4400377fb
 AUX ceph-14.2.3-dpdk-compile-fix-1.patch 4729 BLAKE2B 96e709b592a7ea9324f54acf75ac3f78334a0d2b155f6d4b5360df8b13e2c9c8e5f6d6b19da5ddb7760c56d9307e056db9aeecec1926dddec88b6b685eb55374 SHA512 d0849fa120b3d7c26106e75bd830874854ee4214ac867b577f4486e4a033b2f555fa6745910f90d26f7fa5280bff01f5880eda9a2bc6edc856400a5756a8346b
@@ -36,12 +37,12 @@ AUX envd-tcmalloc 48 BLAKE2B 4a0799ac6bbedfe5e701eead67600312d86f06143dbfd11d2c5
 AUX make-node-frontend-tarball.bash 3196 BLAKE2B 1779c8fe924d8a341bcf922da310c9e3543dd9875db79b2f08fd99419fc2a693e24a5d0c36e7db7b9c46f02bb78b51359e844c8265ff266e8a931a32b877b665 SHA512 4c13ebc9f2a7ba3d45a01cd72135a57b2dc6ad3edfe06a05645957c5522a053be940782f1148c117d8bf785937655083d3d1c74668e8c72d75ae000888a65d85
 AUX rbdmap.initd 2373 BLAKE2B b88d79efc722e2de3d1f0269664a976ed45fbb0a1c9d46fcfd058ea64d3ae7fe27d13455f2ac5ca06663d77cfac1d2f9d86d12bba926541042ac09a8778a3a52 SHA512 bbd48d6987e52eaf6d02bccf3aecd06596465af4d3ac93063f9a814106de162a27bf1a33ae1646e669efb3c754f3ba57f395523293ad643b0d81ee588252216b
 AUX sysctld 57 BLAKE2B 840eec3d188df4998c7ba8fb923777636ae9d2aa342545b69c12e5ea8aa98ae97349b42b56c65a531b207c5f970f873a79c41789941cdd10b279e38f1616f84d SHA512 410f5d721c6cfcc5d7ddaff4f348345140d4b8e1b8fddccb537118bfc59f573ecad63db448598423c9a58fcfdb4cef90e6af27b838e6b77955dfd47673f0f52a
+DIST ceph-14.2.11.tar.gz 129327263 BLAKE2B fb04f3fde6642905dd21836c7472cf3b6cb484f69367ecf01b7d427c757e0fd1db4bd483bf9b0e485e1f8924a8e9201e8d47713a1de9281d5d96e45939bd1078 SHA512 765e8982d457cfd900acddc8f82c23824b32dc6d925d45e7693cba48c06fab798b6d57991dc9ad18a9ace9aff6fb2b917bd97f2d6435a7caceb03c9733e9602a
 DIST ceph-14.2.13.tar.gz 129255298 BLAKE2B 32d12ede10ff657e9341e2fc31412018041a327a4c62219105a4e9576fa46643c12b936c3eaa003a78677c4ef401ef6bd73fe150604e8031482f1d237d483ff1 SHA512 3d51b729ccf26aa9a40c1320f4051755ec405abc714ae5257ec5433a13549e34fed0945f3091525fd8118d00c36fe4ae793125728d9e17f4221cdd1ee7de5b12
 DIST ceph-14.2.15.tar.gz 129254705 BLAKE2B bb30f04ace31c2175c6678a9f252fc31951fd32f47362fb460ed9b8edec3a6535752d28214530e9b996c384a6e6a23eebce5caa89cb2746a2e258f5a1e1f8a3c SHA512 20ac9244974cc1312b7c642acf00142f5b7f59b09ae338f73b6c8e1ee2054b4ebd62701b18653cc792ca575a77b98644903ebb11bee6a9f1ab3aec6b37a2ef1b
-DIST ceph-15.2.5.tar.gz 149219528 BLAKE2B 8f2cea9a258b7c530bff72a46d45fabf5364cf919f098c7d77857afa0dfdbcd7c290aa5a0d88cce1d99923588cc303d27c0b85179378ff1c394d9ce0f135a1b1 SHA512 55de068886c48293e92ef95cf8343ae44825fd2bf9c3fa7d47cda92907a47bae79e0af730cd34d0155b0777901d0fd6f9d1f30537c66c54c95098df7368fca2e
-DIST ceph-15.2.6.tar.gz 148124143 BLAKE2B 4132a2c50037839f712a796cf428190b0e450f0f8b6f157b3d983ca596d9e9e521f1f991c66e14455122c927ddaafada387ef780fd438b2506cfe56194177648 SHA512 0bbbbc532fb9f29437c094a86a1e58040f03b679e4d52ea9cc752ecf411c594c8ec37dc5e9f0ee47712d32b93b4e60b0f3fded280867d41c41b8db806b375e4e
+DIST ceph-15.2.7.tar.gz 148140871 BLAKE2B 2a86b1af8b2ac70ac101fce8b8e048a2be4bdb8eea65e7461d7a8f71eeafdab44c7c20a23d4f08cfbdcb9bab253d24b1af66eaa23586bb64c634afdec658e916 SHA512 bfe07cefcd603d773216a2b1d49fb32bdf1185dfb69b30d5362eb48d3afa2984cebffb598f7d68bfbd9afdc2f29975130a585a9b83724ca6a3f59163895c0de0
+EBUILD ceph-14.2.11-r1.ebuild 10618 BLAKE2B ac21b9ea68fada78929abe07e468e8ca3e57caff06e874f9f78024e5d2235ae0c3b9ff6a1c9e7872435e353670deb9194533b85c3e91870a3a84c25ad13bf8ca SHA512 732255ab69203c1888355e2a17693575b35cf480c29eb82bdb5650a806f9e9cc3fc1fe3974b64496dcc389ab7a40cdce07b9f69170c453bba3e23cd9c4c13475
 EBUILD ceph-14.2.13.ebuild 10566 BLAKE2B a99171d8aa6339d5c272fbfba934d5d750d8ea93411ff0e505c8b3f654734db1e943061a4c7d543655f5862b5e0bf5318f6e908642174c78ac4adefa9f9f4fef SHA512 03943fe5657614709aca3e4a6d4aa67fe1c23e9e397d020bec9119494dff7336a60e9ec29990ba97def09f2d61844ff1ef94e1b912dcc08dfc4c90a9647c91d8
 EBUILD ceph-14.2.15.ebuild 10614 BLAKE2B ffd0ae927bf711fae3390de8bdd785b60579961881f8970d920fe655c4b2b860fd06c8c6f672256499142442882763e53381e47d79213d045e0c113dc5836b04 SHA512 eb0c2b70e7334014501efd91156a5806e5073a4a446abba6d041f960dac0feab20b95ea5f6135b5a1406fa294f5b68b626e32ea367a776f9e24a5f236c3a87e4
-EBUILD ceph-15.2.5-r1.ebuild 10820 BLAKE2B 141d965afdb9a09a5ea7d97684223f31f209bcf534f4e6067d526fd8a09f077f860db2915d2f434f21b1778b8c3c505e2ffc70a4415cd39bbad83e369986b5fa SHA512 f15e60946e0e0cc920ac61495010723e7146f12cf49298d074c3f4970b48e32672cf699792c988665a39260007bdcbff7fbfc7908743a0613e12d20e19df9051
-EBUILD ceph-15.2.6-r1.ebuild 10817 BLAKE2B d808bedf02a00603712902de1feb3e697d83a2b652cdf57278889753d6c177a79ab9adefaa4b3b0dc63f20984d99f25e6f8339c88420397bb464b41a700b84cb SHA512 0201e816306a47ed330cd0df40ca5363a11acfa7ac207d7c09852e007cad33ca530a5a1164cfb6aa4aeed91d7029c909752a8d336396d29e50516d5093f6af8b
+EBUILD ceph-15.2.7-r1.ebuild 10835 BLAKE2B 5f6dfc359dd6d0147653acfeb0d6bc81fdcb06f7d4ca7415475126447e58a49109d87e7e3ef8c861116afdeee725c971ee787e20ae00f1cea6abdc2b6909c2e2 SHA512 93f4fc07c81295e44ac54db4a6af97947b74cead03fa0f49636bb527ff48cee564bb949a9ab44c979f98a3b69e900d0a23189aa24dfbf8cd255efb8432f7369f
 MISC metadata.xml 2044 BLAKE2B f9a309d38c66cfb87071206331a6e2ba88366ed09802e949cb4499f1a0b2ee7a3ceca7df5653d1955c76ad2daf900aeee166265a2ced9c0b393e609f397dd563 SHA512 c051bacbbc9e64f0774714c1f6f8cf99990e1669de0ca1633173d870c03e04827cae993fd5e6846b310d838eead8471d2181a0678693ea43423e08795dfc0a47
diff --git a/sys-cluster/ceph/ceph-15.2.5-r1.ebuild b/sys-cluster/ceph/ceph-14.2.11-r1.ebuild
index eef323fd6146..43094784627a 100644
--- a/sys-cluster/ceph/ceph-15.2.5-r1.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.11-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64"
+	KEYWORDS="~amd64 ~ppc64"
 fi
 
 DESCRIPTION="Ceph distributed filesystem"
@@ -29,8 +29,8 @@ SLOT="0"
 CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
 
 IUSE="babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc
-	kafka kerberos ldap libressl lttng +mgr numa +openssl pmdk rabbitmq +radosgw
-	rbd-rwl +ssl spdk system-boost systemd +tcmalloc test uring xfs zfs"
+	kafka kerberos ldap libressl lttng +mgr numa +openssl rabbitmq +radosgw +ssl
+	spdk system-boost systemd +tcmalloc test xfs zfs"
 IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
 
 DEPEND="
@@ -46,7 +46,6 @@ DEPEND="
 	dev-libs/crypto++:=
 	dev-libs/leveldb:=[snappy,tcmalloc(-)?]
 	dev-libs/libaio:=
-	dev-libs/libfmt:=
 	dev-libs/libnl:3=
 	dev-libs/libxml2:=
 	dev-libs/xmlsec:=[!openssl?,!libressl?]
@@ -93,7 +92,6 @@ DEPEND="
 		libressl? ( dev-libs/libressl:= )
 	)
 	system-boost? ( =dev-libs/boost-1.72*[threads,context,python,${PYTHON_USEDEP}] )
-	uring? ( sys-libs/liburing:= )
 	xfs? ( sys-fs/xfsprogs:= )
 	zfs? ( sys-fs/zfs:= )
 	${PYTHON_DEPS}
@@ -129,7 +127,6 @@ RDEPEND="${DEPEND}
 	app-admin/sudo
 	net-misc/socat
 	sys-apps/gptfdisk
-	sys-apps/nvme-cli
 	>=sys-apps/smartmontools-7.0
 	sys-block/parted
 	sys-fs/cryptsetup
@@ -138,7 +135,6 @@ RDEPEND="${DEPEND}
 	virtual/awk
 	dev-python/bcrypt[${PYTHON_USEDEP}]
 	dev-python/cherrypy[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/pecan[${PYTHON_USEDEP}]
@@ -147,7 +143,6 @@ RDEPEND="${DEPEND}
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/werkzeug[${PYTHON_USEDEP}]
 	mgr? (
-		dev-python/jsonpatch[${PYTHON_USEDEP}]
 		dev-python/more-itertools[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pyjwt[${PYTHON_USEDEP}]
@@ -190,18 +185,19 @@ PATCHES=(
 	"${FILESDIR}/ceph-14.2.0-cflags.patch"
 	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
 	"${FILESDIR}/ceph-13.2.0-cflags.patch"
-	"${FILESDIR}/ceph-15.2.0-no-virtualenvs.patch"
+	"${FILESDIR}/ceph-14.2.0-mgr-python-version.patch"
+	"${FILESDIR}/ceph-14.2.5-no-virtualenvs.patch"
 	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
 	"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
 	"${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch"
 	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
-	"${FILESDIR}/ceph-15.2.0-rocksdb-cmake.patch"
-	"${FILESDIR}/ceph-15.2.2-systemd-unit.patch"
-	"${FILESDIR}/ceph-15.2.3-spdk-compile.patch"
-	"${FILESDIR}/ceph-15.2.4-system-uring.patch"
-	"${FILESDIR}/ceph-15.2.5-missing-includes.patch"
-	"${FILESDIR}/ceph-15.2.5-systemd-unit-fix.patch"
-	"${FILESDIR}/ceph-15.2.5-glibc-2.32.patch"
+	"${FILESDIR}/ceph-14.2.3-dpdk-compile-fix-1.patch"
+	"${FILESDIR}/ceph-14.2.4-python-executable.patch"
+	"${FILESDIR}/ceph-14.2.4-undefined-behaviour.patch"
+	"${FILESDIR}/ceph-14.2.10-missing-includes.patch"
+	"${FILESDIR}/ceph-14.2.10-python-warnings.patch"
+	"${FILESDIR}/ceph-14.2.10-build-without-mgr.patch"
+	"${FILESDIR}/ceph-14.2.11-systemd-unit-fix.patch"
 )
 
 check-reqs_export_vars() {
@@ -248,7 +244,6 @@ ceph_src_configure() {
 	local flag
 	local mycmakeargs=(
 		-DWITH_BABELTRACE=$(usex babeltrace)
-		-DWITH_BLUESTORE_PMEM=$(usex pmdk)
 		-DWITH_CEPHFS=$(usex cephfs)
 		-DWITH_CEPHFS_SHELL=$(usex cephfs)
 		-DWITH_DPDK=$(usex dpdk)
@@ -265,11 +260,9 @@ ceph_src_configure() {
 		-DWITH_RADOSGW=$(usex radosgw)
 		-DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq)
 		-DWITH_RADOSGW_KAFKA_ENDPOINT=$(usex kafka)
-		-DWITH_RBD_RWL=$(usex rbd-rwl)
 		-DWITH_SSL=$(usex ssl)
 		-DWITH_SYSTEMD=$(usex systemd)
 		-DWITH_TESTS=$(usex test)
-		-DWITH_LIBURING=$(usex uring)
 		-DWITH_XFS=$(usex xfs)
 		-DWITH_ZFS=$(usex zfs)
 		-DENABLE_SHARED="ON"
diff --git a/sys-cluster/ceph/ceph-15.2.6-r1.ebuild b/sys-cluster/ceph/ceph-15.2.7-r1.ebuild
index ee2ec4c70131..df2f81bfe069 100644
--- a/sys-cluster/ceph/ceph-15.2.6-r1.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.7-r1.ebuild
@@ -43,13 +43,14 @@ DEPEND="
 	app-arch/zstd:=
 	app-shells/bash:0
 	app-misc/jq:=
+	dev-cpp/gflags:=
 	dev-libs/crypto++:=
 	dev-libs/leveldb:=[snappy,tcmalloc(-)?]
-	dev-libs/rocksdb:=
 	dev-libs/libaio:=
 	dev-libs/libfmt:=
 	dev-libs/libnl:3=
 	dev-libs/libxml2:=
+	dev-libs/rocksdb:=
 	dev-libs/xmlsec:=[!openssl?,!libressl?]
 	dev-cpp/yaml-cpp:=
 	dev-libs/nss:=
diff --git a/sys-cluster/ceph/files/ceph-14.2.10-missing-includes.patch b/sys-cluster/ceph/files/ceph-14.2.10-missing-includes.patch
new file mode 100644
index 000000000000..aaa6ee080a33
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-14.2.10-missing-includes.patch
@@ -0,0 +1,26 @@
+diff --git a/src/common/bit_str.h b/src/common/bit_str.h
+index c4c24f6a75..b5631e8b84 100644
+--- a/src/common/bit_str.h
++++ b/src/common/bit_str.h
+@@ -14,6 +14,8 @@
+ #ifndef CEPH_COMMON_BIT_STR_H
+ #define CEPH_COMMON_BIT_STR_H
+ 
++#include <cstdint>
++#include <iosfwd>
+ #include <functional>
+ 
+ namespace ceph {
+diff --git a/src/librbd/api/PoolMetadata.h b/src/librbd/api/PoolMetadata.h
+index 977ce3638d..8d982879aa 100644
+--- a/src/librbd/api/PoolMetadata.h
++++ b/src/librbd/api/PoolMetadata.h
+@@ -8,6 +8,8 @@
+ #include "include/rados/librados_fwd.hpp"
+ 
+ #include <map>
++#include <string>
++#include <cstdint>
+ 
+ namespace librbd {
+ 
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index 76683b1e2cfe..da3cffb6ede1 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1,13 +1,16 @@
 AUX cinder.initd 494 BLAKE2B f919de45b8e39b65d355f627fcd71a4c23a7bb550157d25811c1d1f3a84b9f1c1e7c596361ec5d2aab650f1ebf3f0f053e313f2e15be64995d1309a6eafc8a69 SHA512 be3c2e6798b08527487cfd2b1cd66a03d891526a45f52c97a536b15a08d46a4162e3b036dcae86911c7dba25c5d7f02e73a089d4dd720526bf38ecd0f44c59b0
 AUX cinder.sudoersd 86 BLAKE2B 1ea49d3cf3bc134ea0a2d5512c6e258f117187267bfa408fea0d2449a091068e5404812a0e693f226d895ec23766ed73aca36128d6f7b968ae44dc38b8ad948a SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1
 DIST cinder-16.2.0.tar.gz 5484918 BLAKE2B f2259dd21c060280e856c053bece8fd635f289d8100710b177105227a5ce3a4c4e380b49261671294cf85975c9f665646cefe5f9d66d873e1938a7d141156f4e SHA512 586057d49f9c94daaf163dacf979e62d18be7489b43eeedfa7caa4d23a4a6060f455eea7162020319187466f308d0480a3efb047d0b34ce013f1b5c632e30755
-DIST cinder-17.0.0.tar.gz 5759659 BLAKE2B f8a2e6647e38185b962311087f06364108db4a80def2eef909e837d37adfe539f0794cc9d9b95aee88da9aeeb5a6a0fe019fc37bafb8e4ceed8dbdfaa2a7c27b SHA512 cd7b74e5da1e696bd72e8e37f2bbff7c7fe4012aa5eaae4ccc51ddfc743ac68cc9fae885063c75d199a48978e4f479cc55813f489787a84914d98521a42d7fd4
+DIST cinder-16.2.1.tar.gz 5531297 BLAKE2B c517515df669e9aafbc1b8d80e8f422bbe6cf55ded044d03fd21142fafdc2e81f5f211c5ce3f39f2fd965f324194635efa7b53aee05113abff8f9d2f6438f3f9 SHA512 37fd7025f4490a35214bf4ac90b5b8ec9d21752ab54295403e6d485e429ffe8172c33e692e5f516156a58358b35da60fc7a8f7f25daa4b0d405db25beadd59b7
+DIST cinder-17.0.1.tar.gz 5815391 BLAKE2B cae43e4668560b9a329e65738533a6c015b42210c45f10d82ab758509f676778503152ba75f0ac862b040b9a489b92cf59f8da83e36e9610696e14c9e0d573c8 SHA512 44cadb33ea22953c05105e336555798b2332b0c77f1e9baedeaef58fe300caa70174a5fa4ad94a515f1bd0c685b15ca639053001d4a5b12ad9cceb385f2a63ba
 DIST cinder.conf.sample-16.2.0 183294 BLAKE2B 5d0f28b9ad200d912c42c34ca030a5ec3660c57db332677e1b66b314a2865187862c83baf78d122fc0af7f73fbf4f0c7f04b9253882d228dcb863bfc88e37e72 SHA512 faf712a3da37af05e642b3c14f98ce8d4e3db5b736b208d7ca8a18be02ac5626c94b4ed314bd0030d5fa3771b325ba0f24ec3a45188d27fd9de79c97b56e2626
-DIST cinder.conf.sample-17.0.0 186451 BLAKE2B efc75cf3c5e852d411d9c2ed2080eb554a5f81c9b39a2ee9cf44add21842c05ea5b03cc66747da2182d2efc73d83b55323cecd4aa34db99369bf62b5ed1795bc SHA512 ee60a62ec8490a38c995f9c4a9ede8eeec631745bdbc9bc6e1d195370687de5d99aa8754ea017f23e6a9542b987842c7ffd7cf203bfed37f2a7ddbe61a82d517
+DIST cinder.conf.sample-16.2.1 183294 BLAKE2B 5d0f28b9ad200d912c42c34ca030a5ec3660c57db332677e1b66b314a2865187862c83baf78d122fc0af7f73fbf4f0c7f04b9253882d228dcb863bfc88e37e72 SHA512 faf712a3da37af05e642b3c14f98ce8d4e3db5b736b208d7ca8a18be02ac5626c94b4ed314bd0030d5fa3771b325ba0f24ec3a45188d27fd9de79c97b56e2626
+DIST cinder.conf.sample-17.0.1 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.0.ebuild 7626 BLAKE2B 2d2eacf1a1ea90dc0a8f93caca9bc0ed9876862d85b55e9845be979e87c773bdae48c464741d7220f87be0ec9bea9eb69e9af56c2fb5e1d39910abcdd63471e5 SHA512 11019a13e8f7811228e95d3dffba35cce531de79b4abf42701f72e1d217fb5fa2314033d4d39da1b931a1e66eca06d87c1ba652f34d44fadcccba4407cca9aed
-EBUILD cinder-17.0.0.ebuild 6818 BLAKE2B 9ffb3360cbe44be93d6a498149f1846211ecfd0491cbbec89362663e6f69f9a7a68c979f750f9c6ed8ffd5106d2d282c23bdcba5885a88f155214e8703d34436 SHA512 309047d98b6c4a072a0d4b9cc779c66cc0077bec999292d6cd11f57b4d3666d4eb0b35629286e66cfb5ea720c805b23826058f9870b7289a187e91252ae4fae2
+EBUILD cinder-16.2.1.ebuild 7628 BLAKE2B 89c1b14ec775f5635cb0a39ed2fe3b37678c2ae57dc968908b62b94296fb022b876c311eeb43898f8b0d96b1cde152799e7606237e8fa123ab8088e67b9247ad SHA512 62b9ea484e242f6a1bfbbc6ccaeba4a1c063300cc868f191c6980f4a8196409831df4acf82a5f89f8bb7dbed5da61381f2c019a225cfa7bf175c13d745305016
+EBUILD cinder-17.0.1.ebuild 6818 BLAKE2B 9ffb3360cbe44be93d6a498149f1846211ecfd0491cbbec89362663e6f69f9a7a68c979f750f9c6ed8ffd5106d2d282c23bdcba5885a88f155214e8703d34436 SHA512 309047d98b6c4a072a0d4b9cc779c66cc0077bec999292d6cd11f57b4d3666d4eb0b35629286e66cfb5ea720c805b23826058f9870b7289a187e91252ae4fae2
 EBUILD cinder-2020.1.9999.ebuild 7628 BLAKE2B 89c1b14ec775f5635cb0a39ed2fe3b37678c2ae57dc968908b62b94296fb022b876c311eeb43898f8b0d96b1cde152799e7606237e8fa123ab8088e67b9247ad SHA512 62b9ea484e242f6a1bfbbc6ccaeba4a1c063300cc868f191c6980f4a8196409831df4acf82a5f89f8bb7dbed5da61381f2c019a225cfa7bf175c13d745305016
 EBUILD cinder-2020.2.9999.ebuild 6818 BLAKE2B 9ffb3360cbe44be93d6a498149f1846211ecfd0491cbbec89362663e6f69f9a7a68c979f750f9c6ed8ffd5106d2d282c23bdcba5885a88f155214e8703d34436 SHA512 309047d98b6c4a072a0d4b9cc779c66cc0077bec999292d6cd11f57b4d3666d4eb0b35629286e66cfb5ea720c805b23826058f9870b7289a187e91252ae4fae2
 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
new file mode 100644
index 000000000000..3065830afe0f
--- /dev/null
+++ b/sys-cluster/cinder/cinder-16.2.1.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 eutils 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-17.0.0.ebuild b/sys-cluster/cinder/cinder-17.0.1.ebuild
index db06b542b144..db06b542b144 100644
--- a/sys-cluster/cinder/cinder-17.0.0.ebuild
+++ b/sys-cluster/cinder/cinder-17.0.1.ebuild
diff --git a/sys-cluster/corosync/Manifest b/sys-cluster/corosync/Manifest
index b5b6d802fe8e..db22aae12c12 100644
--- a/sys-cluster/corosync/Manifest
+++ b/sys-cluster/corosync/Manifest
@@ -4,7 +4,7 @@ AUX corosync.logrotate 93 BLAKE2B cc8f22c668dfde3fe4dac13fb295be81ff1ca13c808155
 DIST corosync-2.3.5.tar.gz 428253 BLAKE2B be9fc2b27b60357acee6dee013bc95c08045c114acafc62eaa82a1821f07ff76b8821b9d06f31246b9978f8aef46e3a9e1a2d61ca74465bc74d4140c0ad0d0fa SHA512 212a95d8a68a2941f27c9ec22750a88598744d6fd4db6b46abe0b4cdfa988d3906f760bdf67c403d8c6d0a04da64f29ec744fb68ca51c7269ba58e306553cee9
 DIST corosync-2.4.5.tar.gz 587015 BLAKE2B f1ef6b0a0f34e23a4ab5a5e9a6f21ba1886fb6cebec7d9440f6e189acb095cd825049dfceb174b490be1b6d85195ae4b99230ea44a31e427db9020257e8fc428 SHA512 e8476c006df8fd0c5291a8b0099c4756f884d41c7e9c13573c34458f63cd057d49d6fa0c1d5344d5fc44341186817ddee66997d51937339e6d70dcada0c402ee
 DIST corosync-3.1.0.tar.gz 447073 BLAKE2B 1a0d5b744ac5cba1d67fed6d58a159d8dfc63615aa6fbe5051b20f6e41da589871b6d0b59937db0ac31b4186e4f051378e48308ffc3e0743a5372e494485b3c7 SHA512 05be0d417f3ebbba993b92074f261dea3d951e20d2054817b9017eb04a8a017c9c3f3d0119dafd689944accb690beaafc9f11c1e67f53d978918ea49e51a5e6f
-EBUILD corosync-2.3.5.ebuild 1735 BLAKE2B 765b8975199936351fbf79d3b185bdd4f8acfb85136476699a4ee5e7a63829e9bfaa66477541f1af1a4c9dcbc8e0579da958baf0ef9ba72f42fb534e32886ff0 SHA512 4811829e99eea8738d8ce9647919137d90910fbed382409ddf21f285e961a5e45ded341d1acee98c80e346e5a13fd6eca231877b393a7d2a47509d091af2c955
+EBUILD corosync-2.3.5.ebuild 1735 BLAKE2B 979a985503cbaaf0dd961604bc7022e5e4da046d78417543634c8a799d0ab1ab2e08b23789b310e7a58806e5031384ce7211e87802edd83c4a962732a85372e5 SHA512 803fa60d64bb64bd724852458231963021fbde8b374f115bcbf801aecacc83d2c5bd0b1191f187902bab3cbcf086937f06d6837454c4309c6071ea55e6ce5ea6
 EBUILD corosync-2.4.5.ebuild 1702 BLAKE2B dbf853cd542094bb4edd03a50c76895d83ae886cefb67115790a408f6e565d4d46e8a9a377e239bf233905cf6ff7771cb372ab5173d90a5ee158fa696fba890e SHA512 a012365a627b1813af9b109460b37c8a3a6d3e34ee533253524dd48b54f370c43dea425ae475ac681d387bdf5271020c6d3645e196f9984b1bd5137b2d31c91a
 EBUILD corosync-3.1.0.ebuild 2545 BLAKE2B 0b03da2f70e6c6151c3d7c399be6f0754cf9e626c139f601c8271f061b545b126dd35daabc9716820008261f735db0144207e3a187bbe5e7e48db7998c636be3 SHA512 175d460ca94d22fdc9fa8e45c4633fcb2e44cec6325de818bce61e73ac24021224dc673db9442ed1a252ad95bee436fb7dccaf010f83f34468ea1b311f99250f
 MISC metadata.xml 568 BLAKE2B b37326b0f2809f7e67a1537b9a0a9126b7f6801559007fab15a2b90fa8bd094a907414eb6b384ebce9cfd32ff6dfa8e00e73b637a5629c5e56dad6217872a58e SHA512 1f37d14000dac9555b731071cef48a008a775893f200488b2acc55e5c90f789223202da8fb3f7a016db05e84b2c75b311baa5dc2a95f8f73a2ea9194c1d6a2ff
diff --git a/sys-cluster/corosync/corosync-2.3.5.ebuild b/sys-cluster/corosync/corosync-2.3.5.ebuild
index e40a5ddb5edb..d1a1fc207d47 100644
--- a/sys-cluster/corosync/corosync-2.3.5.ebuild
+++ b/sys-cluster/corosync/corosync-2.3.5.ebuild
@@ -26,7 +26,7 @@ RDEPEND="!sys-cluster/heartbeat
 		sys-fabric/librdmacm:*
 	)
 	dev-libs/nss
-	>=sys-cluster/libqb-0.14.4"
+	<=sys-cluster/libqb-0.17.2"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( sys-apps/groff )"
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index b1935f9091a6..c26d116f73b7 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -5,5 +5,5 @@ 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
 EBUILD keepalived-2.0.20.ebuild 2001 BLAKE2B 2207a4c15a10335c03f8277eafe2f29cdd6c593c7ec918c15824e526d7d509afa4dfb3cca36e600e727a956a088df4310f86111db96451fc64a883595ced705c SHA512 7c61d2129c2a64b7ac27daeb0264df6837780dec2bc81a79cb7951d99ffa450b279141802b3e693b80ea066a8a377a2f67561516ff34e40efefae51f68bfdc37
-EBUILD keepalived-2.1.5.ebuild 2005 BLAKE2B 9e8a0a9237d32facfbe26d8303e393c8e61abd521dd332346e5916b9fed328244905019eb9cdccfd8e04a079951c393bcad0d22008d89ae83e9d788b70745e2d SHA512 5d6fe1ff61c8b260df8e703ab075a33807f0d0bc6124cd75f7b9b54196e58177c5a1567cc10514cc924f4a80e54dc3fd5062a2405d65de06d08df18469e8864b
+EBUILD keepalived-2.1.5.ebuild 2002 BLAKE2B a7257fddd2367482103956b845702805964da198679282c7e23b4f29914199074ab709126282b4de105d4018de7582d54f4532245019e0fa50de292d7d08e9d1 SHA512 667f1ae61d9fe73bd76f86be85aba7a20213150c672e160e9ef5efc16eb9db75379093b7614ec26aec655ec7af78f61961a283dc64bcb0cda6c07afe3057e867
 MISC metadata.xml 529 BLAKE2B e20e135a1037fe1ce32a4321858160594512de8c13bb8bf67655fc431c7d6ebf8806db518a09c59e6724842577647a23bb7f310638025a85c5ee8e5fee4ee877 SHA512 3925927d7e0866283769f5582e77bfadf1708162e6aae6a5d1a605fda4a2b4c3de631b96718f5ea69ed5335445523ea1ec1e121a1372641dbec751285cb35dd2
diff --git a/sys-cluster/keepalived/keepalived-2.1.5.ebuild b/sys-cluster/keepalived/keepalived-2.1.5.ebuild
index 12763f521185..b6c8c6ac769f 100644
--- a/sys-cluster/keepalived/keepalived-2.1.5.ebuild
+++ b/sys-cluster/keepalived/keepalived-2.1.5.ebuild
@@ -11,7 +11,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"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
 IUSE="+bfd dbus -json regex snmp"
 
 RDEPEND="dev-libs/libnl:=
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index 274ae79d57cc..c2878033daf7 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -7,10 +7,12 @@ DIST kubernetes-1.18.10.tar.gz 32640930 BLAKE2B f07b5cb047bb023f1b46414edf360b4d
 DIST kubernetes-1.18.12.tar.gz 32641752 BLAKE2B e1af0b8c83d0854cbe0c5f1751cb4433fae022f07785c116b27854db1858c30b0d0a46af97204d8df94d20000c860275e980e123ced53dad514f3441c3b2453c SHA512 20cfac78a484724c648d65e3904d588e9853e80eb291598d788d492293e7190ec6df737c90dc3e87268d5218523920f2958684f2684853c5433c080bc6c6523d
 DIST kubernetes-1.19.3.tar.gz 33357048 BLAKE2B 9e023d8be35a4f65ec7412e3dd624f22ecaac478da9e2c4ef98f7369e686bc4b3ccc7f8ba2a1aa1f4fc4aabfaa6670678799fd3db6326fdd3d034b678e66ff0c SHA512 a394544e3baf797282291cae28b58e27e31fea3b3f66274a5ce9005519534860ae6f4b138ce51f4996e7da15930fadeb21d427d80e93433dc14e79cdcb250607
 DIST kubernetes-1.19.4.tar.gz 33362702 BLAKE2B a3402abbd524ba135b7fa5ae9451743da44e7691e9b646de01b265078d89099440e7d14b56b21f4b2f0e105825d51c9565b62d7ae81b644f2a0a0dde4f40122a SHA512 b5a2cd73db3b1454c54d500d21630c971b5dae94377180e658638384ef2b243f0b41f1ce00eb425ab5958bddbdc0c792be4f14b9b61a364a90992860ca9109da
+DIST kubernetes-1.20.0.tar.gz 35797322 BLAKE2B 8bcb34cd3e62f241caa21706f95f010cb5962b697799fcbfba62c67bfb786c3cdcac61b444676fa90952d4ac0d997364202c3797f963c8fcf60d69deca235ba5 SHA512 d04967ca858c05eb52ea46fbd5415cadb86e2ceb88481f523de2779c68dfc5eacdab033ccd873ba2c4b23e843d97b9f01400d058b421ddc618ea2b2ef751e24b
 EBUILD kube-apiserver-1.17.13.ebuild 975 BLAKE2B 741780310211ee7b3c7e6a9bdb4774f6d09eb139b0cac659a6e51fd2ba733886fe18a7f028a6c123bb3b609e3cf8a3cfcb80e39af0099444d9190227e10fbfbe SHA512 6a3b3d15dc76cbdd66053eb69b5dd4f888897272b3e9d6d7fd3cc8014c8320b3b2406a0e0c0165e9fef13b0b7050c220c73446fa641a49692fb83f71e41527dc
 EBUILD kube-apiserver-1.17.14.ebuild 976 BLAKE2B 62c56381e05666cc1d0362403bab27a38f27dce58cdfd84cff171d1b46795e827fdf670247887501779f56b066228526911a7235e1d3971d0a152de6b73baf7f SHA512 8013f2ecc8296ce0580fafeace5a690a1f318296ce772ded602b145c9e84937f25521b34fcafe51c0dea3e86410230370e655872857e96bf23aaf77d50dfb43e
 EBUILD kube-apiserver-1.18.10.ebuild 1004 BLAKE2B 37352f285c75f1fd14d2acdd847caad33e422d47dcd768dd1e1bc2adf968eda55bb0e7fb90c1f0055909a6a3d6e3e714d08ab8bbaa5bd1c32a6dcb84ff6d8bf7 SHA512 194dbdb7bde76fcd1f3d623dfe92790968da796e8272dfa6920cd965daaad6cf4a92661fec81e2fe3fb009a0d9b49dd732db83132cc474d212e8b9963d2d5f8d
 EBUILD kube-apiserver-1.18.12.ebuild 1005 BLAKE2B a5012338e60aa1ddebb47360b366bfb3b0dc0ab303bad91b7595287ff883058628ec96c4936e0084c314542b917ae8f6e1c29c9f7eb926555c59f097681ff295 SHA512 48aebd74d74e744e9f579e923459369a36774f80a17e81876664c0aae38d26b1d017f8656c968d4ca922c5bb2f66d5656a44a4d6b059cdcebb353202c1cca103
 EBUILD kube-apiserver-1.19.3.ebuild 1011 BLAKE2B e379517c1e19e309e5151e8919d04dcee5573c36da9cc6794c3b523da3b65e929a68dc10c86e22330e94f710005b07936fb252df8f2f7f730910705e92a56129 SHA512 c0bff494da8b557f348ca19d92d748a9490e03b7eef4cf80239a2ac01478cd3fbe3b8c477034e95d9b8405936daefe47cf47371378188a3a989368e3dade5b6d
 EBUILD kube-apiserver-1.19.4.ebuild 1012 BLAKE2B 6ddd81924033f371422aa120319efb48ec5ac3a61599ec4d691eb26e51f2eb1b5d27c4c2a6717d36bdec6c21b57ddcfa9456d4e322942d20945143afb7a6b839 SHA512 2b4121c6e2c6ef381dd9fbe23c3b52043620d737539088e3917e3529784823e228cdd569493c3e38a7a4fad0a49b4b12581cf637d66840fd6f7df5efab72036c
+EBUILD kube-apiserver-1.20.0.ebuild 1012 BLAKE2B 6ddd81924033f371422aa120319efb48ec5ac3a61599ec4d691eb26e51f2eb1b5d27c4c2a6717d36bdec6c21b57ddcfa9456d4e322942d20945143afb7a6b839 SHA512 2b4121c6e2c6ef381dd9fbe23c3b52043620d737539088e3917e3529784823e228cdd569493c3e38a7a4fad0a49b4b12581cf637d66840fd6f7df5efab72036c
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.20.0.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.20.0.ebuild
new file mode 100644
index 000000000000..0c60e4a0143a
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.20.0.ebuild
@@ -0,0 +1,40 @@
+# 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-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index f989a98af9e5..8d42bc6a3cc3 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -7,10 +7,12 @@ DIST kubernetes-1.18.10.tar.gz 32640930 BLAKE2B f07b5cb047bb023f1b46414edf360b4d
 DIST kubernetes-1.18.12.tar.gz 32641752 BLAKE2B e1af0b8c83d0854cbe0c5f1751cb4433fae022f07785c116b27854db1858c30b0d0a46af97204d8df94d20000c860275e980e123ced53dad514f3441c3b2453c SHA512 20cfac78a484724c648d65e3904d588e9853e80eb291598d788d492293e7190ec6df737c90dc3e87268d5218523920f2958684f2684853c5433c080bc6c6523d
 DIST kubernetes-1.19.3.tar.gz 33357048 BLAKE2B 9e023d8be35a4f65ec7412e3dd624f22ecaac478da9e2c4ef98f7369e686bc4b3ccc7f8ba2a1aa1f4fc4aabfaa6670678799fd3db6326fdd3d034b678e66ff0c SHA512 a394544e3baf797282291cae28b58e27e31fea3b3f66274a5ce9005519534860ae6f4b138ce51f4996e7da15930fadeb21d427d80e93433dc14e79cdcb250607
 DIST kubernetes-1.19.4.tar.gz 33362702 BLAKE2B a3402abbd524ba135b7fa5ae9451743da44e7691e9b646de01b265078d89099440e7d14b56b21f4b2f0e105825d51c9565b62d7ae81b644f2a0a0dde4f40122a SHA512 b5a2cd73db3b1454c54d500d21630c971b5dae94377180e658638384ef2b243f0b41f1ce00eb425ab5958bddbdc0c792be4f14b9b61a364a90992860ca9109da
+DIST kubernetes-1.20.0.tar.gz 35797322 BLAKE2B 8bcb34cd3e62f241caa21706f95f010cb5962b697799fcbfba62c67bfb786c3cdcac61b444676fa90952d4ac0d997364202c3797f963c8fcf60d69deca235ba5 SHA512 d04967ca858c05eb52ea46fbd5415cadb86e2ceb88481f523de2779c68dfc5eacdab033ccd873ba2c4b23e843d97b9f01400d058b421ddc618ea2b2ef751e24b
 EBUILD kube-controller-manager-1.17.13.ebuild 995 BLAKE2B 415d764fd1b869881b77028994696658f3df64861e30afe2f428886355f839f8ad9e6935f7097578942d81e77510c567116eba6eac69fa338c568bbec90ca7b4 SHA512 6b217ae240ab158951ab2b57a81c7d76175a4ab24c886a57f8cce35852123d34b8c4321fc6ca35c3a97f25631089e873d328c7f78b032ad27489ee9ece87f0e9
 EBUILD kube-controller-manager-1.17.14.ebuild 996 BLAKE2B 929048396d2bd64334c24c4370e2a27ac6c736d00076094bbf8768062c3fb6abd2dd1ed157f636343845c76afff78850104c6dfb115e966eedc2300a7b64b1d2 SHA512 64d7b841153d8dd15a077cce8d3287f4e9e717879c94b739565a4e06eff4b974edc0017e5610a0a0597f859493d12ddfd3d4ef3e0003202e318cc7cdb0064b3b
 EBUILD kube-controller-manager-1.18.10.ebuild 995 BLAKE2B 0e02e87535309211f9b0616b55d68b4f39b961de404c2241c5f98c7ac33c11a7688c02a291cb1fbd6a47476b448c7d8937a69b1d4ceae1669ffd11ecac6f84e7 SHA512 5f7c3ad0e5f76d130752015beca896d42a249981a19fc96f30fd79a3ea721aa17b6d6a070797f695e32c63ff3e2a913bc55cbbd9816768153dc434cb5837c649
 EBUILD kube-controller-manager-1.18.12.ebuild 996 BLAKE2B 1b71359d516c24758c4c22ef0724aad19fd7cffabc0a1e22eba9809e635099d1934336309ba7330801eacdb2ec17136e080ac3de2868d56670d15216d3781042 SHA512 dc4c0d820fcdc1602952e42f4868f9e7a2a7f10a3b49633b11807e4a6bd22be44e19f4306aaf88b1a3b1f0442173fde980c0c7534c078e535f1251aa66548d00
 EBUILD kube-controller-manager-1.19.3.ebuild 1013 BLAKE2B ece69494aaf4069df77f5b59f69194bc9026ff0ff9c99c26d01871c79d79cdb9690b6ef0e23548aa9d949fc2a3d498d90ae3343d718d75f8c5fc064f15fc82f4 SHA512 b4cd7597206d1a0689ae8fc8592ecf2b438e386d8a65057b60aafc8fb2614d1ce0a16ef92d3e807c4dc93177786f93f9a10f00d0dfe091abd3a6c01ec34c5142
 EBUILD kube-controller-manager-1.19.4.ebuild 1014 BLAKE2B 17fcd0560a912cb174f5efe605c2400f13644a1229cc2d2009c8f01e73cf1f8c277e9111f07f020ef6fdd65667fdff1cf89578fb76849f01c06000449a2def66 SHA512 557136c63f805b8ffa64d3a6c63411594d77c1d98587cb0ac42a9ecc00eb9c6b91330866da16b82bafe8e97eec6a1b3d899b790bf98f112a566eda9bae0b53c9
+EBUILD kube-controller-manager-1.20.0.ebuild 1014 BLAKE2B 17fcd0560a912cb174f5efe605c2400f13644a1229cc2d2009c8f01e73cf1f8c277e9111f07f020ef6fdd65667fdff1cf89578fb76849f01c06000449a2def66 SHA512 557136c63f805b8ffa64d3a6c63411594d77c1d98587cb0ac42a9ecc00eb9c6b91330866da16b82bafe8e97eec6a1b3d899b790bf98f112a566eda9bae0b53c9
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.0.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.0.ebuild
new file mode 100644
index 000000000000..7ebd21720e51
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.0.ebuild
@@ -0,0 +1,39 @@
+# 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-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index 13239b3f315a..26da6f6a5d04 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -7,10 +7,12 @@ DIST kubernetes-1.18.10.tar.gz 32640930 BLAKE2B f07b5cb047bb023f1b46414edf360b4d
 DIST kubernetes-1.18.12.tar.gz 32641752 BLAKE2B e1af0b8c83d0854cbe0c5f1751cb4433fae022f07785c116b27854db1858c30b0d0a46af97204d8df94d20000c860275e980e123ced53dad514f3441c3b2453c SHA512 20cfac78a484724c648d65e3904d588e9853e80eb291598d788d492293e7190ec6df737c90dc3e87268d5218523920f2958684f2684853c5433c080bc6c6523d
 DIST kubernetes-1.19.3.tar.gz 33357048 BLAKE2B 9e023d8be35a4f65ec7412e3dd624f22ecaac478da9e2c4ef98f7369e686bc4b3ccc7f8ba2a1aa1f4fc4aabfaa6670678799fd3db6326fdd3d034b678e66ff0c SHA512 a394544e3baf797282291cae28b58e27e31fea3b3f66274a5ce9005519534860ae6f4b138ce51f4996e7da15930fadeb21d427d80e93433dc14e79cdcb250607
 DIST kubernetes-1.19.4.tar.gz 33362702 BLAKE2B a3402abbd524ba135b7fa5ae9451743da44e7691e9b646de01b265078d89099440e7d14b56b21f4b2f0e105825d51c9565b62d7ae81b644f2a0a0dde4f40122a SHA512 b5a2cd73db3b1454c54d500d21630c971b5dae94377180e658638384ef2b243f0b41f1ce00eb425ab5958bddbdc0c792be4f14b9b61a364a90992860ca9109da
+DIST kubernetes-1.20.0.tar.gz 35797322 BLAKE2B 8bcb34cd3e62f241caa21706f95f010cb5962b697799fcbfba62c67bfb786c3cdcac61b444676fa90952d4ac0d997364202c3797f963c8fcf60d69deca235ba5 SHA512 d04967ca858c05eb52ea46fbd5415cadb86e2ceb88481f523de2779c68dfc5eacdab033ccd873ba2c4b23e843d97b9f01400d058b421ddc618ea2b2ef751e24b
 EBUILD kube-proxy-1.17.13.ebuild 921 BLAKE2B 91cf30d2997a292d3483cf56eb3582c36f40f8d06dffdc323ffce92301eb4f3cadb19a306473b68e17a31c2de67d38144480d965a8c71413edf786f4259282cf SHA512 d65fe717deb2769c1a3554cf4643e35b6b9998efd67ef279597285471bdc1cabde94e9914f9b097754dab38541ad1fe1d65a269b7ca8668819af333f94db00b3
 EBUILD kube-proxy-1.17.14.ebuild 922 BLAKE2B bfd93c76c8f0ea61fb3cef2a0de77617df9993d8a5c0eca7121d771763dadc8bca702822c73362031609b9c15e05cacbac7a25d86f2df043d45242f1ff4a2d94 SHA512 57eb38bf2e407b32c61e1389e8b278c3d49602ca5480380d9cc7d86ce4beb781b5a7c64980b4c2cce6eb6d604ed220930eeb33fdd0189299688a04ff95f423c8
 EBUILD kube-proxy-1.18.10.ebuild 921 BLAKE2B 91cf30d2997a292d3483cf56eb3582c36f40f8d06dffdc323ffce92301eb4f3cadb19a306473b68e17a31c2de67d38144480d965a8c71413edf786f4259282cf SHA512 d65fe717deb2769c1a3554cf4643e35b6b9998efd67ef279597285471bdc1cabde94e9914f9b097754dab38541ad1fe1d65a269b7ca8668819af333f94db00b3
 EBUILD kube-proxy-1.18.12.ebuild 922 BLAKE2B bfd93c76c8f0ea61fb3cef2a0de77617df9993d8a5c0eca7121d771763dadc8bca702822c73362031609b9c15e05cacbac7a25d86f2df043d45242f1ff4a2d94 SHA512 57eb38bf2e407b32c61e1389e8b278c3d49602ca5480380d9cc7d86ce4beb781b5a7c64980b4c2cce6eb6d604ed220930eeb33fdd0189299688a04ff95f423c8
 EBUILD kube-proxy-1.19.3.ebuild 928 BLAKE2B 34644b672e168243d5589eca39c2bad64d5b5fdd41d022cad64a9d9792a14856e5ed55f7868739af44ee039d8184c2a57e0c076adf59498be9d961f312a3cb17 SHA512 0372233c7948b6206d4aada693a4093fc439dd7390de682b6a363fcf8a3e5915213065b30773cdbaa2e2557e3c19db721df1ce4239cf01ae88366fba525bfc68
 EBUILD kube-proxy-1.19.4.ebuild 929 BLAKE2B f4edf4ee4dcd41abcfaaed2373837b952323b7fa6f42322ef792e287c68986c54b9d9a36fda99a21913c6b59dcc44e835793bc48abd06e3cd83676e8df132965 SHA512 f942cccd8c6bc7094bc54fbd258868a74c9d4f5ffc73d55acb8d1bd4548033aba0a457b4a0e03ce4a81ce2f240fcafe6a5d580f9db8cd323357c5aa13380611c
+EBUILD kube-proxy-1.20.0.ebuild 929 BLAKE2B f4edf4ee4dcd41abcfaaed2373837b952323b7fa6f42322ef792e287c68986c54b9d9a36fda99a21913c6b59dcc44e835793bc48abd06e3cd83676e8df132965 SHA512 f942cccd8c6bc7094bc54fbd258868a74c9d4f5ffc73d55acb8d1bd4548033aba0a457b4a0e03ce4a81ce2f240fcafe6a5d580f9db8cd323357c5aa13380611c
 MISC metadata.xml 362 BLAKE2B 7f3bc6132d658d3af0f5ed69dc10e06a6aa93bcbf229a1f089ea6ff9d72fa4c489c2374e2932898d75d5eef61e6ccf1875ccb8c783c34864fd976ae845f10f28 SHA512 51b04b1a97ab16a620347142992b59fdeaacbec1940e69a7a98df386f978024fb27b92dd0ae7557ed1c31c36bc34ff7d2c86c935ce0e01dfbb1bd8d7080d807c
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.20.0.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.20.0.ebuild
new file mode 100644
index 000000000000..2bf8b1a469e1
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.20.0.ebuild
@@ -0,0 +1,35 @@
+# 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-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index dd346e5a4a52..3b8bc1670d24 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -7,10 +7,12 @@ DIST kubernetes-1.18.10.tar.gz 32640930 BLAKE2B f07b5cb047bb023f1b46414edf360b4d
 DIST kubernetes-1.18.12.tar.gz 32641752 BLAKE2B e1af0b8c83d0854cbe0c5f1751cb4433fae022f07785c116b27854db1858c30b0d0a46af97204d8df94d20000c860275e980e123ced53dad514f3441c3b2453c SHA512 20cfac78a484724c648d65e3904d588e9853e80eb291598d788d492293e7190ec6df737c90dc3e87268d5218523920f2958684f2684853c5433c080bc6c6523d
 DIST kubernetes-1.19.3.tar.gz 33357048 BLAKE2B 9e023d8be35a4f65ec7412e3dd624f22ecaac478da9e2c4ef98f7369e686bc4b3ccc7f8ba2a1aa1f4fc4aabfaa6670678799fd3db6326fdd3d034b678e66ff0c SHA512 a394544e3baf797282291cae28b58e27e31fea3b3f66274a5ce9005519534860ae6f4b138ce51f4996e7da15930fadeb21d427d80e93433dc14e79cdcb250607
 DIST kubernetes-1.19.4.tar.gz 33362702 BLAKE2B a3402abbd524ba135b7fa5ae9451743da44e7691e9b646de01b265078d89099440e7d14b56b21f4b2f0e105825d51c9565b62d7ae81b644f2a0a0dde4f40122a SHA512 b5a2cd73db3b1454c54d500d21630c971b5dae94377180e658638384ef2b243f0b41f1ce00eb425ab5958bddbdc0c792be4f14b9b61a364a90992860ca9109da
+DIST kubernetes-1.20.0.tar.gz 35797322 BLAKE2B 8bcb34cd3e62f241caa21706f95f010cb5962b697799fcbfba62c67bfb786c3cdcac61b444676fa90952d4ac0d997364202c3797f963c8fcf60d69deca235ba5 SHA512 d04967ca858c05eb52ea46fbd5415cadb86e2ceb88481f523de2779c68dfc5eacdab033ccd873ba2c4b23e843d97b9f01400d058b421ddc618ea2b2ef751e24b
 EBUILD kube-scheduler-1.17.13.ebuild 980 BLAKE2B 59b13870a0cf9667315f9ada89c2f84b20a387894ba66dc4db6b40fc4f68c30f4cd66bd2c160447666d64bd0cbbf4f354793c56a495bf07ca6a64d59dfdbfaa8 SHA512 c8ac15ebc5ce5526b0b42684141ea1493e8dbec1a7412402fe6b0cf451964d1b01e0a4ca044dfff0cf6df209d0a2a7e2895256352d5b9281449ac79fb45ea05b
 EBUILD kube-scheduler-1.17.14.ebuild 981 BLAKE2B 138abec122588f0e3c2a08ac415fa0bb49939ce6c6dd3e7dc687376602996a7b75b2c610c521ec973489967fa1682a05ab78690008ed78fb88daf2234e1acd5f SHA512 2ba85727af5bbcbc9787ccab32e258018b905448dfdabc2217bebf852afc92d44ced6694bc6019120346fbd16f51eb440f50a5b7509651887d3df320d58a4bae
 EBUILD kube-scheduler-1.18.10.ebuild 979 BLAKE2B 3452a23ce4c0260f19ab673fa725d0dab18c06fcf194ad2703bc9d11fda99334d55c6eef701f92a82f049b8ad91d0d6ee2318df5b4c6e0cb4f50ebb82c4fa20d SHA512 f0256abcbb27d4eb0b5b1e7cf6b1b1ec37545bf6182a1a371a195317b729ca4e0d394d9bb89c1d6dd1cb770dc1fab5c66d3ccb422054d542904e8260944ade41
 EBUILD kube-scheduler-1.18.12.ebuild 980 BLAKE2B 7748469a14dbeff7596492398847575c7911d03b50666122ff85cfc8979582027996627cf8ef0e880e9a3e5a543eeea8b84209e80df97c256e5bf11e7b49cfa0 SHA512 f7183cd1322bdb4dcfc181202a67fdad3b2d5b1af3c0a92cc4c6eacfa7cdcc79de361832e1de8b7f1725461885469b67023d59e6198416b4321cda7fe8a614e7
 EBUILD kube-scheduler-1.19.3.ebuild 986 BLAKE2B dfd44bf7514501fb504941a0d39760affed4d7a40b1de38569ede78e5882976ba99cebaf5470ad5286026373cc89e33cd13f48a4aeafedca34ec157e02ab70d8 SHA512 7ec037243377d2caf291d3c48ab3c4b7804a8c414d0527e13a0b9a4750a7ef2abee5eb580ce307937516878b79fc6795e5407c36188fc94c8eff9f98aac90ded
 EBUILD kube-scheduler-1.19.4.ebuild 987 BLAKE2B 9923a4552e935463e26b4cbb0fe06ba3b0bdd697ffee66eb99d54dde50bc2a380aa00c9f9064151de23ce455638c1912e5093266e7fcf586cb77699afac753ff SHA512 a668af044df3e8dcc4633806d620ec0c743d75f0dde819d6320497de56e9ea7359f6c5c79637c83d8df2156df949772dbd4e73315ed8fde6f4a2adf9b3360725
+EBUILD kube-scheduler-1.20.0.ebuild 987 BLAKE2B 9923a4552e935463e26b4cbb0fe06ba3b0bdd697ffee66eb99d54dde50bc2a380aa00c9f9064151de23ce455638c1912e5093266e7fcf586cb77699afac753ff SHA512 a668af044df3e8dcc4633806d620ec0c743d75f0dde819d6320497de56e9ea7359f6c5c79637c83d8df2156df949772dbd4e73315ed8fde6f4a2adf9b3360725
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.20.0.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.20.0.ebuild
new file mode 100644
index 000000000000..177edc1feff5
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.20.0.ebuild
@@ -0,0 +1,39 @@
+# 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/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index 23693635817a..749e8f023ab6 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -4,10 +4,12 @@ DIST kubernetes-1.18.10.tar.gz 32640930 BLAKE2B f07b5cb047bb023f1b46414edf360b4d
 DIST kubernetes-1.18.12.tar.gz 32641752 BLAKE2B e1af0b8c83d0854cbe0c5f1751cb4433fae022f07785c116b27854db1858c30b0d0a46af97204d8df94d20000c860275e980e123ced53dad514f3441c3b2453c SHA512 20cfac78a484724c648d65e3904d588e9853e80eb291598d788d492293e7190ec6df737c90dc3e87268d5218523920f2958684f2684853c5433c080bc6c6523d
 DIST kubernetes-1.19.3.tar.gz 33357048 BLAKE2B 9e023d8be35a4f65ec7412e3dd624f22ecaac478da9e2c4ef98f7369e686bc4b3ccc7f8ba2a1aa1f4fc4aabfaa6670678799fd3db6326fdd3d034b678e66ff0c SHA512 a394544e3baf797282291cae28b58e27e31fea3b3f66274a5ce9005519534860ae6f4b138ce51f4996e7da15930fadeb21d427d80e93433dc14e79cdcb250607
 DIST kubernetes-1.19.4.tar.gz 33362702 BLAKE2B a3402abbd524ba135b7fa5ae9451743da44e7691e9b646de01b265078d89099440e7d14b56b21f4b2f0e105825d51c9565b62d7ae81b644f2a0a0dde4f40122a SHA512 b5a2cd73db3b1454c54d500d21630c971b5dae94377180e658638384ef2b243f0b41f1ce00eb425ab5958bddbdc0c792be4f14b9b61a364a90992860ca9109da
+DIST kubernetes-1.20.0.tar.gz 35797322 BLAKE2B 8bcb34cd3e62f241caa21706f95f010cb5962b697799fcbfba62c67bfb786c3cdcac61b444676fa90952d4ac0d997364202c3797f963c8fcf60d69deca235ba5 SHA512 d04967ca858c05eb52ea46fbd5415cadb86e2ceb88481f523de2779c68dfc5eacdab033ccd873ba2c4b23e843d97b9f01400d058b421ddc618ea2b2ef751e24b
 EBUILD kubeadm-1.17.13.ebuild 901 BLAKE2B 7f118a9ac267777fc698ef039be02061aede156020072f011c8e78decdde80adfb36abe921255f57230121a2722b4cf02c35d268a4bef35982c8ff0fd5509035 SHA512 c6592ea1b41e9ee7ec7c475af14674d9b4559f5c2319638546de0b01aba89a10c9ed5bba5db697a08889c3b3d58720bae1a76ce225863218b24909f72e7d5df5
 EBUILD kubeadm-1.17.14.ebuild 902 BLAKE2B 255a094f68fe085bd9421d4f8cfd9572f9e8a609e687ed4806c0e07a42d103acd4e97986b67e2e7de94648233a205b85d9642a802e2863ec941ab6fdee632785 SHA512 1fba5a6a6bfa5513c53220d62f67adf6508b53c48e0d195ca363ccb9b7f56bc3290cd3a30fea925aab95da7410c6e33a8d525604918fc2416a97bf0a7564ff9b
 EBUILD kubeadm-1.18.10.ebuild 901 BLAKE2B 7f118a9ac267777fc698ef039be02061aede156020072f011c8e78decdde80adfb36abe921255f57230121a2722b4cf02c35d268a4bef35982c8ff0fd5509035 SHA512 c6592ea1b41e9ee7ec7c475af14674d9b4559f5c2319638546de0b01aba89a10c9ed5bba5db697a08889c3b3d58720bae1a76ce225863218b24909f72e7d5df5
 EBUILD kubeadm-1.18.12.ebuild 902 BLAKE2B 255a094f68fe085bd9421d4f8cfd9572f9e8a609e687ed4806c0e07a42d103acd4e97986b67e2e7de94648233a205b85d9642a802e2863ec941ab6fdee632785 SHA512 1fba5a6a6bfa5513c53220d62f67adf6508b53c48e0d195ca363ccb9b7f56bc3290cd3a30fea925aab95da7410c6e33a8d525604918fc2416a97bf0a7564ff9b
 EBUILD kubeadm-1.19.3.ebuild 906 BLAKE2B 5efec4d82bb7d0197af8b423a5a503c2c00ebfd21aa1790aa4eef89968832811278b836ba256910df9b14010c64cbb367e2331dbfe74891045e872d40e6bfe14 SHA512 d7caf5711538385a89329ec6118ccacc05452549e06bf1fd54cae4e90e7508c5e7e0207cfc65e5d0e9a7a88964b122ba1649b1850a94c62ce914c7967e63535f
 EBUILD kubeadm-1.19.4.ebuild 907 BLAKE2B 997a6d7c90c6e24a34e2a38624e96788ff455222459016954ed3335cbeff01d34e2173b99ca85455e3229dad52af52afa1341d5b2ed6e299cd626ac5816346f7 SHA512 aef36b64c58fd050cda91a5c3534fb9827e830f5aa3e17ff0d66e4c1903e8e4147f851ac75e61644d58f728dc45973982d542f3d5ce9ba41a10fb76b50598b00
+EBUILD kubeadm-1.20.0.ebuild 907 BLAKE2B 997a6d7c90c6e24a34e2a38624e96788ff455222459016954ed3335cbeff01d34e2173b99ca85455e3229dad52af52afa1341d5b2ed6e299cd626ac5816346f7 SHA512 aef36b64c58fd050cda91a5c3534fb9827e830f5aa3e17ff0d66e4c1903e8e4147f851ac75e61644d58f728dc45973982d542f3d5ce9ba41a10fb76b50598b00
 MISC metadata.xml 917 BLAKE2B ece7788c2a425d9663a25793715a9a2b1227c76f4ca0606340adf98bf524325524cbfde458125fc20cdfe4278950f4109d6a8a4d31c066f7884c33d856b5cd31 SHA512 587a9b0e0de0e18ccd2b8de9929f588c270172e795cede9093fa2380aa422f67e6e35ea0f534d8507ec278448bb1a7a2832bff561a92f8663e15824130be450a
diff --git a/sys-cluster/kubeadm/kubeadm-1.20.0.ebuild b/sys-cluster/kubeadm/kubeadm-1.20.0.ebuild
new file mode 100644
index 000000000000..192287ce82c9
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.20.0.ebuild
@@ -0,0 +1,34 @@
+# 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/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index 5b0ea31cdf0c..0ff930d8646b 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -4,10 +4,12 @@ DIST kubernetes-1.18.10.tar.gz 32640930 BLAKE2B f07b5cb047bb023f1b46414edf360b4d
 DIST kubernetes-1.18.12.tar.gz 32641752 BLAKE2B e1af0b8c83d0854cbe0c5f1751cb4433fae022f07785c116b27854db1858c30b0d0a46af97204d8df94d20000c860275e980e123ced53dad514f3441c3b2453c SHA512 20cfac78a484724c648d65e3904d588e9853e80eb291598d788d492293e7190ec6df737c90dc3e87268d5218523920f2958684f2684853c5433c080bc6c6523d
 DIST kubernetes-1.19.3.tar.gz 33357048 BLAKE2B 9e023d8be35a4f65ec7412e3dd624f22ecaac478da9e2c4ef98f7369e686bc4b3ccc7f8ba2a1aa1f4fc4aabfaa6670678799fd3db6326fdd3d034b678e66ff0c SHA512 a394544e3baf797282291cae28b58e27e31fea3b3f66274a5ce9005519534860ae6f4b138ce51f4996e7da15930fadeb21d427d80e93433dc14e79cdcb250607
 DIST kubernetes-1.19.4.tar.gz 33362702 BLAKE2B a3402abbd524ba135b7fa5ae9451743da44e7691e9b646de01b265078d89099440e7d14b56b21f4b2f0e105825d51c9565b62d7ae81b644f2a0a0dde4f40122a SHA512 b5a2cd73db3b1454c54d500d21630c971b5dae94377180e658638384ef2b243f0b41f1ce00eb425ab5958bddbdc0c792be4f14b9b61a364a90992860ca9109da
+DIST kubernetes-1.20.0.tar.gz 35797322 BLAKE2B 8bcb34cd3e62f241caa21706f95f010cb5962b697799fcbfba62c67bfb786c3cdcac61b444676fa90952d4ac0d997364202c3797f963c8fcf60d69deca235ba5 SHA512 d04967ca858c05eb52ea46fbd5415cadb86e2ceb88481f523de2779c68dfc5eacdab033ccd873ba2c4b23e843d97b9f01400d058b421ddc618ea2b2ef751e24b
 EBUILD kubectl-1.17.13.ebuild 900 BLAKE2B a2316313974f7d973a3b95348227f2a7a7080d87d327cf1fa0869cd42e8c3cba4c15db9e3d08a563b5f2b7a60268f0366c8594eaeb4cd4a1210510b85819feec SHA512 0bfff79b25a87fe70a95b3a63213323d48bdfd525b27089d8f7f7eb5a37eca9897f9912b454a5581364cf5f24e9a7c636bddbfd9c992c2453954a33b490e624c
 EBUILD kubectl-1.17.14.ebuild 901 BLAKE2B 0e16ff8b1cc0c3ec52e1ba469e25fa268b2fd8a2d1d3beb4236be91acdaf4f601bed9a08acb6d802cf6ceaa295ea9ff8592668868962155a8f621b9612475989 SHA512 6219eabfd961215925d0ce1817c9f6e1a3491a2471279005d8b1547451816456995635d046771e32c9b9dcd01575b1f2bdc43f03256e9be0f982e7f6b2096cd4
 EBUILD kubectl-1.18.10.ebuild 900 BLAKE2B a2316313974f7d973a3b95348227f2a7a7080d87d327cf1fa0869cd42e8c3cba4c15db9e3d08a563b5f2b7a60268f0366c8594eaeb4cd4a1210510b85819feec SHA512 0bfff79b25a87fe70a95b3a63213323d48bdfd525b27089d8f7f7eb5a37eca9897f9912b454a5581364cf5f24e9a7c636bddbfd9c992c2453954a33b490e624c
 EBUILD kubectl-1.18.12.ebuild 901 BLAKE2B 0e16ff8b1cc0c3ec52e1ba469e25fa268b2fd8a2d1d3beb4236be91acdaf4f601bed9a08acb6d802cf6ceaa295ea9ff8592668868962155a8f621b9612475989 SHA512 6219eabfd961215925d0ce1817c9f6e1a3491a2471279005d8b1547451816456995635d046771e32c9b9dcd01575b1f2bdc43f03256e9be0f982e7f6b2096cd4
 EBUILD kubectl-1.19.3.ebuild 901 BLAKE2B 928a7f93d2de11e0f5671a40819a54d0ba59284e7036fc166d9af399495bc897fa9508e9b69f2d00e36c467135fc2fd61b642fe0a88a9aa21afc3ec4fc07c0f8 SHA512 0becacf2403f7b2baa65a4f482d7caf36414ebe328e57e2f88987d706698810aa69375e90e743d655e56fc4278016564b2578d2812b3d72785c8a80b4920f999
 EBUILD kubectl-1.19.4.ebuild 902 BLAKE2B e1c50f7f5774556d754f5014f80a4fdbd8064a05e19283108b55957896cfaf034669e82a068484ed57c349200ce3a2e4eae02a34400b8f885a86d2f7f982c76b SHA512 6677668326cd8fa238fb339c78474902d50d8acb16dc46e0fe1b562c1b762d981ab15ab806487b5eb5f85d47c8724248ebcb2b0ce706af12e8134db18b1c76b7
+EBUILD kubectl-1.20.0.ebuild 902 BLAKE2B e1c50f7f5774556d754f5014f80a4fdbd8064a05e19283108b55957896cfaf034669e82a068484ed57c349200ce3a2e4eae02a34400b8f885a86d2f7f982c76b SHA512 6677668326cd8fa238fb339c78474902d50d8acb16dc46e0fe1b562c1b762d981ab15ab806487b5eb5f85d47c8724248ebcb2b0ce706af12e8134db18b1c76b7
 MISC metadata.xml 334 BLAKE2B e4daad1c0150025addcba294ef07c06e004c6d713e0d03a72b70a51bc44d6a4b0a86c9cd543af113c312f693d79c2985b679d6774a54370e9af9b0430de63f22 SHA512 f894ee487b6aff7d302bef231d72faba7ae9c0aa673974b306a4b74fe3b90dbc62c49b6bd829cc1b439a6d820ffe94db3a15ea2209250fc3b13c8b06297af27c
diff --git a/sys-cluster/kubectl/kubectl-1.20.0.ebuild b/sys-cluster/kubectl/kubectl-1.20.0.ebuild
new file mode 100644
index 000000000000..716d7d53396c
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.20.0.ebuild
@@ -0,0 +1,34 @@
+# 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/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index 772b775315d7..eb70c62af6cf 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -9,10 +9,12 @@ DIST kubernetes-1.18.10.tar.gz 32640930 BLAKE2B f07b5cb047bb023f1b46414edf360b4d
 DIST kubernetes-1.18.12.tar.gz 32641752 BLAKE2B e1af0b8c83d0854cbe0c5f1751cb4433fae022f07785c116b27854db1858c30b0d0a46af97204d8df94d20000c860275e980e123ced53dad514f3441c3b2453c SHA512 20cfac78a484724c648d65e3904d588e9853e80eb291598d788d492293e7190ec6df737c90dc3e87268d5218523920f2958684f2684853c5433c080bc6c6523d
 DIST kubernetes-1.19.3.tar.gz 33357048 BLAKE2B 9e023d8be35a4f65ec7412e3dd624f22ecaac478da9e2c4ef98f7369e686bc4b3ccc7f8ba2a1aa1f4fc4aabfaa6670678799fd3db6326fdd3d034b678e66ff0c SHA512 a394544e3baf797282291cae28b58e27e31fea3b3f66274a5ce9005519534860ae6f4b138ce51f4996e7da15930fadeb21d427d80e93433dc14e79cdcb250607
 DIST kubernetes-1.19.4.tar.gz 33362702 BLAKE2B a3402abbd524ba135b7fa5ae9451743da44e7691e9b646de01b265078d89099440e7d14b56b21f4b2f0e105825d51c9565b62d7ae81b644f2a0a0dde4f40122a SHA512 b5a2cd73db3b1454c54d500d21630c971b5dae94377180e658638384ef2b243f0b41f1ce00eb425ab5958bddbdc0c792be4f14b9b61a364a90992860ca9109da
+DIST kubernetes-1.20.0.tar.gz 35797322 BLAKE2B 8bcb34cd3e62f241caa21706f95f010cb5962b697799fcbfba62c67bfb786c3cdcac61b444676fa90952d4ac0d997364202c3797f963c8fcf60d69deca235ba5 SHA512 d04967ca858c05eb52ea46fbd5415cadb86e2ceb88481f523de2779c68dfc5eacdab033ccd873ba2c4b23e843d97b9f01400d058b421ddc618ea2b2ef751e24b
 EBUILD kubelet-1.17.13.ebuild 996 BLAKE2B cc36c5052214105c94b7160960f86129d6d356b1111f539d007e117eba99f8f25be61f98b415a22a976c4409154d24b418a3f557bf1be0c9791d45bb34cad89d SHA512 88c906092887d7d7bf6a0697774e1cbc6ae4f9897b54410f08c015f9a04a8fe893b45001d860a5acbb4242574c282302ffd9e58fe0b99cb0782a100425646d7f
 EBUILD kubelet-1.17.14.ebuild 997 BLAKE2B 35252dbc83344caa86944c708e9f8f3a4fbbd5657bccee14b3a1782ea91f4ce89e614a80d1a6bcd3b044908eec6a7560e462c4be50a3b9134c45cfac2481bd9f SHA512 ccf2ae644acc00e64935a0bee9556629d07632de7e1ef91c499a122847a17d9aa3964dbe87622ad97d7fd77d4315401eec5b4449d2516493945aaff451a7636d
 EBUILD kubelet-1.18.10.ebuild 996 BLAKE2B cc36c5052214105c94b7160960f86129d6d356b1111f539d007e117eba99f8f25be61f98b415a22a976c4409154d24b418a3f557bf1be0c9791d45bb34cad89d SHA512 88c906092887d7d7bf6a0697774e1cbc6ae4f9897b54410f08c015f9a04a8fe893b45001d860a5acbb4242574c282302ffd9e58fe0b99cb0782a100425646d7f
 EBUILD kubelet-1.18.12.ebuild 997 BLAKE2B 35252dbc83344caa86944c708e9f8f3a4fbbd5657bccee14b3a1782ea91f4ce89e614a80d1a6bcd3b044908eec6a7560e462c4be50a3b9134c45cfac2481bd9f SHA512 ccf2ae644acc00e64935a0bee9556629d07632de7e1ef91c499a122847a17d9aa3964dbe87622ad97d7fd77d4315401eec5b4449d2516493945aaff451a7636d
 EBUILD kubelet-1.19.3.ebuild 1003 BLAKE2B 8c7e0e91a3108a6fa20ffa4ca7ecc247cf19f3ca2fa22f4c69795abc4430c1068ec854bed768ccb8caede6427456d5f8b43ff1aa018a3f9a2875a62c32d5ced8 SHA512 55923ca8b0a637bf9e710be0f2f217ab17ab4aa37785c6da7c2d5d28b62dbfdf4f1df425f1b8770c2051335a57911b919188e8a587bc08a32058601e9fe456e9
 EBUILD kubelet-1.19.4.ebuild 1004 BLAKE2B 0ad9b099c3404ec897e5a98c2812a2cc722a7d4933f23cf4117f539e8b5844e8eab2895fb7b120e7194d33044212140620e66d9726090bf462d7a9519ccb5b0d SHA512 ca6e9ea5dd11bb5f48b6dd8e21e18cb451dffeb123be423aa20bdeb87c9050adf6487c9e87bb0603eb54cd5c1fbc40a42e61d24cc69d6de591e5327f88c45ac0
+EBUILD kubelet-1.20.0.ebuild 1004 BLAKE2B 0ad9b099c3404ec897e5a98c2812a2cc722a7d4933f23cf4117f539e8b5844e8eab2895fb7b120e7194d33044212140620e66d9726090bf462d7a9519ccb5b0d SHA512 ca6e9ea5dd11bb5f48b6dd8e21e18cb451dffeb123be423aa20bdeb87c9050adf6487c9e87bb0603eb54cd5c1fbc40a42e61d24cc69d6de591e5327f88c45ac0
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kubelet/kubelet-1.20.0.ebuild b/sys-cluster/kubelet/kubelet-1.20.0.ebuild
new file mode 100644
index 000000000000..03f40ee62ef0
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.20.0.ebuild
@@ -0,0 +1,37 @@
+# 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/nova/Manifest b/sys-cluster/nova/Manifest
index 9f1693f58185..0755010297d9 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -3,20 +3,14 @@ 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.1.0.tar.gz 9213435 BLAKE2B e84bc5131c4bd5ca50ab2783b8b6c606eac0abdaf622fb9a32b9c86fb91ac569f92459da199b4d4bbf679710e593f7ce5539c7f85f89446a463064a108b58d3b SHA512 abb6db64bf25806a9037df1b54bb5874e0599654b8cabafbb6ac659358124a5aa62668117e0a529677e1997d7d89b4265fbb9de4613f28d00d71bdfc4e94c471
 DIST nova-21.1.1.tar.gz 9300545 BLAKE2B 757e7da69a10da73f7786e71e81ffc126304f8bff65910d3cb7ee8bf8fddc70490451b8173ac1a26e0b256e6cf54f4292617481c5fc7394e727ad2da20ed4607 SHA512 c44f0ca3b689cf3a3f364654bbdc8d4a425c702506be2d4e2d00002baf3395b5212807f1cc696488602d642c3565a7a84a407357d3621028c39e844c2ac4c466
-DIST nova-22.0.0.tar.gz 9168828 BLAKE2B 6ae28abd6e14a50c7d28564bcd7df0ab5681c5a89b4b561a68231d14f92faca4d394b2669b0f60292bc0a00589e36663f6529059a26fd6a5e3991066abda0070 SHA512 4b6b889550f839711462dba8b541977e35aecc062a3f86414b94338666807d31b330084ac3f6ebf889b8ef3f4fddec324d6af6fadeea76edd96baa48c00df7f7
 DIST nova-22.0.1.tar.gz 9254552 BLAKE2B b676ef872a9c14331860cd907a74c30f41dfb64908af9ac9e93bbc966a43daf1b3ef74d8a9e80e6f50ac25713a65a0082a02ecb276731ea3ea704dad210d6e7e SHA512 002b4fac8807b0a993e281fe6438b3e1db5cba31f12b2570c3bfd7cc495a5334668db4cc75a66f11186a8f0409f84e47e9e8b38220a1b3af762e543481ab0b7c
 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.1.0 191182 BLAKE2B 99999b1b42b9ecc6a7f404c9874c5065591dfd8e896c97d261307f7f3b5e935e12db1b4650182660cf1eb97bcfb993d41a1f89e079120adc00b339b5a4ac1c98 SHA512 af22ba8dcfbafdb07ba2785bdcb40efd201adb81d47bee15ee11bb76437bc7a5b7c88390f995432ffa92b64b849df754bd15264e97530334f3eac6f8f93e828d
 DIST nova.conf.sample-21.1.1 191182 BLAKE2B 99999b1b42b9ecc6a7f404c9874c5065591dfd8e896c97d261307f7f3b5e935e12db1b4650182660cf1eb97bcfb993d41a1f89e079120adc00b339b5a4ac1c98 SHA512 af22ba8dcfbafdb07ba2785bdcb40efd201adb81d47bee15ee11bb76437bc7a5b7c88390f995432ffa92b64b849df754bd15264e97530334f3eac6f8f93e828d
-DIST nova.conf.sample-22.0.0 187107 BLAKE2B e577126b67f2cc1aa6597f89b1632007f726ad85875d5f27041d0f9ac88923b944fe7f45ae2b3332157713b5f93034dad4da2860917b025649a52d7d71986612 SHA512 4149f8f19a573e8717f521183ba330853742bb6731f0e9ef02842d3be1c188ea3a2cdbeb6043086869360b9b1174a17e221c4ad1f543f74220c46cf31b1ca970
 DIST nova.conf.sample-22.0.1 187107 BLAKE2B e577126b67f2cc1aa6597f89b1632007f726ad85875d5f27041d0f9ac88923b944fe7f45ae2b3332157713b5f93034dad4da2860917b025649a52d7d71986612 SHA512 4149f8f19a573e8717f521183ba330853742bb6731f0e9ef02842d3be1c188ea3a2cdbeb6043086869360b9b1174a17e221c4ad1f543f74220c46cf31b1ca970
 EBUILD nova-2020.1.9999.ebuild 7628 BLAKE2B 3486d8ff71c4e70391cd416b6ef0cdf346ea8676d79cf594abaae8ea0f91dbe77a9a4a7fc720cbd4c6f910be91180b25251fa196878a33b4c8d114bb382c7e2a SHA512 d2a507f1fa6a00c2260f837cec8f02d6b151efbc7a50aecb6d50f30c1e56bd3cc708245ff7dec1a2d1a2601fb7a12a028a00ab3a7e75ff015500640c4b00c26a
 EBUILD nova-2020.2.9999.ebuild 7493 BLAKE2B 13c828ef32b49e6284464e2fe99d396412e1345b7b148368fbcf2eecfcf671d9653733e8c64729a548cacf3b149d89099421ac78bc9c5a4e5083f83273180d12 SHA512 e7e8dd5dfea3be846e769207859255c88ab04ea745fbaf8062c1763f34959241b09ba0a444967e8abc91a9c96bfea00e6861006597bf8571843de6050b9e3779
-EBUILD nova-21.1.0.ebuild 7651 BLAKE2B fef31b81037d3412567f60578d63732f08fa0e70697c8a936d31e6b1fe5868b0dbb722447826b918ecb1467df9b95d9efec07fbe7a94225efa3f0695825e3f41 SHA512 c1a64cea2dbed104b03330662349ac165e18e162b89812a4c101f28f539773bb8563a3a56656fe561109eaef54f7eb3eccc799d81ec35de420109f35ade74352
-EBUILD nova-21.1.1.ebuild 7653 BLAKE2B 0eb9a06982266d64a505ae021939ca933ed504335318324a6587e56e6af8ecae55cf12fb98944abbf5c94bfaf89a424ad3f011e067257cd6a3d18ac0759e7bab SHA512 09e0b4650488aad403adad1436cef1a9afe328d3bcd50153b5aec17f85cdc5ef4958ea47d4e40af45f0312e64e0b64626d04c73c784fb21e3ed7dc6d55028720
-EBUILD nova-22.0.0.ebuild 7493 BLAKE2B 13c828ef32b49e6284464e2fe99d396412e1345b7b148368fbcf2eecfcf671d9653733e8c64729a548cacf3b149d89099421ac78bc9c5a4e5083f83273180d12 SHA512 e7e8dd5dfea3be846e769207859255c88ab04ea745fbaf8062c1763f34959241b09ba0a444967e8abc91a9c96bfea00e6861006597bf8571843de6050b9e3779
-EBUILD nova-22.0.1.ebuild 7493 BLAKE2B 13c828ef32b49e6284464e2fe99d396412e1345b7b148368fbcf2eecfcf671d9653733e8c64729a548cacf3b149d89099421ac78bc9c5a4e5083f83273180d12 SHA512 e7e8dd5dfea3be846e769207859255c88ab04ea745fbaf8062c1763f34959241b09ba0a444967e8abc91a9c96bfea00e6861006597bf8571843de6050b9e3779
+EBUILD nova-21.1.1.ebuild 7651 BLAKE2B fef31b81037d3412567f60578d63732f08fa0e70697c8a936d31e6b1fe5868b0dbb722447826b918ecb1467df9b95d9efec07fbe7a94225efa3f0695825e3f41 SHA512 c1a64cea2dbed104b03330662349ac165e18e162b89812a4c101f28f539773bb8563a3a56656fe561109eaef54f7eb3eccc799d81ec35de420109f35ade74352
+EBUILD nova-22.0.1.ebuild 7491 BLAKE2B c7c9321f79801920a7f12e2c6ac50a822afa149f6563e6ecceded24c790369c47bd961c0902f43c79a97cdfefc5417f2c0fa6370ca3a8871a8adea5b9eb805d0 SHA512 cc9bd391e783872f7384e136725d132fc8c2dffbe57b4af3fd7216029183a6218714d4243e9f2d489d611b04c6992d91b678a3f1f0875a62f757de997bdc8cd1
 MISC metadata.xml 1172 BLAKE2B aa85fe6bed1e40717884d721c2633c5f6d380914c69cb8a4a4c31b3e4c779db52b90fdaa5ee63b66ad9bc6694f666dd37dceeffb8de4676014ef3bb688476ef7 SHA512 bb506fa680b064c3d6a48710cac11efedc9e8a340603e234bf5c4c48aaab773e4527d7a8fc66ae36ec894230a1d02a5be995e521d222914f652e03b6f72642e4
diff --git a/sys-cluster/nova/nova-21.1.0.ebuild b/sys-cluster/nova/nova-21.1.0.ebuild
deleted file mode 100644
index f1651e868045..000000000000
--- a/sys-cluster/nova/nova-21.1.0.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-inherit distutils-r1 eutils linux-info multilib
-
-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.21.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/nova/nova-21.1.1.ebuild b/sys-cluster/nova/nova-21.1.1.ebuild
index 7d6ad9d9a1d9..f1651e868045 100644
--- a/sys-cluster/nova/nova-21.1.1.ebuild
+++ b/sys-cluster/nova/nova-21.1.1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]];then
 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"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/sys-cluster/nova/nova-22.0.0.ebuild b/sys-cluster/nova/nova-22.0.0.ebuild
deleted file mode 100644
index 4f4d7b2b35ea..000000000000
--- a/sys-cluster/nova/nova-22.0.0.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 python3_8 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 eutils linux-info multilib
-
-DESCRIPTION="Cloud computing fabric controller"
-HOMEPAGE="https://launchpad.net/nova"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/nova.conf.sample -> nova.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/nova.git"
-	EGIT_BRANCH="stable/victoria"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/nova.conf.sample -> nova.conf.sample-${PV}
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
-REQUIRED_USE="
-	!compute-only? ( || ( mysql postgres sqlite ) )
-	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
-
-CDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	compute-only? (
-		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
-	)
-	sqlite? (
-		>=dev-python/sqlalchemy-1.2.19[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
-	)
-	>=dev-python/decorator-4.1.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.15[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.13.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.7.1[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-	!~dev-python/python-cinderclient-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.23.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/websockify-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-6.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.21.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-upgradecheck-0.1.1[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.44.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-10.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.33.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.40.1[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/os-resource-classes-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/os-traits-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/os-vif-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-4.2.0[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/os-xenapi-0.3.4[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
-	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/pypowervm-1.1.15[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-	>=dev-python/zVMCloudConnector-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.35.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	app-emulation/libvirt[iscsi?]
-	app-emulation/spice-html5
-	novncproxy? ( www-apps/novnc )
-	sys-apps/iproute2
-	openvswitch? ( net-misc/openvswitch )
-	rabbitmq? ( net-misc/rabbitmq-server )
-	memcached? (
-		net-misc/memcached
-		>=dev-python/python-memcached-1.58
-	)
-	sys-fs/sysfsutils
-	sys-fs/multipath-tools
-	net-misc/bridge-utils
-	compute? (
-		app-cdr/cdrtools
-		sys-fs/dosfstools
-		app-emulation/qemu
-	)
-	iscsi? (
-		sys-fs/lsscsi
-		>=sys-block/open-iscsi-2.0.873-r1
-	)
-	acct-user/nova
-	acct-group/nova"
-
-#PATCHES=(
-#)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
-	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
-	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
-		done
-	fi
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use !compute-only; then
-		for svc in api conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
-			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
-		done
-	fi
-	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
-	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
-
-	diropts -m 0750 -o nova -g qemu
-	dodir /var/log/nova /var/lib/nova/instances
-	diropts -m 0750 -o nova -g nova
-
-	insinto /etc/nova
-	insopts -m 0640 -o nova -g nova
-	newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample"
-	doins "${FILESDIR}/nova-compute.conf"
-	doins "${S}/etc/nova/"*
-	# rootwrap filters
-	insopts -m 0644
-	insinto /etc/nova/rootwrap.d
-	doins "etc/nova/rootwrap.d/compute.filters"
-
-	# add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0600 -o root -g root
-	doins "${FILESDIR}/nova-sudoers"
-
-	if use iscsi ; then
-		# Install udev rules for handle iscsi disk with right links under /dev
-		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
-
-		insinto /etc/nova/
-		doins "${FILESDIR}/scsi-openscsi-link.sh"
-	fi
-	rm -r "${ED}/usr/etc"
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "iscsid needs to be running if you want cinder to connect"
-	fi
-}
diff --git a/sys-cluster/nova/nova-22.0.1.ebuild b/sys-cluster/nova/nova-22.0.1.ebuild
index 4f4d7b2b35ea..ba69c65d6da4 100644
--- a/sys-cluster/nova/nova-22.0.1.ebuild
+++ b/sys-cluster/nova/nova-22.0.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]];then
 else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/nova.conf.sample -> nova.conf.sample-${PV}
 	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index b8541222980b..fc760d981ab6 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -4,14 +4,9 @@ AUX pacemaker-2.0.4-qa-warnings.patch 819 BLAKE2B 5de3717c80c6aa0d81b66c2b16e0b1
 AUX pacemaker.initd 862 BLAKE2B 4da4af65887be567aa77fff2b3647b64fa86a9862a2269db1c27ab429759ac597f6eb5fcbadefc22ec64d0eb5983b3d7301c1867d056ef8332f241d967aae3c0 SHA512 9578a47ea9271a5b8b5939dc32ff49736504c2e6318f3e9f906b554b1b11a334c01cae8900e946318cdffd3cf9611d748013bdcc63b3ae68919709ebb12e7e7c
 AUX pacemaker.service 105 BLAKE2B 2b77b0c81427ab418bb5af372fb4938a7c630a9bb1e4128ed7335d9d1d11b5fbaf657e9ccabd6a7d4b1a120a00d7e46678f8a7a635b0dee7a2aa60559e78d50c SHA512 478e1040811f16c0c26fad8feb55cf803e5c4ec4a25e7c82ec771663f25270500fce2dd53622abd7126006c4629bdc3a82fb7f16361eb19543619824a56e848b
 DIST Pacemaker-1.1.16.tar.gz 4897772 BLAKE2B a6ea8b3e5f6ef776a67d8895a0361945c5bcd98ecd861c0fd8d8b3c474a6f14c816e1f36da1dccd429ab8d92c53a9dd071796968d5080d6a900518df200fafbd SHA512 967c860fab7b9e73dd8643e6d09083a2a1298a77d71c3b138187803c89153bee7219da13e6b94b20f2881b53ba7fc1c8584a43ff058a265e76708fd5dbccf534
-DIST Pacemaker-1.1.19.tar.gz 5369381 BLAKE2B 9134f014b4da61c01bb2533ad33201400335d9e722e064f5e838df851777cfd17115430bd4623b08b97330bfe98340091f06a98c06dd125761053e79f0375dd2 SHA512 c41403441a3ba7a4fb81b6c3e84d7eff5ee951e1040918597ea8462284c83dc6f572607d4903b1238c55757f1eca78132878a172da4e3b5db2dbfe0831c34548
-DIST Pacemaker-1.1.24-rc1.tar.gz 5766749 BLAKE2B 7928fc40ba6c88983f394edb19116f8843c0e51c5dbbde503b10962fc178ab712470f3de91d93f69de4e18395aa9af04edf79c0c35372a3d3cc3d4d1ef6aa262 SHA512 188e3960408b9529f502e3bff28de39b7d7393140af3b14fe9220b52f59b3bcca85d9f00d07f9d210b3a5dd8a618d2aea23f65c6f484a8e31510da9d759ceeb8
-DIST Pacemaker-2.0.4.tar.gz 5134516 BLAKE2B 8fa9a648d9d3971a579852833cba2bbf2d45d2d02870bf314813389fe6d49bb2109f9436224d8e0abe8449660b319a37ea9aa2b28250f14874608bcba6e4472d SHA512 fbff3b5ab05ad52d469304d5bc7fca518df2f491a1176a24735cd1a9b46f7ff90dc5aeae65e5e29feb86e8a210e69e528261138847d6f8773933fb557e71133d
-DIST Pacemaker-2.0.5-rc3.tar.gz 5433648 BLAKE2B f564ff0d7c33897bb58886194e169d2071823c43b27bb5e359a3a3a9a471cb8a9c22f86e93ed99d7eedcebfc530494a35fbd0b523287d3111dea0f507cf5b76b SHA512 adf558d80d93ee7944b8e9eb5d07304e374ee61a4d81159daa9c6a9108ee77294e109766c21ed6f6eef2847ebc67d98925b8c63ff49bba958058bb7ef68d0f07
+DIST Pacemaker-1.1.24.tar.gz 5765945 BLAKE2B cdbba75b640adf6962d00a13a12045bf5d1e34dbdaf34d53797e8fea4fff9368dd3d771fe2d7f70813bb3cfab87a7daca3af56f4f5b343fb3ac3aec649f32316 SHA512 6eb5996ae135970cb7a04b81ad43d060e898566d0addd70da61085d47da6d7dc752e8e9df580e18c295c8b373bab6b4574ddb3a34cb7a1e29b2ed768a4f916bd
+DIST Pacemaker-2.0.5.tar.gz 5434850 BLAKE2B 4e3d24746978fe0785dd9c415cc3779a2bd06f78d8bcd3353cdab8c93b192db8a017d404f6d5e27852369e8db2dc1ee4a2c4c7806ebb1aad5381d1c5b5a681dc SHA512 5fd3614f0284297babb66ea2dc567583315052fcf77f49107c52161e8e8c164ae3169d98528fdc1316d8eabaacc98ed24e9c6e6c90b3286f2f012a4ee874bbba
 EBUILD pacemaker-1.1.16.ebuild 1458 BLAKE2B 3b9456e15527b474b5d6865012040046e4fa23f20c6294b4728a9482cba65fb154af4aabd3b288529c9a64ce0e8e9cc3bafea5a540850672f96f476bb14994de SHA512 506adfebe1059b3f03def9d08da0235aa482ebbceb77a778e78f6519a07f0d25d45efc00faa1546835a5d67d9b2f9bfe02909640c59c4dcee045bbf1407d761d
-EBUILD pacemaker-1.1.19-r1.ebuild 1493 BLAKE2B eab0b238de42ed3cf3debbe9337ee66cf3b521aa2536d877850c47f488090f97d6896b7fa97f915b248b5e75a1398111da5622e9ccdc5c65cea1944e323fb035 SHA512 79eb96bdfbec00370087849f1c18995ad1e9e50136eae2fb69c6f1cef70349ef4af49a12d7cab7f220a5532c6c8a0d1c5afd1c4ff1f103e9379e7ca073c3130d
-EBUILD pacemaker-1.1.19.ebuild 1460 BLAKE2B f06004d23b50a994c9b1f9efa838e53c48b36817d299976c5d805d2b40da37b410718c0de5ad57cbe443e409049495485fb3e9cbef01bbc647f4f5446df2dfa8 SHA512 ce1a47cedacfb54a9af73698bb8ddbd4a210fcacdf896857b0af5d3119673d13ad87e51935f04a2f7cc1b7a5fd181532a92148aeb2b69c98961f3360f5db575a
-EBUILD pacemaker-1.1.24_rc1.ebuild 1678 BLAKE2B c9158e44b70924415e4e9269486e2674415f2f468e395024385fd9ac6400cd053846c372ee1d0036db0c72236d6281c7d6b6453e01626e4997ec109228bd35e9 SHA512 3b3ab7724c93575163415ada7c72234254f9aaabec43b4647fbe5d2ac4da2ad391fd435be2ded2c2e0d723681070401552c170785ee4b0a60ffa2a7a392b4680
-EBUILD pacemaker-2.0.4.ebuild 1580 BLAKE2B 9a117486e36def204f3973ac5bdfc3ce1135c04e1c92edd538facd9fbf40a57b861c567f0f8f04757cf3ba8ea090e6da73baa352d36f025544fc20bc443bb921 SHA512 9905ff45eb621149fbaaa1e307cb2d3617e1487c7a427af8d57347436694d28ffaef408e858dfd95bd582588370d3997b7d17d1649cef9ecffb36b2d44f937e9
-EBUILD pacemaker-2.0.5_rc3.ebuild 1580 BLAKE2B 9a117486e36def204f3973ac5bdfc3ce1135c04e1c92edd538facd9fbf40a57b861c567f0f8f04757cf3ba8ea090e6da73baa352d36f025544fc20bc443bb921 SHA512 9905ff45eb621149fbaaa1e307cb2d3617e1487c7a427af8d57347436694d28ffaef408e858dfd95bd582588370d3997b7d17d1649cef9ecffb36b2d44f937e9
+EBUILD pacemaker-1.1.24.ebuild 1678 BLAKE2B c9158e44b70924415e4e9269486e2674415f2f468e395024385fd9ac6400cd053846c372ee1d0036db0c72236d6281c7d6b6453e01626e4997ec109228bd35e9 SHA512 3b3ab7724c93575163415ada7c72234254f9aaabec43b4647fbe5d2ac4da2ad391fd435be2ded2c2e0d723681070401552c170785ee4b0a60ffa2a7a392b4680
+EBUILD pacemaker-2.0.5.ebuild 1580 BLAKE2B 9a117486e36def204f3973ac5bdfc3ce1135c04e1c92edd538facd9fbf40a57b861c567f0f8f04757cf3ba8ea090e6da73baa352d36f025544fc20bc443bb921 SHA512 9905ff45eb621149fbaaa1e307cb2d3617e1487c7a427af8d57347436694d28ffaef408e858dfd95bd582588370d3997b7d17d1649cef9ecffb36b2d44f937e9
 MISC metadata.xml 808 BLAKE2B a4da9e3271b4b28e903675dafd9d7f89e04ba1f326a849bb61b74f9ee7a3d21acf32b64826752b5881e40a292e850242eb87d722a41caa2d6c5106fe7162a3d9 SHA512 a86d59e889206951e38efc0fb3ace9f54662abfc56edbf04e66f266e4d29c97bda968df5b16bc54150a5be24ccbb7f3ff3d04f8d527f12bc067fac02255b5119
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
deleted file mode 100644
index 7790d983ce70..000000000000
--- a/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit autotools python-single-r1
-
-MY_PN="${PN^}"
-MY_P="${MY_PN}-${PV/_/-}"
-
-DESCRIPTION="Pacemaker CRM"
-HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker"
-SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="acl smtp snmp"
-
-DEPEND="${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	sys-cluster/cluster-glue
-	sys-cluster/corosync
-	>=sys-cluster/libqb-0.14.0
-	sys-cluster/resource-agents
-
-	smtp?		( net-libs/libesmtp )
-	snmp?		( net-analyzer/net-snmp )
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-src_prepare() {
-	default
-	sed -i -e "s/ -ggdb//g" configure.ac || die
-	eautoreconf
-	python_fix_shebang .
-}
-
-src_configure() {
-	# appends lib to localstatedir automatically
-	local myconf=(
-		--localstatedir=/var
-		--disable-fatal-warnings
-		--disable-static
-		--without-cs-quorum
-		--without-cman
-		$(use_with acl)
-		--without-heartbeat
-		$(use_with smtp esmtp)
-		$(use_with snmp)
-		--with-ais
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	rm -rf "${D}/var/run" "${D}/etc/init.d"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	if has_version "<sys-cluster/corosync-2.0"; then
-		insinto /etc/corosync/service.d
-		newins "${FILESDIR}/${PN}.service" "${PN}"
-	fi
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild
deleted file mode 100644
index d1e44f3de6f8..000000000000
--- a/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils python-single-r1
-
-MY_PN="Pacemaker"
-MY_P=${MY_PN}-${PV/_/-}
-
-DESCRIPTION="Pacemaker CRM"
-HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker"
-SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="acl smtp snmp static-libs"
-
-DEPEND="${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	sys-cluster/cluster-glue
-	sys-cluster/corosync
-	>=sys-cluster/libqb-0.14.0
-	sys-cluster/resource-agents
-	smtp? ( net-libs/libesmtp )
-	snmp? ( net-analyzer/net-snmp )
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-src_prepare() {
-	default
-	sed -i -e "s/ -ggdb//g" configure.ac || die
-	eautoreconf
-	python_fix_shebang .
-}
-
-src_configure() {
-	# appends lib to localstatedir automatically
-	econf \
-		--localstatedir=/var \
-		--disable-fatal-warnings \
-		$(use_with acl) \
-		--without-cs-quorum \
-		--without-cman \
-		--without-heartbeat \
-		$(use_with smtp esmtp) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		--with-ais
-}
-
-src_install() {
-	default
-	rm -rf "${D}"/var/run "${D}"/etc/init.d
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	if has_version "<sys-cluster/corosync-2.0"; then
-		insinto /etc/corosync/service.d
-		newins "${FILESDIR}/${PN}.service" ${PN}
-	fi
-}
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.24_rc1.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.24.ebuild
index 2b957bb10d39..2b957bb10d39 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.24_rc1.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.24.ebuild
diff --git a/sys-cluster/pacemaker/pacemaker-2.0.4.ebuild b/sys-cluster/pacemaker/pacemaker-2.0.5.ebuild
index 0d030893990e..0d030893990e 100644
--- a/sys-cluster/pacemaker/pacemaker-2.0.4.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-2.0.5.ebuild
diff --git a/sys-cluster/pacemaker/pacemaker-2.0.5_rc3.ebuild b/sys-cluster/pacemaker/pacemaker-2.0.5_rc3.ebuild
deleted file mode 100644
index 0d030893990e..000000000000
--- a/sys-cluster/pacemaker/pacemaker-2.0.5_rc3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-
-inherit autotools python-single-r1
-
-MY_PN="${PN^}"
-MY_P="${MY_PN}-${PV/_/-}"
-
-DESCRIPTION="Pacemaker CRM"
-HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker"
-SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="acl smtp snmp"
-
-DEPEND="${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=sys-cluster/cluster-glue-1.0.12-r1
-	>=sys-cluster/libqb-2.0.0:=
-	sys-cluster/resource-agents
-	sys-cluster/corosync
-	smtp? ( net-libs/libesmtp )
-	snmp? ( net-analyzer/net-snmp )
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.4-qa-warnings.patch
-)
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-src_prepare() {
-	default
-	sed -i -e "s/ -ggdb//g" configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	# appends lib to localstatedir automatically
-	local myconf=(
-		--with-ocfdir=/usr/$(get_libdir)/ocf
-		--localstatedir=/var
-		--disable-fatal-warnings
-		--disable-static
-		--without-cs-quorum
-		--without-cman
-		--without-heartbeat
-		--with-corosync
-		--with-ais
-		$(use_with acl)
-		$(use_with smtp esmtp)
-		$(use_with snmp)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-	rm -rf "${D}/var/run" "${D}/etc/init.d"
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-
-	keepdir /var/lib/pacemaker/{blackbox,cib,cores,pengine}
-	keepdir /var/log/pacemaker/bundles
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sys-cluster/placement/Manifest b/sys-cluster/placement/Manifest
index 4a060dbe889a..c172830c0ee7 100644
--- a/sys-cluster/placement/Manifest
+++ b/sys-cluster/placement/Manifest
@@ -7,5 +7,5 @@ DIST placement.conf.sample-4.0.0 26306 BLAKE2B 037ce73d52066fc2f2fe0542c10e3879c
 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 2790 BLAKE2B 3165ca6ae8a9954218b9891f9deb1d097ce795b036102a03349b08b9766c4c74ba071743f251073ac58c5d3be39ff72fc99f5dc38240bdbd106e521d43858f9a SHA512 49e4f3ae482c6a581dbe531d0238fb576c8475375490e3b51b38ec971081a1b0905ef9cb2d57e36da799c345053fbd87b7c32c0cc2d4c6ff8b353b1a7fd6f83d
+EBUILD placement-4.0.0.ebuild 2788 BLAKE2B 94306657e2060c1f19ea4220ee123fe79b7e251de0954a5bf8c56a7d1fcf46ff73e223be8d242c0cf0f41829ad9feb40561493b82c12d5b5941443ec7acf7f7d SHA512 3987bc996abe9691d77111a095cd02c346b7115e7b27426bfbe7e487ec8fbbef04177f19033f09596af1edc814ee082f314ff203f2d0d3d0f83f1a090e2da1e8
 MISC metadata.xml 590 BLAKE2B 52aa7d1deb487225f34afa59f668939abe56f4d377626b3cd6dc20c2c94fc1b104f2cac7047d7ba461c62c90515cd39e75b8a94d17a341dd8c549d6bdca6bee3 SHA512 188176cc3f839d3a53dbcaf38f74fc71f1c223f7e938bcc9627e71b2509b14e535647513a7c1bb2eb2d250a317b9e6f0ef906cf464e465697d5a26b4bb013f78
diff --git a/sys-cluster/placement/placement-4.0.0.ebuild b/sys-cluster/placement/placement-4.0.0.ebuild
index e54645cb04c1..5b83b21d629a 100644
--- a/sys-cluster/placement/placement-4.0.0.ebuild
+++ b/sys-cluster/placement/placement-4.0.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]];then
 else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/placement/victoria/placement.conf.sample -> placement.conf.sample-${PV}
 	https://tarballs.openstack.org/${PN}/openstack-${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	S="${WORKDIR}/openstack-${P}"
 fi
 
diff --git a/sys-cluster/sanlock/Manifest b/sys-cluster/sanlock/Manifest
index d8ed348f2180..022e0186f495 100644
--- a/sys-cluster/sanlock/Manifest
+++ b/sys-cluster/sanlock/Manifest
@@ -4,5 +4,5 @@ AUX wdmd.initd 261 BLAKE2B 65b393f2f084896d3c17aa0345f9930badeec7a3ee4cc7e47bd0a
 DIST sanlock-3.6.0.tar.gz 221666 BLAKE2B 7fe95bd6813c13b76993b343a5ad605c7ba642583987ffa5fef583f34c053ee62b0f9e5979f5b5cb9e4fcde53268ae3debc5ec36b04f6651cc4cb902dff52df9 SHA512 59eb2a6f12e95d54886fdf6d56fd9a6814dd20fe11f39664f2bb82a56326fee48c9465ae30e6d04f970c8f1b0d9c2e22b90d21ab1f657c6d6b61ff9f02332443
 DIST sanlock-3.8.2.tar.gz 266780 BLAKE2B 5248d08225bcc2a19594a3dcd3872c8c69ca8b217d31f6263f2717e4594180d4ba4685c9679ce2f31b6a2dcb4fe9f3e6a5dd5ac3ed073aea02599e7bbc04390c SHA512 2fa92e16eee4d2f3dac452400522f7e90b93b71349d322564d5957e2d87fb4bd69f0b5617b05f4b296c272d6da9a404fccadbbfff106354a0e302c436593eaac
 EBUILD sanlock-3.6.0.ebuild 2055 BLAKE2B ddf101be000bf9d0b081a50386bbd8947e025d8edb475457167cc460c4f3a44f9863d0a3db1720839d239da61b9b3925d8eb953a29029501281eb6e6873575c9 SHA512 1c651d40550f67858d4ff552f8cbeea125205396087cb2290e3b70d370a410fbdab29d7e2fc0da9d01593b59c29042080a463fff920601b37e5577a5cec125bb
-EBUILD sanlock-3.8.2.ebuild 2090 BLAKE2B d8eca28a2869f76a0817e27b26632517ba8634fbe97a41bd4b19978519a2560c4382869bf776f3995eda9e50e66ba027cbb1f2ac4887917cbe31bcb2fa54d8e2 SHA512 b5250d978145ce6fab960531b7945e1195d5d6cfc9b91d80726ebdc3ed07fe538aecc3751ca15d039c94ca331a23232168418dc7df7f2f50ff85baf988b75508
+EBUILD sanlock-3.8.2.ebuild 2083 BLAKE2B 7d00563aabe44f1e0e4c2b6867c690ef3a62a2de5e886fbd5084b4f85812e05d2cf3ba7100de6cb8909bc25fe050e526891d59f147848455bef7d84763d18e0f SHA512 b05328ad208a5ab3fd962725213dae33cbb050549f8f798ee101598bfa7d654d371c10b7e0f9d3ccb8f16ab644f16bd53ce9ae59acaf5de57afb750e75347bc1
 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 449fd2f3274a..7ddbde133ef4 100644
--- a/sys-cluster/sanlock/sanlock-3.8.2.ebuild
+++ b/sys-cluster/sanlock/sanlock-3.8.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2+ GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index c43b6c007aac..030cc2728a4c 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -4,8 +4,6 @@ AUX slurm.tmpfiles 31 BLAKE2B f08dbc53517cc15463be5264505d858fcf1f2196565868d164
 AUX slurmctld.initd 1842 BLAKE2B 25c9fd76dc888544888abb2790d8a0ae66254c0f8807bf48433a54fd34f49d2f4f95b5c6dd9e4ab1f40938c274be6be2e88cdb8959ecb12b4a86d07bc0a5bc86 SHA512 4356552630d1a154bbf369012c0315baf08b5b98ff6411d66ea3b1b039bfff5f105091b110e8fa1e64209eb0990038abda86d980cf2316ca97a5c10a43243df6
 AUX slurmd.initd 2001 BLAKE2B a0464ee0407406c7ceadd8e78f0229f5c6eda7081a691e24e609caa50f627d9bbf9c2d57bc6746b9c719a66cf2f4b0d756ecbbaf3bcd070846ad5ced6b289c9d SHA512 bb9447c25d2e96de1aea5935084ea78ea403701bd655d89d1a9d1d21bdbf88bdbae3888cfd618aabcc86dd8808401157ff84402ef35c4e138263457fd954046a
 AUX slurmdbd.initd 1717 BLAKE2B e177a937f8bd97bb2f45e479e0f34b23cc23ab44b0000165a856ff8476560638a567baecad8aa8d57aeb76062f248039da7f440ddca8f5827e4729136a10d7de SHA512 6d21f667f4222ab62dc8d7f648e00205da982612d58b98e8e35e6b6602b3ad31c03e5130402437c77d3677b424da7b5226e2bfa8c5d29bc908fd618fc02697a8
-DIST slurm-20-02-4-1.tar.gz 8689917 BLAKE2B 69d78b7f82065f7ca1c869c0648012cc23e746c81b1a76d612d96fe2c6c66cc2fc1727a1e164a0f6d338b568c45bb1ac78b815181325a3982957683b77ae60d5 SHA512 932989a3c03468783d244d9925472fb9bb4dd0007a91dccc37a3b12763ed81902ad0dc039b8527526bde58f7540d056727df4cdab7581182b028f67e597fb7d5
-DIST slurm-20-02-5-1.tar.gz 8690263 BLAKE2B dd05ea11cd59385135d8988b6490d3aea6aed9e487afb8e920fc5104408fb8b440c8e8af85732f888841d5d7f9a09e95e3df7cb91b5d0fa855ff9b2127265263 SHA512 3eaeee276453ab9aea4f0eb921e8172a912b86d59a93756fc0b83a8c08eeda04c9f3cf64a33d2eab0b8e8daefb19c0e0bfcb895a5aefb327eaf18ed4e216161d
-EBUILD slurm-20.02.4.1.ebuild 7988 BLAKE2B c95a6d86019b74668c7f3cdb46b0bddad929d438f6085b24edf4c44caf6c0a766251f05ebef3b77d675f5bab9e3c992185dea028d9d3334b3785f5b391b31cdc SHA512 ae6b7c18c32f217bc690ad53070e125e9259ba684e0683891f1ee61bb2b65189aad460e2eecca3fbc911a5abdabf83ba0b63fa3c1f56968c71bae2ad00983fa9
-EBUILD slurm-20.02.5.1.ebuild 7988 BLAKE2B c95a6d86019b74668c7f3cdb46b0bddad929d438f6085b24edf4c44caf6c0a766251f05ebef3b77d675f5bab9e3c992185dea028d9d3334b3785f5b391b31cdc SHA512 ae6b7c18c32f217bc690ad53070e125e9259ba684e0683891f1ee61bb2b65189aad460e2eecca3fbc911a5abdabf83ba0b63fa3c1f56968c71bae2ad00983fa9
+DIST slurm-20-11-0-1.tar.gz 8762691 BLAKE2B 1e24a04b3faf97f4df98bd982d67d47f79670b863f466326e45e00fac0b99124122e94e30054a97471e4337234cbd213806791bdd5b3bddfeb05bef55f42931e SHA512 9a57f2610f7294ba6cd265746b874e32a7930100f30c0adf41d95b261787c441bdcacaa641f0b9785150b94fc7d6b5b7608ec618f668bffcae6f774752f17678
+EBUILD slurm-20.11.0.1.ebuild 7764 BLAKE2B 252d3cb8c68645d40b1d0bfe28295d896985787c7b66213569f55ce39d40a2fbfdcac327963453e499948c11f81e9f278864a3174eb9fe3cf86bbe10b59af094 SHA512 3b69f91188cbd5cd436989c2f561c5cf553c2522c7fb46b072fd4b9e55f60f619a286f237f752f0c5072623989cbc7a5c89191a2b6d8144582219f1f1b7fc03c
 MISC metadata.xml 1199 BLAKE2B b52e7cae7554d439e7f25da2a80d98993d5c7f7abd5ba8b76c09bf60731b035040f976ac1bfc3c153f81b8feed89e2ceb5e6b676c25cc7b6219c4bcd87bd7e50 SHA512 8f48d582e61789373fc07ffd1db123cb8f43d337b03611972e480179ca5b43f2866392203f470d3d69784f2aae79cbcffdf583cba0aa4a9c25969f2c72a3f55f
diff --git a/sys-cluster/slurm/slurm-20.02.4.1.ebuild b/sys-cluster/slurm/slurm-20.02.4.1.ebuild
deleted file mode 100644
index 74a772b3b669..000000000000
--- a/sys-cluster/slurm/slurm-20.02.4.1.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/SchedMD/slurm.git"
-	INHERIT_GIT="git-r3"
-	MY_P="${P}"
-else
-	if [[ ${PV} == *pre* || ${PV} == *rc* ]]; then
-		MY_PV=$(ver_rs '-0.') # pre-releases or release-candidate
-	else
-		MY_PV=$(ver_rs 1-4 '-') # stable releases
-	fi
-	MY_P="${PN}-${MY_PV}"
-	INHERIT_GIT=""
-	SRC_URI="https://github.com/SchedMD/slurm/archive/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit autotools bash-completion-r1 pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT}
-
-DESCRIPTION="A Highly Scalable Resource Manager"
-HOMEPAGE="https://www.schedmd.com https://github.com/SchedMD/slurm"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl slurmdbd static-libs ucx torque X"
-
-COMMON_DEPEND="
-	!sys-cluster/torque
-	!net-analyzer/slurm
-	!net-analyzer/sinfo
-	|| ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 )
-	mysql? (
-		|| ( dev-db/mariadb-connector-c dev-db/mysql-connector-c )
-		slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) )
-		)
-	munge? ( sys-auth/munge )
-	pam? ( sys-libs/pam )
-	lua? ( dev-lang/lua:0= )
-	!lua? ( !dev-lang/lua )
-	ipmi? ( sys-libs/freeipmi )
-	json? ( dev-libs/json-c:= )
-	amd64? ( netloc? ( || ( sys-apps/netloc >=sys-apps/hwloc-2.1.0[netloc] ) ) )
-	hdf5? ( sci-libs/hdf5:= )
-	numa? ( sys-process/numactl )
-	ofed? ( sys-fabric/ofed )
-	ucx? ( sys-cluster/ucx )
-	X? ( net-libs/libssh2 )
-	>=sys-apps/hwloc-1.1.1-r1
-	sys-libs/ncurses:0=
-	app-arch/lz4:0=
-	sys-libs/readline:0="
-
-DEPEND="${COMMON_DEPEND}
-	html? ( sys-apps/man2html )"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-user/slurm
-	acct-group/slurm
-	dev-libs/libcgroup"
-
-REQUIRED_USE="torque? ( perl )"
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-LIBSLURM_PERL_S="${S}/contribs/perlapi/libslurm/perl"
-LIBSLURMDB_PERL_S="${S}/contribs/perlapi/libslurmdb/perl"
-
-RESTRICT="test"
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	tc-ld-disable-gold
-	default
-
-	# pids should go to /var/run/slurm
-	sed \
-		-e 's:/tmp:/var/tmp:g' \
-		-e "s:/var/run/slurmctld.pid:${EPREFIX}/run/slurm/slurmctld.pid:g" \
-		-e "s:/var/run/slurmd.pid:${EPREFIX}/run/slurm/slurmd.pid:g" \
-		-e "s:StateSaveLocation=.*:StateSaveLocation=${EPREFIX}/var/spool/slurm:g" \
-		-e "s:SlurmdSpoolDir=.*:SlurmdSpoolDir=${EPREFIX}/var/spool/slurm/slurmd:g" \
-		-i "${S}/etc/slurm.conf.example" \
-		|| die "Can't sed for /var/run/slurmctld.pid"
-	sed \
-		-e "s:/var/run/slurmdbd.pid:${EPREFIX}/run/slurm/slurmdbd.pid:g" \
-		-i "${S}/etc/slurmdbd.conf.example" \
-		|| die "Can't sed for /var/run/slurmdbd.pid"
-	# gentooify systemd services
-	sed \
-		-e 's:sysconfig/.*:conf.d/slurm:g' \
-		-e 's:var/run/:run/slurm/:g' \
-		-e '/^EnvironmentFile=.*/d' \
-		-i "${S}/etc"/*.service.in \
-		|| die "Can't sed systemd services for sysconfig or var/run/"
-
-	sed -e '/AM_PATH_GTK_2_0/d' -i configure.ac || die
-
-	hprefixify auxdir/{ax_check_zlib,x_ac_{lz4,ofed,munge}}.m4
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--sysconfdir="${EPREFIX}/etc/${PN}"
-		--with-hwloc="${EPREFIX}/usr"
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-	use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
-	use mysql || myconf+=( --without-mysql_config )
-	use amd64 && myconf+=( $(use_with netloc) )
-	econf "${myconf[@]}" \
-		$(use_enable debug) \
-		$(use_enable pam) \
-		$(use_enable X x11) \
-		$(use_with munge) \
-		$(use_with json) \
-		$(use_with hdf5) \
-		$(use_with ofed) \
-		$(use_with ucx) \
-		$(use_enable static-libs static) \
-		$(use_enable multiple-slurmd)
-
-	# --htmldir does not seems to propagate... Documentations are installed
-	# in /usr/share/doc/slurm-2.3.0/html
-	# instead of /usr/share/doc/slurm-2.3.0.2/html
-	sed \
-		-e "s|htmldir = .*/html|htmldir = \${prefix}/share/doc/slurm-${PVR}/html|g" \
-		-i doc/html/Makefile || die
-	if use perl ; then
-		# small hack to make it compile
-		mkdir -p "${S}/src/api/.libs" || die
-		mkdir -p "${S}/src/db_api/.libs" || die
-		touch "${S}/src/api/.libs/libslurm.so" || die
-		touch "${S}/src/db_api/.libs/libslurmdb.so" || die
-		cd "${LIBSLURM_PERL_S}" || die
-		S="${LIBSLURM_PERL_S}" SRC_PREP="no" perl-module_src_configure
-		cd "${LIBSLURMDB_PERL_S}" || die
-		S="${LIBSLURMDB_PERL_S}" SRC_PREP="no" perl-module_src_configure
-		cd "${S}" || die
-		rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs" || die
-	fi
-}
-
-src_compile() {
-	default
-	use pam && emake -C contribs/pam
-	if use perl ; then
-		cd "${LIBSLURM_PERL_S}" || die
-		S="${LIBSLURM_PERL_S}" perl-module_src_compile
-		cd "${LIBSLURMDB_PERL_S}" || die
-		S="${LIBSLURMDB_PERL_S}" perl-module_src_compile
-		cd "${S}" || die
-	fi
-	use torque && emake -C contribs/torque
-}
-
-src_install() {
-	default
-	use pam && emake DESTDIR="${D}" -C contribs/pam install
-	if use perl; then
-		cd "${LIBSLURM_PERL_S}" || die
-		S="${LIBSLURM_PERL_S}" perl-module_src_install
-		cd "${LIBSLURMDB_PERL_S}" || die
-		S="${LIBSLURMDB_PERL_S}" perl-module_src_install
-		cd "${S}" || die
-	fi
-	if use torque; then
-		emake DESTDIR="${D}" -C contribs/torque
-		rm -f "${D}"/usr/bin/mpiexec || die
-	fi
-	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
-	# install sample configs
-	keepdir /etc/slurm
-	insinto /etc/slurm
-	doins \
-		etc/prolog.example \
-		etc/cgroup.conf.example \
-		etc/slurm.conf.example \
-		etc/slurmdbd.conf.example
-	exeinto /etc/slurm
-	keepdir /etc/slurm/layouts.d
-	insinto /etc/slurm/layouts.d
-	newins etc/layouts.d.power.conf.example power.conf.example
-	newins etc/layouts.d.power_cpufreq.conf.example power_cpufreq.conf.example
-	newins etc/layouts.d.unit.conf.example unit.conf.example
-	# install init.d files
-	newinitd "$(prefixify_ro "${FILESDIR}/slurmd.initd")" slurmd
-	newinitd "$(prefixify_ro "${FILESDIR}/slurmctld.initd")" slurmctld
-	newinitd "$(prefixify_ro "${FILESDIR}/slurmdbd.initd")" slurmdbd
-	# install conf.d files
-	newconfd "${FILESDIR}/slurm.confd" slurm
-	# install logrotate file
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate" slurm
-	# install bashcomp
-	newbashcomp contribs/slurm_completion_help/slurm_completion.sh scontrol
-	bashcomp_alias scontrol \
-		sreport sacctmgr squeue scancel sshare sbcast sinfo \
-		sprio sacct salloc sbatch srun sattach sdiag sstat
-	# install systemd files
-	systemd_newtmpfilesd "${FILESDIR}/slurm.tmpfiles" slurm.conf
-	systemd_dounit etc/slurmd.service etc/slurmctld.service etc/slurmdbd.service
-}
-
-pkg_preinst() {
-	if use munge; then
-		sed -i 's,\(SLURM_USE_MUNGE=\).*,\11,' "${D}"/etc/conf.d/slurm || die
-	fi
-}
-
-create_folders_and_fix_permissions() {
-	einfo "Fixing permissions in ${@}"
-	mkdir -p ${@} || die
-	chown -R ${PN}:${PN} ${@} || die
-}
-
-pkg_postinst() {
-	paths=(
-		"${EROOT}"/var/${PN}/checkpoint
-		"${EROOT}"/var/${PN}
-		"${EROOT}"/var/spool/${PN}/slurmd
-		"${EROOT}"/var/spool/${PN}
-		"${EROOT}"/var/log/${PN}
-		/var/tmp/${PN}/${PN}d
-		/var/tmp/${PN}
-		/run/${PN}
-	)
-	local folder_path
-	for folder_path in ${paths[@]}; do
-		create_folders_and_fix_permissions $folder_path
-	done
-	echo
-
-	elog "Please visit the file '/usr/share/doc/${P}/html/configurator.html"
-	elog "through a (javascript enabled) browser to create a configureation file."
-	elog "Copy that file to /etc/slurm/slurm.conf on all nodes (including the headnode) of your cluster."
-	echo
-	elog "For cgroup support, please see https://www.schedmd.com/slurmdocs/cgroup.conf.html"
-	elog "Your kernel must be compiled with the wanted cgroup feature:"
-	elog "    For the proctrack plugin:"
-	elog "        freezer"
-	elog "    For the task plugin:"
-	elog "        cpuset, memory, devices"
-	elog "    For the accounting plugin:"
-	elog "        cpuacct, memory, blkio"
-	elog "Then, set these options in /etc/slurm/slurm.conf:"
-	elog "    ProctrackType=proctrack/cgroup"
-	elog "    TaskPlugin=task/cgroup"
-	einfo
-	ewarn "Paths were created for slurm. Please use these paths in /etc/slurm/slurm.conf:"
-	for folder_path in ${paths[@]}; do
-		ewarn "    ${folder_path}"
-	done
-}
diff --git a/sys-cluster/slurm/slurm-20.02.5.1.ebuild b/sys-cluster/slurm/slurm-20.11.0.1.ebuild
index 74a772b3b669..e74fe466f7ea 100644
--- a/sys-cluster/slurm/slurm-20.02.5.1.ebuild
+++ b/sys-cluster/slurm/slurm-20.11.0.1.ebuild
@@ -190,10 +190,6 @@ src_install() {
 		etc/slurmdbd.conf.example
 	exeinto /etc/slurm
 	keepdir /etc/slurm/layouts.d
-	insinto /etc/slurm/layouts.d
-	newins etc/layouts.d.power.conf.example power.conf.example
-	newins etc/layouts.d.power_cpufreq.conf.example power_cpufreq.conf.example
-	newins etc/layouts.d.unit.conf.example unit.conf.example
 	# install init.d files
 	newinitd "$(prefixify_ro "${FILESDIR}/slurmd.initd")" slurmd
 	newinitd "$(prefixify_ro "${FILESDIR}/slurmctld.initd")" slurmctld
diff --git a/sys-cluster/spark-bin/Manifest b/sys-cluster/spark-bin/Manifest
index 5c6c39c1eba1..624f3b8ede7b 100644
--- a/sys-cluster/spark-bin/Manifest
+++ b/sys-cluster/spark-bin/Manifest
@@ -3,7 +3,7 @@ DIST spark-bin-2.4.3-nohadoop-scala212.tgz 141465231 BLAKE2B e29b534076b981e3408
 DIST spark-bin-2.4.7-nohadoop-scala211.tgz 168360525 BLAKE2B 9a8728a1c7450166d4d9635ff1be6a65d57df1832945672e92044e0fc88ef152e7e870d02ec590378ea97a47d4a68568da73e6a1e92f8eaaaa06f495ed9939ad SHA512 ff75e6db3c4ca5cece2a8a26ad7bd8a2c1c46b4f93e8f2922a31e6a8d98274bedc66bef3e469e862d249c5439355ccca83687a20d536a8400f2c058be553df57
 DIST spark-bin-2.4.7-nohadoop-scala212.tgz 146775712 BLAKE2B f0381e6aebeae90990d5ad19d8db923efd01e9b215ddfe34e34a8272942e57fe7ec6a53208146006ba5c4e76f8e44d202e0715f63b559cc8749b523710b92a5f SHA512 708a702af5c754dba0137c88e3c7055d7759593f013798755468638b6fdc583a707aae4c2a4e14648f91c16b963f9bba9f8c44d28341c08c4512590a425f70a8
 DIST spark-bin-3.0.1-nohadoop.tgz 156390722 BLAKE2B 9ac4645759ca0ec6d1501dfa79d149b9cbf49dee1c4b9dcf38f62490d3ad91db01ad61d9d6b1ef4dd7bcb81a868cb58b9251575dded823c8415801d10571afee SHA512 07fc6df224f303ef53189e6082004400d51cd6c2244d1851d90eabbe58404a69ff980bffe147a5259a34190e1e1c974c72d02470d10a783d2d87f43a8da0850b
-EBUILD spark-bin-2.4.3.ebuild 1912 BLAKE2B 32179e648529a5ab5302d036ecfe3ed341bc14a9ab126cba569ca7702057bc99f613c371a2410f0ba66c6f8e40de40938d00e77d6f36135ea81d2604edee12ff SHA512 4e7e377935efa5fea31d48aa15dd9b918ce3794905d74890c44236df20f50bb6b49ee9de23d69953da4d3aa20ccf05150f8c933935c2e4beefd742a4647366b7
-EBUILD spark-bin-2.4.7-r1.ebuild 1912 BLAKE2B 32179e648529a5ab5302d036ecfe3ed341bc14a9ab126cba569ca7702057bc99f613c371a2410f0ba66c6f8e40de40938d00e77d6f36135ea81d2604edee12ff SHA512 4e7e377935efa5fea31d48aa15dd9b918ce3794905d74890c44236df20f50bb6b49ee9de23d69953da4d3aa20ccf05150f8c933935c2e4beefd742a4647366b7
-EBUILD spark-bin-3.0.1-r2.ebuild 1542 BLAKE2B 2e02f5f0951a23703d2519502a29eee109610d68037f8d73369d8b19fc3cb9f2cac783a77e14376f60b7acbd2485a1f0484794f5d846851176f0b697a0045764 SHA512 6ed6a9cfd211f04c9d2bff14f8e27c78b0cba015efde7a173414267b6334eb812bb175a83024e5e454720e77130214ba8e5e1a708639f21851f6c811bf5a629c
+EBUILD spark-bin-2.4.3.ebuild 1780 BLAKE2B 7a6683b78de9dc64e7ca6c9ad4f47b4a99ee45fea600b1cc1c034066d8310c0ff787bf255ea791d2e003bd0af99a811145ecb3308016d7cfc0a74c7cee5a244b SHA512 5857f946263aac1aea87c9c36043c8470f8981a2a0cf4ace53f4f83c54c147a2e690c8fb17217dfb4d0320198a218e9c3ce7acda5b54e5ab8aedee7c60e9dadf
+EBUILD spark-bin-2.4.7-r1.ebuild 1780 BLAKE2B 7a6683b78de9dc64e7ca6c9ad4f47b4a99ee45fea600b1cc1c034066d8310c0ff787bf255ea791d2e003bd0af99a811145ecb3308016d7cfc0a74c7cee5a244b SHA512 5857f946263aac1aea87c9c36043c8470f8981a2a0cf4ace53f4f83c54c147a2e690c8fb17217dfb4d0320198a218e9c3ce7acda5b54e5ab8aedee7c60e9dadf
+EBUILD spark-bin-3.0.1-r2.ebuild 1410 BLAKE2B 03148b1b46f5f3577230e85b4a312b27bd305d18060db84bea824d72903fbad5ee169db16ec82974e2fcd35961716842ae6ad9874ba83ac2c4ce9de6de2e9b74 SHA512 8d95f8129b55b3d6762c87e6da9a8991569c177af1c7207b800864ce34030cc44c14b3a04c538f8c741192c778868ea62b8efa91493c3e130fd5e32042169ad9
 MISC metadata.xml 674 BLAKE2B 8b9d5a6f5266d83bcb2f57738547d35347fb59f0e9d26c6368ef42a49ae92a911243430bfacdaf256012841f07f9a530ee28a59b0bd2a2e30a2511118644cc8b SHA512 a8b9fe7f3ab599508089cddcb3815d393b589c9d533ef51c13e0dc76aaf9a2889a7b2f1201ae03f7a1df38bfb9bf5feb5c1d029db885af6ba8707560b5e54abb
diff --git a/sys-cluster/spark-bin/spark-bin-2.4.3.ebuild b/sys-cluster/spark-bin/spark-bin-2.4.3.ebuild
index 99aa5cd404a1..68debb5ec8f3 100644
--- a/sys-cluster/spark-bin/spark-bin-2.4.3.ebuild
+++ b/sys-cluster/spark-bin/spark-bin-2.4.3.ebuild
@@ -43,6 +43,7 @@ src_install() {
 
 	local SPARK_SCRIPTS=(
 		bin/beeline
+		bin/find-spark-home
 		bin/load-spark-env.sh
 		bin/pyspark
 		bin/spark-class
@@ -53,9 +54,6 @@ src_install() {
 
 	local s
 	for s in "${SPARK_SCRIPTS[@]}"; do
-		ebegin "Setting SPARK_HOME to /usr/lib/spark-${SLOT} in $(basename ${s}) script ..."
-		sed -i -e "2iSPARK_HOME=/usr/lib/spark-${SLOT}" "${s}"
-		eend $?
 		dobin "${s}"
 	done
 
diff --git a/sys-cluster/spark-bin/spark-bin-2.4.7-r1.ebuild b/sys-cluster/spark-bin/spark-bin-2.4.7-r1.ebuild
index 99aa5cd404a1..68debb5ec8f3 100644
--- a/sys-cluster/spark-bin/spark-bin-2.4.7-r1.ebuild
+++ b/sys-cluster/spark-bin/spark-bin-2.4.7-r1.ebuild
@@ -43,6 +43,7 @@ src_install() {
 
 	local SPARK_SCRIPTS=(
 		bin/beeline
+		bin/find-spark-home
 		bin/load-spark-env.sh
 		bin/pyspark
 		bin/spark-class
@@ -53,9 +54,6 @@ src_install() {
 
 	local s
 	for s in "${SPARK_SCRIPTS[@]}"; do
-		ebegin "Setting SPARK_HOME to /usr/lib/spark-${SLOT} in $(basename ${s}) script ..."
-		sed -i -e "2iSPARK_HOME=/usr/lib/spark-${SLOT}" "${s}"
-		eend $?
 		dobin "${s}"
 	done
 
diff --git a/sys-cluster/spark-bin/spark-bin-3.0.1-r2.ebuild b/sys-cluster/spark-bin/spark-bin-3.0.1-r2.ebuild
index aa75467add18..9c34936b7ea9 100644
--- a/sys-cluster/spark-bin/spark-bin-3.0.1-r2.ebuild
+++ b/sys-cluster/spark-bin/spark-bin-3.0.1-r2.ebuild
@@ -32,6 +32,7 @@ src_install() {
 
 	local SPARK_SCRIPTS=(
 		bin/beeline
+		bin/find-spark-home
 		bin/load-spark-env.sh
 		bin/pyspark
 		bin/spark-class
@@ -42,9 +43,6 @@ src_install() {
 
 	local s
 	for s in "${SPARK_SCRIPTS[@]}"; do
-		ebegin "Setting SPARK_HOME to /usr/lib/spark-${SLOT} in $(basename ${s}) script ..."
-		sed -i -e "2iSPARK_HOME=/usr/lib/spark-${SLOT}" "${s}"
-		eend $?
 		dobin "${s}"
 	done
 
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index ca3c7b3b85ab..22abfe1eebaf 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -22,4 +22,4 @@ DIST torque-6.0.4-gh-20170829.tar.gz 6182495 BLAKE2B f9156ae4ffe388a7f3fa0df142e
 EBUILD torque-4.1.7-r1.ebuild 7455 BLAKE2B d05ed3f1431a21b1328b7ba83a46cac5b70345d90f53d5008e3287d4b00ef4032dbf644fb51e7f510ddda9b1de1d8ee7a04453c0277679362c7e637530f67808 SHA512 92e19691180517e59e4b5220c3f25819c0111193b609adea1bd1af90312f25279a417130f1a198af1de261bec876b77b63b7987efafb53c84fd7a9184f137dc0
 EBUILD torque-4.2.10-r1.ebuild 6088 BLAKE2B e43ee0a1add304630e8f559afac47c5d00f2fe39d6ab3d35465f1665d457895235f18852d4b239c5c4620f22cc50c95d9093fe2bcb04da29e851584fc33c0679 SHA512 705f761276af9ce4e4f524c63844f1cfe1081afb8da69262d8b0cb38f060d7975af915db20e905b60d73bd08ce8f3db0862c99bbf39efa1f401e1c5554b6e20e
 EBUILD torque-6.0.4-r1.ebuild 5518 BLAKE2B 563b14e5a08bb429c5c5f40939bf7363e6260323de70b674d78f6aef7b3a20aa30b40a18f5c191e3b7540af82ac9f6a710131d2438509b5aed045c1491984c65 SHA512 cc45836fbd08c5da09cf85aa087fe337c6db863d3aa75e429857478c9970c88ea18fa36e9e5e65559ea78d0bad5daf0a499b6b3ba92b872300b804a4c77f8849
-MISC metadata.xml 988 BLAKE2B 257e838c8bde7ceea876a84631c248fce2e3a347794459bbfd4ae23210c779f69e606e120438351783ebf1cdeab7bd5e5df196ee9af31306bebd6130a08bb46f SHA512 46f2eb41303c17e84aacf5b8548b645772ab923bf9a4847892260cc5c6aaf354acc0bb0128186acf312ed77a24d9429c97f18914d759c7c5c97c19ad62489a43
+MISC metadata.xml 875 BLAKE2B 5dc87d879d76aeabc191e39ed3732f7c4a114cd153a24a6d01fb8cfcb9b492a89a0241105f6e2f58b28f66a77632032d283499edeaed144abe6efd214eb038d8 SHA512 c317f81cd3df8549d58cc9216d9c2cff35b046efc1dac56b0dc22c5defc14f3fedbbc5ba3a4cdbb1c9561072222d90fe776c6e1a3e4bf11a135bb7e3bc408f95
diff --git a/sys-cluster/torque/metadata.xml b/sys-cluster/torque/metadata.xml
index ce0da419e927..6a4dba903d70 100644
--- a/sys-cluster/torque/metadata.xml
+++ b/sys-cluster/torque/metadata.xml
@@ -5,10 +5,6 @@
     <email>cluster@gentoo.org</email>
     <name>Gentoo Cluster Project</name>
   </maintainer>
-  <maintainer type="person">
-    <email>axs@gentoo.org</email>
-    <name>Ian Stakenvicius</name>
-  </maintainer>
   <use>
     <flag name="autorun">Enable the AUTORUN_JOBS codebase</flag>
     <flag name="cgroups">Enable pbs_mom to use linux cgroups to isolate jobs</flag>
author	V3n3RiX <venerix@redcorelinux.org>	2020-12-14 13:26:14 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-12-14 13:26:14 +0000
commit	6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree	25413d1cb3a0cbfe36029db32398c0f333609215 /sys-cluster
parent	9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)