gentoo resync : 03.03.2021

3 files changed, 5 insertions, 54 deletions

diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
index 94707d47e5b6..9a0faac40b1f 100644
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -1,7 +1,5 @@
-DIST buildah-1.14.11.tar.gz 10660686 BLAKE2B ae24982b2da66b536a0bbba21d07da8c54af7726e065545c2ab6167395ec45f7298c25811ab0e2aec5ffccd084557107313baa36f873327d7b520a61dd8081af SHA512 6522ef39cdf6166ddb6eca6e43025953d025b92a677055ec026f4e163b0bb4b3334e20369e5850593189822c74fe82e39807ea387ad22ee64b3557bbaf8e30ce
-DIST buildah-1.15.1.tar.gz 10344892 BLAKE2B e84f8d245536f8864f057f576d92c218420ac975fabfbdc8b6bf591c2ef43494d49fe9095320a07de450f2ea64d046aa4ad680f08be80210e0dce1ffa874a286 SHA512 61cbe91867dc664a9e76b367e0f99bf5c797c68dda7182ed43c6a6a5a72a0f0519e45db6b2746b26933d829834757cc93bdbd30c62ce6a947ee546dbc1f930be
 DIST buildah-1.16.1.tar.gz 10525480 BLAKE2B d7a174049b9a99d11fa31a1b52fa6acfe037197171c7112607d755c788509b0798af315d1fde5c229bd6e029fdd3e57ae93042044f373d4ff63fcb121264730d SHA512 c17358d71e9102ef5da530df54648eaa13a1384b06cd43fe74094cdbaa2dfda6aa6d1a218fb88e12898ae4b9dca2d8c555643326779c5f09b6a118f0a440d17a
-EBUILD buildah-1.14.11.ebuild 1129 BLAKE2B aca3d81fdbb6aec01fc0eda8fbada9a95b3b71ac302e06fdbc7532b5a09ba2d1f22c6a142926ac65bd86bfd4840509be5df1872b23297e7d68e1c197c6c4279d SHA512 bdd7624308543bbc66e7499a1e1a433e859f33af3ea5a2183eb047f3d67074e6e53edc403f3677e1135bcc81ca64de43563379cfcaa4f43ace70b95a90d1faea
-EBUILD buildah-1.15.1.ebuild 1136 BLAKE2B bad68647b29a09e0d995977fe7317eee20fa563ffd4c50152ccddb154a1eca7f6a22fc5a13d0e3af796a506b38f322775ddf70c712d4246fe230eb67088bbcd7 SHA512 88586493206c7db57feff5023af94fa849a96a22db51019a262c8c038174c655f543ba0c3e524925b4f3d9034cc3e648ed5bf792c070e09e5736f2d0ab01be0a
+DIST buildah-1.19.6.tar.gz 10815708 BLAKE2B c5ad1405d907f6d5973f55c15b86e4341dc4c7c0db32854b5b54655fe1af1606b1206f3c7a3e86f83962c2ab1355c9e2b770ada97abfd9b9f8f231bd4b77e981 SHA512 81a865b795588b86a61fdada40045c06f9f3bbf8bdc3f6e4c70a9e4c7b28bf3fc31dd080c9f7555a8924f8bffac10fad776275619053fee8039176d6d6b69571
 EBUILD buildah-1.16.1.ebuild 1142 BLAKE2B 6f18d182afb257f979e63e9b5773daf4ca5a116695a1e270572c182d9bd8dcb6413faa02f87a781489d96a60b87a22420dfa564b0ec3f9297ff5b8f192b07c05 SHA512 047b0a978aa9687b29c49cd2bc8df37a444a8d91662c8fd1ea393d0214f42ce0a5bc0b5bd4bb1cb729828f11ebdca9f3c60c1b36d21422241ae422a8252c7033
+EBUILD buildah-1.19.6.ebuild 1142 BLAKE2B 66e377badc4f4ab69dc41f0c04a88a92c7114f5a0171359898f3c8061dc04bca813f627cdf88390a89900d07f7ea8d89adca952a0434a0321cfc824534a6da46 SHA512 5beeba858d55b381e7de141256c6a3f07d4bad59367b3957977871b27105f455a4535a9152909a72c6bc11bc121cff5c5eef901a26ad6c5fa2f4497352f4bf84
 MISC metadata.xml 327 BLAKE2B cd14ee5c563ac21da34ce7728d2d12b797374bc43c50f4a9923d773ae4e010d4930793a0f0ecf610bb798fb3f1b7cd567944cf9895258e9244c3852969ac2406 SHA512 bed26d87edba20ed9385633b70b8bc23fc046ed95aa9b608400933ed4199594f6d0461854060a68b42d33a9b7be0d1b61f52e22e0d3b6d2c2248f58442094711
diff --git a/app-emulation/buildah/buildah-1.14.11.ebuild b/app-emulation/buildah/buildah-1.14.11.ebuild
deleted file mode 100644
index 717adf3f3541..000000000000
--- a/app-emulation/buildah/buildah-1.14.11.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 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=7a921ff79b
-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
-	[[ -f selinux_tag.sh ]] || die
-	use selinux || { echo -e "#!/bin/sh\ntrue" > \
-		selinux_tag.sh || die; }
-}
-
-src_compile() {
-	emake GIT_COMMIT=${GIT_COMMIT} 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.15.1.ebuild b/app-emulation/buildah/buildah-1.19.6.ebuild
index ef3db50fcacf..dd54c70e89b9 100644
--- a/app-emulation/buildah/buildah-1.15.1.ebuild
+++ b/app-emulation/buildah/buildah-1.19.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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=c967e88ef6
+GIT_COMMIT=7aedb16428
 SRC_URI="https://github.com/containers/buildah/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 RDEPEND="app-crypt/gpgme:=
 	app-emulation/skopeo
@@ -38,7 +38,7 @@ src_install() {
 	dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
 	doman docs/*.1
 	dodoc -r docs/tutorials
-	dobin ${PN} imgtype
+	dobin bin/{${PN},imgtype}
 	dobashcomp contrib/completions/bash/buildah
 }