gentoo auto-resync : 04:01:2023 - 12:06:28

3 files changed, 13 insertions, 81 deletions

diff --git a/app-containers/skopeo/Manifest b/app-containers/skopeo/Manifest
index d8b3021d41c6..15daac0eeb3e 100644
--- a/app-containers/skopeo/Manifest
+++ b/app-containers/skopeo/Manifest
@@ -1,7 +1,5 @@
+DIST skopeo-1.10.0.tar.gz 6460856 BLAKE2B b904a161334ef0a3eaaab8c58f0c7e4c507fa68a09f8fa8235e8a9222d48c98874c9ce878a509e2816f210ffb37dbf707ff2653212e1efbd9ad6686efb97e147 SHA512 0d64e7f12a0d10c81074a04b6c74ed6e7213f598013f1ba672c4c696e9dad5827f41f41bb817263bf8606cd051b8e24e7eab65b95d73d8a1c8bbb3eaeb9defdb
 DIST skopeo-1.5.1.tar.gz 5636533 BLAKE2B 7f0e86cdee5c3250ec1280d7e71554ac2f8ad96ababe0e81dfabc00e8c128a13fc0c9c561b7a9be389d7386e9f664b95118bd2122612b9c2e8844db49769c03c SHA512 3f8c730eaa739bf2a29b82d3b04aa4eee1c09f957b61964fc8c48e59d1537bcb87b5bdf9c18fa48f9d36cf2b7ede3a1448918a20b5a3167f6ce09881a6cd3dde
-DIST skopeo-1.7.0.tar.gz 6542347 BLAKE2B 990ad594df9483ad114debeb2882ed3976306d69983ae3d91d807e2654583e7a6599ddf50152df9a937c1c64c1e5a8abb6ed83433036e7efd4ef7e911f99c191 SHA512 7d17f98e86677150fb2ddba9edae18d8b1ac8f06fba575268e6ba54c60f7b371b5e5a9eab1a4fe19da6c7e85eb79c1eef169ad2a39eff979130ee8d141bd8d6b
-DIST skopeo-1.8.0.tar.gz 6577667 BLAKE2B 21565736a13d2fcce2576fcc1ff522e81b74aff6c18058f4c994e4f0fc12efa38706ba4c07bbe35abd7e339d9080783f766b68325b01cba90c3cd82f19470aec SHA512 697242244e533b597f481005754301efed8581018cdc297e071fa24347301ddf6111d1f1d3ccc6e87e3e5a9ea606e9c6b40c47bf69d2df6b44336fb260f546de
+EBUILD skopeo-1.10.0-r1.ebuild 1066 BLAKE2B f55aa099a396fca1f8513786c48929923d7419a08d232ba910d65d325c5f31c2a4fbb43487d3585c36098375687897f07fbd9e7274edeb4e1b7bf5301dba040d SHA512 0109637023cf52163bbdc2a30fbd086f514a5bd77948888ce30a7824cf4472c46f98f6011e9a0302a054578e5bb812d2b495dac041a060bdb26abbbd034c27bc
 EBUILD skopeo-1.5.1.ebuild 1403 BLAKE2B a4c236cb6248a1551c90683a45247d19d5634ca7e9ca801761953131f73a7bd0058ab5bcea1d7b2593229eb20c6482e2dae833443227467daccef020b23b5f88 SHA512 b163486639a8831eb20db3a5906378485f0aaf3299e815217b1c8a2f4e27ca35af0bda40e6265a7c58107588cab429c0044717666cd22c43e8e21c73a75277dd
-EBUILD skopeo-1.7.0.ebuild 1405 BLAKE2B dce3e36f77136de837bc5111de50f4db5ecf97b536b141e36c011258890efe1d8523557d917793c83b3a85cdbe8ce84e9c129087c1a1d09d2f5be21775dd354c SHA512 5618521e281c41e9e9770c830ace7686a757295c7b1c04fca7ce65ecf816ca2e5c49e8309d9dd89114f8539e334c1a1d2aeec83ea233e918247abd6422c62c91
-EBUILD skopeo-1.8.0.ebuild 1405 BLAKE2B 8ad2416a913af4c39d58101131826e3bf0783824378452c2a4c282f74ff89688a770c1afb169db1326ce3cf1683ca31d1d2943fa20e096fb2ee2c9b2135ea9f2 SHA512 6cc2d62ba405d74ab4a120994e12735257b5439c6cecd9c88bd324eab9e20a35a7c30bdc262d4b2940e5640c4f5c583ba1907b563e86773a42959993bcc3520a
 MISC metadata.xml 425 BLAKE2B 7f6ee6b669ae19cdf0e807a7a88a4e2573e94d36798418a037b78d5e3219a4d45297b841c5ca239e064de564a95ffed69758687adf44e0be0df5ac86c7516412 SHA512 f0954bc3db4e4a0e69149f89af269e70d074cbe7dde6c9161c5ced959f236eed7ce32d777970d5b103a6b880445842f38b680b4c69f12ca512a12f27dd0cd1eb
diff --git a/app-containers/skopeo/skopeo-1.7.0.ebuild b/app-containers/skopeo/skopeo-1.10.0-r1.ebuild
index d228fd00e921..98396d981315 100644
--- a/app-containers/skopeo/skopeo-1.7.0.ebuild
+++ b/app-containers/skopeo/skopeo-1.10.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-COMMIT=f45ae950aacb7b61ec13223fc22269f2fe270eab
-inherit go-module bash-completion-r1
+EAPI=8
+COMMIT=ee60474d5a4d99745aac9855797ad4b26510d786
+inherit go-module
 
 DESCRIPTION="Command line utility foroperations on container images and image repositories"
 HOMEPAGE="https://github.com/containers/skopeo"
@@ -19,34 +19,20 @@ COMMON_DEPEND=">=app-crypt/gpgme-1.5.5:=
 	dev-libs/libgpg-error:=
 	btrfs? ( >=sys-fs/btrfs-progs-4.0.1 )
 	>=sys-fs/lvm2-2.02.145:="
-DEPEND="${COMMON_DEPEND}
-	dev-go/go-md2man"
+DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}"
+	BDEPEND="dev-go/go-md2man"
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 src_compile() {
 	local BUILDTAGS
 	BUILDTAGS="containers_image_ostree_stub $(usex btrfs "" exclude_graphdriver_btrfs)"
-	set -- go build -mod=vendor -ldflags "-X main.gitCommit=${COMMIT}" \
-		-gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \
-		-o skopeo ./cmd/skopeo
-	echo "$@"
-	"$@" || die
-	cd docs || die
-	for f in *.1.md; do
-		go-md2man -in ${f} -out ${f%%.md} || die
-	done
+	emake PREFIX=/usr BUILDTAGS="${BUILDTAGS}" GIT_COMMIT="${COMMIT}" \
+		all completions
 }
 
 src_install() {
-	dobin skopeo
-	doman docs/*.1
-	dobashcomp completions/bash/skopeo
-	insinto /etc/containers
-	newins default-policy.json policy.json
-	insinto /etc/containers/registries.d
-	doins default.yaml
-	keepdir /var/lib/atomic/sigstore
-	einstalldocs
+	emake PREFIX=/usr DESTDIR="${ED}" install
+	keepdir /var/lib/containers/sigstore
 }
diff --git a/app-containers/skopeo/skopeo-1.8.0.ebuild b/app-containers/skopeo/skopeo-1.8.0.ebuild
deleted file mode 100644
index c3dcc4973b2a..000000000000
--- a/app-containers/skopeo/skopeo-1.8.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-COMMIT=37727a45f96ac208785b606f7772d609bf50dbc4
-inherit go-module bash-completion-r1
-
-DESCRIPTION="Command line utility foroperations on container images and image repositories"
-HOMEPAGE="https://github.com/containers/skopeo"
-SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="btrfs"
-
-COMMON_DEPEND=">=app-crypt/gpgme-1.5.5:=
-	>=dev-libs/libassuan-2.4.3:=
-	dev-libs/libgpg-error:=
-	btrfs? ( >=sys-fs/btrfs-progs-4.0.1 )
-	>=sys-fs/lvm2-2.02.145:="
-DEPEND="${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-
-RESTRICT+=" test"
-
-src_compile() {
-	local BUILDTAGS
-	BUILDTAGS="containers_image_ostree_stub $(usex btrfs "" exclude_graphdriver_btrfs)"
-	set -- go build -mod=vendor -ldflags "-X main.gitCommit=${COMMIT}" \
-		-gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \
-		-o skopeo ./cmd/skopeo
-	echo "$@"
-	"$@" || die
-	cd docs || die
-	for f in *.1.md; do
-		go-md2man -in ${f} -out ${f%%.md} || die
-	done
-}
-
-src_install() {
-	dobin skopeo
-	doman docs/*.1
-	dobashcomp completions/bash/skopeo
-	insinto /etc/containers
-	newins default-policy.json policy.json
-	insinto /etc/containers/registries.d
-	doins default.yaml
-	keepdir /var/lib/atomic/sigstore
-	einstalldocs
-}