| 1 |
On Mon, 2012-05-21 at 02:41 -0400, Alexandre Rostovtsev wrote: |
| 2 |
> Index: autotools.eclass |
| 3 |
> =================================================================== |
| 4 |
> RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v |
| 5 |
> retrieving revision 1.138 |
| 6 |
> diff -u -r1.138 autotools.eclass |
| 7 |
> --- autotools.eclass 20 May 2012 13:01:22 -0000 1.138 |
| 8 |
> +++ autotools.eclass 21 May 2012 06:31:48 -0000 |
| 9 |
> @@ -28,6 +28,11 @@ |
| 10 |
> # The major version of automake your package needs |
| 11 |
> : ${WANT_AUTOMAKE:=latest} |
| 12 |
> |
| 13 |
> +# @ECLASS-VARIABLE: WANT_INTLTOOL |
| 14 |
> +# @DESCRIPTION: |
| 15 |
> +# Do you want intltool? Valid values here are "latest" and "none". |
| 16 |
> +: ${WANT_INTLTOOL:=latest} |
| 17 |
> + |
| 18 |
> # @ECLASS-VARIABLE: WANT_LIBTOOL |
| 19 |
> # @DESCRIPTION: |
| 20 |
> # Do you want libtool? Valid values here are "latest" and "none". |
| 21 |
> @@ -77,6 +82,16 @@ |
| 22 |
> export WANT_AUTOCONF |
| 23 |
> fi |
| 24 |
> |
| 25 |
> +_intltool_atom="dev-util/intltool" |
| 26 |
> +if [[ -n ${WANT_INTLTOOL} ]] ; then |
| 27 |
> + case ${WANT_INTLTOOL} in |
| 28 |
> + none) _intltool_atom="" ;; |
| 29 |
> + latest) ;; |
| 30 |
> + *) die "Invalid WANT_INTLTOOL value '${WANT_INTLTOOL}'" ;; |
| 31 |
> + esac |
| 32 |
> + export WANT_LIBTOOL |
| 33 |
|
| 34 |
Sorry, typo; should be |
| 35 |
|
| 36 |
export WANT_INTLTOOL |
| 37 |
|
| 38 |
> +fi |
| 39 |
> + |
| 40 |
> _libtool_atom="sys-devel/libtool" |
| 41 |
> if [[ -n ${WANT_LIBTOOL} ]] ; then |
| 42 |
> case ${WANT_LIBTOOL} in |
| 43 |
> @@ -87,7 +102,7 @@ |
| 44 |
> export WANT_LIBTOOL |
| 45 |
> fi |
| 46 |
> |
| 47 |
> -AUTOTOOLS_DEPEND="${_automake_atom} ${_autoconf_atom} ${_libtool_atom}" |
| 48 |
> +AUTOTOOLS_DEPEND="${_automake_atom} ${_autoconf_atom} ${_intltool_atom} ${_libtool_atom}" |
| 49 |
> RDEPEND="" |
| 50 |
> |
| 51 |
> # @ECLASS-VARIABLE: AUTOTOOLS_AUTO_DEPEND |
| 52 |
> @@ -163,9 +178,13 @@ |
| 53 |
> [[ -n ${m4dirs} ]] && mkdir -p ${m4dirs} |
| 54 |
> |
| 55 |
> eaclocal |
| 56 |
> - if grep -q '^AM_GNU_GETTEXT_VERSION' configure.?? ; then |
| 57 |
> + # Follow gnome2-live.eclass and gnome-autogen.sh logic; bug #416789 |
| 58 |
> + if grep -q '^AM_GNU_GETTEXT_VERSION' configure.?? && ! grep -q '^AM_GLIB_GNU_GETTEXT' configure.?? ; then |
| 59 |
> eautopoint --force |
| 60 |
> fi |
| 61 |
> + if grep -q "^AC_PROG_INTLTOOL\|^IT_PROG_INTLTOOL" configure.?? ; then |
| 62 |
> + autotools_run_tool intltoolize --force --copy --automake |
| 63 |
> + fi |
| 64 |
> _elibtoolize --install --copy --force |
| 65 |
> eautoconf |
| 66 |
> eautoheader |
| 67 |
> |
| 68 |
> |
Archives