| 1 |
commit: fe24ac0e36123da4265ca1cf904ae24f817a1016 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Mar 30 18:43:16 2018 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 30 18:43:40 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe24ac0e |
| 7 |
|
| 8 |
app-portage/portage-utils: fix failing test, bug #638970 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/638970 |
| 11 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 12 |
|
| 13 |
app-portage/portage-utils/portage-utils-0.64-r1.ebuild | 8 ++++++++ |
| 14 |
app-portage/portage-utils/portage-utils-0.64.ebuild | 7 +++++++ |
| 15 |
app-portage/portage-utils/portage-utils-0.65.ebuild | 8 ++++++++ |
| 16 |
3 files changed, 23 insertions(+) |
| 17 |
|
| 18 |
diff --git a/app-portage/portage-utils/portage-utils-0.64-r1.ebuild b/app-portage/portage-utils/portage-utils-0.64-r1.ebuild |
| 19 |
index d85fe56221c..fcbb87997aa 100644 |
| 20 |
--- a/app-portage/portage-utils/portage-utils-0.64-r1.ebuild |
| 21 |
+++ b/app-portage/portage-utils/portage-utils-0.64-r1.ebuild |
| 22 |
@@ -24,6 +24,14 @@ PATCHES=( |
| 23 |
"${FILESDIR}"/portage-utils-0.64-fix-quiet.patch |
| 24 |
) |
| 25 |
|
| 26 |
+src_prepare() { |
| 27 |
+ default |
| 28 |
+ # bug #638970, caused by gemato writing Manifest.gz files in |
| 29 |
+ # metadata/md5-cache dir, unlike hashgen |
| 30 |
+ sed -i -e '/find [.] -mindepth/s/-type f/-type f ! -name "Manifest.*"/' \ |
| 31 |
+ tests/atom_explode/dotest || die |
| 32 |
+} |
| 33 |
+ |
| 34 |
src_configure() { |
| 35 |
# Avoid slow configure+gnulib+make if on an up-to-date Linux system |
| 36 |
if use prefix || ! use kernel_linux || \ |
| 37 |
|
| 38 |
diff --git a/app-portage/portage-utils/portage-utils-0.64.ebuild b/app-portage/portage-utils/portage-utils-0.64.ebuild |
| 39 |
index b56d5c2a0f0..74b28b849f5 100644 |
| 40 |
--- a/app-portage/portage-utils/portage-utils-0.64.ebuild |
| 41 |
+++ b/app-portage/portage-utils/portage-utils-0.64.ebuild |
| 42 |
@@ -20,6 +20,13 @@ DEPEND="${RDEPEND} |
| 43 |
app-arch/xz-utils |
| 44 |
static? ( dev-libs/iniparser:0[static-libs] )" |
| 45 |
|
| 46 |
+src_prepare() { |
| 47 |
+ # bug #638970, caused by gemato writing Manifest.gz files in |
| 48 |
+ # metadata/md5-cache dir, unlike hashgen |
| 49 |
+ sed -i -e '/find [.] -mindepth/s/-type f/-type f ! -name "Manifest.*"/' \ |
| 50 |
+ tests/atom_explode/dotest || die |
| 51 |
+} |
| 52 |
+ |
| 53 |
src_configure() { |
| 54 |
# Avoid slow configure+gnulib+make if on an up-to-date Linux system |
| 55 |
if use prefix || ! use kernel_linux || \ |
| 56 |
|
| 57 |
diff --git a/app-portage/portage-utils/portage-utils-0.65.ebuild b/app-portage/portage-utils/portage-utils-0.65.ebuild |
| 58 |
index 300ced4574a..f9e45952107 100644 |
| 59 |
--- a/app-portage/portage-utils/portage-utils-0.65.ebuild |
| 60 |
+++ b/app-portage/portage-utils/portage-utils-0.65.ebuild |
| 61 |
@@ -20,6 +20,14 @@ DEPEND="${RDEPEND} |
| 62 |
app-arch/xz-utils |
| 63 |
static? ( dev-libs/iniparser:0[static-libs] )" |
| 64 |
|
| 65 |
+src_prepare() { |
| 66 |
+ default |
| 67 |
+ # bug #638970, caused by gemato writing Manifest.gz files in |
| 68 |
+ # metadata/md5-cache dir, unlike hashgen |
| 69 |
+ sed -i -e '/find [.] -mindepth/s/-type f/-type f ! -name "Manifest.*"/' \ |
| 70 |
+ tests/atom_explode/dotest || die |
| 71 |
+} |
| 72 |
+ |
| 73 |
src_configure() { |
| 74 |
# Avoid slow configure+gnulib+make if on an up-to-date Linux system |
| 75 |
if use prefix || ! use kernel_linux || \ |
Archives