From: Fabian Groffen <grobian@gentoo.org>
Date: Fri, 30 Mar 2018 18:43:16 +0000 (+0200)
Subject: app-portage/portage-utils: fix failing test, bug #638970
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fe24ac0e36123da4265ca1cf904ae24f817a1016;p=gentoo.git

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 d85fe56221cf..fcbb87997aae 100644
--- 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 b56d5c2a0f0e..74b28b849f53 100644
--- 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 300ced4574a3..f9e459521076 100644
--- 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 || \