gentoo resync : 21.06.2020

19 files changed, 377 insertions, 209 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index a7fd5835fada..5f307b012c2c 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index 9d76bb595fb9..671d9ffbf85d 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -1,13 +1,9 @@
 AUX charliecloud-0.10-fix-hardcoded-gcc.patch 1944 BLAKE2B 920697592b47f532a335c493ffa381b08852d628f76bf1e7abbdad299ca5d3431e2bb9d3713cb12dc6e532fc9e1a3a8bda3acc2639c6a0a309fe13347763a8cd SHA512 0c911ec270bdda5d2025faf09ce45961dfaf307b03e9d293630adc49747e1f750273a8ce5c0f46a2756d3ef97312684f7afbfc125c80cbd61384722437bc0dfd
-AUX charliecloud-0.9.10-fix-flags.patch 1471 BLAKE2B 637d7fc18126a5842006233468da626a9e26c9e66c1efbf5112c0c391795a27885a28f90035894d6d529ad58926c59a9fb4ee50d8759a5d259b2e59ffef749f1 SHA512 6dae473e0583f3a167f88d1dc7006dfa0120d6f2a3508ca63e499dbbb9e1e2ef78041093144efa350d6a9653ac2de1d5b36f71b071af7577f467933d590a0379
-AUX charliecloud-0.9.10-fix-hardcoded-gcc.patch 708 BLAKE2B 78b73bf527f7d9be0aa9de06eb023557bd9934708dda8ff5d948fc8240484b5cb2a0404fd2184da2759c2c08e6dd4842e5dd60b6d9af92f12a4734557df49f13 SHA512 5dfab73c4242bad9620dca71737d69215f43c8b109d25bcd2156166d2bd83d328011c6d448ee87d5f54908ea7946283ba200a865c61500912da95b7acf6c13ad
 DIST charliecloud-0.10.tar.gz 301083 BLAKE2B be0c650bebc12fd047b1afc61588b4b9cfc0d0addfddb808765d8e125c70329d6c06a86144b4167e5abaf64392ad1891319aabd2ba8fb528de2d9789d040fc0c SHA512 681e2f30f730b42b55b4097dba78e41924b17990354b866e04e09e6d2e4bb584211c130f9a04619dcdd38f2a3eaaad7615ee5ec20a266ee2332b0a512492331f
 DIST charliecloud-0.15.tar.gz 346718 BLAKE2B a3710814864904c5db282d092f64faf9a11aeea016c788ee4be62f11257b5b5200d0c1887150b93f18446034d7919df933d3badcf33907a81c0b33e65a5e9f78 SHA512 70f6c9a18f613d05396eda5d41044ec699cf6366ae1bf43839275e62ac317231bb1c3278469040faa03af007260d84e2d718c0fb3fb45e6ace8fb733c6275a84
-DIST charliecloud-0.9.10.tar.gz 275687 BLAKE2B e03c3358dd4e5eb88f9c5a3002366c79563e15d5d7792dd55f2800a001b847c13443fce0689a850aa7e6a0aa510c3f6b53d93a88a6f79326eac27acc9cbe2c57 SHA512 93a6f0c6bcceb54fabbc179b960a0d03f1b3547786ce8d502552ddc571475ea2110d6aa290ce5c245be6e2c7cdc47d3f23ff7e74558f684b4a27358aa0971a61
-DIST charliecloud-0.9.6.tar.gz 205380 BLAKE2B 2e95f5486ea6d2306512378290cd29114bc688717741436ae9cc8c1dd2679c22ab21059574d62222cd14063bacecc6a7005b216cd9e2ed01fe1593a3b69871b0 SHA512 55af3e57ef6c2b81ae10bd50d149872af50d508392b271bdaa75cf3b655659ec7da5016a9deeea15aaa20e265e8066d1ed982c122cb5e62ee6d47f25d367410f
+DIST charliecloud-0.16.tar.gz 356118 BLAKE2B 72e7640feb23fbc55c515fd841cf90562b7800a83673b6a786c8162229b6714ed6a98d3c5066e42ce75a58935e085e86e42ae927cd5f14e6e54ffe6e9863629e SHA512 bf37b5ea2d139635f3207475497bd90595ce625ce9ad05eef5fcd19ec3252e4843eba2bd457587cd9c4ab860aa1e40ec01ac5cd073414bb5a4f89b5c4488bceb
 EBUILD charliecloud-0.10-r1.ebuild 1559 BLAKE2B e33fd6a6dcd8bf6823e9d79a005050c56ff40f4d86a63805997f15c0b2620fea00b726a9734f7c2d6ccc97132b3f83990a6cb5a3d5e16090f51ac8c4e7ba4a35 SHA512 c04634bbaa51798f5d969657608f11008af026781d6eddd1350bd98415dc38d5dadb4aff252fdfdbc3073b72a29e46209c2792675414749649ce8befd2ead13d
 EBUILD charliecloud-0.15.ebuild 1979 BLAKE2B dc1016a9437a8ce7219b5ee62eec43cc28c35dc514c7d51ef693140abe2a3626b3ce17b2d182ab705e067af3de0c60b2c991bf3b1c72da96b2828f7611943874 SHA512 919c24c2c48bdc7b2d46415dcc69c478f77502a0b4748a3d6f520376adbdaed5eda1d120496ecb89fb29cb81d7a2315763f4cf73b7a4d8093163264308bcd21b
-EBUILD charliecloud-0.9.10.ebuild 1554 BLAKE2B a5255254ef542ed3ac8d2233af32dffb2be2cf75578891ca66ecac4283657bb453d7fbbd50914f93399d996cafe6694f4efab855bf5a151f5db0225cded66e7d SHA512 a44da8749ee859b459a211d92838d8e5886eeb58e8927d44c9014d0c15a24d20d2531c0a994ecf9513ef509cafb1d8086e5ab556f8549c46731534d4bd28d674
-EBUILD charliecloud-0.9.6.ebuild 1502 BLAKE2B b7dee3131b106eaa6ef4ec023339efcf33b24d9e684e0f3b0b9e246676f4868394e6a4a7e23cb66296c355de32cee0cc2425c8ca7241a3743787849bfdf80f4b SHA512 ad33df1b66ffab1b882b5799c89df2f03a3458c0bfc5e172eed3da9f37490db535c447ba9e4b177bdb747b43e3b042b9f88fac5021d7a1356bd70f32d1d18344
+EBUILD charliecloud-0.16.ebuild 1979 BLAKE2B dc1016a9437a8ce7219b5ee62eec43cc28c35dc514c7d51ef693140abe2a3626b3ce17b2d182ab705e067af3de0c60b2c991bf3b1c72da96b2828f7611943874 SHA512 919c24c2c48bdc7b2d46415dcc69c478f77502a0b4748a3d6f520376adbdaed5eda1d120496ecb89fb29cb81d7a2315763f4cf73b7a4d8093163264308bcd21b
 EBUILD charliecloud-9999.ebuild 1979 BLAKE2B dc1016a9437a8ce7219b5ee62eec43cc28c35dc514c7d51ef693140abe2a3626b3ce17b2d182ab705e067af3de0c60b2c991bf3b1c72da96b2828f7611943874 SHA512 919c24c2c48bdc7b2d46415dcc69c478f77502a0b4748a3d6f520376adbdaed5eda1d120496ecb89fb29cb81d7a2315763f4cf73b7a4d8093163264308bcd21b
 MISC metadata.xml 937 BLAKE2B e57547bd213b476c45d79c716af07e58d5097637fe86f3a65215eea57348dd94b93176239b4275660c5a50d370937cd9cfb340205b0ad556163f8ec7c5896a51 SHA512 69b8c1bec13e3ab80a277c7e24070a707b72dc0cb82de2bd2f75236e06185489692da07bfd5504f61a2b096b77bf9ca10ee8b66252031e3587855559919ccd7d
diff --git a/sys-cluster/charliecloud/charliecloud-0.16.ebuild b/sys-cluster/charliecloud/charliecloud-0.16.ebuild
new file mode 100644
index 000000000000..54113d039cd4
--- /dev/null
+++ b/sys-cluster/charliecloud/charliecloud-0.16.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit autotools eutils python-single-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hpc/${PN}.git"
+	S="${WORKDIR}/${P}"
+else
+	SRC_URI="https://github.com/hpc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~x86-linux"
+fi
+
+DESCRIPTION="Lightweight user-defined software stacks for high-performance computing"
+HOMEPAGE="https://hpc.github.io/charliecloud/"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+IUSE="ch-grow doc examples +pv +squashfs squashfuse"
+
+# Extensive test suite exists, but downloads container images
+# directly and via Docker and installs packages inside using apt/yum.
+# Additionally, clashes with portage namespacing and sandbox.
+RESTRICT="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	pv? ( sys-apps/pv )
+	squashfs? ( sys-fs/squashfs-tools )
+	squashfuse? ( sys-fs/squashfuse )"
+DEPEND="
+	ch-grow? (
+		$(python_gen_cond_dep '
+			dev-python/lark-parser[${PYTHON_MULTI_USEDEP}]
+			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
+		')
+		net-misc/rsync
+	)"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local econf_args=()
+	econf_args+=(
+		$(use_enable doc html)
+		$(use_enable ch-grow)
+		# Libdir is used as a libexec-style destination.
+		--libdir="${EPREFIX}"/usr/lib
+		# Attempts to call python-exec directly otherwise.
+		--with-sphinx-python=${PYTHON}
+	)
+	econf "${econf_args[@]}"
+}
+
+pkg_postinst() {
+	elog "Various builders are supported, as alternative "
+	elog "to the internal ch-grow. The following packages "
+	elog "can be installed to get the corresponding support."
+
+	optfeature "Building with Buildah" app-emulation/buildah
+	optfeature "Building with Docker" app-emulation/docker
+}
diff --git a/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild b/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild
deleted file mode 100644
index 042093fc1081..000000000000
--- a/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit python-single-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/hpc/${PN}.git"
-	S="${WORKDIR}/${P}"
-else
-	SRC_URI="https://github.com/hpc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Lightweight user-defined software stacks for high-performance computing"
-HOMEPAGE="https://hpc.github.io/charliecloud/"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-IUSE="doc examples +pv"
-
-# Extensive test suite exists, but downloads container images
-# directly and via Docker and installs packages inside using apt/yum.
-# Additionally, clashes with portage namespacing and sandbox.
-RESTRICT="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	pv? ( sys-apps/pv )
-"
-DEPEND="
-	doc? (
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
-		')
-		net-misc/rsync
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/"${PN}-${PV}"-fix-flags.patch
-	"${FILESDIR}"/"${PN}-${PV}"-fix-hardcoded-gcc.patch
-)
-
-src_compile() {
-	emake
-	use doc && emake -C doc-src
-}
-
-src_install() {
-	emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}" LIBEXEC_DIR="libexec/${PF}"
-	if use doc; then
-		local HTML_DOCS=(doc/.)
-	fi
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	rm -rf "${ED}/usr/share/doc/charliecloud" || die
-	einstalldocs
-}
diff --git a/sys-cluster/charliecloud/charliecloud-0.9.6.ebuild b/sys-cluster/charliecloud/charliecloud-0.9.6.ebuild
deleted file mode 100644
index 3fd8f0d7646a..000000000000
--- a/sys-cluster/charliecloud/charliecloud-0.9.6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# User namespaces don't play well with the sandbox.
-RESTRICT="test"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/hpc/${PN}.git"
-	S="${WORKDIR}/${P}"
-else
-	SRC_URI="https://github.com/hpc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Lightweight user-defined software stacks for high-performance computing"
-HOMEPAGE="https://hpc.github.io/charliecloud/"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-IUSE="doc examples +pv test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	pv? ( sys-apps/pv )
-	doc? ( dev-python/sphinx
-	       dev-python/sphinx_rtd_theme
-	       net-misc/rsync )
-	test? ( app-arch/pigz )"
-
-DOCS=(
-	README.rst
-)
-
-src_compile() {
-	emake
-	use doc && emake -C doc-src
-}
-
-src_install() {
-	emake install PREFIX="${EPREFIX}/usr" DESTDIR="${ED}"
-	if use doc; then
-		mv doc html || die
-		local HTML_DOCS=(html/.)
-	fi
-	if use examples; then
-		docompress -x "${EPREFIX}/usr/share/doc/${PF}/examples"
-		DOCS+=(examples)
-	fi
-	rm -rf "${ED}/usr/share/doc/charliecloud" || die
-	einstalldocs
-}
-
-src_test() {
-	cd "${S}/test" || die
-	export CH_TEST_TARDIR="${T}/tarballs"
-	export CH_TEST_IMGDIR="${T}/images"
-
-	# Do not run tests requiring root.
-	export CH_TEST_PERMDIRS="skip"
-	export CH_TEST_SKIP_DOCKER=yes
-	sed -i 's/CHTEST_HAVE_SUDO=yes/CHTEST_HAVE_SUDO=no/' "${S}/test/common.bash" || die
-
-	emake test-quick
-}
diff --git a/sys-cluster/charliecloud/files/charliecloud-0.9.10-fix-flags.patch b/sys-cluster/charliecloud/files/charliecloud-0.9.10-fix-flags.patch
deleted file mode 100644
index 24f2f2d72532..000000000000
--- a/sys-cluster/charliecloud/files/charliecloud-0.9.10-fix-flags.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From f0b867bb3bb527150e86a891c0c84dff3acc39e8 Mon Sep 17 00:00:00 2001
-From: Peter Wienemann <wienemann@physik.uni-bonn.de>
-Date: Mon, 1 Jul 2019 19:17:25 +0200
-Subject: [PATCH] PR #462 from @wiene: Add missing compiler flags for examples
-
-This patch ensures that CFLAGS, CPPFLAGS and LDFLAGS settings are
-respected when compiling/linking (lib)sotest, pivot_root and userns.
----
- examples/syscalls/Makefile | 2 +-
- test/Makefile              | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/examples/syscalls/Makefile b/examples/syscalls/Makefile
-index 4dbef21b..177ab42a 100644
---- a/examples/syscalls/Makefile
-+++ b/examples/syscalls/Makefile
-@@ -10,4 +10,4 @@ clean:
- $(BINS): Makefile
- 
- %: %.c
--	gcc $(CFLAGS) $< -o $@
-+	gcc $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< -o $@
-diff --git a/test/Makefile b/test/Makefile
-index 50f24596..97a9316b 100644
---- a/test/Makefile
-+++ b/test/Makefile
-@@ -81,8 +81,8 @@ sotest/lib/libsotest.so.1.0: sotest/libsotest.so.1.0
- # the container. (Issue #227.)
- 
- sotest/sotest: sotest/sotest.c sotest/libsotest.so.1.0
--	gcc -o $@ -L./sotest -lsotest $^
-+	gcc -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -L./sotest -lsotest $^
- sotest/libsotest.so.1.0: sotest/libsotest.c
--	gcc -o $@ -shared -fPIC -Wl,-soname,libsotest.so.1 -lc $^
-+	gcc -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fPIC -Wl,-soname,libsotest.so.1 -lc $^
- 	ln -f -s libsotest.so.1.0 sotest/libsotest.so
- 	ln -f -s libsotest.so.1.0 sotest/libsotest.so.1
diff --git a/sys-cluster/charliecloud/files/charliecloud-0.9.10-fix-hardcoded-gcc.patch b/sys-cluster/charliecloud/files/charliecloud-0.9.10-fix-hardcoded-gcc.patch
deleted file mode 100644
index 5654e71da5ad..000000000000
--- a/sys-cluster/charliecloud/files/charliecloud-0.9.10-fix-hardcoded-gcc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From d42f3201bb91c582d4533c732e167961030091f9 Mon Sep 17 00:00:00 2001
-From: Oliver Freyermuth <o.freyermuth@googlemail.com>
-Date: Sat, 6 Jul 2019 17:01:06 +0200
-Subject: [PATCH] examples/syscall/Makefile: Fix hardcoded call to gcc.
-
-To be open for choice of different C compilers,
-honour CC variable.
----
- examples/syscalls/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/examples/syscalls/Makefile b/examples/syscalls/Makefile
-index 177ab42a..7dc9a4b8 100644
---- a/examples/syscalls/Makefile
-+++ b/examples/syscalls/Makefile
-@@ -10,4 +10,4 @@ clean:
- $(BINS): Makefile
- 
- %: %.c
--	gcc $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< -o $@
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< -o $@
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 274fbb70f59d..d3d9d5b766a0 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -16,5 +16,5 @@ EBUILD galera-25.3.28-r1.ebuild 1787 BLAKE2B 724e57232f39574fc9a74ac6005b0f0ef82
 EBUILD galera-25.3.28.ebuild 1933 BLAKE2B 30d6355db4bc5eecec418c814cb6de00d4013ec31ca72a0dbaf981d19eb348639b3777917b0df81df0ccb0c166c40364c7417699aaf2434204b4c153f67cea2f SHA512 d589683edac16b58618cf4ba48c994e8a7deecf9051610ab544f57a95023e8038afab083f526c3e474eb5d8b08d5e648e676453b326005297e47e2b0e99cd806
 EBUILD galera-26.4.2.ebuild 1887 BLAKE2B 3cfcc688d2211a780d74e8c1001abb560c4990328f281bf4754c4d0a47b0c1f54a3cd83817e66086e330050f8cee45ca5a55b4034cbd6f9c7c2b2e74b98f9a2a SHA512 4ebd12af503f8c62b354a1fc2f19190f61a1708d1c7f391320fc7df013a1409790af14c4722b7ae739094c7552f7c9c3825153fdc06f0190627616b17b18d23d
 EBUILD galera-26.4.3.ebuild 1789 BLAKE2B 457e551c47e4711a1c4420aa667a4d949b386bac6942b9c20dfbc577d6158db07b103e542daaff2e71c3233d61a99921ab20d5bf901e7b10a543aeb880af1495 SHA512 78e370cee168728221740f984907f987c5c5f84a889e5ea62406bee503b8bd5638c2d3d1057dbd220f2a195f971fe91696e6f6e72d0f709df1fca3c5567e9660
-EBUILD galera-26.4.4.ebuild 1839 BLAKE2B be81a4d487171611c60cf0b165890b84d61a5b1f674e4b14507ea803e00d6f5dce0f5f0878d580bac2692c12a153245296e2f7fcbad12c21507e50baaa4e5752 SHA512 048db88b36730e6c5785ceb9f98b40a4451243c8166d0b9782bcd51ff156ca0b5e242524c5472a3bc300b2071ce3b456f97c349d4c4b5725ae77f4abf47343b4
+EBUILD galera-26.4.4.ebuild 1838 BLAKE2B 4cdc14ad6f9ed0884cd416936617ebc315c527cfa16a57377332ddb4c0bfc436b740dd85c6ecab09f10d7ab86f0e6ea092a91870a05a52c595649579dd9dee00 SHA512 0518b4fad5cbc4ec92d3dbe581a4d3afb2f25db7549a3d7b25d7e437e389332a0c6b9ba9130de621a7e03771fe5597a56f02945533bb7fc262a367f4e48a0729
 MISC metadata.xml 462 BLAKE2B 1b0826bcb2bd93caa5f017b3c530d3bea18daac9f457dc79d6436d21f41b8c33d2979469df870cbc68428ba0110d17013bf9cd82f4f46d9be43bf996f7815e0c SHA512 b99987e53ae976905d3e493b09cbe35161f90b8ebfc88c4a9616b8722b0a0005c2427d509e15fdd7bbb30977266188452b3b6ec7479a943bce3a5922410246e2
diff --git a/sys-cluster/galera/galera-26.4.4.ebuild b/sys-cluster/galera/galera-26.4.4.ebuild
index 0a0b545084cb..24b7eee54002 100644
--- a/sys-cluster/galera/galera-26.4.4.ebuild
+++ b/sys-cluster/galera/galera-26.4.4.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2 BSD"
 
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="cpu_flags_x86_sse4_2 garbd test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-cluster/kubernetes/Manifest b/sys-cluster/kubernetes/Manifest
index 5b110711ba6c..f43ed87ab468 100644
--- a/sys-cluster/kubernetes/Manifest
+++ b/sys-cluster/kubernetes/Manifest
@@ -25,14 +25,14 @@ DIST kubernetes-1.18.0.tar.gz 32554015 BLAKE2B 24079970cc1887c6dad7b55d9f2fd80cd
 DIST kubernetes-1.18.1.tar.gz 32581783 BLAKE2B ffacdba21dd6d326ddf9733c49ed3a16ad679fbd25b4ddda44b047a402a163474033d6b2328a816e83ede505aae07e205b68938165c546202fa6df2d03609ead SHA512 c002153e16494cd74e6f0609847602d6dcf166c8bab020341f8302b7cad5d7452ed1c2e66b3b230731d13401493d2d02f0500abcd526dbff44ae3aeabd210577
 DIST kubernetes-1.18.2.tar.gz 32585912 BLAKE2B 1f8dbd6e7a8ba4257abaf2926ada656ec42eb7e0f502f2b4fc75b2a6cacd9a6e91624a717772f605a24b42421933580bc399aca4480aa1c88009016160485a77 SHA512 9786312b06aea5cbd4e786e4b6d639ec4750fa6c8ba469d860702b317103ec464f038015ef038ba21841a0d627d58902769eb73a5d2fdf4da2f0ae4c0ec14e85
 DIST kubernetes-1.18.3.tar.gz 32596732 BLAKE2B 067a0b74d3d8e63ba99da1828c7a3e905b235a8e5bee1eb11bbc0a5e12ab2d94c0b5dcf9febf6b0808c053eb81fa6ea4746aa42d6c0a19c02b834b44d25f095f SHA512 0bb1dc33802127b03480e43dcbdeb576188a2a50b0257bcf47a0efec7d504cbce9b61048cb87d2ae4148174fcb2e373298c5947d5130604f827b806d9d00c6a4
-EBUILD kubernetes-1.16.10.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
-EBUILD kubernetes-1.16.8.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
-EBUILD kubernetes-1.16.9.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
+EBUILD kubernetes-1.16.10.ebuild 2303 BLAKE2B 805c711559a39bcffdb24972db170d1b22018a52cc69d15488f2673a62bfbcf00a94ab4db48506e50a1b440489e28e7db1c3b276223c582991538264ff6d30e6 SHA512 4e7bd9452e329034035b84190289fbf37491b544bacc46f5f4e1556083f5f1f13fe13563a699412aa901cb3cb57e512a279b571defc4616b1a43a493392e25f7
+EBUILD kubernetes-1.16.8.ebuild 2303 BLAKE2B 805c711559a39bcffdb24972db170d1b22018a52cc69d15488f2673a62bfbcf00a94ab4db48506e50a1b440489e28e7db1c3b276223c582991538264ff6d30e6 SHA512 4e7bd9452e329034035b84190289fbf37491b544bacc46f5f4e1556083f5f1f13fe13563a699412aa901cb3cb57e512a279b571defc4616b1a43a493392e25f7
+EBUILD kubernetes-1.16.9.ebuild 2303 BLAKE2B 805c711559a39bcffdb24972db170d1b22018a52cc69d15488f2673a62bfbcf00a94ab4db48506e50a1b440489e28e7db1c3b276223c582991538264ff6d30e6 SHA512 4e7bd9452e329034035b84190289fbf37491b544bacc46f5f4e1556083f5f1f13fe13563a699412aa901cb3cb57e512a279b571defc4616b1a43a493392e25f7
 EBUILD kubernetes-1.17.4.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
 EBUILD kubernetes-1.17.5.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
-EBUILD kubernetes-1.17.6.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
+EBUILD kubernetes-1.17.6.ebuild 2303 BLAKE2B 805c711559a39bcffdb24972db170d1b22018a52cc69d15488f2673a62bfbcf00a94ab4db48506e50a1b440489e28e7db1c3b276223c582991538264ff6d30e6 SHA512 4e7bd9452e329034035b84190289fbf37491b544bacc46f5f4e1556083f5f1f13fe13563a699412aa901cb3cb57e512a279b571defc4616b1a43a493392e25f7
 EBUILD kubernetes-1.18.0.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
 EBUILD kubernetes-1.18.1.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
 EBUILD kubernetes-1.18.2.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
-EBUILD kubernetes-1.18.3.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
+EBUILD kubernetes-1.18.3.ebuild 2303 BLAKE2B 805c711559a39bcffdb24972db170d1b22018a52cc69d15488f2673a62bfbcf00a94ab4db48506e50a1b440489e28e7db1c3b276223c582991538264ff6d30e6 SHA512 4e7bd9452e329034035b84190289fbf37491b544bacc46f5f4e1556083f5f1f13fe13563a699412aa901cb3cb57e512a279b571defc4616b1a43a493392e25f7
 MISC metadata.xml 719 BLAKE2B 4f7918cba4809becbff0cb1f6c6e9ce00e778c1a474955e64fccef68942a2e7fb337d5dbe8b01074b992497da913fbfbebe5705635245e8ce02f6daca4df7936 SHA512 9d4662622f1fa57b753018db9839b4399f3bb589a1e061821941738ea86a6d65cd0dbec31ffef658aeb14ac7d5c3840948694627b1fb32bc138b0f7dbf40a011
diff --git a/sys-cluster/kubernetes/kubernetes-1.16.10.ebuild b/sys-cluster/kubernetes/kubernetes-1.16.10.ebuild
index c333bbabb3b4..08ecc8821c16 100644
--- a/sys-cluster/kubernetes/kubernetes-1.16.10.ebuild
+++ b/sys-cluster/kubernetes/kubernetes-1.16.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 AGENT="kubelet"
 CLI="kubeadm kubectl"
diff --git a/sys-cluster/kubernetes/kubernetes-1.16.8.ebuild b/sys-cluster/kubernetes/kubernetes-1.16.8.ebuild
index c333bbabb3b4..08ecc8821c16 100644
--- a/sys-cluster/kubernetes/kubernetes-1.16.8.ebuild
+++ b/sys-cluster/kubernetes/kubernetes-1.16.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 AGENT="kubelet"
 CLI="kubeadm kubectl"
diff --git a/sys-cluster/kubernetes/kubernetes-1.16.9.ebuild b/sys-cluster/kubernetes/kubernetes-1.16.9.ebuild
index c333bbabb3b4..08ecc8821c16 100644
--- a/sys-cluster/kubernetes/kubernetes-1.16.9.ebuild
+++ b/sys-cluster/kubernetes/kubernetes-1.16.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 AGENT="kubelet"
 CLI="kubeadm kubectl"
diff --git a/sys-cluster/kubernetes/kubernetes-1.17.6.ebuild b/sys-cluster/kubernetes/kubernetes-1.17.6.ebuild
index c333bbabb3b4..08ecc8821c16 100644
--- a/sys-cluster/kubernetes/kubernetes-1.17.6.ebuild
+++ b/sys-cluster/kubernetes/kubernetes-1.17.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 AGENT="kubelet"
 CLI="kubeadm kubectl"
diff --git a/sys-cluster/kubernetes/kubernetes-1.18.3.ebuild b/sys-cluster/kubernetes/kubernetes-1.18.3.ebuild
index c333bbabb3b4..08ecc8821c16 100644
--- a/sys-cluster/kubernetes/kubernetes-1.18.3.ebuild
+++ b/sys-cluster/kubernetes/kubernetes-1.18.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 AGENT="kubelet"
 CLI="kubeadm kubectl"
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 9a707959ae95..a3d57ce9a850 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -4,12 +4,15 @@ AUX nova.initd 747 BLAKE2B 2a20a632fcb66001e68f4d70fa11ba179db9b06a6f412115d7b89
 AUX openstack-scsi-disk.rules 134 BLAKE2B c1e3e150d93ab51b4da48caf2a0f83513fe63b5dde1e449a9c4c4dbfad65589b6326c799958736da86390142a914acbf9acf5b78bb1042e2c156eaf01cec8250 SHA512 6c3734d0b9ce9de887e15b1ddd5f5486dd1d0a55f463f9824ef067d3fe64a93d08ad2ef2b9d288f0dd42d570a5061e7a06976f7223df44b98bd321b73f9d036b
 AUX scsi-openscsi-link.sh 2777 BLAKE2B 84c14df2b1c49fe6210a4abf4387229aaa4fcd0c956b374b719285a20d8309f1bb58d51061084f34d284624d279bc64d53a629ec57702314c23e9b129c4a16b4 SHA512 3e7f6fc872f27b6a4d6c991346bd8eafcbc8f2b74439f1c77e93362e57fa1010ff002813cf21bf12d0550bfc165f79c70430862cd4ed5aaa15056777baf34409
 DIST nova-20.2.0.tar.gz 11625085 BLAKE2B 5ae0be3831ed03722947041efa6ce1dc3662273517ca652fb0c135f90f0323deed1f0af7751916343e3c8e065be4cc8eb7b00adf043ddaa798bf5faa88aa7bc9 SHA512 3db1fc8bda5ae95394518af1a856b6876104b852ffd758bda90a7fbdb8b389bc246e406d55eae614e65b559556ea9511c0c1281e2858d6157dd462767ae5127f
+DIST nova-20.3.0.tar.gz 11622955 BLAKE2B 39801fa8dfeed9b7a677e7bc9ba8b82a59bc431850083e108361ad3f334fef7ea9cd6065e47a86145fca28ad8f3991fd5755464bebf0fe224fb5f24900c1a8c2 SHA512 c5c8b4c475b02cba7e842312bd7f5e1c71756eff6e22bb38e8a4728edc60d746222ada05edf440f700da07d90cce19a9cbfdebee6ab6ea56a926545b5effe08d
 DIST nova-21.0.0.tar.gz 9193053 BLAKE2B efc95ac54a18a7df1530fc61e2478d59e5711e4c2da0156c405945a9a0ccd533255e2733d626f28f3460238cf157d802b79a8573f570623024089dd86ac23abc SHA512 a006a47f10d141df8a2495ae81c98bd0bf7af0b1f790627ba929e9b3e2931e438259f96d8c9391b9717126778f3f72f0bde01db5245bdbe801077fd884ba5a89
 DIST nova.conf.sample-20.2.0 220110 BLAKE2B af98687c895ee091cc2e8d668eb50b52cc94618081f8a50b544faebed29b2b3a5dfa38309da70dcc6d0083792605b810081b50c15a6c960947e0c782f25717ab SHA512 cc6cce95943b06d60dfc1f85b87d527662eeb57388dca4a6037078b517302b86fd7f752c6e9e43c59c10be83ac5955f21c08284bbc946ffe2171f5bfa6edff38
+DIST nova.conf.sample-20.3.0 220110 BLAKE2B af98687c895ee091cc2e8d668eb50b52cc94618081f8a50b544faebed29b2b3a5dfa38309da70dcc6d0083792605b810081b50c15a6c960947e0c782f25717ab SHA512 cc6cce95943b06d60dfc1f85b87d527662eeb57388dca4a6037078b517302b86fd7f752c6e9e43c59c10be83ac5955f21c08284bbc946ffe2171f5bfa6edff38
 DIST nova.conf.sample-2019.2.9999 220110 BLAKE2B af98687c895ee091cc2e8d668eb50b52cc94618081f8a50b544faebed29b2b3a5dfa38309da70dcc6d0083792605b810081b50c15a6c960947e0c782f25717ab SHA512 cc6cce95943b06d60dfc1f85b87d527662eeb57388dca4a6037078b517302b86fd7f752c6e9e43c59c10be83ac5955f21c08284bbc946ffe2171f5bfa6edff38
 DIST nova.conf.sample-2020.1.9999 191182 BLAKE2B 99999b1b42b9ecc6a7f404c9874c5065591dfd8e896c97d261307f7f3b5e935e12db1b4650182660cf1eb97bcfb993d41a1f89e079120adc00b339b5a4ac1c98 SHA512 af22ba8dcfbafdb07ba2785bdcb40efd201adb81d47bee15ee11bb76437bc7a5b7c88390f995432ffa92b64b849df754bd15264e97530334f3eac6f8f93e828d
 DIST nova.conf.sample-21.0.0 191182 BLAKE2B 99999b1b42b9ecc6a7f404c9874c5065591dfd8e896c97d261307f7f3b5e935e12db1b4650182660cf1eb97bcfb993d41a1f89e079120adc00b339b5a4ac1c98 SHA512 af22ba8dcfbafdb07ba2785bdcb40efd201adb81d47bee15ee11bb76437bc7a5b7c88390f995432ffa92b64b849df754bd15264e97530334f3eac6f8f93e828d
 EBUILD nova-20.2.0.ebuild 7724 BLAKE2B 746858811dcdc2e5951d3fdbeb3e113136e6b32e62d18d2ba39f59988c57050607ddc4b1805dce6485597160103a21d8492c1b157635e7daa9292e06e335507b SHA512 a39fa8fd98f10e9933596565bfe1827b6e0e5505559a31e9c3c70a93acdd2898e9b02ab321cfb8f7bc18455d9260af0531de98a11b2020272000040bdb22d0a5
+EBUILD nova-20.3.0.ebuild 7726 BLAKE2B 54ac624037ad5f471d987cae53bee5e88feeb9eb56ca06e362993156a3ebe069cb878e4975b20ee09318a45768841e2bf0fa045db05abafb26d4d4fcde06fdff SHA512 ed74e7d855e703cd30b427fc3e75d090493932ef511b0a62309fa23dfe20809ecb695cbd39a2892ae9745d3753951c8d052056cb4a8d9a6cdc5e919ce09fdf3b
 EBUILD nova-2019.2.9999.ebuild 7726 BLAKE2B 54ac624037ad5f471d987cae53bee5e88feeb9eb56ca06e362993156a3ebe069cb878e4975b20ee09318a45768841e2bf0fa045db05abafb26d4d4fcde06fdff SHA512 ed74e7d855e703cd30b427fc3e75d090493932ef511b0a62309fa23dfe20809ecb695cbd39a2892ae9745d3753951c8d052056cb4a8d9a6cdc5e919ce09fdf3b
 EBUILD nova-2020.1.9999.ebuild 7628 BLAKE2B 3486d8ff71c4e70391cd416b6ef0cdf346ea8676d79cf594abaae8ea0f91dbe77a9a4a7fc720cbd4c6f910be91180b25251fa196878a33b4c8d114bb382c7e2a SHA512 d2a507f1fa6a00c2260f837cec8f02d6b151efbc7a50aecb6d50f30c1e56bd3cc708245ff7dec1a2d1a2601fb7a12a028a00ab3a7e75ff015500640c4b00c26a
 EBUILD nova-21.0.0.ebuild 7626 BLAKE2B 0b6038133b804d49d5164fc5cf6ef28bdba54c058f77a869a8c89d3c2658e534379808d0294f37eb0a42170980beb43b37244f23f4533f858f442e6aaae59e50 SHA512 06b0649cfcb1233e45a24f033e330dc29434b66f4ca263c8f9757940cb1b93db8ce8dd51068a3c19a16a6e394b0805f43b24b8cb9f665cd52d51e8d8d1f1e843
diff --git a/sys-cluster/nova/nova-20.3.0.ebuild b/sys-cluster/nova/nova-20.3.0.ebuild
new file mode 100644
index 000000000000..a866be1bbd8e
--- /dev/null
+++ b/sys-cluster/nova/nova-20.3.0.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1 eutils linux-info multilib
+
+DESCRIPTION="Cloud computing fabric controller"
+HOMEPAGE="https://launchpad.net/nova"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/train/nova.conf.sample -> nova.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/nova.git"
+	EGIT_BRANCH="stable/train"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/train/nova.conf.sample -> nova.conf.sample-${PV}
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
+REQUIRED_USE="
+	!compute-only? ( || ( mysql postgres sqlite ) )
+	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
+
+CDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	compute-only? (
+		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-1.2.19[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
+	)
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.20.0[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.4.1[${PYTHON_USEDEP}]
+	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
+	!~dev-python/greenlet-0.4.14[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
+	!~dev-python/python-cinderclient-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.21.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.1[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.40.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.44.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.33.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.40.1[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-2.6.1[${PYTHON_USEDEP}]
+	>=dev-python/os-resource-classes-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/os-traits-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/os-vif-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/os-xenapi-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/pypowervm-1.1.15[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+	>=dev-python/zVMCloudConnector-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.35.0[${PYTHON_USEDEP}]
+	dev-python/libvirt-python[${PYTHON_USEDEP}]
+	app-emulation/libvirt[iscsi?]
+	app-emulation/spice-html5
+	novncproxy? ( www-apps/novnc )
+	sys-apps/iproute2
+	openvswitch? ( net-misc/openvswitch )
+	rabbitmq? ( net-misc/rabbitmq-server )
+	memcached? (
+		net-misc/memcached
+		>=dev-python/python-memcached-1.58
+	)
+	sys-fs/sysfsutils
+	sys-fs/multipath-tools
+	net-misc/bridge-utils
+	compute? (
+		app-cdr/cdrtools
+		sys-fs/dosfstools
+		app-emulation/qemu
+	)
+	iscsi? (
+		sys-fs/lsscsi
+		>=sys-block/open-iscsi-2.0.873-r1
+	)
+	acct-user/nova
+	acct-group/nova"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
+	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
+	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use !compute-only; then
+		for svc in api conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
+			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
+		done
+	fi
+	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
+	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
+
+	diropts -m 0750 -o nova -g qemu
+	dodir /var/log/nova /var/lib/nova/instances
+	diropts -m 0750 -o nova -g nova
+
+	insinto /etc/nova
+	insopts -m 0640 -o nova -g nova
+	newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample"
+	doins "${FILESDIR}/nova-compute.conf"
+	doins "${S}/etc/nova/"*
+	# rootwrap filters
+	insopts -m 0644
+	insinto /etc/nova/rootwrap.d
+	doins "etc/nova/rootwrap.d/api-metadata.filters"
+	doins "etc/nova/rootwrap.d/compute.filters"
+	doins "etc/nova/rootwrap.d/network.filters"
+
+	# add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0600 -o root -g root
+	doins "${FILESDIR}/nova-sudoers"
+
+	if use iscsi ; then
+		# Install udev rules for handle iscsi disk with right links under /dev
+		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
+
+		insinto /etc/nova/
+		doins "${FILESDIR}/scsi-openscsi-link.sh"
+	fi
+	rm -r "${ED}/usr/etc"
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "iscsid needs to be running if you want cinder to connect"
+	fi
+}
diff --git a/sys-cluster/zookeeper-bin/Manifest b/sys-cluster/zookeeper-bin/Manifest
index e2ed62418b32..41e855b6b3bb 100644
--- a/sys-cluster/zookeeper-bin/Manifest
+++ b/sys-cluster/zookeeper-bin/Manifest
@@ -1,6 +1,7 @@
 AUX log4j.properties 2191 BLAKE2B 64ca568213fcc1168a10b8ca5914361f2d4543e8d5a2e22bf81ee807df2c4f7ca269a1f8d355ee8e889aa50c250e24f65c3900a32f06233e6c3dbc9b460c48b2 SHA512 a465aef274e3f325730c150fdebe3ca27f9debe723af6680b187daf83d6da663fa8a51bb9813ec8cba3b4d59c9e28848032083a44686b08fd2c246a461ada0c6
 AUX zookeeper.confd 398 BLAKE2B d49c6c7358ce2f6911d359142e0f6abe2662c0e5c2bcf1ac114cd272d44efcfad05d31d58ef368a470e6f844df999068b68a7c1e8392138fc07887333e7bd41f SHA512 76ad4796faa2d267ae30d85e573de2dbad00c566764cf6757d71c00c68b10c99383dd87d2352f521c872ce22edde85bb2d3896bb6258f57ce3fc6b423a16296f
 AUX zookeeper.initd 373 BLAKE2B c60740f691d186861e3f101c84e5904774de6235a0423f4f639843b105d6ce9b4ebd9555db13f5ac1447c154881b3c95fbd4738d496f6008d9e52de1cc3e74eb SHA512 34a4011ecb5d8739e57dbc9222b528a0b323c6aa0aa45391621e724106571a632908782e3a4e14e953be72fa0e525b4c7cab0440af37bbef26a100fd1d92da81
+DIST apache-zookeeper-3.6.1-bin.tar.gz 12436328 BLAKE2B 73c8628826382d68171f12e6ff5baefc66c4569f6e7dfec53ce00a2fd8bcf5ec519c5aeb29e9d01762ca95205bdfce3748cdaa1c745cf254c38df6ee38117165 SHA512 1c5cb4d9886fae41bf244a446dd874b73c0fff7a5fc2dda4305041964420cde21e59b388dfd2551464a46bb6918d9d3c3c01ebe68fdbe782074ee360aa830c7d
 DIST zookeeper-3.4.10.tar.gz 35042811 BLAKE2B c17100d2179688665cfc9efededd378543492e2a839df9da7ab72097b954200c527375cadae1d7b30d83c511c21c1470d0b86a4a19df5abe0c82980920cad92f SHA512 4c54e40ac8d0b267db4a188a30e39ed0ac2c3e8a8fadaf244be45ff5adee956df28f6cb9f1eb56f175e924fa3629b64f98286a090c46764c91c017613c80a51b
 DIST zookeeper-3.4.11.tar.gz 36668066 BLAKE2B 4bf963d41280bd6227b4e81721576bf1f973a765c7049e78c5fae4d9dbc7e4d034304208af0f68b894bd4624e1945c9e4492b3217ff7f0e05d9b822c1843d96d SHA512 1ed2df11dbff2fbbb70d992d02427c4f694ccb4fe493db10a087b04d934b132b970956099edbdf1c2c636d5eb248bca1528846fcb449ae8bee4b9a82f7936f9e
 DIST zookeeper-3.4.12.tar.gz 36667596 BLAKE2B e4aac98f86fc4fcc576ecfb55381fd37efe3fa56cebc1632abda59b6ba71fecca17ace29124ef9f59ca0de627ff463f9d6fc7ff7fbbe77c2bbf30ae25a9f99f8 SHA512 026c7feb4a660bf8d99b1b719fec2b7e4603c3c46f2b77bac372df15ed0ceb4d971aa9c954082d61d73929ef8dc38c31693604ae75244f746cafb4eb6e67320c
@@ -9,4 +10,5 @@ EBUILD zookeeper-bin-3.4.10.ebuild 1933 BLAKE2B ac00e5f5e075cb3e77de407ae9863bc4
 EBUILD zookeeper-bin-3.4.11.ebuild 1933 BLAKE2B ac00e5f5e075cb3e77de407ae9863bc4f696711e54b92c45011fe2c51a992d8f156f8bacf20787b91126334c748bcc078ce327869e11c7f0b6afe6b8e73e3c8b SHA512 7dd0ece206a10f882e7fe9e0a6fee4f7a8079e84af017f6d9f12bd48ef08524fa5f672c18c469562812f4da9fdaab7a0c087ed977d473f6f33deac4f7a4e77c3
 EBUILD zookeeper-bin-3.4.12.ebuild 1933 BLAKE2B 5d326d7ea693b528e88a3e74b84e516b16ef60fc2ca1b92caa224170726b1092f8ac839b495a88d1880342b38958c6b18ebf58540884d62cd6ca44d65fd8b0cb SHA512 60b76cbc2b3e221f627737a56a0d3420d67c15f26f4b260f4278b678648d64bf51626867abff5ae2f5f7ca3d735943ac85cff03639c5daf353dc9c33314baf4e
 EBUILD zookeeper-bin-3.4.13.ebuild 2053 BLAKE2B 5aaa2b86d2762abd7558801ca16081ad65a02386bb91abb2b73caac17695028ccd3dac099194f38389c3321e11cc97281b782c9ccc0a99516195e3e7f694c28a SHA512 8335da5a5b9db28943af049dbbc25c615fe7d69684ea900ab9b4d49dc3d4823729b5f2a9c8b7df09cd7f2e0d125643693b475a8a7d382945d66ef474b3f30913
+EBUILD zookeeper-bin-3.6.1.ebuild 1480 BLAKE2B 02f60ec89dffa512c62a8a749c25be390682ca4e806d7d21c9b49a9a4991ae970b670b72f015a7d91dc48cfef35247001afaae8ff2d86664d6e960f213829ea8 SHA512 ec0d2368f7c037fbd33dc1fcb8e10d2021bb340b558eec681a367398c9377b31653da93709b7778f3d56ca4d40d090a53cb45ca0d2826e12bd43a45db69b1551
 MISC metadata.xml 377 BLAKE2B ab2582cf60510f072415cc1dd008bd744f66d76fe6b34b779eba8acf7c28a0d055d70d16c2712af7324b6b11193ed2526b6b8bb1b101084e8a5ca8d96993ef3d SHA512 2ad1600101d36b70c32cb76894e55f01717a544d689bd28ffb41a727d7d23b6f8e9565eea71f252a721bcd4e516692921796f24266485a216a6015a5a9e74f26
diff --git a/sys-cluster/zookeeper-bin/zookeeper-bin-3.6.1.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.6.1.ebuild
new file mode 100644
index 000000000000..ce172dc53831
--- /dev/null
+++ b/sys-cluster/zookeeper-bin/zookeeper-bin-3.6.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils java-utils-2 user
+
+MY_P="zookeeper"
+MY_PN=${MY_P}-${PV}
+
+DESCRIPTION="A high-performance coordination service for distributed applications."
+HOMEPAGE="http://zookeeper.apache.org/"
+SRC_URI="https://downloads.apache.org/${MY_P}/${MY_PN}/apache-${MY_PN}-bin.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror binchecks"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=virtual/jre-1.7"
+
+S=${WORKDIR}/apache-${MY_PN}-bin
+
+INSTALL_DIR=/opt/${PN}
+export CONFIG_PROTECT="${CONFIG_PROTECT} ${INSTALL_DIR}/conf"
+
+pkg_setup() {
+	enewgroup zookeeper
+	enewuser zookeeper -1 /bin/sh /var/lib/zookeeper zookeeper
+}
+
+src_install() {
+	local DATA_DIR=/var/lib/${MY_P}
+
+	rm bin/*.cmd || die
+
+	keepdir "${DATA_DIR}"
+	sed "s:^dataDir=.*:dataDir=${DATA_DIR}:" conf/zoo_sample.cfg > conf/zoo.cfg || die "sed failed"
+	cp "${FILESDIR}"/log4j.properties conf/ || die "cp log4j conf failed"
+
+	dodir "${INSTALL_DIR}"
+	cp -a "${S}"/* "${D}${INSTALL_DIR}" || die "install failed"
+
+	# data dir perms
+	fowners zookeeper:zookeeper "${DATA_DIR}"
+
+	# log dir
+	keepdir /var/log/zookeeper
+	fowners zookeeper:zookeeper /var/log/zookeeper
+
+	# init script
+	newinitd "${FILESDIR}"/zookeeper.initd zookeeper
+	newconfd "${FILESDIR}"/zookeeper.confd zookeeper
+
+	# env file
+	cat > 99"${PN}" <<-EOF
+		PATH=${INSTALL_DIR}/bin
+		CONFIG_PROTECT=${INSTALL_DIR}/conf
+	EOF
+	doenvd 99"${PN}"
+}