new version and some cleanups

6 files changed, 136 insertions, 9 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index e88c58e2d868..fac5bf4cc1ff 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.38 2003/06/12 13:22:40 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.39 2003/06/17 22:57:21 foser Exp $
+
+*gimp-1.2.5 (17 Jun 2003)
+
+  17 Jun 2003; foser <foser@gentoo.org> gimp-1.2.5.ebuild :
+  New version, add AA fix to be on the safe side
+  tidy up filterflags stuff a bit
+  
+  17 Jun 2003; foser <foser@gentoo.org> gimp-1.3.15.ebuild :
+  revert gtkhtml/print changes liquidx did, always disable printint support for now
 
   12 Jun 2003; Alastair Tse <liquidx@gentoo.org> gimp-1.3.15.ebuild:
   restored gtkhtml useflag to use the --disable/enable-print config flag
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 5110c41efc56..c48ebd95844e 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,10 +1,10 @@
 MD5 333c7a300975f264fb660cc0b65025fe gimp-1.3.14.ebuild 2492
-MD5 58d7b7167b6d8d6e9e476fbf6a7ed542 gimp-1.2.5.ebuild 2978
+MD5 cf4c8fe40269dc8c7264609ad8aeb8d5 gimp-1.2.5.ebuild 2975
 MD5 3ffcb6910a8be02857177f4179725ca8 gimp-1.2.3-r3.ebuild 4717
 MD5 29551bea3b9848d4373c27f1b17fc039 gimp-1.3.13.ebuild 2356
-MD5 58d7b7167b6d8d6e9e476fbf6a7ed542 gimp-1.2.4.ebuild 2978
-MD5 229e33e478e655f893ec7578bb0a9984 ChangeLog 6071
-MD5 b3dbedf59d5eb84a678958f32c60000a gimp-1.3.15.ebuild 1920
+MD5 9d05730cd0589897cf6e6df5afa81a71 gimp-1.2.4.ebuild 2977
+MD5 ca1e4e0274ba2b70f9b861dfebc13827 ChangeLog 6388
+MD5 edbec97563e2f24bf3859ee033879d5f gimp-1.3.15.ebuild 1904
 MD5 6606255b200760d9524e19a95740a492 gimp-1.2.3-r2.ebuild 4080
 MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r3-gentoo.diff 427
 MD5 86617fa03849f2ba22c845a31ddf8958 files/digest-gimp-1.2.3-r2 65
diff --git a/media-gfx/gimp/files/digest-gimp-1.2.5 b/media-gfx/gimp/files/digest-gimp-1.2.5
new file mode 100644
index 000000000000..68e979f654b6
--- /dev/null
+++ b/media-gfx/gimp/files/digest-gimp-1.2.5
@@ -0,0 +1 @@
+MD5 b83b55d80e6728268d56620ea4d3051a gimp-1.2.5.tar.bz2 10885324
diff --git a/media-gfx/gimp/gimp-1.2.4.ebuild b/media-gfx/gimp/gimp-1.2.4.ebuild
index 305651ee8618..433ac010a420 100644
--- a/media-gfx/gimp/gimp-1.2.4.ebuild
+++ b/media-gfx/gimp/gimp-1.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.4.ebuild,v 1.3 2003/06/07 17:20:51 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.4.ebuild,v 1.4 2003/06/17 22:57:21 foser Exp $
 
 inherit eutils flag-o-matic
 
@@ -12,7 +12,7 @@ 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 ~sparc ~alpha"
+KEYWORDS="x86 ~ppc ~sparc ~alpha"
 LICENSE="GPL-2"
 
 RDEPEND="=x11-libs/gtk+-1.2*
diff --git a/media-gfx/gimp/gimp-1.2.5.ebuild b/media-gfx/gimp/gimp-1.2.5.ebuild
new file mode 100644
index 000000000000..25946d870a68
--- /dev/null
+++ b/media-gfx/gimp/gimp-1.2.5.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2003 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.5.ebuild,v 1.1 2003/06/17 22:57:21 foser Exp $
+
+inherit eutils flag-o-matic
+
+IUSE="python nls gnome aalib perl doc jpeg png tiff doc"
+
+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 ~sparc ~alpha"
+LICENSE="GPL-2"
+
+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 )
+	tiff? ( media-libs/tiff )
+	jpeg ( media-libs/jpeg )
+	png? ( media-libs/libpng )"
+
+DEPEND="nls? ( sys-devel/gettext )
+	doc? ( dev-util/gtk-doc )
+	>=media-libs/mpeg-lib-1.3.1
+	${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	# here for a mysterious reason
+	touch ${S}/plug-ins/common/${P}.tar.bz2
+}
+
+src_compile() {
+
+	# fix problem with k6's (#22115)
+	replace-flags "-march=k6*" "-march=i586"
+
+	local mymake=""
+	local AA
+
+	use aalib || mymake="LIBAA= AA="
+	use gnome || mymake="${mymake} HELPBROWSER="
+	use perl && export PERL_MM_OPT=' PREFIX=${D}/usr'
+
+	econf \
+		--with-mp \
+		--with-threads \
+		--disable-debug \
+		--disable-print \
+		`use_enable perl` \
+		`use_enable python` \
+		`use_enable nls` \
+		`use_with jpeg libjpeg` \
+		`use_with png libpng` \
+		`use_with tiff libtiff` \
+		`use_enable doc gtk-doc` \
+		${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
+
+	MAKEOPTS="${MAKEOPTS} -j1"
+	emake ${mymake} || die
+}
+
+src_install() {
+
+	local mymake="" 
+	local AA
+
+	use aalib || mymake="LIBAA= AA="
+	use gnome || mymake="${mymake} HELPBROWSER="
+  
+	dodir /usr/lib/gimp/1.2/plug-ins
+	
+	einstall \
+		gimpdatadir=${D}/usr/share/gimp/1.2 \
+		gimpsysconfdir=${D}/etc/gimp/1.2 \
+		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 \
+		INSTALLSITEMAN1DIR=${D}/usr/share/man/man1 \
+		INSTALLSITEMAN3DIR=${D}/usr/share/man/man3pm \
+		INSTALLVENDORMAN1DIR=${D}/usr/share/man/man1 \
+		INSTALLVENDORMAN3DIR=${D}/usr/share/man/man3pm \
+		${mymake} || die "Installation failed"
+
+	dosym gimp-1.2 /usr/bin/gimp
+	#this next line closes bug #810
+	dosym gimptool-1.2 /usr/bin/gimptool
+
+	use gnome && (
+		insinto /usr/share/applications
+		doins ${FILESDIR}/gimp.desktop
+	)
+	
+	preplib /usr
+	
+	dodoc AUTHORS COPYING ChangeLog* *MAINTAINERS README* TODO
+	dodoc docs/*.txt docs/*.ps docs/Wilber* docs/quick_reference.tar.gz
+}
diff --git a/media-gfx/gimp/gimp-1.3.15.ebuild b/media-gfx/gimp/gimp-1.3.15.ebuild
index 17c05a1f6eba..535a0479f19a 100644
--- a/media-gfx/gimp/gimp-1.3.15.ebuild
+++ b/media-gfx/gimp/gimp-1.3.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.3.15.ebuild,v 1.3 2003/06/12 13:22:40 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.3.15.ebuild,v 1.4 2003/06/17 22:57:21 foser Exp $
 
 IUSE="doc python perl aalib png jpeg tiff gtkhtml"
 
@@ -54,7 +54,7 @@ src_compile() {
 		`use_with png libpng` \
 		`use_with jpeg libjpeg` \
 		`use_with tiff libtiff` \
-		`use_enable libgtkhtml print` || die
+		--disable-print || die
 
 	emake || die
 }