gentoo (leap year) resync : 29.02.2020

86 files changed, 1815 insertions, 973 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 637c59a9ea7c..dcae0e709aaa 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 59b69bde3155..dcbe92836f4f 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -55,5 +55,6 @@ AUX sysctld 57 BLAKE2B 840eec3d188df4998c7ba8fb923777636ae9d2aa342545b69c12e5ea8
 DIST ceph-12.2.12.tar.gz 77467762 BLAKE2B a5224432121db9ef49c1e22771d847399df2f7881cd9c2e185eca12096efb79d21578659d248eb5bae678924983d57452d370e23ab7e78663764d7bea834a461 SHA512 e694c9a8c1f9836c08fb74b54423bdc16d4900252e34643c56cf1a615d4dacddfb13df06a6a9f68bb9d438f5f07069ed358f9fa4b5a362640a3046f9c7722dcc
 DIST ceph-14.2.7.tar.gz 116647114 BLAKE2B f6971324b0467cfdb863db553b6feacaf3607b14fb9adae2808bd6e5514fc5ce218482c412b80902c22a74b883ed697f2c126bc687c8733a83de5b970593efa2 SHA512 59f475e56053ba5e7e3a482a3a91b4d44272e6ec8051b92783de76c09c0d967a7ef76676db998968a709e48f08e90828dd8f86bd96a7c3fd111d48bfb7fd93b1
 EBUILD ceph-12.2.12-r2.ebuild 8446 BLAKE2B aed1bab233d20c77e385b49bc0f8fa7cbdd9a806f0e5e856e1000cccb09557bfc394ef2e97fbeb8fa5b995dd119dcd4b3e79751c6b5da00798b1267af392412e SHA512 50e031732540249f824e9b14a8286c600bff8a361e5047ad0b67c87ec940c1feaf0a2f7d5f40ab529dbfa91b15915b4adf372a6d3257025d6457c64cc152d1d1
+EBUILD ceph-14.2.7-r1.ebuild 10460 BLAKE2B 2b39e9b8547e37bea987737c7a0be15f0e4aeb586b509d9403398b72b67568892e9d8755967f70e161091389ede0fc6206ca6f21c071840747f3a08d3dd88297 SHA512 aebd7fc16527519c68912cdf73c07201bb9b05a307a57b6fb98261af668ccc7908a912bba4ab40ed11690b3e4678e7d9c5334428989f30c26ce01291966351e7
 EBUILD ceph-14.2.7.ebuild 10267 BLAKE2B e64a6096a7e021d3a6f1ae0e8564132d76d38f3ef195510a2b0606602792929d2b62c31e16ae12b8c35b0b2dca793d40dc0d4a4e3dc517fa8edb21bf9ff88b42 SHA512 2cc3f8116ca7b57914f0b3b2cde51fbf0df5f90ca9c649db50ed370d6cda8f840cdb1d67f38454d765f1fcc2d96bab0ed5a7766601556a7931b8c8c3a8d988f2
 MISC metadata.xml 1662 BLAKE2B 0d2b5697ff30ba38b9fff57fc08c0339d481e852a1ec54561214594d6fa6ddc6aa1bcd9adabe24bd1da39da9b9b66ff9cca1c30cae5a0d3b4259cb80673638e3 SHA512 95d94f98a016a1c04ed65cbb2710b07984bc2db428c4e54fed3ab35eda6c5e4db6f7a4d273772cffbbe6ad331a8257247cc359e1814bd418eeb4f0952858c945
diff --git a/sys-cluster/ceph/ceph-14.2.7-r1.ebuild b/sys-cluster/ceph/ceph-14.2.7-r1.ebuild
new file mode 100644
index 000000000000..bbd99feb1f92
--- /dev/null
+++ b/sys-cluster/ceph/ceph-14.2.7-r1.ebuild
@@ -0,0 +1,376 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+CMAKE_MAKEFILE_GENERATOR=emake
+
+DISTUTILS_OPTIONAL=1
+
+inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \
+		multiprocessing python-r1 udev readme.gentoo-r1 toolchain-funcs \
+		systemd
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ceph/ceph.git"
+	SRC_URI=""
+else
+	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64"
+fi
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="https://ceph.com/"
+
+LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ BSD Boost-1.0 MIT public-domain"
+SLOT="0"
+
+CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
+
+IUSE="babeltrace +cephfs dpdk fuse grafana jemalloc kerberos ldap libressl"
+IUSE+=" lttng +mgr numa rabbitmq +radosgw +ssl spdk static-libs system-boost"
+IUSE+=" systemd +tcmalloc test xfs zfs"
+IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
+
+COMMON_DEPEND="
+	acct-group/ceph
+	acct-user/ceph
+	virtual/libudev:=
+	app-arch/bzip2:=[static-libs?]
+	app-arch/lz4:=[static-libs?]
+	app-arch/snappy:=[static-libs(-)?]
+	app-arch/zstd:=[static-libs?]
+	app-shells/bash:0
+	app-misc/jq:=[static-libs?]
+	dev-libs/crypto++:=[static-libs?]
+	dev-libs/leveldb:=[snappy,static-libs?,tcmalloc(-)?]
+	dev-libs/libaio:=[static-libs?]
+	dev-libs/libnl:3=[static-libs?]
+	dev-libs/libxml2:=[static-libs?]
+	dev-libs/nss:=
+	sys-auth/oath-toolkit:=
+	sys-apps/coreutils
+	sys-apps/grep
+	sys-apps/keyutils:=[static-libs?]
+	sys-apps/util-linux:=[static-libs?]
+	sys-apps/sed
+	sys-apps/util-linux
+	sys-libs/libcap-ng:=[static-libs?]
+	sys-libs/ncurses:0=[static-libs?]
+	sys-libs/zlib:=[static-libs?]
+	babeltrace? ( dev-util/babeltrace )
+	ldap? ( net-nds/openldap:=[static-libs?] )
+	lttng? ( dev-util/lttng-ust:= )
+	fuse? ( sys-fs/fuse:0=[static-libs?] )
+	kerberos? ( virtual/krb5 )
+	rabbitmq? ( net-libs/rabbitmq-c:=[static-libs?] )
+	ssl? (
+		!libressl? ( dev-libs/openssl:=[static-libs?] )
+		libressl? ( dev-libs/libressl:=[static-libs?] )
+	)
+	xfs? ( sys-fs/xfsprogs:=[static-libs(+)?] )
+	zfs? ( sys-fs/zfs:=[static-libs?] )
+	radosgw? (
+		dev-libs/expat:=[static-libs?]
+		!libressl? (
+			dev-libs/openssl:=[static-libs?]
+			net-misc/curl:=[curl_ssl_openssl,static-libs?]
+		)
+		libressl? (
+			dev-libs/libressl:=[static-libs?]
+			net-misc/curl:=[curl_ssl_libressl,static-libs?]
+		)
+	)
+	system-boost? (
+		|| (
+			=dev-libs/boost-1.71*[threads,context,python,static-libs?,${PYTHON_USEDEP}]
+			=dev-libs/boost-1.70*[threads,context,python,static-libs?,${PYTHON_USEDEP}]
+			=dev-libs/boost-1.67*[threads,context,python,static-libs?,${PYTHON_USEDEP}]
+		)
+		dev-libs/boost:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
+	)
+	jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
+	!jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] )
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+	app-arch/cpio
+	>=dev-util/cmake-3.5.0
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/sphinx
+	dev-util/cunit
+	dev-util/gperf
+	dev-util/valgrind
+	sys-apps/coreutils
+	sys-apps/findutils
+	sys-apps/grep
+	sys-apps/sed
+	sys-apps/which
+	sys-devel/bc
+	sys-devel/patch
+	virtual/pkgconfig
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		sys-apps/grep[pcre]
+		sys-fs/btrfs-progs
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	net-misc/socat
+	sys-apps/gptfdisk
+	sys-block/parted
+	sys-fs/cryptsetup
+	sys-fs/lvm2[-device-mapper-only(-)]
+	sys-fs/lsscsi
+	virtual/awk
+	dev-python/bcrypt[${PYTHON_USEDEP}]
+	dev-python/cherrypy[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pecan[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	mgr? (
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+		dev-python/pyjwt[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/routes[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	mgr? ( cephfs )
+	?? ( jemalloc tcmalloc )
+	rabbitmq? ( radosgw )
+"
+
+# the tests need root access
+RESTRICT="test? ( userpriv )"
+
+# distribution tarball does not include everything needed for tests
+RESTRICT+=" test"
+
+# false positives unless all USE flags are on
+CMAKE_WARN_UNUSED_CLI="no"
+
+PATCHES=(
+	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
+	"${FILESDIR}/ceph-14.2.0-cflags.patch"
+	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
+	"${FILESDIR}/ceph-13.2.0-cflags.patch"
+	"${FILESDIR}/ceph-14.2.0-mgr-python-version.patch"
+	"${FILESDIR}/ceph-14.2.5-no-virtualenvs.patch"
+	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
+	"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
+	"${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch"
+	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
+	"${FILESDIR}/ceph-14.2.5-boost-1.70.patch"
+	"${FILESDIR}/ceph-14.2.3-dpdk-compile-fix-1.patch"
+	"${FILESDIR}/ceph-14.2.4-python-executable.patch"
+	"${FILESDIR}/ceph-14.2.4-undefined-behaviour.patch"
+)
+
+check-reqs_export_vars() {
+	if use amd64; then
+		CHECKREQS_DISK_BUILD="12G"
+		CHECKREQS_DISK_USR="460M"
+	else
+		CHECKREQS_DISK_BUILD="1400M"
+		CHECKREQS_DISK_USR="450M"
+	fi
+
+	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
+}
+
+pkg_pretend() {
+	check-reqs_export_vars
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	python_setup 'python3*'
+	check-reqs_export_vars
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if use system-boost; then
+		eapply "${FILESDIR}/ceph-14.2.5-boost-sonames.patch"
+
+		find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
+			| xargs --null sed -e 's|Boost::|Boost_|g' -i || die
+
+		has_version '>=dev-libs/boost-1.70.0' || \
+			eapply "${FILESDIR}/ceph-14.2.5-boost-1.6-python-sonames.patch"
+	fi
+
+	sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
+		src/bash_completion/CMakeLists.txt || die
+
+	# remove tests that need root access
+	rm src/test/cli/ceph-authtool/cap*.t || die
+}
+
+ceph_src_configure() {
+	local flag
+	local mycmakeargs=(
+		-DWITH_BABELTRACE=$(usex babeltrace)
+		-DWITH_CEPHFS=$(usex cephfs)
+		-DWITH_CEPHFS_SHELL=$(if python_is_python3; then usex cephfs; else echo OFF; fi)
+		-DWITH_DPDK=$(usex dpdk)
+		-DWITH_DPDK=$(usex spdk)
+		-DWITH_FUSE=$(usex fuse)
+		-DWITH_LTTNG=$(usex lttng)
+		-DWITH_GSSAPI=$(usex kerberos)
+		-DWITH_GRAFANA=$(usex grafana)
+		-DWITH_MGR=$(usex mgr)
+		-DWITH_MGR_DASHBOARD_FRONTEND=NO
+		-DWITH_NUMA=$(usex numa)
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DMGR_PYTHON_VERSION=$(if python_is_python3; then echo 3; else echo 2; fi)
+		-DWITH_PYTHON3=$(if python_is_python3; then echo "ON"; else echo "OFF"; fi)
+		-DWITH_PYTHON2=$(if python_is_python3; then echo "OFF"; else echo "ON"; fi)
+		-DWITH_RADOSGW=$(usex radosgw)
+		-DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq)
+		-DWITH_SSL=$(usex ssl)
+		-DWITH_SYSTEMD=$(usex systemd)
+		-DWITH_TESTS=$(usex test)
+		-DWITH_XFS=$(usex xfs)
+		-DWITH_ZFS=$(usex zfs)
+		-DENABLE_SHARED=$(usex static-libs '' 'ON' 'OFF')
+		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
+		-DWITH_SYSTEM_BOOST=$(usex system-boost)
+		-DBOOST_J=$(makeopts_jobs)
+		-DWITH_RDMA=no
+		-DWITH_TBB=no
+		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
+		-DEPYTHON_VERSION="${EPYTHON#python}"
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		#-Wno-dev
+	)
+	if use amd64 || use x86; then
+		for flag in ${CPU_FLAGS_X86[@]}; do
+			mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
+		done
+	fi
+
+	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \
+		|| die "failed to remove cmake cache"
+
+	cmake-utils_src_configure
+
+	# bug #630232
+	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
+		"${BUILD_DIR:-${S}}"/include/acconfig.h \
+		|| die "sed failed"
+}
+
+src_configure() {
+	ceph_src_configure
+}
+
+python_compile() {
+	local CMAKE_USE_DIR="${S}"
+	ceph_src_configure
+
+	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+	emake VERBOSE=1 clean
+	emake VERBOSE=1 all
+
+	# python modules are only compiled with "make install" so we need to do this to
+	# prevent doing a bunch of compilation in src_install
+	DESTDIR="${T}" emake VERBOSE=1 install
+	popd >/dev/null || die
+}
+
+src_compile() {
+	cmake-utils_src_make VERBOSE=1 all
+
+	# we have to do this here to prevent from building everything multiple times
+	python_copy_sources
+	python_foreach_impl python_compile
+}
+
+src_test() {
+	make check || die "make check failed"
+}
+
+python_install() {
+	local CMAKE_USE_DIR="${S}"
+	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+	DESTDIR="${ED}" emake VERBOSE=1 install
+	popd >/dev/null || die
+
+	python_optimize
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_foreach_impl python_install
+
+	find "${ED}" -name '*.la' -type f -delete || die
+
+	exeinto /usr/$(get_libdir)/ceph
+	newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
+
+	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
+
+	fowners -R ceph:ceph /var/log/ceph
+
+	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
+	newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}"/sysctld 90-${PN}.conf
+
+	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
+
+	# units aren't installed by the build system unless systemd is enabled
+	# so no point installing these with the USE flag disabled
+	if use systemd; then
+		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
+			"ceph-mds@.service"
+
+		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
+			"ceph-osd@.service"
+	fi
+
+	udev_dorules udev/*.rules
+
+	readme.gentoo_create_doc
+
+	python_setup 'python3*'
+
+	# bug #630232
+	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \
+		|| die "sed failed"
+
+	python_fix_shebang "${ED}"/usr/{,s}bin/
+
+	# python_fix_shebang apparently is not idempotent
+	local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]'
+	grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \
+		| xargs --null --no-run-if-empty -- sed -i -r  "s:${shebang_regex}:\1:" || die
+
+	local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* )
+	dostrip -x "${rados_classes[@]#${ED}}"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-cluster/cluster-glue/Manifest b/sys-cluster/cluster-glue/Manifest
index 6df12241a20b..313a4726af75 100644
--- a/sys-cluster/cluster-glue/Manifest
+++ b/sys-cluster/cluster-glue/Manifest
@@ -1,7 +1,7 @@
 AUX heartbeat-logd.init 954 BLAKE2B b00280f93cb0a3f3f8f19d3170472e87d705f91113fc7d3fe1d0ecf45cb079673c5777acdc8ed3de63fb64848ce0e33e536f86e7dc74c86eb08e7a32da6e12fa SHA512 ef59ad02a608810750cc0241f4d0eb7584624e419f735e0e69b61c2865b68241e9b90a1d817bb838d744d955d9c67708fb89c36df35b17a0f8ef6243904b32c5
 DIST glue-1.0.11.tar.bz2 466057 BLAKE2B 929c9f803814fb1162d4058e0fb78deb96b6be9b4064dae96ea5653521f5dfb862850ab2c9010530ac652264c5e8e379cb397fc173f720d126540405b264ca5b SHA512 35ac8ac555c39f24c11e3a768cc50eba051fe617edf4cdc0429dac73f45a472f144cfe6ec5faff575606f2b04ff76a2f732556d848b61410c2683d93ba928413
 DIST glue-1.0.12.tar.bz2 451569 BLAKE2B c074507563e797f105318bfcfab3e73eb1b62eb3037689c2b68f1b98f02b4a2c1da2e0b2931cd28ccc194d9f3b486733f642c6ff071c4f7629062d40c8d39427 SHA512 d5d2f6c426d2bed0d39269338fedfffe840a90ff56b05dff395243d0d8b803593bf35bbce5f7dce376120cd7ddef78400914cb7515b5451c287a1e9e74233122
-EBUILD cluster-glue-1.0.11.ebuild 2184 BLAKE2B 9c57a15d40690423533910554f2fec8a8205a581c7e7e46600b0f517bcf419e0db3631593d94b21b573d8a9396110beb01ec221477b81598d4c13ae98873a9d0 SHA512 2c413117b5b3a9d81d6a05a382065112ec37840594fcbc0e81cddf65eba270d0b05368ef32fa0954e02ba1487af3de0cfb8f6bdec7aa04af2fff987ee58b5f35
-EBUILD cluster-glue-1.0.12-r1.ebuild 2375 BLAKE2B 7bdab6d8259ac3c135c1b2e133964e0426b1650606c3b9eaa2ad2a43bfe816032420ac810dd85a68c5a4c80f88d8d18ae3fc7839151b01edc566edabf21d01c8 SHA512 8efd9c728121235952879c7c52a79e631b73c47222ac9319be300e1e9106469c51f90860379ee3c3a07ae729ebef781fa308eea5d0b8b83eac48995026146b25
-EBUILD cluster-glue-1.0.12.ebuild 2202 BLAKE2B 9d0446e1822b96acc2d453f9e46faefb00aa3a4151da94350a1abf3c647dbc5dd90977152a6609296fb92c85702f5f4fd423704f2346d78d3cad789152eb1211 SHA512 71e050af1e1ba946cc30f4c2da48bd372da560ff8a2ba8f0dd7292d6c13ecb482fcd17083f217131291e3358292b82e5e5c8b780776094a11ea4055f2f5be40b
+EBUILD cluster-glue-1.0.11.ebuild 2113 BLAKE2B 8dc1bd4c5cd71e5e6712ab2b5b0e044487aaa9db5e112d0e4af0b66d8ec93f4580095663e6cdb9bb12e1aa84f0b38e0ab802455457a8197183aea7d277834827 SHA512 77fbdc419d3fa5f0bd5341ff1065a58bc697d18499543b251db84b47c4daa4aeb6583898361ef455b967d136a4a34f5551badbdc2369d45cd9a452bea463f3b6
+EBUILD cluster-glue-1.0.12-r1.ebuild 2307 BLAKE2B 12d94da7b4cb01d1b29a670bf98e8b02abab5d56b0f9367732a54b5c3a92d0617b8a63dd5ae6c32747c7fdace95231a12145110997af7bae23a9d265da31bf1c SHA512 471edc53ee595f69aeaca577a7103893062a5551572be1ae42aaec170c159db4ec840af52e239251b3c53802598defc0b32bcaa3aabe2ca4a12a3aba42c9e481
+EBUILD cluster-glue-1.0.12.ebuild 2131 BLAKE2B f877b452e9296d9914b37fb3d16e8797a5c35d7eb45fee2ba737bdd31160f7dab0ac8969baed276f84dac3d651fe2eb366ae170d411b340c734ee31cf3d252c6 SHA512 5ecffdf46d0e0225d215aec183147db77c00dc3985d0bf7402c730a02a389f47f166612e2f79d6c5f30cc95e536cf6b0aab6294a1e8e4770a10ac309342f1c43
 MISC metadata.xml 582 BLAKE2B 5792be1499f85328ff85ec074189187e014c2eadf29b4ddaf4a64c71977ccf5ce91d86f251fe90f3540a7cfab8d52145cd5c085199c6e1099df5dbe801fc4291 SHA512 a2312279ff8e3e47db3d1a560699d76233dae3963cc094aefbbe965af053fe4299e95133d5f40aa69a565c91c21ce9d358020726d3c8c590255dcac72901d7e3
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild
index 1b4e7d2933cc..0e3f3bd34d57 100644
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -54,8 +54,6 @@ src_configure() {
 		$(use_enable libnet) \
 		$(use_enable static-libs static) \
 		--disable-fatal-warnings \
-		--disable-dependency-tracking \
-		--docdir=/usr/share/doc/${PF} \
 		--localstatedir=/var \
 		--with-ocf-root=/usr/$(get_libdir)/ocf \
 		${myopts} \
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
index c067016843b1..ad8181b8ecbb 100644
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.12-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=6
@@ -61,8 +61,6 @@ src_configure() {
 		$(use_enable libnet) \
 		$(use_enable static-libs static) \
 		--disable-fatal-warnings \
-		--disable-dependency-tracking \
-		--docdir=/usr/share/doc/${PF} \
 		--localstatedir=/var \
 		--with-ocf-root=/usr/$(get_libdir)/ocf \
 		${myopts} \
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
index 55d62dcee077..a5c87c155c04 100644
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -55,8 +55,6 @@ src_configure() {
 		$(use_enable libnet) \
 		$(use_enable static-libs static) \
 		--disable-fatal-warnings \
-		--disable-dependency-tracking \
-		--docdir=/usr/share/doc/${PF} \
 		--localstatedir=/var \
 		--with-ocf-root=/usr/$(get_libdir)/ocf \
 		${myopts} \
diff --git a/sys-cluster/corosync/Manifest b/sys-cluster/corosync/Manifest
index 644722fa646a..4823d1c91fab 100644
--- a/sys-cluster/corosync/Manifest
+++ b/sys-cluster/corosync/Manifest
@@ -6,6 +6,6 @@ DIST corosync-1.4.7.tar.gz 420596 BLAKE2B 7818b1d58f2ce743b990fd275908d0b72a63dc
 DIST corosync-2.3.5.tar.gz 428253 BLAKE2B be9fc2b27b60357acee6dee013bc95c08045c114acafc62eaa82a1821f07ff76b8821b9d06f31246b9978f8aef46e3a9e1a2d61ca74465bc74d4140c0ad0d0fa SHA512 212a95d8a68a2941f27c9ec22750a88598744d6fd4db6b46abe0b4cdfa988d3906f760bdf67c403d8c6d0a04da64f29ec744fb68ca51c7269ba58e306553cee9
 DIST corosync-2.4.2.tar.gz 547204 BLAKE2B 1b440e84b25263ea866bd66f9837a3bdbbc790d26a38d10a033d67bb0ba48dd58d6b515879dd0ece75ffe78c8a150c1e5ab8d0eb312e701abdc36eb5cb4dc520 SHA512 45a4d2570d5d096e6f42070f701fdb2aaed26812b6a75f73ea415cf409b33343f8bc090b4fcf851ab971ca4b17925f239c31a3d9eafe4841dfbeb56537b2c78c
 EBUILD corosync-1.4.7.ebuild 1388 BLAKE2B a831d2b50bef790120138c1125fca8356333d88d249c30e0b4ae4e9dc802a5f5d91e2eceda59568c936c9b400dd9acfbda055db60b1172b7d0ce9683cc3ec61f SHA512 1afed4ea8c3e3d719dceaee3c261151108b852232c4c0b4235b9b65df09b96c545c983e8a7762956535cd66d5b12f275f570a0d51374e02daf70eea9b9ea74c9
-EBUILD corosync-2.3.5.ebuild 2052 BLAKE2B 884a7252bfa4d6295957bfb9d23e40a545f82e4c749f6905b1cf9dac97c215e3c84eeb3d185e6ab2cbc4c082052a9a18f2d95fc2d97fb8cf29cdcfa0077ffa72 SHA512 8415aec44086036714b824be3285cbee49a5c3987771ac04c971b3f9f0f0b09a045775c2095d6044357d76b7c44d9c75205f27a109596dd6586cc5f4fb67984c
-EBUILD corosync-2.4.2.ebuild 2015 BLAKE2B d9f795ea7681c0151a679fb112a37d21ae466568be0771e055aa814ce8d2935213c391ff46bd8a87034f6b0ec8eb6e28f6961a1832124ed38ccf3df13ab9372a SHA512 ff992052dc4e7c704f48e4835883954296126ae8f0f06969170171786ac8563405340741fd708a36216aa3ed69b3c34f51bfde5725571b85155868da49de3d6b
+EBUILD corosync-2.3.5.ebuild 2015 BLAKE2B 446cdab62136feed7d66a505c7496b21e669a19f167402e6f8005a633310fd96bcf71953b0cba37c4fabcacd1c77e9eb74b9d460d4452293406a4c51b2602879 SHA512 53567910d981004f1191afccfba9e1c43e4e7ebc0d55f8128b47fa1fce7cabc22148a373937ff9347146a9172ac6df2de2ab7e8d9da3d80b36c4551ca6b0396f
+EBUILD corosync-2.4.2.ebuild 1978 BLAKE2B 1eeb5668e67c1bd8160050a6cb4389e42ec673685f918e716fd95f0b071996172ce2c3d6fac5e9d698d83aad307f3be819c82424a5bd35c83475185485bed34c SHA512 617aba212b7299fe6bb68f87602907a697c316cc80ba95f09460c0103469343fc7f3fcc3b1d598a0532dfd8608ce8eb91ff4db6e18c8dbda486aef0bf35ea18f
 MISC metadata.xml 447 BLAKE2B 660930ff9e96851aa0272fafb5547be824e424f9d866e58a13699608eda86c9c45533218d6c1647028bb1c8e5bb6e738087b8ad8f7ddbe7ae94a2ea9eb47ec47 SHA512 9897d127e1d47ee58213ea00d4ebdb536e2316c13633331194ac118ec5a2e782e515a6f1ccb01cd7eafae34bfb032fc2c9ea61a549b9da34bc3e96a988457d03
diff --git a/sys-cluster/corosync/corosync-2.3.5.ebuild b/sys-cluster/corosync/corosync-2.3.5.ebuild
index 089004f78b9f..3e4bf6a0f565 100644
--- a/sys-cluster/corosync/corosync-2.3.5.ebuild
+++ b/sys-cluster/corosync/corosync-2.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -48,7 +48,6 @@ src_configure() {
 	# FIXME: install just shared libs --disable-static does not work
 	econf_opts=(
 		--localstatedir=/var \
-		--docdir=/usr/share/doc/${PF} \
 		$(use_enable infiniband rdma) \
 		$(use_enable systemd) \
 		$(use_enable xml xmlconf)
diff --git a/sys-cluster/corosync/corosync-2.4.2.ebuild b/sys-cluster/corosync/corosync-2.4.2.ebuild
index be1d2139373a..49840bb0216f 100644
--- a/sys-cluster/corosync/corosync-2.4.2.ebuild
+++ b/sys-cluster/corosync/corosync-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -44,7 +44,6 @@ src_configure() {
 	# FIXME: install just shared libs --disable-static does not work
 	econf_opts=(
 		--localstatedir=/var \
-		--docdir=/usr/share/doc/${PF} \
 		$(use_enable infiniband rdma) \
 		$(use_enable systemd) \
 		$(use_enable xml xmlconf)
diff --git a/sys-cluster/fake/Manifest b/sys-cluster/fake/Manifest
index 029c3fdba68a..455791c6d704 100644
--- a/sys-cluster/fake/Manifest
+++ b/sys-cluster/fake/Manifest
@@ -1,4 +1,4 @@
 AUX fix-ldflags.patch 364 BLAKE2B 7f4c99a1ce9a6ce1a8a51b57a473c89ca2e08c9aaae95516d9e85bc3021ee9b4889ac04823a9df7597ae4c72f78346de88631e25695474c44a04cf99a2d02b54 SHA512 f845e3e176260983dc2567a3de76519ba85611ffabdae84f5c5c542e73352b51d52b8b4361e7c2a100e4bffa42bd8a4a2eb5ee257d841c1de39c811e16fef2ef
 DIST fake-1.1.10.tar.gz 137697 BLAKE2B 7a9124f776671a9de40c67af3ef87f7c32c33fe086893f63ea5b073a00c3b31cb81fe9df77d0d8fbf8660edc79fbba476843f3211affc21cae0f22792866709d SHA512 f8971d164d5b41ed34af7c08cb90f68bb1d1331f402b2ad2c39d459f60a64c7b9abfa7d011618d7efadeda3022d837c30b15fc540e020b423166f6829585d298
-EBUILD fake-1.1.10.ebuild 602 BLAKE2B a2dd7138b238342ad49b28e3fe4a701cdc0d4c8a5c1ab487e85767c18ef4670e8ee44c62b264719e960e60d78fdae96054c5f5b566c80557bb5cd426ab26e4f9 SHA512 b9755487ba341dd0aab0f65e89a10799c9292b62a9789bfe2587664dc7dfe1bca44d6fd966ebe140977ded1b34f960932d640aff29d2a20ed3ccf4b44c968675
+EBUILD fake-1.1.10.ebuild 603 BLAKE2B 4967fdeaa916576f828e08b5d0bc9306704267c20175db1702f76495e4303ddda35d9aed730b98ce3e3d37faaa03a125d7d8c15771dc9ce6d3762f75af416d15 SHA512 7568e0155d4dd88c118a0e7c5c13e65dfbb1a58d324b53d74f59546e190720ce034c9546a0b68faf556bc2b1d75500dc151f494a54eb0074ab2999647b21d851
 MISC metadata.xml 710 BLAKE2B 4fdbf39bf3dfbf542a9386e143357ad88ca0e2efeda296ed4bdab93906623aa8d994cc28d9120b353acd6e73fe6af9425214221c6c3dfe112d0fd6c1e39cb827 SHA512 e6c1b78be31839ac8db3570e98375a13eddd33e4cd43945f5f5e1094cf07f47cc7754d44fbeeb2cf0e613da228d00e80bba2ea5984e3a20eab891d8d68766276
diff --git a/sys-cluster/fake/fake-1.1.10.ebuild b/sys-cluster/fake/fake-1.1.10.ebuild
index 3f960e577b00..1a738649c602 100644
--- a/sys-cluster/fake/fake-1.1.10.ebuild
+++ b/sys-cluster/fake/fake-1.1.10.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
@@ -21,7 +21,7 @@ src_prepare() {
 	emake patch
 }
 
-src_install(){
+src_install() {
 	emake \
 		ROOT_DIR="${ED}" \
 		MAN8_DIR="${ED}/usr/share/man/man8" \
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 3dd106b561ba..2c43d32ba904 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -12,9 +12,9 @@ DIST glusterfs-4.1.8.tar.gz 7835272 BLAKE2B 2546b9c0fe38989df71b8f72b193ce42c499
 DIST glusterfs-6.5.tar.gz 7536238 BLAKE2B 35c58da9e8564bda1f34b095f14316148cae2b5ff1820d22ae945a06d34ac57aea968e5914af3f5831250fd591a103fe4022e160bb96d491a7c915b5b68c54e7 SHA512 b7356de07e8126aea80b0489b9ac39ce0d10ea324fe38d05ff5740765e886f80fc7e6bdda9d4db1371d7b955b055cb76ea29e918e759a575db331a6436bad90f
 DIST glusterfs-6.7.tar.gz 7565257 BLAKE2B bb38383cad0cbf890b89dd75f7b260d21b381aed6da0bf7cf7b3335941d8e195fe5ff60a1c882df941daeb8ad627fddd1a44223c62d71e2388fd85a7ea46a386 SHA512 64d576c91e5accdb3547dc7216d854e96512c9035ddb87dc4018930f2b0a008ad929cd80ae89a340fca7a8d36e2106a30797d7b08768477b1415db95123e07d4
 DIST glusterfs-7.2.tar.gz 7630773 BLAKE2B abceafd06ca8f5de1c84708a1a3ec4453c5d536d8811b773fa6f5dd02d6e3d450c329bc4d0fa32d970ff57e82a1fe3aa48ec9c3a7d3d5ca5817a91e8930b1b6e SHA512 fd1059222c4d30fa5c4011083c3c53af44433180ae124c884a774628051d31d95386bef71d4d25ed2b0c5dd8d9a6936601e8e37d963b34d291cb88ea45e31ff2
-EBUILD glusterfs-4.1.8.ebuild 6785 BLAKE2B 1daf6faa219ec1c64fe661f068aadd6d7735c029f2692cba1f4ce84abe40a7f2defa29bcdbe84f962fc59b805124c5d252be2909afb946e086bc52a3137d347d SHA512 d0a7aaec14523e68ed676ef461bd59ff73de94e40f197a64d9a24b71a98949915327b7732637a57b6138e8171b402d851969732fda9039a255ac9696aa554976
-EBUILD glusterfs-6.5.ebuild 6223 BLAKE2B a708adff12d8467555d22e8652bfc30ad538a00b9ff0bbb3e0379ec9eaee1dc41d6b00432ab63ad0e4fea9c181ec8fd17a6d7013c82410ca7f31b484a171f4cc SHA512 2c2a011e1e96e07a057f04e16a0296f93ffce38aa25c87312682f3f605c66ed3a9fb7c528c86eb11163249ebeb7080acc03eef7c151aa85f587b1a29e67acbb2
-EBUILD glusterfs-6.7-r1.ebuild 6484 BLAKE2B 8fe0924b0de96f68c70becf17ee2ffeb094f3e00d14ebcb527efc45aa251f59961a255de9039e502480af601e71acc110ebb173ef3a403197b99ab1a0ad0b2e1 SHA512 c20d29404d857d0bd12e822e374c5b29adede828098ac0bd692f70fda52d51d172edf054e437bcf52a5bff2b2d77ac2218c1b66518693ba622ed9b740811099c
-EBUILD glusterfs-7.2-r1.ebuild 6366 BLAKE2B f2b859dd7fc0c3f278943918b8e75d31a42045b03cc1f09aa104799371f727254ffc9e3c6831005f5f4b1cef1de3e25fc3dbedb6019f3b3cddf69f297f9fd4c5 SHA512 4cac260a0b364dfe051dceb9acfac86b84e24aef5a28c63c9b53fcda233e2dd158a185f48c3bcbcb3033ac109727eea0c9cc70b36c8f20a28f1594aa57133e8f
-EBUILD glusterfs-9999.ebuild 6789 BLAKE2B a803818430d7faca876f1db48f7082fba1560a9fc539303a1ec7b8154ba0b43716a76f415ac11fde898780afac2469d7b73c28115a6b2a832c1cea8486874ff0 SHA512 3355f1533d7a3a8e8b9ad437c077172a0285e2d0911fdcdf8efab75ab65785671699a26d744ed62cd4f1487678353fe7ccfda55496bd72f209a542dd6a60b0ae
+EBUILD glusterfs-4.1.8.ebuild 6678 BLAKE2B 82e3dc30bfa0b5b883eb17e6ec2f08e0c7f0f4a15f04cbaefe7faa3c3a0d0f42469961c5ee51b807531625d4ff900ae59e3b5d6c835be19877a150556314b804 SHA512 487e8612765bf23c445563fd731aa59aa55fd6bc237720505875f456ad742c95026c2283c1a9cc08d5119d6faf676b8f2d45256a5a4d564e538735dba043b43a
+EBUILD glusterfs-6.5.ebuild 6116 BLAKE2B df48f2df594255aa196477ec76a296b9912b0c4bfd5a6dd10276098b58fa9355e4c35cabfa0bdf7d5e85967dd191208d6f2de3cc2f3b428eac3faa80c0ee9c58 SHA512 3d44b94f1b75bfcf5460a0b00b0cf1e557e468dd3baed07e08a21d29238703d4a40743201485a2e117852c05ac46d48d09349cebb2d35d22596debf2a795e5bf
+EBUILD glusterfs-6.7-r1.ebuild 6377 BLAKE2B 9b6e89a54e32c74498c7731b82edc47c7855fd686f1d714978000ba7704505d2ca3cc603c7dc79fca17876cbb1e3063b7454d406d28e37752a7449ad66d19767 SHA512 9ddef2dd1443e5340d64dea96ec99c98ee4b2bbf78ff16878e58f9f509530134344e26cb08636916de3d83d8c024e48cd64bcf5a153219785e37dae288019a2a
+EBUILD glusterfs-7.2-r1.ebuild 6259 BLAKE2B 30903cd572631cf7dcb6a9eb2fa882d015e5f4f2801c8ae23f2e7e74d6172678ed01761240a0b0fbd74870e8f8d6d14cd173e6612696b6a964eec33259488a7b SHA512 342a661bb98e013d7b9a407aeb5e545fca24763e1363e92b958871e60245f598304a2ba8ab855afdeffeafa6790fa1ee5160f512ee8bf059a9a78128636604e1
+EBUILD glusterfs-9999.ebuild 6682 BLAKE2B 74804f0808c09e50f19258095f94a9fba8287e7a8780c3ff04ef61d6e5e08b7756d65bdc02866ab747caf1b73b0bdd4050927365d3321af7c30267618392f525 SHA512 b013cf5f46d844c68e5e28e37e1ca208766038b5574f5057e43056b740efa638c5a10cd5fd993f49396f9284d54d3bc95a894311ec30ed5a88678d283119f71c
 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 f228f9636ade..351790fe5a70 100644
--- a/sys-cluster/glusterfs/glusterfs-4.1.8.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-4.1.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=7
@@ -102,8 +102,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--disable-dependency-tracking \
-		--disable-silent-rules \
 		--disable-fusermount \
 		$(use_enable debug) \
 		$(use_enable bd-xlator) \
@@ -122,7 +120,6 @@ src_configure() {
 		$(use libtirpc || echo --without-libtirpc) \
 		$(use ipv6 && echo --with-ipv6-default) \
 		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--localstatedir="${EPREFIX}"/var
 }
 
diff --git a/sys-cluster/glusterfs/glusterfs-6.5.ebuild b/sys-cluster/glusterfs/glusterfs-6.5.ebuild
index 87b3e519ab27..895462bd41ab 100644
--- a/sys-cluster/glusterfs/glusterfs-6.5.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-6.5.ebuild
@@ -92,8 +92,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--disable-dependency-tracking \
-		--disable-silent-rules \
 		--disable-fusermount \
 		$(use_enable debug) \
 		$(use_enable fuse fuse-client) \
@@ -106,7 +104,6 @@ src_configure() {
 		$(use libtirpc || echo --without-libtirpc) \
 		$(use ipv6 && echo --with-ipv6-default) \
 		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--localstatedir="${EPREFIX}"/var
 }
 
diff --git a/sys-cluster/glusterfs/glusterfs-6.7-r1.ebuild b/sys-cluster/glusterfs/glusterfs-6.7-r1.ebuild
index d36a647109cf..210f6b936ef1 100644
--- a/sys-cluster/glusterfs/glusterfs-6.7-r1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-6.7-r1.ebuild
@@ -99,8 +99,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--disable-dependency-tracking \
-		--disable-silent-rules \
 		--disable-fusermount \
 		$(use_enable debug) \
 		$(use_enable fuse fuse-client) \
@@ -113,7 +111,6 @@ src_configure() {
 		$(use libtirpc || echo --without-libtirpc) \
 		$(use ipv6 && echo --with-ipv6-default) \
 		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--localstatedir="${EPREFIX}"/var
 }
 
diff --git a/sys-cluster/glusterfs/glusterfs-7.2-r1.ebuild b/sys-cluster/glusterfs/glusterfs-7.2-r1.ebuild
index d122e64c2265..a70a74de42e4 100644
--- a/sys-cluster/glusterfs/glusterfs-7.2-r1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-7.2-r1.ebuild
@@ -96,8 +96,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--disable-dependency-tracking \
-		--disable-silent-rules \
 		--disable-fusermount \
 		$(use_enable debug) \
 		$(use_enable fuse fuse-client) \
@@ -110,7 +108,6 @@ src_configure() {
 		$(use libtirpc || echo --without-libtirpc) \
 		$(use ipv6 && echo --with-ipv6-default) \
 		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--localstatedir="${EPREFIX}"/var
 }
 
diff --git a/sys-cluster/glusterfs/glusterfs-9999.ebuild b/sys-cluster/glusterfs/glusterfs-9999.ebuild
index 4daba19bc765..544b9e693be5 100644
--- a/sys-cluster/glusterfs/glusterfs-9999.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-9999.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
@@ -102,8 +102,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--disable-dependency-tracking \
-		--disable-silent-rules \
 		--disable-fusermount \
 		$(use_enable debug) \
 		$(use_enable bd-xlator) \
@@ -122,7 +120,6 @@ src_configure() {
 		$(use libtirpc || echo --without-libtirpc) \
 		$(use ipv6 && echo --with-ipv6-default) \
 		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--localstatedir="${EPREFIX}"/var
 }
 
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index 897b9d92c7ec..42639be1ab06 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -2,15 +2,21 @@ AUX kube-apiserver.confd 116 BLAKE2B 2cf2dff516674ba4dc0763985a070b75e23f9af51e7
 AUX kube-apiserver.initd 541 BLAKE2B ddddc86735a9f90a0c232f2631ac21c028045783c737d041a808fb5012522844614a40059524c472b9b50fd077253b75e2bcf33d69518d71428fcb7e27143fba SHA512 2863ad6d1d238b5e9557874cd3f5413108ed9424604cf026e2fd8c2fd66ba867ca9a3d98f67fdac54f335bacddf0479547b28f71aaa1db6580beff49290de110
 AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511a4623f85f01830c5e40d4ad4e44fe0b3f90d4143042d82bd83b0a2b11517e89037755ef2ad7afeeb23401bb60 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e
 DIST kubernetes-1.14.10.tar.gz 28106613 BLAKE2B 7ccb89c1390299a224a766a8004b4bfc95adb244ca93a2d7086ab0de76cfa6eef9b51cb35dfdabb9d429fbc1a7c0d06cbeb93cec979a8f15f5586cee90c2b5e5 SHA512 25ecc7bf737e7cbac6405042ced98ccf824ee9a59f290906b76594ab8742028a5b783e892a5b3a03b59a758641f2fe3dfe6a83d72c603103ec7ab0696e406dfc
+DIST kubernetes-1.15.10.tar.gz 26689433 BLAKE2B 5648bf9e6b4738393c735a00baec25e144e278c219c0c906a6a9b209896ce5dcb1411d58bbc8e9dd04f4f9312f7052b5f28eb4f2047406547de69a083fc4db19 SHA512 48c069d88a0111072ac02aed0760bc34ae44fbb5140489a837f089a6c944b5fa18f95f4bcc4286ca1fdfd6cd25e7bd0ff99c3b21373a1d70d3a0f70d352d4ed8
 DIST kubernetes-1.15.7.tar.gz 26671514 BLAKE2B 7ef6f92ea90fd8f45f250dfa4e081a171ad76c72f4eae4b4e901cb8335259779b7546ac31f97eb2a45daf85f49fdd4408577b96a1e0fd750a5509eb0446bfa8e SHA512 a0fb9dca9b6993ac828427589f4e03e9431b97c2ce153cc00a6e5b669dced05bfe236f2ecb85b623359b4e910c662dc473cd3226dfc4e85bd2551fbabbdfc836
 DIST kubernetes-1.15.9.tar.gz 26683313 BLAKE2B e8faaf32bda63dd0ac25670cd96a4a04ac7d1e5151855c9b41bca8d85ae3afadd55f85079b122282f9726386f42898878571072af9326e062062b68c8dfc4e10 SHA512 f60b2e78cd5afee4c5235af37738bed954fd792dfae8788972104bcc79bd2461a8a706f93b3c48f5353610650b6600ebd7197df03aa480ca0fd68fb4ac26278f
 DIST kubernetes-1.16.4.tar.gz 31220590 BLAKE2B 3ee3ab50f2a10c419b99f7f25072ad7b129741829d241ad788b343e5bd30ec3c9b07053755a2ec650227c0d26ae34f3d1d101cfd50ed6b16b3415a8233c8e4c0 SHA512 84768ffe3d4147082b3b151c7787498a78ee0e6aee537f5fb21c8e0e30e72b222d68942389063e8fc2a549aec423fc84a9696b3b70b9ae746a2b87a2f47297de
 DIST kubernetes-1.16.6.tar.gz 31714463 BLAKE2B 050897d4308a31d5164a907766af4f952d6551fba7e503bf7def78db37d017a3f5bd7a1c54125e42f9adeb850e6e38ef4ac9a98af978faf2efc4a474323b9f43 SHA512 2e1ca5781842ccd32f6e9791d069e9838a6221be3c4018abc06517cf97517bb500a6fafd7ae346088430f60c3e1dcbb983842572b9ed3241b70467dc1941e4a1
+DIST kubernetes-1.16.7.tar.gz 31722167 BLAKE2B 4792fec43d5921086dc78fc46d9d38554bc710bfb1a29928fd962fc0940946d4a4c1cba1ca86e999ebf2e1064bbeb011c9c6e464fada90c8a3e52a0cc2984977 SHA512 dc7d9180dd120418964e2fcc57105c9c3ba9b79abfdf357ca3ecd3c41468100b89e63b82ab6658b423c730ac2f229bf5eacca0321896b0739963fbc18343d765
 DIST kubernetes-1.17.2.tar.gz 31753827 BLAKE2B de92f1e0f087115691b5ce057a07f4b46a4410714ad9164801c0390190bd8e29f8aa6e79d0d8b816669770feaf229932df04c48792ce11e77e8c682db54f28bd SHA512 64c45967e6a85943fd3f62f82e0d51001bbeb04ed8ccbe376ad63989f4a888f838bc17d1d0942e8c857118781703a6cbd3336bff1f3ae5269f808b5d9b4d11bd
+DIST kubernetes-1.17.3.tar.gz 31762013 BLAKE2B 4470fadf2ec441ed7a5f3a82581af6a0f4d768780048576863b2aae9c13cff543592da73b979c7f9191a4c7c2b5a1ad10d85e0eba04fdcd08ece86884ab1f80d SHA512 09b33377de0bdd7dc8ac2ae81196d15eeb93862cb0aba1256bcfca38d2ce1f15951ad70cf67600fc3d16c1d449e0451707e756ec21ad812c6628ae1f0fdda427
 EBUILD kube-apiserver-1.14.10.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
+EBUILD kube-apiserver-1.15.10.ebuild 1285 BLAKE2B 0c7156f9f7a749245968622fa4658a42d9efc015264f7928fa9ca37fb4afc24ed8e8ae700de243280593a92513b6e12db0010c27bd61a679c929a132e13c2bd5 SHA512 bf596f678053dc89f968bd44a149c214d9e177a32a8fe8f4726494fbe15a5e4a3bc111de4b85e2b23a3a0ffa1d08a36b52e7a32151c4562fb94a11224bf7385a
 EBUILD kube-apiserver-1.15.7.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
 EBUILD kube-apiserver-1.15.9.ebuild 1242 BLAKE2B dc4869a153bbcb5d13a60f30c4891ed6620b0f8a9c460028d59b97654917c5321e4ed0db5703f0d3604b0603afd6e470aea8a17c753f92d456a1131ed106a72a SHA512 e0645238dc6b36c30f14267bad72a85e830b54cc8de06a21d282a588702145d64a5115ec74f4365bf12edf1f745e5913119209f186c3750d04c174eca6a9cdac
 EBUILD kube-apiserver-1.16.4.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
 EBUILD kube-apiserver-1.16.6.ebuild 1242 BLAKE2B 5fbab1370488aaa4703ced149410e9c6e112e8bd6ba8588c02eb9d943a25e4f3cdd218a89ea467b44fc2ae8917429b949f14c3a8e9bc0228f676b5e5adcdf856 SHA512 22f1ecaece5e97485d07b8ef6ae6e892e56293b086763371fd293be900dc01446fe46e42d6dfc1d952e7ea9fb5a8daac4d785f05be63b5b2e3232d2c85d078c3
+EBUILD kube-apiserver-1.16.7.ebuild 1285 BLAKE2B a59f7298262739cccca6a7645ba1cd27124ae9046f04591b2f5b11d8041620758211898827311579862528eea0764a53a4d8738d21d6d76613bbbcebfc46d794 SHA512 2e5acde6f1629e20cb46832ddf2531dfe4b9211ea19dc1ea2e8cde6e46fcac3aa6b6a76ad3f2358d1595adc47b7b749b9d94af8dea3750ffccaa3e200419b640
 EBUILD kube-apiserver-1.17.2.ebuild 1126 BLAKE2B 671e10c4dd12456049f4726ceadc7252ff433408c1360cd8a82413bd828902d45b9e6a80ab4afac5b4b83c6c3c349f2e7bad18fce578184dde7fc6086915b616 SHA512 ab0bf7873d6ed45cdeb8f482d463ee93c7ecf0b4f6a5245b37ecdd2c4f7a0f9c4c85f66e0fb83b12e8debc59d92e337b8289cf953dec9fdbd0fc7cf2b254e440
+EBUILD kube-apiserver-1.17.3.ebuild 1126 BLAKE2B 671e10c4dd12456049f4726ceadc7252ff433408c1360cd8a82413bd828902d45b9e6a80ab4afac5b4b83c6c3c349f2e7bad18fce578184dde7fc6086915b616 SHA512 ab0bf7873d6ed45cdeb8f482d463ee93c7ecf0b4f6a5245b37ecdd2c4f7a0f9c4c85f66e0fb83b12e8debc59d92e337b8289cf953dec9fdbd0fc7cf2b254e440
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.15.10.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.15.10.ebuild
new file mode 100644
index 000000000000..fc7b99f1b89b
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.15.10.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 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 API server"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+COMMON_DEPEND="acct-group/kube-apiserver
+	acct-user/kube-apiserver"
+DEPEND="${COMMON_DEPEND}
+	dev-go/go-bindata
+	=dev-lang/go-1.12*"
+RDEPEND="${COMMON_DEPEND}"
+
+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}
+	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.7.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.16.7.ebuild
new file mode 100644
index 000000000000..c3b882854d1c
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.16.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 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 API server"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+COMMON_DEPEND="acct-group/kube-apiserver
+	acct-user/kube-apiserver"
+DEPEND="${COMMON_DEPEND}
+	dev-go/go-bindata
+	>=dev-lang/go-1.13"
+RDEPEND="${COMMON_DEPEND}"
+
+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}
+	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.17.3.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.17.3.ebuild
new file mode 100644
index 000000000000..fc16ab15524f
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.17.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="acct-group/kube-apiserver
+	acct-user/kube-apiserver"
+DEPEND="${COMMON_DEPEND}
+	dev-go/go-bindata
+	>=dev-lang/go-1.13"
+RDEPEND="${COMMON_DEPEND}"
+
+RESTRICT="test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" emake -j1 WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	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/Manifest b/sys-cluster/kube-controller-manager/Manifest
index 9ca4dc79db84..c943d3715fbd 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -2,15 +2,21 @@ AUX kube-controller-manager.confd 142 BLAKE2B d8d35c62bf5c04cc3f440e8b5fb8acab2c
 AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544f214921672e60fffa2d6f77dbeb1912b3d1d138f867d8118cef5ae0843b75d3859ebfc71a4defc2b4cf66426a58101 SHA512 7e3baab9b034e7048ed3cda8d09444c76369874cecc0a747fb5484c482fef464adb5ccc25fcb4481fb4aff68415a60462f6cbee2138810316f0cf822637676c1
 AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
 DIST kubernetes-1.14.10.tar.gz 28106613 BLAKE2B 7ccb89c1390299a224a766a8004b4bfc95adb244ca93a2d7086ab0de76cfa6eef9b51cb35dfdabb9d429fbc1a7c0d06cbeb93cec979a8f15f5586cee90c2b5e5 SHA512 25ecc7bf737e7cbac6405042ced98ccf824ee9a59f290906b76594ab8742028a5b783e892a5b3a03b59a758641f2fe3dfe6a83d72c603103ec7ab0696e406dfc
+DIST kubernetes-1.15.10.tar.gz 26689433 BLAKE2B 5648bf9e6b4738393c735a00baec25e144e278c219c0c906a6a9b209896ce5dcb1411d58bbc8e9dd04f4f9312f7052b5f28eb4f2047406547de69a083fc4db19 SHA512 48c069d88a0111072ac02aed0760bc34ae44fbb5140489a837f089a6c944b5fa18f95f4bcc4286ca1fdfd6cd25e7bd0ff99c3b21373a1d70d3a0f70d352d4ed8
 DIST kubernetes-1.15.7.tar.gz 26671514 BLAKE2B 7ef6f92ea90fd8f45f250dfa4e081a171ad76c72f4eae4b4e901cb8335259779b7546ac31f97eb2a45daf85f49fdd4408577b96a1e0fd750a5509eb0446bfa8e SHA512 a0fb9dca9b6993ac828427589f4e03e9431b97c2ce153cc00a6e5b669dced05bfe236f2ecb85b623359b4e910c662dc473cd3226dfc4e85bd2551fbabbdfc836
 DIST kubernetes-1.15.9.tar.gz 26683313 BLAKE2B e8faaf32bda63dd0ac25670cd96a4a04ac7d1e5151855c9b41bca8d85ae3afadd55f85079b122282f9726386f42898878571072af9326e062062b68c8dfc4e10 SHA512 f60b2e78cd5afee4c5235af37738bed954fd792dfae8788972104bcc79bd2461a8a706f93b3c48f5353610650b6600ebd7197df03aa480ca0fd68fb4ac26278f
 DIST kubernetes-1.16.4.tar.gz 31220590 BLAKE2B 3ee3ab50f2a10c419b99f7f25072ad7b129741829d241ad788b343e5bd30ec3c9b07053755a2ec650227c0d26ae34f3d1d101cfd50ed6b16b3415a8233c8e4c0 SHA512 84768ffe3d4147082b3b151c7787498a78ee0e6aee537f5fb21c8e0e30e72b222d68942389063e8fc2a549aec423fc84a9696b3b70b9ae746a2b87a2f47297de
 DIST kubernetes-1.16.6.tar.gz 31714463 BLAKE2B 050897d4308a31d5164a907766af4f952d6551fba7e503bf7def78db37d017a3f5bd7a1c54125e42f9adeb850e6e38ef4ac9a98af978faf2efc4a474323b9f43 SHA512 2e1ca5781842ccd32f6e9791d069e9838a6221be3c4018abc06517cf97517bb500a6fafd7ae346088430f60c3e1dcbb983842572b9ed3241b70467dc1941e4a1
+DIST kubernetes-1.16.7.tar.gz 31722167 BLAKE2B 4792fec43d5921086dc78fc46d9d38554bc710bfb1a29928fd962fc0940946d4a4c1cba1ca86e999ebf2e1064bbeb011c9c6e464fada90c8a3e52a0cc2984977 SHA512 dc7d9180dd120418964e2fcc57105c9c3ba9b79abfdf357ca3ecd3c41468100b89e63b82ab6658b423c730ac2f229bf5eacca0321896b0739963fbc18343d765
 DIST kubernetes-1.17.2.tar.gz 31753827 BLAKE2B de92f1e0f087115691b5ce057a07f4b46a4410714ad9164801c0390190bd8e29f8aa6e79d0d8b816669770feaf229932df04c48792ce11e77e8c682db54f28bd SHA512 64c45967e6a85943fd3f62f82e0d51001bbeb04ed8ccbe376ad63989f4a888f838bc17d1d0942e8c857118781703a6cbd3336bff1f3ae5269f808b5d9b4d11bd
+DIST kubernetes-1.17.3.tar.gz 31762013 BLAKE2B 4470fadf2ec441ed7a5f3a82581af6a0f4d768780048576863b2aae9c13cff543592da73b979c7f9191a4c7c2b5a1ad10d85e0eba04fdcd08ece86884ab1f80d SHA512 09b33377de0bdd7dc8ac2ae81196d15eeb93862cb0aba1256bcfca38d2ce1f15951ad70cf67600fc3d16c1d449e0451707e756ec21ad812c6628ae1f0fdda427
 EBUILD kube-controller-manager-1.14.10.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
+EBUILD kube-controller-manager-1.15.10.ebuild 1311 BLAKE2B 110f383313870a7be68474bf227948e9d974051011681427d7959e35d67fa4bccb50cce1375db7dbb64e5466dcf50fecf74225686100515989fbb01d6ab1bf73 SHA512 ca002dd605ac00c82357fe74621c988ec4eb1befabf0d29b159e2a7e64ae8d03738ad8577728a9c43530f1bc2dadbf50e689c19e0d400cd3bf8f3e772115f29d
 EBUILD kube-controller-manager-1.15.7.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
 EBUILD kube-controller-manager-1.15.9.ebuild 1250 BLAKE2B 708043fa8337523b9dbbc8f7771d86255a117b855ea7acbae948338ab30a34b0553766e5f94321195f05ae1f3fb4481d7aff8c8756ec421a3f1100f329b1cbe3 SHA512 d6dfbfc137f9b16b6de9e572e68ab89b2fa5f9cf913c493fb812e3cecc2598e684c64136723ba9789be623161ab778f6d7fcbbd29d8d8db5cb2d23b23a667495
 EBUILD kube-controller-manager-1.16.4.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
 EBUILD kube-controller-manager-1.16.6.ebuild 1250 BLAKE2B 5adf33cf39af56aa9fbc5d5f76cf158f44f4482213cfba0fe3d9cfec6bc1dcc6dee44273c083601c54cca4a0431090cfb930833a185c10e6e8bbbeb0085c833d SHA512 ef5bad8a1d06fe3365b7fa4d3656743e9ea48c8812ebd1d8a938142a6641e207e3f92f715873a46475bb8a7fce1d0d18151f846ddc4d474f2862c50b291ed84a
+EBUILD kube-controller-manager-1.16.7.ebuild 1311 BLAKE2B 519c5d1b915a39db5b5ba411f3877be52c33589cd7da802a33f1e8b58a211611ee81ba47d623c02b7f3c1ca4c810919106ab8b2ff836f2040e5c4ff0c602e197 SHA512 98bbe8279b0b7aaaad65608b166ddeaea7f9f5ad11a8abc2a426631297d615ce769efde59a10beaebd6ba974b9fcce708b9b7baf2616935b70827f9ee94e5a23
 EBUILD kube-controller-manager-1.17.2.ebuild 1153 BLAKE2B 2ad827e85b8bfbd74c278bece29f89165c356d6b2973200324510254d83841d8d872e441fd59fe8b534c4704057df890899f02de5abe2dacde24532c2339720e SHA512 8df3a7bb651c184a45e9595c1c80156e387b49b7c0b66313b96b67421345e53faee9eacfaa48dfb4136a2caa063378bd24cb6e83b6cd84d20ad7569a15d53c5b
+EBUILD kube-controller-manager-1.17.3.ebuild 1153 BLAKE2B 2ad827e85b8bfbd74c278bece29f89165c356d6b2973200324510254d83841d8d872e441fd59fe8b534c4704057df890899f02de5abe2dacde24532c2339720e SHA512 8df3a7bb651c184a45e9595c1c80156e387b49b7c0b66313b96b67421345e53faee9eacfaa48dfb4136a2caa063378bd24cb6e83b6cd84d20ad7569a15d53c5b
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.10.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.10.ebuild
new file mode 100644
index 000000000000..e2bb284d01ae
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.10.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 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 Controller Manager"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}
+	dev-go/go-bindata
+	=dev-lang/go-1.12*"
+RDEPEND="${COMMON_DEPEND}"
+
+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}
+	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.7.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.16.7.ebuild
new file mode 100644
index 000000000000..bfb0eaa2ad80
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.16.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 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 Controller Manager"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}
+	dev-go/go-bindata
+	>=dev-lang/go-1.13"
+RDEPEND="${COMMON_DEPEND}"
+
+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}
+	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.17.3.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.17.3.ebuild
new file mode 100644
index 000000000000..a00f15cc108c
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.17.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}
+	dev-go/go-bindata
+	>=dev-lang/go-1.13"
+	RDEPEND="${COMMON_DEPEND}"
+
+RESTRICT="test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" emake -j1 WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	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-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index ba91271fcb5d..e5164775d5d7 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -2,15 +2,21 @@ AUX kube-proxy.confd 53 BLAKE2B 0cd5fc844dc21f63786ef21d972210ac02ea55165b05cef8
 AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe464d672d00ecf5b5fffd349a6affcd8ae3ea0ba06160be72f31cfa2d918c01050e83640fb9956917dc0 SHA512 088d91cd77e614f7857d65496f5b6d486741a8e3358b3e13bcd4203d35a76fa3aa390f658065e2826145525b6e83fcd33f8365a873e99b522f3ab7e8615ed364
 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
 DIST kubernetes-1.14.10.tar.gz 28106613 BLAKE2B 7ccb89c1390299a224a766a8004b4bfc95adb244ca93a2d7086ab0de76cfa6eef9b51cb35dfdabb9d429fbc1a7c0d06cbeb93cec979a8f15f5586cee90c2b5e5 SHA512 25ecc7bf737e7cbac6405042ced98ccf824ee9a59f290906b76594ab8742028a5b783e892a5b3a03b59a758641f2fe3dfe6a83d72c603103ec7ab0696e406dfc
+DIST kubernetes-1.15.10.tar.gz 26689433 BLAKE2B 5648bf9e6b4738393c735a00baec25e144e278c219c0c906a6a9b209896ce5dcb1411d58bbc8e9dd04f4f9312f7052b5f28eb4f2047406547de69a083fc4db19 SHA512 48c069d88a0111072ac02aed0760bc34ae44fbb5140489a837f089a6c944b5fa18f95f4bcc4286ca1fdfd6cd25e7bd0ff99c3b21373a1d70d3a0f70d352d4ed8
 DIST kubernetes-1.15.7.tar.gz 26671514 BLAKE2B 7ef6f92ea90fd8f45f250dfa4e081a171ad76c72f4eae4b4e901cb8335259779b7546ac31f97eb2a45daf85f49fdd4408577b96a1e0fd750a5509eb0446bfa8e SHA512 a0fb9dca9b6993ac828427589f4e03e9431b97c2ce153cc00a6e5b669dced05bfe236f2ecb85b623359b4e910c662dc473cd3226dfc4e85bd2551fbabbdfc836
 DIST kubernetes-1.15.9.tar.gz 26683313 BLAKE2B e8faaf32bda63dd0ac25670cd96a4a04ac7d1e5151855c9b41bca8d85ae3afadd55f85079b122282f9726386f42898878571072af9326e062062b68c8dfc4e10 SHA512 f60b2e78cd5afee4c5235af37738bed954fd792dfae8788972104bcc79bd2461a8a706f93b3c48f5353610650b6600ebd7197df03aa480ca0fd68fb4ac26278f
 DIST kubernetes-1.16.4.tar.gz 31220590 BLAKE2B 3ee3ab50f2a10c419b99f7f25072ad7b129741829d241ad788b343e5bd30ec3c9b07053755a2ec650227c0d26ae34f3d1d101cfd50ed6b16b3415a8233c8e4c0 SHA512 84768ffe3d4147082b3b151c7787498a78ee0e6aee537f5fb21c8e0e30e72b222d68942389063e8fc2a549aec423fc84a9696b3b70b9ae746a2b87a2f47297de
 DIST kubernetes-1.16.6.tar.gz 31714463 BLAKE2B 050897d4308a31d5164a907766af4f952d6551fba7e503bf7def78db37d017a3f5bd7a1c54125e42f9adeb850e6e38ef4ac9a98af978faf2efc4a474323b9f43 SHA512 2e1ca5781842ccd32f6e9791d069e9838a6221be3c4018abc06517cf97517bb500a6fafd7ae346088430f60c3e1dcbb983842572b9ed3241b70467dc1941e4a1
+DIST kubernetes-1.16.7.tar.gz 31722167 BLAKE2B 4792fec43d5921086dc78fc46d9d38554bc710bfb1a29928fd962fc0940946d4a4c1cba1ca86e999ebf2e1064bbeb011c9c6e464fada90c8a3e52a0cc2984977 SHA512 dc7d9180dd120418964e2fcc57105c9c3ba9b79abfdf357ca3ecd3c41468100b89e63b82ab6658b423c730ac2f229bf5eacca0321896b0739963fbc18343d765
 DIST kubernetes-1.17.2.tar.gz 31753827 BLAKE2B de92f1e0f087115691b5ce057a07f4b46a4410714ad9164801c0390190bd8e29f8aa6e79d0d8b816669770feaf229932df04c48792ce11e77e8c682db54f28bd SHA512 64c45967e6a85943fd3f62f82e0d51001bbeb04ed8ccbe376ad63989f4a888f838bc17d1d0942e8c857118781703a6cbd3336bff1f3ae5269f808b5d9b4d11bd
+DIST kubernetes-1.17.3.tar.gz 31762013 BLAKE2B 4470fadf2ec441ed7a5f3a82581af6a0f4d768780048576863b2aae9c13cff543592da73b979c7f9191a4c7c2b5a1ad10d85e0eba04fdcd08ece86884ab1f80d SHA512 09b33377de0bdd7dc8ac2ae81196d15eeb93862cb0aba1256bcfca38d2ce1f15951ad70cf67600fc3d16c1d449e0451707e756ec21ad812c6628ae1f0fdda427
 EBUILD kube-proxy-1.14.10.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
+EBUILD kube-proxy-1.15.10.ebuild 1194 BLAKE2B eee9417cd4089a7ddd1a4ca37f62b0cbc15ec3c978c884a2a296f7a2976244f667b9b4999426cb981d3bc247a3c6a449a2f1dece95c4b060ffaf9979915d853a SHA512 e2090b86dc47563d152d15e2b9b42b096981580b3fee7627698f81e88d5513721534b36ab09aaae88f68c9a928b1af09e57b2de59312686ee5bda85937641814
 EBUILD kube-proxy-1.15.7.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
 EBUILD kube-proxy-1.15.9.ebuild 1194 BLAKE2B b949ab5acd44b5a1ff4d0899261ea6556b02cadb3d65c2be6a3792c85ab1ccf14b52c85e836e7878addd5fd3be5a1c46389c04914faf3e6fbd67759cd6ca19c5 SHA512 590b609fe43ca0d018a41b5c1e42a9d1d1a9a19822c8fb5e8ca9654d5626b866d774fd444fef5022c0bc02826a3f6e2c3d516f8142c9faa732e39f876c84ee46
 EBUILD kube-proxy-1.16.4.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
 EBUILD kube-proxy-1.16.6.ebuild 1194 BLAKE2B a261c9e446644f53d98b5c445a55964a38c8cc24fc6ec0548435c5204a09d910b78290d17cb44ad192ca12e2402c7cc7eb93cc466e109e71757425e15808dbe6 SHA512 f57448691af8faf545bef57f77fc79ec2241c4f3c25f870367e48a4e59cff816ade69abf3372af6d10510dac10f0f27654c0d4bae6bfe8a17d93be11cd4a2f9c
+EBUILD kube-proxy-1.16.7.ebuild 1194 BLAKE2B a261c9e446644f53d98b5c445a55964a38c8cc24fc6ec0548435c5204a09d910b78290d17cb44ad192ca12e2402c7cc7eb93cc466e109e71757425e15808dbe6 SHA512 f57448691af8faf545bef57f77fc79ec2241c4f3c25f870367e48a4e59cff816ade69abf3372af6d10510dac10f0f27654c0d4bae6bfe8a17d93be11cd4a2f9c
 EBUILD kube-proxy-1.17.2.ebuild 1035 BLAKE2B 68fa466d990f76cddfa22c6bdc7023ddb471c5d0ad074422b4edfd3812c110d801e8171c3d4964430fd1f9189c2d67ca017425a1283b229b3fa7c13dbdee794b SHA512 c22fbfa6ea34a7d292f2eed5b9d1d674be6361f16d80b71d71d8f3a1ae8d883b843814bbfa7b427387cc0708fb0924cad9e6097f2bf0437a06ca48efdf0a4f97
+EBUILD kube-proxy-1.17.3.ebuild 1035 BLAKE2B 68fa466d990f76cddfa22c6bdc7023ddb471c5d0ad074422b4edfd3812c110d801e8171c3d4964430fd1f9189c2d67ca017425a1283b229b3fa7c13dbdee794b SHA512 c22fbfa6ea34a7d292f2eed5b9d1d674be6361f16d80b71d71d8f3a1ae8d883b843814bbfa7b427387cc0708fb0924cad9e6097f2bf0437a06ca48efdf0a4f97
 MISC metadata.xml 362 BLAKE2B 7f3bc6132d658d3af0f5ed69dc10e06a6aa93bcbf229a1f089ea6ff9d72fa4c489c2374e2932898d75d5eef61e6ccf1875ccb8c783c34864fd976ae845f10f28 SHA512 51b04b1a97ab16a620347142992b59fdeaacbec1940e69a7a98df386f978024fb27b92dd0ae7557ed1c31c36bc34ff7d2c86c935ce0e01dfbb1bd8d7080d807c
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.15.10.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.15.10.ebuild
new file mode 100644
index 000000000000..03c146243909
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.15.10.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 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.12*"
+
+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.7.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.16.7.ebuild
new file mode 100644
index 000000000000..80fd0acd1eb5
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.16.7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 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.13"
+
+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.17.3.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.17.3.ebuild
new file mode 100644
index 000000000000..db6bdd0cb855
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.17.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-go/go-bindata
+	>=dev-lang/go-1.13"
+
+RDEPEND="net-firewall/conntrack-tools"
+
+RESTRICT="test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" emake -j1 WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index ad12523b52f4..ad6352ee99a4 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -2,15 +2,21 @@ AUX kube-scheduler.confd 133 BLAKE2B 6b88dfc011173f183a88a16d078cbb5d96d46c26912
 AUX kube-scheduler.initd 548 BLAKE2B dd9373f659b87fcf12dca20527aebdb304a60ec559fd9fb9efcd0db8b3c155fdba2ce8a59461cd15ed3b4294cc5b335093e12d2b8411e400927e1307b37bc6d8 SHA512 151ea6f5cc36de9b83f0e5365579e33eea8002f9a03f5f61d195a349236e6baf192f701d3fb591b769aa90e8e1e620d525b20c95a1e8cda58d062971d8f587a3
 AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a28e9a5b02361cf4833982d4489364bd1291faa136df275988f02ce78c7b785c9209a54aec5eea6180b9041da0 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6
 DIST kubernetes-1.14.10.tar.gz 28106613 BLAKE2B 7ccb89c1390299a224a766a8004b4bfc95adb244ca93a2d7086ab0de76cfa6eef9b51cb35dfdabb9d429fbc1a7c0d06cbeb93cec979a8f15f5586cee90c2b5e5 SHA512 25ecc7bf737e7cbac6405042ced98ccf824ee9a59f290906b76594ab8742028a5b783e892a5b3a03b59a758641f2fe3dfe6a83d72c603103ec7ab0696e406dfc
+DIST kubernetes-1.15.10.tar.gz 26689433 BLAKE2B 5648bf9e6b4738393c735a00baec25e144e278c219c0c906a6a9b209896ce5dcb1411d58bbc8e9dd04f4f9312f7052b5f28eb4f2047406547de69a083fc4db19 SHA512 48c069d88a0111072ac02aed0760bc34ae44fbb5140489a837f089a6c944b5fa18f95f4bcc4286ca1fdfd6cd25e7bd0ff99c3b21373a1d70d3a0f70d352d4ed8
 DIST kubernetes-1.15.7.tar.gz 26671514 BLAKE2B 7ef6f92ea90fd8f45f250dfa4e081a171ad76c72f4eae4b4e901cb8335259779b7546ac31f97eb2a45daf85f49fdd4408577b96a1e0fd750a5509eb0446bfa8e SHA512 a0fb9dca9b6993ac828427589f4e03e9431b97c2ce153cc00a6e5b669dced05bfe236f2ecb85b623359b4e910c662dc473cd3226dfc4e85bd2551fbabbdfc836
 DIST kubernetes-1.15.9.tar.gz 26683313 BLAKE2B e8faaf32bda63dd0ac25670cd96a4a04ac7d1e5151855c9b41bca8d85ae3afadd55f85079b122282f9726386f42898878571072af9326e062062b68c8dfc4e10 SHA512 f60b2e78cd5afee4c5235af37738bed954fd792dfae8788972104bcc79bd2461a8a706f93b3c48f5353610650b6600ebd7197df03aa480ca0fd68fb4ac26278f
 DIST kubernetes-1.16.4.tar.gz 31220590 BLAKE2B 3ee3ab50f2a10c419b99f7f25072ad7b129741829d241ad788b343e5bd30ec3c9b07053755a2ec650227c0d26ae34f3d1d101cfd50ed6b16b3415a8233c8e4c0 SHA512 84768ffe3d4147082b3b151c7787498a78ee0e6aee537f5fb21c8e0e30e72b222d68942389063e8fc2a549aec423fc84a9696b3b70b9ae746a2b87a2f47297de
 DIST kubernetes-1.16.6.tar.gz 31714463 BLAKE2B 050897d4308a31d5164a907766af4f952d6551fba7e503bf7def78db37d017a3f5bd7a1c54125e42f9adeb850e6e38ef4ac9a98af978faf2efc4a474323b9f43 SHA512 2e1ca5781842ccd32f6e9791d069e9838a6221be3c4018abc06517cf97517bb500a6fafd7ae346088430f60c3e1dcbb983842572b9ed3241b70467dc1941e4a1
+DIST kubernetes-1.16.7.tar.gz 31722167 BLAKE2B 4792fec43d5921086dc78fc46d9d38554bc710bfb1a29928fd962fc0940946d4a4c1cba1ca86e999ebf2e1064bbeb011c9c6e464fada90c8a3e52a0cc2984977 SHA512 dc7d9180dd120418964e2fcc57105c9c3ba9b79abfdf357ca3ecd3c41468100b89e63b82ab6658b423c730ac2f229bf5eacca0321896b0739963fbc18343d765
 DIST kubernetes-1.17.2.tar.gz 31753827 BLAKE2B de92f1e0f087115691b5ce057a07f4b46a4410714ad9164801c0390190bd8e29f8aa6e79d0d8b816669770feaf229932df04c48792ce11e77e8c682db54f28bd SHA512 64c45967e6a85943fd3f62f82e0d51001bbeb04ed8ccbe376ad63989f4a888f838bc17d1d0942e8c857118781703a6cbd3336bff1f3ae5269f808b5d9b4d11bd
+DIST kubernetes-1.17.3.tar.gz 31762013 BLAKE2B 4470fadf2ec441ed7a5f3a82581af6a0f4d768780048576863b2aae9c13cff543592da73b979c7f9191a4c7c2b5a1ad10d85e0eba04fdcd08ece86884ab1f80d SHA512 09b33377de0bdd7dc8ac2ae81196d15eeb93862cb0aba1256bcfca38d2ce1f15951ad70cf67600fc3d16c1d449e0451707e756ec21ad812c6628ae1f0fdda427
 EBUILD kube-scheduler-1.14.10.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
+EBUILD kube-scheduler-1.15.10.ebuild 1285 BLAKE2B 8fb33630b5406b0c6820544b1701ed4e955ebc50eba52ecdff193b18a9ed29ca6949c241dfe1b3f477b288b2ebc274cde6264f4faf7f46adf346e4d8697b3f4a SHA512 40cd3afb9417158ae90f6dd0cea5354baff793effce060c0cb56d2b8486bc191291e7da03b07403db798f0f4e702289ee47ff96990004904fff165a5126073bb
 EBUILD kube-scheduler-1.15.7.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
 EBUILD kube-scheduler-1.15.9.ebuild 1241 BLAKE2B 31f22c6f2e5961f0f13fb900912abf34b3a7543f2cd1b4c29a06050759ba5a0a03ae29eb246f2727603ae1d7c02b1e6a9a6eb50aba07cfa6ed4e934d5110fe5b SHA512 aadb95413a3b18fefab0d1d47ed1e75c4c581f5c8eb40c7205e94cabbdd92fcc288e72c6280c1e42a050d3964dc55140e76f97b37ad25d243b52eb107a0d74e3
 EBUILD kube-scheduler-1.16.4.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
 EBUILD kube-scheduler-1.16.6.ebuild 1241 BLAKE2B 0f53526f046ddb3793d1e139c59a9d73fd10969be76a036e145f6e4cc5f64bdd5d04565b763f89d738dbccb126410df3f563e77df04fdf47d4ea413f9706eca2 SHA512 dfd50324038cf20effe2764cd2471cc308070bbf474662eedde1480bd1dc65c1ef52f6c0ffbf8c5627fc7e82879bf140cf4d391ad62f7f5ed98ba17c3918a464
+EBUILD kube-scheduler-1.16.7.ebuild 1285 BLAKE2B dfa432448d8432a5a85a087b77225b321ecab0eddb10d0035fb410e09c2808a8a508134e7ae2d0f3f31197fcad755aebdda6a70365ec8986e935ec6538148e91 SHA512 cd6519a51af003249f2df05fcd8d641234f26fba4f79e62337730af0f8230ba688818204a62f81163172bdadb9f53a72339390073cf989f2059ad2111cfb0a34
 EBUILD kube-scheduler-1.17.2.ebuild 1126 BLAKE2B 0d50f6da953e1a038d716b0b87284dd875686f1494a2dead30938b4549b37524ac027cf8a600ffac2c5965da13a9d2536f3348024d3ab8459ed83252c7d036fd SHA512 79eb3308402764b2ea332a67fbf3a2933675f3d9d9ce7fa3dca702366cc09f32d5b462b2361649e9d4f3fedb20d89a081eec1881fb9103afc22971b87611175f
+EBUILD kube-scheduler-1.17.3.ebuild 1126 BLAKE2B 0d50f6da953e1a038d716b0b87284dd875686f1494a2dead30938b4549b37524ac027cf8a600ffac2c5965da13a9d2536f3348024d3ab8459ed83252c7d036fd SHA512 79eb3308402764b2ea332a67fbf3a2933675f3d9d9ce7fa3dca702366cc09f32d5b462b2361649e9d4f3fedb20d89a081eec1881fb9103afc22971b87611175f
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.15.10.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.15.10.ebuild
new file mode 100644
index 000000000000..d11afdbbbedd
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.15.10.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 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 Scheduler"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+COMMON_DEPEND="acct-group/kube-scheduler
+	acct-user/kube-scheduler"
+DEPEND="${COMMON_DEPEND}
+	dev-go/go-bindata
+	=dev-lang/go-1.12*"
+	RDEPEND="${COMMON_DEPEND}"
+
+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}
+	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.7.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.16.7.ebuild
new file mode 100644
index 000000000000..27b2f5fe03cc
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.16.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 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 Scheduler"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+COMMON_DEPEND="acct-group/kube-scheduler
+	acct-user/kube-scheduler"
+DEPEND="${COMMON_DEPEND}
+	dev-go/go-bindata
+	>=dev-lang/go-1.13"
+	RDEPEND="${COMMON_DEPEND}"
+
+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}
+	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.17.3.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.17.3.ebuild
new file mode 100644
index 000000000000..0faf33996b1a
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.17.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="acct-group/kube-scheduler
+	acct-user/kube-scheduler"
+DEPEND="${COMMON_DEPEND}
+	dev-go/go-bindata
+	>=dev-lang/go-1.13"
+	RDEPEND="${COMMON_DEPEND}"
+
+RESTRICT="test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" emake -j1 WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	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/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index 35f029ec2588..397ce42ac669 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -1,20 +1,26 @@
 AUX kubeadm-1.14-openrc.patch 3523 BLAKE2B bbcc45a82984afe2a8ab567ce1319b6c14c84eade26aba21393ba6fe44de35b654000468e15fd44e49da329c85cd4d3dac3fe643d8c83183ab126edaf4a5f4c9 SHA512 8aec0a1cda24fcd7001e34ff6163aee7eaf679dea953068b58df3578c016f70e1406903e032a51519bc16ac0dbe583159d1cf4d504adbb2930d811cc2f762cfe
 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.10.tar.gz 26689433 BLAKE2B 5648bf9e6b4738393c735a00baec25e144e278c219c0c906a6a9b209896ce5dcb1411d58bbc8e9dd04f4f9312f7052b5f28eb4f2047406547de69a083fc4db19 SHA512 48c069d88a0111072ac02aed0760bc34ae44fbb5140489a837f089a6c944b5fa18f95f4bcc4286ca1fdfd6cd25e7bd0ff99c3b21373a1d70d3a0f70d352d4ed8
 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.15.9.tar.gz 26683313 BLAKE2B e8faaf32bda63dd0ac25670cd96a4a04ac7d1e5151855c9b41bca8d85ae3afadd55f85079b122282f9726386f42898878571072af9326e062062b68c8dfc4e10 SHA512 f60b2e78cd5afee4c5235af37738bed954fd792dfae8788972104bcc79bd2461a8a706f93b3c48f5353610650b6600ebd7197df03aa480ca0fd68fb4ac26278f
 DIST kubernetes-1.16.2.tar.gz 31202049 BLAKE2B e7bb9330c233959702545207ce3061559ecae6283332eae9eb57d38654a0b7a447d85ca016a674cf72b253c816662bffe2e04cf298ce43d3e5dd26d722783ac1 SHA512 44c600f3e9af64f66d2403340137cd162bfcc1ed30d5d6ad440b77be403656f624a1390489680134a7742626d3eb0affa92ff3e17c02ba2df91f7a75655046a9
 DIST kubernetes-1.16.3.tar.gz 31211177 BLAKE2B 816b7a4c3489b328d14ae149bdc71bcdc9a6c981ddff8d812b602d1976d12785355615f6ad43246cc201c6d7f3d5a19381d3e6cefba9358a754df81cf35bedca SHA512 3381249ab9b76849720252ddcc89565dd4f79c003c6e6f97b9cb39f7490acfd12110d21beeee4d5b7239769ace998d1949f8b25d70e42643c244b819d7b5c042
 DIST kubernetes-1.16.6.tar.gz 31714463 BLAKE2B 050897d4308a31d5164a907766af4f952d6551fba7e503bf7def78db37d017a3f5bd7a1c54125e42f9adeb850e6e38ef4ac9a98af978faf2efc4a474323b9f43 SHA512 2e1ca5781842ccd32f6e9791d069e9838a6221be3c4018abc06517cf97517bb500a6fafd7ae346088430f60c3e1dcbb983842572b9ed3241b70467dc1941e4a1
+DIST kubernetes-1.16.7.tar.gz 31722167 BLAKE2B 4792fec43d5921086dc78fc46d9d38554bc710bfb1a29928fd962fc0940946d4a4c1cba1ca86e999ebf2e1064bbeb011c9c6e464fada90c8a3e52a0cc2984977 SHA512 dc7d9180dd120418964e2fcc57105c9c3ba9b79abfdf357ca3ecd3c41468100b89e63b82ab6658b423c730ac2f229bf5eacca0321896b0739963fbc18343d765
 DIST kubernetes-1.17.2.tar.gz 31753827 BLAKE2B de92f1e0f087115691b5ce057a07f4b46a4410714ad9164801c0390190bd8e29f8aa6e79d0d8b816669770feaf229932df04c48792ce11e77e8c682db54f28bd SHA512 64c45967e6a85943fd3f62f82e0d51001bbeb04ed8ccbe376ad63989f4a888f838bc17d1d0942e8c857118781703a6cbd3336bff1f3ae5269f808b5d9b4d11bd
+DIST kubernetes-1.17.3.tar.gz 31762013 BLAKE2B 4470fadf2ec441ed7a5f3a82581af6a0f4d768780048576863b2aae9c13cff543592da73b979c7f9191a4c7c2b5a1ad10d85e0eba04fdcd08ece86884ab1f80d SHA512 09b33377de0bdd7dc8ac2ae81196d15eeb93862cb0aba1256bcfca38d2ce1f15951ad70cf67600fc3d16c1d449e0451707e756ec21ad812c6628ae1f0fdda427
 EBUILD kubeadm-1.14.8.ebuild 1346 BLAKE2B 5577bf77097cda800fa952f89ef6dc1f64748100e92b6b0f2b16cc9320ac41b629c5dcbb1d06c2ce5e7a4a65b6ee4e7ac29cfb9f5c08323a3b6acc201828968c SHA512 5c45b4ea190d63afb399e6c676de353d93212936cad1d7e8d22e9a103037f107bf4402430c6d67366aa8616cd2b28f79af8397df80248a3db7ae179d18fdfc6b
 EBUILD kubeadm-1.14.9.ebuild 1346 BLAKE2B 5577bf77097cda800fa952f89ef6dc1f64748100e92b6b0f2b16cc9320ac41b629c5dcbb1d06c2ce5e7a4a65b6ee4e7ac29cfb9f5c08323a3b6acc201828968c SHA512 5c45b4ea190d63afb399e6c676de353d93212936cad1d7e8d22e9a103037f107bf4402430c6d67366aa8616cd2b28f79af8397df80248a3db7ae179d18fdfc6b
+EBUILD kubeadm-1.15.10.ebuild 1259 BLAKE2B 19a9929ca93f885b8f33b51162649ad9b218a2c90572e28e43da4dc3064d18d1c975bc41266e65f41c68d308eaa4d01f13d637f8640b3a4bf86f79cecd67c1d3 SHA512 7e0b06c3086bf4c09fd724c3f50e07bcfbe3e8cfcdee09161bfee0ecabdbb4d8a89fbef6176f3c5aec1f22ec86395ca5f38e85a281f7f23ba47e8102b9105c01
 EBUILD kubeadm-1.15.5.ebuild 1259 BLAKE2B c457240648b86a60b75e27b277caba17f98ab8488eebf619b36215a9b785da856cec30b926bdd4ed877886e985789304dd12e1325eb31beb0c82a9c08036ef08 SHA512 7123e4fda317531803d885a0593a5f00a8671321ea87984f4572b059735304552d66e61d0394338759b8c107ca9d7556b009eb088cdccda869ed31a2830abc4e
 EBUILD kubeadm-1.15.6.ebuild 1259 BLAKE2B c457240648b86a60b75e27b277caba17f98ab8488eebf619b36215a9b785da856cec30b926bdd4ed877886e985789304dd12e1325eb31beb0c82a9c08036ef08 SHA512 7123e4fda317531803d885a0593a5f00a8671321ea87984f4572b059735304552d66e61d0394338759b8c107ca9d7556b009eb088cdccda869ed31a2830abc4e
 EBUILD kubeadm-1.15.9.ebuild 1259 BLAKE2B 39e44efefd2cafe28c6488c8269d01c86ea5903dc331c69ab04e3c5857e1b2b2b44da5078815dd7dbb3870dd291b0f41a6497eb7272980674bd853f044969df3 SHA512 79c9698208663bfd5d0b19b82294d13440a762ac37d9caec8c662b05d6a39921a189c4e0df89301d25ee4d7aa2c5de8d739b53b980b24a1eb4b9ede86f060504
 EBUILD kubeadm-1.16.2.ebuild 1259 BLAKE2B c457240648b86a60b75e27b277caba17f98ab8488eebf619b36215a9b785da856cec30b926bdd4ed877886e985789304dd12e1325eb31beb0c82a9c08036ef08 SHA512 7123e4fda317531803d885a0593a5f00a8671321ea87984f4572b059735304552d66e61d0394338759b8c107ca9d7556b009eb088cdccda869ed31a2830abc4e
 EBUILD kubeadm-1.16.3.ebuild 1259 BLAKE2B c457240648b86a60b75e27b277caba17f98ab8488eebf619b36215a9b785da856cec30b926bdd4ed877886e985789304dd12e1325eb31beb0c82a9c08036ef08 SHA512 7123e4fda317531803d885a0593a5f00a8671321ea87984f4572b059735304552d66e61d0394338759b8c107ca9d7556b009eb088cdccda869ed31a2830abc4e
 EBUILD kubeadm-1.16.6.ebuild 1259 BLAKE2B c493558a7faeaad6f21e3d223deab0596b95e282fa3636e5fb362c3ee4154977724498a992758f8bc7631c7c659dbb652b5836a5b69c2f1b083150aa7e1786d2 SHA512 9b9b93e65116ce6023452fdf2bc4c5fe20957cbcafed0a0407e762efa319345e89e43bfe995fc7aa635d46bf6d36d3393f2495f47f7b9cb78a3142451fd71c66
+EBUILD kubeadm-1.16.7.ebuild 1259 BLAKE2B c493558a7faeaad6f21e3d223deab0596b95e282fa3636e5fb362c3ee4154977724498a992758f8bc7631c7c659dbb652b5836a5b69c2f1b083150aa7e1786d2 SHA512 9b9b93e65116ce6023452fdf2bc4c5fe20957cbcafed0a0407e762efa319345e89e43bfe995fc7aa635d46bf6d36d3393f2495f47f7b9cb78a3142451fd71c66
 EBUILD kubeadm-1.17.2.ebuild 1049 BLAKE2B 76523b23b08c88c6e56bdc8927096b299008f8f6edec3fc27327b63860c20ac9772ff5bc03cf6be625109cb42d7059b6bcc12de8b8dc06d3c09ada9935c71fe7 SHA512 c2412c7e68a3efa031c2e27a5173b0a540de3cefac94245e48d4b4f810f7134219e29c68d7b3314d7697e267d1add10e341399a771537e1021958021ce050755
+EBUILD kubeadm-1.17.3.ebuild 1049 BLAKE2B 76523b23b08c88c6e56bdc8927096b299008f8f6edec3fc27327b63860c20ac9772ff5bc03cf6be625109cb42d7059b6bcc12de8b8dc06d3c09ada9935c71fe7 SHA512 c2412c7e68a3efa031c2e27a5173b0a540de3cefac94245e48d4b4f810f7134219e29c68d7b3314d7697e267d1add10e341399a771537e1021958021ce050755
 MISC metadata.xml 917 BLAKE2B ece7788c2a425d9663a25793715a9a2b1227c76f4ca0606340adf98bf524325524cbfde458125fc20cdfe4278950f4109d6a8a4d31c066f7884c33d856b5cd31 SHA512 587a9b0e0de0e18ccd2b8de9929f588c270172e795cede9093fa2380aa422f67e6e35ea0f534d8507ec278448bb1a7a2832bff561a92f8663e15824130be450a
diff --git a/sys-cluster/kubeadm/kubeadm-1.15.10.ebuild b/sys-cluster/kubeadm/kubeadm-1.15.10.ebuild
new file mode 100644
index 000000000000..6f09247989fc
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.15.10.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=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"
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+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
+}
+
+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/kubeadm/kubeadm-1.16.7.ebuild b/sys-cluster/kubeadm/kubeadm-1.16.7.ebuild
new file mode 100644
index 000000000000..3c0ba8c5f84f
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.16.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 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 Easily bootstrap a secure Kubernetes cluster"
+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.13
+	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
+}
+
+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/kubeadm/kubeadm-1.17.3.ebuild b/sys-cluster/kubeadm/kubeadm-1.17.3.ebuild
new file mode 100644
index 000000000000..a2529fec51c7
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.17.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=dev-lang/go-1.13
+	dev-go/go-bindata"
+
+RESTRICT="test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" emake -j1 WHAT=cmd/${PN} GOFLAGS=-v
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index 6353e1a62b27..25fb9b68213c 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,17 +1,23 @@
 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.10.tar.gz 26689433 BLAKE2B 5648bf9e6b4738393c735a00baec25e144e278c219c0c906a6a9b209896ce5dcb1411d58bbc8e9dd04f4f9312f7052b5f28eb4f2047406547de69a083fc4db19 SHA512 48c069d88a0111072ac02aed0760bc34ae44fbb5140489a837f089a6c944b5fa18f95f4bcc4286ca1fdfd6cd25e7bd0ff99c3b21373a1d70d3a0f70d352d4ed8
 DIST kubernetes-1.15.7.tar.gz 26671514 BLAKE2B 7ef6f92ea90fd8f45f250dfa4e081a171ad76c72f4eae4b4e901cb8335259779b7546ac31f97eb2a45daf85f49fdd4408577b96a1e0fd750a5509eb0446bfa8e SHA512 a0fb9dca9b6993ac828427589f4e03e9431b97c2ce153cc00a6e5b669dced05bfe236f2ecb85b623359b4e910c662dc473cd3226dfc4e85bd2551fbabbdfc836
 DIST kubernetes-1.15.9.tar.gz 26683313 BLAKE2B e8faaf32bda63dd0ac25670cd96a4a04ac7d1e5151855c9b41bca8d85ae3afadd55f85079b122282f9726386f42898878571072af9326e062062b68c8dfc4e10 SHA512 f60b2e78cd5afee4c5235af37738bed954fd792dfae8788972104bcc79bd2461a8a706f93b3c48f5353610650b6600ebd7197df03aa480ca0fd68fb4ac26278f
 DIST kubernetes-1.16.4.tar.gz 31220590 BLAKE2B 3ee3ab50f2a10c419b99f7f25072ad7b129741829d241ad788b343e5bd30ec3c9b07053755a2ec650227c0d26ae34f3d1d101cfd50ed6b16b3415a8233c8e4c0 SHA512 84768ffe3d4147082b3b151c7787498a78ee0e6aee537f5fb21c8e0e30e72b222d68942389063e8fc2a549aec423fc84a9696b3b70b9ae746a2b87a2f47297de
 DIST kubernetes-1.16.6.tar.gz 31714463 BLAKE2B 050897d4308a31d5164a907766af4f952d6551fba7e503bf7def78db37d017a3f5bd7a1c54125e42f9adeb850e6e38ef4ac9a98af978faf2efc4a474323b9f43 SHA512 2e1ca5781842ccd32f6e9791d069e9838a6221be3c4018abc06517cf97517bb500a6fafd7ae346088430f60c3e1dcbb983842572b9ed3241b70467dc1941e4a1
+DIST kubernetes-1.16.7.tar.gz 31722167 BLAKE2B 4792fec43d5921086dc78fc46d9d38554bc710bfb1a29928fd962fc0940946d4a4c1cba1ca86e999ebf2e1064bbeb011c9c6e464fada90c8a3e52a0cc2984977 SHA512 dc7d9180dd120418964e2fcc57105c9c3ba9b79abfdf357ca3ecd3c41468100b89e63b82ab6658b423c730ac2f229bf5eacca0321896b0739963fbc18343d765
 DIST kubernetes-1.17.0.tar.gz 31727453 BLAKE2B 692937c3153338bc290768eda1d3dab0cb5afdc329b795831d5e144eb7a28d40a92403ab82361d010c36e2b31d8fa1eb0047762258194d34f10841107de96cd9 SHA512 906cdae9bf9ca04cd8b1ce869fa7e7af575127ccf1616b070a29d1a32861f96672c8f55e955942a86722d64a0a269cecf52707f6e5b1d853badfe28f10e1628f
 DIST kubernetes-1.17.2.tar.gz 31753827 BLAKE2B de92f1e0f087115691b5ce057a07f4b46a4410714ad9164801c0390190bd8e29f8aa6e79d0d8b816669770feaf229932df04c48792ce11e77e8c682db54f28bd SHA512 64c45967e6a85943fd3f62f82e0d51001bbeb04ed8ccbe376ad63989f4a888f838bc17d1d0942e8c857118781703a6cbd3336bff1f3ae5269f808b5d9b4d11bd
+DIST kubernetes-1.17.3.tar.gz 31762013 BLAKE2B 4470fadf2ec441ed7a5f3a82581af6a0f4d768780048576863b2aae9c13cff543592da73b979c7f9191a4c7c2b5a1ad10d85e0eba04fdcd08ece86884ab1f80d SHA512 09b33377de0bdd7dc8ac2ae81196d15eeb93862cb0aba1256bcfca38d2ce1f15951ad70cf67600fc3d16c1d449e0451707e756ec21ad812c6628ae1f0fdda427
 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.10.ebuild 1287 BLAKE2B c1039bcd37cd643f098c60e5e8a5cc5305daac8c22bde30f65a9faadf05657ef6ae01e8d87f8d2c0ccb47ef65d0a3b1ae2a4b94aa2b7c977bfd04fd4f9a98c00 SHA512 bbe2c3260b1a0435811b23a52b697853f08495605ae0e0bf8539e93d60b6a562005b64360d5640df3098986912b0dc805989a9f582fb4abfd3de6ed40ac5017f
 EBUILD kubectl-1.15.7.ebuild 1287 BLAKE2B 7ad8382c1d26cf19add47a321d36002be4af02839058cede08914b060487537d3d96364a5230a9e24f2e6c8043ab0adb3f0e443ab310462507fe880fdf35998f SHA512 f2771b09d63bd9b4a5ff836d45dbc44d92c4de6915f008755cc9eed84f47901ed0d0b1ec250849261c6f6fb209fc0bfba0cb8c8a3244e761f5d07dcf00d294e6
 EBUILD kubectl-1.15.9.ebuild 1287 BLAKE2B 6c9905c5c02ad6a4e99f41edbd859e9482bc20f94b2f89c271de92099541dda41708e53b60eafb7349eaf8ce4dc83267814adf5aa9012423d0754db51663df06 SHA512 9d5c4bdbe1b722f0fa1152cdc8bd00587fab44694ff9651b24aab1780c1603a973653ab09a7b37d6267d606a0efc83207925a301d5e4ef32f9a2756ed4891948
 EBUILD kubectl-1.16.4.ebuild 1287 BLAKE2B 7ad8382c1d26cf19add47a321d36002be4af02839058cede08914b060487537d3d96364a5230a9e24f2e6c8043ab0adb3f0e443ab310462507fe880fdf35998f SHA512 f2771b09d63bd9b4a5ff836d45dbc44d92c4de6915f008755cc9eed84f47901ed0d0b1ec250849261c6f6fb209fc0bfba0cb8c8a3244e761f5d07dcf00d294e6
 EBUILD kubectl-1.16.6.ebuild 1287 BLAKE2B eafef6161de411917449cf56a9262ff03a11243de64ac3b00af9a3df6d2249f3e21841369177783de0ceeb79a4e73afdb757afa361833bbefb786670d952d10e SHA512 3442cceb953bb2221c990feb3365001fda8c9c64636e93a7580d35ebe6d080fcdfbde414db46f388723dbd87b2698b093220184c808b8de9505b655f1145ed47
+EBUILD kubectl-1.16.7.ebuild 1287 BLAKE2B eafef6161de411917449cf56a9262ff03a11243de64ac3b00af9a3df6d2249f3e21841369177783de0ceeb79a4e73afdb757afa361833bbefb786670d952d10e SHA512 3442cceb953bb2221c990feb3365001fda8c9c64636e93a7580d35ebe6d080fcdfbde414db46f388723dbd87b2698b093220184c808b8de9505b655f1145ed47
 EBUILD kubectl-1.17.0.ebuild 1255 BLAKE2B 4ab4613acda0f351adc829d725e228ecb22d0f82fc521fad83ed81e74d33ca67d14fd32cee074ae2eaf782fc85b88ca94a1754844ed781ffc73223abeb56d787 SHA512 170a34f293dcf44cf5c281653d055107036e75061100adc0f34d52c3364813db8a1779e7028fc2c6d812993df9531047060a5f9e60a80cf4da5ff807f1033b27
 EBUILD kubectl-1.17.2.ebuild 1045 BLAKE2B 09065ad2b4d3ce4e8793fec15195298ad765469633198a4181fd49b4e7441646d8931937ac6dc1015701bc4fb71a66802f1bd6b53473cbdd42a1ef8544463ff2 SHA512 b9c2fbb820a9fd1d7760959203058be872e625ee248f3cf5803695e1df26f97a3c9c288b71d3392b160db3cce24938159d68bddf69471da5f637f1b17fb36cc3
+EBUILD kubectl-1.17.3.ebuild 1051 BLAKE2B a0bcd5e270a4b55cd36974b519cf48cfd4bf717fbd2101054ae5b39479a8ea8351754a3f2819f685fb1114c70f5196b152aea69ff08ca893a335cbce186512c6 SHA512 32322c110477b4b44d066b0c59d12991597b6d772d9f79b0ce10516c8563c3edc3e55b61f27bd5e5ed7567837615eb7a5b9b766786291683a4d26e2a4f4d385e
 MISC metadata.xml 334 BLAKE2B e4daad1c0150025addcba294ef07c06e004c6d713e0d03a72b70a51bc44d6a4b0a86c9cd543af113c312f693d79c2985b679d6774a54370e9af9b0430de63f22 SHA512 f894ee487b6aff7d302bef231d72faba7ae9c0aa673974b306a4b74fe3b90dbc62c49b6bd829cc1b439a6d820ffe94db3a15ea2209250fc3b13c8b06297af27c
diff --git a/sys-cluster/kubectl/kubectl-1.15.10.ebuild b/sys-cluster/kubectl/kubectl-1.15.10.ebuild
new file mode 100644
index 000000000000..021b5398348a
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.15.10.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 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.16.7.ebuild b/sys-cluster/kubectl/kubectl-1.16.7.ebuild
new file mode 100644
index 000000000000..85c2d4e74472
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.16.7.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 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.13
+	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.17.3.ebuild b/sys-cluster/kubectl/kubectl-1.17.3.ebuild
new file mode 100644
index 000000000000..f70139e33e0b
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.17.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=dev-lang/go-1.13
+	dev-go/go-bindata"
+
+RESTRICT="strip test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" emake -j1 WHAT=cmd/${PN} GOFLAGS=-v
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index a3a925009944..30d34f6915e5 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -5,16 +5,22 @@ AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba8320
 AUX kubelet.service 642 BLAKE2B 9f0fa5db48c09c2525cbc556cd520660302408a43aceb6c11da3a191b4b21607e824e46d9805b12b57a0ac7878c7da94d0cb86c69cd949814c77bb217973c6f1 SHA512 770cadae6afb68f0556c7c5969643642bbf09b596ff49d969d31b8d9f0d8907d6931eb7fb14485c78a3f75682e44e2355c7e51973a0dfdd1e665816f04ba21ae
 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.10.tar.gz 26689433 BLAKE2B 5648bf9e6b4738393c735a00baec25e144e278c219c0c906a6a9b209896ce5dcb1411d58bbc8e9dd04f4f9312f7052b5f28eb4f2047406547de69a083fc4db19 SHA512 48c069d88a0111072ac02aed0760bc34ae44fbb5140489a837f089a6c944b5fa18f95f4bcc4286ca1fdfd6cd25e7bd0ff99c3b21373a1d70d3a0f70d352d4ed8
 DIST kubernetes-1.15.7.tar.gz 26671514 BLAKE2B 7ef6f92ea90fd8f45f250dfa4e081a171ad76c72f4eae4b4e901cb8335259779b7546ac31f97eb2a45daf85f49fdd4408577b96a1e0fd750a5509eb0446bfa8e SHA512 a0fb9dca9b6993ac828427589f4e03e9431b97c2ce153cc00a6e5b669dced05bfe236f2ecb85b623359b4e910c662dc473cd3226dfc4e85bd2551fbabbdfc836
 DIST kubernetes-1.15.9.tar.gz 26683313 BLAKE2B e8faaf32bda63dd0ac25670cd96a4a04ac7d1e5151855c9b41bca8d85ae3afadd55f85079b122282f9726386f42898878571072af9326e062062b68c8dfc4e10 SHA512 f60b2e78cd5afee4c5235af37738bed954fd792dfae8788972104bcc79bd2461a8a706f93b3c48f5353610650b6600ebd7197df03aa480ca0fd68fb4ac26278f
 DIST kubernetes-1.16.4.tar.gz 31220590 BLAKE2B 3ee3ab50f2a10c419b99f7f25072ad7b129741829d241ad788b343e5bd30ec3c9b07053755a2ec650227c0d26ae34f3d1d101cfd50ed6b16b3415a8233c8e4c0 SHA512 84768ffe3d4147082b3b151c7787498a78ee0e6aee537f5fb21c8e0e30e72b222d68942389063e8fc2a549aec423fc84a9696b3b70b9ae746a2b87a2f47297de
 DIST kubernetes-1.16.6.tar.gz 31714463 BLAKE2B 050897d4308a31d5164a907766af4f952d6551fba7e503bf7def78db37d017a3f5bd7a1c54125e42f9adeb850e6e38ef4ac9a98af978faf2efc4a474323b9f43 SHA512 2e1ca5781842ccd32f6e9791d069e9838a6221be3c4018abc06517cf97517bb500a6fafd7ae346088430f60c3e1dcbb983842572b9ed3241b70467dc1941e4a1
+DIST kubernetes-1.16.7.tar.gz 31722167 BLAKE2B 4792fec43d5921086dc78fc46d9d38554bc710bfb1a29928fd962fc0940946d4a4c1cba1ca86e999ebf2e1064bbeb011c9c6e464fada90c8a3e52a0cc2984977 SHA512 dc7d9180dd120418964e2fcc57105c9c3ba9b79abfdf357ca3ecd3c41468100b89e63b82ab6658b423c730ac2f229bf5eacca0321896b0739963fbc18343d765
 DIST kubernetes-1.17.2.tar.gz 31753827 BLAKE2B de92f1e0f087115691b5ce057a07f4b46a4410714ad9164801c0390190bd8e29f8aa6e79d0d8b816669770feaf229932df04c48792ce11e77e8c682db54f28bd SHA512 64c45967e6a85943fd3f62f82e0d51001bbeb04ed8ccbe376ad63989f4a888f838bc17d1d0942e8c857118781703a6cbd3336bff1f3ae5269f808b5d9b4d11bd
+DIST kubernetes-1.17.3.tar.gz 31762013 BLAKE2B 4470fadf2ec441ed7a5f3a82581af6a0f4d768780048576863b2aae9c13cff543592da73b979c7f9191a4c7c2b5a1ad10d85e0eba04fdcd08ece86884ab1f80d SHA512 09b33377de0bdd7dc8ac2ae81196d15eeb93862cb0aba1256bcfca38d2ce1f15951ad70cf67600fc3d16c1d449e0451707e756ec21ad812c6628ae1f0fdda427
 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.10.ebuild 1371 BLAKE2B 43bdcb3a9150f9b861ee4fa2021364d45cff93457662de3d43dce3470b907c72c723a2c49f552f63e0754f37dfc497f7a7f2db040e89899afbc9069348e3373b SHA512 0dfc25ce173f1c4d0084e2fd924c8419519c8e6e3c9ad655e361f8c935c7e825db372f767d0831f48399550683c0ffb1328b7359ee7b466f173a45ce8ed050da
 EBUILD kubelet-1.15.7.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
 EBUILD kubelet-1.15.9.ebuild 1371 BLAKE2B c867a62e238c0ed4b8cbf871fef4cd47c8a20c28e74ecfc1501f1f84376ec8ad3ca4fca29396bae66d69bbe6c964789daffc21619fb3811fb9773800d252b66e SHA512 a6fdbd53566961f3aa3273d44868b0f8fa7c1306aaad1573724d558f1d6186ffe2484b412d9b1d06b582e18b47024cc982d1136a800753850473ec3208a1356e
 EBUILD kubelet-1.16.4.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
 EBUILD kubelet-1.16.6.ebuild 1371 BLAKE2B 56677b88b0ce37209a05f906cfa35cbe2d605cba25eb1f3d5957cb65c87654eb8545d53b1e055b02508d997d08a844090560df80ed675b85d15143cb3b325ee4 SHA512 a1571faf59947595508944ab42fa703e8628db52108211ecd1990633238d00987b78d684aa42dcfc8dc579c8fa6432e66aa5a2b254c0c11a310b5bd6cf5de2bf
+EBUILD kubelet-1.16.7.ebuild 1371 BLAKE2B 56677b88b0ce37209a05f906cfa35cbe2d605cba25eb1f3d5957cb65c87654eb8545d53b1e055b02508d997d08a844090560df80ed675b85d15143cb3b325ee4 SHA512 a1571faf59947595508944ab42fa703e8628db52108211ecd1990633238d00987b78d684aa42dcfc8dc579c8fa6432e66aa5a2b254c0c11a310b5bd6cf5de2bf
 EBUILD kubelet-1.17.2.ebuild 1212 BLAKE2B fcc55d782f04ccd11819f9860028321a5a06da5efbd9344f0a2cf4c1aab6d8e2e7d63554fc904dbf44cc941c92c027016d86855b265389019a6e41309f09b9ae SHA512 6f60e8ef1da9f376eb7e3c3fda9e8007bf802e2208034938d86b54498857e1f787ef0f0f8040522d41f2af52953520b8416601d7d2d23f8e0b76513054eadc77
+EBUILD kubelet-1.17.3.ebuild 1215 BLAKE2B aaa430e041597b155183233742531db60fccc16d479e421c7d8a0e946294ffc27422566fa686b3dd1a2902b34568709a06e1b9cbc4981cdf793388008f20d2b5 SHA512 f62b07ae957ba610564284b17ef694c4555d8fdd5f62267d34f76319ccbb3036653e1d45f3b7f07c972a08ed2751dada1748c3ebe25ce4321ebcdf00df306637
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kubelet/kubelet-1.15.10.ebuild b/sys-cluster/kubelet/kubelet-1.15.10.ebuild
new file mode 100644
index 000000000000..82bd9f75ce32
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.15.10.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 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.12*"
+
+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.7.ebuild b/sys-cluster/kubelet/kubelet-1.16.7.ebuild
new file mode 100644
index 000000000000..d73fa6b62a50
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.16.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 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.13"
+
+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.17.3.ebuild b/sys-cluster/kubelet/kubelet-1.17.3.ebuild
new file mode 100644
index 000000000000..d32e9b53641a
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.17.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+DEPEND="dev-go/go-bindata
+	>=dev-lang/go-1.13"
+
+RESTRICT+=" test "
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d"  -e "s/-s -w/-w/" hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
+	LDFLAGS="" emake -j1 WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc/kubernetes
+	newins "${FILESDIR}"/${PN}.env ${PN}.env
+}
diff --git a/sys-cluster/mpich/Manifest b/sys-cluster/mpich/Manifest
index 5fed03728b2a..3a03363df622 100644
--- a/sys-cluster/mpich/Manifest
+++ b/sys-cluster/mpich/Manifest
@@ -2,5 +2,5 @@ AUX mpich-3.3-add-external-libdir-parameter.patch 8605 BLAKE2B 56a6c60362da3004c
 DIST mpich-3.0.4.tar.gz 10921075 BLAKE2B 341aaac23277aed05a4448ea03d9caf1ee14cfe327a770c95d620fc1ee1ea7bfa6df36860aa44aad162eb6d630d35fdfb30ae9a866d67680ab71c7b4326c109c SHA512 f9d8b2cf561fe5f85c12512ef4dd7b0cf5ec8b53ddb07bfa0d1db2e3c8ae0382c77e0661f46b82ec96b05d18ea2d25328bb84e9528ac06e5925f30ec8ef030d0
 DIST mpich-3.3.tar.gz 27209008 BLAKE2B 3010f847456ed71a27e728b91887e04303a83b4abea883bf73d9794ff697052efe3bccd238933dc6e5fbc75e0be36004f1ae9fc7695a4e8887984552ae005917 SHA512 1ed6d8d30db4923fd1bd39b6e9622f0db939a45edf8d9f8bdbccfa619fde7fb920c5a0d3f2442f0dd63cf8fda823dbd2983ac5f7c16308bc79e04f61d8e119be
 EBUILD mpich-3.0.4.ebuild 2529 BLAKE2B d60c5eb9d4a9b7838de58dbc93c695ccf379136004a9ea670f9002c8b1173c5d8d7fb5107d29940025bf417dd5f2b3289ed44d062ba0de1f2ccfe77b14ee217b SHA512 c4588f2b52025fe4fca70b6b0b0c83b5595c4f2d281b744cede8f9ccfc73c0c880dea5f2271fb54a52f64a759488e194a14e5c55e017be63690a7aea9e9d2707
-EBUILD mpich-3.3.ebuild 3795 BLAKE2B f712a7c70d2e444c3aa8fa3d32a0751eae7cee897e845537d05e7c8f7cc400a30a2bef493f9a7d29e1499856d930798d535ac19ec3be9ce919abbe31cfa7a971 SHA512 8da57e216efb628c9a523b433b67de59b77e627bf5c6dfd37ea2a16a4acb6c812ec147eedfc45edaaeb17fdef1e002965b1f9ff7cb140cc2af3111798ac00769
+EBUILD mpich-3.3.ebuild 3745 BLAKE2B 8372527de32d88ba6bb6442ecbacdc095ec85022a5564140790a40d56105a55ab32786f871f015511ba17002bcb7ada296448fc8513f3cfd84af4fe72f341dc1 SHA512 833d6e76f108d1fbca423c77c10846ea9fb00c5202ae5d47227074989c4f49e98ad24255292cba52dd4352e0b2d3d56f99b706a246516e48313b102889746a2e
 MISC metadata.xml 547 BLAKE2B e96f9ca4c9bca4aabd1ecda3b3b03713e3841b8a09facc5058f8dd1ec34a4948d1cb1b314b55c2a9d76975babf8ddccabb6c5496ad77abb0b07da43c7e05cfa8 SHA512 850e8575f14a0b0c5bbf81ff738975211a611d6938abddeb98b28538d7176c1f167690f59e705c953792c6bc93f38424247ef1295d56556e82c345131d43dca1
diff --git a/sys-cluster/mpich/mpich-3.3.ebuild b/sys-cluster/mpich/mpich-3.3.ebuild
index 8eeb7b552f05..7f8f685b41ad 100644
--- a/sys-cluster/mpich/mpich-3.3.ebuild
+++ b/sys-cluster/mpich/mpich-3.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=6
@@ -89,7 +89,6 @@ multilib_src_configure() {
 	fi
 
 	c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
-	c="${c} --docdir=${EPREFIX}/usr/share/doc/${PF}"
 
 	export MPICHLIB_CFLAGS="${CFLAGS}"
 	export MPICHLIB_CPPFLAGS="${CPPFLAGS}"
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index e85d8701d3a2..d915eaa983c5 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -6,18 +6,15 @@ AUX neutron-openvswitch-agent.confd 142 BLAKE2B 32c521f734854608173a41625bc037ee
 AUX neutron-server.confd 70 BLAKE2B 88309872ce864e4dfa9072c1472bd6f1e8116f71106ff7e055f6386563ef1077b41f538a72e183ae00e700262d2bcf82434077f0b7e5753389077be3f276b178 SHA512 79f1a40486c37b2c3486b4ef015864f6b20ee89b05d788ce6ade8af934e2c160da9e0495d22e941a717072c1d8ca3b77963a3ec06f3ec25a3f8af8b24a4e40a0
 AUX neutron.initd 530 BLAKE2B 48900bdde5770a0b0db90490d6ae8541dafc96e3fa2aa1c8d75eab5f547be35fa5adb792db8960f71a98bbeb71d56b29e5f5166a47735ebe85804019aa4e1f11 SHA512 c9c7386ae8d97205859f02edb0c7d601059af78def3f232f87e676131c5e6fcdb6e880ccee5b1b15397b1dffe83446421145c90ed448f5e9d55994efd1629f92
 AUX neutron.sudoersd 117 BLAKE2B 30e903fd3d681b779ad7e4758b56bfd78df6165ae030f0a5017dccd1873570db450efd3e7b232f77d6d2e3fcb81cb64d9d44901802310ebe2d88f882d334acda SHA512 143f8a1faa7650bc66b2566d0bd62f71eb743231b9efc4c7df265e53d664418b23182e3f271b86845ed76c537b7f60157e87af59413cf659379f367924d14366
-DIST neutron-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-15.0.0.tar.gz 23546 BLAKE2B df706681e63e4f36b54be33a6619da15d642803f40afe737bd31426f9b3643a6a032cb8bfcb95899d1e67b759155fd14bb45f41460cefdc7d9f91d3377a90d5d SHA512 ef4555be50dfb81a0558ed28eb917a1d0634d913a2b0b58deeae3132a0e3c61521074b21d195e51e348a08b55c21919b537ac3c7122f4d5524ead824642292fe
+DIST neutron-15.0.2.tar.gz 10523237 BLAKE2B d900a95286549ede403a988b206315cee911c0dfde198101c2961a39f3059ed2121352ca0d232eac2a8deacb55344de3073b821312d40156331064b8aa00add8 SHA512 36a2adcbecf7b168a4a8141bae29453bc8122e3400bff9987d2cfe40728896a0a55040c2fd7d98ecade27162e49bbd0918be712940a0c2b7b31984d0677d1dbe
 DIST neutron-configs-15.0.1.tar.gz 23546 BLAKE2B df706681e63e4f36b54be33a6619da15d642803f40afe737bd31426f9b3643a6a032cb8bfcb95899d1e67b759155fd14bb45f41460cefdc7d9f91d3377a90d5d SHA512 ef4555be50dfb81a0558ed28eb917a1d0634d913a2b0b58deeae3132a0e3c61521074b21d195e51e348a08b55c21919b537ac3c7122f4d5524ead824642292fe
-DIST neutron-configs-2019.1.9999.tar.gz 22973 BLAKE2B f454ccc2569ec1e586d88b410d3acbe557f25894c5f4d06558aa242f3d14971b791eca0d827f22400ef02db9899fdb2a501b1b745a531c0f6577318a28c58278 SHA512 dce4a1fd8880d9ffbde9014dffdbb67f69a798a834f9cc6ac6ccd34d520c21b468b16093b3c54fbb472ded501305775b0b31da3c62a860cf19c4486a30c1da2b
+DIST neutron-configs-15.0.2.tar.gz 23546 BLAKE2B df706681e63e4f36b54be33a6619da15d642803f40afe737bd31426f9b3643a6a032cb8bfcb95899d1e67b759155fd14bb45f41460cefdc7d9f91d3377a90d5d SHA512 ef4555be50dfb81a0558ed28eb917a1d0634d913a2b0b58deeae3132a0e3c61521074b21d195e51e348a08b55c21919b537ac3c7122f4d5524ead824642292fe
 DIST neutron-configs-2019.2.9999.tar.gz 23546 BLAKE2B df706681e63e4f36b54be33a6619da15d642803f40afe737bd31426f9b3643a6a032cb8bfcb95899d1e67b759155fd14bb45f41460cefdc7d9f91d3377a90d5d SHA512 ef4555be50dfb81a0558ed28eb917a1d0634d913a2b0b58deeae3132a0e3c61521074b21d195e51e348a08b55c21919b537ac3c7122f4d5524ead824642292fe
-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-2019.1.9999.tar.gz 8642 BLAKE2B 71d945504f3e2185bffddb94956f019fa38bdd4a8782e936de2b8753e2a934374b6f0ed11ea0cdc9d454a80544b2e225e70ff987acbb971d756ae940cf4d7d16 SHA512 399e3f0cd8daaaf18e36d47aa105cf71d70e3ed5f707093e2292e480e3a0868818ee0ee68ca7a8eeb8e28cec51721e2508ed75815f04a415eb42dfe56708fce2
+DIST neutron-ml2-plugins-15.0.2.tar.gz 8669 BLAKE2B 3c34a857c0e7dd4e5313f5f9a1bb22384aeae6d1e43e719c50eab8dc3e842e98f202eb12cbb788127603931292deeed802f0592bad232e6a05121939e3b26fe0 SHA512 0e6858425ee3d3e2233c8ebf19aa8e62b5ff849532a2fdceb953f384f3b33432137537afbb2878f23ec5eb57e185eda36a6d6ff71d8be5f32b43abcb5c186082
 DIST neutron-ml2-plugins-2019.2.9999.tar.gz 8669 BLAKE2B 3c34a857c0e7dd4e5313f5f9a1bb22384aeae6d1e43e719c50eab8dc3e842e98f202eb12cbb788127603931292deeed802f0592bad232e6a05121939e3b26fe0 SHA512 0e6858425ee3d3e2233c8ebf19aa8e62b5ff849532a2fdceb953f384f3b33432137537afbb2878f23ec5eb57e185eda36a6d6ff71d8be5f32b43abcb5c186082
-EBUILD neutron-15.0.0.ebuild 8455 BLAKE2B 5a54bbce1310f6ebb7bb72565984b61850aa4546b2166fcbfa1a433f977447117aa2d2f4599c2c475d22208c6f1b45daa8fd784033c9593477aaed94f717e53b SHA512 a5db11530a440c5447e507e75ad35b5dcf4d8671940bd76bf3e9fe49bf72badfd721a1d907212e5af34779e0667a206399bc53b117f48e3f04be8ded63d76fd6
 EBUILD neutron-15.0.1.ebuild 8397 BLAKE2B c60c20f26aa5325428daf5634e03f85f9013471231389d65d62261cf670d7b544bbe4c40967788df6d0cdfb50b349403860d84a8f67dc2068d1a501df916eaeb SHA512 466a62192eed31b276395f4fab869ff2a8f186878242656cbc89f9f6a65cd26a17b1a5b0b5d90b9179f71a0213b49d7fe04a1688b132c11bdd12b0f548217909
-EBUILD neutron-2019.1.9999.ebuild 8253 BLAKE2B aac9db30aacf9371b60199f7c4b16639270e0e8870b68633d22c62574c65eb1a6be249efa92e80cf8d2a553423038bff79fead92e23c34400225a991a28cc755 SHA512 75243e297fb7397216fb8595f2998c8e4d11fb8aa66652c78bffb9518e8293db59fab28e10fff4d6ed7c042f68ba00549b41c484afe5a87e6b0c8c0a80e3de78
+EBUILD neutron-15.0.2.ebuild 8399 BLAKE2B f03c192d5bb8c5012e614156ec69d96866ed99572a34f07aed36f7c88611e70cba4ea1ba416923c889b56fa89aa74f38cf87f4835a54fcd8d42220c4caf6aa4c SHA512 d2c67e02dd6796310595687210760e423d6f6fdadf29b5ec57576b36b4a18df263bb70e7004b739731b7f6b751d8a3152f68c06b205eb076f3498d28c678488d
 EBUILD neutron-2019.2.9999.ebuild 8399 BLAKE2B f03c192d5bb8c5012e614156ec69d96866ed99572a34f07aed36f7c88611e70cba4ea1ba416923c889b56fa89aa74f38cf87f4835a54fcd8d42220c4caf6aa4c SHA512 d2c67e02dd6796310595687210760e423d6f6fdadf29b5ec57576b36b4a18df263bb70e7004b739731b7f6b751d8a3152f68c06b205eb076f3498d28c678488d
 MISC metadata.xml 1619 BLAKE2B 462b212e519778c98632ec3230e5f0d1a006a229edef034ed0d462559cb0c1763dafb997198241cca4f9c7cb056ebada214c82745dce35b269c2c27d554145a4 SHA512 8f9075719eeec3c3a939e8a1b05a5604bc1e801b227feb5775bfa9f2812e67c41165dc0b2b377685645d9fd9988523356ac77a8db8e73139ab3f035ae59b70ce
diff --git a/sys-cluster/neutron/neutron-15.0.0.ebuild b/sys-cluster/neutron/neutron-15.0.2.ebuild
index 082eab07ed24..518d9465fd1a 100644
--- a/sys-cluster/neutron/neutron-15.0.0.ebuild
+++ b/sys-cluster/neutron/neutron-15.0.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6,7} )
 # still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439
 
-inherit distutils-r1 linux-info user
+inherit distutils-r1 linux-info
 
 DESCRIPTION="A virtual network service for Openstack"
 HOMEPAGE="https://launchpad.net/neutron"
@@ -19,7 +19,7 @@ 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"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 LICENSE="Apache-2.0"
@@ -118,7 +118,9 @@ RDEPEND="
 		net-misc/radvd
 		>=net-misc/dibbler-1.0.1
 	)
-	dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
+	dhcp? ( net-dns/dnsmasq[dhcp-tools] )
+	acct-group/neutron
+	acct-user/neutron"
 
 #PATCHES=(
 #)
@@ -135,11 +137,6 @@ pkg_pretend() {
 	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
@@ -157,7 +154,7 @@ 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
+		dosym ../../plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
 	fi
 	if use dhcp; then
 		newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
diff --git a/sys-cluster/neutron/neutron-2019.1.9999.ebuild b/sys-cluster/neutron/neutron-2019.1.9999.ebuild
deleted file mode 100644
index d34628c1f749..000000000000
--- a/sys-cluster/neutron/neutron-2019.1.9999.ebuild
+++ /dev/null
@@ -1,226 +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} )
-# still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439
-
-inherit distutils-r1 linux-info
-
-DESCRIPTION="A virtual network service for Openstack"
-HOMEPAGE="https://launchpad.net/neutron"
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/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] )
-	acct-group/neutron
-	acct-user/neutron"
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_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_config() {
-	fperms 0700 /var/log/neutron
-	fowners neutron:neutron /var/log neutron
-}
-
-src_prepare() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	# it's /bin/ip not /sbin/ip
-	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use server; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-server"
-		newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
-		dosym ../../plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
-	fi
-	if use dhcp; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
-		newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
-	fi
-	if use l3; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
-		newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
-	fi
-	if use metadata; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
-		newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
-	fi
-	if use openvswitch; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
-		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
-		newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
-		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
-	fi
-	if use linuxbridge; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
-		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
-	fi
-	diropts -m 755 -o neutron -g neutron
-	dodir /var/log/neutron /var/lib/neutron
-	keepdir /etc/neutron
-	insinto /etc/neutron
-	insopts -m 0640 -o neutron -g neutron
-
-	doins etc/*
-	# stupid renames
-	insinto /etc/neutron
-	doins -r "etc/neutron/plugins"
-	insopts -m 0640 -o root -g root
-	doins "etc/rootwrap.conf"
-	doins -r "etc/neutron/rootwrap.d"
-
-	#add sudoers definitions for user neutron
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/neutron.sudoersd" neutron
-
-	# add generated configs
-	cd "${D}/etc/neutron" || die
-	unpack "neutron-configs-${PV}.tar.gz"
-	cd "${D}/etc/neutron/plugins/ml2" || die
-	unpack "neutron-ml2-plugins-${PV}.tar.gz"
-
-	# correcting perms
-	fowners neutron:neutron -R "/etc/neutron"
-	fperms o-rwx -R "/etc/neutron/"
-
-	#remove superfluous stuff
-	rm -R "${D}/usr/etc/"
-}
-
-python_install() {
-	distutils-r1_python_install
-	# copy migration conf file (not coppied on install via setup.py script)
-	python_moduleinto neutron/db/migration/alembic_migrations
-	python_domodule "neutron/db/migration/alembic_migrations/versions"
-}
-
-pkg_postinst() {
-	elog
-	elog "neutron-server's conf.d file may need updating to include additional ini files"
-	elog "We currently assume the ml2 plugin will be used but do not make assumptions"
-	elog "on if you will use openvswitch or linuxbridge (or something else)"
-	elog
-	elog "Other conf.d files may need updating too, but should be good for the default use case"
-	elog
-}
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 5947f507823a..e35dc78f44fe 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -1,33 +1,25 @@
 AUX hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch 1602 BLAKE2B d15d2321ef32b3b16a2084ae1f0c3b6d6a6d4f6f16aa703c3ff0d217bf8900df261e053d3ea7426e889344597bbda59ceacbda6ba4c0ddd046cac4fc3d972d58 SHA512 7732a53f6074432a10bbe7dcca6b64e45bebadb797c214fca9c93d2ec5fd179832f69374c38d2bba5932089fcae6a7045990a1c7bbb048c3b5ab1397e9596c74
 AUX openmpi-ltdl.patch 2449 BLAKE2B 4ea973f09988a45485840cb70dd8f1c72f6b51d38d051f700fe04cd38ea79ca08c81cd8930504b38633fbb31a081cc9e5819c21e1170fa0461870467846a6c52 SHA512 4487ecbd2025d561f5ac46c70da5e407f6f201b7588f350d1211790dceb64ec2acdf3ca8f90e2ecbe8a6f7c3a6577e77fb7ae22be0ff3dd4adbded9035a7b6c9
 DIST openmpi-1.10.7.tar.bz2 13435131 BLAKE2B c1914e6842f59a4a21a27d015275eff00092e57784c4219f58424fbc69c6d9e58109aa1b2ff4e1e340ddc3b93f07d7271e728928772c66c271442e375c08315e SHA512 9c5470f9959ca37650a59e56fb8343c028422c709876ab9d25a411dd09a07cdde927c45d8f3db1ad524b1f2847fe799471d469fa1efee48f8018b2ff24427ecb
-DIST openmpi-1.4.3.tar.bz2 6626909 BLAKE2B 76c87f748908dc91e79114f555f9dc6341729959076221ba92a4c542fb4af16ceac70e5b7567a918604dc1338a1b417c7d358b746a7d4b0c966b3ab8abbc2f28 SHA512 c33d5e019ba0b080aa34ecfa085182349da806e4bff26c1bf4dbdc8fb3f8f3c38899b9d96d671e1ae337b523ac9d634ae25c49d9af6eef2bc340c29dba75b1b8
 DIST openmpi-1.4.5.tar.bz2 6643760 BLAKE2B 6890e8ed6f75e77e0e02c88bce473a37195549bca06696881cf7c3f6e46db25abaa04d9517d7ff9a11ad64cc97cf8d1b8678d9797c49a1659656d8a5de5c56ae SHA512 f89922345cde8978483e397e9016103626db3f1787f9afccaf0f60d59caa2a4409b47b01ac221d60e24e241f2afecb636ca89688bf326dc0ca5c817de96b3e99
 DIST openmpi-1.6.5.tar.bz2 10943881 BLAKE2B 8022d8a146d7e99a01e734d9c9725882bb359a2419dc27afe6a2dc2e8bbc8bca03ec1311e10a12068dd38d0f9c442d1efe5af755192a2ad2af332a1459369953 SHA512 b0ede0264cd9263b8ba59ec51d17ad47b5f20d49d219ca05f7c396d608398d517b2023a46a2535fd6191160d709e4805c4de436dcfee56eda287383bd69f9652
 DIST openmpi-1.7.5.tar.bz2 13286694 BLAKE2B 15862d34f8b8db60e7896f57274555df849713492c6e7e590feb06ec9b3655ff0311a81c0a6c87cc16dc8fd95510a1d79b23467af843d37768f75005ff4edd8c SHA512 72de2788fa26615a2e7373b5f32e0a2b9e39d56094c45b49348ef19bbb0ea306734b7d3275d76471a18628b5244d882de4ed3595eb46f13683e1c8d2b277f065
-DIST openmpi-1.8.4.tar.bz2 13488749 BLAKE2B 25190d5b5853e5b18900ee5b00e5c3524aa7923258e4718ea562da6d7f0e316f777a54be9fa8e15d3ba6e82a00a506c8df15b51a554bfc6f1a6e34c7adda8561 SHA512 d4c8ce2bd3359cf2e85958b58ba18b52c9cef6676718eb3d948309b164b2f54544f8f8419ef6881c7a51ba268a876cd56e9b2d340a106a16fa25fb9fc3e4eff9
-DIST openmpi-1.8.7.tar.bz2 13228742 BLAKE2B d273d038726f0892467416388c4c52f4ed8b655868761306a812c44f93fbde41a157cccf06b8a5ae5d376dcb98a1afd1dc8820268ef22cb567be9c476c9f3f83 SHA512 953e007b00c9753bafc05d13e6f686c9aa47f76f55fcc4eda565174d410de059e07862b7e667d15df13afb80418661d9a8d5ee17fdcc211d3e044992cd9ceede
 DIST openmpi-1.8.8.tar.bz2 13231433 BLAKE2B d196fd0bb08cfb0c86a29ae39015eb15e1465554e322c1ae039b61cee3a027ea0ba8d7fecd02e310309caec416147611a233861e464db4449da3b449387b1dca SHA512 8ca2e3ebb9d9ba0f33faba9bef76fe95293721b73619cbc18176611074a56c277e9ab6cae7fa6c87ace11f16151c1bc495b2a8dbc8ad064d5a8f89f5d431a660
 DIST openmpi-2.0.2.tar.bz2 8311215 BLAKE2B 8dd0d7b95c396e9a0f05760136bbf62defd3527b2ac4f9ec738239b91d8cf5ed0c3dc4ad5330f0ea2fafa3464164e3d514bc058dc9d019daa83382ae990f442c SHA512 87dc3c23db4b9cb92dbacc9b384b21ce8c4288fe4edc204fbf4a3bef70d8ac4329269e777ed190fa87933d78b73b9e5550ea3b925b2039599cfef3953567232a
 DIST openmpi-2.0.4.tar.bz2 8272983 BLAKE2B 7d0a392fbc8c896cdccefb9bf0ff83fbd8db8a42d17f06cb23ac88ba896e2c75e1b1b7a79559d0ce3c2b881f197f54ce1bd8967c889bafe2b97f95fb6b957501 SHA512 2cccb83847d44f6282ec24f7bc12ab51b84dc5ac1a2a919ef0761847ff7cdcb31cfb1f38dca33df7063a98c27a64575a108002716d207cbba3a54773b999e6c5
 DIST openmpi-2.1.6.tar.bz2 8324626 BLAKE2B 4aed4b397c0e0ead24ed5e9bbf45ee8f6719a7566d74405cccf119ddf535891ece91c04cbcad96be5a5d9805c620aa13a1b51c0edd67c049827357e7668008b9 SHA512 f552f47961e040476e7d2949cdd3e5a0b5ad74bea2b6532608117ec893473a160cd368251d1f439fd773f4846950857baf939e7b3586bac2a099495f7bc0e349
 DIST openmpi-3.0.4.tar.bz2 9308341 BLAKE2B 84536082f8415c9a0e41db01d96d64bffc463ca84de7730b25789dfee74e2205db5467739a42f13b0938d0934b45c948cd2be406290cdb4b196a5b51a5a3fc88 SHA512 c9db432e89d680e8857444395fee3544bebd4d1535f3e85a9435ca21f9848fad9f181e6be1ab8b93241b88723395535e3b3bdb2a5dd4128ed26df887b9a55810
 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 6263 BLAKE2B 3b62f526e26cca18bb42ddb1da43401f8250fa3ac948cbef7a7a10f7a8d475efbf0fd728896e5bc57837486c71e7802d1122a9929cac786406c677530c9370ac SHA512 2f6f7b6265536a34596a4b28610bcc753834c7f7d96fd87d2ba13b2c3e4ed80f5cd7905e01c496aac88be5394876ebda9e724fa0f637c81331e506105f2bc056
-EBUILD openmpi-1.4.3.ebuild 2437 BLAKE2B 3efab12eccefe66f6ee61c368fc20e323144b1ab61129c30bd3a0c0a2757dc9394ebf444b60f14b145a59fdcba0420a5b2daeb16e8de95a8e94e9d9f69bd4d93 SHA512 2cc33b0a3a60ac5e262a323927fe3a2c669110be4fa5aa9f0615584763300be72879e1f34fbac9922ad527c972f53166685299242dc9bd4e05bc0113376e050e
-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 4803 BLAKE2B 7a76f303d011bfbc728c1493f84d16dba7b846c35db9f7b480e4d6dc6f9f24560926512c4cc41b78518e1751e2a2023852e878c5b32a6d36756c232683ee68ef SHA512 a207be21dab98a6722c67169ef9b9f106f78942f5d8e71bffc1e4ed5098428293d61021271b0eebe324c71a19f4bec7cfb515207d59b4734533fa024948fd0fd
-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-1.4.5.ebuild 2438 BLAKE2B 2bc673e395029f0892afbbe61ffe81264673db90727f9bd50ac52f836aa813a5f6bad79bac3eab862fd664655b629fc8d00feea48292d2c4f5a603e6cd1972fb SHA512 7e3f32b2887f7b8c7f889ee39fdc32f6968dd67fd82618b382b1069462855b8191b90e7f01254589bbbe94af734bbf0e2369304b341261f4c28c3a20752b21b0
+EBUILD openmpi-1.6.5-r1.ebuild 5008 BLAKE2B 7adca9087c72cd4abd34049d43963a936d64aee6893ac3743d163c62af0e266fea62f2eebcc28b32eadf3ba8a64fe316ce0906f604f2c217f8dd4df0f92b4e4b SHA512 3f33f763da0d4438216cb6458bfae130047f52c40f4a55497a949130b69f6dccb3a84fa750f547920376712f6ef9f2968dee1f3bcb6b585f05ab2d863c0b6519
+EBUILD openmpi-1.7.5-r1.ebuild 4758 BLAKE2B e6c0bfd7a63f4c8ba8b74b6f05ec5341177ea91de39c0f2a95021825632675a09e023b1613f8f4c0e9ba4f9a6df610f18cb77f98beb3f6c1c12de38ac89348c1 SHA512 124de92b7cccd583dd978ef3317e88b19aa1cd04b4a89f89f4ff6f8b778073ac8888d0304bd23869d3f8a929d3c86eb9d0d2d49df4ac79d644e296e2d9175951
+EBUILD openmpi-1.8.8.ebuild 5319 BLAKE2B 3071a92067d41f3559e127ca98854de7bb360ab8b9606ce56fe694067abca83a895345700fff8308413eca8082c833f9ac24ddd078fc5f4dd93b44419151a4b2 SHA512 84b1722fbbc42200d82cf40e82ab09ad2dbbfc9548cf2fb1c3bcb1555f99296b00e2ccf5af38498e4b1de13c728ab3f9e8cee4ea0dc6686c9c3c2025e043fe86
 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.4.3.ebuild b/sys-cluster/openmpi/openmpi-1.4.3.ebuild
deleted file mode 100644
index 995428ba0bae..000000000000
--- a/sys-cluster/openmpi/openmpi-1.4.3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit eutils fortran-2 multilib flag-o-matic toolchain-funcs
-
-MY_P=${P/-mpi}
-
-DESCRIPTION="A high-performance message passing library (MPI)"
-HOMEPAGE="http://www.open-mpi.org"
-SRC_URI="http://www.open-mpi.org/software/ompi/v1.4/downloads/${MY_P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-RESTRICT="mpi-threads? ( test )"
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="+cxx fortran heterogeneous ipv6 mpi-threads pbs romio threads vt"
-RDEPEND="
-	pbs? ( sys-cluster/torque )
-	vt? (
-		!dev-libs/libotf
-		!app-text/lcdf-typetools
-	)
-	!sys-cluster/mpich
-	!sys-cluster/mpich2
-	!sys-cluster/pmix"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	if use mpi-threads; then
-		echo
-		ewarn "WARNING: use of MPI_THREAD_MULTIPLE is still disabled by"
-		ewarn "default and officially unsupported by upstream."
-		ewarn "You may stop now and set USE=-mpi-threads"
-		echo
-	fi
-
-	echo
-	elog "OpenMPI has an overwhelming count of configuration options."
-	elog "Don't forget the EXTRA_ECONF environment variable can let you"
-	elog "specify configure options if you find them necessary."
-	echo
-}
-
-src_prepare() {
-	# Necessary for scalibility, see
-	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
-	if use threads; then
-		echo 'oob_tcp_listen_mode = listen_thread' \
-			>> opal/etc/openmpi-mca-params.conf
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		--sysconfdir="${EPREFIX}/etc/${PN}"
-		--enable-pretty-print-stacktrace
-		--enable-orterun-prefix-by-default
-		--without-slurm)
-
-	if use mpi-threads; then
-		myconf+=(--enable-mpi-threads
-			--enable-progress-threads)
-	fi
-
-	if use fortran; then
-		if [[ $(tc-getFC) =~ g77 ]]; then
-			myconf+=(--disable-mpi-f90)
-		elif [[ $(tc-getFC) =~ if ]]; then
-			# Enabled here as gfortran compile times are huge with this enabled.
-			myconf+=(--with-mpi-f90-size=medium)
-		fi
-	else
-		myconf+=(--disable-mpi-f90 --disable-mpi-f77)
-	fi
-
-	! use vt && myconf+=(--enable-contrib-no-build=vt)
-
-	econf "${myconf[@]}" \
-		$(use_enable cxx mpi-cxx) \
-		$(use_enable romio io-romio) \
-		$(use_enable heterogeneous) \
-		$(use_with pbs tm) \
-		$(use_enable ipv6)
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-	dodoc README AUTHORS NEWS VERSION
-}
-
-src_test() {
-	# Doesn't work with the default src_test as the dry run (-n) fails.
-	emake -j1 check
-}
diff --git a/sys-cluster/openmpi/openmpi-1.4.5.ebuild b/sys-cluster/openmpi/openmpi-1.4.5.ebuild
index 09f1a47cf5a1..06dc029d76c8 100644
--- a/sys-cluster/openmpi/openmpi-1.4.5.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.4.5.ebuild
@@ -17,7 +17,7 @@ LICENSE="BSD"
 SLOT="0"
 RESTRICT="mpi-threads? ( test )"
 
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE="+cxx fortran heterogeneous ipv6 mpi-threads pbs romio threads vt"
 RDEPEND="
 	pbs? ( sys-cluster/torque )
@@ -91,7 +91,7 @@ src_configure() {
 		$(use_enable ipv6)
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 	dodoc README AUTHORS NEWS VERSION
 }
diff --git a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
index 2316cbacd408..2e0401287fb9 100644
--- a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
@@ -153,7 +153,7 @@ src_configure() {
 		$(use_with openmpi_rm_slurm slurm)
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 	# From USE=vt see #359917
 	rm "${ED}"/usr/share/libtool &> /dev/null
diff --git a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
index b89bbeea526c..dab0046aced8 100644
--- a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
@@ -145,7 +145,7 @@ src_configure() {
 		$(use_with openmpi_rm_slurm slurm)
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 	# From USE=vt see #359917
 	rm "${ED}"/usr/share/libtool &> /dev/null
diff --git a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
deleted file mode 100644
index 6fb44825a36e..000000000000
--- a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit autotools cuda eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator
-
-MY_P=${P/-mpi}
-S=${WORKDIR}/${MY_P}
-
-IUSE_OPENMPI_FABRICS="
-	openmpi_fabrics_ofed
-	openmpi_fabrics_knem
-	openmpi_fabrics_psm"
-
-IUSE_OPENMPI_RM="
-	openmpi_rm_pbs
-	openmpi_rm_slurm"
-
-IUSE_OPENMPI_OFED_FEATURES="
-	openmpi_ofed_features_control-hdr-padding
-	openmpi_ofed_features_connectx-xrc
-	openmpi_ofed_features_udcm
-	openmpi_ofed_features_rdmacm
-	openmpi_ofed_features_dynamic-sl
-	openmpi_ofed_features_failover"
-
-DESCRIPTION="A high-performance message passing library (MPI)"
-HOMEPAGE="http://www.open-mpi.org"
-SRC_URI="http://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux"
-IUSE="cma cuda +cxx fortran heterogeneous ipv6 mpi-threads numa romio threads vt
-	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
-
-REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
-	openmpi_rm_pbs? ( !openmpi_rm_slurm )
-	openmpi_fabrics_psm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )"
-
-MPI_UNCLASSED_DEP_STR="
-	vt? (
-		!dev-libs/libotf
-		!app-text/lcdf-typetools
-	)"
-
-RDEPEND="
-	!sys-cluster/mpich
-	!sys-cluster/mpich2
-	!sys-cluster/pmix
-	dev-libs/libevent
-	dev-libs/libltdl:0
-	<sys-apps/hwloc-2[numa?]
-	sys-libs/zlib
-	cuda? ( dev-util/nvidia-cuda-toolkit )
-	openmpi_fabrics_ofed? ( sys-fabric/ofed )
-	openmpi_fabrics_knem? ( sys-cluster/knem )
-	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm )
-	openmpi_rm_pbs? ( sys-cluster/torque )
-	openmpi_rm_slurm? ( sys-cluster/slurm )
-	openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm )
-	"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-
-	if use mpi-threads; then
-		echo
-		ewarn "WARNING: use of MPI_THREAD_MULTIPLE is still disabled by"
-		ewarn "default and officially unsupported by upstream."
-		ewarn "You may stop now and set USE=-mpi-threads"
-		echo
-	fi
-
-	echo
-	elog "OpenMPI has an overwhelming count of configuration options."
-	elog "Don't forget the EXTRA_ECONF environment variable can let you"
-	elog "specify configure options if you find them necessary."
-	echo
-}
-
-src_prepare() {
-	# Necessary for scalibility, see
-	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
-	if use threads; then
-		echo 'oob_tcp_listen_mode = listen_thread' \
-			>> opal/etc/openmpi-mca-params.conf
-	fi
-
-	# https://github.com/open-mpi/ompi/issues/163
-	epatch "${FILESDIR}"/openmpi-ltdl.patch
-
-	AT_M4DIR=config eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--sysconfdir="${EPREFIX}/etc/${PN}"
-		--enable-pretty-print-stacktrace
-		--enable-orterun-prefix-by-default
-		--with-hwloc="${EPREFIX}/usr"
-		--with-libltdl=external
-		)
-
-	if use mpi-threads; then
-		myconf+=(--enable-mpi-threads
-			--enable-opal-multi-threads)
-	fi
-
-	if use fortran; then
-		myconf+=(--enable-mpi-fortran=all)
-	else
-		myconf+=(--enable-mpi-fortran=no)
-	fi
-
-	! use vt && myconf+=(--enable-contrib-no-build=vt)
-
-	econf "${myconf[@]}" \
-		$(use_enable cxx mpi-cxx) \
-		$(use_with cma) \
-		$(use_with cuda cuda "${EPREFIX}"/opt/cuda) \
-		$(use_enable romio io-romio) \
-		$(use_enable heterogeneous) \
-		$(use_enable ipv6) \
-		$(use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
-		$(use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
-		$(use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \
-		$(use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
-		$(use_enable openmpi_ofed_features_connectx-xrc openib-connectx-xrc) \
-		$(use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \
-		$(use_enable openmpi_ofed_features_udcm openib-udcm) \
-		$(use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \
-		$(use_enable openmpi_ofed_features_failover btl-openib-failover) \
-		$(use_with openmpi_rm_pbs tm) \
-		$(use_with openmpi_rm_slurm slurm)
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-
-	# From USE=vt see #359917
-	rm "${ED}"/usr/share/libtool &> /dev/null
-
-	# Avoid collisions with libevent
-	rm -rf "${ED}"/usr/include/event2 &> /dev/null
-
-	# Remove la files, no static libs are installed and we have pkg-config
-	find "${ED}"/usr/$(get_libdir)/ -type f -name '*.la' -delete
-
-	dodoc README AUTHORS NEWS VERSION
-}
-
-src_test() {
-	# Doesn't work with the default src_test as the dry run (-n) fails.
-	emake -j1 check
-}
diff --git a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
deleted file mode 100644
index e50b89fd7f6a..000000000000
--- a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit cuda eutils flag-o-matic fortran-2 java-pkg-opt-2 multilib toolchain-funcs versionator
-
-MY_P=${P/-mpi}
-S=${WORKDIR}/${MY_P}
-
-IUSE_OPENMPI_FABRICS="
-	openmpi_fabrics_ofed
-	openmpi_fabrics_knem
-	openmpi_fabrics_psm"
-
-IUSE_OPENMPI_RM="
-	openmpi_rm_pbs
-	openmpi_rm_slurm"
-
-IUSE_OPENMPI_OFED_FEATURES="
-	openmpi_ofed_features_control-hdr-padding
-	openmpi_ofed_features_connectx-xrc
-	openmpi_ofed_features_udcm
-	openmpi_ofed_features_rdmacm
-	openmpi_ofed_features_dynamic-sl
-	openmpi_ofed_features_failover"
-
-DESCRIPTION="A high-performance message passing library (MPI)"
-HOMEPAGE="http://www.open-mpi.org"
-SRC_URI="http://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="cma cuda +cxx fortran heterogeneous ipv6 java mpi-threads numa romio threads vt
-	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
-
-REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
-	openmpi_rm_pbs? ( !openmpi_rm_slurm )
-	openmpi_fabrics_psm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )"
-
-MPI_UNCLASSED_DEP_STR="
-	vt? (
-		!dev-libs/libotf
-		!app-text/lcdf-typetools
-	)"
-
-CDEPEND="
-	!sys-cluster/mpich
-	!sys-cluster/mpich2
-	!sys-cluster/pmix
-	dev-libs/libevent
-	dev-libs/libltdl:0
-	<sys-apps/hwloc-2[numa?]
-	sys-libs/zlib
-	cuda? ( dev-util/nvidia-cuda-toolkit )
-	openmpi_fabrics_ofed? ( sys-fabric/ofed )
-	openmpi_fabrics_knem? ( sys-cluster/knem )
-	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm )
-	openmpi_rm_pbs? ( sys-cluster/torque )
-	openmpi_rm_slurm? ( sys-cluster/slurm )
-	openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm )"
-
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.6 )"
-
-DEPEND="${CDEPEND}
-	java? ( >=virtual/jdk-1.6 )"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	java-pkg-opt-2_pkg_setup
-
-	if use mpi-threads; then
-		echo
-		ewarn "WARNING: use of MPI_THREAD_MULTIPLE is still disabled by"
-		ewarn "default and officially unsupported by upstream."
-		ewarn "You may stop now and set USE=-mpi-threads"
-		echo
-	fi
-
-	echo
-	elog "OpenMPI has an overwhelming count of configuration options."
-	elog "Don't forget the EXTRA_ECONF environment variable can let you"
-	elog "specify configure options if you find them necessary."
-	echo
-}
-
-src_prepare() {
-	# Necessary for scalibility, see
-	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
-	if use threads; then
-		echo 'oob_tcp_listen_mode = listen_thread' \
-			>> opal/etc/openmpi-mca-params.conf
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		--sysconfdir="${EPREFIX}/etc/${PN}"
-		--enable-pretty-print-stacktrace
-		--enable-orterun-prefix-by-default
-		--with-hwloc="${EPREFIX}/usr"
-		--with-libltdl="${EPREFIX}/usr"
-		)
-
-	if use fortran; then
-		myconf+=(--enable-mpi-fortran=all)
-	else
-		myconf+=(--enable-mpi-fortran=no)
-	fi
-
-	if use java; then
-		# We must always build with the right -source and -target
-		# flags. Passing flags to javac isn't explicitly supported here
-		# but we can cheat by overriding the configure test for javac.
-		export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
-	fi
-
-	! use vt && myconf+=(--enable-contrib-no-build=vt)
-
-	econf "${myconf[@]}" \
-		$(use_enable cxx mpi-cxx) \
-		$(use_with cma) \
-		$(use_with cuda cuda "${EPREFIX}"/opt/cuda) \
-		$(use_enable romio io-romio) \
-		$(use_enable heterogeneous) \
-		$(use_enable ipv6) \
-		$(use_enable mpi-threads mpi-thread-multiple) \
-		$(use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
-		$(use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
-		$(use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \
-		$(use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
-		$(use_enable openmpi_ofed_features_connectx-xrc openib-connectx-xrc) \
-		$(use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \
-		$(use_enable openmpi_ofed_features_udcm openib-udcm) \
-		$(use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \
-		$(use_enable openmpi_ofed_features_failover btl-openib-failover) \
-		$(use_with openmpi_rm_pbs tm) \
-		$(use_with openmpi_rm_slurm slurm) \
-		$(use_enable java) \
-		$(use_enable java mpi-java)
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-
-	# From USE=vt see #359917
-	rm "${ED}"/usr/share/libtool &> /dev/null
-
-	# Avoid collisions with libevent
-	rm -rf "${ED}"/usr/include/event2 &> /dev/null
-
-	# Remove la files, no static libs are installed and we have pkg-config
-	find "${ED}"/usr/$(get_libdir)/ -type f -name '*.la' -delete
-
-	if use java; then
-		local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
-		java-pkg_dojar "${mpi_jar}"
-		# We don't want to install the jar file twice
-		# so let's clean after ourselves.
-		rm "${mpi_jar}" || die
-	fi
-
-	dodoc README AUTHORS NEWS VERSION
-}
-
-src_test() {
-	# Doesn't work with the default src_test as the dry run (-n) fails.
-	emake -j1 check
-}
diff --git a/sys-cluster/openmpi/openmpi-1.8.8.ebuild b/sys-cluster/openmpi/openmpi-1.8.8.ebuild
index 762622c3a983..824231448dff 100644
--- a/sys-cluster/openmpi/openmpi-1.8.8.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.8.ebuild
@@ -149,7 +149,7 @@ src_configure() {
 		$(use_enable java mpi-java)
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 
 	# From USE=vt see #359917
diff --git a/sys-cluster/openmpi/openmpi-4.0.1-r1.ebuild b/sys-cluster/openmpi/openmpi-4.0.1-r1.ebuild
deleted file mode 100644
index 325f9db22542..000000000000
--- a/sys-cluster/openmpi/openmpi-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FORTRAN_NEEDED=fortran
-
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib multilib-minimal
-
-MY_P=${P/-mpi}
-S=${WORKDIR}/${MY_P}
-
-IUSE_OPENMPI_FABRICS="
-	openmpi_fabrics_ofed
-	openmpi_fabrics_knem
-	openmpi_fabrics_psm"
-
-IUSE_OPENMPI_RM="
-	openmpi_rm_pbs
-	openmpi_rm_slurm"
-
-IUSE_OPENMPI_OFED_FEATURES="
-	openmpi_ofed_features_control-hdr-padding
-	openmpi_ofed_features_udcm
-	openmpi_ofed_features_rdmacm
-	openmpi_ofed_features_dynamic-sl"
-
-DESCRIPTION="A high-performance message passing library (MPI)"
-HOMEPAGE="http://www.open-mpi.org"
-SRC_URI="http://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="cma cuda cxx fortran heterogeneous ipv6 java romio
-	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
-
-REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
-	openmpi_rm_pbs? ( !openmpi_rm_slurm )
-	openmpi_fabrics_psm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )"
-
-CDEPEND="
-	!sys-cluster/mpich
-	!sys-cluster/mpich2
-	!sys-cluster/nullmpi
-	>=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads]
-	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-	>=sys-apps/hwloc-2.0.2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
-	openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
-	openmpi_fabrics_knem? ( sys-cluster/knem )
-	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
-	openmpi_rm_pbs? ( sys-cluster/torque )
-	openmpi_rm_slurm? ( sys-cluster/slurm )
-	openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* )"
-
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.6 )"
-
-DEPEND="${CDEPEND}
-	java? ( >=virtual/jdk-1.6 )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/mpi.h
-	/usr/include/openmpi/ompi/mpi/java/mpiJava.h
-)
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	java-pkg-opt-2_pkg_setup
-
-	elog
-	elog "OpenMPI has an overwhelming count of configuration options."
-	elog "Don't forget the EXTRA_ECONF environment variable can let you"
-	elog "specify configure options if you find them necessary."
-	elog
-}
-
-src_prepare() {
-	default
-
-	# Necessary for scalibility, see
-	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
-	echo 'oob_tcp_listen_mode = listen_thread' \
-		>> opal/etc/openmpi-mca-params.conf || die
-}
-
-multilib_src_configure() {
-	if use java; then
-		# We must always build with the right -source and -target
-		# flags. Passing flags to javac isn't explicitly supported here
-		# but we can cheat by overriding the configure test for javac.
-		export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
-	fi
-
-	ECONF_SOURCE=${S} econf \
-		--sysconfdir="${EPREFIX}/etc/${PN}" \
-		--enable-pretty-print-stacktrace \
-		--enable-orterun-prefix-by-default \
-		--with-hwloc="${EPREFIX}/usr" \
-		--with-hwloc-libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-libltdl="${EPREFIX}/usr" \
-		--with-libevent="${EPREFIX}/usr" \
-		--with-libevent-libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--enable-mpi-fortran=$(usex fortran all no) \
-		$(use_enable cxx mpi-cxx) \
-		$(use_with cma) \
-		$(multilib_native_use_with cuda cuda "${EPREFIX}"/opt/cuda) \
-		$(use_enable romio io-romio) \
-		$(use_enable heterogeneous) \
-		$(use_enable ipv6) \
-		$(multilib_native_use_enable java mpi-java) \
-		$(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
-		$(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
-		$(multilib_native_use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \
-		$(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
-		$(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \
-		$(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm) \
-		$(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \
-		$(multilib_native_use_with openmpi_rm_pbs tm) \
-		$(multilib_native_use_with openmpi_rm_slurm slurm)
-}
-
-multilib_src_test() {
-	# Doesn't work with the default src_test as the dry run (-n) fails.
-	emake -j1 check
-}
-
-multilib_src_install() {
-	default
-
-	# fortran header cannot be wrapped (bug #540508), workaround part 1
-	if multilib_is_native_abi && use fortran; then
-		mkdir "${T}"/fortran || die
-		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
-	else
-		# some fortran files get installed unconditionally
-		rm \
-			"${ED}"/usr/include/mpif* \
-			"${ED}"/usr/bin/mpif* \
-			|| die
-	fi
-}
-
-multilib_src_install_all() {
-	# fortran header cannot be wrapped (bug #540508), workaround part 2
-	if use fortran; then
-		mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
-	fi
-
-	# Remove la files, no static libs are installed and we have pkg-config
-	find "${ED}" -name '*.la' -delete || die
-
-	if use java; then
-		local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
-		java-pkg_dojar "${mpi_jar}"
-		# We don't want to install the jar file twice
-		# so let's clean after ourselves.
-		rm "${mpi_jar}" || die
-	fi
-	einstalldocs
-}
diff --git a/sys-cluster/openstack-meta/Manifest b/sys-cluster/openstack-meta/Manifest
index d660084acf1f..6b60a74150cb 100644
--- a/sys-cluster/openstack-meta/Manifest
+++ b/sys-cluster/openstack-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD openstack-meta-2019.2.2.ebuild 725 BLAKE2B 008d57246099fb3c7c9dd3fe75d17ca8c6b7292d5215d732d0f41983b1ddce3ff07778c78bf131f6a7db840b0331b65def740af30661e5a499f5123edc11c81a SHA512 c3ee9e79ba4c1e6a9523531bb13dc0303e57d46beaa57cd8faa48efa1c143ffa51c64eab15f34b4216de311957473fbcd792073f14087e614fc950a0fdec5097
+EBUILD openstack-meta-2019.2.2.ebuild 942 BLAKE2B 1f1d58cd9d7ef6b713899a08adb1e1464a3dc7da4db624b0372b7cfbf124e72c1a462c84abd04f4fd800a1701a6394dc478c95d03819ee4f21bd67926c155a42 SHA512 83a819ab86334cd88ccc3701aa995262070f037e3cf8e33a44f76e57ba25ea4cd491dfba62022a53570f045d15d923eacd55a56f8b75799296208dea8e1c88b5
 EBUILD openstack-meta-2019.2.9999.ebuild 720 BLAKE2B 7b98e630cdf78a504a088f7cbef581ddb23cbd266058a4af622370c8deb5d58bc3d8a6fc65b77a4350ead39b3c120146b26edb23abac2cfb74b2b14a07dd313d SHA512 5d80cc2745055cc52c9b8d9ceb0c7d540e4295135ab8e4fc4af2b0c8cda1ea4e09f35d01634bb8ded59b880321f70cdf73397a741bda21999fa20bb1b4be3ef6
-MISC metadata.xml 931 BLAKE2B 23cfe01ee67c4203f65ae6fe48c75c039948576ee98ce29e319ad7821e1bf7afe2f80dcb88994893a270d7902d37663159223639843f9b026a09c9f7a004d770 SHA512 5a37fd37399ecf64a4b655a117b2ed0bc118a08b281bf71d84cb5f2e0057f67322dd177c2e2572200bff90cef14bfe1d0323f8e3b84d6b8120d859f4c0d4576f
+MISC metadata.xml 940 BLAKE2B 4b051b3ca52e1d545960126dd433ce0000bffce88dbb0f8232870fe2c3bf203133e91c237196544bc7cb20ee40e19665be9b1d88bd54363a40fc37e0a0482200 SHA512 bc45c4c949aeb153bb9e3b37ec6d84fbfb8248d83d58d5f05ed3ed5a38a6ccdd37171e1d6f394c2b8d01306f586b73cb64ff0e48ae5d365f60434c6d9e6cc4b6
diff --git a/sys-cluster/openstack-meta/metadata.xml b/sys-cluster/openstack-meta/metadata.xml
index 57f3985438c1..d2ce7526d7e1 100644
--- a/sys-cluster/openstack-meta/metadata.xml
+++ b/sys-cluster/openstack-meta/metadata.xml
@@ -6,7 +6,7 @@
     <name>Matthew Thode</name>
   </maintainer>
   <longdescription lang="en">
-    An openstack meta package to allow for easier installation of openstack.
+    An openstack meta package to allow for easier installation of openstack services.
   </longdescription>
   <use>
     <flag name="keystone">Installs Openstack Keystone</flag>
diff --git a/sys-cluster/openstack-meta/openstack-meta-2019.2.2.ebuild b/sys-cluster/openstack-meta/openstack-meta-2019.2.2.ebuild
index 135d73ac37cc..2fcebd4b1a30 100644
--- a/sys-cluster/openstack-meta/openstack-meta-2019.2.2.ebuild
+++ b/sys-cluster/openstack-meta/openstack-meta-2019.2.2.ebuild
@@ -16,12 +16,19 @@ fi
 
 DEPEND=""
 RDEPEND="
-	keystone? ( ~sys-auth/keystone-16.0.0 )
+	keystone? ( >=sys-auth/keystone-16.0.0
+	            <sys-auth/keystone-17 )
 	swift? ( ~sys-cluster/swift-2.23.1 )
-	neutron? ( ~sys-cluster/neutron-15.0.0 )
-	glance? ( ~app-admin/glance-19.0.0 )
-	cinder? ( ~sys-cluster/cinder-15.0.1 )
-	nova? ( ~sys-cluster/nova-20.0.1 )
-	heat? ( ~sys-cluster/heat-13.0.0 )
-	placement? ( ~sys-cluster/placement-2.0.0 )
+	neutron? ( >=sys-cluster/neutron-15.0.0
+						 <sys-cluster/neutron-16 )
+	glance? ( >=app-admin/glance-19.0.0
+						<app-admin/glance-20 )
+	cinder? ( >=sys-cluster/cinder-15.0.0
+						<sys-cluster/cinder-16 )
+	nova? ( >=sys-cluster/nova-20.0.0
+				  <sys-cluster/nova-21 )
+	heat? ( >=sys-cluster/heat-13.0.0
+				  <sys-cluster/heat-14 )
+	placement? ( >=sys-cluster/placement-2.0.0
+						   <sys-cluster/placement-3 )
 "
diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index 03fdb1ed01bc..ab0baf6a60b8 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -2,7 +2,7 @@ AUX pacemaker.initd 862 BLAKE2B 4da4af65887be567aa77fff2b3647b64fa86a9862a2269db
 AUX pacemaker.service 105 BLAKE2B 2b77b0c81427ab418bb5af372fb4938a7c630a9bb1e4128ed7335d9d1d11b5fbaf657e9ccabd6a7d4b1a120a00d7e46678f8a7a635b0dee7a2aa60559e78d50c SHA512 478e1040811f16c0c26fad8feb55cf803e5c4ec4a25e7c82ec771663f25270500fce2dd53622abd7126006c4629bdc3a82fb7f16361eb19543619824a56e848b
 DIST Pacemaker-1.1.16.tar.gz 4897772 BLAKE2B a6ea8b3e5f6ef776a67d8895a0361945c5bcd98ecd861c0fd8d8b3c474a6f14c816e1f36da1dccd429ab8d92c53a9dd071796968d5080d6a900518df200fafbd SHA512 967c860fab7b9e73dd8643e6d09083a2a1298a77d71c3b138187803c89153bee7219da13e6b94b20f2881b53ba7fc1c8584a43ff058a265e76708fd5dbccf534
 DIST Pacemaker-1.1.19.tar.gz 5369381 BLAKE2B 9134f014b4da61c01bb2533ad33201400335d9e722e064f5e838df851777cfd17115430bd4623b08b97330bfe98340091f06a98c06dd125761053e79f0375dd2 SHA512 c41403441a3ba7a4fb81b6c3e84d7eff5ee951e1040918597ea8462284c83dc6f572607d4903b1238c55757f1eca78132878a172da4e3b5db2dbfe0831c34548
-EBUILD pacemaker-1.1.16.ebuild 1703 BLAKE2B a7266e084dba208f4370e5fdf4f8decebc19b162992ff4b0f3dd7daeca6d87ae453159a8f130d6bf73e9706c5b19ddc859263f23b979051be887189100beac6b SHA512 22d5da2218c68ffdb63ca5ad631e802ab28ad06f31749b98f8b3c4cc14f3cb0dad3fedd282d8dfbcee1b5c9fbe32a0a0c9f484cbc45d2d6dc8696bf96138c27c
-EBUILD pacemaker-1.1.19-r1.ebuild 1722 BLAKE2B dbfa40ed6003923bad59418476c2ed14679c490c5276262f52c3479878cd952505bb50126f3550d5941a7d8354dc96290e85dbfba67c72415cb1758f196ed10e SHA512 9cc79001a41738654f4f95c81322ceccd97aa25c8a6b8637458694422d3c7cd816a37d59ea9f97ce55c95b534cf5095e3780a93f1c965ecf315335e248205e86
-EBUILD pacemaker-1.1.19.ebuild 1706 BLAKE2B 770372129bd5de9fb9440c89b9724386196c89d9667b30e2b919ee2abf31dd875d7707f7980fa234c34f369fd554c85837ed79c57f9326ec9e6611facb777f2c SHA512 acbfb099817a76e985ac9e1e7bc29d34cc47a06bbd1a57ac8eff64930b2c6bd8e1ce0494d91fa976c044d2472e1b93cfb464dd855f53bef8854ed5ce85f103aa
+EBUILD pacemaker-1.1.16.ebuild 1634 BLAKE2B ff3d8e910f8132df7c6a2ca2429603419b8e3742adb86388e1b3c610eef03da4027f6686ffe9bca3d975008a71d95ba165668e8191f4c0cff3247f76e837b3e2 SHA512 1895c8a7582c7a1a63d598aabe78ee096e1180ee89898870d3cf67f32e75ab35cce63fd9a5aee3ce897cfff343617fe4d5a1444d039909cf9c0e02f3a4c564a3
+EBUILD pacemaker-1.1.19-r1.ebuild 1658 BLAKE2B 930b3112129a3ee362cdf8fe6d58b6db910246e82c3f575ee37c3d408e843e85109507a4f41b459c010b83bdc57b003fa1022640710eed9e483b83656e58ce7d SHA512 46412606edf97b401152fcc1cf181e0a8428804ea0083fa67a38b556103d06fc6b58501753f14a3026420c4a9307125c2a526d92571c389c045a71dd08b703aa
+EBUILD pacemaker-1.1.19.ebuild 1637 BLAKE2B bec518f49dedf193882e42fde6c24f5a6787884739807460c15dd6e71a1ef1967262ab8384ef9902e13e432826a8ca63e97c4eff711d4cbd242f595f5a236361 SHA512 998e69df883392f99074155de857063e55fa5ecaa617665d8c01d393b3295b5b3c4152467879628791464547c1b3fd551843a010f52f699acf59b6a153d191dd
 MISC metadata.xml 889 BLAKE2B 9b52f88582de605852765e0956640e713e68584066410f472beecccbf69db5a8b7226aaf4ce12851b45fd6945d0cde5cd7e524a873599bf35d4e3cf03a6dd8a5 SHA512 dbfaa3e72fbe361e1648a0a1dfd3e0f153489d005f052fc4ddd1468480d53c84a49bb18c0cfc16ac3f2f409f2ff673ec554faae562452420b898167b8650654f
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
index f58cbbd86bea..737be8f19686 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -51,9 +51,7 @@ src_configure() {
 	fi
 	# appends lib to localstatedir automatically
 	econf \
-		--libdir=/usr/$(get_libdir) \
 		--localstatedir=/var \
-		--disable-dependency-tracking \
 		--disable-fatal-warnings \
 		$(use_with acl) \
 		--without-cs-quorum \
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
index 8ad454d732e4..2378565f6dcd 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
@@ -46,9 +46,7 @@ src_prepare() {
 src_configure() {
 	# appends lib to localstatedir automatically
 	local myconf=(
-		--libdir="/usr/$(get_libdir)"
 		--localstatedir=/var
-		--disable-dependency-tracking
 		--disable-fatal-warnings
 		--disable-static
 		--without-cs-quorum
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild
index eea845a19fe1..0c8299ce0378 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -51,9 +51,7 @@ src_configure() {
 	fi
 	# appends lib to localstatedir automatically
 	econf \
-		--libdir=/usr/$(get_libdir) \
 		--localstatedir=/var \
-		--disable-dependency-tracking \
 		--disable-fatal-warnings \
 		$(use_with acl) \
 		--without-cs-quorum \
diff --git a/sys-cluster/rdma-core/Manifest b/sys-cluster/rdma-core/Manifest
index 2f4dedb97483..2b30b3595f35 100644
--- a/sys-cluster/rdma-core/Manifest
+++ b/sys-cluster/rdma-core/Manifest
@@ -5,8 +5,10 @@ AUX srpd.init 546 BLAKE2B 40a03607fd4a85b821a71b98373b5c59f721bb2da78afbede8299a
 DIST rdma-core-26.0.tar.gz 1444585 BLAKE2B 148b25f6108199b3845446e9f45a59d089e7f546218d70abeadffd5cf3e0b26569bc5099abfb6152f376689e04a493529a61fc1d6b40c153aca23b5df2776bf7 SHA512 7dfdd93d10e4c56cac5ac0c1b46900fe7a6c634920e470ebc582abd7a0f57c57d585b4e0dbbb5ad84f46ca8518132e684d44d33c62b0509461ed5b62b7e0f19b
 DIST rdma-core-26.1.tar.gz 1601313 BLAKE2B 459baa80d5cb74386e567880ec7fd2de9e4aaea177e7022603db5dd70f633152d86618bbab637ca337a9314c0c19b5c0f6a51f281802fa0b8bedb8fad149f26c SHA512 98f0e3f3e951f3b2287711526a2a6c62cb4e0f5eb693894c7f44783c5eb6d4213c9eedc39b2370563e8bca17e133497e475392004ace0203d2a39de371254742
 DIST rdma-core-27.0.tar.gz 1445552 BLAKE2B a038653865f8d37b6599a54ca7fef97b2ac131b3a11ce8696b5c1ec558e85332e950f8d5104f250b23a186224735b2a338fc03f875979bff342ad26ebb5b74b2 SHA512 8a299f4d3fe6ea98d8fc8d8135295e55c8bbf5d0d5f2e5fd362a5eb96d86f5aa84263736ab80a3c0eb104c7fc5fb5d43a2077cc6a1fed3d346af89597a4ddee2
+DIST rdma-core-28.0.tar.gz 1455729 BLAKE2B cee2030bda14d3833fa6e851e85d92ec7f91363a09e11bb7ce939ae144e4edbe32653a759a573d94a735ba6766911cb491e7871722bad81e45c3744dc3b8683e SHA512 aec8b8a0d67bcfe42d9d4a53f93bf03ead14fc6f8887fc9f05b2f1ccfd1aae1214c49ecbc01f16b585f71369e3c7a7e2c8d2adc42aa9b31436939b3f3038fde8
 EBUILD rdma-core-26.0-r1.ebuild 2513 BLAKE2B 519c57cb9eb2e8ddbd666668c50e186b106eeff016f8be36ee3f15afadcc7851f65f16684355d4deee14ec66ef0770391fcd3f202423b6a6dc926c26c40afbcc SHA512 f81a43e2b04de7479b61fb626a1dc701ae21bf6c14af586574950965195d8541c09e663a678b5a28a3db658c57da2dc010e7071dcae2e32b465b140a18b3a7fb
 EBUILD rdma-core-26.1.ebuild 2514 BLAKE2B d63803233031ebe7765c685e24a28751f1e83433b49ad7dd6a167d97c007d4076fa3ba01015404ac24897997ce21ada5e634aad920911e9e3e0ee8f74c8517e6 SHA512 3b31ab7ec3630268d4f072046404ab129c3b5539054343d29361d56bdd493b01a04f05701f4bb7f6362787e6144f0dfbf43a6105426ab10b02aa3ed944922801
-EBUILD rdma-core-27.0-r1.ebuild 2538 BLAKE2B 9e36cbb2a9422d89000623f21b5089c422b4ec08709414038bee1158002f27e053d7d6bc7b582642e1af56bcae9260742ba50faaf3f42f05e10d3afda7d36c41 SHA512 910b9558c81b6ae579eb34eb5c6eac66ba82a2fbbf56ec3689fa3082f506235e6afd5956add2eaf543f8003e6380397b62277559a9026fc39a338262ca0d2ba9
+EBUILD rdma-core-27.0-r1.ebuild 2545 BLAKE2B 3527d23b09d389391992ab23b3c54f328fd1ca6439ec45da9ddb90aa594a7aa917ffe29103713e9d2c761044e71fdcbcef55a0730d4a8e74cc4381813a1c61b1 SHA512 91230439a73aff381201d3b34076e1481e21fef3ff6d8760b90894bfa4512397c4d1d7a198e1a9430cd702c90e1e3379fd2e98c07946e9e3a62930b31106adb4
+EBUILD rdma-core-28.0.ebuild 2538 BLAKE2B 9e36cbb2a9422d89000623f21b5089c422b4ec08709414038bee1158002f27e053d7d6bc7b582642e1af56bcae9260742ba50faaf3f42f05e10d3afda7d36c41 SHA512 910b9558c81b6ae579eb34eb5c6eac66ba82a2fbbf56ec3689fa3082f506235e6afd5956add2eaf543f8003e6380397b62277559a9026fc39a338262ca0d2ba9
 EBUILD rdma-core-9999.ebuild 2472 BLAKE2B d1883898cc9fe6f89ce89377ec7f4141c60b7c945d7152c2c59548e396a5f771a4a2b75028886fc2131d51288005ca07de08e347c235d5bb4b75398f9b9b7d92 SHA512 2768d543d83416c519c7305af1ad66c9c7370d090a249fd5d9a5c79cb3245bd5c1824279f1cf8c7ecb26fabaf618adf96d1bcac1a243fb9c3c788d618fa2a8e7
 MISC metadata.xml 559 BLAKE2B 1526777511ab5118d4de73361959107221858659ebbc60f52eb09b45d0798d969f847e4f157501ed6e8c85c2cee1c93d0b26989b357141bba45af946e2e5b0a1 SHA512 5d69acf3d0a323c0d2ee66971fd058c6c0ebf59e4fac0d4777b15bfcc7db8f515b67e6059d204346404ce3b26cdd77c2bea21e1132f418498fe1523eb16dccbb
diff --git a/sys-cluster/rdma-core/rdma-core-27.0-r1.ebuild b/sys-cluster/rdma-core/rdma-core-27.0-r1.ebuild
index 9313f938a56d..f8ee8760f4e5 100644
--- a/sys-cluster/rdma-core/rdma-core-27.0-r1.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-27.0-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
 	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 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"
diff --git a/sys-cluster/rdma-core/rdma-core-28.0.ebuild b/sys-cluster/rdma-core/rdma-core-28.0.ebuild
new file mode 100644
index 000000000000..9313f938a56d
--- /dev/null
+++ b/sys-cluster/rdma-core/rdma-core-28.0.ebuild
@@ -0,0 +1,101 @@
+# 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 ~hppa ~ia64 ~ppc ~ppc64 ~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? (
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_MULTI_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
+
+	use python && python_optimize
+}
diff --git a/sys-cluster/resource-agents/Manifest b/sys-cluster/resource-agents/Manifest
index 125b89fc81b2..25883d77f010 100644
--- a/sys-cluster/resource-agents/Manifest
+++ b/sys-cluster/resource-agents/Manifest
@@ -1,6 +1,6 @@
 AUX 3.9.4-configure.patch 1052 BLAKE2B 1b815cad8bba3049929607a5a236fd1a5937af692ef17b4d2fb67d8846697ca9b9ed1513054f3b9d46c73bfc25f9826bd05b74ab3c2c2ae35d8e3bb508e49799 SHA512 3d716f9ddd24fe7bf6080525a106bb84bd83f684890fef8e88ef2bdf6fcf38409a9b83b0800e6f040b2f38450c8a8a47eb076ee1facd4ec730fbdf08fb98390e
 DIST resource-agents-3.9.6.tar.gz 617790 BLAKE2B a158743dca379dd4bbc9fe1cf784bca3f7cee1f930e9867734fae86ae8c8b39942b5b9a244f3a3efdbbcdb2cdc3718714062d0e7954645bca5f0eb1a4fd7ca38 SHA512 b4ca8b8cc3e09508847af3f1cf50cef946f374eae4ee7903700ba49ef7a3357b1ceaa26dca0616feaa79fb290713f18939dda42ee92a5a7bca2fab807fc77901
 DIST resource-agents-4.0.1.tar.gz 659123 BLAKE2B 47b976db2db2f82b2f5c300dbaa0e794d16f91425aa7641c18915cc2cc499af00a49d9990085ac069602d1bf6b8cf1ff5b477236254d16d15a0c48c6649a0350 SHA512 9c92bca7775e3c47c6463587fd7eea89f019997cfab0361ef37ee97192604d3b3d0dcd1cb70f774e01689b803dc856af170bd10e86a9d4824597293c264735d5
-EBUILD resource-agents-3.9.6.ebuild 1521 BLAKE2B 68b25e51f5cba968e60d66ff8f87941d6c266588c49601024cbcb25628bb1ce384902655f134cc0fe2aa6c5e091c6ec5c8de8adfe11c224d57bca680bd272899 SHA512 0bb816f54d9b9ad8ac3958cee5247fe85546245ae6327d61277163062a0d9aa2f90995a866c47775c69bc6572b878255f2e122a38db9b9db6e351ce8b7e6e095
-EBUILD resource-agents-4.0.1.ebuild 1524 BLAKE2B 5c76aba84df32581b318ee506a91e364a716baafafdd40bfd81cfc3198ad43e4688a7d7cfd75eed685c703f3d8938586ed100a1f64cc7c8079a37fdbc3eedce4 SHA512 dc5803facc4c2bfc64a8bd8f2ca96c6041ddfc81705d4c2b8cd2e50265e9638a8e4e1f381f96157378c8755a579732b1aba592fdca4efba354b081bba2d8935e
+EBUILD resource-agents-3.9.6.ebuild 1418 BLAKE2B 890248c75ca78b40008608652c179badf2c62576d879594430ab4f9a3e7bd63d3bab5da6092bcfe654a059e3d0019a5bd4b96da43b920eaad0b4efa5c98e61c9 SHA512 641a696ed270ded5a13bf5d994797a725437320c119ed4911a071bb35c3a3c505a208b331a46bf8ea8b8f548d4e8b4e3837230c0705bd947cf1f41c1c88a18d8
+EBUILD resource-agents-4.0.1.ebuild 1421 BLAKE2B b7baa3be36db62dcf64fb25c1590d122dd6bd9b205183b5ad6fdddf023550451effaa80abe01e99e5d5f767720e13ddf0257aa2f920f9797ac68da80d45e296e SHA512 6eedba5825d444de0dca94e8443290cbda181ab0c1f5cbc8c28f1d53c5e7e31766ffd33e53551e7a40b92556efbbe984c8a4f47f39861315e22ca2aff7cc8638
 MISC metadata.xml 865 BLAKE2B d90a204c0f8c9785b85951208542e7a61599fd74bfad991fe12d3e9dce6c41bb8f4a4fe6b62ad9afacd8b6933881291272ba3a964d715084368bd9327667eb5e SHA512 954a7cf7c2905824442807d1c0221037321240a60db6400ccad6ea55bd6d0c1822b8e0d5d71537e3cb720e83868d5b56daedd6361571874401d7bc58591b585f
diff --git a/sys-cluster/resource-agents/resource-agents-3.9.6.ebuild b/sys-cluster/resource-agents/resource-agents-3.9.6.ebuild
index 70c075ce6545..fbd5e99fe38e 100644
--- a/sys-cluster/resource-agents/resource-agents-3.9.6.ebuild
+++ b/sys-cluster/resource-agents/resource-agents-3.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -36,11 +36,8 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--disable-dependency-tracking \
 		--disable-fatal-warnings \
 		--localstatedir=/var \
-		--docdir=/usr/share/doc/${PF} \
-		--libdir=/usr/$(get_libdir) \
 		--with-ocf-root=/usr/$(get_libdir)/ocf \
 		$(use_enable doc) \
 		$(use_enable libnet)
diff --git a/sys-cluster/resource-agents/resource-agents-4.0.1.ebuild b/sys-cluster/resource-agents/resource-agents-4.0.1.ebuild
index dcbb842b6cdc..009b0748efca 100644
--- a/sys-cluster/resource-agents/resource-agents-4.0.1.ebuild
+++ b/sys-cluster/resource-agents/resource-agents-4.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -36,11 +36,8 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--disable-dependency-tracking \
 		--disable-fatal-warnings \
 		--localstatedir=/var \
-		--docdir=/usr/share/doc/${PF} \
-		--libdir=/usr/$(get_libdir) \
 		--with-ocf-root=/usr/$(get_libdir)/ocf \
 		$(use_enable doc) \
 		$(use_enable libnet)
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index 9871e4ecd5b9..44d6b8ef7c5a 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -7,6 +7,8 @@ AUX slurmd.initd 2001 BLAKE2B a0464ee0407406c7ceadd8e78f0229f5c6eda7081a691e24e6
 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-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
+DIST slurm-20-02-0-1.tar.gz 8657581 BLAKE2B 402bb9c9a87055940ca525eb5c5e37cb62ad8957ae626682109e885834e6e17e93e3964f65b66c17c5ecc611271bd19709290f7ab79398c8c6b5aa762e476b50 SHA512 2c27133c8598cbb4ad0e6d186732f83cfb1b12460fddd89646b41a4d7c8239afff795db22345216f76ba5b666f1d5c2642dcfcbf38285f66d748424b60f9598a
+EBUILD slurm-19.05.4.1.ebuild 7964 BLAKE2B 448fb69fe8bf9cfe76329910c7bf14e5725fe3b19da23cee5cf7cd3f784e92d70477a881374cabc042679f2ac280ffe216814f4a402bb76101c3117ff7c06b80 SHA512 fe105bd1dd4797935fab2487f47bb57e91526760e4f7099624bafa42c916d0ffe2a839b8d0f75b45f01551e58d534ac5eb3a11c139cc072de87e8e224be50a79
+EBUILD slurm-19.05.5.1.ebuild 7957 BLAKE2B 6626fe4f6d3aa9de349c9526b8d267d06b22c0b77b3902c6d12d563f874d01984743e5f2d11e0c791d322f1f951115c8c750b8ef6bc75bc37efa686d9075746e SHA512 85308f3cb07b6db25391d23778999f3341705b40ee6b11c25eada41ceb8c62b5947be9e8ebae2fef37cc43e26e3bed6600d699ec94b867117ca0b91704fd6156
+EBUILD slurm-20.02.0.1.ebuild 7890 BLAKE2B c8518fba7cf04d91fd42c3b88f69720d92f6e49597574b1ccdc698a45f0e09ecc96db7fd9e8c19345b2d835993b8c9270c2f0b9c2fd06dbfd030abdbad0b42fa SHA512 d0a026181747b83680835e7cb44d54bad9341196b90b5a12839ce0ab1478f87939952b1e01033d2f88e2acb096fca51821c20b1fef2fbca10424cc6f6822ac91
 MISC metadata.xml 1199 BLAKE2B b52e7cae7554d439e7f25da2a80d98993d5c7f7abd5ba8b76c09bf60731b035040f976ac1bfc3c153f81b8feed89e2ceb5e6b676c25cc7b6219c4bcd87bd7e50 SHA512 8f48d582e61789373fc07ffd1db123cb8f43d337b03611972e480179ca5b43f2866392203f470d3d69784f2aae79cbcffdf583cba0aa4a9c25969f2c72a3f55f
diff --git a/sys-cluster/slurm/slurm-19.05.4.1.ebuild b/sys-cluster/slurm/slurm-19.05.4.1.ebuild
index f9a659b1dc90..e412669c3edf 100644
--- a/sys-cluster/slurm/slurm-19.05.4.1.ebuild
+++ b/sys-cluster/slurm/slurm-19.05.4.1.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
@@ -113,8 +113,7 @@ src_configure() {
 	local myconf=(
 		--sysconfdir="${EPREFIX}/etc/${PN}"
 		--with-hwloc="${EPREFIX}/usr"
-		--docdir="${EPREFIX}/usr/share/doc/${P}"
-		--htmldir="${EPREFIX}/usr/share/doc/${P}"
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}"
 	)
 	use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
 	use mysql || myconf+=( --without-mysql_config )
diff --git a/sys-cluster/slurm/slurm-19.05.5.1.ebuild b/sys-cluster/slurm/slurm-19.05.5.1.ebuild
index c7cb6c9ce414..770a3e533907 100644
--- a/sys-cluster/slurm/slurm-19.05.5.1.ebuild
+++ b/sys-cluster/slurm/slurm-19.05.5.1.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
@@ -113,8 +113,7 @@ src_configure() {
 	local myconf=(
 		--sysconfdir="${EPREFIX}/etc/${PN}"
 		--with-hwloc="${EPREFIX}/usr"
-		--docdir="${EPREFIX}/usr/share/doc/${P}"
-		--htmldir="${EPREFIX}/usr/share/doc/${P}"
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}"
 	)
 	use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
 	use mysql || myconf+=( --without-mysql_config )
diff --git a/sys-cluster/slurm/slurm-20.02.0.1.ebuild b/sys-cluster/slurm/slurm-20.02.0.1.ebuild
new file mode 100644
index 000000000000..10e2d81f7ef7
--- /dev/null
+++ b/sys-cluster/slurm/slurm-20.02.0.1.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/SchedMD/slurm.git"
+	INHERIT_GIT="git-r3"
+	MY_P="${P}"
+else
+	if [[ ${PV} == *pre* || ${PV} == *rc* ]]; then
+		MY_PV=$(ver_rs '-0.') # pre-releases or release-candidate
+	else
+		MY_PV=$(ver_rs 1-3 '-') # stable releases
+	fi
+	MY_P="${PN}-${MY_PV}"
+	INHERIT_GIT=""
+	SRC_URI="https://github.com/SchedMD/slurm/archive/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit autotools bash-completion-r1 pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT}
+
+DESCRIPTION="A Highly Scalable Resource Manager"
+HOMEPAGE="https://www.schedmd.com https://github.com/SchedMD/slurm"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl slurmdbd static-libs ucx torque X"
+
+COMMON_DEPEND="
+	!sys-cluster/torque
+	!net-analyzer/slurm
+	!net-analyzer/sinfo
+	|| ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 )
+	mysql? (
+		|| ( dev-db/mariadb-connector-c dev-db/mysql-connector-c )
+		slurmdbd? ( || ( dev-db/mariadb dev-db/mysql ) )
+		)
+	munge? ( sys-auth/munge )
+	pam? ( sys-libs/pam )
+	lua? ( dev-lang/lua:0= )
+	!lua? ( !dev-lang/lua )
+	ipmi? ( sys-libs/freeipmi )
+	json? ( dev-libs/json-c:= )
+	amd64? ( netloc? ( sys-apps/netloc ) )
+	hdf5? ( sci-libs/hdf5:= )
+	numa? ( sys-process/numactl )
+	ofed? ( sys-fabric/ofed )
+	ucx? ( sys-cluster/ucx )
+	X? ( net-libs/libssh2 )
+	>=sys-apps/hwloc-1.1.1-r1
+	sys-libs/ncurses:0=
+	app-arch/lz4:0=
+	sys-libs/readline:0="
+DEPEND="${COMMON_DEPEND}
+	html? ( sys-apps/man2html )"
+RDEPEND="${OMMON_DEPEND}
+	acct-user/slurm
+	acct-group/slurm
+	dev-libs/libcgroup"
+
+REQUIRED_USE="torque? ( perl )"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LIBSLURM_PERL_S="${S}/contribs/perlapi/libslurm/perl"
+LIBSLURMDB_PERL_S="${S}/contribs/perlapi/libslurmdb/perl"
+
+RESTRICT="test"
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	tc-ld-disable-gold
+	default
+
+	# pids should go to /var/run/slurm
+	sed \
+		-e 's:/tmp:/var/tmp:g' \
+		-e "s:/var/run/slurmctld.pid:${EPREFIX}/run/slurm/slurmctld.pid:g" \
+		-e "s:/var/run/slurmd.pid:${EPREFIX}/run/slurm/slurmd.pid:g" \
+		-e "s:StateSaveLocation=.*:StateSaveLocation=${EPREFIX}/var/spool/slurm:g" \
+		-e "s:SlurmdSpoolDir=.*:SlurmdSpoolDir=${EPREFIX}/var/spool/slurm/slurmd:g" \
+		-i "${S}/etc/slurm.conf.example" \
+		|| die "Can't sed for /var/run/slurmctld.pid"
+	sed \
+		-e "s:/var/run/slurmdbd.pid:${EPREFIX}/run/slurm/slurmdbd.pid:g" \
+		-i "${S}/etc/slurmdbd.conf.example" \
+		|| die "Can't sed for /var/run/slurmdbd.pid"
+	# gentooify systemd services
+	sed \
+		-e 's:sysconfig/.*:conf.d/slurm:g' \
+		-e 's:var/run/:run/slurm/:g' \
+		-e '/^EnvironmentFile=.*/d' \
+		-i "${S}/etc"/*.service.in \
+		|| die "Can't sed systemd services for sysconfig or var/run/"
+
+	hprefixify auxdir/{ax_check_zlib,x_ac_{lz4,ofed,munge}}.m4
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--sysconfdir="${EPREFIX}/etc/${PN}"
+		--with-hwloc="${EPREFIX}/usr"
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}"
+	)
+	use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
+	use mysql || myconf+=( --without-mysql_config )
+	use amd64 && myconf+=( $(use_with netloc) )
+	econf "${myconf[@]}" \
+		$(use_enable debug) \
+		$(use_enable pam) \
+		$(use_enable X x11) \
+		$(use_with munge) \
+		$(use_with json) \
+		$(use_with hdf5) \
+		$(use_with ofed) \
+		$(use_with ucx) \
+		$(use_enable static-libs static) \
+		$(use_enable multiple-slurmd)
+
+	# --htmldir does not seems to propagate... Documentations are installed
+	# in /usr/share/doc/slurm-2.3.0/html
+	# instead of /usr/share/doc/slurm-2.3.0.2/html
+	sed \
+		-e "s|htmldir = .*/html|htmldir = \${prefix}/share/doc/slurm-${PVR}/html|g" \
+		-i doc/html/Makefile || die
+	if use perl ; then
+		# small hack to make it compile
+		mkdir -p "${S}/src/api/.libs" || die
+		mkdir -p "${S}/src/db_api/.libs" || die
+		touch "${S}/src/api/.libs/libslurm.so" || die
+		touch "${S}/src/db_api/.libs/libslurmdb.so" || die
+		cd "${LIBSLURM_PERL_S}" || die
+		S="${LIBSLURM_PERL_S}" SRC_PREP="no" perl-module_src_configure
+		cd "${LIBSLURMDB_PERL_S}" || die
+		S="${LIBSLURMDB_PERL_S}" SRC_PREP="no" perl-module_src_configure
+		cd "${S}" || die
+		rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs" || die
+	fi
+}
+
+src_compile() {
+	default
+	use pam && emake -C contribs/pam
+	if use perl ; then
+		cd "${LIBSLURM_PERL_S}" || die
+		S="${LIBSLURM_PERL_S}" perl-module_src_compile
+		cd "${LIBSLURMDB_PERL_S}" || die
+		S="${LIBSLURMDB_PERL_S}" perl-module_src_compile
+		cd "${S}" || die
+	fi
+	use torque && emake -C contribs/torque
+}
+
+src_install() {
+	default
+	use pam && emake DESTDIR="${D}" -C contribs/pam install
+	if use perl; then
+		cd "${LIBSLURM_PERL_S}" || die
+		S="${LIBSLURM_PERL_S}" perl-module_src_install
+		cd "${LIBSLURMDB_PERL_S}" || die
+		S="${LIBSLURMDB_PERL_S}" perl-module_src_install
+		cd "${S}" || die
+	fi
+	if use torque; then
+		emake DESTDIR="${D}" -C contribs/torque
+		rm -f "${D}"/usr/bin/mpiexec || die
+	fi
+	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
+	# install sample configs
+	keepdir /etc/slurm
+	insinto /etc/slurm
+	doins \
+		etc/prolog.example \
+		etc/cgroup.conf.example \
+		etc/slurm.conf.example \
+		etc/slurmdbd.conf.example
+	exeinto /etc/slurm
+	keepdir /etc/slurm/layouts.d
+	insinto /etc/slurm/layouts.d
+	newins etc/layouts.d.power.conf.example power.conf.example
+	newins etc/layouts.d.power_cpufreq.conf.example power_cpufreq.conf.example
+	newins etc/layouts.d.unit.conf.example unit.conf.example
+	# install init.d files
+	newinitd "$(prefixify_ro "${FILESDIR}/slurmd.initd")" slurmd
+	newinitd "$(prefixify_ro "${FILESDIR}/slurmctld.initd")" slurmctld
+	newinitd "$(prefixify_ro "${FILESDIR}/slurmdbd.initd")" slurmdbd
+	# install conf.d files
+	newconfd "${FILESDIR}/slurm.confd" slurm
+	# install logrotate file
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate" slurm
+	# install bashcomp
+	newbashcomp contribs/slurm_completion_help/slurm_completion.sh scontrol
+	bashcomp_alias scontrol \
+		sreport sacctmgr squeue scancel sshare sbcast sinfo \
+		sprio sacct salloc sbatch srun sattach sdiag sstat
+	# install systemd files
+	systemd_newtmpfilesd "${FILESDIR}/slurm.tmpfiles" slurm.conf
+	systemd_dounit etc/slurmd.service etc/slurmctld.service etc/slurmdbd.service
+}
+
+pkg_preinst() {
+	if use munge; then
+		sed -i 's,\(SLURM_USE_MUNGE=\).*,\11,' "${D}"/etc/conf.d/slurm || die
+	fi
+}
+
+create_folders_and_fix_permissions() {
+	einfo "Fixing permissions in ${@}"
+	mkdir -p ${@} || die
+	chown -R ${PN}:${PN} ${@} || die
+}
+
+pkg_postinst() {
+	paths=(
+		"${EROOT}"/var/${PN}/checkpoint
+		"${EROOT}"/var/${PN}
+		"${EROOT}"/var/spool/${PN}/slurmd
+		"${EROOT}"/var/spool/${PN}
+		"${EROOT}"/var/log/${PN}
+		/var/tmp/${PN}/${PN}d
+		/var/tmp/${PN}
+		/run/${PN}
+	)
+	local folder_path
+	for folder_path in ${paths[@]}; do
+		create_folders_and_fix_permissions $folder_path
+	done
+	echo
+
+	elog "Please visit the file '/usr/share/doc/${P}/html/configurator.html"
+	elog "through a (javascript enabled) browser to create a configureation file."
+	elog "Copy that file to /etc/slurm/slurm.conf on all nodes (including the headnode) of your cluster."
+	echo
+	elog "For cgroup support, please see https://www.schedmd.com/slurmdocs/cgroup.conf.html"
+	elog "Your kernel must be compiled with the wanted cgroup feature:"
+	elog "    For the proctrack plugin:"
+	elog "        freezer"
+	elog "    For the task plugin:"
+	elog "        cpuset, memory, devices"
+	elog "    For the accounting plugin:"
+	elog "        cpuacct, memory, blkio"
+	elog "Then, set these options in /etc/slurm/slurm.conf:"
+	elog "    ProctrackType=proctrack/cgroup"
+	elog "    TaskPlugin=task/cgroup"
+	einfo
+	ewarn "Paths were created for slurm. Please use these paths in /etc/slurm/slurm.conf:"
+	for folder_path in ${paths[@]}; do
+		ewarn "    ${folder_path}"
+	done
+}
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index 33700296143d..d44b6ab276db 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -5,8 +5,8 @@ AUX swift-proxy.initd 1379 BLAKE2B 56453a557c0abfd6b07f65778ef14d8920bedc4133e0e
 DIST swift-2.22.0.tar.gz 3070436 BLAKE2B 53049ba901cf5a46d4567c7fa3620b0ad486d88897beb75887d81c5beb747a08ff52e7eba93eab9e9e087c82447d99f0fd85c97211fb4e930ce5b27a1bba41f1 SHA512 855f9d35399251ac86d687b652a9372da4d2f03dff8dee1743357c14c79f6ea8903b7c67d99fed08b6b4cdfa2cfd6ecb78b010b2ee83195eda30c4a9463a5a0c
 DIST swift-2.23.1.tar.gz 3044545 BLAKE2B b3b06aefa7c58b718f7d9c1c1b9bc92f442b83202b8d5c2dbbb777650088f2d939f5e9d0fbe83cea38fd6635d072cd8bb3894d64ed9767dde203064c1b81cfdb SHA512 48aa82b178f5e3901363c2b9eeeedeea12a58b1ba86cc46937dd9ec074ecc005b04a6ce732d4e9fce2497c6c62b659038da40ed43550256584bb371df4e596fb
 DIST swift-2.24.0.tar.gz 3177018 BLAKE2B f465f0e8f58cc097b5b1fdbe5c9736ee3e2247d13d8ae1beeb7e736dd1246e7d8820cb7241afb67e651ad85c269a48d9dbeda3479dadd773bfc1fe3278731afe SHA512 f8e3b0fec06776e095067b2c12f782a9a787c814cea8039ec32930c562be5c74b4b2bf4cb9dad3481953e5163bd051fe32f3074be7776fd1af0be94982d113b6
-EBUILD swift-2.22.0.ebuild 3854 BLAKE2B 92ade52d11d331d9f08ed9ff7f017453c2c4bbb68edf13a7e3a4f61ec2b1817bd0ef18fe680cb7862224da8b3a1405242499a21489dd2fd1f9e066eaf384525b SHA512 573572d4dab5a4be49bd4638221e757804454571a246b2333ceac48b105e1a099b07d62c7b01885980a435146cdc2a61635bd04f05b0b38295b05af1f3378054
-EBUILD swift-2.23.1.ebuild 3855 BLAKE2B a72c67caf9cb6cab55e24ed942e708ed6f4b08aa4806178c6421e76896c9afc5e4ba963bc88b0e2d46e233f710eff368d12715ab79ca8c064f61eb1cff002b96 SHA512 ab4c4ae34bd94e42b008c671c3d4df017fd45b06108b5ef82e693ae0bac9269a9c27d9304025260128adf86cd798c078ffa80515e51a0e7c97a899f19bac1ccd
-EBUILD swift-2.24.0.ebuild 3837 BLAKE2B 2fd42f1864db9312f8c66e9379ead2560295dfc87ea5d6d98db37d3c38a128621b6d0ceba8f1415bd0b3cc277cc4be25dbae3613684f9e0628a208ae329b8687 SHA512 5b580e2377d322971b24a19cd02c331ed6d0b53afc5f016f4fb1ced11fa327e7c6f9ca62aea376149de3c46ed6d190f6d07324059b8ce724ca77a24f2fd9f8e7
-EBUILD swift-2019.2.9999.ebuild 3837 BLAKE2B 2fd42f1864db9312f8c66e9379ead2560295dfc87ea5d6d98db37d3c38a128621b6d0ceba8f1415bd0b3cc277cc4be25dbae3613684f9e0628a208ae329b8687 SHA512 5b580e2377d322971b24a19cd02c331ed6d0b53afc5f016f4fb1ced11fa327e7c6f9ca62aea376149de3c46ed6d190f6d07324059b8ce724ca77a24f2fd9f8e7
+EBUILD swift-2.22.0-r1.ebuild 3804 BLAKE2B 1c7081b788f4da4ea97a5f887201f753301d83c0970d20ac841bd816b6728177cf671e95a0b1bad65e5853c283e100668e93db9662dec22d185c3ae6121f3cbe SHA512 1614de090b295474d6c3c9acf844b88ec857cd6b610683922c5db909dc296799459577e7d4676d6e4007a1261740b8e4615bdfaa3f7706ea0e13a876d70a74a8
+EBUILD swift-2.23.1-r1.ebuild 3805 BLAKE2B 619a072a04ce20ad0757cbf047cdf6684c42eed448132de651db9c066f643b25bd1ba20738d9cbabc6270d39453ea7f3caf9f68b3aea554171ff5ef9ff3ad6e7 SHA512 997d0ff187e617dcbe32bfac47661ebcbe2f08b81de89869d6d0ae32a2967cc2ec3d715c1640f2a8beafa6125672c5cde2495086d0302bb7387b187c5b596fa5
+EBUILD swift-2.24.0-r1.ebuild 3787 BLAKE2B b09da5a79610d9fa84b60c6cfd694a98f9bf14eb5a1183803f0cf804e50f8f1ad3d6ca40b193070f67122904ca80abd470b4fc227cfe35bd89fd97fa666ffd2b SHA512 4985cea1d149f77c2579d1e67205def3b8162bf5c2b9e7e6592dcbe642a3d9c72cb627d1f4a3a8ac1ed47ced7a40d80661e8ecffb8f9e1198ddf133abd60abed
+EBUILD swift-2019.2.9999.ebuild 3787 BLAKE2B b09da5a79610d9fa84b60c6cfd694a98f9bf14eb5a1183803f0cf804e50f8f1ad3d6ca40b193070f67122904ca80abd470b4fc227cfe35bd89fd97fa666ffd2b SHA512 4985cea1d149f77c2579d1e67205def3b8162bf5c2b9e7e6592dcbe642a3d9c72cb627d1f4a3a8ac1ed47ced7a40d80661e8ecffb8f9e1198ddf133abd60abed
 MISC metadata.xml 898 BLAKE2B 3d502769ba44cdc1e3a500929d60a1ed82d8540297b2dfddb6d6745ec9b5b56bd9fe7130a738858b9bac653b49634efae1841600325194d69ec30222b2e8b3f2 SHA512 3f9d2cf7538fe32010b811d3a49802eb085dde793b29d9590fe3032d63a743f620e3c1dcf1226b59aa5938ea239f440997a3d4d489f9887816621879e19a0c4c
diff --git a/sys-cluster/swift/swift-2.22.0.ebuild b/sys-cluster/swift/swift-2.22.0-r1.ebuild
index a69e441eb239..84ba4cd0845d 100644
--- a/sys-cluster/swift/swift-2.22.0.ebuild
+++ b/sys-cluster/swift/swift-2.22.0-r1.ebuild
@@ -39,7 +39,6 @@ RDEPEND="
 	dev-python/pyxattr[${PYTHON_USEDEP}]
 	>=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]
 	memcached? ( net-misc/memcached )
 	net-misc/rsync[xattr]"
 
@@ -66,7 +65,7 @@ src_prepare() {
 	distutils-r1_python_prepare_all
 }
 
-src_test () {
+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
diff --git a/sys-cluster/swift/swift-2.23.1.ebuild b/sys-cluster/swift/swift-2.23.1-r1.ebuild
index 1b2a5d5648c0..81130d620e21 100644
--- a/sys-cluster/swift/swift-2.23.1.ebuild
+++ b/sys-cluster/swift/swift-2.23.1-r1.ebuild
@@ -39,7 +39,6 @@ RDEPEND="
 	dev-python/pyxattr[${PYTHON_USEDEP}]
 	>=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]
 	memcached? ( net-misc/memcached )
 	net-misc/rsync[xattr]"
 
@@ -66,7 +65,7 @@ src_prepare() {
 	distutils-r1_python_prepare_all
 }
 
-src_test () {
+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
diff --git a/sys-cluster/swift/swift-2.24.0.ebuild b/sys-cluster/swift/swift-2.24.0-r1.ebuild
index 66211332bf21..dfb4786356f7 100644
--- a/sys-cluster/swift/swift-2.24.0.ebuild
+++ b/sys-cluster/swift/swift-2.24.0-r1.ebuild
@@ -39,7 +39,6 @@ RDEPEND="
 	dev-python/pyxattr[${PYTHON_USEDEP}]
 	>=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]
 	memcached? ( net-misc/memcached )
 	net-misc/rsync[xattr]
 	acct-user/swift
@@ -63,7 +62,7 @@ src_prepare() {
 	distutils-r1_python_prepare_all
 }
 
-src_test () {
+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
diff --git a/sys-cluster/swift/swift-2019.2.9999.ebuild b/sys-cluster/swift/swift-2019.2.9999.ebuild
index 66211332bf21..dfb4786356f7 100644
--- a/sys-cluster/swift/swift-2019.2.9999.ebuild
+++ b/sys-cluster/swift/swift-2019.2.9999.ebuild
@@ -39,7 +39,6 @@ RDEPEND="
 	dev-python/pyxattr[${PYTHON_USEDEP}]
 	>=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]
 	memcached? ( net-misc/memcached )
 	net-misc/rsync[xattr]
 	acct-user/swift
@@ -63,7 +62,7 @@ src_prepare() {
 	distutils-r1_python_prepare_all
 }
 
-src_test () {
+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
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index ec3707a0701a..62769f88bcff 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -21,5 +21,5 @@ DIST torque-4.2.10-gh-20150517.tar.gz 5836286 BLAKE2B 7108f1adcb6f674526b7db97df
 DIST torque-6.0.4-gh-20170829.tar.gz 6182495 BLAKE2B f9156ae4ffe388a7f3fa0df142e5f2d48c16fd7b8c148a3a80cd1c977eb0c1ef4a455da275f993100867be043422526ed05c53734e707851083d6d23ee1a2cc4 SHA512 8f1101adb89e06617de501f7956e126633b78b495baeb7980d3c534d34537cc604a3cf0a7c23c48eb2554b26cc13672b0e00c75d0f722d63ac4d42d57388ed94
 EBUILD torque-4.1.7-r1.ebuild 7489 BLAKE2B d501d043c61825faf2101d7d47d20f373f05f9e4135ad86c2c61ac75002dd462c29c3ad23f856020c0bc008563d2c97b638f5eb2422544af8e576e8816422d3e SHA512 005bf4107b0bdf7fc7adc441196dab1cc900332c0988dd332bb0621eabf67406675cccf6da0fd1315064611343d7debc44726f62ff8838ae317b0186fdd7ab41
 EBUILD torque-4.2.10-r1.ebuild 6086 BLAKE2B c685ce4e6b5b7f58c040f0b16779bb59540aa0c80fe9a55b76d603e336e63a5186d543d664caa0f6184c3145c9608b31fed379b2e827bdcd62e6e53f8334b5cc SHA512 2c64f7dfaa26e1648e32283c1dcc31df0dba8bf3c4177fdafbe713d408d931ca83c2386d3548b47e1d6d90552e4c5ceeadf96c50089f2d17eb56d79312dc70f8
-EBUILD torque-6.0.4-r1.ebuild 5543 BLAKE2B ee956490a4cc94d9b6be9000b9886f0a04b5a1324a1447240f25de90abeedb78e237e98f6ff520a34eb6ae145cfc3a4f3e6d7bbac5de6620b10aeafa3fa198c2 SHA512 07a22cabbd04268d1a035aed2aba774a7bacb831879062e9f9f9c5638d13605a1e5716aeaded6ab3abe4417a9391aeed7c92426640045a60cab0d8b0c95e8f47
+EBUILD torque-6.0.4-r1.ebuild 5516 BLAKE2B 4d5df405f257a71a5fe828e2c30ae752c5f90f90de1d4f08d76aed91a4b4a00cc0d2d9ea6ba55958f655214c9c5ce11913dfe7db54a1ad27f899638874db9903 SHA512 c990b36581da9eff9614149dc0a4d51e3306cb4fddca685de5a7d4d6d17702d33aec6416a676348726a8d3202e92e3ba3a6e817d9103d22c5b0fab19e253b857
 MISC metadata.xml 988 BLAKE2B 257e838c8bde7ceea876a84631c248fce2e3a347794459bbfd4ae23210c779f69e606e120438351783ebf1cdeab7bd5e5df196ee9af31306bebd6130a08bb46f SHA512 46f2eb41303c17e84aacf5b8548b645772ab923bf9a4847892260cc5c6aaf354acc0bb0128186acf312ed77a24d9429c97f18914d759c7c5c97c19ad62489a43
diff --git a/sys-cluster/torque/torque-6.0.4-r1.ebuild b/sys-cluster/torque/torque-6.0.4-r1.ebuild
index 93a88643f0d3..456675c959f4 100644
--- a/sys-cluster/torque/torque-6.0.4-r1.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-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=6
@@ -113,7 +113,6 @@ src_configure() {
 		--with-environ=/etc/pbs_environment \
 		--with-default-server=${PBS_SERVER_NAME} \
 		--disable-gcc-warnings \
-		--disable-silent-rules \
 		--with-tcp-retry-limit=2 \
 		--without-loadlibfile
 }
diff --git a/sys-cluster/wulfware/Manifest b/sys-cluster/wulfware/Manifest
index 10d82402c1a2..a3508fb00745 100644
--- a/sys-cluster/wulfware/Manifest
+++ b/sys-cluster/wulfware/Manifest
@@ -1,5 +1,5 @@
 AUX wulfware-2.6.0-opts_and_strip.patch 5085 BLAKE2B 91f47591019cb6a3134a2713f7768ad9a82ae26863251784166b5a4974a7729fdd55b8796c85f39f90af3a19642f65cdc84dbbbe813b49b13be2787a9de7c516 SHA512 2c2f897374a5a81feef97a0db425961b4e58cbc62cfebe026dd3661bacd1737ce5e023385f0e6725160087c9a549c37c23be02cdfa0c680b473b94cd6ed212a0
 AUX wulfware-2.6.0-tinfo.patch 762 BLAKE2B 1ef928141e186ec8dceeea98c14123a0bbd71fa9707500a5ee9fbd7075877c0d993b86df5212780f7fcf072976dcfc4bb2ca267003ed67ffdcfc883eee0846bb SHA512 e0b0ae730078f083b5546d98a6f6b60d7df6083ad20fd31b0d7a277e3baab8f384bd0c1bb45315231743e2cf24764e8f1cf55edcbb6d30d515148884efb7ebc5
 DIST wulfware-2.6.0.tgz 469000 BLAKE2B 23730adeeafcef0761455fd62e744fec0fad1d8f1b13eabe256b27fa16a7bb468ff33b08ebff29e9c2c69c044e15fbf3b4d0ea2c39081ed7015089989bffa7b9 SHA512 626314124c836ee937f860a4093272d5b6e12b5d3aca631647bde6ef03880e2dd7916ab2805f34c4863e915ea3295e5c5d69ced9c5ec05b224cdf849738c78cd
-EBUILD wulfware-2.6.0.ebuild 1317 BLAKE2B e09dbeb4d892b3b0979bc8092eb64acfde2bc18e336c85770543184a31d22d55941a0ce4f0310d0406c95b216732b7626ca2630d518561f8e67f964206cd2f95 SHA512 934b4907c6f7c7a66cb36c8265acc167dd3442c8e8da9e47fb442fdbc33d6560ac2aacbf0ee69673bd6a741d6f56b5a2ddd53a16af191c4d75dcfa1711274dd8
+EBUILD wulfware-2.6.0.ebuild 1287 BLAKE2B e902cf290057c4dc7cc3ab7a58abdb8dce016488337cdb7ab42771f782cd57e20c6bce9592241597b1fb9e05c0c6155ebd69ae032ce3d795fcb8a790a534e909 SHA512 0e92b1e44f7a33496874c18dd70ee7429e4affc91ea869c2e5e50d602e4422f74c7c03186fa2645d6e525f812287ab3909f65226a9d636307ce32994d76bcea4
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-cluster/wulfware/wulfware-2.6.0.ebuild b/sys-cluster/wulfware/wulfware-2.6.0.ebuild
index c38cff22bd46..1d6812f51d53 100644
--- a/sys-cluster/wulfware/wulfware-2.6.0.ebuild
+++ b/sys-cluster/wulfware/wulfware-2.6.0.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
@@ -37,7 +37,7 @@ src_prepare() {
 
 src_configure() {
 	tc-export CC
-	econf --disable-dependency-tracking
+	econf
 }
 
 src_compile() {