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 CDB501393A3 for ; Thu, 27 Dec 2012 22:52:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B5A8221C010; Thu, 27 Dec 2012 22:51:55 +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 1FAC121C010 for ; Thu, 27 Dec 2012 22:51:55 +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 3434C33D866 for ; Thu, 27 Dec 2012 22:51:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id BA226E544B for ; Thu, 27 Dec 2012 22:51:52 +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: <1356648687.6be2fa225f4655384af261dbf05307b8c30b97e9.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: 6be2fa225f4655384af261dbf05307b8c30b97e9 X-VCS-Branch: master Date: Thu, 27 Dec 2012 22:51:52 +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: e3037f3e-40df-47a4-bcb5-0dedc16372e5 X-Archives-Hash: ebe44767219bc5d1a5c7ae4ed7166fc5 commit: 6be2fa225f4655384af261dbf05307b8c30b97e9 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Thu Dec 27 22:50:27 2012 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Thu Dec 27 22:51:27 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6be2fa22 eclass/gnome2.eclass: allow ebuild override of eclass generated econf --- eclass/gnome2.eclass | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass index e2540d1..750f20b 100644 --- a/eclass/gnome2.eclass +++ b/eclass/gnome2.eclass @@ -140,7 +140,7 @@ gnome2_src_configure() { # Update the GNOME configuration options if [[ ${GCONF_DEBUG} != 'no' ]] ; then if use debug ; then - G2CONF="${G2CONF} --enable-debug=yes" + G2CONF="--enable-debug=yes ${G2CONF}" fi fi @@ -153,44 +153,44 @@ gnome2_src_configure() { # Preserve old behavior for older EAPI. if grep -q "enable-gtk-doc" ${ECONF_SOURCE:-.}/configure ; then if has ${EAPI:-0} 0 1 2 3 4 && in_iuse doc ; then - G2CONF="${G2CONF} $(use_enable doc gtk-doc)" + G2CONF="$(use_enable doc gtk-doc) ${G2CONF}" else - G2CONF="${G2CONF} --disable-gtk-doc" + G2CONF="--disable-gtk-doc ${G2CONF}" fi fi # Pass --disable-maintainer-mode when needed if grep -q "^[[:space:]]*AM_MAINTAINER_MODE(\[enable\])" \ ${ECONF_SOURCE:-.}/configure.*; then - G2CONF="${G2CONF} --disable-maintainer-mode" + G2CONF="--disable-maintainer-mode ${G2CONF}" fi # Pass --disable-scrollkeeper when possible if grep -q "disable-scrollkeeper" ${ECONF_SOURCE:-.}/configure; then - G2CONF="${G2CONF} --disable-scrollkeeper" + G2CONF="--disable-scrollkeeper ${G2CONF}" 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" ${ECONF_SOURCE:-.}/configure; then - G2CONF="${G2CONF} --disable-silent-rules" + G2CONF="--disable-silent-rules ${G2CONF}" fi fi # Pass --disable-schemas-install when possible if grep -q "disable-schemas-install" ${ECONF_SOURCE:-.}/configure; then - G2CONF="${G2CONF} --disable-schemas-install" + G2CONF="--disable-schemas-install ${G2CONF}" fi # Pass --disable-schemas-compile when possible if grep -q "disable-schemas-compile" ${ECONF_SOURCE:-.}/configure; then - G2CONF="${G2CONF} --disable-schemas-compile" + G2CONF="--disable-schemas-compile ${G2CONF}" fi # Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659) addwrite "$(unset HOME; echo ~)/.gnome2" - econf "$@" ${G2CONF} + econf ${G2CONF} "$@" } # @FUNCTION: gnome2_src_compile