gentoo auto-resync : 28:04:2024 - 23:59:44

6 files changed, 46 insertions, 7 deletions

diff --git a/app-containers/docker/Manifest b/app-containers/docker/Manifest
index 561f8f068584..4a5a724bf472 100644
--- a/app-containers/docker/Manifest
+++ b/app-containers/docker/Manifest
@@ -1,14 +1,16 @@
 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.ebuild 7678 BLAKE2B 6a810a6e620d5d767196f407168935ae86a6c386666170728bcc740d2219b63fb7341c553e3df8c0600c5399043954fd5ef93708851b7d2f1475cc3a880f90b8 SHA512 d3ef18e6c19e08eda50da385f914db0b906c17e018809f28043d251d29af754a276dcc52e7c493b41ccf242c2f18eccf842bdd502061d744a5daf0f9b4a30c15
+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.ebuild 7730 BLAKE2B 96e28fb42703b73dccf3e4c3d650f865c85e3efdde01ed45637d9a01d684ff24472cba3c66774d738e04387d7f151e0664ae06b0fa16b704c0bba4ed683c4d65 SHA512 b5d9d0f2462b3bc978297708587ea0744e6de7ce5574f7f7e3afaac61a5f425cdb23c8d8be36d32dc62901b0d618603bf1f87154e6b47bf67c28686e5dc26f61
+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.ebuild 7445 BLAKE2B a301dab36213223a8e90f5296535c0aae2c738d4a866b73d49ab333003f7b4f1a16b68e79be93838ba65bafd8ed6c76f0a5f6482b166414c1193151f34693a4d SHA512 8f5f1015fdc5d20b1efa2732caa4f8dfff79023260f85b33f19b73d0808a7b581a1ee23b00d6e8b47c04988d2aaf3687e5d6f0b39f2446e3b99aee479c9ac244
+EBUILD docker-26.1.0-r1.ebuild 7535 BLAKE2B 634f539707209593c0c611b3b8e012beb5ddcd731edf8cba23dc9b811dccf9c33e0e992127718518f5357b543cb7b6f02b20fd812e84070b101d743592823ae8 SHA512 43440d69faba36e5a506721f28a3fb81d6d92eec96e670935d632653e3814cbb7aeab6846e88147bf9cd856f86559fe7d66b9b4aab873607f7b94deb5a15043c
 MISC metadata.xml 1238 BLAKE2B 66ba70d18bda5204db7a3a11ce1b258d5f3c3679ee5e9271033b04eeb9a23891632c5fb55a1bbd4d549b865261c9f05e9515879e989001b8b8e84e082dca8fb9 SHA512 ed304e622873eb5cb5e5f6e79955b19c4d660d8d3348ebc632b7c2ec996680ce43a53ee920c0f124525911836aa08e6cdaf942c9a856f68d31632a955930b271
diff --git a/app-containers/docker/docker-24.0.5.ebuild b/app-containers/docker/docker-24.0.5-r1.ebuild
index ac578996d43f..2421fd8dd3eb 100644
--- a/app-containers/docker/docker-24.0.5.ebuild
+++ b/app-containers/docker/docker-24.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 device-mapper overlay seccomp selinux"
+IUSE="apparmor btrfs +container-init device-mapper overlay seccomp selinux systemd"
 
 DEPEND="
 	acct-group/docker
@@ -23,6 +23,7 @@ DEPEND="
 	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
@@ -54,6 +55,7 @@ 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() {
@@ -263,6 +265,8 @@ src_compile() {
 		fi
 	done
 
+	export SYSTEMD=$(usex systemd 1 0)
+
 	# build binaries
 	./hack/make.sh dynbinary || die 'dynbinary failed'
 }
diff --git a/app-containers/docker/docker-24.0.7.ebuild b/app-containers/docker/docker-24.0.7-r1.ebuild
index 14dddd2aafd9..ad913c3d0c3b 100644
--- a/app-containers/docker/docker-24.0.7.ebuild
+++ b/app-containers/docker/docker-24.0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 device-mapper overlay seccomp selinux"
+IUSE="apparmor btrfs +container-init device-mapper overlay seccomp selinux systemd"
 
 DEPEND="
 	acct-group/docker
@@ -23,6 +23,7 @@ DEPEND="
 	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
@@ -55,6 +56,7 @@ 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() {
@@ -264,6 +266,8 @@ src_compile() {
 		fi
 	done
 
+	export SYSTEMD=$(usex systemd 1 0)
+
 	# build binaries
 	./hack/make.sh dynbinary || die 'dynbinary failed'
 }
diff --git a/app-containers/docker/docker-26.1.0.ebuild b/app-containers/docker/docker-26.1.0-r1.ebuild
index 6a2110fa66a5..9a1e51a65f67 100644
--- a/app-containers/docker/docker-26.1.0.ebuild
+++ b/app-containers/docker/docker-26.1.0-r1.ebuild
@@ -54,6 +54,7 @@ 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() {
@@ -258,6 +259,8 @@ src_compile() {
 		fi
 	done
 
+	export SYSTEMD=$(usex systemd 1 0)
+
 	# build binaries
 	./hack/make.sh dynbinary || die 'dynbinary failed'
 }
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
new file mode 100644
index 000000000000..fb764b3b1a99
--- /dev/null
+++ b/app-containers/docker/files/docker-24.0.5-automagic-systemd.patch
@@ -0,0 +1,13 @@
+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/docker/files/docker-26.1.0-automagic-systemd.patch b/app-containers/docker/files/docker-26.1.0-automagic-systemd.patch
new file mode 100644
index 000000000000..004dbb9ad3c7
--- /dev/null
+++ b/app-containers/docker/files/docker-26.1.0-automagic-systemd.patch
@@ -0,0 +1,13 @@
+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
+