gentoo auto-resync : 16:02:2025 - 00:13:18

8 files changed, 61 insertions, 122 deletions

diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index b8cf0b0e34c3..6c7242d0efe5 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/apptainer/Manifest b/app-containers/apptainer/Manifest
index 9ed0cd1b8c34..3dbedc8d1a8d 100644
--- a/app-containers/apptainer/Manifest
+++ b/app-containers/apptainer/Manifest
@@ -2,5 +2,5 @@ AUX apptainer-1.0.2-trim_upstream_cflags.patch 1142 BLAKE2B 7238229b70a8ac37f340
 DIST apptainer-1.3.2.tar.gz 17129103 BLAKE2B a2c15d408dc956a4bc8cb154dadfe0e60aa8b4216277ff4afd508058f9425722fb66200e7d4ab33cf5a73aee34761ac198e7b31439ab69dfaceebb9f768b58e6 SHA512 c3112c8254c995f83e3ae424ecf734e8ca9583c34cd8b0e56fdde2a7ef8d5145ac68a7a2c9575b071515a2cb681d11423fe57a5a3910750d3bc697c85c15585d
 DIST apptainer-1.3.6.tar.gz 17129602 BLAKE2B 2dd17c1a0601c7d191d4604f2c0e3fb5d8cc4e831dba7bf4cfcbfc359eba1bb3f255ab2c1a81ae844cbebfc6e96729911e5ac4a92195b30f74d77fafac12059f SHA512 e50b8cbdac544241a56d7dc662ad927fdcf9a0f245bab4be0bc35ba9658f9db7c851a95de500e32c0975a2f5e8bcf7f16628e963ebb945ca036de9e91bd8a4a9
 EBUILD apptainer-1.3.2.ebuild 2462 BLAKE2B 97c52f554cc1d29249ccb1de44e26c62998441f1d37079caa702aa8cdacb39b740aac2626bb3acb0b04e5e58c50b45d0e4057001a86938200429882c7563e6df SHA512 760eff4dcee6a67202e2657f1e0126bb6c34bf724a4cc10497ef8f6331435c7bf19035e7fe30cdb500eb591149924b7e89a9f5b90c25204833102d072c1240d7
-EBUILD apptainer-1.3.6.ebuild 2437 BLAKE2B 1d75175d5ae711a39d91db42213f313fb65ec01b2f2cfc5653c246255edc5a0908bca75c0820f9f33e2c37e1478b706eb88ddfbb77d315ee614a75c56e96b035 SHA512 aa5b8465ad006b99196650c004c1b0301b8c565dd6dd765ba6a98dafe6bd3641d22869549a7007d739395ab63c5e5a06a5ab41629532251c40d0202bcbcf8d3e
+EBUILD apptainer-1.3.6.ebuild 2362 BLAKE2B 8e9389ee79162b69731c6cf74dc4101eaabc9b007d5ab97b799749114c22566deff383c072df57c97a61a926e04e4febc9e96df223b7f9b08c6ac79e3fe10f57 SHA512 c3f05da62acc6c810ff50af89f689ae94eed8ce30f61f0af01606fbf773a9b2ae62ed2a9ef927ff210306c04b9d92ac4f19297651172b571be9cb9f8a8139910
 MISC metadata.xml 376 BLAKE2B 0c0bcda53c7a1203fe5b32758e572d4f60270e4fdfc5a3779db54bf4ab7ea8fc3c958b53aaaa3e1c7c4c817e82bf95ccf52f122542b4c3f7f1b25fb84332ac7e SHA512 0364cb2a1537a41ad872de51eba33cba2407c6081b010acb3f404eb308fea863ad7c0f462c3fc1a424ff33577a0c7eea672eb7722a81c6b0a01475a4d0fc7727
diff --git a/app-containers/apptainer/apptainer-1.3.6.ebuild b/app-containers/apptainer/apptainer-1.3.6.ebuild
index 1adfbf38c500..49372666e5f8 100644
--- a/app-containers/apptainer/apptainer-1.3.6.ebuild
+++ b/app-containers/apptainer/apptainer-1.3.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit linux-info toolchain-funcs
+inherit eapi9-ver linux-info toolchain-funcs
 
 DESCRIPTION="The container system for secure high-performance computing"
 HOMEPAGE="https://apptainer.org/"
@@ -79,13 +79,9 @@ src_install() {
 
 pkg_postinst() {
 	if ! use suid; then
-		local oldver
-		for oldver in ${REPLACING_VERSIONS}; do
-			if ver_test "${oldver}" -lt 1.1.0; then
-				ewarn "Since version 1.1.0 ${PN} no longer installs setuid-root components by default, relying on unprivileged user namespaces instead. For details, see https://apptainer.org/docs/admin/main/user_namespace.html"
-				ewarn "Make sure user namespaces (possibly except network ones for improved security) are enabled on your system, or re-enable installation of setuid root components by passing USE=suid to ${CATEGORY}/${PN}"
-				break
-			fi
-		done
+		if ver_replacing -lt 1.1.0; then
+			ewarn "Since version 1.1.0 ${PN} no longer installs setuid-root components by default, relying on unprivileged user namespaces instead. For details, see https://apptainer.org/docs/admin/main/user_namespace.html"
+			ewarn "Make sure user namespaces (possibly except network ones for improved security) are enabled on your system, or re-enable installation of setuid root components by passing USE=suid to ${CATEGORY}/${PN}"
+		fi
 	fi
 }
diff --git a/app-containers/docker-buildx/Manifest b/app-containers/docker-buildx/Manifest
index 51cd134cbfdf..722d1be892f8 100644
--- a/app-containers/docker-buildx/Manifest
+++ b/app-containers/docker-buildx/Manifest
@@ -1,8 +1,10 @@
 DIST docker-buildx-0.11.2.tar.gz 10342565 BLAKE2B 1e034e9a07f36b46096f8f035869adc93b63af46cd9886f5ed4bc0939ce2f76b7f029a11ee536a34be23952e5c85251d757cec9ff05df172e3a26ea82a1bf0b1 SHA512 6f3718edf1e86c4422e1419580e4c38cf378a59555067be2aa6fac3e7f8878afe39d777765ace274cd9c47630f39cbacfacfdc4ecadd6ff46d5ee37d8f9bc75c
 DIST docker-buildx-0.14.0.tar.gz 11120356 BLAKE2B 01fec6b29665088a4778cb6a926f071c1beacb22d7a50593d55afff1225d0e74d083a82eaab4ae96ffee8a6f653ce048fd81b3410e7113bc29da210d77042b64 SHA512 bc09f29096cfd08c60efd8fca7976a1db896f0ed08d33dfc64dfca2c6487a1dc1722b3fe80b6a175ebebeacf8b460bcc214806d0c7a637f17ed5d09793d8c9d8
 DIST docker-buildx-0.19.1.tar.gz 11691424 BLAKE2B 40cc5e68eb85e8693bc6cd7bf91fe3a6300644d9934a3ff84b89c79dba31d475dce5ac4366075127391c5230905591a83bd59c762cf9f9f4bde0931834633473 SHA512 cc811eb93910bfb5a4668cc3dc59ab6c13a1308c0fa49707a81d1d733e834d209677502786e951ce3c8f098c387b559054dd3cd9933edafbecae610d1ef321e6
+DIST docker-buildx-0.20.1.tar.gz 12049522 BLAKE2B cc370f8a6bc82d9358cb59f99645447e83a4c84c656ae75409a504d0e0a973027791129d6eeb55827eb98904300d04c34685be993309e80f547514b76566fb2e SHA512 75c47204a2f11773ed978678735637fb8248ad87bb745e0b878ad7db161dea4d000dbfb98c83b03225efed126cc04b31d3a9ca500f8d3ac414620c7f980fa9cc
 EBUILD docker-buildx-0.11.2.ebuild 1541 BLAKE2B c5fc39fcf9ae1d65563f1f0009160de12444868e55dfa72f4bb3df59fb367e4f28d88513a5a7ac44ff7875317f7fd7ff8b87ab9df6733fe01e958b9da31efb2f SHA512 5ada6f9325cc7d9bff66b1ca9c0f413de23e1ac82caa1ee571ab361f909b61a3659c221a86795144e12df072d1fd7a128b87dd50ab5031601a69a4752333c6a6
 EBUILD docker-buildx-0.14.0.ebuild 1542 BLAKE2B b7460e822f99b1f5d08c713c28081fad23e58ca5958d91ebdc9ee327c791d59062b3f75f81c5707d2c55f29df4bddf884c5985231ee4ff2ac927b23dc2a1a9ee SHA512 4398055cbdb47ec0c2f15a79ed46ebb2618ee7d51b26ff2ba1af9444904b0fe30d5d2926ba38c59f2742312c1d168fcd9b09f5ef4bfa27afa7af2af47bf28c94
 EBUILD docker-buildx-0.19.1.ebuild 1542 BLAKE2B f3c678b0b29ef3f525d945f8a9c7e1f156917d489e55c8e2a6acd0f9f6c12c7716f28a336025cd73ab777492d61d1e3d28ac596e5ba9848c20c2b94fc4f407fc SHA512 3cfe321cccae5512b424efd4a07bd7b6431005b9ff534015907aad28b602a417963caacf9ec8f6235543cf61543bc2f30d22272244e950937356d957c005bfb3
+EBUILD docker-buildx-0.20.1.ebuild 1366 BLAKE2B 3e4af0049c43f8a3376fb342589897316f70abd5fe461f883eb49fd3e308bebffde8289f6a7df509a5f50f0800baef1e1d3bf8c017e7452cfb729ae017c7fe85 SHA512 97ae15c138c84695b0402e6e0f775d5bc82fecd37e0bc0291cf9c851ff60821cb84b5553114fb306471f07d05cfe662c7a9a29c680ceb8db6dd19ee63611c918
 EBUILD docker-buildx-9999.ebuild 1545 BLAKE2B d3e6db3fee8cf75cf4bdeb84a097cfada046048326898a3799cb57234ec70279b9bcf6d13ba15e9b5a98fea3d39004d6e76167e484fbab84035785dae32298b3 SHA512 5eb4375ff570f77d1971d38c627830579e18c3774c7603ec6349760d3ed50d7b4ff105179626e8c40542ea2f123743bc757b665f8fbde3d2d3b22e41dc80edb4
 MISC metadata.xml 819 BLAKE2B eabae0ff28ea1eea91dff4633ae0edee670ec5fea2615c550b80b37d71e07c311073e4c17f32b50a46a670f46d5d8c536595058cdcf485b4002aa416328663b2 SHA512 e290b4c9af65f262a654f4bb5e5c7bedd7a246dc5804387d8c4823e6c7cd2b2eff7b671cd493145a5c1a6083861c5464004a1f626b65c18e91c9b9675d3831d1
diff --git a/app-containers/docker-buildx/docker-buildx-0.20.1.ebuild b/app-containers/docker-buildx/docker-buildx-0.20.1.ebuild
new file mode 100644
index 000000000000..f1b68c11170d
--- /dev/null
+++ b/app-containers/docker-buildx/docker-buildx-0.20.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+MY_PN="buildx"
+DESCRIPTION="Docker CLI plugin for extended build capabilities with BuildKit"
+HOMEPAGE="https://github.com/docker/buildx"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/docker/buildx.git"
+else
+	SRC_URI="https://github.com/docker/buildx/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="app-containers/docker-cli"
+
+src_compile() {
+	local _buildx_r='github.com/docker/buildx'
+	local version=${PV}
+	if [[ ${PV} == 9999 ]]; then
+		version="$(git rev-parse --short HEAD)"
+	fi
+	ego build -o docker-buildx \
+		-ldflags "-linkmode=external
+		-X $_buildx_r/version.Version=${version}
+		-X $_buildx_r/version.Revision=$(date -u +%FT%T%z)
+		-X $_buildx_r/version.Package=$_buildx_r" \
+		./cmd/buildx
+}
+
+src_test() {
+	# TestGit can't work in a source tarball; TestReadTargets fails seemingly due to parallelism.
+	if [[ ${PV} == 9999 ]]; then
+		ego test ./... -skip "TestReadTargets|TestIntegration"
+	else
+		ego test ./... -skip "TestGit|TestReadTargets|TestIntegration"
+	fi
+}
+
+src_install() {
+	exeinto /usr/libexec/docker/cli-plugins
+	doexe docker-buildx
+
+	dodoc README.md
+}
diff --git a/app-containers/flannel/Manifest b/app-containers/flannel/Manifest
index e654c3ad1a6c..925dbcf1d71e 100644
--- a/app-containers/flannel/Manifest
+++ b/app-containers/flannel/Manifest
@@ -4,11 +4,7 @@ AUX flanneld.confd 40 BLAKE2B 7e3aae756e872ead179c34119e39bb054c7e23255b647c9c4f
 AUX flanneld.initd 518 BLAKE2B 36859121c77fcd7b53f679eff455ad1ba1f9c6c58fc6a015e195c7639434f941106c44349671c1fe15f4f0c63c3d753f69e9b8cfe2a8d706cd33dbf62a928154 SHA512 3f6f33fe90adca1dd17b503ce0cd3a7f3cc0ca7fc10d0ca5b631f4c87ed513c0133dfd7679618cf95540b252b3176f9bbefd6454867ef792258c46cafc039d86
 AUX flanneld.logrotated 77 BLAKE2B 778f7289a6268cf6b150b1c58895514808c304b56baca56b1df3297df4ff0a4c9ec6e70a3ddbf16c55c0bd5be146bcfa20f7b4ac8ceb08fa9af223164c19a905 SHA512 d84258a164adcec0f1cef7fcafcf0cadb3bf3959b393b905c4897274adeff476279ce96ec42e9aa9d574c6bd7d37649d92c7c52563975f85d303cade990a3942
 AUX flanneld.service 476 BLAKE2B ea838e26be0834943bafb985a37e71b45219bffbd68784b8442c065d9bafc8c9cb2b097c8a00629c19faf4b7bb1fb4ae33071e51d4bf6ffdd62cf5898de1f3cf SHA512 4a7d09f25f117b1cda9b02914a394c0d6d6ddd6c02503f61c0646ede1934cb4cad831992058c5738401b1ac7be6e4c7cd83b1c4a70c04084bb4bb01338c08220
-DIST flannel-0.17.0.tar.gz 9534647 BLAKE2B 03d6d036d5877641a2fc7b6654995822522d378943e4d7b2531be8197de6e7d6e0509143cd8d4dfd3d2ef11c9355011bfc44c834f966e14fd3aa774350bcab11 SHA512 f0625339e387a6ae81780d21025c282c2e0caf8b32ac778634a877a4e04ebf10d41fc10b50ae477c28815cedaf34af867b651ed5a8c5267177ea925abc6a1253
-DIST flannel-0.20.0.tar.gz 10737855 BLAKE2B d2e5821c4457a8c0781618a62245132f862d7877ce10467f8d9c72be2440f7b60f0866a3420a69d13bc53826407b0b653e6c2385f8e56d684ee1e09acf0528f0 SHA512 624a293607d3d4d5e53b41b5fd26a416f8499a763f8cfbe39c79796644a56d5eb3605664592d15eddde519f2dba55da241889be159644bbe40e78ae72ed5a43b
 DIST flannel-0.26.3-deps.tar.xz 4762164 BLAKE2B c6fcbc0bf9b99f36332af3ddbbfcc10f150da36f3464ab44ad04170aff1cdec49e4bde89065e2945260fd4e8ecb8aebcfa31f1800985269a47ea12a6ba743318 SHA512 f0d78ea6351b0851491b2d00bfeac5e12acbbc7baf387162617f9330a56a7e6b80f11ba6e3c9c895624c8df6969c214721aea3d63156420418044d3280fb5cbe
 DIST flannel-0.26.3.tar.gz 2344640 BLAKE2B 6671f64ca90804cbe9293a66d9611fd276ddc8be886bd7bffc4d11b3ef4c5ca9119d8494a7719c578f402713f11ab2c6d19a3688a8897ba4c549abe71f55e284 SHA512 7888f28b2994fa0ae6036e54d0291e57aef54cbfb8db5869bd62e33ae092fe028adb3780acfdb2017187ba035f7c3310cc51d0214aa78713321f062343364bcb
-EBUILD flannel-0.17.0.ebuild 1436 BLAKE2B c0dc753253b6267ffc746294c1cec61bd4647f30ad1b562598dec39de55073bf2cd0a47b1b9a0bb518ec4211f285f00f63a319c009b6c4d83498242d99908083 SHA512 6fbaedd060184774118f8a483ea737fa1ba6eb16996d8b2f7677c9f09ba5aeafc1773182980a98f4185c70442d6a7080ab4903944958197125c26b7e4f13fc8c
-EBUILD flannel-0.20.0.ebuild 1436 BLAKE2B c0dc753253b6267ffc746294c1cec61bd4647f30ad1b562598dec39de55073bf2cd0a47b1b9a0bb518ec4211f285f00f63a319c009b6c4d83498242d99908083 SHA512 6fbaedd060184774118f8a483ea737fa1ba6eb16996d8b2f7677c9f09ba5aeafc1773182980a98f4185c70442d6a7080ab4903944958197125c26b7e4f13fc8c
 EBUILD flannel-0.26.3.ebuild 1509 BLAKE2B a66fb37ced57669894432301beddb18fa0fa514d5060cf7b0e51baaf5b77e0d120e1d892aa22bb194bb5f564221e927d5e4e0fde211936709e280e8f87f4c312 SHA512 fa4057bd7a552a83d23b9d4987b944f20f60867dcd43762e84ee26fe453370c31161e2216c970252a73402a17b22e4837cb6913ab8c9d61de6e5bdb6b4c18237
 MISC metadata.xml 310 BLAKE2B de0cea7ebb19915abdb06399ba91ff1f3c45b2ca5a24c4c99e59c839bad7a854f702cd5909549bc9ad746ad579b80280fe53be39736117aa5f4fdec184a122e3 SHA512 e2c16506f5baf5911f15a5cadc4d8493b0c8d66dfefef8f789a471dfc4c92411e3a8c5ac3e40490edd3d4c8150a0beb815d497882db83164724093e2fc8aa34d
diff --git a/app-containers/flannel/flannel-0.17.0.ebuild b/app-containers/flannel/flannel-0.17.0.ebuild
deleted file mode 100644
index 18d922d3f1d3..000000000000
--- a/app-containers/flannel/flannel-0.17.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd tmpfiles
-
-KEYWORDS="~amd64 ~arm64"
-DESCRIPTION="An etcd backed network fabric for containers"
-HOMEPAGE="https://github.com/flannel-io/flannel"
-SRC_URI="https://github.com/flannel-io/flannel/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD ISC LGPL-3 MIT"
-SLOT="0"
-IUSE="hardened"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	default
-	sed -e "s:^var Version =.*:var Version = \"${PV}\":" \
-		-i "${S}/version/version.go" || die
-}
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"\
-	go build -o dist/flanneld -ldflags "
-		-X github.com/flannel-io/flannel/version.Version=v${PV}
-		-extldflags \"-static\"" . || die
-}
-
-src_test() {
-	GOPATH="${WORKDIR}/${P}" \
-		go test -v -work -x "${EGO_PN}" || die
-}
-
-src_install() {
-	dobin dist/${PN}d
-	exeinto /usr/libexec/flannel
-	doexe dist/mk-docker-opts.sh
-	insinto /etc/systemd/system/docker.service.d
-	newins "${FILESDIR}/flannel-docker.conf" flannel.conf
-	newinitd "${FILESDIR}"/flanneld.initd flanneld
-	newconfd "${FILESDIR}"/flanneld.confd flanneld
-	keepdir /var/log/${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/flanneld.logrotated flanneld
-	newtmpfiles "${FILESDIR}/flannel.tmpfilesd" flannel.conf
-	systemd_dounit "${FILESDIR}/flanneld.service"
-	dodoc README.md
-}
-
-pkg_postinst() {
-	tmpfiles_process flannel.conf
-}
diff --git a/app-containers/flannel/flannel-0.20.0.ebuild b/app-containers/flannel/flannel-0.20.0.ebuild
deleted file mode 100644
index 18d922d3f1d3..000000000000
--- a/app-containers/flannel/flannel-0.20.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd tmpfiles
-
-KEYWORDS="~amd64 ~arm64"
-DESCRIPTION="An etcd backed network fabric for containers"
-HOMEPAGE="https://github.com/flannel-io/flannel"
-SRC_URI="https://github.com/flannel-io/flannel/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD ISC LGPL-3 MIT"
-SLOT="0"
-IUSE="hardened"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	default
-	sed -e "s:^var Version =.*:var Version = \"${PV}\":" \
-		-i "${S}/version/version.go" || die
-}
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"\
-	go build -o dist/flanneld -ldflags "
-		-X github.com/flannel-io/flannel/version.Version=v${PV}
-		-extldflags \"-static\"" . || die
-}
-
-src_test() {
-	GOPATH="${WORKDIR}/${P}" \
-		go test -v -work -x "${EGO_PN}" || die
-}
-
-src_install() {
-	dobin dist/${PN}d
-	exeinto /usr/libexec/flannel
-	doexe dist/mk-docker-opts.sh
-	insinto /etc/systemd/system/docker.service.d
-	newins "${FILESDIR}/flannel-docker.conf" flannel.conf
-	newinitd "${FILESDIR}"/flanneld.initd flanneld
-	newconfd "${FILESDIR}"/flanneld.confd flanneld
-	keepdir /var/log/${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/flanneld.logrotated flanneld
-	newtmpfiles "${FILESDIR}/flannel.tmpfilesd" flannel.conf
-	systemd_dounit "${FILESDIR}/flanneld.service"
-	dodoc README.md
-}
-
-pkg_postinst() {
-	tmpfiles_process flannel.conf
-}