gentoo resync : 16.04.2022

37 files changed, 13 insertions, 948 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 0acc61df8075..381e03a97ad9 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index 707bbd42b78f..33408b017621 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -1,7 +1,6 @@
-AUX charliecloud-0.24-musl-argp.patch 1304 BLAKE2B cefc0e45803a1e82d62e4e7d16d6b39d1a25e76f7750977a6e5f91f48f87b24cc7b3ef2955375343ba122a90646aa3a33cdb3fe2aec06bba9bc6ffa56d85475b SHA512 87e0d73522f9777987e39ec841fd4ca6af62e81b2f73cf02df8590e8a82d8f8cc49ba44242c35fb898d0cdb5044e37f0902efeae4e0c2e4170c8ed15d4df6d31
-DIST charliecloud-0.25.tar.gz 454041 BLAKE2B 3a071f3b9fb06ca1db6d3b85a577943fe76440d395fdf1415d5085110db665fb75ee09dc14768d326e7e280e6c20096479e5f62290f7dee46821c356f5f18535 SHA512 a7a35b584dbdd6c6e27188d3555173c44f90c0e44fa685a15a47f47c94f9d76aa46ab80054a7c53e10a7f56bef87696f1db2a0eb8c49a388dbb0da0fe9112a60
 DIST charliecloud-0.26.tar.gz 472324 BLAKE2B 2b4b8f44f05a497e9367e97e49de255170b610880ef5d7909f7837bc54962f2c2de929d8381b99dc3f4b6124583744993b59839f8f1481cdbd5dc32334d3da9f SHA512 a8638db42a5563723b62ba0e9b9861b41e76b9246b94887d57a8d4c421d9dd2e8c0965b62af166e47859b72a50a2e01ec6775ef13f79c52696a6b2fd95134174
-EBUILD charliecloud-0.25.ebuild 2230 BLAKE2B 767bad4c7b77dbbf6687805b54c17d780ec51bdb09146cd58e8ec60f413ca12cf6232c1ff86fdfe3ebcf6de226d50d28c044296e6606736c89675ea23788d79d SHA512 232deff91ec5bf39cb13725e603edad2f208357581f3215a4ff4f6cc880dc83044bcb9210240a60b5667edefd964b22e6566e823ed38951c390591814c9a7465
+DIST charliecloud-0.27.tar.gz 471754 BLAKE2B b683847a79dd55a4bb79458e94e03988acdff0a1e6a24e7f67d56758bdbc3754cc3609e97bfc778f5cb6ce35d6f4df773235314c2ed642ac796b28b824ecadf6 SHA512 cfa5b1ac923008b9a38fc0228562b31551ea941bf222c9b9e12d8dce4c83ca896893e3509773a5ebc02d6b374d08dc049797226cf1432099aae7174c2bc5ee2b
 EBUILD charliecloud-0.26-r1.ebuild 2226 BLAKE2B 8ec73950df4519a606096cc14c5092c6547c26874ae28da1e98efb53498ab0725804321b1fc5960891b6ad78c1ecefdd0eac7f52dd9d233c982f7189915227f1 SHA512 76699826a6a5a10420b651317c4b074fd883d1d1ac5562431cdc74cb7997991434c50bc05960b7df51b21d05b09b9257e30e9f336e502c341f531f0ed83838da
-EBUILD charliecloud-9999.ebuild 2226 BLAKE2B 8ec73950df4519a606096cc14c5092c6547c26874ae28da1e98efb53498ab0725804321b1fc5960891b6ad78c1ecefdd0eac7f52dd9d233c982f7189915227f1 SHA512 76699826a6a5a10420b651317c4b074fd883d1d1ac5562431cdc74cb7997991434c50bc05960b7df51b21d05b09b9257e30e9f336e502c341f531f0ed83838da
+EBUILD charliecloud-0.27.ebuild 2230 BLAKE2B c9b1f02893c06d65118d21f14fbd2fca75cad01c69e15db450239015e38b22572491d2180f299bdce265177f158a62a171605172ecc6a7cf9765eb9e225be8fd SHA512 53811b9e665a81d26d0382e33a09a94a4f027653b7c2003f58607957857d53351fb2d7b37a4f943d92f6d83832db32b72be0bbdd82b7fb3cbea064312e790137
+EBUILD charliecloud-9999.ebuild 2230 BLAKE2B c9b1f02893c06d65118d21f14fbd2fca75cad01c69e15db450239015e38b22572491d2180f299bdce265177f158a62a171605172ecc6a7cf9765eb9e225be8fd SHA512 53811b9e665a81d26d0382e33a09a94a4f027653b7c2003f58607957857d53351fb2d7b37a4f943d92f6d83832db32b72be0bbdd82b7fb3cbea064312e790137
 MISC metadata.xml 618 BLAKE2B 5f7dbfdb8a940a534ed97b4bd47b05a271d6454b0584ac29db1c2fb533044a2c6d48b8425399866abd8d2ebea1f41199ea4cf23af1c6f2646d4c35b5b4c104a4 SHA512 df1b817bbabc6b227c9a779677d345b9df259444b943b1ab58d55c860cd79ad8f9d4b382dc6c4de0c5daa955fd694990217a559e897a3b11f7e954c7b54d4678
diff --git a/sys-cluster/charliecloud/charliecloud-0.25.ebuild b/sys-cluster/charliecloud/charliecloud-0.27.ebuild
index f54e49ec426d..e3f49d23c4f0 100644
--- a/sys-cluster/charliecloud/charliecloud-0.25.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.27.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8,9,10} )
 
@@ -48,10 +48,6 @@ DEPEND="
 		net-misc/rsync
 	)"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.24-musl-argp.patch
-)
-
 src_prepare() {
 	default
 	eautoreconf
@@ -65,11 +61,13 @@ src_configure() {
 		# Libdir is used as a libexec-style destination.
 		--libdir="${EPREFIX}"/usr/lib
 		# Attempts to call python-exec directly otherwise.
-		--with-sphinx-python=${PYTHON}
+		--with-sphinx-python="${PYTHON}"
 		# This disables -Werror, see also: https://github.com/hpc/charliecloud/pull/808
 		--enable-buggy-build
 		# Do not use bundled version of dev-python/lark-parser.
 		--disable-bundled-lark
+		# Use correct shebang.
+		--with-python="${PYTHON}"
 	)
 	econf "${econf_args[@]}"
 }
diff --git a/sys-cluster/charliecloud/charliecloud-9999.ebuild b/sys-cluster/charliecloud/charliecloud-9999.ebuild
index 14f8aa4a1aa5..e3f49d23c4f0 100644
--- a/sys-cluster/charliecloud/charliecloud-9999.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8,9,10} )
 
@@ -61,13 +61,13 @@ src_configure() {
 		# Libdir is used as a libexec-style destination.
 		--libdir="${EPREFIX}"/usr/lib
 		# Attempts to call python-exec directly otherwise.
-		--with-sphinx-python=${PYTHON}
+		--with-sphinx-python="${PYTHON}"
 		# This disables -Werror, see also: https://github.com/hpc/charliecloud/pull/808
 		--enable-buggy-build
 		# Do not use bundled version of dev-python/lark-parser.
 		--disable-bundled-lark
 		# Use correct shebang.
-		--with-python=${PYTHON}
+		--with-python="${PYTHON}"
 	)
 	econf "${econf_args[@]}"
 }
diff --git a/sys-cluster/charliecloud/files/charliecloud-0.24-musl-argp.patch b/sys-cluster/charliecloud/files/charliecloud-0.24-musl-argp.patch
deleted file mode 100644
index 71817111cdcd..000000000000
--- a/sys-cluster/charliecloud/files/charliecloud-0.24-musl-argp.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 1832d5ff905b16435efa64e458e2ca2f656f0ab5 Mon Sep 17 00:00:00 2001
-From: Oliver Freyermuth <o.freyermuth@googlemail.com>
-Date: Sun, 19 Dec 2021 16:30:27 +0100
-Subject: [PATCH] configure: Add musl compatibility (external argp).
-
----
- configure.ac | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 687d4d4..9f708cf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -109,6 +109,26 @@ AC_CHECK_LIB([rt], [shm_open], [LIBRT=-lrt], [
- ])
- AC_SUBST([LIBRT])
- 
-+# argp_parse, needed externally from libargp / argp_standalone e.g. with musl.
-+# First, check if available in used libc out of the box.
-+AC_LINK_IFELSE(
-+  [AC_LANG_PROGRAM(
-+    [#include <argp.h>],
-+    [int argc=1; char **argv=NULL; argp_parse(0,argc,argv,0,0,0); return 0;]
-+  )],
-+  [libc_provides_argp="true"],
-+  [libc_provides_argp="false"]
-+)
-+# If libc doesn't provide argp, test for libargp
-+if test "$libc_provides_argp" = "false" ; then
-+  AC_MSG_WARN("libc does not provide argp")
-+  AC_CHECK_LIB([argp], [argp_parse], [have_largp="true"], [have_largp="false"])
-+  if test "$have_largp" = "false"; then
-+    AC_MSG_ERROR([*** argp functions not found - install libargp or argp_standalone])
-+  else
-+    CH_RUN_LIBS="-largp $CH_RUN_LIBS"
-+  fi
-+fi
- 
- ## Options
- 
--- 
-2.32.0
-
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 7268369b29dd..6f2b565feb84 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -8,7 +8,7 @@ DIST glusterfs-10.1.tar.gz 8273640 BLAKE2B a29eb83fbc3a65e5f5a1db3694e6f46519973
 DIST glusterfs-8.6.tar.gz 7826147 BLAKE2B 3a8a488c9a8e4b1daf3ed01fa5e52a62cf791349c1169aaf8609252bfb8bc0a0534f9fc23fac27cfab11ac6fb5e3e1d9588b4ec8080b02cf97e679bf2c8fb5c2 SHA512 bb1125e5d6b4d424234bc40786847f217e7a05cecad1462dd91248cf9559569914f04e1f909e829051cb1db4079ecf906440a38af9de2bbf3bcf53ca8fa1f349
 DIST glusterfs-9.4.tar.gz 8173625 BLAKE2B c35c63696717bf09f8fbf77dca16a6f45de278253e768c6ffc40c0c097da9ea1b32888233da412a5333281995e89e08d9ed23fd47aba7c506de84b08f9f80cea SHA512 2a17197bd2b425117e34af004a6177b7c5012807cd99b9c6d37a1081e0ab9def6b013bedd0ba4122d149969755e0e2985bef8aed9cf612a27a6452b8719a33bf
 DIST glusterfs-9.5.tar.gz 8174643 BLAKE2B d7527b7749b753768bde086e88e146564b461f835bb9108ce24da9626d7d87e7e4da1b2a340c6497da2d8bafe0cd43e87c01d4ba6639635ff96d8788997a8042 SHA512 3483068ba6d72a9c63cc6fcb2dbcb38dd5001564d755cc3a30dbf6402eeab9a7c80759a535be1c5c06eae88b61156a336444c89b12bbecdabf56a87f00328a44
-EBUILD glusterfs-10.1-r1.ebuild 5641 BLAKE2B 29c24ef034e8f76e520b9d84352519cc9c9f93d576f722e78b63a566b7f85632fd12c3242a96dbb5b9c166228d6173fd99adb34fe19dddd9ff17f97b8613e38e SHA512 846caa385cdf1d795ad91dc478944e9dbf24af59f71c15d95db7516819bfa151616fb321f432e683b95c0fe664fd23e248d846f0062838c4ea02e250cd2139d3
+EBUILD glusterfs-10.1-r1.ebuild 5648 BLAKE2B bcde2078a417d5e7437da1f2cf0950be41b8041a1d5c0ad38628e5729f459dda1d26405841e408b3ac0ac84d9507e65b78b69a485dd7a6e6d2ff048fa88b1ee7 SHA512 9582ee4b7f1943a4072fa8655e558431260f7882160a9e90b635dc4dfc30e4ad1f716287a9590ef368b121bda60573f882dff14e9abda0583358ba77ecd42ed4
 EBUILD glusterfs-8.6-r1.ebuild 5549 BLAKE2B b23f1ed817da27181bbe1d046446e1d608c177c0ad2f6a5f0b919d6b43f797aaa8ea53ec6327f60b60742ac8ff7e2027ef6d610136c107bf0a9282fb096933ab SHA512 0afb60317c4690aa7ae157619ec11c29b78d8d5e3b98f90e3feb519635b60b679dc391f37e128efb0f658b33aa17a16d4b3a2afd232119b176ef52e4d5051455
 EBUILD glusterfs-9.4-r1.ebuild 5571 BLAKE2B a2f69784255800f464e14f014a1316a128de51f03439a8ca68924d9c8320cb29a9f24fb97cb9727a858a235d2d9cecfed849692fde5813932b6506146b607698 SHA512 06bb48816431216637dcffb2bcf1c4ad783043b0b96b0060253c89f173ac1bba92beb4615c27c8f014ab30c74ad7399b24c9132591f2134891df30c41356674f
 EBUILD glusterfs-9.5-r1.ebuild 5574 BLAKE2B 0ad30d35d4bf908983e7070e0ae73c3499705a4465ebd4c416aab4416031eca82fe15dcca8b5aad6350dcf42d276f326987109b970d044708b8b352b1b1c2e35 SHA512 9cf9dd83174eb28b6ef1f56deebf5305c48bae8f86267dba73b9bbeb091273ec85abc2d83f4dd3623eedc5676c2f2f1de46cca1fa289227a0d16589fbd98d799
diff --git a/sys-cluster/glusterfs/glusterfs-10.1-r1.ebuild b/sys-cluster/glusterfs/glusterfs-10.1-r1.ebuild
index a969fc3c5a82..4dc7d85c5f57 100644
--- a/sys-cluster/glusterfs/glusterfs-10.1-r1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-10.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.
 
 LICENSE="|| ( GPL-2 LGPL-3+ )"
 SLOT="0/${PV%%.*}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
 
 IUSE="debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs tcmalloc test +xml"
 
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index 5a8535fddfcf..5e0ee3ad345b 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -1,16 +1,10 @@
 AUX kube-apiserver.confd 116 BLAKE2B 2cf2dff516674ba4dc0763985a070b75e23f9af51e7334eedcb2593855e7481d5969ed458d322ac29de0e9a9c7f9f041911ee7aeca750ff77ce04fd60bf3a3d3 SHA512 302b2a7ec715967c0aa7d1c177d4e55b26e37ebba8d04dd37ecf627d20042fe91cd7e6192ff9d71422129b0ea54a9eec6046f505af550548bd450998924f37ee
 AUX kube-apiserver.initd 541 BLAKE2B ddddc86735a9f90a0c232f2631ac21c028045783c737d041a808fb5012522844614a40059524c472b9b50fd077253b75e2bcf33d69518d71428fcb7e27143fba SHA512 2863ad6d1d238b5e9557874cd3f5413108ed9424604cf026e2fd8c2fd66ba867ca9a3d98f67fdac54f335bacddf0479547b28f71aaa1db6580beff49290de110
 AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511a4623f85f01830c5e40d4ad4e44fe0b3f90d4143042d82bd83b0a2b11517e89037755ef2ad7afeeb23401bb60 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e
-DIST kubernetes-1.21.10.tar.gz 36173594 BLAKE2B 0fb18498a706b9ef9e641ea3e1c2496b7d206a4e0d97fbedc5a2847672cf13b5905604f42f38bd39912cb30f094408fe78de1b791282e16069c51440955b4c06 SHA512 c3876e34a86b6421e92d20ded25e303e7034999bbb7382bfdec6aa9c2139203d5be1eac66b46d11fa5271104d988a6bd7536dc9a6fcd3923667927aac0b99712
 DIST kubernetes-1.21.11.tar.gz 36183641 BLAKE2B 81683c0f3d9d36aa21fb0bd8d771019af621947c772a9121b453c0c836e991f0812ef4bb0296db7fd0fab0794bbc9af9dbd4801b44d3f6422fa908da03b7de8b SHA512 9b8c92f277c2621015fab67832b8d89a9b2c0227a5ca884a58b959de717af9a3c601acaa6522d758673a628943b93ae23b8a95819b5daf4e0419509ec99408a6
-DIST kubernetes-1.22.7.tar.gz 36046015 BLAKE2B 6c96f9fad5a395eb3540533dc9145597d520a9a1040a2ef9892589de4249d0cc4d946fdb668f0f7829fafdc8453ad2e6cdbe3ef341a1fe34a001873350b0c064 SHA512 83b6a574fa1593f2796da108e01f5938726f34afe5a792e864fe19abd5eee2565456fa8e0e8d4298d912fd8b3d7821a0694e91a626a5fae1dcc010e04cff0302
 DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a
-DIST kubernetes-1.23.4.tar.gz 38190117 BLAKE2B f68cdc9a428f80606d004cda4ded8eafa1a99974207bec3888efcf077970b1fb5768cfd4a0b572de06891a0754ad6253bf3ec4c9bc12488888b82af193775089 SHA512 1dfb165676c6220671248837a46bc714efa438253291a38726062a755a4e9e4993d5787c0253ca0930b3886c849c89dca2f39dad8cbaaa9c53453b30042c9d98
 DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2
-EBUILD kube-apiserver-1.21.10.ebuild 1016 BLAKE2B 33a61cde7d8b70c868711c034d5d69af002f25cd3ff80b6ba12708618b8e0aa8fda2351d58b157e9ea68182c7932943bdac6d387c414551d9e799abc4abad8f8 SHA512 548b0b55ca6b094704e6f6b9a73ef6d5d0af8b9b03b2ed9f9ed692284e867439d1da6f9e412d11163d32ed58f99bdf57fa265e6791831cea8519bee46bb353a1
 EBUILD kube-apiserver-1.21.11.ebuild 1016 BLAKE2B 33a61cde7d8b70c868711c034d5d69af002f25cd3ff80b6ba12708618b8e0aa8fda2351d58b157e9ea68182c7932943bdac6d387c414551d9e799abc4abad8f8 SHA512 548b0b55ca6b094704e6f6b9a73ef6d5d0af8b9b03b2ed9f9ed692284e867439d1da6f9e412d11163d32ed58f99bdf57fa265e6791831cea8519bee46bb353a1
-EBUILD kube-apiserver-1.22.7.ebuild 1016 BLAKE2B 33a61cde7d8b70c868711c034d5d69af002f25cd3ff80b6ba12708618b8e0aa8fda2351d58b157e9ea68182c7932943bdac6d387c414551d9e799abc4abad8f8 SHA512 548b0b55ca6b094704e6f6b9a73ef6d5d0af8b9b03b2ed9f9ed692284e867439d1da6f9e412d11163d32ed58f99bdf57fa265e6791831cea8519bee46bb353a1
 EBUILD kube-apiserver-1.22.8.ebuild 1016 BLAKE2B 33a61cde7d8b70c868711c034d5d69af002f25cd3ff80b6ba12708618b8e0aa8fda2351d58b157e9ea68182c7932943bdac6d387c414551d9e799abc4abad8f8 SHA512 548b0b55ca6b094704e6f6b9a73ef6d5d0af8b9b03b2ed9f9ed692284e867439d1da6f9e412d11163d32ed58f99bdf57fa265e6791831cea8519bee46bb353a1
-EBUILD kube-apiserver-1.23.4.ebuild 1016 BLAKE2B 43a0086dbd06540f263b4cfcfdfeb1a778d4c6804919d7b9f2b016cee92dd44a63b55bb50df9dfe24ab48a3c9989275045f69b755618a51b4fcbb4cbbf02906a SHA512 7b198365e77ab9f1c70848871c932539fc90b10e74bbbcf87ddaa535f5e7e5a04b057e8e7761166bc106beaa49cd33bdcbd170e9b2413f120eb4a755a6416316
 EBUILD kube-apiserver-1.23.5.ebuild 991 BLAKE2B ee45da98c6c18e3bf3e979863e01c1401596cf21cf3cc79da20e6ccbdf2f7383b409f571f8cf6a245138dcfd481cf361a789284ef62e59bcb20938e1bdb5d148 SHA512 43091fd9e05355a4063d5133917ec5dade31ac326c0c332afae795b88648cdc3c96944305ff25553312a44ecb785361b1893310686a4e16bb82f218404592815
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.21.10.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.21.10.ebuild
deleted file mode 100644
index a43f3c267727..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.21.10.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="
-	acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.22.7.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.22.7.ebuild
deleted file mode 100644
index a43f3c267727..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.22.7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="
-	acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.23.4.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.23.4.ebuild
deleted file mode 100644
index 11b45ed397db..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.23.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2021-2022 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.17"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index ae9280bcb7d7..7ae27f1ebccb 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -1,16 +1,10 @@
 AUX kube-controller-manager.confd 142 BLAKE2B d8d35c62bf5c04cc3f440e8b5fb8acab2cf815b25ac4e91354e3fce756a1955e71ec762fab1091074ef4233fff22667aba50417c0d6a896055f8f52b6630bb4e SHA512 b0227a7431018a6742b3931fda0f14b4a040107ecd6821c84593180919ba8a5af9b99b7a507645a5488792f14accd686acc4cc6f70a5084bbdfcdd494021aafc
 AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544f214921672e60fffa2d6f77dbeb1912b3d1d138f867d8118cef5ae0843b75d3859ebfc71a4defc2b4cf66426a58101 SHA512 7e3baab9b034e7048ed3cda8d09444c76369874cecc0a747fb5484c482fef464adb5ccc25fcb4481fb4aff68415a60462f6cbee2138810316f0cf822637676c1
 AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
-DIST kubernetes-1.21.10.tar.gz 36173594 BLAKE2B 0fb18498a706b9ef9e641ea3e1c2496b7d206a4e0d97fbedc5a2847672cf13b5905604f42f38bd39912cb30f094408fe78de1b791282e16069c51440955b4c06 SHA512 c3876e34a86b6421e92d20ded25e303e7034999bbb7382bfdec6aa9c2139203d5be1eac66b46d11fa5271104d988a6bd7536dc9a6fcd3923667927aac0b99712
 DIST kubernetes-1.21.11.tar.gz 36183641 BLAKE2B 81683c0f3d9d36aa21fb0bd8d771019af621947c772a9121b453c0c836e991f0812ef4bb0296db7fd0fab0794bbc9af9dbd4801b44d3f6422fa908da03b7de8b SHA512 9b8c92f277c2621015fab67832b8d89a9b2c0227a5ca884a58b959de717af9a3c601acaa6522d758673a628943b93ae23b8a95819b5daf4e0419509ec99408a6
-DIST kubernetes-1.22.7.tar.gz 36046015 BLAKE2B 6c96f9fad5a395eb3540533dc9145597d520a9a1040a2ef9892589de4249d0cc4d946fdb668f0f7829fafdc8453ad2e6cdbe3ef341a1fe34a001873350b0c064 SHA512 83b6a574fa1593f2796da108e01f5938726f34afe5a792e864fe19abd5eee2565456fa8e0e8d4298d912fd8b3d7821a0694e91a626a5fae1dcc010e04cff0302
 DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a
-DIST kubernetes-1.23.4.tar.gz 38190117 BLAKE2B f68cdc9a428f80606d004cda4ded8eafa1a99974207bec3888efcf077970b1fb5768cfd4a0b572de06891a0754ad6253bf3ec4c9bc12488888b82af193775089 SHA512 1dfb165676c6220671248837a46bc714efa438253291a38726062a755a4e9e4993d5787c0253ca0930b3886c849c89dca2f39dad8cbaaa9c53453b30042c9d98
 DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2
-EBUILD kube-controller-manager-1.21.10.ebuild 1013 BLAKE2B 124277c370f8b8238311ffecaac5d9f609bb620c9dccf9d929ec6b23c335b31d501b9e9f9db602a75d96fa330e8e9e6350cacb4125934146e6da7482911f34c5 SHA512 e2efacfeb452585f6d469aacee9bbe958cee567e437a7a6a438a7805dd46279089354cece61495241e4f75d0b02edd6cc425a12a24e533d784030ae6dca34cee
 EBUILD kube-controller-manager-1.21.11.ebuild 1013 BLAKE2B 124277c370f8b8238311ffecaac5d9f609bb620c9dccf9d929ec6b23c335b31d501b9e9f9db602a75d96fa330e8e9e6350cacb4125934146e6da7482911f34c5 SHA512 e2efacfeb452585f6d469aacee9bbe958cee567e437a7a6a438a7805dd46279089354cece61495241e4f75d0b02edd6cc425a12a24e533d784030ae6dca34cee
-EBUILD kube-controller-manager-1.22.7.ebuild 1013 BLAKE2B 124277c370f8b8238311ffecaac5d9f609bb620c9dccf9d929ec6b23c335b31d501b9e9f9db602a75d96fa330e8e9e6350cacb4125934146e6da7482911f34c5 SHA512 e2efacfeb452585f6d469aacee9bbe958cee567e437a7a6a438a7805dd46279089354cece61495241e4f75d0b02edd6cc425a12a24e533d784030ae6dca34cee
 EBUILD kube-controller-manager-1.22.8.ebuild 1013 BLAKE2B 124277c370f8b8238311ffecaac5d9f609bb620c9dccf9d929ec6b23c335b31d501b9e9f9db602a75d96fa330e8e9e6350cacb4125934146e6da7482911f34c5 SHA512 e2efacfeb452585f6d469aacee9bbe958cee567e437a7a6a438a7805dd46279089354cece61495241e4f75d0b02edd6cc425a12a24e533d784030ae6dca34cee
-EBUILD kube-controller-manager-1.23.4.ebuild 1013 BLAKE2B 5ecc062517fca3fba440598e41a520dd512c88334ad4792288794e6dcadf01f05a35fc1510f2b019a370662f79fa19f181b55c14edc1d21617197e1afee2654a SHA512 20b69bab264290accafcb7be39d9399ab6d88a37b7d66c8d0a68b99aec73edfcdcfd1e1f5fe976be29e8f768f9a08e9fdf592284e72c9e2d7fb1adbcdcb1b10c
 EBUILD kube-controller-manager-1.23.5.ebuild 988 BLAKE2B 87d2477f6f3dcc1b9b44ced1d69e981fbd21e5cb3e44c10848d8c53c393d82312b26cab030e8afc55be8b01af13160c42f28a52751e69b70d44dc7d00e4bfe53 SHA512 aa70cb437ed4cebfe426c899a4c80d5426df0ff733e5e633ce1986b8a6fbad3453058f42655f0cd03284837adc8eae7951ccc3cb735c1faa449a63905b6a2477
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.21.10.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.21.10.ebuild
deleted file mode 100644
index 2e2307593ee7..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.21.10.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.22.7.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.22.7.ebuild
deleted file mode 100644
index 2e2307593ee7..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.22.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.23.4.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.23.4.ebuild
deleted file mode 100644
index 032808da4431..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.23.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 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.17"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index bbd2aa4550e2..9dc6d497a3b5 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -1,16 +1,10 @@
 AUX kube-proxy.confd 53 BLAKE2B 0cd5fc844dc21f63786ef21d972210ac02ea55165b05cef8810268f894e3466cea4d82c7882e56d6a0bf425311adbf6a55e3e3fe351b9a1a7ce1d9e1e087018b SHA512 4c8c34ae8668bcfa5167c2d2af006fc46b461a5dafb3ec5b64cb8cdf2a830c22ddb5cf806c93b1404f60dabf91b4153724947fa2d2c494376f20e637eeed5018
 AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe464d672d00ecf5b5fffd349a6affcd8ae3ea0ba06160be72f31cfa2d918c01050e83640fb9956917dc0 SHA512 088d91cd77e614f7857d65496f5b6d486741a8e3358b3e13bcd4203d35a76fa3aa390f658065e2826145525b6e83fcd33f8365a873e99b522f3ab7e8615ed364
 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
-DIST kubernetes-1.21.10.tar.gz 36173594 BLAKE2B 0fb18498a706b9ef9e641ea3e1c2496b7d206a4e0d97fbedc5a2847672cf13b5905604f42f38bd39912cb30f094408fe78de1b791282e16069c51440955b4c06 SHA512 c3876e34a86b6421e92d20ded25e303e7034999bbb7382bfdec6aa9c2139203d5be1eac66b46d11fa5271104d988a6bd7536dc9a6fcd3923667927aac0b99712
 DIST kubernetes-1.21.11.tar.gz 36183641 BLAKE2B 81683c0f3d9d36aa21fb0bd8d771019af621947c772a9121b453c0c836e991f0812ef4bb0296db7fd0fab0794bbc9af9dbd4801b44d3f6422fa908da03b7de8b SHA512 9b8c92f277c2621015fab67832b8d89a9b2c0227a5ca884a58b959de717af9a3c601acaa6522d758673a628943b93ae23b8a95819b5daf4e0419509ec99408a6
-DIST kubernetes-1.22.7.tar.gz 36046015 BLAKE2B 6c96f9fad5a395eb3540533dc9145597d520a9a1040a2ef9892589de4249d0cc4d946fdb668f0f7829fafdc8453ad2e6cdbe3ef341a1fe34a001873350b0c064 SHA512 83b6a574fa1593f2796da108e01f5938726f34afe5a792e864fe19abd5eee2565456fa8e0e8d4298d912fd8b3d7821a0694e91a626a5fae1dcc010e04cff0302
 DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a
-DIST kubernetes-1.23.4.tar.gz 38190117 BLAKE2B f68cdc9a428f80606d004cda4ded8eafa1a99974207bec3888efcf077970b1fb5768cfd4a0b572de06891a0754ad6253bf3ec4c9bc12488888b82af193775089 SHA512 1dfb165676c6220671248837a46bc714efa438253291a38726062a755a4e9e4993d5787c0253ca0930b3886c849c89dca2f39dad8cbaaa9c53453b30042c9d98
 DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2
-EBUILD kube-proxy-1.21.10.ebuild 928 BLAKE2B c4a2ec947e91a35d0be81b534664205feb724cdede78fe09b8b30b8d024823b2544503adf2ff63772e25634fd2a859477039d7e9c7ebbc791a505f520aaa7f5b SHA512 57e22150df4378f562c852ec6db401467c94aa4cc953534fae8383919b4c4872952047e4461c3916adab8dd9490a54184fd2dad5defca262b351463ec5e46a13
 EBUILD kube-proxy-1.21.11.ebuild 928 BLAKE2B c4a2ec947e91a35d0be81b534664205feb724cdede78fe09b8b30b8d024823b2544503adf2ff63772e25634fd2a859477039d7e9c7ebbc791a505f520aaa7f5b SHA512 57e22150df4378f562c852ec6db401467c94aa4cc953534fae8383919b4c4872952047e4461c3916adab8dd9490a54184fd2dad5defca262b351463ec5e46a13
-EBUILD kube-proxy-1.22.7.ebuild 928 BLAKE2B c4a2ec947e91a35d0be81b534664205feb724cdede78fe09b8b30b8d024823b2544503adf2ff63772e25634fd2a859477039d7e9c7ebbc791a505f520aaa7f5b SHA512 57e22150df4378f562c852ec6db401467c94aa4cc953534fae8383919b4c4872952047e4461c3916adab8dd9490a54184fd2dad5defca262b351463ec5e46a13
 EBUILD kube-proxy-1.22.8.ebuild 928 BLAKE2B c4a2ec947e91a35d0be81b534664205feb724cdede78fe09b8b30b8d024823b2544503adf2ff63772e25634fd2a859477039d7e9c7ebbc791a505f520aaa7f5b SHA512 57e22150df4378f562c852ec6db401467c94aa4cc953534fae8383919b4c4872952047e4461c3916adab8dd9490a54184fd2dad5defca262b351463ec5e46a13
-EBUILD kube-proxy-1.23.4.ebuild 928 BLAKE2B abd18816abb0cdad0a15567483ac7837174016982419368c450379360dfc9b81f6e0e402ff8cea2678377ee5b428be52a7acb499be4c1915b0604e63d952d057 SHA512 2594a06f0ea70a8d7aa480325db5183d537841b28ab61b42022efef70ba095ff8b295209632847a1632dd66e9203199672738df4b3385e25a830642c7b1fa0f2
 EBUILD kube-proxy-1.23.5.ebuild 903 BLAKE2B 6af6c1be968999dd8b76cd9a7036137d8be4c72c0516ce89f512f13eb3fc2186e34fc74d090fc5d34f285e2ca6f822382b6194ef1e80238ee23c7be1b10f6df9 SHA512 6f3a8e41e2505e752c4a0fbde6a93801db713a500903882f17c4001443a878c61087db361686a89afe529bb43d50e626343cac75c18f5c577b0e12ed582ab12a
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.21.10.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.21.10.ebuild
deleted file mode 100644
index 5cb1f41bbeab..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.21.10.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="net-firewall/conntrack-tools
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.22.7.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.22.7.ebuild
deleted file mode 100644
index 5cb1f41bbeab..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.22.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="net-firewall/conntrack-tools
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.23.4.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.23.4.ebuild
deleted file mode 100644
index 16d282f95217..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.23.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 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.17"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index a9c97a346194..a9df28c47a07 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -1,16 +1,10 @@
 AUX kube-scheduler.confd 133 BLAKE2B 6b88dfc011173f183a88a16d078cbb5d96d46c269129b483d650fd7dd63376e366825f483178c26e931db226478ce9d0b85412fc264d4d600a8232d0bac149e7 SHA512 d7326f34b26aaebf4b5c25a03abcff3bc3d397382ad4fed0f4718ee425e71399febf6fec6dc817813490671692d3f1b454fd5d14d9c47c3d41b0d3405a01a6c2
 AUX kube-scheduler.initd 548 BLAKE2B dd9373f659b87fcf12dca20527aebdb304a60ec559fd9fb9efcd0db8b3c155fdba2ce8a59461cd15ed3b4294cc5b335093e12d2b8411e400927e1307b37bc6d8 SHA512 151ea6f5cc36de9b83f0e5365579e33eea8002f9a03f5f61d195a349236e6baf192f701d3fb591b769aa90e8e1e620d525b20c95a1e8cda58d062971d8f587a3
 AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a28e9a5b02361cf4833982d4489364bd1291faa136df275988f02ce78c7b785c9209a54aec5eea6180b9041da0 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6
-DIST kubernetes-1.21.10.tar.gz 36173594 BLAKE2B 0fb18498a706b9ef9e641ea3e1c2496b7d206a4e0d97fbedc5a2847672cf13b5905604f42f38bd39912cb30f094408fe78de1b791282e16069c51440955b4c06 SHA512 c3876e34a86b6421e92d20ded25e303e7034999bbb7382bfdec6aa9c2139203d5be1eac66b46d11fa5271104d988a6bd7536dc9a6fcd3923667927aac0b99712
 DIST kubernetes-1.21.11.tar.gz 36183641 BLAKE2B 81683c0f3d9d36aa21fb0bd8d771019af621947c772a9121b453c0c836e991f0812ef4bb0296db7fd0fab0794bbc9af9dbd4801b44d3f6422fa908da03b7de8b SHA512 9b8c92f277c2621015fab67832b8d89a9b2c0227a5ca884a58b959de717af9a3c601acaa6522d758673a628943b93ae23b8a95819b5daf4e0419509ec99408a6
-DIST kubernetes-1.22.7.tar.gz 36046015 BLAKE2B 6c96f9fad5a395eb3540533dc9145597d520a9a1040a2ef9892589de4249d0cc4d946fdb668f0f7829fafdc8453ad2e6cdbe3ef341a1fe34a001873350b0c064 SHA512 83b6a574fa1593f2796da108e01f5938726f34afe5a792e864fe19abd5eee2565456fa8e0e8d4298d912fd8b3d7821a0694e91a626a5fae1dcc010e04cff0302
 DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a
-DIST kubernetes-1.23.4.tar.gz 38190117 BLAKE2B f68cdc9a428f80606d004cda4ded8eafa1a99974207bec3888efcf077970b1fb5768cfd4a0b572de06891a0754ad6253bf3ec4c9bc12488888b82af193775089 SHA512 1dfb165676c6220671248837a46bc714efa438253291a38726062a755a4e9e4993d5787c0253ca0930b3886c849c89dca2f39dad8cbaaa9c53453b30042c9d98
 DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2
-EBUILD kube-scheduler-1.21.10.ebuild 986 BLAKE2B a4f7a53e19faa830536c7463c384db1ffde30248eee4ca26dfcde1bc6a82278159b6c5e830a885785d845ec429d83b8baaeef7097e9ff1501d99c5a72676cd52 SHA512 fb3775804affa077c9ed82f34169c25113bb9511708afdd3baf6a71aa801682c57833ddb5778603349f5b7f07d6fd0e655e8a8a7b57699fec9c40656d1423bca
 EBUILD kube-scheduler-1.21.11.ebuild 986 BLAKE2B a4f7a53e19faa830536c7463c384db1ffde30248eee4ca26dfcde1bc6a82278159b6c5e830a885785d845ec429d83b8baaeef7097e9ff1501d99c5a72676cd52 SHA512 fb3775804affa077c9ed82f34169c25113bb9511708afdd3baf6a71aa801682c57833ddb5778603349f5b7f07d6fd0e655e8a8a7b57699fec9c40656d1423bca
-EBUILD kube-scheduler-1.22.7.ebuild 986 BLAKE2B a4f7a53e19faa830536c7463c384db1ffde30248eee4ca26dfcde1bc6a82278159b6c5e830a885785d845ec429d83b8baaeef7097e9ff1501d99c5a72676cd52 SHA512 fb3775804affa077c9ed82f34169c25113bb9511708afdd3baf6a71aa801682c57833ddb5778603349f5b7f07d6fd0e655e8a8a7b57699fec9c40656d1423bca
 EBUILD kube-scheduler-1.22.8.ebuild 986 BLAKE2B a4f7a53e19faa830536c7463c384db1ffde30248eee4ca26dfcde1bc6a82278159b6c5e830a885785d845ec429d83b8baaeef7097e9ff1501d99c5a72676cd52 SHA512 fb3775804affa077c9ed82f34169c25113bb9511708afdd3baf6a71aa801682c57833ddb5778603349f5b7f07d6fd0e655e8a8a7b57699fec9c40656d1423bca
-EBUILD kube-scheduler-1.23.4.ebuild 986 BLAKE2B 74ce053a3a4fa3f66acd43d150ff55b55752292c5d707922aaad8e73e062f140686f99a7c14c6b92458dc74ceb51dbd781c243d158e1f1b147aebb440aba1eab SHA512 7d44ead07e56088640288e1c2c6f8f159e042114fb60c49f919390c29457cc607ef4cc97d1f7c839ebb55ef6244b61d06851c51ff7ef5c72bd26e5b21113d27c
 EBUILD kube-scheduler-1.23.5.ebuild 961 BLAKE2B 833f5fcd8ed332afd7e503ac7fde09828ce18565ebf9c98d43356790bf79d985d6f6de1d682e371cceca717a593a10bc85e266c141ea20725cb57f6c6e34b26f SHA512 6d9ad34d6bb8a1a3a3a88576ef3ffa6129317ce5f9ad3bf7a9574414d3ace6a207f92324387f8fd9a1506a15cdeae09d5a2d30c9138a0fcc555d70513c6da120
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.21.10.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.21.10.ebuild
deleted file mode 100644
index 992ec024d537..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.21.10.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.22.7.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.22.7.ebuild
deleted file mode 100644
index 992ec024d537..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.22.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.23.4.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.23.4.ebuild
deleted file mode 100644
index 9987d1dc17a8..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.23.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 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.17"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index 71f227dce682..2a6c34184d5b 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -1,13 +1,7 @@
-DIST kubernetes-1.21.10.tar.gz 36173594 BLAKE2B 0fb18498a706b9ef9e641ea3e1c2496b7d206a4e0d97fbedc5a2847672cf13b5905604f42f38bd39912cb30f094408fe78de1b791282e16069c51440955b4c06 SHA512 c3876e34a86b6421e92d20ded25e303e7034999bbb7382bfdec6aa9c2139203d5be1eac66b46d11fa5271104d988a6bd7536dc9a6fcd3923667927aac0b99712
 DIST kubernetes-1.21.11.tar.gz 36183641 BLAKE2B 81683c0f3d9d36aa21fb0bd8d771019af621947c772a9121b453c0c836e991f0812ef4bb0296db7fd0fab0794bbc9af9dbd4801b44d3f6422fa908da03b7de8b SHA512 9b8c92f277c2621015fab67832b8d89a9b2c0227a5ca884a58b959de717af9a3c601acaa6522d758673a628943b93ae23b8a95819b5daf4e0419509ec99408a6
-DIST kubernetes-1.22.7.tar.gz 36046015 BLAKE2B 6c96f9fad5a395eb3540533dc9145597d520a9a1040a2ef9892589de4249d0cc4d946fdb668f0f7829fafdc8453ad2e6cdbe3ef341a1fe34a001873350b0c064 SHA512 83b6a574fa1593f2796da108e01f5938726f34afe5a792e864fe19abd5eee2565456fa8e0e8d4298d912fd8b3d7821a0694e91a626a5fae1dcc010e04cff0302
 DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a
-DIST kubernetes-1.23.4.tar.gz 38190117 BLAKE2B f68cdc9a428f80606d004cda4ded8eafa1a99974207bec3888efcf077970b1fb5768cfd4a0b572de06891a0754ad6253bf3ec4c9bc12488888b82af193775089 SHA512 1dfb165676c6220671248837a46bc714efa438253291a38726062a755a4e9e4993d5787c0253ca0930b3886c849c89dca2f39dad8cbaaa9c53453b30042c9d98
 DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2
-EBUILD kubeadm-1.21.10.ebuild 911 BLAKE2B 8d528e3a92f11884298862fa90dbc02621635d0e0677af3ff9e63c78b67564d34b99b5a6017f57cec32e8bc09e99996781b3a355dfb8a410562fe53d8c8472a0 SHA512 75a830c95e052946772ee92ea4bd11bb677ba5add4f1342dbbac0c7bef0d51167dc3e32f85dc94463b24835350d4475ce253b47f3087b5c3c7e6de1c1008fbda
 EBUILD kubeadm-1.21.11.ebuild 911 BLAKE2B 8d528e3a92f11884298862fa90dbc02621635d0e0677af3ff9e63c78b67564d34b99b5a6017f57cec32e8bc09e99996781b3a355dfb8a410562fe53d8c8472a0 SHA512 75a830c95e052946772ee92ea4bd11bb677ba5add4f1342dbbac0c7bef0d51167dc3e32f85dc94463b24835350d4475ce253b47f3087b5c3c7e6de1c1008fbda
-EBUILD kubeadm-1.22.7.ebuild 911 BLAKE2B 8d528e3a92f11884298862fa90dbc02621635d0e0677af3ff9e63c78b67564d34b99b5a6017f57cec32e8bc09e99996781b3a355dfb8a410562fe53d8c8472a0 SHA512 75a830c95e052946772ee92ea4bd11bb677ba5add4f1342dbbac0c7bef0d51167dc3e32f85dc94463b24835350d4475ce253b47f3087b5c3c7e6de1c1008fbda
 EBUILD kubeadm-1.22.8.ebuild 911 BLAKE2B 8d528e3a92f11884298862fa90dbc02621635d0e0677af3ff9e63c78b67564d34b99b5a6017f57cec32e8bc09e99996781b3a355dfb8a410562fe53d8c8472a0 SHA512 75a830c95e052946772ee92ea4bd11bb677ba5add4f1342dbbac0c7bef0d51167dc3e32f85dc94463b24835350d4475ce253b47f3087b5c3c7e6de1c1008fbda
-EBUILD kubeadm-1.23.4.ebuild 911 BLAKE2B b2feeed1fbe35efc9e7cd43db070822d9ef663d649fb0c9aaf8b1e7e8ba8879d473b78e2c32debb748622479d981768ad0893cdb1407a2a1bc235efc9ef028ca SHA512 f9a1aa5ef684387bf3a2fdd76217866acc745630f9ce12c46492d8586dec69fbe99f82f5e1b6a275724a15d56506e1ad577381b6969f149165331409380d8f19
 EBUILD kubeadm-1.23.5.ebuild 877 BLAKE2B 2c27ca601ccb9c9498cc2f3dcbc242e38946275232eaba4cc35d56a0edba48ecb7bdbd36d8de59a76bc36e5854c4f8f46957f2160bf96c41a80be731f104f00d SHA512 d02b2409d74052608b3150db41a3b77e8bf0cebb6398c2a4e51034304b28875ddb22bb7a21a61338bb09cacb930523444e5e25ae941a38ad6fb100cafb94397a
 MISC metadata.xml 918 BLAKE2B 487a711e9aebe9d4d8f2c3a03664990aa544a4c0b969dbb60d10ebf42ca64cb9b21f822f92e774f3a813b409d5df905c8ecf02f186218f925a69f70b2960d53c SHA512 392d1cdf4179bc2aa14598e41e38e364518f0c71c34d61280729ae2cdab37c247112b48fcea58c792f6f7148e3979dfbff174bac3a3a00b7084168332112f5d3
diff --git a/sys-cluster/kubeadm/kubeadm-1.21.10.ebuild b/sys-cluster/kubeadm/kubeadm-1.21.10.ebuild
deleted file mode 100644
index 7ce55220d46f..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.21.10.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.22.7.ebuild b/sys-cluster/kubeadm/kubeadm-1.22.7.ebuild
deleted file mode 100644
index 7ce55220d46f..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.22.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.23.4.ebuild b/sys-cluster/kubeadm/kubeadm-1.23.4.ebuild
deleted file mode 100644
index be9347c86f73..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.23.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2022 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.17"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index 241b1dac945c..9c055f1aeb77 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,13 +1,7 @@
-DIST kubernetes-1.21.10.tar.gz 36173594 BLAKE2B 0fb18498a706b9ef9e641ea3e1c2496b7d206a4e0d97fbedc5a2847672cf13b5905604f42f38bd39912cb30f094408fe78de1b791282e16069c51440955b4c06 SHA512 c3876e34a86b6421e92d20ded25e303e7034999bbb7382bfdec6aa9c2139203d5be1eac66b46d11fa5271104d988a6bd7536dc9a6fcd3923667927aac0b99712
 DIST kubernetes-1.21.11.tar.gz 36183641 BLAKE2B 81683c0f3d9d36aa21fb0bd8d771019af621947c772a9121b453c0c836e991f0812ef4bb0296db7fd0fab0794bbc9af9dbd4801b44d3f6422fa908da03b7de8b SHA512 9b8c92f277c2621015fab67832b8d89a9b2c0227a5ca884a58b959de717af9a3c601acaa6522d758673a628943b93ae23b8a95819b5daf4e0419509ec99408a6
-DIST kubernetes-1.22.7.tar.gz 36046015 BLAKE2B 6c96f9fad5a395eb3540533dc9145597d520a9a1040a2ef9892589de4249d0cc4d946fdb668f0f7829fafdc8453ad2e6cdbe3ef341a1fe34a001873350b0c064 SHA512 83b6a574fa1593f2796da108e01f5938726f34afe5a792e864fe19abd5eee2565456fa8e0e8d4298d912fd8b3d7821a0694e91a626a5fae1dcc010e04cff0302
 DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a
-DIST kubernetes-1.23.4.tar.gz 38190117 BLAKE2B f68cdc9a428f80606d004cda4ded8eafa1a99974207bec3888efcf077970b1fb5768cfd4a0b572de06891a0754ad6253bf3ec4c9bc12488888b82af193775089 SHA512 1dfb165676c6220671248837a46bc714efa438253291a38726062a755a4e9e4993d5787c0253ca0930b3886c849c89dca2f39dad8cbaaa9c53453b30042c9d98
 DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2
-EBUILD kubectl-1.21.10.ebuild 906 BLAKE2B fb1ae356bd2e4248ab3d3ba494a19dde26f915ed3086ce06eac4b3d1d2eb84a98098d6032d6b9ab9c027d94e288e9f3603163245d36df30671592131a4050c84 SHA512 6cab06510917581df5bde6c2eb9c46f411be9f0954c7be57ad1d63798777fba55d473a702b12a0e2214d35ed7318255c6e6dd27ce80ebfdbd57dcea3954a7516
 EBUILD kubectl-1.21.11.ebuild 906 BLAKE2B fb1ae356bd2e4248ab3d3ba494a19dde26f915ed3086ce06eac4b3d1d2eb84a98098d6032d6b9ab9c027d94e288e9f3603163245d36df30671592131a4050c84 SHA512 6cab06510917581df5bde6c2eb9c46f411be9f0954c7be57ad1d63798777fba55d473a702b12a0e2214d35ed7318255c6e6dd27ce80ebfdbd57dcea3954a7516
-EBUILD kubectl-1.22.7.ebuild 906 BLAKE2B fb1ae356bd2e4248ab3d3ba494a19dde26f915ed3086ce06eac4b3d1d2eb84a98098d6032d6b9ab9c027d94e288e9f3603163245d36df30671592131a4050c84 SHA512 6cab06510917581df5bde6c2eb9c46f411be9f0954c7be57ad1d63798777fba55d473a702b12a0e2214d35ed7318255c6e6dd27ce80ebfdbd57dcea3954a7516
 EBUILD kubectl-1.22.8.ebuild 906 BLAKE2B fb1ae356bd2e4248ab3d3ba494a19dde26f915ed3086ce06eac4b3d1d2eb84a98098d6032d6b9ab9c027d94e288e9f3603163245d36df30671592131a4050c84 SHA512 6cab06510917581df5bde6c2eb9c46f411be9f0954c7be57ad1d63798777fba55d473a702b12a0e2214d35ed7318255c6e6dd27ce80ebfdbd57dcea3954a7516
-EBUILD kubectl-1.23.4.ebuild 906 BLAKE2B 63fef387b58b2a94bbd8cdf0f860626beee7ecb48190e1c7683be89358f63fa795ba0f50ac17f1e6ab54d3fd2d02be1f8596245eddabba2a3c95d54332caa698 SHA512 34dc35393b48aa96b1b648f25b9e66df9e685c574d20e023ab0a3578ef9890365f1fd250e04b394543f4dd6f2826b5c7cd10738196db9b3df50672d45c66b778
 EBUILD kubectl-1.23.5.ebuild 873 BLAKE2B 92dd69326d788658c1c9d7ce0800f1762459ed06bda11aacbae11fb7e8babfa447f72d30749458630e44f0413d18f5e928799097cfb7585a97ffc52fd4b0f6ac SHA512 bdedaf5eaf161a6ee62aec1a2777d9b2a228b3ba6c2b232f4a1ecd9c11caa9b5b2ff65cf4c8fefc2f1afb146abb13501c42e148c02e44d695a734178aabe99a7
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kubectl/kubectl-1.21.10.ebuild b/sys-cluster/kubectl/kubectl-1.21.10.ebuild
deleted file mode 100644
index 1bc008b30c4a..000000000000
--- a/sys-cluster/kubectl/kubectl-1.21.10.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-DEPEND="!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubectl/kubectl-1.22.7.ebuild b/sys-cluster/kubectl/kubectl-1.22.7.ebuild
deleted file mode 100644
index 1bc008b30c4a..000000000000
--- a/sys-cluster/kubectl/kubectl-1.22.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-DEPEND="!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubectl/kubectl-1.23.4.ebuild b/sys-cluster/kubectl/kubectl-1.23.4.ebuild
deleted file mode 100644
index 9187677535ee..000000000000
--- a/sys-cluster/kubectl/kubectl-1.23.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2022 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.17"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index 73fd3f1370ae..95e91af8b6c5 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -3,16 +3,10 @@ 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.21.10.tar.gz 36173594 BLAKE2B 0fb18498a706b9ef9e641ea3e1c2496b7d206a4e0d97fbedc5a2847672cf13b5905604f42f38bd39912cb30f094408fe78de1b791282e16069c51440955b4c06 SHA512 c3876e34a86b6421e92d20ded25e303e7034999bbb7382bfdec6aa9c2139203d5be1eac66b46d11fa5271104d988a6bd7536dc9a6fcd3923667927aac0b99712
 DIST kubernetes-1.21.11.tar.gz 36183641 BLAKE2B 81683c0f3d9d36aa21fb0bd8d771019af621947c772a9121b453c0c836e991f0812ef4bb0296db7fd0fab0794bbc9af9dbd4801b44d3f6422fa908da03b7de8b SHA512 9b8c92f277c2621015fab67832b8d89a9b2c0227a5ca884a58b959de717af9a3c601acaa6522d758673a628943b93ae23b8a95819b5daf4e0419509ec99408a6
-DIST kubernetes-1.22.7.tar.gz 36046015 BLAKE2B 6c96f9fad5a395eb3540533dc9145597d520a9a1040a2ef9892589de4249d0cc4d946fdb668f0f7829fafdc8453ad2e6cdbe3ef341a1fe34a001873350b0c064 SHA512 83b6a574fa1593f2796da108e01f5938726f34afe5a792e864fe19abd5eee2565456fa8e0e8d4298d912fd8b3d7821a0694e91a626a5fae1dcc010e04cff0302
 DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a
-DIST kubernetes-1.23.4.tar.gz 38190117 BLAKE2B f68cdc9a428f80606d004cda4ded8eafa1a99974207bec3888efcf077970b1fb5768cfd4a0b572de06891a0754ad6253bf3ec4c9bc12488888b82af193775089 SHA512 1dfb165676c6220671248837a46bc714efa438253291a38726062a755a4e9e4993d5787c0253ca0930b3886c849c89dca2f39dad8cbaaa9c53453b30042c9d98
 DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2
-EBUILD kubelet-1.21.10.ebuild 1003 BLAKE2B f7d967573c1558befc261e742472a7bf2d8ffb2279bf90bae5ef1316990abe0f5a542160ab06db9e195e0039e85b78b198163dcab5c393126df97262e5a81094 SHA512 03093d1134618415982e162a88452487654681be9f8be3312b3935d9f6b7efa2aa8cef3240367a9371b2f6b21fe4bdc8f0327e97ee655dc6bb5ffc84113777e0
 EBUILD kubelet-1.21.11.ebuild 1003 BLAKE2B f7d967573c1558befc261e742472a7bf2d8ffb2279bf90bae5ef1316990abe0f5a542160ab06db9e195e0039e85b78b198163dcab5c393126df97262e5a81094 SHA512 03093d1134618415982e162a88452487654681be9f8be3312b3935d9f6b7efa2aa8cef3240367a9371b2f6b21fe4bdc8f0327e97ee655dc6bb5ffc84113777e0
-EBUILD kubelet-1.22.7.ebuild 1003 BLAKE2B f7d967573c1558befc261e742472a7bf2d8ffb2279bf90bae5ef1316990abe0f5a542160ab06db9e195e0039e85b78b198163dcab5c393126df97262e5a81094 SHA512 03093d1134618415982e162a88452487654681be9f8be3312b3935d9f6b7efa2aa8cef3240367a9371b2f6b21fe4bdc8f0327e97ee655dc6bb5ffc84113777e0
 EBUILD kubelet-1.22.8.ebuild 1003 BLAKE2B f7d967573c1558befc261e742472a7bf2d8ffb2279bf90bae5ef1316990abe0f5a542160ab06db9e195e0039e85b78b198163dcab5c393126df97262e5a81094 SHA512 03093d1134618415982e162a88452487654681be9f8be3312b3935d9f6b7efa2aa8cef3240367a9371b2f6b21fe4bdc8f0327e97ee655dc6bb5ffc84113777e0
-EBUILD kubelet-1.23.4.ebuild 1003 BLAKE2B 3d374ebcdc4180d49675a220476e10c60e8c19ef079c1f566c2207efc0bd92cb679b850c2f63e2e835972d15176ebf387c30cd025cf92ad55eb94859f77eb683 SHA512 ae8ee1262b71a27276dfbe4064149603e876a16856a58f8d0971d151dbec9504181565840cd283b78a2e43b9efb6b54d5970ac380fcba844c4d577aae124a27f
 EBUILD kubelet-1.23.5.ebuild 969 BLAKE2B 1aa00967d2b13a6607ca139498c8772385c8fae93c086c9128ea1968bb3ad61b40a63831f27718a7fe43eff8d5f52dc8001a5c7301d0146f327918fa05f53d2a SHA512 2a483fe573fa549b7a1886e2757e368b874d602027a7ed844602bad71b64c4ccb9171a74343e1950049d3640bc78f698c6c6063b75b7912927b02e69ca6aa9e6
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kubelet/kubelet-1.21.10.ebuild b/sys-cluster/kubelet/kubelet-1.21.10.ebuild
deleted file mode 100644
index dff62dcd892d..000000000000
--- a/sys-cluster/kubelet/kubelet-1.21.10.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test "
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.22.7.ebuild b/sys-cluster/kubelet/kubelet-1.22.7.ebuild
deleted file mode 100644
index dff62dcd892d..000000000000
--- a/sys-cluster/kubelet/kubelet-1.22.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="!sys-cluster/kubernetes"
-BDEPEND=">=dev-lang/go-1.16"
-
-RESTRICT+=" test "
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.23.4.ebuild b/sys-cluster/kubelet/kubelet-1.23.4.ebuild
deleted file mode 100644
index 07727f428aed..000000000000
--- a/sys-cluster/kubelet/kubelet-1.23.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 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.17"
-
-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/singularity/Manifest b/sys-cluster/singularity/Manifest
index aa58026a2965..8c5c75a07cde 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,5 +1,3 @@
-DIST singularity-3.8.5.tar.gz 7898598 BLAKE2B 3cf76734d6208340d8562f3d3d67f95c507bad3fad6797d82aed39aa39288385ca02d62854f3dddcfc1a1e3056e7485f27e6081c152b853c682ca8e3a587cf3a SHA512 857761f47528a841a3cf11b49583ab7e8a2d137703e1826ff194011abba3334ed06859219e0c457f352304e7b18f1c493a8b337cc5df67981eb428c567d0ac5f
 DIST singularity-3.8.7.tar.gz 8185470 BLAKE2B afa1b0b5b3096e0f3634ce7b61bc19a9d5435a213e241220d2fb19cdb65e93b05e4d8a27db89eeaed6af6b4ab5e09a8914d21a3ff0be88a7c6c8d6245dce9e30 SHA512 5649264c15414b90bab47d1958ec61681fa0b9e37ee445a5059f78f3d822aa27f5b9c5c4f4010d053ec9d03e0215c67e2de8e315f74de7d3cd16b8399f40ee59
-EBUILD singularity-3.8.5.ebuild 1981 BLAKE2B 142b49af9107f82191cdd9f6d30aa5fc91b80b99f7c02a143d4a3034383c3e8267440ffd63e798d858b0d9fc492119af69a92c31a526fd5abe68caa90374c527 SHA512 bbd5b496bced3218e409e056d461bb391fb241c91b4e9d4e428a52ee532cec84e60c26125d263950282ea2214e582765032d6b68f94dbebbde3033eeead65b5e
 EBUILD singularity-3.8.7.ebuild 2011 BLAKE2B b8f0f131d647484544c3d7ff950ea4a92ec028fc8a8480e55998d8be88a7d68d4efb1e72b32c3c663e7dd84ab38decb35a6957b0147817433c5b4014fe61b642 SHA512 c38b55f346d746796b7fc434dbd4387fa35fc15e569c3a86889b1e604cfb433b6ebf9345ea40d094edc73742e3087b281fdb5e8a90deb36569cd5073b71617e7
 MISC metadata.xml 456 BLAKE2B 2fe2e6f15b6998b662296caafe976db4472e553ca93d2de2c3703bbbec545f2ca28c04cd5b794563b79726f34341d57c11e1b46481ccfb3d0d499a68c7ba46d8 SHA512 d3162fb561bee3e34423fa42256cb6247b1a9e398d8c9675939991e88fd3ba02baa5dfab21045dfcab30489cb0509e42637bcbd62a8483b08025904a6c2a8dbd
diff --git a/sys-cluster/singularity/singularity-3.8.5.ebuild b/sys-cluster/singularity/singularity-3.8.5.ebuild
deleted file mode 100644
index 0ecdfaee462b..000000000000
--- a/sys-cluster/singularity/singularity-3.8.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info toolchain-funcs
-
-DESCRIPTION="Application containers for Linux"
-HOMEPAGE="https://github.com/apptainer/singularity"
-SRC_URI="https://github.com/apptainer/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="examples +network +suid"
-
-# Do not complain about CFLAGS etc. since go projects do not use them.
-QA_FLAGS_IGNORED='.*'
-
-COMMON="sys-libs/libseccomp"
-BDEPEND="virtual/pkgconfig"
-DEPEND="${COMMON}
-	>=dev-lang/go-1.16.0
-	app-crypt/gpgme
-	dev-libs/openssl
-	sys-apps/util-linux
-	sys-fs/cryptsetup"
-RDEPEND="${COMMON}
-	sys-fs/squashfs-tools"
-
-CONFIG_CHECK="~SQUASHFS"
-
-src_configure() {
-	local myconfargs=(
-		-c "$(tc-getBUILD_CC)" \
-		-x "$(tc-getBUILD_CXX)" \
-		-C "$(tc-getCC)" \
-		-X "$(tc-getCXX)" \
-		--prefix="${EPREFIX}"/usr \
-		--sysconfdir="${EPREFIX}"/etc \
-		--runstatedir="${EPREFIX}"/run \
-		--localstatedir="${EPREFIX}"/var \
-		$(usex network "" "--without-network") \
-		$(usex suid "" "--without-suid")
-	)
-	./mconfig -v ${myconfargs[@]} || die "Error invoking mconfig"
-}
-
-src_compile() {
-	emake -C builddir
-}
-
-src_install() {
-	emake DESTDIR="${D}" -C builddir install
-	keepdir /var/singularity/mnt/session
-
-	# As of version 3.5.3 this seems to be very much broken, affecting
-	# commands which have got nothing to do with singularity (example:
-	# completion on 'udisks mount -b /dev/' rejects all files from that
-	# directory other than 'autofs'). Moreover, this should go into
-	# $(get_bashcompdir) (from bash-completion-r1.eclass) rather than /etc.
-	# Hopefully temporary, which is why we delete this at install time
-	# instead of patching build scripts not to generate bash-completion
-	# data in the first place.
-	rm -rf "${ED}"/etc/bash_completion.d || die
-
-	dodoc README.md CONTRIBUTORS.md CONTRIBUTING.md
-	if use examples; then
-		dodoc -r examples
-	fi
-}