gentoo resync : 15.12.2019

5 files changed, 32 insertions, 38 deletions

diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
index 43694cdc65af..186ecece3d72 100644
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -1,7 +1,8 @@
-DIST buildah-1.11.2.tar.gz 10128075 BLAKE2B ad8f4253b62cd7709bf5ae530d002190c1850da6bbfa7dff2281de0592422eccc67a4ba6e52f7a82d6c1b320b986237a84d0ffaaf9b3b1b93822a54621365250 SHA512 f491d96d5bb4d0aa03981fb58d24f36c2e3928179c8fb79e85f323ce9a65ae6da05b816d86ae43f94a83a1b2445b315f93ca28b531436d9b4e5861e4adef2aac
-DIST buildah-1.11.3.tar.gz 10429884 BLAKE2B 2d433a128d115c6b2f3a9d246d41406993905dee357237796cea3295036d026ca93f8c98ca992cfebfa574ab0d5e7b974fd356a146b7cde58986166bc18a5645 SHA512 07fff3f8c044ad01a663bf5470b19f75568ce741b3bb45f656200099ba559622597111ede3e20331dc06139f2e58d962d92bf0fdd00284ca6ed05b5b66500975
 DIST buildah-1.11.5.tar.gz 10594213 BLAKE2B 421d4ea78ad84fbae42086b8d49fec26db8e2aa1f83e261a8b5b1f3f41a5be4ea2fdeb41d4e27fb52bf23f309b8aea1d050cea0c6deffcad0ebb273032e712ba SHA512 04a9c51e1cb6f3a88f118b69dcea1eba85b02d534e671cd5bf31a6d6a797bce4a488c9373c92736fccd74331c1242ff60a95f44626ecbb50c32db176c7106e86
-EBUILD buildah-1.11.2.ebuild 1485 BLAKE2B 4f766ba24804b36bc976d4e1f767e469482ab8d9930b8a5488a57cd72b3644ca7bafe8d909d6e7272d73c99daf905a589bcb8b9032aeda9869e7d0bbd8ef1943 SHA512 7b10c0998a118d0e888222fe2bee26dcb2887b1f965a114f14a823b1ea8d917d55e6af657f68e003b779642f6205de43d72c4a3f119ebe8e5594a00241d3e858
-EBUILD buildah-1.11.3.ebuild 1485 BLAKE2B 01285630eb57227136150c22ff37c364786541b891c0141614e5c08a19403257ec0f2e0c7947a011c9c72d066d0581ea46a09e8cd4714bcde069a78f990efec5 SHA512 0af5f84ecf95ae34df0ed7617cb7459f9f679021e388b7247bba13a16e18649f3a0ad1cd16deca6cd3b03aa40f3ef63884bce790ca7dd25c1c2222040806cf01
-EBUILD buildah-1.11.5.ebuild 1208 BLAKE2B eda40fe5008c05f0de349186a5701bb0759bbcf38f82cbdc7c4a5dc57b4e5d3fa9528683493d8e4786d5e981a8701510a4e2e21d178316433765c0f387a381d7 SHA512 bccc1c143aeec3b623709bca126072fa8cf0043e0dd85652527379f563b1c11283a5aed2d78c8899d3cf40900eb881069977884a5fa8ab7e0a3c5b5737a9dbf9
-MISC metadata.xml 430 BLAKE2B 7486f6f62edf735da40a63ee17411e421101908e3e2652584800a3bfe315afbd46b9b6fe6338f8bb6cc7d09eb1bab34c1600e9aa6ae08b8d0326ee896270f2ea SHA512 8f25eca02d11272cc5a479adf3e361fe7f7cd595b0d54d26668b68940e012499d6c447ba93f44773a72f5431dffc346f1286be1f1a984eaa94e9dfc9501eb7b0
+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 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
+MISC metadata.xml 327 BLAKE2B cd14ee5c563ac21da34ce7728d2d12b797374bc43c50f4a9923d773ae4e010d4930793a0f0ecf610bb798fb3f1b7cd567944cf9895258e9244c3852969ac2406 SHA512 bed26d87edba20ed9385633b70b8bc23fc046ed95aa9b608400933ed4199594f6d0461854060a68b42d33a9b7be0d1b61f52e22e0d3b6d2c2248f58442094711
diff --git a/app-emulation/buildah/buildah-1.11.2.ebuild b/app-emulation/buildah/buildah-1.11.5-r1.ebuild
index 6a58e5f4b30b..792dc80accb0 100644
--- a/app-emulation/buildah/buildah-1.11.2.ebuild
+++ b/app-emulation/buildah/buildah-1.11.5-r1.ebuild
@@ -2,18 +2,19 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit bash-completion-r1 golang-vcs-snapshot
+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="ostree selinux"
-EGO_PN="${HOMEPAGE#*//}"
+IUSE="selinux"
 EGIT_COMMIT="v${PV}"
-GIT_COMMIT="0bafbfe"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+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:=
@@ -23,17 +24,15 @@ RDEPEND="app-crypt/gpgme:=
 	selinux? ( sys-libs/libselinux:= )"
 DEPEND="${RDEPEND}"
 RESTRICT="test"
-REQUIRED_USE="!selinux? ( !ostree )"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
 
 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 ostree_tag.sh ]] || die
-	use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
-		ostree_tag.sh || die; }
-
 	[[ -f selinux_tag.sh ]] || die
 	use selinux || { echo -e "#!/bin/sh\ntrue" > \
 		selinux_tag.sh || die; }
@@ -41,7 +40,7 @@ src_prepare() {
 
 src_compile() {
 	export -n GOCACHE XDG_CACHE_HOME
-	GOPATH="${WORKDIR}/${P}" emake all
+	emake all
 }
 
 src_install() {
@@ -53,5 +52,5 @@ src_install() {
 }
 
 src_test() {
-	GOPATH="${WORKDIR}/${P}" emake test-unit
+	emake test-unit
 }
diff --git a/app-emulation/buildah/buildah-1.11.3.ebuild b/app-emulation/buildah/buildah-1.11.6.ebuild
index 42661d17b64a..0b2d48115c43 100644
--- a/app-emulation/buildah/buildah-1.11.3.ebuild
+++ b/app-emulation/buildah/buildah-1.11.6.ebuild
@@ -2,18 +2,19 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit bash-completion-r1 golang-vcs-snapshot
+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="ostree selinux"
-EGO_PN="${HOMEPAGE#*//}"
+IUSE="selinux"
 EGIT_COMMIT="v${PV}"
-GIT_COMMIT="bdd78ad"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+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:=
@@ -23,17 +24,15 @@ RDEPEND="app-crypt/gpgme:=
 	selinux? ( sys-libs/libselinux:= )"
 DEPEND="${RDEPEND}"
 RESTRICT="test"
-REQUIRED_USE="!selinux? ( !ostree )"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
 
 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 ostree_tag.sh ]] || die
-	use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
-		ostree_tag.sh || die; }
-
 	[[ -f selinux_tag.sh ]] || die
 	use selinux || { echo -e "#!/bin/sh\ntrue" > \
 		selinux_tag.sh || die; }
@@ -41,7 +40,7 @@ src_prepare() {
 
 src_compile() {
 	export -n GOCACHE XDG_CACHE_HOME
-	GOPATH="${WORKDIR}/${P}" emake all
+	emake all
 }
 
 src_install() {
@@ -53,5 +52,5 @@ src_install() {
 }
 
 src_test() {
-	GOPATH="${WORKDIR}/${P}" emake test-unit
+	emake test-unit
 }
diff --git a/app-emulation/buildah/buildah-1.11.5.ebuild b/app-emulation/buildah/buildah-1.12.0.ebuild
index 2f7bb8f8c0d9..3608a7769b98 100644
--- a/app-emulation/buildah/buildah-1.11.5.ebuild
+++ b/app-emulation/buildah/buildah-1.12.0.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="7c97335"
+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
diff --git a/app-emulation/buildah/metadata.xml b/app-emulation/buildah/metadata.xml
index aef68f1e5381..491730ac55c1 100644
--- a/app-emulation/buildah/metadata.xml
+++ b/app-emulation/buildah/metadata.xml
@@ -5,11 +5,6 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
-	<use>
-		<flag name="ostree">
-			Enables dependencies for handling of OSTree images.
-		</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">containers/buildah</remote-id>
 	</upstream>