gentoo auto-resync : 29:06:2024 - 08:00:25

6 files changed, 70 insertions, 8 deletions

diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 0a729cd8e035..288d7027dd93 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/apptainer/Manifest b/app-containers/apptainer/Manifest
index 52b504b69afa..c6cc6fedd740 100644
--- a/app-containers/apptainer/Manifest
+++ b/app-containers/apptainer/Manifest
@@ -1,4 +1,4 @@
 AUX apptainer-1.0.2-trim_upstream_cflags.patch 1142 BLAKE2B 7238229b70a8ac37f3401a163d19dc705adb6a4ab6355e4eaa386ad5c639bfc1443cf61507112a53b66816399ca5fe2c32de964dd602ea16c5dfbf9003343f8c SHA512 1351ee000274567bb5a63aa740fbc43510d84ccad42c9af0c555943b99d93d86a2b036801c1681b93548a874bda1bab3304c2bf0da83bbca102a71e82574a032
 DIST apptainer-1.3.2.tar.gz 17129103 BLAKE2B a2c15d408dc956a4bc8cb154dadfe0e60aa8b4216277ff4afd508058f9425722fb66200e7d4ab33cf5a73aee34761ac198e7b31439ab69dfaceebb9f768b58e6 SHA512 c3112c8254c995f83e3ae424ecf734e8ca9583c34cd8b0e56fdde2a7ef8d5145ac68a7a2c9575b071515a2cb681d11423fe57a5a3910750d3bc697c85c15585d
 EBUILD apptainer-1.3.2.ebuild 2462 BLAKE2B 97c52f554cc1d29249ccb1de44e26c62998441f1d37079caa702aa8cdacb39b740aac2626bb3acb0b04e5e58c50b45d0e4057001a86938200429882c7563e6df SHA512 760eff4dcee6a67202e2657f1e0126bb6c34bf724a4cc10497ef8f6331435c7bf19035e7fe30cdb500eb591149924b7e89a9f5b90c25204833102d072c1240d7
-MISC metadata.xml 454 BLAKE2B 7891b6acae30424b8b6877166b856c1113a13e40ebec9051935df10a0650bf941f52d75bdb6a4258795e07b080082979469b8b8242d2ddd56c52f9c5b6759f0e SHA512 ef53c2dee45734f36403ab71549494f3c24707bc183353e4bd9c548a97b3ab5d7877f4fc9d311d9e86ab249cbdb379f0a1a211ee36afda99fd552f0a5cac30bb
+MISC metadata.xml 376 BLAKE2B 0c0bcda53c7a1203fe5b32758e572d4f60270e4fdfc5a3779db54bf4ab7ea8fc3c958b53aaaa3e1c7c4c817e82bf95ccf52f122542b4c3f7f1b25fb84332ac7e SHA512 0364cb2a1537a41ad872de51eba33cba2407c6081b010acb3f404eb308fea863ad7c0f462c3fc1a424ff33577a0c7eea672eb7722a81c6b0a01475a4d0fc7727
diff --git a/app-containers/apptainer/metadata.xml b/app-containers/apptainer/metadata.xml
index 069f7e2cb731..c461d956342a 100644
--- a/app-containers/apptainer/metadata.xml
+++ b/app-containers/apptainer/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="network">Install network plug-ins</flag>
 		<flag name="suid">Install SUID helper binary</flag>
diff --git a/app-containers/docker-buildx/Manifest b/app-containers/docker-buildx/Manifest
index 63bc0cc07a9b..ecc2fa611d84 100644
--- a/app-containers/docker-buildx/Manifest
+++ b/app-containers/docker-buildx/Manifest
@@ -1,6 +1,8 @@
 DIST docker-buildx-0.10.4.tar.gz 9184825 BLAKE2B f0e71c0f6dda5f02da4cf0b0514f67f5d339ba10359afc69aae25abf907447fd22fe3d92427299bc67aeaa6a84e748a8a5cbd86151b2baba2dd01f25cc04a793 SHA512 f82b89b8dd4e45524c8d353c4d7588f47b1c7b7ecf759fd9605247c1c7aa0ca152c3ecdec0e0b62b5eef05e6b65d2ca1f5ccab6d75819b92fc92ff62b44105b7
 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
 EBUILD docker-buildx-0.10.4-r1.ebuild 1509 BLAKE2B 6249c41dd3a487486299280496241ddc5a10aad213ab74ad14588f04f7ff65698411cb22c740804b35861f2d0eebfd4f7fb4119fb10c5c4b5d501e3a87bbe751 SHA512 cae6418005c70a6175452db13be6dae93157e07b9faec4bbf08cd911887b13847cdf7894b2c9fe49951b3323db8e751f9256566e5f1a499b2b337d03bf888901
 EBUILD docker-buildx-0.11.2.ebuild 1544 BLAKE2B 528ca1df997bb69588c7e458ea888b930ccf53b4515a413a6d748a3e1a953c11b4a8ecfb91d8dbae8880196c02b09d5be87a443afc68613cd88078c602bf5075 SHA512 31daf408aa66ff74aff6cd8f9bf5e1e3a2164ac0b92d73a85fb073dd643c4e160869967d0a8b60591ad392aba46e9d6a04ce1a7709300a1479647eed54375712
-EBUILD docker-buildx-9999.ebuild 1544 BLAKE2B 528ca1df997bb69588c7e458ea888b930ccf53b4515a413a6d748a3e1a953c11b4a8ecfb91d8dbae8880196c02b09d5be87a443afc68613cd88078c602bf5075 SHA512 31daf408aa66ff74aff6cd8f9bf5e1e3a2164ac0b92d73a85fb073dd643c4e160869967d0a8b60591ad392aba46e9d6a04ce1a7709300a1479647eed54375712
+EBUILD docker-buildx-0.14.0.ebuild 1545 BLAKE2B d3e6db3fee8cf75cf4bdeb84a097cfada046048326898a3799cb57234ec70279b9bcf6d13ba15e9b5a98fea3d39004d6e76167e484fbab84035785dae32298b3 SHA512 5eb4375ff570f77d1971d38c627830579e18c3774c7603ec6349760d3ed50d7b4ff105179626e8c40542ea2f123743bc757b665f8fbde3d2d3b22e41dc80edb4
+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.14.0.ebuild b/app-containers/docker-buildx/docker-buildx-0.14.0.ebuild
new file mode 100644
index 000000000000..d36ee06a5456
--- /dev/null
+++ b/app-containers/docker-buildx/docker-buildx-0.14.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 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"
+
+IUSE="test"
+
+# This gives us the ability to neatly `-skip` tests.
+# not required once ::gentoo is all > 1.20
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? ( >=dev-lang/go-1.20 )
+"
+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/docker-buildx/docker-buildx-9999.ebuild b/app-containers/docker-buildx/docker-buildx-9999.ebuild
index 8cecb6eed7ae..d36ee06a5456 100644
--- a/app-containers/docker-buildx/docker-buildx-9999.ebuild
+++ b/app-containers/docker-buildx/docker-buildx-9999.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=8
@@ -20,10 +20,11 @@ fi
 LICENSE="Apache-2.0"
 SLOT="0"
 
+IUSE="test"
+
 # This gives us the ability to neatly `-skip` tests.
 # not required once ::gentoo is all > 1.20
 RESTRICT="!test? ( test )"
-IUSE="test"
 
 BDEPEND="
 	test? ( >=dev-lang/go-1.20 )