Adding metadata

71 files changed, 159 insertions, 2510 deletions

diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index 3599ec0959a3..7fedcda4ba13 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -1,11 +1,3 @@
-DIST kubernetes-1.32.10.tar.gz 36387593 BLAKE2B 36d612cb52ad38e884db4195d94ae94e9395f818fba1d27aca2b2d5aa286d100c3f6eb54f3d8a50863f264f197c035b8985f71dff4ff0cd5d006fd5202517f82 SHA512 6d7737d1142af13359eda2d8f17717e4046cddd249b45f7d333c9b7e99330b6f1de36a735f700056161a751c980c625f35f85019ada9c198c4f9a90f8071d2d4
-DIST kubernetes-1.32.11.tar.gz 36398817 BLAKE2B 63103be0387c175e22c877c7edf1f68cbae28cbfade09ddb5a735b9ed27239a0593a10346424dbf4129cc15786236f585d37f52b2459c29f0c332e4f4abe7965 SHA512 a7ff80d340f83f1bc3a0d1666fe931d00ace63417159bbfd683b90d7b1345b1ee5d52967931b7dfa41cf196877b50f00ddde266a2d1f0d9a4f20fdcb974e3d04
-DIST kubernetes-1.32.9.tar.gz 36381108 BLAKE2B a617404aab203cf2b11c1adf1e60fe326f474a74e0caea04dcb001f40b8a0552b5c1411630d379ac5bcb22220833c64bc86f0c1a36e6c16c6b2eb422c0af4bcc SHA512 aad8538f6331b1d3e1bf7d19a8ce15b4bf0cbffc3a71f0bd09fb04e34ad25ddc70186b06f88668dd3f4008a8d4bb3b1421d20e21f029b9be4cffd2c3f64ca22b
-DIST kubernetes-1.33.5.tar.gz 37091266 BLAKE2B e7c2093a1e96fc82156895f40f4f5e13e65def5918f9487ce386c70f3364da1bd43d8322c29e045bfa0d2675797b882fb689ed777e3fc90c1fcd69724b9a9790 SHA512 bd5d3a95b03df672b9371b53bb7410ce1fba7a70be4a647044429828c3eb50ac5267db21bd7ddf1b15aec1476d782d77124be752109b79c283cb513a0ab79359
-DIST kubernetes-1.33.6.tar.gz 37104539 BLAKE2B d4bf3ba1499073fe91a5007e9dfa2bcf282ab799794a17ef67e677321515d4e81628f9cf8a147bd7aa4a2b18b35b47d03902cfbbde148079f2c3daa1e5218ba9 SHA512 d20b142dc41350c6fcc4b84e79f3c0982408de396c2fcfb4a1e34d928f2e334f40ee7ebce37147d4bab6be8d31468c5bf0723433f8ede353a04d2b06f88b1014
-DIST kubernetes-1.33.7.tar.gz 37110661 BLAKE2B 365043c0b83d0c45f8cf254567141662eae62c8e1abbb60f3badf29e9bfff6ce7c0e2f449aba28fe47f0c40a63e74d2c22c78ec586c2cb18cad33517b9abef70 SHA512 720c552292445e52b8d669b740c7000ac4a8e8c420fee014da1b3468569c5f401ccc30f33d14c11dd523ceeb2ce70fd7ce08f87f5cb8c2e731e27208cd9de48e
-DIST kubernetes-1.34.1.tar.gz 38057175 BLAKE2B 3eec25d42d7d89e3a8cbe45c5979ab72441444f55b93c0a72c0c41941feef3254577cdc287748ce0bd5ba4726373635a9a14f2dbaedef18088d70c8fd5cdbfd7 SHA512 97f8bb4cbbd12c1100d62faa2205388ee6b7834778c381bf3d658bc056be43e13cc63fa7df487e5305b3a162439f1ebe06226da1dd824181154d0b8f3b63b764
-DIST kubernetes-1.34.2.tar.gz 38080420 BLAKE2B 4d70f30c91449771620e841db325be01246f3ef94506666549197a373ce2e8d998fadb50596db55e74c2870b6b26cce2a2a1ae0aba95451ad47db91035831e43 SHA512 57de82cc5994a29956b2281f94f79a659b7c7a5e664aa931df403201793a91b8dba9642898e88f5ce2093a182359dc369cd0e44e1e5295dc625dbfa881190633
-DIST kubernetes-1.34.3.tar.gz 38087990 BLAKE2B f9a8ab54f9d76b6d1b7cee119c1d22f8e8387629730407eecec5997de9cc1fe506d7cd9ddc5bb1fdc415474523d55543c1be82b7198967f11b43bc53fc26ec4e SHA512 c1ced5e2b35c4809a0f9aa538cd1daaa0105cc4eb28df0a2cf0c546694573ca7dace8413ce2c9a74e957fd76de71ea2c2e5f0a9eb050e27207e31d7ed1ae42c8
 DIST kubernetes-1.35.0.tar.gz 42076423 BLAKE2B ee0ff9c0a638918cc04ff2b55d2acea124f701b9e474b898e70bd3341333b3bf63750e07692dde0350721c3367e87bd397623b0871d0b577e9a0d8059ebfcfc5 SHA512 7bb55b41f0243bc42cf1fd77302ce780f802021ef89292f55c981261c5ed8774eacbaaf233e71f5f94bec35035eaa725f27e286b6dbba5a0f20da8f88bc061ac
 DIST kubernetes-1.36.1.tar.gz 40596408 BLAKE2B 8316541a245a42be40fff845028e35e7fa5f9103460c0029e1205da8bed4d82d726a5c1b9542348b1822c464e04a18fce24d838cfb29fda4301bb8e60a079e04 SHA512 348d91a1e1068ee55a302ce1224b4d6db3d764d96595cdf0f46b31be4e0c57d8dbd29dd32aa23bbd6436e39dc0326f2a8c89ee660c44b38b3387636717be5422
+DIST kubernetes-1.37.0.tar.gz 45558262 BLAKE2B 7663006f698e8541dd5f812f6f06a3a3e996b8282b82c00fec3262ae3b216b720cfcf9d08fb4465f76eeec9aec7dcb725f676da856a11fb07e5248884e9da17d SHA512 45d529acbd4dea94ef345eca588732f7a7ea71184843d462c385662ad6ffcf2aa6cd1015f57b36e6f1cf7f33b19811be65b29e045ab60e09a908ef78526ea45c
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.32.11.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.32.11.ebuild
deleted file mode 100644
index fefed026d7ec..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.32.11.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2021-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit 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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-RESTRICT="test"
-
-DEPEND="
-	acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-RDEPEND="${DEPEND}"
-BDEPEND=">=dev-lang/go-1.23.3"
-
-QA_PRESTRIPPED=usr/bin/kube-apiserver
-
-src_compile() {
-	FORCE_HOST_GO="yes" emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	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.32.9.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.32.9.ebuild
deleted file mode 100644
index c857e938421e..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.32.9.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2021-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit 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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-RESTRICT="test"
-
-DEPEND="
-	acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-RDEPEND="${DEPEND}"
-BDEPEND=">=dev-lang/go-1.23.3"
-
-QA_PRESTRIPPED=usr/bin/kube-apiserver
-
-src_compile() {
-	FORCE_HOST_GO="yes" emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	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.33.5.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.33.5.ebuild
deleted file mode 100644
index 1fd9441bf4cd..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.33.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2021-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit 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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-RESTRICT="test"
-
-DEPEND="
-	acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-RDEPEND="${DEPEND}"
-BDEPEND=">=dev-lang/go-1.24.0"
-
-QA_PRESTRIPPED=usr/bin/kube-apiserver
-
-src_compile() {
-	FORCE_HOST_GO="yes" emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	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.33.6.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.33.6.ebuild
deleted file mode 100644
index e6a6fec3e4a8..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.33.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2021-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit 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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-RESTRICT="test"
-
-DEPEND="
-	acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-RDEPEND="${DEPEND}"
-BDEPEND=">=dev-lang/go-1.24.0"
-
-QA_PRESTRIPPED=usr/bin/kube-apiserver
-
-src_compile() {
-	FORCE_HOST_GO="yes" emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	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.33.7.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.33.7.ebuild
deleted file mode 100644
index e6a6fec3e4a8..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.33.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2021-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit 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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-RESTRICT="test"
-
-DEPEND="
-	acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-RDEPEND="${DEPEND}"
-BDEPEND=">=dev-lang/go-1.24.0"
-
-QA_PRESTRIPPED=usr/bin/kube-apiserver
-
-src_compile() {
-	FORCE_HOST_GO="yes" emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	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.34.1.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.34.1.ebuild
deleted file mode 100644
index eca3c1c6290a..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.34.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2021-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit 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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-RESTRICT="test"
-
-DEPEND="
-	acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-RDEPEND="${DEPEND}"
-BDEPEND=">=dev-lang/go-1.24.6"
-
-QA_PRESTRIPPED=usr/bin/kube-apiserver
-
-src_compile() {
-	FORCE_HOST_GO="yes" emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	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.34.2.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.34.2.ebuild
deleted file mode 100644
index 6eb88c72e99d..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.34.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2021-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit 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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-RESTRICT="test"
-
-DEPEND="
-	acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-RDEPEND="${DEPEND}"
-BDEPEND=">=dev-lang/go-1.24.6"
-
-QA_PRESTRIPPED=usr/bin/kube-apiserver
-
-src_compile() {
-	FORCE_HOST_GO="yes" emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	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.34.3.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.34.3.ebuild
deleted file mode 100644
index 6eb88c72e99d..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.34.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2021-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit 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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-RESTRICT="test"
-
-DEPEND="
-	acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-RDEPEND="${DEPEND}"
-BDEPEND=">=dev-lang/go-1.24.6"
-
-QA_PRESTRIPPED=usr/bin/kube-apiserver
-
-src_compile() {
-	FORCE_HOST_GO="yes" emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	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.32.10.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.37.0.ebuild
index fefed026d7ec..635e22121b3b 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.32.10.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.37.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit go-module systemd
+inherit go-env go-module shell-completion sysroot systemd
 
 DESCRIPTION="Kubernetes API server"
 HOMEPAGE="https://kubernetes.io"
@@ -21,16 +21,32 @@ DEPEND="
 	acct-group/kube-apiserver
 	acct-user/kube-apiserver"
 RDEPEND="${DEPEND}"
-BDEPEND=">=dev-lang/go-1.23.3"
+BDEPEND=">=dev-lang/go-1.26.0"
 
 QA_PRESTRIPPED=usr/bin/kube-apiserver
 
 src_compile() {
-	FORCE_HOST_GO="yes" emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+	local GOOS=$(go-env_goos)
+
+	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
+		KUBE_BUILD_PLATFORMS="${GOOS}/${GOARCH}" KUBE_${GOOS@U}_${GOARCH@U}_CC="${CC}" \
+		WHAT=cmd/${PN}
+
+	bin=_output/local/bin/${GOOS}/${GOARCH}/${PN}
+
+	einfo "generating shell completion files"
+	sysroot_try_run_prefixed ${bin} completion bash > ${PN}.bash || die
+	sysroot_try_run_prefixed ${bin} completion zsh > ${PN}.zsh || die
+	sysroot_try_run_prefixed ${bin} completion fish > ${PN}.fish || die
 }
 
 src_install() {
-	dobin _output/bin/${PN}
+	dobin ${bin}
+
+	[[ -s ${PN}.bash ]] && newbashcomp ${PN}.bash ${PN}
+	[[ -s ${PN}.zsh ]] && newzshcomp ${PN}.zsh _${PN}
+	[[ -s ${PN}.fish ]] && dofishcomp ${PN}.fish
+
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 	systemd_dounit "${FILESDIR}"/${PN}.service
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index 3599ec0959a3..7fedcda4ba13 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -1,11 +1,3 @@
-DIST kubernetes-1.32.10.tar.gz 36387593 BLAKE2B 36d612cb52ad38e884db4195d94ae94e9395f818fba1d27aca2b2d5aa286d100c3f6eb54f3d8a50863f264f197c035b8985f71dff4ff0cd5d006fd5202517f82 SHA512 6d7737d1142af13359eda2d8f17717e4046cddd249b45f7d333c9b7e99330b6f1de36a735f700056161a751c980c625f35f85019ada9c198c4f9a90f8071d2d4
-DIST kubernetes-1.32.11.tar.gz 36398817 BLAKE2B 63103be0387c175e22c877c7edf1f68cbae28cbfade09ddb5a735b9ed27239a0593a10346424dbf4129cc15786236f585d37f52b2459c29f0c332e4f4abe7965 SHA512 a7ff80d340f83f1bc3a0d1666fe931d00ace63417159bbfd683b90d7b1345b1ee5d52967931b7dfa41cf196877b50f00ddde266a2d1f0d9a4f20fdcb974e3d04
-DIST kubernetes-1.32.9.tar.gz 36381108 BLAKE2B a617404aab203cf2b11c1adf1e60fe326f474a74e0caea04dcb001f40b8a0552b5c1411630d379ac5bcb22220833c64bc86f0c1a36e6c16c6b2eb422c0af4bcc SHA512 aad8538f6331b1d3e1bf7d19a8ce15b4bf0cbffc3a71f0bd09fb04e34ad25ddc70186b06f88668dd3f4008a8d4bb3b1421d20e21f029b9be4cffd2c3f64ca22b
-DIST kubernetes-1.33.5.tar.gz 37091266 BLAKE2B e7c2093a1e96fc82156895f40f4f5e13e65def5918f9487ce386c70f3364da1bd43d8322c29e045bfa0d2675797b882fb689ed777e3fc90c1fcd69724b9a9790 SHA512 bd5d3a95b03df672b9371b53bb7410ce1fba7a70be4a647044429828c3eb50ac5267db21bd7ddf1b15aec1476d782d77124be752109b79c283cb513a0ab79359
-DIST kubernetes-1.33.6.tar.gz 37104539 BLAKE2B d4bf3ba1499073fe91a5007e9dfa2bcf282ab799794a17ef67e677321515d4e81628f9cf8a147bd7aa4a2b18b35b47d03902cfbbde148079f2c3daa1e5218ba9 SHA512 d20b142dc41350c6fcc4b84e79f3c0982408de396c2fcfb4a1e34d928f2e334f40ee7ebce37147d4bab6be8d31468c5bf0723433f8ede353a04d2b06f88b1014
-DIST kubernetes-1.33.7.tar.gz 37110661 BLAKE2B 365043c0b83d0c45f8cf254567141662eae62c8e1abbb60f3badf29e9bfff6ce7c0e2f449aba28fe47f0c40a63e74d2c22c78ec586c2cb18cad33517b9abef70 SHA512 720c552292445e52b8d669b740c7000ac4a8e8c420fee014da1b3468569c5f401ccc30f33d14c11dd523ceeb2ce70fd7ce08f87f5cb8c2e731e27208cd9de48e
-DIST kubernetes-1.34.1.tar.gz 38057175 BLAKE2B 3eec25d42d7d89e3a8cbe45c5979ab72441444f55b93c0a72c0c41941feef3254577cdc287748ce0bd5ba4726373635a9a14f2dbaedef18088d70c8fd5cdbfd7 SHA512 97f8bb4cbbd12c1100d62faa2205388ee6b7834778c381bf3d658bc056be43e13cc63fa7df487e5305b3a162439f1ebe06226da1dd824181154d0b8f3b63b764
-DIST kubernetes-1.34.2.tar.gz 38080420 BLAKE2B 4d70f30c91449771620e841db325be01246f3ef94506666549197a373ce2e8d998fadb50596db55e74c2870b6b26cce2a2a1ae0aba95451ad47db91035831e43 SHA512 57de82cc5994a29956b2281f94f79a659b7c7a5e664aa931df403201793a91b8dba9642898e88f5ce2093a182359dc369cd0e44e1e5295dc625dbfa881190633
-DIST kubernetes-1.34.3.tar.gz 38087990 BLAKE2B f9a8ab54f9d76b6d1b7cee119c1d22f8e8387629730407eecec5997de9cc1fe506d7cd9ddc5bb1fdc415474523d55543c1be82b7198967f11b43bc53fc26ec4e SHA512 c1ced5e2b35c4809a0f9aa538cd1daaa0105cc4eb28df0a2cf0c546694573ca7dace8413ce2c9a74e957fd76de71ea2c2e5f0a9eb050e27207e31d7ed1ae42c8
 DIST kubernetes-1.35.0.tar.gz 42076423 BLAKE2B ee0ff9c0a638918cc04ff2b55d2acea124f701b9e474b898e70bd3341333b3bf63750e07692dde0350721c3367e87bd397623b0871d0b577e9a0d8059ebfcfc5 SHA512 7bb55b41f0243bc42cf1fd77302ce780f802021ef89292f55c981261c5ed8774eacbaaf233e71f5f94bec35035eaa725f27e286b6dbba5a0f20da8f88bc061ac
 DIST kubernetes-1.36.1.tar.gz 40596408 BLAKE2B 8316541a245a42be40fff845028e35e7fa5f9103460c0029e1205da8bed4d82d726a5c1b9542348b1822c464e04a18fce24d838cfb29fda4301bb8e60a079e04 SHA512 348d91a1e1068ee55a302ce1224b4d6db3d764d96595cdf0f46b31be4e0c57d8dbd29dd32aa23bbd6436e39dc0326f2a8c89ee660c44b38b3387636717be5422
+DIST kubernetes-1.37.0.tar.gz 45558262 BLAKE2B 7663006f698e8541dd5f812f6f06a3a3e996b8282b82c00fec3262ae3b216b720cfcf9d08fb4465f76eeec9aec7dcb725f676da856a11fb07e5248884e9da17d SHA512 45d529acbd4dea94ef345eca588732f7a7ea71184843d462c385662ad6ffcf2aa6cd1015f57b36e6f1cf7f33b19811be65b29e045ab60e09a908ef78526ea45c
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.32.11.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.32.11.ebuild
deleted file mode 100644
index 6da53edaf17a..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.32.11.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-RESTRICT="test"
-
-DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-RDEPEND="${DEPEND}"
-BDEPEND=">=dev-lang/go-1.23.3"
-
-QA_PRESTRIPPED=usr/bin/kube-controller-manager
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	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.32.9.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.32.9.ebuild
deleted file mode 100644
index 1a20e339ab90..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.32.9.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-RESTRICT="test"
-
-DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-RDEPEND="${DEPEND}"
-BDEPEND=">=dev-lang/go-1.23.3"
-
-QA_PRESTRIPPED=usr/bin/kube-controller-manager
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	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.33.5.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.33.5.ebuild
deleted file mode 100644
index 49e62e7fe74c..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.33.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-RESTRICT="test"
-
-DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-RDEPEND="${DEPEND}"
-BDEPEND=">=dev-lang/go-1.24.0"
-
-QA_PRESTRIPPED=usr/bin/kube-controller-manager
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	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.33.6.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.33.6.ebuild
deleted file mode 100644
index 248ae27843f4..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.33.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-RESTRICT="test"
-
-DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-RDEPEND="${DEPEND}"
-BDEPEND=">=dev-lang/go-1.24.0"
-
-QA_PRESTRIPPED=usr/bin/kube-controller-manager
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	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.33.7.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.33.7.ebuild
deleted file mode 100644
index 248ae27843f4..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.33.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-RESTRICT="test"
-
-DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-RDEPEND="${DEPEND}"
-BDEPEND=">=dev-lang/go-1.24.0"
-
-QA_PRESTRIPPED=usr/bin/kube-controller-manager
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	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.34.1.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.34.1.ebuild
deleted file mode 100644
index b0baaacabb04..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.34.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-RESTRICT="test"
-
-DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-RDEPEND="${DEPEND}"
-BDEPEND=">=dev-lang/go-1.24.6"
-
-QA_PRESTRIPPED=usr/bin/kube-controller-manager
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	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.34.2.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.34.2.ebuild
deleted file mode 100644
index 2d10f55882df..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.34.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-RESTRICT="test"
-
-DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-RDEPEND="${DEPEND}"
-BDEPEND=">=dev-lang/go-1.24.6"
-
-QA_PRESTRIPPED=usr/bin/kube-controller-manager
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	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.34.3.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.34.3.ebuild
deleted file mode 100644
index 2d10f55882df..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.34.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-RESTRICT="test"
-
-DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-RDEPEND="${DEPEND}"
-BDEPEND=">=dev-lang/go-1.24.6"
-
-QA_PRESTRIPPED=usr/bin/kube-controller-manager
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	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.32.10.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.37.0.ebuild
index 6da53edaf17a..97797e11142e 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.32.10.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.37.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit go-module systemd
+inherit go-env go-module shell-completion sysroot systemd
 
 DESCRIPTION="Kubernetes Controller Manager"
 HOMEPAGE="https://kubernetes.io"
@@ -20,17 +20,32 @@ RESTRICT="test"
 DEPEND="acct-group/kube-controller-manager
 	acct-user/kube-controller-manager"
 RDEPEND="${DEPEND}"
-BDEPEND=">=dev-lang/go-1.23.3"
+BDEPEND=">=dev-lang/go-1.26.0"
 
 QA_PRESTRIPPED=usr/bin/kube-controller-manager
 
 src_compile() {
+	local GOOS=$(go-env_goos)
+
 	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
+		KUBE_BUILD_PLATFORMS="${GOOS}/${GOARCH}" KUBE_${GOOS@U}_${GOARCH@U}_CC="${CC}" \
 		WHAT=cmd/${PN}
+
+	bin=_output/local/bin/${GOOS}/${GOARCH}/${PN}
+
+	einfo "generating shell completion files"
+	sysroot_try_run_prefixed ${bin} completion bash > ${PN}.bash || die
+	sysroot_try_run_prefixed ${bin} completion zsh > ${PN}.zsh || die
+	sysroot_try_run_prefixed ${bin} completion fish > ${PN}.fish || die
 }
 
 src_install() {
-	dobin _output/bin/${PN}
+	dobin ${bin}
+
+	[[ -s ${PN}.bash ]] && newbashcomp ${PN}.bash ${PN}
+	[[ -s ${PN}.zsh ]] && newzshcomp ${PN}.zsh _${PN}
+	[[ -s ${PN}.fish ]] && dofishcomp ${PN}.fish
+
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 	systemd_dounit "${FILESDIR}"/${PN}.service
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index 023da7d16955..02b302d0b8ab 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -1,12 +1,4 @@
-DIST kubernetes-1.32.10.tar.gz 36387593 BLAKE2B 36d612cb52ad38e884db4195d94ae94e9395f818fba1d27aca2b2d5aa286d100c3f6eb54f3d8a50863f264f197c035b8985f71dff4ff0cd5d006fd5202517f82 SHA512 6d7737d1142af13359eda2d8f17717e4046cddd249b45f7d333c9b7e99330b6f1de36a735f700056161a751c980c625f35f85019ada9c198c4f9a90f8071d2d4
-DIST kubernetes-1.32.11.tar.gz 36398817 BLAKE2B 63103be0387c175e22c877c7edf1f68cbae28cbfade09ddb5a735b9ed27239a0593a10346424dbf4129cc15786236f585d37f52b2459c29f0c332e4f4abe7965 SHA512 a7ff80d340f83f1bc3a0d1666fe931d00ace63417159bbfd683b90d7b1345b1ee5d52967931b7dfa41cf196877b50f00ddde266a2d1f0d9a4f20fdcb974e3d04
-DIST kubernetes-1.32.9.tar.gz 36381108 BLAKE2B a617404aab203cf2b11c1adf1e60fe326f474a74e0caea04dcb001f40b8a0552b5c1411630d379ac5bcb22220833c64bc86f0c1a36e6c16c6b2eb422c0af4bcc SHA512 aad8538f6331b1d3e1bf7d19a8ce15b4bf0cbffc3a71f0bd09fb04e34ad25ddc70186b06f88668dd3f4008a8d4bb3b1421d20e21f029b9be4cffd2c3f64ca22b
-DIST kubernetes-1.33.5.tar.gz 37091266 BLAKE2B e7c2093a1e96fc82156895f40f4f5e13e65def5918f9487ce386c70f3364da1bd43d8322c29e045bfa0d2675797b882fb689ed777e3fc90c1fcd69724b9a9790 SHA512 bd5d3a95b03df672b9371b53bb7410ce1fba7a70be4a647044429828c3eb50ac5267db21bd7ddf1b15aec1476d782d77124be752109b79c283cb513a0ab79359
-DIST kubernetes-1.33.6.tar.gz 37104539 BLAKE2B d4bf3ba1499073fe91a5007e9dfa2bcf282ab799794a17ef67e677321515d4e81628f9cf8a147bd7aa4a2b18b35b47d03902cfbbde148079f2c3daa1e5218ba9 SHA512 d20b142dc41350c6fcc4b84e79f3c0982408de396c2fcfb4a1e34d928f2e334f40ee7ebce37147d4bab6be8d31468c5bf0723433f8ede353a04d2b06f88b1014
-DIST kubernetes-1.33.7.tar.gz 37110661 BLAKE2B 365043c0b83d0c45f8cf254567141662eae62c8e1abbb60f3badf29e9bfff6ce7c0e2f449aba28fe47f0c40a63e74d2c22c78ec586c2cb18cad33517b9abef70 SHA512 720c552292445e52b8d669b740c7000ac4a8e8c420fee014da1b3468569c5f401ccc30f33d14c11dd523ceeb2ce70fd7ce08f87f5cb8c2e731e27208cd9de48e
-DIST kubernetes-1.34.1.tar.gz 38057175 BLAKE2B 3eec25d42d7d89e3a8cbe45c5979ab72441444f55b93c0a72c0c41941feef3254577cdc287748ce0bd5ba4726373635a9a14f2dbaedef18088d70c8fd5cdbfd7 SHA512 97f8bb4cbbd12c1100d62faa2205388ee6b7834778c381bf3d658bc056be43e13cc63fa7df487e5305b3a162439f1ebe06226da1dd824181154d0b8f3b63b764
-DIST kubernetes-1.34.2.tar.gz 38080420 BLAKE2B 4d70f30c91449771620e841db325be01246f3ef94506666549197a373ce2e8d998fadb50596db55e74c2870b6b26cce2a2a1ae0aba95451ad47db91035831e43 SHA512 57de82cc5994a29956b2281f94f79a659b7c7a5e664aa931df403201793a91b8dba9642898e88f5ce2093a182359dc369cd0e44e1e5295dc625dbfa881190633
-DIST kubernetes-1.34.3.tar.gz 38087990 BLAKE2B f9a8ab54f9d76b6d1b7cee119c1d22f8e8387629730407eecec5997de9cc1fe506d7cd9ddc5bb1fdc415474523d55543c1be82b7198967f11b43bc53fc26ec4e SHA512 c1ced5e2b35c4809a0f9aa538cd1daaa0105cc4eb28df0a2cf0c546694573ca7dace8413ce2c9a74e957fd76de71ea2c2e5f0a9eb050e27207e31d7ed1ae42c8
 DIST kubernetes-1.35.0.tar.gz 42076423 BLAKE2B ee0ff9c0a638918cc04ff2b55d2acea124f701b9e474b898e70bd3341333b3bf63750e07692dde0350721c3367e87bd397623b0871d0b577e9a0d8059ebfcfc5 SHA512 7bb55b41f0243bc42cf1fd77302ce780f802021ef89292f55c981261c5ed8774eacbaaf233e71f5f94bec35035eaa725f27e286b6dbba5a0f20da8f88bc061ac
 DIST kubernetes-1.35.3.tar.gz 38927893 BLAKE2B a7f7d8c5b1f0d23d01f8efaf94412ef428539cd375ba5c0135ecf9f3237fb6d9031c56c8a55b68af696b0af4cedad41c13ed55f88fcd0b6d13e2433d97c0e277 SHA512 43781daf0cd1c414efeda2fe6a911fd02cd4392b8e11bd056f1da9183ce9d7c731cfedb918b099347b73d9dcd63f5966e6941a2cc0d8e90578b280d028b434d4
 DIST kubernetes-1.36.1.tar.gz 40596408 BLAKE2B 8316541a245a42be40fff845028e35e7fa5f9103460c0029e1205da8bed4d82d726a5c1b9542348b1822c464e04a18fce24d838cfb29fda4301bb8e60a079e04 SHA512 348d91a1e1068ee55a302ce1224b4d6db3d764d96595cdf0f46b31be4e0c57d8dbd29dd32aa23bbd6436e39dc0326f2a8c89ee660c44b38b3387636717be5422
+DIST kubernetes-1.37.0.tar.gz 45558262 BLAKE2B 7663006f698e8541dd5f812f6f06a3a3e996b8282b82c00fec3262ae3b216b720cfcf9d08fb4465f76eeec9aec7dcb725f676da856a11fb07e5248884e9da17d SHA512 45d529acbd4dea94ef345eca588732f7a7ea71184843d462c385662ad6ffcf2aa6cd1015f57b36e6f1cf7f33b19811be65b29e045ab60e09a908ef78526ea45c
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.32.11.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.32.11.ebuild
deleted file mode 100644
index 9f14d3abc660..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.32.11.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-RESTRICT="test"
-
-RDEPEND="net-firewall/conntrack-tools"
-BDEPEND=">=dev-lang/go-1.23.3"
-
-QA_PRESTRIPPED=usr/bin/kube-proxy
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		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}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.32.9.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.32.9.ebuild
deleted file mode 100644
index d382f9f64bce..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.32.9.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-RESTRICT="test"
-
-RDEPEND="net-firewall/conntrack-tools"
-BDEPEND=">=dev-lang/go-1.23.3"
-
-QA_PRESTRIPPED=usr/bin/kube-proxy
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		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}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.33.5.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.33.5.ebuild
deleted file mode 100644
index 6b1964962725..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.33.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-RESTRICT="test"
-
-RDEPEND="net-firewall/conntrack-tools"
-BDEPEND=">=dev-lang/go-1.24.0"
-
-QA_PRESTRIPPED=usr/bin/kube-proxy
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		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}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.33.6.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.33.6.ebuild
deleted file mode 100644
index def56e5fe7c4..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.33.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-RESTRICT="test"
-
-RDEPEND="net-firewall/conntrack-tools"
-BDEPEND=">=dev-lang/go-1.24.0"
-
-QA_PRESTRIPPED=usr/bin/kube-proxy
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		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}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.33.7.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.33.7.ebuild
deleted file mode 100644
index def56e5fe7c4..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.33.7.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-RESTRICT="test"
-
-RDEPEND="net-firewall/conntrack-tools"
-BDEPEND=">=dev-lang/go-1.24.0"
-
-QA_PRESTRIPPED=usr/bin/kube-proxy
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		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}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.34.1.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.34.1.ebuild
deleted file mode 100644
index d904e484800d..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.34.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-RESTRICT="test"
-
-RDEPEND="net-firewall/conntrack-tools"
-BDEPEND=">=dev-lang/go-1.24.6"
-
-QA_PRESTRIPPED=usr/bin/kube-proxy
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		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}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.34.2.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.34.2.ebuild
deleted file mode 100644
index 9ca14702120c..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.34.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-RESTRICT="test"
-
-RDEPEND="net-firewall/conntrack-tools"
-BDEPEND=">=dev-lang/go-1.24.6"
-
-QA_PRESTRIPPED=usr/bin/kube-proxy
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		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}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.34.3.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.34.3.ebuild
deleted file mode 100644
index 9ca14702120c..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.34.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-RESTRICT="test"
-
-RDEPEND="net-firewall/conntrack-tools"
-BDEPEND=">=dev-lang/go-1.24.6"
-
-QA_PRESTRIPPED=usr/bin/kube-proxy
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		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}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.32.10.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.37.0.ebuild
index 9f14d3abc660..e5702ddca2fd 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.32.10.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.37.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit go-module systemd
+inherit go-env go-module shell-completion sysroot systemd
 
 DESCRIPTION="Kubernetes Proxy service"
 HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
@@ -18,17 +18,32 @@ KEYWORDS="~amd64 ~arm64"
 RESTRICT="test"
 
 RDEPEND="net-firewall/conntrack-tools"
-BDEPEND=">=dev-lang/go-1.23.3"
+BDEPEND=">=dev-lang/go-1.26.0"
 
 QA_PRESTRIPPED=usr/bin/kube-proxy
 
 src_compile() {
+	local GOOS=$(go-env_goos)
+
 	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
+		KUBE_BUILD_PLATFORMS="${GOOS}/${GOARCH}" KUBE_${GOOS@U}_${GOARCH@U}_CC="${CC}" \
 		WHAT=cmd/${PN}
+
+	bin=_output/local/bin/${GOOS}/${GOARCH}/${PN}
+
+	einfo "generating shell completion files"
+	sysroot_try_run_prefixed ${bin} completion bash > ${PN}.bash || die
+	sysroot_try_run_prefixed ${bin} completion zsh > ${PN}.zsh || die
+	sysroot_try_run_prefixed ${bin} completion fish > ${PN}.fish || die
 }
 
 src_install() {
-	dobin _output/bin/${PN}
+	dobin ${bin}
+
+	[[ -s ${PN}.bash ]] && newbashcomp ${PN}.bash ${PN}
+	[[ -s ${PN}.zsh ]] && newzshcomp ${PN}.zsh _${PN}
+	[[ -s ${PN}.fish ]] && dofishcomp ${PN}.fish
+
 	keepdir /var/log/${PN} /var/lib/${PN}
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index 3599ec0959a3..7fedcda4ba13 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -1,11 +1,3 @@
-DIST kubernetes-1.32.10.tar.gz 36387593 BLAKE2B 36d612cb52ad38e884db4195d94ae94e9395f818fba1d27aca2b2d5aa286d100c3f6eb54f3d8a50863f264f197c035b8985f71dff4ff0cd5d006fd5202517f82 SHA512 6d7737d1142af13359eda2d8f17717e4046cddd249b45f7d333c9b7e99330b6f1de36a735f700056161a751c980c625f35f85019ada9c198c4f9a90f8071d2d4
-DIST kubernetes-1.32.11.tar.gz 36398817 BLAKE2B 63103be0387c175e22c877c7edf1f68cbae28cbfade09ddb5a735b9ed27239a0593a10346424dbf4129cc15786236f585d37f52b2459c29f0c332e4f4abe7965 SHA512 a7ff80d340f83f1bc3a0d1666fe931d00ace63417159bbfd683b90d7b1345b1ee5d52967931b7dfa41cf196877b50f00ddde266a2d1f0d9a4f20fdcb974e3d04
-DIST kubernetes-1.32.9.tar.gz 36381108 BLAKE2B a617404aab203cf2b11c1adf1e60fe326f474a74e0caea04dcb001f40b8a0552b5c1411630d379ac5bcb22220833c64bc86f0c1a36e6c16c6b2eb422c0af4bcc SHA512 aad8538f6331b1d3e1bf7d19a8ce15b4bf0cbffc3a71f0bd09fb04e34ad25ddc70186b06f88668dd3f4008a8d4bb3b1421d20e21f029b9be4cffd2c3f64ca22b
-DIST kubernetes-1.33.5.tar.gz 37091266 BLAKE2B e7c2093a1e96fc82156895f40f4f5e13e65def5918f9487ce386c70f3364da1bd43d8322c29e045bfa0d2675797b882fb689ed777e3fc90c1fcd69724b9a9790 SHA512 bd5d3a95b03df672b9371b53bb7410ce1fba7a70be4a647044429828c3eb50ac5267db21bd7ddf1b15aec1476d782d77124be752109b79c283cb513a0ab79359
-DIST kubernetes-1.33.6.tar.gz 37104539 BLAKE2B d4bf3ba1499073fe91a5007e9dfa2bcf282ab799794a17ef67e677321515d4e81628f9cf8a147bd7aa4a2b18b35b47d03902cfbbde148079f2c3daa1e5218ba9 SHA512 d20b142dc41350c6fcc4b84e79f3c0982408de396c2fcfb4a1e34d928f2e334f40ee7ebce37147d4bab6be8d31468c5bf0723433f8ede353a04d2b06f88b1014
-DIST kubernetes-1.33.7.tar.gz 37110661 BLAKE2B 365043c0b83d0c45f8cf254567141662eae62c8e1abbb60f3badf29e9bfff6ce7c0e2f449aba28fe47f0c40a63e74d2c22c78ec586c2cb18cad33517b9abef70 SHA512 720c552292445e52b8d669b740c7000ac4a8e8c420fee014da1b3468569c5f401ccc30f33d14c11dd523ceeb2ce70fd7ce08f87f5cb8c2e731e27208cd9de48e
-DIST kubernetes-1.34.1.tar.gz 38057175 BLAKE2B 3eec25d42d7d89e3a8cbe45c5979ab72441444f55b93c0a72c0c41941feef3254577cdc287748ce0bd5ba4726373635a9a14f2dbaedef18088d70c8fd5cdbfd7 SHA512 97f8bb4cbbd12c1100d62faa2205388ee6b7834778c381bf3d658bc056be43e13cc63fa7df487e5305b3a162439f1ebe06226da1dd824181154d0b8f3b63b764
-DIST kubernetes-1.34.2.tar.gz 38080420 BLAKE2B 4d70f30c91449771620e841db325be01246f3ef94506666549197a373ce2e8d998fadb50596db55e74c2870b6b26cce2a2a1ae0aba95451ad47db91035831e43 SHA512 57de82cc5994a29956b2281f94f79a659b7c7a5e664aa931df403201793a91b8dba9642898e88f5ce2093a182359dc369cd0e44e1e5295dc625dbfa881190633
-DIST kubernetes-1.34.3.tar.gz 38087990 BLAKE2B f9a8ab54f9d76b6d1b7cee119c1d22f8e8387629730407eecec5997de9cc1fe506d7cd9ddc5bb1fdc415474523d55543c1be82b7198967f11b43bc53fc26ec4e SHA512 c1ced5e2b35c4809a0f9aa538cd1daaa0105cc4eb28df0a2cf0c546694573ca7dace8413ce2c9a74e957fd76de71ea2c2e5f0a9eb050e27207e31d7ed1ae42c8
 DIST kubernetes-1.35.0.tar.gz 42076423 BLAKE2B ee0ff9c0a638918cc04ff2b55d2acea124f701b9e474b898e70bd3341333b3bf63750e07692dde0350721c3367e87bd397623b0871d0b577e9a0d8059ebfcfc5 SHA512 7bb55b41f0243bc42cf1fd77302ce780f802021ef89292f55c981261c5ed8774eacbaaf233e71f5f94bec35035eaa725f27e286b6dbba5a0f20da8f88bc061ac
 DIST kubernetes-1.36.1.tar.gz 40596408 BLAKE2B 8316541a245a42be40fff845028e35e7fa5f9103460c0029e1205da8bed4d82d726a5c1b9542348b1822c464e04a18fce24d838cfb29fda4301bb8e60a079e04 SHA512 348d91a1e1068ee55a302ce1224b4d6db3d764d96595cdf0f46b31be4e0c57d8dbd29dd32aa23bbd6436e39dc0326f2a8c89ee660c44b38b3387636717be5422
+DIST kubernetes-1.37.0.tar.gz 45558262 BLAKE2B 7663006f698e8541dd5f812f6f06a3a3e996b8282b82c00fec3262ae3b216b720cfcf9d08fb4465f76eeec9aec7dcb725f676da856a11fb07e5248884e9da17d SHA512 45d529acbd4dea94ef345eca588732f7a7ea71184843d462c385662ad6ffcf2aa6cd1015f57b36e6f1cf7f33b19811be65b29e045ab60e09a908ef78526ea45c
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.32.11.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.32.11.ebuild
deleted file mode 100644
index e0d053a98911..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.32.11.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-RESTRICT="test"
-
-DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-RDEPEND="${DEPEND}"
-BDEPEND=">=dev-lang/go-1.23.3"
-
-QA_PRESTRIPPED=usr/bin/kube-scheduler
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	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.32.9.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.32.9.ebuild
deleted file mode 100644
index 80ada3c916c2..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.32.9.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-RESTRICT="test"
-
-DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-RDEPEND="${DEPEND}"
-BDEPEND=">=dev-lang/go-1.23.3"
-
-QA_PRESTRIPPED=usr/bin/kube-scheduler
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	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.33.5.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.33.5.ebuild
deleted file mode 100644
index fe3bdc8d0242..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.33.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-RESTRICT="test"
-
-DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-RDEPEND="${DEPEND}"
-BDEPEND=">=dev-lang/go-1.24.0"
-
-QA_PRESTRIPPED=usr/bin/kube-scheduler
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	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.33.6.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.33.6.ebuild
deleted file mode 100644
index 3afb619fdfcd..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.33.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-RESTRICT="test"
-
-DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-RDEPEND="${DEPEND}"
-BDEPEND=">=dev-lang/go-1.24.0"
-
-QA_PRESTRIPPED=usr/bin/kube-scheduler
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	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.33.7.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.33.7.ebuild
deleted file mode 100644
index 3afb619fdfcd..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.33.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-RESTRICT="test"
-
-DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-RDEPEND="${DEPEND}"
-BDEPEND=">=dev-lang/go-1.24.0"
-
-QA_PRESTRIPPED=usr/bin/kube-scheduler
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	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.34.1.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.34.1.ebuild
deleted file mode 100644
index fe3bdc8d0242..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.34.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-RESTRICT="test"
-
-DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-RDEPEND="${DEPEND}"
-BDEPEND=">=dev-lang/go-1.24.0"
-
-QA_PRESTRIPPED=usr/bin/kube-scheduler
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	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.34.2.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.34.2.ebuild
deleted file mode 100644
index fe3bdc8d0242..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.34.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-RESTRICT="test"
-
-DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-RDEPEND="${DEPEND}"
-BDEPEND=">=dev-lang/go-1.24.0"
-
-QA_PRESTRIPPED=usr/bin/kube-scheduler
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	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.34.3.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.34.3.ebuild
deleted file mode 100644
index 3afb619fdfcd..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.34.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-RESTRICT="test"
-
-DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-RDEPEND="${DEPEND}"
-BDEPEND=">=dev-lang/go-1.24.0"
-
-QA_PRESTRIPPED=usr/bin/kube-scheduler
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	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.32.10.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.37.0.ebuild
index e0d053a98911..904d878da6c0 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.32.10.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.37.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit go-module systemd
+inherit go-env go-module shell-completion sysroot systemd
 
 DESCRIPTION="Kubernetes Scheduler"
 HOMEPAGE="https://kubernetes.io"
@@ -20,17 +20,32 @@ RESTRICT="test"
 DEPEND="acct-group/kube-scheduler
 	acct-user/kube-scheduler"
 RDEPEND="${DEPEND}"
-BDEPEND=">=dev-lang/go-1.23.3"
+BDEPEND=">=dev-lang/go-1.26.0"
 
 QA_PRESTRIPPED=usr/bin/kube-scheduler
 
 src_compile() {
+	local GOOS=$(go-env_goos)
+
 	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
+		KUBE_BUILD_PLATFORMS="${GOOS}/${GOARCH}" KUBE_${GOOS@U}_${GOARCH@U}_CC="${CC}" \
 		WHAT=cmd/${PN}
+
+	bin=_output/local/bin/${GOOS}/${GOARCH}/${PN}
+
+	einfo "generating shell completion files"
+	sysroot_try_run_prefixed ${bin} completion bash > ${PN}.bash || die
+	sysroot_try_run_prefixed ${bin} completion zsh > ${PN}.zsh || die
+	sysroot_try_run_prefixed ${bin} completion fish > ${PN}.fish || die
 }
 
 src_install() {
-	dobin _output/bin/${PN}
+	dobin ${bin}
+
+	[[ -s ${PN}.bash ]] && newbashcomp ${PN}.bash ${PN}
+	[[ -s ${PN}.zsh ]] && newzshcomp ${PN}.zsh _${PN}
+	[[ -s ${PN}.fish ]] && dofishcomp ${PN}.fish
+
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 	systemd_dounit "${FILESDIR}"/${PN}.service
diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index 3599ec0959a3..7fedcda4ba13 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -1,11 +1,3 @@
-DIST kubernetes-1.32.10.tar.gz 36387593 BLAKE2B 36d612cb52ad38e884db4195d94ae94e9395f818fba1d27aca2b2d5aa286d100c3f6eb54f3d8a50863f264f197c035b8985f71dff4ff0cd5d006fd5202517f82 SHA512 6d7737d1142af13359eda2d8f17717e4046cddd249b45f7d333c9b7e99330b6f1de36a735f700056161a751c980c625f35f85019ada9c198c4f9a90f8071d2d4
-DIST kubernetes-1.32.11.tar.gz 36398817 BLAKE2B 63103be0387c175e22c877c7edf1f68cbae28cbfade09ddb5a735b9ed27239a0593a10346424dbf4129cc15786236f585d37f52b2459c29f0c332e4f4abe7965 SHA512 a7ff80d340f83f1bc3a0d1666fe931d00ace63417159bbfd683b90d7b1345b1ee5d52967931b7dfa41cf196877b50f00ddde266a2d1f0d9a4f20fdcb974e3d04
-DIST kubernetes-1.32.9.tar.gz 36381108 BLAKE2B a617404aab203cf2b11c1adf1e60fe326f474a74e0caea04dcb001f40b8a0552b5c1411630d379ac5bcb22220833c64bc86f0c1a36e6c16c6b2eb422c0af4bcc SHA512 aad8538f6331b1d3e1bf7d19a8ce15b4bf0cbffc3a71f0bd09fb04e34ad25ddc70186b06f88668dd3f4008a8d4bb3b1421d20e21f029b9be4cffd2c3f64ca22b
-DIST kubernetes-1.33.5.tar.gz 37091266 BLAKE2B e7c2093a1e96fc82156895f40f4f5e13e65def5918f9487ce386c70f3364da1bd43d8322c29e045bfa0d2675797b882fb689ed777e3fc90c1fcd69724b9a9790 SHA512 bd5d3a95b03df672b9371b53bb7410ce1fba7a70be4a647044429828c3eb50ac5267db21bd7ddf1b15aec1476d782d77124be752109b79c283cb513a0ab79359
-DIST kubernetes-1.33.6.tar.gz 37104539 BLAKE2B d4bf3ba1499073fe91a5007e9dfa2bcf282ab799794a17ef67e677321515d4e81628f9cf8a147bd7aa4a2b18b35b47d03902cfbbde148079f2c3daa1e5218ba9 SHA512 d20b142dc41350c6fcc4b84e79f3c0982408de396c2fcfb4a1e34d928f2e334f40ee7ebce37147d4bab6be8d31468c5bf0723433f8ede353a04d2b06f88b1014
-DIST kubernetes-1.33.7.tar.gz 37110661 BLAKE2B 365043c0b83d0c45f8cf254567141662eae62c8e1abbb60f3badf29e9bfff6ce7c0e2f449aba28fe47f0c40a63e74d2c22c78ec586c2cb18cad33517b9abef70 SHA512 720c552292445e52b8d669b740c7000ac4a8e8c420fee014da1b3468569c5f401ccc30f33d14c11dd523ceeb2ce70fd7ce08f87f5cb8c2e731e27208cd9de48e
-DIST kubernetes-1.34.1.tar.gz 38057175 BLAKE2B 3eec25d42d7d89e3a8cbe45c5979ab72441444f55b93c0a72c0c41941feef3254577cdc287748ce0bd5ba4726373635a9a14f2dbaedef18088d70c8fd5cdbfd7 SHA512 97f8bb4cbbd12c1100d62faa2205388ee6b7834778c381bf3d658bc056be43e13cc63fa7df487e5305b3a162439f1ebe06226da1dd824181154d0b8f3b63b764
-DIST kubernetes-1.34.2.tar.gz 38080420 BLAKE2B 4d70f30c91449771620e841db325be01246f3ef94506666549197a373ce2e8d998fadb50596db55e74c2870b6b26cce2a2a1ae0aba95451ad47db91035831e43 SHA512 57de82cc5994a29956b2281f94f79a659b7c7a5e664aa931df403201793a91b8dba9642898e88f5ce2093a182359dc369cd0e44e1e5295dc625dbfa881190633
-DIST kubernetes-1.34.3.tar.gz 38087990 BLAKE2B f9a8ab54f9d76b6d1b7cee119c1d22f8e8387629730407eecec5997de9cc1fe506d7cd9ddc5bb1fdc415474523d55543c1be82b7198967f11b43bc53fc26ec4e SHA512 c1ced5e2b35c4809a0f9aa538cd1daaa0105cc4eb28df0a2cf0c546694573ca7dace8413ce2c9a74e957fd76de71ea2c2e5f0a9eb050e27207e31d7ed1ae42c8
 DIST kubernetes-1.35.0.tar.gz 42076423 BLAKE2B ee0ff9c0a638918cc04ff2b55d2acea124f701b9e474b898e70bd3341333b3bf63750e07692dde0350721c3367e87bd397623b0871d0b577e9a0d8059ebfcfc5 SHA512 7bb55b41f0243bc42cf1fd77302ce780f802021ef89292f55c981261c5ed8774eacbaaf233e71f5f94bec35035eaa725f27e286b6dbba5a0f20da8f88bc061ac
 DIST kubernetes-1.36.1.tar.gz 40596408 BLAKE2B 8316541a245a42be40fff845028e35e7fa5f9103460c0029e1205da8bed4d82d726a5c1b9542348b1822c464e04a18fce24d838cfb29fda4301bb8e60a079e04 SHA512 348d91a1e1068ee55a302ce1224b4d6db3d764d96595cdf0f46b31be4e0c57d8dbd29dd32aa23bbd6436e39dc0326f2a8c89ee660c44b38b3387636717be5422
+DIST kubernetes-1.37.0.tar.gz 45558262 BLAKE2B 7663006f698e8541dd5f812f6f06a3a3e996b8282b82c00fec3262ae3b216b720cfcf9d08fb4465f76eeec9aec7dcb725f676da856a11fb07e5248884e9da17d SHA512 45d529acbd4dea94ef345eca588732f7a7ea71184843d462c385662ad6ffcf2aa6cd1015f57b36e6f1cf7f33b19811be65b29e045ab60e09a908ef78526ea45c
diff --git a/sys-cluster/kubeadm/kubeadm-1.32.11.ebuild b/sys-cluster/kubeadm/kubeadm-1.32.11.ebuild
deleted file mode 100644
index 441e00f9d4b1..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.32.11.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2021-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module toolchain-funcs shell-completion
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="selinux"
-RESTRICT="test"
-
-RDEPEND="app-containers/cri-tools
-	selinux? ( sec-policy/selinux-kubernetes )"
-BDEPEND=">=dev-lang/go-1.23.3"
-
-QA_PRESTRIPPED=usr/bin/kubeadm
-
-src_compile() {
-	FORCE_HOST_GO=yes emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-
-	if ! tc-is-cross-compiler; then
-		einfo "generating shell completion files"
-		_output/bin/${PN} completion bash > ${PN}.bash || die
-		_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	fi
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-
-	if ! tc-is-cross-compiler; then
-		newbashcomp ${PN}.bash ${PN}
-		newzshcomp ${PN}.zsh _${PN}
-	else
-		ewarn "Shell completion files not installed! Install them manually with '${PN} completion --help'"
-	fi
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.32.9.ebuild b/sys-cluster/kubeadm/kubeadm-1.32.9.ebuild
deleted file mode 100644
index b7d3129ef05f..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.32.9.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2021-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module toolchain-funcs shell-completion
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="selinux"
-RESTRICT="test"
-
-RDEPEND="app-containers/cri-tools
-	selinux? ( sec-policy/selinux-kubernetes )"
-BDEPEND=">=dev-lang/go-1.23.3"
-
-QA_PRESTRIPPED=usr/bin/kubeadm
-
-src_compile() {
-	FORCE_HOST_GO=yes emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-
-	if ! tc-is-cross-compiler; then
-		einfo "generating shell completion files"
-		_output/bin/${PN} completion bash > ${PN}.bash || die
-		_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	fi
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-
-	if ! tc-is-cross-compiler; then
-		newbashcomp ${PN}.bash ${PN}
-		newzshcomp ${PN}.zsh _${PN}
-	else
-		ewarn "Shell completion files not installed! Install them manually with '${PN} completion --help'"
-	fi
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.33.5.ebuild b/sys-cluster/kubeadm/kubeadm-1.33.5.ebuild
deleted file mode 100644
index a321c896e5f5..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.33.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2021-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module toolchain-funcs shell-completion
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="selinux"
-RESTRICT="test"
-
-RDEPEND="app-containers/cri-tools
-	selinux? ( sec-policy/selinux-kubernetes )"
-BDEPEND=">=dev-lang/go-1.24.0"
-
-QA_PRESTRIPPED=usr/bin/kubeadm
-
-src_compile() {
-	FORCE_HOST_GO=yes emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-
-	if ! tc-is-cross-compiler; then
-		einfo "generating shell completion files"
-		_output/bin/${PN} completion bash > ${PN}.bash || die
-		_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	fi
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-
-	if ! tc-is-cross-compiler; then
-		newbashcomp ${PN}.bash ${PN}
-		newzshcomp ${PN}.zsh _${PN}
-	else
-		ewarn "Shell completion files not installed! Install them manually with '${PN} completion --help'"
-	fi
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.33.6.ebuild b/sys-cluster/kubeadm/kubeadm-1.33.6.ebuild
deleted file mode 100644
index 4246f3e90b9d..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.33.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2021-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module toolchain-funcs shell-completion
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="selinux"
-RESTRICT="test"
-
-RDEPEND="app-containers/cri-tools
-	selinux? ( sec-policy/selinux-kubernetes )"
-BDEPEND=">=dev-lang/go-1.24.0"
-
-QA_PRESTRIPPED=usr/bin/kubeadm
-
-src_compile() {
-	FORCE_HOST_GO=yes emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-
-	if ! tc-is-cross-compiler; then
-		einfo "generating shell completion files"
-		_output/bin/${PN} completion bash > ${PN}.bash || die
-		_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	fi
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-
-	if ! tc-is-cross-compiler; then
-		newbashcomp ${PN}.bash ${PN}
-		newzshcomp ${PN}.zsh _${PN}
-	else
-		ewarn "Shell completion files not installed! Install them manually with '${PN} completion --help'"
-	fi
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.33.7.ebuild b/sys-cluster/kubeadm/kubeadm-1.33.7.ebuild
deleted file mode 100644
index 4246f3e90b9d..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.33.7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2021-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module toolchain-funcs shell-completion
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="selinux"
-RESTRICT="test"
-
-RDEPEND="app-containers/cri-tools
-	selinux? ( sec-policy/selinux-kubernetes )"
-BDEPEND=">=dev-lang/go-1.24.0"
-
-QA_PRESTRIPPED=usr/bin/kubeadm
-
-src_compile() {
-	FORCE_HOST_GO=yes emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-
-	if ! tc-is-cross-compiler; then
-		einfo "generating shell completion files"
-		_output/bin/${PN} completion bash > ${PN}.bash || die
-		_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	fi
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-
-	if ! tc-is-cross-compiler; then
-		newbashcomp ${PN}.bash ${PN}
-		newzshcomp ${PN}.zsh _${PN}
-	else
-		ewarn "Shell completion files not installed! Install them manually with '${PN} completion --help'"
-	fi
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.34.1.ebuild b/sys-cluster/kubeadm/kubeadm-1.34.1.ebuild
deleted file mode 100644
index cf517faa7a1f..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.34.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2021-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module toolchain-funcs shell-completion
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="selinux"
-RESTRICT="test"
-
-RDEPEND="app-containers/cri-tools
-	selinux? ( sec-policy/selinux-kubernetes )"
-BDEPEND=">=dev-lang/go-1.24.6"
-
-QA_PRESTRIPPED=usr/bin/kubeadm
-
-src_compile() {
-	FORCE_HOST_GO=yes emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-
-	if ! tc-is-cross-compiler; then
-		einfo "generating shell completion files"
-		_output/bin/${PN} completion bash > ${PN}.bash || die
-		_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	fi
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-
-	if ! tc-is-cross-compiler; then
-		newbashcomp ${PN}.bash ${PN}
-		newzshcomp ${PN}.zsh _${PN}
-	else
-		ewarn "Shell completion files not installed! Install them manually with '${PN} completion --help'"
-	fi
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.34.2.ebuild b/sys-cluster/kubeadm/kubeadm-1.34.2.ebuild
deleted file mode 100644
index da194ea63f94..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.34.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2021-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module toolchain-funcs shell-completion
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="selinux"
-RESTRICT="test"
-
-RDEPEND="app-containers/cri-tools
-	selinux? ( sec-policy/selinux-kubernetes )"
-BDEPEND=">=dev-lang/go-1.24.6"
-
-QA_PRESTRIPPED=usr/bin/kubeadm
-
-src_compile() {
-	FORCE_HOST_GO=yes emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-
-	if ! tc-is-cross-compiler; then
-		einfo "generating shell completion files"
-		_output/bin/${PN} completion bash > ${PN}.bash || die
-		_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	fi
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-
-	if ! tc-is-cross-compiler; then
-		newbashcomp ${PN}.bash ${PN}
-		newzshcomp ${PN}.zsh _${PN}
-	else
-		ewarn "Shell completion files not installed! Install them manually with '${PN} completion --help'"
-	fi
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.34.3.ebuild b/sys-cluster/kubeadm/kubeadm-1.34.3.ebuild
deleted file mode 100644
index da194ea63f94..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.34.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2021-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module toolchain-funcs shell-completion
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="selinux"
-RESTRICT="test"
-
-RDEPEND="app-containers/cri-tools
-	selinux? ( sec-policy/selinux-kubernetes )"
-BDEPEND=">=dev-lang/go-1.24.6"
-
-QA_PRESTRIPPED=usr/bin/kubeadm
-
-src_compile() {
-	FORCE_HOST_GO=yes emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-
-	if ! tc-is-cross-compiler; then
-		einfo "generating shell completion files"
-		_output/bin/${PN} completion bash > ${PN}.bash || die
-		_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	fi
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-
-	if ! tc-is-cross-compiler; then
-		newbashcomp ${PN}.bash ${PN}
-		newzshcomp ${PN}.zsh _${PN}
-	else
-		ewarn "Shell completion files not installed! Install them manually with '${PN} completion --help'"
-	fi
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.32.10.ebuild b/sys-cluster/kubeadm/kubeadm-1.37.0.ebuild
index 441e00f9d4b1..2fda011c988a 100644
--- a/sys-cluster/kubeadm/kubeadm-1.32.10.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.37.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit go-module toolchain-funcs shell-completion
+inherit go-env go-module shell-completion sysroot
 
 DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
 HOMEPAGE="https://kubernetes.io"
@@ -20,27 +20,27 @@ RESTRICT="test"
 
 RDEPEND="app-containers/cri-tools
 	selinux? ( sec-policy/selinux-kubernetes )"
-BDEPEND=">=dev-lang/go-1.23.3"
+BDEPEND=">=dev-lang/go-1.26.0"
 
 QA_PRESTRIPPED=usr/bin/kubeadm
 
 src_compile() {
-	FORCE_HOST_GO=yes emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+	local GOOS=$(go-env_goos)
 
-	if ! tc-is-cross-compiler; then
-		einfo "generating shell completion files"
-		_output/bin/${PN} completion bash > ${PN}.bash || die
-		_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	fi
+	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
+		KUBE_BUILD_PLATFORMS="${GOOS}/${GOARCH}" KUBE_${GOOS@U}_${GOARCH@U}_CC="${CC}" \
+		WHAT=cmd/${PN}
+
+	bin=_output/local/bin/${GOOS}/${GOARCH}/${PN}
+
+	einfo "generating shell completion files"
+	sysroot_try_run_prefixed ${bin} completion bash > ${PN}.bash || die
+	sysroot_try_run_prefixed ${bin} completion zsh > ${PN}.zsh || die
 }
 
 src_install() {
-	dobin _output/bin/${PN}
+	dobin ${bin}
 
-	if ! tc-is-cross-compiler; then
-		newbashcomp ${PN}.bash ${PN}
-		newzshcomp ${PN}.zsh _${PN}
-	else
-		ewarn "Shell completion files not installed! Install them manually with '${PN} completion --help'"
-	fi
+	[[ -s ${PN}.bash ]] && newbashcomp ${PN}.bash ${PN}
+	[[ -s ${PN}.zsh ]] && newzshcomp ${PN}.zsh _${PN}
 }
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index 2327a47b7131..4ccd5838b1a4 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,12 +1,4 @@
-DIST kubernetes-1.32.10.tar.gz 36387593 BLAKE2B 36d612cb52ad38e884db4195d94ae94e9395f818fba1d27aca2b2d5aa286d100c3f6eb54f3d8a50863f264f197c035b8985f71dff4ff0cd5d006fd5202517f82 SHA512 6d7737d1142af13359eda2d8f17717e4046cddd249b45f7d333c9b7e99330b6f1de36a735f700056161a751c980c625f35f85019ada9c198c4f9a90f8071d2d4
-DIST kubernetes-1.32.11.tar.gz 36398817 BLAKE2B 63103be0387c175e22c877c7edf1f68cbae28cbfade09ddb5a735b9ed27239a0593a10346424dbf4129cc15786236f585d37f52b2459c29f0c332e4f4abe7965 SHA512 a7ff80d340f83f1bc3a0d1666fe931d00ace63417159bbfd683b90d7b1345b1ee5d52967931b7dfa41cf196877b50f00ddde266a2d1f0d9a4f20fdcb974e3d04
-DIST kubernetes-1.32.9.tar.gz 36381108 BLAKE2B a617404aab203cf2b11c1adf1e60fe326f474a74e0caea04dcb001f40b8a0552b5c1411630d379ac5bcb22220833c64bc86f0c1a36e6c16c6b2eb422c0af4bcc SHA512 aad8538f6331b1d3e1bf7d19a8ce15b4bf0cbffc3a71f0bd09fb04e34ad25ddc70186b06f88668dd3f4008a8d4bb3b1421d20e21f029b9be4cffd2c3f64ca22b
-DIST kubernetes-1.33.5.tar.gz 37091266 BLAKE2B e7c2093a1e96fc82156895f40f4f5e13e65def5918f9487ce386c70f3364da1bd43d8322c29e045bfa0d2675797b882fb689ed777e3fc90c1fcd69724b9a9790 SHA512 bd5d3a95b03df672b9371b53bb7410ce1fba7a70be4a647044429828c3eb50ac5267db21bd7ddf1b15aec1476d782d77124be752109b79c283cb513a0ab79359
-DIST kubernetes-1.33.6.tar.gz 37104539 BLAKE2B d4bf3ba1499073fe91a5007e9dfa2bcf282ab799794a17ef67e677321515d4e81628f9cf8a147bd7aa4a2b18b35b47d03902cfbbde148079f2c3daa1e5218ba9 SHA512 d20b142dc41350c6fcc4b84e79f3c0982408de396c2fcfb4a1e34d928f2e334f40ee7ebce37147d4bab6be8d31468c5bf0723433f8ede353a04d2b06f88b1014
-DIST kubernetes-1.33.7.tar.gz 37110661 BLAKE2B 365043c0b83d0c45f8cf254567141662eae62c8e1abbb60f3badf29e9bfff6ce7c0e2f449aba28fe47f0c40a63e74d2c22c78ec586c2cb18cad33517b9abef70 SHA512 720c552292445e52b8d669b740c7000ac4a8e8c420fee014da1b3468569c5f401ccc30f33d14c11dd523ceeb2ce70fd7ce08f87f5cb8c2e731e27208cd9de48e
-DIST kubernetes-1.34.1.tar.gz 38057175 BLAKE2B 3eec25d42d7d89e3a8cbe45c5979ab72441444f55b93c0a72c0c41941feef3254577cdc287748ce0bd5ba4726373635a9a14f2dbaedef18088d70c8fd5cdbfd7 SHA512 97f8bb4cbbd12c1100d62faa2205388ee6b7834778c381bf3d658bc056be43e13cc63fa7df487e5305b3a162439f1ebe06226da1dd824181154d0b8f3b63b764
-DIST kubernetes-1.34.2.tar.gz 38080420 BLAKE2B 4d70f30c91449771620e841db325be01246f3ef94506666549197a373ce2e8d998fadb50596db55e74c2870b6b26cce2a2a1ae0aba95451ad47db91035831e43 SHA512 57de82cc5994a29956b2281f94f79a659b7c7a5e664aa931df403201793a91b8dba9642898e88f5ce2093a182359dc369cd0e44e1e5295dc625dbfa881190633
-DIST kubernetes-1.34.3.tar.gz 38087990 BLAKE2B f9a8ab54f9d76b6d1b7cee119c1d22f8e8387629730407eecec5997de9cc1fe506d7cd9ddc5bb1fdc415474523d55543c1be82b7198967f11b43bc53fc26ec4e SHA512 c1ced5e2b35c4809a0f9aa538cd1daaa0105cc4eb28df0a2cf0c546694573ca7dace8413ce2c9a74e957fd76de71ea2c2e5f0a9eb050e27207e31d7ed1ae42c8
 DIST kubernetes-1.35.0.tar.gz 42076423 BLAKE2B ee0ff9c0a638918cc04ff2b55d2acea124f701b9e474b898e70bd3341333b3bf63750e07692dde0350721c3367e87bd397623b0871d0b577e9a0d8059ebfcfc5 SHA512 7bb55b41f0243bc42cf1fd77302ce780f802021ef89292f55c981261c5ed8774eacbaaf233e71f5f94bec35035eaa725f27e286b6dbba5a0f20da8f88bc061ac
 DIST kubernetes-1.36.0.tar.gz 43819283 BLAKE2B f623725d03a5dee3bfc3b06a2700997534f1f02ec72dd0d8e0b95d77aa8b4ddba0a2c40b3d38c43bca34ebde0f1c32ad7832b6db2d2e06078ed32defa1bbb75a SHA512 5e01d225adcf4523bc8e039b9dc37dcfef177264e7f051072565e25697d0b6eea3d8aadd6f17fa51c2e39bfc861f9f0fb6275bc077b9916f37e743087ed446df
 DIST kubernetes-1.36.1.tar.gz 40596408 BLAKE2B 8316541a245a42be40fff845028e35e7fa5f9103460c0029e1205da8bed4d82d726a5c1b9542348b1822c464e04a18fce24d838cfb29fda4301bb8e60a079e04 SHA512 348d91a1e1068ee55a302ce1224b4d6db3d764d96595cdf0f46b31be4e0c57d8dbd29dd32aa23bbd6436e39dc0326f2a8c89ee660c44b38b3387636717be5422
+DIST kubernetes-1.37.0.tar.gz 45558262 BLAKE2B 7663006f698e8541dd5f812f6f06a3a3e996b8282b82c00fec3262ae3b216b720cfcf9d08fb4465f76eeec9aec7dcb725f676da856a11fb07e5248884e9da17d SHA512 45d529acbd4dea94ef345eca588732f7a7ea71184843d462c385662ad6ffcf2aa6cd1015f57b36e6f1cf7f33b19811be65b29e045ab60e09a908ef78526ea45c
diff --git a/sys-cluster/kubectl/kubectl-1.32.10.ebuild b/sys-cluster/kubectl/kubectl-1.32.10.ebuild
deleted file mode 100644
index 56f02b169b58..000000000000
--- a/sys-cluster/kubectl/kubectl-1.32.10.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2021-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module toolchain-funcs shell-completion
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="selinux"
-RESTRICT="test"
-
-BDEPEND=">=dev-lang/go-1.23.3"
-RDEPEND+=" selinux? ( sec-policy/selinux-kubernetes )"
-
-QA_PRESTRIPPED=usr/bin/kubectl
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-
-	if ! tc-is-cross-compiler; then
-		einfo "generating shell completion files"
-		_output/bin/${PN} completion bash > ${PN}.bash || die
-		_output/bin/${PN} completion zsh > ${PN}.zsh || die
-		_output/bin/${PN} completion fish > ${PN}.fish || die
-	fi
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-
-	if ! tc-is-cross-compiler; then
-		newbashcomp ${PN}.bash ${PN}
-		newzshcomp ${PN}.zsh _${PN}
-		dofishcomp ${PN}.fish
-	else
-		ewarn "Shell completion files not installed! Install them manually with '${PN} completion --help'"
-	fi
-}
diff --git a/sys-cluster/kubectl/kubectl-1.32.11.ebuild b/sys-cluster/kubectl/kubectl-1.32.11.ebuild
deleted file mode 100644
index 56f02b169b58..000000000000
--- a/sys-cluster/kubectl/kubectl-1.32.11.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2021-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module toolchain-funcs shell-completion
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="selinux"
-RESTRICT="test"
-
-BDEPEND=">=dev-lang/go-1.23.3"
-RDEPEND+=" selinux? ( sec-policy/selinux-kubernetes )"
-
-QA_PRESTRIPPED=usr/bin/kubectl
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-
-	if ! tc-is-cross-compiler; then
-		einfo "generating shell completion files"
-		_output/bin/${PN} completion bash > ${PN}.bash || die
-		_output/bin/${PN} completion zsh > ${PN}.zsh || die
-		_output/bin/${PN} completion fish > ${PN}.fish || die
-	fi
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-
-	if ! tc-is-cross-compiler; then
-		newbashcomp ${PN}.bash ${PN}
-		newzshcomp ${PN}.zsh _${PN}
-		dofishcomp ${PN}.fish
-	else
-		ewarn "Shell completion files not installed! Install them manually with '${PN} completion --help'"
-	fi
-}
diff --git a/sys-cluster/kubectl/kubectl-1.32.9.ebuild b/sys-cluster/kubectl/kubectl-1.32.9.ebuild
deleted file mode 100644
index aace01892c91..000000000000
--- a/sys-cluster/kubectl/kubectl-1.32.9.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2021-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module toolchain-funcs shell-completion
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="selinux"
-RESTRICT="test"
-
-BDEPEND=">=dev-lang/go-1.23.3"
-RDEPEND+=" selinux? ( sec-policy/selinux-kubernetes )"
-
-QA_PRESTRIPPED=usr/bin/kubectl
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-
-	if ! tc-is-cross-compiler; then
-		einfo "generating shell completion files"
-		_output/bin/${PN} completion bash > ${PN}.bash || die
-		_output/bin/${PN} completion zsh > ${PN}.zsh || die
-		_output/bin/${PN} completion fish > ${PN}.fish || die
-	fi
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-
-	if ! tc-is-cross-compiler; then
-		newbashcomp ${PN}.bash ${PN}
-		newzshcomp ${PN}.zsh _${PN}
-		dofishcomp ${PN}.fish
-	else
-		ewarn "Shell completion files not installed! Install them manually with '${PN} completion --help'"
-	fi
-}
diff --git a/sys-cluster/kubectl/kubectl-1.33.5.ebuild b/sys-cluster/kubectl/kubectl-1.33.5.ebuild
deleted file mode 100644
index d4f07a2de0ee..000000000000
--- a/sys-cluster/kubectl/kubectl-1.33.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2021-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module toolchain-funcs shell-completion
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="selinux"
-RESTRICT="test"
-
-BDEPEND=">=dev-lang/go-1.24.0"
-RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
-
-QA_PRESTRIPPED=usr/bin/kubectl
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-
-	if ! tc-is-cross-compiler; then
-		einfo "generating shell completion files"
-		_output/bin/${PN} completion bash > ${PN}.bash || die
-		_output/bin/${PN} completion zsh > ${PN}.zsh || die
-		_output/bin/${PN} completion fish > ${PN}.fish || die
-	fi
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-
-	if ! tc-is-cross-compiler; then
-		newbashcomp ${PN}.bash ${PN}
-		newzshcomp ${PN}.zsh _${PN}
-		dofishcomp ${PN}.fish
-	else
-		ewarn "Shell completion files not installed! Install them manually with '${PN} completion --help'"
-	fi
-}
diff --git a/sys-cluster/kubectl/kubectl-1.33.6.ebuild b/sys-cluster/kubectl/kubectl-1.33.6.ebuild
deleted file mode 100644
index 0b9f193d1fa8..000000000000
--- a/sys-cluster/kubectl/kubectl-1.33.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2021-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module toolchain-funcs shell-completion
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="selinux"
-RESTRICT="test"
-
-BDEPEND=">=dev-lang/go-1.24.0"
-RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
-
-QA_PRESTRIPPED=usr/bin/kubectl
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-
-	if ! tc-is-cross-compiler; then
-		einfo "generating shell completion files"
-		_output/bin/${PN} completion bash > ${PN}.bash || die
-		_output/bin/${PN} completion zsh > ${PN}.zsh || die
-		_output/bin/${PN} completion fish > ${PN}.fish || die
-	fi
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-
-	if ! tc-is-cross-compiler; then
-		newbashcomp ${PN}.bash ${PN}
-		newzshcomp ${PN}.zsh _${PN}
-		dofishcomp ${PN}.fish
-	else
-		ewarn "Shell completion files not installed! Install them manually with '${PN} completion --help'"
-	fi
-}
diff --git a/sys-cluster/kubectl/kubectl-1.33.7.ebuild b/sys-cluster/kubectl/kubectl-1.33.7.ebuild
deleted file mode 100644
index 0b9f193d1fa8..000000000000
--- a/sys-cluster/kubectl/kubectl-1.33.7.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2021-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module toolchain-funcs shell-completion
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="selinux"
-RESTRICT="test"
-
-BDEPEND=">=dev-lang/go-1.24.0"
-RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
-
-QA_PRESTRIPPED=usr/bin/kubectl
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-
-	if ! tc-is-cross-compiler; then
-		einfo "generating shell completion files"
-		_output/bin/${PN} completion bash > ${PN}.bash || die
-		_output/bin/${PN} completion zsh > ${PN}.zsh || die
-		_output/bin/${PN} completion fish > ${PN}.fish || die
-	fi
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-
-	if ! tc-is-cross-compiler; then
-		newbashcomp ${PN}.bash ${PN}
-		newzshcomp ${PN}.zsh _${PN}
-		dofishcomp ${PN}.fish
-	else
-		ewarn "Shell completion files not installed! Install them manually with '${PN} completion --help'"
-	fi
-}
diff --git a/sys-cluster/kubectl/kubectl-1.34.1.ebuild b/sys-cluster/kubectl/kubectl-1.34.1.ebuild
deleted file mode 100644
index db57a162ce4f..000000000000
--- a/sys-cluster/kubectl/kubectl-1.34.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2021-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module toolchain-funcs shell-completion
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="selinux"
-RESTRICT="test"
-
-BDEPEND=">=dev-lang/go-1.24.6"
-RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
-
-QA_PRESTRIPPED=usr/bin/kubectl
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-
-	if ! tc-is-cross-compiler; then
-		einfo "generating shell completion files"
-		_output/bin/${PN} completion bash > ${PN}.bash || die
-		_output/bin/${PN} completion zsh > ${PN}.zsh || die
-		_output/bin/${PN} completion fish > ${PN}.fish || die
-	fi
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-
-	if ! tc-is-cross-compiler; then
-		newbashcomp ${PN}.bash ${PN}
-		newzshcomp ${PN}.zsh _${PN}
-		dofishcomp ${PN}.fish
-	else
-		ewarn "Shell completion files not installed! Install them manually with '${PN} completion --help'"
-	fi
-}
diff --git a/sys-cluster/kubectl/kubectl-1.34.2.ebuild b/sys-cluster/kubectl/kubectl-1.34.2.ebuild
deleted file mode 100644
index 8b0407cb8cf0..000000000000
--- a/sys-cluster/kubectl/kubectl-1.34.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2021-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module toolchain-funcs shell-completion
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="selinux"
-RESTRICT="test"
-
-BDEPEND=">=dev-lang/go-1.24.6"
-RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
-
-QA_PRESTRIPPED=usr/bin/kubectl
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-
-	if ! tc-is-cross-compiler; then
-		einfo "generating shell completion files"
-		_output/bin/${PN} completion bash > ${PN}.bash || die
-		_output/bin/${PN} completion zsh > ${PN}.zsh || die
-		_output/bin/${PN} completion fish > ${PN}.fish || die
-	fi
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-
-	if ! tc-is-cross-compiler; then
-		newbashcomp ${PN}.bash ${PN}
-		newzshcomp ${PN}.zsh _${PN}
-		dofishcomp ${PN}.fish
-	else
-		ewarn "Shell completion files not installed! Install them manually with '${PN} completion --help'"
-	fi
-}
diff --git a/sys-cluster/kubectl/kubectl-1.34.3.ebuild b/sys-cluster/kubectl/kubectl-1.34.3.ebuild
deleted file mode 100644
index 8b0407cb8cf0..000000000000
--- a/sys-cluster/kubectl/kubectl-1.34.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2021-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module toolchain-funcs shell-completion
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="selinux"
-RESTRICT="test"
-
-BDEPEND=">=dev-lang/go-1.24.6"
-RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
-
-QA_PRESTRIPPED=usr/bin/kubectl
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-
-	if ! tc-is-cross-compiler; then
-		einfo "generating shell completion files"
-		_output/bin/${PN} completion bash > ${PN}.bash || die
-		_output/bin/${PN} completion zsh > ${PN}.zsh || die
-		_output/bin/${PN} completion fish > ${PN}.fish || die
-	fi
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-
-	if ! tc-is-cross-compiler; then
-		newbashcomp ${PN}.bash ${PN}
-		newzshcomp ${PN}.zsh _${PN}
-		dofishcomp ${PN}.fish
-	else
-		ewarn "Shell completion files not installed! Install them manually with '${PN} completion --help'"
-	fi
-}
diff --git a/sys-cluster/kubectl/kubectl-1.37.0.ebuild b/sys-cluster/kubectl/kubectl-1.37.0.ebuild
new file mode 100644
index 000000000000..ab0cc6a1c9db
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.37.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2021-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-env go-module shell-completion sysroot
+
+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"
+S=${WORKDIR}/kubernetes-${PV}
+
+LICENSE="Apache-2.0"
+# Dependent licenses
+LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+RESTRICT="test"
+
+BDEPEND=">=dev-lang/go-1.26.1"
+
+QA_PRESTRIPPED=usr/bin/kubectl
+
+src_compile() {
+	local GOOS=$(go-env_goos)
+
+	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
+		KUBE_BUILD_PLATFORMS="${GOOS}/${GOARCH}" KUBE_${GOOS@U}_${GOARCH@U}_CC="${CC}" \
+		WHAT=cmd/${PN}
+
+	bin=_output/local/bin/${GOOS}/${GOARCH}/${PN}
+
+	einfo "generating shell completion files"
+	sysroot_try_run_prefixed ${bin} completion bash > ${PN}.bash || die
+	sysroot_try_run_prefixed ${bin} completion zsh > ${PN}.zsh || die
+	sysroot_try_run_prefixed ${bin} completion fish > ${PN}.fish || die
+}
+
+src_install() {
+	dobin ${bin}
+
+	[[ -s ${PN}.bash ]] && newbashcomp ${PN}.bash ${PN}
+	[[ -s ${PN}.zsh ]] && newzshcomp ${PN}.zsh _${PN}
+	[[ -s ${PN}.fish ]] && dofishcomp ${PN}.fish
+}
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index 3599ec0959a3..7fedcda4ba13 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -1,11 +1,3 @@
-DIST kubernetes-1.32.10.tar.gz 36387593 BLAKE2B 36d612cb52ad38e884db4195d94ae94e9395f818fba1d27aca2b2d5aa286d100c3f6eb54f3d8a50863f264f197c035b8985f71dff4ff0cd5d006fd5202517f82 SHA512 6d7737d1142af13359eda2d8f17717e4046cddd249b45f7d333c9b7e99330b6f1de36a735f700056161a751c980c625f35f85019ada9c198c4f9a90f8071d2d4
-DIST kubernetes-1.32.11.tar.gz 36398817 BLAKE2B 63103be0387c175e22c877c7edf1f68cbae28cbfade09ddb5a735b9ed27239a0593a10346424dbf4129cc15786236f585d37f52b2459c29f0c332e4f4abe7965 SHA512 a7ff80d340f83f1bc3a0d1666fe931d00ace63417159bbfd683b90d7b1345b1ee5d52967931b7dfa41cf196877b50f00ddde266a2d1f0d9a4f20fdcb974e3d04
-DIST kubernetes-1.32.9.tar.gz 36381108 BLAKE2B a617404aab203cf2b11c1adf1e60fe326f474a74e0caea04dcb001f40b8a0552b5c1411630d379ac5bcb22220833c64bc86f0c1a36e6c16c6b2eb422c0af4bcc SHA512 aad8538f6331b1d3e1bf7d19a8ce15b4bf0cbffc3a71f0bd09fb04e34ad25ddc70186b06f88668dd3f4008a8d4bb3b1421d20e21f029b9be4cffd2c3f64ca22b
-DIST kubernetes-1.33.5.tar.gz 37091266 BLAKE2B e7c2093a1e96fc82156895f40f4f5e13e65def5918f9487ce386c70f3364da1bd43d8322c29e045bfa0d2675797b882fb689ed777e3fc90c1fcd69724b9a9790 SHA512 bd5d3a95b03df672b9371b53bb7410ce1fba7a70be4a647044429828c3eb50ac5267db21bd7ddf1b15aec1476d782d77124be752109b79c283cb513a0ab79359
-DIST kubernetes-1.33.6.tar.gz 37104539 BLAKE2B d4bf3ba1499073fe91a5007e9dfa2bcf282ab799794a17ef67e677321515d4e81628f9cf8a147bd7aa4a2b18b35b47d03902cfbbde148079f2c3daa1e5218ba9 SHA512 d20b142dc41350c6fcc4b84e79f3c0982408de396c2fcfb4a1e34d928f2e334f40ee7ebce37147d4bab6be8d31468c5bf0723433f8ede353a04d2b06f88b1014
-DIST kubernetes-1.33.7.tar.gz 37110661 BLAKE2B 365043c0b83d0c45f8cf254567141662eae62c8e1abbb60f3badf29e9bfff6ce7c0e2f449aba28fe47f0c40a63e74d2c22c78ec586c2cb18cad33517b9abef70 SHA512 720c552292445e52b8d669b740c7000ac4a8e8c420fee014da1b3468569c5f401ccc30f33d14c11dd523ceeb2ce70fd7ce08f87f5cb8c2e731e27208cd9de48e
-DIST kubernetes-1.34.1.tar.gz 38057175 BLAKE2B 3eec25d42d7d89e3a8cbe45c5979ab72441444f55b93c0a72c0c41941feef3254577cdc287748ce0bd5ba4726373635a9a14f2dbaedef18088d70c8fd5cdbfd7 SHA512 97f8bb4cbbd12c1100d62faa2205388ee6b7834778c381bf3d658bc056be43e13cc63fa7df487e5305b3a162439f1ebe06226da1dd824181154d0b8f3b63b764
-DIST kubernetes-1.34.2.tar.gz 38080420 BLAKE2B 4d70f30c91449771620e841db325be01246f3ef94506666549197a373ce2e8d998fadb50596db55e74c2870b6b26cce2a2a1ae0aba95451ad47db91035831e43 SHA512 57de82cc5994a29956b2281f94f79a659b7c7a5e664aa931df403201793a91b8dba9642898e88f5ce2093a182359dc369cd0e44e1e5295dc625dbfa881190633
-DIST kubernetes-1.34.3.tar.gz 38087990 BLAKE2B f9a8ab54f9d76b6d1b7cee119c1d22f8e8387629730407eecec5997de9cc1fe506d7cd9ddc5bb1fdc415474523d55543c1be82b7198967f11b43bc53fc26ec4e SHA512 c1ced5e2b35c4809a0f9aa538cd1daaa0105cc4eb28df0a2cf0c546694573ca7dace8413ce2c9a74e957fd76de71ea2c2e5f0a9eb050e27207e31d7ed1ae42c8
 DIST kubernetes-1.35.0.tar.gz 42076423 BLAKE2B ee0ff9c0a638918cc04ff2b55d2acea124f701b9e474b898e70bd3341333b3bf63750e07692dde0350721c3367e87bd397623b0871d0b577e9a0d8059ebfcfc5 SHA512 7bb55b41f0243bc42cf1fd77302ce780f802021ef89292f55c981261c5ed8774eacbaaf233e71f5f94bec35035eaa725f27e286b6dbba5a0f20da8f88bc061ac
 DIST kubernetes-1.36.1.tar.gz 40596408 BLAKE2B 8316541a245a42be40fff845028e35e7fa5f9103460c0029e1205da8bed4d82d726a5c1b9542348b1822c464e04a18fce24d838cfb29fda4301bb8e60a079e04 SHA512 348d91a1e1068ee55a302ce1224b4d6db3d764d96595cdf0f46b31be4e0c57d8dbd29dd32aa23bbd6436e39dc0326f2a8c89ee660c44b38b3387636717be5422
+DIST kubernetes-1.37.0.tar.gz 45558262 BLAKE2B 7663006f698e8541dd5f812f6f06a3a3e996b8282b82c00fec3262ae3b216b720cfcf9d08fb4465f76eeec9aec7dcb725f676da856a11fb07e5248884e9da17d SHA512 45d529acbd4dea94ef345eca588732f7a7ea71184843d462c385662ad6ffcf2aa6cd1015f57b36e6f1cf7f33b19811be65b29e045ab60e09a908ef78526ea45c
diff --git a/sys-cluster/kubelet/kubelet-1.32.11.ebuild b/sys-cluster/kubelet/kubelet-1.32.11.ebuild
deleted file mode 100644
index 669fc674b86b..000000000000
--- a/sys-cluster/kubelet/kubelet-1.32.11.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="selinux"
-RESTRICT="test"
-
-RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
-BDEPEND=">=dev-lang/go-1.23.3"
-
-QA_PRESTRIPPED=usr/bin/kubelet
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		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.32.9.ebuild b/sys-cluster/kubelet/kubelet-1.32.9.ebuild
deleted file mode 100644
index 631d525c4d6e..000000000000
--- a/sys-cluster/kubelet/kubelet-1.32.9.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="selinux"
-RESTRICT="test"
-
-RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
-BDEPEND=">=dev-lang/go-1.23.3"
-
-QA_PRESTRIPPED=usr/bin/kubelet
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		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.33.5.ebuild b/sys-cluster/kubelet/kubelet-1.33.5.ebuild
deleted file mode 100644
index b54906eeba4d..000000000000
--- a/sys-cluster/kubelet/kubelet-1.33.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="selinux"
-RESTRICT="test"
-
-RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
-BDEPEND=">=dev-lang/go-1.24.0"
-
-QA_PRESTRIPPED=usr/bin/kubelet
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		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.33.6.ebuild b/sys-cluster/kubelet/kubelet-1.33.6.ebuild
deleted file mode 100644
index 400fb6a9e3e1..000000000000
--- a/sys-cluster/kubelet/kubelet-1.33.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="selinux"
-RESTRICT="test"
-
-RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
-BDEPEND=">=dev-lang/go-1.24.0"
-
-QA_PRESTRIPPED=usr/bin/kubelet
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		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.33.7.ebuild b/sys-cluster/kubelet/kubelet-1.33.7.ebuild
deleted file mode 100644
index 400fb6a9e3e1..000000000000
--- a/sys-cluster/kubelet/kubelet-1.33.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="selinux"
-RESTRICT="test"
-
-RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
-BDEPEND=">=dev-lang/go-1.24.0"
-
-QA_PRESTRIPPED=usr/bin/kubelet
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		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.34.1.ebuild b/sys-cluster/kubelet/kubelet-1.34.1.ebuild
deleted file mode 100644
index 77b070ff348d..000000000000
--- a/sys-cluster/kubelet/kubelet-1.34.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="selinux"
-RESTRICT="test"
-
-RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
-BDEPEND=">=dev-lang/go-1.24.6"
-
-QA_PRESTRIPPED=usr/bin/kubelet
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		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.34.2.ebuild b/sys-cluster/kubelet/kubelet-1.34.2.ebuild
deleted file mode 100644
index d84bb0b73093..000000000000
--- a/sys-cluster/kubelet/kubelet-1.34.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="selinux"
-RESTRICT="test"
-
-RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
-BDEPEND=">=dev-lang/go-1.24.6"
-
-QA_PRESTRIPPED=usr/bin/kubelet
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		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.34.3.ebuild b/sys-cluster/kubelet/kubelet-1.34.3.ebuild
deleted file mode 100644
index d84bb0b73093..000000000000
--- a/sys-cluster/kubelet/kubelet-1.34.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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"
-S=${WORKDIR}/kubernetes-${PV}
-
-LICENSE="Apache-2.0"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="selinux"
-RESTRICT="test"
-
-RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
-BDEPEND=">=dev-lang/go-1.24.6"
-
-QA_PRESTRIPPED=usr/bin/kubelet
-
-src_compile() {
-	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		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.32.10.ebuild b/sys-cluster/kubelet/kubelet-1.37.0.ebuild
index 669fc674b86b..22c67c698fc9 100644
--- a/sys-cluster/kubelet/kubelet-1.32.10.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.37.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit go-module systemd
+inherit go-env go-module shell-completion sysroot systemd
 
 DESCRIPTION="Kubernetes Node Agent"
 HOMEPAGE="https://kubernetes.io"
@@ -19,17 +19,32 @@ IUSE="selinux"
 RESTRICT="test"
 
 RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
-BDEPEND=">=dev-lang/go-1.23.3"
+BDEPEND=">=dev-lang/go-1.26.0"
 
 QA_PRESTRIPPED=usr/bin/kubelet
 
 src_compile() {
+	local GOOS=$(go-env_goos)
+
 	emake -j1 GOFLAGS="${GOFLAGS}" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
+		KUBE_BUILD_PLATFORMS="${GOOS}/${GOARCH}" KUBE_${GOOS@U}_${GOARCH@U}_CC="${CC}" \
 		WHAT=cmd/${PN}
+
+	bin=_output/local/bin/${GOOS}/${GOARCH}/${PN}
+
+	einfo "generating shell completion files"
+	sysroot_try_run_prefixed ${bin} completion bash > ${PN}.bash || die
+	sysroot_try_run_prefixed ${bin} completion zsh > ${PN}.zsh || die
+	sysroot_try_run_prefixed ${bin} completion fish > ${PN}.fish || die
 }
 
 src_install() {
-	dobin _output/bin/${PN}
+	dobin ${bin}
+
+	[[ -s ${PN}.bash ]] && newbashcomp ${PN}.bash ${PN}
+	[[ -s ${PN}.zsh ]] && newzshcomp ${PN}.zsh _${PN}
+	[[ -s ${PN}.fish ]] && dofishcomp ${PN}.fish
+
 	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}