gentoo resync : 17.07.2021

55 files changed, 1615 insertions, 286 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index e4213a71d8aa..806aa22205fd 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ampi/Manifest b/sys-cluster/ampi/Manifest
index e0a6038d4089..84f8ce4c2afb 100644
--- a/sys-cluster/ampi/Manifest
+++ b/sys-cluster/ampi/Manifest
@@ -1,3 +1,3 @@
 DIST ampi-0_pre20140616.tar.gz 1127315 BLAKE2B e003f44f74449b40f5cb2c98ca4d0eebd39aa82363c519e86b58cdd11056153d8cf9b196819cb654fcfb9eaa12ef9ca8a819a1c06a1a1f34d599541b5ac6aece SHA512 b6a8790c1686a32546194fa6c3818aa9d2ba08911621d5251e85a4114dad75e350f18560cf0527811c487f804265bc09a4b80faeab5eafbd670e4dfa103fe078
-EBUILD ampi-0_pre20140616.ebuild 500 BLAKE2B cdb0993f74f840679985ec7bf9b8c605df846ce662b2f3159d8d052c9d4d92049631f27fde9ab1aefbde4acc9726c899be72386aaeb8991cb6be0d4ff369ab15 SHA512 e1b59c0af768fc9b863cfb0153ac24ea2037a9ace4c89638a28b7ee388e6a13865fab1aaf2fb52e8259a4a7d1afcf6f24ab30a4cb67f19470752b34395276685
+EBUILD ampi-0_pre20140616.ebuild 516 BLAKE2B 3591b399e0e5e33d1896ede3566790f4de473078fb0ac0e98296a2e8dd83ed7ce803464f381b90ae6bd532b5d02a39d3f83d37bafe00abe89921c68d7644a50b SHA512 77bf3aff6604a79a6027034ef497ea6be1a7de7abb32a17be48164239beeb8ebbd4657f5483f35632810ab04c1afe68c6bb74cf58a2d1968fbc37b9aab11ac56
 MISC metadata.xml 257 BLAKE2B e4f657523a349a531d465953f61a55f61c3d1262af149695624b6f601aa464e39a1bceec34b26d97804e441ac6b45e48f930006a77e60e031a3e321b8297ed4a SHA512 ac9b4b4f3ef6a190cf1465bfac8aaf69c9c7b91e2cf3876e19a0b39264accaae12e301a2059bacff7781d0fb1f40499cb2930be0cd3f7ef9cb1a40d266ad059f
diff --git a/sys-cluster/ampi/ampi-0_pre20140616.ebuild b/sys-cluster/ampi/ampi-0_pre20140616.ebuild
index e0473fa93aee..8966cb761423 100644
--- a/sys-cluster/ampi/ampi-0_pre20140616.ebuild
+++ b/sys-cluster/ampi/ampi-0_pre20140616.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 inherit autotools
 
@@ -11,11 +11,12 @@ SRC_URI="https://dev.gentoo.org/~jauhien/distfiles/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="virtual/mpi"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
+	default
 	eautoreconf
 }
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 3f1bf307ce95..96941eb47f0a 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -52,9 +52,11 @@ DIST ceph-14.2.22.tar.gz 130597047 BLAKE2B 58bbb3243de076ed1d25dfd7bd75717c50ad1
 DIST ceph-15.2.12.tar.gz 148509713 BLAKE2B 4962e7d574b38592a874a1b3fa8610bb2d0afc8713d995d67a790c025bb086cb619cbbaec76482ec096b4c55b9f1df383f5bd4806a231bc88e70ac3efbac24b5 SHA512 08266a2e9a7ca5a37e03f340873571fd012c630dd898a87241cd97c29760b2bf41fe64c8883e7b08e0f83c26245072cd26e69ecb1db02378d1ec38335ba1cd0f
 DIST ceph-15.2.13.tar.gz 148542333 BLAKE2B 2e9668bcb0fd283ec4ab51b0c6142fc9a3b6310eb5d34e07da5e6b73b55dd7976db5ab9c78a93684ddc2f51873b1a17c4d31c5f5647b2d43a2826ee5362f7e5d SHA512 bde28c331c489db0845959f65c425146c317466a7793f56a83e2827dec35b8cd6f600bf9056151c1e6926cc0155deebbc8681c240ac9f37ad876b9a6afae96da
 DIST ceph-16.2.4.tar.gz 155840423 BLAKE2B a803ffa61ac9fd6d42790d6d8e12aa8df843968627df0051475355f3ba0dc1272afa3d9e2716115ad769b2f322d7bd239d99b89e51610e89ce9efe39af4f01ae SHA512 8904e7fcabd50276e4e86735fd85dba96f417c194c219025146f994707def7abe372528b0f2e862e274b2f405d7b791bac86b6cbb8d57cecd6f44023a2ffb6f6
+DIST ceph-16.2.5.tar.gz 155933825 BLAKE2B 3c8f3f1663b91d4de1e3736317add0b88d9083db5ab2fc3e2e913278977deec076bd4410e309f4e47ccc169d74356c2ab1221c94532cc45ee75ec73673fc42a0 SHA512 5c32f9aa817ecfa788725bcfe5743756853ca9b3f9ee453242110f1b5e1bdd1feaef79ad9ccf2b185445c9644bcecb1355e151a2255bfd27edc9818e0d6d4c4a
 EBUILD ceph-14.2.21-r2.ebuild 10431 BLAKE2B da08ec46959c57da162051019010c20bd718e1def03a99f7a74dfae5a8305b63d720b5da00fd26c0527683d13e703d223c09d86fad88c251934b28a20d444efb SHA512 38ca1c08982148a210c9aeb308407cc118c67e315aee6d20f2255f01f48656dfa622d610337dcbd5b83d27cfba60649c1d8aa07beed84d9ffe8fb74c644a4d8c
 EBUILD ceph-14.2.22.ebuild 10379 BLAKE2B 970b467d01d8b294f5c886e843e0f85c19dccf6bfe17726f7e6a34ec2e34557b90a96305d2b62e45a9e3264e5eb9335b1f29cc37a52fb116387b85aa62d685f6 SHA512 f64bf074c77fc603b4ade5c2ac341218c932f4058eadbaeff29bbf6f10facf60b09698bf0a6fa2de6d7feb6271dbe2ff9ad41e2e60b8b0d57ab2a9517f346775
 EBUILD ceph-15.2.12-r2.ebuild 10780 BLAKE2B c3ceaef839451ad3c05d8d3ffa389a3e8a2a65563a0276c3b5b6f9e81a02590a77561d5a1ee7ac6842ad1295d3f2908fe3c4aede5edb50f15eaec2ebe2dbeae2 SHA512 f2d503964a06f6ebab1e080ae574744c455ba34323ab04de7d98ff7f6b33b8d0439b179412fd3410ab2602443f2c5757621238a4006edc73aaddb001b9b81c8b
 EBUILD ceph-15.2.13-r2.ebuild 10676 BLAKE2B df69ca97ef59cd7934aab08fa4e754e69ccf0a000e06523bd444681fde18171adc71acd4b99d5935174542cc0c3eb12ae39e557a078bc296e482047092514b1d SHA512 474f065867fbdf66832e4d910d90447406dcb0483727ce42e8e5ae13b8222294e05838fa18990998b3cb693a27e0fc2de4a06402120535088a12c374ede8f814
 EBUILD ceph-16.2.4-r2.ebuild 11991 BLAKE2B 62c9ee82927b0ae110e8bad74e76a39cf3ccbf1e4d5d247784d4962fa619fceec2c463885c574fedb5ec75d4f369a0152afd007550d60fe8833dd1faa0c71d26 SHA512 09d8ce0d5aa9ae0b11b6c2918ef06807a9065b8d4341df7c0ff9b5f87ef1896589d2d1437eb70a4ed0cf5f0a29c01d998318797a358a96b5b56fe5caa8dbbeeb
+EBUILD ceph-16.2.5.ebuild 11991 BLAKE2B 62c9ee82927b0ae110e8bad74e76a39cf3ccbf1e4d5d247784d4962fa619fceec2c463885c574fedb5ec75d4f369a0152afd007550d60fe8833dd1faa0c71d26 SHA512 09d8ce0d5aa9ae0b11b6c2918ef06807a9065b8d4341df7c0ff9b5f87ef1896589d2d1437eb70a4ed0cf5f0a29c01d998318797a358a96b5b56fe5caa8dbbeeb
 MISC metadata.xml 2318 BLAKE2B f9cf86426b0d8ea87cb80cb03315e9b0b581f604b2e1f28011dd49ab885232184fbcb6e496e8305d92e2c45bea973b8627235115e6bc7b7590874ac2ce9a00cc SHA512 e4eb8fb92dfe9161c217d880db3733aec36efc74431f529b12212702abbf633647bb8a22bfe7864d7389e8ed893bc37518e228ce165140058f98aec534b8f3de
diff --git a/sys-cluster/ceph/ceph-16.2.5.ebuild b/sys-cluster/ceph/ceph-16.2.5.ebuild
new file mode 100644
index 000000000000..834efe8eb5e6
--- /dev/null
+++ b/sys-cluster/ceph/ceph-16.2.5.ebuild
@@ -0,0 +1,450 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_OPTIONAL=1
+LUA_COMPAT=( lua5-3 )
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic \
+		lua-single python-r1 udev readme.gentoo-r1 toolchain-funcs \
+		systemd tmpfiles
+
+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 ~arm64 ~ppc64"
+fi
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="https://ceph.com/"
+
+LICENSE="Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain"
+SLOT="0"
+
+CPU_FLAGS_X86=(avx2 avx512f pclmul sse{,2,3,4_1,4_2} ssse3)
+
+IUSE="babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana
+	jemalloc jaeger kafka kerberos ldap lttng +mgr numa pmdk rabbitmq
+	+radosgw rbd-rwl rbd-ssd rgw-lua +ssl spdk +sqlite system-boost systemd
+	+tcmalloc test uring xfs zbd zfs"
+IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
+
+DEPEND="
+	${LUA_DEPS}
+	acct-group/ceph
+	acct-user/ceph
+	virtual/libudev:=
+	app-arch/bzip2:=
+	app-arch/lz4:=
+	<app-arch/snappy-1.1.9:=
+	app-arch/zstd:=
+	app-shells/bash:0
+	app-misc/jq:=
+	dev-libs/crypto++:=
+	dev-cpp/gflags:=
+	dev-libs/leveldb:=[snappy,tcmalloc(-)?]
+	dev-libs/libaio:=
+	dev-libs/libfmt:=
+	dev-libs/libnl:3=
+	dev-libs/libxml2:=
+	dev-libs/libevent:=
+	<dev-libs/rocksdb-6.15:=
+	dev-libs/xmlsec:=[openssl]
+	dev-cpp/yaml-cpp:=
+	dev-libs/nss:=
+	dev-libs/protobuf:=
+	net-dns/c-ares:=
+	net-libs/gnutls:=
+	sys-auth/oath-toolkit:=
+	sys-apps/coreutils
+	sys-apps/grep
+	sys-apps/hwloc:=
+	sys-apps/keyutils:=
+	sys-apps/util-linux:=
+	sys-apps/sed
+	sys-apps/util-linux
+	sys-libs/libcap-ng:=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:=
+	sys-process/numactl:=
+	virtual/libcrypt:=
+	x11-libs/libpciaccess:=
+	babeltrace? ( dev-util/babeltrace )
+	fuse? ( sys-fs/fuse:0= )
+	jemalloc? ( dev-libs/jemalloc:= )
+	!jemalloc? ( >=dev-util/google-perftools-2.6.1:= )
+	jaeger? ( dev-cpp/nlohmann_json:= )
+	kafka? ( dev-libs/librdkafka:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:= )
+	lttng? ( dev-util/lttng-ust:= )
+	pmdk? ( dev-libs/pmdk:= )
+	rabbitmq? ( net-libs/rabbitmq-c:= )
+	radosgw? (
+		dev-libs/icu:=
+		dev-libs/expat:=
+		dev-libs/openssl:=
+		net-misc/curl:=[curl_ssl_openssl]
+	)
+	rbd-rwl? ( dev-libs/pmdk:= )
+	ssl? ( dev-libs/openssl:= )
+	sqlite? ( dev-db/sqlite:= )
+	system-boost? ( >=dev-libs/boost-1.72:=[threads(+),context,python,${PYTHON_USEDEP}] )
+	uring? ( sys-libs/liburing:= )
+	xfs? ( sys-fs/xfsprogs:= )
+	zbd? ( sys-block/libzbd:= )
+	zfs? ( sys-fs/zfs:= )
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	amd64? ( dev-lang/nasm )
+	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/ragel
+	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
+	jaeger? (
+		sys-devel/bison
+		sys-devel/flex
+	)
+	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="
+	${DEPEND}
+	app-admin/sudo
+	net-misc/socat
+	sys-apps/gptfdisk
+	sys-apps/nvme-cli
+	>=sys-apps/smartmontools-7.0
+	sys-block/parted
+	sys-fs/cryptsetup
+	sys-fs/lsscsi
+	sys-fs/lvm2[-device-mapper-only(-)]
+	virtual/awk
+	dev-python/bcrypt[${PYTHON_USEDEP}]
+	dev-python/cherrypy[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pecan[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	mgr? (
+		dev-python/jsonpatch[${PYTHON_USEDEP}]
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pyjwt[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/routes[${PYTHON_USEDEP}]
+		diskprediction? (
+			>=dev-python/scipy-1.4.0[${PYTHON_USEDEP}]
+		)
+		sci-libs/scikit-learn[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+# diskprediction needs older scipy not compatible with py38
+# bug #724438
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	${LUA_REQUIRED_USE}
+	?? ( jemalloc tcmalloc )
+	jaeger? ( !system-boost )
+	diskprediction? ( mgr )
+	kafka? ( radosgw )
+	mgr? ( cephfs )
+	rabbitmq? ( radosgw )
+"
+RESTRICT="!test? ( test )"
+
+# the tests need root access
+RESTRICT="test? ( userpriv )"
+
+# distribution tarball does not include everything needed for tests
+RESTRICT+=" test"
+
+# create a non-debug release
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+# 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-16.2.2-cflags.patch"
+	"${FILESDIR}/ceph-16.2.2-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-16.2.0-rocksdb-cmake.patch"
+	"${FILESDIR}/ceph-15.2.3-spdk-compile.patch"
+	"${FILESDIR}/ceph-16.2.0-install-libblk.patch"
+	"${FILESDIR}/ceph-16.2.0-spdk-tinfo.patch"
+	"${FILESDIR}/ceph-16.2.0-jaeger-system-boost.patch"
+	"${FILESDIR}/ceph-16.2.0-liburing.patch"
+	"${FILESDIR}/ceph-16.2.2-system-zstd.patch"
+)
+
+check-reqs_export_vars() {
+	CHECKREQS_DISK_BUILD="6G"
+
+	if use system-boost; then
+		CHECKREQS_DISK_USR="350M"
+	else
+		CHECKREQS_DISK_USR="510M"
+	fi
+
+	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
+}
+
+pkg_pretend() {
+	check-reqs_export_vars
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	python_setup
+	lua_setup
+	check-reqs_export_vars
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if use system-boost; then
+		find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
+			| xargs --null sed -r \
+			-e 's|Boost::|boost_|g' \
+			-e 's|Boost_|boost_|g' \
+			-e 's|[Bb]oost_boost|boost_system|g' -i || die
+	fi
+
+	sed -r -e "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
+		-i src/bash_completion/CMakeLists.txt || die
+
+	sed  -e "s:objdump -p:$(tc-getOBJDUMP) -p:" -i CMakeLists.txt || die
+
+	if ! use diskprediction; then
+		rm -rf src/pybind/mgr/diskprediction_local || die
+	fi
+
+	# force lua version to use selected version
+	local lua_version
+	lua_version=$(ver_cut 1-2 $(lua_get_version))
+	sed -i "s:find_package(Lua [0-9][.][0-9] REQUIRED):find_package(Lua ${lua_version} EXACT REQUIRED):" src/CMakeLists.txt
+
+	# 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_BLUESTORE_PMEM=$(usex pmdk)
+		-DWITH_CEPHFS=$(usex cephfs)
+		-DWITH_CEPHFS_SHELL=$(usex cephfs)
+		-DWITH_DPDK=$(usex dpdk)
+		-DWITH_SPDK=$(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=OFF
+		-DWITH_NUMA=$(usex numa)
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DWITH_PYTHON3=3
+		-DWITH_RADOSGW=$(usex radosgw)
+		-DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq)
+		-DWITH_RADOSGW_KAFKA_ENDPOINT=$(usex kafka)
+		-DWITH_RADOSGW_LUA_PACKAGES=$(usex rgw-lua "$(usex radosgw)" "NO")
+		-DWITH_RBD_RWL=$(usex rbd-rwl)
+		-DWITH_RBD_SSD_CACHE=$(usex rbd-ssd)
+		-DWITH_SSL=$(usex ssl)
+		-DWITH_SYSTEMD=$(usex systemd)
+		-DWITH_TESTS=$(usex test)
+		-DWITH_LIBURING=$(usex uring)
+		-DWITH_SYSTEM_LIBURING=$(usex uring)
+		-DWITH_LIBCEPHSQLITE=$(usex sqlite)
+		-DWITH_XFS=$(usex xfs)
+		-DWITH_ZBD=$(usex zbd)
+		-DWITH_ZFS=$(usex zfs)
+		-DENABLE_SHARED="ON"
+		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
+		-DWITH_SYSTEM_PMDK=$(usex pmdk 'YES' "$(usex rbd-rwl)")
+		-DWITH_SYSTEM_BOOST=$(usex system-boost)
+		-DBOOST_J=$(makeopts_jobs)
+		-DWITH_SYSTEM_ROCKSDB=ON
+		-DWITH_RDMA=OFF
+		-DWITH_TBB=OFF
+		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
+		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=$(systemd_get_systemunitdir)
+		-DEPYTHON_VERSION="${EPYTHON#python}"
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-Wno-dev
+	)
+
+	# this breaks when re-configuring for python impl
+	[[ ${EBUILD_PHASE} == configure ]] && mycmakeargs+=(-DWITH_JAEGER=$(usex jaeger))
+
+	if use amd64 || use x86; then
+		for flag in ${CPU_FLAGS_X86[@]}; do
+			case "${flag}" in
+				avx*)
+					local var=${flag%f}
+					mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_NASM_X64_${var^^}=1")")
+				;;
+				*) mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")");;
+			esac
+		done
+	fi
+
+	# needed for >=glibc-2.32
+	has_version '>=sys-libs/glibc-2.32' && mycmakeargs+=(-DWITH_REENTRANT_STRSIGNAL:BOOL=ON)
+
+	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \
+		|| die "failed to remove cmake cache"
+
+	cmake_src_configure
+
+	# bug #630232
+	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
+		"${BUILD_DIR:-${S}}"/include/acconfig.h \
+		|| die "sed failed"
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	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_build 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_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-r1" 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
+	newtmpfiles "${FILESDIR}"/ceph-tmpfilesd ${PN}.conf
+
+	readme.gentoo_create_doc
+
+	python_setup
+
+	# 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/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index 7f17000f21ed..3ce08552dbe0 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -2,11 +2,19 @@ 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.18.19.tar.gz 32437793 BLAKE2B d5212b8eb29635d8269f91880420bbc9c16e472583ffd659a08362e80f79beb9fb48945a48dacf0f68b6b4383db0d1e615b432ea1687c015f78e4bc7aef94189 SHA512 aba80c2d5d2296bc2453a1519c29034a4f5e52373dc366186c295154960744f2d7fbae0b9cd1c64044bbb5cd9007b182dc4f60e57e991d28b3c8f0fc8cb279fb
+DIST kubernetes-1.18.20.tar.gz 32438617 BLAKE2B 89cd395a4efda04e37e19c2e3a7961ff7e98d564dab5b8c60ddba938bbce49dd6a49be44a548346774427c6d7d9bd3acf34f1e6f5227888d3f1c843294235f65 SHA512 e8d0e1eebf3ed339bda467e7a9027151164f1be29cfe9a3f3d0e30ba854dbd9d592cc720bf61c4cb3e9634a45cf0ef23630e7564e00dd19db741b29bb3f55324
 DIST kubernetes-1.19.11.tar.gz 33549052 BLAKE2B 5c17aae668a1e8c2eb656330a990786edf18a72d655ef23e55d9b02aa2a23ac07eeab5fdf4bfda2141e8ae2e9db3559bf8f402c8b984ae152aa955cff0ee3e22 SHA512 42a8c65eac4d4c2b9531fab578c9f605a1d57b3d892e2650ec87e3b1972e58f438dbf9f5c05ec2eb529218c43c8e391e3a294467c82ceffe94cc90b35e619242
+DIST kubernetes-1.19.12.tar.gz 33540953 BLAKE2B adcaec9e572c8e76ac87ce9e121bc87f340e19bf1f906461aadeb07914846d77b5827a307f33716201bf3f62fcf55c30964243537bdb781ec40daf2c8b741202 SHA512 ccef766299c3261fd3839bd2900a7d22c7ca18bd4c4709f2d3c45c71bfcef0a091ecb2cea0ae111613bcd68ac7fb3b8b8e9045215f0419c9a9c588a73c279a7b
 DIST kubernetes-1.20.7.tar.gz 34486823 BLAKE2B b0467ecb4527a6de3955185ea377248bbf0b83624af8afd4bf8f33cb2a5e33d0433ea98b3f984a38c59ad9fd6a8cf3e8124eadc81cbe337ca7bc4bce53d4f9ed SHA512 ccb8ac6f1d9535791386ee73ba5008180e1a77fcdc320363248037117547eb6c59d25c46ea1d5bb49043717e2b6a1796470b3b677229a7a40fd6cd1f4b8ab695
+DIST kubernetes-1.20.8.tar.gz 34490175 BLAKE2B 5d99299d14f14d882c39a4928699c5eaf2cb9583ecf050e5cf80b800d4fd80c7e976b16e606b4ec22f32db16fe1bd14be7e1280a9683968a2e4b8f2b682ab084 SHA512 172127ec5015bddf763ecdbebd3922c1c77ecb8e976b72f08f9e6d6768132f06b586a639ae0e8cbbe4db3f029d509740b3efa119f468387637dc15fc63d79aac
 DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
+DIST kubernetes-1.21.2.tar.gz 36081553 BLAKE2B 60566f2f33aebcd2f48e9d245883aa74d17ce21bdec05b529265a55e266497d6c7278fb7fdb5a94747e10641b5843b2a4b8079b981818ce3f3078c046ed72762 SHA512 20f81c975d6a5a4e6cbbfcaa2f34e8dd4f96018a8a60004a9fedf13eb9d8d43a14f0b746fb48a1240e378d2a1b8de440104c72269d68239040fa6a690c5115ff
 EBUILD kube-apiserver-1.18.19.ebuild 975 BLAKE2B 46fc8c70b370b4ae9fe2a3a5f627bdf7f45626605daec2b36a9b6352624bb62a37c3dc9c338e2fe2ad59aa6005be64390b6ef2c3b69b71e0f0a58f4d102cf4c0 SHA512 a8e56862b198c338faff6d950db23c33c562f0da0981ac0e24524238070250012b5f25b64b6b956a042e0a029589461fec7bf12aa844f90b2bbd15f70f7c6022
+EBUILD kube-apiserver-1.18.20.ebuild 976 BLAKE2B 812d6dedcd0657a5132b6ddb630a82ad8bc017536beec23d688cd4bd2d30aae0804d3768e9ede78ada2691dd621cf9f96af132b9d265c8432d5624a3381c81e6 SHA512 0f5348ce253d37772042fb19f6bcd037cd0f88f8ce5ec146e8a927a594a72a52bfa7fd35e7b4906369705522aaebac4d669aed232dba59965c430e527cfac586
 EBUILD kube-apiserver-1.19.11.ebuild 1011 BLAKE2B 566109dae1b25fd1d3c1c5a7d2553482a3cb30a286dc128163a3b3cd389623812111a9966b8c1650e31f47cf45ef5173cb8de1cd332674d3f33fafcf17897f0d SHA512 0749b4858729c72d1d5ea53d130180245de055eb7e03f8864fff208bca6d7fdd6073791d22c31fc4e14b47a36d2c02234a6507b2e5f438327662c9c87b6c52af
+EBUILD kube-apiserver-1.19.12.ebuild 1012 BLAKE2B 06cc1b6c301fc5ee4e7e9aff9bfec6c0e51764494609e2c154ad8e0cb33cb1dcf493cd99fbb0ed8bcdb753db31b142ffa50d11e666d01e6f10352d41d3582c7a SHA512 9c46b95d73968b35414d69e16bb18b56fad6abe9d0aab2c84d855cd9dc1e75f53406d6fea8fa4da9971747bbb84c021227684898e7f4d3f6b9bd699a8c1f417c
 EBUILD kube-apiserver-1.20.7.ebuild 1011 BLAKE2B 566109dae1b25fd1d3c1c5a7d2553482a3cb30a286dc128163a3b3cd389623812111a9966b8c1650e31f47cf45ef5173cb8de1cd332674d3f33fafcf17897f0d SHA512 0749b4858729c72d1d5ea53d130180245de055eb7e03f8864fff208bca6d7fdd6073791d22c31fc4e14b47a36d2c02234a6507b2e5f438327662c9c87b6c52af
+EBUILD kube-apiserver-1.20.8.ebuild 1012 BLAKE2B 06cc1b6c301fc5ee4e7e9aff9bfec6c0e51764494609e2c154ad8e0cb33cb1dcf493cd99fbb0ed8bcdb753db31b142ffa50d11e666d01e6f10352d41d3582c7a SHA512 9c46b95d73968b35414d69e16bb18b56fad6abe9d0aab2c84d855cd9dc1e75f53406d6fea8fa4da9971747bbb84c021227684898e7f4d3f6b9bd699a8c1f417c
 EBUILD kube-apiserver-1.21.1.ebuild 1011 BLAKE2B e12c4b1626234585bd58ceb9d8adf620a6277f2c41e9d880333d77a5c41a4250b470b13c2f000e99361fce1eb2e1cf2e02d9ecedfd0d47c306a744697a4900b8 SHA512 8928db8027f8022c2555a4aee889f8eb42d62bcc478cffd7eaa86e7a584b4f2d36f4e4ee445445c5c6989bdd96b665df0730ae7621db88a55a9f010c4695a280
+EBUILD kube-apiserver-1.21.2.ebuild 1012 BLAKE2B d3f9db4f7631a00bee5bec5e14addbaa8f16c1fcdd499b434d5dc255acba09e0c6c537607e4a2ad3b9f027bc7a24000b44826eb8e25aa3fc5b4236695ea14f67 SHA512 643bd11525041d2507413fac4998100281c9b784a52cf814849d61bb374d17ff66644ca4c857968c08554eaa1f77481a0406bb8002695e72d1c8f677ee9326ab
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.18.20.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.18.20.ebuild
new file mode 100644
index 000000000000..49d7e68c4096
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.18.20.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+COMMON_DEPEND="
+	acct-group/kube-apiserver
+	acct-user/kube-apiserver"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.19.12.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.19.12.ebuild
new file mode 100644
index 000000000000..eddbed5f2447
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.19.12.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="
+	acct-group/kube-apiserver
+	acct-user/kube-apiserver"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.20.8.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.20.8.ebuild
new file mode 100644
index 000000000000..eddbed5f2447
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.20.8.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="
+	acct-group/kube-apiserver
+	acct-user/kube-apiserver"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.21.2.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.21.2.ebuild
new file mode 100644
index 000000000000..4ad13d1aaaca
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.21.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="
+	acct-group/kube-apiserver
+	acct-user/kube-apiserver"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index 223c6f84fb78..0b175db98ed1 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -2,11 +2,19 @@ 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.18.19.tar.gz 32437793 BLAKE2B d5212b8eb29635d8269f91880420bbc9c16e472583ffd659a08362e80f79beb9fb48945a48dacf0f68b6b4383db0d1e615b432ea1687c015f78e4bc7aef94189 SHA512 aba80c2d5d2296bc2453a1519c29034a4f5e52373dc366186c295154960744f2d7fbae0b9cd1c64044bbb5cd9007b182dc4f60e57e991d28b3c8f0fc8cb279fb
+DIST kubernetes-1.18.20.tar.gz 32438617 BLAKE2B 89cd395a4efda04e37e19c2e3a7961ff7e98d564dab5b8c60ddba938bbce49dd6a49be44a548346774427c6d7d9bd3acf34f1e6f5227888d3f1c843294235f65 SHA512 e8d0e1eebf3ed339bda467e7a9027151164f1be29cfe9a3f3d0e30ba854dbd9d592cc720bf61c4cb3e9634a45cf0ef23630e7564e00dd19db741b29bb3f55324
 DIST kubernetes-1.19.11.tar.gz 33549052 BLAKE2B 5c17aae668a1e8c2eb656330a990786edf18a72d655ef23e55d9b02aa2a23ac07eeab5fdf4bfda2141e8ae2e9db3559bf8f402c8b984ae152aa955cff0ee3e22 SHA512 42a8c65eac4d4c2b9531fab578c9f605a1d57b3d892e2650ec87e3b1972e58f438dbf9f5c05ec2eb529218c43c8e391e3a294467c82ceffe94cc90b35e619242
+DIST kubernetes-1.19.12.tar.gz 33540953 BLAKE2B adcaec9e572c8e76ac87ce9e121bc87f340e19bf1f906461aadeb07914846d77b5827a307f33716201bf3f62fcf55c30964243537bdb781ec40daf2c8b741202 SHA512 ccef766299c3261fd3839bd2900a7d22c7ca18bd4c4709f2d3c45c71bfcef0a091ecb2cea0ae111613bcd68ac7fb3b8b8e9045215f0419c9a9c588a73c279a7b
 DIST kubernetes-1.20.7.tar.gz 34486823 BLAKE2B b0467ecb4527a6de3955185ea377248bbf0b83624af8afd4bf8f33cb2a5e33d0433ea98b3f984a38c59ad9fd6a8cf3e8124eadc81cbe337ca7bc4bce53d4f9ed SHA512 ccb8ac6f1d9535791386ee73ba5008180e1a77fcdc320363248037117547eb6c59d25c46ea1d5bb49043717e2b6a1796470b3b677229a7a40fd6cd1f4b8ab695
+DIST kubernetes-1.20.8.tar.gz 34490175 BLAKE2B 5d99299d14f14d882c39a4928699c5eaf2cb9583ecf050e5cf80b800d4fd80c7e976b16e606b4ec22f32db16fe1bd14be7e1280a9683968a2e4b8f2b682ab084 SHA512 172127ec5015bddf763ecdbebd3922c1c77ecb8e976b72f08f9e6d6768132f06b586a639ae0e8cbbe4db3f029d509740b3efa119f468387637dc15fc63d79aac
 DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
+DIST kubernetes-1.21.2.tar.gz 36081553 BLAKE2B 60566f2f33aebcd2f48e9d245883aa74d17ce21bdec05b529265a55e266497d6c7278fb7fdb5a94747e10641b5843b2a4b8079b981818ce3f3078c046ed72762 SHA512 20f81c975d6a5a4e6cbbfcaa2f34e8dd4f96018a8a60004a9fedf13eb9d8d43a14f0b746fb48a1240e378d2a1b8de440104c72269d68239040fa6a690c5115ff
 EBUILD kube-controller-manager-1.18.19.ebuild 966 BLAKE2B 2f0ddb82c8607d193aef1444912d82125578d41d62fc2b48b1512e2775903fccde7cd139c3c718b484f80fb6fa13567c33f78574a69a198ee6a459fd1ed7d68e SHA512 ba9c6f7a4bd05686357f7a7fb771c34bdc6dfdcb7bac2fbaf1fc6c977b9c5a05b65d55f188b8cc02583328baf80087d9b3f633f17a3f5f291cffaab542389c4f
+EBUILD kube-controller-manager-1.18.20.ebuild 967 BLAKE2B f3bd71d34cc101f228dfd1a9a96b342493f5546d6f408076908efb7e134bcc6bd9a898908fd85a71889a2d5360e96cf7f09ab1320db0d237240992250d8e5d51 SHA512 10cfe6208b1ee4252aeb659a15bd256177c8699aae94d0d2bacc51e617adad9b6ff9c297acedbdd2711b5c6cf979087a45620e0b14c5d9ee8e5a59749bb39463
 EBUILD kube-controller-manager-1.19.11.ebuild 1013 BLAKE2B 3c2b2e91482958bf1985544e059aa22a6e3ce2ece7d2a18f0c8959854370977d8f4459b4c5a331ef1cadfffa6076114a9d301346498dd6294ec63c3e38c5e06a SHA512 9576d01ca501bd09ea3717be93f5ab1ecd137c59866a8366ec1b0bfa5b544e8b463c902e40119487e0df63d6b7d9ea528a6f13a2abbe2b06df9094191972ba83
+EBUILD kube-controller-manager-1.19.12.ebuild 1014 BLAKE2B bf46369c9a72568037c40455a8342cc94c7f6a928bbd4012cadf2aed7c057f3f1490dc232e4aee7c2848e4591a10ebfcfb50b08170cfbc1015ffd8a0894ac2a9 SHA512 5c88fc9377e1244a97eb0b23458c1b7e935d749aea5b7f045a6e32607bd2dd9a04321167dd5d4915aa78aadd75798e388cd2cb40277b787daccbd750e765210f
 EBUILD kube-controller-manager-1.20.7.ebuild 1013 BLAKE2B 3c2b2e91482958bf1985544e059aa22a6e3ce2ece7d2a18f0c8959854370977d8f4459b4c5a331ef1cadfffa6076114a9d301346498dd6294ec63c3e38c5e06a SHA512 9576d01ca501bd09ea3717be93f5ab1ecd137c59866a8366ec1b0bfa5b544e8b463c902e40119487e0df63d6b7d9ea528a6f13a2abbe2b06df9094191972ba83
+EBUILD kube-controller-manager-1.20.8.ebuild 1014 BLAKE2B bf46369c9a72568037c40455a8342cc94c7f6a928bbd4012cadf2aed7c057f3f1490dc232e4aee7c2848e4591a10ebfcfb50b08170cfbc1015ffd8a0894ac2a9 SHA512 5c88fc9377e1244a97eb0b23458c1b7e935d749aea5b7f045a6e32607bd2dd9a04321167dd5d4915aa78aadd75798e388cd2cb40277b787daccbd750e765210f
 EBUILD kube-controller-manager-1.21.1.ebuild 1013 BLAKE2B 4590d4d6cb14abec9f934f70408129c8d4aa8da8e6ff7561089e57aa344feced5dfc761def4631228a0eb25caaa3f7bdbaf94b943e234c19b23ed8c3618fcc44 SHA512 d956b305015ddb278f46fefaffd53124fafe416ac155590108cc7496709f96caeae812b151bde8771fc2741be7adb16a10ee621b9362e8177b0ab8be8a90afd9
+EBUILD kube-controller-manager-1.21.2.ebuild 1014 BLAKE2B fff067c08b078e53395d941ce9b944510376aa4f16d7534ab0512492ff94a4a458590d45176ae1d9f55921de7c80a0a38b017de4dfa00e7de19d07ed1b384449 SHA512 6554108b79864865e2e7e3921573925b99d4b1257c38fb81cff2f932ae74ed06c6e090c66a108c90348266c0146bfb34230b2543f41aee933104e7ef3e116d16
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.20.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.20.ebuild
new file mode 100644
index 000000000000..fd520d1073ea
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.20.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.12.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.12.ebuild
new file mode 100644
index 000000000000..e61ad6675f61
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.12.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.8.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.8.ebuild
new file mode 100644
index 000000000000..e61ad6675f61
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.8.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.21.2.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.21.2.ebuild
new file mode 100644
index 000000000000..68d01d0642b7
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.21.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index dc7130e1e7ce..aaf4b7afc708 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -2,11 +2,19 @@ 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.18.19.tar.gz 32437793 BLAKE2B d5212b8eb29635d8269f91880420bbc9c16e472583ffd659a08362e80f79beb9fb48945a48dacf0f68b6b4383db0d1e615b432ea1687c015f78e4bc7aef94189 SHA512 aba80c2d5d2296bc2453a1519c29034a4f5e52373dc366186c295154960744f2d7fbae0b9cd1c64044bbb5cd9007b182dc4f60e57e991d28b3c8f0fc8cb279fb
+DIST kubernetes-1.18.20.tar.gz 32438617 BLAKE2B 89cd395a4efda04e37e19c2e3a7961ff7e98d564dab5b8c60ddba938bbce49dd6a49be44a548346774427c6d7d9bd3acf34f1e6f5227888d3f1c843294235f65 SHA512 e8d0e1eebf3ed339bda467e7a9027151164f1be29cfe9a3f3d0e30ba854dbd9d592cc720bf61c4cb3e9634a45cf0ef23630e7564e00dd19db741b29bb3f55324
 DIST kubernetes-1.19.11.tar.gz 33549052 BLAKE2B 5c17aae668a1e8c2eb656330a990786edf18a72d655ef23e55d9b02aa2a23ac07eeab5fdf4bfda2141e8ae2e9db3559bf8f402c8b984ae152aa955cff0ee3e22 SHA512 42a8c65eac4d4c2b9531fab578c9f605a1d57b3d892e2650ec87e3b1972e58f438dbf9f5c05ec2eb529218c43c8e391e3a294467c82ceffe94cc90b35e619242
+DIST kubernetes-1.19.12.tar.gz 33540953 BLAKE2B adcaec9e572c8e76ac87ce9e121bc87f340e19bf1f906461aadeb07914846d77b5827a307f33716201bf3f62fcf55c30964243537bdb781ec40daf2c8b741202 SHA512 ccef766299c3261fd3839bd2900a7d22c7ca18bd4c4709f2d3c45c71bfcef0a091ecb2cea0ae111613bcd68ac7fb3b8b8e9045215f0419c9a9c588a73c279a7b
 DIST kubernetes-1.20.7.tar.gz 34486823 BLAKE2B b0467ecb4527a6de3955185ea377248bbf0b83624af8afd4bf8f33cb2a5e33d0433ea98b3f984a38c59ad9fd6a8cf3e8124eadc81cbe337ca7bc4bce53d4f9ed SHA512 ccb8ac6f1d9535791386ee73ba5008180e1a77fcdc320363248037117547eb6c59d25c46ea1d5bb49043717e2b6a1796470b3b677229a7a40fd6cd1f4b8ab695
+DIST kubernetes-1.20.8.tar.gz 34490175 BLAKE2B 5d99299d14f14d882c39a4928699c5eaf2cb9583ecf050e5cf80b800d4fd80c7e976b16e606b4ec22f32db16fe1bd14be7e1280a9683968a2e4b8f2b682ab084 SHA512 172127ec5015bddf763ecdbebd3922c1c77ecb8e976b72f08f9e6d6768132f06b586a639ae0e8cbbe4db3f029d509740b3efa119f468387637dc15fc63d79aac
 DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
+DIST kubernetes-1.21.2.tar.gz 36081553 BLAKE2B 60566f2f33aebcd2f48e9d245883aa74d17ce21bdec05b529265a55e266497d6c7278fb7fdb5a94747e10641b5843b2a4b8079b981818ce3f3078c046ed72762 SHA512 20f81c975d6a5a4e6cbbfcaa2f34e8dd4f96018a8a60004a9fedf13eb9d8d43a14f0b746fb48a1240e378d2a1b8de440104c72269d68239040fa6a690c5115ff
 EBUILD kube-proxy-1.18.19.ebuild 892 BLAKE2B 07e99c7043554ba3fe7d71838d72daccd1c753ce9db9d9619971b87a798d0d68c39b3b87bfbd3bbbe94d5f457cb9f1564d9ed1ec0c9bbe51b8cefd9ee43e3b4f SHA512 1b913f8b0f6ebcd62af8786e9b96f2be14778eb582a48ac2f4756ace84c90452246686ee1e75be448d945c666e63b1c5f6125200a704ebcf7fe6fab4e5dbd527
+EBUILD kube-proxy-1.18.20.ebuild 893 BLAKE2B fb0815f05971fdcbf04f6b94850dcc5a3c1bd6692fcbf2c1bb6b5f9a5df5d21f25d44d4bafacd21ea9cd6cb5a52d47e9c6e26b9bf76c5139d3ba734b383c5c6b SHA512 5121058bbd622bfd4bb9b4a60a86ed6d7ed72ab581f72178a500d13a8a588404e639ae350242a22d4acc386209a2dce39103a5606ded2a6a677c201ce6f7a449
 EBUILD kube-proxy-1.19.11.ebuild 928 BLAKE2B 765fa0b999f93352690b0da19e0e4652165fab7bfe7f5a117e182a4513ec98a4cae1e6e2cc28e8fcafff62596dceef8c88d05908c9844b4a5596dca9ac94ca6f SHA512 57f6eafc77edfd06d0f6abdb0f870f4be2f8a0fecf0889db5afc5f9153951b63cfca87e5f0d8812c88e8f7c31b80c4d6ecbeb630a1a3d9effd8030564bb022e8
+EBUILD kube-proxy-1.19.12.ebuild 929 BLAKE2B 81abfe44a4025e907542f6935af1c953920d3c730008b4db082800626542265955c07b4277e39d9b8517273fc89bb87e7ca29217dd68cad235d8138fb005232b SHA512 fe6d3657c95c46a1bc87f2c0abb9e8e98eeb11c8cd48810ae94a49739b04f401b32b00522c14a488d7f043d721cda9967937b1c177765cdfa07c9add4300a99c
 EBUILD kube-proxy-1.20.7.ebuild 928 BLAKE2B 765fa0b999f93352690b0da19e0e4652165fab7bfe7f5a117e182a4513ec98a4cae1e6e2cc28e8fcafff62596dceef8c88d05908c9844b4a5596dca9ac94ca6f SHA512 57f6eafc77edfd06d0f6abdb0f870f4be2f8a0fecf0889db5afc5f9153951b63cfca87e5f0d8812c88e8f7c31b80c4d6ecbeb630a1a3d9effd8030564bb022e8
+EBUILD kube-proxy-1.20.8.ebuild 929 BLAKE2B 81abfe44a4025e907542f6935af1c953920d3c730008b4db082800626542265955c07b4277e39d9b8517273fc89bb87e7ca29217dd68cad235d8138fb005232b SHA512 fe6d3657c95c46a1bc87f2c0abb9e8e98eeb11c8cd48810ae94a49739b04f401b32b00522c14a488d7f043d721cda9967937b1c177765cdfa07c9add4300a99c
 EBUILD kube-proxy-1.21.1.ebuild 928 BLAKE2B 530e14d24d0bfcedef386d4e5c6b5089ef8428e814264d64d8611a2f3bbcf7be57176731f63ff8299a090c12e323c90e702ad6d99dfebffc4343ac15a3f4ff39 SHA512 ee958c9c6ea19156fbbc863d819bd52db1fae84e8e2d2cfc9a4d282fe0495e19bbadd24ae7f74c13b61cd3716c45001ba2cec471450c8db81ae5562cc3902ab2
+EBUILD kube-proxy-1.21.2.ebuild 929 BLAKE2B 457168acecb296450df17416cccfa8c23a41236489150d3e47da3287b0e43d0e2ae1a24b4088685c7a9e40a71218a56ee30b718464e158874482b15a5dd335ac SHA512 8dbb6193562898f48c70a83d5b1ae8f3109f05bcab2208031f285bb8a90a3c828761b0144234ae2963eecb7dac10fccccf586d566b7314bcf4f14947064483bb
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.18.20.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.18.20.ebuild
new file mode 100644
index 000000000000..dc462bedf2c4
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.18.20.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+RDEPEND="net-firewall/conntrack-tools
+	!sys-cluster/kubernetes"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.19.12.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.19.12.ebuild
new file mode 100644
index 000000000000..d62b6c41d8fd
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.19.12.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="net-firewall/conntrack-tools
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.20.8.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.20.8.ebuild
new file mode 100644
index 000000000000..d62b6c41d8fd
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.20.8.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="net-firewall/conntrack-tools
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.21.2.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.21.2.ebuild
new file mode 100644
index 000000000000..6c8c309ffd31
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.21.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="net-firewall/conntrack-tools
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index f51fe6fe02a2..f9ddf1face0e 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -2,11 +2,19 @@ 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.18.19.tar.gz 32437793 BLAKE2B d5212b8eb29635d8269f91880420bbc9c16e472583ffd659a08362e80f79beb9fb48945a48dacf0f68b6b4383db0d1e615b432ea1687c015f78e4bc7aef94189 SHA512 aba80c2d5d2296bc2453a1519c29034a4f5e52373dc366186c295154960744f2d7fbae0b9cd1c64044bbb5cd9007b182dc4f60e57e991d28b3c8f0fc8cb279fb
+DIST kubernetes-1.18.20.tar.gz 32438617 BLAKE2B 89cd395a4efda04e37e19c2e3a7961ff7e98d564dab5b8c60ddba938bbce49dd6a49be44a548346774427c6d7d9bd3acf34f1e6f5227888d3f1c843294235f65 SHA512 e8d0e1eebf3ed339bda467e7a9027151164f1be29cfe9a3f3d0e30ba854dbd9d592cc720bf61c4cb3e9634a45cf0ef23630e7564e00dd19db741b29bb3f55324
 DIST kubernetes-1.19.11.tar.gz 33549052 BLAKE2B 5c17aae668a1e8c2eb656330a990786edf18a72d655ef23e55d9b02aa2a23ac07eeab5fdf4bfda2141e8ae2e9db3559bf8f402c8b984ae152aa955cff0ee3e22 SHA512 42a8c65eac4d4c2b9531fab578c9f605a1d57b3d892e2650ec87e3b1972e58f438dbf9f5c05ec2eb529218c43c8e391e3a294467c82ceffe94cc90b35e619242
+DIST kubernetes-1.19.12.tar.gz 33540953 BLAKE2B adcaec9e572c8e76ac87ce9e121bc87f340e19bf1f906461aadeb07914846d77b5827a307f33716201bf3f62fcf55c30964243537bdb781ec40daf2c8b741202 SHA512 ccef766299c3261fd3839bd2900a7d22c7ca18bd4c4709f2d3c45c71bfcef0a091ecb2cea0ae111613bcd68ac7fb3b8b8e9045215f0419c9a9c588a73c279a7b
 DIST kubernetes-1.20.7.tar.gz 34486823 BLAKE2B b0467ecb4527a6de3955185ea377248bbf0b83624af8afd4bf8f33cb2a5e33d0433ea98b3f984a38c59ad9fd6a8cf3e8124eadc81cbe337ca7bc4bce53d4f9ed SHA512 ccb8ac6f1d9535791386ee73ba5008180e1a77fcdc320363248037117547eb6c59d25c46ea1d5bb49043717e2b6a1796470b3b677229a7a40fd6cd1f4b8ab695
+DIST kubernetes-1.20.8.tar.gz 34490175 BLAKE2B 5d99299d14f14d882c39a4928699c5eaf2cb9583ecf050e5cf80b800d4fd80c7e976b16e606b4ec22f32db16fe1bd14be7e1280a9683968a2e4b8f2b682ab084 SHA512 172127ec5015bddf763ecdbebd3922c1c77ecb8e976b72f08f9e6d6768132f06b586a639ae0e8cbbe4db3f029d509740b3efa119f468387637dc15fc63d79aac
 DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
+DIST kubernetes-1.21.2.tar.gz 36081553 BLAKE2B 60566f2f33aebcd2f48e9d245883aa74d17ce21bdec05b529265a55e266497d6c7278fb7fdb5a94747e10641b5843b2a4b8079b981818ce3f3078c046ed72762 SHA512 20f81c975d6a5a4e6cbbfcaa2f34e8dd4f96018a8a60004a9fedf13eb9d8d43a14f0b746fb48a1240e378d2a1b8de440104c72269d68239040fa6a690c5115ff
 EBUILD kube-scheduler-1.18.19.ebuild 950 BLAKE2B c7e4bf0bfca4b9e3fbf29ba120a85ebd3302c94500e57e3fd21193958ed9099627e51e178510d5a0d6974c1c07812495a60d3f595c25f6c2794667bddb06e4a3 SHA512 3da62f1f16b14858ce36d9506b009135aa1a627be5e466a782bc3784c605e494d4b618195bcc7e7bb760ace5574c8e7964bd99d2ec52fd81327c3a1259e18f8e
+EBUILD kube-scheduler-1.18.20.ebuild 951 BLAKE2B 9a79b2d2568fd0666080b980a2f47094ea036d8352345b4a0489f48a950946c88eb85ff7950234ecef0f43e3ae5885b254b19ad3a7d1adaeabb696ca42f32ab0 SHA512 d177752bc34802343e103bed6dadc1900766727c4b3251003df10b20ab744b4d44be1abc6297143b481872c7a74990f980bb39a65300ac8a5f5d46ed515b79ef
 EBUILD kube-scheduler-1.19.11.ebuild 986 BLAKE2B 9582a16c18d3c9045c63fe29390ea54fe3e9570cd6e8860277d840d43fec7981637a709e21b7219f71f18d2e26540be053b2c961f3d66d8942a1781592d786f9 SHA512 3f7b822a52db4aa4c5324984e8117811065a7836de643fce508e8f6155d9d05703555b5061e2da22c719c6e45e01863b1b1fe5ac742fdeb07507f089c8745aa8
+EBUILD kube-scheduler-1.19.12.ebuild 987 BLAKE2B 2bb55884a676b43cd0678ed33f450622a4503b72e3f6a94c511b56c6c148bc8c606f79a07a0e4160c85a8369dffd3b09e3cd6e48b6fb06f4bc8b407fff01dd30 SHA512 f95df23f7b81dcd24ab696830e58eac93da20653e31b3486b2781540b4d138c5390503fb15b498a67ac6253c779e83677915f4f13f41c08a7d79acf6a9666485
 EBUILD kube-scheduler-1.20.7.ebuild 986 BLAKE2B 9582a16c18d3c9045c63fe29390ea54fe3e9570cd6e8860277d840d43fec7981637a709e21b7219f71f18d2e26540be053b2c961f3d66d8942a1781592d786f9 SHA512 3f7b822a52db4aa4c5324984e8117811065a7836de643fce508e8f6155d9d05703555b5061e2da22c719c6e45e01863b1b1fe5ac742fdeb07507f089c8745aa8
+EBUILD kube-scheduler-1.20.8.ebuild 987 BLAKE2B 2bb55884a676b43cd0678ed33f450622a4503b72e3f6a94c511b56c6c148bc8c606f79a07a0e4160c85a8369dffd3b09e3cd6e48b6fb06f4bc8b407fff01dd30 SHA512 f95df23f7b81dcd24ab696830e58eac93da20653e31b3486b2781540b4d138c5390503fb15b498a67ac6253c779e83677915f4f13f41c08a7d79acf6a9666485
 EBUILD kube-scheduler-1.21.1.ebuild 986 BLAKE2B 2fd297a5e2a967da944d6fc98882330685cfe1dbaa2fb2188003099883cfad4dd8cefb8f9a1af2d44f98fecebf35c76213c9663993d3f0d4f0636851bfb00b4c SHA512 514528bd0183987f4e60f6df9eaee374844ad444d49f707ee33ebd14c5bce619941913705dc20b1abd513e87596f9ba29692176f998b2ee79d5035bc8b789939
+EBUILD kube-scheduler-1.21.2.ebuild 987 BLAKE2B 60f25a20a95753c4a57a7962c98fbc8fa6d2948ed783b50ce281238b484355ffa037c5201bf02a4d1db8c3824cf07b0cadf4edf094e943506850582e8fb89cfd SHA512 def9c3a32e1b7fb792f029302d29cb4d5d19cb9c91b5f5011c98e6c4cf8d243aa5861ced10436e93c8f5b057eb0532137bc14182e14777977ca0393c636af3ec
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.18.20.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.18.20.ebuild
new file mode 100644
index 000000000000..68467bd70d77
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.18.20.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-scheduler
+	acct-user/kube-scheduler"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.19.12.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.19.12.ebuild
new file mode 100644
index 000000000000..98230502bf76
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.19.12.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-scheduler
+	acct-user/kube-scheduler"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.20.8.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.20.8.ebuild
new file mode 100644
index 000000000000..98230502bf76
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.20.8.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-scheduler
+	acct-user/kube-scheduler"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.21.2.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.21.2.ebuild
new file mode 100644
index 000000000000..0e9f9a6dd32b
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.21.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-scheduler
+	acct-user/kube-scheduler"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index 7fbdbaa7c169..df148c5c9184 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -1,9 +1,17 @@
 DIST kubernetes-1.18.19.tar.gz 32437793 BLAKE2B d5212b8eb29635d8269f91880420bbc9c16e472583ffd659a08362e80f79beb9fb48945a48dacf0f68b6b4383db0d1e615b432ea1687c015f78e4bc7aef94189 SHA512 aba80c2d5d2296bc2453a1519c29034a4f5e52373dc366186c295154960744f2d7fbae0b9cd1c64044bbb5cd9007b182dc4f60e57e991d28b3c8f0fc8cb279fb
+DIST kubernetes-1.18.20.tar.gz 32438617 BLAKE2B 89cd395a4efda04e37e19c2e3a7961ff7e98d564dab5b8c60ddba938bbce49dd6a49be44a548346774427c6d7d9bd3acf34f1e6f5227888d3f1c843294235f65 SHA512 e8d0e1eebf3ed339bda467e7a9027151164f1be29cfe9a3f3d0e30ba854dbd9d592cc720bf61c4cb3e9634a45cf0ef23630e7564e00dd19db741b29bb3f55324
 DIST kubernetes-1.19.11.tar.gz 33549052 BLAKE2B 5c17aae668a1e8c2eb656330a990786edf18a72d655ef23e55d9b02aa2a23ac07eeab5fdf4bfda2141e8ae2e9db3559bf8f402c8b984ae152aa955cff0ee3e22 SHA512 42a8c65eac4d4c2b9531fab578c9f605a1d57b3d892e2650ec87e3b1972e58f438dbf9f5c05ec2eb529218c43c8e391e3a294467c82ceffe94cc90b35e619242
+DIST kubernetes-1.19.12.tar.gz 33540953 BLAKE2B adcaec9e572c8e76ac87ce9e121bc87f340e19bf1f906461aadeb07914846d77b5827a307f33716201bf3f62fcf55c30964243537bdb781ec40daf2c8b741202 SHA512 ccef766299c3261fd3839bd2900a7d22c7ca18bd4c4709f2d3c45c71bfcef0a091ecb2cea0ae111613bcd68ac7fb3b8b8e9045215f0419c9a9c588a73c279a7b
 DIST kubernetes-1.20.7.tar.gz 34486823 BLAKE2B b0467ecb4527a6de3955185ea377248bbf0b83624af8afd4bf8f33cb2a5e33d0433ea98b3f984a38c59ad9fd6a8cf3e8124eadc81cbe337ca7bc4bce53d4f9ed SHA512 ccb8ac6f1d9535791386ee73ba5008180e1a77fcdc320363248037117547eb6c59d25c46ea1d5bb49043717e2b6a1796470b3b677229a7a40fd6cd1f4b8ab695
+DIST kubernetes-1.20.8.tar.gz 34490175 BLAKE2B 5d99299d14f14d882c39a4928699c5eaf2cb9583ecf050e5cf80b800d4fd80c7e976b16e606b4ec22f32db16fe1bd14be7e1280a9683968a2e4b8f2b682ab084 SHA512 172127ec5015bddf763ecdbebd3922c1c77ecb8e976b72f08f9e6d6768132f06b586a639ae0e8cbbe4db3f029d509740b3efa119f468387637dc15fc63d79aac
 DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
+DIST kubernetes-1.21.2.tar.gz 36081553 BLAKE2B 60566f2f33aebcd2f48e9d245883aa74d17ce21bdec05b529265a55e266497d6c7278fb7fdb5a94747e10641b5843b2a4b8079b981818ce3f3078c046ed72762 SHA512 20f81c975d6a5a4e6cbbfcaa2f34e8dd4f96018a8a60004a9fedf13eb9d8d43a14f0b746fb48a1240e378d2a1b8de440104c72269d68239040fa6a690c5115ff
 EBUILD kubeadm-1.18.19.ebuild 872 BLAKE2B 1f3aaf9c5520fada96580be3d4a31911514b21acb2aa311697b00454fa27badca0ab6b5daa5ca7f79311708f2902a0acdeb26eabb417476d168a67e403457091 SHA512 6cfd03238748f6b67c7c408f3184413afe075f5df7053d062a2a5f736b0206edde4bdd0b7f771004aed14a26104654ae32b78ffeb90059f06d52be1b7a321d7e
+EBUILD kubeadm-1.18.20.ebuild 873 BLAKE2B caa208d5cc70aeae8698a818fd5ba149796697eee8297966b71a6355b4feadb1b8b5a07ad0cd7bb4510dbeeed9bd30b78416a49a8d8c1d8d4b942bbccbd14458 SHA512 5482f2f8b4c9538894008358257e468f7ff8f1c2a936edb923775c955e1a8ceadf484987fb102b218548061480912f93af0351938fda9324b05f7d0bf15b5c81
 EBUILD kubeadm-1.19.11.ebuild 906 BLAKE2B 9d23a85485ad61d17992dcd33f016f61567c83380b25c7f5792b93107a01c12648ff9f78a57bf1ca903a0173277c6ee940b33baeeda1eb8aded8b13eab0bb0db SHA512 d0473158b12a2a8332eba6b1306691750096a0eb3acd65d9db2c1adf7083275fd10ecce397a7045ca840da25a837db8e89645d5b3b3087cf93edee4efa688c2b
+EBUILD kubeadm-1.19.12.ebuild 907 BLAKE2B 5e04bb4a35a8a99082f8b6b656ce6498e2121ab448f2a02b109ea84cd50d99b71e24f39e6cb4f39de0212d45629c3e533b45a9073afb4a368b593ad8ad1c4b8f SHA512 8baef54420d2354ef809920131cd7ee027030020f4a239534fba3e838807e1b95092ea692feaf4b7dfdd4a297a37a21413bf3a5f0ec0eca603abad652890ab8d
 EBUILD kubeadm-1.20.7.ebuild 906 BLAKE2B 9d23a85485ad61d17992dcd33f016f61567c83380b25c7f5792b93107a01c12648ff9f78a57bf1ca903a0173277c6ee940b33baeeda1eb8aded8b13eab0bb0db SHA512 d0473158b12a2a8332eba6b1306691750096a0eb3acd65d9db2c1adf7083275fd10ecce397a7045ca840da25a837db8e89645d5b3b3087cf93edee4efa688c2b
+EBUILD kubeadm-1.20.8.ebuild 907 BLAKE2B 5e04bb4a35a8a99082f8b6b656ce6498e2121ab448f2a02b109ea84cd50d99b71e24f39e6cb4f39de0212d45629c3e533b45a9073afb4a368b593ad8ad1c4b8f SHA512 8baef54420d2354ef809920131cd7ee027030020f4a239534fba3e838807e1b95092ea692feaf4b7dfdd4a297a37a21413bf3a5f0ec0eca603abad652890ab8d
 EBUILD kubeadm-1.21.1.ebuild 906 BLAKE2B 976b6b81abac175c8b5d91ebb43e8c9bc30135ddd787992783860bca174e847bf371ad55c46b4b70a824dc0446853ec0735eb497f27cb80121c4a40cd50ec13f SHA512 9dcbc099f39ba5c0696bdab617cd67100d88809180e7bb08d671cceb903eb323f31e093e0d46cd42a4f9f7f281dfc6cd6ac82d5a398d88b7c3d41c95a5a76c9f
+EBUILD kubeadm-1.21.2.ebuild 907 BLAKE2B 9afd971b3448c327ce26750d0d90ff79d4416a158e0cafb37bf834ef47056e9e087cc06cdeabeec88b9c1426cf0106c1e7c7e1945b8523e518ac8e69c51e87ff SHA512 0861a7d79b74f60623f11c7de08306732793ba1edcf185e7abc8e779757c744b94191f4a829932818468de05b350636a81d36344d3a128e404a7a1b33526a0d0
 MISC metadata.xml 917 BLAKE2B ead95efd60868ca415983905cf72f7a3b00dd7048fe6fad5caf52fa78ab1ce77109e3e29ac5708b5240dc27b58b69858ca23b6952f2b087f5e311359e9929010 SHA512 3be4ae4aec07e6cdfb6eb1aebabb71fd49e9e9dbf9a183c4a1b19c74f3419c32a01b537425f30844ad642e04d72411ecfafd19c2ebdb0df8715ae139d9145949
diff --git a/sys-cluster/kubeadm/kubeadm-1.18.20.ebuild b/sys-cluster/kubeadm/kubeadm-1.18.20.ebuild
new file mode 100644
index 000000000000..b7becaae8f36
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.18.20.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/kubeadm
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubeadm/kubeadm-1.19.12.ebuild b/sys-cluster/kubeadm/kubeadm-1.19.12.ebuild
new file mode 100644
index 000000000000..e8e9bef16ed9
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.19.12.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubeadm/kubeadm-1.20.8.ebuild b/sys-cluster/kubeadm/kubeadm-1.20.8.ebuild
new file mode 100644
index 000000000000..e8e9bef16ed9
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.20.8.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubeadm/kubeadm-1.21.2.ebuild b/sys-cluster/kubeadm/kubeadm-1.21.2.ebuild
new file mode 100644
index 000000000000..b98e9b739641
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.21.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index e96c6029be35..d2de9eb706a6 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,9 +1,17 @@
 DIST kubernetes-1.18.19.tar.gz 32437793 BLAKE2B d5212b8eb29635d8269f91880420bbc9c16e472583ffd659a08362e80f79beb9fb48945a48dacf0f68b6b4383db0d1e615b432ea1687c015f78e4bc7aef94189 SHA512 aba80c2d5d2296bc2453a1519c29034a4f5e52373dc366186c295154960744f2d7fbae0b9cd1c64044bbb5cd9007b182dc4f60e57e991d28b3c8f0fc8cb279fb
+DIST kubernetes-1.18.20.tar.gz 32438617 BLAKE2B 89cd395a4efda04e37e19c2e3a7961ff7e98d564dab5b8c60ddba938bbce49dd6a49be44a548346774427c6d7d9bd3acf34f1e6f5227888d3f1c843294235f65 SHA512 e8d0e1eebf3ed339bda467e7a9027151164f1be29cfe9a3f3d0e30ba854dbd9d592cc720bf61c4cb3e9634a45cf0ef23630e7564e00dd19db741b29bb3f55324
 DIST kubernetes-1.19.11.tar.gz 33549052 BLAKE2B 5c17aae668a1e8c2eb656330a990786edf18a72d655ef23e55d9b02aa2a23ac07eeab5fdf4bfda2141e8ae2e9db3559bf8f402c8b984ae152aa955cff0ee3e22 SHA512 42a8c65eac4d4c2b9531fab578c9f605a1d57b3d892e2650ec87e3b1972e58f438dbf9f5c05ec2eb529218c43c8e391e3a294467c82ceffe94cc90b35e619242
+DIST kubernetes-1.19.12.tar.gz 33540953 BLAKE2B adcaec9e572c8e76ac87ce9e121bc87f340e19bf1f906461aadeb07914846d77b5827a307f33716201bf3f62fcf55c30964243537bdb781ec40daf2c8b741202 SHA512 ccef766299c3261fd3839bd2900a7d22c7ca18bd4c4709f2d3c45c71bfcef0a091ecb2cea0ae111613bcd68ac7fb3b8b8e9045215f0419c9a9c588a73c279a7b
 DIST kubernetes-1.20.7.tar.gz 34486823 BLAKE2B b0467ecb4527a6de3955185ea377248bbf0b83624af8afd4bf8f33cb2a5e33d0433ea98b3f984a38c59ad9fd6a8cf3e8124eadc81cbe337ca7bc4bce53d4f9ed SHA512 ccb8ac6f1d9535791386ee73ba5008180e1a77fcdc320363248037117547eb6c59d25c46ea1d5bb49043717e2b6a1796470b3b677229a7a40fd6cd1f4b8ab695
+DIST kubernetes-1.20.8.tar.gz 34490175 BLAKE2B 5d99299d14f14d882c39a4928699c5eaf2cb9583ecf050e5cf80b800d4fd80c7e976b16e606b4ec22f32db16fe1bd14be7e1280a9683968a2e4b8f2b682ab084 SHA512 172127ec5015bddf763ecdbebd3922c1c77ecb8e976b72f08f9e6d6768132f06b586a639ae0e8cbbe4db3f029d509740b3efa119f468387637dc15fc63d79aac
 DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
+DIST kubernetes-1.21.2.tar.gz 36081553 BLAKE2B 60566f2f33aebcd2f48e9d245883aa74d17ce21bdec05b529265a55e266497d6c7278fb7fdb5a94747e10641b5843b2a4b8079b981818ce3f3078c046ed72762 SHA512 20f81c975d6a5a4e6cbbfcaa2f34e8dd4f96018a8a60004a9fedf13eb9d8d43a14f0b746fb48a1240e378d2a1b8de440104c72269d68239040fa6a690c5115ff
 EBUILD kubectl-1.18.19.ebuild 871 BLAKE2B 8358e454dd4e2bef7e0bebda1043376bd103079110b5edaecb2ad51249f812363cc245f51d5150e5f00a5aa8c384b5b32d05171327075fd7aa27d22dbca24c07 SHA512 43373bb937da14b667cc037665c2c36f79382c2f4c0c08f6af931067356f044d8c03579451ffb6fe096836e411579e8e02e1780b552c6d55ce4f625ba8fff3b5
+EBUILD kubectl-1.18.20.ebuild 872 BLAKE2B 6630bf8f8b331fdeae6f434d2d13699ffcfa38fa14ba897317a492997d153f1c9cea7dc57923d948ca6661b2077fe606bd34cd8523bcbd4a47f81a6c66aa766c SHA512 3fd64b13dfda775b85e8679d8f6cba25ea3d9bab6b040cd6653439a2f405b1745000ca242de4d5f13e431aa4b256c88c714dfea259866489977c2beaffe2688f
 EBUILD kubectl-1.19.11.ebuild 901 BLAKE2B 83da76032ca52af1865dfb01c685a34b87a728dfe861d6aa831abab06ffbfedbe1b35de9406d5ebdc0391398766c91cad7d8cb3aa612cf60b9cf6ce4b143b62d SHA512 c1a867a99b5515a2130ce430adb20d0c8180d24b8ddfebbadc896e99221fbc137441ef08937df631b956d58fdddc691021479b2eadb71bd124b6d06952e8c366
+EBUILD kubectl-1.19.12.ebuild 902 BLAKE2B 6f454846b9f0f28044dd85192f039fb6dedd3643d91e13c67b219a49cf011fa6c3c3eed9995b6c7ec0bfcca0150a7d2118d9a6c9d24d1da9de28dc06f6bd2bc0 SHA512 15c047f5caf38d5d6e550609c376ceb558542846077f7433d48261a8f60b9aaa9700a87dd63b52d0a4be0aa6453bd500171877ec038fdd4e010723d7582768e9
 EBUILD kubectl-1.20.7.ebuild 901 BLAKE2B 83da76032ca52af1865dfb01c685a34b87a728dfe861d6aa831abab06ffbfedbe1b35de9406d5ebdc0391398766c91cad7d8cb3aa612cf60b9cf6ce4b143b62d SHA512 c1a867a99b5515a2130ce430adb20d0c8180d24b8ddfebbadc896e99221fbc137441ef08937df631b956d58fdddc691021479b2eadb71bd124b6d06952e8c366
+EBUILD kubectl-1.20.8.ebuild 902 BLAKE2B 6f454846b9f0f28044dd85192f039fb6dedd3643d91e13c67b219a49cf011fa6c3c3eed9995b6c7ec0bfcca0150a7d2118d9a6c9d24d1da9de28dc06f6bd2bc0 SHA512 15c047f5caf38d5d6e550609c376ceb558542846077f7433d48261a8f60b9aaa9700a87dd63b52d0a4be0aa6453bd500171877ec038fdd4e010723d7582768e9
 EBUILD kubectl-1.21.1.ebuild 901 BLAKE2B 9aefec009262faa0888202910542873bcee4eb1245658cfc33d71dbffe9c4e942967ccf9d274411ceb42d88f18f25292809679138205b93de18181d96b59ff04 SHA512 c9a161914ea33735b68cd899fffd96cf54dbb89c09c0ff79eb26b01c39936f809a9b0d3a86725199ca157de4f7c874c534514e90505a7e3c4fda872485d06c51
+EBUILD kubectl-1.21.2.ebuild 902 BLAKE2B 5907f4fb13676ce0fddae866a732043d9c965f1f201b65ed0077240fe1f7fd7df28ea180a2541085486f4c0f612e604bd6e357fe038edc72abff6538b276a57d SHA512 4b717de62be84d6237e8b87b8550687bf8451d1a635b06b2f07567fb00a13f62b4d16f488074e10d0eacdc9dd9020ef7e5e1469bad3993e4350c8adbf1b51223
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kubectl/kubectl-1.18.20.ebuild b/sys-cluster/kubectl/kubectl-1.18.20.ebuild
new file mode 100644
index 000000000000..1e44048f862a
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.18.20.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubectl/kubectl-1.19.12.ebuild b/sys-cluster/kubectl/kubectl-1.19.12.ebuild
new file mode 100644
index 000000000000..99f1f19c12d4
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.19.12.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+DEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubectl/kubectl-1.20.8.ebuild b/sys-cluster/kubectl/kubectl-1.20.8.ebuild
new file mode 100644
index 000000000000..99f1f19c12d4
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.20.8.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+DEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubectl/kubectl-1.21.2.ebuild b/sys-cluster/kubectl/kubectl-1.21.2.ebuild
new file mode 100644
index 000000000000..5603ed030db7
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.21.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+DEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index 6dc8342b06d1..f94f1f77a9ef 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -4,11 +4,19 @@ AUX kubelet.initd 520 BLAKE2B 50edf888fed020a02f099189f8a5bdde54a4bfa2a005854898
 AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba83207ae89aae4f2e151a8b32e21b8d5e92229cccd7b7aa2676328d3d1a5fa80cadde65fe80a8cde10535d4 SHA512 05ce9ea16d2ddf8e255adb406556c37bc04dcfc457a132a78d31deaed78963f4e1f31555f781b706909c02815a04370d5c0e02614eb79d602b1cb827cf2471d5
 AUX kubelet.service 642 BLAKE2B 9f0fa5db48c09c2525cbc556cd520660302408a43aceb6c11da3a191b4b21607e824e46d9805b12b57a0ac7878c7da94d0cb86c69cd949814c77bb217973c6f1 SHA512 770cadae6afb68f0556c7c5969643642bbf09b596ff49d969d31b8d9f0d8907d6931eb7fb14485c78a3f75682e44e2355c7e51973a0dfdd1e665816f04ba21ae
 DIST kubernetes-1.18.19.tar.gz 32437793 BLAKE2B d5212b8eb29635d8269f91880420bbc9c16e472583ffd659a08362e80f79beb9fb48945a48dacf0f68b6b4383db0d1e615b432ea1687c015f78e4bc7aef94189 SHA512 aba80c2d5d2296bc2453a1519c29034a4f5e52373dc366186c295154960744f2d7fbae0b9cd1c64044bbb5cd9007b182dc4f60e57e991d28b3c8f0fc8cb279fb
+DIST kubernetes-1.18.20.tar.gz 32438617 BLAKE2B 89cd395a4efda04e37e19c2e3a7961ff7e98d564dab5b8c60ddba938bbce49dd6a49be44a548346774427c6d7d9bd3acf34f1e6f5227888d3f1c843294235f65 SHA512 e8d0e1eebf3ed339bda467e7a9027151164f1be29cfe9a3f3d0e30ba854dbd9d592cc720bf61c4cb3e9634a45cf0ef23630e7564e00dd19db741b29bb3f55324
 DIST kubernetes-1.19.11.tar.gz 33549052 BLAKE2B 5c17aae668a1e8c2eb656330a990786edf18a72d655ef23e55d9b02aa2a23ac07eeab5fdf4bfda2141e8ae2e9db3559bf8f402c8b984ae152aa955cff0ee3e22 SHA512 42a8c65eac4d4c2b9531fab578c9f605a1d57b3d892e2650ec87e3b1972e58f438dbf9f5c05ec2eb529218c43c8e391e3a294467c82ceffe94cc90b35e619242
+DIST kubernetes-1.19.12.tar.gz 33540953 BLAKE2B adcaec9e572c8e76ac87ce9e121bc87f340e19bf1f906461aadeb07914846d77b5827a307f33716201bf3f62fcf55c30964243537bdb781ec40daf2c8b741202 SHA512 ccef766299c3261fd3839bd2900a7d22c7ca18bd4c4709f2d3c45c71bfcef0a091ecb2cea0ae111613bcd68ac7fb3b8b8e9045215f0419c9a9c588a73c279a7b
 DIST kubernetes-1.20.7.tar.gz 34486823 BLAKE2B b0467ecb4527a6de3955185ea377248bbf0b83624af8afd4bf8f33cb2a5e33d0433ea98b3f984a38c59ad9fd6a8cf3e8124eadc81cbe337ca7bc4bce53d4f9ed SHA512 ccb8ac6f1d9535791386ee73ba5008180e1a77fcdc320363248037117547eb6c59d25c46ea1d5bb49043717e2b6a1796470b3b677229a7a40fd6cd1f4b8ab695
+DIST kubernetes-1.20.8.tar.gz 34490175 BLAKE2B 5d99299d14f14d882c39a4928699c5eaf2cb9583ecf050e5cf80b800d4fd80c7e976b16e606b4ec22f32db16fe1bd14be7e1280a9683968a2e4b8f2b682ab084 SHA512 172127ec5015bddf763ecdbebd3922c1c77ecb8e976b72f08f9e6d6768132f06b586a639ae0e8cbbe4db3f029d509740b3efa119f468387637dc15fc63d79aac
 DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
+DIST kubernetes-1.21.2.tar.gz 36081553 BLAKE2B 60566f2f33aebcd2f48e9d245883aa74d17ce21bdec05b529265a55e266497d6c7278fb7fdb5a94747e10641b5843b2a4b8079b981818ce3f3078c046ed72762 SHA512 20f81c975d6a5a4e6cbbfcaa2f34e8dd4f96018a8a60004a9fedf13eb9d8d43a14f0b746fb48a1240e378d2a1b8de440104c72269d68239040fa6a690c5115ff
 EBUILD kubelet-1.18.19.ebuild 967 BLAKE2B d1d54a616a42fcef1f24483e2db99d09297ae0af42778816ebb487b33c4eae4940e6fa4b45158f85f5740ef90c05800b3ba97bd5938793d6915d9e6f451c10a4 SHA512 c5e4163bf6d69dbf6a8d19e00c92421ecd62494b99f3c4aea29319d6ae156da99e69a89e9bee5911a6644bf2e43e2ea505e5331809739e5b6c75eae9931020ef
+EBUILD kubelet-1.18.20.ebuild 968 BLAKE2B f677dcad1302346ca4763a62da621f7f7f96b3927d298eb854cb842fb332cc4d21e3fdc8fd79f07f9b5843eb53cc523419d9c7a8ba29bf48b9545a1af0c37d95 SHA512 2d8118164c53702d34080ae0f68669cb95c146afa537dd5d0a3c97020a85cc52aba7e96621a8fd11b765a96cfd28f1b421632c5bb788e013fb5e306951bb5035
 EBUILD kubelet-1.19.11.ebuild 1003 BLAKE2B afae3cd57239417bab7bc049af4f3fd1a7faf2fc6cd1d128ba15857c23944d4e72050dbf4b487feb4ac285511f0c4be217087a9ee8dd81971c8529f6d7029494 SHA512 ef137f406c76dff3d015b649304de4e4a8c131f81ac9543ef2ffb5a55b323f683b991b392022390e416b63562accefead8ccd592ba72e7253919afd42213891c
+EBUILD kubelet-1.19.12.ebuild 1004 BLAKE2B ae16a92a877501f8a611ad0f34065652b0819d753277857698dc6cbb007eb273722b596a375047247d6f6625f124f7b5e7407e7b350fb8a4b6641afcc35f37e2 SHA512 0c0474deb8a6fa845e2bd0d0e27d432ca2f0888246454ea91feb265cb490a8c4b3722f79a19c3732f80df3b7ad9f87992ef92e8577b9520e9d92c18010a6714f
 EBUILD kubelet-1.20.7.ebuild 1003 BLAKE2B afae3cd57239417bab7bc049af4f3fd1a7faf2fc6cd1d128ba15857c23944d4e72050dbf4b487feb4ac285511f0c4be217087a9ee8dd81971c8529f6d7029494 SHA512 ef137f406c76dff3d015b649304de4e4a8c131f81ac9543ef2ffb5a55b323f683b991b392022390e416b63562accefead8ccd592ba72e7253919afd42213891c
+EBUILD kubelet-1.20.8.ebuild 1004 BLAKE2B ae16a92a877501f8a611ad0f34065652b0819d753277857698dc6cbb007eb273722b596a375047247d6f6625f124f7b5e7407e7b350fb8a4b6641afcc35f37e2 SHA512 0c0474deb8a6fa845e2bd0d0e27d432ca2f0888246454ea91feb265cb490a8c4b3722f79a19c3732f80df3b7ad9f87992ef92e8577b9520e9d92c18010a6714f
 EBUILD kubelet-1.21.1.ebuild 1003 BLAKE2B ec935db07373229e5f1a47afb0700bfc1c57d98ce22096442ec9bd96c249f0b281988086e9680b61a865aa0a29328fcca1fded077adc36e3ed887e90482926b0 SHA512 57e849382861127150d322b947f22a7e84b4b4a19459a99fb48be480e109e5ff32a546139eb0ab191a149aa0c857d3f909ac21eaff3e41d2d9a95bcb88858a4f
+EBUILD kubelet-1.21.2.ebuild 1004 BLAKE2B f88397138d1ad4d29a043f56763236cf87f6c219c6d4ee45fc9d45df3f1a6758a10ebdf6cfdb2757fd420595c5720e9d0bd3df0dbb159859cedfc40f2662f5dd SHA512 fdcb1d7d2e8959cfbe3e6c3d138cc2f20cea6024f3cb89959bb8a7f68d5e2188d1b5bffd299a9484c4e37e446e128470a1f56d9278c46ce2c539ccabf2444ce3
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kubelet/kubelet-1.18.20.ebuild b/sys-cluster/kubelet/kubelet-1.18.20.ebuild
new file mode 100644
index 000000000000..53a67a3c87c8
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.18.20.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+
+RESTRICT+=" test "
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc/kubernetes
+	newins "${FILESDIR}"/${PN}.env ${PN}.env
+}
diff --git a/sys-cluster/kubelet/kubelet-1.19.12.ebuild b/sys-cluster/kubelet/kubelet-1.19.12.ebuild
new file mode 100644
index 000000000000..78302b14a815
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.19.12.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test "
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc/kubernetes
+	newins "${FILESDIR}"/${PN}.env ${PN}.env
+}
diff --git a/sys-cluster/kubelet/kubelet-1.20.8.ebuild b/sys-cluster/kubelet/kubelet-1.20.8.ebuild
new file mode 100644
index 000000000000..78302b14a815
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.20.8.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test "
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc/kubernetes
+	newins "${FILESDIR}"/${PN}.env ${PN}.env
+}
diff --git a/sys-cluster/kubelet/kubelet-1.21.2.ebuild b/sys-cluster/kubelet/kubelet-1.21.2.ebuild
new file mode 100644
index 000000000000..25f142b537a3
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.21.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test "
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc/kubernetes
+	newins "${FILESDIR}"/${PN}.env ${PN}.env
+}
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 368331142eb1..41c097e21d43 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -13,15 +13,15 @@ DIST openmpi-4.0.2.tar.bz2 9819372 BLAKE2B 000faa8ff032f9aa6bf5f0a14fb9a363080cf
 DIST openmpi-4.0.3.tar.bz2 9856669 BLAKE2B 571e8038cdf125bfb452fbee44d8397f8e724498971409fb25e11cc90ad4d7f9106f4ad093d4722754303808b82c58bf3b39a72a2567192efd1b98422f09160f SHA512 01f773064c575a0fe6ab081c20c5cf07ba1c9eada5ecfe520d14ce2b9fc6d021d0f56a0159fa354fd6c8e2bb7354a272aa8d0063b351f59251deb56474849acc
 DIST openmpi-4.0.4.tar.bz2 9748444 BLAKE2B 3c3258b7cd71156deec317479ac1ea9766b09447b77174e448a63dab30f75a525c4142159ff58ad0b6208282e36d568e4cd4e7cc1f8b9b34cad8561ce2969a72 SHA512 6c193b4b5cbfd9d48fa5efcef01372c424b51ae5e9727ccf4235e3b14556dfeb010865e41a9473419ccda16559139aa469086b1fff9abfd337e87387fdec1c64
 DIST openmpi-4.0.5.tar.bz2 9752045 BLAKE2B 9709dc8c251d4f2be14d0ab498c5d0d0e59f95db98fb16d9e84fe3d30af5a8e2f9636bbceaf7ae4086a3312bcd6299f0e9e1ca609d658930a1f5abe1018311e1 SHA512 b7a1a5ccfc0eaa0f0504ff770b550480f7ae6727fa891e3310d9340a0d844a2ceddf62c2e59efd047ab9416b24c829919bbccd29606ca0e0d7a0569dad800011
-EBUILD openmpi-1.10.7.ebuild 6265 BLAKE2B 33362f7aa92673ae525b737239a81d608db4b783e62130bf30a6cc1b29d6f59cf2f3bff21e3d0389e582d81b25e7949eab5de965e124e7b3d5b6b538343f33e8 SHA512 5434a10d4c06ad6cc4da12ec45192ce2f08ff0c95bf138487b75b81dfb6a6055b5bcb6d81827e885935ef8481907f631268e9d6065fba330ec3e553f9ce10806
+EBUILD openmpi-1.10.7.ebuild 6255 BLAKE2B 9c95f5795f1ae64079ee6196437bd10fa74cd94cbe38c2923d582ba50041e61fec23accffb9e21c259495b79a37d8a5cc151e6d81818fb7f7840bd40de666671 SHA512 45d7ca9d261a9309acc1e857e3e26ba63d0a39c95bcabca2023b2573c336d2d4ebe25213a037a986bfac38385cf5977ddabe16f7cebcf18a2f697a363fcf2469
 EBUILD openmpi-1.4.5.ebuild 2413 BLAKE2B 0e4c9ad51c2f7f44449b0a5d3e1400de600f5337d591dcb89eb938455afa24d891573e03abdfa7434432b8377ffb3f9aefc291881713de0b80fe50322b962ba7 SHA512 187962e3788b94607b9a22728c6f90405cd4c49007413e9d0cfb4df45d5e67f30bcd2129ae8132d08460d9760891f2b15539f995e481962d91c2b7c5a7005002
 EBUILD openmpi-1.6.5-r1.ebuild 4944 BLAKE2B 8e5686a037431c45d7ebde9e82e633f138dc887ca2f1cc2ae24e76dc800ace2a79f63f6c7804794cde1cad5ec7e84b00ded707d84424d7a6413da9c80359fb51 SHA512 008b5b5ad61126d5a758784f6c2c805a55837de6dc109c11758941e2e3a414d3361ba3dbb3959185e2b6b3f02eb7ecf4a8aadb76bea0b872e463c13620a48a08
 EBUILD openmpi-1.7.5-r1.ebuild 4695 BLAKE2B c00f8c11c18323c38a9ed700693d9b67313588d04facacf24f29fae2d625aaa6fe5643adb01f9505effefd5314ce016730a1ff350ab7d467876be6d36d556135 SHA512 07050a17e0f331301f07b7de3473c9f7eb0e89741e39206b69f18d0cb48beb0541c29557ebc7e833a0e79df6405a22eace83799b6b4745a9bdda26d6919ddcc5
 EBUILD openmpi-1.8.8.ebuild 5249 BLAKE2B 6fbf1a0adad811879e393672e6425f1766fbe69e51479a8eaa9cb456f506077833fe07e8befe274546de5e0fe5a93c96b17e5ff1a23a71d8518e9d05a5851380 SHA512 f423c2423f12ca013c393bc14c42841acf910674770124eb4f8a81220606e80ae46795d27524242ea98e83f5d5aaf4bc53358097cffc4b54ce908b93b4eb41bd
-EBUILD openmpi-2.0.4.ebuild 5877 BLAKE2B 353ab1af6828784e696f0688487cb6ad45f6af3a40c4fa636f7b28156623c92ff8af82ed20dc39fd4372abf9cff0d29ffdb265a1e4d810ae73cf1d8eb9e1f1a3 SHA512 e38b332dae2e88edeca894cf82a1b6e89e76438836cd7d841f08b717a2bf13c068eac380c13411417c3d2511893111e49971f1ad706ae57b52860d1064d539d5
-EBUILD openmpi-2.1.6.ebuild 5495 BLAKE2B c31d193ddfe6a521d3173cbf0d4301a0c39dbebeb9981eba5a78c2c23172630d3bc6a969ccaa231dfd2e38101951b69b755c1effaf139a99f89b795884ebbd25 SHA512 b945303b1f459ede6d85b551db588f63ae604817ebae9c8475a70c424313d488bc85b48b2990d2766e7e284ea2a74d7f11ca19fb6cea726db22a0a663538ab1c
-EBUILD openmpi-3.0.4.ebuild 5381 BLAKE2B 806722e9526f4659ac549e306c169d2647078a1fc86389b5490133034f41d4cd60eef31e83d962ca1ac798c5506ae9e4774a90cefa1af210f7c166138d554f3b SHA512 33586d6a1d613b2efbf6b73892c3c554fb5afbda87051ef0894168caf28f10f269a18d1faf779cdff8a7b1a8a18e4d4b8d04745852d809f11df90b9550c7b3a2
-EBUILD openmpi-3.1.4.ebuild 5381 BLAKE2B 806722e9526f4659ac549e306c169d2647078a1fc86389b5490133034f41d4cd60eef31e83d962ca1ac798c5506ae9e4774a90cefa1af210f7c166138d554f3b SHA512 33586d6a1d613b2efbf6b73892c3c554fb5afbda87051ef0894168caf28f10f269a18d1faf779cdff8a7b1a8a18e4d4b8d04745852d809f11df90b9550c7b3a2
+EBUILD openmpi-2.0.4.ebuild 5865 BLAKE2B d16aaad399c13dedfeaffdc1c171c3a93a3394969b258c8b6a1b3b44494d8bdbb680f04c6a77cccef65baec41da2c7c9a408c895bdf74a8509239e786380c807 SHA512 82a99b9e2fde11a9f9b847077e0c685f467b7764d638580bbe6175c6d0065a085cf44d30101859ca7025eddaa5b041d370a7e1cb4acb104eb273d38e88c8e33f
+EBUILD openmpi-2.1.6.ebuild 5470 BLAKE2B 3b2c88ac0478b6828001366437acb965d62061a956de45fb7b9e7917641757a65dddfaf63b6c80475837d5742f92d60cc4bf140ea6f42f78b1491f56fd324f52 SHA512 166142b1364b7964991129d1340549148f0cf96124493495e83a0a2ea011dc60424f297f0c5c101b3d3b0d14c58e6bd45d05b50ae0f0d13fe22cda183542bffe
+EBUILD openmpi-3.0.4.ebuild 5356 BLAKE2B 2330d221b4b6f8cfb83abddd5c9d0ea62c733bfb3c2b2e0f9a05be4cf54516208ef508bcf782ef3ff0b22221b5eb91bc8e963db2032495e58b4620fec52a9084 SHA512 7ff7298fe6e6bf4d20d2ab5c75b47c5f354a34c24a057ca18150a971665b93926355b6de7d2434bd4c4237072a5346641b02debcedb48d4aecfb5d1f782876a2
+EBUILD openmpi-3.1.4.ebuild 5356 BLAKE2B 2330d221b4b6f8cfb83abddd5c9d0ea62c733bfb3c2b2e0f9a05be4cf54516208ef508bcf782ef3ff0b22221b5eb91bc8e963db2032495e58b4620fec52a9084 SHA512 7ff7298fe6e6bf4d20d2ab5c75b47c5f354a34c24a057ca18150a971665b93926355b6de7d2434bd4c4237072a5346641b02debcedb48d4aecfb5d1f782876a2
 EBUILD openmpi-4.0.2.ebuild 5321 BLAKE2B 09350d41a27b89cc1938e2ecc9330b5b9511cfda313ec1c46467ae148ecf2c752d301d1c21d9cb164550f9f792fdbd1d1684a1ed2285be59a85d7c5ce4b332cf SHA512 09b95d07f982900cd4d46eaaba11a316528d37c6ac48b1ce51fb94968481530e8283170405bb3c7c9272ae7c452f3cc8f57a55ddd645854c6c1c318f45363b35
 EBUILD openmpi-4.0.3.ebuild 5321 BLAKE2B 09350d41a27b89cc1938e2ecc9330b5b9511cfda313ec1c46467ae148ecf2c752d301d1c21d9cb164550f9f792fdbd1d1684a1ed2285be59a85d7c5ce4b332cf SHA512 09b95d07f982900cd4d46eaaba11a316528d37c6ac48b1ce51fb94968481530e8283170405bb3c7c9272ae7c452f3cc8f57a55ddd645854c6c1c318f45363b35
 EBUILD openmpi-4.0.4.ebuild 5321 BLAKE2B 09350d41a27b89cc1938e2ecc9330b5b9511cfda313ec1c46467ae148ecf2c752d301d1c21d9cb164550f9f792fdbd1d1684a1ed2285be59a85d7c5ce4b332cf SHA512 09b95d07f982900cd4d46eaaba11a316528d37c6ac48b1ce51fb94968481530e8283170405bb3c7c9272ae7c452f3cc8f57a55ddd645854c6c1c318f45363b35
diff --git a/sys-cluster/openmpi/openmpi-1.10.7.ebuild b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
index 15fdb90992dc..662924556001 100644
--- a/sys-cluster/openmpi/openmpi-1.10.7.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 FORTRAN_NEEDED=fortran
 
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs versionator multilib-minimal
+inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib-minimal
 
 MY_P=${P/-mpi}
 S=${WORKDIR}/${MY_P}
@@ -29,7 +29,7 @@ IUSE_OPENMPI_OFED_FEATURES="
 
 DESCRIPTION="A high-performance message passing library (MPI)"
 HOMEPAGE="https://www.open-mpi.org"
-SRC_URI="https://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2"
+SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
@@ -160,30 +160,33 @@ multilib_src_install() {
 	# 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
+		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
+		rm \
+			"${ED}"/usr/include/mpif* \
+			"${ED}"/usr/bin/mpif* \
+			|| die
 	fi
 }
 
 multilib_src_install_all() {
 	# From USE=vt see #359917
-	rm -rf "${ED}"usr/share/libtool &> /dev/null || die
+	rm -rf "${ED}"/usr/share/libtool &> /dev/null || die
 
 	# fortran header cannot be wrapped (bug #540508), workaround part 2
 	if use fortran; then
-		mv "${T}"/fortran/mpif* "${ED}"usr/include || die
+		mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
 	fi
 
 	# Avoid collisions with libevent
-	rm -rf "${ED}"usr/include/event2 &> /dev/null || die
+	rm -rf "${ED}"/usr/include/event2 &> /dev/null || die
 
 	# 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
+		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.
diff --git a/sys-cluster/openmpi/openmpi-2.0.4.ebuild b/sys-cluster/openmpi/openmpi-2.0.4.ebuild
index 39c9e77772d7..93c7bfd018cf 100644
--- a/sys-cluster/openmpi/openmpi-2.0.4.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.0.4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 FORTRAN_NEEDED=fortran
 
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs versionator multilib-minimal
+inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib-minimal
 
 MY_P=${P/-mpi}
 S=${WORKDIR}/${MY_P}
@@ -29,7 +29,7 @@ IUSE_OPENMPI_OFED_FEATURES="
 
 DESCRIPTION="A high-performance message passing library (MPI)"
 HOMEPAGE="https://www.open-mpi.org"
-SRC_URI="https://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2"
+SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux"
@@ -149,24 +149,27 @@ multilib_src_install() {
 	# 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
+		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
+		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
+		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
+		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.
diff --git a/sys-cluster/openmpi/openmpi-2.1.6.ebuild b/sys-cluster/openmpi/openmpi-2.1.6.ebuild
index 8fead75c26b0..bb8a65b2cf1c 100644
--- a/sys-cluster/openmpi/openmpi-2.1.6.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.1.6.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 FORTRAN_NEEDED=fortran
 
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs versionator multilib-minimal
+inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib-minimal
 
 MY_P=${P/-mpi}
 S=${WORKDIR}/${MY_P}
@@ -27,7 +27,7 @@ IUSE_OPENMPI_OFED_FEATURES="
 
 DESCRIPTION="A high-performance message passing library (MPI)"
 HOMEPAGE="https://www.open-mpi.org"
-SRC_URI="https://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2"
+SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
@@ -140,14 +140,14 @@ multilib_src_install() {
 	# 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
+		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
 	else
 		# some fortran files get installed unconditionally
 		rm \
-			"${ED}"usr/include/mpif* \
-			"${ED}"usr/bin/mpif* \
-			"${ED}"usr/bin/oshfort \
-			"${ED}"usr/bin/shmemfort \
+			"${ED}"/usr/include/mpif* \
+			"${ED}"/usr/bin/mpif* \
+			"${ED}"/usr/bin/oshfort \
+			"${ED}"/usr/bin/shmemfort \
 			|| die
 	fi
 }
@@ -155,14 +155,14 @@ multilib_src_install() {
 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
+		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
+		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.
diff --git a/sys-cluster/openmpi/openmpi-3.0.4.ebuild b/sys-cluster/openmpi/openmpi-3.0.4.ebuild
index 108954556787..6d1e97a1de5c 100644
--- a/sys-cluster/openmpi/openmpi-3.0.4.ebuild
+++ b/sys-cluster/openmpi/openmpi-3.0.4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 FORTRAN_NEEDED=fortran
 
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs versionator multilib-minimal
+inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib-minimal
 
 MY_P=${P/-mpi}
 S=${WORKDIR}/${MY_P}
@@ -27,7 +27,7 @@ IUSE_OPENMPI_OFED_FEATURES="
 
 DESCRIPTION="A high-performance message passing library (MPI)"
 HOMEPAGE="https://www.open-mpi.org"
-SRC_URI="https://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2"
+SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
@@ -137,14 +137,14 @@ multilib_src_install() {
 	# 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
+		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
 	else
 		# some fortran files get installed unconditionally
 		rm \
-			"${ED}"usr/include/mpif* \
-			"${ED}"usr/bin/mpif* \
-			"${ED}"usr/bin/oshfort \
-			"${ED}"usr/bin/shmemfort \
+			"${ED}"/usr/include/mpif* \
+			"${ED}"/usr/bin/mpif* \
+			"${ED}"/usr/bin/oshfort \
+			"${ED}"/usr/bin/shmemfort \
 			|| die
 	fi
 }
@@ -152,14 +152,14 @@ multilib_src_install() {
 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
+		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
+		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.
diff --git a/sys-cluster/openmpi/openmpi-3.1.4.ebuild b/sys-cluster/openmpi/openmpi-3.1.4.ebuild
index 108954556787..6d1e97a1de5c 100644
--- a/sys-cluster/openmpi/openmpi-3.1.4.ebuild
+++ b/sys-cluster/openmpi/openmpi-3.1.4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 FORTRAN_NEEDED=fortran
 
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs versionator multilib-minimal
+inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib-minimal
 
 MY_P=${P/-mpi}
 S=${WORKDIR}/${MY_P}
@@ -27,7 +27,7 @@ IUSE_OPENMPI_OFED_FEATURES="
 
 DESCRIPTION="A high-performance message passing library (MPI)"
 HOMEPAGE="https://www.open-mpi.org"
-SRC_URI="https://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2"
+SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
@@ -137,14 +137,14 @@ multilib_src_install() {
 	# 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
+		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
 	else
 		# some fortran files get installed unconditionally
 		rm \
-			"${ED}"usr/include/mpif* \
-			"${ED}"usr/bin/mpif* \
-			"${ED}"usr/bin/oshfort \
-			"${ED}"usr/bin/shmemfort \
+			"${ED}"/usr/include/mpif* \
+			"${ED}"/usr/bin/mpif* \
+			"${ED}"/usr/bin/oshfort \
+			"${ED}"/usr/bin/shmemfort \
 			|| die
 	fi
 }
@@ -152,14 +152,14 @@ multilib_src_install() {
 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
+		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
+		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.
diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index a312afe03e8c..b32f84d8f1c5 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,5 +1,5 @@
 DIST singularity-3.7.4.tar.gz 6446703 BLAKE2B f9263a18c138cffa116ab06d59533948e48500fad69917598adc36b47fb0b8bf81e868ea924d1cd0e39ca6345a2fdc38a1c9788944729a43c4c8b63bbe82a184 SHA512 a02d8e5c3c229e454c7736173cbe3709ccaafb0ffedcf537501eb091cd3ee54899542e0c6e1221f35dcffbaf48d27be7e91a9bd510bdaacfd8a2285ea41e6f3d
 DIST singularity-3.8.0.tar.gz 7892955 BLAKE2B a75c9a5646cf5bfcc906bdda0e72e062787f6694322ca62ff329c63dfad051edc6c751e4e58cf01476a133947d87ad6230ba60e2d7b7da75ba654486a6c8d48c SHA512 b1e3dc673fbf58d8fa13bea4c67114d1abf0f17e86f1958f585795374107f6b18dd854899b4a574dc3e4d8d4abf4177c26e63c7c3436ae1d35c66331f1630272
 EBUILD singularity-3.7.4.ebuild 1920 BLAKE2B dfb08d92fd548420df98f8f7a231840b13c6fcab2f74a673c324a2f123a212128eb4a0968f3834b6a2b11c5239b42ce80f0f78906bec6de40a5f81efa96f771e SHA512 e420cac5eea34e0d6dab96bbd02dfacfc7fcea64469fa2d542dd474249f88fa37367792d7d124b7fbe923da60ef66c817b4f4a69c50a722c8ed5166a5a48c48d
-EBUILD singularity-3.8.0.ebuild 1902 BLAKE2B 2eb0b09273480ac09f1ff9fbfc759046253660bba7c049b80890ea91ba78c4cf05b583ec4eb8db40450cdc1e06261fbced9c4f6d22cfe05ded82ec66c9eb4206 SHA512 e9a894fc5313729fa28c4353cf4b0ca298a2aeb9ebeaaa67b03a9aa0cf90e7c8e39fd7effd6f8f50c5f85e1d0ba60be77a2d4f58b881d2ffc75c20f6956f0982
+EBUILD singularity-3.8.0.ebuild 1900 BLAKE2B a24c10ad485b5359a304caf1c85dcd1529e41d50070f842b9d36f1ef79c76edd51ed44f8bceddeea729038eb299e1a917036fef34f036413255033e3e4c0d3ae SHA512 32764eddc65b36a265c7527852b4b1709dca3f1cc17ad38ea75950fd2972643f0f13238df1e481fe392762ef6755e83707b64037b36f73dd18a923ee0f28058c
 MISC metadata.xml 451 BLAKE2B 0cca32721561e4100348cd884b88edad067a426736df27d4be6926525f9dd1315387dbefff84b983e69ab1972a44cd3a3a2c643bae676b413dab3482005d4ceb SHA512 da6f640f7df71bfe98fdabfe8ea69b1929b80b3c23d869dc496515a76d3f76c5d89d38843faf850184ddd7f624dd1e821dd50103f92e81aeb620a4bcd7151609
diff --git a/sys-cluster/singularity/singularity-3.8.0.ebuild b/sys-cluster/singularity/singularity-3.8.0.ebuild
index 2c112879880a..e0cda2b957ce 100644
--- a/sys-cluster/singularity/singularity-3.8.0.ebuild
+++ b/sys-cluster/singularity/singularity-3.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hpcng/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples +network +suid"
 
 # Do not complain about CFLAGS etc. since go projects do not use them.
diff --git a/sys-cluster/zetcd/Manifest b/sys-cluster/zetcd/Manifest
index 6befb12379db..ecbb0c27c697 100644
--- a/sys-cluster/zetcd/Manifest
+++ b/sys-cluster/zetcd/Manifest
@@ -5,5 +5,5 @@ DIST github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz
 DIST github.com-google-go-genproto-ee236bd376b077c7a89f260c026c4735b195e459.tar.gz 968271 BLAKE2B 25c00f9bdb5b6069b3e06bd4e26b5df95110843c894216eef033e10660a5103d4b471ad8b014630292c5001f976c54e1da5dfb4c89d6f655715241d41ee99b7b SHA512 a3a9e923926da62e097ee1775332cc5550334e4f96975f2ac5f0d3bdaa148f6583dcce10db68d1d4606ee471072b3248f40ae276bd9409c0d31a9f9bb3803bc1
 DIST github.com-grpc-grpc-go-777daa17ff9b5daef1cfdf915088a2ada3332bf0.tar.gz 220340 BLAKE2B 788b394df3b791a558c5aeb0fc1e330053d0dcc58d47308d337498743284a7b0a01eb28a853d619ae0038b27db4c93883cef672f74d7a7442d856b19e3e1cfb2 SHA512 ca79d38bc7d68f1d98869bee21dcdc563c3fee1a8d28b77d474752376fb91cc7b368466dfac41ddebbec13c1560ac3c22257a52deb6d844add5d208646d2e3f5
 DIST zetcd-0.0.4.tar.gz 1781564 BLAKE2B f6d5b69b9679dd53aa2f993979fbe8acc7711544fc43f58624d05223b90ff1aff76a8760708cbe8d3d424516ba67fc44967f1c54c025cd471d95465b2d6ba000 SHA512 d01cf89f500c6caf0ca4b60adda82d662d3f8948aeb3963f72872363f31ecd4e99b2b839ad8ae826906b0abdc46fbdacd6f996778d2a51cf2a1ddc6ba09b3fc6
-EBUILD zetcd-0.0.4.ebuild 1396 BLAKE2B 90880cf3a536c267949ce68487ab426b5e9a1fc8cafd80471b6b7b2797e807665113519d5b90f4028af7492c8abb759dab09c4af3ecf3887a027d5b597ac76bf SHA512 6d9496328e56a2b02f05b88367b58900f570daf2635e0dcf725feaeba8c66b5e76bd1aa14865af1b6eaa0d1fae4c98d01509ca9f4d97821115c40521de697773
+EBUILD zetcd-0.0.4-r2.ebuild 1386 BLAKE2B 74aa134c48e0dc58f6bcc530f3e178c8be1a78d2bae269c9a07719fd1cd98e0a38311b5fc275c48ae22e2ec9c5ec6495efd9700fd2fd5736adbc2fbea42b7781 SHA512 35ee46e0abec9043321f1b09005e6894e096d4b41c2f1afc53e814566130ab8032cf50ed3cd9a1fb7c1ccc80274bb4eb26921e2d17c155b897d05d2b6be1dacc
 MISC metadata.xml 244 BLAKE2B ff259b94f4e824620ba81fdbc657d5308919c840834f07290dd71a3482d366a970d82829447e4afd3498cdf88673e0ce28dba2507e8e0685aee062cc23db89b7 SHA512 e177f12585fce0e2369a90e7cd55b725cd4f41462826859edfeefea5ba8c430ef4df82ccd6843c9813fcba9141be34897917c55677753214d6ecf47c39d3df03
diff --git a/sys-cluster/zetcd/zetcd-0.0.4.ebuild b/sys-cluster/zetcd/zetcd-0.0.4-r2.ebuild
index 0f92ae748b79..a1a5da597d9c 100644
--- a/sys-cluster/zetcd/zetcd-0.0.4.ebuild
+++ b/sys-cluster/zetcd/zetcd-0.0.4-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 EGO_PN="github.com/coreos/zetcd"
 
@@ -13,25 +13,28 @@ EGO_VENDOR=( "github.com/coreos/etcd 714e7ec8db7f8398880197be10771fe89c480ee5"
 
 ZETCD_COMMIT="e4352ce3cc940bc5b60bb3dd69c14f16dac2980a"
 
-inherit golang-build golang-vcs-snapshot user
+inherit golang-build golang-vcs-snapshot
 
 ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
 
 DESCRIPTION="A ZooKeeper personality for etcd"
 HOMEPAGE="https://github.com/coreos/zetcd"
-SRC_URI="${ARCHIVE_URI}
-	${EGO_VENDOR_URI}"
+SRC_URI="
+	${ARCHIVE_URI}
+	${EGO_VENDOR_URI}
+"
+
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE=""
+KEYWORDS="~amd64"
 
 RESTRICT="test"
 
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
+DEPEND="
+	acct-group/zetcd
+	acct-user/zetcd
+"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	pushd src || die
diff --git a/sys-cluster/zookeeper-bin/Manifest b/sys-cluster/zookeeper-bin/Manifest
index 2c5bd25092bf..b52b47ef50aa 100644
--- a/sys-cluster/zookeeper-bin/Manifest
+++ b/sys-cluster/zookeeper-bin/Manifest
@@ -1,12 +1,6 @@
 AUX log4j.properties 2191 BLAKE2B 64ca568213fcc1168a10b8ca5914361f2d4543e8d5a2e22bf81ee807df2c4f7ca269a1f8d355ee8e889aa50c250e24f65c3900a32f06233e6c3dbc9b460c48b2 SHA512 a465aef274e3f325730c150fdebe3ca27f9debe723af6680b187daf83d6da663fa8a51bb9813ec8cba3b4d59c9e28848032083a44686b08fd2c246a461ada0c6
 AUX zookeeper.confd 398 BLAKE2B d49c6c7358ce2f6911d359142e0f6abe2662c0e5c2bcf1ac114cd272d44efcfad05d31d58ef368a470e6f844df999068b68a7c1e8392138fc07887333e7bd41f SHA512 76ad4796faa2d267ae30d85e573de2dbad00c566764cf6757d71c00c68b10c99383dd87d2352f521c872ce22edde85bb2d3896bb6258f57ce3fc6b423a16296f
 AUX zookeeper.initd 373 BLAKE2B c60740f691d186861e3f101c84e5904774de6235a0423f4f639843b105d6ce9b4ebd9555db13f5ac1447c154881b3c95fbd4738d496f6008d9e52de1cc3e74eb SHA512 34a4011ecb5d8739e57dbc9222b528a0b323c6aa0aa45391621e724106571a632908782e3a4e14e953be72fa0e525b4c7cab0440af37bbef26a100fd1d92da81
-DIST apache-zookeeper-3.5.9-bin.tar.gz 9623007 BLAKE2B cb8a599a86f57cb0eb91d58925d363271749e0ca93b0d40be5852f859848bf557f4bc6016707cb99ad75e95204b7b8e0417acdff5ebc8328e3a12c5fe7faf285 SHA512 0e5a64713abc6f36d961dd61a06f681868171a9d9228366e512a01324806d263e05508029c94d8e18307811867cdc39d848e736c252bf56c461273ef74c66a45
-DIST apache-zookeeper-3.6.2-bin.tar.gz 12515974 BLAKE2B 6770397b818558464843638bb9beebc1e23fc737ed88b28966494f69a28adb9624d9ea67225f8b528babd78a6ce7650218933b80db520ea08e31231e1bbe478c SHA512 caff5111bb6876b7124760bc006e6fa2523efa54b99321a3c9cd8192ea0d5596abc7d70a054b1aac9b20a411407dae7611c7aba870c23bff28eb1643ba499199
-DIST zookeeper-3.4.13.tar.gz 37191810 BLAKE2B 994eecf982a19bbf3ae648c5d140746f5836f0f5d8921ed005ebccdedf0098591005b9038eb75fc660b48ae12b09b8db9dd68d3ac3b4ac9f847de214996e1efd SHA512 3481bd19945d80848f81d9dc2896a682ae8b62269b8164ffbae532e55aa4219961403e0208c8e72cf784605eae436d70ddae2b26e0deba0f1f84c74188c32c0a
 DIST zookeeper-bin-3.7.0.tar.gz 12387614 BLAKE2B 5b5467b4c7e206704177d41289c3c52fb0487f990fcc460d2749215551ab08eee672b6b52b8d43796c52660a46d3bed837fe26f042c30506b537457f54a95bd7 SHA512 64e2701c019ed46f45f4d53b2c5eaeaf7cf48c342bbafa032a0819d527fc77caebfada6bdad34e5171e6d838f40b16c95b62ce378b53dfc827af2d60cec0b17c
-EBUILD zookeeper-bin-3.4.13-r1.ebuild 1715 BLAKE2B 8ce26ac2d66e2e9591b57a344bf4ae0448d6bf6178c0552255f1137fa4d1038385c1880f31485c928a09719ec9b37a8f9950aa57ebbf60d3c8095d13b48254d4 SHA512 cedb27ee795393d4cdfc342fb549cd603cbb1585ef6ea74a3d2c334d6dd0213d39d9e680408e895b2d0e403724029a3e60e1cd194d008b53f43f95a13898974a
-EBUILD zookeeper-bin-3.5.9.ebuild 1477 BLAKE2B f6cc7898f223a134e7ec0f64f63ab1487e255c8be6690e583f89ad19e04c9f795dc17d24599684cd7f5a2a91575a90fdef57f4e5c2b5b34c9cac4dbd84748c91 SHA512 de17264957bbc15d231a14d88c82538d1ae0fcc490c9feb72534fb1d04517e9e66235266b8ec09f6d87b1e7b813799dd33b0fa80930d339a8f3710bb31c3d536
-EBUILD zookeeper-bin-3.6.2.ebuild 1477 BLAKE2B f6cc7898f223a134e7ec0f64f63ab1487e255c8be6690e583f89ad19e04c9f795dc17d24599684cd7f5a2a91575a90fdef57f4e5c2b5b34c9cac4dbd84748c91 SHA512 de17264957bbc15d231a14d88c82538d1ae0fcc490c9feb72534fb1d04517e9e66235266b8ec09f6d87b1e7b813799dd33b0fa80930d339a8f3710bb31c3d536
-EBUILD zookeeper-bin-3.7.0.ebuild 1492 BLAKE2B f76741fe53ab3cc99240af760f451a304ec5b1c6a666d28c0d5d3228ca78afd6fb8be4e778f1ff26064af4304fe14bde94f492f330fa8aebd6cc9016e41f834f SHA512 6d7cf7057665bb2076e48777f3c22df094886d113ffd6d7845c8a16eaae43b728524075c36129efc314b830ae42e8b2ec2b92b8589ff09d7325379b261ddf33e
+EBUILD zookeeper-bin-3.7.0.ebuild 1490 BLAKE2B 03572804661466c353c36c37eba0847148dc8a7bd5643c100c59183c054b25800803524d66e36e818e9316b8bc82425ebcd62d0a157383746458df279674e828 SHA512 e90e8b9acd7e360b310576fdb538289e536783e42e1b7f5c1c6b972008d792edcdc3e802b09724e2b92cc6eb160022ff4675f68ffb5e215e0ef3437c91dc50f7
 MISC metadata.xml 377 BLAKE2B ab2582cf60510f072415cc1dd008bd744f66d76fe6b34b779eba8acf7c28a0d055d70d16c2712af7324b6b11193ed2526b6b8bb1b101084e8a5ca8d96993ef3d SHA512 2ad1600101d36b70c32cb76894e55f01717a544d689bd28ffb41a727d7d23b6f8e9565eea71f252a721bcd4e516692921796f24266485a216a6015a5a9e74f26
diff --git a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13-r1.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13-r1.ebuild
deleted file mode 100644
index d6622479c88c..000000000000
--- a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-utils-2 user
-
-MY_P="zookeeper"
-MY_PN=${MY_P}-${PV}
-
-DESCRIPTION="A high-performance coordination service for distributed applications."
-HOMEPAGE="http://zookeeper.apache.org/"
-SRC_URI="mirror://apache/${MY_P}/${MY_PN}/${MY_PN}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="mirror binchecks"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=virtual/jre-1.7"
-
-S=${WORKDIR}/${MY_PN}
-
-INSTALL_DIR=/opt/${PN}
-export CONFIG_PROTECT="${CONFIG_PROTECT} ${INSTALL_DIR}/conf"
-
-pkg_setup() {
-	enewgroup zookeeper
-	enewuser zookeeper -1 /bin/sh /var/lib/zookeeper zookeeper
-}
-
-src_prepare() {
-	# whyyyy u -Werror ?! so horribal!
-	sed -e 's/-Werror//g' -i src/c/Makefile.* || die "Failed to rectify the Makefile"
-}
-
-src_configure() {
-	cd "${S}"/src/c || die
-	econf
-}
-
-src_compile() {
-	cd "${S}"/src/c || die
-	emake
-}
-
-src_install() {
-	local DATA_DIR=/var/lib/${MY_P}
-
-	# cleanup sources
-	rm -rf src/ || die
-	rm bin/*.cmd || die
-
-	keepdir "${DATA_DIR}"
-	sed "s:^dataDir=.*:dataDir=${DATA_DIR}:" conf/zoo_sample.cfg > conf/zoo.cfg || die "sed failed"
-	cp "${FILESDIR}"/log4j.properties conf/ || die "cp log4j conf failed"
-
-	dodir "${INSTALL_DIR}"
-	cp -a "${S}"/* "${D}${INSTALL_DIR}" || die "install failed"
-
-	# data dir perms
-	fowners zookeeper:zookeeper "${DATA_DIR}"
-
-	# log dir
-	keepdir /var/log/zookeeper
-	fowners zookeeper:zookeeper /var/log/zookeeper
-
-	# init script
-	newinitd "${FILESDIR}"/zookeeper.initd zookeeper
-	newconfd "${FILESDIR}"/zookeeper.confd zookeeper
-
-	# env file
-	cat > 99"${PN}" <<-EOF
-		PATH=${INSTALL_DIR}/bin
-		CONFIG_PROTECT=${INSTALL_DIR}/conf
-	EOF
-	doenvd 99"${PN}"
-}
diff --git a/sys-cluster/zookeeper-bin/zookeeper-bin-3.5.9.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.5.9.ebuild
deleted file mode 100644
index da7b8c2abcdc..000000000000
--- a/sys-cluster/zookeeper-bin/zookeeper-bin-3.5.9.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-utils-2 user
-
-MY_P="apache-zookeeper"
-MY_PN=${MY_P}-${PV}-bin
-
-DESCRIPTION="A high-performance coordination service for distributed applications."
-HOMEPAGE="http://zookeeper.apache.org/"
-SRC_URI="mirror://apache/zookeeper/zookeeper-${PV}/${MY_PN}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror binchecks"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=virtual/jre-1.7"
-
-S=${WORKDIR}/${MY_PN}
-
-INSTALL_DIR=/opt/${PN}
-export CONFIG_PROTECT="${CONFIG_PROTECT} ${INSTALL_DIR}/conf"
-
-pkg_setup() {
-	enewgroup zookeeper
-	enewuser zookeeper -1 /bin/sh /var/lib/zookeeper zookeeper
-}
-
-src_install() {
-	local DATA_DIR=/var/lib/${MY_P}
-
-	# cleanup sources
-	rm bin/*.cmd || die
-
-	keepdir "${DATA_DIR}"
-	sed "s:^dataDir=.*:dataDir=${DATA_DIR}:" conf/zoo_sample.cfg > conf/zoo.cfg || die "sed failed"
-	cp "${FILESDIR}"/log4j.properties conf/ || die "cp log4j conf failed"
-
-	dodir "${INSTALL_DIR}"
-	cp -a "${S}"/* "${D}${INSTALL_DIR}" || die "install failed"
-
-	# data dir perms
-	fowners zookeeper:zookeeper "${DATA_DIR}"
-
-	# log dir
-	keepdir /var/log/zookeeper
-	fowners zookeeper:zookeeper /var/log/zookeeper
-
-	# init script
-	newinitd "${FILESDIR}"/zookeeper.initd zookeeper
-	newconfd "${FILESDIR}"/zookeeper.confd zookeeper
-
-	# env file
-	cat > 99"${PN}" <<-EOF
-		PATH=${INSTALL_DIR}/bin
-		CONFIG_PROTECT=${INSTALL_DIR}/conf
-	EOF
-	doenvd 99"${PN}"
-}
diff --git a/sys-cluster/zookeeper-bin/zookeeper-bin-3.6.2.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.6.2.ebuild
deleted file mode 100644
index da7b8c2abcdc..000000000000
--- a/sys-cluster/zookeeper-bin/zookeeper-bin-3.6.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-utils-2 user
-
-MY_P="apache-zookeeper"
-MY_PN=${MY_P}-${PV}-bin
-
-DESCRIPTION="A high-performance coordination service for distributed applications."
-HOMEPAGE="http://zookeeper.apache.org/"
-SRC_URI="mirror://apache/zookeeper/zookeeper-${PV}/${MY_PN}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror binchecks"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=virtual/jre-1.7"
-
-S=${WORKDIR}/${MY_PN}
-
-INSTALL_DIR=/opt/${PN}
-export CONFIG_PROTECT="${CONFIG_PROTECT} ${INSTALL_DIR}/conf"
-
-pkg_setup() {
-	enewgroup zookeeper
-	enewuser zookeeper -1 /bin/sh /var/lib/zookeeper zookeeper
-}
-
-src_install() {
-	local DATA_DIR=/var/lib/${MY_P}
-
-	# cleanup sources
-	rm bin/*.cmd || die
-
-	keepdir "${DATA_DIR}"
-	sed "s:^dataDir=.*:dataDir=${DATA_DIR}:" conf/zoo_sample.cfg > conf/zoo.cfg || die "sed failed"
-	cp "${FILESDIR}"/log4j.properties conf/ || die "cp log4j conf failed"
-
-	dodir "${INSTALL_DIR}"
-	cp -a "${S}"/* "${D}${INSTALL_DIR}" || die "install failed"
-
-	# data dir perms
-	fowners zookeeper:zookeeper "${DATA_DIR}"
-
-	# log dir
-	keepdir /var/log/zookeeper
-	fowners zookeeper:zookeeper /var/log/zookeeper
-
-	# init script
-	newinitd "${FILESDIR}"/zookeeper.initd zookeeper
-	newconfd "${FILESDIR}"/zookeeper.confd zookeeper
-
-	# env file
-	cat > 99"${PN}" <<-EOF
-		PATH=${INSTALL_DIR}/bin
-		CONFIG_PROTECT=${INSTALL_DIR}/conf
-	EOF
-	doenvd 99"${PN}"
-}
diff --git a/sys-cluster/zookeeper-bin/zookeeper-bin-3.7.0.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.7.0.ebuild
index 758806fe6c01..b5c177878c77 100644
--- a/sys-cluster/zookeeper-bin/zookeeper-bin-3.7.0.ebuild
+++ b/sys-cluster/zookeeper-bin/zookeeper-bin-3.7.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/apache-${MY_P}-bin"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 RESTRICT="mirror binchecks"
 
 BDEPEND="