gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /sys-cluster
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
167 files changed, 1613 insertions, 1707 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 05c63a3fbd7d..5ad15396110b 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 852dda22a2f6..1144272d1ab3 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -58,13 +58,13 @@ DIST ceph-12.2.8.tar.gz 77243685 BLAKE2B 37c34396a0c276b8d79735e14934ac70da02482
 DIST ceph-13.2.5.tar.gz 91006057 BLAKE2B 68551e2f54d78aff7b0e9ec3c62e6a3394dd7c23e80924a5b400cd9666a05a42e5f22445deee4040f1b78201c6a6660b283109878d4c92d845821bff831c8a5e SHA512 6daea524523f829e725609328ea71f416b2c3a9530fa8956720a7bc69dc08e55a169654f500704579dc9ba693f04eedd7e04614c0850e9ab1169cd45f19039f8
 DIST ceph-13.2.6.tar.gz 90808224 BLAKE2B cd7b4f4838eafc9dd580102cbb5247b86a153f90127f81355b556f32dbbacd2d7fb0144d15f99869a318a7148d2f50a9f995eb05aee056d7a5843830ede5702c SHA512 1e9c08d16b14447bf6b8bb72144e053aa9d5cf390bb4a6e878869e38895d3698073502fe9c4f8b775a3da872b920444bd01260105d3a839e53cf90cd27c6ab9c
 DIST ceph-14.2.4.tar.gz 116371380 BLAKE2B 2d2c78ec32a0749df16e9c527d2fd087a75daeb2ef26ac5f6aa641989eab62fa276eb320b873740e9eee3fd4f369da152c53c2389b1def1b6a45906ccc1bd1f1 SHA512 dc60321ed4dcaccacca711ab70c35011b5dfc6b8369016fb413a9976199ed4ba22c7dc87ba1ebaf1118513dee1a0c263c99ab137f27fc03c55e8a0625a3bdcc0
-DIST ceph-14.2.5.tar.gz 118629512 BLAKE2B d1e1e1a2981ab733a8233b6de504c626f9ee776f6a980de61c95b16c85d48f674c40b2013327ce4efb35a844b22a169f55500d45ae827d6fb42e9a5cbae87aea SHA512 38da62a38960d3618e2689f0e882785d4d95358b4a3b3b5b83e54e227cff9e69f4cca0b63d2d55d69e3916055818e6cf9067f2c2eddeb221ef4bc64a13cfa22b
-EBUILD ceph-12.2.11.ebuild 8025 BLAKE2B 0b7a0acd31afef011b05907332ecafd8ca72fe6d90244bcdfd879eb1b554a6293349b16638ad151052048019863ede89da0aa5024a6561c9016fab15f24f1778 SHA512 b6d0203fb1aec6ba62a2d7db6ee62794efab5389f4ac9a86cb4ad796f6f81985f8d8e107d55abfdc669a6beb55ecaeaa2e71d4283f3d93ee135803bc2d17293f
-EBUILD ceph-12.2.12-r2.ebuild 8390 BLAKE2B dbbf53017559230bfc03f4cf267e325e5c2c112657ced392c9ce93653fe796d2793b198150f24e8217c5b8c8a1fde750cb1ffa16cde2d5c990cd77e69001bfd8 SHA512 48e7f521c584aba6373f5e63c5769671cd016f0726fb30233b57c8a1598b01570fcee9765c3a58a6bdbdd92fe5c3bd8bf4e16aca340a47986c546624fb5c20d5
-EBUILD ceph-12.2.8-r1.ebuild 7886 BLAKE2B e99590739ce73d96895c282108d3b945bb0e13bdb73e34b06d2da5c9e7d74dc4fdceddfb6330a106b775c612c7cca6b67325b83389f1c6d5af712e59a6f1fd55 SHA512 ab8d2a1ee7c4a7d7179f81e18dc601a18da365663351d88cf6dfee32e2aaaf40412bc2fde98d7c07012f79f8b6c19bac773ef97b872a32b663748ce41a5954c1
-EBUILD ceph-13.2.5-r4.ebuild 9007 BLAKE2B fc84d7fee8572582743979cd3da76cdd337667843410f8efb167ec80442d006b6d4c1c947ffeeb9c6265c47116a6cf15a012f4277c619cb55ad942b0e95f6cdb SHA512 eec2780a80d98b3a535a33c86efaae4112605b8c6e220b61beb9956ece895a8807024fe71f86b626c89b3ca8af3b94a4c0e990c47e9951cc31490a90c1841ff3
-EBUILD ceph-13.2.6.ebuild 9133 BLAKE2B d5990d637edaa460b90eadc0b97c8952b2e7688c4916f0978bb15e9c2b99c206f3be5c2f57ded889393e5ba32fa63bf08a89138ea96a7045b6a47a3cd59d0381 SHA512 7a510c208b8b15fe124aafba24d25c0f181bc2ff61710d274e59c383f5d0a27ef83fbbd6b19e1020953887a0a4221769d88e8f75e720d0af3fa93ba5d9c50792
-EBUILD ceph-14.2.4-r1.ebuild 10019 BLAKE2B 2429f9e8a00619a84061448a90445913bb8134d203ad539a2f68d851de095ab5362eb99d8b10378fb7ef3f9ad3b8702d36135866f02c30df499b6094d9f89cac SHA512 fe643c2b3f36152b54fd843da858bac2103d762cb3928a57c7d63f64051a9859160906ce1dd61b5e9afe47029e8ec22c8f79808042ba721665624ea9fa151e26
-EBUILD ceph-14.2.4-r2.ebuild 9978 BLAKE2B a0a142590664d3ed04f3b6f87136bd6b2f234752b5d2264fd1acf64cf0fc243ce120b8986ee7f04ded668d775388493a67bf40fcb74f5bce5903c0cdda6c0bdc SHA512 a4182c04ebef5c5e64095e9a3f31a758b5021c08c3962e895b8cff0c561b6660810e9295f7ae1548f40e7025fd4ee9666a0d83891d3da2b3f0e150a48f0fec21
-EBUILD ceph-14.2.5.ebuild 10266 BLAKE2B 1e606a552c36dd59b63fc45e4e75a93d436b624832d809893e77687dcfab6eef7f1010b2906774d1ce1b6fc070a5378130aca710c3568a1a513222353900ae8a SHA512 fe7fac6fc97a123671ad91790ce248a11abb4d9d49a418a7bf8f2e24800431e280a3edbab8227df45e3c061e94501826353d6d13e1d822f68e2edd9c4828a39b
+DIST ceph-14.2.6.tar.gz 116645542 BLAKE2B 520a95a6a8190c694f59cc2b811fccf56f93bb2015042a8f10b793b053bc34601f865e4973663c8ab63dbaabe4394a91d9e42595d0a72dfec38ac091bb3de9d0 SHA512 b864a228deb3f8ec64fd17ed1b56b7e100332b9f94109eb31bfe4af24d50a615671a4389f02148e55852df01e7cc965b2baf56624ea89192bda34d79223f97fe
+EBUILD ceph-12.2.11.ebuild 8024 BLAKE2B d13386c796a8b4f1ca22a5d264eee716830f2ce7d28a3347fff890f1dc5ee970b648d77d7bed9c0f8dca1693dff63fac5ce9bc1ca0eae2ede6fbfaf310596447 SHA512 bdded5e6d15f7d8b5490a2001b6266358812e4d0a1f4d7754030acc14329b5a1c4328812bda77b1e444692d19a568159ba4e9e93b4858cd426d5ecf2c419a89b
+EBUILD ceph-12.2.12-r2.ebuild 8389 BLAKE2B 5a1c3794dbe1e1d9221a435ddb5c27cc6ffd781d29206af9a48575195b63d7e1228672eded10bdb7281ad26e6998f685992ee63af0ca3671047da57695322a57 SHA512 29d253cacb5053b3bb4c24a4579a8656fdaa295fb1d4009429d274d762cb69b935596d1c061c3b8c60f0dee31a8744d36a6ddeb2efa94b171e548ae28fd2c17c
+EBUILD ceph-12.2.8-r1.ebuild 7885 BLAKE2B 1812e67aee147263eb4b64a0516e8d9d180dcc28ff8d789515711cf7af534b915b80c570ad5bda2fa529e627f3e5ec37f5b75ae6d29fd0fc4268149d6a769f50 SHA512 0b9a69ffab5fa11bf98729e17cb104540f3dc11707dc6972b592e0d5230d569fa3f7c4eff024bbd8aa72635f5a696d9d4b5ce32203c7102a23d726c297600515
+EBUILD ceph-13.2.5-r4.ebuild 9006 BLAKE2B 81c6f45bcc9bc5ec911909085e0c706169c58f1c397b0af4fb8c47d6084638d39baaa1bd03ed42e3e2b8b3ff31adca81d0a30435b76c210464e7c5e1a0aec110 SHA512 3b074ea75b28eae5291d4a116151bbd1f1f33398506ff54495913574e7db3f0087459716e029ce360d9d4a00abe5f50896de6d6f397f64723cd6be0f69d1ffec
+EBUILD ceph-13.2.6.ebuild 9132 BLAKE2B c96a1067f6d8b6fcdb56992bbcfae324221d4519340bd16614e3b6413b0bb323c82a23b5f307172dd184253d9fe75c496e9a9a69c0980819ca0e7770ebdab2fb SHA512 75c7fb52373c4b387cf9640eb63a70593061e07177fcc6d641eb9aab11b9459ba962c83c97b1f052119c7ace8cb58c1db063ab6dc2393a483851f0d7dd4bf6bf
+EBUILD ceph-14.2.4-r1.ebuild 10020 BLAKE2B 237ddf9d4fa2adc02560d23fe486027135e27f3f3e5c185f4f5b4cff33dc79a0e6d89c13d374d4d387f674f2270de0df2d95c3884c0d6edc0619dbc5204a43c2 SHA512 cc41523a80884fb278fbab9172bc8ab4131a9c5e391494f612c0c48c3d95fe8f1dbbbf2f6619cbe2c4a7028c260991ef75174b16315f2fedbc161376c859b060
+EBUILD ceph-14.2.4-r2.ebuild 9979 BLAKE2B 97e37b42d542b325d245b4dfc188ecfbba3d46a99af69d8e26df82738f3e87e38140df73f3277f58df096844cb30a228d3ba7cedf62fb657985ecd7d92befd8a SHA512 b6deb72deafbfa386740294b032459e448fd3787d908673b2bbcf1695950bbb27b68dfbf914bc413356bb463332bce17ab47fa675fee0c9c5fd00320bdbf1197
+EBUILD ceph-14.2.6.ebuild 10274 BLAKE2B 583d9cf0f649b253fdc7f7b8c26b65013445aee480a6262d5923f2e4b5725996aff0401994fda80d4a5708c79345ed334463bacae908ad38d442676a17db77db SHA512 63b13abe4e821fb39735dacdd93c6751e102ec2bfb3dbbc19138b43153fd64ac9b4cf8af4b114f911cfcb646a0f56532c8677d6049c43e5570f379e3c7a49888
 MISC metadata.xml 1662 BLAKE2B 0d2b5697ff30ba38b9fff57fc08c0339d481e852a1ec54561214594d6fa6ddc6aa1bcd9adabe24bd1da39da9b9b66ff9cca1c30cae5a0d3b4259cb80673638e3 SHA512 95d94f98a016a1c04ed65cbb2710b07984bc2db428c4e54fed3ab35eda6c5e4db6f7a4d273772cffbbe6ad331a8257247cc359e1814bd418eeb4f0952858c945
diff --git a/sys-cluster/ceph/ceph-12.2.11.ebuild b/sys-cluster/ceph/ceph-12.2.11.ebuild
index 7c67f5867f62..a8235f1875ee 100644
--- a/sys-cluster/ceph/ceph-12.2.11.ebuild
+++ b/sys-cluster/ceph/ceph-12.2.11.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 DISTUTILS_OPTIONAL=1
 
 inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \
@@ -36,7 +36,7 @@ COMMON_DEPEND="
 	virtual/libudev:=
 	app-arch/bzip2:=[static-libs?]
 	app-arch/lz4:=[static-libs?]
-	app-arch/snappy:=[static-libs?]
+	app-arch/snappy:=[static-libs(-)?]
 	app-arch/zstd:=[static-libs?]
 	app-misc/jq:=[static-libs?]
 	<dev-libs/crypto++-7.0:=[static-libs?]
diff --git a/sys-cluster/ceph/ceph-12.2.12-r2.ebuild b/sys-cluster/ceph/ceph-12.2.12-r2.ebuild
index 5c5c01140856..0cbc23413818 100644
--- a/sys-cluster/ceph/ceph-12.2.12-r2.ebuild
+++ b/sys-cluster/ceph/ceph-12.2.12-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 DISTUTILS_OPTIONAL=1
 
 inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \
@@ -36,7 +36,7 @@ COMMON_DEPEND="
 	virtual/libudev:=
 	app-arch/bzip2:=[static-libs?]
 	app-arch/lz4:=[static-libs?]
-	app-arch/snappy:=[static-libs?]
+	app-arch/snappy:=[static-libs(-)?]
 	app-arch/zstd:=[static-libs?]
 	app-misc/jq:=[static-libs?]
 	<dev-libs/crypto++-7.0:=[static-libs?]
diff --git a/sys-cluster/ceph/ceph-12.2.8-r1.ebuild b/sys-cluster/ceph/ceph-12.2.8-r1.ebuild
index 9a0d16e9f3ae..1d48087d0c84 100644
--- a/sys-cluster/ceph/ceph-12.2.8-r1.ebuild
+++ b/sys-cluster/ceph/ceph-12.2.8-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 DISTUTILS_OPTIONAL=1
 
 inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \
@@ -36,7 +36,7 @@ COMMON_DEPEND="
 	virtual/libudev:=
 	app-arch/bzip2:=[static-libs?]
 	app-arch/lz4:=[static-libs?]
-	app-arch/snappy:=[static-libs?]
+	app-arch/snappy:=[static-libs(-)?]
 	app-arch/zstd:=[static-libs?]
 	app-misc/jq:=[static-libs?]
 	<dev-libs/crypto++-7.0:=[static-libs?]
diff --git a/sys-cluster/ceph/ceph-13.2.5-r4.ebuild b/sys-cluster/ceph/ceph-13.2.5-r4.ebuild
index 20ba0bcb3c92..80e50f0f5072 100644
--- a/sys-cluster/ceph/ceph-13.2.5-r4.ebuild
+++ b/sys-cluster/ceph/ceph-13.2.5-r4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 DISTUTILS_OPTIONAL=1
 
 inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \
@@ -37,7 +37,7 @@ COMMON_DEPEND="
 	virtual/libudev:=
 	app-arch/bzip2:=[static-libs?]
 	app-arch/lz4:=[static-libs?]
-	app-arch/snappy:=[static-libs?]
+	app-arch/snappy:=[static-libs(-)?]
 	app-arch/zstd:=[static-libs?]
 	app-misc/jq:=[static-libs?]
 	dev-libs/crypto++:=[static-libs?]
diff --git a/sys-cluster/ceph/ceph-13.2.6.ebuild b/sys-cluster/ceph/ceph-13.2.6.ebuild
index 18241357036d..4ad98dad1112 100644
--- a/sys-cluster/ceph/ceph-13.2.6.ebuild
+++ b/sys-cluster/ceph/ceph-13.2.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 DISTUTILS_OPTIONAL=1
 
 inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \
@@ -37,7 +37,7 @@ COMMON_DEPEND="
 	virtual/libudev:=
 	app-arch/bzip2:=[static-libs?]
 	app-arch/lz4:=[static-libs?]
-	app-arch/snappy:=[static-libs?]
+	app-arch/snappy:=[static-libs(-)?]
 	app-arch/zstd:=[static-libs?]
 	app-misc/jq:=[static-libs?]
 	dev-libs/crypto++:=[static-libs?]
diff --git a/sys-cluster/ceph/ceph-14.2.4-r1.ebuild b/sys-cluster/ceph/ceph-14.2.4-r1.ebuild
index b56ddd9c3f0c..090dba354716 100644
--- a/sys-cluster/ceph/ceph-14.2.4-r1.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.4-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 DISTUTILS_OPTIONAL=1
 
 inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \
@@ -35,7 +35,7 @@ COMMON_DEPEND="
 	virtual/libudev:=
 	app-arch/bzip2:=[static-libs?]
 	app-arch/lz4:=[static-libs?]
-	app-arch/snappy:=[static-libs?]
+	app-arch/snappy:=[static-libs(-)?]
 	app-arch/zstd:=[static-libs?]
 	app-misc/jq:=[static-libs?]
 	dev-libs/crypto++:=[static-libs?]
diff --git a/sys-cluster/ceph/ceph-14.2.4-r2.ebuild b/sys-cluster/ceph/ceph-14.2.4-r2.ebuild
index a2be80d3d7c7..23ee9e9a9bca 100644
--- a/sys-cluster/ceph/ceph-14.2.4-r2.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.4-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 CMAKE_MAKEFILE_GENERATOR=emake
 
 DISTUTILS_OPTIONAL=1
@@ -39,7 +39,7 @@ COMMON_DEPEND="
 	virtual/libudev:=
 	app-arch/bzip2:=[static-libs?]
 	app-arch/lz4:=[static-libs?]
-	app-arch/snappy:=[static-libs?]
+	app-arch/snappy:=[static-libs(-)?]
 	app-arch/zstd:=[static-libs?]
 	app-shells/bash:0
 	app-misc/jq:=[static-libs?]
diff --git a/sys-cluster/ceph/ceph-14.2.5.ebuild b/sys-cluster/ceph/ceph-14.2.6.ebuild
index 95bdb0d89fbc..ac597f52a5fd 100644
--- a/sys-cluster/ceph/ceph-14.2.5.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 CMAKE_MAKEFILE_GENERATOR=emake
 
 DISTUTILS_OPTIONAL=1
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
 fi
 
 DESCRIPTION="Ceph distributed filesystem"
@@ -39,7 +39,7 @@ COMMON_DEPEND="
 	virtual/libudev:=
 	app-arch/bzip2:=[static-libs?]
 	app-arch/lz4:=[static-libs?]
-	app-arch/snappy:=[static-libs?]
+	app-arch/snappy:=[static-libs(-)?]
 	app-arch/zstd:=[static-libs?]
 	app-shells/bash:0
 	app-misc/jq:=[static-libs?]
diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index 0250d9a15482..bfe29300a4e7 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -4,8 +4,8 @@ AUX charliecloud-0.9.10-fix-hardcoded-gcc.patch 708 BLAKE2B 78b73bf527f7d9be0aa9
 DIST charliecloud-0.10.tar.gz 301083 BLAKE2B be0c650bebc12fd047b1afc61588b4b9cfc0d0addfddb808765d8e125c70329d6c06a86144b4167e5abaf64392ad1891319aabd2ba8fb528de2d9789d040fc0c SHA512 681e2f30f730b42b55b4097dba78e41924b17990354b866e04e09e6d2e4bb584211c130f9a04619dcdd38f2a3eaaad7615ee5ec20a266ee2332b0a512492331f
 DIST charliecloud-0.9.10.tar.gz 275687 BLAKE2B e03c3358dd4e5eb88f9c5a3002366c79563e15d5d7792dd55f2800a001b847c13443fce0689a850aa7e6a0aa510c3f6b53d93a88a6f79326eac27acc9cbe2c57 SHA512 93a6f0c6bcceb54fabbc179b960a0d03f1b3547786ce8d502552ddc571475ea2110d6aa290ce5c245be6e2c7cdc47d3f23ff7e74558f684b4a27358aa0971a61
 DIST charliecloud-0.9.6.tar.gz 205380 BLAKE2B 2e95f5486ea6d2306512378290cd29114bc688717741436ae9cc8c1dd2679c22ab21059574d62222cd14063bacecc6a7005b216cd9e2ed01fe1593a3b69871b0 SHA512 55af3e57ef6c2b81ae10bd50d149872af50d508392b271bdaa75cf3b655659ec7da5016a9deeea15aaa20e265e8066d1ed982c122cb5e62ee6d47f25d367410f
-EBUILD charliecloud-0.10.ebuild 1514 BLAKE2B 46d8d2699fd8019f4aa9d72310607d2d77b97b1abd7e2b58a045cf6c6c6bff3ba3475c4be17f70b4a49a49b7f38b08ef87d801c34458923514a29f3b1f92e0d5 SHA512 b36cd40e8b3444d3d025f3672292cc82e0712001ac6bc774f9fbcc21ffff759be795aa309009ee590a9bb1855533c8a113a94e37ec2940bd23bb4f15f7ca3689
-EBUILD charliecloud-0.9.10.ebuild 1509 BLAKE2B 13fcc75ca82b10e34d44e93927ca79586d01e8f6c84bd3a6a109ee2be4ace68a8e85328e99b01eaaef20d66f595998eb540c387ab2d0d4be2db2d2f6a81ddbd3 SHA512 1c4975683bb9ec0e0762c1fcc1600177f80c4b7040b4d51e3c3f5b99dc480b6611cb725d8f21975bd63e51fbc97700d5152db4df6aaa84068e8fc1ed508dabb9
+EBUILD charliecloud-0.10.ebuild 1512 BLAKE2B 786ab44a7afdecfd9ed124bf15d464336090bf2550e40fae5446591f5fc205f77f35ee6515c21cebbf9750438472267a32e7036f726a54930ab8b40fb5e12990 SHA512 32209c6cd04145740ea14f21a902b5fd2ae0d685e9b9e01defbf10f11e61dcdd2537fc6c13a79302d39668208793f8dfe8b7f0091cd4922f6d38855bfcbfabd1
+EBUILD charliecloud-0.9.10.ebuild 1507 BLAKE2B 9a6d834c063198c140d30d7f39f28f429ca8720dbb882bc5fb920e7bda1c90c7469f73164335bd9f44bfa38be89507e4a9bf5a4f0c4a05b4efd3ae205515539f SHA512 dbf662098d89e8019e6bfff2876a49cd453cfbac484d192b0f1f33ea571f54e7b8404e85d959a8b4aa5e7c50a5a296bc03065a6a43c55ef9055c447406a2502d
 EBUILD charliecloud-0.9.6.ebuild 1502 BLAKE2B b7dee3131b106eaa6ef4ec023339efcf33b24d9e684e0f3b0b9e246676f4868394e6a4a7e23cb66296c355de32cee0cc2425c8ca7241a3743787849bfdf80f4b SHA512 ad33df1b66ffab1b882b5799c89df2f03a3458c0bfc5e172eed3da9f37490db535c447ba9e4b177bdb747b43e3b042b9f88fac5021d7a1356bd70f32d1d18344
-EBUILD charliecloud-9999.ebuild 1381 BLAKE2B c3e7bafafd5609f776860129a62e021f275272772319dc1a5c8252ea8541ad11c9cc1e3e27a2685f282a10c3d91783d7526ffdfb0b77245ca6f05af4f3f11975 SHA512 d56ed1c9a737f0bb864f4c8b99c17df70a92c64c435eac3109dae5c9f4a1c2d0a4abcf1285fe5d8f17b43144087138b9e95cb0283e2288298750fd4e8a1ca840
+EBUILD charliecloud-9999.ebuild 1379 BLAKE2B f020986c8158d6575b0431027aad64626306048d1df6373facd3177a71a6da7dd96a852fcd45e8c63d68c2e13bde38f3f1a853c03f07ef30cea20b5ba1002f72 SHA512 d2a449c6317b29ecb98733bbddfec19f54ea46971fa6df16d9129f12bdadf0cb858da1766ab5f2fd7ebe4a73b80693f7c168a5d26fb78ff787444749f1df620d
 MISC metadata.xml 782 BLAKE2B 8eb3cbbd39486b78ffaf3b932804536d900cbbded17dc41437bece7f47f6edbe8fe76d99b695f220c7477356e93ffad16a137a902a026ded8ab5098b7a44ade6 SHA512 775f7de9e4f296a5d13bf66df50b935866d4ca87b2d13678ba03ee5ee72f2740d17c9c2ba69e221efef7ca4038129d7704f1e13c738227e87cd7b869cd7d63db
diff --git a/sys-cluster/charliecloud/charliecloud-0.10.ebuild b/sys-cluster/charliecloud/charliecloud-0.10.ebuild
index b5e0b1e21ce3..8705c0ed4ae3 100644
--- a/sys-cluster/charliecloud/charliecloud-0.10.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit python-single-r1
 
diff --git a/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild b/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild
index fe9cc07e931a..d86e0f7345fe 100644
--- a/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit python-single-r1
 
diff --git a/sys-cluster/charliecloud/charliecloud-9999.ebuild b/sys-cluster/charliecloud/charliecloud-9999.ebuild
index dae07ff3e273..4b1d34753150 100644
--- a/sys-cluster/charliecloud/charliecloud-9999.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit python-single-r1
 
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index af8f93e2daac..68b3d70403a7 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -2,17 +2,23 @@ AUX cinder.initd 494 BLAKE2B f919de45b8e39b65d355f627fcd71a4c23a7bb550157d25811c
 AUX cinder.sudoersd 86 BLAKE2B 1ea49d3cf3bc134ea0a2d5512c6e258f117187267bfa408fea0d2449a091068e5404812a0e693f226d895ec23766ed73aca36128d6f7b968ae44dc38b8ad948a SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1
 DIST cinder-13.0.7.tar.gz 5477179 BLAKE2B 210abb3b1e961eae43edb598deaeddee8ac2ff948519cacf8410d42d306b7e3476e46ecd0acc9392453647ca886bea512c5b7c48f8ae83e2ddf012c4556a8d18 SHA512 4ae3939b5b43ede09d36aeafc623baa4b2dd55b801b22d95230ff3fa2130c84cd2891351d14caf5516982294fcbcab7fd5f4f59a63e8e46e63d5493ba94f9d98
 DIST cinder-14.0.1.tar.gz 5504153 BLAKE2B 1f895cd93a433e93907e5c8eb69675084f3d2f4f3fd5e605e1bbc505795bd853bca15acc1e6af86a0dea88063e9ee5d95dad17dc62abf2ee2a8a4db8efe962b3 SHA512 f2ba53f67fe15216c4f7296fbf5135e9289ead41e6ca94d1b9a003d21000cf0b178c156b100868796c6f36a4bb2bc1cf081fca5c30e6d4cc3ee36d396a3d53f3
+DIST cinder-14.0.3.tar.gz 5517381 BLAKE2B 2a7391e8e0d36b7857b528a6059ded753ecd70de4d270803cb72c84279df1a465b79a56fbbdcb89e89efdb8b9f27936124ec4b6418b7e5fb802836182ecb4aaa SHA512 5dcf0e51f068171e1657a0ebf1b416dcb3a7f9c988ea41ab745b7acfa0ea21265e06b91bd54bd065c0172580022bd28e99ef5388ac5480ea4c1ef579b1a443c9
 DIST cinder-15.0.0.tar.gz 5515047 BLAKE2B c7b62dc424bda2a86b9369f283fae4d891f55922228dc2c05206cee67bb7553b75b98e86f8d90035d0566baddad28a76aa4ca454fb4e003eaff346d2bb49a699 SHA512 f80705782976ec778681ef65f5da79ee2028a8dccbe9a14150b3577354882beedbde73f562b40ec395427e23766688299e07bf173476627c579bc812eec065fa
+DIST cinder-15.0.1.tar.gz 5516811 BLAKE2B 081b3a6175303c783ff23122d409814812fdab2a7955174cd90b57ea62c055c1e39936d8e8a38e21fc2820e7069e0afc91fa46a490f539f518f33302067b4acd SHA512 7a63f25bcd6beedc60bb4a6b976d8b1f862b445a6d858e2fbbf53f4ff425d8bee094af354883a46c6226349d7557d45a649cd745e79a445e32b759b24294116f
 DIST cinder.conf.sample-13.0.7 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
 DIST cinder.conf.sample-14.0.1 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
+DIST cinder.conf.sample-14.0.3 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
 DIST cinder.conf.sample-15.0.0 183153 BLAKE2B fb86b82c711568c89a445c5876a1d5e890714d4dd957d4aa5b3158a3c85150e75d8d0055a93bf6a937d8a6f5a3c4042c5ddb4b4da2dd006d77d8eb8ec8a19fc5 SHA512 95a2076970184bc34c9c293371f72a791f16600c4933572b8d51291c506a7c1ef3bd2ea185f1f4dafeff6c85a237f4453f8ee6c1df6af7f603afe1ddfd63cd3a
+DIST cinder.conf.sample-15.0.1 183153 BLAKE2B fb86b82c711568c89a445c5876a1d5e890714d4dd957d4aa5b3158a3c85150e75d8d0055a93bf6a937d8a6f5a3c4042c5ddb4b4da2dd006d77d8eb8ec8a19fc5 SHA512 95a2076970184bc34c9c293371f72a791f16600c4933572b8d51291c506a7c1ef3bd2ea185f1f4dafeff6c85a237f4453f8ee6c1df6af7f603afe1ddfd63cd3a
 DIST cinder.conf.sample-2018.2.9999 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
 DIST cinder.conf.sample-2019.1.9999 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
 DIST cinder.conf.sample-2019.2.9999 183153 BLAKE2B fb86b82c711568c89a445c5876a1d5e890714d4dd957d4aa5b3158a3c85150e75d8d0055a93bf6a937d8a6f5a3c4042c5ddb4b4da2dd006d77d8eb8ec8a19fc5 SHA512 95a2076970184bc34c9c293371f72a791f16600c4933572b8d51291c506a7c1ef3bd2ea185f1f4dafeff6c85a237f4453f8ee6c1df6af7f603afe1ddfd63cd3a
-EBUILD cinder-13.0.7.ebuild 7834 BLAKE2B 67a273b75ccdf707409f9a5b997e15c7df8578113ba02134f257c67bfc1b3e3c7baa29f210b883dca6b709357f4609e7795f0941efb5be6366bef54466e67a7c SHA512 934c690db97b57e736d92dda6e2de5f9a9b212877c63efa4d327072d03bf7f5f7c4b12c37abdbc1539915dc42ebdd9c744879193000c96b864e2ff7c4b80ab88
-EBUILD cinder-14.0.1.ebuild 7843 BLAKE2B e99b355da949938da146f6e29afcbcb7e8d92f72b0126b7380c6fbb3b341e94c0db6d9a3885b09e589f86dfcfb640f96adfb5807e04654a3f8f5faa0eee4f28f SHA512 f8bbdff8e7c9370a959d735a7ddae83de181a50987548f458c3d8aeee16f29068603901f05b8f86467085ed12d7655a4ac1a368cfed482951a5d3de7987a6c38
-EBUILD cinder-15.0.0.ebuild 7864 BLAKE2B 8545b70308823527777f007b50fa4779162fb1755cc3303269f33ca15ab60a0b8015275ea38812350fee5346a9efb32a9f848facb5f878e6456ef828622cdbb7 SHA512 8eafaf741b22ae68be4743a3037f9a8bf6959966c449d486a56cec59379df76487b18c1f13699b76de0154d87238405d6fe09e10a395709f90a6dd18d92940d4
-EBUILD cinder-2018.2.9999.ebuild 7836 BLAKE2B fafa9cab1f7e35134dfc9c5462076bc97c68a3794f919680e26e1a98104f4e35ce5837460cba74359f749e4b267c7642384a1576c6c8887edd96bc39e8aada39 SHA512 29f8ac4b4d0e729f5dbad2bb3a6171a3524c0dad292eef0e82756f47ae31b4a9b9e2051de83172b1d6d5bfb1b17f892feabadc302ae9da8b14488c7e15b76242
-EBUILD cinder-2019.1.9999.ebuild 7845 BLAKE2B 0d6cba4f3a37638de3ada1a975c0cefab02c19b3e821d9490508c42e54afc29685cda5d475b37bf18d0b8c98d42e0d81b30239f05589bad1cac8fae55d877fce SHA512 94365953b649436baf469142506ee818dd4f75aa1e0730023ffea8c8a2d9469ca12cb779f716b311869b3ae580fec8035518f5913a8991b2f2d7c044e7e50b80
-EBUILD cinder-2019.2.9999.ebuild 7919 BLAKE2B f3c09027afd86b675331068bd322ea1526ffbfbc7e1abf35987064462dd2455c4abec24b220c6fd56e7b6355f96979c03e710791195aa4aa5903afc41ba24d9f SHA512 8ccc6da7d18201bbb9e65d6c5f3bd7e61223b85654408fb89278681a3b71ab1f29e917d4a6d0d6187965090d18f2af938d15c5e42cb27de93453b31fdf6fce5d
+EBUILD cinder-13.0.7.ebuild 7767 BLAKE2B 0d4667dfb48d674f20c8d8f17f49a79f65ce7c16c248610fa85e083ce7d6161d8f24bbe11f14a695cc1b161e29854494082338be6ca1b5c0612e195814ad542c SHA512 fe20c1e8e9522cc8c2b55b7d675761a3edc74735185b4f0a5a06a2ff170418a319b214f22dfeece3eb6d61e979fe606b2df7bfdf43aec8c649fa59f2670c55c7
+EBUILD cinder-14.0.1.ebuild 7778 BLAKE2B 6e56d10ec661543cbde67d791002089e3bbaac26dc86e720e7cc48daf6ff49cbdab074b75c1684df408a9552e89610143f496082fd4dcdbbcb2749daaa84261a SHA512 d8a8e7b85b050300943760d84bbc2aa6452c16d4e3910fbb63569c36a744226bd0d82f872748e0b498bddbee569d414e17d7cbd0c17bbb7a76aa1bc0261136ca
+EBUILD cinder-14.0.3.ebuild 7780 BLAKE2B f35f477ce749e9fda504ce63fa7369053c75786ca22d49c9e4d73d14eb872390098a85622b5cded582f018e0505685f043f2e23db2c789dfc549618504aab58b SHA512 457979a4f8f7e7a7d6140b666849d96a443361736c6133feb943b5fa7aca6f7346fcacd8c5c11e737fc990b43e0963d0d2f38e18c1e824256e244d67f886e174
+EBUILD cinder-15.0.0.ebuild 7778 BLAKE2B 5019af30bc8b195694bb1c3d0a85f1636466ffe680daf3464097feb8dd4a95b34f0bd02d81543c185942c5f35ced18a71c530de69e413b5f3b780c7758203439 SHA512 a9589470aa830ec490ec66cc69156fbf3a6f6a383736ada769c524b3b5fb413d2a3f337d19ef9d7e3412a4e1dc58bbbd96c61d7c8d24a92de087ebd156507d02
+EBUILD cinder-15.0.1.ebuild 7780 BLAKE2B 1468810068a386b70a3622e39c65e1161034d5a80a024b74c913d9cbf9657073abe86122f53112ec0af97ca70278788ca4639c7209002cd1a1e41daddba03c91 SHA512 856bfa4fd74f451a7ed0b9a4ad2cf163b1c1b2bc8435c9b9fe549b8cbe68d51984ebc66856b03e4cd827f19f57aeec5607df6f6cd7f8f81870984e189b42ea8e
+EBUILD cinder-2018.2.9999.ebuild 7769 BLAKE2B 8bdbeab2a0713099f8a879f86309d33f7d9a7deb277ad067949fe51e688e3a079bc690326f4ad2d5a4ac53127447c07950051859d9b84a2776a52a60b31d83ee SHA512 dbf2145af24094e696744108b2f1d9a67c9d07a5c486f0818ea4ff6d5436a5f7e9ed575bc4f79fc53db5859651c6cb2dd51432c8ad9bc954e8f8576b1df7941f
+EBUILD cinder-2019.1.9999.ebuild 7780 BLAKE2B f35f477ce749e9fda504ce63fa7369053c75786ca22d49c9e4d73d14eb872390098a85622b5cded582f018e0505685f043f2e23db2c789dfc549618504aab58b SHA512 457979a4f8f7e7a7d6140b666849d96a443361736c6133feb943b5fa7aca6f7346fcacd8c5c11e737fc990b43e0963d0d2f38e18c1e824256e244d67f886e174
+EBUILD cinder-2019.2.9999.ebuild 7780 BLAKE2B 1468810068a386b70a3622e39c65e1161034d5a80a024b74c913d9cbf9657073abe86122f53112ec0af97ca70278788ca4639c7209002cd1a1e41daddba03c91 SHA512 856bfa4fd74f451a7ed0b9a4ad2cf163b1c1b2bc8435c9b9fe549b8cbe68d51984ebc66856b03e4cd827f19f57aeec5607df6f6cd7f8f81870984e189b42ea8e
 MISC metadata.xml 1244 BLAKE2B bac3f4931079ae89c48d66ed2fe689978fcf609638ade7b26d8f07ffbd6562d7c4a16b42dec4390654747c6d2dfcb92b73d27c90356f1928199469d42432ef69 SHA512 fda201e6974bb0af9c24c1384a3bb2dd0a0c630439d7f1955de336f53804070a68426919fd4dc6f864d502c7e9e99a80d1920c740b6dc179f7b46c7f7fb7aef9
diff --git a/sys-cluster/cinder/cinder-13.0.7.ebuild b/sys-cluster/cinder/cinder-13.0.7.ebuild
index 4c8eb939d671..f114067cadf8 100644
--- a/sys-cluster/cinder/cinder-13.0.7.ebuild
+++ b/sys-cluster/cinder/cinder-13.0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1 eutils linux-info user
 
 DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
@@ -38,7 +38,6 @@ RDEPEND="
 	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
 	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
 	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
-	dev-python/enum34[$(python_gen_usedep 'python2_7')]
 	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
 	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
 	>=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
diff --git a/sys-cluster/cinder/cinder-14.0.1.ebuild b/sys-cluster/cinder/cinder-14.0.1.ebuild
index fda10c627766..cb31be555adf 100644
--- a/sys-cluster/cinder/cinder-14.0.1.ebuild
+++ b/sys-cluster/cinder/cinder-14.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 eutils linux-info user
 
 DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
@@ -36,7 +36,6 @@ RDEPEND="
 	${CDEPEND}
 	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
 	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
-	dev-python/enum34[$(python_gen_usedep 'python2_7')]
 	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
 	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
 	>=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
diff --git a/sys-cluster/cinder/cinder-14.0.3.ebuild b/sys-cluster/cinder/cinder-14.0.3.ebuild
new file mode 100644
index 000000000000..a6fac88ac63b
--- /dev/null
+++ b/sys-cluster/cinder/cinder-14.0.3.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1 eutils linux-info user
+
+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/rocky/cinder.conf.sample -> cinder.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/cinder.git"
+	EGIT_BRANCH="stable/stein"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/rocky/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="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${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/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	virtual/python-ipaddress[${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/oauth2client-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-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.0.0[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${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/suds-0.6[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-vmware-2.17.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"
+# 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
+}
+
+pkg_setup() {
+	enewgroup cinder
+	enewuser cinder -1 -1 /var/lib/cinder cinder
+}
+
+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-15.0.0.ebuild b/sys-cluster/cinder/cinder-15.0.0.ebuild
index 1debd3eab15e..023a076b4f1c 100644
--- a/sys-cluster/cinder/cinder-15.0.0.ebuild
+++ b/sys-cluster/cinder/cinder-15.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 eutils linux-info user
 
 DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
@@ -36,7 +36,6 @@ RDEPEND="
 	${CDEPEND}
 	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
 	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2_7')
 	>=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
 	!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
 	!~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
diff --git a/sys-cluster/cinder/cinder-15.0.1.ebuild b/sys-cluster/cinder/cinder-15.0.1.ebuild
new file mode 100644
index 000000000000..380941c5f784
--- /dev/null
+++ b/sys-cluster/cinder/cinder-15.0.1.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1 eutils linux-info user
+
+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/train/cinder.conf.sample -> cinder.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/cinder.git"
+	EGIT_BRANCH="stable/train"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/train/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="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	app-admin/sudo"
+
+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}]
+	virtual/python-ipaddress[${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/oauth2client-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-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.0.0[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${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/suds-0.6[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-vmware-2.17.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"
+# 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
+}
+
+pkg_setup() {
+	enewgroup cinder
+	enewuser cinder -1 -1 /var/lib/cinder cinder
+}
+
+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-2018.2.9999.ebuild b/sys-cluster/cinder/cinder-2018.2.9999.ebuild
index 23e3164d8658..8a3b1329e6b6 100644
--- a/sys-cluster/cinder/cinder-2018.2.9999.ebuild
+++ b/sys-cluster/cinder/cinder-2018.2.9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1 eutils linux-info user
 
 DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
@@ -38,7 +38,6 @@ RDEPEND="
 	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
 	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
 	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
-	dev-python/enum34[$(python_gen_usedep 'python2_7')]
 	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
 	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
 	>=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
diff --git a/sys-cluster/cinder/cinder-2019.1.9999.ebuild b/sys-cluster/cinder/cinder-2019.1.9999.ebuild
index bf4f9da51b43..a6fac88ac63b 100644
--- a/sys-cluster/cinder/cinder-2019.1.9999.ebuild
+++ b/sys-cluster/cinder/cinder-2019.1.9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 eutils linux-info user
 
 DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
@@ -36,7 +36,6 @@ RDEPEND="
 	${CDEPEND}
 	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
 	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
-	dev-python/enum34[$(python_gen_usedep 'python2_7')]
 	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
 	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
 	>=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
diff --git a/sys-cluster/cinder/cinder-2019.2.9999.ebuild b/sys-cluster/cinder/cinder-2019.2.9999.ebuild
index e9c432edc272..380941c5f784 100644
--- a/sys-cluster/cinder/cinder-2019.2.9999.ebuild
+++ b/sys-cluster/cinder/cinder-2019.2.9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 eutils linux-info user
 
 DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
@@ -36,8 +36,6 @@ RDEPEND="
 	${CDEPEND}
 	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
 	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
-	dev-python/enum34[$(python_gen_usedep 'python2_7')]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2_7')
 	>=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
 	!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
 	!~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
diff --git a/sys-cluster/crmsh/Manifest b/sys-cluster/crmsh/Manifest
index 0e21b93c2fe6..9b357b624dca 100644
--- a/sys-cluster/crmsh/Manifest
+++ b/sys-cluster/crmsh/Manifest
@@ -2,6 +2,6 @@ DIST crmsh-2.1.1.tar.gz 733302 BLAKE2B 6b6afdb1c3144eccf432e52a16910e7b427384458
 DIST crmsh-3.0.3.tar.gz 948573 BLAKE2B b4acb4420a7f447f0d50115ba449d506d2017e6f29221bd0b1ba45eb790e6472eadc62ff5ac6af367f4d5f2631cae162e770c0a6735dea42367248f2302cdcb4 SHA512 9dcb9560f8e23791340454e20f4e1ccd090230337357b93c2029f58ff9754756bc1eca5991c00290b937eeb3b42554989b5d6cc85a2eef5107f250d7acf570d3
 DIST crmsh-4.1.0.tar.gz 1002842 BLAKE2B 02505d9f10e2ac9525692a727d40a925d99f0035d1e372f0840b3072c4c016b55fced7ccaea8dbad9e475d7868e483e62944dbe45e5533eb4028eeda08b99c58 SHA512 3522a28c86069216222eb2efbb258014d74ce838e49885cd527a69d890415ea0899632b4cec095d2fde802b26cd7e673b0e9ea20e8d023fc7c4df140be600ef9
 EBUILD crmsh-2.1.1.ebuild 1198 BLAKE2B 31e22eb5730765bf5e00836940b1508b005d27a626c00ddd44b7444ecd7b5c9b7c887a420fa5d548bc0ca606484792078d96691d4758cc8b8485b65b7cc562ec SHA512 7ff9b5e19a76b8cf857a3dc144633a045010071c519fd63c3d3b246baa4f2419261a1e49e7886426cfd1fdd356a0aa8f28852b7b367e0ba73ed13b86a23ead6a
-EBUILD crmsh-3.0.3.ebuild 861 BLAKE2B 82d7e3d98cf784acaeecf490922c9299665beb481d9c959a428e8ae570550f7fbaee42e3d8952743c127855c657277c2bf76c465711669aba4e5fa348057a1d4 SHA512 cafeba7c67ddd841dc41e504773735cf0eed3faefddc356d48dbc89e455d359d4d83a425ddc5ffefe7bee288a67ee65e8e9bb8dfb1c4fec6e942052badc9cb29
-EBUILD crmsh-4.1.0.ebuild 902 BLAKE2B 74d078ec4592291330f02a7884764e0c03e56687f0c098da2e749ccc7deabb792a1a17193e6ddd21a284a1fe3588e58607dccecf2c6f74b7f311e89dc98b528a SHA512 63432308f5697a1b1ffadf12dd68167d6d202281500975c9a28b35cc01f60d36587f7e0596ef9fa80473678e482c65292ce19c534180343b057471429b693fa7
+EBUILD crmsh-3.0.3.ebuild 856 BLAKE2B ff511ad69e98a5993b349e8225bfbc7a607eb36c44b8b848e4608afbbc1b067dab1ac78521420cca4a52088cb7b886966b7ddf3dc69fe5dc25dac890783905be SHA512 7341f2b2fe310c2191c7843073fe9df45307f230d29be8ccd75600dee2f16b4408c4cbd6db912ce9b6207ff811fcfa9604180c6c3dba12d4fea79b144a89cbe5
+EBUILD crmsh-4.1.0.ebuild 900 BLAKE2B ccf48736fe67ef9b51f25339835b8df518c6d27c05d6501fc06656eb8ee13c6f9f6e44526a2053372dfb68d8a0e168946fe20ad975edca33629fa60fdddb0b3e SHA512 e346b813a5408321f950ffe052452242f4ad28af95b7fe92e83e93179e231fbf8fbab6a2e300c3f19bbcc79ab5bdb80fdb7e08bf6b1a49f72f0bdc4ec39727f9
 MISC metadata.xml 343 BLAKE2B 7ecf74be968150181c3df6d9fd7f56957bbfc760390a428097d0033099120ca9ba1c14e50a4b084af8f60e84447a899e554b8f3933819f16ce5e8c149e787206 SHA512 0830e62f1461e108e47feed29a48d172e63003be6d55e10f647f9a02ef90c0c7b3ad0c1e6a805edef9ebe6b015adfa3b86fbc058d0c9e19188f9e9f8304a5d91
diff --git a/sys-cluster/crmsh/crmsh-3.0.3.ebuild b/sys-cluster/crmsh/crmsh-3.0.3.ebuild
index ba5fa913ffae..083f9ee58d69 100644
--- a/sys-cluster/crmsh/crmsh-3.0.3.ebuild
+++ b/sys-cluster/crmsh/crmsh-3.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 AUTOTOOLS_AUTORECONF=true
 KEYWORDS=""
diff --git a/sys-cluster/crmsh/crmsh-4.1.0.ebuild b/sys-cluster/crmsh/crmsh-4.1.0.ebuild
index 493af7ad63b2..7366d4f33a90 100644
--- a/sys-cluster/crmsh/crmsh-4.1.0.ebuild
+++ b/sys-cluster/crmsh/crmsh-4.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 AUTOTOOLS_AUTORECONF=true
 KEYWORDS=""
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index e9ebfa5dd60e..8ac09487e491 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -8,10 +8,10 @@ DIST galera-25.3.28.tar.gz 3390722 BLAKE2B 4e399b0f00c7303c11622c3807bc8a7b9b3b5
 DIST galera-26.4.2.tar.gz 3499538 BLAKE2B 4531b246da119528192ce85364a344f56aeb83b05b6de0a87fed5cb34f7e23497b9576e4014899c58af23d045501989ccdb51a25ee27b4e32aeb5d1be1054115 SHA512 6c500dbcdc9156421c628c842a00985b3e7c440ad2facbd893f98c846426bf0607ca28152fef99a587146cefb376883ef083d498562d96fcedecf4935a3d466f
 DIST galera-26.4.3.tar.gz 3507925 BLAKE2B fb15724dd1477cbabffe6d76e6fee0425a86d335289a61e8b3fbb51b5dd84f8a6259d3ce1cf808fb5b2f2299c2b9f28988a87d0dc67667a02a53e12ba911d976 SHA512 857c6b1965871a5801d3cd7396fec8259e0b72a397b5fb92e63f374531fdb03dbecd5d5ebfdf2f0dc388d87c0ae25b357d02581c8d5889803d04c0a2f2583b52
 DIST galera-3-25.3.25.tar.gz 3373347 BLAKE2B 892c5824d88d7ceb0db16f72d9fad9ac7074435a6cacf3fea1599af0be811cc1a0b476d0a15353d0cf854a201ca5e60808392a41125c780bd97b844a4fd55216 SHA512 bc9f02c796c7289034f5b285a8f6a0e668c78302546b47c70cbe3927467993baae8835cf54978fb5276251a6d04a84d6952eaee4e6c7c5fd488543fd53d07b03
-EBUILD galera-25.3.25.ebuild 1921 BLAKE2B ba3f24609c661cb8372faa296c7a5b1ac6f0e321cd044e5227e2112060d7f72b38c89cda9b97081815789b47774324a145b652426dffcef9f14037a429af5a21 SHA512 c5ee0331c7ea348a6d59c78d09d214413711e2711de6d68ad29f704b6be8c7b8517f7cb317e51d226995cd9e2304ad5afdc544ddca805ff9eccde1a8569fbeb3
-EBUILD galera-25.3.26.ebuild 1940 BLAKE2B 30f4214e8457bbe5657063ba12fa37f16888ee4928d094689070c0272fbd2471147d7c8b604db61174054c1baf0a19179ff001113445fc31c4df30be29019d57 SHA512 9d13b8300d0d907d8289c4b7e72dfeba11218aac66b60fb1b235a5d16f22592be90fdf9984ecd2dafa58e66c95c6f01877ff690539e7f73bbc9da974a2319da0
-EBUILD galera-25.3.28-r1.ebuild 1798 BLAKE2B 0923506a89b289399c746746d090d493f76350044d831e060495f1b7600d5a4a8fb319b51974d1072411a1bc1673abc5315bb9cef737bdab07d229c6f2c95b72 SHA512 db2480f6d95b95e1b25a06dca9cce806f8ae824af62a0cfde26171491744121439a2eeb44ccd87978adedd86289399ec03354cbf7b8109f0ea43f5574839287f
-EBUILD galera-25.3.28.ebuild 1940 BLAKE2B 1fef8ac231b929fb4e3dceb990ca65249ffe4b7f40c69f34e01c9e73fae6749a0c8ad2ef51122a8c825f0f95098f69ef05471fba6559e1a56b2b4843d2aa4122 SHA512 05eb56bbd931349018a8e4dae326ddc62b27b56ff5b81a9c10b7ad354298c8b2411520edc2fc12e2a35267d14b6b80918ebf2032001c7286267bf3a0c9bde2ab
-EBUILD galera-26.4.2.ebuild 1894 BLAKE2B e2e663253b96ae48fab2e5209a42a9a3b966a4c29304857922af862707548e0db8a88480857faf86a9507f71ebb287784a2d1f8e2b7e7016af5b8171b0a696e0 SHA512 76c27d5ea4fae06c388c6f22a8fd5e80c6dac7f319b8dff70804e890064e44f63737d1b82d1b83e479a6eefd8bd652e99b2c8ede2d77f6a20ae69513a4a5dc11
-EBUILD galera-26.4.3.ebuild 1798 BLAKE2B df2a27c02c1516f27cf58b10b176bac225317c7b005dabe9ab3f52cb0822b90812bf9e420f66ab8b6f39d0182062942382a965af64a27372a9f76af1413dfdd2 SHA512 f31d82807ffeeae6a641e92386ccf7f174bf2bb55c44785308acca02a5b761028e90bac9f7c437856a4470371412c315b1fb54e52de6b0ba1a3e8779c72eb22c
+EBUILD galera-25.3.25.ebuild 1917 BLAKE2B a79f4254ba6fa85f555c32516c4cbec40cf38dca8cf13185ff466c4c957ac9495810a772ca4f72d38b73fa54c7734166eb56ba8abeaa62caae633c674a5dfdf0 SHA512 cb716fd80c6990d243aa60d3bab6db7e6a11e8da16c55be063e159e401b98d13a3ec348f13852ba23a4063ec1320c3f9a6846c60753a805c9b40cf21ddaa1149
+EBUILD galera-25.3.26.ebuild 1936 BLAKE2B 05e4b45bfb16388643d411874850d4ac55dbf7ce55e260eee06aef13d764a955342cb5266a34ed9f341170affaf49d7b72319efc8fb651c6546b5eea1605fa9b SHA512 07412b9dfdaeb17dff32c3292bb67d79a86befc325b8c782bdd6748bec0ae43f1a181624d03d245bc824241aa6ae56174970b4a4e16354b647f199587db17ce1
+EBUILD galera-25.3.28-r1.ebuild 1794 BLAKE2B e01a44761b3335993623c855f7004215510dd18439b47186d45081535850217a46fce54159afcbe38522aaf97a4ce61ee0bf1d4dcfde50d9f90429e71287830f SHA512 199e48a8f2ae1abc25c4065c8db5463faca551447903fe40e29f044b380b9e32b14e3839baa75b81cd22054d26ab2232f357d4bdb86c8c4eb31fe07f17aa7890
+EBUILD galera-25.3.28.ebuild 1936 BLAKE2B 2429f091fd2148dc1ddab4ebbea33716a5587b2e5fbe1db7f3e468445f58e5b4e18d8c4681ebd69309c5465799f156b0b0ab4515738eb4dcf681abe90664a370 SHA512 dabe8571df02ac88647ec2339235414642338dd63e083d879abb5f7f9ba54530b9ef8d38a737f82ce5a2be74b5c08c000f8ead68a4729362a3151beae15ee24e
+EBUILD galera-26.4.2.ebuild 1890 BLAKE2B 64797d6bef6c10c7caa64378751ce0c8c5e95729a796d6d180edccafb82902a781b2da6c855c8e5839b72773bf5f713d8fdced4d312ad489ce60f828fe0ca909 SHA512 3f5be0efb37f17f592a315274eef85a9dd3328b6473834a39a39575e7ad029ef75671a748b954ce0943d31498fb88bf4a0edaf42f5df4b3371bd3a44e044da99
+EBUILD galera-26.4.3.ebuild 1794 BLAKE2B de91252646af1c30448a7a82712aec4f3638c76d99a6a90eb8bc3436c7ae7f3bdb1989d209647168e3404800d91f226bf9887496c7accfc6cc59c62eff124fd3 SHA512 9f9624415793179aebc61bea4e7697f6ccb90f23e37be85eebbdfbd1acef6f86cafcfd90ec84e3bf75a76c296859720d181c02607c8fd67cd9cb1635490f4bcb
 MISC metadata.xml 462 BLAKE2B 1b0826bcb2bd93caa5f017b3c530d3bea18daac9f457dc79d6436d21f41b8c33d2979469df870cbc68428ba0110d17013bf9cd82f4f46d9be43bf996f7815e0c SHA512 b99987e53ae976905d3e493b09cbe35161f90b8ebfc88c4a9616b8722b0a0005c2427d509e15fdd7bbb30977266188452b3b6ec7479a943bce3a5922410246e2
diff --git a/sys-cluster/galera/galera-25.3.25.ebuild b/sys-cluster/galera/galera-25.3.25.ebuild
index a067a4a0b4e1..c1c8faac6bed 100644
--- a/sys-cluster/galera/galera-25.3.25.ebuild
+++ b/sys-cluster/galera/galera-25.3.25.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 MY_P="${PN}-3-${PV}"
 
diff --git a/sys-cluster/galera/galera-25.3.26.ebuild b/sys-cluster/galera/galera-25.3.26.ebuild
index f0d9ad274790..b5ffbd5c1026 100644
--- a/sys-cluster/galera/galera-25.3.26.ebuild
+++ b/sys-cluster/galera/galera-25.3.26.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 MY_P="${PN}-3-${PV}"
 
diff --git a/sys-cluster/galera/galera-25.3.28-r1.ebuild b/sys-cluster/galera/galera-25.3.28-r1.ebuild
index adcb8849262b..e96a74f63416 100644
--- a/sys-cluster/galera/galera-25.3.28-r1.ebuild
+++ b/sys-cluster/galera/galera-25.3.28-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
 
diff --git a/sys-cluster/galera/galera-25.3.28.ebuild b/sys-cluster/galera/galera-25.3.28.ebuild
index 22212d135640..ba57a09fea77 100644
--- a/sys-cluster/galera/galera-25.3.28.ebuild
+++ b/sys-cluster/galera/galera-25.3.28.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 MY_P="${PN}-3-${PV}"
 
diff --git a/sys-cluster/galera/galera-26.4.2.ebuild b/sys-cluster/galera/galera-26.4.2.ebuild
index a270153de4f6..d523af7c34e9 100644
--- a/sys-cluster/galera/galera-26.4.2.ebuild
+++ b/sys-cluster/galera/galera-26.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit python-any-r1 scons-utils toolchain-funcs user flag-o-matic
 
diff --git a/sys-cluster/galera/galera-26.4.3.ebuild b/sys-cluster/galera/galera-26.4.3.ebuild
index 19657aed1251..c5f610e33cc1 100644
--- a/sys-cluster/galera/galera-26.4.3.ebuild
+++ b/sys-cluster/galera/galera-26.4.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
 
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 93a047c5a9db..2c339a5c173d 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -9,8 +9,8 @@ AUX glusterfs.vim 139 BLAKE2B 73fdcb49c0c252784718b461541d5483e118bf1b83f445a6ce
 DIST glusterfs-4.1.8.tar.gz 7835272 BLAKE2B 2546b9c0fe38989df71b8f72b193ce42c499621dcaaa4c5e3deeacfba68179f2280fc699cebeb87486171442152fa8b56b42a0d17465b739769eb227c82307d7 SHA512 950cd2fd774e3eb00f1ec06d54566736b6fbe8d1aed54477a19d9b2727eff8a70ef7ac32815cc7e01d45b5d357fc01af786e16c451f6ad314d472e61ba04ce85
 DIST glusterfs-6.1.tar.gz 7510074 BLAKE2B 8002597f8f695d11578be250cafb3f32358ac29d873b27f87bb26edd38b64d896050322d9591b156793fe6ee7af111904961d5a3e7a933f7c5176cf0c6793305 SHA512 53f4195ecb565a8dcc0d66e74d07dd7334e3c8b1cc1671517612be32a00e9e9bbfb5e983955c4f116b25f7df990bcd1c05bbd3d0b740e9f8c76a16b9b16bec00
 DIST glusterfs-6.5.tar.gz 7536238 BLAKE2B 35c58da9e8564bda1f34b095f14316148cae2b5ff1820d22ae945a06d34ac57aea968e5914af3f5831250fd591a103fe4022e160bb96d491a7c915b5b68c54e7 SHA512 b7356de07e8126aea80b0489b9ac39ce0d10ea324fe38d05ff5740765e886f80fc7e6bdda9d4db1371d7b955b055cb76ea29e918e759a575db331a6436bad90f
-EBUILD glusterfs-4.1.8.ebuild 6772 BLAKE2B a13e90db6317fa727cb64f9f1cf244a9276e8a9b3f9fd0c4808e2572fe5802d12663b5b768ee223fd78f92ae781d8d3a6f31706ab7f5e83d3eaa3cf1fe98bd82 SHA512 5436e666878df02b3b4af43a3c448329e4b94a2255fd91d35d9f520184a91aea6d381428e423baebef7c233c4ecee6c0142cc8b5ba223341f5b34ae79945bf2f
-EBUILD glusterfs-6.1.ebuild 6212 BLAKE2B 4d57942e086b22e4ca1f9426c6d2f9c9c521b0ead729c3d7db22d51d7185cda54c850233e2140c0b139666b76ed4d882532bc269b8693ceb038492b7e3a13190 SHA512 37c5ceee736e05db6b5a0a25e38b1d2d89c9518b374086e3aea8d0d3270689d189b85a1168e6406649e8a2dcb4d18e1c244f5409d7b2d96eea498e6ae0a5a95d
-EBUILD glusterfs-6.5.ebuild 6212 BLAKE2B 4d57942e086b22e4ca1f9426c6d2f9c9c521b0ead729c3d7db22d51d7185cda54c850233e2140c0b139666b76ed4d882532bc269b8693ceb038492b7e3a13190 SHA512 37c5ceee736e05db6b5a0a25e38b1d2d89c9518b374086e3aea8d0d3270689d189b85a1168e6406649e8a2dcb4d18e1c244f5409d7b2d96eea498e6ae0a5a95d
-EBUILD glusterfs-9999.ebuild 6779 BLAKE2B 0461134fcea8e8f237c6fcd4a7579426fa107e1d2c642ac009381e8a102623d37b15c33b696ecd5c127fe2db96e050dcccb2d100539fc16a506dd71a749401b4 SHA512 437fc1cda7440cf04a1c35c8d724542b20faf71fe70da2bf2f4a7048902c576fd5c4c4ee055585fa685933116e60eb161370faf1997bf35497faeb8c7fcad174
+EBUILD glusterfs-4.1.8.ebuild 6785 BLAKE2B 1daf6faa219ec1c64fe661f068aadd6d7735c029f2692cba1f4ce84abe40a7f2defa29bcdbe84f962fc59b805124c5d252be2909afb946e086bc52a3137d347d SHA512 d0a7aaec14523e68ed676ef461bd59ff73de94e40f197a64d9a24b71a98949915327b7732637a57b6138e8171b402d851969732fda9039a255ac9696aa554976
+EBUILD glusterfs-6.1.ebuild 6223 BLAKE2B a708adff12d8467555d22e8652bfc30ad538a00b9ff0bbb3e0379ec9eaee1dc41d6b00432ab63ad0e4fea9c181ec8fd17a6d7013c82410ca7f31b484a171f4cc SHA512 2c2a011e1e96e07a057f04e16a0296f93ffce38aa25c87312682f3f605c66ed3a9fb7c528c86eb11163249ebeb7080acc03eef7c151aa85f587b1a29e67acbb2
+EBUILD glusterfs-6.5.ebuild 6223 BLAKE2B a708adff12d8467555d22e8652bfc30ad538a00b9ff0bbb3e0379ec9eaee1dc41d6b00432ab63ad0e4fea9c181ec8fd17a6d7013c82410ca7f31b484a171f4cc SHA512 2c2a011e1e96e07a057f04e16a0296f93ffce38aa25c87312682f3f605c66ed3a9fb7c528c86eb11163249ebeb7080acc03eef7c151aa85f587b1a29e67acbb2
+EBUILD glusterfs-9999.ebuild 6789 BLAKE2B a803818430d7faca876f1db48f7082fba1560a9fc539303a1ec7b8154ba0b43716a76f415ac11fde898780afac2469d7b73c28115a6b2a832c1cea8486874ff0 SHA512 3355f1533d7a3a8e8b9ad437c077172a0285e2d0911fdcdf8efab75ab65785671699a26d744ed62cd4f1487678353fe7ccfda55496bd72f209a542dd6a60b0ae
 MISC metadata.xml 1724 BLAKE2B 8d164da1feb4e49490543de9841ec60282199451f2dcd6920c6781bcff41cb1248fcea7895501db0501f01a1b87b27e91a068adacd87842630f17efebf4d8954 SHA512 5bc076910d574a03f1b29db15fe1933e1b9b6f0f2cde654a6934397f7fa6f10c5063dd0318248d522da508af1ce56d16f1a204bc4be8429430f189143baaf043
diff --git a/sys-cluster/glusterfs/glusterfs-4.1.8.ebuild b/sys-cluster/glusterfs/glusterfs-4.1.8.ebuild
index 61cb827c0e8f..f228f9636ade 100644
--- a/sys-cluster/glusterfs/glusterfs-4.1.8.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-4.1.8.ebuild
@@ -32,7 +32,7 @@ RESTRICT="test"
 # sys-apps/util-linux is required for libuuid
 RDEPEND="bd-xlator? ( sys-fs/lvm2 )
 	!elibc_glibc? ( sys-libs/argp-standalone )
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	fuse? ( >=sys-fs/fuse-2.7.0:0 )
 	georeplication? ( ${PYTHON_DEPS} )
 	infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
diff --git a/sys-cluster/glusterfs/glusterfs-6.1.ebuild b/sys-cluster/glusterfs/glusterfs-6.1.ebuild
index e9acb97223c7..87b3e519ab27 100644
--- a/sys-cluster/glusterfs/glusterfs-6.1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools elisp-common python-single-r1 systemd user
 
@@ -30,7 +30,7 @@ RESTRICT="test"
 
 # sys-apps/util-linux is required for libuuid
 RDEPEND="!elibc_glibc? ( sys-libs/argp-standalone )
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	fuse? ( >=sys-fs/fuse-2.7.0:0 )
 	georeplication? ( ${PYTHON_DEPS} )
 	infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
diff --git a/sys-cluster/glusterfs/glusterfs-6.5.ebuild b/sys-cluster/glusterfs/glusterfs-6.5.ebuild
index e9acb97223c7..87b3e519ab27 100644
--- a/sys-cluster/glusterfs/glusterfs-6.5.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-6.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools elisp-common python-single-r1 systemd user
 
@@ -30,7 +30,7 @@ RESTRICT="test"
 
 # sys-apps/util-linux is required for libuuid
 RDEPEND="!elibc_glibc? ( sys-libs/argp-standalone )
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	fuse? ( >=sys-fs/fuse-2.7.0:0 )
 	georeplication? ( ${PYTHON_DEPS} )
 	infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
diff --git a/sys-cluster/glusterfs/glusterfs-9999.ebuild b/sys-cluster/glusterfs/glusterfs-9999.ebuild
index 9110a2d46e73..4daba19bc765 100644
--- a/sys-cluster/glusterfs/glusterfs-9999.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,7 +32,7 @@ RESTRICT="test"
 # sys-apps/util-linux is required for libuuid
 RDEPEND="bd-xlator? ( sys-fs/lvm2 )
 	!elibc_glibc? ( sys-libs/argp-standalone )
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	fuse? ( >=sys-fs/fuse-2.7.0:0 )
 	georeplication? ( ${PYTHON_DEPS} )
 	infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
diff --git a/sys-cluster/heat/Manifest b/sys-cluster/heat/Manifest
index 431351982cd9..a4eef69a01d8 100644
--- a/sys-cluster/heat/Manifest
+++ b/sys-cluster/heat/Manifest
@@ -8,10 +8,10 @@ DIST heat.conf.sample-2019.2.9999 75054 BLAKE2B 294313cc94bea784536030f7b4cd6b87
 DIST openstack-heat-11.0.2.tar.gz 2320284 BLAKE2B 0bb16840cf0637dfd4783cf837f0b9eb8806275f9e292fcde54b18d14058004ce8382a17e433a785027c74653761412c3851a737c30b7a3e7100d6ef34a4f13e SHA512 fdc9dbdfd6c927c9df681a9d1213cd5ea8191d5efeb07c172f87baedad00a16687a074137f88d1d2dcce4081ca23f53cc7afbee8cb3c2a6add6fd01560684cdf
 DIST openstack-heat-12.0.0.tar.gz 2366052 BLAKE2B 53c44cb20be0383c1dc7df6edea35bfc3547cb9ca652645879b7156a87fa645b74f3317ac28ce15587cee281bb0ba219ddacc2f03cfc56e528156412a104ce5e SHA512 2fcc42de118e2abf380c1b8c2637812f0f3dcaaad0f9ddcf349bd372e9880d2b45bc09ab349faa5c2d2c9384aba73d7679f6e80ba6b143a52b669e13d56fe0e9
 DIST openstack-heat-13.0.0.tar.gz 2342125 BLAKE2B 1fe46924ff491301f69d91979e3e1be9297a4b499e1dbf5004b1e37633afee1167fcd5e8bb79a2b87d7cf54c50ba9accfa6f3a56874555a3640e22ad69ccb4dc SHA512 b122cb864982730fa3ae5db0b41aa4f9cc0d2cf93c439595c85ed5946cdb25483b30d9dfaf066f4450d5cb4a9613b5527810dd2535f9090e568c5eb63c6e60a4
-EBUILD heat-11.0.2.ebuild 6242 BLAKE2B baec7461119ef6a5126d8166f92c73c9bd3ffbdc620683a6691eba70513cfd5ebf8f2e63d19a46f0cff6e7a06da414f0882ec82ce8b3f4ccd4fd32a2408adb6a SHA512 aa33f7205856a4975a04f58ff7edcfab84d8ab958bec361c1e0b9729d94f5b510094f0750f8cc93d6efa9d8f8c7ac1a136eeb53e6418775e3021cf9cf18d81dc
-EBUILD heat-12.0.0.ebuild 6323 BLAKE2B 05c35db627ffe887053274c5d48186ef40b77f369b7f8c1f7533c9e5789171266ca465a15568a193a3f6f2c4538ed65cdb73b5f9b97511b0e8527b3a1134c0a8 SHA512 14537652cd4e0d52cb80ad0ed074bcea434aad1fe7cc72ec31600cab3cec847647e98ffcba8a70d8d8053a1aaa36205b0b6d8094fccf7ca984d3a8eba5940ec1
-EBUILD heat-13.0.0.ebuild 6467 BLAKE2B b9575dc9f9d0c053fd62a3b00a9400bfd0bf79cea5f6ac2986c2772714388f000a8712e70359cf38f22384911a240c6e46d809c0eac8537b4d71765911419d08 SHA512 64b2b3d17441c69dcc7abde58fc8d10de9c587123558a6ba35fd97fce74f83a0cc69e8075873ab241f8942bf96f7e00d4eb56b2ec60b6193ae6dbbb50ad294c3
-EBUILD heat-2018.2.9999.ebuild 6234 BLAKE2B 01e13a18b911d25f906cea867f7888fc47f0446f4710f12ca999ff6cacc3eecfa89330048515d2d0a380608840ae74454d82cf38ab901b5082f5aaff4689a744 SHA512 6f5d83c7e48a12b9aecbdfba4edf556e58d8356b816d6e2063ccd476ba4cfbce3c8ebcf987f9d92c74174ce7ae9d9f01333d8c4955c500aaf7ab19c233f0cfd1
-EBUILD heat-2019.1.9999.ebuild 6295 BLAKE2B 276def78be9c584191c8b13dfbcac2a96ba3e026aa0ed80faf2cc0700618f63dd4cc34367efc3010cfd283d9ed9f34c7600113460f2f0f64c130e3428907fa73 SHA512 cae484cf3e0be1384befb47c13c5f5b206363379d78d0174152da6b330c04373fcc8b34ab824e62335ed2eb7566afd0ab212b8214c81931620f2a06a7b2d8798
-EBUILD heat-2019.2.9999.ebuild 6439 BLAKE2B a65d3296955ab0352783580bc1c0acf9d8fee255e40ebe692acda5356265278db20841215dea59259c18f1138975438bb612a4311edc3caa84fb88f667221c6e SHA512 6952cd040e91c0c4f0a51b921fce6b7c439440302b4c7248b7faed5daec243c86cdd97ae31e60b710ce1fcc2d63a0b5b9f790807a93965a8bb2e8a36d1a1a646
+EBUILD heat-11.0.2.ebuild 6228 BLAKE2B 0fd008c295a3a5a7bf796d138f74c9e81b27e68c6067861cde98867898c5d698a57e47331269e01c7c330bb6e3383302dd53dc65848aafa47304ea2aab3a71e2 SHA512 cc94ac8af5ed6515ccfa8b49dd8b6e0cf8aeb9d4ed81201e4de51b8b2db629efe7048d9fc2bd0fc3d26bc585bcec75ff82767b90e127327116dfcdacc46dd5d7
+EBUILD heat-12.0.0.ebuild 6311 BLAKE2B 2f793ec824c18bcece84c9f91fb65816b1bcbd745cf015ba639912a22d363123839c4dbabf0c661af2f198fbabcd64361f647f4308534d37b6c8bb1b6d4eec0f SHA512 04a9cc3147eb89d6cdc483ef60527bdb5d0428ec00ad0a57fd63d597b95d18a3bfdd3f64e98868868968ef8dc30db6242ca91ddcc250abc7217578f545797efe
+EBUILD heat-13.0.0.ebuild 6455 BLAKE2B 0e26a6fa5734f01a62334ed10f7711c995ab54bd46ba8720fc1cd4ab4acd49978e97299208e1687c812a28a6b0289c87ff78cc16b912f4617e82132acb940ca5 SHA512 8e84446b80e5dcad6880b3797781d3d645d3bd6f804b067abe7c7fabf189d426807a579c930ed126bf83c631e6249acb9aef82f69f87398b6a908ccb834b5f1a
+EBUILD heat-2018.2.9999.ebuild 6220 BLAKE2B 9e43f4583a9445682660e8331f6d43ff584b80c376a56ae15b0fd29edaf8b9b18d2244d7c3c5900f36e4a51079eba4bef17d5eb40a5862242b4cee8b2f039930 SHA512 b61d8bcebbb88f50a56a40ca4a2265b547ee94fb8da81c2f481b6dc269ab02d41541664285ddefa7a4eef449de40f758b7d8454d87e0495b6c8bce80a81d8038
+EBUILD heat-2019.1.9999.ebuild 6283 BLAKE2B 8d4da6aab6ce4fe14a48d7637129fe144ca248972088556fd0d6bf456457e695f85631c23de3b6fe75081edc47af98fffe7e9d2c835c5bd04d054ed1233487cb SHA512 209c67b6d72fbea345386be83b36dd5d503dc22ac6c05fd0b28b07ba53cf12b735aa2e23e306ddcd316081badf506b5d42daabf65a7e18bcfa7be1aa62e95f5b
+EBUILD heat-2019.2.9999.ebuild 6427 BLAKE2B 5f122bc349af96945e5c64c269f49c22e2ae6c34dd8012c36f05a1cfeeaaa418e0b0de9a0ae1abeca79810403bac5d02829166b9ed43241e9cd0bdcce9615474 SHA512 848149cfff85d4431b7058ae792d4ad270dab04541d322f5c698dee7e2f5390472a8b08225619073717ea12975511ab35b467408c30e7f52b712f2582af84ce4
 MISC metadata.xml 631 BLAKE2B 566d35b5533177a6d8b0ef428c9bd1a320aace6b43e186139c4b53cde224c1bf488340be8b6bcac14bf6c7a51212952dc13940d34edc38e24d7d2fbea5ce0c68 SHA512 44e741975cc462454bfd08fce461b019c5ef141997f272796052f7f3aa7297646304cdc7d75a2ed01319bcba753475ba5861306c3ac74f3d97218bce60d42429
diff --git a/sys-cluster/heat/heat-11.0.2.ebuild b/sys-cluster/heat/heat-11.0.2.ebuild
index 264bd5ea49c6..c9b2bf422cc2 100644
--- a/sys-cluster/heat/heat-11.0.2.ebuild
+++ b/sys-cluster/heat/heat-11.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 eutils linux-info user
 
diff --git a/sys-cluster/heat/heat-12.0.0.ebuild b/sys-cluster/heat/heat-12.0.0.ebuild
index c05c06af65a8..01133d855824 100644
--- a/sys-cluster/heat/heat-12.0.0.ebuild
+++ b/sys-cluster/heat/heat-12.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 eutils linux-info user
 
diff --git a/sys-cluster/heat/heat-13.0.0.ebuild b/sys-cluster/heat/heat-13.0.0.ebuild
index 7d52dde43096..5fdc092f0f52 100644
--- a/sys-cluster/heat/heat-13.0.0.ebuild
+++ b/sys-cluster/heat/heat-13.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 eutils linux-info user
 
diff --git a/sys-cluster/heat/heat-2018.2.9999.ebuild b/sys-cluster/heat/heat-2018.2.9999.ebuild
index bf4626413563..f8d5e856b2af 100644
--- a/sys-cluster/heat/heat-2018.2.9999.ebuild
+++ b/sys-cluster/heat/heat-2018.2.9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 eutils linux-info user
 
diff --git a/sys-cluster/heat/heat-2019.1.9999.ebuild b/sys-cluster/heat/heat-2019.1.9999.ebuild
index d6bd077a30e8..91b44430970f 100644
--- a/sys-cluster/heat/heat-2019.1.9999.ebuild
+++ b/sys-cluster/heat/heat-2019.1.9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 eutils linux-info user
 
diff --git a/sys-cluster/heat/heat-2019.2.9999.ebuild b/sys-cluster/heat/heat-2019.2.9999.ebuild
index e2d5eb4e2b2a..25cc976a9001 100644
--- a/sys-cluster/heat/heat-2019.2.9999.ebuild
+++ b/sys-cluster/heat/heat-2019.2.9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 eutils linux-info user
 
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index 7213f87cc914..0b437887097d 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -1,12 +1,4 @@
-DIST hpx_0.9.99.tar.gz 3779841 BLAKE2B fae6b06a303964e3d52d68fcfd980f89625bfd2a7c04f3a4b027c47814c677bdcf7f367434aee912be08b67afbb6cfe811831dfdc284c0b785d7eaf8838566a9 SHA512 57c03c01c4a9f770e56a60645ec352338365fe05c544b18ff2e944044284315a7e76bbdc2c7193fe55e6992dcb51a51d1042372fdd141b572bd8e18bf1afc363
-DIST hpx_1.0.0.tar.gz 3972403 BLAKE2B 737282f2b547c2ce7e6e0367df64beaf22760d73840f2f1b983e8b970baef074b376f264a97f8c67873eedc24255ec2515bbf2a5bbcb364f89284f48ac18b177 SHA512 42c155654f118bff34b48d929b1732fd56126b8fd3e7657b5bd2f84275288ddf538572ed1152883c4aed5e9683de53b9b1f1c3613e5092e7bd1a5e165bed606d
-DIST hpx_1.1.0.tar.gz 4374855 BLAKE2B 17caeb085e0167d51a1a89c73bce653938d9918776b9db07ae9171cb11570a440e2f88cea86d8b8066b7d102e9a24f1e8304b47b2ade161cbe4e27cce91e3b84 SHA512 09b69a5f14bdb4cbf629bc3a10a4e1dc4c0ab35efdb74386fc7f0135558db5f9557ae8de4edd0ade12cfb91a78e6cc2fac25efbdf9a21042abcb0f303eda1938
-DIST hpx_1.2.0.tar.gz 3918088 BLAKE2B 7c5eccef6a58f683f94e59e3773e949945652e1fc7c883d134da5b6d32f21bb9a2f526d073260561657da518687ac96487f058715e51236a334b97b27a414451 SHA512 e2dec9484490f5a5fa7d60f712989f70068bcddac643d8b730d2d52aa2a7e49260b28c3becd519925a8e96e9a703473f19955adce087061cf50b861f4fed8ab1
 DIST hpx_1.2.1.tar.gz 3919474 BLAKE2B 5f62f97a047c1b931068b671855bc9d7b8ff03d7f26793ee58445fb4c567d68c6c24c87844c7a6463901d784e11afe475120a41038e783a67cc75ede508473c5 SHA512 057724de1ef252e941a776174fa594a855255b5600461725a4da6e9002b1424a1e59be3f8a40673bb3db5a8aabd3c7b38abbb78042490befe247dd73c921b87c
-EBUILD hpx-0.9.99.ebuild 1908 BLAKE2B 3a7b4c5473e647de4145e4295fe4ad719e83a7164725eacdb1391c93897c7c04bef2edb36b61d1bddf9bed6931fb3db6662d5988cc1e443f40fd551cbac01bf0 SHA512 8d64bf93b54f6c2ffdcd4d79b18223e1925ca9b288b4945c6423f2a10ac9de6122c5024d2a37ba37ad6af9bee6f01eb33947283e8baf015311b8196e84101689
-EBUILD hpx-1.0.0.ebuild 1966 BLAKE2B 7a290fab010bff912d1eff2bd8d41062141e802e426aa603310633bae9ba97e5a850b55c1dd134b4042273b6162392aeadf93e2d9bb450263c756277e605b7f9 SHA512 28adaac00c82afa4cc145968219df5f5671a46bd52f31f4ea10b984c46c070fd36c2d7d707291cdadfdfe095b36da2561f0c44daea9f287f1c91e5c22c2161a4
-EBUILD hpx-1.1.0.ebuild 1966 BLAKE2B 7a290fab010bff912d1eff2bd8d41062141e802e426aa603310633bae9ba97e5a850b55c1dd134b4042273b6162392aeadf93e2d9bb450263c756277e605b7f9 SHA512 28adaac00c82afa4cc145968219df5f5671a46bd52f31f4ea10b984c46c070fd36c2d7d707291cdadfdfe095b36da2561f0c44daea9f287f1c91e5c22c2161a4
-EBUILD hpx-1.2.0.ebuild 1966 BLAKE2B 7a290fab010bff912d1eff2bd8d41062141e802e426aa603310633bae9ba97e5a850b55c1dd134b4042273b6162392aeadf93e2d9bb450263c756277e605b7f9 SHA512 28adaac00c82afa4cc145968219df5f5671a46bd52f31f4ea10b984c46c070fd36c2d7d707291cdadfdfe095b36da2561f0c44daea9f287f1c91e5c22c2161a4
-EBUILD hpx-1.2.1.ebuild 1862 BLAKE2B d31faafcc7c2d14533884eae3ce9dd98f6d18ebc3fa9313ed3d6833dcf9b5cf15c6caf308eb807e63a130c00cd2188f91099a51a1835e55cb92282b9338309f9 SHA512 d686c36929968e6eab84917c6b8a473746822d7f2655c3337c584a5bbb48baeba8037c9a3d2e2c3648353e7df5482029e8dc70aa0384f519e8d20f90fefb93b6
-EBUILD hpx-9999.ebuild 1862 BLAKE2B d31faafcc7c2d14533884eae3ce9dd98f6d18ebc3fa9313ed3d6833dcf9b5cf15c6caf308eb807e63a130c00cd2188f91099a51a1835e55cb92282b9338309f9 SHA512 d686c36929968e6eab84917c6b8a473746822d7f2655c3337c584a5bbb48baeba8037c9a3d2e2c3648353e7df5482029e8dc70aa0384f519e8d20f90fefb93b6
-MISC metadata.xml 1015 BLAKE2B 10711221bc93b52b674b0179b1d27ab762fc4f9de3a97e3af2e26296f7b42097aa75ab9acc0f6a5ed3faf053c31a575dd50dd2f1b7a69eb1ad4c7a745a547992 SHA512 a0215ad65388b911bb093d58903fb0b4948bfaaf32db26223c21ee2bd63bc7797f14f01d9a8e1203a27dea6bb6ea70c8f34bbeb22b53f49f70971d5e60ba8949
+EBUILD hpx-1.2.1.ebuild 1831 BLAKE2B 395c62c2cab7bc309ec4cc6ce05090d80b74a8db7f7095d4ccff500baa72cc81cfcc2725ca6f9a1d4e0b34f2693dae72785d3b92d95530d709e19e8f860669a6 SHA512 72f74a38132344cc847c1058225bbf6d1c7fabf96f493bbd762a8994b7efaf45ded1ba0756049f36b467c1ed68e2ac8018df4e416b68d19365d10b9c5526b873
+EBUILD hpx-9999.ebuild 1831 BLAKE2B 395c62c2cab7bc309ec4cc6ce05090d80b74a8db7f7095d4ccff500baa72cc81cfcc2725ca6f9a1d4e0b34f2693dae72785d3b92d95530d709e19e8f860669a6 SHA512 72f74a38132344cc847c1058225bbf6d1c7fabf96f493bbd762a8994b7efaf45ded1ba0756049f36b467c1ed68e2ac8018df4e416b68d19365d10b9c5526b873
+MISC metadata.xml 964 BLAKE2B 0f71483979af41ebf24ccf4a7b547048aaa6198d638b04963303cdbe0b3b7b86a66ff13dadaac501fcbb3c7992e3bdebffebcfbd3d82bad0fe5890e89d581b9f SHA512 2c80ae2fd03aebaa25fa19592b6f84cd343cc6c2733dde34023800805987ae91024d36b2c3246c449acdb0be18154648bc571328bb8acb8f561afc149666bf8e
diff --git a/sys-cluster/hpx/hpx-0.9.99.ebuild b/sys-cluster/hpx/hpx-0.9.99.ebuild
deleted file mode 100644
index 742001e9ada5..000000000000
--- a/sys-cluster/hpx/hpx-0.9.99.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-
-if [ ${PV} == 9999 ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/STEllAR-GROUP/hpx.git"
-else
-	SRC_URI="http://stellar.cct.lsu.edu/files/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${PN}_${PV}"
-fi
-
-inherit cmake-utils fortran-2 multilib python-any-r1
-
-DESCRIPTION="C++ runtime system for parallel and distributed applications"
-HOMEPAGE="http://stellar.cct.lsu.edu/tag/hpx/"
-
-SLOT="0"
-LICENSE="Boost-1.0"
-IUSE="doc examples jemalloc papi +perftools tbb test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	tbb? ( dev-cpp/tbb )
-	>=dev-libs/boost-1.49
-	papi? ( dev-libs/papi )
-	perftools? ( >=dev-util/google-perftools-1.7.1 )
-	>=sys-apps/hwloc-1.8
-	>=sys-libs/libunwind-1
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-	doc? ( >=dev-libs/boost-1.56.0-r1:=[tools] )
-"
-REQUIRED_USE="
-	jemalloc? ( !perftools !tbb )
-	perftools? ( !jemalloc !tbb )
-	tbb? ( !jemalloc !perftools )
-	"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	CMAKE_BUILD_TYPE=Release
-	local mycmakeargs=(
-		-DHPX_BUILD_EXAMPLES=OFF
-		-DHPX_MALLOC=system
-		-DLIB=$(get_libdir)
-		-Dcmake_dir=cmake
-		-DHPX_BUILD_DOCUMENTATION=$(usex doc)
-		-DHPX_JEMALLOC=$(usex jemalloc)
-		-DBUILD_TESTING=$(usex test)
-		-DHPX_GOOGLE_PERFTOOLS=$(usex perftools)
-		-DHPX_PAPI=$(usex papi)
-	)
-
-	use perftools && mycmakeargs+=( -DHPX_MALLOC=tcmalloc )
-	use jemalloc && mycmakeargs+=( -DHPX_MALLOC=jemalloc )
-	use tbb && mycmakeargs+=( -DHPX_MALLOC=tbbmalloc )
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	# avoid over-suscribing
-	cmake-utils_src_make -j1 tests
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sys-cluster/hpx/hpx-1.0.0.ebuild b/sys-cluster/hpx/hpx-1.0.0.ebuild
deleted file mode 100644
index 0c4de411e176..000000000000
--- a/sys-cluster/hpx/hpx-1.0.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-if [ ${PV} == 9999 ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/STEllAR-GROUP/hpx.git"
-else
-	SRC_URI="http://stellar.cct.lsu.edu/files/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${PN}_${PV}"
-fi
-
-inherit cmake-utils fortran-2 multilib python-any-r1
-
-DESCRIPTION="C++ runtime system for parallel and distributed applications"
-HOMEPAGE="http://stellar.cct.lsu.edu/tag/hpx/"
-
-SLOT="0"
-LICENSE="Boost-1.0"
-IUSE="doc examples jemalloc papi +perftools tbb test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	tbb? ( dev-cpp/tbb )
-	>=dev-libs/boost-1.49
-	papi? ( dev-libs/papi )
-	perftools? ( >=dev-util/google-perftools-1.7.1 )
-	>=sys-apps/hwloc-1.8
-	>=sys-libs/libunwind-1
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-	doc? ( >=dev-libs/boost-1.56.0-r1:=[tools] )
-"
-REQUIRED_USE="
-	jemalloc? ( !perftools !tbb )
-	perftools? ( !jemalloc !tbb )
-	tbb? ( !jemalloc !perftools )
-	"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	CMAKE_BUILD_TYPE=Release
-	local mycmakeargs=(
-		-DHPX_BUILD_EXAMPLES=OFF
-		-DHPX_MALLOC=system
-		-DLIB=$(get_libdir)
-		-Dcmake_dir=cmake
-		-DHPX_BUILD_DOCUMENTATION=$(usex doc)
-		-DHPX_JEMALLOC=$(usex jemalloc)
-		-DBUILD_TESTING=$(usex test)
-		-DHPX_GOOGLE_PERFTOOLS=$(usex perftools)
-		-DHPX_PAPI=$(usex papi)
-	)
-
-	use perftools && mycmakeargs+=( -DHPX_MALLOC=tcmalloc )
-	use jemalloc && mycmakeargs+=( -DHPX_MALLOC=jemalloc )
-	use tbb && mycmakeargs+=( -DHPX_MALLOC=tbbmalloc )
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	# avoid over-suscribing
-	cmake-utils_src_make -j1 tests
-}
-
-src_install() {
-	cmake-utils_src_install
-	mv "${D}/usr/bin/spin" "${D}/usr/bin/hpx_spin"
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sys-cluster/hpx/hpx-1.1.0.ebuild b/sys-cluster/hpx/hpx-1.1.0.ebuild
deleted file mode 100644
index 0c4de411e176..000000000000
--- a/sys-cluster/hpx/hpx-1.1.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-if [ ${PV} == 9999 ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/STEllAR-GROUP/hpx.git"
-else
-	SRC_URI="http://stellar.cct.lsu.edu/files/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${PN}_${PV}"
-fi
-
-inherit cmake-utils fortran-2 multilib python-any-r1
-
-DESCRIPTION="C++ runtime system for parallel and distributed applications"
-HOMEPAGE="http://stellar.cct.lsu.edu/tag/hpx/"
-
-SLOT="0"
-LICENSE="Boost-1.0"
-IUSE="doc examples jemalloc papi +perftools tbb test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	tbb? ( dev-cpp/tbb )
-	>=dev-libs/boost-1.49
-	papi? ( dev-libs/papi )
-	perftools? ( >=dev-util/google-perftools-1.7.1 )
-	>=sys-apps/hwloc-1.8
-	>=sys-libs/libunwind-1
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-	doc? ( >=dev-libs/boost-1.56.0-r1:=[tools] )
-"
-REQUIRED_USE="
-	jemalloc? ( !perftools !tbb )
-	perftools? ( !jemalloc !tbb )
-	tbb? ( !jemalloc !perftools )
-	"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	CMAKE_BUILD_TYPE=Release
-	local mycmakeargs=(
-		-DHPX_BUILD_EXAMPLES=OFF
-		-DHPX_MALLOC=system
-		-DLIB=$(get_libdir)
-		-Dcmake_dir=cmake
-		-DHPX_BUILD_DOCUMENTATION=$(usex doc)
-		-DHPX_JEMALLOC=$(usex jemalloc)
-		-DBUILD_TESTING=$(usex test)
-		-DHPX_GOOGLE_PERFTOOLS=$(usex perftools)
-		-DHPX_PAPI=$(usex papi)
-	)
-
-	use perftools && mycmakeargs+=( -DHPX_MALLOC=tcmalloc )
-	use jemalloc && mycmakeargs+=( -DHPX_MALLOC=jemalloc )
-	use tbb && mycmakeargs+=( -DHPX_MALLOC=tbbmalloc )
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	# avoid over-suscribing
-	cmake-utils_src_make -j1 tests
-}
-
-src_install() {
-	cmake-utils_src_install
-	mv "${D}/usr/bin/spin" "${D}/usr/bin/hpx_spin"
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sys-cluster/hpx/hpx-1.2.0.ebuild b/sys-cluster/hpx/hpx-1.2.0.ebuild
deleted file mode 100644
index 0c4de411e176..000000000000
--- a/sys-cluster/hpx/hpx-1.2.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-if [ ${PV} == 9999 ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/STEllAR-GROUP/hpx.git"
-else
-	SRC_URI="http://stellar.cct.lsu.edu/files/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${PN}_${PV}"
-fi
-
-inherit cmake-utils fortran-2 multilib python-any-r1
-
-DESCRIPTION="C++ runtime system for parallel and distributed applications"
-HOMEPAGE="http://stellar.cct.lsu.edu/tag/hpx/"
-
-SLOT="0"
-LICENSE="Boost-1.0"
-IUSE="doc examples jemalloc papi +perftools tbb test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	tbb? ( dev-cpp/tbb )
-	>=dev-libs/boost-1.49
-	papi? ( dev-libs/papi )
-	perftools? ( >=dev-util/google-perftools-1.7.1 )
-	>=sys-apps/hwloc-1.8
-	>=sys-libs/libunwind-1
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-	doc? ( >=dev-libs/boost-1.56.0-r1:=[tools] )
-"
-REQUIRED_USE="
-	jemalloc? ( !perftools !tbb )
-	perftools? ( !jemalloc !tbb )
-	tbb? ( !jemalloc !perftools )
-	"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	CMAKE_BUILD_TYPE=Release
-	local mycmakeargs=(
-		-DHPX_BUILD_EXAMPLES=OFF
-		-DHPX_MALLOC=system
-		-DLIB=$(get_libdir)
-		-Dcmake_dir=cmake
-		-DHPX_BUILD_DOCUMENTATION=$(usex doc)
-		-DHPX_JEMALLOC=$(usex jemalloc)
-		-DBUILD_TESTING=$(usex test)
-		-DHPX_GOOGLE_PERFTOOLS=$(usex perftools)
-		-DHPX_PAPI=$(usex papi)
-	)
-
-	use perftools && mycmakeargs+=( -DHPX_MALLOC=tcmalloc )
-	use jemalloc && mycmakeargs+=( -DHPX_MALLOC=jemalloc )
-	use tbb && mycmakeargs+=( -DHPX_MALLOC=tbbmalloc )
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	# avoid over-suscribing
-	cmake-utils_src_make -j1 tests
-}
-
-src_install() {
-	cmake-utils_src_install
-	mv "${D}/usr/bin/spin" "${D}/usr/bin/hpx_spin"
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sys-cluster/hpx/hpx-1.2.1.ebuild b/sys-cluster/hpx/hpx-1.2.1.ebuild
index 64c2d82ce771..40cfca820e39 100644
--- a/sys-cluster/hpx/hpx-1.2.1.ebuild
+++ b/sys-cluster/hpx/hpx-1.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
@@ -13,7 +13,7 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${PN}_${PV}"
 fi
-inherit cmake-utils fortran-2 python-any-r1
+inherit cmake fortran-2 python-any-r1
 
 DESCRIPTION="C++ runtime system for parallel and distributed applications"
 HOMEPAGE="https://stellar.cct.lsu.edu/tag/hpx/"
@@ -64,16 +64,16 @@ src_configure() {
 		mycmakeargs+=( -DHPX_WITH_MALLOC=system )
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
 	# avoid over-suscribing
-	cmake-utils_src_make -j1 tests
+	cmake_build -j1 tests
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	if use examples; then
 		mv "${D}/usr/bin/spin" "${D}/usr/bin/hpx_spin" || die
 		insinto /usr/share/doc/${PF}
diff --git a/sys-cluster/hpx/hpx-9999.ebuild b/sys-cluster/hpx/hpx-9999.ebuild
index 64c2d82ce771..40cfca820e39 100644
--- a/sys-cluster/hpx/hpx-9999.ebuild
+++ b/sys-cluster/hpx/hpx-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
@@ -13,7 +13,7 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${PN}_${PV}"
 fi
-inherit cmake-utils fortran-2 python-any-r1
+inherit cmake fortran-2 python-any-r1
 
 DESCRIPTION="C++ runtime system for parallel and distributed applications"
 HOMEPAGE="https://stellar.cct.lsu.edu/tag/hpx/"
@@ -64,16 +64,16 @@ src_configure() {
 		mycmakeargs+=( -DHPX_WITH_MALLOC=system )
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
 	# avoid over-suscribing
-	cmake-utils_src_make -j1 tests
+	cmake_build -j1 tests
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	if use examples; then
 		mv "${D}/usr/bin/spin" "${D}/usr/bin/hpx_spin" || die
 		insinto /usr/share/doc/${PF}
diff --git a/sys-cluster/hpx/metadata.xml b/sys-cluster/hpx/metadata.xml
index 1a1ee0ef0fd7..af517a2b5293 100644
--- a/sys-cluster/hpx/metadata.xml
+++ b/sys-cluster/hpx/metadata.xml
@@ -10,9 +10,7 @@
   currently, Linux based systems, such as SMP nodes and conventional
   clusters.
 </longdescription>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="perftools">Use <pkg>dev-util/google-perftools</pkg> for
   memory allocation</flag>
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index 483f7455c0a4..fa1e1bf1bc7e 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -1,16 +1,10 @@
 AUX kube-apiserver.confd 116 BLAKE2B 2cf2dff516674ba4dc0763985a070b75e23f9af51e7334eedcb2593855e7481d5969ed458d322ac29de0e9a9c7f9f041911ee7aeca750ff77ce04fd60bf3a3d3 SHA512 302b2a7ec715967c0aa7d1c177d4e55b26e37ebba8d04dd37ecf627d20042fe91cd7e6192ff9d71422129b0ea54a9eec6046f505af550548bd450998924f37ee
 AUX kube-apiserver.initd 541 BLAKE2B ddddc86735a9f90a0c232f2631ac21c028045783c737d041a808fb5012522844614a40059524c472b9b50fd077253b75e2bcf33d69518d71428fcb7e27143fba SHA512 2863ad6d1d238b5e9557874cd3f5413108ed9424604cf026e2fd8c2fd66ba867ca9a3d98f67fdac54f335bacddf0479547b28f71aaa1db6580beff49290de110
 AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511a4623f85f01830c5e40d4ad4e44fe0b3f90d4143042d82bd83b0a2b11517e89037755ef2ad7afeeb23401bb60 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e
-DIST kubernetes-1.14.8.tar.gz 28096873 BLAKE2B a75fc2443475c9edc67328dc8a2c1b258ca02e675f665e4ea570889e4be76d6f55bfe8ca376b305c482dd12c7a7e9f9f8a452b69277d055b277ab37d24f8abdd SHA512 c751d04f59336186a9556f066bbd4c410cfd9748c2fdffaf14936d734a52de5cc044414d3f4d1e005914564858ceaac0451fd2360f1b9d97847d6f8515c50378
-DIST kubernetes-1.14.9.tar.gz 28099090 BLAKE2B 418e00594eb5d06c9e508054c95ac12e00bc431344c8eef7a8e016729a75f811d430dd00de1f6434ac79d6f5c784758edd062135066cd02c9ab55ba04be416b5 SHA512 61ffb34d0d3ed7543539b9c7339db1a04aa86a396f35a2fe214d64d772488146db8e1ee36a51efc629d6f1378745ec60c2f94051026b30a9b72604080f01b6f6
-DIST kubernetes-1.15.5.tar.gz 26658547 BLAKE2B a1b97329c7e8b7b54b682cb9cf5c35181a83fe7434dd02b4fc8731cd0a7abe67154a1f04ddf9f2e2bfa28a4e1b3940ebac167dc066b88565a9f12d7011966978 SHA512 2fe035e9cbef19582b1b5e732bf8afff2113281e1d4802a531233c8f6f04cd1538a9b59bc7f4407c0c483d06a5339b02f234337e453533b3e5c016a65f53d6b0
-DIST kubernetes-1.15.6.tar.gz 26665166 BLAKE2B 9e40db549d524a4e248479d5836aaa6063e44c0e01f1bbdfcf3bdc37e8f317badc0446148b8cc737c16790d93dd2827f48ab896d0ec36e1b265b598a67ecbae5 SHA512 f7b374bc0797a9c48535ffea28da1629de8734aa8884cf63ff4850ae5f63e64d55b89ceb6e2a29082bf7317ab742f8deed6333b2c21089e9e99e931d72e8f6b0
-DIST kubernetes-1.16.2.tar.gz 31202049 BLAKE2B e7bb9330c233959702545207ce3061559ecae6283332eae9eb57d38654a0b7a447d85ca016a674cf72b253c816662bffe2e04cf298ce43d3e5dd26d722783ac1 SHA512 44c600f3e9af64f66d2403340137cd162bfcc1ed30d5d6ad440b77be403656f624a1390489680134a7742626d3eb0affa92ff3e17c02ba2df91f7a75655046a9
-DIST kubernetes-1.16.3.tar.gz 31211177 BLAKE2B 816b7a4c3489b328d14ae149bdc71bcdc9a6c981ddff8d812b602d1976d12785355615f6ad43246cc201c6d7f3d5a19381d3e6cefba9358a754df81cf35bedca SHA512 3381249ab9b76849720252ddcc89565dd4f79c003c6e6f97b9cb39f7490acfd12110d21beeee4d5b7239769ace998d1949f8b25d70e42643c244b819d7b5c042
-EBUILD kube-apiserver-1.14.8.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
-EBUILD kube-apiserver-1.14.9.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
-EBUILD kube-apiserver-1.15.5.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
-EBUILD kube-apiserver-1.15.6.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
-EBUILD kube-apiserver-1.16.2.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
-EBUILD kube-apiserver-1.16.3.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
-MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
+DIST kubernetes-1.14.10.tar.gz 28106613 BLAKE2B 7ccb89c1390299a224a766a8004b4bfc95adb244ca93a2d7086ab0de76cfa6eef9b51cb35dfdabb9d429fbc1a7c0d06cbeb93cec979a8f15f5586cee90c2b5e5 SHA512 25ecc7bf737e7cbac6405042ced98ccf824ee9a59f290906b76594ab8742028a5b783e892a5b3a03b59a758641f2fe3dfe6a83d72c603103ec7ab0696e406dfc
+DIST kubernetes-1.15.7.tar.gz 26671514 BLAKE2B 7ef6f92ea90fd8f45f250dfa4e081a171ad76c72f4eae4b4e901cb8335259779b7546ac31f97eb2a45daf85f49fdd4408577b96a1e0fd750a5509eb0446bfa8e SHA512 a0fb9dca9b6993ac828427589f4e03e9431b97c2ce153cc00a6e5b669dced05bfe236f2ecb85b623359b4e910c662dc473cd3226dfc4e85bd2551fbabbdfc836
+DIST kubernetes-1.16.4.tar.gz 31220590 BLAKE2B 3ee3ab50f2a10c419b99f7f25072ad7b129741829d241ad788b343e5bd30ec3c9b07053755a2ec650227c0d26ae34f3d1d101cfd50ed6b16b3415a8233c8e4c0 SHA512 84768ffe3d4147082b3b151c7787498a78ee0e6aee537f5fb21c8e0e30e72b222d68942389063e8fc2a549aec423fc84a9696b3b70b9ae746a2b87a2f47297de
+EBUILD kube-apiserver-1.14.10.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
+EBUILD kube-apiserver-1.15.7.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
+EBUILD kube-apiserver-1.16.4.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
+MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.14.8.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.14.10.ebuild
index a1931590ff31..a1931590ff31 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.14.8.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.14.10.ebuild
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.15.6.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.15.6.ebuild
deleted file mode 100644
index a1931590ff31..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.15.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${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-apiserver/kube-apiserver-1.14.9.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.15.7.ebuild
index a1931590ff31..a1931590ff31 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.14.9.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.15.7.ebuild
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.16.2.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.16.2.ebuild
deleted file mode 100644
index a1931590ff31..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.16.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${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-apiserver/kube-apiserver-1.16.3.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.16.3.ebuild
deleted file mode 100644
index a1931590ff31..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.16.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${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-apiserver/kube-apiserver-1.15.5.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.16.4.ebuild
index a1931590ff31..a1931590ff31 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.15.5.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.16.4.ebuild
diff --git a/sys-cluster/kube-apiserver/metadata.xml b/sys-cluster/kube-apiserver/metadata.xml
index f3dec6944099..601df5439e13 100644
--- a/sys-cluster/kube-apiserver/metadata.xml
+++ b/sys-cluster/kube-apiserver/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">kubernetes/kubernetes</remote-id>
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index a28c599f83b5..5f023a769084 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -1,16 +1,10 @@
 AUX kube-controller-manager.confd 142 BLAKE2B d8d35c62bf5c04cc3f440e8b5fb8acab2cf815b25ac4e91354e3fce756a1955e71ec762fab1091074ef4233fff22667aba50417c0d6a896055f8f52b6630bb4e SHA512 b0227a7431018a6742b3931fda0f14b4a040107ecd6821c84593180919ba8a5af9b99b7a507645a5488792f14accd686acc4cc6f70a5084bbdfcdd494021aafc
 AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544f214921672e60fffa2d6f77dbeb1912b3d1d138f867d8118cef5ae0843b75d3859ebfc71a4defc2b4cf66426a58101 SHA512 7e3baab9b034e7048ed3cda8d09444c76369874cecc0a747fb5484c482fef464adb5ccc25fcb4481fb4aff68415a60462f6cbee2138810316f0cf822637676c1
 AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
-DIST kubernetes-1.14.8.tar.gz 28096873 BLAKE2B a75fc2443475c9edc67328dc8a2c1b258ca02e675f665e4ea570889e4be76d6f55bfe8ca376b305c482dd12c7a7e9f9f8a452b69277d055b277ab37d24f8abdd SHA512 c751d04f59336186a9556f066bbd4c410cfd9748c2fdffaf14936d734a52de5cc044414d3f4d1e005914564858ceaac0451fd2360f1b9d97847d6f8515c50378
-DIST kubernetes-1.14.9.tar.gz 28099090 BLAKE2B 418e00594eb5d06c9e508054c95ac12e00bc431344c8eef7a8e016729a75f811d430dd00de1f6434ac79d6f5c784758edd062135066cd02c9ab55ba04be416b5 SHA512 61ffb34d0d3ed7543539b9c7339db1a04aa86a396f35a2fe214d64d772488146db8e1ee36a51efc629d6f1378745ec60c2f94051026b30a9b72604080f01b6f6
-DIST kubernetes-1.15.5.tar.gz 26658547 BLAKE2B a1b97329c7e8b7b54b682cb9cf5c35181a83fe7434dd02b4fc8731cd0a7abe67154a1f04ddf9f2e2bfa28a4e1b3940ebac167dc066b88565a9f12d7011966978 SHA512 2fe035e9cbef19582b1b5e732bf8afff2113281e1d4802a531233c8f6f04cd1538a9b59bc7f4407c0c483d06a5339b02f234337e453533b3e5c016a65f53d6b0
-DIST kubernetes-1.15.6.tar.gz 26665166 BLAKE2B 9e40db549d524a4e248479d5836aaa6063e44c0e01f1bbdfcf3bdc37e8f317badc0446148b8cc737c16790d93dd2827f48ab896d0ec36e1b265b598a67ecbae5 SHA512 f7b374bc0797a9c48535ffea28da1629de8734aa8884cf63ff4850ae5f63e64d55b89ceb6e2a29082bf7317ab742f8deed6333b2c21089e9e99e931d72e8f6b0
-DIST kubernetes-1.16.2.tar.gz 31202049 BLAKE2B e7bb9330c233959702545207ce3061559ecae6283332eae9eb57d38654a0b7a447d85ca016a674cf72b253c816662bffe2e04cf298ce43d3e5dd26d722783ac1 SHA512 44c600f3e9af64f66d2403340137cd162bfcc1ed30d5d6ad440b77be403656f624a1390489680134a7742626d3eb0affa92ff3e17c02ba2df91f7a75655046a9
-DIST kubernetes-1.16.3.tar.gz 31211177 BLAKE2B 816b7a4c3489b328d14ae149bdc71bcdc9a6c981ddff8d812b602d1976d12785355615f6ad43246cc201c6d7f3d5a19381d3e6cefba9358a754df81cf35bedca SHA512 3381249ab9b76849720252ddcc89565dd4f79c003c6e6f97b9cb39f7490acfd12110d21beeee4d5b7239769ace998d1949f8b25d70e42643c244b819d7b5c042
-EBUILD kube-controller-manager-1.14.8.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
-EBUILD kube-controller-manager-1.14.9.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
-EBUILD kube-controller-manager-1.15.5.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
-EBUILD kube-controller-manager-1.15.6.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
-EBUILD kube-controller-manager-1.16.2.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
-EBUILD kube-controller-manager-1.16.3.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
-MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
+DIST kubernetes-1.14.10.tar.gz 28106613 BLAKE2B 7ccb89c1390299a224a766a8004b4bfc95adb244ca93a2d7086ab0de76cfa6eef9b51cb35dfdabb9d429fbc1a7c0d06cbeb93cec979a8f15f5586cee90c2b5e5 SHA512 25ecc7bf737e7cbac6405042ced98ccf824ee9a59f290906b76594ab8742028a5b783e892a5b3a03b59a758641f2fe3dfe6a83d72c603103ec7ab0696e406dfc
+DIST kubernetes-1.15.7.tar.gz 26671514 BLAKE2B 7ef6f92ea90fd8f45f250dfa4e081a171ad76c72f4eae4b4e901cb8335259779b7546ac31f97eb2a45daf85f49fdd4408577b96a1e0fd750a5509eb0446bfa8e SHA512 a0fb9dca9b6993ac828427589f4e03e9431b97c2ce153cc00a6e5b669dced05bfe236f2ecb85b623359b4e910c662dc473cd3226dfc4e85bd2551fbabbdfc836
+DIST kubernetes-1.16.4.tar.gz 31220590 BLAKE2B 3ee3ab50f2a10c419b99f7f25072ad7b129741829d241ad788b343e5bd30ec3c9b07053755a2ec650227c0d26ae34f3d1d101cfd50ed6b16b3415a8233c8e4c0 SHA512 84768ffe3d4147082b3b151c7787498a78ee0e6aee537f5fb21c8e0e30e72b222d68942389063e8fc2a549aec423fc84a9696b3b70b9ae746a2b87a2f47297de
+EBUILD kube-controller-manager-1.14.10.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
+EBUILD kube-controller-manager-1.15.7.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
+EBUILD kube-controller-manager-1.16.4.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
+MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.8.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.10.ebuild
index 6aa71f51b8b1..6aa71f51b8b1 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.8.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.10.ebuild
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.6.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.6.ebuild
deleted file mode 100644
index 6aa71f51b8b1..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${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-controller-manager/kube-controller-manager-1.14.9.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.7.ebuild
index 6aa71f51b8b1..6aa71f51b8b1 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.9.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.7.ebuild
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.16.2.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.16.2.ebuild
deleted file mode 100644
index 6aa71f51b8b1..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.16.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${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-controller-manager/kube-controller-manager-1.16.3.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.16.3.ebuild
deleted file mode 100644
index 6aa71f51b8b1..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.16.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${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-controller-manager/kube-controller-manager-1.15.5.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.16.4.ebuild
index 6aa71f51b8b1..6aa71f51b8b1 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.5.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.16.4.ebuild
diff --git a/sys-cluster/kube-controller-manager/metadata.xml b/sys-cluster/kube-controller-manager/metadata.xml
index f3dec6944099..601df5439e13 100644
--- a/sys-cluster/kube-controller-manager/metadata.xml
+++ b/sys-cluster/kube-controller-manager/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">kubernetes/kubernetes</remote-id>
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index a5faa57ab0e3..17720312e157 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -1,16 +1,10 @@
 AUX kube-proxy.confd 53 BLAKE2B 0cd5fc844dc21f63786ef21d972210ac02ea55165b05cef8810268f894e3466cea4d82c7882e56d6a0bf425311adbf6a55e3e3fe351b9a1a7ce1d9e1e087018b SHA512 4c8c34ae8668bcfa5167c2d2af006fc46b461a5dafb3ec5b64cb8cdf2a830c22ddb5cf806c93b1404f60dabf91b4153724947fa2d2c494376f20e637eeed5018
 AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe464d672d00ecf5b5fffd349a6affcd8ae3ea0ba06160be72f31cfa2d918c01050e83640fb9956917dc0 SHA512 088d91cd77e614f7857d65496f5b6d486741a8e3358b3e13bcd4203d35a76fa3aa390f658065e2826145525b6e83fcd33f8365a873e99b522f3ab7e8615ed364
 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
-DIST kubernetes-1.14.8.tar.gz 28096873 BLAKE2B a75fc2443475c9edc67328dc8a2c1b258ca02e675f665e4ea570889e4be76d6f55bfe8ca376b305c482dd12c7a7e9f9f8a452b69277d055b277ab37d24f8abdd SHA512 c751d04f59336186a9556f066bbd4c410cfd9748c2fdffaf14936d734a52de5cc044414d3f4d1e005914564858ceaac0451fd2360f1b9d97847d6f8515c50378
-DIST kubernetes-1.14.9.tar.gz 28099090 BLAKE2B 418e00594eb5d06c9e508054c95ac12e00bc431344c8eef7a8e016729a75f811d430dd00de1f6434ac79d6f5c784758edd062135066cd02c9ab55ba04be416b5 SHA512 61ffb34d0d3ed7543539b9c7339db1a04aa86a396f35a2fe214d64d772488146db8e1ee36a51efc629d6f1378745ec60c2f94051026b30a9b72604080f01b6f6
-DIST kubernetes-1.15.5.tar.gz 26658547 BLAKE2B a1b97329c7e8b7b54b682cb9cf5c35181a83fe7434dd02b4fc8731cd0a7abe67154a1f04ddf9f2e2bfa28a4e1b3940ebac167dc066b88565a9f12d7011966978 SHA512 2fe035e9cbef19582b1b5e732bf8afff2113281e1d4802a531233c8f6f04cd1538a9b59bc7f4407c0c483d06a5339b02f234337e453533b3e5c016a65f53d6b0
-DIST kubernetes-1.15.6.tar.gz 26665166 BLAKE2B 9e40db549d524a4e248479d5836aaa6063e44c0e01f1bbdfcf3bdc37e8f317badc0446148b8cc737c16790d93dd2827f48ab896d0ec36e1b265b598a67ecbae5 SHA512 f7b374bc0797a9c48535ffea28da1629de8734aa8884cf63ff4850ae5f63e64d55b89ceb6e2a29082bf7317ab742f8deed6333b2c21089e9e99e931d72e8f6b0
-DIST kubernetes-1.16.2.tar.gz 31202049 BLAKE2B e7bb9330c233959702545207ce3061559ecae6283332eae9eb57d38654a0b7a447d85ca016a674cf72b253c816662bffe2e04cf298ce43d3e5dd26d722783ac1 SHA512 44c600f3e9af64f66d2403340137cd162bfcc1ed30d5d6ad440b77be403656f624a1390489680134a7742626d3eb0affa92ff3e17c02ba2df91f7a75655046a9
-DIST kubernetes-1.16.3.tar.gz 31211177 BLAKE2B 816b7a4c3489b328d14ae149bdc71bcdc9a6c981ddff8d812b602d1976d12785355615f6ad43246cc201c6d7f3d5a19381d3e6cefba9358a754df81cf35bedca SHA512 3381249ab9b76849720252ddcc89565dd4f79c003c6e6f97b9cb39f7490acfd12110d21beeee4d5b7239769ace998d1949f8b25d70e42643c244b819d7b5c042
-EBUILD kube-proxy-1.14.8.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
-EBUILD kube-proxy-1.14.9.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
-EBUILD kube-proxy-1.15.5.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
-EBUILD kube-proxy-1.15.6.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
-EBUILD kube-proxy-1.16.2.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
-EBUILD kube-proxy-1.16.3.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
+DIST kubernetes-1.14.10.tar.gz 28106613 BLAKE2B 7ccb89c1390299a224a766a8004b4bfc95adb244ca93a2d7086ab0de76cfa6eef9b51cb35dfdabb9d429fbc1a7c0d06cbeb93cec979a8f15f5586cee90c2b5e5 SHA512 25ecc7bf737e7cbac6405042ced98ccf824ee9a59f290906b76594ab8742028a5b783e892a5b3a03b59a758641f2fe3dfe6a83d72c603103ec7ab0696e406dfc
+DIST kubernetes-1.15.7.tar.gz 26671514 BLAKE2B 7ef6f92ea90fd8f45f250dfa4e081a171ad76c72f4eae4b4e901cb8335259779b7546ac31f97eb2a45daf85f49fdd4408577b96a1e0fd750a5509eb0446bfa8e SHA512 a0fb9dca9b6993ac828427589f4e03e9431b97c2ce153cc00a6e5b669dced05bfe236f2ecb85b623359b4e910c662dc473cd3226dfc4e85bd2551fbabbdfc836
+DIST kubernetes-1.16.4.tar.gz 31220590 BLAKE2B 3ee3ab50f2a10c419b99f7f25072ad7b129741829d241ad788b343e5bd30ec3c9b07053755a2ec650227c0d26ae34f3d1d101cfd50ed6b16b3415a8233c8e4c0 SHA512 84768ffe3d4147082b3b151c7787498a78ee0e6aee537f5fb21c8e0e30e72b222d68942389063e8fc2a549aec423fc84a9696b3b70b9ae746a2b87a2f47297de
+EBUILD kube-proxy-1.14.10.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
+EBUILD kube-proxy-1.15.7.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
+EBUILD kube-proxy-1.16.4.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
 MISC metadata.xml 253 BLAKE2B 7fb80f1781f3e4a877895594e590e0b9ad50f4818bda46aab2f96a04ee7b8513e15f8e3f879ec1d842e23711b139641e971f83c6f81aae2e3618ce44e47a4b57 SHA512 763fdd8e496502c98ef116e903e1ec9e298a59683829835a663dc4e5c9ea54a0083e8dd24fab1155648b3fd59e133f78582bc3587e45377108171b95002cdd4d
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.14.8.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.14.10.ebuild
index f519690e8b2f..f519690e8b2f 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.14.8.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.14.10.ebuild
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.15.6.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.15.6.ebuild
deleted file mode 100644
index f519690e8b2f..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.15.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RDEPEND="net-firewall/conntrack-tools"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.14.9.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.15.7.ebuild
index f519690e8b2f..f519690e8b2f 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.14.9.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.15.7.ebuild
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.16.2.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.16.2.ebuild
deleted file mode 100644
index f519690e8b2f..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.16.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RDEPEND="net-firewall/conntrack-tools"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.16.3.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.16.3.ebuild
deleted file mode 100644
index f519690e8b2f..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.16.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RDEPEND="net-firewall/conntrack-tools"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.15.5.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.16.4.ebuild
index f519690e8b2f..f519690e8b2f 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.15.5.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.16.4.ebuild
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index 6d637903ecd8..2dbe84bf5e62 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -1,16 +1,10 @@
 AUX kube-scheduler.confd 133 BLAKE2B 6b88dfc011173f183a88a16d078cbb5d96d46c269129b483d650fd7dd63376e366825f483178c26e931db226478ce9d0b85412fc264d4d600a8232d0bac149e7 SHA512 d7326f34b26aaebf4b5c25a03abcff3bc3d397382ad4fed0f4718ee425e71399febf6fec6dc817813490671692d3f1b454fd5d14d9c47c3d41b0d3405a01a6c2
 AUX kube-scheduler.initd 548 BLAKE2B dd9373f659b87fcf12dca20527aebdb304a60ec559fd9fb9efcd0db8b3c155fdba2ce8a59461cd15ed3b4294cc5b335093e12d2b8411e400927e1307b37bc6d8 SHA512 151ea6f5cc36de9b83f0e5365579e33eea8002f9a03f5f61d195a349236e6baf192f701d3fb591b769aa90e8e1e620d525b20c95a1e8cda58d062971d8f587a3
 AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a28e9a5b02361cf4833982d4489364bd1291faa136df275988f02ce78c7b785c9209a54aec5eea6180b9041da0 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6
-DIST kubernetes-1.14.8.tar.gz 28096873 BLAKE2B a75fc2443475c9edc67328dc8a2c1b258ca02e675f665e4ea570889e4be76d6f55bfe8ca376b305c482dd12c7a7e9f9f8a452b69277d055b277ab37d24f8abdd SHA512 c751d04f59336186a9556f066bbd4c410cfd9748c2fdffaf14936d734a52de5cc044414d3f4d1e005914564858ceaac0451fd2360f1b9d97847d6f8515c50378
-DIST kubernetes-1.14.9.tar.gz 28099090 BLAKE2B 418e00594eb5d06c9e508054c95ac12e00bc431344c8eef7a8e016729a75f811d430dd00de1f6434ac79d6f5c784758edd062135066cd02c9ab55ba04be416b5 SHA512 61ffb34d0d3ed7543539b9c7339db1a04aa86a396f35a2fe214d64d772488146db8e1ee36a51efc629d6f1378745ec60c2f94051026b30a9b72604080f01b6f6
-DIST kubernetes-1.15.5.tar.gz 26658547 BLAKE2B a1b97329c7e8b7b54b682cb9cf5c35181a83fe7434dd02b4fc8731cd0a7abe67154a1f04ddf9f2e2bfa28a4e1b3940ebac167dc066b88565a9f12d7011966978 SHA512 2fe035e9cbef19582b1b5e732bf8afff2113281e1d4802a531233c8f6f04cd1538a9b59bc7f4407c0c483d06a5339b02f234337e453533b3e5c016a65f53d6b0
-DIST kubernetes-1.15.6.tar.gz 26665166 BLAKE2B 9e40db549d524a4e248479d5836aaa6063e44c0e01f1bbdfcf3bdc37e8f317badc0446148b8cc737c16790d93dd2827f48ab896d0ec36e1b265b598a67ecbae5 SHA512 f7b374bc0797a9c48535ffea28da1629de8734aa8884cf63ff4850ae5f63e64d55b89ceb6e2a29082bf7317ab742f8deed6333b2c21089e9e99e931d72e8f6b0
-DIST kubernetes-1.16.2.tar.gz 31202049 BLAKE2B e7bb9330c233959702545207ce3061559ecae6283332eae9eb57d38654a0b7a447d85ca016a674cf72b253c816662bffe2e04cf298ce43d3e5dd26d722783ac1 SHA512 44c600f3e9af64f66d2403340137cd162bfcc1ed30d5d6ad440b77be403656f624a1390489680134a7742626d3eb0affa92ff3e17c02ba2df91f7a75655046a9
-DIST kubernetes-1.16.3.tar.gz 31211177 BLAKE2B 816b7a4c3489b328d14ae149bdc71bcdc9a6c981ddff8d812b602d1976d12785355615f6ad43246cc201c6d7f3d5a19381d3e6cefba9358a754df81cf35bedca SHA512 3381249ab9b76849720252ddcc89565dd4f79c003c6e6f97b9cb39f7490acfd12110d21beeee4d5b7239769ace998d1949f8b25d70e42643c244b819d7b5c042
-EBUILD kube-scheduler-1.14.8.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
-EBUILD kube-scheduler-1.14.9.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
-EBUILD kube-scheduler-1.15.5.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
-EBUILD kube-scheduler-1.15.6.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
-EBUILD kube-scheduler-1.16.2.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
-EBUILD kube-scheduler-1.16.3.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
-MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
+DIST kubernetes-1.14.10.tar.gz 28106613 BLAKE2B 7ccb89c1390299a224a766a8004b4bfc95adb244ca93a2d7086ab0de76cfa6eef9b51cb35dfdabb9d429fbc1a7c0d06cbeb93cec979a8f15f5586cee90c2b5e5 SHA512 25ecc7bf737e7cbac6405042ced98ccf824ee9a59f290906b76594ab8742028a5b783e892a5b3a03b59a758641f2fe3dfe6a83d72c603103ec7ab0696e406dfc
+DIST kubernetes-1.15.7.tar.gz 26671514 BLAKE2B 7ef6f92ea90fd8f45f250dfa4e081a171ad76c72f4eae4b4e901cb8335259779b7546ac31f97eb2a45daf85f49fdd4408577b96a1e0fd750a5509eb0446bfa8e SHA512 a0fb9dca9b6993ac828427589f4e03e9431b97c2ce153cc00a6e5b669dced05bfe236f2ecb85b623359b4e910c662dc473cd3226dfc4e85bd2551fbabbdfc836
+DIST kubernetes-1.16.4.tar.gz 31220590 BLAKE2B 3ee3ab50f2a10c419b99f7f25072ad7b129741829d241ad788b343e5bd30ec3c9b07053755a2ec650227c0d26ae34f3d1d101cfd50ed6b16b3415a8233c8e4c0 SHA512 84768ffe3d4147082b3b151c7787498a78ee0e6aee537f5fb21c8e0e30e72b222d68942389063e8fc2a549aec423fc84a9696b3b70b9ae746a2b87a2f47297de
+EBUILD kube-scheduler-1.14.10.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
+EBUILD kube-scheduler-1.15.7.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
+EBUILD kube-scheduler-1.16.4.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
+MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.14.8.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.14.10.ebuild
index 2830ac40ff36..2830ac40ff36 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.14.8.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.14.10.ebuild
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.15.6.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.15.6.ebuild
deleted file mode 100644
index 2830ac40ff36..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.15.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${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/kube-scheduler-1.14.9.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.15.7.ebuild
index 2830ac40ff36..2830ac40ff36 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.14.9.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.15.7.ebuild
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.16.2.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.16.2.ebuild
deleted file mode 100644
index 2830ac40ff36..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.16.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${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/kube-scheduler-1.16.3.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.16.3.ebuild
deleted file mode 100644
index 2830ac40ff36..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.16.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${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/kube-scheduler-1.15.5.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.16.4.ebuild
index 2830ac40ff36..2830ac40ff36 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.15.5.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.16.4.ebuild
diff --git a/sys-cluster/kube-scheduler/metadata.xml b/sys-cluster/kube-scheduler/metadata.xml
index f3dec6944099..601df5439e13 100644
--- a/sys-cluster/kube-scheduler/metadata.xml
+++ b/sys-cluster/kube-scheduler/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">kubernetes/kubernetes</remote-id>
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index de08ed456625..4e4ad6be4d6c 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,13 +1,11 @@
-DIST kubernetes-1.14.8.tar.gz 28096873 BLAKE2B a75fc2443475c9edc67328dc8a2c1b258ca02e675f665e4ea570889e4be76d6f55bfe8ca376b305c482dd12c7a7e9f9f8a452b69277d055b277ab37d24f8abdd SHA512 c751d04f59336186a9556f066bbd4c410cfd9748c2fdffaf14936d734a52de5cc044414d3f4d1e005914564858ceaac0451fd2360f1b9d97847d6f8515c50378
+DIST kubernetes-1.14.10.tar.gz 28106613 BLAKE2B 7ccb89c1390299a224a766a8004b4bfc95adb244ca93a2d7086ab0de76cfa6eef9b51cb35dfdabb9d429fbc1a7c0d06cbeb93cec979a8f15f5586cee90c2b5e5 SHA512 25ecc7bf737e7cbac6405042ced98ccf824ee9a59f290906b76594ab8742028a5b783e892a5b3a03b59a758641f2fe3dfe6a83d72c603103ec7ab0696e406dfc
 DIST kubernetes-1.14.9.tar.gz 28099090 BLAKE2B 418e00594eb5d06c9e508054c95ac12e00bc431344c8eef7a8e016729a75f811d430dd00de1f6434ac79d6f5c784758edd062135066cd02c9ab55ba04be416b5 SHA512 61ffb34d0d3ed7543539b9c7339db1a04aa86a396f35a2fe214d64d772488146db8e1ee36a51efc629d6f1378745ec60c2f94051026b30a9b72604080f01b6f6
-DIST kubernetes-1.15.5.tar.gz 26658547 BLAKE2B a1b97329c7e8b7b54b682cb9cf5c35181a83fe7434dd02b4fc8731cd0a7abe67154a1f04ddf9f2e2bfa28a4e1b3940ebac167dc066b88565a9f12d7011966978 SHA512 2fe035e9cbef19582b1b5e732bf8afff2113281e1d4802a531233c8f6f04cd1538a9b59bc7f4407c0c483d06a5339b02f234337e453533b3e5c016a65f53d6b0
-DIST kubernetes-1.15.6.tar.gz 26665166 BLAKE2B 9e40db549d524a4e248479d5836aaa6063e44c0e01f1bbdfcf3bdc37e8f317badc0446148b8cc737c16790d93dd2827f48ab896d0ec36e1b265b598a67ecbae5 SHA512 f7b374bc0797a9c48535ffea28da1629de8734aa8884cf63ff4850ae5f63e64d55b89ceb6e2a29082bf7317ab742f8deed6333b2c21089e9e99e931d72e8f6b0
-DIST kubernetes-1.16.2.tar.gz 31202049 BLAKE2B e7bb9330c233959702545207ce3061559ecae6283332eae9eb57d38654a0b7a447d85ca016a674cf72b253c816662bffe2e04cf298ce43d3e5dd26d722783ac1 SHA512 44c600f3e9af64f66d2403340137cd162bfcc1ed30d5d6ad440b77be403656f624a1390489680134a7742626d3eb0affa92ff3e17c02ba2df91f7a75655046a9
-DIST kubernetes-1.16.3.tar.gz 31211177 BLAKE2B 816b7a4c3489b328d14ae149bdc71bcdc9a6c981ddff8d812b602d1976d12785355615f6ad43246cc201c6d7f3d5a19381d3e6cefba9358a754df81cf35bedca SHA512 3381249ab9b76849720252ddcc89565dd4f79c003c6e6f97b9cb39f7490acfd12110d21beeee4d5b7239769ace998d1949f8b25d70e42643c244b819d7b5c042
-EBUILD kubectl-1.14.8.ebuild 1254 BLAKE2B 3184f7cccfcc48fa97f23af40cdc5fbf6903741a78c1c1936e8aa1915b0e7d1f4ad8e263769eda8093a0b9cc2224c4992c201e5df0b214d88235e605223e38a3 SHA512 4392b86b8ef111139cea7abf6017becd26b292e2f0b3c4b0bbdc124ba5308752c4935049e7cf0cab76ca8d41b74bfc51eb35a72e1ac3010ddc9d9d9e4bdf1d78
-EBUILD kubectl-1.14.9.ebuild 1255 BLAKE2B ac9e05e1da4524183f369898e5e4e492e43f8c17b1e2ebf71c7594cf7a55bbfcb5a4d19a8fd855e760028a722c0832c0e60299e97748c7bff599202e8e0d83e0 SHA512 25390c464c6b280185b525bb3a978e8e80b8309a174746603889627e18f9d564548a42a39600eac8ac39d4952c4ffc3e52add133061a9e4a4afcfe7d936184e3
-EBUILD kubectl-1.15.5.ebuild 1287 BLAKE2B 7ad8382c1d26cf19add47a321d36002be4af02839058cede08914b060487537d3d96364a5230a9e24f2e6c8043ab0adb3f0e443ab310462507fe880fdf35998f SHA512 f2771b09d63bd9b4a5ff836d45dbc44d92c4de6915f008755cc9eed84f47901ed0d0b1ec250849261c6f6fb209fc0bfba0cb8c8a3244e761f5d07dcf00d294e6
-EBUILD kubectl-1.15.6.ebuild 1287 BLAKE2B 7ad8382c1d26cf19add47a321d36002be4af02839058cede08914b060487537d3d96364a5230a9e24f2e6c8043ab0adb3f0e443ab310462507fe880fdf35998f SHA512 f2771b09d63bd9b4a5ff836d45dbc44d92c4de6915f008755cc9eed84f47901ed0d0b1ec250849261c6f6fb209fc0bfba0cb8c8a3244e761f5d07dcf00d294e6
-EBUILD kubectl-1.16.2.ebuild 1287 BLAKE2B 7ad8382c1d26cf19add47a321d36002be4af02839058cede08914b060487537d3d96364a5230a9e24f2e6c8043ab0adb3f0e443ab310462507fe880fdf35998f SHA512 f2771b09d63bd9b4a5ff836d45dbc44d92c4de6915f008755cc9eed84f47901ed0d0b1ec250849261c6f6fb209fc0bfba0cb8c8a3244e761f5d07dcf00d294e6
-EBUILD kubectl-1.16.3.ebuild 1287 BLAKE2B 7ad8382c1d26cf19add47a321d36002be4af02839058cede08914b060487537d3d96364a5230a9e24f2e6c8043ab0adb3f0e443ab310462507fe880fdf35998f SHA512 f2771b09d63bd9b4a5ff836d45dbc44d92c4de6915f008755cc9eed84f47901ed0d0b1ec250849261c6f6fb209fc0bfba0cb8c8a3244e761f5d07dcf00d294e6
-MISC metadata.xml 331 BLAKE2B 5af758a2aff067b1d7e94cb6d87a27fb96825c56490b5a4c7d9554cbb5057cf10b0dfb7d069f3edf8f7bcdce88b0f6b4286c4622c3cdcf5e5b283c75760f6a1d SHA512 d44cef89f9f902c706b0f9c0c4106bfd6ca094d64c273d0a13da53aec7ba2b238cd6ff489f13765e895ee4a6f2bb4638436839c7c60cce2ece3013fdc27232a4
+DIST kubernetes-1.15.7.tar.gz 26671514 BLAKE2B 7ef6f92ea90fd8f45f250dfa4e081a171ad76c72f4eae4b4e901cb8335259779b7546ac31f97eb2a45daf85f49fdd4408577b96a1e0fd750a5509eb0446bfa8e SHA512 a0fb9dca9b6993ac828427589f4e03e9431b97c2ce153cc00a6e5b669dced05bfe236f2ecb85b623359b4e910c662dc473cd3226dfc4e85bd2551fbabbdfc836
+DIST kubernetes-1.16.4.tar.gz 31220590 BLAKE2B 3ee3ab50f2a10c419b99f7f25072ad7b129741829d241ad788b343e5bd30ec3c9b07053755a2ec650227c0d26ae34f3d1d101cfd50ed6b16b3415a8233c8e4c0 SHA512 84768ffe3d4147082b3b151c7787498a78ee0e6aee537f5fb21c8e0e30e72b222d68942389063e8fc2a549aec423fc84a9696b3b70b9ae746a2b87a2f47297de
+DIST kubernetes-1.17.0.tar.gz 31727453 BLAKE2B 692937c3153338bc290768eda1d3dab0cb5afdc329b795831d5e144eb7a28d40a92403ab82361d010c36e2b31d8fa1eb0047762258194d34f10841107de96cd9 SHA512 906cdae9bf9ca04cd8b1ce869fa7e7af575127ccf1616b070a29d1a32861f96672c8f55e955942a86722d64a0a269cecf52707f6e5b1d853badfe28f10e1628f
+EBUILD kubectl-1.14.10.ebuild 1255 BLAKE2B ac9e05e1da4524183f369898e5e4e492e43f8c17b1e2ebf71c7594cf7a55bbfcb5a4d19a8fd855e760028a722c0832c0e60299e97748c7bff599202e8e0d83e0 SHA512 25390c464c6b280185b525bb3a978e8e80b8309a174746603889627e18f9d564548a42a39600eac8ac39d4952c4ffc3e52add133061a9e4a4afcfe7d936184e3
+EBUILD kubectl-1.14.9.ebuild 1254 BLAKE2B 3184f7cccfcc48fa97f23af40cdc5fbf6903741a78c1c1936e8aa1915b0e7d1f4ad8e263769eda8093a0b9cc2224c4992c201e5df0b214d88235e605223e38a3 SHA512 4392b86b8ef111139cea7abf6017becd26b292e2f0b3c4b0bbdc124ba5308752c4935049e7cf0cab76ca8d41b74bfc51eb35a72e1ac3010ddc9d9d9e4bdf1d78
+EBUILD kubectl-1.15.7.ebuild 1287 BLAKE2B 7ad8382c1d26cf19add47a321d36002be4af02839058cede08914b060487537d3d96364a5230a9e24f2e6c8043ab0adb3f0e443ab310462507fe880fdf35998f SHA512 f2771b09d63bd9b4a5ff836d45dbc44d92c4de6915f008755cc9eed84f47901ed0d0b1ec250849261c6f6fb209fc0bfba0cb8c8a3244e761f5d07dcf00d294e6
+EBUILD kubectl-1.16.4.ebuild 1287 BLAKE2B 7ad8382c1d26cf19add47a321d36002be4af02839058cede08914b060487537d3d96364a5230a9e24f2e6c8043ab0adb3f0e443ab310462507fe880fdf35998f SHA512 f2771b09d63bd9b4a5ff836d45dbc44d92c4de6915f008755cc9eed84f47901ed0d0b1ec250849261c6f6fb209fc0bfba0cb8c8a3244e761f5d07dcf00d294e6
+EBUILD kubectl-1.17.0.ebuild 1255 BLAKE2B 4ab4613acda0f351adc829d725e228ecb22d0f82fc521fad83ed81e74d33ca67d14fd32cee074ae2eaf782fc85b88ca94a1754844ed781ffc73223abeb56d787 SHA512 170a34f293dcf44cf5c281653d055107036e75061100adc0f34d52c3364813db8a1779e7028fc2c6d812993df9531047060a5f9e60a80cf4da5ff807f1033b27
+MISC metadata.xml 251 BLAKE2B 8ea7ae1d539221d71ae4b523ad3bd117c1c89b20f69eb9a11b179aa887cfc308fc24fede0193b4bf7e7038d76ee0da41067a41c2d8ec095131f5baf68bdb844e SHA512 82a9175b94e1176358987403966d28ca36eb21abbab0a42296ced36413eab0dd57d4afac43fc56ecff687ae426a0b41237e189962e1a90e553b2a39a65d12706
diff --git a/sys-cluster/kubectl/kubectl-1.14.8.ebuild b/sys-cluster/kubectl/kubectl-1.14.10.ebuild
index f7acff2e23b4..7a61b25dce90 100644
--- a/sys-cluster/kubectl/kubectl-1.14.8.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.14.10.ebuild
@@ -6,7 +6,7 @@ inherit golang-build golang-vcs-snapshot bash-completion-r1
 
 EGO_PN="k8s.io/kubernetes"
 ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 
 DESCRIPTION="CLI to run commands against Kubernetes clusters"
 HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
diff --git a/sys-cluster/kubectl/kubectl-1.14.9.ebuild b/sys-cluster/kubectl/kubectl-1.14.9.ebuild
index 7a61b25dce90..f7acff2e23b4 100644
--- a/sys-cluster/kubectl/kubectl-1.14.9.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.14.9.ebuild
@@ -6,7 +6,7 @@ inherit golang-build golang-vcs-snapshot bash-completion-r1
 
 EGO_PN="k8s.io/kubernetes"
 ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DESCRIPTION="CLI to run commands against Kubernetes clusters"
 HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
diff --git a/sys-cluster/kubectl/kubectl-1.15.5.ebuild b/sys-cluster/kubectl/kubectl-1.15.7.ebuild
index 2ab1aefbcfc3..2ab1aefbcfc3 100644
--- a/sys-cluster/kubectl/kubectl-1.15.5.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.15.7.ebuild
diff --git a/sys-cluster/kubectl/kubectl-1.16.3.ebuild b/sys-cluster/kubectl/kubectl-1.16.3.ebuild
deleted file mode 100644
index 2ab1aefbcfc3..000000000000
--- a/sys-cluster/kubectl/kubectl-1.16.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.12
-	dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-	rm src/${EGO_PN}/go.mod || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	popd || die
-}
diff --git a/sys-cluster/kubectl/kubectl-1.15.6.ebuild b/sys-cluster/kubectl/kubectl-1.16.4.ebuild
index 2ab1aefbcfc3..2ab1aefbcfc3 100644
--- a/sys-cluster/kubectl/kubectl-1.15.6.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.16.4.ebuild
diff --git a/sys-cluster/kubectl/kubectl-1.16.2.ebuild b/sys-cluster/kubectl/kubectl-1.17.0.ebuild
index 2ab1aefbcfc3..7f668c0bebf8 100644
--- a/sys-cluster/kubectl/kubectl-1.16.2.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.17.0.ebuild
@@ -16,7 +16,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 
-DEPEND=">=dev-lang/go-1.12
+DEPEND=">=dev-lang/go-1.13
 	dev-go/go-bindata"
 
 RESTRICT="test"
@@ -25,7 +25,6 @@ src_prepare() {
 	default
 	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
 	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-	rm src/${EGO_PN}/go.mod || die
 }
 
 src_compile() {
diff --git a/sys-cluster/kubectl/metadata.xml b/sys-cluster/kubectl/metadata.xml
index 417822e21b70..14c570095b81 100644
--- a/sys-cluster/kubectl/metadata.xml
+++ b/sys-cluster/kubectl/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="github">kubernetes/kubernetes</remote-id>
 	</upstream>
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index bd9bae4df9b8..a27f9167c18c 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -3,16 +3,12 @@ AUX kubelet.env 547 BLAKE2B db9144a0e155450f08a665700edbb05f3fa093d209f72320fdbc
 AUX kubelet.initd 520 BLAKE2B 50edf888fed020a02f099189f8a5bdde54a4bfa2a00585489864c262d90ad8347763753f99eccec6fe6670c6fa016674dee4dea0fa838991abb503db97bd983a SHA512 c6b9bcdb6d063728ef2e9d67673ea29c0972e70e446be9c020cfd277a7bbcfc955a5ad7a72ab0ca1579a4d04b0fc4ac71ee20e6dba9d9a9a9099efcad3c139d0
 AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba83207ae89aae4f2e151a8b32e21b8d5e92229cccd7b7aa2676328d3d1a5fa80cadde65fe80a8cde10535d4 SHA512 05ce9ea16d2ddf8e255adb406556c37bc04dcfc457a132a78d31deaed78963f4e1f31555f781b706909c02815a04370d5c0e02614eb79d602b1cb827cf2471d5
 AUX kubelet.service 642 BLAKE2B 9f0fa5db48c09c2525cbc556cd520660302408a43aceb6c11da3a191b4b21607e824e46d9805b12b57a0ac7878c7da94d0cb86c69cd949814c77bb217973c6f1 SHA512 770cadae6afb68f0556c7c5969643642bbf09b596ff49d969d31b8d9f0d8907d6931eb7fb14485c78a3f75682e44e2355c7e51973a0dfdd1e665816f04ba21ae
-DIST kubernetes-1.14.8.tar.gz 28096873 BLAKE2B a75fc2443475c9edc67328dc8a2c1b258ca02e675f665e4ea570889e4be76d6f55bfe8ca376b305c482dd12c7a7e9f9f8a452b69277d055b277ab37d24f8abdd SHA512 c751d04f59336186a9556f066bbd4c410cfd9748c2fdffaf14936d734a52de5cc044414d3f4d1e005914564858ceaac0451fd2360f1b9d97847d6f8515c50378
+DIST kubernetes-1.14.10.tar.gz 28106613 BLAKE2B 7ccb89c1390299a224a766a8004b4bfc95adb244ca93a2d7086ab0de76cfa6eef9b51cb35dfdabb9d429fbc1a7c0d06cbeb93cec979a8f15f5586cee90c2b5e5 SHA512 25ecc7bf737e7cbac6405042ced98ccf824ee9a59f290906b76594ab8742028a5b783e892a5b3a03b59a758641f2fe3dfe6a83d72c603103ec7ab0696e406dfc
 DIST kubernetes-1.14.9.tar.gz 28099090 BLAKE2B 418e00594eb5d06c9e508054c95ac12e00bc431344c8eef7a8e016729a75f811d430dd00de1f6434ac79d6f5c784758edd062135066cd02c9ab55ba04be416b5 SHA512 61ffb34d0d3ed7543539b9c7339db1a04aa86a396f35a2fe214d64d772488146db8e1ee36a51efc629d6f1378745ec60c2f94051026b30a9b72604080f01b6f6
-DIST kubernetes-1.15.5.tar.gz 26658547 BLAKE2B a1b97329c7e8b7b54b682cb9cf5c35181a83fe7434dd02b4fc8731cd0a7abe67154a1f04ddf9f2e2bfa28a4e1b3940ebac167dc066b88565a9f12d7011966978 SHA512 2fe035e9cbef19582b1b5e732bf8afff2113281e1d4802a531233c8f6f04cd1538a9b59bc7f4407c0c483d06a5339b02f234337e453533b3e5c016a65f53d6b0
-DIST kubernetes-1.15.6.tar.gz 26665166 BLAKE2B 9e40db549d524a4e248479d5836aaa6063e44c0e01f1bbdfcf3bdc37e8f317badc0446148b8cc737c16790d93dd2827f48ab896d0ec36e1b265b598a67ecbae5 SHA512 f7b374bc0797a9c48535ffea28da1629de8734aa8884cf63ff4850ae5f63e64d55b89ceb6e2a29082bf7317ab742f8deed6333b2c21089e9e99e931d72e8f6b0
-DIST kubernetes-1.16.2.tar.gz 31202049 BLAKE2B e7bb9330c233959702545207ce3061559ecae6283332eae9eb57d38654a0b7a447d85ca016a674cf72b253c816662bffe2e04cf298ce43d3e5dd26d722783ac1 SHA512 44c600f3e9af64f66d2403340137cd162bfcc1ed30d5d6ad440b77be403656f624a1390489680134a7742626d3eb0affa92ff3e17c02ba2df91f7a75655046a9
-DIST kubernetes-1.16.3.tar.gz 31211177 BLAKE2B 816b7a4c3489b328d14ae149bdc71bcdc9a6c981ddff8d812b602d1976d12785355615f6ad43246cc201c6d7f3d5a19381d3e6cefba9358a754df81cf35bedca SHA512 3381249ab9b76849720252ddcc89565dd4f79c003c6e6f97b9cb39f7490acfd12110d21beeee4d5b7239769ace998d1949f8b25d70e42643c244b819d7b5c042
-EBUILD kubelet-1.14.8.ebuild 1370 BLAKE2B 266582d9525e760a83c267cee55e51402121c8b70f5392cfb428eb47da7a5087a3d8c419f22ee8d1f17ff8471e610b0cb29605079118f64470b0b3ebc4198731 SHA512 8efbd5783cf009f22ee4687d20fb09ad495cd8cb65be297c168f47871ed1d7a945066ad49b114511987d97c6196dc30c58e774a9ddbee3d5b292807ec9abae3a
-EBUILD kubelet-1.14.9.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
-EBUILD kubelet-1.15.5.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
-EBUILD kubelet-1.15.6.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
-EBUILD kubelet-1.16.2.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
-EBUILD kubelet-1.16.3.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
-MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
+DIST kubernetes-1.15.7.tar.gz 26671514 BLAKE2B 7ef6f92ea90fd8f45f250dfa4e081a171ad76c72f4eae4b4e901cb8335259779b7546ac31f97eb2a45daf85f49fdd4408577b96a1e0fd750a5509eb0446bfa8e SHA512 a0fb9dca9b6993ac828427589f4e03e9431b97c2ce153cc00a6e5b669dced05bfe236f2ecb85b623359b4e910c662dc473cd3226dfc4e85bd2551fbabbdfc836
+DIST kubernetes-1.16.4.tar.gz 31220590 BLAKE2B 3ee3ab50f2a10c419b99f7f25072ad7b129741829d241ad788b343e5bd30ec3c9b07053755a2ec650227c0d26ae34f3d1d101cfd50ed6b16b3415a8233c8e4c0 SHA512 84768ffe3d4147082b3b151c7787498a78ee0e6aee537f5fb21c8e0e30e72b222d68942389063e8fc2a549aec423fc84a9696b3b70b9ae746a2b87a2f47297de
+EBUILD kubelet-1.14.10.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
+EBUILD kubelet-1.14.9.ebuild 1370 BLAKE2B 266582d9525e760a83c267cee55e51402121c8b70f5392cfb428eb47da7a5087a3d8c419f22ee8d1f17ff8471e610b0cb29605079118f64470b0b3ebc4198731 SHA512 8efbd5783cf009f22ee4687d20fb09ad495cd8cb65be297c168f47871ed1d7a945066ad49b114511987d97c6196dc30c58e774a9ddbee3d5b292807ec9abae3a
+EBUILD kubelet-1.15.7.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
+EBUILD kubelet-1.16.4.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
+MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kubelet/kubelet-1.15.5.ebuild b/sys-cluster/kubelet/kubelet-1.14.10.ebuild
index f38ce59e625d..f38ce59e625d 100644
--- a/sys-cluster/kubelet/kubelet-1.15.5.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.14.10.ebuild
diff --git a/sys-cluster/kubelet/kubelet-1.14.8.ebuild b/sys-cluster/kubelet/kubelet-1.14.8.ebuild
deleted file mode 100644
index 447655a3a284..000000000000
--- a/sys-cluster/kubelet/kubelet-1.14.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot systemd
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="amd64"
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d"  -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.14.9.ebuild b/sys-cluster/kubelet/kubelet-1.14.9.ebuild
index f38ce59e625d..447655a3a284 100644
--- a/sys-cluster/kubelet/kubelet-1.14.9.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.14.9.ebuild
@@ -6,7 +6,7 @@ inherit golang-build golang-vcs-snapshot systemd
 
 EGO_PN="k8s.io/kubernetes"
 ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DESCRIPTION="Kubernetes Node Agent"
 HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
diff --git a/sys-cluster/kubelet/kubelet-1.15.6.ebuild b/sys-cluster/kubelet/kubelet-1.15.7.ebuild
index f38ce59e625d..f38ce59e625d 100644
--- a/sys-cluster/kubelet/kubelet-1.15.6.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.15.7.ebuild
diff --git a/sys-cluster/kubelet/kubelet-1.16.3.ebuild b/sys-cluster/kubelet/kubelet-1.16.3.ebuild
deleted file mode 100644
index f38ce59e625d..000000000000
--- a/sys-cluster/kubelet/kubelet-1.16.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot systemd
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d"  -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.16.2.ebuild b/sys-cluster/kubelet/kubelet-1.16.4.ebuild
index f38ce59e625d..f38ce59e625d 100644
--- a/sys-cluster/kubelet/kubelet-1.16.2.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.16.4.ebuild
diff --git a/sys-cluster/kubelet/metadata.xml b/sys-cluster/kubelet/metadata.xml
index f3dec6944099..601df5439e13 100644
--- a/sys-cluster/kubelet/metadata.xml
+++ b/sys-cluster/kubelet/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">kubernetes/kubernetes</remote-id>
diff --git a/sys-cluster/libqb/Manifest b/sys-cluster/libqb/Manifest
index c76e5c1fbd05..a3f598de0005 100644
--- a/sys-cluster/libqb/Manifest
+++ b/sys-cluster/libqb/Manifest
@@ -1,7 +1,9 @@
 DIST libqb-0.17.2.tar.xz 373540 BLAKE2B b9d751fca21cc25798a24207740b14722502cbb918cc652cd33b0159a9bd1254a8a64bc73684ae3274a2cf346db5b19924cf010ba487f4c6a9a5f9deade792c4 SHA512 9c6dce7d18aa4da31594faecd0ea2737c2beefa749290094f733fe89ac40f094ec6409f310c534b8144d500e8c204c328386eaf1029995698d7019c014433443
 DIST libqb-1.0.1.tar.xz 438204 BLAKE2B be4d4dbe624721a6434f7e3023bcaef017e1358f67fa308e4107bd96469675eca51b5787f498857d22104e3ffa55ded9c44fe320c37fec639a84648c1f517223 SHA512 9afdf5b7064f4e79f70e3c21d1ae954d1444d202d5903bd84866e502b2afc218d4a84fd21fab637a198357e1dad5da94814a6c0bdaa0ba6ac4a24ff40422c185
 DIST libqb-1.0.5.tar.xz 488516 BLAKE2B 96f61ce681d0c259e8df38f35c04349ab3b1199f62c2311d60c6f229bf15e8f62825c965a4847cbda4701119fc7ae3c68cc3a7187f927f8ddf7496cf1931c7c2 SHA512 a695bc4c913a32d47535cb2d8812f14a39732cae32651521a8f7b6d05c4202bfc28a477c88875bbfbe1a0238cd33f1fe64f2d2217b0c27cf11acf7233fc2cbdf
+DIST libqb-1.9.0.tar.gz 225147 BLAKE2B d8200d5eec8c05a18675de585e2f85694d3d062d82afca38c421859e3e0287d1691fe9726a75d3726afc58a94765f6a201f8fb51bf1ed25c1cfeaeb326e6f6d0 SHA512 9bdf2087f610a7a02b976312d60391e1c53ebd3f36a897cdc3fcf818f666f772d63386b52bd11ed4e5ea52fa4775231ab7125359a270451f925b3821d9b8e3ee
 EBUILD libqb-0.17.2.ebuild 1155 BLAKE2B 3028a41671305e4202f7535905fb0d9636659456c254a7817d26ed8f1c77210d0bf551bd86a748e5ef114055a0ca2964155bb26f119a8af5c10b1cd71addf2f1 SHA512 89420a61581c365561d5cb25601efd84c0ef331e4b8666a80e64fc4d83b106e6518ae11d98079b5a37a8e63303e11186522fa45448c4751da7f4e7e95826270c
 EBUILD libqb-1.0.1.ebuild 1167 BLAKE2B cb36195482930926022160f4fcc37636f83726daee2a56f382370341e2b9a4729e875929a1f0a014b6d46511d920727b9c72b4ca838c4bca3bb70cb70d9f0ad0 SHA512 f6fa8cd1e1d2513827bacb46898596072bc3b5c2b9369b3ed29164585a83e4051aaa82e5d691f346d7c39ba3c63bac23c36dccbcd171d725c656b6bbd55a8dc1
 EBUILD libqb-1.0.5.ebuild 1004 BLAKE2B 8aeaecd43035bd49dc1ba587aa435fc295aa5bf59826bbb72d9c922f9b822f89c8dc046add84fd92639aa11ee88543eb6c4bdbd274def5e0461943c6fed141a7 SHA512 6101d690fd176d773a21e7b357ca9be5100a028b46736db385c22f5342a0a8f4f0b250cc9182f2b31460dd0f4cbfc211fd4cee6f181edcac0ec1b57e5ef18399
+EBUILD libqb-1.9.0.ebuild 1324 BLAKE2B c8d226238ef2a15b55e7796bc66dbd168bf538e6bd2ea00558bcb92073a2b3932959d09ceb0a6637e5eb6c5ba6cd8657be1a0d2636d1e54537fb7563a287a042 SHA512 d8b337bd282416ba5786035b22d89d652fe088350e7e44718e1ff3de6f452343f77b095516cc307c14fce4e8a1f687fc029e4099b0aa3c0c6e398b94cfa701f1
 MISC metadata.xml 339 BLAKE2B c62f10b2ef4d7efe87b20e68a511c136192cdf33cddb9dee961099a44c26179f78ccd2804dacc21f6e72c2a5266f2274b332f656c3e5a1ad4f0fdad7ad33a0ab SHA512 39cccac769c39f6b8f90500c1b8f21e6ab65429ec1d992e7aa0025bc161d1ceffa28796accba321af01b75671c11ae6cacb4c8b4ab5ef14dbc8ef103dfc9f0b3
diff --git a/sys-cluster/libqb/libqb-1.9.0.ebuild b/sys-cluster/libqb/libqb-1.9.0.ebuild
new file mode 100644
index 000000000000..6ae629bdc2fe
--- /dev/null
+++ b/sys-cluster/libqb/libqb-1.9.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Library providing high performance logging, tracing, ipc, and poll"
+HOMEPAGE="https://github.com/ClusterLabs/libqb"
+
+# Avoiding release tarball due to https://github.com/ClusterLabs/libqb/issues/375
+# Please re-add ChangeLog to DOCS when switching back
+SRC_URI="https://github.com/ClusterLabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/20"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug doc examples systemd test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/glib:2"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	test? ( dev-libs/check )
+	doc? ( app-doc/doxygen[dot] )"
+
+DOCS=( README.markdown )
+
+src_prepare() {
+	default
+
+	# Skip installation of text documents without value
+	sed -e '/dist_doc_DATA/d' -i Makefile.am || die
+
+	# Do not append version suffix "-yank"
+	sed 's|1-yank|1|' -i configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable systemd systemd-journal) \
+		$(use_enable debug)
+}
+
+src_compile() {
+	default
+	use doc && emake doxygen
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.c
+	fi
+
+	use doc && HTML_DOCS=("docs/html/.")
+	einstalldocs
+}
diff --git a/sys-cluster/minikube/Manifest b/sys-cluster/minikube/Manifest
index c586fc432eed..c6ee7e674df4 100644
--- a/sys-cluster/minikube/Manifest
+++ b/sys-cluster/minikube/Manifest
@@ -92,6 +92,8 @@ DIST github.com-spf13-viper-v1.3.2.tar.gz 36932 BLAKE2B 62a214160e4307949f2c2bf3
 DIST github.com-ulikunitz-xz-v0.5.5.tar.gz 477164 BLAKE2B 505d5dfa38cc36ce9a9ec742ae1b7fbfeb5b658cbc8d376e103459b924e5ce4c1c23aa1314b308c28bf021ceded10e2bd590a809c35667b927c5aa42b210eb68 SHA512 8142b2031fe13b709f77721de9571966029ada028c59fb756191d3607263de9023a25bd322f26a9700c69d9b9a78ab3020a5e2cdec64c5dff6b31ec94f3e032b
 DIST minikube-1.0.1.tar.gz 11206771 BLAKE2B 3aae096cd0998405ae30e1db699fd51330e82c13ebbf05283e5ead25918bfdd52c352fb8385caf7ef74b45fb94f63ddf2fa64c96cba79be59703cf0579e79e39 SHA512 41855aec3b159ddc8f6e89b9a8a63179edf21d3078040ccda56994aab8ce7b57f6a989d63b8b75c92698f2bbec8c128980b7f2268c793157f67f245625e07780
 DIST minikube-1.6.1.tar.gz 78447692 BLAKE2B 16ee3d0f9dfc90f20723ae9ef33a36cbfa02de0f00d973f34c2e39872d6b954d5909c1aa534bb690b00ace0bdd4207986f022c796dfff20f776d12a13796bc96 SHA512 00da5047404abd631e08046a9e285d8009465b3cfa18c4e238bd5a6549714fb21f19864fcb68973e9a317f03a270158b90c36c0601316605edf2ecf93175b12e
-EBUILD minikube-1.0.1.ebuild 1810 BLAKE2B 7d14a27607613562524d30c70fa73d0a0bad89a57501476baa2d41f344b6d85e62bde875867dfd9de2e49f18760492cc45e5ad101fee00160013bb5b1e457715 SHA512 aed35306528a42a144ca77390acbddb99eade384441c78f9c7bb6e707f74c1e71588d825efcb2a5251383e0089fd9175735c3b4855866a1f962f7f4562ada6d1
-EBUILD minikube-1.6.1.ebuild 6945 BLAKE2B 229f8866e3563124b551718e9404c074a8507be04f99af7397915682b5a76cad12fea32e889eb276bcd099693d5cd756caf9c3803c5d222e2bf3fe12e0da7ecf SHA512 bb9f26b9ac27da6d9de82536a0743cda54c3571ad162ca3b711687d15f3ca0b6fa31b846f4c29d575de002dccee1fa7d3a8794a8cbd68b850f35001b5c4eff7a
+DIST minikube-1.6.2.tar.gz 78450821 BLAKE2B 05efb671bebf197fa4942c578585583476c2550dd3f3dc7804bdd836f5b2cb38864ab39d267d968ace2b816220e7d45b40b7367782e8c1eb4755679c91a8f3d6 SHA512 40af184878e812defecf48308c1ce3a702415985e5e7dfde37d61fe3413bee5e986ecf4a873aa66f11faae733f8afa8c64e3b0122f4e75b7153764fdcc771c48
+EBUILD minikube-1.0.1.ebuild 1806 BLAKE2B e6df223c56458f5d4a56777f3d8e604a5e1a7cc7a61bd7ef149d66a0a47f8644a3b736ab3c13c7e7593c22ed1f074bc15eb4c805ee07b1157be0a8d97e89d3db SHA512 210843add77079f009580428c137a9a2526c53a7a58be7c3513c8e0013b3e9509cd8e458d2514b1a6881961e2858b92cacda9f2cd034499a9b80754a5c3fe7c0
+EBUILD minikube-1.6.1.ebuild 6943 BLAKE2B 86d852e91895ccb837205323d7f09f77ed4df7be69b168d09dc1010e1b97f15786e46a890376cf41cefa82c5b2f4b5080580eccca6cbf637cef59acad2df7fb1 SHA512 01714d1a53363b267d18349f16a916f655d87f478b945a6865953e1ca8ea829496d0d27268051b192cded712854c8f8cf659e0582cbeb0bd938641f7e6538f8e
+EBUILD minikube-1.6.2.ebuild 6943 BLAKE2B 7783f828650aea01b0e7fb841b23d82d409e4ee1a8494becb2ec2ccd54802450995643c71d2e39733fe2e6cc9a1f4389f54cbbd04af52f258c5ba0310733a027 SHA512 015d6a7ce9777ec6c510fb644358aa759c0aa859d513c5d8eeb8ce1b61b61f36f905fe4dec72c699a8ea1fa5bb7c85e0add11ab43851505ed722e22b0dde5fed
 MISC metadata.xml 393 BLAKE2B 6c1d7e4c6ebff826d2a8eb0bf7a81fdd0c67279084e95aea0188e9b7e0f8ff869fc983f50c318cf17c42fdb482388e0989c655c8e65f18b462da0343dd57bf24 SHA512 9af4b86772936bd3299be9ff2e62a72dcad3481b39d4644b3774bfbdec6617d47dd1697205e1b3fa0a3944c38464584f42b8b2d6c7f1086b340d6a917f4d280f
diff --git a/sys-cluster/minikube/minikube-1.0.1.ebuild b/sys-cluster/minikube/minikube-1.0.1.ebuild
index 9c1f369635f1..c0cfc1eabe7b 100644
--- a/sys-cluster/minikube/minikube-1.0.1.ebuild
+++ b/sys-cluster/minikube/minikube-1.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit python-any-r1 golang-build golang-vcs-snapshot
 
diff --git a/sys-cluster/minikube/minikube-1.6.1.ebuild b/sys-cluster/minikube/minikube-1.6.1.ebuild
index 0f67b66d0aed..7acc960aa259 100644
--- a/sys-cluster/minikube/minikube-1.6.1.ebuild
+++ b/sys-cluster/minikube/minikube-1.6.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
 
 inherit python-any-r1 go-module
 
diff --git a/sys-cluster/minikube/minikube-1.6.2.ebuild b/sys-cluster/minikube/minikube-1.6.2.ebuild
new file mode 100644
index 000000000000..bb5af846aa7d
--- /dev/null
+++ b/sys-cluster/minikube/minikube-1.6.2.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+
+inherit python-any-r1 go-module
+
+EGIT_COMMIT="54f28ac5d3a815d1196cd5d57d707439ee4bb392"
+
+EGO_VENDOR=(
+	"cloud.google.com/go v0.49.0 github.com/googleapis/google-cloud-go"
+	"github.com/aws/aws-sdk-go v1.16.26"
+	"github.com/bgentry/go-netrc 9fd32a8b3d3d3f9d43c341bfe098430e07609480"
+	"github.com/blang/semver v3.5.0"
+	"github.com/cenkalti/backoff v2.2.1"
+	"github.com/cheggaaa/pb v3.0.1"
+	"github.com/cloudfoundry-attic/jibber_jabber bcc4c8345a21301bf47c032ff42dd1aae2fe3027"
+	"github.com/cpuguy83/go-md2man v1.0.10"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
+	"github.com/docker/docker v1.13.1"
+	"github.com/docker/go-connections v0.3.0"
+	"github.com/docker/go-units v0.3.3"
+	"github.com/docker/machine a555e4f7a8f518a8b1b174824c377e46cbfc4fe2"
+	"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
+	"github.com/fatih/color v1.7.0"
+	"github.com/fsnotify/fsnotify v1.4.7"
+	"github.com/gogo/protobuf v1.1.1"
+	"github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
+	"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
+	"github.com/golang/protobuf v1.3.2"
+	"github.com/googleapis/gax-go v2.0.5"
+	"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
+	"github.com/google/go-cmp v0.3.0"
+	"github.com/google/go-containerregistry 697ee0b3d46eff19ed2b30f86230377061203f79"
+	"github.com/google/gofuzz v1.0.0"
+	"github.com/hashicorp/errwrap 7554cd9344cec97297fa6649b055a8c98c2a1e55"
+	"github.com/hashicorp/go-cleanhttp v0.5.0"
+	"github.com/hashicorp/go-getter v1.4.0"
+	"github.com/hashicorp/golang-lru v0.5.1"
+	"github.com/hashicorp/go-multierror 8c5f0ad9360406a3807ce7de6bc73269a91a6e51"
+	"github.com/hashicorp/go-safetemp v1.0.0"
+	"github.com/hashicorp/go-version v1.1.0"
+	"github.com/hashicorp/hcl v1.0.0"
+	"github.com/imdario/mergo v0.3.5"
+	"github.com/intel-go/cpuid 1a4a6f06a1c643c8fbd339bd61d980960627d09e"
+	"github.com/jimmidyson/go-download 7f9a90c8c95bee1bb7de9e72c682c67c8bf5546d"
+	"github.com/jmespath/go-jmespath c2b33e8439af944379acbdd9c3a5fe0bc44bd8a5"
+	"github.com/json-iterator/go v1.1.6"
+	"github.com/juju/clock 9c5c9712527c7986f012361e7d13756b4d99543d"
+	"github.com/juju/errors 0232dcc7464d0c0037b619d6e10190301d01362f"
+	"github.com/juju/mutex d21b13acf4bfd8a8b0482a3a78e44d98880b40d3"
+	"github.com/kballard/go-shellquote 95032a82bc518f77982ea72343cc1ade730072f0"
+	"github.com/libvirt/libvirt-go v3.4.0"
+	"github.com/machine-drivers/docker-machine-driver-vmware v0.1.1"
+	"github.com/magiconair/properties v1.8.0"
+	"github.com/MakeNowJust/heredoc bb23615498cded5e105af4ce27de75b089cbe851"
+	"github.com/mattn/go-colorable v0.1.2"
+	"github.com/mattn/go-isatty v0.0.8"
+	"github.com/mattn/go-runewidth v0.0.4"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-ps 4fdf99ab29366514c69ccccddab5dc58b8d84062"
+	"github.com/mitchellh/go-testing-interface v1.0.0"
+	"github.com/mitchellh/go-wordwrap v1.0.0"
+	"github.com/mitchellh/mapstructure v1.1.2"
+	"github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"
+	"github.com/modern-go/reflect2 v1.0.1"
+	"github.com/olekukonko/tablewriter bdcc175572fd7abece6c831e643891b9331bc9e7"
+	"github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"
+	"github.com/pelletier/go-toml v1.2.0"
+	"github.com/pkg/browser 9302be274faad99162b9d48ec97b24306872ebb0"
+	"github.com/pkg/errors v0.8.1"
+	"github.com/pkg/profile 3a8809bd8a80f8ecfe4ee1b34b3f37194968617c"
+	"github.com/russross/blackfriday v1.5.2"
+	"github.com/samalba/dockerclient 91d7393ff85980ba3a8966405871a3d446ca28f2"
+	"github.com/shirou/gopsutil v2.18.12"
+	"github.com/spf13/afero v1.1.2"
+	"github.com/spf13/cast v1.3.0"
+	"github.com/spf13/cobra v0.0.5"
+	"github.com/spf13/jwalterweatherman v1.0.0"
+	"github.com/spf13/pflag v1.0.3"
+	"github.com/spf13/viper v1.3.2"
+	"github.com/ulikunitz/xz v0.5.5"
+	"github.com/VividCortex/ewma v1.1.1"
+	"golang.org/x/crypto 5c40567a22f818bd14a1ea7245dad9f8ef0691aa github.com/golang/crypto"
+	"golang.org/x/net 3b0461eec859c4b73bb64fdc8285971fd33e3938 github.com/golang/net"
+	"golang.org/x/oauth2 0f29369cfe4552d0e4bcddc57cc75f4d7e672a33 github.com/golang/oauth2"
+	"golang.org/x/sync 112230192c580c3556b8cee6403af37a4fc5f28c github.com/golang/sync"
+	"golang.org/x/sys 04f50cda93cbb67f2afa353c52f342100e80e625 github.com/golang/sys"
+	"golang.org/x/text v0.3.2 github.com/golang/text"
+	"golang.org/x/time 9d24e82272b4f38b78bc8cff74fa936d31ccd8ef github.com/golang/time"
+	"google.golang.org/api v0.9.0 github.com/googleapis/google-api-go-client"
+	"google.golang.org/genproto 24fa4b261c55da65468f2abfdae2b024eef27dfb github.com/googleapis/go-genproto"
+	"google.golang.org/grpc v1.21.1 github.com/grpc/grpc-go"
+	"go.opencensus.io v0.22.2 github.com/census-instrumentation/opencensus-go"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.27 github.com/cheggaaa/pb"
+	"gopkg.in/inf.v0 v0.9.1 github.com/go-inf/inf"
+	"gopkg.in/yaml.v2 v2.2.2 github.com/go-yaml/yaml"
+	"k8s.io/klog v0.3.1 github.com/kubernetes/klog"
+	"k8s.io/kubernetes 8c3b7d7679ccf368cc4cedb352fac4cd1b82124e github.com/kubernetes/kubernetes"
+	"k8s.io/utils c2654d5206da6b7b6ace12841e8f359bb89b443c github.com/kubernetes/utils"
+	"sigs.k8s.io/yaml v1.1.0 github.com/kubernetes-sigs/yaml"
+)
+
+KEYWORDS="~amd64"
+
+DESCRIPTION="Single Node Kubernetes Cluster"
+HOMEPAGE="https://github.com/kubernetes/minikube https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(go-module_vendor_uris)"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 CC0-1.0 GPL-2 ISC LGPL-3 MIT MPL-2.0 WTFPL-2 ZLIB || ( LGPL-3+ GPL-2 ) || ( Apache-2.0 LGPL-3+ ) || ( Apache-2.0 CC-BY-4.0 )"
+SLOT="0"
+IUSE="hardened libvirt"
+
+RDEPEND=">=sys-cluster/kubectl-1.14.0
+	libvirt? ( app-emulation/libvirt:=[qemu] )"
+DEPEND="${RDEPEND}
+	dev-go/go-bindata
+	${PYTHON_DEPS}"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	mv vendor/k8s.io/kubernetes/staging/src/k8s.io/* vendor/k8s.io || die
+	rm -rf vendor/k8s.io/kubernetes/staging || die
+	sed -i -e "s/get_commit(), get_tree_state(), get_version()/get_commit(), 'gitTreeState=clean', get_version()/"  hack/get_k8s_version.py || die
+	sed -i -e "s|^COMMIT ?=.*|COMMIT = ${EGIT_COMMIT}|" -e "s|^COMMIT_NO :=.*|COMMIT_NO = ${EGIT_COMMIT}|" -i Makefile || die
+}
+
+src_compile() {
+	export -n GOCACHE GOPATH XDG_CACHE_HOME
+	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
+	LDFLAGS="" emake  $(usex libvirt "out/docker-machine-driver-kvm2" "") out/minikube-linux-amd64
+}
+
+src_install() {
+	newbin out/minikube-linux-amd64 minikube
+	use libvirt && dobin out/docker-machine-driver-kvm2
+	dodoc -r docs CHANGELOG.md README.md
+}
+
+pkg_postinst() {
+	elog "You may want to install the following optional dependency:"
+	elog "  app-emulation/virtualbox or app-emulation/virtualbox-bin"
+}
diff --git a/sys-cluster/mvapich2/Manifest b/sys-cluster/mvapich2/Manifest
index 2f05e44f35cf..ec9813ed4250 100644
--- a/sys-cluster/mvapich2/Manifest
+++ b/sys-cluster/mvapich2/Manifest
@@ -1,3 +1,3 @@
 DIST mvapich2-1.6.tgz 23239787 BLAKE2B 4cdd286d7a13f70b50ced6ac6cb3df51065225a33141410b699246f2b99d0f4b57611cd95f39806387c71d0f07257560c6f210ed4bbb8ce5fa5d2b8b7071db2c SHA512 4a4aac17742f347c4daed40a8360576ff4c644c549d4a3b364c7d2b1eada6aecc514b447b4613111e113d8f9be79b5101a999298cf89ff19ce63523a54702289
-EBUILD mvapich2-1.6.ebuild 3844 BLAKE2B 64f23b92bcc4734b4094fe52c4b3f7ac820a5b21abba30ddc86b4705a282997584699378351e23a3129ef5bca1cff6f8c37faca920df0d72128acef55dfc7874 SHA512 7cc91f5dde6d727874fd455d3856be7e8e99f1b0c8f0dcfe4630b19481add96b54e620c799f5f12c1dc6b8bbbd10cc4de3c5f967893cc7832249c4c0c74aaa41
+EBUILD mvapich2-1.6.ebuild 3866 BLAKE2B ea64a2e4bd676d0e2e96831e58b478897c1224b80b2054160604f37d6795e3d0a121505bf5001231f1be7c0f54d0c9cb362500f3fc543a269aac1df7ad692406 SHA512 ec9a465aa255b7df796dc344e7b3cf076c92dc862579574cde2fc238f7e5511656e72e451311eb082f647392d0169cb7e9254f28d20b2d0bff1b2c165fa7d072
 MISC metadata.xml 646 BLAKE2B e656b3bb792c7058861e1b1f5ee548c3fbecd238d6d016035a12f750f7549d7c9e1260b579f1b8ca1e8742ca6d4d68d6c54a8396dca3e7ab4f4af298ac01b69c SHA512 251bae667db76befd899a01a8f1c658f4552f2a4c0e0790489c7b0d8e984fcf3f08b2954e9dcb2ddc4d3b7a4d0bb8a82aee5d004c9dabb4b760e1c7d0ec3b67a
diff --git a/sys-cluster/mvapich2/mvapich2-1.6.ebuild b/sys-cluster/mvapich2/mvapich2-1.6.ebuild
index d5bc03fc1b7d..b75168cb8715 100644
--- a/sys-cluster/mvapich2/mvapich2-1.6.ebuild
+++ b/sys-cluster/mvapich2/mvapich2-1.6.ebuild
@@ -7,7 +7,7 @@ inherit fortran-2
 
 DESCRIPTION="MVAPICH2 MPI-over-infiniband package auto-configured for OpenIB"
 HOMEPAGE="http://mvapich.cse.ohio-state.edu/"
-SRC_URI="${HOMEPAGE}/download/mvapich2/mvapich2-${PV/_/-}.tgz"
+SRC_URI="http://mvapich.cse.ohio-state.edu/download/mvapich2/mvapich2-${PV/_/-}.tgz"
 
 SLOT="0"
 LICENSE="BSD"
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index c905f6ee7554..2c2185ddf1f1 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -8,23 +8,31 @@ AUX neutron.initd 530 BLAKE2B 48900bdde5770a0b0db90490d6ae8541dafc96e3fa2aa1c8d7
 AUX neutron.sudoersd 117 BLAKE2B 30e903fd3d681b779ad7e4758b56bfd78df6165ae030f0a5017dccd1873570db450efd3e7b232f77d6d2e3fcb81cb64d9d44901802310ebe2d88f882d334acda SHA512 143f8a1faa7650bc66b2566d0bd62f71eb743231b9efc4c7df265e53d664418b23182e3f271b86845ed76c537b7f60157e87af59413cf659379f367924d14366
 DIST neutron-14.0.2.tar.gz 10734311 BLAKE2B fea60def53a82bddf0815701d0f4998a51acc1e8fea6c589761852605c3a30b0f9c31656dc251f53698fe633befe40eb6eb32225e1ea6412f71fc6550d3698b5 SHA512 ab58e0fdf501e279532b78f02326e56722a81a8baa0800e2c28bf2d46ef7d9f20fc4516a8b8f84f2738aaaef83997b096223d3abbc07c6f712ca4d4fd587c731
 DIST neutron-14.0.3.tar.gz 10747068 BLAKE2B 47cbb470408781ab98573c6f3398e1d42e8005be3cdfbe7e4dd26ec50924cbc2c073b0198e578c7de88f3859ec010373f426712d78efaa39c898e22802790c55 SHA512 f3a65d43c13d80715709f355926ecb712a9c18c579c1bbc7b05e4efd38cdef13305c3c2cc317437eebc648a57115a109ff32d54a0819322e78b74fb40412c1ae
+DIST neutron-14.0.4.tar.gz 10750971 BLAKE2B 448f26ee523895f37849463250fa9eb73c53c300d468e7a58e01a1023a1ed05639171093d81bdd60b8256fd9aaccbfc56cc6a4415b2df038e589d7375fc8a2bb SHA512 02ae67fd30f9cb63014638de85ebe3b52bc816e473615dc2a9bde1995249cdd436ab86e397e273b2d6d32e15628124071c46c21d9c12e7c536590cfe52876da8
 DIST neutron-15.0.0.tar.gz 10512007 BLAKE2B a0cbd9a9279daf89ac6c162063c1e1f706335a53c24d9cdc946be2f44c42fc62c4755ad0c8414b5c67c26c916656491e24dcf398c670588815155a498a0cee56 SHA512 911cddb5521b8f3758895f91f638f28adeda8e5b2154376dd99eb78e189f8fd77074fbec8b9805b75db7002a71442630380f0aa37cd8a2e3c13d38c10f9dbcef
+DIST neutron-15.0.1.tar.gz 10516525 BLAKE2B a74d96c09cc387ca65654e7b6e338ea5c2407e3af051b4ba442c5658b9a5578b13f9d2419afb75816c6b8f006b5f27d611525246afb592931dd86e179a7d2df8 SHA512 f724f8f830e2b6b04914b0e00851acb0c43c671a32d6b751cc0a3cdd8f7fc03a35c61baa6ce839f85044a56870f58054d6775ad9770d59de447263165de58e9c
 DIST neutron-configs-14.0.2.tar.gz 22973 BLAKE2B f454ccc2569ec1e586d88b410d3acbe557f25894c5f4d06558aa242f3d14971b791eca0d827f22400ef02db9899fdb2a501b1b745a531c0f6577318a28c58278 SHA512 dce4a1fd8880d9ffbde9014dffdbb67f69a798a834f9cc6ac6ccd34d520c21b468b16093b3c54fbb472ded501305775b0b31da3c62a860cf19c4486a30c1da2b
 DIST neutron-configs-14.0.3.tar.gz 22973 BLAKE2B f454ccc2569ec1e586d88b410d3acbe557f25894c5f4d06558aa242f3d14971b791eca0d827f22400ef02db9899fdb2a501b1b745a531c0f6577318a28c58278 SHA512 dce4a1fd8880d9ffbde9014dffdbb67f69a798a834f9cc6ac6ccd34d520c21b468b16093b3c54fbb472ded501305775b0b31da3c62a860cf19c4486a30c1da2b
+DIST neutron-configs-14.0.4.tar.gz 22973 BLAKE2B f454ccc2569ec1e586d88b410d3acbe557f25894c5f4d06558aa242f3d14971b791eca0d827f22400ef02db9899fdb2a501b1b745a531c0f6577318a28c58278 SHA512 dce4a1fd8880d9ffbde9014dffdbb67f69a798a834f9cc6ac6ccd34d520c21b468b16093b3c54fbb472ded501305775b0b31da3c62a860cf19c4486a30c1da2b
 DIST neutron-configs-15.0.0.tar.gz 23546 BLAKE2B df706681e63e4f36b54be33a6619da15d642803f40afe737bd31426f9b3643a6a032cb8bfcb95899d1e67b759155fd14bb45f41460cefdc7d9f91d3377a90d5d SHA512 ef4555be50dfb81a0558ed28eb917a1d0634d913a2b0b58deeae3132a0e3c61521074b21d195e51e348a08b55c21919b537ac3c7122f4d5524ead824642292fe
+DIST neutron-configs-15.0.1.tar.gz 23546 BLAKE2B df706681e63e4f36b54be33a6619da15d642803f40afe737bd31426f9b3643a6a032cb8bfcb95899d1e67b759155fd14bb45f41460cefdc7d9f91d3377a90d5d SHA512 ef4555be50dfb81a0558ed28eb917a1d0634d913a2b0b58deeae3132a0e3c61521074b21d195e51e348a08b55c21919b537ac3c7122f4d5524ead824642292fe
 DIST neutron-configs-2018.2.9999.tar.gz 26109 BLAKE2B 5de3b90dcb6f8c86ce659b3ab439a79dd920aaf57b66a1e1b29f1b0d0fd433b222335a634dca01ce2b0e07acc3011ff6bf25983071dc0ff00e78ac847ee3fdd6 SHA512 498f41ffec6c14597e9785da9a36c2d906138215b34017aa93f56d051078682279bcce05288d2534ff7ab8208b8251c9f721256488f6850173210e41bc6dd51c
 DIST neutron-configs-2019.1.9999.tar.gz 22973 BLAKE2B f454ccc2569ec1e586d88b410d3acbe557f25894c5f4d06558aa242f3d14971b791eca0d827f22400ef02db9899fdb2a501b1b745a531c0f6577318a28c58278 SHA512 dce4a1fd8880d9ffbde9014dffdbb67f69a798a834f9cc6ac6ccd34d520c21b468b16093b3c54fbb472ded501305775b0b31da3c62a860cf19c4486a30c1da2b
 DIST neutron-configs-2019.2.9999.tar.gz 23546 BLAKE2B df706681e63e4f36b54be33a6619da15d642803f40afe737bd31426f9b3643a6a032cb8bfcb95899d1e67b759155fd14bb45f41460cefdc7d9f91d3377a90d5d SHA512 ef4555be50dfb81a0558ed28eb917a1d0634d913a2b0b58deeae3132a0e3c61521074b21d195e51e348a08b55c21919b537ac3c7122f4d5524ead824642292fe
 DIST neutron-ml2-plugins-14.0.2.tar.gz 8642 BLAKE2B 71d945504f3e2185bffddb94956f019fa38bdd4a8782e936de2b8753e2a934374b6f0ed11ea0cdc9d454a80544b2e225e70ff987acbb971d756ae940cf4d7d16 SHA512 399e3f0cd8daaaf18e36d47aa105cf71d70e3ed5f707093e2292e480e3a0868818ee0ee68ca7a8eeb8e28cec51721e2508ed75815f04a415eb42dfe56708fce2
 DIST neutron-ml2-plugins-14.0.3.tar.gz 8642 BLAKE2B 71d945504f3e2185bffddb94956f019fa38bdd4a8782e936de2b8753e2a934374b6f0ed11ea0cdc9d454a80544b2e225e70ff987acbb971d756ae940cf4d7d16 SHA512 399e3f0cd8daaaf18e36d47aa105cf71d70e3ed5f707093e2292e480e3a0868818ee0ee68ca7a8eeb8e28cec51721e2508ed75815f04a415eb42dfe56708fce2
+DIST neutron-ml2-plugins-14.0.4.tar.gz 8642 BLAKE2B 71d945504f3e2185bffddb94956f019fa38bdd4a8782e936de2b8753e2a934374b6f0ed11ea0cdc9d454a80544b2e225e70ff987acbb971d756ae940cf4d7d16 SHA512 399e3f0cd8daaaf18e36d47aa105cf71d70e3ed5f707093e2292e480e3a0868818ee0ee68ca7a8eeb8e28cec51721e2508ed75815f04a415eb42dfe56708fce2
 DIST neutron-ml2-plugins-15.0.0.tar.gz 8669 BLAKE2B 3c34a857c0e7dd4e5313f5f9a1bb22384aeae6d1e43e719c50eab8dc3e842e98f202eb12cbb788127603931292deeed802f0592bad232e6a05121939e3b26fe0 SHA512 0e6858425ee3d3e2233c8ebf19aa8e62b5ff849532a2fdceb953f384f3b33432137537afbb2878f23ec5eb57e185eda36a6d6ff71d8be5f32b43abcb5c186082
+DIST neutron-ml2-plugins-15.0.1.tar.gz 8669 BLAKE2B 3c34a857c0e7dd4e5313f5f9a1bb22384aeae6d1e43e719c50eab8dc3e842e98f202eb12cbb788127603931292deeed802f0592bad232e6a05121939e3b26fe0 SHA512 0e6858425ee3d3e2233c8ebf19aa8e62b5ff849532a2fdceb953f384f3b33432137537afbb2878f23ec5eb57e185eda36a6d6ff71d8be5f32b43abcb5c186082
 DIST neutron-ml2-plugins-2018.2.9999.tar.gz 7068 BLAKE2B fa27bd84c1d67bd36c7c7e47b6e8f98dd100e09c7a3bfa7aec615ed24e3dadf240f8ef44874c868ff92f79452afbf4a21fba46b1b9aec191bad53a62767b1861 SHA512 add4697c78c592dfe5ebadd3b0cf9b9c2a2c33bd05130a8e1422abf7456d8a0cc926a0d46f6b49ceee87017304d7c9c3486c975086e46f178e3bc142844f836f
 DIST neutron-ml2-plugins-2019.1.9999.tar.gz 8642 BLAKE2B 71d945504f3e2185bffddb94956f019fa38bdd4a8782e936de2b8753e2a934374b6f0ed11ea0cdc9d454a80544b2e225e70ff987acbb971d756ae940cf4d7d16 SHA512 399e3f0cd8daaaf18e36d47aa105cf71d70e3ed5f707093e2292e480e3a0868818ee0ee68ca7a8eeb8e28cec51721e2508ed75815f04a415eb42dfe56708fce2
 DIST neutron-ml2-plugins-2019.2.9999.tar.gz 8669 BLAKE2B 3c34a857c0e7dd4e5313f5f9a1bb22384aeae6d1e43e719c50eab8dc3e842e98f202eb12cbb788127603931292deeed802f0592bad232e6a05121939e3b26fe0 SHA512 0e6858425ee3d3e2233c8ebf19aa8e62b5ff849532a2fdceb953f384f3b33432137537afbb2878f23ec5eb57e185eda36a6d6ff71d8be5f32b43abcb5c186082
-EBUILD neutron-14.0.2.ebuild 8388 BLAKE2B 3716d11d139f7ecee31b49009e07f2b5219c6a953a83a375d933aa6fb67c961a697341cdbe13da38bf09819607eafd07e3df6a106e41cfa1eccd38fc209a30c1 SHA512 42759d4cb73245f0fd5ce6a75d8c659e06eb552dc58b7c1723ebc37a1e49f56e74dce78e0b74d5befa8dae0389ed5b089e1c9c4bae5eeeb4025ab5daf12c3fa2
-EBUILD neutron-14.0.3.ebuild 8388 BLAKE2B 3716d11d139f7ecee31b49009e07f2b5219c6a953a83a375d933aa6fb67c961a697341cdbe13da38bf09819607eafd07e3df6a106e41cfa1eccd38fc209a30c1 SHA512 42759d4cb73245f0fd5ce6a75d8c659e06eb552dc58b7c1723ebc37a1e49f56e74dce78e0b74d5befa8dae0389ed5b089e1c9c4bae5eeeb4025ab5daf12c3fa2
-EBUILD neutron-15.0.0.ebuild 8556 BLAKE2B 1b03561822e0b246d8a01b195b7960bbb177e5db4387c17878f9e45064f192559b6ed08e42e04f25c263f06c9eff9ee1e6ecf2c73f1fb347f703d46f94dccb8e SHA512 980e11e2b528fc9bf69a631cbc5161f986a3405137d2920ecda5f3702d09e25f1ad991a93283669fcef302a65f26770363b460b08be5dd101d03abda22cd1035
-EBUILD neutron-2018.2.9999.ebuild 8350 BLAKE2B 40303975455b8e20a9b55d228b0653104ddaa8f1a20000188d86da895af95c7030b3931b1d71c3038235cac8efd37dfe547ee8da0a57611fedc2de743f388a96 SHA512 c9240d19364c27113ec1e63893f86c2a5df66af5e5610becf53d6366868ebe6777d20f4324905a5a502cfe224dd05a3820255b016b1cbdd3b30ac8678092e224
-EBUILD neutron-2019.1.9999.ebuild 8391 BLAKE2B 6182fa27064f390f6dc459d7a0d6b926ff1e1ad43d380e654e6ef5ed63fa91e130bed6fdc93a815e0c7eca598848a61596766e9fedca44439a2b99b589757224 SHA512 56d78135fed5fbbd23c789ce9037bcaa805ab42da39492dc2d41b5256d1f7139db92f119ab6c03b74a898e18a5e20ba8295ca54b17fcf2629d8f8ca06bb4777b
-EBUILD neutron-2019.2.9999.ebuild 8558 BLAKE2B 81d081a274a0f22f07527aaeeaa89868b76569fd9dcce40d17d3fcc4dcf74d886ef9ae244bdf95f427631c7217f14965de87730b00dfdfaf3a2c128bfa62d382 SHA512 46b7ee3c7ef552d8fb970c673462deae61b7ddfe412c047580c3373acb69770fb23b86ef1ab72f150137e1e52b16cc98b1dd6419cb0efdde00ca7a40ed416146
+EBUILD neutron-14.0.2.ebuild 8308 BLAKE2B b13b39c82a4cb97f1a67c610c3aa9ed866d1bfa28cdb6af7945e10fcdc7a0c619959961ffd22002837736f5fd01139e2f12ff2f00afc0850999b5413ff376538 SHA512 3430039f5ffd609c494c36507c6039b95efe782701991401df20a39a92c17db8fce6dc429f35009cfb7b599bcb20558ca7cfe5dc6f9e8dcbd9a9fe16e6afeb17
+EBUILD neutron-14.0.3.ebuild 8308 BLAKE2B b13b39c82a4cb97f1a67c610c3aa9ed866d1bfa28cdb6af7945e10fcdc7a0c619959961ffd22002837736f5fd01139e2f12ff2f00afc0850999b5413ff376538 SHA512 3430039f5ffd609c494c36507c6039b95efe782701991401df20a39a92c17db8fce6dc429f35009cfb7b599bcb20558ca7cfe5dc6f9e8dcbd9a9fe16e6afeb17
+EBUILD neutron-14.0.4.ebuild 8310 BLAKE2B 9e22929d71d2ef4b73013df53a0f6cc390738c06ec0012534b92331d5ad8dc51f3b63a7e5395aa9a27e373e07c1a4180fb13f43cc6bd27999dc079dc56badcb5 SHA512 0e0834930b01f11f190c33d1ba31fb7dd3b75745f33bc5d500f2204128de2833ed250752a7b1227628fbf0d139d476c303ce713a4f2bcd0eb8ddf4d07f245cf4
+EBUILD neutron-15.0.0.ebuild 8455 BLAKE2B 5a54bbce1310f6ebb7bb72565984b61850aa4546b2166fcbfa1a433f977447117aa2d2f4599c2c475d22208c6f1b45daa8fd784033c9593477aaed94f717e53b SHA512 a5db11530a440c5447e507e75ad35b5dcf4d8671940bd76bf3e9fe49bf72badfd721a1d907212e5af34779e0667a206399bc53b117f48e3f04be8ded63d76fd6
+EBUILD neutron-15.0.1.ebuild 8457 BLAKE2B 62e7594954c5560ee9d6abb16e286675da481c3f0b79941c731be28d5695f2c44d801e10bec5ba5e21c71ec4d96feeca8a71f904c769036d60f0b65dc970146d SHA512 b9aeff2d3081f5733c95c769025a67de938c0220f7b252c5c6b9c5f9dc74784639562c743783291a9ce8913118c945633080b66c9bbaaa573962eb1a0981e29f
+EBUILD neutron-2018.2.9999.ebuild 8268 BLAKE2B c53786ac99f21900cfa553ebbd599dd4f285668193a17d8120a7f7fc3f4014e3e80e6d12a82b7366dfc76337061a0d5b5aa632d1eb135656a903d3cb9c38ba69 SHA512 c6bf5d74cb59715faf2ce01bbe39c837f3087a656a2ba71d135b508434c9359704c40b628e37efa1efd24a8048bb49f6371f17b56359bd3c80831e186ce822e4
+EBUILD neutron-2019.1.9999.ebuild 8311 BLAKE2B 937757ba405000dffce235adba8f36863c21f7470636f5c2897f2c21823aecf8f047bf4b35a5889ee79aef3ee705ef6bbe6709c5130bbcc93a52a2c12448cdbf SHA512 a9483c0d8456fb5dc01d8cbac3fe593d3ff407c5df86672c3afb3fcbc198fa843149cc2b34602d91b374e27c242c6237dc6892e76088a2d215053767c0a8f445
+EBUILD neutron-2019.2.9999.ebuild 8457 BLAKE2B 62e7594954c5560ee9d6abb16e286675da481c3f0b79941c731be28d5695f2c44d801e10bec5ba5e21c71ec4d96feeca8a71f904c769036d60f0b65dc970146d SHA512 b9aeff2d3081f5733c95c769025a67de938c0220f7b252c5c6b9c5f9dc74784639562c743783291a9ce8913118c945633080b66c9bbaaa573962eb1a0981e29f
 MISC metadata.xml 1619 BLAKE2B 462b212e519778c98632ec3230e5f0d1a006a229edef034ed0d462559cb0c1763dafb997198241cca4f9c7cb056ebada214c82745dce35b269c2c27d554145a4 SHA512 8f9075719eeec3c3a939e8a1b05a5604bc1e801b227feb5775bfa9f2812e67c41165dc0b2b377685645d9fd9988523356ac77a8db8e73139ab3f035ae59b70ce
diff --git a/sys-cluster/neutron/neutron-14.0.2.ebuild b/sys-cluster/neutron/neutron-14.0.2.ebuild
index 137caa2c7569..aabbe08f02c2 100644
--- a/sys-cluster/neutron/neutron-14.0.2.ebuild
+++ b/sys-cluster/neutron/neutron-14.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 # still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439
 
 inherit distutils-r1 linux-info user
@@ -98,7 +98,6 @@ RDEPEND="
 	>=dev-python/ovsdbapp-0.9.1[${PYTHON_USEDEP}]
 	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
 	>=dev-python/pyroute2-0.5.3[${PYTHON_USEDEP}]
-	>=dev-python/weakrefmethod-1.0.2[$(python_gen_usedep 'python2_7')]
 	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
 	>=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
 	>=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
diff --git a/sys-cluster/neutron/neutron-14.0.3.ebuild b/sys-cluster/neutron/neutron-14.0.3.ebuild
index 137caa2c7569..aabbe08f02c2 100644
--- a/sys-cluster/neutron/neutron-14.0.3.ebuild
+++ b/sys-cluster/neutron/neutron-14.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 # still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439
 
 inherit distutils-r1 linux-info user
@@ -98,7 +98,6 @@ RDEPEND="
 	>=dev-python/ovsdbapp-0.9.1[${PYTHON_USEDEP}]
 	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
 	>=dev-python/pyroute2-0.5.3[${PYTHON_USEDEP}]
-	>=dev-python/weakrefmethod-1.0.2[$(python_gen_usedep 'python2_7')]
 	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
 	>=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
 	>=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
diff --git a/sys-cluster/neutron/neutron-14.0.4.ebuild b/sys-cluster/neutron/neutron-14.0.4.ebuild
new file mode 100644
index 000000000000..0e21778417eb
--- /dev/null
+++ b/sys-cluster/neutron/neutron-14.0.4.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+# still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439
+
+inherit distutils-r1 linux-info user
+
+DESCRIPTION="A virtual network service for Openstack"
+HOMEPAGE="https://launchpad.net/neutron"
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/stein/configs.tar.gz -> neutron-configs-${PV}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/stein/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz"
+	EGIT_REPO_URI="https://github.com/openstack/neutron.git"
+	EGIT_BRANCH="stable/stein"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/stein/configs.tar.gz -> neutron-configs-${PV}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/stein/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres"
+REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
+						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
+						|| ( openvswitch linuxbridge ) )"
+
+CDEPEND=">=dev-python/pbr-4.0.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	>=dev-python/pecan-1.3.2[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/neutron-lib-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
+	compute-only? (
+		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-1.2.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.37.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.35.1[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/os-ken-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/ovsdbapp-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/pyroute2-0.5.3[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
+	dev-python/pyudev[${PYTHON_USEDEP}]
+	sys-apps/iproute2
+	net-misc/iputils[arping]
+	net-misc/bridge-utils
+	net-firewall/ipset
+	net-firewall/iptables
+	net-firewall/ebtables
+	net-firewall/conntrack-tools
+	haproxy? ( net-proxy/haproxy )
+	openvswitch? ( net-misc/openvswitch )
+	ipv6? (
+		net-misc/radvd
+		>=net-misc/dibbler-1.0.1
+	)
+	dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
+
+#PATCHES=(
+#)
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \
+	NF_NAT_IPV4 NF_NAT NF_CONNTRACK IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
+}
+
+pkg_setup() {
+	enewgroup neutron
+	enewuser neutron -1 -1 /var/lib/neutron neutron
+}
+
+pkg_config() {
+	fperms 0700 /var/log/neutron
+	fowners neutron:neutron /var/log neutron
+}
+
+src_prepare() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	# it's /bin/ip not /sbin/ip
+	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use server; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-server"
+		newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
+		dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
+	fi
+	if use dhcp; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
+		newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
+	fi
+	if use l3; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
+		newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
+	fi
+	if use metadata; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
+		newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
+	fi
+	if use openvswitch; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
+		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
+		newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
+		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
+	fi
+	if use linuxbridge; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
+		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
+	fi
+	diropts -m 755 -o neutron -g neutron
+	dodir /var/log/neutron /var/lib/neutron
+	keepdir /etc/neutron
+	insinto /etc/neutron
+	insopts -m 0640 -o neutron -g neutron
+
+	doins etc/*
+	# stupid renames
+	insinto /etc/neutron
+	doins -r "etc/neutron/plugins"
+	insopts -m 0640 -o root -g root
+	doins "etc/rootwrap.conf"
+	doins -r "etc/neutron/rootwrap.d"
+
+	#add sudoers definitions for user neutron
+	insinto /etc/sudoers.d/
+	insopts -m 0440 -o root -g root
+	newins "${FILESDIR}/neutron.sudoersd" neutron
+
+	# add generated configs
+	cd "${D}/etc/neutron" || die
+	unpack "neutron-configs-${PV}.tar.gz"
+	cd "${D}/etc/neutron/plugins/ml2" || die
+	unpack "neutron-ml2-plugins-${PV}.tar.gz"
+
+	# correcting perms
+	fowners neutron:neutron -R "/etc/neutron"
+	fperms o-rwx -R "/etc/neutron/"
+
+	#remove superfluous stuff
+	rm -R "${D}/usr/etc/"
+}
+
+python_install() {
+	distutils-r1_python_install
+	# copy migration conf file (not coppied on install via setup.py script)
+	python_moduleinto neutron/db/migration/alembic_migrations
+	python_domodule "neutron/db/migration/alembic_migrations/versions"
+}
+
+pkg_postinst() {
+	elog
+	elog "neutron-server's conf.d file may need updating to include additional ini files"
+	elog "We currently assume the ml2 plugin will be used but do not make assumptions"
+	elog "on if you will use openvswitch or linuxbridge (or something else)"
+	elog
+	elog "Other conf.d files may need updating too, but should be good for the default use case"
+	elog
+}
diff --git a/sys-cluster/neutron/neutron-15.0.0.ebuild b/sys-cluster/neutron/neutron-15.0.0.ebuild
index 98b7b65c1e55..082eab07ed24 100644
--- a/sys-cluster/neutron/neutron-15.0.0.ebuild
+++ b/sys-cluster/neutron/neutron-15.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 # still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439
 
 inherit distutils-r1 linux-info user
@@ -99,7 +99,6 @@ RDEPEND="
 	>=dev-python/ovsdbapp-0.9.1[${PYTHON_USEDEP}]
 	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
 	>=dev-python/pyroute2-0.5.3[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/weakrefmethod-1.0.2[${PYTHON_USEDEP}]' 'python2_7')
 	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
 	>=dev-python/openstacksdk-0.31.2[${PYTHON_USEDEP}]
 	>=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
diff --git a/sys-cluster/neutron/neutron-15.0.1.ebuild b/sys-cluster/neutron/neutron-15.0.1.ebuild
new file mode 100644
index 000000000000..ba485cb5c831
--- /dev/null
+++ b/sys-cluster/neutron/neutron-15.0.1.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+# still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439
+
+inherit distutils-r1 linux-info user
+
+DESCRIPTION="A virtual network service for Openstack"
+HOMEPAGE="https://launchpad.net/neutron"
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/train/configs.tar.gz -> neutron-configs-${PV}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/train/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz"
+	EGIT_REPO_URI="https://github.com/openstack/neutron.git"
+	EGIT_BRANCH="stable/train"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/train/configs.tar.gz -> neutron-configs-${PV}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/train/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite +mysql postgres"
+REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
+						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
+						|| ( openvswitch linuxbridge ) )"
+
+CDEPEND=">=dev-python/pbr-4.0.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	>=dev-python/pecan-1.3.2[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/neutron-lib-1.29.1[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
+	compute-only? (
+		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-1.2.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.37.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.35.1[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/os-ken-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/ovsdbapp-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/pyroute2-0.5.3[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.31.2[${PYTHON_USEDEP}]
+	>=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/os-vif-1.15.1[${PYTHON_USEDEP}]
+	dev-python/pyudev[${PYTHON_USEDEP}]
+	sys-apps/iproute2
+	net-misc/iputils[arping]
+	net-misc/bridge-utils
+	net-firewall/ipset
+	net-firewall/iptables
+	net-firewall/ebtables
+	net-firewall/conntrack-tools
+	haproxy? ( net-proxy/haproxy )
+	openvswitch? ( net-misc/openvswitch )
+	ipv6? (
+		net-misc/radvd
+		>=net-misc/dibbler-1.0.1
+	)
+	dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
+
+#PATCHES=(
+#)
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \
+	NF_NAT_IPV4 NF_NAT NF_CONNTRACK IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
+}
+
+pkg_setup() {
+	enewgroup neutron
+	enewuser neutron -1 -1 /var/lib/neutron neutron
+}
+
+pkg_config() {
+	fperms 0700 /var/log/neutron
+	fowners neutron:neutron /var/log neutron
+}
+
+src_prepare() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	# it's /bin/ip not /sbin/ip
+	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use server; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-server"
+		newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
+		dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
+	fi
+	if use dhcp; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
+		newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
+	fi
+	if use l3; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
+		newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
+	fi
+	if use metadata; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
+		newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
+	fi
+	if use openvswitch; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
+		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
+		newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
+		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
+	fi
+	if use linuxbridge; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
+		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
+	fi
+	diropts -m 755 -o neutron -g neutron
+	dodir /var/log/neutron /var/lib/neutron
+	keepdir /etc/neutron
+	insinto /etc/neutron
+	insopts -m 0640 -o neutron -g neutron
+
+	doins etc/*
+	# stupid renames
+	insinto /etc/neutron
+	doins -r "etc/neutron/plugins"
+	insopts -m 0640 -o root -g root
+	doins "etc/rootwrap.conf"
+	doins -r "etc/neutron/rootwrap.d"
+
+	#add sudoers definitions for user neutron
+	insinto /etc/sudoers.d/
+	insopts -m 0440 -o root -g root
+	newins "${FILESDIR}/neutron.sudoersd" neutron
+
+	# add generated configs
+	cd "${D}/etc/neutron" || die
+	unpack "neutron-configs-${PV}.tar.gz"
+	cd "${D}/etc/neutron/plugins/ml2" || die
+	unpack "neutron-ml2-plugins-${PV}.tar.gz"
+
+	# correcting perms
+	fowners neutron:neutron -R "/etc/neutron"
+	fperms o-rwx -R "/etc/neutron/"
+
+	#remove superfluous stuff
+	rm -R "${D}/usr/etc/"
+}
+
+python_install() {
+	distutils-r1_python_install
+	# copy migration conf file (not coppied on install via setup.py script)
+	python_moduleinto neutron/db/migration/alembic_migrations
+	python_domodule "neutron/db/migration/alembic_migrations/versions"
+}
+
+pkg_postinst() {
+	elog
+	elog "neutron-server's conf.d file may need updating to include additional ini files"
+	elog "We currently assume the ml2 plugin will be used but do not make assumptions"
+	elog "on if you will use openvswitch or linuxbridge (or something else)"
+	elog
+	elog "Other conf.d files may need updating too, but should be good for the default use case"
+	elog
+}
diff --git a/sys-cluster/neutron/neutron-2018.2.9999.ebuild b/sys-cluster/neutron/neutron-2018.2.9999.ebuild
index 5bd5528fe264..d9d0f19bac82 100644
--- a/sys-cluster/neutron/neutron-2018.2.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2018.2.9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 # still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439
 
 inherit distutils-r1 linux-info user
@@ -98,7 +98,6 @@ RDEPEND="
 	>=dev-python/ovsdbapp-0.9.1[${PYTHON_USEDEP}]
 	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
 	>=dev-python/pyroute2-0.4.21[${PYTHON_USEDEP}]
-	>=dev-python/weakrefmethod-1.0.2[$(python_gen_usedep 'python2_7')]
 	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
 	>=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
 	>=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
diff --git a/sys-cluster/neutron/neutron-2019.1.9999.ebuild b/sys-cluster/neutron/neutron-2019.1.9999.ebuild
index dca9c322db0c..2435f5317d6a 100644
--- a/sys-cluster/neutron/neutron-2019.1.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2019.1.9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 # still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439
 
 inherit distutils-r1 linux-info user
@@ -98,7 +98,6 @@ RDEPEND="
 	>=dev-python/ovsdbapp-0.9.1[${PYTHON_USEDEP}]
 	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
 	>=dev-python/pyroute2-0.5.3[${PYTHON_USEDEP}]
-	>=dev-python/weakrefmethod-1.0.2[$(python_gen_usedep 'python2_7')]
 	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
 	>=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
 	>=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
diff --git a/sys-cluster/neutron/neutron-2019.2.9999.ebuild b/sys-cluster/neutron/neutron-2019.2.9999.ebuild
index 6a32ace7fec2..ba485cb5c831 100644
--- a/sys-cluster/neutron/neutron-2019.2.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2019.2.9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 # still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439
 
 inherit distutils-r1 linux-info user
@@ -99,7 +99,6 @@ RDEPEND="
 	>=dev-python/ovsdbapp-0.9.1[${PYTHON_USEDEP}]
 	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
 	>=dev-python/pyroute2-0.5.3[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/weakrefmethod-1.0.2[${PYTHON_USEDEP}]' 'python2_7')
 	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
 	>=dev-python/openstacksdk-0.31.2[${PYTHON_USEDEP}]
 	>=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 79fcb6f86e5d..2612d52605e7 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -12,10 +12,10 @@ DIST nova.conf.sample-20.0.1 220110 BLAKE2B af98687c895ee091cc2e8d668eb50b52cc94
 DIST nova.conf.sample-2018.2.9999 387334 BLAKE2B a51b8cdc644ee60390cde3a30ba8f64a339695887b57b2640da39b5a8d34dfec51664b1249955a6cf9202ae19e8e0a8bcd805d4b87d2f6c99a5a6294cc955577 SHA512 be9fbab15ea1cac6d3cd1d186aab904454ef17801f9f4b2f1a37c6e46b4c69fed22a7724846049ebd343beff7753d8db408abae52ad3fca0693d70414c6afc61
 DIST nova.conf.sample-2019.1.9999 387769 BLAKE2B 2b4668e78765469c5ee518a8c340a09407a8f7e9bf3f87a6919b820db0ce2f38499827dbea58994490c8db3a648eef2c95521f7c62b3ae37606bb249492b4b12 SHA512 4facb96c111945f472654788e1ac3d52808b0c45e36c87b873cd1355d36b71922fa94b11d66ec5a8b250739072ecdec394dd4f852a8eb57dbd900c61c71ba770
 DIST nova.conf.sample-2019.2.9999 220110 BLAKE2B af98687c895ee091cc2e8d668eb50b52cc94618081f8a50b544faebed29b2b3a5dfa38309da70dcc6d0083792605b810081b50c15a6c960947e0c782f25717ab SHA512 cc6cce95943b06d60dfc1f85b87d527662eeb57388dca4a6037078b517302b86fd7f752c6e9e43c59c10be83ac5955f21c08284bbc946ffe2171f5bfa6edff38
-EBUILD nova-18.2.3.ebuild 9493 BLAKE2B 1b9ec29a2a6ff3eb43933d2871d5c7c2caec586cbd2e15df1b79e98a39e852de164b43647c1c00ff2a3557d39c6b697686bee3a3c53a9201a8b0726e88406356 SHA512 fbb3e4561c7b5ff86da1216ad3ab9e891da0564ce77b290d1abeec910a13738da14b46caf902ddf388513f835e15dd0774811ec885ba6b919894db349c9a7b57
-EBUILD nova-19.0.3.ebuild 9582 BLAKE2B 285306242428951b117928d492e8babe5786e03e4065e8556395c7cf67afaea3c10d04acc6cb74907a23aa44535b4c8661635dafe0727ade47fdae1359395a38 SHA512 9d61543f6809972a18843d122a3c098f956f27f1954e179fb0bbe235c974bc01c255c400563b4c21d4ffcb991174792548991c402aebedb76851d05cb9c15486
-EBUILD nova-20.0.1.ebuild 7908 BLAKE2B ba20f3b0cf6460fbf32672cfcd6233c830e0f127a1be396386b4c63032a7833efa32fa978ba3861d70a3d88787623fc439ec23895ce4773bb371d3c255a0541f SHA512 9e72ee5fad9806d664076e4e25b790ee9a41a0bf339b66c77578d59bf50189047bad1599fd7866a7d7d3acaba22372a8adefe162e49a2daddc9eb1bcbd86002b
-EBUILD nova-2018.2.9999.ebuild 9496 BLAKE2B c962c25fe0107327d30eb0fde3163e4722763db4e2b3b0ff0250f9dbee071807db7a5dd9404e4425d758cb6408efafa571f79fa50cd0756355ca6754513668e6 SHA512 62756e826de4bed6fa6d185e92defe459e9e32ca53b7b860c882896e0dd306d04918cd932c25311d0700ccefc3effb16e5fadcc4e17d7e2074088d90e3f49734
-EBUILD nova-2019.1.9999.ebuild 9354 BLAKE2B 92302f07eb36bcf62aaefaa51cec5795692823fa886978c70bbbcae000fa46f6b4baeb355831fa58bc8a9bd8fd57fe4dde23c7d50a250d6492c080929979c375 SHA512 cca0284a3e11f5b4509bc755e1390aa383809d8acb7baaa40345d41d09da9222ac7aa968fe14fa95528268410a1bc5f474c3acc7145256709109a4c26278ebd4
-EBUILD nova-2019.2.9999.ebuild 7910 BLAKE2B bd87a12c33c67dcf08318ea0db235150ed3594018a5e2e18c05c17e789f44fc67c8714ee0bd541390c6bf2ec5877fb520b01ad73a4e4755e240522c40354133c SHA512 116e616c76ffadb59df78d5dae314daaf77b52494a616b5ec1104cc35fff78fe80cb020d64341b1a2f20a81e526a2a54f3921021c99bcb1384a69ede007450c3
+EBUILD nova-18.2.3.ebuild 9417 BLAKE2B 82196a1cbd36d3e16519ee9f9f99809af021852fa9cd04c6202fc2c5b50679565312588927dec76e0a916f119c84e8c540333c32be7f1c75e83655fa795f2cb1 SHA512 62c52abfd8fd2d87c8beba14720c8d7bc3264f31381dc13bc77780090115bf65e1abde3c9b41f946417fd0318a53c773770e662144988d6a87741d15ea392dc2
+EBUILD nova-19.0.3.ebuild 9507 BLAKE2B a7496d98e45a811e913f42a3d913af5f26956cc2c9f436a6bc34cc8425abf36dd183125a036dc8d1977fbdc9525b6124d9b6435199fd1c8109f6e4733d8e8e97 SHA512 f08a3f85c93efe313f16ff354638558ba5e7303da004779fb6b76c1ca7d4547ad12f608e50f46186407423a9c46c85e37eb096d01e4030da635af4acb0196510
+EBUILD nova-20.0.1.ebuild 7833 BLAKE2B 97055ab422300946032a79791afbdf250e9f1e9834aa145596a9a275eb5585064bfd17c1ed8a91243af458eb58479cbcf2283e651abc437f9060803e9181065a SHA512 e42571920ebeedd3e82ab82b1922fcf6a28a64974f77da9047c324bd6af0070118b0fb13c68cb9a07d86ad12521c2c81b617af46ba113eb4031c4a2c9d140439
+EBUILD nova-2018.2.9999.ebuild 9420 BLAKE2B eb27aae509665f7bff2f3f06994112a1822e752b278a259b86784b2c0164ed36140456f447839cf6083ceb4b6b54b07f83f673ea9dff70c70f058d20937852c7 SHA512 0c242631b60d701b2c8ad73f0dfc9210e4cd29ed73d13adbe48bc59dd7d369a42fdae4587a29384b0eec75240c6f47109d234fbdac8d03b24a5f9a9a5b988012
+EBUILD nova-2019.1.9999.ebuild 9279 BLAKE2B cfde5c9fb9528b48f8425d084bb377414bee007b92b45b0663f69b78919af4f64ec5dae127fe642d4bbeeb7e95c1f07bd723633a22f87a820a26612c49384aaa SHA512 ce6861798fc9de2cb81cfc1b4de000a15043b161ba372e0c3302263c6cfb516dc200368c1c626bd4199eee4045b85634216e45e6adb1423f99dbab1cbb718901
+EBUILD nova-2019.2.9999.ebuild 7835 BLAKE2B 9484f3721935acec232ab7f6017ac418323aacabf9cab42f520604648bc62002619eb0351b701d35e064deb07ed4df4a0c867041a05d3256b7e8cf1a3d851f23 SHA512 b2547735beba54dc42bc9f548a56cd548cf2873dfbfc303b2d8e72b54a2eb467c8a257688c2d4dfa5982043499757038f08ce6da0c39c51e944738abc8d07551
 MISC metadata.xml 1172 BLAKE2B aa85fe6bed1e40717884d721c2633c5f6d380914c69cb8a4a4c31b3e4c779db52b90fdaa5ee63b66ad9bc6694f666dd37dceeffb8de4676014ef3bb688476ef7 SHA512 bb506fa680b064c3d6a48710cac11efedc9e8a340603e234bf5c4c48aaab773e4527d7a8fc66ae36ec894230a1d02a5be995e521d222914f652e03b6f72642e4
diff --git a/sys-cluster/nova/nova-18.2.3.ebuild b/sys-cluster/nova/nova-18.2.3.ebuild
index f57c926d0e3e..c0f27aa09b18 100644
--- a/sys-cluster/nova/nova-18.2.3.ebuild
+++ b/sys-cluster/nova/nova-18.2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1 eutils linux-info multilib user
 
 DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
@@ -151,7 +151,6 @@ RDEPEND="
 	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
 	>=dev-python/zVMCloudConnector-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/futures-3.0.0[$(python_gen_usedep 'python2_7')]
 	dev-python/libvirt-python[${PYTHON_USEDEP}]
 	app-emulation/libvirt[iscsi?]
 	novncproxy? ( www-apps/novnc )
diff --git a/sys-cluster/nova/nova-19.0.3.ebuild b/sys-cluster/nova/nova-19.0.3.ebuild
index d25e3939bb40..62aa6375ef4f 100644
--- a/sys-cluster/nova/nova-19.0.3.ebuild
+++ b/sys-cluster/nova/nova-19.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 eutils linux-info multilib user
 
 DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
@@ -151,7 +151,6 @@ RDEPEND="
 	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
 	>=dev-python/zVMCloudConnector-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/futurist-1.8.0[$(python_gen_usedep 'python2_7')]
 	dev-python/libvirt-python[${PYTHON_USEDEP}]
 	app-emulation/libvirt[iscsi?]
 	app-emulation/spice-html5
diff --git a/sys-cluster/nova/nova-20.0.1.ebuild b/sys-cluster/nova/nova-20.0.1.ebuild
index 721b0a62416c..9b4ef0a8b72a 100644
--- a/sys-cluster/nova/nova-20.0.1.ebuild
+++ b/sys-cluster/nova/nova-20.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 eutils linux-info multilib user
 
 DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
@@ -122,7 +122,6 @@ RDEPEND="
 	>=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/futurist-1.8.0[$(python_gen_usedep 'python2_7')]
 	>=dev-python/openstacksdk-0.35.0[${PYTHON_USEDEP}]
 	dev-python/libvirt-python[${PYTHON_USEDEP}]
 	app-emulation/libvirt[iscsi?]
diff --git a/sys-cluster/nova/nova-2018.2.9999.ebuild b/sys-cluster/nova/nova-2018.2.9999.ebuild
index dd30ccf5b550..fd27a7d13ab2 100644
--- a/sys-cluster/nova/nova-2018.2.9999.ebuild
+++ b/sys-cluster/nova/nova-2018.2.9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1 eutils linux-info multilib user
 
 DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
@@ -151,7 +151,6 @@ RDEPEND="
 	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
 	>=dev-python/zVMCloudConnector-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/futures-3.0.0[$(python_gen_usedep 'python2_7')]
 	dev-python/libvirt-python[${PYTHON_USEDEP}]
 	app-emulation/libvirt[iscsi?]
 	novncproxy? ( www-apps/novnc )
diff --git a/sys-cluster/nova/nova-2019.1.9999.ebuild b/sys-cluster/nova/nova-2019.1.9999.ebuild
index 4eaf50a66197..1a8192dec6f4 100644
--- a/sys-cluster/nova/nova-2019.1.9999.ebuild
+++ b/sys-cluster/nova/nova-2019.1.9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 eutils linux-info multilib user
 
 DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
@@ -151,7 +151,6 @@ RDEPEND="
 	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
 	>=dev-python/zVMCloudConnector-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/futurist-1.8.0[$(python_gen_usedep 'python2_7')]
 	dev-python/libvirt-python[${PYTHON_USEDEP}]
 	app-emulation/libvirt[iscsi?]
 	app-emulation/spice-html5
diff --git a/sys-cluster/nova/nova-2019.2.9999.ebuild b/sys-cluster/nova/nova-2019.2.9999.ebuild
index 01dac558c9cb..9d72a11b0add 100644
--- a/sys-cluster/nova/nova-2019.2.9999.ebuild
+++ b/sys-cluster/nova/nova-2019.2.9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 eutils linux-info multilib user
 
 DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
@@ -122,7 +122,6 @@ RDEPEND="
 	>=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/futurist-1.8.0[$(python_gen_usedep 'python2_7')]
 	>=dev-python/openstacksdk-0.35.0[${PYTHON_USEDEP}]
 	dev-python/libvirt-python[${PYTHON_USEDEP}]
 	app-emulation/libvirt[iscsi?]
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 5fe89d4f8340..402e662aabde 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -15,19 +15,19 @@ DIST openmpi-3.0.4.tar.bz2 9308341 BLAKE2B 84536082f8415c9a0e41db01d96d64bffc463
 DIST openmpi-3.1.4.tar.bz2 9468371 BLAKE2B 70a93aa170086f43b2eb4f9b7c74673065bd309ae7a4c8f478a6db7523167fd1d25af19f87661149f6dd6033898ab47b86690a0421a01aa6f5a4d70478072e0e SHA512 5b4aafffc79fd85cb94a11a6e2fac563b142ac532191009eb35826c432ed3c391a6616e2ca92eacbf36137468eadb7c0f7ddc787034bc95c4214232ed5128338
 DIST openmpi-4.0.1.tar.bz2 9838152 BLAKE2B 75657940e37c23fbe88032f116588960c6bcf34c4928d77b45e8fde6fb51e814f521adb6c5155cb588fff9d1b382c2470873d90979a68598ff13e1aa205fc811 SHA512 09f35dc2e44b4f84aab9c5af9d81f90bbdb030e4d90800a5d3ffae88cb32b7faecc9bea0abb113da53c21f73e9d19db68f961f997bc47bdd28d83a87beee0731
 DIST openmpi-4.0.2.tar.bz2 9819372 BLAKE2B 000faa8ff032f9aa6bf5f0a14fb9a363080cfcdd7c6f8ab90bc9507fd7a473d70502574ee1e75c88acecb06c516a643ef7b9e804fb580be9fc860b7b1fb1cc5d SHA512 634d45d989f1e0b8848bfb4eb4527c7edd76d4fccd77a5f8d85a46a5822f97ba653adf13df857c87ae56a8117b4ae2d45ec24249c6ee41a562446d4112ddb770
-EBUILD openmpi-1.10.7.ebuild 6285 BLAKE2B a012fecf048e0e1d2a0c9d759953885990e2cdacb69fcf87d263cb5e6c066fc42c1b79b1c958aa0cd521cf53fd82d59f5ec72bf169145214cbba8d8961025eda SHA512 d037215aa2acfc7a689fccbea4c5d04739b548095ccf9ceec671dfd3353b2ed6688e54f87c09a5215b0e2c0324782a0f73631ea28694b461906df8032f7bc3dc
-EBUILD openmpi-1.4.3.ebuild 2458 BLAKE2B 50cc346bc9bb8b556f80e61fc6920e983aacb1324faf3418ce4e8589b99c69b66466f4d1a357827dacb49e90a256aac9adc6c04d75c7f5785ebc61f94f933692 SHA512 ca2930c486bba543149aece276640dccc43d545db8ee2fc89f2c7cdddcfe3d46361022f23c184953900d845ad43024c68e434432f82f5364fe0afc271264c542
-EBUILD openmpi-1.4.5.ebuild 2467 BLAKE2B f715ef1c3cc4c35d4805b3a5e4d127c968b925101a533f805fafeaee5aaa4b54cefd65b378ccd660b4173b8f1354594cbb6b3980cee25bc47fe8887de98f3075 SHA512 998a3f751610d798462084ec521436643536c892255bdec541d830991a21646380e447d4a8d8a8032e84025d142cc3e2ed6c868f57524ca7f77d67f9dc814623
-EBUILD openmpi-1.6.5-r1.ebuild 5031 BLAKE2B 9dde21cb5630e436583e63955e374f6353f40cdb3de1889fec66ec7b739c22cc513b1b1accbaf0c5970c8d87aedf574117aef85a48b9376bd2202d41257f1b4e SHA512 e3e5f4bbcea9a710954f9201517a5424dafa508fe8f86d124a00464d26e0d7d34ce6a75b0c8c221a6076a379aa1b549aad2461c29f35a5294ea4ae29b2161e0f
-EBUILD openmpi-1.7.5-r1.ebuild 4781 BLAKE2B 0ba96d032c94f06867ff899f4f57ea9955ab3abc54d4b84547736fc770b9ab6670bb9c34d410f25df8db0dbc944f9184765ecf775342847faacbfdfd2d9d0905 SHA512 92caadf55abcf9e3c3c08ab6a7cca083fe9e819e0a4273e17fd90d54ef2f059594e015fadd034e6ae700e9b2e8d1d9bcc77c245d20058d50c6e901d1885c88f4
-EBUILD openmpi-1.8.4-r4.ebuild 4824 BLAKE2B c3b44a6c9e644305f77d9db41829a58c28e651f67179e990624252f4854fe723923da666502945b01cb2ece2d9f5058824aeadc5f9ef1468d971be8d3ad0dca3 SHA512 d0f71fbee1d862954e51824e80ede7a51f5a926f0ad11269988096af063638976be644d8a2bd4c0972256d4a44664cadafdebe1d554139030a12da2fedd43682
-EBUILD openmpi-1.8.7-r1.ebuild 5336 BLAKE2B 58abdd314132e2e60df0bf4167c431dbb33ba071203faa14062f890ef17dfc60c26ecee9b36b5b90dc9fcc30e6308eb6334989393238533361390ca21fd5afcd SHA512 130cdc40e4658be42374e59f99a7ad5c5914812192911fc077e45aa4056187cf63643fe470ccbdf2b7d6831df603777f7cb3729d9f8d6d84065ff3fe5a1e72fc
-EBUILD openmpi-1.8.8.ebuild 5342 BLAKE2B 20d4833a0dc7f63e261198459e871030c88ead4cfa6d34eca89d011804135557639bfa004f4707db1b8d4ecf5efcccdc5cdab01ba5eb50b3d10bd3064ff513a4 SHA512 927f4b33d1ddb44fc6147fbe4d18689f420a19817e664c28e63087258e754c32bc759266e07231f20a832170e6c594652d7345dcfa26f32e450cfe58a1b69d4c
-EBUILD openmpi-2.0.2.ebuild 5895 BLAKE2B 54083652e78d0ca04be20c1446ee46b903d5e21c7a81cd9b2bc5300bf721d060a04f0ac621f80f72cc96785f3f1694d538e4e7502f23995b49f26acb70a3325f SHA512 104fccd6ec11772e8787d72bece2908711c3fda93a22b48daf03a3fc070faf40c961366171d2a17c6cb85c582e5e9710e69a687cf52a492cea94a27f7bc77c42
-EBUILD openmpi-2.0.4.ebuild 5899 BLAKE2B 1a495bfcffbd62d456fac2a95e18af701ca6fb0d95adf56587dad9f3519e2d7f70674953534bc7bbfd11c32356d2637961b9d1dee3b76f2b63651c26873454bb SHA512 3b3db523b5d477bf6fd52a370af63d6e0aee1390efd9b597b378a7380dc4f3b18f5a900dde49fddfdd239956026c555bf645adc79f7f52b0e91bc8c009d05e04
-EBUILD openmpi-2.1.6.ebuild 5513 BLAKE2B 1f4e90e16643bbde9eaf39fe12514370ef29ef8bb2efd1cc8f65a2e1a35a4fdac7d77808a4e3764083e6e1f72c43cc2a10e125ba7917be1135fa68b5fc96fb9a SHA512 e9bc83cffaeff5008f041d6661b5d547bc3de22e5b0445dde293adc34e7e98b99b35bf52335871cd1beba8397661cee383a28092134fbda7056d9cc47fd50aac
-EBUILD openmpi-3.0.4.ebuild 5399 BLAKE2B daac9298114db476cff1915f48b03ca045eb50b487a83845eaef6a4d448f3ece2a1db60c233a1586b01f0cf754b14ee9447dd15eb4add2011e088dca321d8e5a SHA512 434ebba25c99fbb087ea7bb7dc40f43cefab9b660bed65b6772e640722786f33b8a17811872141a0715b6509715e898274397c4c796a2f31196e3a68731a93fd
-EBUILD openmpi-3.1.4.ebuild 5399 BLAKE2B daac9298114db476cff1915f48b03ca045eb50b487a83845eaef6a4d448f3ece2a1db60c233a1586b01f0cf754b14ee9447dd15eb4add2011e088dca321d8e5a SHA512 434ebba25c99fbb087ea7bb7dc40f43cefab9b660bed65b6772e640722786f33b8a17811872141a0715b6509715e898274397c4c796a2f31196e3a68731a93fd
-EBUILD openmpi-4.0.1-r1.ebuild 5341 BLAKE2B 323615263b4e803de715a7cab0b8d01d34f693122b93bf08a9a4abd70e8430c29c2974515be71132284ef649ddd0f9b771ccecc218121dcb13f97bda5cc223f3 SHA512 e6b17cb28c0cbf78932ff6edda4c3bc012012f723c8407be0c8d9b472933b4edf1173cb78a0a50f398561e2938a702cb871babe537670966364b0266b0b7026a
-EBUILD openmpi-4.0.2.ebuild 5341 BLAKE2B 323615263b4e803de715a7cab0b8d01d34f693122b93bf08a9a4abd70e8430c29c2974515be71132284ef649ddd0f9b771ccecc218121dcb13f97bda5cc223f3 SHA512 e6b17cb28c0cbf78932ff6edda4c3bc012012f723c8407be0c8d9b472933b4edf1173cb78a0a50f398561e2938a702cb871babe537670966364b0266b0b7026a
+EBUILD openmpi-1.10.7.ebuild 6263 BLAKE2B 3b62f526e26cca18bb42ddb1da43401f8250fa3ac948cbef7a7a10f7a8d475efbf0fd728896e5bc57837486c71e7802d1122a9929cac786406c677530c9370ac SHA512 2f6f7b6265536a34596a4b28610bcc753834c7f7d96fd87d2ba13b2c3e4ed80f5cd7905e01c496aac88be5394876ebda9e724fa0f637c81331e506105f2bc056
+EBUILD openmpi-1.4.3.ebuild 2436 BLAKE2B 24b8252dc932d6f9a2d67c57650b55561f4e21e153c97f05df42b569b9a810ad29558eddfd4c367b5995ea47158a39444bf26c2db31bc9c67102aa58182af31b SHA512 c082d0e9904dad07100b5bc2ba2aaa0e9982585ff2bb5742b553bf562ca709e49ece33bc6be5cd27abf9a82d8365842f6980d36809a0e2acfb600e88862142cc
+EBUILD openmpi-1.4.5.ebuild 2445 BLAKE2B 43a7054359fd696b62e5402ad516d863d7fff69a4e99afb9412b5ed4d5b1f23a9a03d358d09ddd9a02740ebabd6181fa422cb7e291bf2d0b5103a78ea27cd341 SHA512 85930a30601f2ed2ea99fd42ed97b5310ab99fe0e2787a6dc3ff1262505f396b488577dab662a433e304f8d6b6b1c5e39d17113d45bf1f3477eaa9ebaaf52c1b
+EBUILD openmpi-1.6.5-r1.ebuild 5009 BLAKE2B 60fd2512b457e6b4fc8f226a08a6f1563962c80de5bf5f245e5476a2cb4538864b8fe4551f474bbcd31f47bf6002f6ff4b758f247eeeac25ce82676543d4e4fc SHA512 806d58dc0bade3b601f35992409ddb9c7eb275d346a2e7df52a6dd8c1d11d77574e82a3a1c13c99699f9cc1e06549acc71fa2b16d01915711d35a83e249fd9e6
+EBUILD openmpi-1.7.5-r1.ebuild 4759 BLAKE2B 45c90e4ad034085849e3653e9dcefb383d431d0d2846731612f97feb195571ce61b4f7175478d0764d9066db61b09fd6f71bb6c3cec82964ac4c6582e65266f1 SHA512 15cd32162895306696da23762c7053969890f6e52869c378a53ea7da5886e0487cbdb80e9f041237fea9520703a1cca299244bd8e5d40fd6cbaf5adff8a00c5e
+EBUILD openmpi-1.8.4-r4.ebuild 4802 BLAKE2B 99c045bfd1eb46e5119f647e3aa8917b5ea38f22b99181fd2702a1cc9ba6e21b47a4708915d6c92a48ba5cca8443e6bf448016291cfa5a8680532fe9114da5d9 SHA512 2c8e0ef7a419c9a02b6e62b50ca426aacc912c4930f9a09ef784182cd48c7719ed96190733c862bf048b2c1723c6f916276e4df0cd73b9c60fdf2b4eff84205c
+EBUILD openmpi-1.8.7-r1.ebuild 5314 BLAKE2B ab982909481cce9f14cdad5f434f3605b47ec584004355b27d7d1e792c0a152844782f15857b9558635270cf1da9eb37be11016f4caaab22e9da4be8c5241d10 SHA512 9bf214ca103100df609c09267376989ea531f427dcadfae26c5608fd2587cff0b0df62dacea17ce1eb44db375b4e5a4aa778544f3b197cd05b8b187329fbc10d
+EBUILD openmpi-1.8.8.ebuild 5320 BLAKE2B ca0be3563d2110673489348d25bab2e3e5713924cf6a5a4129f595c88c707b3090df4722c22367870225afaf41d64af6eeec58ccd35f5b508b126335a425ee22 SHA512 0781ea59c2c941b968f2ae39d660ca26f6991019520e07f5b4fe37140f236ec76f77d2e8bb84f290b7007f8da7630c9aac156b5073d2093773975a9f7abb2868
+EBUILD openmpi-2.0.2.ebuild 5873 BLAKE2B 8b92228d6a4c1d3ae7d5914cee38aef6eac9f3ce198ed7cf620bdd699f1b54a67f537f6b8841bb6a97711b4af741c305c8dd4f5dfbb1a53a3ce286c73d1f394d SHA512 1ff2f6d2cda462d1416a3f49655ae0f97d34dbbdcd22b64555de8e593fc0888b8dd127ef5c32e08be8d88fdbb28b31bcc856dcb46a7813dac6b20ba851689994
+EBUILD openmpi-2.0.4.ebuild 5877 BLAKE2B 096d892a023c61dad1f8d628b5b2a9450b7eb43687e246c841bf2d68bedd8046f9ddb922e6b077511a05e56d4fedc68043c9b9954296fd6c17af006c8fc002cf SHA512 3dad7eca29d98fb2b564ea5d96adccc794ca056357cc596b57ac82bceaa7bf08031d45ff0779dfe835ffb5bf8bbc1973c69ed1298c5a046eb65875561873d5a8
+EBUILD openmpi-2.1.6.ebuild 5491 BLAKE2B 4820398c3d020f650c067ba56fe6c324d319acd0755ab87d98df0cc43abfd24f1481d991c75a545e12a4b856287ec6337a872bb00e5a528595acd0a247dc6f7e SHA512 2c15f7b7f9131b7b6a0c08e918d7c683ffd8108f71decdd8ca4e1e82c78b66dd31e2017c22ec60c72a5cd37f2ea3c2e6f65d1ca3d13b6855e19e5ebe57278586
+EBUILD openmpi-3.0.4.ebuild 5377 BLAKE2B a07ba3ef9c7b594c9de2ef29ff1d33177ec56568d10336147c9c4ffadd4d655f2648a1f097468bb7e638249f081bf80d27421db0e03435f33c20f9b649cb585e SHA512 b552ee84c2196f233cbd052f98bea70ea003b447ee3f5a5853841fcdae68843317afd7ba3fb8be93641c76f538fc77aecd2b81e8593fceed2e4ca4c56475045b
+EBUILD openmpi-3.1.4.ebuild 5377 BLAKE2B a07ba3ef9c7b594c9de2ef29ff1d33177ec56568d10336147c9c4ffadd4d655f2648a1f097468bb7e638249f081bf80d27421db0e03435f33c20f9b649cb585e SHA512 b552ee84c2196f233cbd052f98bea70ea003b447ee3f5a5853841fcdae68843317afd7ba3fb8be93641c76f538fc77aecd2b81e8593fceed2e4ca4c56475045b
+EBUILD openmpi-4.0.1-r1.ebuild 5319 BLAKE2B eff82c6e203d8875c8e8ce2a0e3add15f95302479d1a76bc947162ee72f6660b1545f40903f95c52adc5b63a006a2982f4be343b7a06cbfa73a772bfaf69151f SHA512 4f6096c9d123c0b49ff49de54b5540758fe3626c58fe537bfd0e815ce3b34a17d8ff71bd2363a119cc5ed57eec56edd6b9834c5dcdb65c6ce5e57152c6057bed
+EBUILD openmpi-4.0.2.ebuild 5319 BLAKE2B eff82c6e203d8875c8e8ce2a0e3add15f95302479d1a76bc947162ee72f6660b1545f40903f95c52adc5b63a006a2982f4be343b7a06cbfa73a772bfaf69151f SHA512 4f6096c9d123c0b49ff49de54b5540758fe3626c58fe537bfd0e815ce3b34a17d8ff71bd2363a119cc5ed57eec56edd6b9834c5dcdb65c6ce5e57152c6057bed
 MISC metadata.xml 928 BLAKE2B f6cacb50815977ad28b83ec24725021a140db9592152d2a9e238da051058287c01c73ac557392946f83949caee2f75a847ba5e82c4b6f816ab3f8288aa38b719 SHA512 a7ba5e4bfc8e6c1a74667f31c4d8df580699fa84766cbc597a66c1a0ed12ece60bf1f683fcbd30529b042588ae4460741b4eef407e232532a3eede1766326f1e
diff --git a/sys-cluster/openmpi/openmpi-1.10.7.ebuild b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
index adce58ce204b..fafd136a9e2e 100644
--- a/sys-cluster/openmpi/openmpi-1.10.7.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -57,7 +57,6 @@ CDEPEND="
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
 	!sys-cluster/nullmpi
-	!sys-cluster/mpiexec
 	!sys-cluster/pmix
 	>=dev-libs/libevent-2.0.21[${MULTILIB_USEDEP}]
 	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
diff --git a/sys-cluster/openmpi/openmpi-1.4.3.ebuild b/sys-cluster/openmpi/openmpi-1.4.3.ebuild
index db37d6581843..150c38ec5a91 100644
--- a/sys-cluster/openmpi/openmpi-1.4.3.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,7 +25,6 @@ RDEPEND="
 	)
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
-	!sys-cluster/mpiexec
 	!sys-cluster/pmix"
 DEPEND="${RDEPEND}"
 
diff --git a/sys-cluster/openmpi/openmpi-1.4.5.ebuild b/sys-cluster/openmpi/openmpi-1.4.5.ebuild
index 0bbe9b66f66f..09f1a47cf5a1 100644
--- a/sys-cluster/openmpi/openmpi-1.4.5.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -27,7 +27,6 @@ RDEPEND="
 	)
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
-	!sys-cluster/mpiexec
 	!sys-cluster/pmix"
 DEPEND="${RDEPEND}"
 
diff --git a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
index df2aebcc202a..2316cbacd408 100644
--- a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -50,7 +50,6 @@ REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
 RDEPEND="
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
-	!sys-cluster/mpiexec
 	!sys-cluster/pmix
 	<sys-apps/hwloc-2
 	dev-libs/libltdl:0
diff --git a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
index 3ac5a69985c9..b89bbeea526c 100644
--- a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -53,7 +53,6 @@ MPI_UNCLASSED_DEP_STR="
 RDEPEND="
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
-	!sys-cluster/mpiexec
 	!sys-cluster/pmix
 	dev-libs/libevent
 	dev-libs/libltdl:0
diff --git a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
index 2c81eb423270..8b62b1da8c2e 100644
--- a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -55,7 +55,6 @@ MPI_UNCLASSED_DEP_STR="
 RDEPEND="
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
-	!sys-cluster/mpiexec
 	!sys-cluster/pmix
 	dev-libs/libevent
 	dev-libs/libltdl:0
diff --git a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
index 95e3f08eb07e..e50b89fd7f6a 100644
--- a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -55,7 +55,6 @@ MPI_UNCLASSED_DEP_STR="
 CDEPEND="
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
-	!sys-cluster/mpiexec
 	!sys-cluster/pmix
 	dev-libs/libevent
 	dev-libs/libltdl:0
diff --git a/sys-cluster/openmpi/openmpi-1.8.8.ebuild b/sys-cluster/openmpi/openmpi-1.8.8.ebuild
index df5defd234e3..762622c3a983 100644
--- a/sys-cluster/openmpi/openmpi-1.8.8.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -55,7 +55,6 @@ MPI_UNCLASSED_DEP_STR="
 CDEPEND="
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
-	!sys-cluster/mpiexec
 	!sys-cluster/pmix
 	dev-libs/libevent
 	dev-libs/libltdl:0
diff --git a/sys-cluster/openmpi/openmpi-2.0.2.ebuild b/sys-cluster/openmpi/openmpi-2.0.2.ebuild
index 22ab86ab5cd5..0cd832b79dc6 100644
--- a/sys-cluster/openmpi/openmpi-2.0.2.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -51,7 +51,6 @@ CDEPEND="
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
 	!sys-cluster/nullmpi
-	!sys-cluster/mpiexec
 	!sys-cluster/pmix
 	>=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
 	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
diff --git a/sys-cluster/openmpi/openmpi-2.0.4.ebuild b/sys-cluster/openmpi/openmpi-2.0.4.ebuild
index 6d45ab300608..9f690b3e56ba 100644
--- a/sys-cluster/openmpi/openmpi-2.0.4.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -51,7 +51,6 @@ CDEPEND="
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
 	!sys-cluster/nullmpi
-	!sys-cluster/mpiexec
 	!sys-cluster/pmix
 	>=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
 	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
diff --git a/sys-cluster/openmpi/openmpi-2.1.6.ebuild b/sys-cluster/openmpi/openmpi-2.1.6.ebuild
index 1ceddfc03e6b..675c6c28a79b 100644
--- a/sys-cluster/openmpi/openmpi-2.1.6.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -47,7 +47,6 @@ CDEPEND="
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
 	!sys-cluster/nullmpi
-	!sys-cluster/mpiexec
 	!sys-cluster/pmix
 	>=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
 	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
diff --git a/sys-cluster/openmpi/openmpi-3.0.4.ebuild b/sys-cluster/openmpi/openmpi-3.0.4.ebuild
index d02b39b55b43..5e4759429d76 100644
--- a/sys-cluster/openmpi/openmpi-3.0.4.ebuild
+++ b/sys-cluster/openmpi/openmpi-3.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -47,7 +47,6 @@ CDEPEND="
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
 	!sys-cluster/nullmpi
-	!sys-cluster/mpiexec
 	!sys-cluster/pmix
 	>=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
 	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
diff --git a/sys-cluster/openmpi/openmpi-3.1.4.ebuild b/sys-cluster/openmpi/openmpi-3.1.4.ebuild
index d02b39b55b43..5e4759429d76 100644
--- a/sys-cluster/openmpi/openmpi-3.1.4.ebuild
+++ b/sys-cluster/openmpi/openmpi-3.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -47,7 +47,6 @@ CDEPEND="
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
 	!sys-cluster/nullmpi
-	!sys-cluster/mpiexec
 	!sys-cluster/pmix
 	>=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
 	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
diff --git a/sys-cluster/openmpi/openmpi-4.0.1-r1.ebuild b/sys-cluster/openmpi/openmpi-4.0.1-r1.ebuild
index 44ace1d10c6c..325f9db22542 100644
--- a/sys-cluster/openmpi/openmpi-4.0.1-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-4.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -46,7 +46,6 @@ CDEPEND="
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
 	!sys-cluster/nullmpi
-	!sys-cluster/mpiexec
 	>=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads]
 	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
 	>=sys-apps/hwloc-2.0.2[${MULTILIB_USEDEP}]
diff --git a/sys-cluster/openmpi/openmpi-4.0.2.ebuild b/sys-cluster/openmpi/openmpi-4.0.2.ebuild
index 44ace1d10c6c..325f9db22542 100644
--- a/sys-cluster/openmpi/openmpi-4.0.2.ebuild
+++ b/sys-cluster/openmpi/openmpi-4.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -46,7 +46,6 @@ CDEPEND="
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
 	!sys-cluster/nullmpi
-	!sys-cluster/mpiexec
 	>=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads]
 	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
 	>=sys-apps/hwloc-2.0.2[${MULTILIB_USEDEP}]
diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index acaffd558650..03fdb1ed01bc 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -3,6 +3,6 @@ AUX pacemaker.service 105 BLAKE2B 2b77b0c81427ab418bb5af372fb4938a7c630a9bb1e412
 DIST Pacemaker-1.1.16.tar.gz 4897772 BLAKE2B a6ea8b3e5f6ef776a67d8895a0361945c5bcd98ecd861c0fd8d8b3c474a6f14c816e1f36da1dccd429ab8d92c53a9dd071796968d5080d6a900518df200fafbd SHA512 967c860fab7b9e73dd8643e6d09083a2a1298a77d71c3b138187803c89153bee7219da13e6b94b20f2881b53ba7fc1c8584a43ff058a265e76708fd5dbccf534
 DIST Pacemaker-1.1.19.tar.gz 5369381 BLAKE2B 9134f014b4da61c01bb2533ad33201400335d9e722e064f5e838df851777cfd17115430bd4623b08b97330bfe98340091f06a98c06dd125761053e79f0375dd2 SHA512 c41403441a3ba7a4fb81b6c3e84d7eff5ee951e1040918597ea8462284c83dc6f572607d4903b1238c55757f1eca78132878a172da4e3b5db2dbfe0831c34548
 EBUILD pacemaker-1.1.16.ebuild 1703 BLAKE2B a7266e084dba208f4370e5fdf4f8decebc19b162992ff4b0f3dd7daeca6d87ae453159a8f130d6bf73e9706c5b19ddc859263f23b979051be887189100beac6b SHA512 22d5da2218c68ffdb63ca5ad631e802ab28ad06f31749b98f8b3c4cc14f3cb0dad3fedd282d8dfbcee1b5c9fbe32a0a0c9f484cbc45d2d6dc8696bf96138c27c
-EBUILD pacemaker-1.1.19-r1.ebuild 1724 BLAKE2B 3061080181b8dd2e3ba5fae992f9e1e1628c750f7f4113028541f6416d046c0571695598d9ac4589ffc8a6521a4d253894fbb358ae36b0219b3b207cd30673fb SHA512 71ecbec41eceb2b52b0687c2b567ac18c5b48524fa7e46e7412597b5a8afb5511ad186bb36fd0901beac8c88a4081110c94b6f5fcd593b48f8d2f446ae00a102
+EBUILD pacemaker-1.1.19-r1.ebuild 1722 BLAKE2B dbfa40ed6003923bad59418476c2ed14679c490c5276262f52c3479878cd952505bb50126f3550d5941a7d8354dc96290e85dbfba67c72415cb1758f196ed10e SHA512 9cc79001a41738654f4f95c81322ceccd97aa25c8a6b8637458694422d3c7cd816a37d59ea9f97ce55c95b534cf5095e3780a93f1c965ecf315335e248205e86
 EBUILD pacemaker-1.1.19.ebuild 1706 BLAKE2B 770372129bd5de9fb9440c89b9724386196c89d9667b30e2b919ee2abf31dd875d7707f7980fa234c34f369fd554c85837ed79c57f9326ec9e6611facb777f2c SHA512 acbfb099817a76e985ac9e1e7bc29d34cc47a06bbd1a57ac8eff64930b2c6bd8e1ce0494d91fa976c044d2472e1b93cfb464dd855f53bef8854ed5ce85f103aa
 MISC metadata.xml 889 BLAKE2B 9b52f88582de605852765e0956640e713e68584066410f472beecccbf69db5a8b7226aaf4ce12851b45fd6945d0cde5cd7e524a873599bf35d4e3cf03a6dd8a5 SHA512 dbfaa3e72fbe361e1648a0a1dfd3e0f153489d005f052fc4ddd1468480d53c84a49bb18c0cfc16ac3f2f409f2ff673ec554faae562452420b898167b8650654f
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
index 879fa861bc17..8ad454d732e4 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit autotools python-single-r1
 
diff --git a/sys-cluster/placement/Manifest b/sys-cluster/placement/Manifest
index 66453fb04d3b..ea2eb9dd3648 100644
--- a/sys-cluster/placement/Manifest
+++ b/sys-cluster/placement/Manifest
@@ -4,8 +4,8 @@ DIST placement.conf.sample-1.0.0 19383 BLAKE2B 0088bffd3755ff589026856c977f241a1
 DIST placement.conf.sample-2.0.0 25512 BLAKE2B ddc802d500bc7f5b8627740ab5d8905fbf0c4629b18810907cee74dbe82a55b2440d89a4ddba496196627373c3f109daec33dd2841e73b8b1dbadb6407daa8f0 SHA512 3d4f81a00a2f98bfdb25b6a15f2db94c06547b4f98f22d503123475f9e73cdb65252c5958ba5e954cfcddfa64c60de362768fca88b83a4215ec462d9995ac1fc
 DIST placement.conf.sample-2019.1.9999 19383 BLAKE2B 0088bffd3755ff589026856c977f241a1d98d151966ad7ece7b11e6fb382b1cc49fd606c66d857defba52db1927b6255f74144ce61d86e806e014baf97e6af1f SHA512 ea3c842145870fc51cf9d118734cab07498691fabc5313297e8956e2c8547eddfd0ef99b8529a8ad5e4d7b98e708276c3bed6549158b5ea774c39ef16777d1d3
 DIST placement.conf.sample-2019.2.9999 25512 BLAKE2B ddc802d500bc7f5b8627740ab5d8905fbf0c4629b18810907cee74dbe82a55b2440d89a4ddba496196627373c3f109daec33dd2841e73b8b1dbadb6407daa8f0 SHA512 3d4f81a00a2f98bfdb25b6a15f2db94c06547b4f98f22d503123475f9e73cdb65252c5958ba5e954cfcddfa64c60de362768fca88b83a4215ec462d9995ac1fc
-EBUILD placement-1.0.0-r1.ebuild 4228 BLAKE2B b9d766b14374e388bad56ccc7a03fec6d7d8fa18f7fc6cf102492633a172bda1279a00924b390bb554e4967867a355f0877f8342ddd09e2ce8f424acd3eb611f SHA512 419299eb25b7ced1ff63b5925de32654d5e3639143292096de64b5d0f711e5ad0fbab6c80cd7d61efde9f5aa2712f39173279688b6f24bcda7a24eb84796256e
-EBUILD placement-2.0.0.ebuild 3497 BLAKE2B 8641397be2abaf406449867bd2c3403ab22d1f6823aaa4fd0c8f71ef6b61d117012c6a12d2e34582c775e20483645d1c7493ffad6a0b3c7af83b9bbe39616d9f SHA512 c05c8bdc0c84d9c4b6035a2573d77e53452bae4b43ea85f2592bf2f102c9b5fea65cceccb0515a6cc9738b98d64cdbdf003a7622a8e58e0d37db722ac944d76a
-EBUILD placement-2019.1.9999.ebuild 4230 BLAKE2B 1e214d7aab53f15041f635d85f9338aec45baba58ff0ae65eb64cd5df38dcef1db33497d20728c6fcb2220841470ea7142ac66174b21a0c516bdd680aa99b7d9 SHA512 714a9960fe71dccebd2b2a166f0f387d908db83d40c5a8de2dadf5b9a82cf98c38bbd8ce378dac967b22cd6046ac377f379165badc7be5ca0377a04c449f8d26
-EBUILD placement-2019.2.9999.ebuild 3499 BLAKE2B 6b5ca636190eca51f5715db4bac48af9772fc84235e8a2cc63d5aeefeed9985caa46381334fd10260aee4fcb5fce55d3656c7e91dfb83fde96b516476d0df24b SHA512 4e0a3da7584a9b02380e13e9c1d2f9c37848497ee47461666115628167909d4d8eb3c69b40da723d7d4876c6c9a3f7ef3f12775b69ad0e63ea7aa4295fa1b4f5
+EBUILD placement-1.0.0-r1.ebuild 4221 BLAKE2B 49d628a06e00a0e6fdeaab6d323f8d4cd7e0d64b0710c9da550f0c2fd2ecc73427f2de2e1dc91cd0dc3b8b59ccfcabfddebd1e2a0a95436ddda6c35a077e62b5 SHA512 c18c6fcab3713da5b6f69af4f65e90bc2aa0fc530471ac9d875fc7d19c9909e0b5b4e68f8d9a18c9e0de1c978e8369a70582e63197893b91c96c63e35b88c638
+EBUILD placement-2.0.0.ebuild 3490 BLAKE2B 64bb87b4459b30e03b2f7426af7eec63fb281b966d0e5395c7b0e0f210ba9c7717a8a22c4ccc917a45abc94d937a4b17e35b69700cd36a6bfa93f6c5eea401f7 SHA512 5634a3a9f045ce29bd8e8077168e83e025ab54713e79e5b26e556015066b9920d5079371701f08f703e235a33399505670f4acc1b3301c628f4c34307a3124ee
+EBUILD placement-2019.1.9999.ebuild 4223 BLAKE2B 35d93cd2f520bec894c636394e65194ee00440b1cc818820a912eac0516419942dd2b7d2e4649e87408a9a0b69f39012c2e3c955bde21da6e371f8dd941c4138 SHA512 a9516e57804db2dd6f0471b36f3d57cc6a4f8fcb64ebf3fc142a0b7cce6a557c391da8262699fc1ebcbb968d28374677b0f6d41fea2f9b149177f59eafaaf45e
+EBUILD placement-2019.2.9999.ebuild 3492 BLAKE2B a8d060833d194d755355a55bb2fa8be3d90c0d17c694229fdc5aa5eff634c4ff1f01f753086a7c930bd0585144935a51a28975f1bd65bc5ec28cc39d47a48a67 SHA512 4717fa1eff0acbe005a737e54738a25a6ea40615cf70d975f15af990090444a3ff5726b89e94d2281de39c74384c7ac53df60e96ef45f28dc0ecde8e86d5d87e
 MISC metadata.xml 590 BLAKE2B 52aa7d1deb487225f34afa59f668939abe56f4d377626b3cd6dc20c2c94fc1b104f2cac7047d7ba461c62c90515cd39e75b8a94d17a341dd8c549d6bdca6bee3 SHA512 188176cc3f839d3a53dbcaf38f74fc71f1c223f7e938bcc9627e71b2509b14e535647513a7c1bb2eb2d250a317b9e6f0ef906cf464e465697d5a26b4bb013f78
diff --git a/sys-cluster/placement/placement-1.0.0-r1.ebuild b/sys-cluster/placement/placement-1.0.0-r1.ebuild
index 215ee1c6c250..05dd9fb8deb7 100644
--- a/sys-cluster/placement/placement-1.0.0-r1.ebuild
+++ b/sys-cluster/placement/placement-1.0.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 user
 
diff --git a/sys-cluster/placement/placement-2.0.0.ebuild b/sys-cluster/placement/placement-2.0.0.ebuild
index 4a5d735a95d9..0cc034068308 100644
--- a/sys-cluster/placement/placement-2.0.0.ebuild
+++ b/sys-cluster/placement/placement-2.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 user
 
diff --git a/sys-cluster/placement/placement-2019.1.9999.ebuild b/sys-cluster/placement/placement-2019.1.9999.ebuild
index 291dc9ebaad5..932302170822 100644
--- a/sys-cluster/placement/placement-2019.1.9999.ebuild
+++ b/sys-cluster/placement/placement-2019.1.9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 user
 
diff --git a/sys-cluster/placement/placement-2019.2.9999.ebuild b/sys-cluster/placement/placement-2019.2.9999.ebuild
index 82a01ec98a97..2296f8f7a949 100644
--- a/sys-cluster/placement/placement-2019.2.9999.ebuild
+++ b/sys-cluster/placement/placement-2019.2.9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 user
 
diff --git a/sys-cluster/rdma-core/Manifest b/sys-cluster/rdma-core/Manifest
index 090a3a952288..147f3a064d68 100644
--- a/sys-cluster/rdma-core/Manifest
+++ b/sys-cluster/rdma-core/Manifest
@@ -4,7 +4,9 @@ AUX optional_pandoc.patch 1611 BLAKE2B 5f6c4f8ebe1379cf733b4b1829f39bfc34ff2715c
 AUX srpd.init 546 BLAKE2B 40a03607fd4a85b821a71b98373b5c59f721bb2da78afbede8299ae6eedd402776c4ee3b4965c7df0b8b1816969a715351a1e659e4a26abc99808e93ef69f6c9 SHA512 14c1dac4581943855c362d7a37ef31a87be458123dd890bdcfb75c35b71b0a6e789a819c768ea352b3846af29ab5c3b1872cbe27a2e127b8fc8c93a835428190
 DIST rdma-core-26.0.tar.gz 1444585 BLAKE2B 148b25f6108199b3845446e9f45a59d089e7f546218d70abeadffd5cf3e0b26569bc5099abfb6152f376689e04a493529a61fc1d6b40c153aca23b5df2776bf7 SHA512 7dfdd93d10e4c56cac5ac0c1b46900fe7a6c634920e470ebc582abd7a0f57c57d585b4e0dbbb5ad84f46ca8518132e684d44d33c62b0509461ed5b62b7e0f19b
 DIST rdma-core-26.1.tar.gz 1601313 BLAKE2B 459baa80d5cb74386e567880ec7fd2de9e4aaea177e7022603db5dd70f633152d86618bbab637ca337a9314c0c19b5c0f6a51f281802fa0b8bedb8fad149f26c SHA512 98f0e3f3e951f3b2287711526a2a6c62cb4e0f5eb693894c7f44783c5eb6d4213c9eedc39b2370563e8bca17e133497e475392004ace0203d2a39de371254742
-EBUILD rdma-core-26.0.ebuild 2441 BLAKE2B a18a883e25718e06b3e679b7966af50822d5250f677226b22ace7afa9110c07ed297c64545346a03f13bb06229fcf1b0a812fb2147ebe2dc6421e16a343a86f1 SHA512 0fa5d951b3cd1ba8b5af633523695b6965d038196f16c78f4de32d4deaadfce64a29a3fc05e81ece9d9fcb4463ba2d6dab4ce365f7c061ddfb79f0911e0cfa84
-EBUILD rdma-core-26.1.ebuild 2443 BLAKE2B fc1eead938c226fd7c238eacd6d70660fd2bb5e92b8ab3cc6a4edcbfe16ac424ffc6ab15d8ebb368991fe70c51234797416ca90abca4c7bedcc566e4802f33c9 SHA512 2a96af59412d92a230f354db417f68ebb31cb40f6d5be1ab6f630675076184e71b75d6ee9b3b0d6b134b9c2cd9be0432dfd2dfffef7a052fc7370f166390cefb
-EBUILD rdma-core-9999.ebuild 2390 BLAKE2B 77f3af5fe37f08c92427e3e9d546ff3d4577d8c754274ab77633d93a5a44edca95e883a7d089cfb482f0cfaa9f375a65ac79f7bf77d285be4951cf7b9fdab4ec SHA512 e4df896afa8585fa3e58f55e1f7da6470ab08e7a8d3e5b36f29fb77b3d01cadda2d51e126a845bff76a51101d9211bcd517258813d4205a778c1cbd802b699a9
+DIST rdma-core-27.0.tar.gz 1445552 BLAKE2B a038653865f8d37b6599a54ca7fef97b2ac131b3a11ce8696b5c1ec558e85332e950f8d5104f250b23a186224735b2a338fc03f875979bff342ad26ebb5b74b2 SHA512 8a299f4d3fe6ea98d8fc8d8135295e55c8bbf5d0d5f2e5fd362a5eb96d86f5aa84263736ab80a3c0eb104c7fc5fb5d43a2077cc6a1fed3d346af89597a4ddee2
+EBUILD rdma-core-26.0.ebuild 2439 BLAKE2B 9b35dcbe991f1cdebedb601838ebf081d872b1b5d286e9a698a024e6909d44f937b88f110d7190b828a6da7fe7e75840d866c853fc3cc537153d02131529b9d3 SHA512 53ec17e9cb20f5da20c388254cc4924f5202f05a2db3feeb3128d16e1c4b058c25fe31ccc7133eae99bc9535d556e73b6ba890d7e8c47b8ae7ec602dea9b4004
+EBUILD rdma-core-26.1.ebuild 2441 BLAKE2B 31bd2434748e44555bd6d23bedc43a040ad3836616293d030b4d230e6ff6933b165f2b4ba59a84bdda3adda30cf5635085388c5843fbacd431706bbcee91d4d7 SHA512 dab20965e12df6dcc67c8969b6bfd22af1527d0fdcdeae650aadf2d2543fe77a13da245ea6702d58c5ab6aa5a42b75395f22067f8d9768d2728b532c9bbac544
+EBUILD rdma-core-27.0.ebuild 2441 BLAKE2B 31bd2434748e44555bd6d23bedc43a040ad3836616293d030b4d230e6ff6933b165f2b4ba59a84bdda3adda30cf5635085388c5843fbacd431706bbcee91d4d7 SHA512 dab20965e12df6dcc67c8969b6bfd22af1527d0fdcdeae650aadf2d2543fe77a13da245ea6702d58c5ab6aa5a42b75395f22067f8d9768d2728b532c9bbac544
+EBUILD rdma-core-9999.ebuild 2393 BLAKE2B d3d3948505820a7004fbea7b2a184ed0f4b289cfb21831c836363e20d8f72d570326c2240c0093a523e9188d00bc64bd865a7ecd2c3b95fb68f25610c02b2c9d SHA512 04bd97f0e16c33a5831bcf087d82e2050e1f0001384a0c1e1aec493d0176035b1fdfa648854e2dbd5427ea1b5bbcb4e809cc44cc55f97c321f3800dbb1302462
 MISC metadata.xml 559 BLAKE2B 1526777511ab5118d4de73361959107221858659ebbc60f52eb09b45d0798d969f847e4f157501ed6e8c85c2cee1c93d0b26989b357141bba45af946e2e5b0a1 SHA512 5d69acf3d0a323c0d2ee66971fd058c6c0ebf59e4fac0d4777b15bfcc7db8f515b67e6059d204346404ce3b26cdd77c2bea21e1132f418498fe1523eb16dccbb
diff --git a/sys-cluster/rdma-core/rdma-core-26.0.ebuild b/sys-cluster/rdma-core/rdma-core-26.0.ebuild
index 326e3d699b0e..c2a9e0a05f59 100644
--- a/sys-cluster/rdma-core/rdma-core-26.0.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-26.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-utils python-single-r1 udev systemd
 
diff --git a/sys-cluster/rdma-core/rdma-core-26.1.ebuild b/sys-cluster/rdma-core/rdma-core-26.1.ebuild
index 3e47003b5b6b..e879e9b2b999 100644
--- a/sys-cluster/rdma-core/rdma-core-26.1.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-26.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-utils python-single-r1 udev systemd
 
diff --git a/sys-cluster/rdma-core/rdma-core-27.0.ebuild b/sys-cluster/rdma-core/rdma-core-27.0.ebuild
new file mode 100644
index 000000000000..e879e9b2b999
--- /dev/null
+++ b/sys-cluster/rdma-core/rdma-core-27.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit cmake-utils python-single-r1 udev systemd
+
+DESCRIPTION="Userspace components for the Linux Kernel's drivers/infiniband subsystem"
+HOMEPAGE="https://github.com/linux-rdma/rdma-core"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core"
+else
+	SRC_URI="https://github.com/linux-rdma/rdma-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"
+SLOT="0"
+IUSE="neigh python static-libs systemd valgrind"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	virtual/libudev:=
+	neigh? ( dev-libs/libnl:3 )
+	systemd? ( sys-apps/systemd:= )
+	valgrind? ( dev-util/valgrind )
+	python? ( ${PYTHON_DEPS} )"
+
+DEPEND="${COMMON_DEPEND}
+	python? ( dev-python/cython[${PYTHON_USEDEP}] )"
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-fabric/infiniband-diags
+	!sys-fabric/libibverbs
+	!sys-fabric/librdmacm
+	!sys-fabric/libibumad
+	!sys-fabric/ibacm
+	!sys-fabric/libibmad
+	!sys-fabric/srptools
+	!sys-fabric/infinipath-psm
+	!sys-fabric/libcxgb3
+	!sys-fabric/libcxgb4
+	!sys-fabric/libmthca
+	!sys-fabric/libmlx4
+	!sys-fabric/libmlx5
+	!sys-fabric/libocrdma
+	!sys-fabric/libnes"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/optional_pandoc.patch )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_FULL_RUNDIR=/run
+		-DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib
+		-DCMAKE_INSTALL_UDEV_RULESDIR="$(get_udevdir)"/rules.d
+		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_pandoc=yes
+		$(ver_test -ge 25 && echo -DCMAKE_DISABLE_FIND_PACKAGE_rst2man=yes)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Systemd="$(usex systemd no yes)"
+		-DENABLE_VALGRIND="$(usex valgrind)"
+		-DENABLE_RESOLVE_NEIGH="$(usex neigh)"
+		-DENABLE_STATIC="$(usex static-libs)"
+	)
+
+	if use python; then
+		mycmakeargs+=( -DNO_PYVERBS=OFF )
+	else
+		mycmakeargs+=( -DNO_PYVERBS=ON )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	udev_dorules "${D}"/etc/udev/rules.d/70-persistent-ipoib.rules
+	rm -r "${D}"/etc/{udev,init.d} || die
+
+	newinitd "${FILESDIR}"/ibacm.init ibacm
+	newinitd "${FILESDIR}"/iwpmd.init iwpmd
+	newinitd "${FILESDIR}"/srpd.init srpd
+}
diff --git a/sys-cluster/rdma-core/rdma-core-9999.ebuild b/sys-cluster/rdma-core/rdma-core-9999.ebuild
index 69def0d58b57..f6f843f6875d 100644
--- a/sys-cluster/rdma-core/rdma-core-9999.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-utils python-single-r1 udev systemd
 
diff --git a/sys-cluster/sanlock/Manifest b/sys-cluster/sanlock/Manifest
index c2c237fd26e9..756ba7a2158f 100644
--- a/sys-cluster/sanlock/Manifest
+++ b/sys-cluster/sanlock/Manifest
@@ -2,6 +2,6 @@ AUX sanlock.initd 249 BLAKE2B 18bafba28ab4449c7f25ab2d14b4ac2d3cc89cf79bfb8f802f
 AUX wdmd.initd 261 BLAKE2B 65b393f2f084896d3c17aa0345f9930badeec7a3ee4cc7e47bd0a35e47c18ea2bcf5afdc386c0da98988bc9fae479a68b504c244b55ab389ac7f5304c34282ae SHA512 9c7e980817c1c76868caff229b42a3d70e912abfd8c974bf5b856067bef79fbd3a5942b30bcb7d02869e2eba85e6f6ba3c861e9780046b01b25df1b39661b6c0
 DIST sanlock-3.6.0.tar.gz 221666 BLAKE2B 7fe95bd6813c13b76993b343a5ad605c7ba642583987ffa5fef583f34c053ee62b0f9e5979f5b5cb9e4fcde53268ae3debc5ec36b04f6651cc4cb902dff52df9 SHA512 59eb2a6f12e95d54886fdf6d56fd9a6814dd20fe11f39664f2bb82a56326fee48c9465ae30e6d04f970c8f1b0d9c2e22b90d21ab1f657c6d6b61ff9f02332443
 DIST sanlock-3.8.0.tar.gz 262077 BLAKE2B c5638dc405cb22098f551d2c267fb13ef8b59422d5d5fb64ade5273d27d6ef772178c1283860a180d3da053da46387e3687c69369c5447d90d7b04a61da80b92 SHA512 ec4e40066c8f5f25287265247509bcb9d8ae24e5bafdd563cb090e94df3fa65881c4814edeb81c50188e71990774d29e330b1dda864c22052fc936a9e2a0892a
-EBUILD sanlock-3.6.0.ebuild 2070 BLAKE2B 1a45cc4c28519b6cf572aa54c031748dbf308d2c378464dc13c8db04bb947841dab06ead04b9eb36dd5e7741a5512e2c99ae7d6b4f56c476d0c75cd7cf562639 SHA512 bd61913bbbbabfc611a5615349c7427288ed729f81a4121f5ec214abec5fa079c7fe45c76c3214a2bdf186be18cd546406cf5842473e4cc59496067201334773
-EBUILD sanlock-3.8.0.ebuild 2082 BLAKE2B 0a59fdd3fde607f5c4bb6beeed7b2b1728971ea7d9d35407c68b5436afb6eb0e99c035465e4d1773aa3f6291688f8a182d74f74cd61ea48d9e050802972885af SHA512 857a7ed65703a69f4c1e1633905b73d46ad5c7f4084391255f03749234d6a40857b47ac8568cc48310788bb50055ca2ffc33626de5fb9cebfddb8ff27a7bfdfe
+EBUILD sanlock-3.6.0.ebuild 2066 BLAKE2B 9ab19bfc48d101d87d98069b946d9705620466a7dd4191de87fed20b3107d67892625ce371038672431e65f0666532edd76b9bdcc95ed3a6621ac16dfc29eb38 SHA512 9e18c201e6c2d74ec9f91865054a7d1a3970d6f8f8c17b4268ae5d0b30c3988a964203111dd1ec39140b748a2e70bd4342333e00ffeca0d1d78663b32049ef95
+EBUILD sanlock-3.8.0.ebuild 2078 BLAKE2B 62c51742e27340813cfe304ed269d6d2521c70a233a20bd2cf66424c08791862868876d17b32bb6302e8f0348e13abe88697fa726d367e30dba1f809ec0caacd SHA512 e7234cfdb968b17a5f9ff544c745277762bbb92619949edeed31bbfb6c76adbaf2974cc9eabf6b1aa27462fe03d6c02cb61d72b9dd889c709d5351ca776e219d
 MISC metadata.xml 368 BLAKE2B a15a411ea20eb7649f299e38704b394344194d7526f9bc92b27c0a26760d7dba05b1e5d483ff5f9ce73a6d1cd527a18ac905344a614c8dc31a0c1180b2be07e7 SHA512 2cc3ec3c99cfff2e0c576ab6c7b0a39460af875ba826ce0cf3c5a1a4f0f3def6170753c8d42af2fc7a139ad7f2135e309c3165bde83b4e7574292768c96e8086
diff --git a/sys-cluster/sanlock/sanlock-3.6.0.ebuild b/sys-cluster/sanlock/sanlock-3.6.0.ebuild
index bd884bab813e..76555399e7d3 100644
--- a/sys-cluster/sanlock/sanlock-3.6.0.ebuild
+++ b/sys-cluster/sanlock/sanlock-3.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit linux-info python-r1 systemd user
 
 DESCRIPTION="shared storage lock manager"
diff --git a/sys-cluster/sanlock/sanlock-3.8.0.ebuild b/sys-cluster/sanlock/sanlock-3.8.0.ebuild
index 4cf116d5a0b1..0defcba0b5fe 100644
--- a/sys-cluster/sanlock/sanlock-3.8.0.ebuild
+++ b/sys-cluster/sanlock/sanlock-3.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit linux-info python-r1 systemd user
 
 DESCRIPTION="shared storage lock manager"
diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index 393c331b506f..c8691976971b 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,3 +1,3 @@
 DIST singularity-2.6.1.tar.gz 835029 BLAKE2B 4a581e1bc5df9d664d68f17e275f01081c850aa53f8a9bfcceaf5eb2b8f16e3a018f88669674c7427c60ab00ec0f21b4ec5e6ecaab261c16f70a998cb54ff855 SHA512 063327c67dae2629d1decebc060c474a72e6741f6dc9b6373734e429ccf11d53ee55c1578c28e74e8f8bcda87f3e0b735a3a0e982c9ea894f03a31eaaadf617c
-EBUILD singularity-2.6.1.ebuild 891 BLAKE2B 9aa8d36790e8b5f5ac9b7699a15f4f6de2e8d409b3bf764b84b70269b340650ef4b4f4024dcbac3b66c78c67890f8b0d5a4216de49dbeff26bcb25c2d1aea77b SHA512 43a58ab9c3df74c65ccff46dcc3c407f918efc60e66f80c1b227b64044ebd3f160d8089603ed73fc64e7183ddc587f384f14162c9eb3d841d46319c7de6f2c52
+EBUILD singularity-2.6.1.ebuild 887 BLAKE2B 19268b434a825c6d03c7a53741553aefd9d14796abfbda8e954436829456026003a705c86df8bb83b6f802289b54cde226000cbe0c0768d43816484f6fa17873 SHA512 ade0b12d26dc2991824fa6b90fc91adcb3a1d6d798f6484b5f124197493ecc9d88bfeeebb1493182c684dab234c2c8b9cc3e5a9c4ffb0d1fbf413853d3b5e14a
 MISC metadata.xml 336 BLAKE2B 8da1deed407d4f546b3765bd240bda546a0dd7756d70468490547f38f4e1ca7ac6be41d74c881359cefb28c7ff87eb94012f15d0411be9843603b7cdd35a3999 SHA512 02684993daeb7128cb6e4a4561144b90eee37318e8581821a870e072e39f04f61723a09c430f9fd92e38804de901421b3a1f3cab12ccf37d2d403eb688d5170f
diff --git a/sys-cluster/singularity/singularity-2.6.1.ebuild b/sys-cluster/singularity/singularity-2.6.1.ebuild
index a9de088a6578..34a5b5315e36 100644
--- a/sys-cluster/singularity/singularity-2.6.1.ebuild
+++ b/sys-cluster/singularity/singularity-2.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit autotools eutils python-single-r1
 
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index 8312d1c61a4f..9871e4ecd5b9 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -1,3 +1,4 @@
+AUX disable-sview.patch 2451 BLAKE2B 4cf247c55bd439f72e428c94c2826394f6be2a3eb9b65ff6b713b1651248eb7470e2fa9aeb3fe27ad122971924a3d6e154659a3a3cbff19aafec713d6a25e861 SHA512 d828d64703c86bba79d929ed3583842b0b9e82f4f6e1f887eb7d4b4d0015e16cdfdc812454b4adb184afa08011afaa24a3def6d90dbc957375fc88e05c93e199
 AUX logrotate 360 BLAKE2B 36c5ce908a6434f03a3e140cd1fc0bfec50a6fa89d6120061a5a83d3b12d9a6137ae2fa3a83bd36f55f48c79d140f24d6933cda18fc79674e8b758cacc34a948 SHA512 f6edceef15960accbe72ddd34ff34934fa46b6d647c83e0d3a512d2ddc1ae6c60352e377cfa5332fd5cd817689e23680f7384f1b27fc49677b2e671e1bfe86b9
 AUX slurm.confd 155 BLAKE2B 4f0793808328b88ffa2b32b1accab6c0dfe0b01dc84210fee6a674361ddf9ea7b3f15ccc775c354198577849ab0791d403b153adee476fc7f1237d2177275bab SHA512 e4d21cdb6a427f0beaef0e157202308f9e86a41dea4532ee98b274a5979b5e82ec2ca4ca2996f6cb59045fd8b01e815aaad71673e2011cead788de3d879aa11f
 AUX slurm.tmpfiles 31 BLAKE2B f08dbc53517cc15463be5264505d858fcf1f2196565868d164463a167459082a23eea25fa22edf2987e52c71f953160c12b29cdb5e5f437a3bdc89f1cd8395b5 SHA512 b7f116687e0dee0377b43cbb49f63569088d6f5f9b1514014999b1135b1b4da462e04887851b753161d7b9691436048b692b7697ffee2a4e45daa339a412c93c
@@ -5,7 +6,7 @@ AUX slurmctld.initd 1842 BLAKE2B 25c9fd76dc888544888abb2790d8a0ae66254c0f8807bf4
 AUX slurmd.initd 2001 BLAKE2B a0464ee0407406c7ceadd8e78f0229f5c6eda7081a691e24e609caa50f627d9bbf9c2d57bc6746b9c719a66cf2f4b0d756ecbbaf3bcd070846ad5ced6b289c9d SHA512 bb9447c25d2e96de1aea5935084ea78ea403701bd655d89d1a9d1d21bdbf88bdbae3888cfd618aabcc86dd8808401157ff84402ef35c4e138263457fd954046a
 AUX slurmdbd.initd 1717 BLAKE2B e177a937f8bd97bb2f45e479e0f34b23cc23ab44b0000165a856ff8476560638a567baecad8aa8d57aeb76062f248039da7f440ddca8f5827e4729136a10d7de SHA512 6d21f667f4222ab62dc8d7f648e00205da982612d58b98e8e35e6b6602b3ad31c03e5130402437c77d3677b424da7b5226e2bfa8c5d29bc908fd618fc02697a8
 DIST slurm-19-05-4-1.tar.gz 8446001 BLAKE2B d3b1524a72d7969b14788b93c7d64b03faf159b71b1ed8fb30782980b7b39e9f4a1d1435f4fbdce722ed9585e7d3285f9a84322c5a5d2f44d5e084bb38019ae4 SHA512 ecee26b23fc72ea4b6eb3039aada1814b5932d75eaf61501a31b97ac8f7b600864f2429a36de068f1f1cde178fa1383f2c53192af5b1a62766e3ffe48be4395c
-DIST slurm-19.05.3-2.tar.bz2 6233270 BLAKE2B be59d157e99353340f9801f0adac21cfb8c3051f8d6a1bd94ad76fc05d0f83d1f933f72bf4e33b603521ec94cc859185bf56ecbcab674fcbff526164dd39d3cc SHA512 15d63f1ba693458b220ece5512210f1dba52273946809b338e33d684b9daadecd3cc77fda84c1b3bf8b03bc0fe8b8be0f429a96a1bf72a8b5c8cf169e0e1f5bb
-EBUILD slurm-19.05.3.2.ebuild 8000 BLAKE2B e150b57f5e125dbd200a27baee3487b738acd88e1ac8f3955a9cd13a8ebc1b260f390c1c3d207c3856029f906d5a0b55ed9a59de0ed7b8c5c5eed401f147e2af SHA512 94bc73f29ea276cabc863a9b4c62aac4b043ba93a43bcaaaf64c7d34c8bf8e25916c05991071ea72075735ef7e653013c76d98efaa5e2e053c9253fdd30b0ec4
-EBUILD slurm-19.05.4.1.ebuild 8046 BLAKE2B 7a20345c3cca566b6fa0f7908880080adf2052732c50c1665da56a45fcf35580dd1911da3fcc803c4961957f7a7a2a4883bd9eb5c63f3a8f2191c71d1f461e5d SHA512 d5b615b0c664d734f709538ee9e8eb38d53e1710bb87864102bf3a5034b55351df32f95f987e1640536f753b0246937a6455e6442f9811a91404c1f1299198e6
+DIST slurm-19-05-5-1.tar.gz 8447611 BLAKE2B 052d6a9c7e196546a2a7ca0c8e324d3728177e06a6b82150d6888cf5f6aa4b0f6612e09e928b2224be412971b4e40318d3b03e27068ed7c2256036a417ebf9c5 SHA512 612ce1c476de3d08d4003c48df65883880e697652ef8b0847cd87719e91196f489409b27c67ef040ab9ffe0c9d824cdae6441608e9af9619abcf11ebf0d464be
+EBUILD slurm-19.05.4.1.ebuild 8006 BLAKE2B c0d5f023c1a5e8ba30f9732c6e0c0dd51ee9009f62ffd48f8825ae2ada2e6d44d4ccfbb7c6aa8f2d5c95a9802e3e78cb268eb91a47df8acae327a9348da9bb08 SHA512 f0e0c5b2c0e4fa1a9bc954de8f5ada094371351b5bf45453f1110ddf5eaa17830d3652f3e515bc78aa2fe57e5e0352717198a0f1214044a038e1a8ef298b7582
+EBUILD slurm-19.05.5.1.ebuild 7999 BLAKE2B 7529d970466ca2744f2329b11e2722a2de855b4b460a9e4d55918eb20a80f36d471d4207634ca076c513d64c1e9d318527f1237e1415b42d893f50cea3b0eaac SHA512 d99b37d9e8d16be68d7e945706f0401d2b72806a59cdd0d01818fd234245f1988628c890ab207eb959319259a3c053528cbdd96737baa1e54d1ac10e3759aee3
 MISC metadata.xml 1199 BLAKE2B b52e7cae7554d439e7f25da2a80d98993d5c7f7abd5ba8b76c09bf60731b035040f976ac1bfc3c153f81b8feed89e2ceb5e6b676c25cc7b6219c4bcd87bd7e50 SHA512 8f48d582e61789373fc07ffd1db123cb8f43d337b03611972e480179ca5b43f2866392203f470d3d69784f2aae79cbcffdf583cba0aa4a9c25969f2c72a3f55f
diff --git a/sys-cluster/slurm/files/disable-sview.patch b/sys-cluster/slurm/files/disable-sview.patch
new file mode 100644
index 000000000000..f409765a847a
--- /dev/null
+++ b/sys-cluster/slurm/files/disable-sview.patch
@@ -0,0 +1,76 @@
+--- a/configure.ac	2019-08-13 20:40:08.000000000 +0200
++++ b/configure.ac	2019-08-22 12:02:02.127865098 +0200
+@@ -229,42 +229,6 @@
+ PKG_CHECK_MODULES([CHECK], [check >= 0.9.8], [ac_have_check="yes"], [ac_have_check="no"])
+ AM_CONDITIONAL(HAVE_CHECK, test "x$ac_have_check" = "xyes")
+ 
+-#
+-#  Tests for GTK+
+-#
+-
+-# use the correct libs if running on 64bit
+-if test -d "/usr/lib64/pkgconfig"; then
+-    PKG_CONFIG_PATH="/usr/lib64/pkgconfig/:$PKG_CONFIG_PATH"
+-fi
+-
+-if test -d "/opt/gnome/lib64/pkgconfig"; then
+-    PKG_CONFIG_PATH="/opt/gnome/lib64/pkgconfig/:$PKG_CONFIG_PATH"
+-fi
+-
+-AM_PATH_GLIB_2_0([2.7.1], [ac_glib_test="yes"], [ac_glib_test="no"], [gthread])
+-
+-if test ${glib_config_minor_version=0} -ge 32 ; then
+-       AC_DEFINE([GLIB_NEW_THREADS], 1, [Define to 1 if using glib-2.32.0 or higher])
+-fi
+-
+-AM_PATH_GTK_2_0([2.7.1], [ac_gtk_test="yes"], [ac_gtk_test="no"], [gthread])
+-if test ${gtk_config_minor_version=0} -ge 10 ; then
+-       AC_DEFINE([GTK2_USE_RADIO_SET], 1, [Define to 1 if using gtk+-2.10.0 or higher])
+-fi
+-
+-if test ${gtk_config_minor_version=0} -ge 12 ; then
+-       AC_DEFINE([GTK2_USE_TOOLTIP], 1, [Define to 1 if using gtk+-2.12.0 or higher])
+-fi
+-
+-if test ${gtk_config_minor_version=0} -ge 14 ; then
+-       AC_DEFINE([GTK2_USE_GET_FOCUS], 1, [Define to 1 if using gtk+-2.14.0 or higher])
+-fi
+-
+-if test "x$ac_glib_test" != "xyes" -o "x$ac_gtk_test" != "xyes"; then
+-	AC_MSG_WARN([cannot build sview without gtk library]);
+-fi
+-
+ AM_CONDITIONAL(BUILD_SVIEW, [test "x$ac_glib_test" = "xyes"] && [test "x$ac_gtk_test" = "xyes"])
+ 
+ X_AC_CRAY
+@@ -447,7 +411,6 @@
+ 		 src/sshare/Makefile
+ 		 src/sstat/Makefile
+ 		 src/strigger/Makefile
+-		 src/sview/Makefile
+ 		 src/plugins/Makefile
+ 		 src/plugins/accounting_storage/Makefile
+ 		 src/plugins/accounting_storage/common/Makefile
+diff -Naur slurm-19.05.2.orig/src/Makefile.am slurm-19.05.2/src/Makefile.am
+--- slurm-19.05.2.orig/src/Makefile.am	2019-08-13 20:40:08.000000000 +0200
++++ slurm-19.05.2/src/Makefile.am	2019-08-22 12:02:02.127865098 +0200
+@@ -25,5 +25,4 @@
+ 	srun		\
+ 	sshare		\
+ 	sstat		\
+-	strigger	\
+-	sview
++	strigger
+diff -Naur slurm-19.05.2.orig/src/Makefile.in slurm-19.05.2/src/Makefile.in
+--- slurm-19.05.2.orig/src/Makefile.in	2019-08-13 20:40:08.000000000 +0200
++++ slurm-19.05.2/src/Makefile.in	2019-08-22 12:02:02.127865098 +0200
+@@ -495,8 +495,7 @@
+ 	srun		\
+ 	sshare		\
+ 	sstat		\
+-	strigger	\
+-	sview
++	strigger
+ 
+ all: all-recursive
+ 
diff --git a/sys-cluster/slurm/slurm-19.05.4.1.ebuild b/sys-cluster/slurm/slurm-19.05.4.1.ebuild
index 2bfe56a32f5a..f9a659b1dc90 100644
--- a/sys-cluster/slurm/slurm-19.05.4.1.ebuild
+++ b/sys-cluster/slurm/slurm-19.05.4.1.ebuild
@@ -28,7 +28,7 @@ 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 ssl static-libs ucx torque X"
+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
@@ -41,7 +41,6 @@ COMMON_DEPEND="
 		)
 	munge? ( sys-auth/munge )
 	pam? ( sys-libs/pam )
-	ssl? ( dev-libs/openssl:0= )
 	lua? ( dev-lang/lua:0= )
 	!lua? ( !dev-lang/lua )
 	ipmi? ( sys-libs/freeipmi )
@@ -67,8 +66,8 @@ REQUIRED_USE="torque? ( perl )"
 
 S="${WORKDIR}/${PN}-${MY_P}"
 
-LIBSLURM_PERL_S="${WORKDIR}/${MY_P}/contribs/perlapi/libslurm/perl"
-LIBSLURMDB_PERL_S="${WORKDIR}/${MY_P}/contribs/perlapi/libslurmdb/perl"
+LIBSLURM_PERL_S="${S}/contribs/perlapi/libslurm/perl"
+LIBSLURMDB_PERL_S="${S}/contribs/perlapi/libslurmdb/perl"
 
 RESTRICT="test"
 
@@ -82,6 +81,7 @@ src_unpack() {
 
 src_prepare() {
 	tc-ld-disable-gold
+	eapply "${FILESDIR}"/disable-sview.patch
 	default
 
 	# pids should go to /var/run/slurm
@@ -123,7 +123,6 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_enable pam) \
 		$(use_enable X x11) \
-		$(use_with ssl) \
 		$(use_with munge) \
 		$(use_with json) \
 		$(use_with hdf5) \
diff --git a/sys-cluster/slurm/slurm-19.05.3.2.ebuild b/sys-cluster/slurm/slurm-19.05.5.1.ebuild
index 4c9d3cbf4ae4..c7cb6c9ce414 100644
--- a/sys-cluster/slurm/slurm-19.05.3.2.ebuild
+++ b/sys-cluster/slurm/slurm-19.05.5.1.ebuild
@@ -13,22 +13,22 @@ else
 	if [[ ${PV} == *pre* || ${PV} == *rc* ]]; then
 		MY_PV=$(ver_rs '-0.') # pre-releases or release-candidate
 	else
-		MY_PV=$(ver_rs 3 '-') # stable releases
+		MY_PV=$(ver_rs 1-3 '-') # stable releases
 	fi
 	MY_P="${PN}-${MY_PV}"
 	INHERIT_GIT=""
-	SRC_URI="https://download.schedmd.com/slurm/${MY_P}.tar.bz2"
+	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"
+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 ssl static-libs ucx torque X"
+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
@@ -41,7 +41,6 @@ COMMON_DEPEND="
 		)
 	munge? ( sys-auth/munge )
 	pam? ( sys-libs/pam )
-	ssl? ( dev-libs/openssl:0= )
 	lua? ( dev-lang/lua:0= )
 	!lua? ( !dev-lang/lua )
 	ipmi? ( sys-libs/freeipmi )
@@ -65,10 +64,10 @@ RDEPEND="${OMMON_DEPEND}
 
 REQUIRED_USE="torque? ( perl )"
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/${PN}-${MY_P}"
 
-LIBSLURM_PERL_S="${WORKDIR}/${MY_P}/contribs/perlapi/libslurm/perl"
-LIBSLURMDB_PERL_S="${WORKDIR}/${MY_P}/contribs/perlapi/libslurmdb/perl"
+LIBSLURM_PERL_S="${S}/contribs/perlapi/libslurm/perl"
+LIBSLURMDB_PERL_S="${S}/contribs/perlapi/libslurmdb/perl"
 
 RESTRICT="test"
 
@@ -82,6 +81,7 @@ src_unpack() {
 
 src_prepare() {
 	tc-ld-disable-gold
+	eapply "${FILESDIR}"/disable-sview.patch
 	default
 
 	# pids should go to /var/run/slurm
@@ -123,7 +123,6 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_enable pam) \
 		$(use_enable X x11) \
-		$(use_with ssl) \
 		$(use_with munge) \
 		$(use_with json) \
 		$(use_with hdf5) \
@@ -185,7 +184,7 @@ src_install() {
 	keepdir /etc/slurm
 	insinto /etc/slurm
 	doins \
-		etc/bluegene.conf.example \
+		etc/prolog.example \
 		etc/cgroup.conf.example \
 		etc/slurm.conf.example \
 		etc/slurmdbd.conf.example
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index 32a95f471bc3..bd025d581ac7 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -2,12 +2,9 @@ AUX swift-account.initd 867 BLAKE2B 12a01902f520b2c25261a229e1239c3f85ba05dd708e
 AUX swift-container.initd 877 BLAKE2B f45f04d6d6d4fefdf153d40d1480535cb6552daa812854328e845ff8afb96ffd4f947a0a38437ec401a10c493701f328667e1b7e314ea39510c957ec3e7be2bc SHA512 46ae66806db3cb8b9416ccde1a08f0f8af5dd1bbeeda23fc547f8ed29f979c554b47ff0c9ca13f8944ec8c3f4c2d0ffd0616bead4ac9b42078ffaf0ba238d52b
 AUX swift-object.initd 862 BLAKE2B 2a062873ab613e7d98d78758ccae793d8d952cb66922d900353a516738014cfe72f98a6830d0af523757e15b432b88f991753572a3e1b8e248af8e1bf43d2b70 SHA512 a977e3d81e22785b4999e5dbe6c51c020f98fe4ba08d52ff971477fca606a7fbd8e80f4c45ac6ba6afa213ddca7b81acc6238d91bb5c45635cc68c174575aa05
 AUX swift-proxy.initd 1379 BLAKE2B 56453a557c0abfd6b07f65778ef14d8920bedc4133e0efa1aa4a5466a72103e9b57b361f481e0b5cb816471161196755de7794bd3ea3d6f5120cc1f159489c22 SHA512 dd32e4249686b51d2ed6add8e2e91eb9e520c662ebdf068f68b4e52faf4d508d3c87e996c6c2f7ba2a7d1f5fdf639d08e1e6878cd4c9918408e007ccbd7c84ec
-DIST swift-2.21.0.tar.gz 3025042 BLAKE2B 847b11fa61620cdd07acadd1d4fcc43c9fc53ecfc958e8cb617dde6b643bce116662df74b9b2a01df8551847c4577fedd25aab3951ce437cf5d046552e3b22e0 SHA512 ceb96401aa5d1ab36dc0a08455970f9c1704868d778970cad9783463bf8a25dddc7431df0aa73e4d2d7d4f6ef2908fa5faede749fe94e32d5f67e61768edd964
 DIST swift-2.22.0.tar.gz 3070436 BLAKE2B 53049ba901cf5a46d4567c7fa3620b0ad486d88897beb75887d81c5beb747a08ff52e7eba93eab9e9e087c82447d99f0fd85c97211fb4e930ce5b27a1bba41f1 SHA512 855f9d35399251ac86d687b652a9372da4d2f03dff8dee1743357c14c79f6ea8903b7c67d99fed08b6b4cdfa2cfd6ecb78b010b2ee83195eda30c4a9463a5a0c
 DIST swift-2.23.1.tar.gz 3044545 BLAKE2B b3b06aefa7c58b718f7d9c1c1b9bc92f442b83202b8d5c2dbbb777650088f2d939f5e9d0fbe83cea38fd6635d072cd8bb3894d64ed9767dde203064c1b81cfdb SHA512 48aa82b178f5e3901363c2b9eeeedeea12a58b1ba86cc46937dd9ec074ecc005b04a6ce732d4e9fce2497c6c62b659038da40ed43550256584bb371df4e596fb
-EBUILD swift-2.21.0-r1.ebuild 3992 BLAKE2B ed764b4ffdbab51f1931035ddbc73144438553aa22571eb299fe776e37f4c107f5b3590419cfbf11d59e4ccae20ed2f3ffa8925d9bbdf22f125fe848d4645377 SHA512 54f7acf9fbdfcabe2547ed60f346492b14f60d14a52e7bd3e3726a8d9206abb034d5e9ace382550d2fcf9163b7425067c230366af2d71ecfb71da8332809a5ba
-EBUILD swift-2.22.0.ebuild 3931 BLAKE2B b7b90549b04cfffd80f4d65a0defb9708fb34042bf45943b7225754cd7055039ee9c25dc54c0e59502504cf965cb916c3662a4add53fb55a513162d27cb9545c SHA512 27b98fcd7ed95062ab57235c50099aab9d7ea1daf07c690d9e016005e6af057521c6a8ba91f672d6687881d3b06c6e3db36ec4096ce13a01efb151f875a51eb3
-EBUILD swift-2.23.1.ebuild 3932 BLAKE2B 118efe039c811e80355f1e2375efa477afc446022bca900d79824bc42fc7ecb47e6cadb5bbe7798b86b128684426d3ea3a06218d57a33cf6ea3916f763a01ead SHA512 d138ace933da931b56123bd46e93120a7481258b2bc3fc1909af897d42695a11bc8c4f92604a524e654693bcf26ff7a89ba336ace5b3de338665ce726fe00057
-EBUILD swift-2019.1.9999.ebuild 3994 BLAKE2B b69d165cebd7f06796ffc8b363cf3dfba1df0c8d4236e290f832d589ed1f9969121b2715b6ec261ac079ac44ed58f040e2c4b30b99e6ffbf1b86f0dd024e3a71 SHA512 416a2b30ba88c50c97cecf8e619f0873f59c95d08b8b6df98363fe7d9b2f84b2bb42f63e46a5a051eba9475c49f4be2d2da7a2190c89a242407af313b06d3d83
-EBUILD swift-2019.2.9999.ebuild 3934 BLAKE2B fd7ba5f75e587cf474834fe9cddcaec3c7e790eb82f63ec8e38f068a2bd7ce8f0e86ff8f3b490938947e4cda7e805555a291b1c036f3ece735af660fdeaa222b SHA512 b4e7bdecd4777e6d3b234b68813d2281a6979e2cca85031072a9adc9edc4c291a0b35a99e34d04d8d9f5be20e998ff34b3e2b2401870105fb2a4b5d757c8a411
+EBUILD swift-2.22.0.ebuild 3854 BLAKE2B 92ade52d11d331d9f08ed9ff7f017453c2c4bbb68edf13a7e3a4f61ec2b1817bd0ef18fe680cb7862224da8b3a1405242499a21489dd2fd1f9e066eaf384525b SHA512 573572d4dab5a4be49bd4638221e757804454571a246b2333ceac48b105e1a099b07d62c7b01885980a435146cdc2a61635bd04f05b0b38295b05af1f3378054
+EBUILD swift-2.23.1.ebuild 3855 BLAKE2B a72c67caf9cb6cab55e24ed942e708ed6f4b08aa4806178c6421e76896c9afc5e4ba963bc88b0e2d46e233f710eff368d12715ab79ca8c064f61eb1cff002b96 SHA512 ab4c4ae34bd94e42b008c671c3d4df017fd45b06108b5ef82e693ae0bac9269a9c27d9304025260128adf86cd798c078ffa80515e51a0e7c97a899f19bac1ccd
+EBUILD swift-2019.2.9999.ebuild 3857 BLAKE2B 859c3e48d9364d660cc14d37910e399964efc5c823cb511111cd72b8feed0e9b61628ca6d3bf3da107299e1c00ec8eae5392c8886af512c9237ce55a994bb485 SHA512 e736912deea3dc63a618d67e5401a60b93bd06a61715e5f4ecce905d93b3c71b8a7ed0c987dcc583fc228bc7d90e87faefef5bb7b2d59ad6d4e35b1b7c26069e
 MISC metadata.xml 898 BLAKE2B 3d502769ba44cdc1e3a500929d60a1ed82d8540297b2dfddb6d6745ec9b5b56bd9fe7130a738858b9bac653b49634efae1841600325194d69ec30222b2e8b3f2 SHA512 3f9d2cf7538fe32010b811d3a49802eb085dde793b29d9590fe3032d63a743f620e3c1dcf1226b59aa5938ea239f440997a3d4d489f9887816621879e19a0c4c
diff --git a/sys-cluster/swift/swift-2.21.0-r1.ebuild b/sys-cluster/swift/swift-2.21.0-r1.ebuild
deleted file mode 100644
index e0892e4069a1..000000000000
--- a/sys-cluster/swift/swift-2.21.0-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store"
-HOMEPAGE="https://launchpad.net/swift"
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/openstack/swift.git"
-	EGIT_BRANCH="stable/stein"
-else
-	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="account container doc +memcached object proxy"
-REQUIRED_USE="|| ( proxy account container object )"
-
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/dnspython-1.14.0:0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.5[${PYTHON_USEDEP}]
-	!~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
-	!~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	dev-python/pyxattr[${PYTHON_USEDEP}]
-	>=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
-	>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]
-	memcached? ( net-misc/memcached )
-	net-misc/rsync[xattr]"
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
-	~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
-	~ZFS"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
-		done
-	fi
-}
-
-pkg_setup() {
-	enewuser swift
-	enewgroup swift
-}
-
-src_prepare() {
-	sed -i 's/xattr/pyxattr/g' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-src_test () {
-	# https://bugs.launchpad.net/swift/+bug/1249727
-	find . \( -name test_wsgi.py -o -name test_locale.py -o -name test_utils.py \) -delete || die
-	SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /etc/swift
-	insinto /etc/swift
-
-	newins "etc/swift.conf-sample" "swift.conf"
-	newins "etc/rsyncd.conf-sample" "rsyncd.conf"
-	newins "etc/mime.types-sample" "mime.types-sample"
-	newins "etc/memcache.conf-sample" "memcache.conf-sample"
-	newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample"
-	newins "etc/dispersion.conf-sample" "dispersion.conf-sample"
-
-	if use proxy; then
-		newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
-		newins "etc/proxy-server.conf-sample" "proxy-server.conf"
-		if use memcached; then
-			sed -i '/depend/a\
-    need memcached' "${D}/etc/init.d/swift-proxy"
-		fi
-	fi
-	if use account; then
-		newinitd "${FILESDIR}/swift-account.initd" "swift-account"
-		newins "etc/account-server.conf-sample" "account-server.conf"
-	fi
-	if use container; then
-		newinitd "${FILESDIR}/swift-container.initd" "swift-container"
-		newins "etc/container-server.conf-sample" "container-server.conf"
-	fi
-	if use object; then
-		newinitd "${FILESDIR}/swift-object.initd" "swift-object"
-		newins "etc/object-server.conf-sample" "object-server.conf"
-		newins "etc/object-expirer.conf-sample" "object-expirer.conf"
-	fi
-
-	if use doc; then
-		doman doc/manpages/*
-		dodoc -r doc/{s3api,saio,source}
-	fi
-
-	fowners root:swift "/etc/swift"
-	fperms 0750 /etc/swift
-}
-
-pkg_postinst() {
-	elog "Openstack swift will default to using insecure http unless a"
-	elog "certificate is created in /etc/swift/cert.crt and the associated key"
-	elog "in /etc/swift/cert.key.  These can be created with the following:"
-	elog "  * cd /etc/swift"
-	elog "  * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
-}
diff --git a/sys-cluster/swift/swift-2.22.0.ebuild b/sys-cluster/swift/swift-2.22.0.ebuild
index 9a409be64721..a69e441eb239 100644
--- a/sys-cluster/swift/swift-2.22.0.ebuild
+++ b/sys-cluster/swift/swift-2.22.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1 eutils linux-info user
 
@@ -29,7 +29,6 @@ DEPEND="
 
 RDEPEND="
 	${CDEPEND}
-	>=dev-python/dnspython-1.14.0:0[$(python_gen_usedep 'python2_7')]
 	>=dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
 	>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
 	>=dev-python/netifaces-0.8[${PYTHON_USEDEP}]
diff --git a/sys-cluster/swift/swift-2.23.1.ebuild b/sys-cluster/swift/swift-2.23.1.ebuild
index 3e3deb94d7f2..1b2a5d5648c0 100644
--- a/sys-cluster/swift/swift-2.23.1.ebuild
+++ b/sys-cluster/swift/swift-2.23.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1 eutils linux-info user
 
@@ -29,7 +29,6 @@ DEPEND="
 
 RDEPEND="
 	${CDEPEND}
-	>=dev-python/dnspython-1.15.0:0[$(python_gen_usedep 'python2_7')]
 	>=dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
 	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
 	>=dev-python/netifaces-0.8[${PYTHON_USEDEP}]
diff --git a/sys-cluster/swift/swift-2019.1.9999.ebuild b/sys-cluster/swift/swift-2019.1.9999.ebuild
deleted file mode 100644
index 537207edd2a7..000000000000
--- a/sys-cluster/swift/swift-2019.1.9999.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store"
-HOMEPAGE="https://launchpad.net/swift"
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/openstack/swift.git"
-	EGIT_BRANCH="stable/stein"
-else
-	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="account container doc +memcached object proxy"
-REQUIRED_USE="|| ( proxy account container object )"
-
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/dnspython-1.14.0:0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.5[${PYTHON_USEDEP}]
-	!~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
-	!~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	dev-python/pyxattr[${PYTHON_USEDEP}]
-	>=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
-	>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]
-	memcached? ( net-misc/memcached )
-	net-misc/rsync[xattr]"
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
-	~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
-	~ZFS"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
-		done
-	fi
-}
-
-pkg_setup() {
-	enewuser swift
-	enewgroup swift
-}
-
-src_prepare() {
-	sed -i 's/xattr/pyxattr/g' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-src_test () {
-	# https://bugs.launchpad.net/swift/+bug/1249727
-	find . \( -name test_wsgi.py -o -name test_locale.py -o -name test_utils.py \) -delete || die
-	SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /etc/swift
-	insinto /etc/swift
-
-	newins "etc/swift.conf-sample" "swift.conf"
-	newins "etc/rsyncd.conf-sample" "rsyncd.conf"
-	newins "etc/mime.types-sample" "mime.types-sample"
-	newins "etc/memcache.conf-sample" "memcache.conf-sample"
-	newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample"
-	newins "etc/dispersion.conf-sample" "dispersion.conf-sample"
-
-	if use proxy; then
-		newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
-		newins "etc/proxy-server.conf-sample" "proxy-server.conf"
-		if use memcached; then
-			sed -i '/depend/a\
-    need memcached' "${D}/etc/init.d/swift-proxy"
-		fi
-	fi
-	if use account; then
-		newinitd "${FILESDIR}/swift-account.initd" "swift-account"
-		newins "etc/account-server.conf-sample" "account-server.conf"
-	fi
-	if use container; then
-		newinitd "${FILESDIR}/swift-container.initd" "swift-container"
-		newins "etc/container-server.conf-sample" "container-server.conf"
-	fi
-	if use object; then
-		newinitd "${FILESDIR}/swift-object.initd" "swift-object"
-		newins "etc/object-server.conf-sample" "object-server.conf"
-		newins "etc/object-expirer.conf-sample" "object-expirer.conf"
-	fi
-
-	if use doc; then
-		doman doc/manpages/*
-		dodoc -r doc/{s3api,saio,source}
-	fi
-
-	fowners root:swift "/etc/swift"
-	fperms 0750 /etc/swift
-}
-
-pkg_postinst() {
-	elog "Openstack swift will default to using insecure http unless a"
-	elog "certificate is created in /etc/swift/cert.crt and the associated key"
-	elog "in /etc/swift/cert.key.  These can be created with the following:"
-	elog "  * cd /etc/swift"
-	elog "  * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
-}
diff --git a/sys-cluster/swift/swift-2019.2.9999.ebuild b/sys-cluster/swift/swift-2019.2.9999.ebuild
index d90ce6aa21ec..c9ab6d0b2f70 100644
--- a/sys-cluster/swift/swift-2019.2.9999.ebuild
+++ b/sys-cluster/swift/swift-2019.2.9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1 eutils linux-info user
 
@@ -29,7 +29,6 @@ DEPEND="
 
 RDEPEND="
 	${CDEPEND}
-	>=dev-python/dnspython-1.15.0:0[$(python_gen_usedep 'python2_7')]
 	>=dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
 	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
 	>=dev-python/netifaces-0.8[${PYTHON_USEDEP}]
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /sys-cluster
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)