gentoo auto-resync : 17:03:2024 - 18:49:32

9 files changed, 483 insertions, 2 deletions

diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 1ecee3e35022..6462e882c316 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest
index b2ae28823c02..323d315c29a0 100644
--- a/app-containers/buildah/Manifest
+++ b/app-containers/buildah/Manifest
@@ -5,7 +5,7 @@ DIST buildah-1.34.1.tar.gz 18838539 BLAKE2B de11f64a54fa24c8aa543dd44e6a3fca9df6
 DIST buildah-1.35.0.tar.gz 19353483 BLAKE2B 806c098d557480b6d6e92e6da61c32e48dfd6c1bfa4926a2871a8f41a3ef5f35d91381e51d33636a892bce930eabfda509e97e9efa60ba5c4feab75781d027ee SHA512 b4dd30b4d8087bbd0bbfd9a7b9791afc015a0c489041b38d6b6241df27a97286083dcf7b25102ce1fa1080265378442be73313e301c22660f21d8e4f39bb3aa4
 EBUILD buildah-1.33.5.ebuild 2909 BLAKE2B 661fe0713bc3359843c53397d1b5b0cf4fb90e953699c302d3dd00aa0fc3ea4e6885e31d076f91924d47f99fad87e5b309f450be1e04f9c37a2b5b22bc562ea7 SHA512 2728c95830caea275f18063fd2ff3b41b958a8b3b6b94bc7db6a488ae9c0e0a5f57d65c332740efb29afd31e91c934250e8c8b9953a95891ffb6ce34e3cafdba
 EBUILD buildah-1.33.6.ebuild 2909 BLAKE2B 028314b5c62013ce5ebd147a45944e5e27f2150ad51f2fc566c5ebe45a64ad78ea068962b41dbb5fb657312bf5a48f06e75a920b0f9a4190a06c0b96f7ce02c8 SHA512 48e37433580225f5dbaccbdb2748d7e9715793692c5a2a570ef7cfafcb1994d72583b1bba46c17d81bc5e53603f9ea8f2ac5d8fdcde7377641dd58d08d1040ac
-EBUILD buildah-1.34.0.ebuild 2902 BLAKE2B e1378ac470bc01624ad505725ecd58a6a8ffbb9513e94f9079f2638b272e067a1dd271c7c7494d0288769772afa63be01747530849cfc39dfaf7ca0b8192cc78 SHA512 cfabb584f69dcc7660d864e5e0c61ca045fa58cbe822e8172fdc38c181543d196bd7e02c61e1396f593ed79ffdc84398fcca60de632163e7f992dc1b03aa2366
+EBUILD buildah-1.34.0.ebuild 2910 BLAKE2B 005d1365c73b062d304f8cc729af70d27cb7ab8d74d94799ec7d4a5d293bf3cc2a436ec6d05de539f72c8c1af019ed3cc67312d67276ae5e611cb0e9893e1da8 SHA512 f7f3594f3c75db2fe2ea40645d398b64662d804a22510b22f3cc386b9827e3ce51fc4ee89230495454bc7783ae43185ddd576b85bf3433f29db345d04766c7b5
 EBUILD buildah-1.34.1.ebuild 2910 BLAKE2B 77283c1f12db741d30099b6f9a500a2fb2c5669b8d2241c044962b5caf278ff66a4d9f74531dcb656caa164af5b61d010e12237950f49c5fa4d74ee105a4c418 SHA512 ed979f1b6c25cc5a6b050586ef34127544e491ece492d94cf9311c68846bba4b9520201841f4009a48b31e60e62694d37036d052048e1bec17eaedc28272dec0
 EBUILD buildah-1.35.0.ebuild 2827 BLAKE2B b810fee44fea3dd57934f408c78166e6976ba0c340599799d523341f9b60654a5e5c114a3ad412f840d87aafb95f0a15d3fef0218503493966d56405d4d51594 SHA512 b79b8bec1a0330a89b2f9975003f550fa085ffbee1b022c10f8c009ffbdda8e6d555802ab06de2126c5c864c1e0a80e92efd9c000a92b475a07ff5b0c8e8eb49
 EBUILD buildah-9999.ebuild 2827 BLAKE2B b810fee44fea3dd57934f408c78166e6976ba0c340599799d523341f9b60654a5e5c114a3ad412f840d87aafb95f0a15d3fef0218503493966d56405d4d51594 SHA512 b79b8bec1a0330a89b2f9975003f550fa085ffbee1b022c10f8c009ffbdda8e6d555802ab06de2126c5c864c1e0a80e92efd9c000a92b475a07ff5b0c8e8eb49
diff --git a/app-containers/buildah/buildah-1.34.0.ebuild b/app-containers/buildah/buildah-1.34.0.ebuild
index fb2f52d55abd..6237903cb5cc 100644
--- a/app-containers/buildah/buildah-1.34.0.ebuild
+++ b/app-containers/buildah/buildah-1.34.0.ebuild
@@ -29,7 +29,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/containers/buildah.git"
 else
 	SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="arm64"
+	# KEYWORDS="amd64 arm64"
 fi
 
 RDEPEND="
diff --git a/app-containers/containerd/Manifest b/app-containers/containerd/Manifest
index da289ec9af80..b459fd948587 100644
--- a/app-containers/containerd/Manifest
+++ b/app-containers/containerd/Manifest
@@ -2,11 +2,13 @@ AUX containerd.confd 124 BLAKE2B 25f72941a47374fa0de3a2dce3d8ca57420f013a0d7527e
 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.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.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
diff --git a/app-containers/containerd/containerd-1.7.14.ebuild b/app-containers/containerd/containerd-1.7.14.ebuild
new file mode 100644
index 000000000000..9a363e0c14c7
--- /dev/null
+++ b/app-containers/containerd/containerd-1.7.14.ebuild
@@ -0,0 +1,86 @@
+# 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/docker-cli/Manifest b/app-containers/docker-cli/Manifest
index c05352bcaf02..68a3ab98234c 100644
--- a/app-containers/docker-cli/Manifest
+++ b/app-containers/docker-cli/Manifest
@@ -6,8 +6,11 @@ DIST docker-cli-24.0.7-man.tar.xz 82228 BLAKE2B 7fbf114a724157243c78de9ae03b5d0b
 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
 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
 MISC metadata.xml 398 BLAKE2B f9cd5360fa32f30edeeb2fe1df0ea50fd0b061bf882c66c65f18d15ba56995deac8c054419ddbf2d6436bf90f6fb729dda9560b3766b558d45498ae2c8de486c SHA512 4b2cf7c3b38df8382680539e1a8121f6f2f75cbe70f1f92c589fb40dd4c368f2f207cf3567ead5620714c323c0c196c318a4c5ab947d49092668dc2a3a8a6a53
diff --git a/app-containers/docker-cli/docker-cli-25.0.4.ebuild b/app-containers/docker-cli/docker-cli-25.0.4.ebuild
new file mode 100644
index 000000000000..97d5f7e61767
--- /dev/null
+++ b/app-containers/docker-cli/docker-cli-25.0.4.ebuild
@@ -0,0 +1,70 @@
+# 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 5412dc543a4f..f6b4d5e78a45 100644
--- a/app-containers/docker/Manifest
+++ b/app-containers/docker/Manifest
@@ -3,8 +3,10 @@ DIST docker-24.0.5.tar.gz 14456089 BLAKE2B be13a4256787152cb35ddb96d80e97a5e5b58
 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
 EBUILD docker-24.0.5.ebuild 7678 BLAKE2B 6a810a6e620d5d767196f407168935ae86a6c386666170728bcc740d2219b63fb7341c553e3df8c0600c5399043954fd5ef93708851b7d2f1475cc3a880f90b8 SHA512 d3ef18e6c19e08eda50da385f914db0b906c17e018809f28043d251d29af754a276dcc52e7c493b41ccf242c2f18eccf842bdd502061d744a5daf0f9b4a30c15
 EBUILD docker-24.0.6.ebuild 7730 BLAKE2B b0b794e5b2286db6f0e150d9fb9dda78affc11e56c10b338f82518505bf62079b3df4dfcbb265ee2a49169c94b63015540bf6134d5c003cd14b697f656fea122 SHA512 d1ffd748c8d99cc85e3328f9c0937d1dfe08e1cd3b2332a34d54e255e3321a2376dc83898cd8120f7c06b6dd72dd4b2935da88496548cb6c81c37098e7ac4bd8
 EBUILD docker-24.0.7.ebuild 7730 BLAKE2B 96e28fb42703b73dccf3e4c3d650f865c85e3efdde01ed45637d9a01d684ff24472cba3c66774d738e04387d7f151e0664ae06b0fa16b704c0bba4ed683c4d65 SHA512 b5d9d0f2462b3bc978297708587ea0744e6de7ce5574f7f7e3afaac61a5f425cdb23c8d8be36d32dc62901b0d618603bf1f87154e6b47bf67c28686e5dc26f61
 EBUILD docker-25.0.1.ebuild 7400 BLAKE2B 27cc2cbcba89474dae5d73bb7085d75820bffd7d0bbab25906517b75a6150c4b33a1b411178a13c11b2bb7acbb0896be8e6b7d7e08b5a22be5fd4c3d89a4fcef SHA512 a4e1e3cde6170cced1f73e47a0f54497818fcd46aebace94732e84a4b09b7717490e5fe465b0a9e72e341b58f661070e45acf7901f5e1836044e26cbcb0143ed
+EBUILD docker-25.0.4.ebuild 7402 BLAKE2B 2fad943f26d8e74d7dbb2eb6417b0ccae49f0ca07ffcc5d3b0c3146e1344cfc4307a6881786ff28bcea31c5217fe058598163ab56b0b4e3c363475fa06663bcb SHA512 f494f5f0fa47b29c488154e52373fcffedb2e450df0c72bc51ad513ef53dff2bb9ffd0021d76e2cd440fb43f1008561ab91c3e3ecdb67b151923684a8f2ef885
 MISC metadata.xml 1238 BLAKE2B 66ba70d18bda5204db7a3a11ce1b258d5f3c3679ee5e9271033b04eeb9a23891632c5fb55a1bbd4d549b865261c9f05e9515879e989001b8b8e84e082dca8fb9 SHA512 ed304e622873eb5cb5e5f6e79955b19c4d660d8d3348ebc632b7c2ec996680ce43a53ee920c0f124525911836aa08e6cdaf942c9a856f68d31632a955930b271
diff --git a/app-containers/docker/docker-25.0.4.ebuild b/app-containers/docker/docker-25.0.4.ebuild
new file mode 100644
index 000000000000..739506d1d063
--- /dev/null
+++ b/app-containers/docker/docker-25.0.4.ebuild
@@ -0,0 +1,318 @@
+# 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
+}