app-emulation/buildah: add upstream VFS user xattrs patch

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Zac Medico <zmedico@gentoo.org>

diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
index 4cbdecb560f65a7c6d6c2a13e3af87fcbc237b9f..f2f644ce30486f11409b947e497dda072799ea4d 100644 (file)
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -1 +1,2 @@
 DIST buildah-1.11.5.tar.gz 10594213 BLAKE2B 421d4ea78ad84fbae42086b8d49fec26db8e2aa1f83e261a8b5b1f3f41a5be4ea2fdeb41d4e27fb52bf23f309b8aea1d050cea0c6deffcad0ebb273032e712ba SHA512 04a9c51e1cb6f3a88f118b69dcea1eba85b02d534e671cd5bf31a6d6a797bce4a488c9373c92736fccd74331c1242ff60a95f44626ecbb50c32db176c7106e86
+DIST containers-storage-1.14.0-vfs-user-xattrs.patch 14835 BLAKE2B 99c35933dcb25385ee83b80cf282c11c738d0e4d91216cc08a50522f6caa9bca5938299412908f16df404f99e80616a10b4c02c0ebc38240a987830ddaf15008 SHA512 62c7ed49728bd12b5706f59b0d4af3b18d90e8cfc2b06e681f84fe3f5d3e0cd5c0317147109c4e3ec4fec26f82c269af3c9813e47339ce102e4e97400b74627d

diff --git a/app-emulation/buildah/buildah-1.11.5.ebuild b/app-emulation/buildah/buildah-1.11.5-r1.ebuild
similarity index 74%
rename from app-emulation/buildah/buildah-1.11.5.ebuild
rename to app-emulation/buildah/buildah-1.11.5-r1.ebuild
index 2f7bb8f8c0d996142e4a1499192f7fba7cb362ce..792dc80accb0f7f4d90417f9425e70cb8caf550a 100644 (file)
--- a/app-emulation/buildah/buildah-1.11.5.ebuild
+++ b/app-emulation/buildah/buildah-1.11.5-r1.ebuild
@@ -12,7 +12,9 @@ SLOT="0"
 IUSE="selinux"
 EGIT_COMMIT="v${PV}"
 GIT_COMMIT="7c97335"
-SRC_URI="https://github.com/containers/buildah/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+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:=
@@ -25,6 +27,10 @@ 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