gentoo Easter resync : 12.04.2020

6 files changed, 8 insertions, 183 deletions

diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
index 533cef5d53e0..f00d02aac19a 100644
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -1,12 +1,5 @@
-DIST buildah-1.11.5.tar.gz 10594213 BLAKE2B 421d4ea78ad84fbae42086b8d49fec26db8e2aa1f83e261a8b5b1f3f41a5be4ea2fdeb41d4e27fb52bf23f309b8aea1d050cea0c6deffcad0ebb273032e712ba SHA512 04a9c51e1cb6f3a88f118b69dcea1eba85b02d534e671cd5bf31a6d6a797bce4a488c9373c92736fccd74331c1242ff60a95f44626ecbb50c32db176c7106e86
-DIST buildah-1.11.6.tar.gz 10600477 BLAKE2B b70849ca0121e32cd66da3da282a443688c15a783a1be7d5d3650bf1122c865e9674d0790fb599f6da4c04072a19360aa224ccc76d516e8a8e71061c903dd0e1 SHA512 419d51d0b430dbc38862bad218cf0bb9a698472dd3932e69fa6bcfb2023b9cd10cf03916f2333892cdcc051ce799664619c62941965a59420d81ba4706e9d7be
-DIST buildah-1.12.0.tar.gz 10717080 BLAKE2B 67107684d625ef23166d666dba50244861e6903f46315d8bae4d313d3585da154b7ee5f87ae8ab69ca717fdf68b914dee0cbcf2e1e95c34ebfccee4739db1d62 SHA512 ed7d77dfe88f613ef4f756455d889d707707ad16f8f6a9b514a8fbaabb56fef58db54ceb2344954a9311bcc6f1f000b21ac461f9b612b8534ae6a4594ad7a16d
-DIST buildah-1.13.1.tar.gz 10928426 BLAKE2B 7f790e2e6499543f6ddae5582f03e4e8a2429783512bf53ffa48d010b1338c4e232117e8b175057205c75ee839981564358239d08d48dbdef8cae80bbacc6554 SHA512 89c02f3c485408f16d6334bb4621accbb7de5f8d3d4458eb4c925468da1f6c14a18132e8f643e965d3054f05a90ada3c4911e539541f9ca045ca606c9ce1bed9
-DIST buildah-1.14.0.tar.gz 10895764 BLAKE2B afc99c12737651997785ce96793afbff24e514a89e445ec5e176940940335b5966cf6e05e3d418d2aad2308d604e05879874eb5d5c07182dc0484e43411628e7 SHA512 c2fe27ccff81cc22dcb398f6d57f618015a1f534510888966483002d552c5f233b8899f639dac15d0f299c6c618e6f1d9889e65c745ce4709e7abd9498258a86
-DIST containers-storage-1.14.0-vfs-user-xattrs.patch 14835 BLAKE2B 99c35933dcb25385ee83b80cf282c11c738d0e4d91216cc08a50522f6caa9bca5938299412908f16df404f99e80616a10b4c02c0ebc38240a987830ddaf15008 SHA512 62c7ed49728bd12b5706f59b0d4af3b18d90e8cfc2b06e681f84fe3f5d3e0cd5c0317147109c4e3ec4fec26f82c269af3c9813e47339ce102e4e97400b74627d
-EBUILD buildah-1.11.5-r1.ebuild 1584 BLAKE2B 2435e6136bbd7b261aa25cf1a1bd8cc83e417900c0bb2bdda0fa2de0ea39e67240770b0f0d25141a303892a931acf72a412c600f349342cf89528be227a1c9f9 SHA512 ae2f57cbdf97f30dc56d0eedecd7480cc7a3f5b88c1b1d3d25fe155249db8160466a2a606b32530e2607a3ecc952f3855d2ca16a98a117767d0494dda31e0477
-EBUILD buildah-1.11.6.ebuild 1584 BLAKE2B 7ffcafe3e88de41edb8d0b8b8433c451c40ec42ccc51789cf0b6f24b566bda4fd57c54559a44f8e305bf9f56b55d0c4695be2a38ce2063964f369e0edeb0b1a5 SHA512 c385003b323de4cd79aad24f7a12c57c61c55a9a2e0245ad1bf1cc21cfdd1e2745e464a79c835192f19356dabbdaaeddf0df8a709d2ce1de6ffb7c7c3401cce8
-EBUILD buildah-1.12.0.ebuild 1208 BLAKE2B e9195ea67dfddb0e592f7d0de2a4809e575b87a343d4cb6380950aca7031be06e87b83bab22ea33ccc5986f9764440b4311cff707aa206dff621c7f7b1b9a2bc SHA512 5cc5b01169134a55a930033bb0aa5ded2869d47a7e674afeffebd5b8d88e989c1f5b4f98d62ad4b0fd7ed46af100c380432b949ce5f219620b69b8224dd80d5b
-EBUILD buildah-1.13.1.ebuild 1208 BLAKE2B 4ad98c84dafee7a8def81f6065eefe3751b5c63c623a96fe2c61762fe477346b955bce15c58f4c0c70ecf1f9917a1c84b44643de7e46aae7650d7c73bcdad75b SHA512 60bf145750f0089e63133394fd44a2fb446a9cba41f6842d4cfcc86d1753e4b79950b7b8b0330ea991201c72602d25ababed8150183a45e04ba1e6578289f3d8
-EBUILD buildah-1.14.0.ebuild 1208 BLAKE2B 83e6645cbfcadeece94da5b0a5ef8ad8efadcacea0e14723946b94e727bc75b2bfbe88645c88525ba7f6bbfb3f19c4a5d9db80d45cafea4d4e26702126d12c3c SHA512 38400d4fbd7aa24ba9efcdc673d9673bc19cf804cdf9a78d8406d264b8b543b1df44f095e15811a13c01ac0b627190424028a9e82ddb65a23d87daf291011a74
+DIST buildah-1.14.5.tar.gz 11023227 BLAKE2B ebd6cecfc6fa4635ae662dddc722a350fd0b9c87c3d4d67f8010d5ea070270da4f4cd5759612b84d55ecd27b90904950b96471d75057bc6b7d45989312ebec8e SHA512 759d2ba26af43d6ff7ee891f88114a0cde6307439f7837343bfa6edba2473805f0f2e584264e8be01b9f0af07b1fd323243af5feeb9535ada4475ce53a980ff6
+DIST buildah-1.14.6.tar.gz 11104320 BLAKE2B fa618e095523e853454170504aa2747d29e8bec16282eb4bdcf9d8ddeccceeb7ad706d0d127dc621ef0840136737b328c31d9b6b2f9bd1b734beb6d24a15bea3 SHA512 869addbd41c115ca92eab30133c76cd0d449184e95f3b64fa57ad84f50834e6f6189bd1a7e4871aba270b96bf69192ff00da7f0e086439c811c5093342ac14d2
+EBUILD buildah-1.14.5.ebuild 1124 BLAKE2B 30c1cbfe0c90d0f93c2ec25cc49cea13503329a65dc92e17da10bc3ef3c926514f09c52c6a9297aa2315365de6c28d219d671ba47e276d12a4a9109348408dc2 SHA512 1eb7b89fe046fe1f02850b3451a9a125a34c4adfc20cbaa3f11053e3ee31c7504850e6519fcb912ced3ea9be9bcff7cc6b98fa2745f26e8720a57eae1b015c3c
+EBUILD buildah-1.14.6.ebuild 1125 BLAKE2B 916ae6de2bdac9991a2b04489cc6f06afa422c12f006c5c460bab00433e4fa3ea346368c5f0a9ffa5db458f84f94ff084ecf3a7ace70e84de2abbd1ab5f97eb5 SHA512 3d85d286096c7e8ab3d123c63d97bff19b536b5a116842f5c57dfae1eef15e6beb42946dfc490012c6b96e909dd94dae602e3efe78babc81cfb40eab0c2cbd39
 MISC metadata.xml 327 BLAKE2B cd14ee5c563ac21da34ce7728d2d12b797374bc43c50f4a9923d773ae4e010d4930793a0f0ecf610bb798fb3f1b7cd567944cf9895258e9244c3852969ac2406 SHA512 bed26d87edba20ed9385633b70b8bc23fc046ed95aa9b608400933ed4199594f6d0461854060a68b42d33a9b7be0d1b61f52e22e0d3b6d2c2248f58442094711
diff --git a/app-emulation/buildah/buildah-1.11.5-r1.ebuild b/app-emulation/buildah/buildah-1.11.5-r1.ebuild
deleted file mode 100644
index 792dc80accb0..000000000000
--- a/app-emulation/buildah/buildah-1.11.5-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-KEYWORDS="~amd64"
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-IUSE="selinux"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="7c97335"
-CONTAINERS_STORAGE_PATCH="containers-storage-1.14.0-vfs-user-xattrs.patch"
-SRC_URI="https://github.com/containers/buildah/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	https://github.com/containers/storage/pull/466.patch -> ${CONTAINERS_STORAGE_PATCH}"
-RDEPEND="app-crypt/gpgme:=
-	app-emulation/skopeo
-	dev-libs/libgpg-error:=
-	dev-libs/libassuan:=
-	sys-fs/lvm2:=
-	sys-libs/libseccomp:=
-	selinux? ( sys-libs/libselinux:= )"
-DEPEND="${RDEPEND}"
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -e 's| \([ab]\)/| \1/vendor/github.com/containers/storage/|' < \
-		"${DISTDIR}/${CONTAINERS_STORAGE_PATCH}" > \
-		"${WORKDIR}/${CONTAINERS_STORAGE_PATCH}" || die
-	eapply "${WORKDIR}/${CONTAINERS_STORAGE_PATCH}"
-	sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
-
-	[[ -f selinux_tag.sh ]] || die
-	use selinux || { echo -e "#!/bin/sh\ntrue" > \
-		selinux_tag.sh || die; }
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME
-	emake all
-}
-
-src_install() {
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
-	doman docs/*.1
-	dodoc -r docs/tutorials
-	dobin ${PN} imgtype
-	dobashcomp contrib/completions/bash/buildah
-}
-
-src_test() {
-	emake test-unit
-}
diff --git a/app-emulation/buildah/buildah-1.11.6.ebuild b/app-emulation/buildah/buildah-1.11.6.ebuild
deleted file mode 100644
index 0b2d48115c43..000000000000
--- a/app-emulation/buildah/buildah-1.11.6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-KEYWORDS="~amd64"
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-IUSE="selinux"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="9513cb8"
-CONTAINERS_STORAGE_PATCH="containers-storage-1.14.0-vfs-user-xattrs.patch"
-SRC_URI="https://github.com/containers/buildah/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	https://github.com/containers/storage/pull/466.patch -> ${CONTAINERS_STORAGE_PATCH}"
-RDEPEND="app-crypt/gpgme:=
-	app-emulation/skopeo
-	dev-libs/libgpg-error:=
-	dev-libs/libassuan:=
-	sys-fs/lvm2:=
-	sys-libs/libseccomp:=
-	selinux? ( sys-libs/libselinux:= )"
-DEPEND="${RDEPEND}"
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -e 's| \([ab]\)/| \1/vendor/github.com/containers/storage/|' < \
-		"${DISTDIR}/${CONTAINERS_STORAGE_PATCH}" > \
-		"${WORKDIR}/${CONTAINERS_STORAGE_PATCH}" || die
-	eapply "${WORKDIR}/${CONTAINERS_STORAGE_PATCH}"
-	sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
-
-	[[ -f selinux_tag.sh ]] || die
-	use selinux || { echo -e "#!/bin/sh\ntrue" > \
-		selinux_tag.sh || die; }
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME
-	emake all
-}
-
-src_install() {
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
-	doman docs/*.1
-	dodoc -r docs/tutorials
-	dobin ${PN} imgtype
-	dobashcomp contrib/completions/bash/buildah
-}
-
-src_test() {
-	emake test-unit
-}
diff --git a/app-emulation/buildah/buildah-1.12.0.ebuild b/app-emulation/buildah/buildah-1.12.0.ebuild
deleted file mode 100644
index 3608a7769b98..000000000000
--- a/app-emulation/buildah/buildah-1.12.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-KEYWORDS="~amd64"
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-IUSE="selinux"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="6cc4656"
-SRC_URI="https://github.com/containers/buildah/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-RDEPEND="app-crypt/gpgme:=
-	app-emulation/skopeo
-	dev-libs/libgpg-error:=
-	dev-libs/libassuan:=
-	sys-fs/lvm2:=
-	sys-libs/libseccomp:=
-	selinux? ( sys-libs/libselinux:= )"
-DEPEND="${RDEPEND}"
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
-
-	[[ -f selinux_tag.sh ]] || die
-	use selinux || { echo -e "#!/bin/sh\ntrue" > \
-		selinux_tag.sh || die; }
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME
-	emake all
-}
-
-src_install() {
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
-	doman docs/*.1
-	dodoc -r docs/tutorials
-	dobin ${PN} imgtype
-	dobashcomp contrib/completions/bash/buildah
-}
-
-src_test() {
-	emake test-unit
-}
diff --git a/app-emulation/buildah/buildah-1.14.0.ebuild b/app-emulation/buildah/buildah-1.14.5.ebuild
index eb7c61b39ef6..079c23170d2a 100644
--- a/app-emulation/buildah/buildah-1.14.0.ebuild
+++ b/app-emulation/buildah/buildah-1.14.5.ebuild
@@ -11,7 +11,7 @@ LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 SLOT="0"
 IUSE="selinux"
 EGIT_COMMIT="v${PV}"
-GIT_COMMIT="5965d9a"
+GIT_COMMIT=5247a1f
 SRC_URI="https://github.com/containers/buildah/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 RDEPEND="app-crypt/gpgme:=
 	app-emulation/skopeo
@@ -25,16 +25,13 @@ RESTRICT="test"
 
 src_prepare() {
 	default
-	sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
-
 	[[ -f selinux_tag.sh ]] || die
 	use selinux || { echo -e "#!/bin/sh\ntrue" > \
 		selinux_tag.sh || die; }
 }
 
 src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME
-	emake all
+	emake GIT_COMMIT=${GIT_COMMIT} all
 }
 
 src_install() {
diff --git a/app-emulation/buildah/buildah-1.13.1.ebuild b/app-emulation/buildah/buildah-1.14.6.ebuild
index 9880537f2941..fe2402a5756a 100644
--- a/app-emulation/buildah/buildah-1.13.1.ebuild
+++ b/app-emulation/buildah/buildah-1.14.6.ebuild
@@ -11,7 +11,7 @@ LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 SLOT="0"
 IUSE="selinux"
 EGIT_COMMIT="v${PV}"
-GIT_COMMIT="836d6d2"
+GIT_COMMIT=09cce629
 SRC_URI="https://github.com/containers/buildah/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 RDEPEND="app-crypt/gpgme:=
 	app-emulation/skopeo
@@ -25,16 +25,13 @@ RESTRICT="test"
 
 src_prepare() {
 	default
-	sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
-
 	[[ -f selinux_tag.sh ]] || die
 	use selinux || { echo -e "#!/bin/sh\ntrue" > \
 		selinux_tag.sh || die; }
 }
 
 src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME
-	emake all
+	emake GIT_COMMIT=${GIT_COMMIT} all
 }
 
 src_install() {