version bump

4 files changed, 114 insertions, 3 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index f1637041fb92..ae298c14d33e 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,7 +1,14 @@
 # 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.51 2003/08/30 18:14:43 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.52 2003/09/20 08:47:55 liquidx Exp $
 
+*gimp-1.3.20 (20 Sep 2003)
+
+  20 Sep 2003; Alastair Tse <liquidx@gentoo.org> gimp-1.3.20.ebuild:
+  version bump. this version has uses libtool 1.5a, and as a result, the
+  troubles with upgrading has re-appeared.we are resorting to the symlink trick
+  at the moment until we can find out how to fix it.
+  
 *gimp-1.3.19 (30 Aug 2003)
 
   30 Aug 2003; Alastair Tse <liquidx@gentoo.org> gimp-1.3.19.ebuild:
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index d336a3cf33bc..3c4c1fa45b52 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,11 +1,11 @@
-MD5 f4e5ec69e2d761efb43ac249c4058a37 ChangeLog 8145
+MD5 ee82130ecd24e2c563151eca5179e919 ChangeLog 8451
 MD5 d410d062966d05248f9c4251bd81d3af gimp-1.2.3-r3.ebuild 4707
 MD5 3d28dd0ccc739e10db388438d4f06dda gimp-1.2.4.ebuild 3086
 MD5 d235271944c1076aa7edb1726b79fecd gimp-1.2.5.ebuild 3253
 MD5 74527154777079e96af121051dc3441b gimp-1.3.17.ebuild 2413
 MD5 06e96d6cc8a8dd73b20043a194b716ce gimp-1.3.18.ebuild 2400
 MD5 75ad0c3088982ebf00bc3d06d2f47602 gimp-1.3.19.ebuild 2400
-MD5 75ad0c3088982ebf00bc3d06d2f47602 gimp-1.3.20.ebuild 2400
+MD5 6d1e107d7780a1459c45cb18a818f6a5 gimp-1.3.20.ebuild 2796
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 86617fa03849f2ba22c845a31ddf8958 files/digest-gimp-1.2.3-r3 65
 MD5 86551dc2402aaed28ccf3612e8fe7b7a files/digest-gimp-1.2.4 65
diff --git a/media-gfx/gimp/files/digest-gimp-1.3.20 b/media-gfx/gimp/files/digest-gimp-1.3.20
new file mode 100644
index 000000000000..ff8364b2ed67
--- /dev/null
+++ b/media-gfx/gimp/files/digest-gimp-1.3.20
@@ -0,0 +1 @@
+MD5 e77d4b2948b57eb0739cde0f76aea57b gimp-1.3.20.tar.bz2 11380508
diff --git a/media-gfx/gimp/gimp-1.3.20.ebuild b/media-gfx/gimp/gimp-1.3.20.ebuild
new file mode 100644
index 000000000000..7a75ac2509cf
--- /dev/null
+++ b/media-gfx/gimp/gimp-1.3.20.ebuild
@@ -0,0 +1,103 @@
+# 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.20.ebuild,v 1.1 2003/09/20 08:47:55 liquidx Exp $
+
+IUSE="doc python aalib png jpeg tiff gtkhtml mmx sse X"
+
+inherit debug flag-o-matic libtool
+
+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="2"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~hppa ~sparc"
+
+# protect against over optimisation (related to #21787)
+replace-flags -Os -O2
+MAKEOPTS="${MAKEOPTS} -j1"
+
+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
+		media-libs/libexif )
+	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 )
+
+	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_unpack() {
+	unpack ${A}
+	# note: this make elibtoolize do some weird things, so disabling - liquidx
+	# replace ltmain.sh from libtool 1.5a with libtool 1.4.x
+	#cd ${S}; aclocal; automake; libtoolize --force; autoconf
+}
+
+src_compile() {
+	# since 1.3.16, fixes linker problems when upgrading
+	elibtoolize --reverse-deps
+
+	# workaround portage variable leakage
+	local AA
+	local myconf
+
+	replace-flags "-march=k6*" "-march=i586"
+	# gimp uses inline functions (plug-ins/common/grid.c) (#23078)
+	filter-flags "-fno-inline"
+
+	econf ${myconf} \
+		`use_enable mmx` \
+		`use_enable sse` \
+		`use_enable doc gtk-doc` \
+		`use_enable python` \
+		`use_with X x` \
+		`use_with png libpng` \
+		`use_with jpeg libjpeg` \
+		`use_with jpeg libexif` \
+		`use_with tiff libtiff` \
+		`use_with aalib aa` \
+		--enable-debug \
+		--disable-print || die
+
+	emake || die
+}
+
+src_install() {
+	# workaround portage variable leakage
+	local AA
+
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS COPYING ChangeL* HACKING INSTALL MAINTAINERS NEWS PLUGIN_MAINTAINERS README* TODO*
+
+	# fix desktop link in the right place
+	dodir /usr/share/applications
+	rm ${D}/usr/share/gimp/1.3/misc/gimp-1.3.desktop
+	mv ${D}/usr/share/gimp/1.3/misc/gimp.desktop ${D}/usr/share/applications/gimp-1.3.desktop
+	
+	# create temporary libtool workaround links
+	for x in libgimp libgimpwidgets libgimpbase libgimpcolor; do
+		dosym /usr/lib/${x}-1.3.so.20 /usr/lib/${x}-1.3.so.19
+	done		
+}
+
+pkg_postinst() {
+	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."
+}