new dev version

9 files changed, 25 insertions, 221 deletions

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index be636cf5dacf..ddb0377abd52 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,25 +1,18 @@
-MD5 5c5db8b34a5eef5999b14dc1fbe3e081 gimp-1.3.17.ebuild 2428
-MD5 333c7a300975f264fb660cc0b65025fe gimp-1.3.14.ebuild 2492
+MD5 5bdd42927a61acb8ad9210df5777738c gimp-1.3.17.ebuild 2406
 MD5 4c0ee765b6864845a0df8a0c3ac9014a gimp-1.2.5.ebuild 3200
-MD5 bbf44a3a26484a0e47eadac8a3f54fd2 gimp-1.3.16.ebuild 2429
+MD5 c3dc61c814aa0cc40bf9b53c95128d8b gimp-1.3.16.ebuild 2425
 MD5 3ffcb6910a8be02857177f4179725ca8 gimp-1.2.3-r3.ebuild 4717
-MD5 29551bea3b9848d4373c27f1b17fc039 gimp-1.3.13.ebuild 2356
 MD5 b0e19c97a61c41bd47f0783ca135d07d gimp-1.2.4.ebuild 3091
-MD5 3d3b0ce9834a688916f4daac7ccc52b7 ChangeLog 7164
+MD5 573f1e5922221fc247c2393b4878d838 ChangeLog 7422
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 96f56a23292f1416ab2074951d66c233 gimp-1.3.15.ebuild 2273
 MD5 6606255b200760d9524e19a95740a492 gimp-1.2.3-r2.ebuild 4080
 MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r3-gentoo.diff 427
-MD5 5f27a61ede63f16d8e88660e081e1200 files/gimp-1.3-link_fix.patch 10365
 MD5 86617fa03849f2ba22c845a31ddf8958 files/digest-gimp-1.2.3-r2 65
 MD5 86617fa03849f2ba22c845a31ddf8958 files/digest-gimp-1.2.3-r3 65
 MD5 f2b58299eceabecfe5df955198c267d6 files/psd_save.c 49151
 MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.4-gentoo.diff 427
 MD5 9696bde4a1b70dd2816d46bed477ebc0 files/gimp.desktop 2404
 MD5 cdda0b1cc179cf75eabb63945efdae0e files/gimp-1.2.3-libgimpi-libtool.diff 1365
-MD5 13e882e38fccf991bbea8677bedca67e files/digest-gimp-1.3.13 66
-MD5 89fee7931deb88ed771f5ec2ec28aea4 files/digest-gimp-1.3.14 66
-MD5 ba7261fba402df352c9f7d8d496457db files/digest-gimp-1.3.15 66
 MD5 e8adce46a21cdb214def668b6577902c files/digest-gimp-1.3.16 66
 MD5 bc0cf9570b3e8a71b95426095b0ca86c files/digest-gimp-1.3.17 66
 MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r2-gentoo.diff 427
diff --git a/media-gfx/gimp/files/digest-gimp-1.3.13 b/media-gfx/gimp/files/digest-gimp-1.3.13
deleted file mode 100644
index ff07135424e8..000000000000
--- a/media-gfx/gimp/files/digest-gimp-1.3.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fdc6a57cae53b7f3d01516e6205bdaaf gimp-1.3.13.tar.bz2 10310077
diff --git a/media-gfx/gimp/files/digest-gimp-1.3.14 b/media-gfx/gimp/files/digest-gimp-1.3.14
deleted file mode 100644
index ddcf7f1b6be2..000000000000
--- a/media-gfx/gimp/files/digest-gimp-1.3.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8fa594f7527a37662722728bb55d40a6 gimp-1.3.14.tar.bz2 10596207
diff --git a/media-gfx/gimp/files/digest-gimp-1.3.15 b/media-gfx/gimp/files/digest-gimp-1.3.15
deleted file mode 100644
index 679e2eb4bc10..000000000000
--- a/media-gfx/gimp/files/digest-gimp-1.3.15
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c0ca246339857e3afdc47769c331f01a gimp-1.3.15.tar.bz2 10564287
diff --git a/media-gfx/gimp/files/digest-gimp-1.3.17 b/media-gfx/gimp/files/digest-gimp-1.3.17
new file mode 100644
index 000000000000..550b953bb069
--- /dev/null
+++ b/media-gfx/gimp/files/digest-gimp-1.3.17
@@ -0,0 +1 @@
+MD5 d1fe81d77d9860ab47fda6f298cbf89a gimp-1.3.17.tar.bz2 10611101
diff --git a/media-gfx/gimp/gimp-1.3.13.ebuild b/media-gfx/gimp/gimp-1.3.13.ebuild
deleted file mode 100644
index 4b6247d8ba29..000000000000
--- a/media-gfx/gimp/gimp-1.3.13.ebuild
+++ /dev/null
@@ -1,93 +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.13.ebuild,v 1.3 2003/06/10 12:54:48 liquidx Exp $
-
-IUSE="doc python aalib"
-
-inherit debug flag-o-matic
-
-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"
-
-replace-flags -Os -O2
-
-#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
-
-	aalib?	( media-libs/aalib )
-	python?	( >=dev-lang/python-2.2
-		>=dev-python/pygtk-1.99.13 )
-
-	perl?	( dev-lang/perl )"
-
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	sys-devel/gettext
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-src_compile() {
-
-	# Strip out -fomit-frame-pointer for k6's
-	is-flag "-march=k6-3" && strip-flags "-fomit-frame-pointer"
-	is-flag "-march=k6-2" && strip-flags "-fomit-frame-pointer"
-	is-flag "-march=k6" && strip-flags "-fomit-frame-pointer"
-
-
-	local myconf
-
-	use doc \
-		&& myconf="${myconf} --enable-gtk-doc" \
-		|| myconf="${myconf} --disable-gtk-doc"
-	use python \
-		&& myconf="${myconf} --enable-python" \
-		|| myconf="${myconf} --disable-python"
-	use perl \
-		&& myconf="${myconf} --enable-perl" \
-		|| myconf="${myconf} --disable-perl"
-
-	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
-
-	econf ${myconf} || die
-
-	# 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
-	ewarn "You are strongly advised to remove the ~/.gimp-1.3 directory"
-	ewarn "and perform a fresh user installation if you have been"
-	ewarn "running a gimp-1.3 below minor version 11"
-}
diff --git a/media-gfx/gimp/gimp-1.3.14.ebuild b/media-gfx/gimp/gimp-1.3.14.ebuild
deleted file mode 100644
index 98a641261eeb..000000000000
--- a/media-gfx/gimp/gimp-1.3.14.ebuild
+++ /dev/null
@@ -1,100 +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.14.ebuild,v 1.4 2003/04/19 17:48:50 malverian Exp $
-
-IUSE="doc python perl aalib png jpeg tiff gtkhtml"
-
-inherit debug flag-o-matic
-
-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"
-
-replace-flags -Os -O2
-
-RDEPEND=">=x11-libs/gtk+-2.2
-	>=x11-libs/pango-1.2
-	>=dev-libs/glib-2.2
-	gtkhtml? ( =gnome-extra/libgtkhtml-2* )
-
-	png? ( >=media-libs/libpng-1.2.1 )
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( >=media-libs/tiff-3.5.7 )
-	>=media-libs/libart_lgpl-2.3.8-r1
-
-	aalib?	( media-libs/aalib )
-	python?	( >=dev-lang/python-2.2
-		>=dev-python/pygtk-1.99.13 )
-
-	perl?	( dev-lang/perl )"
-
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	sys-devel/gettext
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-src_compile() {
-
-	# Strip out -fomit-frame-pointer for k6's
-	is-flag "-march=k6*" && filter-flags "-fomit-frame-pointer"
-
-
-	local myconf
-
-	use doc \
-		&& myconf="${myconf} --enable-gtk-doc" \
-		|| myconf="${myconf} --disable-gtk-doc"
-	use python \
-		&& myconf="${myconf} --enable-python" \
-		|| myconf="${myconf} --disable-python"
-	use perl \
-		&& myconf="${myconf} --enable-perl" \
-		|| myconf="${myconf} --disable-perl"
-	use png \
-		&& myconf="${myconf} --with-libpng" \
-		|| myconf="${myconf} --without-libpng"
-	use jpeg \
-		&& myconf="${myconf} --with-libjpeg" \
-		|| myconf="${myconf} --without-libjpeg"
-	use tiff \
-		&& myconf="${myconf} --with-libtiff" \
-		|| myconf="${myconf} --without-libtiff"
-	use gtkhtml \
-		&& myconf="${myconf} --with-libtiff" \
-		|| myconf="${myconf} --without-libtiff"
-
-	myconf="${myconf} --disable-print"
-
-	econf ${myconf} || die
-
-
-	# 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
-	ewarn "You are strongly advised to remove the ~/.gimp-1.3 directory"
-	ewarn "and perform a fresh user installation if you have been"
-	ewarn "running a gimp-1.3 below minor version 11"
-}
diff --git a/media-gfx/gimp/gimp-1.3.16.ebuild b/media-gfx/gimp/gimp-1.3.16.ebuild
index 8d255d53a460..aaee6a8da750 100644
--- a/media-gfx/gimp/gimp-1.3.16.ebuild
+++ b/media-gfx/gimp/gimp-1.3.16.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.16.ebuild,v 1.1 2003/07/05 19:38:51 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.3.16.ebuild,v 1.2 2003/07/25 20:20:59 foser Exp $
 
 IUSE="doc python perl aalib png jpeg tiff gtkhtml"
 
@@ -10,7 +10,7 @@ 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"
+SLOT="2"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc"
 
diff --git a/media-gfx/gimp/gimp-1.3.15.ebuild b/media-gfx/gimp/gimp-1.3.17.ebuild
index df0091e87d77..85be517f333f 100644
--- a/media-gfx/gimp/gimp-1.3.15.ebuild
+++ b/media-gfx/gimp/gimp-1.3.17.ebuild
@@ -1,16 +1,15 @@
 # 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.8 2003/07/05 13:39:10 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.3.17.ebuild,v 1.1 2003/07/25 20:20:59 foser Exp $
 
-IUSE="doc python perl aalib png jpeg tiff gtkhtml"
+IUSE="doc python aalib png jpeg tiff gtkhtml mmx sse X"
 
-inherit debug flag-o-matic
+inherit debug flag-o-matic libtool
 
-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"
+SLOT="2"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~hppa"
 
@@ -26,21 +25,27 @@ RDEPEND=">=x11-libs/gtk+-2.2
 	png? ( >=media-libs/libpng-1.2.1 )
 	jpeg? ( >=media-libs/jpeg-6b-r2 )
 	tiff? ( >=media-libs/tiff-3.5.7 )
-	>=media-libs/libart_lgpl-2.3.8-r1
+		>=media-libs/libart_lgpl-2.3.8-r1
 
 	aalib?	( media-libs/aalib )
 	python?	( >=dev-lang/python-2.2
 		>=dev-python/pygtk-1.99.13 )
 
-	perl?	( dev-lang/perl )"
+	X? ( virtual/x11 )"
 
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0
+	dev-util/intltool
 	sys-devel/gettext
+	>=sys-devel/libtool-1.4.3-r1
 	doc? ( >=dev-util/gtk-doc-1 )"
+# be safe and require the latest libtool
 
 src_compile() {
+	# since 1.3.16, fixes linker problems when upgrading
+	elibtoolize --reverse-deps
+
 	# workaround portage variable leakage
 	local AA
 	local myconf
@@ -51,12 +56,16 @@ src_compile() {
 	filter-flags "-fno-inline"
 
 	econf ${myconf} \
+		`use_enable mmx` \
+		`use_enable sse` \
 		`use_enable doc gtk-doc` \
 		`use_enable python` \
-		`use_enable perl` \
+		`use_with X x` \
 		`use_with png libpng` \
 		`use_with jpeg libjpeg` \
 		`use_with tiff libtiff` \
+		`use_with aalib aa` \
+		--enable-debug \
 		--disable-print || die
 
 	emake || die
@@ -76,9 +85,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	ewarn "There have been changes to the gtkrc file."
-	ewarn
-	ewarn "You are strongly advised to remove the ~/.gimp-1.3 directory"
-	ewarn "and perform a fresh user installation if you have been"
-	ewarn "running a gimp-1.3 below minor version 11"
+	ewarn "The 1.3 Gimp series have been reslotted to SLOT 2."
+	ewarn "To clean up old 1.3 version remove all 1.3 series and recompile." 
 }