gnome2.eclass appends configure switches to user arguments. Change logic so that it prepends values to G2CONF and pass extra args of gnome2_src_configure after G2CONF so that ebuilds can indeed override eclass settings.
--- eclass/gnome2.eclass | 18 +++++++++--------- 1 file 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 -- 1.8.1
signature.asc
Description: This is a digitally signed message part