From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1R5ptL-00065c-GO for garchives@archives.gentoo.org; Tue, 20 Sep 2011 02:16:59 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF06421C09C; Tue, 20 Sep 2011 02:16:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A44D521C09C for ; Tue, 20 Sep 2011 02:16:51 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 072441B400E for ; Tue, 20 Sep 2011 02:16:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 2CBBB80042 for ; Tue, 20 Sep 2011 02:16:50 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <765007b63d0c4e9c9e81eabaf79ce87f87da1720.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:gnome-next commit in: eclass/ X-VCS-Repository: proj/gnome X-VCS-Files: eclass/gnome2-live.eclass X-VCS-Directories: eclass/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 765007b63d0c4e9c9e81eabaf79ce87f87da1720 Date: Tue, 20 Sep 2011 02:16:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 9068af15bae1b23205d16157f27ed897 commit: 765007b63d0c4e9c9e81eabaf79ce87f87da1720 Author: Alexandre Rostovtsev gmail com> AuthorDate: Tue Sep 20 02:12:30 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Tue Sep 20 02:12:30 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D765007b6 eclass/gnome2-live.eclass: fix autopoint logic Borrow the logic from gnome-autogen.sh to only run autopoint for packages that use AM_GNU_GETTEXT_VERSION and do not use AM_GLIB_GNU_GETTEXT. Otherwise, running autopoint will result in failures such as autopoint: *** Missing version: please specify in configure.in through a line 'AM_GNU_GETTEXT_VERSION(x.yy.zz)' the gettext version the package is using Thanks to Steev Klimaszewski for pointing out such a failure on IRC. The eclass now appears to work both for packages that require autopoint (e.g. cogl) and those that cannot use it (e.g. mutter). --- eclass/gnome2-live.eclass | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass index 6c4aefd..638cdc9 100644 --- a/eclass/gnome2-live.eclass +++ b/eclass/gnome2-live.eclass @@ -81,13 +81,16 @@ gnome2-live_src_prepare() { mkdir -p "$i" done =20 - # Generate po/Makefile.in.in if it doesn't exist - if [[ -d po && ! -e po/Makefile.in.in && ! -e po/Makefile.am ]]; then - eautopoint --force - fi - # We don't run gettextize because that does too much stuff if grep -qe 'GETTEXT' configure.*; then + # Generate po/Makefile.in.in if it doesn't exist for packages that use + # AM_GNU_GETTEXT and AM_GNU_GETTEXT_VERSION (e.g. media-libs/cogl). + # Logic is inspired by gnome-autogen.sh + if ! grep -qe '^AM_GLIB_GNU_GETTEXT' configure.* && + grep -qe '^AM_GNU_GETTEXT_VERSION' configure.* && + [[ -d po && ! -e po/Makefile.in.in && ! -e po/Makefile.am ]]; then + eautopoint --force + fi local aux_dir=3D${S}/$(gnome2-live_get_var AC_CONFIG_AUX_DIR configure= .*) mkdir -p "${aux_dir}" test -e "${aux_dir}/config.rpath" || :> "${aux_dir}/config.rpath"