gentoo auto-resync : 07:04:2023 - 11:29:55

3 files changed, 69 insertions, 8 deletions

diff --git a/app-containers/docker-buildx/Manifest b/app-containers/docker-buildx/Manifest
index 54bbd2b132ae..7b361b41d71c 100644
--- a/app-containers/docker-buildx/Manifest
+++ b/app-containers/docker-buildx/Manifest
@@ -1,6 +1,7 @@
 DIST docker-buildx-0.10.2.tar.gz 9187634 BLAKE2B 9a43a7bcb224f33d718928ef3070449cac4db87c951f4337368d0c994f211d4c3db3a5e9c309ce10e357ab24746bed2507e2867c9fdab3b51a5423787362fee1 SHA512 ba6b8baae1a8e24bf9ddc58d5e2451270fa6e3891bae83112ca00ae56b7a4842b45ec970898ec27a2123e312885bf0d8c58cc600d8462787242eb878f45cd877
 DIST docker-buildx-0.10.4.tar.gz 9184825 BLAKE2B f0e71c0f6dda5f02da4cf0b0514f67f5d339ba10359afc69aae25abf907447fd22fe3d92427299bc67aeaa6a84e748a8a5cbd86151b2baba2dd01f25cc04a793 SHA512 f82b89b8dd4e45524c8d353c4d7588f47b1c7b7ecf759fd9605247c1c7aa0ca152c3ecdec0e0b62b5eef05e6b65d2ca1f5ccab6d75819b92fc92ff62b44105b7
 EBUILD docker-buildx-0.10.2.ebuild 1419 BLAKE2B 9270f5131fc4ff742928ad8308a6017d5ec96dca156b50992d3df77477af5d302be5457b9745026e14f7129aaefb0a0aef6e1ddf3778f2157c73c26adce1f4b7 SHA512 b57cabd264c6e89158107691581ede6fab15cc108c7a7c3248f38c12d3137dd8d610bec6e2757f4c7863bfbebc43a68c6cd82d19d4e3c2ad8b5aefccf0d8b0bd
+EBUILD docker-buildx-0.10.4-r1.ebuild 1509 BLAKE2B 6249c41dd3a487486299280496241ddc5a10aad213ab74ad14588f04f7ff65698411cb22c740804b35861f2d0eebfd4f7fb4119fb10c5c4b5d501e3a87bbe751 SHA512 cae6418005c70a6175452db13be6dae93157e07b9faec4bbf08cd911887b13847cdf7894b2c9fe49951b3323db8e751f9256566e5f1a499b2b337d03bf888901
 EBUILD docker-buildx-0.10.4.ebuild 1542 BLAKE2B 857e629af0ccf5f975884902bb58561aa9dfc65abc4613c7619925e2b0fbbf7b5a26cd073efaac44c61390506e32acf06b4b143812742faf064df07c3bde1d92 SHA512 a8db926dca24e0501448fd951d4bf5f151baf65da1b49ea6fbd5c3e7c50344b5a753f78438344b877535e421f8e5651508bec8e14d0406116865c035756956be
-EBUILD docker-buildx-9999.ebuild 1521 BLAKE2B 1947c4345adb1d3c642f88733330fee5a7e2cfcabe1ed68a8f9dd02f7cc8478d197ccec328a3ab3b206b8b7dfc9bb5a62900d27dc7ea96c82a7b280c905fe4da SHA512 c8559990538a01f78345f2f10650edeb18d89220be9e1125a7f24a5f3ac1d32a6ceda757d39cf30d6fd58bad8f21a2466364f1933cf10fcf64f8ab859b0635dc
+EBUILD docker-buildx-9999.ebuild 1512 BLAKE2B 4ddf44f9fd348b374cc961c2dced227d31b7c915eb513edb14c9f3332cc0f7b3d42ba4e970b2caa99069205f9949853cb68905bd619351527e621c898ec7663d SHA512 8facddba40493ab8b7256fb6d488b37ddfb84fb75abc4c2dcec4fbe1cd6dbdc41a82137ad3a6f1a3439997083f24d206a302c133abb68e0f4a7d6d3166df11e1
 MISC metadata.xml 710 BLAKE2B e54ba5993825b2fa455c7ad33dc37d3edddbf74f19cc2e8ce3260fdac0d581c3c719d5f7252b7836d263efd020b4d3d90d717c3873531055418dbb556f02288c SHA512 f217f1f7f8ac31cbf5516630eea107a686394efc960384c67a216f80b57c61323b6b02b5dd1ae458817a851b9f166c684087790079e48b7d4a2a78130dc2a411
diff --git a/app-containers/docker-buildx/docker-buildx-0.10.4-r1.ebuild b/app-containers/docker-buildx/docker-buildx-0.10.4-r1.ebuild
new file mode 100644
index 000000000000..982bd439623f
--- /dev/null
+++ b/app-containers/docker-buildx/docker-buildx-0.10.4-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 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"
+
+# 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 )
+"
+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"
+	else
+		ego test ./... -skip "TestGit|TestReadTargets"
+	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 e46ea450eaef..48941a07ce98 100644
--- a/app-containers/docker-buildx/docker-buildx-9999.ebuild
+++ b/app-containers/docker-buildx/docker-buildx-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	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 ~arm64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 
@@ -28,8 +28,7 @@ IUSE="test"
 BDEPEND="
 	test? ( >=dev-lang/go-1.20 )
 "
-DEPEND="app-containers/docker"
-RDEPEND="${DEPEND}"
+RDEPEND="app-containers/docker-cli"
 
 src_compile() {
 	local _buildx_r='github.com/docker/buildx'
@@ -37,10 +36,10 @@ src_compile() {
 	if [[ ${PV} == 9999 ]]; then
 		version="$(git rev-parse --short HEAD)"
 	fi
-	ego build -mod=vendor -o docker-buildx \
-		-ldflags "-linkmode=external \
-		-X $_buildx_r/version.Version=${version} \
-		-X $_buildx_r/version.Revision=$(date -u +%FT%T%z) \
+	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
 }