gentoo auto-resync : 05:09:2024 - 12:28:40

3 files changed, 20 insertions, 14 deletions

diff --git a/app-containers/docker/Manifest b/app-containers/docker/Manifest
index 45735b70ba2d..51bc73df77e8 100644
--- a/app-containers/docker/Manifest
+++ b/app-containers/docker/Manifest
@@ -1,7 +1,7 @@
 AUX 0001-Openrc-Depend-on-containerd-init-script.patch 774 BLAKE2B a7ac6f6a1e9ee88751e8e0471cd33429b8141cbea07a3a56c61eccd63c796c9135edafaf5977571a4413e5d71931aac44b5313110af94c3206e286b15394f637 SHA512 bc709b6f0dd8685fbf2404be589743f32a5f4deb24dec8ed6aeec18f0fcd1db4c5d59587209c28f62d964d78ec9ab3a3fdbb795dc4b7e3fabd00a06a002af34e
 AUX docker-26.1.0-automagic-systemd.patch 355 BLAKE2B 95d2367d5450a15214939c0a080b81a07d3ea3fdaaee921b2fc221949f3737652182366e54af499da5a1597fb1353a29d8935ed0a5e60a805920d3375aa594a1 SHA512 ba694ac1ca135fadc39d1afe0b8fdfaef8d6b9c75cbe4177a51422f972022f3502625c5e5467cd54fe33b2e83acdfe2c524da2a4d37f74376f365d7baaa12bec
 DIST docker-26.1.0.tar.gz 16390376 BLAKE2B 6703e9b153c430bc28aed2e7de7bada0203353d61f0a2ce3d49ddbd017eab196a685dd1ab1e719a6b287813eb5fa4f2c612e2cf1ab95789d6e79ebe5dac7ace3 SHA512 47b6b9af9947016884614b6bc25977e1db281da95c9b8b34c753c21c664a737a893f9fa65d92cbb897735aae3893567e106e6bababb5507e069b1e0981e48d50
-DIST docker-27.1.2.tar.gz 16608463 BLAKE2B 27d8ab2e917c838007f8bc286899ed65e9f9a16d67d77034845ec5b04ef2733887dec3a18c224130823516738fb40c6c731962538b61603e94746e2c32d721a5 SHA512 26f85a1437ba4361dc050861dd9c3ba900f80e4fdc0eaf2bfcba33b6419c5d981c9ee5ab3bea9af208502eca372a2f76c42325abe9e3d2c1b2f725fe7b10df92
+DIST docker-27.2.0.tar.gz 16689537 BLAKE2B faf0bae9f7da127d5b65b9989acd82dc726bc3f09ace502df151b9f03a84b6f1ec2a946d905263aaa7d2e7d7a3cd4ad1a09291dcfc6691e73cc9a8738f150d55 SHA512 97abaf56d2249c1514beacf17fc9096848b960846e064f1a9bd800a59762a1f1888b32e83b3e8289e23656496ca0293fea65931210d68faaa8a713aab6e48b65
 EBUILD docker-26.1.0-r1.ebuild 7522 BLAKE2B 9b02ddf1d1a68847be4541e93a01cddbe486907e68eef51c3a87e6012ed5be52c4e31af675ed718ad0e911acbdb856fdc9b127edeaec92f879c778b4bff79bcf SHA512 a3e351d6c33cdea4584c4444902b0277543b7f6f573716225ed0ed8f68aa50422902d03958cce3b1a2ca0d128d1d1edd94247e8d32e063f75990985fa18726f3
-EBUILD docker-27.1.2.ebuild 7498 BLAKE2B 32ea90a0d76fe0441b198708f9a8daac0561d9158eeb01098310bcb977369181224c7877e70a02d746d0390f427a402f5d2ed6db1859c0c57f153f85be068eba SHA512 e8db487f04d11f9b42ff2d1aa124ccda8c75a5f9d101f609266ef1461d4f296b22772a903ffb33514c844b0dd77a733fdae2e786980a6490e18bbc3bf58c2cc8
-MISC metadata.xml 1100 BLAKE2B d7a5f93051eb7d087cadd9788a1607f115deb9e7bb73929efad1815a25633f7c9f66c6e797e0283ba975f573e7a8729b48a70d1b2384c392fab1f7b1e4842a17 SHA512 7637097ccfdcc4d07099d54de4eacbac42cfc0f84aa7da78aa5547fe9c42b3c77e853d15492d0fea467c0c53514068b35c0d34dbe6668c285212d8e2bb5371dc
+EBUILD docker-27.2.0.ebuild 7729 BLAKE2B dfa17b7a00fffee3b4f7dd34d213257bdeb28cd8a22eddbd921aff5a8a6be6b258752125624c8e82deb24379c13b2780faac0528ea053ca7dc66d0e7016d87b7 SHA512 29412e6433c6f98b8eb3a9ef7cfd96217cc3bb3277f2b6985ee87c39d7c313bd375236dcfb0cf66794d4e485943ba83c73a0b96457f67cbb9be3831745d86c65
+MISC metadata.xml 1229 BLAKE2B 5cb0c3e7e3bd8607977a7a915ee913f3abe1af56b93c2ad37c9429c6f967915455582479615b25882ee7561b929e248678e14d68e2cd418a6ff5f460242bae91 SHA512 2463e031fe4b1aef27d1c2ba8dbeed21ded238040c361899903eab57d48a9572dd0d5de16ef3eb4278e5bda5880d7740ea11d4f5a271e89c62446f4a99776943
diff --git a/app-containers/docker/docker-27.1.2.ebuild b/app-containers/docker/docker-27.2.0.ebuild
index 8b5a0a425043..4f5f1df2aba3 100644
--- a/app-containers/docker/docker-27.1.2.ebuild
+++ b/app-containers/docker/docker-27.2.0.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 EGO_PN=github.com/docker/docker
 MY_PV=${PV/_/-}
-inherit golang-vcs-snapshot linux-info systemd udev
-GIT_COMMIT=f9522e5e96c3ab5a6b8a643d15a92700ca864da6
+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/"
@@ -14,7 +14,7 @@ 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"
+IUSE="apparmor btrfs +container-init +overlay2 seccomp selinux systemd"
 
 DEPEND="
 	acct-group/docker
@@ -33,7 +33,7 @@ RDEPEND="
 	sys-process/procps
 	>=dev-vcs/git-1.7
 	>=app-arch/xz-utils-4.9
-	>=app-containers/containerd-1.7.20[apparmor?,btrfs?,seccomp?]
+	>=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] )
@@ -246,7 +246,7 @@ src_compile() {
 
 	# let's set up some optional features :)
 	export DOCKER_BUILDTAGS=''
-	for gd in btrfs overlay; do
+	for gd in btrfs overlay2; do
 		if ! use $gd; then
 			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
 		fi
@@ -271,6 +271,9 @@ src_install() {
 	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
@@ -303,17 +306,16 @@ pkg_postinst() {
 	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
+
+	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() {
diff --git a/app-containers/docker/metadata.xml b/app-containers/docker/metadata.xml
index 63036f19e3e5..dfe556527506 100644
--- a/app-containers/docker/metadata.xml
+++ b/app-containers/docker/metadata.xml
@@ -25,6 +25,10 @@
 			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.
+		</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">moby/moby</remote-id>