fix autoreconf errors; fix locals not installing with 'nls' in USE.
authorMartin Schlemmer <azarah@gentoo.org>
Fri, 1 Nov 2002 20:29:28 +0000 (20:29 +0000)
committerMartin Schlemmer <azarah@gentoo.org>
Fri, 1 Nov 2002 20:29:28 +0000 (20:29 +0000)
media-gfx/gimp/ChangeLog
media-gfx/gimp/files/digest-gimp-1.2.3-r3 [new file with mode: 0644]
media-gfx/gimp/files/gimp-1.2.3-r3-gentoo.diff [new file with mode: 0644]
media-gfx/gimp/gimp-1.2.3-r3.ebuild [new file with mode: 0644]

index 982a5a5cfa1485f078740f8ffda334af6534b560..21a1b064e487dbab056fd05efc4073827ef0bbac 100644 (file)
@@ -1,6 +1,15 @@
 # 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.11 2002/10/23 19:18:31 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.12 2002/11/01 20:29:28 azarah Exp $
+
+*gimp-1.2.3-r3 (2 Nov 2002)
+
+  28 Oct 2002; Martin Schlemmer <azarah@gentoo.org> gimp-1.2.3-r3.ebuild :
+  Fix braindead use of autoconf-2.5 during reconf.  Do not run autoreconf,
+  or even autoconf, as it (autoreconf at least) needs cvs installed, and
+  breaks configure (locales are not installed).  Our psd_save patch anyhow
+  only touch .am files, so only automake is needed ....  This should fix
+  bugs #8490, #6021 and #9621.
 
 *gimp-1.3.9 (12 Oct 2002)
  
 
 *gimp-1.2.3-r2 (14 Jul 2002)
 
-  23 Oct 2002; Martin Schlemmer <azarah@gentoo.org> gimp-1.2.3-r2:
+  23 Oct 2002; Martin Schlemmer <azarah@gentoo.org> gimp-1.2.3-r2.ebuild :
   Some more autoconf/gettext fixes.
 
-  14 Jul 2002; Martin Schlemmer <azarah@gentoo.org> gimp-1.2.3-r2:
+  14 Jul 2002; Martin Schlemmer <azarah@gentoo.org> gimp-1.2.3-r2.ebuild :
   Some automake warning cleanups.  Dont really fix anything except
   getting rid of the warnings, so no revision bump.
 
diff --git a/media-gfx/gimp/files/digest-gimp-1.2.3-r3 b/media-gfx/gimp/files/digest-gimp-1.2.3-r3
new file mode 100644 (file)
index 0000000..174f1d8
--- /dev/null
@@ -0,0 +1 @@
+MD5 b19235f19f524f772a4aef597a69b1da gimp-1.2.3.tar.bz2 10795020
diff --git a/media-gfx/gimp/files/gimp-1.2.3-r3-gentoo.diff b/media-gfx/gimp/files/gimp-1.2.3-r3-gentoo.diff
new file mode 100644 (file)
index 0000000..2021e97
--- /dev/null
@@ -0,0 +1,25 @@
+--- Makefile.am~       Mon Dec 18 16:14:07 2000
++++ Makefile.am        Fri Jun 22 16:58:34 2001
+@@ -105,6 +105,7 @@
+       polar \
+       ps \
+       psd \
++      psd_save \
+       $(PSP) \
+       randomize \
+       ripple \
+@@ -944,6 +945,14 @@
+       psd.c
+
+ psd_LDADD = \
++      $(top_builddir)/libgimp/libgimp.la      \
++      $(GLIB_LIBS)                            \
++      $(INTLLIBS)
++
++psd_save_SOURCES = \
++      psd_save.c
++
++psd_save_LDADD = \
+       $(top_builddir)/libgimp/libgimp.la      \
+       $(GLIB_LIBS)                            \
+       $(INTLLIBS)
diff --git a/media-gfx/gimp/gimp-1.2.3-r3.ebuild b/media-gfx/gimp/gimp-1.2.3-r3.ebuild
new file mode 100644 (file)
index 0000000..3d5f8e7
--- /dev/null
@@ -0,0 +1,165 @@
+# 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-r3.ebuild,v 1.1 2002/11/01 20:29:28 azarah Exp $
+
+IUSE="python nls gnome aalib perl"
+
+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/"
+
+SLOT="1.2"
+KEYWORDS="x86 ppc"
+LICENSE="GPL-2"
+
+DEPEND="nls? ( sys-devel/gettext )
+       sys-devel/autoconf
+       sys-devel/automake
+       =x11-libs/gtk+-1.2*
+       >=media-libs/mpeg-lib-1.3.1
+       aalib? ( >=media-libs/aalib-1.2 )
+       perl? ( >=dev-perl/PDL-2.2.1 
+               >=dev-perl/Parse-RecDescent-1.80 
+               >=dev-perl/gtk-perl-0.7004 )
+       python? ( >=dev-lang/python-2.0 )
+       gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
+
+RDEPEND="=x11-libs/gtk+-1.2*
+       aalib? ( >=media-libs/aalib-1.2 )
+       perl? ( >=dev-perl/PDL-2.2.1 >=dev-perl/Parse-RecDescent-1.80 >=dev-perl/gtk-perl-0.7004 )
+       python? ( >=dev-lang/python-2.0 )
+       gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
+
+src_unpack() {
+       unpack ${A}
+       
+       cd ${S}/plug-ins/common
+       # compile with nonstandard psd_save plugin
+       cp ${FILESDIR}/psd_save.c .
+       patch -p0 < ${FILESDIR}/${PF}-gentoo.diff || die
+       cd ${S}
+       
+       if [ -f ${ROOT}/usr/share/gettext/config.rpath ] ; then
+               cp -f ${ROOT}/usr/share/gettext/config.rpath ${S}
+       else
+               touch ${S}/config.rpath
+               chmod 0755 ${S}/config.rpath
+       fi
+       
+       echo ">>> Reconfiguring package..."
+       export WANT_AUTOMAKE_1_4=1
+       export WANT_AUTOCONF_2_1=1
+       aclocal -I . -I ${S}/plug-ins/perl
+       automake --add-missing --gnu
+# Do not run autoreconf, or even autoconf, as it (autoreconf at least)
+# needs cvs installed, and breaks configure (locales are not installed).
+# Our psd_save patch anyhow only touch .am files, so only automake is
+# needed ....  This should fix bug #8490, #6021 and #9621.
+#
+# <azarah@gentoo.org> (2 Nov 2002)
+#
+#      autoreconf --install --symlink &> ${T}/autoreconf.log || ( \
+#              echo "DEBUG: working directory is: `pwd`" >>${T}/autoreconf.log
+#              eerror "Reonfigure failed, please attatch the contents of:"
+#              eerror
+#              eerror "  ${T}/autoreconf.log"
+#              eerror
+#              eerror "in your bugreport."
+#              # we need an error here, else the ebuild do not die
+#              exit 1
+#      ) || die "running autoreconf failed"
+       touch plug-ins/common/gimp-1.2.3.tar.bz2
+}
+
+src_compile() {
+       local myconf=""
+       local mymake=""
+       local myvars=""
+       if [ -z "`use nls`" ] ; then
+               myconf="${myconf} --disable-nls"
+       fi
+
+       if [ -z "`use perl`" ] ; then
+               myconf="${myconf} --disable-perl"
+       else
+               export  PERL_MM_OPT=' PREFIX=${D}/usr'
+               myconf="${myconf} --enable-perl"
+       fi
+
+       if [ -z "`use python`" ] ; then
+               myconf="${myconf} --disable-python"
+       else
+               myconf="${myconf} --enable-python"
+       fi
+
+       if [ -z "`use aalib`" ] ; then
+               mymake="LIBAA= AA="
+       fi
+
+       if [ -z "`use gnome`" ] ; then
+               mymake="${mymake} HELPBROWSER="
+       fi
+
+       ./configure --host=${CHOST} \
+                       --prefix=/usr \
+                       --mandir=/usr/share/man \
+                       --infodir=/usr/share/info \
+                       --sysconfdir=/etc \
+                       --with-mp \
+                       --with-threads \
+                       --disable-debug \
+                       ${myconf} || die
+
+       if [ -z "`use aalib`" ] ; then 
+               # Horrible automake brokenness
+               cp plug-ins/common/Makefile plug-ins/common/Makefile.orig
+               cat plug-ins/common/Makefile.orig | \
+                       sed 's/CML_explorer$(EXEEXT) aa/CML_explorer$(EXEEXT)/' \
+                       > plug-ins/common/Makefile
+       fi
+
+       # Doesn't work with -j 4 (hallski)
+       MAKEOPTS="-j1" emake ${mymake} || die
+}
+
+src_install() {
+
+       local mymake="" 
+       if [ -z "`use aalib`" ] ; then
+               mymake="LIBAA= AA="
+       fi
+
+       if [ -z "`use gnome`" ] ; then
+               mymake="${mymake} HELPBROWSER="
+       fi
+  
+       dodir /usr/lib/gimp/1.2/plug-ins
+       
+       make prefix=${D}/usr \
+                gimpsysconfdir=${D}/etc/gimp/1.2 \
+                mandir=${D}/usr/share/man \
+                infodir=${D}/usr/share/info \
+                PREFIX=${D}/usr \
+                INSTALLPRIVLIB=${D}/usr/lib/perl5 \
+                INSTALLSCRIPT=${D}/usr/bin \
+                INSTALLSITELIB=${D}/usr/lib/perl5/site_perl \
+                INSTALLBIN=${D}/usr/bin \
+                INSTALLMAN1DIR=${D}/usr/share/man/man1 \
+                INSTALLMAN3DIR=${D}/usr/share/man/man3 \
+                ${mymake} \
+                install || die
+
+       dosym gimp-1.2 /usr/bin/gimp
+       #this next line closes bug #810
+       dosym gimptool-1.2 /usr/bin/gimptool
+       
+       preplib /usr
+       
+       dodoc AUTHORS COPYING ChangeLog* *MAINTAINERS README* TODO
+       dodoc docs/*.txt docs/*.ps docs/Wilber* docs/quick_reference.tar.gz
+       dohtml -r devel-docs
+       docinto devel
+       dodoc devel-docs/*.txt
+}
+