From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 095AC1381F3 for ; Sun, 16 Dec 2012 14:16:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C62E721C036; Sun, 16 Dec 2012 14:16:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 308F821C036 for ; Sun, 16 Dec 2012 14:16:40 +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 4906F33DC68 for ; Sun, 16 Dec 2012 14:16:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C5B66E543C for ; Sun, 16 Dec 2012 14:16:37 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1355667355.2fa870eba1590fb08976fe0343b5f3e2ac79092f.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: eclass/ X-VCS-Repository: proj/gnome X-VCS-Files: eclass/gnome2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 2fa870eba1590fb08976fe0343b5f3e2ac79092f X-VCS-Branch: master Date: Sun, 16 Dec 2012 14:16:37 +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: 232a7c9a-5c8a-4e9a-a562-aed4c17d397d X-Archives-Hash: 53e4141e556bc3e20f9b1cf72f2cbffe commit: 2fa870eba1590fb08976fe0343b5f3e2ac79092f Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sun Dec 16 14:15:55 2012 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun Dec 16 14:15:55 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2fa870eb eclass/gnome2.eclass: sync ECONF_SOURCE fixes from gx86 --- eclass/gnome2.eclass | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass index 8fac19c..59d5396 100644 --- a/eclass/gnome2.eclass +++ b/eclass/gnome2.eclass @@ -156,7 +156,7 @@ gnome2_src_configure() { # relink URLs in documentation to already installed documentation. # This decision also greatly helps with constantly broken doc generation. # Preserve old behavior for older EAPI. - if grep -q "enable-gtk-doc" configure ; then + if grep -q "enable-gtk-doc" ${ECONF_SOURCE:-.}/configure ; then if has ${EAPI-0} 0 1 2 3 4 && has doc ${IUSE} ; then G2CONF="${G2CONF} $(use_enable doc gtk-doc)" else @@ -165,24 +165,25 @@ gnome2_src_configure() { fi # Pass --disable-maintainer-mode when needed - if grep -q "^[[:space:]]*AM_MAINTAINER_MODE(\[enable\])" configure.*; then + if grep -q "^[[:space:]]*AM_MAINTAINER_MODE(\[enable\])" \ + ${ECONF_SOURCE:-.}/configure.*; then G2CONF="${G2CONF} --disable-maintainer-mode" fi # Pass --disable-scrollkeeper when possible - if grep -q "disable-scrollkeeper" configure; then + if grep -q "disable-scrollkeeper" ${ECONF_SOURCE:-.}/configure; then G2CONF="${G2CONF} --disable-scrollkeeper" fi # Pass --disable-silent-rules when possible (not needed for eapi5), bug #429308 if has ${EAPI:-0} 0 1 2 3 4; then - if grep -q "disable-silent-rules" configure; then + if grep -q "disable-silent-rules" ${ECONF_SOURCE:-.}/configure; then G2CONF="${G2CONF} --disable-silent-rules" fi fi # Pass --disable-schemas-install when possible - if grep -q "disable-schemas-install" configure; then + if grep -q "disable-schemas-install" ${ECONF_SOURCE:-.}/configure; then G2CONF="${G2CONF} --disable-schemas-install" fi