From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-500203-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 03C61138010
for <garchives@archives.gentoo.org>; Thu, 30 Aug 2012 05:30:30 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 90571E06E8;
Thu, 30 Aug 2012 05:30:20 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 59EE6E06E8
for <gentoo-commits@lists.gentoo.org>; Thu, 30 Aug 2012 05:30:20 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 8F58B33CE86
for <gentoo-commits@lists.gentoo.org>; Thu, 30 Aug 2012 05:30:19 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id 28C8DE543C
for <gentoo-commits@lists.gentoo.org>; Thu, 30 Aug 2012 05:30:18 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <1346304577.7d7387b34fdfb6ac8e736ca4e73f1e3f8fa1a705.zmedico@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: bin/
X-VCS-Repository: proj/portage
X-VCS-Files: bin/phase-helpers.sh
X-VCS-Directories: bin/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: 7d7387b34fdfb6ac8e736ca4e73f1e3f8fa1a705
X-VCS-Branch: master
Date: Thu, 30 Aug 2012 05:30:18 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 0e32c8e9-d067-4cf1-86b3-b4eab17314b8
X-Archives-Hash: 2a87eb89ffcbc95fcab720e0b49555ca
commit: 7d7387b34fdfb6ac8e736ca4e73f1e3f8fa1a705
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 30 05:25:33 2012 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Aug 30 05:29:37 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=7d7387b3
EAPI 5: econf --disable-silent-rules
See bug #379497 and the PMS patch:
http://git.overlays.gentoo.org/gitweb/?p=proj/pms.git;a=commit;h=b7750e67b4772c1064543defb7df6a556f09807b
---
bin/phase-helpers.sh | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index 3230870..db1548e 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -421,11 +421,29 @@ econf() {
fi
# EAPI=4 adds --disable-dependency-tracking to econf
- if ! has "$EAPI" 0 1 2 3 && \
- "${ECONF_SOURCE}/configure" --help 2>/dev/null | \
- grep -q disable-dependency-tracking ; then
- set -- --disable-dependency-tracking "$@"
- fi
+ case "${EAPI}" in
+ 0|1|2|3)
+ ;;
+ *)
+ local conf_help=$("${ECONF_SOURCE}/configure" --help 2>/dev/null)
+ case "${conf_help}" in
+ *--disable-dependency-tracking*)
+ set -- --disable-dependency-tracking "$@"
+ ;;
+ esac
+ case "${EAPI}" in
+ 4|4-python|4-slot-abi)
+ ;;
+ *)
+ case "${conf_help}" in
+ *--disable-silent-rules*)
+ set -- --disable-silent-rules "$@"
+ ;;
+ esac
+ ;;
+ esac
+ ;;
+ esac
# if the profile defines a location to install libs to aside from default, pass it on.
# if the ebuild passes in --libdir, they're responsible for the conf_libdir fun.