gentoo resync : 13.06.2020

4 files changed, 5 insertions, 131 deletions

diff --git a/app-emulation/containers-storage/Manifest b/app-emulation/containers-storage/Manifest
index fa1fbfa9fa74..e38411963b2c 100644
--- a/app-emulation/containers-storage/Manifest
+++ b/app-emulation/containers-storage/Manifest
@@ -1,9 +1,5 @@
-DIST containers-storage-1.15.1.tar.gz 6037975 BLAKE2B e6d0d9adae829fd3d8cb40aa124b7149ee56ed13650b0dc57ba316ab2f03e754bdbb3e566c199b7768c612b159fa3051db39cd90127f4676255e452863aa7e24 SHA512 ea017e7dec840e5794f0ae61ebfc0cbf55b8de2c237286371eef3fd1808809e2bb149f08ba62126c741e0811839bf0af8f97bbda32e715132e42905f2ebd3a6c
-DIST containers-storage-1.15.2.tar.gz 6199303 BLAKE2B 76b950892d4a3016a6df2223c66d9720334205bb1c1b6d18f09b984df9c967391329a970d9d927206f37d4557fc6f4b6c366cb6f35711d2a7d8842f7e3bf7221 SHA512 b152e85e8ebdc5016955287c289390568865d60b2b034e5d32eaa3d11d775a12788465246ff7b75cd8a079758f5d2fd90bd1443191f6a089f54862951a26cdae
-DIST containers-storage-1.15.7.tar.gz 6202610 BLAKE2B 2eeeb124c0ce22b5f80aced4b0a9b8d541a00d532458c64e8a017b6d7e7364b90cf798db81b9dfe36af3a25e70383529f7e2ee649750ceaff753b9327a1713c8 SHA512 25317ec5a002274422cab7ab3928ac5e9776751bc2c7c17800def2f0f918f2356c074f1914056e24bd900fb4d951d6259461f9fe3fd7c6d669ca2e78b2c70d12
 DIST containers-storage-1.18.1.tar.gz 3803605 BLAKE2B 6ecf7a2ac395f0973f2d071d6736ccd6dfe8917168b50daeb26b141457d9fc53d9f4471577c659dcf77f2d4058d0a5cecbe1599a365d7ae102916188dc44aa5d SHA512 1b2d16ae5703af232c58eb4ecc65b98a7f754cd9784b563e5323ef3303dc8f72896453f2fd84fee20490b72f9c2455437d5879f6c5c23aaa188316cb1b272211
-EBUILD containers-storage-1.15.1.ebuild 1471 BLAKE2B 9990d85a89853309e601d27cb26093e7c9255b680907a952936ea234ff2a2974f9e78100b8a18b73f58cc3984a6efd387f00ec277511fb4052c09c17330c329c SHA512 04e5fed27bef4254b8ad07e6169f1eee023ff9693c4d4eddebf1f87f50e8bb4f70eee0b42585faa24cd1aaad1a909006135869dff4274533b8323c30a50238ad
-EBUILD containers-storage-1.15.2.ebuild 1471 BLAKE2B 9990d85a89853309e601d27cb26093e7c9255b680907a952936ea234ff2a2974f9e78100b8a18b73f58cc3984a6efd387f00ec277511fb4052c09c17330c329c SHA512 04e5fed27bef4254b8ad07e6169f1eee023ff9693c4d4eddebf1f87f50e8bb4f70eee0b42585faa24cd1aaad1a909006135869dff4274533b8323c30a50238ad
-EBUILD containers-storage-1.15.7.ebuild 1479 BLAKE2B f5fa031ee42b10c7dc41fc20a37a61436f3e4e6ee68fc33b37d6cd2bb0989e274d13a9b3165ee742da4c83a6ba127541905aebea4e60a2cd6038b632e4fa4847 SHA512 4bdb4af924e1e70851e1757f172917a779134f869677bf810ec45596e84142f48a6c97ca6ca9080c849da36d8a70c1c10e365bf692176f02fce1d9a8a4dd1cce
+DIST containers-storage-1.20.2.tar.gz 3827404 BLAKE2B 7284a86c34c91c21e49d7c9f89bfe8cc65d3a6673d37ea2e6e769c8abda581189b62119480bfcb0757cc3b4b47e29c7e0c65d245ec9bac082674f4b29f0899e1 SHA512 6ed73080da5c284eb421dd3c192662b16b2c72801bd0043f676c1e3bf44ee9899b10dea7fe5e2e52f95ecc511606aa2d971fd064b4cc7c993459ea75bf14536f
 EBUILD containers-storage-1.18.1.ebuild 1460 BLAKE2B 092e5d402a3fc7f8b45c8d730bc2c24dcf70dd8fc7491c048c045c92d3827082c2ebae2c26377eda8cbd7215e0b511a3f4111e456c0083832ef12419948ce005 SHA512 c96a4a96e0dcb304c811a485b75c9671a4d2d6c87422a9d0f600a356f35d5145f63647c4db370a12e399ec30fecf2ec02e829abfa19c0afd5cd30104167ff30b
+EBUILD containers-storage-1.20.2.ebuild 1460 BLAKE2B 092e5d402a3fc7f8b45c8d730bc2c24dcf70dd8fc7491c048c045c92d3827082c2ebae2c26377eda8cbd7215e0b511a3f4111e456c0083832ef12419948ce005 SHA512 c96a4a96e0dcb304c811a485b75c9671a4d2d6c87422a9d0f600a356f35d5145f63647c4db370a12e399ec30fecf2ec02e829abfa19c0afd5cd30104167ff30b
 MISC metadata.xml 603 BLAKE2B 97f54132ebad8af6ff29ffd35644f68faeca3f387025e6bfd7529e7d61582e7bbd8f4279c3608b6b8187e1f6a78c552d1bb9e828cfb2f6fe5fa6710e0730d2f2 SHA512 f65876cdaac00b0d5ed7524467b9cde201da0a3fdf17d959bb19bc2d98344ca013b93dd0d2ebbb24b585a9754b8d06711e0085092a3820bdfe238e26a64d765b
diff --git a/app-emulation/containers-storage/containers-storage-1.15.1.ebuild b/app-emulation/containers-storage/containers-storage-1.15.1.ebuild
deleted file mode 100644
index d094e8ef9e33..000000000000
--- a/app-emulation/containers-storage/containers-storage-1.15.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module
-
-KEYWORDS="~amd64"
-DESCRIPTION="containers/storage library"
-HOMEPAGE="https://github.com/containers/storage"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-IUSE="btrfs +device-mapper test"
-EGO_PN="${HOMEPAGE#*//}"
-EGIT_COMMIT="v${PV}"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-RDEPEND="
-	btrfs? ( sys-fs/btrfs-progs )
-	device-mapper? ( sys-fs/lvm2:= )"
-DEPEND="${RDEPEND}
-	dev-go/go-md2man
-	test? (
-		sys-fs/btrfs-progs
-		sys-fs/lvm2
-		sys-apps/util-linux
-	)"
-RESTRICT="test"
-
-S=${WORKDIR}/${P#containers-}
-
-src_prepare() {
-	default
-
-	sed -e 's:GO111MODULE=off:GO111MODULE=on:' -i Makefile || die
-
-	[[ -f hack/btrfs_tag.sh ]] || die
-	use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
-		"hack/btrfs_tag.sh" || die; }
-
-	[[ -f hack/libdm_tag.sh ]] || die
-	use device-mapper || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_devicemapper" > \
-		"hack/libdm_tag.sh" || die; }
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME #678856
-	emake containers-storage docs
-}
-
-src_install() {
-	dobin "${PN}"
-	while read -r -d ''; do
-		mv "${REPLY}" "${REPLY%.1}" || die
-	done < <(find "${S}/docs" -name '*.[[:digit:]].1' -print0)
-	find "${S}/docs" -name '*.[[:digit:]]' -exec doman '{}' + || die
-}
-
-src_test() {
-	GOPATH="${S}" unshare -m emake local-test-unit || die
-}
diff --git a/app-emulation/containers-storage/containers-storage-1.15.2.ebuild b/app-emulation/containers-storage/containers-storage-1.15.2.ebuild
deleted file mode 100644
index d094e8ef9e33..000000000000
--- a/app-emulation/containers-storage/containers-storage-1.15.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module
-
-KEYWORDS="~amd64"
-DESCRIPTION="containers/storage library"
-HOMEPAGE="https://github.com/containers/storage"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-IUSE="btrfs +device-mapper test"
-EGO_PN="${HOMEPAGE#*//}"
-EGIT_COMMIT="v${PV}"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-RDEPEND="
-	btrfs? ( sys-fs/btrfs-progs )
-	device-mapper? ( sys-fs/lvm2:= )"
-DEPEND="${RDEPEND}
-	dev-go/go-md2man
-	test? (
-		sys-fs/btrfs-progs
-		sys-fs/lvm2
-		sys-apps/util-linux
-	)"
-RESTRICT="test"
-
-S=${WORKDIR}/${P#containers-}
-
-src_prepare() {
-	default
-
-	sed -e 's:GO111MODULE=off:GO111MODULE=on:' -i Makefile || die
-
-	[[ -f hack/btrfs_tag.sh ]] || die
-	use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
-		"hack/btrfs_tag.sh" || die; }
-
-	[[ -f hack/libdm_tag.sh ]] || die
-	use device-mapper || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_devicemapper" > \
-		"hack/libdm_tag.sh" || die; }
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME #678856
-	emake containers-storage docs
-}
-
-src_install() {
-	dobin "${PN}"
-	while read -r -d ''; do
-		mv "${REPLY}" "${REPLY%.1}" || die
-	done < <(find "${S}/docs" -name '*.[[:digit:]].1' -print0)
-	find "${S}/docs" -name '*.[[:digit:]]' -exec doman '{}' + || die
-}
-
-src_test() {
-	GOPATH="${S}" unshare -m emake local-test-unit || die
-}
diff --git a/app-emulation/containers-storage/containers-storage-1.15.7.ebuild b/app-emulation/containers-storage/containers-storage-1.20.2.ebuild
index 1c7bf5f6ff65..868c589909c5 100644
--- a/app-emulation/containers-storage/containers-storage-1.15.7.ebuild
+++ b/app-emulation/containers-storage/containers-storage-1.20.2.ebuild
@@ -11,9 +11,7 @@ HOMEPAGE="https://github.com/containers/storage"
 LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
 SLOT="0"
 IUSE="btrfs +device-mapper test"
-EGO_PN="${HOMEPAGE#*//}"
-EGIT_COMMIT="v${PV}"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/containers/storage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 RDEPEND="
 	btrfs? ( sys-fs/btrfs-progs )
 	device-mapper? ( sys-fs/lvm2:= )"
@@ -31,7 +29,7 @@ S=${WORKDIR}/${P#containers-}
 src_prepare() {
 	default
 
-	sed -e 's:GO111MODULE=off:GO111MODULE=on:' -i Makefile || die
+	sed -e 's|: install\.tools|:|' -i Makefile || die
 
 	[[ -f hack/btrfs_tag.sh ]] || die
 	use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
@@ -44,7 +42,7 @@ src_prepare() {
 
 src_compile() {
 	export -n GOCACHE GOPATH XDG_CACHE_HOME #678856
-	emake containers-storage docs
+	emake GOMD2MAN=go-md2man FFJSON= containers-storage docs
 }
 
 src_install() {