new release, mark 2.0.0 x86

5 files changed, 121 insertions, 5 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 1f99993645d6..3e9066378bb1 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.81 2004/06/07 21:40:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.82 2004/06/21 23:26:49 foser Exp $
+
+*gimp-2.0.2 (22 Jun 2004)
+
+  22 Jun 2004; foser <foser@gentoo.org> gimp-2.0.2.ebuild :
+  New release, as requested in #47983
+  Added svg USE as in #51263 (still autodetect based though :/)
+  Use --disable-default-binary instead of removing the versionless gimp link
 
   07 Jun 2004; Aron Griffis <agriffis@gentoo.org> gimp-1.2.3-r3.ebuild,
   gimp-1.2.4.ebuild, gimp-1.2.5.ebuild:
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index c15a458769eb..2f12cc247bb9 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,8 +1,9 @@
-MD5 ff48d878d00b827dcf08793c861cc458 gimp-2.0.0.ebuild 2663
+MD5 d6655e8e52726077647e3213045205f4 gimp-2.0.0.ebuild 2665
+MD5 ce5ae5d71364c06be889e2c500ac90d5 gimp-2.0.2.ebuild 2568
 MD5 407ec5f52d77b3d34e037a606baf3563 gimp-1.2.5.ebuild 3214
 MD5 fc6d6f0c6212cef9b6be1a5c8090d8a7 gimp-1.2.3-r3.ebuild 4601
 MD5 c815c21e193e42741c85441b01a77215 gimp-1.2.4.ebuild 3073
-MD5 d470e80443e21491df8b74649ce0a0ec ChangeLog 12577
+MD5 72fd60ab6a9aafcf2b1efec2f85a0e6a ChangeLog 12841
 MD5 82f7f5af98180c722f5d381722cff9cb gimp-2.0_pre3-r1.ebuild 2992
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r3-gentoo.diff 427
@@ -22,3 +23,4 @@ MD5 f8c14ef5c45d029ac5abc6c614701d5e files/gimp-1.3.20-screenshot_fix.patch 2002
 MD5 86551dc2402aaed28ccf3612e8fe7b7a files/digest-gimp-1.2.4 65
 MD5 662e7b51f4c882429b73dea3263b39de files/digest-gimp-1.2.5 65
 MD5 568ba885fc51613466e3b0039e21946c files/digest-gimp-2.0.0 65
+MD5 1f2afa6b0785b0547e956d5aff63cf4d files/digest-gimp-2.0.2 65
diff --git a/media-gfx/gimp/files/digest-gimp-2.0.2 b/media-gfx/gimp/files/digest-gimp-2.0.2
new file mode 100644
index 000000000000..e9d1b2d50be8
--- /dev/null
+++ b/media-gfx/gimp/files/digest-gimp-2.0.2
@@ -0,0 +1 @@
+MD5 b0dfdf4720e09ffa44fdc4d1bb48f82b gimp-2.0.2.tar.bz2 13788996
diff --git a/media-gfx/gimp/gimp-2.0.0.ebuild b/media-gfx/gimp/gimp-2.0.0.ebuild
index 6aa01d362c2b..363ec6305436 100644
--- a/media-gfx/gimp/gimp-2.0.0.ebuild
+++ b/media-gfx/gimp/gimp-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.0.0.ebuild,v 1.5 2004/06/01 21:59:10 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.0.0.ebuild,v 1.6 2004/06/21 23:26:49 foser Exp $
 
 inherit flag-o-matic libtool eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gimp.org/"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~hppa ~sparc amd64 ~mips"
+KEYWORDS="x86 ~ppc ~hppa ~sparc amd64 ~mips"
 IUSE="doc python aalib png jpeg tiff mng wmf gimpprint gtkhtml mmx sse X altivec debug"
 
 # FIXME : some more things can be (local) USE flagged
diff --git a/media-gfx/gimp/gimp-2.0.2.ebuild b/media-gfx/gimp/gimp-2.0.2.ebuild
new file mode 100644
index 000000000000..ff8819dbb848
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.0.2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.0.2.ebuild,v 1.1 2004/06/21 23:26:49 foser Exp $
+
+inherit flag-o-matic libtool eutils
+
+DESCRIPTION="GNU Image Manipulation Program"
+SRC_URI="mirror://gimp/v2.0/${P}.tar.bz2"
+HOMEPAGE="http://www.gimp.org/"
+
+SLOT="2"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~hppa ~sparc ~amd64 ~mips"
+IUSE="doc python aalib png jpeg tiff mng wmf gimpprint gtkhtml mmx sse X altivec debug"
+
+# FIXME : some more things can be (local) USE flagged
+# a few options are detection only, fix them to switch
+
+RDEPEND=">=dev-libs/glib-2.2
+	>=x11-libs/gtk+-2.2.2
+	>=x11-libs/pango-1.2.2
+	>=media-libs/fontconfig-2.2
+	>=media-libs/libart_lgpl-2.3.8-r1
+	sys-libs/zlib
+
+	gimpprint? ( =media-gfx/gimp-print-4.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 )
+	mng? ( media-libs/libmng )
+
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	svg? ( >=gnome-base/librsvg-2.2 )
+
+	aalib?	( media-libs/aalib )
+	python?	( >=dev-lang/python-2.2
+		>=dev-python/pygtk-2 )
+
+	X? ( virtual/x11 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	dev-util/intltool
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# Fix linking to older version of gimp if installed - this should
+	# void liquidx's hack, so it is removed.
+	epatch ${FILESDIR}/ltmain_sh-1.5.0-fix-relink.patch
+
+}
+
+src_compile() {
+
+	# Since 1.3.16, fixes linker problems when upgrading
+	elibtoolize
+
+	# Workaround portage variable leakage
+	local AA=
+
+	replace-flags "-march=k6*" "-march=i586"
+	# gimp uses inline functions (plug-ins/common/grid.c) (#23078)
+	filter-flags "-fno-inline"
+
+	econf \
+		--disable-default-binary \
+		`use_enable mmx` \
+		`use_enable sse` \
+		`use_enable altivec` \
+		`use_enable doc gtk-doc` \
+		`use_enable python` \
+		`use_enable gimpprint print` \
+		`use_with X x` \
+		`use_with png libpng` \
+		`use_with jpeg libjpeg` \
+		`use_with jpeg libexif` \
+		`use_with tiff libtiff` \
+		`use_with mng libmng` \
+		`use_with aalib aa` \
+		`use_enable debug` || die
+
+	emake || die
+
+}
+
+src_install() {
+
+	# Workaround portage variable leakage
+	local AA=
+
+	# create these dirs to make the makefile installs these items correctly
+	dodir /usr/share/{applications,application-registry,mime-info}
+
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS COPYING ChangeL* HACKING INSTALL \
+		MAINTAINERS NEWS PLUGIN_MAINTAINERS README* TODO*
+
+}