7 files changed, 82 insertions, 144 deletions
diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 7e1f1f7a8c73..c31ec2627b49 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,11 @@
 # 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.22 2003/02/12 06:59:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.23 2003/02/24 17:00:15 foser Exp $
+
+*gimp-1.3.12 (24 Feb 2003)
+
+  24 Feb 2003; foser <foser@gentoo.org> gimp-1.3.12.ebuild :
+  New version, added aalib USE and xpm dep
 
 *gimp-1.3.11 (05 Jan 2003)
 
diff --git a/media-gfx/gimp/files/digest-gimp-1.3.10 b/media-gfx/gimp/files/digest-gimp-1.3.10
deleted file mode 100644
index 4af9fda4de0a..000000000000
--- a/media-gfx/gimp/files/digest-gimp-1.3.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e4845ef30eb38b328b34b2d5243723cc gimp-1.3.10.tar.bz2 9911982
diff --git a/media-gfx/gimp/files/digest-gimp-1.3.12 b/media-gfx/gimp/files/digest-gimp-1.3.12
new file mode 100644
index 000000000000..1d254f3b1045
--- /dev/null
+++ b/media-gfx/gimp/files/digest-gimp-1.3.12
@@ -0,0 +1 @@
+MD5 1f3eda10fc8e6379e5578f21a925e2be gimp-1.3.12.tar.bz2 10226396
diff --git a/media-gfx/gimp/files/digest-gimp-1.3.9 b/media-gfx/gimp/files/digest-gimp-1.3.9
deleted file mode 100644
index b8f08ba4573a..000000000000
--- a/media-gfx/gimp/files/digest-gimp-1.3.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 618b60e2e1762a37e89a8db0c024ee08 gimp-1.3.9.tar.bz2 9754975
diff --git a/media-gfx/gimp/gimp-1.3.10.ebuild b/media-gfx/gimp/gimp-1.3.10.ebuild
deleted file mode 100644
index 781a735f9c4c..000000000000
--- a/media-gfx/gimp/gimp-1.3.10.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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.10.ebuild,v 1.2 2003/02/13 12:32:41 vapier Exp $
-
-IUSE="doc python"
-
-inherit debug
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Development series of Gimp"
-SRC_URI="ftp://ftp.gimp.org/pub/gimp/v1.3/v${PV}/${P}.tar.bz2"
-HOMEPAGE="http://www.gimp.org/"
-SLOT="1.4"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
-
-#libglade
-RDEPEND=">=x11-libs/gtk+-2.0.0
-	>=x11-libs/pango-1.0.0
-	>=dev-libs/glib-2.0.0
-	>=media-libs/libpng-1.2.1
-	>=media-libs/jpeg-6b-r2
-	>=media-libs/tiff-3.5.7
-	>=media-libs/libart_lgpl-2.3.8-r1
-	sys-devel/gettext
-	python? ( >=dev-lang/python-2.2 )"
-# Bah, circ dependency
-#	cups? ( media-gfx/gimp-print )
-	
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-0.9 )"
-
-src_compile() {
-	local myconf
-	use doc && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --disable-gtk-doc"
-
-# python seems not yet ready
-#	use python && myconf="${myconf} --enable-python" \
-#		|| myconf="${myconf} --disable-python"
-
-# circular dependency
-# 	use cups && myconf="${myconf} --enable-print" || myconf="${myconf} --disable-print"
-	myconf="${myconf} --disable-print"
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--localstatedir=/var/lib \
-		--disable-perl ${myconf} \
-		--without-gnome-desktop \
-		|| die
-	# disable gnome-desktop since it breaks sandboxing
-
-# hack for odd make break
-	touch plug-ins/common/${P}.tar.bz2
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} prefix=/usr \
-		sysconfdir=/etc \
-		infodir=/usr/share/info \
-		mandir=/usr/share/man \
-		localstatedir=/var/lib \
-		install || die
-    
-	dodoc AUTHORS COPYING ChangeL* HACKING INSTALL MAINTAINERS NEWS PLUGIN_MAINTAINERS README* TODO* 
-}
-
-
diff --git a/media-gfx/gimp/gimp-1.3.12.ebuild b/media-gfx/gimp/gimp-1.3.12.ebuild
new file mode 100644
index 000000000000..28d6b1b581f4
--- /dev/null
+++ b/media-gfx/gimp/gimp-1.3.12.ebuild
@@ -0,0 +1,75 @@
+# 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.12.ebuild,v 1.1 2003/02/24 17:00:15 foser Exp $
+
+IUSE="doc python aalib"
+
+inherit debug
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Development series of Gimp"
+SRC_URI="ftp://ftp.gimp.org/pub/gimp/v1.3/v${PV}/${P}.tar.bz2"
+HOMEPAGE="http://www.gimp.org/"
+SLOT="1.4"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+
+#libglade
+RDEPEND=">=x11-libs/gtk+-2
+	>=x11-libs/pango-1
+	>=dev-libs/glib-2
+	>=gnome-extra/libgtkhtml-2
+
+	>=media-libs/libpng-1.2.1
+	>=media-libs/jpeg-6b-r2
+	>=media-libs/tiff-3.5.7
+	>=media-libs/libart_lgpl-2.3.8-r1
+	media-libs/xpm
+
+	aalib? ( media-libs/aalib )
+	python? ( >=dev-lang/python-2.2 
+		>=dev-python/pygtk-1.99.13 ) "
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	sys-devel/gettext
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+src_compile() {
+	local myconf
+
+	use doc \
+		&& myconf="${myconf} --enable-gtk-doc" \
+		|| myconf="${myconf} --disable-gtk-doc"
+	use python \
+		&& myconf="${myconf} --enable-python" \
+		|| myconf="${myconf} --disable-python"
+
+	myconf="${myconf} --disable-print"
+
+	#econf --disable-perl --with-gnome-datadir=${D}/usr/share ${myconf} || die
+	econf --disable-perl ${myconf} --without-gnome-desktop || die
+	# disable gnome-desktop since it breaks sandboxing
+
+	# hack for odd make break
+	touch plug-ins/common/${P}.tar.bz2
+
+	emake || die
+}
+
+src_install() {
+        make DESTDIR=${D} prefix=/usr \
+                sysconfdir=/etc \
+                infodir=/usr/share/info \
+                mandir=/usr/share/man \
+                localstatedir=/var/lib \
+                install || die
+    
+	dodoc AUTHORS COPYING ChangeL* HACKING INSTALL MAINTAINERS NEWS PLUGIN_MAINTAINERS README* TODO* 
+}
+
+pkg_postinst() {
+	ewarn "There have been changes to the gtkrc file."
+	ewarn "You are strongly advised to remove the ~/.gimp-1.3 directory and perform a fresh"
+	ewarn "user installation if you have been running a gimp-1.3 below minor version 11"
+}
diff --git a/media-gfx/gimp/gimp-1.3.9.ebuild b/media-gfx/gimp/gimp-1.3.9.ebuild
deleted file mode 100644
index 92f64a1ef332..000000000000
--- a/media-gfx/gimp/gimp-1.3.9.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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.9.ebuild,v 1.2 2003/02/13 12:32:49 vapier Exp $
-
-IUSE="doc"
-
-inherit debug
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Development series of Gimp"
-SRC_URI="ftp://ftp.gimp.org/pub/gimp/v1.3/v${PV}/${P}.tar.bz2"
-HOMEPAGE="http://www.gimp.org/"
-SLOT="1.4"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
-
-#libglade
-RDEPEND=">=x11-libs/gtk+-2.0.0
-	>=x11-libs/pango-1.0.0
-	>=dev-libs/glib-2.0.0
-	>=media-libs/libpng-1.2.1
-	>=media-libs/jpeg-6b-r2
-	>=media-libs/tiff-3.5.7
-	>=media-libs/libart_lgpl-2.3.8-r1
-	sys-devel/gettext"
-# Bah, circ dependency
-#	cups? ( media-gfx/gimp-print )
-	
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-0.9 )"
-
-src_compile() {
-	local myconf
-	use doc && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --disable-gtk-doc"
-# circular dependency
-# 	use cups && myconf="${myconf} --enable-print" || myconf="${myconf} --disable-print"
-	myconf="${myconf} --disable-print"
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--localstatedir=/var/lib \
-		--disable-perl ${myconf} \
-		--without-gnome-desktop \
-		|| die
-	# disable gnome-desktop since it breaks sandboxing
-
-# hack for odd make break
-	touch plug-ins/common/${P}.tar.bz2
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} prefix=/usr \
-		sysconfdir=/etc \
-		infodir=/usr/share/info \
-		mandir=/usr/share/man \
-		localstatedir=/var/lib \
-		install || die
-    
-	dodoc AUTHORS COPYING ChangeL* HACKING INSTALL MAINTAINERS NEWS PLUGIN_MAINTAINERS README* TODO* 
-
-}
-
-