gentoo auto-resync : 24:10:2024 - 04:04:24

27 files changed, 599 insertions, 77 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 745de67affea..dd57b7347ef5 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index 0c9907f1c61d..99158c2c48ad 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -10,7 +10,9 @@ DIST kubernetes-1.29.8.tar.gz 41200139 BLAKE2B 82fe26e74fe2aea6fa854c4e018561ccb
 DIST kubernetes-1.30.2.tar.gz 39581297 BLAKE2B 7d1f303d21b870ad29d2cac96626edc3a19addedd544624e5cd9f42beb368e0959e499e5fd88bc7ee491a01cd29573115d1e77dfb73098ea88204a2614f7b635 SHA512 73f87da96fae889805e3e8fe644228159746c139e907755ec8654dd2fe46bf4561c6c5bb015bd95a6a1f5ba9be2e193aea9bb43b37ce1d67fb4ba42a50b9dac8
 DIST kubernetes-1.30.3.tar.gz 39587795 BLAKE2B ba6d819866247dd0d26cb014857d238075dc6beb9cfacfc4ecaccab9d88c4295189309d62e4856c0f4f6c57762b14bfa16fb6bd96548cb88f69dd350e00dbf59 SHA512 303c823f74ccc5c1685ec16ba3de9dbbe9614ddf19e279e43ee392a4ef04ee68400a3e0c2a839d6a3f43712fab426084037ed871e3e4caafe8b37999fd83b73a
 DIST kubernetes-1.30.4.tar.gz 39602012 BLAKE2B 36bb038a2c64ae9252e002a11b2e08930a48471022b00f45511c7b869c76f2de5b941207ee05b57a824a8b4a84b475c376ffb856e5486b532d1cd7413a79500a SHA512 09a562deb763d43578cf345d62be145ccc92e77be228b10184b1b2909716eed8cf2b0c20f6add195347653c2f42ed1c749a5f1c03a9b7dd0a5e0f1e21f32adc0
+DIST kubernetes-1.30.6.tar.gz 39612960 BLAKE2B cfc0c062348b703bce584f7b97b178f0f01b907b05fef81ccb61bbb17460b9b12a430c8606529d01afb148e75190cfad12b0dd798aa316be7ba3e78c8cef24f1 SHA512 c4b5ebb08dbd9daeac2f4da5a1b93c397473e7cf12439291ce80e43b4aae1d233c6e980a080b5c8aaa12e296aa04e068f8b00b23386b23802b99c2ce8f42c800
 DIST kubernetes-1.31.0.tar.gz 39255058 BLAKE2B 65ad06c8e57eec7d1affce4d263fe0d6ca4c75543b658372efd37a84f4af7817d7f1134ca92102666e6df140645d7421d8927c1c50726199002462f58075fb8b SHA512 7848802bbd6d6818e55dca4741f4cf32ebd83b2f2f7914323235e0d016ed142feeea16556f6d5ffc7c8a57d122067cfc04e2c1e85368c1a562085e4f479b26c2
+DIST kubernetes-1.31.1.tar.gz 36559502 BLAKE2B ca76103fe53019b27d3b88ae61edc9e28d8da80d289e855059394a60e409e3e3045d50c9f73ae449a1b8cbf5ffb6d9d0f15974b7f0175be20f40fa8c920bff58 SHA512 588d3a371d18855165685a291936da4903b194d4b95f77bed8114ce8659c7657a8261f6313f1cacdc9acac492d46bc6d13213a9147fa04c050bf6afd5aba994c
 EBUILD kube-apiserver-1.28.11.ebuild 1011 BLAKE2B b9b690506e1fa8144d04629569261617662fa79c6ef9642eb3653f08ffbf9b607507d3ab0215e61422c2a9092edd5195dbbd5a3f94129de8b804ed2b022b601c SHA512 33a20363d21b508a277b7afb8170a80da493f6c7da0f064d4bb123a283376279ad349148fa4b610f560b8e945ce714f8ef192b71e19d837fe131e01d2fd5ff57
 EBUILD kube-apiserver-1.28.12.ebuild 1011 BLAKE2B b9b690506e1fa8144d04629569261617662fa79c6ef9642eb3653f08ffbf9b607507d3ab0215e61422c2a9092edd5195dbbd5a3f94129de8b804ed2b022b601c SHA512 33a20363d21b508a277b7afb8170a80da493f6c7da0f064d4bb123a283376279ad349148fa4b610f560b8e945ce714f8ef192b71e19d837fe131e01d2fd5ff57
 EBUILD kube-apiserver-1.28.13.ebuild 1011 BLAKE2B b9b690506e1fa8144d04629569261617662fa79c6ef9642eb3653f08ffbf9b607507d3ab0215e61422c2a9092edd5195dbbd5a3f94129de8b804ed2b022b601c SHA512 33a20363d21b508a277b7afb8170a80da493f6c7da0f064d4bb123a283376279ad349148fa4b610f560b8e945ce714f8ef192b71e19d837fe131e01d2fd5ff57
@@ -20,5 +22,7 @@ EBUILD kube-apiserver-1.29.8.ebuild 1014 BLAKE2B e1a16fab69deb688ffffef185f286ce
 EBUILD kube-apiserver-1.30.2.ebuild 1013 BLAKE2B 085c9087b14001a9b4b56bf976fb985009b9bc3ab5b3eb571453edb419fcb0080d91d555875ef8bfa32d17b1a865141ad8f48c32a092d68cb23921ba7739393d SHA512 42a488765bc4303b8c28bd34e80d13935a67f82ffda2d6fe34db460e0802ade45c5b44f7f00d1d9d07a275c6655c5dd6c3cb9e42a84ec6671a53da6026fc0a63
 EBUILD kube-apiserver-1.30.3.ebuild 1013 BLAKE2B 085c9087b14001a9b4b56bf976fb985009b9bc3ab5b3eb571453edb419fcb0080d91d555875ef8bfa32d17b1a865141ad8f48c32a092d68cb23921ba7739393d SHA512 42a488765bc4303b8c28bd34e80d13935a67f82ffda2d6fe34db460e0802ade45c5b44f7f00d1d9d07a275c6655c5dd6c3cb9e42a84ec6671a53da6026fc0a63
 EBUILD kube-apiserver-1.30.4.ebuild 1014 BLAKE2B 9d5ed496a96d9cf0b689d96723c0950c48e7fed440f883ded9c9e62ca21120ee0f9e4364d2bdfed11061eba34232a6922d2b9f6123bd84ed6f40e32fa16eae6e SHA512 450a54b7ddd910aee02d7b100111c89e67de4dcdb96d08d6796da3ef5d77af989fdf0f289f51b7fbea81bbbe89b4a3ce5fb3d976f14843eb277e7fa7fd42f84a
+EBUILD kube-apiserver-1.30.6.ebuild 1014 BLAKE2B 9d5ed496a96d9cf0b689d96723c0950c48e7fed440f883ded9c9e62ca21120ee0f9e4364d2bdfed11061eba34232a6922d2b9f6123bd84ed6f40e32fa16eae6e SHA512 450a54b7ddd910aee02d7b100111c89e67de4dcdb96d08d6796da3ef5d77af989fdf0f289f51b7fbea81bbbe89b4a3ce5fb3d976f14843eb277e7fa7fd42f84a
 EBUILD kube-apiserver-1.31.0.ebuild 1014 BLAKE2B 65d2694ae5fc0eafae67a824516df81e1df45ee9f17b2a1c83e28d5f12cd99394078a222adecdf508a56bc46f8c07ffab6abdb61ab60837fca94d5f3c8223777 SHA512 59a654d78b1452a186b01a9c68b5eee1b9d5acce8e20c0d76f0f5ef5bbacbb8893fa3c659a3b3844e9443f8d059f8aa77f23bc40badd6d8c13be3b6c173d08dc
+EBUILD kube-apiserver-1.31.1.ebuild 1014 BLAKE2B 65d2694ae5fc0eafae67a824516df81e1df45ee9f17b2a1c83e28d5f12cd99394078a222adecdf508a56bc46f8c07ffab6abdb61ab60837fca94d5f3c8223777 SHA512 59a654d78b1452a186b01a9c68b5eee1b9d5acce8e20c0d76f0f5ef5bbacbb8893fa3c659a3b3844e9443f8d059f8aa77f23bc40badd6d8c13be3b6c173d08dc
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.30.6.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.30.6.ebuild
new file mode 100644
index 000000000000..1e1f4ab1cbbe
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.30.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="
+	acct-group/kube-apiserver
+	acct-user/kube-apiserver"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-lang/go-1.21.6"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fNO-PIC ' '')" FORCE_HOST_GO="yes" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.31.1.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.31.1.ebuild
new file mode 100644
index 000000000000..961d6df18f5f
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.31.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="
+	acct-group/kube-apiserver
+	acct-user/kube-apiserver"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-lang/go-1.23.0"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fNO-PIC ' '')" FORCE_HOST_GO="yes" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index 7089287407ee..bb12d22cc2ec 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -10,7 +10,9 @@ DIST kubernetes-1.29.8.tar.gz 41200139 BLAKE2B 82fe26e74fe2aea6fa854c4e018561ccb
 DIST kubernetes-1.30.2.tar.gz 39581297 BLAKE2B 7d1f303d21b870ad29d2cac96626edc3a19addedd544624e5cd9f42beb368e0959e499e5fd88bc7ee491a01cd29573115d1e77dfb73098ea88204a2614f7b635 SHA512 73f87da96fae889805e3e8fe644228159746c139e907755ec8654dd2fe46bf4561c6c5bb015bd95a6a1f5ba9be2e193aea9bb43b37ce1d67fb4ba42a50b9dac8
 DIST kubernetes-1.30.3.tar.gz 39587795 BLAKE2B ba6d819866247dd0d26cb014857d238075dc6beb9cfacfc4ecaccab9d88c4295189309d62e4856c0f4f6c57762b14bfa16fb6bd96548cb88f69dd350e00dbf59 SHA512 303c823f74ccc5c1685ec16ba3de9dbbe9614ddf19e279e43ee392a4ef04ee68400a3e0c2a839d6a3f43712fab426084037ed871e3e4caafe8b37999fd83b73a
 DIST kubernetes-1.30.4.tar.gz 39602012 BLAKE2B 36bb038a2c64ae9252e002a11b2e08930a48471022b00f45511c7b869c76f2de5b941207ee05b57a824a8b4a84b475c376ffb856e5486b532d1cd7413a79500a SHA512 09a562deb763d43578cf345d62be145ccc92e77be228b10184b1b2909716eed8cf2b0c20f6add195347653c2f42ed1c749a5f1c03a9b7dd0a5e0f1e21f32adc0
+DIST kubernetes-1.30.6.tar.gz 39612960 BLAKE2B cfc0c062348b703bce584f7b97b178f0f01b907b05fef81ccb61bbb17460b9b12a430c8606529d01afb148e75190cfad12b0dd798aa316be7ba3e78c8cef24f1 SHA512 c4b5ebb08dbd9daeac2f4da5a1b93c397473e7cf12439291ce80e43b4aae1d233c6e980a080b5c8aaa12e296aa04e068f8b00b23386b23802b99c2ce8f42c800
 DIST kubernetes-1.31.0.tar.gz 39255058 BLAKE2B 65ad06c8e57eec7d1affce4d263fe0d6ca4c75543b658372efd37a84f4af7817d7f1134ca92102666e6df140645d7421d8927c1c50726199002462f58075fb8b SHA512 7848802bbd6d6818e55dca4741f4cf32ebd83b2f2f7914323235e0d016ed142feeea16556f6d5ffc7c8a57d122067cfc04e2c1e85368c1a562085e4f479b26c2
+DIST kubernetes-1.31.1.tar.gz 36559502 BLAKE2B ca76103fe53019b27d3b88ae61edc9e28d8da80d289e855059394a60e409e3e3045d50c9f73ae449a1b8cbf5ffb6d9d0f15974b7f0175be20f40fa8c920bff58 SHA512 588d3a371d18855165685a291936da4903b194d4b95f77bed8114ce8659c7657a8261f6313f1cacdc9acac492d46bc6d13213a9147fa04c050bf6afd5aba994c
 EBUILD kube-controller-manager-1.28.11.ebuild 1012 BLAKE2B e63c992c8be88abe66bcc019b07a8d95c7181d70d416fcce987a29bf10395ec510bb0b57e7e7970e9e53c3e84b21ca9ad247c7c1404a6d5b6d5d90d2a50960e7 SHA512 114daea8acfe8507672be3d0a3e464182a15466842c12150830e57587e3fb6eb55dcaf728884474dacd454d01aca474796a93f5c18d227f2060c432826712699
 EBUILD kube-controller-manager-1.28.12.ebuild 1012 BLAKE2B e63c992c8be88abe66bcc019b07a8d95c7181d70d416fcce987a29bf10395ec510bb0b57e7e7970e9e53c3e84b21ca9ad247c7c1404a6d5b6d5d90d2a50960e7 SHA512 114daea8acfe8507672be3d0a3e464182a15466842c12150830e57587e3fb6eb55dcaf728884474dacd454d01aca474796a93f5c18d227f2060c432826712699
 EBUILD kube-controller-manager-1.28.13.ebuild 1012 BLAKE2B e63c992c8be88abe66bcc019b07a8d95c7181d70d416fcce987a29bf10395ec510bb0b57e7e7970e9e53c3e84b21ca9ad247c7c1404a6d5b6d5d90d2a50960e7 SHA512 114daea8acfe8507672be3d0a3e464182a15466842c12150830e57587e3fb6eb55dcaf728884474dacd454d01aca474796a93f5c18d227f2060c432826712699
@@ -20,5 +22,7 @@ EBUILD kube-controller-manager-1.29.8.ebuild 1013 BLAKE2B 1da7acccda20c292bb49ff
 EBUILD kube-controller-manager-1.30.2.ebuild 1012 BLAKE2B 80ff569cf14f9ad37d486b000854b27e34598a4f2bb9099950c135c44d468faaefd729a8704dc011333e5480244df064ede3581628f8e7b242c0cc6a100c5a85 SHA512 5334ddd4ba7c70bb085fb41234469a25b04b4d259e41e87e618662bf3683b9567c775e89d895d7160373088ace4aa43d6fb2909c219aa84050cdd16a49b9bbef
 EBUILD kube-controller-manager-1.30.3.ebuild 1012 BLAKE2B 80ff569cf14f9ad37d486b000854b27e34598a4f2bb9099950c135c44d468faaefd729a8704dc011333e5480244df064ede3581628f8e7b242c0cc6a100c5a85 SHA512 5334ddd4ba7c70bb085fb41234469a25b04b4d259e41e87e618662bf3683b9567c775e89d895d7160373088ace4aa43d6fb2909c219aa84050cdd16a49b9bbef
 EBUILD kube-controller-manager-1.30.4.ebuild 1013 BLAKE2B 3f357a3dd2cedb979cf719ac72002ece4d94bbbfe92a2e8659a0d7b472c2005dde0576f5a6edda2fd9893b0eda22c79f69dd3a96d1df6a6cab69e82d9e06386d SHA512 0da7657b7cef2b73fe0f1b5d0f4f1af78b3c0b460cc73678358bd34fad0e892a0649bdf62dfbf9c0724a7339c1bb4a19d450f7692e59c0ef251894e81962fe34
+EBUILD kube-controller-manager-1.30.6.ebuild 1013 BLAKE2B 3f357a3dd2cedb979cf719ac72002ece4d94bbbfe92a2e8659a0d7b472c2005dde0576f5a6edda2fd9893b0eda22c79f69dd3a96d1df6a6cab69e82d9e06386d SHA512 0da7657b7cef2b73fe0f1b5d0f4f1af78b3c0b460cc73678358bd34fad0e892a0649bdf62dfbf9c0724a7339c1bb4a19d450f7692e59c0ef251894e81962fe34
 EBUILD kube-controller-manager-1.31.0.ebuild 1013 BLAKE2B 6bf72a931c06e97778ed9c55a2ca6acfdc2e0e1826f5ad928e6300008a87597f1e217a29b16d8b55308fbbcfe3d4a42ca20a8dbf00ef6fe4cb819f241228f09c SHA512 0c744fb36e5076311e36b8157cb08c7429ccc67911155272b2207aa870659102af9ce672c2fce340f0d53437e8f742dbb27f09c2540e1bdc0d28c4c82b418a9f
+EBUILD kube-controller-manager-1.31.1.ebuild 1013 BLAKE2B 6bf72a931c06e97778ed9c55a2ca6acfdc2e0e1826f5ad928e6300008a87597f1e217a29b16d8b55308fbbcfe3d4a42ca20a8dbf00ef6fe4cb819f241228f09c SHA512 0c744fb36e5076311e36b8157cb08c7429ccc67911155272b2207aa870659102af9ce672c2fce340f0d53437e8f742dbb27f09c2540e1bdc0d28c4c82b418a9f
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.30.6.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.30.6.ebuild
new file mode 100644
index 000000000000..3fd35054c9f4
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.30.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-lang/go-1.21.6"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v 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}
+	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.31.1.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.31.1.ebuild
new file mode 100644
index 000000000000..656e09872f1e
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.31.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-lang/go-1.23.0"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v 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}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index ab00c2005675..0c9969a0448f 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -10,7 +10,9 @@ DIST kubernetes-1.29.8.tar.gz 41200139 BLAKE2B 82fe26e74fe2aea6fa854c4e018561ccb
 DIST kubernetes-1.30.2.tar.gz 39581297 BLAKE2B 7d1f303d21b870ad29d2cac96626edc3a19addedd544624e5cd9f42beb368e0959e499e5fd88bc7ee491a01cd29573115d1e77dfb73098ea88204a2614f7b635 SHA512 73f87da96fae889805e3e8fe644228159746c139e907755ec8654dd2fe46bf4561c6c5bb015bd95a6a1f5ba9be2e193aea9bb43b37ce1d67fb4ba42a50b9dac8
 DIST kubernetes-1.30.3.tar.gz 39587795 BLAKE2B ba6d819866247dd0d26cb014857d238075dc6beb9cfacfc4ecaccab9d88c4295189309d62e4856c0f4f6c57762b14bfa16fb6bd96548cb88f69dd350e00dbf59 SHA512 303c823f74ccc5c1685ec16ba3de9dbbe9614ddf19e279e43ee392a4ef04ee68400a3e0c2a839d6a3f43712fab426084037ed871e3e4caafe8b37999fd83b73a
 DIST kubernetes-1.30.4.tar.gz 39602012 BLAKE2B 36bb038a2c64ae9252e002a11b2e08930a48471022b00f45511c7b869c76f2de5b941207ee05b57a824a8b4a84b475c376ffb856e5486b532d1cd7413a79500a SHA512 09a562deb763d43578cf345d62be145ccc92e77be228b10184b1b2909716eed8cf2b0c20f6add195347653c2f42ed1c749a5f1c03a9b7dd0a5e0f1e21f32adc0
+DIST kubernetes-1.30.6.tar.gz 39612960 BLAKE2B cfc0c062348b703bce584f7b97b178f0f01b907b05fef81ccb61bbb17460b9b12a430c8606529d01afb148e75190cfad12b0dd798aa316be7ba3e78c8cef24f1 SHA512 c4b5ebb08dbd9daeac2f4da5a1b93c397473e7cf12439291ce80e43b4aae1d233c6e980a080b5c8aaa12e296aa04e068f8b00b23386b23802b99c2ce8f42c800
 DIST kubernetes-1.31.0.tar.gz 39255058 BLAKE2B 65ad06c8e57eec7d1affce4d263fe0d6ca4c75543b658372efd37a84f4af7817d7f1134ca92102666e6df140645d7421d8927c1c50726199002462f58075fb8b SHA512 7848802bbd6d6818e55dca4741f4cf32ebd83b2f2f7914323235e0d016ed142feeea16556f6d5ffc7c8a57d122067cfc04e2c1e85368c1a562085e4f479b26c2
+DIST kubernetes-1.31.1.tar.gz 36559502 BLAKE2B ca76103fe53019b27d3b88ae61edc9e28d8da80d289e855059394a60e409e3e3045d50c9f73ae449a1b8cbf5ffb6d9d0f15974b7f0175be20f40fa8c920bff58 SHA512 588d3a371d18855165685a291936da4903b194d4b95f77bed8114ce8659c7657a8261f6313f1cacdc9acac492d46bc6d13213a9147fa04c050bf6afd5aba994c
 EBUILD kube-proxy-1.28.11.ebuild 927 BLAKE2B 7feb28b5c1611bb4f04fcdf0df97f9025b3a10d208905a454c895fde979918b2671d00274d0cc78e4decaec0cab3e5388fe161978dd18e86376bf38564b92350 SHA512 2868246b7e4888ef45eea09849d038472ee580164598947a1d398021513d040e67cc7ccb983fbbe7596efde2ed90a1f066101d087905ba19409e0e7351dc9d0e
 EBUILD kube-proxy-1.28.12.ebuild 927 BLAKE2B 7feb28b5c1611bb4f04fcdf0df97f9025b3a10d208905a454c895fde979918b2671d00274d0cc78e4decaec0cab3e5388fe161978dd18e86376bf38564b92350 SHA512 2868246b7e4888ef45eea09849d038472ee580164598947a1d398021513d040e67cc7ccb983fbbe7596efde2ed90a1f066101d087905ba19409e0e7351dc9d0e
 EBUILD kube-proxy-1.28.13.ebuild 927 BLAKE2B 7feb28b5c1611bb4f04fcdf0df97f9025b3a10d208905a454c895fde979918b2671d00274d0cc78e4decaec0cab3e5388fe161978dd18e86376bf38564b92350 SHA512 2868246b7e4888ef45eea09849d038472ee580164598947a1d398021513d040e67cc7ccb983fbbe7596efde2ed90a1f066101d087905ba19409e0e7351dc9d0e
@@ -20,5 +22,7 @@ EBUILD kube-proxy-1.29.8.ebuild 928 BLAKE2B 5e1964735d27c898c394f89b2a7db618a3b4
 EBUILD kube-proxy-1.30.2.ebuild 927 BLAKE2B eddc57edf29131780baa0a067372b4d0dbc11b1bbb70b243ce6634ea8d5bc6b7fc7dfdca4ddcde914abcdfbd1b1728a2a9d505e6b8a265f388a388924c0f1794 SHA512 628adfa6a5e07bb7edcafaae9099e8bc5363a05844668adc5faa65de1f0c00ea7ee056ec83a62b6baccb8dbc0693f56f3de685d0ce925f4a9682461de8662bcb
 EBUILD kube-proxy-1.30.3.ebuild 927 BLAKE2B eddc57edf29131780baa0a067372b4d0dbc11b1bbb70b243ce6634ea8d5bc6b7fc7dfdca4ddcde914abcdfbd1b1728a2a9d505e6b8a265f388a388924c0f1794 SHA512 628adfa6a5e07bb7edcafaae9099e8bc5363a05844668adc5faa65de1f0c00ea7ee056ec83a62b6baccb8dbc0693f56f3de685d0ce925f4a9682461de8662bcb
 EBUILD kube-proxy-1.30.4.ebuild 928 BLAKE2B 2a8359b85be090f5fa93729e65223ceef317f49aed0f560d0560d8a8c484e8a39f81a041701c53783dc5052bd4d40ef1aed44ecf8a36d603ff969f90b8b31ef2 SHA512 c673a8b1a463f7aaab6f2885787823f9d64d2fdb84054ba086d8c4522aa7cf80cbf0e65e0dbb94c0e7f019b882318e1602963109dc9d5c47458e19a3a0a26a51
+EBUILD kube-proxy-1.30.6.ebuild 928 BLAKE2B 2a8359b85be090f5fa93729e65223ceef317f49aed0f560d0560d8a8c484e8a39f81a041701c53783dc5052bd4d40ef1aed44ecf8a36d603ff969f90b8b31ef2 SHA512 c673a8b1a463f7aaab6f2885787823f9d64d2fdb84054ba086d8c4522aa7cf80cbf0e65e0dbb94c0e7f019b882318e1602963109dc9d5c47458e19a3a0a26a51
 EBUILD kube-proxy-1.31.0.ebuild 928 BLAKE2B 14b851af4952b24d20cdfd63f097804a2e19d4b9a60f1eeb9ce7a6f357a29f7dccbff542d3ba814a66b3079b500fb461174a8f1432906f6b33360689f9f975d9 SHA512 c8f6abf22d9da44964aa05354f6c82a6af182c65c4d8c5e49f89d52153d70768ab355f199dfd397a27beee7f8e0e7ebdb0756e51a04bc5060d4e8aa699969983
+EBUILD kube-proxy-1.31.1.ebuild 928 BLAKE2B 14b851af4952b24d20cdfd63f097804a2e19d4b9a60f1eeb9ce7a6f357a29f7dccbff542d3ba814a66b3079b500fb461174a8f1432906f6b33360689f9f975d9 SHA512 c8f6abf22d9da44964aa05354f6c82a6af182c65c4d8c5e49f89d52153d70768ab355f199dfd397a27beee7f8e0e7ebdb0756e51a04bc5060d4e8aa699969983
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.30.6.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.30.6.ebuild
new file mode 100644
index 000000000000..bd858543529e
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.30.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="net-firewall/conntrack-tools"
+BDEPEND=">=dev-lang/go-1.21.6"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 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}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.31.1.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.31.1.ebuild
new file mode 100644
index 000000000000..61c67e1168d2
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.31.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="net-firewall/conntrack-tools"
+BDEPEND=">=dev-lang/go-1.23.0"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 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}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index 91057d5d91c3..a0e75f4dc28b 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -10,7 +10,9 @@ DIST kubernetes-1.29.8.tar.gz 41200139 BLAKE2B 82fe26e74fe2aea6fa854c4e018561ccb
 DIST kubernetes-1.30.2.tar.gz 39581297 BLAKE2B 7d1f303d21b870ad29d2cac96626edc3a19addedd544624e5cd9f42beb368e0959e499e5fd88bc7ee491a01cd29573115d1e77dfb73098ea88204a2614f7b635 SHA512 73f87da96fae889805e3e8fe644228159746c139e907755ec8654dd2fe46bf4561c6c5bb015bd95a6a1f5ba9be2e193aea9bb43b37ce1d67fb4ba42a50b9dac8
 DIST kubernetes-1.30.3.tar.gz 39587795 BLAKE2B ba6d819866247dd0d26cb014857d238075dc6beb9cfacfc4ecaccab9d88c4295189309d62e4856c0f4f6c57762b14bfa16fb6bd96548cb88f69dd350e00dbf59 SHA512 303c823f74ccc5c1685ec16ba3de9dbbe9614ddf19e279e43ee392a4ef04ee68400a3e0c2a839d6a3f43712fab426084037ed871e3e4caafe8b37999fd83b73a
 DIST kubernetes-1.30.4.tar.gz 39602012 BLAKE2B 36bb038a2c64ae9252e002a11b2e08930a48471022b00f45511c7b869c76f2de5b941207ee05b57a824a8b4a84b475c376ffb856e5486b532d1cd7413a79500a SHA512 09a562deb763d43578cf345d62be145ccc92e77be228b10184b1b2909716eed8cf2b0c20f6add195347653c2f42ed1c749a5f1c03a9b7dd0a5e0f1e21f32adc0
+DIST kubernetes-1.30.6.tar.gz 39612960 BLAKE2B cfc0c062348b703bce584f7b97b178f0f01b907b05fef81ccb61bbb17460b9b12a430c8606529d01afb148e75190cfad12b0dd798aa316be7ba3e78c8cef24f1 SHA512 c4b5ebb08dbd9daeac2f4da5a1b93c397473e7cf12439291ce80e43b4aae1d233c6e980a080b5c8aaa12e296aa04e068f8b00b23386b23802b99c2ce8f42c800
 DIST kubernetes-1.31.0.tar.gz 39255058 BLAKE2B 65ad06c8e57eec7d1affce4d263fe0d6ca4c75543b658372efd37a84f4af7817d7f1134ca92102666e6df140645d7421d8927c1c50726199002462f58075fb8b SHA512 7848802bbd6d6818e55dca4741f4cf32ebd83b2f2f7914323235e0d016ed142feeea16556f6d5ffc7c8a57d122067cfc04e2c1e85368c1a562085e4f479b26c2
+DIST kubernetes-1.31.1.tar.gz 36559502 BLAKE2B ca76103fe53019b27d3b88ae61edc9e28d8da80d289e855059394a60e409e3e3045d50c9f73ae449a1b8cbf5ffb6d9d0f15974b7f0175be20f40fa8c920bff58 SHA512 588d3a371d18855165685a291936da4903b194d4b95f77bed8114ce8659c7657a8261f6313f1cacdc9acac492d46bc6d13213a9147fa04c050bf6afd5aba994c
 EBUILD kube-scheduler-1.28.11.ebuild 985 BLAKE2B f6cb598a3e99ec210438c1b317f6d41dcf3bb44d7d003d9c2c206800d7b93c90b4076706fe905829905faf1f28f2eec119e87b20fc868be2b65323e3f0ffec47 SHA512 5fb02612169709cabf124bdd228f3553a9ef412a49dc28edfba6943d51f27ec4f14f0f9919a4501831ec561a1b02c24d70975a103dbd611b6663cdc4a4deaae5
 EBUILD kube-scheduler-1.28.12.ebuild 985 BLAKE2B f6cb598a3e99ec210438c1b317f6d41dcf3bb44d7d003d9c2c206800d7b93c90b4076706fe905829905faf1f28f2eec119e87b20fc868be2b65323e3f0ffec47 SHA512 5fb02612169709cabf124bdd228f3553a9ef412a49dc28edfba6943d51f27ec4f14f0f9919a4501831ec561a1b02c24d70975a103dbd611b6663cdc4a4deaae5
 EBUILD kube-scheduler-1.28.13.ebuild 985 BLAKE2B f6cb598a3e99ec210438c1b317f6d41dcf3bb44d7d003d9c2c206800d7b93c90b4076706fe905829905faf1f28f2eec119e87b20fc868be2b65323e3f0ffec47 SHA512 5fb02612169709cabf124bdd228f3553a9ef412a49dc28edfba6943d51f27ec4f14f0f9919a4501831ec561a1b02c24d70975a103dbd611b6663cdc4a4deaae5
@@ -20,5 +22,7 @@ EBUILD kube-scheduler-1.29.8.ebuild 986 BLAKE2B 3294a84c4b36ef5c2ded7a2d10318c11
 EBUILD kube-scheduler-1.30.2.ebuild 985 BLAKE2B 1d43bf13256ee356626556f920006e206294958af4a7bfe0bf9f89a3f9176ea0e531b8c31dc7aab6d8fd6a9122b0807c79d191f86345a01aa263d26b5750b383 SHA512 254428a3fa51ba60c517a4f2638ee4d6498760210a9804c76e0ddc97b8ab30e4d9ce1975aa2a8b0b51b2635ae6457be7ce2ae09bb6f77b3123b8a505bf7001f4
 EBUILD kube-scheduler-1.30.3.ebuild 985 BLAKE2B 1d43bf13256ee356626556f920006e206294958af4a7bfe0bf9f89a3f9176ea0e531b8c31dc7aab6d8fd6a9122b0807c79d191f86345a01aa263d26b5750b383 SHA512 254428a3fa51ba60c517a4f2638ee4d6498760210a9804c76e0ddc97b8ab30e4d9ce1975aa2a8b0b51b2635ae6457be7ce2ae09bb6f77b3123b8a505bf7001f4
 EBUILD kube-scheduler-1.30.4.ebuild 986 BLAKE2B 31ee68cb5803f60d7515c6377eaaabad4cc7c6a5b97c78a3d86ee148ddb2d7fb1d1b6745661ebdad5195facf2d0ce32834828f30743cb131e353df46a5d3f5f1 SHA512 71371907e9a18ed37d8aa1cb671972a28d44e9674cfa9ecf9c426f49d9d20cfae78ea4d6678551acaec6c59a2bb0be74488f7a18742af345b6ec851e7a843801
+EBUILD kube-scheduler-1.30.6.ebuild 986 BLAKE2B 31ee68cb5803f60d7515c6377eaaabad4cc7c6a5b97c78a3d86ee148ddb2d7fb1d1b6745661ebdad5195facf2d0ce32834828f30743cb131e353df46a5d3f5f1 SHA512 71371907e9a18ed37d8aa1cb671972a28d44e9674cfa9ecf9c426f49d9d20cfae78ea4d6678551acaec6c59a2bb0be74488f7a18742af345b6ec851e7a843801
 EBUILD kube-scheduler-1.31.0.ebuild 986 BLAKE2B 896a7d7a6ec333e2ff5cbbdef11cb428ebb539f8f20cdfe5630222c48ca37a22fce23864bc76c8287901e57293ba1f1b5834092be9660ab637c617d0643c1656 SHA512 1cf8dafc8d4b3e40b2cc9f30ec7b3753c2a726be682cc80a7c301365a804f6f3e29563d719bec425a47d8f09c4d540696cd5a8187a50e6e0c194cfcb334b84ff
+EBUILD kube-scheduler-1.31.1.ebuild 986 BLAKE2B 896a7d7a6ec333e2ff5cbbdef11cb428ebb539f8f20cdfe5630222c48ca37a22fce23864bc76c8287901e57293ba1f1b5834092be9660ab637c617d0643c1656 SHA512 1cf8dafc8d4b3e40b2cc9f30ec7b3753c2a726be682cc80a7c301365a804f6f3e29563d719bec425a47d8f09c4d540696cd5a8187a50e6e0c194cfcb334b84ff
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.30.6.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.30.6.ebuild
new file mode 100644
index 000000000000..d3b8c1135b94
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.30.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-scheduler
+	acct-user/kube-scheduler"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-lang/go-1.21.6"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 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}
+	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.31.1.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.31.1.ebuild
new file mode 100644
index 000000000000..a3f60b02fee1
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.31.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-scheduler
+	acct-user/kube-scheduler"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-lang/go-1.23.0"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 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}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index 24300559e3f5..b1d24ab6b072 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -7,7 +7,9 @@ DIST kubernetes-1.29.8.tar.gz 41200139 BLAKE2B 82fe26e74fe2aea6fa854c4e018561ccb
 DIST kubernetes-1.30.2.tar.gz 39581297 BLAKE2B 7d1f303d21b870ad29d2cac96626edc3a19addedd544624e5cd9f42beb368e0959e499e5fd88bc7ee491a01cd29573115d1e77dfb73098ea88204a2614f7b635 SHA512 73f87da96fae889805e3e8fe644228159746c139e907755ec8654dd2fe46bf4561c6c5bb015bd95a6a1f5ba9be2e193aea9bb43b37ce1d67fb4ba42a50b9dac8
 DIST kubernetes-1.30.3.tar.gz 39587795 BLAKE2B ba6d819866247dd0d26cb014857d238075dc6beb9cfacfc4ecaccab9d88c4295189309d62e4856c0f4f6c57762b14bfa16fb6bd96548cb88f69dd350e00dbf59 SHA512 303c823f74ccc5c1685ec16ba3de9dbbe9614ddf19e279e43ee392a4ef04ee68400a3e0c2a839d6a3f43712fab426084037ed871e3e4caafe8b37999fd83b73a
 DIST kubernetes-1.30.4.tar.gz 39602012 BLAKE2B 36bb038a2c64ae9252e002a11b2e08930a48471022b00f45511c7b869c76f2de5b941207ee05b57a824a8b4a84b475c376ffb856e5486b532d1cd7413a79500a SHA512 09a562deb763d43578cf345d62be145ccc92e77be228b10184b1b2909716eed8cf2b0c20f6add195347653c2f42ed1c749a5f1c03a9b7dd0a5e0f1e21f32adc0
+DIST kubernetes-1.30.6.tar.gz 39612960 BLAKE2B cfc0c062348b703bce584f7b97b178f0f01b907b05fef81ccb61bbb17460b9b12a430c8606529d01afb148e75190cfad12b0dd798aa316be7ba3e78c8cef24f1 SHA512 c4b5ebb08dbd9daeac2f4da5a1b93c397473e7cf12439291ce80e43b4aae1d233c6e980a080b5c8aaa12e296aa04e068f8b00b23386b23802b99c2ce8f42c800
 DIST kubernetes-1.31.0.tar.gz 39255058 BLAKE2B 65ad06c8e57eec7d1affce4d263fe0d6ca4c75543b658372efd37a84f4af7817d7f1134ca92102666e6df140645d7421d8927c1c50726199002462f58075fb8b SHA512 7848802bbd6d6818e55dca4741f4cf32ebd83b2f2f7914323235e0d016ed142feeea16556f6d5ffc7c8a57d122067cfc04e2c1e85368c1a562085e4f479b26c2
+DIST kubernetes-1.31.1.tar.gz 36559502 BLAKE2B ca76103fe53019b27d3b88ae61edc9e28d8da80d289e855059394a60e409e3e3045d50c9f73ae449a1b8cbf5ffb6d9d0f15974b7f0175be20f40fa8c920bff58 SHA512 588d3a371d18855165685a291936da4903b194d4b95f77bed8114ce8659c7657a8261f6313f1cacdc9acac492d46bc6d13213a9147fa04c050bf6afd5aba994c
 EBUILD kubeadm-1.28.11.ebuild 984 BLAKE2B 4ccf58e59512d3284f3500085b2e60a1dd84a883f99c198d8947b15af60c25802ecf94bf96ddf6ea369e5dfe156dbd579b296dbd07804499253af6191d18de0d SHA512 87946ff2c837e0c0d6cc3dfd836fa78d7c451c452f765ff46c3a89d10a9e6e946157aedfce6d767f1d4785bce09772a835a868db6cf56a9f1e42fc1ffb1e6071
 EBUILD kubeadm-1.28.12.ebuild 984 BLAKE2B 4ccf58e59512d3284f3500085b2e60a1dd84a883f99c198d8947b15af60c25802ecf94bf96ddf6ea369e5dfe156dbd579b296dbd07804499253af6191d18de0d SHA512 87946ff2c837e0c0d6cc3dfd836fa78d7c451c452f765ff46c3a89d10a9e6e946157aedfce6d767f1d4785bce09772a835a868db6cf56a9f1e42fc1ffb1e6071
 EBUILD kubeadm-1.28.13.ebuild 984 BLAKE2B 4ccf58e59512d3284f3500085b2e60a1dd84a883f99c198d8947b15af60c25802ecf94bf96ddf6ea369e5dfe156dbd579b296dbd07804499253af6191d18de0d SHA512 87946ff2c837e0c0d6cc3dfd836fa78d7c451c452f765ff46c3a89d10a9e6e946157aedfce6d767f1d4785bce09772a835a868db6cf56a9f1e42fc1ffb1e6071
@@ -17,5 +19,7 @@ EBUILD kubeadm-1.29.8.ebuild 985 BLAKE2B c5583798d960f2a9bf3c6c389136e1302de48dd
 EBUILD kubeadm-1.30.2.ebuild 984 BLAKE2B 0fc81d24d398f2b31414cc5e5413c8e2c488ea602319e949ebd5e7820bcf43b193c066b64908c2f9f5bcd25439b8e4ef54facac6b1cc1ff87bca5e64d089bad0 SHA512 19cfeae0c77120c94be859b5d2f23e645152c425b8d5054bdb15cc9c4b2beee02447b37c779a5c01b841182ca5df42439a5d44be4f37c9823d822e823d1e11f6
 EBUILD kubeadm-1.30.3.ebuild 984 BLAKE2B 0fc81d24d398f2b31414cc5e5413c8e2c488ea602319e949ebd5e7820bcf43b193c066b64908c2f9f5bcd25439b8e4ef54facac6b1cc1ff87bca5e64d089bad0 SHA512 19cfeae0c77120c94be859b5d2f23e645152c425b8d5054bdb15cc9c4b2beee02447b37c779a5c01b841182ca5df42439a5d44be4f37c9823d822e823d1e11f6
 EBUILD kubeadm-1.30.4.ebuild 985 BLAKE2B fd19277a768673336f5f86452487e1bfc8efaab4592992dc1a2f10cdc15b5d9aef62225317e9b5888e3f282cf4b1231a3fcb8b30d699a788cbae2af835f56a63 SHA512 bccd64b12bce02d5bb0967c96b5c010f98795c428dd41e0b852d6eec84f8d449cee971c7c4481bf005476c1b0b83cf91ee9226c2f466eb03c73489956b9d18ea
+EBUILD kubeadm-1.30.6.ebuild 985 BLAKE2B fd19277a768673336f5f86452487e1bfc8efaab4592992dc1a2f10cdc15b5d9aef62225317e9b5888e3f282cf4b1231a3fcb8b30d699a788cbae2af835f56a63 SHA512 bccd64b12bce02d5bb0967c96b5c010f98795c428dd41e0b852d6eec84f8d449cee971c7c4481bf005476c1b0b83cf91ee9226c2f466eb03c73489956b9d18ea
 EBUILD kubeadm-1.31.0.ebuild 985 BLAKE2B 8000e05d2aa01aa3dbe89ffe9047ed577cd4f18fedf7af594b6e4579de258bb5b5c317d044560b841269905758c263dad20e968c4664c6e07eb9621eb30f2b7a SHA512 3ab6db2c02b392f4bb8e590e90055e11c5a9e1dd424195b45e29463bfd7fb321a0cdfad21b0242d4409102f065e7aa58184c16571c5b69f0a6ac5e2a8e40a220
+EBUILD kubeadm-1.31.1.ebuild 985 BLAKE2B 8000e05d2aa01aa3dbe89ffe9047ed577cd4f18fedf7af594b6e4579de258bb5b5c317d044560b841269905758c263dad20e968c4664c6e07eb9621eb30f2b7a SHA512 3ab6db2c02b392f4bb8e590e90055e11c5a9e1dd424195b45e29463bfd7fb321a0cdfad21b0242d4409102f065e7aa58184c16571c5b69f0a6ac5e2a8e40a220
 MISC metadata.xml 918 BLAKE2B 487a711e9aebe9d4d8f2c3a03664990aa544a4c0b969dbb60d10ebf42ca64cb9b21f822f92e774f3a813b409d5df905c8ecf02f186218f925a69f70b2960d53c SHA512 392d1cdf4179bc2aa14598e41e38e364518f0c71c34d61280729ae2cdab37c247112b48fcea58c792f6f7148e3979dfbff174bac3a3a00b7084168332112f5d3
diff --git a/sys-cluster/kubeadm/kubeadm-1.30.6.ebuild b/sys-cluster/kubeadm/kubeadm-1.30.6.ebuild
new file mode 100644
index 000000000000..d175a9ec3808
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.30.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened selinux"
+
+BDEPEND=">=dev-lang/go-1.21.6"
+RDEPEND="app-containers/cri-tools
+	selinux? ( sec-policy/selinux-kubernetes )"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" FORCE_HOST_GO=yes \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubeadm/kubeadm-1.31.1.ebuild b/sys-cluster/kubeadm/kubeadm-1.31.1.ebuild
new file mode 100644
index 000000000000..96a6a4b94b0c
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.31.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened selinux"
+
+BDEPEND=">=dev-lang/go-1.23.0"
+RDEPEND="app-containers/cri-tools
+	selinux? ( sec-policy/selinux-kubernetes )"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" FORCE_HOST_GO=yes \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index fb7a6d9bfee2..9b7ace29e235 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -7,7 +7,9 @@ DIST kubernetes-1.29.8.tar.gz 41200139 BLAKE2B 82fe26e74fe2aea6fa854c4e018561ccb
 DIST kubernetes-1.30.2.tar.gz 39581297 BLAKE2B 7d1f303d21b870ad29d2cac96626edc3a19addedd544624e5cd9f42beb368e0959e499e5fd88bc7ee491a01cd29573115d1e77dfb73098ea88204a2614f7b635 SHA512 73f87da96fae889805e3e8fe644228159746c139e907755ec8654dd2fe46bf4561c6c5bb015bd95a6a1f5ba9be2e193aea9bb43b37ce1d67fb4ba42a50b9dac8
 DIST kubernetes-1.30.3.tar.gz 39587795 BLAKE2B ba6d819866247dd0d26cb014857d238075dc6beb9cfacfc4ecaccab9d88c4295189309d62e4856c0f4f6c57762b14bfa16fb6bd96548cb88f69dd350e00dbf59 SHA512 303c823f74ccc5c1685ec16ba3de9dbbe9614ddf19e279e43ee392a4ef04ee68400a3e0c2a839d6a3f43712fab426084037ed871e3e4caafe8b37999fd83b73a
 DIST kubernetes-1.30.4.tar.gz 39602012 BLAKE2B 36bb038a2c64ae9252e002a11b2e08930a48471022b00f45511c7b869c76f2de5b941207ee05b57a824a8b4a84b475c376ffb856e5486b532d1cd7413a79500a SHA512 09a562deb763d43578cf345d62be145ccc92e77be228b10184b1b2909716eed8cf2b0c20f6add195347653c2f42ed1c749a5f1c03a9b7dd0a5e0f1e21f32adc0
+DIST kubernetes-1.30.6.tar.gz 39612960 BLAKE2B cfc0c062348b703bce584f7b97b178f0f01b907b05fef81ccb61bbb17460b9b12a430c8606529d01afb148e75190cfad12b0dd798aa316be7ba3e78c8cef24f1 SHA512 c4b5ebb08dbd9daeac2f4da5a1b93c397473e7cf12439291ce80e43b4aae1d233c6e980a080b5c8aaa12e296aa04e068f8b00b23386b23802b99c2ce8f42c800
 DIST kubernetes-1.31.0.tar.gz 39255058 BLAKE2B 65ad06c8e57eec7d1affce4d263fe0d6ca4c75543b658372efd37a84f4af7817d7f1134ca92102666e6df140645d7421d8927c1c50726199002462f58075fb8b SHA512 7848802bbd6d6818e55dca4741f4cf32ebd83b2f2f7914323235e0d016ed142feeea16556f6d5ffc7c8a57d122067cfc04e2c1e85368c1a562085e4f479b26c2
+DIST kubernetes-1.31.1.tar.gz 36559502 BLAKE2B ca76103fe53019b27d3b88ae61edc9e28d8da80d289e855059394a60e409e3e3045d50c9f73ae449a1b8cbf5ffb6d9d0f15974b7f0175be20f40fa8c920bff58 SHA512 588d3a371d18855165685a291936da4903b194d4b95f77bed8114ce8659c7657a8261f6313f1cacdc9acac492d46bc6d13213a9147fa04c050bf6afd5aba994c
 EBUILD kubectl-1.28.11.ebuild 897 BLAKE2B 6af1e405fac4b88bf750c23970a61dda832f0ee6859e78cd8bfbff92c325a4744cde580c55794c4fba5073918007287725b46405ae2af9964888a429c2a61ba2 SHA512 a0a7f1bdb464d89397204b704956b9b75575ca58ef90155b9e2b391eeff836f84fe5df0d13424f5ab9baed5075b2447ca2097fd57ce29b5c0cd679f1eba5b1b3
 EBUILD kubectl-1.28.12.ebuild 897 BLAKE2B 6af1e405fac4b88bf750c23970a61dda832f0ee6859e78cd8bfbff92c325a4744cde580c55794c4fba5073918007287725b46405ae2af9964888a429c2a61ba2 SHA512 a0a7f1bdb464d89397204b704956b9b75575ca58ef90155b9e2b391eeff836f84fe5df0d13424f5ab9baed5075b2447ca2097fd57ce29b5c0cd679f1eba5b1b3
 EBUILD kubectl-1.28.13.ebuild 897 BLAKE2B 6af1e405fac4b88bf750c23970a61dda832f0ee6859e78cd8bfbff92c325a4744cde580c55794c4fba5073918007287725b46405ae2af9964888a429c2a61ba2 SHA512 a0a7f1bdb464d89397204b704956b9b75575ca58ef90155b9e2b391eeff836f84fe5df0d13424f5ab9baed5075b2447ca2097fd57ce29b5c0cd679f1eba5b1b3
@@ -17,5 +19,7 @@ EBUILD kubectl-1.29.8.ebuild 898 BLAKE2B 1c2d57e41b717fb82b0a9766d309dde5e3a077e
 EBUILD kubectl-1.30.2.ebuild 897 BLAKE2B 770090253eff6ddd781e7a456ed1a4df4a467f24b37f78fc4dfec2357861c22072f00d7966110973168615fd56ebde628a215df028aa0bcae62bc881498296c3 SHA512 1c1b490e0560bd9247f9792c8133245259ffabb046d4a43c53ad5ebb3a3ed87b3da8a77aa267bc35f03ed695746cf4e2c817cb8e9397e9d32c6da8e186a9f108
 EBUILD kubectl-1.30.3.ebuild 897 BLAKE2B 770090253eff6ddd781e7a456ed1a4df4a467f24b37f78fc4dfec2357861c22072f00d7966110973168615fd56ebde628a215df028aa0bcae62bc881498296c3 SHA512 1c1b490e0560bd9247f9792c8133245259ffabb046d4a43c53ad5ebb3a3ed87b3da8a77aa267bc35f03ed695746cf4e2c817cb8e9397e9d32c6da8e186a9f108
 EBUILD kubectl-1.30.4.ebuild 898 BLAKE2B fea0b23545fa35a7fab59fa471d091f762e5ea7a29aefe99bf876c84e388b9bcdf88d9691bdfba55ab63800a4f449ac0cf692032df3d0f409f94a2bb4eea78d6 SHA512 bb377848511b76dfeceb6e06d7e9ee206efea54f774cc0bd0658cfab1d6834e689d440c86722ff31bd38e467a10a51754bfde1b7a0a5e44bb54bbc3e3676cfbc
+EBUILD kubectl-1.30.6.ebuild 898 BLAKE2B fea0b23545fa35a7fab59fa471d091f762e5ea7a29aefe99bf876c84e388b9bcdf88d9691bdfba55ab63800a4f449ac0cf692032df3d0f409f94a2bb4eea78d6 SHA512 bb377848511b76dfeceb6e06d7e9ee206efea54f774cc0bd0658cfab1d6834e689d440c86722ff31bd38e467a10a51754bfde1b7a0a5e44bb54bbc3e3676cfbc
 EBUILD kubectl-1.31.0.ebuild 898 BLAKE2B c7884578ec104d9eff15b68323a3cf32d30c49328d67c388bb2ba24363e38cd38f1540338aa9974728f4c956aedf2519d5aafa7cf5c7820dee7c013e008a749d SHA512 18db5ec0a070ca6b37ac8c2d853224d98e98ae9377360b8a64c11663ef0149b1c7788092a980ab7430829a485b819af443f16dad273ab5699fdfba2bbbdab4c7
+EBUILD kubectl-1.31.1.ebuild 898 BLAKE2B c7884578ec104d9eff15b68323a3cf32d30c49328d67c388bb2ba24363e38cd38f1540338aa9974728f4c956aedf2519d5aafa7cf5c7820dee7c013e008a749d SHA512 18db5ec0a070ca6b37ac8c2d853224d98e98ae9377360b8a64c11663ef0149b1c7788092a980ab7430829a485b819af443f16dad273ab5699fdfba2bbbdab4c7
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kubectl/kubectl-1.30.6.ebuild b/sys-cluster/kubectl/kubectl-1.30.6.ebuild
new file mode 100644
index 000000000000..419b200ff1be
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.30.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+BDEPEND=">=dev-lang/go-1.21.6"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
+		WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubectl/kubectl-1.31.1.ebuild b/sys-cluster/kubectl/kubectl-1.31.1.ebuild
new file mode 100644
index 000000000000..67b1ecc00f15
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.31.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+BDEPEND=">=dev-lang/go-1.23.0"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
+		WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index fb548065ff87..9f0b4c19d442 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -12,7 +12,9 @@ DIST kubernetes-1.29.8.tar.gz 41200139 BLAKE2B 82fe26e74fe2aea6fa854c4e018561ccb
 DIST kubernetes-1.30.2.tar.gz 39581297 BLAKE2B 7d1f303d21b870ad29d2cac96626edc3a19addedd544624e5cd9f42beb368e0959e499e5fd88bc7ee491a01cd29573115d1e77dfb73098ea88204a2614f7b635 SHA512 73f87da96fae889805e3e8fe644228159746c139e907755ec8654dd2fe46bf4561c6c5bb015bd95a6a1f5ba9be2e193aea9bb43b37ce1d67fb4ba42a50b9dac8
 DIST kubernetes-1.30.3.tar.gz 39587795 BLAKE2B ba6d819866247dd0d26cb014857d238075dc6beb9cfacfc4ecaccab9d88c4295189309d62e4856c0f4f6c57762b14bfa16fb6bd96548cb88f69dd350e00dbf59 SHA512 303c823f74ccc5c1685ec16ba3de9dbbe9614ddf19e279e43ee392a4ef04ee68400a3e0c2a839d6a3f43712fab426084037ed871e3e4caafe8b37999fd83b73a
 DIST kubernetes-1.30.4.tar.gz 39602012 BLAKE2B 36bb038a2c64ae9252e002a11b2e08930a48471022b00f45511c7b869c76f2de5b941207ee05b57a824a8b4a84b475c376ffb856e5486b532d1cd7413a79500a SHA512 09a562deb763d43578cf345d62be145ccc92e77be228b10184b1b2909716eed8cf2b0c20f6add195347653c2f42ed1c749a5f1c03a9b7dd0a5e0f1e21f32adc0
+DIST kubernetes-1.30.6.tar.gz 39612960 BLAKE2B cfc0c062348b703bce584f7b97b178f0f01b907b05fef81ccb61bbb17460b9b12a430c8606529d01afb148e75190cfad12b0dd798aa316be7ba3e78c8cef24f1 SHA512 c4b5ebb08dbd9daeac2f4da5a1b93c397473e7cf12439291ce80e43b4aae1d233c6e980a080b5c8aaa12e296aa04e068f8b00b23386b23802b99c2ce8f42c800
 DIST kubernetes-1.31.0.tar.gz 39255058 BLAKE2B 65ad06c8e57eec7d1affce4d263fe0d6ca4c75543b658372efd37a84f4af7817d7f1134ca92102666e6df140645d7421d8927c1c50726199002462f58075fb8b SHA512 7848802bbd6d6818e55dca4741f4cf32ebd83b2f2f7914323235e0d016ed142feeea16556f6d5ffc7c8a57d122067cfc04e2c1e85368c1a562085e4f479b26c2
+DIST kubernetes-1.31.1.tar.gz 36559502 BLAKE2B ca76103fe53019b27d3b88ae61edc9e28d8da80d289e855059394a60e409e3e3045d50c9f73ae449a1b8cbf5ffb6d9d0f15974b7f0175be20f40fa8c920bff58 SHA512 588d3a371d18855165685a291936da4903b194d4b95f77bed8114ce8659c7657a8261f6313f1cacdc9acac492d46bc6d13213a9147fa04c050bf6afd5aba994c
 EBUILD kubelet-1.28.11.ebuild 1053 BLAKE2B 40f4bc39e10cb1be386a28e6975294392fee70fa22d75b13a06f3feddb66917f4ed0a41bb4e557b94bfe1a4b472222ef51d1202ce2685606c217d80b96ec4a8f SHA512 a0a7248c2eed54ea3061e953c8c9f4f6d31fbe7253c8099bde7304475eb31a66568d1b3f4e92a276e2e5cfc5d14770f72d587e80d426080be2632e22377cf48b
 EBUILD kubelet-1.28.12.ebuild 1053 BLAKE2B 40f4bc39e10cb1be386a28e6975294392fee70fa22d75b13a06f3feddb66917f4ed0a41bb4e557b94bfe1a4b472222ef51d1202ce2685606c217d80b96ec4a8f SHA512 a0a7248c2eed54ea3061e953c8c9f4f6d31fbe7253c8099bde7304475eb31a66568d1b3f4e92a276e2e5cfc5d14770f72d587e80d426080be2632e22377cf48b
 EBUILD kubelet-1.28.13.ebuild 1053 BLAKE2B 40f4bc39e10cb1be386a28e6975294392fee70fa22d75b13a06f3feddb66917f4ed0a41bb4e557b94bfe1a4b472222ef51d1202ce2685606c217d80b96ec4a8f SHA512 a0a7248c2eed54ea3061e953c8c9f4f6d31fbe7253c8099bde7304475eb31a66568d1b3f4e92a276e2e5cfc5d14770f72d587e80d426080be2632e22377cf48b
@@ -22,5 +24,7 @@ EBUILD kubelet-1.29.8.ebuild 1054 BLAKE2B 7590f1dcc39e59cbac0714ab63dfb8449baa0b
 EBUILD kubelet-1.30.2.ebuild 1053 BLAKE2B 80ffb65adecbf3764d8b1b175ef89335295a8874ba96e1c15f355cc845935561b9ca51b8b78cd58c4cafe4068add7f1e63a8ba7846e85cddbd555a1c6a708c22 SHA512 a408aebd4870a6f6edec33b7290310d4dd032c51b673786e26764727fe506ead687f05f884a93089d533696e74dba808705bd5776ce5586112711ad1f5924b90
 EBUILD kubelet-1.30.3.ebuild 1053 BLAKE2B 80ffb65adecbf3764d8b1b175ef89335295a8874ba96e1c15f355cc845935561b9ca51b8b78cd58c4cafe4068add7f1e63a8ba7846e85cddbd555a1c6a708c22 SHA512 a408aebd4870a6f6edec33b7290310d4dd032c51b673786e26764727fe506ead687f05f884a93089d533696e74dba808705bd5776ce5586112711ad1f5924b90
 EBUILD kubelet-1.30.4.ebuild 1054 BLAKE2B d7abb078c146dfed8f8e9821e30c4c6213527b04d77bd905dc04acbaf5a5f3a239ebd4763c841daab612f746818877658954dd1e52e76b957f8eea1c3867b767 SHA512 0a2cd0b01673a5859a200225328b8022654bf26bf718a972f488986588a9b54e9774cea41baaa9a7a1bc6aeded186785a3b57ec977693473c9ddc3855537ea92
+EBUILD kubelet-1.30.6.ebuild 1054 BLAKE2B d7abb078c146dfed8f8e9821e30c4c6213527b04d77bd905dc04acbaf5a5f3a239ebd4763c841daab612f746818877658954dd1e52e76b957f8eea1c3867b767 SHA512 0a2cd0b01673a5859a200225328b8022654bf26bf718a972f488986588a9b54e9774cea41baaa9a7a1bc6aeded186785a3b57ec977693473c9ddc3855537ea92
 EBUILD kubelet-1.31.0.ebuild 1054 BLAKE2B e981793793bb485ef46589df4481fb63364ba700fb669ad81269c3ba8f9f28aa447998be85b27d41390034f3ee449f7381a0b2bc8b837965591ee1ef8f7b5160 SHA512 2fd2d3b1b0413c14f3f0535cc5d7baea4cc7369bb207db625fa2ec8221f394167ffa48deeaafc1e30dc1dea1c731760c115a414bed8f549602a6b3619912dba9
+EBUILD kubelet-1.31.1.ebuild 1054 BLAKE2B e981793793bb485ef46589df4481fb63364ba700fb669ad81269c3ba8f9f28aa447998be85b27d41390034f3ee449f7381a0b2bc8b837965591ee1ef8f7b5160 SHA512 2fd2d3b1b0413c14f3f0535cc5d7baea4cc7369bb207db625fa2ec8221f394167ffa48deeaafc1e30dc1dea1c731760c115a414bed8f549602a6b3619912dba9
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kubelet/kubelet-1.30.6.ebuild b/sys-cluster/kubelet/kubelet-1.30.6.ebuild
new file mode 100644
index 000000000000..49e2249286ad
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.30.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 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"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened selinux"
+
+BDEPEND=">=dev-lang/go-1.21.6"
+RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
+
+RESTRICT+=" test "
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	emake -j1 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.31.1.ebuild b/sys-cluster/kubelet/kubelet-1.31.1.ebuild
new file mode 100644
index 000000000000..a5aae6c40845
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.31.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 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"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened selinux"
+
+BDEPEND=">=dev-lang/go-1.23.0"
+RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
+
+RESTRICT+=" test "
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	emake -j1 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/resource-agents/Manifest b/sys-cluster/resource-agents/Manifest
index 7718ec7ea80e..7b86fe01744a 100644
--- a/sys-cluster/resource-agents/Manifest
+++ b/sys-cluster/resource-agents/Manifest
@@ -1,8 +1,7 @@
+AUX 4.6.1-autoconf-2.72.patch 566 BLAKE2B 0e7b5ca1308921b85444dbd3827232d349af3e5187ce059c0f36fcafa7558609d1a60fd1d66beb788b4f5ff7f8420d1fb9ec360f2e75c771f1b92ab83c5d5ad6 SHA512 26b1171c7857913e59fd9c6a313a6bce98739d3df9fbdef33c2046cd4ea90d0538b281a82c719fffde50e35f7a2429f9b317921a9c1c4b6619a768e3cb5fd97e
 AUX 4.6.1-configure.patch 1181 BLAKE2B 51290610cded3c58be968b140716047ca42cfff9e678ae4bdfc842e619c534d9b12ae62fe3ce5a5fbf491e89d0330b3946bd862ee6db99b62349e788beb32cd0 SHA512 e6269e8e4333a884ebd9f6ff1ecb1f1b23e4b6da57bf8921868e0bfaa6a072caa2306b9b76d119743d33544207dbcf6c0ec77638bbf23ac9e9098c3fa6bbc39e
-DIST resource-agents-4.11.0.tar.gz 860940 BLAKE2B 8009d6936c59bd014710db2478e3d001c59eca8c9e76f5847cc7568c08951f784696a65ff0cf62970a7d193ce7e205ddfc1116993dc0ea07496a647833d32829 SHA512 3baf66b39a26323787a5089dccd369a0e4fc8ac60a3061c8fbe461d5e60cdee6330eaa7840c32d536473688f1bdeea47b77e1ba9bb199012495a31d2d75662c2
 DIST resource-agents-4.12.0.tar.gz 865910 BLAKE2B fe10a86620e9b549b7634721697d04eb331bb87e50c28dadeb4590ae74febc3a793b9d7bce7fbb8de7d1b8a6ace2546882627e506020e1006cb9fb193b114d19 SHA512 1c1ec1ae4a96b6832eb8631f8e2aa064adac04093e1e98c444376e18d27db4b630c840c45bc3486160a2a8f5c510bb05c15362b8b65197387a31b7adc059e87b
-DIST resource-agents-4.6.1.tar.gz 799688 BLAKE2B a276dbd17d6b91926f2a040d847e2ca499fe36cf30a0413d2bdffccd3bd8cbe7022ab29244524d5f7f6b91c7513a56b40de5f4bb425e65d4f83710445da91231 SHA512 ccd4a86b5a4da636248badfb81808fa4c96f08dbce9dc8d9322b594cb6028f74b33fd9cacdbee65f49ca05f7dca04671e247f64b767df5cd0b7d19539f52ad5e
-EBUILD resource-agents-4.11.0.ebuild 1589 BLAKE2B 721c27815ee0ac081fc13e81971b94881e400d79739def71f3f49203e77ce7f352a4036552aefed536fc285a48bf6f0102122028e74535035a6e9c060130dfd4 SHA512 a3604e060702a47ae7571052fa1268e92926f7291703fa2bbf0f3f53fb456321b8398fe3e47184a21eca911aff0a9d939090373ffc892fc1132f99a567236763
-EBUILD resource-agents-4.12.0.ebuild 1819 BLAKE2B 37999bddaa6c2a08dddb69e2555c251fad77e5ba4681b981acb005d70d730c9f05ba82f70c12715984dd7ef76b56144c66fc7abdaa8aaab956f921843b94b5b4 SHA512 50320290c7e82d530bed94202d584629422760d9bfbad0a031af8139d6796b89c50186c0fc955d915e1fcdafc85a1008d6b01c6e24fb28154363bdef93e6f06f
-EBUILD resource-agents-4.6.1.ebuild 1502 BLAKE2B 08ca4d6e594f6cc91bf4e3cb3b395928183e709af2159eb8519ad0b8df20f3c44f31ab4f5e243dc1d0f1a0e8043240c210763a708e206767fcf959bd74da867b SHA512 df73d89def7f2acaf66476505718e32f9366059b51312a770ed9016817bf74bcbdb5687b4dcdf1a49ab7c427fb6b09160bcb344132cc578380876c07e9d8c03d
+DIST resource-agents-4.15.1.tar.gz 891596 BLAKE2B 17a8e8268508ae539f88a10e8d8b5cfab6449d4a8678b2aac4422a5e4fe33746f99b4b3964b6372eb2ad186a629b85927ba93543a47b1c5f2ca28cc4fb675cf5 SHA512 e5990fa28bef5795183dc198340f5cba1f379f73b89bd53cf1ecb2e7c8337e0ac8f47e85f7f2a66af45b9d7dd500e60f78d757f316168ed2592689d9d88fc0ea
+EBUILD resource-agents-4.12.0.ebuild 1860 BLAKE2B aee7f340bca81fc27247454e058d530727785740c6d33ab11db793596f54110eb9180cebe2d89894191a224dbcc4c3d7a1cee4e20dc1d0bf21041a5cfb555a96 SHA512 b1130496f6a25d773985e9a841fbffb215903a67467bb10dc7b3ad531ea862dceaaeb615c91c2df1725d2d22034a604bf9102f5343842392b9695e56f50422aa
+EBUILD resource-agents-4.15.1.ebuild 1925 BLAKE2B 7d2bc7ac403bbe4237c5a5c2a6098751760225d7e2f813959b916e0b144bce6b504efdeda303e54ab821ba33e0114614f80cfcd9af79dc52ccfc315a6f3b7a26 SHA512 a05d06365cd4a3ebd2ed705faee93849c3ff9a05e21afcf1f45f6a9dcd5dc483c1f266722879ac8a8036a3dcd7c44b1a7eae22d9a0675bb3089967012973e4c8
 MISC metadata.xml 866 BLAKE2B b366853b9f1cd186c3fffae556ec08006f82a415a64acddcd5700faec1bab16eb63046a479beb8115de011bee8566994d6846bf574aa7a9eb6953182766e1972 SHA512 55d7e7d1601196cefc59a741ec5e3036b32c4727c367db9ee1ef463e3ddd23cd7b96d7c5f2c97a2e6ca14a3ce406d4bd468df0914b53bbb3e30480a1e369d01d
diff --git a/sys-cluster/resource-agents/files/4.6.1-autoconf-2.72.patch b/sys-cluster/resource-agents/files/4.6.1-autoconf-2.72.patch
new file mode 100644
index 000000000000..0ac63a216ff6
--- /dev/null
+++ b/sys-cluster/resource-agents/files/4.6.1-autoconf-2.72.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/920743
+https://github.com/ClusterLabs/resource-agents/pull/1908
+
+From a97a00c37d8a15ee3a8d11ac00281626f55790b3 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Mon, 8 Jan 2024 15:07:19 +0100
+Subject: [PATCH] configure: fix "C preprocessor "gcc -E" fails sanity check"
+ error caused by autoconf 2.72
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -81,6 +81,7 @@ fi
+ AC_PROG_CC dnl Can force other with environment variable "CC".
+ AM_PROG_CC_C_O
+ AC_PROG_CC_STDC
++AC_PROG_CPP
+ AC_PROG_AWK
+ AC_PROG_LN_S
+ AC_PROG_INSTALL
+
diff --git a/sys-cluster/resource-agents/resource-agents-4.12.0.ebuild b/sys-cluster/resource-agents/resource-agents-4.12.0.ebuild
index 186c37a1b914..c7e69e2cf201 100644
--- a/sys-cluster/resource-agents/resource-agents-4.12.0.ebuild
+++ b/sys-cluster/resource-agents/resource-agents-4.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -32,6 +32,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/4.6.1-configure.patch"
+	"${FILESDIR}/4.6.1-autoconf-2.72.patch"
 )
 
 src_prepare() {
diff --git a/sys-cluster/resource-agents/resource-agents-4.11.0.ebuild b/sys-cluster/resource-agents/resource-agents-4.15.1.ebuild
index 5438b3b45f41..6bbb47044a5a 100644
--- a/sys-cluster/resource-agents/resource-agents-4.11.0.ebuild
+++ b/sys-cluster/resource-agents/resource-agents-4.15.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 MY_P="${P/resource-}"
-inherit autotools
+inherit autotools tmpfiles
 
 DESCRIPTION="Resources pack for Heartbeat / Pacemaker"
 HOMEPAGE="http://www.linux-ha.org/wiki/Resource_Agents"
@@ -12,18 +12,22 @@ SRC_URI="https://github.com/ClusterLabs/resource-agents/archive/v${PV}.tar.gz ->
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="doc libnet rgmanager systemd"
 
 RDEPEND="
 	sys-apps/iproute2
+	sys-apps/which
 	>=sys-cluster/cluster-glue-1.0.12-r1
+	sys-cluster/libqb:=
 	libnet? ( net-libs/libnet:1.1 )
 	systemd? ( sys-apps/systemd )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	sys-apps/which
 	doc? (
+		dev-libs/libxml2
 		dev-libs/libxslt
 		app-text/docbook-xsl-stylesheets
 	)
@@ -39,14 +43,19 @@ src_prepare() {
 }
 
 src_configure() {
-	# --with-ocf-root needs to be /usr/lib, see bug #720420
-	econf \
-		--disable-fatal-warnings \
-		--localstatedir=/var \
-		--with-ocf-root=/usr/lib/ocf \
-		--with-rsctmpdir=/run/resource-agents \
-		$(use_enable doc) \
+	# TODO: fix systemd automagic
+	# TODO: python support
+	local myeconfargs=(
+		--disable-fatal-warnings
+		--localstatedir=/var
+		# --with-ocf-root needs to be /usr/lib, see bug #720420
+		--with-ocf-root=/usr/lib/ocf
+		--with-rsctmpdir=/run/resource-agents
+		$(use_enable doc)
 		$(use_enable libnet)
+	)
+
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
@@ -57,9 +66,17 @@ src_install() {
 	rm -rf "${ED}"{,/var}/run || die
 
 	use rgmanager || rm -rf "${ED}"/usr/share/cluster/ "${ED}"/var/
+
+	if ! use systemd ; then
+		newtmpfiles - resource-agents.conf <<-EOF
+		d /var/run/resource-agents 1755 root root
+		EOF
+	fi
 }
 
 pkg_postinst() {
+	tmpfiles_process resource-agents.conf
+
 	elog "To use Resource Agents installed in ${EROOT}/usr/lib/ocf/resource.d"
 	elog "you have to emerge required runtime dependencies manually."
 	elog ""
diff --git a/sys-cluster/resource-agents/resource-agents-4.6.1.ebuild b/sys-cluster/resource-agents/resource-agents-4.6.1.ebuild
deleted file mode 100644
index cf01dbf63693..000000000000
--- a/sys-cluster/resource-agents/resource-agents-4.6.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P/resource-}"
-inherit autotools multilib
-
-DESCRIPTION="Resources pack for Heartbeat / Pacemaker"
-HOMEPAGE="http://www.linux-ha.org/wiki/Resource_Agents"
-SRC_URI="https://github.com/ClusterLabs/resource-agents/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="doc libnet rgmanager"
-
-RDEPEND="sys-apps/iproute2
-	>=sys-cluster/cluster-glue-1.0.12-r1
-	libnet? ( net-libs/libnet:1.1 )"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-	)"
-
-PATCHES=(
-	"${FILESDIR}/4.6.1-configure.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-fatal-warnings \
-		--localstatedir=/var \
-		--with-ocf-root=/usr/$(get_libdir)/ocf \
-		--with-rsctmpdir=/run/resource-agents \
-		$(use_enable doc) \
-		$(use_enable libnet)
-}
-
-src_install() {
-	default
-	rm -rf "${D}/usr/$(get_libdir)/ocf/resource.d/redhat" || die
-	rm -rf "${D}"/etc/init.d/ || die
-	rm -rf "${D}"{,/var}/run || die
-	use rgmanager || rm -rf "${D}"/usr/share/cluster/ "${D}"/var/
-}
-
-pkg_postinst() {
-	elog "To use Resource Agents installed in /usr/$(get_libdir)/ocf/resource.d"
-	elog "you have to emerge required runtime dependencies manually."
-	elog ""
-	elog "Description and dependencies of all Agents can be found on"
-	elog "http://www.linux-ha.org/wiki/Resource_Agents"
-	elog "or in the documentation of this package."
-}