autoconf/gettext fixes

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 9001939aa7970f5fbde39b5282b57b9cd8d39623..982a5a5cfa1485f078740f8ffda334af6534b560 100644 (file)
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.10 2002/10/12 13:31:16 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.11 2002/10/23 19:18:31 azarah Exp $
 
 *gimp-1.3.9 (12 Oct 2002)
  
@@ -9,6 +9,9 @@
 
 *gimp-1.2.3-r2 (14 Jul 2002)
 
+  23 Oct 2002; Martin Schlemmer <azarah@gentoo.org> gimp-1.2.3-r2:
+  Some more autoconf/gettext fixes.
+
   14 Jul 2002; Martin Schlemmer <azarah@gentoo.org> gimp-1.2.3-r2:
   Some automake warning cleanups.  Dont really fix anything except
   getting rid of the warnings, so no revision bump.

diff --git a/media-gfx/gimp/gimp-1.2.3-r2.ebuild b/media-gfx/gimp/gimp-1.2.3-r2.ebuild
index c90420ec2e4e5243996486eacb1fc992f9c4c882..18502c019b26f1894324fe7d81129be63b70a5f5 100644 (file)
--- a/media-gfx/gimp/gimp-1.2.3-r2.ebuild
+++ b/media-gfx/gimp/gimp-1.2.3-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.3-r2.ebuild,v 1.11 2002/10/05 05:39:14 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.3-r2.ebuild,v 1.12 2002/10/23 19:18:31 azarah Exp $
 
 IUSE="python nls gnome aalib perl"
 
-S=${WORKDIR}/${P}
+S="${WORKDIR}/${P}"
 DESCRIPTION="The GIMP"
 SRC_URI="ftp://ftp.gimp.org/pub/gimp/v1.2/v${PV}/${P}.tar.bz2"
 HOMEPAGE="http://www.gimp.org/"
@@ -50,6 +50,10 @@ src_unpack() {
        echo ">>> Reconfiguring package..."
        export WANT_AUTOMAKE_1_4=1
        export WANT_AUTOCONF_2_5=1
+       # Newer gettext borks if not forced ...
+       echo "AM_GNU_GETTEXT_VERSION(0.10.0)" >> ${S}/configure.in
+       (cp ${S}/intl/Makefile.* ${T}; rm -rf ${S}/intl/*; \
+        cp ${T}/Makefile.* ${S}/intl/)
        automake --add-missing
        autoreconf --install --symlink &> ${T}/autoreconf.log || ( \
                echo "DEBUG: working directory is: `pwd`" >>${T}/autoreconf.log