gentoo resync : 18.11.2019

4 files changed, 9 insertions, 69 deletions

diff --git a/app-emulation/skopeo/Manifest b/app-emulation/skopeo/Manifest
index 98e3246bb1f9..9445363caf48 100644
--- a/app-emulation/skopeo/Manifest
+++ b/app-emulation/skopeo/Manifest
@@ -1,7 +1,5 @@
-DIST skopeo-0.1.37.tar.gz 2766509 BLAKE2B 59e3f4cf37694b4ae59fe4eca6afd8abe4f7ab1aec3c0cee409be6f0f648fd2929092ee9b5a2b167c5041202dac908cd39f693d8ae8eebf621be47f302bd885c SHA512 e2de3c65f864572fe74ca55ee107703a49855f0da71c440784b06d13ed724456cf7bf30e18a5cb15cf2e136edc688b56321cf7838a2cc66f39c4ea9d9686441e
-DIST skopeo-0.1.38.tar.gz 2947365 BLAKE2B 1d2d6ea2ed677f2b068ecca9b8dcee9d31280acb3f7acd8e0a59321d178244b506f4124eba8dd0519a3f5b307a6001d05a093cdf93189eccb55cf7c9cc41895b SHA512 83e53eb7632761eb444d4f824b6fee7a2e265e386fd1ba58e2d3194750f794a0e1cdc94a76222d12f589f851c459b165756661a76c09cc9c7dd9b2d6fff2b39f
 DIST skopeo-0.1.39.tar.gz 3850036 BLAKE2B e635be475f22cc25ab98e446424f4a6b0babe34f827a73f9c9c1533db782490e9af94e759ac78fbeeec1c0e1fa42eef9d09fb4e7ff1f4df654f65fe4c1a9f7b0 SHA512 c4aadc40f9d637c628cd96c204b3e9bc3a928c145521bed2e5046508fc936ff99442dda8b4a4cdd85c4d04e64a9ccee5ea8d563c6ebf4e6020d50d96b921716c
-EBUILD skopeo-0.1.37.ebuild 1393 BLAKE2B 0053a48cf9c1f528756796d0ee32c1ad1a1f8e66321da6bfcab723cabc442457d1219cbabd374aa7f7456682fc4ce061ea4a4f9df804152e45f6aa5b50fd7b01 SHA512 720be9abb702fc76e9345c352bfb08f04d789e4347a3343385c23bdd33a0b37844949f0625aa52a1e324127fb7e1dcc82f53cfeee4722eb99a256dc02c533a63
-EBUILD skopeo-0.1.38.ebuild 1393 BLAKE2B fa6abbefdac30118fde931cb2e5bba8ecce43e1ad9b214c95188b98e4016e64424a6a71f05dc6c844ab30738660d3551304f667456dbf2518542c119c9ba6b94 SHA512 9e12e84ba18f521960d15d2818334abae3d3a10c3c3643e40a960a116f2f79cc61e72fa879d1272d3a0294a23f42edbd9a79c2383ba1a8ee3225bdbfd5193799
-EBUILD skopeo-0.1.39.ebuild 1420 BLAKE2B 1539f426834e83e3d03db609b1bbc412bdb80e3a5876ec512f2a52aa87cba0531f23feaf3298cc19870ce1d6c4b04c5a17d7efd1b971956c82a7a67ec891550a SHA512 8bf6867e89d837784c99a8f6ed0263f8e891de3a4dcd672c28f918d0ddd3bc070f816d8b8ed026da032fcca6e1bd210f583a44a35ca8765e0406e005d7d75acc
+DIST skopeo-0.1.40.tar.gz 3907911 BLAKE2B 0a9ebcc9662036b1595149f0d19a46c0565b115d37b22c6410041eef3e6755b20561439596f1033dd6ce2c78a4948e358b2518003729873d5ab8ce9a7bec082c SHA512 161edb8afa961e48e314cf70a4fcebd971a45a50fc11eab6ec751ba4eb05a8be011d16b83c4ed1fa9d6336846da5f518da006d4476ee4e29a160c629820773d3
+EBUILD skopeo-0.1.39.ebuild 1451 BLAKE2B 9652f26926ef19838041dbb50d355aaaddb975e4a8896fc35b90cfb145b75411f8964222d10229d8df1c9f2b80821746573e4485e5df79493b7bfb07025e519e SHA512 3f91ec57eac22a82c9a5a7e9eb755d0933476554ccf9a223a40b01452c3d57c5996a6e1b204f58ca7189c3260cec5a31971775778ddbbe32f8c920068c8bbe9d
+EBUILD skopeo-0.1.40.ebuild 1330 BLAKE2B b8bdb403529f88d1d3f99a29f68ccebea176c0ddab364ed94dbcd8e11882571ac8d1257165854d2cccef9ea1deeb096bcd3ebc75d651cdd9a8b4df684480e56a SHA512 a40beb890444640523c70b3745dc82f7e0d935c6cfcfb86daae71daa79be1dd938c4089a7ad2bc8ce0f0f3db327d2c096d2527f045bdb87809b54a62893654aa
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-emulation/skopeo/skopeo-0.1.37.ebuild b/app-emulation/skopeo/skopeo-0.1.37.ebuild
deleted file mode 100644
index a3641ef7199d..000000000000
--- a/app-emulation/skopeo/skopeo-0.1.37.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN=github.com/containers/skopeo
-COMMIT=e079f9d
-inherit golang-vcs-snapshot 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"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-COMMON_DEPEND=">=app-crypt/gpgme-1.5.5:=
-	>=dev-libs/libassuan-2.4.3:=
-	dev-libs/libgpg-error:=
-	>=sys-fs/btrfs-progs-4.0.1
-	>=sys-fs/lvm2-2.02.145:="
-DEPEND="${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-RESTRICT="test"
-
-src_compile() {
-	local BUILDTAGS="containers_image_ostree_stub"
-	set -- env -u GOCACHE -u XDG_CACHE_HOME GOPATH="${WORKDIR}/${P}" \
-		go build -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
-}
diff --git a/app-emulation/skopeo/skopeo-0.1.39.ebuild b/app-emulation/skopeo/skopeo-0.1.39.ebuild
index 3af894ea4f9a..b26bcce76158 100644
--- a/app-emulation/skopeo/skopeo-0.1.39.ebuild
+++ b/app-emulation/skopeo/skopeo-0.1.39.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Command line utility foroperations on container images and image re
 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"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
diff --git a/app-emulation/skopeo/skopeo-0.1.38.ebuild b/app-emulation/skopeo/skopeo-0.1.40.ebuild
index d6afc826266f..3ee26d3ab1ad 100644
--- a/app-emulation/skopeo/skopeo-0.1.38.ebuild
+++ b/app-emulation/skopeo/skopeo-0.1.40.ebuild
@@ -2,15 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-EGO_PN=github.com/containers/skopeo
-COMMIT=37f616e
-inherit golang-vcs-snapshot bash-completion-r1
+COMMIT=be6146b
+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"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
@@ -24,14 +23,12 @@ DEPEND="${COMMON_DEPEND}
 	dev-go/go-md2man"
 RDEPEND="${COMMON_DEPEND}"
 
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
 RESTRICT="test"
 
 src_compile() {
 	local BUILDTAGS="containers_image_ostree_stub"
-	set -- env -u GOCACHE -u XDG_CACHE_HOME GOPATH="${WORKDIR}/${P}" \
-		go build -ldflags "-X main.gitCommit=${COMMIT}" \
+	set -- env -u GOCACHE -u XDG_CACHE_HOME \
+		go build -mod=vendor -ldflags "-X main.gitCommit=${COMMIT}" \
 		-gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \
 		-o skopeo ./cmd/skopeo
 	echo "$@"