| 1 |
commit: 6be2fa225f4655384af261dbf05307b8c30b97e9 |
| 2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 27 22:50:27 2012 +0000 |
| 4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 27 22:51:27 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6be2fa22 |
| 7 |
|
| 8 |
eclass/gnome2.eclass: allow ebuild override of eclass generated econf |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/gnome2.eclass | 18 +++++++++--------- |
| 12 |
1 files changed, 9 insertions(+), 9 deletions(-) |
| 13 |
|
| 14 |
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass |
| 15 |
index e2540d1..750f20b 100644 |
| 16 |
--- a/eclass/gnome2.eclass |
| 17 |
+++ b/eclass/gnome2.eclass |
| 18 |
@@ -140,7 +140,7 @@ gnome2_src_configure() { |
| 19 |
# Update the GNOME configuration options |
| 20 |
if [[ ${GCONF_DEBUG} != 'no' ]] ; then |
| 21 |
if use debug ; then |
| 22 |
- G2CONF="${G2CONF} --enable-debug=yes" |
| 23 |
+ G2CONF="--enable-debug=yes ${G2CONF}" |
| 24 |
fi |
| 25 |
fi |
| 26 |
|
| 27 |
@@ -153,44 +153,44 @@ gnome2_src_configure() { |
| 28 |
# Preserve old behavior for older EAPI. |
| 29 |
if grep -q "enable-gtk-doc" ${ECONF_SOURCE:-.}/configure ; then |
| 30 |
if has ${EAPI:-0} 0 1 2 3 4 && in_iuse doc ; then |
| 31 |
- G2CONF="${G2CONF} $(use_enable doc gtk-doc)" |
| 32 |
+ G2CONF="$(use_enable doc gtk-doc) ${G2CONF}" |
| 33 |
else |
| 34 |
- G2CONF="${G2CONF} --disable-gtk-doc" |
| 35 |
+ G2CONF="--disable-gtk-doc ${G2CONF}" |
| 36 |
fi |
| 37 |
fi |
| 38 |
|
| 39 |
# Pass --disable-maintainer-mode when needed |
| 40 |
if grep -q "^[[:space:]]*AM_MAINTAINER_MODE(\[enable\])" \ |
| 41 |
${ECONF_SOURCE:-.}/configure.*; then |
| 42 |
- G2CONF="${G2CONF} --disable-maintainer-mode" |
| 43 |
+ G2CONF="--disable-maintainer-mode ${G2CONF}" |
| 44 |
fi |
| 45 |
|
| 46 |
# Pass --disable-scrollkeeper when possible |
| 47 |
if grep -q "disable-scrollkeeper" ${ECONF_SOURCE:-.}/configure; then |
| 48 |
- G2CONF="${G2CONF} --disable-scrollkeeper" |
| 49 |
+ G2CONF="--disable-scrollkeeper ${G2CONF}" |
| 50 |
fi |
| 51 |
|
| 52 |
# Pass --disable-silent-rules when possible (not needed for eapi5), bug #429308 |
| 53 |
if has ${EAPI:-0} 0 1 2 3 4; then |
| 54 |
if grep -q "disable-silent-rules" ${ECONF_SOURCE:-.}/configure; then |
| 55 |
- G2CONF="${G2CONF} --disable-silent-rules" |
| 56 |
+ G2CONF="--disable-silent-rules ${G2CONF}" |
| 57 |
fi |
| 58 |
fi |
| 59 |
|
| 60 |
# Pass --disable-schemas-install when possible |
| 61 |
if grep -q "disable-schemas-install" ${ECONF_SOURCE:-.}/configure; then |
| 62 |
- G2CONF="${G2CONF} --disable-schemas-install" |
| 63 |
+ G2CONF="--disable-schemas-install ${G2CONF}" |
| 64 |
fi |
| 65 |
|
| 66 |
# Pass --disable-schemas-compile when possible |
| 67 |
if grep -q "disable-schemas-compile" ${ECONF_SOURCE:-.}/configure; then |
| 68 |
- G2CONF="${G2CONF} --disable-schemas-compile" |
| 69 |
+ G2CONF="--disable-schemas-compile ${G2CONF}" |
| 70 |
fi |
| 71 |
|
| 72 |
# Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659) |
| 73 |
addwrite "$(unset HOME; echo ~)/.gnome2" |
| 74 |
|
| 75 |
- econf "$@" ${G2CONF} |
| 76 |
+ econf ${G2CONF} "$@" |
| 77 |
} |
| 78 |
|
| 79 |
# @FUNCTION: gnome2_src_compile |
Archives