app-portage/portage-utils: fix failing test, bug #638970

Closes: https://bugs.gentoo.org/638970
Package-Manager: Portage-2.3.24, Repoman-2.3.6

diff --git a/app-portage/portage-utils/portage-utils-0.64-r1.ebuild b/app-portage/portage-utils/portage-utils-0.64-r1.ebuild
index d85fe56221cf1038ef9148c4979fc80c612f47aa..fcbb87997aae846ed10ea68c2d441a5a02fa2f51 100644 (file)
--- a/app-portage/portage-utils/portage-utils-0.64-r1.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.64-r1.ebuild
@@ -24,6 +24,14 @@ PATCHES=(
        "${FILESDIR}"/portage-utils-0.64-fix-quiet.patch
 )
 
+src_prepare() {
+       default
+       # bug #638970, caused by gemato writing Manifest.gz files in
+       # metadata/md5-cache dir, unlike hashgen
+       sed -i -e '/find [.] -mindepth/s/-type f/-type f ! -name "Manifest.*"/' \
+               tests/atom_explode/dotest || die
+}
+
 src_configure() {
        # Avoid slow configure+gnulib+make if on an up-to-date Linux system
        if use prefix || ! use kernel_linux || \

diff --git a/app-portage/portage-utils/portage-utils-0.64.ebuild b/app-portage/portage-utils/portage-utils-0.64.ebuild
index b56d5c2a0f0eca3e29f7f9d8d23bfb173ca229fb..74b28b849f535453223ededaa0652844aacbf51f 100644 (file)
--- a/app-portage/portage-utils/portage-utils-0.64.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.64.ebuild
@@ -20,6 +20,13 @@ DEPEND="${RDEPEND}
        app-arch/xz-utils
        static? ( dev-libs/iniparser:0[static-libs] )"
 
+src_prepare() {
+       # bug #638970, caused by gemato writing Manifest.gz files in
+       # metadata/md5-cache dir, unlike hashgen
+       sed -i -e '/find [.] -mindepth/s/-type f/-type f ! -name "Manifest.*"/' \
+               tests/atom_explode/dotest || die
+}
+
 src_configure() {
        # Avoid slow configure+gnulib+make if on an up-to-date Linux system
        if use prefix || ! use kernel_linux || \

diff --git a/app-portage/portage-utils/portage-utils-0.65.ebuild b/app-portage/portage-utils/portage-utils-0.65.ebuild
index 300ced4574a39dc523a86a7a9dd3510971fe24d7..f9e459521076a10f1cb05ff8fe0bfa55136dd6cc 100644 (file)
--- a/app-portage/portage-utils/portage-utils-0.65.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.65.ebuild
@@ -20,6 +20,14 @@ DEPEND="${RDEPEND}
        app-arch/xz-utils
        static? ( dev-libs/iniparser:0[static-libs] )"
 
+src_prepare() {
+       default
+       # bug #638970, caused by gemato writing Manifest.gz files in
+       # metadata/md5-cache dir, unlike hashgen
+       sed -i -e '/find [.] -mindepth/s/-type f/-type f ! -name "Manifest.*"/' \
+               tests/atom_explode/dotest || die
+}
+
 src_configure() {
        # Avoid slow configure+gnulib+make if on an up-to-date Linux system
        if use prefix || ! use kernel_linux || \