gentoo auto-resync : 25:02:2023 - 15:53:45

3 files changed, 84 insertions, 7 deletions

diff --git a/app-containers/docker-buildx/Manifest b/app-containers/docker-buildx/Manifest
index 4c1127ca370a..e8bbbfd48655 100644
--- a/app-containers/docker-buildx/Manifest
+++ b/app-containers/docker-buildx/Manifest
@@ -1,3 +1,4 @@
-DIST docker-buildx-0.9.1.tar.gz 8705505 BLAKE2B 75a56b1edda71fd1e0b4312e72695efd67e6e5144e064cc27ae1729e3155d8a605b315fdb6d32055fc9cb86151057f5afd57eaea9a5f4aaa6ac4ecc52a6a5161 SHA512 1d672ae9daa0f1c830fc56c2c3638389312a87c645aed97f4a0ee56eaef936ab833c04d11969a423e0d5ab5388f29db20d7a1fe6c9b0ec7d981123243b4eaa4b
-EBUILD docker-buildx-0.9.1.ebuild 917 BLAKE2B 31e8d83e25269634b0ca8c8b15e0ad3f07fbf673a45b6d43f6136a90a5c13c0c87a694b7bfabfca560513a9c5483048c1f964fb1ec49ea0b68a3e4f1f13a89a5 SHA512 d1d2fd380e5571c16e6377ce9893d81b9188cc29051fceef7958210817fc5ba2ec875288dc2859d6df7e268eed965f721feffabc6b65a2b8d1e3d607916ad455
+DIST docker-buildx-0.10.2.tar.gz 9187634 BLAKE2B 9a43a7bcb224f33d718928ef3070449cac4db87c951f4337368d0c994f211d4c3db3a5e9c309ce10e357ab24746bed2507e2867c9fdab3b51a5423787362fee1 SHA512 ba6b8baae1a8e24bf9ddc58d5e2451270fa6e3891bae83112ca00ae56b7a4842b45ec970898ec27a2123e312885bf0d8c58cc600d8462787242eb878f45cd877
+EBUILD docker-buildx-0.10.2.ebuild 1419 BLAKE2B 9270f5131fc4ff742928ad8308a6017d5ec96dca156b50992d3df77477af5d302be5457b9745026e14f7129aaefb0a0aef6e1ddf3778f2157c73c26adce1f4b7 SHA512 b57cabd264c6e89158107691581ede6fab15cc108c7a7c3248f38c12d3137dd8d610bec6e2757f4c7863bfbebc43a68c6cd82d19d4e3c2ad8b5aefccf0d8b0bd
+EBUILD docker-buildx-9999.ebuild 1419 BLAKE2B 9270f5131fc4ff742928ad8308a6017d5ec96dca156b50992d3df77477af5d302be5457b9745026e14f7129aaefb0a0aef6e1ddf3778f2157c73c26adce1f4b7 SHA512 b57cabd264c6e89158107691581ede6fab15cc108c7a7c3248f38c12d3137dd8d610bec6e2757f4c7863bfbebc43a68c6cd82d19d4e3c2ad8b5aefccf0d8b0bd
 MISC metadata.xml 710 BLAKE2B e54ba5993825b2fa455c7ad33dc37d3edddbf74f19cc2e8ce3260fdac0d581c3c719d5f7252b7836d263efd020b4d3d90d717c3873531055418dbb556f02288c SHA512 f217f1f7f8ac31cbf5516630eea107a686394efc960384c67a216f80b57c61323b6b02b5dd1ae458817a851b9f166c684087790079e48b7d4a2a78130dc2a411
diff --git a/app-containers/docker-buildx/docker-buildx-0.9.1.ebuild b/app-containers/docker-buildx/docker-buildx-0.10.2.ebuild
index 298498909a93..4c9132f3eb3f 100644
--- a/app-containers/docker-buildx/docker-buildx-0.9.1.ebuild
+++ b/app-containers/docker-buildx/docker-buildx-0.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,13 +8,26 @@ inherit go-module
 MY_PN="buildx"
 DESCRIPTION="Docker CLI plugin for extended build capabilities with BuildKit"
 HOMEPAGE="https://github.com/docker/buildx"
-SRC_URI="https://github.com/docker/buildx/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
+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 ~arm64"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
 
+# 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 )
+"
 DEPEND="app-containers/docker"
 RDEPEND="${DEPEND}"
 
@@ -29,7 +42,12 @@ src_compile() {
 }
 
 src_test() {
-	ego 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() {
diff --git a/app-containers/docker-buildx/docker-buildx-9999.ebuild b/app-containers/docker-buildx/docker-buildx-9999.ebuild
new file mode 100644
index 000000000000..4c9132f3eb3f
--- /dev/null
+++ b/app-containers/docker-buildx/docker-buildx-9999.ebuild
@@ -0,0 +1,58 @@
+# 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 ~arm64"
+	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 )
+"
+DEPEND="app-containers/docker"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	local _buildx_r='github.com/docker/buildx'
+	ego build -mod=vendor -o docker-buildx \
+		-ldflags "-linkmode=external \
+		-X $_buildx_r/version.Version=${PV} \
+		-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
+}