On Mon, 2012-05-21 at 02:41 -0400, Alexandre Rostovtsev wrote:
> Index: autotools.eclass
> ===================================================================
> RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
> retrieving revision 1.138
> diff -u -r1.138 autotools.eclass
> --- autotools.eclass 20 May 2012 13:01:22 -0000 1.138
> +++ autotools.eclass 21 May 2012 06:31:48 -0000
> @@ -28,6 +28,11 @@
> # The major version of automake your package needs
> : ${WANT_AUTOMAKE:=latest}
>
> +# @ECLASS-VARIABLE: WANT_INTLTOOL
> +# @DESCRIPTION:
> +# Do you want intltool? Valid values here are "latest" and "none".
> +: ${WANT_INTLTOOL:=latest}
> +
> # @ECLASS-VARIABLE: WANT_LIBTOOL
> # @DESCRIPTION:
> # Do you want libtool? Valid values here are "latest" and "none".
> @@ -77,6 +82,16 @@
> export WANT_AUTOCONF
> fi
>
> +_intltool_atom="dev-util/intltool"
> +if [[ -n ${WANT_INTLTOOL} ]] ; then
> + case ${WANT_INTLTOOL} in
> + none) _intltool_atom="" ;;
> + latest) ;;
> + *) die "Invalid WANT_INTLTOOL value '${WANT_INTLTOOL}'" ;;
> + esac
> + export WANT_LIBTOOL
Sorry, typo; should be
export WANT_INTLTOOL
> +fi
> +
> _libtool_atom="sys-devel/libtool"
> if [[ -n ${WANT_LIBTOOL} ]] ; then
> case ${WANT_LIBTOOL} in
> @@ -87,7 +102,7 @@
> export WANT_LIBTOOL
> fi
>
> -AUTOTOOLS_DEPEND="${_automake_atom} ${_autoconf_atom} ${_libtool_atom}"
> +AUTOTOOLS_DEPEND="${_automake_atom} ${_autoconf_atom} ${_intltool_atom}
> ${_libtool_atom}"
> RDEPEND=""
>
> # @ECLASS-VARIABLE: AUTOTOOLS_AUTO_DEPEND
> @@ -163,9 +178,13 @@
> [[ -n ${m4dirs} ]] && mkdir -p ${m4dirs}
>
> eaclocal
> - if grep -q '^AM_GNU_GETTEXT_VERSION' configure.?? ; then
> + # Follow gnome2-live.eclass and gnome-autogen.sh logic; bug #416789
> + if grep -q '^AM_GNU_GETTEXT_VERSION' configure.?? && ! grep -q
> '^AM_GLIB_GNU_GETTEXT' configure.?? ; then
> eautopoint --force
> fi
> + if grep -q "^AC_PROG_INTLTOOL\|^IT_PROG_INTLTOOL" configure.?? ; then
> + autotools_run_tool intltoolize --force --copy --automake
> + fi
> _elibtoolize --install --copy --force
> eautoconf
> eautoheader
>
>
