gentoo auto-resync : 20:06:2024 - 00:10:56

30 files changed, 38 insertions, 2784 deletions

diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 071a341c166e..1e0fe883643b 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/cni-plugins/Manifest b/app-containers/cni-plugins/Manifest
index 610d286d3ec5..df1dc7107335 100644
--- a/app-containers/cni-plugins/Manifest
+++ b/app-containers/cni-plugins/Manifest
@@ -1,11 +1,8 @@
 AUX cni-dhcp.initd 376 BLAKE2B 5fe40f28773ffbb12416b40e3813578d28787e9ee26ec4a62b2d3e834920f43fedd0bc985bb412c9576c438367429c835b6099f78f017932b6cdff9341e3f356 SHA512 3475f7c6966b9afac6be52c705286b235a59847748aad5c602162589d4ee1193acffc5965c9130c311e318d06f62a3930d5eb1a70b118a63270f4241f8c4fce8
-DIST cni-plugins-0.9.1.tar.gz 2703099 BLAKE2B 878f476e62f12020b39d33a79723fe246b34d80705d3a336573401743392adca9a57b196d6d191b4a6f281110f47ecbb1525aacd91cd488bea61c7aaed12a6ef SHA512 24e8fcedbff2ae7a83aa96085b546b164de6a0884d593e3b5386e9d2de3c4d9a215db9e9405332020cc45c371709a32b600e263e4f8dee62c51adafdc0180f24
-DIST cni-plugins-1.1.1.tar.gz 3076064 BLAKE2B 2fd70260995e423d2b4ac3a8d2135074baffe5d36177d5e1e5a9ce146f6d2ecfeb3b843de62e43f863085ff965be4160cf5f4cae892d3c59070ef390409ef3c9 SHA512 03da31caee5f9595abf65d4a551984b995bc18c5e97409549f08997c5a6a2b41a8950144f8a5b4f810cb401ddbe312232d2be76ec977acf8108eb490786b1817
 DIST cni-plugins-1.2.0.tar.gz 3365015 BLAKE2B 6b487a9c9b240c73510f2bc6aaa4a6c79055e43cacca8204781dbc65d231164fed9f3f68a2a0cead7a41a67bfc9d9e4480b488be26415d368da007559a721b25 SHA512 fb6fb4f46ac1610b3721f5f3a6ddfb096cbf2e5d5b792306edca5351a3944d2f802170d83e5adec01420395bf64fc8a174ede61ac9b93b5ac6b938a4b48651e6
 DIST cni-plugins-1.3.0.tar.gz 3684138 BLAKE2B c5599f1d8ac3bffb802877ae8c49024a9dea1940923316e534397a8dc7e467f6fe3ceef514a41522611a8f06c4f4ba0788105081e68a4712e2eefade33226c7b SHA512 87e186b3cd64f66280f5b2293dcdd1fc22cb8f51a248124fb622adc48a893348419ba4c29c4769dede4d9e60f2e9fea5d4198f10badb4ecd20a1551e0b344e10
-EBUILD cni-plugins-0.9.1.ebuild 948 BLAKE2B 340be886eb779358a8a7f6fe7a94bbc45dd53e51b65f729bfc1eb614e2a8e7db1b7b19622b75b8fb382882ce6d4915ab1b9a3282b7cc76de7efbfd07cea40fc6 SHA512 0a25abd6833e459576afdc3174afe57491a86b5eff6aba6d718db439af1acd983ccc769619448683ae42b57a561a785599146a9f6423dbae7395c625819739cd
-EBUILD cni-plugins-1.1.1-r1.ebuild 1119 BLAKE2B cdff1f61f07687a78b846e69766519f53b6f06f1624c13835658d430ce74710959db3a50c6f8d893855d02d91c841c75b7caed6d49b128a5f3ff931fa92cbfa1 SHA512 8e4493e5720ba4726285b7aaf90c55378b163256c7c92bd64e029f8dadd1b2327dfeaa06bb8d44ff9e3c099c82fc867845dfa3050d49a436b47a14f06c27f372
-EBUILD cni-plugins-1.1.1.ebuild 1026 BLAKE2B 43b5cfb19b0f5413ae5a34168c29746cd9994a29f75b062189ce7b21fca28c504509a7778f302355d6ab9feb4717111a78adefd93a5a401fedb439f9c16c29bb SHA512 8a177cfb045ccb108abde16e90f61bda39bec7227e9161e8957f37c8049004cad4628b5dcc82bb98e789f56856d38e9c27628a57d473b4ad843329072470362d
+DIST cni-plugins-1.5.1.tar.gz 3808203 BLAKE2B 481e6c3e929d9169c643596ba48e008151aef10ff670cac9fa00294a3fe98bc5d7c9ee9f83394becb4c127290abb3b082c4124d332b32c8d97f44fcb01b7e3cf SHA512 d2e01958dd8328407164cb6be9d962321742dae7011ce7cd7b2342f5e4b4bbcd992d8249c53d3d81250a60c27f049969bbf329a75440524f52c1f1466b6e7132
 EBUILD cni-plugins-1.2.0.ebuild 1117 BLAKE2B 7809452db4deb8a4daa84eedce5c3863f2ffd63888bd9e14229c3e12de69a9cc8899448261833659c052177eb0b7d097ca9a55f62ef3b889c93d03a225cd88b0 SHA512 dd81eebf6edda4956170ba8f645e2971cedeea9a0dc6e71cbe46b29ce2fc300e245ddb34d5838fbefb530c333f30b6d56b6e168eb7ee3326c839c066e3f4b439
 EBUILD cni-plugins-1.3.0.ebuild 1119 BLAKE2B f5534fbe2d24ffb0b24c860ff713a9dd81d2db48b39561a812f98cce7da45c096d6af879e4f199d64e7c39fe4997bdec6d130c44c6c33b71b7374f7bc2798a02 SHA512 a5c49edd662f1a8fd2b4826bdefe56aa5a1de78e40ac0fd3154b4b014e4b7319b936959b10f41e6ce298340f14cf591f66bb98f105b1d2628c11d91246e950bd
+EBUILD cni-plugins-1.5.1.ebuild 1119 BLAKE2B 7ad07da26f08d90af8d424a1f41bd95578f8a83436ea26728b7c0061e8846524d8c1fdd7684b07ba949d4318233ceefd41ba868c667be5d385a439530bcd748b SHA512 ae8f72f9c447d393209676d2ee21743b3602fa933a73f3dca0de5d6dfefa6c956563bb385f051fc9be335b46d0297ab908e58b485916c95d9814bb4add7958e2
 MISC metadata.xml 351 BLAKE2B 3565fe13764f828aed1288724a2939be57e523e0d0a9ccf3c091715e6f1e102155a7fa28191a3c87d669d51a0fa087a89587d83fe6c4747d5d9b31da11c1578c SHA512 6cfe3058d20387245c2f4823c7629d464115783e3c9ed1e45769d6e13f2f35f94656c66c0b1572f8eb229e6bf43510dbc35d117d6a3379e15b5b6ababc077856
diff --git a/app-containers/cni-plugins/cni-plugins-0.9.1.ebuild b/app-containers/cni-plugins/cni-plugins-0.9.1.ebuild
deleted file mode 100644
index 5d4529918862..000000000000
--- a/app-containers/cni-plugins/cni-plugins-0.9.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module linux-info
-
-DESCRIPTION="Standard networking plugins for container networking"
-HOMEPAGE="https://github.com/containernetworking/plugins"
-SRC_URI="https://github.com/containernetworking/plugins/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
-IUSE="hardened"
-
-CONFIG_CHECK="~BRIDGE_VLAN_FILTERING"
-S="${WORKDIR}/plugins-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" ./build_linux.sh || die
-}
-
-src_install() {
-	exeinto /opt/cni/bin
-	doexe bin/*
-	dodoc README.md
-	local i
-	for i in plugins/{meta/{bandwidth,firewall,flannel,portmap,sbr,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local,static},sample}; do
-		newdoc README.md ${i##*/}.README.md
-	done
-	newinitd "${FILESDIR}"/cni-dhcp.initd cni-dhcp
-}
diff --git a/app-containers/cni-plugins/cni-plugins-1.1.1.ebuild b/app-containers/cni-plugins/cni-plugins-1.1.1.ebuild
deleted file mode 100644
index 963ca87f9d33..000000000000
--- a/app-containers/cni-plugins/cni-plugins-1.1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module linux-info systemd
-
-DESCRIPTION="Standard networking plugins for container networking"
-HOMEPAGE="https://github.com/containernetworking/plugins"
-SRC_URI="https://github.com/containernetworking/plugins/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
-IUSE="hardened"
-
-CONFIG_CHECK="~BRIDGE_VLAN_FILTERING"
-S="${WORKDIR}/plugins-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" ./build_linux.sh || die
-}
-
-src_install() {
-	exeinto /opt/cni/bin
-	doexe bin/*
-	dodoc README.md
-	local i
-	for i in plugins/{meta/{bandwidth,firewall,flannel,portmap,sbr,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local,static},sample}; do
-		newdoc README.md ${i##*/}.README.md
-	done
-	systemd_dounit plugins/ipam/dhcp/systemd/cni-dhcp.{service,socket}
-	newinitd "${FILESDIR}"/cni-dhcp.initd cni-dhcp
-}
diff --git a/app-containers/cni-plugins/cni-plugins-1.1.1-r1.ebuild b/app-containers/cni-plugins/cni-plugins-1.5.1.ebuild
index 2cd642a24d33..719d96ec6129 100644
--- a/app-containers/cni-plugins/cni-plugins-1.1.1-r1.ebuild
+++ b/app-containers/cni-plugins/cni-plugins-1.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/app-containers/containerd/Manifest b/app-containers/containerd/Manifest
index ce6de036c0f4..c97f8b266403 100644
--- a/app-containers/containerd/Manifest
+++ b/app-containers/containerd/Manifest
@@ -1,17 +1,5 @@
 AUX containerd.confd 124 BLAKE2B 25f72941a47374fa0de3a2dce3d8ca57420f013a0d7527e59697499490ed964b7606819c6d67b9eee1ac6691fa52a65750446d8e46ed9af708d946c24e86704b SHA512 66d891b0d2a541fee2017382ccbea6ea3f93d94c4ff15e1d8626ed84d3d7c0231b0939b2473804d41ac3ad2714267255347d1c671e1d99952d484a8b555948be
 AUX containerd.initd 794 BLAKE2B 88a1976615e4e9d67c10ed3748aadd74ae13ef4cf004bb5b5d45216275715e3acffa8c0c98309d81298795ac007bde02d2f3afd466c7c54e58012a12f156198f SHA512 f31b088e988beb84ef029992255018561417c0e92803dffe35ec481515e1be79ba4611cc139bb5000b0ac79a437f1a6dec3516d6f9580d4b384f1e0f092d8370
-DIST containerd-1.7.1.tar.gz 9682254 BLAKE2B f168070caf2b76f0be350a98f41bfdbfe6d78344d68821fb92a29f839a6e847d795e5b79436e36f985aa88028ff1c3f44f134cf6bd502ddac22453a457bd952b SHA512 e9b00ba8f4dd1b5b1088060d3822f684611d43b367ddfeb1bee1660140af85f31e9c9bfc600a67e8fc8645a625dc4e1919d9af7291bdeaa607bff7065a4fc945
-DIST containerd-1.7.13.tar.gz 10047499 BLAKE2B 792eca378db4e1f7c57d68e00e2c77d11eab1ca60d280f662f1152a349d1c5ddc2a3a334484741e9a4a81f25cb800dce042eea94307c9f020d850ed81ef533aa SHA512 b2932387ea14b8fb76e2583b862ec6495b2e08a8fd7cdf169978d554e8b352b44bb27585c9de1e4e3bb3984d0050d0f3de9bc7a559205d3130c2fe40f961feb4
-DIST containerd-1.7.14.tar.gz 10054632 BLAKE2B 1a4db0d1fba16b71e55f213f5776dbef7d9806bf0f7623f0d1ab945554f8ef6c98a0d29923f1b19c4f0017b8a1c73ca929fd43522371c3c228be838e71e86763 SHA512 c80ad36027407b2e06fdff76280750f84de8d7300ef8be275976766f2a0a04dec1f0f850c8efcceaa7f6163f43922b427d7ae1fcdeabfaf531f487c25c461dc8
 DIST containerd-1.7.15.tar.gz 10071827 BLAKE2B 91de9b7d777d53ecdab4af5bbb0d4ccbe755e4cf0fb7bc99a7bb15c66e0e11ad30aa2af685e0e8b0df80dbeef451704fa056a04b460d92adceebd290977febfc SHA512 84a94c7658a431cfd7a5321ac262d966f4291337ddff14211951b0d2025cd3af25a48175794d2b3a630ffc25ba03047579163546a4758a2fb5d1898cd233854f
-DIST containerd-1.7.2.tar.gz 9688701 BLAKE2B d31cd0e96bb2675390cc63d06114e37d532b7c666b3ffc5b0087dfcef8de23559471f08bf8a52b164c5f645faf1b8102ab2ccdd8ec417a1c74336097f0c3a899 SHA512 c0d4c02991b7e9fc341c4ef3df2d93097f5854a51b99596ed95436a79f7a586820bb8bb7c17fc43b5f38d97ea942e59490fbbf6c9710391ef9caae3d34627bc5
-DIST containerd-1.7.6.tar.gz 9714550 BLAKE2B 863df1a8ab0f0fe6ec62893ed64824763c1b5230fe830fa268820ce0d6254c79e1ac62ab1261a74785b86b01dff83ea9109a899857fa47a48f2cf2eaf298fea8 SHA512 8b7e13c6ea544754ba7d53092d143f3fd2224b9bc874a33d8a00b781e719927f1b22ad5cd1e35b7b95e4890e630f4b92308549a970587ccdf9dbb8eb470e2703
-DIST containerd-1.7.8.tar.gz 9939250 BLAKE2B cddfea0617e92dc56f118e63a3e7af0103c1afe1b18e2c3bf198e4a58aa52424cb62f813f304231700ca10f8ff8936faed5c26735d3dab8958de2219b6769db0 SHA512 29c317b53f1e0eb48f45da47161aad9e97a9e7c5ff6ca2fc0d1233b9e6dcf7c8cd7f866502df80119447e6b889c8ce26257282c7d1948e05e22e1a5afeed1d03
-EBUILD containerd-1.7.1-r1.ebuild 1975 BLAKE2B 46d84564110988f1c9a6a76101fbc439237d303dc9bd63c240250b666abbbbad92416cac822c0bf6882fe2ab6f2aac4cdea9a42b0eba67b472a88c24a88c2fe4 SHA512 ba2b77f93c115a57286eecefa4b826c925ccb06ebcd8283b13981548cfd82a2f0b0e9febf147d04eb4f47711cc5ea95ca8017cdf7f4ddfb32b502b8ade0f547d
-EBUILD containerd-1.7.13.ebuild 1979 BLAKE2B 13d405afb76c805c9cd2e3fc1efc25802d7ec9cec4fe5e4e79d39a927efe1c80d028220374ff9c350f19ab35540a130e6ec50104510cf66532c5d3d77ec60495 SHA512 9aabee17f13bb31922992605dc38381a5cae5706247e2aea67435330a59bad9986b96739d557d218cfc0c5d5c045c752ce0f1647f2384ed3c569c11553a0a51f
-EBUILD containerd-1.7.14.ebuild 1979 BLAKE2B 79e57f56dc71eb987c0faa0d1d6700ac3b49aec91bea91ee956c096e6e976d782afa8dd466f7ba995fe6b0fd05fe00e0abcd03effe095304ff7402eb7637a4cc SHA512 df481e7051df8a00591dd33f4e925140577e5be9bddcac9b5762e5a0c686a6277450fa7dcd5657fb420efe37ce480d11f2c45c2885477d48f36829081d56bc90
 EBUILD containerd-1.7.15.ebuild 1976 BLAKE2B 038a302335d730a6b0c8b6caeb0672beabd7ef48d2a24ec3a317be6d15b41e00551cd95594d575b68fcec6f28757980f91ffbe41cb975bc220168e4963cacf48 SHA512 1fde07b64582f154e76728dd307b4fff449c368ab50c92f68750540ed4805aa383edf400aed1ea8fdc2e52f9a10b61efeddad9ed8f2412b205dfc443c53e771d
-EBUILD containerd-1.7.2.ebuild 1978 BLAKE2B d5c26371468150ed09683ea01250b87802e9862cbb5d15556a16488841ff1f98f9f2aaed054bec160a88e3e00291065c13c9c35e1df5be35639910c44c0d376e SHA512 ec53beae6b6365911a164ffca5d9993b22f4c5a68aeaa886705a1be1aa5d965beef59a704f6c9de16e41442b63ba39e81ab52793c2d544c1b0bcc89a03b43213
-EBUILD containerd-1.7.6.ebuild 1978 BLAKE2B 6d6791e5bb448294a41128e331b19986366510c00276e71890b483fcdfab1852cc842b8eb02b09e7c441f1c9ca4e7a2316f6b72f85a473469835ef03813271c9 SHA512 adc345a3ee0d6e18268b0353318f5c8e006bea3ed5271d8e8fd2e56404dee057389f4cdbf3ed09f710aedf32447135b328702d337e4f1768b56ccdc7c52be47f
-EBUILD containerd-1.7.8.ebuild 1978 BLAKE2B 501601bdba0dbf3e3cf8a32477854a654da005d9ff43ad005a0529cfe8c44edaa5b0f5489006a89e02f8ffe3f40ec339fc29bd739e54f4f2443d3920f8ca4250 SHA512 a3f1b86137cecaeead08c401321d21b75a84c730f2ddf7a4b85a056eac78b620b4f9205c8e797199850ba95fe3e809f4a7cd6bfdf1d09f27cc9b3560d51abfc9
 MISC metadata.xml 981 BLAKE2B 78f44dd46331f9159931ff289a5adfdc177cb5e0c1d12cf717fad4f227b15ae40f479f40554dc4855009342cb7d699aaa543a0fbcc962789fe100a1cc9b350c5 SHA512 a171a3fcd67d8b410148d3e99477ea69be7e84ba2a2d24739343bfde29b88f8f799530c3b1107829ebd52eb847b4f5c25e4d4701ea9a2bc196c761b0768906d1
diff --git a/app-containers/containerd/containerd-1.7.1-r1.ebuild b/app-containers/containerd/containerd-1.7.1-r1.ebuild
deleted file mode 100644
index cc7ea0516264..000000000000
--- a/app-containers/containerd/containerd-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd
-GIT_REVISION=2806fc1057397dbaeefbea0e4e17bddfbd388f38
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/"
-SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
-IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
-
-DEPEND="
-	btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp )
-"
-
-# recommended version of runc is found in script/setup/runc-version
-RDEPEND="
-	${DEPEND}
-	~app-containers/runc-1.1.7[apparmor?,seccomp?]
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-
-# tests require root or docker
-RESTRICT+="test"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s/-s -w//" \
-		-e "s/-mod=readonly//" \
-		Makefile || die
-	sed -i \
-		-e "s:/usr/local:/usr:" \
-		containerd.service || die
-}
-
-src_compile() {
-	local options=(
-		$(usev apparmor)
-		$(usex btrfs "" "no_btrfs")
-		$(usex cri "" "no_cri")
-		$(usex device-mapper "" "no_devmapper")
-		$(usev seccomp)
-		$(usev selinux)
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
-		REVISION="${GIT_REVISION}"
-		VERSION=v${PV}
-	)
-
-	# race condition in man target https://bugs.gentoo.org/765100
-	# we need to explicitly specify GOFLAGS for "go run" to use vendor source
-	emake "${myemakeargs[@]}" man -j1 #nowarn
-	emake "${myemakeargs[@]}" all
-
-}
-
-src_install() {
-	rm "${D}"/bin/gen-manpages
-	dobin bin/*
-	doman man/*
-	newconfd "${FILESDIR}"/${PN}.confd "${PN}"
-	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
-	systemd_dounit containerd.service
-	keepdir /var/lib/containerd
-
-	# we already installed manpages, remove markdown source
-	# before installing docs directory
-	rm -r docs/man || die
-
-	local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
-	einstalldocs
-}
diff --git a/app-containers/containerd/containerd-1.7.13.ebuild b/app-containers/containerd/containerd-1.7.13.ebuild
deleted file mode 100644
index e7293ba451b5..000000000000
--- a/app-containers/containerd/containerd-1.7.13.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd
-GIT_REVISION=7c3aca7a610df76212171d200ca3811ff6096eb8
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/"
-SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
-
-DEPEND="
-	btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp )
-"
-
-# recommended version of runc is found in script/setup/runc-version
-RDEPEND="
-	${DEPEND}
-	~app-containers/runc-1.1.12[apparmor?,seccomp?]
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-
-# tests require root or docker
-RESTRICT+="test"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s/-s -w//" \
-		-e "s/-mod=readonly//" \
-		Makefile || die
-	sed -i \
-		-e "s:/usr/local:/usr:" \
-		containerd.service || die
-}
-
-src_compile() {
-	local options=(
-		$(usev apparmor)
-		$(usex btrfs "" "no_btrfs")
-		$(usex cri "" "no_cri")
-		$(usex device-mapper "" "no_devmapper")
-		$(usev seccomp)
-		$(usev selinux)
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
-		REVISION="${GIT_REVISION}"
-		VERSION=v${PV}
-	)
-
-	# race condition in man target https://bugs.gentoo.org/765100
-	# we need to explicitly specify GOFLAGS for "go run" to use vendor source
-	emake "${myemakeargs[@]}" man -j1 #nowarn
-	emake "${myemakeargs[@]}" all
-
-}
-
-src_install() {
-	rm "${D}"/bin/gen-manpages
-	dobin bin/*
-	doman man/*
-	newconfd "${FILESDIR}"/${PN}.confd "${PN}"
-	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
-	systemd_dounit containerd.service
-	keepdir /var/lib/containerd
-
-	# we already installed manpages, remove markdown source
-	# before installing docs directory
-	rm -r docs/man || die
-
-	local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
-	einstalldocs
-}
diff --git a/app-containers/containerd/containerd-1.7.14.ebuild b/app-containers/containerd/containerd-1.7.14.ebuild
deleted file mode 100644
index 9a363e0c14c7..000000000000
--- a/app-containers/containerd/containerd-1.7.14.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd
-GIT_REVISION=dcf2847247e18caba8dce86522029642f60fe96b
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/"
-SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
-
-DEPEND="
-	btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp )
-"
-
-# recommended version of runc is found in script/setup/runc-version
-RDEPEND="
-	${DEPEND}
-	~app-containers/runc-1.1.12[apparmor?,seccomp?]
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-
-# tests require root or docker
-RESTRICT+="test"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s/-s -w//" \
-		-e "s/-mod=readonly//" \
-		Makefile || die
-	sed -i \
-		-e "s:/usr/local:/usr:" \
-		containerd.service || die
-}
-
-src_compile() {
-	local options=(
-		$(usev apparmor)
-		$(usex btrfs "" "no_btrfs")
-		$(usex cri "" "no_cri")
-		$(usex device-mapper "" "no_devmapper")
-		$(usev seccomp)
-		$(usev selinux)
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
-		REVISION="${GIT_REVISION}"
-		VERSION=v${PV}
-	)
-
-	# race condition in man target https://bugs.gentoo.org/765100
-	# we need to explicitly specify GOFLAGS for "go run" to use vendor source
-	emake "${myemakeargs[@]}" man -j1 #nowarn
-	emake "${myemakeargs[@]}" all
-
-}
-
-src_install() {
-	rm "${D}"/bin/gen-manpages
-	dobin bin/*
-	doman man/*
-	newconfd "${FILESDIR}"/${PN}.confd "${PN}"
-	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
-	systemd_dounit containerd.service
-	keepdir /var/lib/containerd
-
-	# we already installed manpages, remove markdown source
-	# before installing docs directory
-	rm -r docs/man || die
-
-	local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
-	einstalldocs
-}
diff --git a/app-containers/containerd/containerd-1.7.2.ebuild b/app-containers/containerd/containerd-1.7.2.ebuild
deleted file mode 100644
index 498fb8d90a5f..000000000000
--- a/app-containers/containerd/containerd-1.7.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd
-GIT_REVISION=0cae528dd6cb557f7201036e9f43420650207b58
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/"
-SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
-
-DEPEND="
-	btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp )
-"
-
-# recommended version of runc is found in script/setup/runc-version
-RDEPEND="
-	${DEPEND}
-	~app-containers/runc-1.1.7[apparmor?,seccomp?]
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-
-# tests require root or docker
-RESTRICT+="test"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s/-s -w//" \
-		-e "s/-mod=readonly//" \
-		Makefile || die
-	sed -i \
-		-e "s:/usr/local:/usr:" \
-		containerd.service || die
-}
-
-src_compile() {
-	local options=(
-		$(usev apparmor)
-		$(usex btrfs "" "no_btrfs")
-		$(usex cri "" "no_cri")
-		$(usex device-mapper "" "no_devmapper")
-		$(usev seccomp)
-		$(usev selinux)
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
-		REVISION="${GIT_REVISION}"
-		VERSION=v${PV}
-	)
-
-	# race condition in man target https://bugs.gentoo.org/765100
-	# we need to explicitly specify GOFLAGS for "go run" to use vendor source
-	emake "${myemakeargs[@]}" man -j1 #nowarn
-	emake "${myemakeargs[@]}" all
-
-}
-
-src_install() {
-	rm "${D}"/bin/gen-manpages
-	dobin bin/*
-	doman man/*
-	newconfd "${FILESDIR}"/${PN}.confd "${PN}"
-	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
-	systemd_dounit containerd.service
-	keepdir /var/lib/containerd
-
-	# we already installed manpages, remove markdown source
-	# before installing docs directory
-	rm -r docs/man || die
-
-	local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
-	einstalldocs
-}
diff --git a/app-containers/containerd/containerd-1.7.6.ebuild b/app-containers/containerd/containerd-1.7.6.ebuild
deleted file mode 100644
index 8ce5ddd813bd..000000000000
--- a/app-containers/containerd/containerd-1.7.6.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd
-GIT_REVISION=091922f03c2762540fd057fba91260237ff86acb
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/"
-SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
-
-DEPEND="
-	btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp )
-"
-
-# recommended version of runc is found in script/setup/runc-version
-RDEPEND="
-	${DEPEND}
-	~app-containers/runc-1.1.9[apparmor?,seccomp?]
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-
-# tests require root or docker
-RESTRICT+="test"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s/-s -w//" \
-		-e "s/-mod=readonly//" \
-		Makefile || die
-	sed -i \
-		-e "s:/usr/local:/usr:" \
-		containerd.service || die
-}
-
-src_compile() {
-	local options=(
-		$(usev apparmor)
-		$(usex btrfs "" "no_btrfs")
-		$(usex cri "" "no_cri")
-		$(usex device-mapper "" "no_devmapper")
-		$(usev seccomp)
-		$(usev selinux)
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
-		REVISION="${GIT_REVISION}"
-		VERSION=v${PV}
-	)
-
-	# race condition in man target https://bugs.gentoo.org/765100
-	# we need to explicitly specify GOFLAGS for "go run" to use vendor source
-	emake "${myemakeargs[@]}" man -j1 #nowarn
-	emake "${myemakeargs[@]}" all
-
-}
-
-src_install() {
-	rm "${D}"/bin/gen-manpages
-	dobin bin/*
-	doman man/*
-	newconfd "${FILESDIR}"/${PN}.confd "${PN}"
-	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
-	systemd_dounit containerd.service
-	keepdir /var/lib/containerd
-
-	# we already installed manpages, remove markdown source
-	# before installing docs directory
-	rm -r docs/man || die
-
-	local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
-	einstalldocs
-}
diff --git a/app-containers/containerd/containerd-1.7.8.ebuild b/app-containers/containerd/containerd-1.7.8.ebuild
deleted file mode 100644
index 023ca8488369..000000000000
--- a/app-containers/containerd/containerd-1.7.8.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd
-GIT_REVISION=8e4b0bde866788eec76735cc77c4720144248fb7
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/"
-SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
-
-DEPEND="
-	btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp )
-"
-
-# recommended version of runc is found in script/setup/runc-version
-RDEPEND="
-	${DEPEND}
-	~app-containers/runc-1.1.9[apparmor?,seccomp?]
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-
-# tests require root or docker
-RESTRICT+="test"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s/-s -w//" \
-		-e "s/-mod=readonly//" \
-		Makefile || die
-	sed -i \
-		-e "s:/usr/local:/usr:" \
-		containerd.service || die
-}
-
-src_compile() {
-	local options=(
-		$(usev apparmor)
-		$(usex btrfs "" "no_btrfs")
-		$(usex cri "" "no_cri")
-		$(usex device-mapper "" "no_devmapper")
-		$(usev seccomp)
-		$(usev selinux)
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
-		REVISION="${GIT_REVISION}"
-		VERSION=v${PV}
-	)
-
-	# race condition in man target https://bugs.gentoo.org/765100
-	# we need to explicitly specify GOFLAGS for "go run" to use vendor source
-	emake "${myemakeargs[@]}" man -j1 #nowarn
-	emake "${myemakeargs[@]}" all
-
-}
-
-src_install() {
-	rm "${D}"/bin/gen-manpages
-	dobin bin/*
-	doman man/*
-	newconfd "${FILESDIR}"/${PN}.confd "${PN}"
-	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
-	systemd_dounit containerd.service
-	keepdir /var/lib/containerd
-
-	# we already installed manpages, remove markdown source
-	# before installing docs directory
-	rm -r docs/man || die
-
-	local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
-	einstalldocs
-}
diff --git a/app-containers/docker-cli/Manifest b/app-containers/docker-cli/Manifest
index 93b8501134d7..d71c608fc656 100644
--- a/app-containers/docker-cli/Manifest
+++ b/app-containers/docker-cli/Manifest
@@ -1,19 +1,4 @@
-DIST docker-cli-24.0.5-man.tar.xz 82496 BLAKE2B f3295b684dbf8d251ba13a19b9bad9b828fce7d2f76b6643b1cf579cd297b770e8f7304bd3fce823badfbe97e9b760a108b819ca3c760a55e352cf3c5235d815 SHA512 683b0f131902e0a57512207daa49534d73aac6db99dc8621ac6b48eeef26b873e2ba03fe4afe6f1e84c5922e4c60bf0e80e24cc95cdbf2a4953d1c11b80d56ad
-DIST docker-cli-24.0.5.tar.gz 6243993 BLAKE2B a7ce84ecf329bc74e48f3a6e1b12a9e310a8f27ac68918ffeb40ab9c4eab8b79e753265b48220fcd3ab40b4136de5ebd44607831f642664eaf732111bd8f41b1 SHA512 765c67634d91d248b156d3e407398b98b7a0a89507bbac0310d4a68b95aa1a05e3af43c8b90bc10166748749d8cc36670619fc9efca110beefbdcd4385dc96be
-DIST docker-cli-24.0.6-man.tar.xz 82600 BLAKE2B 9e39bf200d252a0d91b0b6f17680a4c1b34e55cc9f357a59f124138cef39c5ff10fb104c51efe3010bca9a4f72447764ced1c02e3bb3924051fa6f1f01a8f6fa SHA512 5e972647961899e438b765f53afff570b9f0c1742c7c72a3a424887719c3a6afbd467d15884d44ac64b752c984261967f304afa5c168466fe6f611967d18a578
-DIST docker-cli-24.0.6.tar.gz 6244014 BLAKE2B c5f2082e44a568d3f6ee2ff5df9e9b727808f0b70d7d0c6c18b9769c1c4d0f49d371cbd08c95e748d441dc0ef011b66446527b0eeb33368ee59b85496185ba12 SHA512 55c56ae08eb314cce5f4c93544c6748586eadb3abe502d39d4d297e14d274af37346b38695a20a91dcfe51d3d35a77ddd7aa69d170b525e5e6ba345161869cd8
-DIST docker-cli-24.0.7-man.tar.xz 82228 BLAKE2B 7fbf114a724157243c78de9ae03b5d0b1237c5b506cd44edd7a28ffc13609a36b7acf66a25e1eff9f60966e48346d97e70f946cca9301f27fd0355db53a1994d SHA512 af2075e3c731c7e0da4941f4baf35e798f87d1e1f3fa09e85b27a4bcadfd767074af2acaff1fd919d8af2a89ed6d49daefcc0811342d1757886db7a28d1252f2
-DIST docker-cli-24.0.7.tar.gz 6451010 BLAKE2B de047f55ce388c09ec33492f470daf87c6f2d1651b0cd839634183494fba4065506661d2d15aac0dc076d005426411f4099ba8e8d95ea2c7247bb114a00f4eef SHA512 b4811e4ecaf1f17e5a53ee4fb34affab79545d87a1662b0f915efb28108989128f8bbf165c4aed111fcb0c851f7ec7d9137eb0f31447d698b058ff4200dba18d
-DIST docker-cli-25.0.1-man.tar.xz 78920 BLAKE2B a4b483e7d3b5c5a70d834a49ca04cd94f76745a8666bbbbbb7aabe9bae887e84b7511e18c455aa213a68d116e3c9bd9652bc5a7afb032e102213d41cc3b7450f SHA512 7a5b676ee9618d0c8d0f3c5690d5d9999dc5a28ba0aa5c41c9da0d1c99da2878502d055e9e8dad71674a84deaffeb07c28a4ac89941c972909fa455447e3c2bc
-DIST docker-cli-25.0.1.tar.gz 6860093 BLAKE2B c0745afe7f009b692c91029e9a0a447a1179c2a865b6021f6d48aa2f44e3405084244ca6802c15eb389151fc46fa194efb535ca4c824bfcd92c1ad51371ff1fe SHA512 6443f3184313acf34292f44b60b0de48c4cb141c607be81988aaacca36a6e4b6c862b249a5fba1c7f22b11523b42f3d38939f695e12f64eca305218add92d65f
-DIST docker-cli-25.0.4-man.tar.xz 78952 BLAKE2B 91315d341c9a6eb42e039dee3ab0b683a2abb2bb3ce44d64fe7b662f03966bfd29ee16a8700368b88a2052df79b5863648df95cf1ddd1ffe9cfe6fb076db8ed8 SHA512 d7d942ee7b979056e0008261d83945be69e837c055b2392b9aa41850b8b003d304df66b06c83d3ff0f4d24b4c7135a370502623e844973768ffb699aab195f19
-DIST docker-cli-25.0.4.tar.gz 6862436 BLAKE2B 6045e7080ca87971904e5a50057f420bc1e6ce9cc3038d5110ae067da259375eff17834e250d61c011aebc117034b892063fab2d131b5b8a9e5168602dc7fe83 SHA512 214984791ab67ca3da4bd5308d73a16218a0210da367d380bbe2a3f56eae131e252080aa2ebc3343df642007c9d91de6c0e0200122be9833866e58c87549db0d
 DIST docker-cli-26.1.0-man.tar.xz 79004 BLAKE2B 36dcf969c6567680990420d6d177101bf457f7fc1c24dff195ce8b478268335419fba5ff51a7b77bb8c0a6e0e6077d83ddb50f2ecf08bf069be89fc4849afd6e SHA512 36297ee3cbf096112ec41db2cd1d06796ddd27a57c4323e71a727e17d3930102710f643a77df9e68cd9b3294a6bb0fdf5565379e9fae7331e25afcd147b0084f
 DIST docker-cli-26.1.0.tar.gz 7213165 BLAKE2B 302236467f2b6f3f46b0f0c75e89c2cef0cd251d36e12f78a67c906cfb85b842b998fd3b07f4a2dfc0a04825a9b105d90f11d176055ded397f2d4e9145639d5d SHA512 1a1e9af1a836765ffa91f7f2e1b27911e2b6b373c308a7db332a7cd1825459ab1c04a93d03c9947b631bead0af21d9f03e06c3a60855cc56ca7039e50e38ba87
-EBUILD docker-cli-24.0.5.ebuild 1916 BLAKE2B a5a41f88d0865638c92efc4b4e377d54db4b32d4c1d21befab6c0822b0a243c36e14a38449ca022ac0a9e2d234198d558ba0bc0febeb9879fd416cdbad3ee8dc SHA512 2eec9b6af9baa8b6741ea4cfd87aa81f674ac4d896ae8ccc15b1495fca9670acd0df3f75bcfd2271bf8f2ac2f555f28776e55f04389e8b539d4cda2057ef0f01
-EBUILD docker-cli-24.0.6.ebuild 1919 BLAKE2B 8dc1817b481ab4d8e6a0238d4d0f99e78b206733e3a907c9f31e2a9cd7c074de1b9a29d96aa5471639d678c6f6e2869a51fb707a9d3b9ca04740f85432bc3c2c SHA512 a70060b91597a57b3040eb53ab005651dbf8b8f9d9b839932ba2eca80e8bacb5c383726f34063536f97bf67e0197491ab0bfa2974caeec435fc85c9396128ab5
-EBUILD docker-cli-24.0.7.ebuild 1919 BLAKE2B 6440d35df56e524ff25f9a79fdf7bfb8515049b01a3ad04f7082db5b3e44c4e230430ecc87040477a07c9bd692b08cb4dc706d04b40e618e30f57bf7fe570070 SHA512 21e3d5460fe942e1f5172746fb01a414e79c68e52b9e3b43f8396d43199e72e2dffe569b6d9fc26d7c3d23dbf54274f40ecb6d9f6cd2f8c27a3d236058b0d5b4
-EBUILD docker-cli-25.0.1.ebuild 1919 BLAKE2B 6adaa473aba7456aba95afabe3d59b346e0ba2c25784b3ffe529b17225776abcc8f3c424be2c5c88627814ee4c68cb4ffb25b0941271be3ad6c68d22c05c1d18 SHA512 e3bde16e2eae8a5a6d0acca62f255346e8935c3c5056c2613e873ca094d2bbd65d7442f852fb19bbf1904d79d2f6654853f6adf0aa4af11c83daead83f264121
-EBUILD docker-cli-25.0.4.ebuild 1919 BLAKE2B d100b2ce4b6193f4ca1ae057649f3d9953fceceebaf948c1cd63bf2c3a2bd002455f0551e697a01aaa104ce883bcdeb03ae7bdeeaff0f3aeb8f4460447bdfb57 SHA512 2de913249a4e2257487b80ba42a266058edf9b068e54fe373bac5ac9a84d5a12dc8a69aebc5b5f9bd5419466bcb7bf150c837f943b12f91905e29839c061517f
 EBUILD docker-cli-26.1.0.ebuild 1948 BLAKE2B b5452c4bcfca4bc6f07d816319c1f24f883a86e8e9cd3bb38b5a4eeff5b6c2edaa2f07399d871707e8b891e099f5c6c275d3fff040032ce09f9d46e6edb88554 SHA512 053edc16298ad414c2327e5a1cc8f53963e6c48b93de130121fd673d09b19c6d658ca304d7b94606b9e184c10c9756415829eec0e86b1307acee1c8dd4d536e2
 MISC metadata.xml 398 BLAKE2B f9cd5360fa32f30edeeb2fe1df0ea50fd0b061bf882c66c65f18d15ba56995deac8c054419ddbf2d6436bf90f6fb729dda9560b3766b558d45498ae2c8de486c SHA512 4b2cf7c3b38df8382680539e1a8121f6f2f75cbe70f1f92c589fb40dd4c368f2f207cf3567ead5620714c323c0c196c318a4c5ab947d49092668dc2a3a8a6a53
diff --git a/app-containers/docker-cli/docker-cli-24.0.5.ebuild b/app-containers/docker-cli/docker-cli-24.0.5.ebuild
deleted file mode 100644
index 4e1f622ad7af..000000000000
--- a/app-containers/docker-cli/docker-cli-24.0.5.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GIT_COMMIT=ced0996600
-EGO_PN="github.com/docker/cli"
-MY_PV=${PV/_/-}
-inherit bash-completion-r1  golang-vcs-snapshot
-
-DESCRIPTION="the command line binary for docker"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-man.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86"
-IUSE="hardened selinux"
-
-RDEPEND="!<app-containers/docker-20.10.1
-	selinux? ( sec-policy/selinux-docker )"
-BDEPEND="
-	>=dev-lang/go-1.16.6"
-
-RESTRICT="installsources strip test"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_unpack() {
-	golang-vcs-snapshot_src_unpack
-	set -- ${A}
-	unpack ${2}
-}
-
-src_prepare() {
-	default
-	sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
-}
-
-src_compile() {
-	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	export GOPATH="${WORKDIR}/${P}"
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
-		emake \
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
-		VERSION="${PV}" \
-		GITCOMMIT="${GIT_COMMIT}" \
-		dynbinary
-}
-
-src_install() {
-	dobin build/docker
-	doman "${WORKDIR}"/man/man?/*
-	dobashcomp contrib/completion/bash/*
-	bashcomp_alias docker dockerd
-	insinto /usr/share/fish/vendor_completions.d/
-	doins contrib/completion/fish/docker.fish
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/_*
-}
-
-pkg_postinst() {
-	has_version "app-containers/docker-buildx" && return
-	ewarn "the 'docker build' command is deprecated and will be removed in a"
-	ewarn "future release. If you need this functionality, install"
-	ewarn "app-containers/docker-buildx."
-}
diff --git a/app-containers/docker-cli/docker-cli-24.0.6.ebuild b/app-containers/docker-cli/docker-cli-24.0.6.ebuild
deleted file mode 100644
index bb48e683d96b..000000000000
--- a/app-containers/docker-cli/docker-cli-24.0.6.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GIT_COMMIT=ed223bc820
-EGO_PN="github.com/docker/cli"
-MY_PV=${PV/_/-}
-inherit bash-completion-r1  golang-vcs-snapshot
-
-DESCRIPTION="the command line binary for docker"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-man.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="hardened selinux"
-
-RDEPEND="!<app-containers/docker-20.10.1
-	selinux? ( sec-policy/selinux-docker )"
-BDEPEND="
-	>=dev-lang/go-1.16.6"
-
-RESTRICT="installsources strip test"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_unpack() {
-	golang-vcs-snapshot_src_unpack
-	set -- ${A}
-	unpack ${2}
-}
-
-src_prepare() {
-	default
-	sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
-}
-
-src_compile() {
-	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	export GOPATH="${WORKDIR}/${P}"
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
-		emake \
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
-		VERSION="${PV}" \
-		GITCOMMIT="${GIT_COMMIT}" \
-		dynbinary
-}
-
-src_install() {
-	dobin build/docker
-	doman "${WORKDIR}"/man/man?/*
-	dobashcomp contrib/completion/bash/*
-	bashcomp_alias docker dockerd
-	insinto /usr/share/fish/vendor_completions.d/
-	doins contrib/completion/fish/docker.fish
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/_*
-}
-
-pkg_postinst() {
-	has_version "app-containers/docker-buildx" && return
-	ewarn "the 'docker build' command is deprecated and will be removed in a"
-	ewarn "future release. If you need this functionality, install"
-	ewarn "app-containers/docker-buildx."
-}
diff --git a/app-containers/docker-cli/docker-cli-24.0.7.ebuild b/app-containers/docker-cli/docker-cli-24.0.7.ebuild
deleted file mode 100644
index 67adf9a5f12d..000000000000
--- a/app-containers/docker-cli/docker-cli-24.0.7.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GIT_COMMIT=afdd53b4e3
-EGO_PN="github.com/docker/cli"
-MY_PV=${PV/_/-}
-inherit bash-completion-r1  golang-vcs-snapshot
-
-DESCRIPTION="the command line binary for docker"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-man.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="hardened selinux"
-
-RDEPEND="!<app-containers/docker-20.10.1
-	selinux? ( sec-policy/selinux-docker )"
-BDEPEND="
-	>=dev-lang/go-1.16.6"
-
-RESTRICT="installsources strip test"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_unpack() {
-	golang-vcs-snapshot_src_unpack
-	set -- ${A}
-	unpack ${2}
-}
-
-src_prepare() {
-	default
-	sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
-}
-
-src_compile() {
-	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	export GOPATH="${WORKDIR}/${P}"
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
-		emake \
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
-		VERSION="${PV}" \
-		GITCOMMIT="${GIT_COMMIT}" \
-		dynbinary
-}
-
-src_install() {
-	dobin build/docker
-	doman "${WORKDIR}"/man/man?/*
-	dobashcomp contrib/completion/bash/*
-	bashcomp_alias docker dockerd
-	insinto /usr/share/fish/vendor_completions.d/
-	doins contrib/completion/fish/docker.fish
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/_*
-}
-
-pkg_postinst() {
-	has_version "app-containers/docker-buildx" && return
-	ewarn "the 'docker build' command is deprecated and will be removed in a"
-	ewarn "future release. If you need this functionality, install"
-	ewarn "app-containers/docker-buildx."
-}
diff --git a/app-containers/docker-cli/docker-cli-25.0.1.ebuild b/app-containers/docker-cli/docker-cli-25.0.1.ebuild
deleted file mode 100644
index 54c637076191..000000000000
--- a/app-containers/docker-cli/docker-cli-25.0.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GIT_COMMIT=29cf629222
-EGO_PN="github.com/docker/cli"
-MY_PV=${PV/_/-}
-inherit bash-completion-r1  golang-vcs-snapshot
-
-DESCRIPTION="the command line binary for docker"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-man.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="hardened selinux"
-
-RDEPEND="!<app-containers/docker-20.10.1
-	selinux? ( sec-policy/selinux-docker )"
-BDEPEND="
-	>=dev-lang/go-1.16.6"
-
-RESTRICT="installsources strip test"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_unpack() {
-	golang-vcs-snapshot_src_unpack
-	set -- ${A}
-	unpack ${2}
-}
-
-src_prepare() {
-	default
-	sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
-}
-
-src_compile() {
-	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	export GOPATH="${WORKDIR}/${P}"
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
-		emake \
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
-		VERSION="${PV}" \
-		GITCOMMIT="${GIT_COMMIT}" \
-		dynbinary
-}
-
-src_install() {
-	dobin build/docker
-	doman "${WORKDIR}"/man/man?/*
-	dobashcomp contrib/completion/bash/*
-	bashcomp_alias docker dockerd
-	insinto /usr/share/fish/vendor_completions.d/
-	doins contrib/completion/fish/docker.fish
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/_*
-}
-
-pkg_postinst() {
-	has_version "app-containers/docker-buildx" && return
-	ewarn "the 'docker build' command is deprecated and will be removed in a"
-	ewarn "future release. If you need this functionality, install"
-	ewarn "app-containers/docker-buildx."
-}
diff --git a/app-containers/docker-cli/docker-cli-25.0.4.ebuild b/app-containers/docker-cli/docker-cli-25.0.4.ebuild
deleted file mode 100644
index 97d5f7e61767..000000000000
--- a/app-containers/docker-cli/docker-cli-25.0.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GIT_COMMIT=1a576c50a9
-EGO_PN="github.com/docker/cli"
-MY_PV=${PV/_/-}
-inherit bash-completion-r1  golang-vcs-snapshot
-
-DESCRIPTION="the command line binary for docker"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-man.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="hardened selinux"
-
-RDEPEND="!<app-containers/docker-20.10.1
-	selinux? ( sec-policy/selinux-docker )"
-BDEPEND="
-	>=dev-lang/go-1.16.6"
-
-RESTRICT="installsources strip test"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_unpack() {
-	golang-vcs-snapshot_src_unpack
-	set -- ${A}
-	unpack ${2}
-}
-
-src_prepare() {
-	default
-	sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
-}
-
-src_compile() {
-	export DISABLE_WARN_OUTSIDE_CONTAINER=1
-	export GOPATH="${WORKDIR}/${P}"
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
-		emake \
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
-		VERSION="${PV}" \
-		GITCOMMIT="${GIT_COMMIT}" \
-		dynbinary
-}
-
-src_install() {
-	dobin build/docker
-	doman "${WORKDIR}"/man/man?/*
-	dobashcomp contrib/completion/bash/*
-	bashcomp_alias docker dockerd
-	insinto /usr/share/fish/vendor_completions.d/
-	doins contrib/completion/fish/docker.fish
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/_*
-}
-
-pkg_postinst() {
-	has_version "app-containers/docker-buildx" && return
-	ewarn "the 'docker build' command is deprecated and will be removed in a"
-	ewarn "future release. If you need this functionality, install"
-	ewarn "app-containers/docker-buildx."
-}
diff --git a/app-containers/docker/Manifest b/app-containers/docker/Manifest
index d4dd7e765e5c..8a2ff52a3645 100644
--- a/app-containers/docker/Manifest
+++ b/app-containers/docker/Manifest
@@ -1,16 +1,5 @@
 AUX 0001-Openrc-Depend-on-containerd-init-script.patch 774 BLAKE2B a7ac6f6a1e9ee88751e8e0471cd33429b8141cbea07a3a56c61eccd63c796c9135edafaf5977571a4413e5d71931aac44b5313110af94c3206e286b15394f637 SHA512 bc709b6f0dd8685fbf2404be589743f32a5f4deb24dec8ed6aeec18f0fcd1db4c5d59587209c28f62d964d78ec9ab3a3fdbb795dc4b7e3fabd00a06a002af34e
-AUX docker-24.0.5-automagic-systemd.patch 408 BLAKE2B 30219bec84f4508dbfdeb58971cc94aa3a93d3d086c23a51fd1dda68b6409b9c2e44f262711ee353347b18877606fceb12bab306496e4ec6c9b4e6b9123ca381 SHA512 490d96d43f2d18a7fe295331bfd8c31d6812f6e6e37d33b39f20671461757d12ec3366fa31212c0123413458c388d1c67361c634224ca15bf40acb7aab10477f
 AUX docker-26.1.0-automagic-systemd.patch 355 BLAKE2B 95d2367d5450a15214939c0a080b81a07d3ea3fdaaee921b2fc221949f3737652182366e54af499da5a1597fb1353a29d8935ed0a5e60a805920d3375aa594a1 SHA512 ba694ac1ca135fadc39d1afe0b8fdfaef8d6b9c75cbe4177a51422f972022f3502625c5e5467cd54fe33b2e83acdfe2c524da2a4d37f74376f365d7baaa12bec
-DIST docker-24.0.5.tar.gz 14456089 BLAKE2B be13a4256787152cb35ddb96d80e97a5e5b587094f1c61d18158737a037c4e81b88c186098ba7416eb7778022ece07bc31ee55af13d3e3da8e0bbd5452ad027f SHA512 cde2e47e7658b153399ee29154ec21eebf54b292185e07d43b968895dcfdfead95e4507fefb713859a4540f21d8007116d3ebeaa1fb7ba305fb2a0449ba1bee6
-DIST docker-24.0.6.tar.gz 14462378 BLAKE2B bced8e687abac59254a9969df46f323a835627a724889e5966bea08df8766b4291914442001d1b573280c45ac4d357a673e98e8fba2b8d116a1dbd65424ccf78 SHA512 d9bf0ba756b1ebe69a44819d7c6aa5d66dad8db5bcc41233e2bfce8131334a2fe1af3972de7f602b7911231288d29aaea797b7a05b335c2d7214a613b27c4b63
-DIST docker-24.0.7.tar.gz 14658649 BLAKE2B 73bad494640ef8cad2b9b991f94414d8bec4dd88b120b0f8238f74d01269c445270f45410ac2c78af074356c3ba60a7c550ab28f5da5924bdc6d8b99e85a1360 SHA512 08f22fcbce163c3ba8eb21302fd38ff04fd3f27067f5715a3c527ba2efe67f694fac80bfe6d6b5e22d06d98917e1685a9d3d9b58991f221354f637f4a8bdc526
-DIST docker-25.0.1.tar.gz 15936052 BLAKE2B 32b24893c9b098b218b16548be074588ad98ed31c8b87ab3fa467f79e33e96ce94f694b86f2920b1166e64c153b1c2482cb602117f673d23f0fc5ccc9b28ae92 SHA512 816c888925cf609e7caa6e491b45614f69fdd7df5ed4f783d8a77cf86d9f46f4f457a95a943aa75ecddf99d080daf78bc0dba55e9648960dc539b1ae62052361
-DIST docker-25.0.4.tar.gz 15953567 BLAKE2B 85398de80b14f21d611822a1714ac987d919cf6a2a8059d8a6d41c9b63fd63a04013e47e01021eccdbd107f1a3f8ee55dc1ecbc4b6c9cc20ff2854434e3b6af7 SHA512 07e724de305def32a1e32a724a8041be193745c4f0d549708723cf5d14b840f74648e83e790fd526e00a6c6fdb7e487ee4e5ed0752fbe172d673ab86fe8819d2
 DIST docker-26.1.0.tar.gz 16390376 BLAKE2B 6703e9b153c430bc28aed2e7de7bada0203353d61f0a2ce3d49ddbd017eab196a685dd1ab1e719a6b287813eb5fa4f2c612e2cf1ab95789d6e79ebe5dac7ace3 SHA512 47b6b9af9947016884614b6bc25977e1db281da95c9b8b34c753c21c664a737a893f9fa65d92cbb897735aae3893567e106e6bababb5507e069b1e0981e48d50
-EBUILD docker-24.0.5-r1.ebuild 7807 BLAKE2B eadcaee6822674bcefcf097ae5f6a431348e93ec1cc676baa8e6f850500edbe92721e0519b3b4dd713c7bcc8297ca85171d7e2f9dfd0fe4d14f57a1c6302b059 SHA512 7a5caa58731a199ae1f51c5c9cba122b11e8b008dd1386bfc3722b6afef1ebeea59466f9f496a9adcbea327f4d970020bbe15286e43c1c72e864efb0506a4d67
-EBUILD docker-24.0.6.ebuild 7730 BLAKE2B b0b794e5b2286db6f0e150d9fb9dda78affc11e56c10b338f82518505bf62079b3df4dfcbb265ee2a49169c94b63015540bf6134d5c003cd14b697f656fea122 SHA512 d1ffd748c8d99cc85e3328f9c0937d1dfe08e1cd3b2332a34d54e255e3321a2376dc83898cd8120f7c06b6dd72dd4b2935da88496548cb6c81c37098e7ac4bd8
-EBUILD docker-24.0.7-r1.ebuild 7859 BLAKE2B 051f48853e4e55c7c998280c550522598ddab232acb3896faacdf1d7bdec0a7d7e3dd2761c23bbcec9aeba49b260c5940bc40f17b3f067ea4a16b2ddcecce246 SHA512 406070d547ed53e59ca3bd6143ed0a579e3bc6c7b6b5484b286f754c26de9b542f5f4ecb12086e9d4a10c4e6d5078f398f2eb688af8614b6e64966cdce0503da
-EBUILD docker-25.0.1.ebuild 7400 BLAKE2B 27cc2cbcba89474dae5d73bb7085d75820bffd7d0bbab25906517b75a6150c4b33a1b411178a13c11b2bb7acbb0896be8e6b7d7e08b5a22be5fd4c3d89a4fcef SHA512 a4e1e3cde6170cced1f73e47a0f54497818fcd46aebace94732e84a4b09b7717490e5fe465b0a9e72e341b58f661070e45acf7901f5e1836044e26cbcb0143ed
-EBUILD docker-25.0.4.ebuild 7402 BLAKE2B 2fad943f26d8e74d7dbb2eb6417b0ccae49f0ca07ffcc5d3b0c3146e1344cfc4307a6881786ff28bcea31c5217fe058598163ab56b0b4e3c363475fa06663bcb SHA512 f494f5f0fa47b29c488154e52373fcffedb2e450df0c72bc51ad513ef53dff2bb9ffd0021d76e2cd440fb43f1008561ab91c3e3ecdb67b151923684a8f2ef885
 EBUILD docker-26.1.0-r1.ebuild 7532 BLAKE2B 4ea141e681d5db35248a0411f9ad0601d1cd8e25be77c217138e0d90709a122405d200d4351a57a77dadbbc18e953a395c9223c2954dc850efc6bb90dfe3c797 SHA512 5797b7045a5dc8c94e65abf46bbcd0ff14c35e5c1940997a4f510eb3c04cb6549e54c9f357ffd575a4c41d6a1ab1739a6ce00245099ac332f090d2edd4f3482f
 MISC metadata.xml 1238 BLAKE2B 66ba70d18bda5204db7a3a11ce1b258d5f3c3679ee5e9271033b04eeb9a23891632c5fb55a1bbd4d549b865261c9f05e9515879e989001b8b8e84e082dca8fb9 SHA512 ed304e622873eb5cb5e5f6e79955b19c4d660d8d3348ebc632b7c2ec996680ce43a53ee920c0f124525911836aa08e6cdaf942c9a856f68d31632a955930b271
diff --git a/app-containers/docker/docker-24.0.5-r1.ebuild b/app-containers/docker/docker-24.0.5-r1.ebuild
deleted file mode 100644
index 2421fd8dd3eb..000000000000
--- a/app-containers/docker/docker-24.0.5-r1.ebuild
+++ /dev/null
@@ -1,334 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGO_PN=github.com/docker/docker
-MY_PV=${PV/_/-}
-inherit linux-info systemd udev golang-vcs-snapshot
-GIT_COMMIT=4ffc61430bbe6d3d405bdf357b766bf303ff3cc5
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
-IUSE="apparmor btrfs +container-init device-mapper overlay seccomp selinux systemd"
-
-DEPEND="
-	acct-group/docker
-	>=dev-db/sqlite-3.7.9:3
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
-	device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] )
-	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-	systemd? ( sys-apps/systemd )
-"
-
-# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4
-	sys-process/procps
-	>=dev-vcs/git-1.7
-	>=app-arch/xz-utils-4.9
-	dev-libs/libltdl
-	>=app-containers/containerd-1.7.1[apparmor?,btrfs?,device-mapper?,seccomp?]
-	!app-containers/docker-proxy
-	container-init? ( >=sys-process/tini-0.19.0[static] )
-	selinux? ( sec-policy/selinux-docker )
-"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-BDEPEND="
-	>=dev-lang/go-1.16.12
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-# tests require running dockerd as root and downloading containers
-RESTRICT="installsources strip test"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552
-PATCHES=(
-	"${FILESDIR}/0001-Openrc-Depend-on-containerd-init-script.patch"
-	"${FILESDIR}/docker-24.0.5-automagic-systemd.patch"
-)
-
-pkg_setup() {
-	# this is based on "contrib/check-config.sh" from upstream's sources
-	# required features.
-	CONFIG_CHECK="
-		~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-		~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
-		~KEYS
-		~VETH ~BRIDGE ~BRIDGE_NETFILTER
-		~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-		~NETFILTER_XT_MATCH_ADDRTYPE
-		~NETFILTER_XT_MATCH_CONNTRACK
-		~NETFILTER_XT_MATCH_IPVS
-		~NETFILTER_XT_MARK
-		~IP_NF_NAT ~NF_NAT
-		~POSIX_MQUEUE
-	"
-	WARNING_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: is required for bind-mounting /dev/mqueue into containers"
-
-	if kernel_is lt 4 8; then
-		CONFIG_CHECK+="
-			~DEVPTS_MULTIPLE_INSTANCES
-		"
-	fi
-
-	if kernel_is le 5 1; then
-		CONFIG_CHECK+="
-			~NF_NAT_IPV4
-		"
-	fi
-
-	if kernel_is le 5 2; then
-		CONFIG_CHECK+="
-			~NF_NAT_NEEDED
-		"
-	fi
-
-	if kernel_is ge 4 15; then
-		CONFIG_CHECK+="
-			~CGROUP_BPF
-		"
-	fi
-
-	# optional features
-	CONFIG_CHECK+="
-		~USER_NS
-	"
-
-	if use seccomp; then
-		CONFIG_CHECK+="
-			~SECCOMP ~SECCOMP_FILTER
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~CGROUP_PIDS
-	"
-
-	if kernel_is lt 6 1; then
-		CONFIG_CHECK+="
-			~MEMCG_SWAP
-			"
-	fi
-
-	if kernel_is le 5 8; then
-		CONFIG_CHECK+="
-			~MEMCG_SWAP_ENABLED
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~!LEGACY_VSYSCALL_NATIVE
-		"
-	if kernel_is lt 5 19; then
-		CONFIG_CHECK+="
-			~LEGACY_VSYSCALL_EMULATE
-			"
-	fi
-	CONFIG_CHECK+="
-		~!LEGACY_VSYSCALL_NONE
-		"
-	WARNING_LEGACY_VSYSCALL_NONE="CONFIG_LEGACY_VSYSCALL_NONE enabled: \
-		Containers with <=glibc-2.13 will not work"
-
-	if kernel_is le 4 5; then
-		CONFIG_CHECK+="
-			~MEMCG_KMEM
-		"
-	fi
-
-	if kernel_is lt 5; then
-		CONFIG_CHECK+="
-			~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~BLK_CGROUP ~BLK_DEV_THROTTLING
-		~CGROUP_PERF
-		~CGROUP_HUGETLB
-		~NET_CLS_CGROUP ~CGROUP_NET_PRIO
-		~CFS_BANDWIDTH ~FAIR_GROUP_SCHED
-		~IP_NF_TARGET_REDIRECT
-		~IP_VS
-		~IP_VS_NFCT
-		~IP_VS_PROTO_TCP
-		~IP_VS_PROTO_UDP
-		~IP_VS_RR
-		"
-
-	if use selinux; then
-		CONFIG_CHECK+="
-			~SECURITY_SELINUX
-			"
-	fi
-
-	if use apparmor; then
-		CONFIG_CHECK+="
-			~SECURITY_APPARMOR
-			"
-	fi
-
-	# if ! is_set EXT4_USE_FOR_EXT2; then
-	#	check_flags EXT3_FS EXT3_FS_XATTR EXT3_FS_POSIX_ACL EXT3_FS_SECURITY
-	#	if ! is_set EXT3_FS || ! is_set EXT3_FS_XATTR || ! is_set EXT3_FS_POSIX_ACL || ! is_set EXT3_FS_SECURITY; then
-	#		echo "    $(wrap_color '(enable these ext3 configs if you are using ext3 as backing filesystem)' bold black)"
-	#	fi
-	# fi
-
-	CONFIG_CHECK+="
-		~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-	"
-
-	# if ! is_set EXT4_FS || ! is_set EXT4_FS_POSIX_ACL || ! is_set EXT4_FS_SECURITY; then
-	#	if is_set EXT4_USE_FOR_EXT2; then
-	#		echo "    $(wrap_color 'enable these ext4 configs if you are using ext3 or ext4 as backing filesystem' bold black)"
-	#	else
-	#		echo "    $(wrap_color 'enable these ext4 configs if you are using ext4 as backing filesystem' bold black)"
-	#	fi
-	# fi
-
-	# network drivers
-	CONFIG_CHECK+="
-		~VXLAN ~BRIDGE_VLAN_FILTERING
-		~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH
-		~XFRM ~XFRM_USER ~XFRM_ALGO ~INET_ESP
-	"
-	if kernel_is le 5 3; then
-		CONFIG_CHECK+="
-			~INET_XFRM_MODE_TRANSPORT
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~IPVLAN
-		"
-	CONFIG_CHECK+="
-		~MACVLAN ~DUMMY
-		"
-	CONFIG_CHECK+="
-		~NF_NAT_FTP ~NF_CONNTRACK_FTP ~NF_NAT_TFTP ~NF_CONNTRACK_TFTP
-	"
-
-	# storage drivers
-	if use btrfs; then
-		CONFIG_CHECK+="
-			~BTRFS_FS
-			~BTRFS_FS_POSIX_ACL
-		"
-	fi
-
-	if use device-mapper; then
-		CONFIG_CHECK+="
-			~BLK_DEV_DM ~DM_THIN_PROVISIONING
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~OVERLAY_FS
-	"
-
-	linux-info_pkg_setup
-}
-
-src_compile() {
-	export DOCKER_GITCOMMIT="${GIT_COMMIT}"
-	export GOPATH="${WORKDIR}/${P}"
-	export VERSION=${PV}
-
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
-
-	# let's set up some optional features :)
-	export DOCKER_BUILDTAGS=''
-	for gd in btrfs device-mapper overlay; do
-		if ! use $gd; then
-			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-		fi
-	done
-
-	for tag in apparmor seccomp; do
-		if use $tag; then
-			DOCKER_BUILDTAGS+=" $tag"
-		fi
-	done
-
-	export SYSTEMD=$(usex systemd 1 0)
-
-	# build binaries
-	./hack/make.sh dynbinary || die 'dynbinary failed'
-}
-
-src_install() {
-	dosym containerd /usr/bin/docker-containerd
-	dosym containerd-shim /usr/bin/docker-containerd-shim
-	dosym runc /usr/bin/docker-runc
-	use container-init && dosym tini /usr/bin/docker-init
-	dobin bundles/dynbinary-daemon/dockerd
-	dobin bundles/dynbinary-daemon/docker-proxy
-
-	newinitd contrib/init/openrc/docker.initd docker
-	newconfd contrib/init/openrc/docker.confd docker
-
-	systemd_dounit contrib/init/systemd/docker.{service,socket}
-
-	udev_dorules contrib/udev/*.rules
-
-	dodoc AUTHORS CONTRIBUTING.md NOTICE README.md
-	dodoc -r docs/*
-
-	# note: intentionally not using "doins" so that we preserve +x bits
-	dodir /usr/share/${PN}/contrib
-	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot:"
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "  systemctl enable docker.service"
-	else
-		elog "  rc-update add docker default"
-	fi
-	elog
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog '  usermod -aG docker <youruser>'
-	elog
-
-	if use device-mapper; then
-		elog " Devicemapper storage driver has been deprecated"
-		elog " It will be removed in a future release"
-		elog
-	fi
-
-	if use overlay; then
-		elog " Overlay storage driver/USEflag has been deprecated"
-		elog " in favor of overlay2 (enabled unconditionally)"
-		elog
-	fi
-
-	if has_version sys-fs/zfs; then
-		elog " ZFS storage driver is available"
-		elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info"
-		elog
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-containers/docker/docker-24.0.6.ebuild b/app-containers/docker/docker-24.0.6.ebuild
deleted file mode 100644
index 6a8cc58fd1f6..000000000000
--- a/app-containers/docker/docker-24.0.6.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGO_PN=github.com/docker/docker
-MY_PV=${PV/_/-}
-inherit linux-info systemd udev golang-vcs-snapshot
-GIT_COMMIT=1a7969545d73537545645f5cd2c79b7a77e7d39f
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor btrfs +container-init device-mapper overlay seccomp selinux"
-
-DEPEND="
-	acct-group/docker
-	>=dev-db/sqlite-3.7.9:3
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
-	device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] )
-	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-"
-
-# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4
-	sys-process/procps
-	>=dev-vcs/git-1.7
-	>=app-arch/xz-utils-4.9
-	dev-libs/libltdl
-	>=app-containers/containerd-1.7.3[apparmor?,btrfs?,device-mapper?,seccomp?]
-	>=app-containers/runc-1.1.9[apparmor?,seccomp?]
-	!app-containers/docker-proxy
-	container-init? ( >=sys-process/tini-0.19.0[static] )
-	selinux? ( sec-policy/selinux-docker )
-"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-BDEPEND="
-	>=dev-lang/go-1.16.12
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-# tests require running dockerd as root and downloading containers
-RESTRICT="installsources strip test"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552
-PATCHES=(
-	"${FILESDIR}/0001-Openrc-Depend-on-containerd-init-script.patch"
-)
-
-pkg_setup() {
-	# this is based on "contrib/check-config.sh" from upstream's sources
-	# required features.
-	CONFIG_CHECK="
-		~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-		~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
-		~KEYS
-		~VETH ~BRIDGE ~BRIDGE_NETFILTER
-		~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-		~NETFILTER_XT_MATCH_ADDRTYPE
-		~NETFILTER_XT_MATCH_CONNTRACK
-		~NETFILTER_XT_MATCH_IPVS
-		~NETFILTER_XT_MARK
-		~IP_NF_NAT ~NF_NAT
-		~POSIX_MQUEUE
-	"
-	WARNING_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: is required for bind-mounting /dev/mqueue into containers"
-
-	if kernel_is lt 4 8; then
-		CONFIG_CHECK+="
-			~DEVPTS_MULTIPLE_INSTANCES
-		"
-	fi
-
-	if kernel_is le 5 1; then
-		CONFIG_CHECK+="
-			~NF_NAT_IPV4
-		"
-	fi
-
-	if kernel_is le 5 2; then
-		CONFIG_CHECK+="
-			~NF_NAT_NEEDED
-		"
-	fi
-
-	if kernel_is ge 4 15; then
-		CONFIG_CHECK+="
-			~CGROUP_BPF
-		"
-	fi
-
-	# optional features
-	CONFIG_CHECK+="
-		~USER_NS
-	"
-
-	if use seccomp; then
-		CONFIG_CHECK+="
-			~SECCOMP ~SECCOMP_FILTER
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~CGROUP_PIDS
-	"
-
-	if kernel_is lt 6 1; then
-		CONFIG_CHECK+="
-			~MEMCG_SWAP
-			"
-	fi
-
-	if kernel_is le 5 8; then
-		CONFIG_CHECK+="
-			~MEMCG_SWAP_ENABLED
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~!LEGACY_VSYSCALL_NATIVE
-		"
-	if kernel_is lt 5 19; then
-		CONFIG_CHECK+="
-			~LEGACY_VSYSCALL_EMULATE
-			"
-	fi
-	CONFIG_CHECK+="
-		~!LEGACY_VSYSCALL_NONE
-		"
-	WARNING_LEGACY_VSYSCALL_NONE="CONFIG_LEGACY_VSYSCALL_NONE enabled: \
-		Containers with <=glibc-2.13 will not work"
-
-	if kernel_is le 4 5; then
-		CONFIG_CHECK+="
-			~MEMCG_KMEM
-		"
-	fi
-
-	if kernel_is lt 5; then
-		CONFIG_CHECK+="
-			~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~BLK_CGROUP ~BLK_DEV_THROTTLING
-		~CGROUP_PERF
-		~CGROUP_HUGETLB
-		~NET_CLS_CGROUP ~CGROUP_NET_PRIO
-		~CFS_BANDWIDTH ~FAIR_GROUP_SCHED
-		~IP_NF_TARGET_REDIRECT
-		~IP_VS
-		~IP_VS_NFCT
-		~IP_VS_PROTO_TCP
-		~IP_VS_PROTO_UDP
-		~IP_VS_RR
-		"
-
-	if use selinux; then
-		CONFIG_CHECK+="
-			~SECURITY_SELINUX
-			"
-	fi
-
-	if use apparmor; then
-		CONFIG_CHECK+="
-			~SECURITY_APPARMOR
-			"
-	fi
-
-	# if ! is_set EXT4_USE_FOR_EXT2; then
-	#	check_flags EXT3_FS EXT3_FS_XATTR EXT3_FS_POSIX_ACL EXT3_FS_SECURITY
-	#	if ! is_set EXT3_FS || ! is_set EXT3_FS_XATTR || ! is_set EXT3_FS_POSIX_ACL || ! is_set EXT3_FS_SECURITY; then
-	#		echo "    $(wrap_color '(enable these ext3 configs if you are using ext3 as backing filesystem)' bold black)"
-	#	fi
-	# fi
-
-	CONFIG_CHECK+="
-		~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-	"
-
-	# if ! is_set EXT4_FS || ! is_set EXT4_FS_POSIX_ACL || ! is_set EXT4_FS_SECURITY; then
-	#	if is_set EXT4_USE_FOR_EXT2; then
-	#		echo "    $(wrap_color 'enable these ext4 configs if you are using ext3 or ext4 as backing filesystem' bold black)"
-	#	else
-	#		echo "    $(wrap_color 'enable these ext4 configs if you are using ext4 as backing filesystem' bold black)"
-	#	fi
-	# fi
-
-	# network drivers
-	CONFIG_CHECK+="
-		~VXLAN ~BRIDGE_VLAN_FILTERING
-		~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH
-		~XFRM ~XFRM_USER ~XFRM_ALGO ~INET_ESP
-	"
-	if kernel_is le 5 3; then
-		CONFIG_CHECK+="
-			~INET_XFRM_MODE_TRANSPORT
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~IPVLAN
-		"
-	CONFIG_CHECK+="
-		~MACVLAN ~DUMMY
-		"
-	CONFIG_CHECK+="
-		~NF_NAT_FTP ~NF_CONNTRACK_FTP ~NF_NAT_TFTP ~NF_CONNTRACK_TFTP
-	"
-
-	# storage drivers
-	if use btrfs; then
-		CONFIG_CHECK+="
-			~BTRFS_FS
-			~BTRFS_FS_POSIX_ACL
-		"
-	fi
-
-	if use device-mapper; then
-		CONFIG_CHECK+="
-			~BLK_DEV_DM ~DM_THIN_PROVISIONING
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~OVERLAY_FS
-	"
-
-	linux-info_pkg_setup
-}
-
-src_compile() {
-	export DOCKER_GITCOMMIT="${GIT_COMMIT}"
-	export GOPATH="${WORKDIR}/${P}"
-	export VERSION=${PV}
-
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
-
-	# let's set up some optional features :)
-	export DOCKER_BUILDTAGS=''
-	for gd in btrfs device-mapper overlay; do
-		if ! use $gd; then
-			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-		fi
-	done
-
-	for tag in apparmor seccomp; do
-		if use $tag; then
-			DOCKER_BUILDTAGS+=" $tag"
-		fi
-	done
-
-	# build binaries
-	./hack/make.sh dynbinary || die 'dynbinary failed'
-}
-
-src_install() {
-	dosym containerd /usr/bin/docker-containerd
-	dosym containerd-shim /usr/bin/docker-containerd-shim
-	dosym runc /usr/bin/docker-runc
-	use container-init && dosym tini /usr/bin/docker-init
-	dobin bundles/dynbinary-daemon/dockerd
-	dobin bundles/dynbinary-daemon/docker-proxy
-
-	newinitd contrib/init/openrc/docker.initd docker
-	newconfd contrib/init/openrc/docker.confd docker
-
-	systemd_dounit contrib/init/systemd/docker.{service,socket}
-
-	udev_dorules contrib/udev/*.rules
-
-	dodoc AUTHORS CONTRIBUTING.md NOTICE README.md
-	dodoc -r docs/*
-
-	# note: intentionally not using "doins" so that we preserve +x bits
-	dodir /usr/share/${PN}/contrib
-	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot:"
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "  systemctl enable docker.service"
-	else
-		elog "  rc-update add docker default"
-	fi
-	elog
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog '  usermod -aG docker <youruser>'
-	elog
-
-	if use device-mapper; then
-		elog " Devicemapper storage driver has been deprecated"
-		elog " It will be removed in a future release"
-		elog
-	fi
-
-	if use overlay; then
-		elog " Overlay storage driver/USEflag has been deprecated"
-		elog " in favor of overlay2 (enabled unconditionally)"
-		elog
-	fi
-
-	if has_version sys-fs/zfs; then
-		elog " ZFS storage driver is available"
-		elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info"
-		elog
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-containers/docker/docker-24.0.7-r1.ebuild b/app-containers/docker/docker-24.0.7-r1.ebuild
deleted file mode 100644
index ad913c3d0c3b..000000000000
--- a/app-containers/docker/docker-24.0.7-r1.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGO_PN=github.com/docker/docker
-MY_PV=${PV/_/-}
-inherit linux-info systemd udev golang-vcs-snapshot
-GIT_COMMIT=311b9ff0aa93aa55880e1e5f8871c4fb69583426
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor btrfs +container-init device-mapper overlay seccomp selinux systemd"
-
-DEPEND="
-	acct-group/docker
-	>=dev-db/sqlite-3.7.9:3
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
-	device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] )
-	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-	systemd? ( sys-apps/systemd )
-"
-
-# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4
-	sys-process/procps
-	>=dev-vcs/git-1.7
-	>=app-arch/xz-utils-4.9
-	dev-libs/libltdl
-	>=app-containers/containerd-1.7.3[apparmor?,btrfs?,device-mapper?,seccomp?]
-	>=app-containers/runc-1.1.9[apparmor?,seccomp?]
-	!app-containers/docker-proxy
-	container-init? ( >=sys-process/tini-0.19.0[static] )
-	selinux? ( sec-policy/selinux-docker )
-"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-BDEPEND="
-	>=dev-lang/go-1.16.12
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-# tests require running dockerd as root and downloading containers
-RESTRICT="installsources strip test"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552
-PATCHES=(
-	"${FILESDIR}/0001-Openrc-Depend-on-containerd-init-script.patch"
-	"${FILESDIR}/docker-24.0.5-automagic-systemd.patch"
-)
-
-pkg_setup() {
-	# this is based on "contrib/check-config.sh" from upstream's sources
-	# required features.
-	CONFIG_CHECK="
-		~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-		~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
-		~KEYS
-		~VETH ~BRIDGE ~BRIDGE_NETFILTER
-		~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-		~NETFILTER_XT_MATCH_ADDRTYPE
-		~NETFILTER_XT_MATCH_CONNTRACK
-		~NETFILTER_XT_MATCH_IPVS
-		~NETFILTER_XT_MARK
-		~IP_NF_NAT ~NF_NAT
-		~POSIX_MQUEUE
-	"
-	WARNING_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: is required for bind-mounting /dev/mqueue into containers"
-
-	if kernel_is lt 4 8; then
-		CONFIG_CHECK+="
-			~DEVPTS_MULTIPLE_INSTANCES
-		"
-	fi
-
-	if kernel_is le 5 1; then
-		CONFIG_CHECK+="
-			~NF_NAT_IPV4
-		"
-	fi
-
-	if kernel_is le 5 2; then
-		CONFIG_CHECK+="
-			~NF_NAT_NEEDED
-		"
-	fi
-
-	if kernel_is ge 4 15; then
-		CONFIG_CHECK+="
-			~CGROUP_BPF
-		"
-	fi
-
-	# optional features
-	CONFIG_CHECK+="
-		~USER_NS
-	"
-
-	if use seccomp; then
-		CONFIG_CHECK+="
-			~SECCOMP ~SECCOMP_FILTER
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~CGROUP_PIDS
-	"
-
-	if kernel_is lt 6 1; then
-		CONFIG_CHECK+="
-			~MEMCG_SWAP
-			"
-	fi
-
-	if kernel_is le 5 8; then
-		CONFIG_CHECK+="
-			~MEMCG_SWAP_ENABLED
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~!LEGACY_VSYSCALL_NATIVE
-		"
-	if kernel_is lt 5 19; then
-		CONFIG_CHECK+="
-			~LEGACY_VSYSCALL_EMULATE
-			"
-	fi
-	CONFIG_CHECK+="
-		~!LEGACY_VSYSCALL_NONE
-		"
-	WARNING_LEGACY_VSYSCALL_NONE="CONFIG_LEGACY_VSYSCALL_NONE enabled: \
-		Containers with <=glibc-2.13 will not work"
-
-	if kernel_is le 4 5; then
-		CONFIG_CHECK+="
-			~MEMCG_KMEM
-		"
-	fi
-
-	if kernel_is lt 5; then
-		CONFIG_CHECK+="
-			~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~BLK_CGROUP ~BLK_DEV_THROTTLING
-		~CGROUP_PERF
-		~CGROUP_HUGETLB
-		~NET_CLS_CGROUP ~CGROUP_NET_PRIO
-		~CFS_BANDWIDTH ~FAIR_GROUP_SCHED
-		~IP_NF_TARGET_REDIRECT
-		~IP_VS
-		~IP_VS_NFCT
-		~IP_VS_PROTO_TCP
-		~IP_VS_PROTO_UDP
-		~IP_VS_RR
-		"
-
-	if use selinux; then
-		CONFIG_CHECK+="
-			~SECURITY_SELINUX
-			"
-	fi
-
-	if use apparmor; then
-		CONFIG_CHECK+="
-			~SECURITY_APPARMOR
-			"
-	fi
-
-	# if ! is_set EXT4_USE_FOR_EXT2; then
-	#	check_flags EXT3_FS EXT3_FS_XATTR EXT3_FS_POSIX_ACL EXT3_FS_SECURITY
-	#	if ! is_set EXT3_FS || ! is_set EXT3_FS_XATTR || ! is_set EXT3_FS_POSIX_ACL || ! is_set EXT3_FS_SECURITY; then
-	#		echo "    $(wrap_color '(enable these ext3 configs if you are using ext3 as backing filesystem)' bold black)"
-	#	fi
-	# fi
-
-	CONFIG_CHECK+="
-		~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-	"
-
-	# if ! is_set EXT4_FS || ! is_set EXT4_FS_POSIX_ACL || ! is_set EXT4_FS_SECURITY; then
-	#	if is_set EXT4_USE_FOR_EXT2; then
-	#		echo "    $(wrap_color 'enable these ext4 configs if you are using ext3 or ext4 as backing filesystem' bold black)"
-	#	else
-	#		echo "    $(wrap_color 'enable these ext4 configs if you are using ext4 as backing filesystem' bold black)"
-	#	fi
-	# fi
-
-	# network drivers
-	CONFIG_CHECK+="
-		~VXLAN ~BRIDGE_VLAN_FILTERING
-		~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH
-		~XFRM ~XFRM_USER ~XFRM_ALGO ~INET_ESP
-	"
-	if kernel_is le 5 3; then
-		CONFIG_CHECK+="
-			~INET_XFRM_MODE_TRANSPORT
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~IPVLAN
-		"
-	CONFIG_CHECK+="
-		~MACVLAN ~DUMMY
-		"
-	CONFIG_CHECK+="
-		~NF_NAT_FTP ~NF_CONNTRACK_FTP ~NF_NAT_TFTP ~NF_CONNTRACK_TFTP
-	"
-
-	# storage drivers
-	if use btrfs; then
-		CONFIG_CHECK+="
-			~BTRFS_FS
-			~BTRFS_FS_POSIX_ACL
-		"
-	fi
-
-	if use device-mapper; then
-		CONFIG_CHECK+="
-			~BLK_DEV_DM ~DM_THIN_PROVISIONING
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~OVERLAY_FS
-	"
-
-	linux-info_pkg_setup
-}
-
-src_compile() {
-	export DOCKER_GITCOMMIT="${GIT_COMMIT}"
-	export GOPATH="${WORKDIR}/${P}"
-	export VERSION=${PV}
-
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
-
-	# let's set up some optional features :)
-	export DOCKER_BUILDTAGS=''
-	for gd in btrfs device-mapper overlay; do
-		if ! use $gd; then
-			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-		fi
-	done
-
-	for tag in apparmor seccomp; do
-		if use $tag; then
-			DOCKER_BUILDTAGS+=" $tag"
-		fi
-	done
-
-	export SYSTEMD=$(usex systemd 1 0)
-
-	# build binaries
-	./hack/make.sh dynbinary || die 'dynbinary failed'
-}
-
-src_install() {
-	dosym containerd /usr/bin/docker-containerd
-	dosym containerd-shim /usr/bin/docker-containerd-shim
-	dosym runc /usr/bin/docker-runc
-	use container-init && dosym tini /usr/bin/docker-init
-	dobin bundles/dynbinary-daemon/dockerd
-	dobin bundles/dynbinary-daemon/docker-proxy
-
-	newinitd contrib/init/openrc/docker.initd docker
-	newconfd contrib/init/openrc/docker.confd docker
-
-	systemd_dounit contrib/init/systemd/docker.{service,socket}
-
-	udev_dorules contrib/udev/*.rules
-
-	dodoc AUTHORS CONTRIBUTING.md NOTICE README.md
-	dodoc -r docs/*
-
-	# note: intentionally not using "doins" so that we preserve +x bits
-	dodir /usr/share/${PN}/contrib
-	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot:"
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "  systemctl enable docker.service"
-	else
-		elog "  rc-update add docker default"
-	fi
-	elog
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog '  usermod -aG docker <youruser>'
-	elog
-
-	if use device-mapper; then
-		elog " Devicemapper storage driver has been deprecated"
-		elog " It will be removed in a future release"
-		elog
-	fi
-
-	if use overlay; then
-		elog " Overlay storage driver/USEflag has been deprecated"
-		elog " in favor of overlay2 (enabled unconditionally)"
-		elog
-	fi
-
-	if has_version sys-fs/zfs; then
-		elog " ZFS storage driver is available"
-		elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info"
-		elog
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-containers/docker/docker-25.0.1.ebuild b/app-containers/docker/docker-25.0.1.ebuild
deleted file mode 100644
index 92c7e31beb2d..000000000000
--- a/app-containers/docker/docker-25.0.1.ebuild
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGO_PN=github.com/docker/docker
-MY_PV=${PV/_/-}
-inherit linux-info systemd udev golang-vcs-snapshot
-GIT_COMMIT=71fa3ab079ec13d17257f86fa92db8d7f24802f1
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor btrfs +container-init overlay seccomp selinux"
-
-DEPEND="
-	acct-group/docker
-	>=dev-db/sqlite-3.7.9:3
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
-	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-"
-
-# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4
-	sys-process/procps
-	>=dev-vcs/git-1.7
-	>=app-arch/xz-utils-4.9
-	dev-libs/libltdl
-	>=app-containers/containerd-1.7.3[apparmor?,btrfs?,seccomp?]
-	>=app-containers/runc-1.1.9[apparmor?,seccomp?]
-	!app-containers/docker-proxy
-	container-init? ( >=sys-process/tini-0.19.0[static] )
-	selinux? ( sec-policy/selinux-docker )
-"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-BDEPEND="
-	>=dev-lang/go-1.16.12
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-# tests require running dockerd as root and downloading containers
-RESTRICT="installsources strip test"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552
-PATCHES=(
-	"${FILESDIR}/0001-Openrc-Depend-on-containerd-init-script.patch"
-)
-
-pkg_setup() {
-	# this is based on "contrib/check-config.sh" from upstream's sources
-	# required features.
-	CONFIG_CHECK="
-		~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-		~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
-		~KEYS
-		~VETH ~BRIDGE ~BRIDGE_NETFILTER
-		~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-		~NETFILTER_XT_MATCH_ADDRTYPE
-		~NETFILTER_XT_MATCH_CONNTRACK
-		~NETFILTER_XT_MATCH_IPVS
-		~NETFILTER_XT_MARK
-		~IP_NF_NAT ~NF_NAT
-		~POSIX_MQUEUE
-	"
-	WARNING_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: is required for bind-mounting /dev/mqueue into containers"
-
-	if kernel_is lt 4 8; then
-		CONFIG_CHECK+="
-			~DEVPTS_MULTIPLE_INSTANCES
-		"
-	fi
-
-	if kernel_is le 5 1; then
-		CONFIG_CHECK+="
-			~NF_NAT_IPV4
-		"
-	fi
-
-	if kernel_is le 5 2; then
-		CONFIG_CHECK+="
-			~NF_NAT_NEEDED
-		"
-	fi
-
-	if kernel_is ge 4 15; then
-		CONFIG_CHECK+="
-			~CGROUP_BPF
-		"
-	fi
-
-	# optional features
-	CONFIG_CHECK+="
-		~USER_NS
-	"
-
-	if use seccomp; then
-		CONFIG_CHECK+="
-			~SECCOMP ~SECCOMP_FILTER
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~CGROUP_PIDS
-	"
-
-	if kernel_is lt 6 1; then
-		CONFIG_CHECK+="
-			~MEMCG_SWAP
-			"
-	fi
-
-	if kernel_is le 5 8; then
-		CONFIG_CHECK+="
-			~MEMCG_SWAP_ENABLED
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~!LEGACY_VSYSCALL_NATIVE
-		"
-	if kernel_is lt 5 19; then
-		CONFIG_CHECK+="
-			~LEGACY_VSYSCALL_EMULATE
-			"
-	fi
-	CONFIG_CHECK+="
-		~!LEGACY_VSYSCALL_NONE
-		"
-	WARNING_LEGACY_VSYSCALL_NONE="CONFIG_LEGACY_VSYSCALL_NONE enabled: \
-		Containers with <=glibc-2.13 will not work"
-
-	if kernel_is le 4 5; then
-		CONFIG_CHECK+="
-			~MEMCG_KMEM
-		"
-	fi
-
-	if kernel_is lt 5; then
-		CONFIG_CHECK+="
-			~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~BLK_CGROUP ~BLK_DEV_THROTTLING
-		~CGROUP_PERF
-		~CGROUP_HUGETLB
-		~NET_CLS_CGROUP ~CGROUP_NET_PRIO
-		~CFS_BANDWIDTH ~FAIR_GROUP_SCHED
-		~IP_NF_TARGET_REDIRECT
-		~IP_VS
-		~IP_VS_NFCT
-		~IP_VS_PROTO_TCP
-		~IP_VS_PROTO_UDP
-		~IP_VS_RR
-		"
-
-	if use selinux; then
-		CONFIG_CHECK+="
-			~SECURITY_SELINUX
-			"
-	fi
-
-	if use apparmor; then
-		CONFIG_CHECK+="
-			~SECURITY_APPARMOR
-			"
-	fi
-
-	# if ! is_set EXT4_USE_FOR_EXT2; then
-	#	check_flags EXT3_FS EXT3_FS_XATTR EXT3_FS_POSIX_ACL EXT3_FS_SECURITY
-	#	if ! is_set EXT3_FS || ! is_set EXT3_FS_XATTR || ! is_set EXT3_FS_POSIX_ACL || ! is_set EXT3_FS_SECURITY; then
-	#		echo "    $(wrap_color '(enable these ext3 configs if you are using ext3 as backing filesystem)' bold black)"
-	#	fi
-	# fi
-
-	CONFIG_CHECK+="
-		~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-	"
-
-	# if ! is_set EXT4_FS || ! is_set EXT4_FS_POSIX_ACL || ! is_set EXT4_FS_SECURITY; then
-	#	if is_set EXT4_USE_FOR_EXT2; then
-	#		echo "    $(wrap_color 'enable these ext4 configs if you are using ext3 or ext4 as backing filesystem' bold black)"
-	#	else
-	#		echo "    $(wrap_color 'enable these ext4 configs if you are using ext4 as backing filesystem' bold black)"
-	#	fi
-	# fi
-
-	# network drivers
-	CONFIG_CHECK+="
-		~VXLAN ~BRIDGE_VLAN_FILTERING
-		~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH
-		~XFRM ~XFRM_USER ~XFRM_ALGO ~INET_ESP
-	"
-	if kernel_is le 5 3; then
-		CONFIG_CHECK+="
-			~INET_XFRM_MODE_TRANSPORT
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~IPVLAN
-		"
-	CONFIG_CHECK+="
-		~MACVLAN ~DUMMY
-		"
-	CONFIG_CHECK+="
-		~NF_NAT_FTP ~NF_CONNTRACK_FTP ~NF_NAT_TFTP ~NF_CONNTRACK_TFTP
-	"
-
-	# storage drivers
-	if use btrfs; then
-		CONFIG_CHECK+="
-			~BTRFS_FS
-			~BTRFS_FS_POSIX_ACL
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~OVERLAY_FS
-	"
-
-	linux-info_pkg_setup
-}
-
-src_compile() {
-	export DOCKER_GITCOMMIT="${GIT_COMMIT}"
-	export GOPATH="${WORKDIR}/${P}"
-	export VERSION=${PV}
-
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
-
-	# let's set up some optional features :)
-	export DOCKER_BUILDTAGS=''
-	for gd in btrfs overlay; do
-		if ! use $gd; then
-			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-		fi
-	done
-
-	for tag in apparmor seccomp; do
-		if use $tag; then
-			DOCKER_BUILDTAGS+=" $tag"
-		fi
-	done
-
-	# build binaries
-	./hack/make.sh dynbinary || die 'dynbinary failed'
-}
-
-src_install() {
-	dosym containerd /usr/bin/docker-containerd
-	dosym containerd-shim /usr/bin/docker-containerd-shim
-	dosym runc /usr/bin/docker-runc
-	use container-init && dosym tini /usr/bin/docker-init
-	dobin bundles/dynbinary-daemon/dockerd
-	dobin bundles/dynbinary-daemon/docker-proxy
-
-	newinitd contrib/init/openrc/docker.initd docker
-	newconfd contrib/init/openrc/docker.confd docker
-
-	systemd_dounit contrib/init/systemd/docker.{service,socket}
-
-	udev_dorules contrib/udev/*.rules
-
-	dodoc AUTHORS CONTRIBUTING.md NOTICE README.md
-	dodoc -r docs/*
-
-	# note: intentionally not using "doins" so that we preserve +x bits
-	dodir /usr/share/${PN}/contrib
-	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot:"
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "  systemctl enable docker.service"
-	else
-		elog "  rc-update add docker default"
-	fi
-	elog
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog '  usermod -aG docker <youruser>'
-	elog
-
-	if use overlay; then
-		elog " Overlay storage driver/USEflag has been deprecated"
-		elog " in favor of overlay2 (enabled unconditionally)"
-		elog
-	fi
-
-	if has_version sys-fs/zfs; then
-		elog " ZFS storage driver is available"
-		elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info"
-		elog
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-containers/docker/docker-25.0.4.ebuild b/app-containers/docker/docker-25.0.4.ebuild
deleted file mode 100644
index 739506d1d063..000000000000
--- a/app-containers/docker/docker-25.0.4.ebuild
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGO_PN=github.com/docker/docker
-MY_PV=${PV/_/-}
-inherit linux-info systemd udev golang-vcs-snapshot
-GIT_COMMIT=061aa95809be396a6b5542618d8a34b02a21ff77
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor btrfs +container-init overlay seccomp selinux"
-
-DEPEND="
-	acct-group/docker
-	>=dev-db/sqlite-3.7.9:3
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
-	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-"
-
-# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4
-	sys-process/procps
-	>=dev-vcs/git-1.7
-	>=app-arch/xz-utils-4.9
-	dev-libs/libltdl
-	>=app-containers/containerd-1.7.12[apparmor?,btrfs?,seccomp?]
-	>=app-containers/runc-1.1.12[apparmor?,seccomp?]
-	!app-containers/docker-proxy
-	container-init? ( >=sys-process/tini-0.19.0[static] )
-	selinux? ( sec-policy/selinux-docker )
-"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-BDEPEND="
-	>=dev-lang/go-1.16.12
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-# tests require running dockerd as root and downloading containers
-RESTRICT="installsources strip test"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552
-PATCHES=(
-	"${FILESDIR}/0001-Openrc-Depend-on-containerd-init-script.patch"
-)
-
-pkg_setup() {
-	# this is based on "contrib/check-config.sh" from upstream's sources
-	# required features.
-	CONFIG_CHECK="
-		~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-		~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
-		~KEYS
-		~VETH ~BRIDGE ~BRIDGE_NETFILTER
-		~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-		~NETFILTER_XT_MATCH_ADDRTYPE
-		~NETFILTER_XT_MATCH_CONNTRACK
-		~NETFILTER_XT_MATCH_IPVS
-		~NETFILTER_XT_MARK
-		~IP_NF_NAT ~NF_NAT
-		~POSIX_MQUEUE
-	"
-	WARNING_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: is required for bind-mounting /dev/mqueue into containers"
-
-	if kernel_is lt 4 8; then
-		CONFIG_CHECK+="
-			~DEVPTS_MULTIPLE_INSTANCES
-		"
-	fi
-
-	if kernel_is le 5 1; then
-		CONFIG_CHECK+="
-			~NF_NAT_IPV4
-		"
-	fi
-
-	if kernel_is le 5 2; then
-		CONFIG_CHECK+="
-			~NF_NAT_NEEDED
-		"
-	fi
-
-	if kernel_is ge 4 15; then
-		CONFIG_CHECK+="
-			~CGROUP_BPF
-		"
-	fi
-
-	# optional features
-	CONFIG_CHECK+="
-		~USER_NS
-	"
-
-	if use seccomp; then
-		CONFIG_CHECK+="
-			~SECCOMP ~SECCOMP_FILTER
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~CGROUP_PIDS
-	"
-
-	if kernel_is lt 6 1; then
-		CONFIG_CHECK+="
-			~MEMCG_SWAP
-			"
-	fi
-
-	if kernel_is le 5 8; then
-		CONFIG_CHECK+="
-			~MEMCG_SWAP_ENABLED
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~!LEGACY_VSYSCALL_NATIVE
-		"
-	if kernel_is lt 5 19; then
-		CONFIG_CHECK+="
-			~LEGACY_VSYSCALL_EMULATE
-			"
-	fi
-	CONFIG_CHECK+="
-		~!LEGACY_VSYSCALL_NONE
-		"
-	WARNING_LEGACY_VSYSCALL_NONE="CONFIG_LEGACY_VSYSCALL_NONE enabled: \
-		Containers with <=glibc-2.13 will not work"
-
-	if kernel_is le 4 5; then
-		CONFIG_CHECK+="
-			~MEMCG_KMEM
-		"
-	fi
-
-	if kernel_is lt 5; then
-		CONFIG_CHECK+="
-			~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~BLK_CGROUP ~BLK_DEV_THROTTLING
-		~CGROUP_PERF
-		~CGROUP_HUGETLB
-		~NET_CLS_CGROUP ~CGROUP_NET_PRIO
-		~CFS_BANDWIDTH ~FAIR_GROUP_SCHED
-		~IP_NF_TARGET_REDIRECT
-		~IP_VS
-		~IP_VS_NFCT
-		~IP_VS_PROTO_TCP
-		~IP_VS_PROTO_UDP
-		~IP_VS_RR
-		"
-
-	if use selinux; then
-		CONFIG_CHECK+="
-			~SECURITY_SELINUX
-			"
-	fi
-
-	if use apparmor; then
-		CONFIG_CHECK+="
-			~SECURITY_APPARMOR
-			"
-	fi
-
-	# if ! is_set EXT4_USE_FOR_EXT2; then
-	#	check_flags EXT3_FS EXT3_FS_XATTR EXT3_FS_POSIX_ACL EXT3_FS_SECURITY
-	#	if ! is_set EXT3_FS || ! is_set EXT3_FS_XATTR || ! is_set EXT3_FS_POSIX_ACL || ! is_set EXT3_FS_SECURITY; then
-	#		echo "    $(wrap_color '(enable these ext3 configs if you are using ext3 as backing filesystem)' bold black)"
-	#	fi
-	# fi
-
-	CONFIG_CHECK+="
-		~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-	"
-
-	# if ! is_set EXT4_FS || ! is_set EXT4_FS_POSIX_ACL || ! is_set EXT4_FS_SECURITY; then
-	#	if is_set EXT4_USE_FOR_EXT2; then
-	#		echo "    $(wrap_color 'enable these ext4 configs if you are using ext3 or ext4 as backing filesystem' bold black)"
-	#	else
-	#		echo "    $(wrap_color 'enable these ext4 configs if you are using ext4 as backing filesystem' bold black)"
-	#	fi
-	# fi
-
-	# network drivers
-	CONFIG_CHECK+="
-		~VXLAN ~BRIDGE_VLAN_FILTERING
-		~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH
-		~XFRM ~XFRM_USER ~XFRM_ALGO ~INET_ESP
-	"
-	if kernel_is le 5 3; then
-		CONFIG_CHECK+="
-			~INET_XFRM_MODE_TRANSPORT
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~IPVLAN
-		"
-	CONFIG_CHECK+="
-		~MACVLAN ~DUMMY
-		"
-	CONFIG_CHECK+="
-		~NF_NAT_FTP ~NF_CONNTRACK_FTP ~NF_NAT_TFTP ~NF_CONNTRACK_TFTP
-	"
-
-	# storage drivers
-	if use btrfs; then
-		CONFIG_CHECK+="
-			~BTRFS_FS
-			~BTRFS_FS_POSIX_ACL
-		"
-	fi
-
-	CONFIG_CHECK+="
-		~OVERLAY_FS
-	"
-
-	linux-info_pkg_setup
-}
-
-src_compile() {
-	export DOCKER_GITCOMMIT="${GIT_COMMIT}"
-	export GOPATH="${WORKDIR}/${P}"
-	export VERSION=${PV}
-
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
-
-	# let's set up some optional features :)
-	export DOCKER_BUILDTAGS=''
-	for gd in btrfs overlay; do
-		if ! use $gd; then
-			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-		fi
-	done
-
-	for tag in apparmor seccomp; do
-		if use $tag; then
-			DOCKER_BUILDTAGS+=" $tag"
-		fi
-	done
-
-	# build binaries
-	./hack/make.sh dynbinary || die 'dynbinary failed'
-}
-
-src_install() {
-	dosym containerd /usr/bin/docker-containerd
-	dosym containerd-shim /usr/bin/docker-containerd-shim
-	dosym runc /usr/bin/docker-runc
-	use container-init && dosym tini /usr/bin/docker-init
-	dobin bundles/dynbinary-daemon/dockerd
-	dobin bundles/dynbinary-daemon/docker-proxy
-
-	newinitd contrib/init/openrc/docker.initd docker
-	newconfd contrib/init/openrc/docker.confd docker
-
-	systemd_dounit contrib/init/systemd/docker.{service,socket}
-
-	udev_dorules contrib/udev/*.rules
-
-	dodoc AUTHORS CONTRIBUTING.md NOTICE README.md
-	dodoc -r docs/*
-
-	# note: intentionally not using "doins" so that we preserve +x bits
-	dodir /usr/share/${PN}/contrib
-	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot:"
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "  systemctl enable docker.service"
-	else
-		elog "  rc-update add docker default"
-	fi
-	elog
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog '  usermod -aG docker <youruser>'
-	elog
-
-	if use overlay; then
-		elog " Overlay storage driver/USEflag has been deprecated"
-		elog " in favor of overlay2 (enabled unconditionally)"
-		elog
-	fi
-
-	if has_version sys-fs/zfs; then
-		elog " ZFS storage driver is available"
-		elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info"
-		elog
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-containers/docker/files/docker-24.0.5-automagic-systemd.patch b/app-containers/docker/files/docker-24.0.5-automagic-systemd.patch
deleted file mode 100644
index fb764b3b1a99..000000000000
--- a/app-containers/docker/files/docker-24.0.5-automagic-systemd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/914076
-https://github.com/moby/moby/issues/47770
---- a/hack/make.sh
-+++ b/hack/make.sh
-@@ -90,7 +90,7 @@ add_buildtag() {
- 	[[ " $DOCKER_BUILDTAGS" == *" $1_"* ]] || DOCKER_BUILDTAGS+=" $1_$2"
- }
- 
--if ${PKG_CONFIG} 'libsystemd' 2> /dev/null; then
-+if [[ -n "$SYSTEMD" ]] && [[ "$SYSTEMD" == 1 ]] && ${PKG_CONFIG} 'libsystemd' 2> /dev/null; then
- 	DOCKER_BUILDTAGS+=" journald"
- fi
- 
diff --git a/app-containers/runc/Manifest b/app-containers/runc/Manifest
index 359f639df98d..ac6b37228077 100644
--- a/app-containers/runc/Manifest
+++ b/app-containers/runc/Manifest
@@ -1,7 +1,3 @@
 DIST runc-1.1.12.tar.gz 2522196 BLAKE2B 14fe8d5f82d5b4d7f6b4bb9111c5d258e74f6a44aeb51fc87c69104e95b9bf24a3d503f4cc5dedb40d542fbd4b6e27273f456bda4fcf3bc298eb93ae292d9663 SHA512 92e8ac54a77d7ebcc76b5a9cc08d9a064211f12e9d26f064070cc203a5afb11c3af28d8f556f297513f797a2933d50bf10a8f22e307724041d66aa8c5ca1d9d3
-DIST runc-1.1.7.tar.gz 2511464 BLAKE2B 63f09052659636b62185abbb178f7e104d22125190899e80e71ed2ba35567eb855abf786d3c7fff3dd9a1ab43ee282fcaecb6650cd8a1ce49c05acefd7c12cde SHA512 e3a18f04ac2c3553a815074ca64e04cfd71af54d78edbd4a13819f187476f96d7311c23bb63fb5c311b91865db4540985a6f9daa84819b0bac5f023b3b2a832c
-DIST runc-1.1.9.tar.gz 2512231 BLAKE2B 4e8e2a454231492f83de34bf66ba25a02b8925b6ef0af2206cdf4ab3299173d3452cea4d51fcfeb02026df288dd8ca6c44ecd35fb075f25f56fd7bc07f873af7 SHA512 020986f2df49c45394d0acbfa4da62663353004550d9b4409f6cfe8369972a090fb8020e4a05342754bde5c1fbe9fcf3868faed2dceed5d54460c3373cdd2278
 EBUILD runc-1.1.12.ebuild 1843 BLAKE2B 08106f5ac68bc0aad1bfbc3c1dbf3db9ee493e5c55f50cc312be88f2b9969caf2469ee66c7103f73a30ef16e3890ceb6b1a76d1bd84d37e60f6d272beed0ee6a SHA512 902d6df904091461cdfcf81732fdffe458f2ff688767127dfdf7958b28e4b3801835ce31cf552e0cda0ce398247d2f2caf6dff990f7d82b287f4ad5c6cd3dd08
-EBUILD runc-1.1.7.ebuild 1843 BLAKE2B 5dcdf28d4b75f14a565ad7766b9dfe6e4bf6ff644449175a7425a809d49048a219708a93bc77a51840cb6ab305f2a13551fb35449e3d4084aa68bab02a5aaa05 SHA512 b3dd66a07869fa8de8db8a13b06bfa19cbb593fe61b9092882073e4b0369e4000daf2735e5a23ba453dcde617e22bb822c76b145e864f6cb486fa0b352f84a90
-EBUILD runc-1.1.9.ebuild 1843 BLAKE2B 8620b7421c51f4e8fa426f98333bab6ea6d11a148bb145898119529402df21ce55a376da2752a4d3ea8550d205e95ee2f35101ae2eef69a1f1927a6fdf4c3da6 SHA512 8fcc48a37906e4d8eb69c9b9873b229fee0eb6eb70fccc2b3a51fb43e0937aa933c1d6e209daf46a02c8d9f7033cb6b49c62845d2fbc38451a2b55691157e57a
 MISC metadata.xml 647 BLAKE2B 67dce497b4fa65db5146f9e017ec00795ad4ef5d63058d4c20bfc730f17e2fabfcd82b403bd06330f9a68ef2e344198514930493eeadef69eb2ee8a618e5e0fc SHA512 970d9753c81eb387a06fc24be8bfb3b056e9e7cbf568f99511bdcfd35f6a8cdfe21ea0103ea36b8fba7be733016493663c3a38452b05225de35af7e1c5b359dc
diff --git a/app-containers/runc/runc-1.1.7.ebuild b/app-containers/runc/runc-1.1.7.ebuild
deleted file mode 100644
index 01b66cb34800..000000000000
--- a/app-containers/runc/runc-1.1.7.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module linux-info
-
-# update on bump, look for https://github.com/docker\
-# docker-ce/blob/<docker ver OR branch>/components/engine/hack/dockerfile/install/runc.installer
-RUNC_COMMIT=4ffc61430bbe6d3d405bdf357b766bf303ff3cc5
-CONFIG_CHECK="~USER_NS"
-
-DESCRIPTION="runc container cli tools"
-HOMEPAGE="http://github.com/opencontainers/runc/"
-MY_PV="${PV/_/-}"
-SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
-IUSE="apparmor hardened +kmem +seccomp selinux test"
-
-DEPEND="seccomp? ( sys-libs/libseccomp )"
-
-RDEPEND="
-	${DEPEND}
-	!app-emulation/docker-runc
-	apparmor? ( sys-libs/libapparmor )
-	selinux? ( sec-policy/selinux-container )
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	test? ( "${RDEPEND}" )
-"
-
-# tests need busybox binary, and portage namespace
-# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox
-# majority of tests pass
-RESTRICT+=" test"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_compile() {
-	# Taken from app-containers/docker-1.7.0-r1
-	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
-		-L${ESYSROOT}/usr/$(get_libdir)"
-
-	# build up optional flags
-	local options=(
-		$(usev apparmor)
-		$(usev seccomp)
-		$(usex kmem '' 'nokmem')
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		COMMIT="${RUNC_COMMIT}"
-	)
-
-	emake "${myemakeargs[@]}" runc man
-}
-
-src_install() {
-	myemakeargs+=(
-		PREFIX="${ED}/usr"
-		BINDIR="${ED}/usr/bin"
-		MANDIR="${ED}/usr/share/man"
-	)
-	emake "${myemakeargs[@]}" install install-man install-bash
-
-	local DOCS=( README.md PRINCIPLES.md docs/. )
-	einstalldocs
-}
-
-src_test() {
-	emake "${myemakeargs[@]}" localunittest
-}
diff --git a/app-containers/runc/runc-1.1.9.ebuild b/app-containers/runc/runc-1.1.9.ebuild
deleted file mode 100644
index 3d5796186404..000000000000
--- a/app-containers/runc/runc-1.1.9.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module linux-info
-
-# update on bump, look for https://github.com/docker\
-# docker-ce/blob/<docker ver OR branch>/components/engine/hack/dockerfile/install/runc.installer
-RUNC_COMMIT=ccaecfcbc907d70a7aa870a6650887b901b25b82
-CONFIG_CHECK="~USER_NS"
-
-DESCRIPTION="runc container cli tools"
-HOMEPAGE="http://github.com/opencontainers/runc/"
-MY_PV="${PV/_/-}"
-SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
-IUSE="apparmor hardened +kmem +seccomp selinux test"
-
-DEPEND="seccomp? ( sys-libs/libseccomp )"
-
-RDEPEND="
-	${DEPEND}
-	!app-emulation/docker-runc
-	apparmor? ( sys-libs/libapparmor )
-	selinux? ( sec-policy/selinux-container )
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	test? ( "${RDEPEND}" )
-"
-
-# tests need busybox binary, and portage namespace
-# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox
-# majority of tests pass
-RESTRICT+=" test"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_compile() {
-	# Taken from app-containers/docker-1.7.0-r1
-	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
-		-L${ESYSROOT}/usr/$(get_libdir)"
-
-	# build up optional flags
-	local options=(
-		$(usev apparmor)
-		$(usev seccomp)
-		$(usex kmem '' 'nokmem')
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		COMMIT="${RUNC_COMMIT}"
-	)
-
-	emake "${myemakeargs[@]}" runc man
-}
-
-src_install() {
-	myemakeargs+=(
-		PREFIX="${ED}/usr"
-		BINDIR="${ED}/usr/bin"
-		MANDIR="${ED}/usr/share/man"
-	)
-	emake "${myemakeargs[@]}" install install-man install-bash
-
-	local DOCS=( README.md PRINCIPLES.md docs/. )
-	einstalldocs
-}
-
-src_test() {
-	emake "${myemakeargs[@]}" localunittest
-}
diff --git a/app-containers/sen/Manifest b/app-containers/sen/Manifest
index 053fd4fdf57c..dbaf83eabe46 100644
--- a/app-containers/sen/Manifest
+++ b/app-containers/sen/Manifest
@@ -1,3 +1,5 @@
 DIST sen-0.6.1_p20200905.tar.gz 1913978 BLAKE2B 189bff583770265de29ca3e54cad1283051c05eccab4fc98160801e50b31376188c52e49b43972292fe231b376ba42879fb34d7b1ae70c2246d676a6e25f670b SHA512 cd1899c1b4c5c7cf7f1f2f5e557bd609a7d7619dbc3fc6457f5ef5ce5c9ab43d92a6fbfa228c43d543d4f46c7928d74dbed9ab8346cabc772c8e7c63a7c07bfe
+DIST sen-0.7.0.tar.gz 1930302 BLAKE2B b17eeb080d2873485e81e90b7bee81f4930ace05b5d10a259a062b1dc818659d61a45d8bf01df95c33514060cce84f5c09f82066400afe11e4797fffa4303b6b SHA512 fc350eaf6694df2ff2378e24e06a07247a5c5bc060e09c4bb5478deca781d4f4fc593927dff14a1e7c7779eabb897fb6170183daee48a4e6b03bcfef975521b0
 EBUILD sen-0.6.1_p20200905-r1.ebuild 846 BLAKE2B 6bd9c496f34f189d68802e5e4a67551f6427412803ec453da1066897f3e7f0bc46ab4dd7a8366101ed2dce5292b38c47ec5ce421986ce1789b4480481f67cec2 SHA512 6ecf7ade1340d22b09ce793e15cd4216944033f9a9da06852747cdf39688cbcb0cf72835630528749f80b9bd8d2473f0b4c9d7b37115acf1ff3c00802263c7e1
+EBUILD sen-0.7.0.ebuild 658 BLAKE2B 2b1d0cd4d870e0ccbf224697baf0b6fe1dc2dcb799c8a9afeb1eb4e494d8bc3e5da6369f1a8e72e65753a68d3aa797fd12965e71c5b62cf9074ca3b2809537c2 SHA512 303b197821565e1d790cab0242fc1a53363904ff453f2cc9d6515916a158a2341fe97e458abfc0ae3ebee785a253ea6fdf0e8b2b11db061d9aaa27bd3b380f7b
 MISC metadata.xml 290 BLAKE2B d0cdad8552c8165bbd5ff6709b9b1ac17890e28be90e2f80e215647a1683583f6dd0e48a9a496926a35430a6dd8a3ec9388cdf44642838349ea468bfdf0dff94 SHA512 3dbc8716f2244331c67eee99dbc406a09282c3a5282335aca0981a3907c9ec4bb8a4aafcba6f12eff244a94029f4b5ef2c06ce9f284600e0ca33ffcb57c3d888
diff --git a/app-containers/sen/sen-0.7.0.ebuild b/app-containers/sen/sen-0.7.0.ebuild
new file mode 100644
index 000000000000..84a042bbafb4
--- /dev/null
+++ b/app-containers/sen/sen-0.7.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="Terminal User Interface for docker engine"
+HOMEPAGE="https://github.com/TomasTomecek/sen"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/urwidtrees[${PYTHON_USEDEP}]
+	dev-python/docker[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/flexmock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc -r docs
+}