gimp fix for bug #810

5 files changed, 11 insertions, 414 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 2a9de0b04ed7..9fbe5e789edb 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,14 +1,22 @@
 # 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.3 2002/02/15 04:33:42 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.4 2002/02/23 01:56:44 drobbins Exp $
 
+*gimp-1.2.3-r2 (22 Feb 2002)
+
+  22 Feb 2002; Daniel Robbins <drobbins@gentoo.org> added gimptool symlink, 
+  closing bug #810.
+  
+*gimp-1.2.3-r1 (15 Feb 2002)
+  
   15 Feb 2002; Martin Schlemmer <azarah@gentoo.org> gimp-1.2.3-r1.build:
 
   Fix /usr/bin/gimp symlink.
 
 *gimp-1.2.3 (14 Feb 2002)
 
-  14 Feb 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ChangeLog digest/digest-gimp-1.2.3 gimp-1.2.3.ebuild files/gimp-1.2.3-gentoo.diff:
+  14 Feb 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ChangeLog
+  digest/digest-gimp-1.2.3 gimp-1.2.3.ebuild files/gimp-1.2.3-gentoo.diff:
 
   New upstream version.
 
diff --git a/media-gfx/gimp/files/digest-gimp-1.2.3-r2 b/media-gfx/gimp/files/digest-gimp-1.2.3-r2
new file mode 100644
index 000000000000..7445a43c7f1c
--- /dev/null
+++ b/media-gfx/gimp/files/digest-gimp-1.2.3-r2
@@ -0,0 +1 @@
+MD5 B19235F19F524F772A4AEF597A69B1DA gimp-1.2.3.tar.bz2 10795020
diff --git a/media-gfx/gimp/gimp-1.2.2-r1.ebuild b/media-gfx/gimp/gimp-1.2.2-r1.ebuild
deleted file mode 100644
index 6554e2700d9f..000000000000
--- a/media-gfx/gimp/gimp-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-
-S=${WORKDIR}/${P}
-DESCRIPTION="The GIMP"
-SRC_URI="ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/v1.2/v${PV}/${P}.tar.bz2"
-HOMEPAGE="http://www.gimp.org/"
-
-DEPEND="nls? ( sys-devel/gettext )
-        sys-devel/autoconf
-	sys-devel/automake
-	>=x11-libs/gtk+-1.2.10-r4
-	>=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.10-r4
-	 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
-
-	cd ${S}
-	automake
-	autoconf
-}
-
-src_compile() {
-
-	local myconf
-	local mymake
-	if [ -z "`use nls`" ] ; then
-		myconf="--disable-nls"
-	fi
-
-	if [ -z "`use perl`" ] ; then
-		myconf="${myconf} --disable-perl"
-	else
-		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
-
-	# Doesn't work with -j 4 (hallski)
-	make ${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
-	     
-	preplib /usr
-	
-	dodoc AUTHORS COPYING ChangeLog* *MAINTAINERS README* TODO
-	dodoc docs/*.txt docs/*.ps docs/Wilber* docs/quick_reference.tar.gz
-	docinto html/libgimp
-	dodoc devel-docs/libgimp/html/*.html
-	docinto devel
-	dodoc devel-docs/*.txt
-}
-
-
-
-
-
diff --git a/media-gfx/gimp/gimp-1.2.3-r1.ebuild b/media-gfx/gimp/gimp-1.2.3-r1.ebuild
deleted file mode 100644
index 48b6209335dc..000000000000
--- a/media-gfx/gimp/gimp-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.3-r1.ebuild,v 1.1 2002/02/15 04:33:42 azarah Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="The GIMP"
-SRC_URI="ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/v1.2/v${PV}/${P}.tar.bz2
-	ftp://ftp.gimp.org/pub/gimp/v1.2/v${PV}/${P}.tar.bz2"
-HOMEPAGE="http://www.gimp.org/"
-
-DEPEND="nls? ( sys-devel/gettext )
-        sys-devel/autoconf
-	sys-devel/automake
-	>=x11-libs/gtk+-1.2.10-r4
-	>=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.10-r4
-	 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
-
-	cd ${S}
-	automake
-	autoconf
-
-	touch plug-ins/common/gimp-1.2.3.tar.bz2
-}
-
-src_compile() {
-
-	local myconf
-	local mymake
-	local myvars
-
-	if [ -z "`use nls`" ] ; then
-		myconf="--disable-nls"
-	fi
-
-	if [ -z "`use perl`" ] ; then
-		myconf="${myconf} --disable-perl"
-	else
-		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)
-	make ${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 /usr/bin/gimp-1.2 /usr/bin/gimp
-	     
-	preplib /usr
-	
-	dodoc AUTHORS COPYING ChangeLog* *MAINTAINERS README* TODO
-	dodoc docs/*.txt docs/*.ps docs/Wilber* docs/quick_reference.tar.gz
-	docinto html/libgimp
-	dodoc devel-docs/libgimp/html/*.html
-	docinto devel
-	dodoc devel-docs/*.txt
-}
-
-
-
-
-
diff --git a/media-gfx/gimp/gimp-1.2.3.ebuild b/media-gfx/gimp/gimp-1.2.3.ebuild
deleted file mode 100644
index 176b66312229..000000000000
--- a/media-gfx/gimp/gimp-1.2.3.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-
-S=${WORKDIR}/${P}
-DESCRIPTION="The GIMP"
-SRC_URI="ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/v1.2/v${PV}/${P}.tar.bz2
-	ftp://ftp.gimp.org/pub/gimp/v1.2/v${PV}/${P}.tar.bz2"
-HOMEPAGE="http://www.gimp.org/"
-
-DEPEND="nls? ( sys-devel/gettext )
-        sys-devel/autoconf
-	sys-devel/automake
-	>=x11-libs/gtk+-1.2.10-r4
-	>=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.10-r4
-	 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
-
-	cd ${S}
-	automake
-	autoconf
-
-	touch plug-ins/common/gimp-1.2.3.tar.bz2
-}
-
-src_compile() {
-
-	local myconf
-	local mymake
-	local myvars
-
-	if [ -z "`use nls`" ] ; then
-		myconf="--disable-nls"
-	fi
-
-	if [ -z "`use perl`" ] ; then
-		myconf="${myconf} --disable-perl"
-	else
-		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)
-	make ${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
-	     
-	preplib /usr
-	
-	dodoc AUTHORS COPYING ChangeLog* *MAINTAINERS README* TODO
-	dodoc docs/*.txt docs/*.ps docs/Wilber* docs/quick_reference.tar.gz
-	docinto html/libgimp
-	dodoc devel-docs/libgimp/html/*.html
-	docinto devel
-	dodoc devel-docs/*.txt
-}
-
-
-
-
-