Re: [gentoo-dev] [PATCH] gnome2.eclass does not respect ECONF_SOURCE

[Doug Goldstein]

On Thu, May 23, 2013 at 2:31 PM, Mike Frysinger <vapier@g.o> wrote:

> On Thursday 09 May 2013 12:59:11 Pacho Ramos wrote:
> > El mié, 08-05-2013 a las 20:59 -0400, Mike Frysinger escribió:
> > > On Wednesday 05 December 2012 18:02:51 Doug Goldstein wrote:
> > > > - if grep -q "disable-scrollkeeper" configure; then
> > > > + if grep -q "disable-scrollkeeper" ${ECONF_SOURCE:-.}/configure;
> then
> > >
> > > ECONF_SOURCE should be quoted
> > > -mike
> >
> > If it doesn't cause any problem (it shouldn't, I think), feel free to
> > commit adding the quotes. Thanks for noticing! (will CC gnome team to
> > keep them aware)
>
> Index: gnome2.eclass
> ===================================================================
> RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v
> retrieving revision 1.120
> diff -u -p -r1.120 gnome2.eclass
> --- gnome2.eclass       16 Jan 2013 23:01:02 -0000      1.120
> +++ gnome2.eclass       23 May 2013 19:31:00 -0000
> @@ -122,7 +122,7 @@ gnome2_src_configure() {
>         # Remember to drop 'doc' USE flag from your package if it was only
> used to
>         # rebuild docs.
>         # Preserve old behavior for older EAPI.
> -       if grep -q "enable-gtk-doc" ${ECONF_SOURCE:-.}/configure ; then
> +       if grep -q "enable-gtk-doc" "${ECONF_SOURCE:-.}"/configure ; then
>                 if has ${EAPI:-0} 0 1 2 3 4 && in_iuse doc ; then
>                         G2CONF="$(use_enable doc gtk-doc) ${G2CONF}"
>                 else
> @@ -132,29 +132,29 @@ gnome2_src_configure() {
>
>         # Pass --disable-maintainer-mode when needed
>         if grep -q "^[[:space:]]*AM_MAINTAINER_MODE(\[enable\])" \
> -               ${ECONF_SOURCE:-.}/configure.*; then
> +               "${ECONF_SOURCE:-.}"/configure.*; then
>                 G2CONF="--disable-maintainer-mode ${G2CONF}"
>         fi
>
>         # Pass --disable-scrollkeeper when possible
> -       if grep -q "disable-scrollkeeper" ${ECONF_SOURCE:-.}/configure;
> then
> +       if grep -q "disable-scrollkeeper" "${ECONF_SOURCE:-.}"/configure;
> then
>                 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
> +               if grep -q "disable-silent-rules"
> "${ECONF_SOURCE:-.}"/configure; then
>                         G2CONF="--disable-silent-rules ${G2CONF}"
>                 fi
>         fi
>
>         # Pass --disable-schemas-install when possible
> -       if grep -q "disable-schemas-install" ${ECONF_SOURCE:-.}/configure;
> then
> +       if grep -q "disable-schemas-install"
> "${ECONF_SOURCE:-.}"/configure; then
>                 G2CONF="--disable-schemas-install ${G2CONF}"
>         fi
>
>         # Pass --disable-schemas-compile when possible
> -       if grep -q "disable-schemas-compile" ${ECONF_SOURCE:-.}/configure;
> then
> +       if grep -q "disable-schemas-compile"
> "${ECONF_SOURCE:-.}"/configure; then
>                 G2CONF="--disable-schemas-compile ${G2CONF}"
>         fi
>
> -mike
>

I guess I forgot to commit that to the tree when I posted it a few days
ago/week, w/e. Yeah commit that. My original commit was wrong.

-- 
Doug Goldstein