commit:     4a84017e00e75a33ef4730486917dd1ee8ff8f57
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 14 23:37:01 2025 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jan 14 23:37:01 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a84017e

app-containers/docker: drop 26.1.0-r1, 27.2.0, 27.3.1, 27.4.0, 27.4.1

Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 app-containers/docker/Manifest                     |   4 -
 app-containers/docker/docker-26.1.0-r1.ebuild      | 322 --------------------
 app-containers/docker/docker-27.2.0.ebuild         | 323 --------------------
 app-containers/docker/docker-27.3.1.ebuild         | 319 --------------------
 app-containers/docker/docker-27.4.0.ebuild         | 319 --------------------
 app-containers/docker/docker-27.4.1.ebuild         | 329 ---------------------
 ...1-Openrc-Depend-on-containerd-init-script.patch |  28 --
 .../files/docker-26.1.0-automagic-systemd.patch    |  13 -
 app-containers/docker/metadata.xml                 |   4 -
 9 files changed, 1661 deletions(-)

diff --git a/app-containers/docker/Manifest b/app-containers/docker/Manifest
index cfe2371f801d..b5428feff32c 100644
--- a/app-containers/docker/Manifest
+++ b/app-containers/docker/Manifest
@@ -1,5 +1 @@
-DIST docker-26.1.0.tar.gz 16390376 BLAKE2B 
6703e9b153c430bc28aed2e7de7bada0203353d61f0a2ce3d49ddbd017eab196a685dd1ab1e719a6b287813eb5fa4f2c612e2cf1ab95789d6e79ebe5dac7ace3
 SHA512 
47b6b9af9947016884614b6bc25977e1db281da95c9b8b34c753c21c664a737a893f9fa65d92cbb897735aae3893567e106e6bababb5507e069b1e0981e48d50
-DIST docker-27.2.0.tar.gz 16689537 BLAKE2B 
faf0bae9f7da127d5b65b9989acd82dc726bc3f09ace502df151b9f03a84b6f1ec2a946d905263aaa7d2e7d7a3cd4ad1a09291dcfc6691e73cc9a8738f150d55
 SHA512 
97abaf56d2249c1514beacf17fc9096848b960846e064f1a9bd800a59762a1f1888b32e83b3e8289e23656496ca0293fea65931210d68faaa8a713aab6e48b65
-DIST docker-27.3.1.tar.gz 16790553 BLAKE2B 
64670eec5a957cb1a088047836fe5e906435f85a062178f52276bafa3df750207bfd02ebb8783e642a6817b2bfa9fb439e441d412e448eba0f3cf15869067d72
 SHA512 
0fddcc8314eed2e7b131af78f1fa01292cfc4fcb7fd0af94b79d5435349ab54a21b0a78cffbf29dd4c58747d8bcd1f47473cc5f5ab2596e133828b2e6540d172
-DIST docker-27.4.0.tar.gz 16836980 BLAKE2B 
9bea16a6177cf8c4f05f015bb241b51f7c96ca8813167a07d3b951e418f38aff09277f83772342bf326a5acb05c7c3a0659120d92d6d57df2e9f9fbba3006c79
 SHA512 
f684d6e91bf0a00247605ea88ea6421cc13b9152239b8f51eb640a568b43b3898ea6bcd22ef64a0e263d6e795362160473db849490672dd1fd39d174ad6f45a0
 DIST docker-27.4.1.tar.gz 16837429 BLAKE2B 
da2e915944a0260619b1e036b43d40f5cbff66f07182153c0ae238ecbcecdfe2066473887882fdaaffa5ef29e2328211f1d07ba3a5239381f9e82d34d9da43fe
 SHA512 
3d77708f7373c1b58b1c46428c2cfc9e8985076e494e40ab86709f37a686cf92b9e2c9db5aa34293f728bb7ccd6a7e08e0cbb1c6d20acfd025c4c787d5908dc0

diff --git a/app-containers/docker/docker-26.1.0-r1.ebuild 
b/app-containers/docker/docker-26.1.0-r1.ebuild
deleted file mode 100644
index 980c31950f3d..000000000000
--- a/app-containers/docker/docker-26.1.0-r1.ebuild
+++ /dev/null
@@ -1,322 +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 golang-vcs-snapshot linux-info systemd udev
-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 systemd"
-
-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 )
-       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
-       >=app-containers/containerd-1.7.15[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"
-       "${FILESDIR}/docker-26.1.0-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
-
-       CONFIG_CHECK+="
-               ~OVERLAY_FS
-       "
-
-       linux-info_pkg_setup
-}
-
-src_compile() {
-       export DOCKER_GITCOMMIT="${GIT_COMMIT}"
-       export GOPATH="${WORKDIR}/${P}"
-       export VERSION=${PV}
-       tc-export PKG_CONFIG
-
-       # setup CFLAGS and LDFLAGS for separate build target
-       # see https://github.com/tianon/docker-overlay/pull/10
-       CGO_CFLAGS+=" -I${ESYSROOT}/usr/include"
-       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
-
-       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 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-27.2.0.ebuild 
b/app-containers/docker/docker-27.2.0.ebuild
deleted file mode 100644
index 4f5f1df2aba3..000000000000
--- a/app-containers/docker/docker-27.2.0.ebuild
+++ /dev/null
@@ -1,323 +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 golang-vcs-snapshot linux-info optfeature systemd udev
-GIT_COMMIT=3ab5c7d0036ca8fc43141e83b167456ec79828aa
-
-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 +overlay2 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 )
-       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
-       >=app-containers/containerd-1.7.21[apparmor?,btrfs?,seccomp?]
-       >=app-containers/runc-1.1.13[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}
-       tc-export PKG_CONFIG
-
-       # setup CFLAGS and LDFLAGS for separate build target
-       # see https://github.com/tianon/docker-overlay/pull/10
-       CGO_CFLAGS+=" -I${ESYSROOT}/usr/include"
-       CGO_LDFLAGS+=" -L${ESYSROOT}/usr/$(get_libdir)"
-
-       # let's set up some optional features :)
-       export DOCKER_BUILDTAGS=''
-       for gd in btrfs overlay2; 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 EXCLUDE_AUTO_BUILDTAG_JOURNALD=$(usex systemd '' 'y')
-
-       # 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
-       for f in dockerd-rootless-setuptool.sh dockerd-rootless.sh; do
-               dosym ../share/docker/contrib/${f} /usr/bin/${f}
-       done
-
-       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 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
-
-       optfeature "rootless mode support" sys-apps/shadow
-       optfeature "rootless mode support" sys-apps/rootlesskit
-       optfeature_header "for rootless mode you also need a network stack"
-       optfeature "rootless mode network stack" app-containers/slirp4netns
-}
-
-pkg_postrm() {
-       udev_reload
-}

diff --git a/app-containers/docker/docker-27.3.1.ebuild 
b/app-containers/docker/docker-27.3.1.ebuild
deleted file mode 100644
index 3fe81a9b43df..000000000000
--- a/app-containers/docker/docker-27.3.1.ebuild
+++ /dev/null
@@ -1,319 +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 golang-vcs-snapshot linux-info optfeature systemd udev
-GIT_COMMIT=41ca978a0a5400cc24b274137efa9f25517fcc0b
-
-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 +overlay2 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 )
-       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
-       >=app-containers/containerd-1.7.22[apparmor?,btrfs?,seccomp?]
-       >=app-containers/runc-1.1.14[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
-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}
-       tc-export PKG_CONFIG
-
-       # setup CFLAGS and LDFLAGS for separate build target
-       # see https://github.com/tianon/docker-overlay/pull/10
-       CGO_CFLAGS+=" -I${ESYSROOT}/usr/include"
-       CGO_LDFLAGS+=" -L${ESYSROOT}/usr/$(get_libdir)"
-
-       # let's set up some optional features :)
-       export DOCKER_BUILDTAGS=''
-       for gd in btrfs overlay2; 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 EXCLUDE_AUTO_BUILDTAG_JOURNALD=$(usex systemd '' 'y')
-
-       # 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
-       for f in dockerd-rootless-setuptool.sh dockerd-rootless.sh; do
-               dosym ../share/docker/contrib/${f} /usr/bin/${f}
-       done
-
-       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 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
-
-       optfeature "rootless mode support" sys-apps/shadow
-       optfeature "rootless mode support" sys-apps/rootlesskit
-       optfeature_header "for rootless mode you also need a network stack"
-       optfeature "rootless mode network stack" app-containers/slirp4netns
-}
-
-pkg_postrm() {
-       udev_reload
-}

diff --git a/app-containers/docker/docker-27.4.0.ebuild 
b/app-containers/docker/docker-27.4.0.ebuild
deleted file mode 100644
index 97c7ea5319e3..000000000000
--- a/app-containers/docker/docker-27.4.0.ebuild
+++ /dev/null
@@ -1,319 +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 golang-vcs-snapshot linux-info optfeature systemd udev
-GIT_COMMIT=92a83937d0280dcbea92099b01e01aa4251c1777
-
-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 +overlay2 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 )
-       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
-       >=app-containers/containerd-1.7.24[apparmor?,btrfs?,seccomp?]
-       >=app-containers/runc-1.2.2[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
-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}
-       tc-export PKG_CONFIG
-
-       # setup CFLAGS and LDFLAGS for separate build target
-       # see https://github.com/tianon/docker-overlay/pull/10
-       CGO_CFLAGS+=" -I${ESYSROOT}/usr/include"
-       CGO_LDFLAGS+=" -L${ESYSROOT}/usr/$(get_libdir)"
-
-       # let's set up some optional features :)
-       export DOCKER_BUILDTAGS=''
-       for gd in btrfs overlay2; 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 EXCLUDE_AUTO_BUILDTAG_JOURNALD=$(usex systemd '' 'y')
-
-       # 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
-       for f in dockerd-rootless-setuptool.sh dockerd-rootless.sh; do
-               dosym ../share/docker/contrib/${f} /usr/bin/${f}
-       done
-
-       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 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
-
-       optfeature "rootless mode support" sys-apps/shadow
-       optfeature "rootless mode support" sys-apps/rootlesskit
-       optfeature_header "for rootless mode you also need a network stack"
-       optfeature "rootless mode network stack" app-containers/slirp4netns
-}
-
-pkg_postrm() {
-       udev_reload
-}

diff --git a/app-containers/docker/docker-27.4.1.ebuild 
b/app-containers/docker/docker-27.4.1.ebuild
deleted file mode 100644
index 846092ae8cf8..000000000000
--- a/app-containers/docker/docker-27.4.1.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-MY_PV=${PV/_/-}
-inherit go-module linux-info optfeature systemd toolchain-funcs udev
-GIT_COMMIT=c710b88579fcb5e0d53f96dcae976d79323b9166
-
-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"
-S="${WORKDIR}/moby-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor btrfs +container-init +overlay2 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 )
-       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
-       >=app-containers/containerd-1.7.24[apparmor?,btrfs?,seccomp?]
-       >=app-containers/runc-1.2.2[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-go/go-md2man
-       virtual/pkgconfig
-"
-# tests require running dockerd as root and downloading containers
-RESTRICT="installsources strip test"
-
-# https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552
-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_unpack() {
-       default
-       cd "${S}"
-       [[ -f go.mod ]] || ln -s vendor.mod go.mod || die
-       [[ -f go.sum ]] || ln -s vendor.sum go.sum || die
-}
-
-src_compile() {
-       export DOCKER_GITCOMMIT="${GIT_COMMIT}"
-       export VERSION=${PV}
-       tc-export PKG_CONFIG
-
-       # setup CFLAGS and LDFLAGS for separate build target
-       # see https://github.com/tianon/docker-overlay/pull/10
-       CGO_CFLAGS+=" -I${ESYSROOT}/usr/include"
-       CGO_LDFLAGS+=" -L${ESYSROOT}/usr/$(get_libdir)"
-
-       # let's set up some optional features :)
-       export DOCKER_BUILDTAGS=''
-       for gd in btrfs overlay2; 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 AUTO_GOPATH=1
-       export EXCLUDE_AUTO_BUILDTAG_JOURNALD=$(usex systemd '' 'y')
-       export GO_MD2MAN=/usr/bin/go-md2man
-
-       # build binaries
-       ./hack/make.sh dynbinary || die 'dynbinary failed'
-
-       # build man page
-       cd man || die
-       emake || die
-}
-
-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
-       for f in dockerd-rootless-setuptool.sh dockerd-rootless.sh; do
-               dosym ../share/docker/contrib/${f} /usr/bin/${f}
-       done
-
-       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/*
-       doman man/man8/dockerd.8
-
-       # 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 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
-
-       optfeature "rootless mode support" sys-apps/shadow
-       optfeature "rootless mode support" sys-apps/rootlesskit
-       optfeature_header "for rootless mode you also need a network stack"
-       optfeature "rootless mode network stack" app-containers/slirp4netns
-}
-
-pkg_postrm() {
-       udev_reload
-}

diff --git 
a/app-containers/docker/files/0001-Openrc-Depend-on-containerd-init-script.patch
 
b/app-containers/docker/files/0001-Openrc-Depend-on-containerd-init-script.patch
deleted file mode 100644
index 22aa145f33b8..000000000000
--- 
a/app-containers/docker/files/0001-Openrc-Depend-on-containerd-init-script.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bb69104381805014eb7675682d204fe460a52388 Mon Sep 17 00:00:00 2001
-From: Jan Breig <[email protected]>
-Date: Mon, 16 May 2022 14:58:36 +0200
-Subject: [PATCH] Openrc: Depend on containerd init script
-
-Signed-off-by: Jan Breig <[email protected]>
----
- contrib/init/openrc/docker.initd | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/contrib/init/openrc/docker.initd 
b/contrib/init/openrc/docker.initd
-index 3229223bad..57defb8f57 100644
---- a/contrib/init/openrc/docker.initd
-+++ b/contrib/init/openrc/docker.initd
-@@ -17,6 +17,10 @@ rc_ulimit="${DOCKER_ULIMIT:--c unlimited -n 1048576 -u 
unlimited}"
- 
- retry="${DOCKER_RETRY:-TERM/60/KILL/10}"
- 
-+depend() {
-+      need containerd
-+}
-+
- start_pre() {
-       checkpath -f -m 0644 -o root:docker "$DOCKER_LOGFILE"
- }
--- 
-2.35.1
-

diff --git a/app-containers/docker/files/docker-26.1.0-automagic-systemd.patch 
b/app-containers/docker/files/docker-26.1.0-automagic-systemd.patch
deleted file mode 100644
index 004dbb9ad3c7..000000000000
--- a/app-containers/docker/files/docker-26.1.0-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
-@@ -83,7 +83,7 @@ if [ ! "$GOPATH" ]; then
-       exit 1
- fi
- 
--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/docker/metadata.xml 
b/app-containers/docker/metadata.xml
index dfe556527506..29ae0a0b6db9 100644
--- a/app-containers/docker/metadata.xml
+++ b/app-containers/docker/metadata.xml
@@ -21,10 +21,6 @@
                        Makes the a staticly-linked init system tini available 
inside a
                        container.
                </flag>
-               <flag name="overlay">
-                       Enables dependencies for the "overlay" graph driver, 
including
-                       necessary kernel flags.
-               </flag>
                <flag name="overlay2">
                        Enables dependencies for the "overlay2" graph driver, 
including
                        necessary kernel flags.


Reply via email to