From 084d88092956ed35d9877ba1951641dd0cc2455e Mon Sep 17 00:00:00 2001
From: Nic Boet <nic@boet.cc>
Date: Thu, 9 Mar 2023 07:55:29 -0600
Subject: app-containers/docker-buildx: ver bump 0.10.4

Signed-off-by: Nic Boet <nic@boet.cc>
Closes: https://github.com/gentoo/gentoo/pull/30022
Signed-off-by: Sam James <sam@gentoo.org>
---
 app-containers/docker-buildx/Manifest              |  1 +
 .../docker-buildx/docker-buildx-0.10.4.ebuild      | 62 ++++++++++++++++++++++
 .../docker-buildx/docker-buildx-9999.ebuild        |  6 ++-
 3 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 app-containers/docker-buildx/docker-buildx-0.10.4.ebuild

(limited to 'app-containers')

diff --git a/app-containers/docker-buildx/Manifest b/app-containers/docker-buildx/Manifest
index bf92b16e83e6..9ce057d50392 100644
--- a/app-containers/docker-buildx/Manifest
+++ b/app-containers/docker-buildx/Manifest
@@ -1 +1,2 @@
 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
diff --git a/app-containers/docker-buildx/docker-buildx-0.10.4.ebuild b/app-containers/docker-buildx/docker-buildx-0.10.4.ebuild
new file mode 100644
index 000000000000..e46ea450eaef
--- /dev/null
+++ b/app-containers/docker-buildx/docker-buildx-0.10.4.ebuild
@@ -0,0 +1,62 @@
+# 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'
+	local version=${PV}
+	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) \
+		-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 4c9132f3eb3f..e46ea450eaef 100644
--- a/app-containers/docker-buildx/docker-buildx-9999.ebuild
+++ b/app-containers/docker-buildx/docker-buildx-9999.ebuild
@@ -33,9 +33,13 @@ RDEPEND="${DEPEND}"
 
 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 -mod=vendor -o docker-buildx \
 		-ldflags "-linkmode=external \
-		-X $_buildx_r/version.Version=${PV} \
+		-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
-- 
cgit v1.2.3-65-gdbad