gentoo resync : 03.09.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-09-03 20:56:28 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-09-03 20:56:28 +0100
commit: fbda87924e6faa7a1919f1a2b4182490bde5ec5c (patch)
tree: f3114a4ed212a754756adce027aeef3a4a1a2e2a /sys-cluster
parent: 3b08f674e3f771b49370edb144dab0958c8cf721 (diff)
73 files changed, 597 insertions, 1166 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index b2629df4b6c7..af4faf8f5e4f 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index cd171e36e056..e7f8fb5c2433 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -51,12 +51,14 @@ DIST ceph-14.2.21.tar.gz 129272778 BLAKE2B f82f452e0f0c40a95ea1bdb3654c2d322caa3
 DIST ceph-14.2.22.tar.gz 130597047 BLAKE2B 58bbb3243de076ed1d25dfd7bd75717c50ad15d16690dcbd1511d1b506477845efc3ff7fbe713cf18fb8cfcc8c16707ad2a0f30159e3198ff82e57fbd2eb3cf2 SHA512 1c66661e1a39fa9151e95e33c390b810ffe269465d8785e2197cc15b8d83bd2edde77de48a8abd71a4da68cd5830ff14bcdf6b98fd17edabe85caeb1eca018d3
 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-15.2.14.tar.gz 148573546 BLAKE2B dc49a86e17702d73afdcde3932ee3bcb79e50bc5a97e207095a7907e34dac9f44de391b5dcace7f26d3466ca715d9cfd172f65ebbad4ddbc0280daa4643a5976 SHA512 eacc4dea0d8dfe2753aff78d89324d81c5634a784313c3da8ded778e2734958c216f8c705b25f070d7ba66b559424ad3c47cb68852f66f8c9c83a83ca78ad5a5
 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 10460 BLAKE2B b5a0c5fd242da07334c24022353750ede7192033c114cae55107f8c68d9523ee4d72ba2d9af29ef2cc4717c8f6438f4fc8dd6c15d3d9176c65b53d8583b0b2be SHA512 8c5b07478158c7276688da4b559662bf181bc9b8ed6bb3539a8f12873969fa1d732fa94048dd6346e71e0ea57d7453e00c319f7f5692b58d6902f590e23643e8
 EBUILD ceph-14.2.22.ebuild 10408 BLAKE2B f1cf94e11b52be223be81070f9186db8073adc6c397ef8e71298724e2098d1a0e6742c292c68e75207aa8aef40be5bb2d45eccd015407520fde469840724870f SHA512 9ef62b42dd7977926461adfbe4f32518e4f788cf05ae33a17f00fa9ef106dc165ce3f612e790fdf07b00df71374b48077a156aa83657411ad19f1ea6cc21cf7e
 EBUILD ceph-15.2.12-r2.ebuild 10809 BLAKE2B 0d6d9c6f03d97938150d63580ef239782c98b5172113fc62f8b345d22d8c004b41de5eca9c1d7ec1d8aaff3d2f4e6d7c393a0e1f9eeb5493f0213f1bd528859a SHA512 43572f01bda8913e6736182f96e2d7f9d0a3cf3ce3d62facbdbe2f6edd2b5e84ef1ae5b0bce25a7ca16c221656d25d12308bd1b6c188fdcdaa0c22ad94d9a7fc
 EBUILD ceph-15.2.13-r2.ebuild 10705 BLAKE2B 59c423be256017163deb6d2e1a4ab690092e65e5068be7e9a26c965936b0e162565360ae2aef3b841b7fe3e418bc2518ba99e8252da4cb66a8f982135a995308 SHA512 5efc7f97490233c427eef21b3ed527e190f0a0436d8f86ab673bcebf1b71549f91d71adba48ea63188412a5aff86dbbe6e0d82cfb233287f5d924e7046e27f23
+EBUILD ceph-15.2.14.ebuild 10705 BLAKE2B 59c423be256017163deb6d2e1a4ab690092e65e5068be7e9a26c965936b0e162565360ae2aef3b841b7fe3e418bc2518ba99e8252da4cb66a8f982135a995308 SHA512 5efc7f97490233c427eef21b3ed527e190f0a0436d8f86ab673bcebf1b71549f91d71adba48ea63188412a5aff86dbbe6e0d82cfb233287f5d924e7046e27f23
 EBUILD ceph-16.2.4-r2.ebuild 12019 BLAKE2B aba6a1b3f4351159591bf590f75b8c8ed67c75191830d6bd3ec828c1a82d71ee8151d5cd654bc092254e77b304b38427bc74179b893f97b3455f4982cfdb97a5 SHA512 1377a375513cce4e326e00e1ee1252b2f19bf3a392dbbed04189dc2e1beb68ef9b444ed66556037797b58b54a77483be26ca63c1a8c7049ea66dc800fb84ccf5
 EBUILD ceph-16.2.5.ebuild 12020 BLAKE2B 07add334a77f2da4c6c5f2b0fe564aea99d0a3d6be09360155873179e29271fc0844a62f33c279eaa9ad35b8b86f6b7d3dd96f21ecbf0ce2070193870ca14270 SHA512 15ae3d05777b333d4ec8ff5d80ed81e384fc2313b533d9a2b71c889543d0072ed1e65b2acc1ecb52a1af79cccb5e6a670c50785e7b94674ce54fe87a14578842
 MISC metadata.xml 2318 BLAKE2B f9cf86426b0d8ea87cb80cb03315e9b0b581f604b2e1f28011dd49ab885232184fbcb6e496e8305d92e2c45bea973b8627235115e6bc7b7590874ac2ce9a00cc SHA512 e4eb8fb92dfe9161c217d880db3733aec36efc74431f529b12212702abbf633647bb8a22bfe7864d7389e8ed893bc37518e228ce165140058f98aec534b8f3de
diff --git a/sys-cluster/ceph/ceph-15.2.14.ebuild b/sys-cluster/ceph/ceph-15.2.14.ebuild
new file mode 100644
index 000000000000..bc1a96acf142
--- /dev/null
+++ b/sys-cluster/ceph/ceph-15.2.14.ebuild
@@ -0,0 +1,402 @@
+# 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
+CMAKE_MAKEFILE_GENERATOR=emake
+
+DISTUTILS_OPTIONAL=1
+
+inherit check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic \
+		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=(sse{,2,3,4_1,4_2} ssse3)
+
+IUSE="babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc
+	kafka kerberos ldap lttng +mgr numa pmdk rabbitmq +radosgw rbd-rwl +ssl spdk
+	system-boost systemd +tcmalloc test uring xfs zfs"
+IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
+
+DEPEND="
+	acct-group/ceph
+	acct-user/ceph
+	virtual/libudev:=
+	app-arch/bzip2:=
+	app-arch/lz4:=
+	app-arch/snappy:=
+	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/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:= )
+	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/expat:=
+		dev-libs/openssl:=
+		net-misc/curl:=[curl_ssl_openssl]
+	)
+	rbd-rwl? ( dev-libs/pmdk:= )
+	ssl? ( dev-libs/openssl:= )
+	system-boost? ( >=dev-libs/boost-1.72:=[threads(+),context,python,${PYTHON_USEDEP}] )
+	uring? ( sys-libs/liburing:= )
+	xfs? ( sys-fs/xfsprogs:= )
+	zfs? ( sys-fs/zfs:= )
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+	app-arch/cpio
+	>=dev-util/cmake-3.5.0
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/sphinx
+	dev-util/cunit
+	dev-util/gperf
+	dev-util/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
+	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}]
+		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}
+	?? ( jemalloc tcmalloc )
+	diskprediction? ( mgr !python_targets_python3_8 )
+	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-13.2.0-cflags.patch"
+	"${FILESDIR}/ceph-15.2.13-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-cython-0.29.patch"
+	"${FILESDIR}/ceph-15.2.0-rocksdb-cmake.patch"
+	"${FILESDIR}/ceph-15.2.2-systemd-unit.patch"
+	"${FILESDIR}/ceph-15.2.3-spdk-compile.patch"
+	"${FILESDIR}/ceph-15.2.4-system-uring.patch"
+	"${FILESDIR}/ceph-15.2.9-dont-compile-isal_compress-if-don-t-have-SSE4_1.patch"
+)
+
+check-reqs_export_vars() {
+	CHECKREQS_DISK_BUILD="5400M"
+	CHECKREQS_DISK_USR="510M"
+
+	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
+}
+
+pkg_pretend() {
+	check-reqs_export_vars
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	python_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
+
+	# 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_RBD_RWL=$(usex rbd-rwl)
+		-DWITH_SSL=$(usex ssl)
+		-DWITH_SYSTEMD=$(usex systemd)
+		-DWITH_TESTS=$(usex test)
+		-DWITH_LIBURING=$(usex uring)
+		-DWITH_XFS=$(usex xfs)
+		-DWITH_ZFS=$(usex zfs)
+		-DENABLE_SHARED="ON"
+		-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
+	)
+	if use amd64 || use x86; then
+		for flag in ${CPU_FLAGS_X86[@]}; do
+			mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
+		done
+	fi
+
+	# 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
+	tmpfiles_process ${PN}.conf
+}
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 15df2902ae8c..8efca15c5a84 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -13,11 +13,11 @@ DIST glusterfs-8.5.tar.gz 7873397 BLAKE2B 6ababf15fda216c9a47c05859f7123847d711d
 DIST glusterfs-9.1.tar.gz 8206207 BLAKE2B dea099eb1d366704010247964c24de404fb09c00a375dde4af30a2af836d3b35689fab91a75268aa01dba45860eb50a6e0572913c059e53fb5799d2302c2f005 SHA512 2c26813f12fed7a0640cc470badc2b83f156b660ef475487a689dca6c3fa407192f4959aeaf7a981969a079cf5d2c7aace85ff818ea6133d5a085d90d226e1da
 DIST glusterfs-9.2.tar.gz 8212980 BLAKE2B 7fb42186c5d309c357f72e3037fc09d8b15f32770d74173dd4779bab91056d1ceb78a4a651fec2018faf1597357576d41593e9d7b04cf9af7f4742301b284b01 SHA512 34a0a1745029e2fad3c8fc6a044b4e4645f8cf11eddc3c8c8e94cce9733449248c577ce6066bc49010a65121d991daf67766393fe513ac694082f0efa1d4ef95
 DIST glusterfs-9.3.tar.gz 8167846 BLAKE2B 119e2c089ef250fafb2b2dfdcf71f40cc25fdda6ac1cbb38a8557a3c206f721227eceadd87b40341e6bf2b32a7cb24996910f45e061f25d193ab2ca4070ddc76 SHA512 0974cf57a6810505f767c490b53201e62bb73ca2fd3c5203d9882dcbe4088c816afb5445ef606d12fb797b1b1fa5e0994f2ea0816577f70e630637668a20f005
-EBUILD glusterfs-7.9-r1.ebuild 5918 BLAKE2B 30a380db21aa976157cffa6da38443b5466ca014e6088915cc7b251671e0d218505938110a10caaab4f68d920920429fc768b7bd4fdc40fa43adbee5e430a1c4 SHA512 d04251b216950f23b5d4a7c95dc62f665da1af04073e9f5a647146411918d377e3152e90023daed81ad6f8e6358b3f43e9901943751ee6ab42baf6903267d1bd
-EBUILD glusterfs-8.3-r1.ebuild 5432 BLAKE2B 82e9ee097997352a86510a7ca3c8a7d450899a6ed96044f7e707fdaa952ad6a6c43fee6e4a557732f3f12dc2173146edbf4ae42d544494e8b659d6edf9146cd5 SHA512 ac49472d7d75eeecc7ee8f005a8d5f5be25eae6458888bb5b083c2e78bb764b31592f058907bdd44da148995900991e0fc0ab2923677c433959f9f2a3d427daf
-EBUILD glusterfs-8.4-r1.ebuild 5432 BLAKE2B 82e9ee097997352a86510a7ca3c8a7d450899a6ed96044f7e707fdaa952ad6a6c43fee6e4a557732f3f12dc2173146edbf4ae42d544494e8b659d6edf9146cd5 SHA512 ac49472d7d75eeecc7ee8f005a8d5f5be25eae6458888bb5b083c2e78bb764b31592f058907bdd44da148995900991e0fc0ab2923677c433959f9f2a3d427daf
+EBUILD glusterfs-7.9-r1.ebuild 5919 BLAKE2B 5aaab652acccfea58034ad71ca937947fa4c38ab3629aa3da6a3f4e77960f18f813fb8781d04e142c248581c07afa44c8699bc5a13c9796d38f65c6341335c6c SHA512 2e9443235a9a7fe493f9df20115b33b4918f23c0af580e34ba232b09a52a658b536290573a8218ad64a6594cbe387d4dea7d8d0928b657f4e803c912a5b56449
+EBUILD glusterfs-8.3-r1.ebuild 5433 BLAKE2B fef5fa52d039133126eb57fcd3578c487aceabe1776b5d6a5bc9ad07e3a9c1d6a6798c0c130b651a1430a09e67336bf5175f09e0fe811776045c8be4d0870fea SHA512 e850928695ea82b3f3257cd83be5f5d34de8d5dce807c5a86914caf4c796e5fd64be92a60cf5f71d02132e0575961c1d66ee7f735f5d1eab176c1b9139ca0db8
+EBUILD glusterfs-8.4-r1.ebuild 5433 BLAKE2B fef5fa52d039133126eb57fcd3578c487aceabe1776b5d6a5bc9ad07e3a9c1d6a6798c0c130b651a1430a09e67336bf5175f09e0fe811776045c8be4d0870fea SHA512 e850928695ea82b3f3257cd83be5f5d34de8d5dce807c5a86914caf4c796e5fd64be92a60cf5f71d02132e0575961c1d66ee7f735f5d1eab176c1b9139ca0db8
 EBUILD glusterfs-8.5-r1.ebuild 5434 BLAKE2B 7b819c7b98e882752f3c76a4df20d2c197c6d6b2bcdf6419972ce0a4bec33a6af72d9ae62307f87faf79b62980ab0a9d9aaaf221131625c3662c6e8e949881a6 SHA512 03a396e9b1c76ed932e8039945f007f71a137bd9966d598af6a3831a1af6b8e8c6a20b02ead72c896e1d312e221700c5843e507694e4189453e5c029b9986c4a
-EBUILD glusterfs-9.1-r1.ebuild 5457 BLAKE2B e9f8b7201eacc9705295a498e0e136742b9cd414f4492e99609d26c3adfa1ea76b62856596a3c30c1349fd25afb19bd502d643ad5cb857b9fab8d6b6db8dbb04 SHA512 746d669c2f0cfb6d996a5128b3c604ab83c39f9a552b26c6e3a7131b564624d25623bb152248e22033046c236efb669c66236c0499f927fe4c098d4eeb14ad66
+EBUILD glusterfs-9.1-r1.ebuild 5458 BLAKE2B a40723b4dcc5b58e363dd1be0fd00cd4f9b7c43f624cc4f89e083811d3bdbef166bd51f16c994f84ec67075f4d3ad47da4a7aff9d9771a2cb4a14356ec487f6c SHA512 26ad8356a77943c141344e1ba05d641398be4301ddb389e13462017a14c54a9c114167c4edd8fd495e636ed61bb0c0dbce1fbf886f60d61f583cf9e2a4e05b15
 EBUILD glusterfs-9.2-r1.ebuild 5458 BLAKE2B f44b0f014e5ae10f939ba1dec4815ca886ca4de737a69a45450089eb082c8d1d8eaf0ab70bcb0d741926c0daccb9faaf276c1e1a035da48d2a590a26707e7f41 SHA512 14ad8f4703bd2ee433a76f6b41e1740afcb7675ed16515845b092ce082619502b5b7305712a8c3531460f94310b4fa891aa22758f2d7b0182cd1b568ca9930bb
 EBUILD glusterfs-9.3.ebuild 5458 BLAKE2B f44b0f014e5ae10f939ba1dec4815ca886ca4de737a69a45450089eb082c8d1d8eaf0ab70bcb0d741926c0daccb9faaf276c1e1a035da48d2a590a26707e7f41 SHA512 14ad8f4703bd2ee433a76f6b41e1740afcb7675ed16515845b092ce082619502b5b7305712a8c3531460f94310b4fa891aa22758f2d7b0182cd1b568ca9930bb
 MISC metadata.xml 1516 BLAKE2B dc32b16a9cc12174d5cf6a82f8d45920392d43545a4ed9be1c6a0ec3bc50b7c51a647b049c1b74971e95a4de949c9205ad168bfc8f074ca4c535d2999b917d3a SHA512 04542d21102f1722d8f82e498f38e91316932d96f0a05eec74180e4ad133b83fd26d58d3591d2906995072c184822d7ed16357d741b7de99a0c7ff7571da6a08
diff --git a/sys-cluster/glusterfs/glusterfs-7.9-r1.ebuild b/sys-cluster/glusterfs/glusterfs-7.9-r1.ebuild
index 8fe9cb9d3d7a..9fe0f1f7df80 100644
--- a/sys-cluster/glusterfs/glusterfs-7.9-r1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-7.9-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit autotools elisp-common python-single-r1 systemd
+inherit autotools elisp-common python-single-r1 tmpfiles
 
 SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
 KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
diff --git a/sys-cluster/glusterfs/glusterfs-8.3-r1.ebuild b/sys-cluster/glusterfs/glusterfs-8.3-r1.ebuild
index 79808b9e3ff6..e951ef2e84cd 100644
--- a/sys-cluster/glusterfs/glusterfs-8.3-r1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-8.3-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit autotools elisp-common python-single-r1 systemd
+inherit autotools elisp-common python-single-r1 tmpfiles
 
 SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
 KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
diff --git a/sys-cluster/glusterfs/glusterfs-8.4-r1.ebuild b/sys-cluster/glusterfs/glusterfs-8.4-r1.ebuild
index 79808b9e3ff6..e951ef2e84cd 100644
--- a/sys-cluster/glusterfs/glusterfs-8.4-r1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-8.4-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit autotools elisp-common python-single-r1 systemd
+inherit autotools elisp-common python-single-r1 tmpfiles
 
 SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
 KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
diff --git a/sys-cluster/glusterfs/glusterfs-9.1-r1.ebuild b/sys-cluster/glusterfs/glusterfs-9.1-r1.ebuild
index 4b3b440fa715..481163386a99 100644
--- a/sys-cluster/glusterfs/glusterfs-9.1-r1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-9.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit autotools elisp-common python-single-r1 systemd
+inherit autotools elisp-common python-single-r1 tmpfiles
 
 SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index 2398a44cd45b..8d3638fa91f6 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -1,26 +1,18 @@
 AUX kube-apiserver.confd 116 BLAKE2B 2cf2dff516674ba4dc0763985a070b75e23f9af51e7334eedcb2593855e7481d5969ed458d322ac29de0e9a9c7f9f041911ee7aeca750ff77ce04fd60bf3a3d3 SHA512 302b2a7ec715967c0aa7d1c177d4e55b26e37ebba8d04dd37ecf627d20042fe91cd7e6192ff9d71422129b0ea54a9eec6046f505af550548bd450998924f37ee
 AUX kube-apiserver.initd 541 BLAKE2B ddddc86735a9f90a0c232f2631ac21c028045783c737d041a808fb5012522844614a40059524c472b9b50fd077253b75e2bcf33d69518d71428fcb7e27143fba SHA512 2863ad6d1d238b5e9557874cd3f5413108ed9424604cf026e2fd8c2fd66ba867ca9a3d98f67fdac54f335bacddf0479547b28f71aaa1db6580beff49290de110
 AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511a4623f85f01830c5e40d4ad4e44fe0b3f90d4143042d82bd83b0a2b11517e89037755ef2ad7afeeb23401bb60 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e
-DIST kubernetes-1.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.19.13.tar.gz 33554674 BLAKE2B e7654262ad0d91f9e7eac3851576bd65888f93a2614fae67e76750af64719d514e95fe27b4fb9d1ee86a0931d8f7e84cf393c6ca25604efa6d5eb4fff50c7c1b SHA512 d5bece5cdc399c5132c959b5f53431427893a2bc37c3f475df73c2f846e4c51b961b092c3099c1f1f42de2cdde782bf62c404b9cc44fc69cecfee2c7765b7509
-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.19.14.tar.gz 33547290 BLAKE2B a35a51301a7c50bf46247ca0a3e341f1b2a479fcbb2d4c53abee20983892ec41d8e607e7e920f54f7ca2ade3ef32e5fe1e84e12eea5d154fc764319a7e37667a SHA512 9262cb6f21b7096121f4ae9dd14d8dcbcffb3c590cfee13aafe7152a585fcdf4c13ab8002553757c2c3288ebef1ad6f824e431b45a2751bcc8ad6e033409d6a2
+DIST kubernetes-1.20.10.tar.gz 34502658 BLAKE2B 273f47a8f99a52a9b1fa2ea8a755dd97d6b85c0bd516d162defe44ed32706f1661221c66eca148fc34978d2027eaf73a2605ba48f26e9fb223cf41cd0177cd56 SHA512 a196fb3c1251de8d3136dd6494b9223a05ed313069219da20b3066fabd26d3dd6752cf6f6c7b1522e4941bcde726099b80cf62f8c0e4752b0cdb9c83e02b4910
 DIST kubernetes-1.20.9.tar.gz 34501156 BLAKE2B 48bc055d4e9516116ba445c6e1dc468502688f189d4ef8cfd12012e7a3e55344894f2f823c38b5664d792bedf51e6380c2f82e011bfea38dcb728159efe9b55e SHA512 9083589e016f1b9d3432fdab748f296b833c2f3425d6c89299e04f074865a9d2e706f4a8c0f9b90f32fca0c568e841f6a9c85dab5a748cd182f4e0f66c08cc8f
-DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
-DIST kubernetes-1.21.2.tar.gz 36081553 BLAKE2B 60566f2f33aebcd2f48e9d245883aa74d17ce21bdec05b529265a55e266497d6c7278fb7fdb5a94747e10641b5843b2a4b8079b981818ce3f3078c046ed72762 SHA512 20f81c975d6a5a4e6cbbfcaa2f34e8dd4f96018a8a60004a9fedf13eb9d8d43a14f0b746fb48a1240e378d2a1b8de440104c72269d68239040fa6a690c5115ff
 DIST kubernetes-1.21.3.tar.gz 36090238 BLAKE2B 90875f42be8bc123d6cdf120ce33ff2aa5e1da33bc2c9b147c1b6d7ccffeaec9e87cb4552e88c301f741fd8f0923792baa9c65a03035fc26f0431a172068dbac SHA512 d780099814468079eaa9b9b33fb0f48e2c44ebbf304068f44c79281e7dc074cfe8a2f56330f8363282ce6ed07a12125fa4ec6a8a5308d208456231f827c861a0
-EBUILD kube-apiserver-1.18.19.ebuild 975 BLAKE2B 46fc8c70b370b4ae9fe2a3a5f627bdf7f45626605daec2b36a9b6352624bb62a37c3dc9c338e2fe2ad59aa6005be64390b6ef2c3b69b71e0f0a58f4d102cf4c0 SHA512 a8e56862b198c338faff6d950db23c33c562f0da0981ac0e24524238070250012b5f25b64b6b956a042e0a029589461fec7bf12aa844f90b2bbd15f70f7c6022
-EBUILD kube-apiserver-1.18.20.ebuild 975 BLAKE2B 46fc8c70b370b4ae9fe2a3a5f627bdf7f45626605daec2b36a9b6352624bb62a37c3dc9c338e2fe2ad59aa6005be64390b6ef2c3b69b71e0f0a58f4d102cf4c0 SHA512 a8e56862b198c338faff6d950db23c33c562f0da0981ac0e24524238070250012b5f25b64b6b956a042e0a029589461fec7bf12aa844f90b2bbd15f70f7c6022
-EBUILD kube-apiserver-1.19.11.ebuild 1011 BLAKE2B 566109dae1b25fd1d3c1c5a7d2553482a3cb30a286dc128163a3b3cd389623812111a9966b8c1650e31f47cf45ef5173cb8de1cd332674d3f33fafcf17897f0d SHA512 0749b4858729c72d1d5ea53d130180245de055eb7e03f8864fff208bca6d7fdd6073791d22c31fc4e14b47a36d2c02234a6507b2e5f438327662c9c87b6c52af
-EBUILD kube-apiserver-1.19.12.ebuild 1011 BLAKE2B 566109dae1b25fd1d3c1c5a7d2553482a3cb30a286dc128163a3b3cd389623812111a9966b8c1650e31f47cf45ef5173cb8de1cd332674d3f33fafcf17897f0d SHA512 0749b4858729c72d1d5ea53d130180245de055eb7e03f8864fff208bca6d7fdd6073791d22c31fc4e14b47a36d2c02234a6507b2e5f438327662c9c87b6c52af
+DIST kubernetes-1.21.4.tar.gz 36099646 BLAKE2B b41b3581c3e0bc85a5e259df31c225c3deab3e67545f8a8439c3e77eeca1c5d0a5c76948565ebc46ac42790299581943042fa2bda71e6cf2616776a2f9453e08 SHA512 79aa3b13242bfdcee6cda1e542a7f4ca940caab35ff81f617295cb45d6a6ce3c1274d794c1de43a74c684dc371a01a062709da8cec4fe462b520bf804ae59c8e
+DIST kubernetes-1.22.1.tar.gz 35986911 BLAKE2B f474963aafe63afec87ae113543aad1be000eb32df725254d28d44d1f4fa1bc7c0fac88d77ac58b9bf1dd67129e2c2d010e97368f5ba392bf3924dd8bfa3ebed SHA512 97d5644cd06c2a092338bddc6b5e5b4c538ae8055b5d7c9ea011a8454b191714864ab624657e88aa1d6e8939d1526a69d763b0126249bfbb5e96f62ecf4290a3
 EBUILD kube-apiserver-1.19.13.ebuild 1011 BLAKE2B 566109dae1b25fd1d3c1c5a7d2553482a3cb30a286dc128163a3b3cd389623812111a9966b8c1650e31f47cf45ef5173cb8de1cd332674d3f33fafcf17897f0d SHA512 0749b4858729c72d1d5ea53d130180245de055eb7e03f8864fff208bca6d7fdd6073791d22c31fc4e14b47a36d2c02234a6507b2e5f438327662c9c87b6c52af
-EBUILD kube-apiserver-1.20.7.ebuild 1011 BLAKE2B 566109dae1b25fd1d3c1c5a7d2553482a3cb30a286dc128163a3b3cd389623812111a9966b8c1650e31f47cf45ef5173cb8de1cd332674d3f33fafcf17897f0d SHA512 0749b4858729c72d1d5ea53d130180245de055eb7e03f8864fff208bca6d7fdd6073791d22c31fc4e14b47a36d2c02234a6507b2e5f438327662c9c87b6c52af
-EBUILD kube-apiserver-1.20.8.ebuild 1011 BLAKE2B 566109dae1b25fd1d3c1c5a7d2553482a3cb30a286dc128163a3b3cd389623812111a9966b8c1650e31f47cf45ef5173cb8de1cd332674d3f33fafcf17897f0d SHA512 0749b4858729c72d1d5ea53d130180245de055eb7e03f8864fff208bca6d7fdd6073791d22c31fc4e14b47a36d2c02234a6507b2e5f438327662c9c87b6c52af
+EBUILD kube-apiserver-1.19.14.ebuild 1012 BLAKE2B 06cc1b6c301fc5ee4e7e9aff9bfec6c0e51764494609e2c154ad8e0cb33cb1dcf493cd99fbb0ed8bcdb753db31b142ffa50d11e666d01e6f10352d41d3582c7a SHA512 9c46b95d73968b35414d69e16bb18b56fad6abe9d0aab2c84d855cd9dc1e75f53406d6fea8fa4da9971747bbb84c021227684898e7f4d3f6b9bd699a8c1f417c
+EBUILD kube-apiserver-1.20.10.ebuild 1012 BLAKE2B 06cc1b6c301fc5ee4e7e9aff9bfec6c0e51764494609e2c154ad8e0cb33cb1dcf493cd99fbb0ed8bcdb753db31b142ffa50d11e666d01e6f10352d41d3582c7a SHA512 9c46b95d73968b35414d69e16bb18b56fad6abe9d0aab2c84d855cd9dc1e75f53406d6fea8fa4da9971747bbb84c021227684898e7f4d3f6b9bd699a8c1f417c
 EBUILD kube-apiserver-1.20.9.ebuild 1011 BLAKE2B 566109dae1b25fd1d3c1c5a7d2553482a3cb30a286dc128163a3b3cd389623812111a9966b8c1650e31f47cf45ef5173cb8de1cd332674d3f33fafcf17897f0d SHA512 0749b4858729c72d1d5ea53d130180245de055eb7e03f8864fff208bca6d7fdd6073791d22c31fc4e14b47a36d2c02234a6507b2e5f438327662c9c87b6c52af
-EBUILD kube-apiserver-1.21.1.ebuild 1011 BLAKE2B e12c4b1626234585bd58ceb9d8adf620a6277f2c41e9d880333d77a5c41a4250b470b13c2f000e99361fce1eb2e1cf2e02d9ecedfd0d47c306a744697a4900b8 SHA512 8928db8027f8022c2555a4aee889f8eb42d62bcc478cffd7eaa86e7a584b4f2d36f4e4ee445445c5c6989bdd96b665df0730ae7621db88a55a9f010c4695a280
-EBUILD kube-apiserver-1.21.2.ebuild 1011 BLAKE2B e12c4b1626234585bd58ceb9d8adf620a6277f2c41e9d880333d77a5c41a4250b470b13c2f000e99361fce1eb2e1cf2e02d9ecedfd0d47c306a744697a4900b8 SHA512 8928db8027f8022c2555a4aee889f8eb42d62bcc478cffd7eaa86e7a584b4f2d36f4e4ee445445c5c6989bdd96b665df0730ae7621db88a55a9f010c4695a280
 EBUILD kube-apiserver-1.21.3.ebuild 1011 BLAKE2B e12c4b1626234585bd58ceb9d8adf620a6277f2c41e9d880333d77a5c41a4250b470b13c2f000e99361fce1eb2e1cf2e02d9ecedfd0d47c306a744697a4900b8 SHA512 8928db8027f8022c2555a4aee889f8eb42d62bcc478cffd7eaa86e7a584b4f2d36f4e4ee445445c5c6989bdd96b665df0730ae7621db88a55a9f010c4695a280
+EBUILD kube-apiserver-1.21.4.ebuild 1012 BLAKE2B d3f9db4f7631a00bee5bec5e14addbaa8f16c1fcdd499b434d5dc255acba09e0c6c537607e4a2ad3b9f027bc7a24000b44826eb8e25aa3fc5b4236695ea14f67 SHA512 643bd11525041d2507413fac4998100281c9b784a52cf814849d61bb374d17ff66644ca4c857968c08554eaa1f77481a0406bb8002695e72d1c8f677ee9326ab
+EBUILD kube-apiserver-1.22.1.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.19.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.18.19.ebuild
deleted file mode 100644
index d974386a034c..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.18.19.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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.18.20.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.18.20.ebuild
deleted file mode 100644
index d974386a034c..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.18.20.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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.11.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.19.11.ebuild
deleted file mode 100644
index bdbcc2cd8a20..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.19.11.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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.19.12.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.19.12.ebuild
deleted file mode 100644
index bdbcc2cd8a20..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.19.12.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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.7.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.19.14.ebuild
index bdbcc2cd8a20..eddbed5f2447 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.20.7.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.19.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.20.8.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.20.10.ebuild
index bdbcc2cd8a20..eddbed5f2447 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.20.8.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.20.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.21.1.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.21.4.ebuild
index e5b9ef6d3840..4ad13d1aaaca 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.21.1.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.21.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.21.2.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.22.1.ebuild
index e5b9ef6d3840..4ad13d1aaaca 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.21.2.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.22.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index 005383b8ed78..0f8a2fdeb0b9 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -1,26 +1,18 @@
 AUX kube-controller-manager.confd 142 BLAKE2B d8d35c62bf5c04cc3f440e8b5fb8acab2cf815b25ac4e91354e3fce756a1955e71ec762fab1091074ef4233fff22667aba50417c0d6a896055f8f52b6630bb4e SHA512 b0227a7431018a6742b3931fda0f14b4a040107ecd6821c84593180919ba8a5af9b99b7a507645a5488792f14accd686acc4cc6f70a5084bbdfcdd494021aafc
 AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544f214921672e60fffa2d6f77dbeb1912b3d1d138f867d8118cef5ae0843b75d3859ebfc71a4defc2b4cf66426a58101 SHA512 7e3baab9b034e7048ed3cda8d09444c76369874cecc0a747fb5484c482fef464adb5ccc25fcb4481fb4aff68415a60462f6cbee2138810316f0cf822637676c1
 AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
-DIST kubernetes-1.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.19.13.tar.gz 33554674 BLAKE2B e7654262ad0d91f9e7eac3851576bd65888f93a2614fae67e76750af64719d514e95fe27b4fb9d1ee86a0931d8f7e84cf393c6ca25604efa6d5eb4fff50c7c1b SHA512 d5bece5cdc399c5132c959b5f53431427893a2bc37c3f475df73c2f846e4c51b961b092c3099c1f1f42de2cdde782bf62c404b9cc44fc69cecfee2c7765b7509
-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.19.14.tar.gz 33547290 BLAKE2B a35a51301a7c50bf46247ca0a3e341f1b2a479fcbb2d4c53abee20983892ec41d8e607e7e920f54f7ca2ade3ef32e5fe1e84e12eea5d154fc764319a7e37667a SHA512 9262cb6f21b7096121f4ae9dd14d8dcbcffb3c590cfee13aafe7152a585fcdf4c13ab8002553757c2c3288ebef1ad6f824e431b45a2751bcc8ad6e033409d6a2
+DIST kubernetes-1.20.10.tar.gz 34502658 BLAKE2B 273f47a8f99a52a9b1fa2ea8a755dd97d6b85c0bd516d162defe44ed32706f1661221c66eca148fc34978d2027eaf73a2605ba48f26e9fb223cf41cd0177cd56 SHA512 a196fb3c1251de8d3136dd6494b9223a05ed313069219da20b3066fabd26d3dd6752cf6f6c7b1522e4941bcde726099b80cf62f8c0e4752b0cdb9c83e02b4910
 DIST kubernetes-1.20.9.tar.gz 34501156 BLAKE2B 48bc055d4e9516116ba445c6e1dc468502688f189d4ef8cfd12012e7a3e55344894f2f823c38b5664d792bedf51e6380c2f82e011bfea38dcb728159efe9b55e SHA512 9083589e016f1b9d3432fdab748f296b833c2f3425d6c89299e04f074865a9d2e706f4a8c0f9b90f32fca0c568e841f6a9c85dab5a748cd182f4e0f66c08cc8f
-DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
-DIST kubernetes-1.21.2.tar.gz 36081553 BLAKE2B 60566f2f33aebcd2f48e9d245883aa74d17ce21bdec05b529265a55e266497d6c7278fb7fdb5a94747e10641b5843b2a4b8079b981818ce3f3078c046ed72762 SHA512 20f81c975d6a5a4e6cbbfcaa2f34e8dd4f96018a8a60004a9fedf13eb9d8d43a14f0b746fb48a1240e378d2a1b8de440104c72269d68239040fa6a690c5115ff
 DIST kubernetes-1.21.3.tar.gz 36090238 BLAKE2B 90875f42be8bc123d6cdf120ce33ff2aa5e1da33bc2c9b147c1b6d7ccffeaec9e87cb4552e88c301f741fd8f0923792baa9c65a03035fc26f0431a172068dbac SHA512 d780099814468079eaa9b9b33fb0f48e2c44ebbf304068f44c79281e7dc074cfe8a2f56330f8363282ce6ed07a12125fa4ec6a8a5308d208456231f827c861a0
-EBUILD kube-controller-manager-1.18.19.ebuild 966 BLAKE2B 2f0ddb82c8607d193aef1444912d82125578d41d62fc2b48b1512e2775903fccde7cd139c3c718b484f80fb6fa13567c33f78574a69a198ee6a459fd1ed7d68e SHA512 ba9c6f7a4bd05686357f7a7fb771c34bdc6dfdcb7bac2fbaf1fc6c977b9c5a05b65d55f188b8cc02583328baf80087d9b3f633f17a3f5f291cffaab542389c4f
-EBUILD kube-controller-manager-1.18.20.ebuild 966 BLAKE2B 2f0ddb82c8607d193aef1444912d82125578d41d62fc2b48b1512e2775903fccde7cd139c3c718b484f80fb6fa13567c33f78574a69a198ee6a459fd1ed7d68e SHA512 ba9c6f7a4bd05686357f7a7fb771c34bdc6dfdcb7bac2fbaf1fc6c977b9c5a05b65d55f188b8cc02583328baf80087d9b3f633f17a3f5f291cffaab542389c4f
-EBUILD kube-controller-manager-1.19.11.ebuild 1013 BLAKE2B 3c2b2e91482958bf1985544e059aa22a6e3ce2ece7d2a18f0c8959854370977d8f4459b4c5a331ef1cadfffa6076114a9d301346498dd6294ec63c3e38c5e06a SHA512 9576d01ca501bd09ea3717be93f5ab1ecd137c59866a8366ec1b0bfa5b544e8b463c902e40119487e0df63d6b7d9ea528a6f13a2abbe2b06df9094191972ba83
-EBUILD kube-controller-manager-1.19.12.ebuild 1013 BLAKE2B 3c2b2e91482958bf1985544e059aa22a6e3ce2ece7d2a18f0c8959854370977d8f4459b4c5a331ef1cadfffa6076114a9d301346498dd6294ec63c3e38c5e06a SHA512 9576d01ca501bd09ea3717be93f5ab1ecd137c59866a8366ec1b0bfa5b544e8b463c902e40119487e0df63d6b7d9ea528a6f13a2abbe2b06df9094191972ba83
+DIST kubernetes-1.21.4.tar.gz 36099646 BLAKE2B b41b3581c3e0bc85a5e259df31c225c3deab3e67545f8a8439c3e77eeca1c5d0a5c76948565ebc46ac42790299581943042fa2bda71e6cf2616776a2f9453e08 SHA512 79aa3b13242bfdcee6cda1e542a7f4ca940caab35ff81f617295cb45d6a6ce3c1274d794c1de43a74c684dc371a01a062709da8cec4fe462b520bf804ae59c8e
+DIST kubernetes-1.22.1.tar.gz 35986911 BLAKE2B f474963aafe63afec87ae113543aad1be000eb32df725254d28d44d1f4fa1bc7c0fac88d77ac58b9bf1dd67129e2c2d010e97368f5ba392bf3924dd8bfa3ebed SHA512 97d5644cd06c2a092338bddc6b5e5b4c538ae8055b5d7c9ea011a8454b191714864ab624657e88aa1d6e8939d1526a69d763b0126249bfbb5e96f62ecf4290a3
 EBUILD kube-controller-manager-1.19.13.ebuild 1013 BLAKE2B 3c2b2e91482958bf1985544e059aa22a6e3ce2ece7d2a18f0c8959854370977d8f4459b4c5a331ef1cadfffa6076114a9d301346498dd6294ec63c3e38c5e06a SHA512 9576d01ca501bd09ea3717be93f5ab1ecd137c59866a8366ec1b0bfa5b544e8b463c902e40119487e0df63d6b7d9ea528a6f13a2abbe2b06df9094191972ba83
-EBUILD kube-controller-manager-1.20.7.ebuild 1013 BLAKE2B 3c2b2e91482958bf1985544e059aa22a6e3ce2ece7d2a18f0c8959854370977d8f4459b4c5a331ef1cadfffa6076114a9d301346498dd6294ec63c3e38c5e06a SHA512 9576d01ca501bd09ea3717be93f5ab1ecd137c59866a8366ec1b0bfa5b544e8b463c902e40119487e0df63d6b7d9ea528a6f13a2abbe2b06df9094191972ba83
-EBUILD kube-controller-manager-1.20.8.ebuild 1013 BLAKE2B 3c2b2e91482958bf1985544e059aa22a6e3ce2ece7d2a18f0c8959854370977d8f4459b4c5a331ef1cadfffa6076114a9d301346498dd6294ec63c3e38c5e06a SHA512 9576d01ca501bd09ea3717be93f5ab1ecd137c59866a8366ec1b0bfa5b544e8b463c902e40119487e0df63d6b7d9ea528a6f13a2abbe2b06df9094191972ba83
+EBUILD kube-controller-manager-1.19.14.ebuild 1014 BLAKE2B bf46369c9a72568037c40455a8342cc94c7f6a928bbd4012cadf2aed7c057f3f1490dc232e4aee7c2848e4591a10ebfcfb50b08170cfbc1015ffd8a0894ac2a9 SHA512 5c88fc9377e1244a97eb0b23458c1b7e935d749aea5b7f045a6e32607bd2dd9a04321167dd5d4915aa78aadd75798e388cd2cb40277b787daccbd750e765210f
+EBUILD kube-controller-manager-1.20.10.ebuild 1014 BLAKE2B bf46369c9a72568037c40455a8342cc94c7f6a928bbd4012cadf2aed7c057f3f1490dc232e4aee7c2848e4591a10ebfcfb50b08170cfbc1015ffd8a0894ac2a9 SHA512 5c88fc9377e1244a97eb0b23458c1b7e935d749aea5b7f045a6e32607bd2dd9a04321167dd5d4915aa78aadd75798e388cd2cb40277b787daccbd750e765210f
 EBUILD kube-controller-manager-1.20.9.ebuild 1013 BLAKE2B 3c2b2e91482958bf1985544e059aa22a6e3ce2ece7d2a18f0c8959854370977d8f4459b4c5a331ef1cadfffa6076114a9d301346498dd6294ec63c3e38c5e06a SHA512 9576d01ca501bd09ea3717be93f5ab1ecd137c59866a8366ec1b0bfa5b544e8b463c902e40119487e0df63d6b7d9ea528a6f13a2abbe2b06df9094191972ba83
-EBUILD kube-controller-manager-1.21.1.ebuild 1013 BLAKE2B 4590d4d6cb14abec9f934f70408129c8d4aa8da8e6ff7561089e57aa344feced5dfc761def4631228a0eb25caaa3f7bdbaf94b943e234c19b23ed8c3618fcc44 SHA512 d956b305015ddb278f46fefaffd53124fafe416ac155590108cc7496709f96caeae812b151bde8771fc2741be7adb16a10ee621b9362e8177b0ab8be8a90afd9
-EBUILD kube-controller-manager-1.21.2.ebuild 1013 BLAKE2B 4590d4d6cb14abec9f934f70408129c8d4aa8da8e6ff7561089e57aa344feced5dfc761def4631228a0eb25caaa3f7bdbaf94b943e234c19b23ed8c3618fcc44 SHA512 d956b305015ddb278f46fefaffd53124fafe416ac155590108cc7496709f96caeae812b151bde8771fc2741be7adb16a10ee621b9362e8177b0ab8be8a90afd9
 EBUILD kube-controller-manager-1.21.3.ebuild 1013 BLAKE2B 4590d4d6cb14abec9f934f70408129c8d4aa8da8e6ff7561089e57aa344feced5dfc761def4631228a0eb25caaa3f7bdbaf94b943e234c19b23ed8c3618fcc44 SHA512 d956b305015ddb278f46fefaffd53124fafe416ac155590108cc7496709f96caeae812b151bde8771fc2741be7adb16a10ee621b9362e8177b0ab8be8a90afd9
+EBUILD kube-controller-manager-1.21.4.ebuild 1014 BLAKE2B fff067c08b078e53395d941ce9b944510376aa4f16d7534ab0512492ff94a4a458590d45176ae1d9f55921de7c80a0a38b017de4dfa00e7de19d07ed1b384449 SHA512 6554108b79864865e2e7e3921573925b99d4b1257c38fb81cff2f932ae74ed06c6e090c66a108c90348266c0146bfb34230b2543f41aee933104e7ef3e116d16
+EBUILD kube-controller-manager-1.22.1.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.19.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.19.ebuild
deleted file mode 100644
index 644054a9b231..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.19.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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.18.20.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.20.ebuild
deleted file mode 100644
index 644054a9b231..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.20.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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.11.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.11.ebuild
deleted file mode 100644
index a0e7c754582c..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.11.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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.19.12.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.12.ebuild
deleted file mode 100644
index a0e7c754582c..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.12.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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.7.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.14.ebuild
index a0e7c754582c..e61ad6675f61 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.7.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-controller-manager
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.10.ebuild
index a0e7c754582c..e61ad6675f61 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.8.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-controller-manager
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.21.1.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.21.4.ebuild
index 7080ad786a90..68d01d0642b7 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.21.1.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.21.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-controller-manager
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.22.1.ebuild
index 7080ad786a90..68d01d0642b7 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.21.2.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.22.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-controller-manager
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index 7f1d26a889c1..f3456fd6e3f1 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -1,26 +1,18 @@
 AUX kube-proxy.confd 53 BLAKE2B 0cd5fc844dc21f63786ef21d972210ac02ea55165b05cef8810268f894e3466cea4d82c7882e56d6a0bf425311adbf6a55e3e3fe351b9a1a7ce1d9e1e087018b SHA512 4c8c34ae8668bcfa5167c2d2af006fc46b461a5dafb3ec5b64cb8cdf2a830c22ddb5cf806c93b1404f60dabf91b4153724947fa2d2c494376f20e637eeed5018
 AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe464d672d00ecf5b5fffd349a6affcd8ae3ea0ba06160be72f31cfa2d918c01050e83640fb9956917dc0 SHA512 088d91cd77e614f7857d65496f5b6d486741a8e3358b3e13bcd4203d35a76fa3aa390f658065e2826145525b6e83fcd33f8365a873e99b522f3ab7e8615ed364
 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
-DIST kubernetes-1.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.19.13.tar.gz 33554674 BLAKE2B e7654262ad0d91f9e7eac3851576bd65888f93a2614fae67e76750af64719d514e95fe27b4fb9d1ee86a0931d8f7e84cf393c6ca25604efa6d5eb4fff50c7c1b SHA512 d5bece5cdc399c5132c959b5f53431427893a2bc37c3f475df73c2f846e4c51b961b092c3099c1f1f42de2cdde782bf62c404b9cc44fc69cecfee2c7765b7509
-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.19.14.tar.gz 33547290 BLAKE2B a35a51301a7c50bf46247ca0a3e341f1b2a479fcbb2d4c53abee20983892ec41d8e607e7e920f54f7ca2ade3ef32e5fe1e84e12eea5d154fc764319a7e37667a SHA512 9262cb6f21b7096121f4ae9dd14d8dcbcffb3c590cfee13aafe7152a585fcdf4c13ab8002553757c2c3288ebef1ad6f824e431b45a2751bcc8ad6e033409d6a2
+DIST kubernetes-1.20.10.tar.gz 34502658 BLAKE2B 273f47a8f99a52a9b1fa2ea8a755dd97d6b85c0bd516d162defe44ed32706f1661221c66eca148fc34978d2027eaf73a2605ba48f26e9fb223cf41cd0177cd56 SHA512 a196fb3c1251de8d3136dd6494b9223a05ed313069219da20b3066fabd26d3dd6752cf6f6c7b1522e4941bcde726099b80cf62f8c0e4752b0cdb9c83e02b4910
 DIST kubernetes-1.20.9.tar.gz 34501156 BLAKE2B 48bc055d4e9516116ba445c6e1dc468502688f189d4ef8cfd12012e7a3e55344894f2f823c38b5664d792bedf51e6380c2f82e011bfea38dcb728159efe9b55e SHA512 9083589e016f1b9d3432fdab748f296b833c2f3425d6c89299e04f074865a9d2e706f4a8c0f9b90f32fca0c568e841f6a9c85dab5a748cd182f4e0f66c08cc8f
-DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
-DIST kubernetes-1.21.2.tar.gz 36081553 BLAKE2B 60566f2f33aebcd2f48e9d245883aa74d17ce21bdec05b529265a55e266497d6c7278fb7fdb5a94747e10641b5843b2a4b8079b981818ce3f3078c046ed72762 SHA512 20f81c975d6a5a4e6cbbfcaa2f34e8dd4f96018a8a60004a9fedf13eb9d8d43a14f0b746fb48a1240e378d2a1b8de440104c72269d68239040fa6a690c5115ff
 DIST kubernetes-1.21.3.tar.gz 36090238 BLAKE2B 90875f42be8bc123d6cdf120ce33ff2aa5e1da33bc2c9b147c1b6d7ccffeaec9e87cb4552e88c301f741fd8f0923792baa9c65a03035fc26f0431a172068dbac SHA512 d780099814468079eaa9b9b33fb0f48e2c44ebbf304068f44c79281e7dc074cfe8a2f56330f8363282ce6ed07a12125fa4ec6a8a5308d208456231f827c861a0
-EBUILD kube-proxy-1.18.19.ebuild 892 BLAKE2B 07e99c7043554ba3fe7d71838d72daccd1c753ce9db9d9619971b87a798d0d68c39b3b87bfbd3bbbe94d5f457cb9f1564d9ed1ec0c9bbe51b8cefd9ee43e3b4f SHA512 1b913f8b0f6ebcd62af8786e9b96f2be14778eb582a48ac2f4756ace84c90452246686ee1e75be448d945c666e63b1c5f6125200a704ebcf7fe6fab4e5dbd527
-EBUILD kube-proxy-1.18.20.ebuild 892 BLAKE2B 07e99c7043554ba3fe7d71838d72daccd1c753ce9db9d9619971b87a798d0d68c39b3b87bfbd3bbbe94d5f457cb9f1564d9ed1ec0c9bbe51b8cefd9ee43e3b4f SHA512 1b913f8b0f6ebcd62af8786e9b96f2be14778eb582a48ac2f4756ace84c90452246686ee1e75be448d945c666e63b1c5f6125200a704ebcf7fe6fab4e5dbd527
-EBUILD kube-proxy-1.19.11.ebuild 928 BLAKE2B 765fa0b999f93352690b0da19e0e4652165fab7bfe7f5a117e182a4513ec98a4cae1e6e2cc28e8fcafff62596dceef8c88d05908c9844b4a5596dca9ac94ca6f SHA512 57f6eafc77edfd06d0f6abdb0f870f4be2f8a0fecf0889db5afc5f9153951b63cfca87e5f0d8812c88e8f7c31b80c4d6ecbeb630a1a3d9effd8030564bb022e8
-EBUILD kube-proxy-1.19.12.ebuild 928 BLAKE2B 765fa0b999f93352690b0da19e0e4652165fab7bfe7f5a117e182a4513ec98a4cae1e6e2cc28e8fcafff62596dceef8c88d05908c9844b4a5596dca9ac94ca6f SHA512 57f6eafc77edfd06d0f6abdb0f870f4be2f8a0fecf0889db5afc5f9153951b63cfca87e5f0d8812c88e8f7c31b80c4d6ecbeb630a1a3d9effd8030564bb022e8
+DIST kubernetes-1.21.4.tar.gz 36099646 BLAKE2B b41b3581c3e0bc85a5e259df31c225c3deab3e67545f8a8439c3e77eeca1c5d0a5c76948565ebc46ac42790299581943042fa2bda71e6cf2616776a2f9453e08 SHA512 79aa3b13242bfdcee6cda1e542a7f4ca940caab35ff81f617295cb45d6a6ce3c1274d794c1de43a74c684dc371a01a062709da8cec4fe462b520bf804ae59c8e
+DIST kubernetes-1.22.1.tar.gz 35986911 BLAKE2B f474963aafe63afec87ae113543aad1be000eb32df725254d28d44d1f4fa1bc7c0fac88d77ac58b9bf1dd67129e2c2d010e97368f5ba392bf3924dd8bfa3ebed SHA512 97d5644cd06c2a092338bddc6b5e5b4c538ae8055b5d7c9ea011a8454b191714864ab624657e88aa1d6e8939d1526a69d763b0126249bfbb5e96f62ecf4290a3
 EBUILD kube-proxy-1.19.13.ebuild 928 BLAKE2B 765fa0b999f93352690b0da19e0e4652165fab7bfe7f5a117e182a4513ec98a4cae1e6e2cc28e8fcafff62596dceef8c88d05908c9844b4a5596dca9ac94ca6f SHA512 57f6eafc77edfd06d0f6abdb0f870f4be2f8a0fecf0889db5afc5f9153951b63cfca87e5f0d8812c88e8f7c31b80c4d6ecbeb630a1a3d9effd8030564bb022e8
-EBUILD kube-proxy-1.20.7.ebuild 928 BLAKE2B 765fa0b999f93352690b0da19e0e4652165fab7bfe7f5a117e182a4513ec98a4cae1e6e2cc28e8fcafff62596dceef8c88d05908c9844b4a5596dca9ac94ca6f SHA512 57f6eafc77edfd06d0f6abdb0f870f4be2f8a0fecf0889db5afc5f9153951b63cfca87e5f0d8812c88e8f7c31b80c4d6ecbeb630a1a3d9effd8030564bb022e8
-EBUILD kube-proxy-1.20.8.ebuild 928 BLAKE2B 765fa0b999f93352690b0da19e0e4652165fab7bfe7f5a117e182a4513ec98a4cae1e6e2cc28e8fcafff62596dceef8c88d05908c9844b4a5596dca9ac94ca6f SHA512 57f6eafc77edfd06d0f6abdb0f870f4be2f8a0fecf0889db5afc5f9153951b63cfca87e5f0d8812c88e8f7c31b80c4d6ecbeb630a1a3d9effd8030564bb022e8
+EBUILD kube-proxy-1.19.14.ebuild 929 BLAKE2B 81abfe44a4025e907542f6935af1c953920d3c730008b4db082800626542265955c07b4277e39d9b8517273fc89bb87e7ca29217dd68cad235d8138fb005232b SHA512 fe6d3657c95c46a1bc87f2c0abb9e8e98eeb11c8cd48810ae94a49739b04f401b32b00522c14a488d7f043d721cda9967937b1c177765cdfa07c9add4300a99c
+EBUILD kube-proxy-1.20.10.ebuild 929 BLAKE2B 81abfe44a4025e907542f6935af1c953920d3c730008b4db082800626542265955c07b4277e39d9b8517273fc89bb87e7ca29217dd68cad235d8138fb005232b SHA512 fe6d3657c95c46a1bc87f2c0abb9e8e98eeb11c8cd48810ae94a49739b04f401b32b00522c14a488d7f043d721cda9967937b1c177765cdfa07c9add4300a99c
 EBUILD kube-proxy-1.20.9.ebuild 928 BLAKE2B 765fa0b999f93352690b0da19e0e4652165fab7bfe7f5a117e182a4513ec98a4cae1e6e2cc28e8fcafff62596dceef8c88d05908c9844b4a5596dca9ac94ca6f SHA512 57f6eafc77edfd06d0f6abdb0f870f4be2f8a0fecf0889db5afc5f9153951b63cfca87e5f0d8812c88e8f7c31b80c4d6ecbeb630a1a3d9effd8030564bb022e8
-EBUILD kube-proxy-1.21.1.ebuild 928 BLAKE2B 530e14d24d0bfcedef386d4e5c6b5089ef8428e814264d64d8611a2f3bbcf7be57176731f63ff8299a090c12e323c90e702ad6d99dfebffc4343ac15a3f4ff39 SHA512 ee958c9c6ea19156fbbc863d819bd52db1fae84e8e2d2cfc9a4d282fe0495e19bbadd24ae7f74c13b61cd3716c45001ba2cec471450c8db81ae5562cc3902ab2
-EBUILD kube-proxy-1.21.2.ebuild 928 BLAKE2B 530e14d24d0bfcedef386d4e5c6b5089ef8428e814264d64d8611a2f3bbcf7be57176731f63ff8299a090c12e323c90e702ad6d99dfebffc4343ac15a3f4ff39 SHA512 ee958c9c6ea19156fbbc863d819bd52db1fae84e8e2d2cfc9a4d282fe0495e19bbadd24ae7f74c13b61cd3716c45001ba2cec471450c8db81ae5562cc3902ab2
 EBUILD kube-proxy-1.21.3.ebuild 928 BLAKE2B 530e14d24d0bfcedef386d4e5c6b5089ef8428e814264d64d8611a2f3bbcf7be57176731f63ff8299a090c12e323c90e702ad6d99dfebffc4343ac15a3f4ff39 SHA512 ee958c9c6ea19156fbbc863d819bd52db1fae84e8e2d2cfc9a4d282fe0495e19bbadd24ae7f74c13b61cd3716c45001ba2cec471450c8db81ae5562cc3902ab2
+EBUILD kube-proxy-1.21.4.ebuild 929 BLAKE2B 457168acecb296450df17416cccfa8c23a41236489150d3e47da3287b0e43d0e2ae1a24b4088685c7a9e40a71218a56ee30b718464e158874482b15a5dd335ac SHA512 8dbb6193562898f48c70a83d5b1ae8f3109f05bcab2208031f285bb8a90a3c828761b0144234ae2963eecb7dac10fccccf586d566b7314bcf4f14947064483bb
+EBUILD kube-proxy-1.22.1.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.19.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.18.19.ebuild
deleted file mode 100644
index f12e156ccea8..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.18.19.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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.18.20.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.18.20.ebuild
deleted file mode 100644
index f12e156ccea8..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.18.20.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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.11.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.19.14.ebuild
index 4860d8ae4993..d62b6c41d8fd 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.19.11.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.19.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="net-firewall/conntrack-tools
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.19.12.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.20.10.ebuild
index 4860d8ae4993..d62b6c41d8fd 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.19.12.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.20.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="net-firewall/conntrack-tools
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.20.7.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.20.7.ebuild
deleted file mode 100644
index 4860d8ae4993..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.20.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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
deleted file mode 100644
index 4860d8ae4993..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.20.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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.1.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.21.4.ebuild
index 9248dbd26dcf..6c8c309ffd31 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.21.1.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.21.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="net-firewall/conntrack-tools
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.21.2.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.22.1.ebuild
index 9248dbd26dcf..6c8c309ffd31 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.21.2.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.22.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="net-firewall/conntrack-tools
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index 14e4ad6bc7c0..308e351fa269 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -1,26 +1,18 @@
 AUX kube-scheduler.confd 133 BLAKE2B 6b88dfc011173f183a88a16d078cbb5d96d46c269129b483d650fd7dd63376e366825f483178c26e931db226478ce9d0b85412fc264d4d600a8232d0bac149e7 SHA512 d7326f34b26aaebf4b5c25a03abcff3bc3d397382ad4fed0f4718ee425e71399febf6fec6dc817813490671692d3f1b454fd5d14d9c47c3d41b0d3405a01a6c2
 AUX kube-scheduler.initd 548 BLAKE2B dd9373f659b87fcf12dca20527aebdb304a60ec559fd9fb9efcd0db8b3c155fdba2ce8a59461cd15ed3b4294cc5b335093e12d2b8411e400927e1307b37bc6d8 SHA512 151ea6f5cc36de9b83f0e5365579e33eea8002f9a03f5f61d195a349236e6baf192f701d3fb591b769aa90e8e1e620d525b20c95a1e8cda58d062971d8f587a3
 AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a28e9a5b02361cf4833982d4489364bd1291faa136df275988f02ce78c7b785c9209a54aec5eea6180b9041da0 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6
-DIST kubernetes-1.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.19.13.tar.gz 33554674 BLAKE2B e7654262ad0d91f9e7eac3851576bd65888f93a2614fae67e76750af64719d514e95fe27b4fb9d1ee86a0931d8f7e84cf393c6ca25604efa6d5eb4fff50c7c1b SHA512 d5bece5cdc399c5132c959b5f53431427893a2bc37c3f475df73c2f846e4c51b961b092c3099c1f1f42de2cdde782bf62c404b9cc44fc69cecfee2c7765b7509
-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.19.14.tar.gz 33547290 BLAKE2B a35a51301a7c50bf46247ca0a3e341f1b2a479fcbb2d4c53abee20983892ec41d8e607e7e920f54f7ca2ade3ef32e5fe1e84e12eea5d154fc764319a7e37667a SHA512 9262cb6f21b7096121f4ae9dd14d8dcbcffb3c590cfee13aafe7152a585fcdf4c13ab8002553757c2c3288ebef1ad6f824e431b45a2751bcc8ad6e033409d6a2
+DIST kubernetes-1.20.10.tar.gz 34502658 BLAKE2B 273f47a8f99a52a9b1fa2ea8a755dd97d6b85c0bd516d162defe44ed32706f1661221c66eca148fc34978d2027eaf73a2605ba48f26e9fb223cf41cd0177cd56 SHA512 a196fb3c1251de8d3136dd6494b9223a05ed313069219da20b3066fabd26d3dd6752cf6f6c7b1522e4941bcde726099b80cf62f8c0e4752b0cdb9c83e02b4910
 DIST kubernetes-1.20.9.tar.gz 34501156 BLAKE2B 48bc055d4e9516116ba445c6e1dc468502688f189d4ef8cfd12012e7a3e55344894f2f823c38b5664d792bedf51e6380c2f82e011bfea38dcb728159efe9b55e SHA512 9083589e016f1b9d3432fdab748f296b833c2f3425d6c89299e04f074865a9d2e706f4a8c0f9b90f32fca0c568e841f6a9c85dab5a748cd182f4e0f66c08cc8f
-DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
-DIST kubernetes-1.21.2.tar.gz 36081553 BLAKE2B 60566f2f33aebcd2f48e9d245883aa74d17ce21bdec05b529265a55e266497d6c7278fb7fdb5a94747e10641b5843b2a4b8079b981818ce3f3078c046ed72762 SHA512 20f81c975d6a5a4e6cbbfcaa2f34e8dd4f96018a8a60004a9fedf13eb9d8d43a14f0b746fb48a1240e378d2a1b8de440104c72269d68239040fa6a690c5115ff
 DIST kubernetes-1.21.3.tar.gz 36090238 BLAKE2B 90875f42be8bc123d6cdf120ce33ff2aa5e1da33bc2c9b147c1b6d7ccffeaec9e87cb4552e88c301f741fd8f0923792baa9c65a03035fc26f0431a172068dbac SHA512 d780099814468079eaa9b9b33fb0f48e2c44ebbf304068f44c79281e7dc074cfe8a2f56330f8363282ce6ed07a12125fa4ec6a8a5308d208456231f827c861a0
-EBUILD kube-scheduler-1.18.19.ebuild 950 BLAKE2B c7e4bf0bfca4b9e3fbf29ba120a85ebd3302c94500e57e3fd21193958ed9099627e51e178510d5a0d6974c1c07812495a60d3f595c25f6c2794667bddb06e4a3 SHA512 3da62f1f16b14858ce36d9506b009135aa1a627be5e466a782bc3784c605e494d4b618195bcc7e7bb760ace5574c8e7964bd99d2ec52fd81327c3a1259e18f8e
-EBUILD kube-scheduler-1.18.20.ebuild 950 BLAKE2B c7e4bf0bfca4b9e3fbf29ba120a85ebd3302c94500e57e3fd21193958ed9099627e51e178510d5a0d6974c1c07812495a60d3f595c25f6c2794667bddb06e4a3 SHA512 3da62f1f16b14858ce36d9506b009135aa1a627be5e466a782bc3784c605e494d4b618195bcc7e7bb760ace5574c8e7964bd99d2ec52fd81327c3a1259e18f8e
-EBUILD kube-scheduler-1.19.11.ebuild 986 BLAKE2B 9582a16c18d3c9045c63fe29390ea54fe3e9570cd6e8860277d840d43fec7981637a709e21b7219f71f18d2e26540be053b2c961f3d66d8942a1781592d786f9 SHA512 3f7b822a52db4aa4c5324984e8117811065a7836de643fce508e8f6155d9d05703555b5061e2da22c719c6e45e01863b1b1fe5ac742fdeb07507f089c8745aa8
-EBUILD kube-scheduler-1.19.12.ebuild 986 BLAKE2B 9582a16c18d3c9045c63fe29390ea54fe3e9570cd6e8860277d840d43fec7981637a709e21b7219f71f18d2e26540be053b2c961f3d66d8942a1781592d786f9 SHA512 3f7b822a52db4aa4c5324984e8117811065a7836de643fce508e8f6155d9d05703555b5061e2da22c719c6e45e01863b1b1fe5ac742fdeb07507f089c8745aa8
+DIST kubernetes-1.21.4.tar.gz 36099646 BLAKE2B b41b3581c3e0bc85a5e259df31c225c3deab3e67545f8a8439c3e77eeca1c5d0a5c76948565ebc46ac42790299581943042fa2bda71e6cf2616776a2f9453e08 SHA512 79aa3b13242bfdcee6cda1e542a7f4ca940caab35ff81f617295cb45d6a6ce3c1274d794c1de43a74c684dc371a01a062709da8cec4fe462b520bf804ae59c8e
+DIST kubernetes-1.22.1.tar.gz 35986911 BLAKE2B f474963aafe63afec87ae113543aad1be000eb32df725254d28d44d1f4fa1bc7c0fac88d77ac58b9bf1dd67129e2c2d010e97368f5ba392bf3924dd8bfa3ebed SHA512 97d5644cd06c2a092338bddc6b5e5b4c538ae8055b5d7c9ea011a8454b191714864ab624657e88aa1d6e8939d1526a69d763b0126249bfbb5e96f62ecf4290a3
 EBUILD kube-scheduler-1.19.13.ebuild 986 BLAKE2B 9582a16c18d3c9045c63fe29390ea54fe3e9570cd6e8860277d840d43fec7981637a709e21b7219f71f18d2e26540be053b2c961f3d66d8942a1781592d786f9 SHA512 3f7b822a52db4aa4c5324984e8117811065a7836de643fce508e8f6155d9d05703555b5061e2da22c719c6e45e01863b1b1fe5ac742fdeb07507f089c8745aa8
-EBUILD kube-scheduler-1.20.7.ebuild 986 BLAKE2B 9582a16c18d3c9045c63fe29390ea54fe3e9570cd6e8860277d840d43fec7981637a709e21b7219f71f18d2e26540be053b2c961f3d66d8942a1781592d786f9 SHA512 3f7b822a52db4aa4c5324984e8117811065a7836de643fce508e8f6155d9d05703555b5061e2da22c719c6e45e01863b1b1fe5ac742fdeb07507f089c8745aa8
-EBUILD kube-scheduler-1.20.8.ebuild 986 BLAKE2B 9582a16c18d3c9045c63fe29390ea54fe3e9570cd6e8860277d840d43fec7981637a709e21b7219f71f18d2e26540be053b2c961f3d66d8942a1781592d786f9 SHA512 3f7b822a52db4aa4c5324984e8117811065a7836de643fce508e8f6155d9d05703555b5061e2da22c719c6e45e01863b1b1fe5ac742fdeb07507f089c8745aa8
+EBUILD kube-scheduler-1.19.14.ebuild 987 BLAKE2B 2bb55884a676b43cd0678ed33f450622a4503b72e3f6a94c511b56c6c148bc8c606f79a07a0e4160c85a8369dffd3b09e3cd6e48b6fb06f4bc8b407fff01dd30 SHA512 f95df23f7b81dcd24ab696830e58eac93da20653e31b3486b2781540b4d138c5390503fb15b498a67ac6253c779e83677915f4f13f41c08a7d79acf6a9666485
+EBUILD kube-scheduler-1.20.10.ebuild 987 BLAKE2B 2bb55884a676b43cd0678ed33f450622a4503b72e3f6a94c511b56c6c148bc8c606f79a07a0e4160c85a8369dffd3b09e3cd6e48b6fb06f4bc8b407fff01dd30 SHA512 f95df23f7b81dcd24ab696830e58eac93da20653e31b3486b2781540b4d138c5390503fb15b498a67ac6253c779e83677915f4f13f41c08a7d79acf6a9666485
 EBUILD kube-scheduler-1.20.9.ebuild 986 BLAKE2B 9582a16c18d3c9045c63fe29390ea54fe3e9570cd6e8860277d840d43fec7981637a709e21b7219f71f18d2e26540be053b2c961f3d66d8942a1781592d786f9 SHA512 3f7b822a52db4aa4c5324984e8117811065a7836de643fce508e8f6155d9d05703555b5061e2da22c719c6e45e01863b1b1fe5ac742fdeb07507f089c8745aa8
-EBUILD kube-scheduler-1.21.1.ebuild 986 BLAKE2B 2fd297a5e2a967da944d6fc98882330685cfe1dbaa2fb2188003099883cfad4dd8cefb8f9a1af2d44f98fecebf35c76213c9663993d3f0d4f0636851bfb00b4c SHA512 514528bd0183987f4e60f6df9eaee374844ad444d49f707ee33ebd14c5bce619941913705dc20b1abd513e87596f9ba29692176f998b2ee79d5035bc8b789939
-EBUILD kube-scheduler-1.21.2.ebuild 986 BLAKE2B 2fd297a5e2a967da944d6fc98882330685cfe1dbaa2fb2188003099883cfad4dd8cefb8f9a1af2d44f98fecebf35c76213c9663993d3f0d4f0636851bfb00b4c SHA512 514528bd0183987f4e60f6df9eaee374844ad444d49f707ee33ebd14c5bce619941913705dc20b1abd513e87596f9ba29692176f998b2ee79d5035bc8b789939
 EBUILD kube-scheduler-1.21.3.ebuild 986 BLAKE2B 2fd297a5e2a967da944d6fc98882330685cfe1dbaa2fb2188003099883cfad4dd8cefb8f9a1af2d44f98fecebf35c76213c9663993d3f0d4f0636851bfb00b4c SHA512 514528bd0183987f4e60f6df9eaee374844ad444d49f707ee33ebd14c5bce619941913705dc20b1abd513e87596f9ba29692176f998b2ee79d5035bc8b789939
+EBUILD kube-scheduler-1.21.4.ebuild 987 BLAKE2B 60f25a20a95753c4a57a7962c98fbc8fa6d2948ed783b50ce281238b484355ffa037c5201bf02a4d1db8c3824cf07b0cadf4edf094e943506850582e8fb89cfd SHA512 def9c3a32e1b7fb792f029302d29cb4d5d19cb9c91b5f5011c98e6c4cf8d243aa5861ced10436e93c8f5b057eb0532137bc14182e14777977ca0393c636af3ec
+EBUILD kube-scheduler-1.22.1.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.19.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.18.19.ebuild
deleted file mode 100644
index 8648b1e5c53f..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.18.19.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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.18.20.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.18.20.ebuild
deleted file mode 100644
index 8648b1e5c53f..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.18.20.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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.11.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.19.11.ebuild
deleted file mode 100644
index 71ae71f5f970..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.19.11.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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.19.12.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.19.12.ebuild
deleted file mode 100644
index 71ae71f5f970..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.19.12.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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.7.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.19.14.ebuild
index 71ae71f5f970..98230502bf76 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.20.7.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.19.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-scheduler
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.20.8.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.20.10.ebuild
index 71ae71f5f970..98230502bf76 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.20.8.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.20.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-scheduler
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.21.1.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.21.4.ebuild
index 6200b79aaf8b..0e9f9a6dd32b 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.21.1.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.21.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-scheduler
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.21.2.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.22.1.ebuild
index 6200b79aaf8b..0e9f9a6dd32b 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.21.2.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.22.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-scheduler
diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index 40865a848d53..8c24465a4661 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -1,23 +1,15 @@
-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.19.13.tar.gz 33554674 BLAKE2B e7654262ad0d91f9e7eac3851576bd65888f93a2614fae67e76750af64719d514e95fe27b4fb9d1ee86a0931d8f7e84cf393c6ca25604efa6d5eb4fff50c7c1b SHA512 d5bece5cdc399c5132c959b5f53431427893a2bc37c3f475df73c2f846e4c51b961b092c3099c1f1f42de2cdde782bf62c404b9cc44fc69cecfee2c7765b7509
-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.19.14.tar.gz 33547290 BLAKE2B a35a51301a7c50bf46247ca0a3e341f1b2a479fcbb2d4c53abee20983892ec41d8e607e7e920f54f7ca2ade3ef32e5fe1e84e12eea5d154fc764319a7e37667a SHA512 9262cb6f21b7096121f4ae9dd14d8dcbcffb3c590cfee13aafe7152a585fcdf4c13ab8002553757c2c3288ebef1ad6f824e431b45a2751bcc8ad6e033409d6a2
+DIST kubernetes-1.20.10.tar.gz 34502658 BLAKE2B 273f47a8f99a52a9b1fa2ea8a755dd97d6b85c0bd516d162defe44ed32706f1661221c66eca148fc34978d2027eaf73a2605ba48f26e9fb223cf41cd0177cd56 SHA512 a196fb3c1251de8d3136dd6494b9223a05ed313069219da20b3066fabd26d3dd6752cf6f6c7b1522e4941bcde726099b80cf62f8c0e4752b0cdb9c83e02b4910
 DIST kubernetes-1.20.9.tar.gz 34501156 BLAKE2B 48bc055d4e9516116ba445c6e1dc468502688f189d4ef8cfd12012e7a3e55344894f2f823c38b5664d792bedf51e6380c2f82e011bfea38dcb728159efe9b55e SHA512 9083589e016f1b9d3432fdab748f296b833c2f3425d6c89299e04f074865a9d2e706f4a8c0f9b90f32fca0c568e841f6a9c85dab5a748cd182f4e0f66c08cc8f
-DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
-DIST kubernetes-1.21.2.tar.gz 36081553 BLAKE2B 60566f2f33aebcd2f48e9d245883aa74d17ce21bdec05b529265a55e266497d6c7278fb7fdb5a94747e10641b5843b2a4b8079b981818ce3f3078c046ed72762 SHA512 20f81c975d6a5a4e6cbbfcaa2f34e8dd4f96018a8a60004a9fedf13eb9d8d43a14f0b746fb48a1240e378d2a1b8de440104c72269d68239040fa6a690c5115ff
 DIST kubernetes-1.21.3.tar.gz 36090238 BLAKE2B 90875f42be8bc123d6cdf120ce33ff2aa5e1da33bc2c9b147c1b6d7ccffeaec9e87cb4552e88c301f741fd8f0923792baa9c65a03035fc26f0431a172068dbac SHA512 d780099814468079eaa9b9b33fb0f48e2c44ebbf304068f44c79281e7dc074cfe8a2f56330f8363282ce6ed07a12125fa4ec6a8a5308d208456231f827c861a0
-EBUILD kubeadm-1.18.19.ebuild 872 BLAKE2B 1f3aaf9c5520fada96580be3d4a31911514b21acb2aa311697b00454fa27badca0ab6b5daa5ca7f79311708f2902a0acdeb26eabb417476d168a67e403457091 SHA512 6cfd03238748f6b67c7c408f3184413afe075f5df7053d062a2a5f736b0206edde4bdd0b7f771004aed14a26104654ae32b78ffeb90059f06d52be1b7a321d7e
-EBUILD kubeadm-1.18.20.ebuild 872 BLAKE2B 1f3aaf9c5520fada96580be3d4a31911514b21acb2aa311697b00454fa27badca0ab6b5daa5ca7f79311708f2902a0acdeb26eabb417476d168a67e403457091 SHA512 6cfd03238748f6b67c7c408f3184413afe075f5df7053d062a2a5f736b0206edde4bdd0b7f771004aed14a26104654ae32b78ffeb90059f06d52be1b7a321d7e
-EBUILD kubeadm-1.19.11.ebuild 906 BLAKE2B 9d23a85485ad61d17992dcd33f016f61567c83380b25c7f5792b93107a01c12648ff9f78a57bf1ca903a0173277c6ee940b33baeeda1eb8aded8b13eab0bb0db SHA512 d0473158b12a2a8332eba6b1306691750096a0eb3acd65d9db2c1adf7083275fd10ecce397a7045ca840da25a837db8e89645d5b3b3087cf93edee4efa688c2b
-EBUILD kubeadm-1.19.12.ebuild 906 BLAKE2B 9d23a85485ad61d17992dcd33f016f61567c83380b25c7f5792b93107a01c12648ff9f78a57bf1ca903a0173277c6ee940b33baeeda1eb8aded8b13eab0bb0db SHA512 d0473158b12a2a8332eba6b1306691750096a0eb3acd65d9db2c1adf7083275fd10ecce397a7045ca840da25a837db8e89645d5b3b3087cf93edee4efa688c2b
+DIST kubernetes-1.21.4.tar.gz 36099646 BLAKE2B b41b3581c3e0bc85a5e259df31c225c3deab3e67545f8a8439c3e77eeca1c5d0a5c76948565ebc46ac42790299581943042fa2bda71e6cf2616776a2f9453e08 SHA512 79aa3b13242bfdcee6cda1e542a7f4ca940caab35ff81f617295cb45d6a6ce3c1274d794c1de43a74c684dc371a01a062709da8cec4fe462b520bf804ae59c8e
+DIST kubernetes-1.22.1.tar.gz 35986911 BLAKE2B f474963aafe63afec87ae113543aad1be000eb32df725254d28d44d1f4fa1bc7c0fac88d77ac58b9bf1dd67129e2c2d010e97368f5ba392bf3924dd8bfa3ebed SHA512 97d5644cd06c2a092338bddc6b5e5b4c538ae8055b5d7c9ea011a8454b191714864ab624657e88aa1d6e8939d1526a69d763b0126249bfbb5e96f62ecf4290a3
 EBUILD kubeadm-1.19.13.ebuild 906 BLAKE2B 9d23a85485ad61d17992dcd33f016f61567c83380b25c7f5792b93107a01c12648ff9f78a57bf1ca903a0173277c6ee940b33baeeda1eb8aded8b13eab0bb0db SHA512 d0473158b12a2a8332eba6b1306691750096a0eb3acd65d9db2c1adf7083275fd10ecce397a7045ca840da25a837db8e89645d5b3b3087cf93edee4efa688c2b
-EBUILD kubeadm-1.20.7.ebuild 906 BLAKE2B 9d23a85485ad61d17992dcd33f016f61567c83380b25c7f5792b93107a01c12648ff9f78a57bf1ca903a0173277c6ee940b33baeeda1eb8aded8b13eab0bb0db SHA512 d0473158b12a2a8332eba6b1306691750096a0eb3acd65d9db2c1adf7083275fd10ecce397a7045ca840da25a837db8e89645d5b3b3087cf93edee4efa688c2b
-EBUILD kubeadm-1.20.8.ebuild 906 BLAKE2B 9d23a85485ad61d17992dcd33f016f61567c83380b25c7f5792b93107a01c12648ff9f78a57bf1ca903a0173277c6ee940b33baeeda1eb8aded8b13eab0bb0db SHA512 d0473158b12a2a8332eba6b1306691750096a0eb3acd65d9db2c1adf7083275fd10ecce397a7045ca840da25a837db8e89645d5b3b3087cf93edee4efa688c2b
+EBUILD kubeadm-1.19.14.ebuild 907 BLAKE2B 5e04bb4a35a8a99082f8b6b656ce6498e2121ab448f2a02b109ea84cd50d99b71e24f39e6cb4f39de0212d45629c3e533b45a9073afb4a368b593ad8ad1c4b8f SHA512 8baef54420d2354ef809920131cd7ee027030020f4a239534fba3e838807e1b95092ea692feaf4b7dfdd4a297a37a21413bf3a5f0ec0eca603abad652890ab8d
+EBUILD kubeadm-1.20.10.ebuild 907 BLAKE2B 5e04bb4a35a8a99082f8b6b656ce6498e2121ab448f2a02b109ea84cd50d99b71e24f39e6cb4f39de0212d45629c3e533b45a9073afb4a368b593ad8ad1c4b8f SHA512 8baef54420d2354ef809920131cd7ee027030020f4a239534fba3e838807e1b95092ea692feaf4b7dfdd4a297a37a21413bf3a5f0ec0eca603abad652890ab8d
 EBUILD kubeadm-1.20.9.ebuild 906 BLAKE2B 9d23a85485ad61d17992dcd33f016f61567c83380b25c7f5792b93107a01c12648ff9f78a57bf1ca903a0173277c6ee940b33baeeda1eb8aded8b13eab0bb0db SHA512 d0473158b12a2a8332eba6b1306691750096a0eb3acd65d9db2c1adf7083275fd10ecce397a7045ca840da25a837db8e89645d5b3b3087cf93edee4efa688c2b
-EBUILD kubeadm-1.21.1.ebuild 906 BLAKE2B 976b6b81abac175c8b5d91ebb43e8c9bc30135ddd787992783860bca174e847bf371ad55c46b4b70a824dc0446853ec0735eb497f27cb80121c4a40cd50ec13f SHA512 9dcbc099f39ba5c0696bdab617cd67100d88809180e7bb08d671cceb903eb323f31e093e0d46cd42a4f9f7f281dfc6cd6ac82d5a398d88b7c3d41c95a5a76c9f
-EBUILD kubeadm-1.21.2.ebuild 906 BLAKE2B 976b6b81abac175c8b5d91ebb43e8c9bc30135ddd787992783860bca174e847bf371ad55c46b4b70a824dc0446853ec0735eb497f27cb80121c4a40cd50ec13f SHA512 9dcbc099f39ba5c0696bdab617cd67100d88809180e7bb08d671cceb903eb323f31e093e0d46cd42a4f9f7f281dfc6cd6ac82d5a398d88b7c3d41c95a5a76c9f
 EBUILD kubeadm-1.21.3.ebuild 906 BLAKE2B 976b6b81abac175c8b5d91ebb43e8c9bc30135ddd787992783860bca174e847bf371ad55c46b4b70a824dc0446853ec0735eb497f27cb80121c4a40cd50ec13f SHA512 9dcbc099f39ba5c0696bdab617cd67100d88809180e7bb08d671cceb903eb323f31e093e0d46cd42a4f9f7f281dfc6cd6ac82d5a398d88b7c3d41c95a5a76c9f
+EBUILD kubeadm-1.21.4.ebuild 907 BLAKE2B 9afd971b3448c327ce26750d0d90ff79d4416a158e0cafb37bf834ef47056e9e087cc06cdeabeec88b9c1426cf0106c1e7c7e1945b8523e518ac8e69c51e87ff SHA512 0861a7d79b74f60623f11c7de08306732793ba1edcf185e7abc8e779757c744b94191f4a829932818468de05b350636a81d36344d3a128e404a7a1b33526a0d0
+EBUILD kubeadm-1.22.1.ebuild 907 BLAKE2B 9afd971b3448c327ce26750d0d90ff79d4416a158e0cafb37bf834ef47056e9e087cc06cdeabeec88b9c1426cf0106c1e7c7e1945b8523e518ac8e69c51e87ff SHA512 0861a7d79b74f60623f11c7de08306732793ba1edcf185e7abc8e779757c744b94191f4a829932818468de05b350636a81d36344d3a128e404a7a1b33526a0d0
 MISC metadata.xml 917 BLAKE2B ead95efd60868ca415983905cf72f7a3b00dd7048fe6fad5caf52fa78ab1ce77109e3e29ac5708b5240dc27b58b69858ca23b6952f2b087f5e311359e9929010 SHA512 3be4ae4aec07e6cdfb6eb1aebabb71fd49e9e9dbf9a183c4a1b19c74f3419c32a01b537425f30844ad642e04d72411ecfafd19c2ebdb0df8715ae139d9145949
diff --git a/sys-cluster/kubeadm/kubeadm-1.18.19.ebuild b/sys-cluster/kubeadm/kubeadm-1.18.19.ebuild
deleted file mode 100644
index bcffeaaa9eaf..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.18.19.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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.18.20.ebuild b/sys-cluster/kubeadm/kubeadm-1.18.20.ebuild
deleted file mode 100644
index bcffeaaa9eaf..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.18.20.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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.11.ebuild b/sys-cluster/kubeadm/kubeadm-1.19.11.ebuild
deleted file mode 100644
index 55c40dd8fdf1..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.19.11.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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.19.12.ebuild b/sys-cluster/kubeadm/kubeadm-1.19.12.ebuild
deleted file mode 100644
index 55c40dd8fdf1..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.19.12.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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.7.ebuild b/sys-cluster/kubeadm/kubeadm-1.19.14.ebuild
index 55c40dd8fdf1..e8e9bef16ed9 100644
--- a/sys-cluster/kubeadm/kubeadm-1.20.7.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.19.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubeadm/kubeadm-1.20.8.ebuild b/sys-cluster/kubeadm/kubeadm-1.20.10.ebuild
index 55c40dd8fdf1..e8e9bef16ed9 100644
--- a/sys-cluster/kubeadm/kubeadm-1.20.8.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.20.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubeadm/kubeadm-1.21.1.ebuild b/sys-cluster/kubeadm/kubeadm-1.21.4.ebuild
index 30a22698926b..b98e9b739641 100644
--- a/sys-cluster/kubeadm/kubeadm-1.21.1.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.21.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubeadm/kubeadm-1.21.2.ebuild b/sys-cluster/kubeadm/kubeadm-1.22.1.ebuild
index 30a22698926b..b98e9b739641 100644
--- a/sys-cluster/kubeadm/kubeadm-1.21.2.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.22.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index fbfb6a54f889..39f8766c7c0b 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,23 +1,15 @@
-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.19.13.tar.gz 33554674 BLAKE2B e7654262ad0d91f9e7eac3851576bd65888f93a2614fae67e76750af64719d514e95fe27b4fb9d1ee86a0931d8f7e84cf393c6ca25604efa6d5eb4fff50c7c1b SHA512 d5bece5cdc399c5132c959b5f53431427893a2bc37c3f475df73c2f846e4c51b961b092c3099c1f1f42de2cdde782bf62c404b9cc44fc69cecfee2c7765b7509
-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.19.14.tar.gz 33547290 BLAKE2B a35a51301a7c50bf46247ca0a3e341f1b2a479fcbb2d4c53abee20983892ec41d8e607e7e920f54f7ca2ade3ef32e5fe1e84e12eea5d154fc764319a7e37667a SHA512 9262cb6f21b7096121f4ae9dd14d8dcbcffb3c590cfee13aafe7152a585fcdf4c13ab8002553757c2c3288ebef1ad6f824e431b45a2751bcc8ad6e033409d6a2
+DIST kubernetes-1.20.10.tar.gz 34502658 BLAKE2B 273f47a8f99a52a9b1fa2ea8a755dd97d6b85c0bd516d162defe44ed32706f1661221c66eca148fc34978d2027eaf73a2605ba48f26e9fb223cf41cd0177cd56 SHA512 a196fb3c1251de8d3136dd6494b9223a05ed313069219da20b3066fabd26d3dd6752cf6f6c7b1522e4941bcde726099b80cf62f8c0e4752b0cdb9c83e02b4910
 DIST kubernetes-1.20.9.tar.gz 34501156 BLAKE2B 48bc055d4e9516116ba445c6e1dc468502688f189d4ef8cfd12012e7a3e55344894f2f823c38b5664d792bedf51e6380c2f82e011bfea38dcb728159efe9b55e SHA512 9083589e016f1b9d3432fdab748f296b833c2f3425d6c89299e04f074865a9d2e706f4a8c0f9b90f32fca0c568e841f6a9c85dab5a748cd182f4e0f66c08cc8f
-DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
-DIST kubernetes-1.21.2.tar.gz 36081553 BLAKE2B 60566f2f33aebcd2f48e9d245883aa74d17ce21bdec05b529265a55e266497d6c7278fb7fdb5a94747e10641b5843b2a4b8079b981818ce3f3078c046ed72762 SHA512 20f81c975d6a5a4e6cbbfcaa2f34e8dd4f96018a8a60004a9fedf13eb9d8d43a14f0b746fb48a1240e378d2a1b8de440104c72269d68239040fa6a690c5115ff
 DIST kubernetes-1.21.3.tar.gz 36090238 BLAKE2B 90875f42be8bc123d6cdf120ce33ff2aa5e1da33bc2c9b147c1b6d7ccffeaec9e87cb4552e88c301f741fd8f0923792baa9c65a03035fc26f0431a172068dbac SHA512 d780099814468079eaa9b9b33fb0f48e2c44ebbf304068f44c79281e7dc074cfe8a2f56330f8363282ce6ed07a12125fa4ec6a8a5308d208456231f827c861a0
-EBUILD kubectl-1.18.19.ebuild 871 BLAKE2B 8358e454dd4e2bef7e0bebda1043376bd103079110b5edaecb2ad51249f812363cc245f51d5150e5f00a5aa8c384b5b32d05171327075fd7aa27d22dbca24c07 SHA512 43373bb937da14b667cc037665c2c36f79382c2f4c0c08f6af931067356f044d8c03579451ffb6fe096836e411579e8e02e1780b552c6d55ce4f625ba8fff3b5
-EBUILD kubectl-1.18.20.ebuild 871 BLAKE2B 8358e454dd4e2bef7e0bebda1043376bd103079110b5edaecb2ad51249f812363cc245f51d5150e5f00a5aa8c384b5b32d05171327075fd7aa27d22dbca24c07 SHA512 43373bb937da14b667cc037665c2c36f79382c2f4c0c08f6af931067356f044d8c03579451ffb6fe096836e411579e8e02e1780b552c6d55ce4f625ba8fff3b5
-EBUILD kubectl-1.19.11.ebuild 901 BLAKE2B 83da76032ca52af1865dfb01c685a34b87a728dfe861d6aa831abab06ffbfedbe1b35de9406d5ebdc0391398766c91cad7d8cb3aa612cf60b9cf6ce4b143b62d SHA512 c1a867a99b5515a2130ce430adb20d0c8180d24b8ddfebbadc896e99221fbc137441ef08937df631b956d58fdddc691021479b2eadb71bd124b6d06952e8c366
-EBUILD kubectl-1.19.12.ebuild 901 BLAKE2B 83da76032ca52af1865dfb01c685a34b87a728dfe861d6aa831abab06ffbfedbe1b35de9406d5ebdc0391398766c91cad7d8cb3aa612cf60b9cf6ce4b143b62d SHA512 c1a867a99b5515a2130ce430adb20d0c8180d24b8ddfebbadc896e99221fbc137441ef08937df631b956d58fdddc691021479b2eadb71bd124b6d06952e8c366
+DIST kubernetes-1.21.4.tar.gz 36099646 BLAKE2B b41b3581c3e0bc85a5e259df31c225c3deab3e67545f8a8439c3e77eeca1c5d0a5c76948565ebc46ac42790299581943042fa2bda71e6cf2616776a2f9453e08 SHA512 79aa3b13242bfdcee6cda1e542a7f4ca940caab35ff81f617295cb45d6a6ce3c1274d794c1de43a74c684dc371a01a062709da8cec4fe462b520bf804ae59c8e
+DIST kubernetes-1.22.1.tar.gz 35986911 BLAKE2B f474963aafe63afec87ae113543aad1be000eb32df725254d28d44d1f4fa1bc7c0fac88d77ac58b9bf1dd67129e2c2d010e97368f5ba392bf3924dd8bfa3ebed SHA512 97d5644cd06c2a092338bddc6b5e5b4c538ae8055b5d7c9ea011a8454b191714864ab624657e88aa1d6e8939d1526a69d763b0126249bfbb5e96f62ecf4290a3
 EBUILD kubectl-1.19.13.ebuild 901 BLAKE2B 83da76032ca52af1865dfb01c685a34b87a728dfe861d6aa831abab06ffbfedbe1b35de9406d5ebdc0391398766c91cad7d8cb3aa612cf60b9cf6ce4b143b62d SHA512 c1a867a99b5515a2130ce430adb20d0c8180d24b8ddfebbadc896e99221fbc137441ef08937df631b956d58fdddc691021479b2eadb71bd124b6d06952e8c366
-EBUILD kubectl-1.20.7.ebuild 901 BLAKE2B 83da76032ca52af1865dfb01c685a34b87a728dfe861d6aa831abab06ffbfedbe1b35de9406d5ebdc0391398766c91cad7d8cb3aa612cf60b9cf6ce4b143b62d SHA512 c1a867a99b5515a2130ce430adb20d0c8180d24b8ddfebbadc896e99221fbc137441ef08937df631b956d58fdddc691021479b2eadb71bd124b6d06952e8c366
-EBUILD kubectl-1.20.8.ebuild 901 BLAKE2B 83da76032ca52af1865dfb01c685a34b87a728dfe861d6aa831abab06ffbfedbe1b35de9406d5ebdc0391398766c91cad7d8cb3aa612cf60b9cf6ce4b143b62d SHA512 c1a867a99b5515a2130ce430adb20d0c8180d24b8ddfebbadc896e99221fbc137441ef08937df631b956d58fdddc691021479b2eadb71bd124b6d06952e8c366
+EBUILD kubectl-1.19.14.ebuild 902 BLAKE2B 6f454846b9f0f28044dd85192f039fb6dedd3643d91e13c67b219a49cf011fa6c3c3eed9995b6c7ec0bfcca0150a7d2118d9a6c9d24d1da9de28dc06f6bd2bc0 SHA512 15c047f5caf38d5d6e550609c376ceb558542846077f7433d48261a8f60b9aaa9700a87dd63b52d0a4be0aa6453bd500171877ec038fdd4e010723d7582768e9
+EBUILD kubectl-1.20.10.ebuild 902 BLAKE2B 6f454846b9f0f28044dd85192f039fb6dedd3643d91e13c67b219a49cf011fa6c3c3eed9995b6c7ec0bfcca0150a7d2118d9a6c9d24d1da9de28dc06f6bd2bc0 SHA512 15c047f5caf38d5d6e550609c376ceb558542846077f7433d48261a8f60b9aaa9700a87dd63b52d0a4be0aa6453bd500171877ec038fdd4e010723d7582768e9
 EBUILD kubectl-1.20.9.ebuild 901 BLAKE2B 83da76032ca52af1865dfb01c685a34b87a728dfe861d6aa831abab06ffbfedbe1b35de9406d5ebdc0391398766c91cad7d8cb3aa612cf60b9cf6ce4b143b62d SHA512 c1a867a99b5515a2130ce430adb20d0c8180d24b8ddfebbadc896e99221fbc137441ef08937df631b956d58fdddc691021479b2eadb71bd124b6d06952e8c366
-EBUILD kubectl-1.21.1.ebuild 901 BLAKE2B 9aefec009262faa0888202910542873bcee4eb1245658cfc33d71dbffe9c4e942967ccf9d274411ceb42d88f18f25292809679138205b93de18181d96b59ff04 SHA512 c9a161914ea33735b68cd899fffd96cf54dbb89c09c0ff79eb26b01c39936f809a9b0d3a86725199ca157de4f7c874c534514e90505a7e3c4fda872485d06c51
-EBUILD kubectl-1.21.2.ebuild 901 BLAKE2B 9aefec009262faa0888202910542873bcee4eb1245658cfc33d71dbffe9c4e942967ccf9d274411ceb42d88f18f25292809679138205b93de18181d96b59ff04 SHA512 c9a161914ea33735b68cd899fffd96cf54dbb89c09c0ff79eb26b01c39936f809a9b0d3a86725199ca157de4f7c874c534514e90505a7e3c4fda872485d06c51
 EBUILD kubectl-1.21.3.ebuild 901 BLAKE2B 9aefec009262faa0888202910542873bcee4eb1245658cfc33d71dbffe9c4e942967ccf9d274411ceb42d88f18f25292809679138205b93de18181d96b59ff04 SHA512 c9a161914ea33735b68cd899fffd96cf54dbb89c09c0ff79eb26b01c39936f809a9b0d3a86725199ca157de4f7c874c534514e90505a7e3c4fda872485d06c51
+EBUILD kubectl-1.21.4.ebuild 902 BLAKE2B 5907f4fb13676ce0fddae866a732043d9c965f1f201b65ed0077240fe1f7fd7df28ea180a2541085486f4c0f612e604bd6e357fe038edc72abff6538b276a57d SHA512 4b717de62be84d6237e8b87b8550687bf8451d1a635b06b2f07567fb00a13f62b4d16f488074e10d0eacdc9dd9020ef7e5e1469bad3993e4350c8adbf1b51223
+EBUILD kubectl-1.22.1.ebuild 902 BLAKE2B 5907f4fb13676ce0fddae866a732043d9c965f1f201b65ed0077240fe1f7fd7df28ea180a2541085486f4c0f612e604bd6e357fe038edc72abff6538b276a57d SHA512 4b717de62be84d6237e8b87b8550687bf8451d1a635b06b2f07567fb00a13f62b4d16f488074e10d0eacdc9dd9020ef7e5e1469bad3993e4350c8adbf1b51223
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kubectl/kubectl-1.18.19.ebuild b/sys-cluster/kubectl/kubectl-1.18.19.ebuild
deleted file mode 100644
index 0addb3847796..000000000000
--- a/sys-cluster/kubectl/kubectl-1.18.19.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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.18.20.ebuild b/sys-cluster/kubectl/kubectl-1.18.20.ebuild
deleted file mode 100644
index 0addb3847796..000000000000
--- a/sys-cluster/kubectl/kubectl-1.18.20.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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.11.ebuild b/sys-cluster/kubectl/kubectl-1.19.11.ebuild
deleted file mode 100644
index 0c55d6b9e06a..000000000000
--- a/sys-cluster/kubectl/kubectl-1.19.11.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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.19.12.ebuild b/sys-cluster/kubectl/kubectl-1.19.12.ebuild
deleted file mode 100644
index 0c55d6b9e06a..000000000000
--- a/sys-cluster/kubectl/kubectl-1.19.12.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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.7.ebuild b/sys-cluster/kubectl/kubectl-1.19.14.ebuild
index 0c55d6b9e06a..99f1f19c12d4 100644
--- a/sys-cluster/kubectl/kubectl-1.20.7.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.19.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 DEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubectl/kubectl-1.20.8.ebuild b/sys-cluster/kubectl/kubectl-1.20.10.ebuild
index 0c55d6b9e06a..99f1f19c12d4 100644
--- a/sys-cluster/kubectl/kubectl-1.20.8.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.20.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 DEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubectl/kubectl-1.21.1.ebuild b/sys-cluster/kubectl/kubectl-1.21.4.ebuild
index f944d97ebefa..5603ed030db7 100644
--- a/sys-cluster/kubectl/kubectl-1.21.1.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.21.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 DEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubectl/kubectl-1.21.2.ebuild b/sys-cluster/kubectl/kubectl-1.22.1.ebuild
index f944d97ebefa..5603ed030db7 100644
--- a/sys-cluster/kubectl/kubectl-1.21.2.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.22.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 DEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index 02f5a9b2ebb8..6026a1f5f490 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -3,26 +3,18 @@ AUX kubelet.env 547 BLAKE2B db9144a0e155450f08a665700edbb05f3fa093d209f72320fdbc
 AUX kubelet.initd 520 BLAKE2B 50edf888fed020a02f099189f8a5bdde54a4bfa2a00585489864c262d90ad8347763753f99eccec6fe6670c6fa016674dee4dea0fa838991abb503db97bd983a SHA512 c6b9bcdb6d063728ef2e9d67673ea29c0972e70e446be9c020cfd277a7bbcfc955a5ad7a72ab0ca1579a4d04b0fc4ac71ee20e6dba9d9a9a9099efcad3c139d0
 AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba83207ae89aae4f2e151a8b32e21b8d5e92229cccd7b7aa2676328d3d1a5fa80cadde65fe80a8cde10535d4 SHA512 05ce9ea16d2ddf8e255adb406556c37bc04dcfc457a132a78d31deaed78963f4e1f31555f781b706909c02815a04370d5c0e02614eb79d602b1cb827cf2471d5
 AUX kubelet.service 642 BLAKE2B 9f0fa5db48c09c2525cbc556cd520660302408a43aceb6c11da3a191b4b21607e824e46d9805b12b57a0ac7878c7da94d0cb86c69cd949814c77bb217973c6f1 SHA512 770cadae6afb68f0556c7c5969643642bbf09b596ff49d969d31b8d9f0d8907d6931eb7fb14485c78a3f75682e44e2355c7e51973a0dfdd1e665816f04ba21ae
-DIST kubernetes-1.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.19.13.tar.gz 33554674 BLAKE2B e7654262ad0d91f9e7eac3851576bd65888f93a2614fae67e76750af64719d514e95fe27b4fb9d1ee86a0931d8f7e84cf393c6ca25604efa6d5eb4fff50c7c1b SHA512 d5bece5cdc399c5132c959b5f53431427893a2bc37c3f475df73c2f846e4c51b961b092c3099c1f1f42de2cdde782bf62c404b9cc44fc69cecfee2c7765b7509
-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.19.14.tar.gz 33547290 BLAKE2B a35a51301a7c50bf46247ca0a3e341f1b2a479fcbb2d4c53abee20983892ec41d8e607e7e920f54f7ca2ade3ef32e5fe1e84e12eea5d154fc764319a7e37667a SHA512 9262cb6f21b7096121f4ae9dd14d8dcbcffb3c590cfee13aafe7152a585fcdf4c13ab8002553757c2c3288ebef1ad6f824e431b45a2751bcc8ad6e033409d6a2
+DIST kubernetes-1.20.10.tar.gz 34502658 BLAKE2B 273f47a8f99a52a9b1fa2ea8a755dd97d6b85c0bd516d162defe44ed32706f1661221c66eca148fc34978d2027eaf73a2605ba48f26e9fb223cf41cd0177cd56 SHA512 a196fb3c1251de8d3136dd6494b9223a05ed313069219da20b3066fabd26d3dd6752cf6f6c7b1522e4941bcde726099b80cf62f8c0e4752b0cdb9c83e02b4910
 DIST kubernetes-1.20.9.tar.gz 34501156 BLAKE2B 48bc055d4e9516116ba445c6e1dc468502688f189d4ef8cfd12012e7a3e55344894f2f823c38b5664d792bedf51e6380c2f82e011bfea38dcb728159efe9b55e SHA512 9083589e016f1b9d3432fdab748f296b833c2f3425d6c89299e04f074865a9d2e706f4a8c0f9b90f32fca0c568e841f6a9c85dab5a748cd182f4e0f66c08cc8f
-DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
-DIST kubernetes-1.21.2.tar.gz 36081553 BLAKE2B 60566f2f33aebcd2f48e9d245883aa74d17ce21bdec05b529265a55e266497d6c7278fb7fdb5a94747e10641b5843b2a4b8079b981818ce3f3078c046ed72762 SHA512 20f81c975d6a5a4e6cbbfcaa2f34e8dd4f96018a8a60004a9fedf13eb9d8d43a14f0b746fb48a1240e378d2a1b8de440104c72269d68239040fa6a690c5115ff
 DIST kubernetes-1.21.3.tar.gz 36090238 BLAKE2B 90875f42be8bc123d6cdf120ce33ff2aa5e1da33bc2c9b147c1b6d7ccffeaec9e87cb4552e88c301f741fd8f0923792baa9c65a03035fc26f0431a172068dbac SHA512 d780099814468079eaa9b9b33fb0f48e2c44ebbf304068f44c79281e7dc074cfe8a2f56330f8363282ce6ed07a12125fa4ec6a8a5308d208456231f827c861a0
-EBUILD kubelet-1.18.19.ebuild 967 BLAKE2B d1d54a616a42fcef1f24483e2db99d09297ae0af42778816ebb487b33c4eae4940e6fa4b45158f85f5740ef90c05800b3ba97bd5938793d6915d9e6f451c10a4 SHA512 c5e4163bf6d69dbf6a8d19e00c92421ecd62494b99f3c4aea29319d6ae156da99e69a89e9bee5911a6644bf2e43e2ea505e5331809739e5b6c75eae9931020ef
-EBUILD kubelet-1.18.20.ebuild 967 BLAKE2B d1d54a616a42fcef1f24483e2db99d09297ae0af42778816ebb487b33c4eae4940e6fa4b45158f85f5740ef90c05800b3ba97bd5938793d6915d9e6f451c10a4 SHA512 c5e4163bf6d69dbf6a8d19e00c92421ecd62494b99f3c4aea29319d6ae156da99e69a89e9bee5911a6644bf2e43e2ea505e5331809739e5b6c75eae9931020ef
-EBUILD kubelet-1.19.11.ebuild 1003 BLAKE2B afae3cd57239417bab7bc049af4f3fd1a7faf2fc6cd1d128ba15857c23944d4e72050dbf4b487feb4ac285511f0c4be217087a9ee8dd81971c8529f6d7029494 SHA512 ef137f406c76dff3d015b649304de4e4a8c131f81ac9543ef2ffb5a55b323f683b991b392022390e416b63562accefead8ccd592ba72e7253919afd42213891c
-EBUILD kubelet-1.19.12.ebuild 1003 BLAKE2B afae3cd57239417bab7bc049af4f3fd1a7faf2fc6cd1d128ba15857c23944d4e72050dbf4b487feb4ac285511f0c4be217087a9ee8dd81971c8529f6d7029494 SHA512 ef137f406c76dff3d015b649304de4e4a8c131f81ac9543ef2ffb5a55b323f683b991b392022390e416b63562accefead8ccd592ba72e7253919afd42213891c
+DIST kubernetes-1.21.4.tar.gz 36099646 BLAKE2B b41b3581c3e0bc85a5e259df31c225c3deab3e67545f8a8439c3e77eeca1c5d0a5c76948565ebc46ac42790299581943042fa2bda71e6cf2616776a2f9453e08 SHA512 79aa3b13242bfdcee6cda1e542a7f4ca940caab35ff81f617295cb45d6a6ce3c1274d794c1de43a74c684dc371a01a062709da8cec4fe462b520bf804ae59c8e
+DIST kubernetes-1.22.1.tar.gz 35986911 BLAKE2B f474963aafe63afec87ae113543aad1be000eb32df725254d28d44d1f4fa1bc7c0fac88d77ac58b9bf1dd67129e2c2d010e97368f5ba392bf3924dd8bfa3ebed SHA512 97d5644cd06c2a092338bddc6b5e5b4c538ae8055b5d7c9ea011a8454b191714864ab624657e88aa1d6e8939d1526a69d763b0126249bfbb5e96f62ecf4290a3
 EBUILD kubelet-1.19.13.ebuild 1003 BLAKE2B afae3cd57239417bab7bc049af4f3fd1a7faf2fc6cd1d128ba15857c23944d4e72050dbf4b487feb4ac285511f0c4be217087a9ee8dd81971c8529f6d7029494 SHA512 ef137f406c76dff3d015b649304de4e4a8c131f81ac9543ef2ffb5a55b323f683b991b392022390e416b63562accefead8ccd592ba72e7253919afd42213891c
-EBUILD kubelet-1.20.7.ebuild 1003 BLAKE2B afae3cd57239417bab7bc049af4f3fd1a7faf2fc6cd1d128ba15857c23944d4e72050dbf4b487feb4ac285511f0c4be217087a9ee8dd81971c8529f6d7029494 SHA512 ef137f406c76dff3d015b649304de4e4a8c131f81ac9543ef2ffb5a55b323f683b991b392022390e416b63562accefead8ccd592ba72e7253919afd42213891c
-EBUILD kubelet-1.20.8.ebuild 1003 BLAKE2B afae3cd57239417bab7bc049af4f3fd1a7faf2fc6cd1d128ba15857c23944d4e72050dbf4b487feb4ac285511f0c4be217087a9ee8dd81971c8529f6d7029494 SHA512 ef137f406c76dff3d015b649304de4e4a8c131f81ac9543ef2ffb5a55b323f683b991b392022390e416b63562accefead8ccd592ba72e7253919afd42213891c
+EBUILD kubelet-1.19.14.ebuild 1004 BLAKE2B ae16a92a877501f8a611ad0f34065652b0819d753277857698dc6cbb007eb273722b596a375047247d6f6625f124f7b5e7407e7b350fb8a4b6641afcc35f37e2 SHA512 0c0474deb8a6fa845e2bd0d0e27d432ca2f0888246454ea91feb265cb490a8c4b3722f79a19c3732f80df3b7ad9f87992ef92e8577b9520e9d92c18010a6714f
+EBUILD kubelet-1.20.10.ebuild 1004 BLAKE2B ae16a92a877501f8a611ad0f34065652b0819d753277857698dc6cbb007eb273722b596a375047247d6f6625f124f7b5e7407e7b350fb8a4b6641afcc35f37e2 SHA512 0c0474deb8a6fa845e2bd0d0e27d432ca2f0888246454ea91feb265cb490a8c4b3722f79a19c3732f80df3b7ad9f87992ef92e8577b9520e9d92c18010a6714f
 EBUILD kubelet-1.20.9.ebuild 1003 BLAKE2B afae3cd57239417bab7bc049af4f3fd1a7faf2fc6cd1d128ba15857c23944d4e72050dbf4b487feb4ac285511f0c4be217087a9ee8dd81971c8529f6d7029494 SHA512 ef137f406c76dff3d015b649304de4e4a8c131f81ac9543ef2ffb5a55b323f683b991b392022390e416b63562accefead8ccd592ba72e7253919afd42213891c
-EBUILD kubelet-1.21.1.ebuild 1003 BLAKE2B ec935db07373229e5f1a47afb0700bfc1c57d98ce22096442ec9bd96c249f0b281988086e9680b61a865aa0a29328fcca1fded077adc36e3ed887e90482926b0 SHA512 57e849382861127150d322b947f22a7e84b4b4a19459a99fb48be480e109e5ff32a546139eb0ab191a149aa0c857d3f909ac21eaff3e41d2d9a95bcb88858a4f
-EBUILD kubelet-1.21.2.ebuild 1003 BLAKE2B ec935db07373229e5f1a47afb0700bfc1c57d98ce22096442ec9bd96c249f0b281988086e9680b61a865aa0a29328fcca1fded077adc36e3ed887e90482926b0 SHA512 57e849382861127150d322b947f22a7e84b4b4a19459a99fb48be480e109e5ff32a546139eb0ab191a149aa0c857d3f909ac21eaff3e41d2d9a95bcb88858a4f
 EBUILD kubelet-1.21.3.ebuild 1003 BLAKE2B ec935db07373229e5f1a47afb0700bfc1c57d98ce22096442ec9bd96c249f0b281988086e9680b61a865aa0a29328fcca1fded077adc36e3ed887e90482926b0 SHA512 57e849382861127150d322b947f22a7e84b4b4a19459a99fb48be480e109e5ff32a546139eb0ab191a149aa0c857d3f909ac21eaff3e41d2d9a95bcb88858a4f
+EBUILD kubelet-1.21.4.ebuild 1004 BLAKE2B f88397138d1ad4d29a043f56763236cf87f6c219c6d4ee45fc9d45df3f1a6758a10ebdf6cfdb2757fd420595c5720e9d0bd3df0dbb159859cedfc40f2662f5dd SHA512 fdcb1d7d2e8959cfbe3e6c3d138cc2f20cea6024f3cb89959bb8a7f68d5e2188d1b5bffd299a9484c4e37e446e128470a1f56d9278c46ce2c539ccabf2444ce3
+EBUILD kubelet-1.22.1.ebuild 1004 BLAKE2B f88397138d1ad4d29a043f56763236cf87f6c219c6d4ee45fc9d45df3f1a6758a10ebdf6cfdb2757fd420595c5720e9d0bd3df0dbb159859cedfc40f2662f5dd SHA512 fdcb1d7d2e8959cfbe3e6c3d138cc2f20cea6024f3cb89959bb8a7f68d5e2188d1b5bffd299a9484c4e37e446e128470a1f56d9278c46ce2c539ccabf2444ce3
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kubelet/kubelet-1.18.19.ebuild b/sys-cluster/kubelet/kubelet-1.18.19.ebuild
deleted file mode 100644
index 74f9eaab04bc..000000000000
--- a/sys-cluster/kubelet/kubelet-1.18.19.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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.18.20.ebuild b/sys-cluster/kubelet/kubelet-1.18.20.ebuild
deleted file mode 100644
index 74f9eaab04bc..000000000000
--- a/sys-cluster/kubelet/kubelet-1.18.20.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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.11.ebuild b/sys-cluster/kubelet/kubelet-1.19.11.ebuild
deleted file mode 100644
index c91af0a8527a..000000000000
--- a/sys-cluster/kubelet/kubelet-1.19.11.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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.19.12.ebuild b/sys-cluster/kubelet/kubelet-1.19.12.ebuild
deleted file mode 100644
index c91af0a8527a..000000000000
--- a/sys-cluster/kubelet/kubelet-1.19.12.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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.7.ebuild b/sys-cluster/kubelet/kubelet-1.19.14.ebuild
index c91af0a8527a..78302b14a815 100644
--- a/sys-cluster/kubelet/kubelet-1.20.7.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.19.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubelet/kubelet-1.20.8.ebuild b/sys-cluster/kubelet/kubelet-1.20.10.ebuild
index c91af0a8527a..78302b14a815 100644
--- a/sys-cluster/kubelet/kubelet-1.20.8.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.20.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubelet/kubelet-1.21.1.ebuild b/sys-cluster/kubelet/kubelet-1.21.4.ebuild
index 8f2f77250771..25f142b537a3 100644
--- a/sys-cluster/kubelet/kubelet-1.21.1.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.21.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubelet/kubelet-1.21.2.ebuild b/sys-cluster/kubelet/kubelet-1.22.1.ebuild
index 8f2f77250771..25f142b537a3 100644
--- a/sys-cluster/kubelet/kubelet-1.21.2.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.22.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/rdma-core/Manifest b/sys-cluster/rdma-core/Manifest
index 3a0808164db9..633eb0095eae 100644
--- a/sys-cluster/rdma-core/Manifest
+++ b/sys-cluster/rdma-core/Manifest
@@ -7,6 +7,7 @@ DIST rdma-core-31.0.tar.gz 1501133 BLAKE2B 5e67d68ab8eb4019ffb18e7d1995caa8e84a2
 DIST rdma-core-32.0.tar.gz 1525119 BLAKE2B 8f754c04be3f13a90a162fde09f96b26d66534aa7284c12e6c0765390f00412cf34052cc1c313f01df8b8bc49cad459a72350cea6e08316387cd6016fd7cb019 SHA512 fbc458e47801b8869fa0a6a045c2ecf10b9021f8fe115cedad8601a4672f116f393a353dcac238ad297935950a09be4a6faa45e373ea6248711d077a57737c16
 DIST rdma-core-33.0.tar.gz 1549162 BLAKE2B 7b7c8711eaeb9e66159962bcf0f70644cbb4af96df70f3c9ee6e9d9c8c3e4de5d3248666a0b3fe490537f91cc18c5d09448c72b98c45585e0645594deedee071 SHA512 64ace358c6336519131aea858012e22791bf2ab95f06d655a87835361b5822f5ce0c29db8ddb83121a62f4606418d5fa11358e7ad84da4f93f6233fb3947e52c
 DIST rdma-core-34.0.tar.gz 1571236 BLAKE2B 1c6799ba742926ef99f8fa7a0e20d7b910e0f3157e5de4350f7068d7d6f4fa79b8fa6be631e9675517bd12b91083c5e92157a1c097691ead0888823702c3583a SHA512 33ce5fbf0d468a31f7ac0e513cf107e3d730f5db279368aa986536f70d684f40e7bacdf965d18b77922272b0420a6cd973c0b73371758107d8f7751be5851ee7
+DIST rdma-core-36.0.tar.gz 1649117 BLAKE2B e3d58d8584f440cff437dedba1ccf34c2b62ecc63b5a039f71fc7666aed8e277ffbba2bbb4f8eda428f2f5f5890a5939163c6ebf6d420d3b3b0037a721d45e42 SHA512 89ad37c381ec7b5f18db01dbcbe65351b40fc1d0bc76e2088d663c6c560bf5f119841930ecf1042c997f5bf644683b906748c38d85f1eb561aadda060baa2368
 EBUILD rdma-core-30.0-r2.ebuild 2602 BLAKE2B 8e5974940353bddc406142c15e3adfad07b4706d8196a194dd35ce9381c4e7b4e394de4f59d16f5ead5087a0db466d1c54ab17f55aff5ee759c645219636a34f SHA512 590d01af90cb6d5fff462a264e8d2688599ea190dc5f2f425189be316509d51a20c4035c7ac00dfc5e79d47a1e176ab914fe8f6ff0bafa618311cb3d58b3e985
 EBUILD rdma-core-31.0.ebuild 2609 BLAKE2B d8f57482d3ae5100a0bb6a70974df3fb91fb74e8945e4723206609322eb6ce3fd7a3a3505c2f40e98f64db65172e99d81101c3176e824eb370ce9578d8dfb939 SHA512 d6fe683f174cc3fd271081e3a9efc3e8d88127962fabe5e55ab0d5f38403cebeb4cb6b211a1552d36632515086b07bed08b19c95b17b8fb632c25b76676b04c1
 EBUILD rdma-core-32.0-r1.ebuild 2610 BLAKE2B af8b426ce6be058696ba668464734e3577987370a0cf9bd33f047c3dc3d54e09e01cde49b75ae100ae555b03dc7fe79901010e5cdf2d5dc9b57e86915b9b4be6 SHA512 44478c203f8bb06c7762c034f44e419d29897cca9107f2d4a24e2191a519aad042564affd4ec79907c613f9e21558507dde06a4380eebb888d1e824d99bf919a
@@ -14,5 +15,6 @@ EBUILD rdma-core-32.0.ebuild 2608 BLAKE2B 235855c21f120e74a1367f5c564cb46991833c
 EBUILD rdma-core-33.0-r1.ebuild 2609 BLAKE2B 77e5b645f78c21892a1bc732119bafc31464fef1babe9756a90404d239fdea9212b7ce85578d46c616db60dbfbb38dc8c046eb944f92c1dbe2be4a6cd5603d54 SHA512 4bd352e52d03598b10a9aab90adf4078f1d814f34a1734d7918776902c15cda2ae80ea6302ec0dafdb0cd36ebd8939c70aff0fface1fb241654b2409ad1df5d1
 EBUILD rdma-core-33.0.ebuild 2609 BLAKE2B d8f57482d3ae5100a0bb6a70974df3fb91fb74e8945e4723206609322eb6ce3fd7a3a3505c2f40e98f64db65172e99d81101c3176e824eb370ce9578d8dfb939 SHA512 d6fe683f174cc3fd271081e3a9efc3e8d88127962fabe5e55ab0d5f38403cebeb4cb6b211a1552d36632515086b07bed08b19c95b17b8fb632c25b76676b04c1
 EBUILD rdma-core-34.0.ebuild 2616 BLAKE2B 5709e9896abb2f409880a3aab216c5a47f2f088ccecafddf996dc989c731aa3b0ab18983f56ffb26dafe432f4d533f4a417a959ef712500ffd41d6c4080753be SHA512 b0906628ae91f9a03a02680c5c801ce86babf68809a03fc8264004d6a059e026d9b9504b5b031f4626629a00d4892b60f8c2247c5c21ee0b45aa7af8d3a81458
+EBUILD rdma-core-36.0.ebuild 2559 BLAKE2B 3244073460b6be9f4d0a91ed7cfb0cc7f31e392a752fe66680830188b4270644b91424b7a352d9bc1f1446810ee54ac20b1dfe118665e2cc2cd492546f4217ce SHA512 ee08008ebbd8cbc3ca429f64f034a5fed491b5d302304b8bba35738cc34040c1ebaf468bcc05a46a58edc86fed571b64676e0dc9a6d92bea625d10207c18062d
 EBUILD rdma-core-9999.ebuild 2608 BLAKE2B 2693dc295b8f2c8f7217d4837341704dfeb3f20cb77756cd7c09d5d7ddea1af3113656842606afd1531f2164518f60125c05907e7430486ea379db4b642cab64 SHA512 f3c011c46112b4fbbaf492ebfccd02627878ae68e7645b52122fd8e0acf15bf578b5ee6ec5c75604143e2b298fc876e34e1b3977d0ecfc69607f588b0835eeb3
 MISC metadata.xml 559 BLAKE2B 1526777511ab5118d4de73361959107221858659ebbc60f52eb09b45d0798d969f847e4f157501ed6e8c85c2cee1c93d0b26989b357141bba45af946e2e5b0a1 SHA512 5d69acf3d0a323c0d2ee66971fd058c6c0ebf59e4fac0d4777b15bfcc7db8f515b67e6059d204346404ce3b26cdd77c2bea21e1132f418498fe1523eb16dccbb
diff --git a/sys-cluster/rdma-core/rdma-core-36.0.ebuild b/sys-cluster/rdma-core/rdma-core-36.0.ebuild
new file mode 100644
index 000000000000..8d147a1e6f0f
--- /dev/null
+++ b/sys-cluster/rdma-core/rdma-core-36.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..10} )
+
+inherit cmake python-single-r1 udev systemd
+
+DESCRIPTION="Userspace components for the Linux Kernel's drivers/infiniband subsystem"
+HOMEPAGE="https://github.com/linux-rdma/rdma-core"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core"
+else
+	SRC_URI="https://github.com/linux-rdma/rdma-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"
+SLOT="0"
+IUSE="neigh python static-libs systemd valgrind"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	virtual/libudev:=
+	neigh? ( dev-libs/libnl:3 )
+	systemd? ( sys-apps/systemd:= )
+	valgrind? ( dev-util/valgrind )
+	python? ( ${PYTHON_DEPS} )"
+
+DEPEND="${COMMON_DEPEND}
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-fabric/infiniband-diags
+	!sys-fabric/libibverbs
+	!sys-fabric/librdmacm
+	!sys-fabric/libibumad
+	!sys-fabric/ibacm
+	!sys-fabric/libibmad
+	!sys-fabric/srptools
+	!sys-fabric/infinipath-psm
+	!sys-fabric/libcxgb3
+	!sys-fabric/libcxgb4
+	!sys-fabric/libmthca
+	!sys-fabric/libmlx4
+	!sys-fabric/libmlx5
+	!sys-fabric/libocrdma
+	!sys-fabric/libnes"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/optional_pandoc.patch )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_RUNDIR=/run
+		-DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib
+		-DCMAKE_INSTALL_UDEV_RULESDIR="${EPREFIX}""$(get_udevdir)"/rules.d
+		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_pandoc=yes
+		$(ver_test -ge 25 && echo -DCMAKE_DISABLE_FIND_PACKAGE_rst2man=yes)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Systemd="$(usex systemd no yes)"
+		-DENABLE_VALGRIND="$(usex valgrind)"
+		-DENABLE_RESOLVE_NEIGH="$(usex neigh)"
+		-DENABLE_STATIC="$(usex static-libs)"
+		-DNO_PYVERBS="$(usex python OFF ON)"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	udev_dorules "${ED}"/etc/udev/rules.d/70-persistent-ipoib.rules
+	rm -r "${ED}"/etc/{udev,init.d} || die
+
+	if use neigh; then
+		newinitd "${FILESDIR}"/ibacm.init ibacm
+		newinitd "${FILESDIR}"/iwpmd.init iwpmd
+	fi
+
+	newinitd "${FILESDIR}"/srpd.init srpd
+
+	use python && python_optimize
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-09-03 20:56:28 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-09-03 20:56:28 +0100
commit	fbda87924e6faa7a1919f1a2b4182490bde5ec5c (patch)
tree	f3114a4ed212a754756adce027aeef3a4a1a2e2a /sys-cluster
parent	3b08f674e3f771b49370edb144dab0958c8cf721 (diff)