From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2DEE41382C5 for ; Fri, 30 Mar 2018 18:43:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 67C42E090A; Fri, 30 Mar 2018 18:43:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2FFC0E090A for ; Fri, 30 Mar 2018 18:43:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0781F335D2E for ; Fri, 30 Mar 2018 18:43:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A5ECF268 for ; Fri, 30 Mar 2018 18:43:46 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1522435420.fe24ac0e36123da4265ca1cf904ae24f817a1016.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-portage/portage-utils/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-portage/portage-utils/portage-utils-0.64-r1.ebuild app-portage/portage-utils/portage-utils-0.64.ebuild app-portage/portage-utils/portage-utils-0.65.ebuild X-VCS-Directories: app-portage/portage-utils/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: fe24ac0e36123da4265ca1cf904ae24f817a1016 X-VCS-Branch: master Date: Fri, 30 Mar 2018 18:43:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f6b2c077-ae44-4db7-ac2e-f74aab6f9a7b X-Archives-Hash: 52f7d3eca1bc8f07e373192df28dae66 commit: fe24ac0e36123da4265ca1cf904ae24f817a1016 Author: Fabian Groffen gentoo org> AuthorDate: Fri Mar 30 18:43:16 2018 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri Mar 30 18:43:40 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe24ac0e 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 app-portage/portage-utils/portage-utils-0.64-r1.ebuild | 8 ++++++++ app-portage/portage-utils/portage-utils-0.64.ebuild | 7 +++++++ app-portage/portage-utils/portage-utils-0.65.ebuild | 8 ++++++++ 3 files changed, 23 insertions(+) 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 d85fe56221c..fcbb87997aa 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 b56d5c2a0f0..74b28b849f5 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 300ced4574a..f9e45952107 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 || \