first stable gtk2 release, correct too eager amd64 stable declaration in _pre3

6 files changed, 37 insertions, 40 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 13fe2e82b073..f961899907b4 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,15 @@
 # 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.73 2004/03/19 13:08:49 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.74 2004/03/26 20:17:25 foser Exp $
+
+*gimp-2.0.0 (26 Mar 2004)
+
+  26 Mar 2004; foser <foser@gentoo.org> gimp-2.0.0.ebuild :
+  First stable release of the GTK+-2 gimp (#45563)
+  Add mng & debug USE
+  Fix up mime/application/desktop installation by touching their dirs
+  Remove the unversioned gimp binary link (slot problem)
+  Removed the obsolete postinstall warnings
 
   19 Mar 2004; foser <foser@gentoo.org> gimp-1.2.{4,5}.ebuild :
   Fix jpeg USE in deps (#45110)
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 8b8deec6ec83..88d211b2df27 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,9 +1,9 @@
-MD5 b8ac622ffb97f5e755f1c2aa9064366f gimp-2.0_pre2.ebuild 2877
+MD5 e9a196e28db4029be76012ab4e5a8edc gimp-2.0.0.ebuild 2613
 MD5 13dc477373a4c541560abf8e2c247bfe gimp-1.2.5.ebuild 3223
 MD5 79946d76b127a835c8c16d552add5cab gimp-1.2.3-r3.ebuild 4690
 MD5 d44fe0c516784fd29c41f42bdce59858 gimp-1.2.4.ebuild 3080
-MD5 617b67ae21f8bf2f81317587a68d4323 ChangeLog 11505
-MD5 189236394c61fb8cf3cabc89c8ec2fdd gimp-2.0_pre3-r1.ebuild 2986
+MD5 3258ab05393260780d41d7591f613b12 ChangeLog 11837
+MD5 c2dfb8612c5b61875f1735d72d46f127 gimp-2.0_pre3-r1.ebuild 2983
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r3-gentoo.diff 427
 MD5 86617fa03849f2ba22c845a31ddf8958 files/digest-gimp-1.2.3-r3 65
@@ -15,9 +15,9 @@ 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 c73865fe1298b84c685ee1314093c7bd files/gimp-2.0_pre2-remote_new_behaviour.patch 11818
-MD5 d75b2f3860a49663eec5ad4a3a1aae07 files/digest-gimp-2.0_pre2 67
 MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r2-gentoo.diff 427
 MD5 945091d07e44e026c8e5fb5c01014873 files/gimp-2.0_pre2-cpuaccel-pic.patch 2524
 MD5 f8c14ef5c45d029ac5abc6c614701d5e files/gimp-1.3.20-screenshot_fix.patch 20024
 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
diff --git a/media-gfx/gimp/files/digest-gimp-2.0.0 b/media-gfx/gimp/files/digest-gimp-2.0.0
new file mode 100644
index 000000000000..d85a3ea8446d
--- /dev/null
+++ b/media-gfx/gimp/files/digest-gimp-2.0.0
@@ -0,0 +1 @@
+MD5 322cc091da8bbd324b37c60143fa26fa gimp-2.0.0.tar.bz2 13208717
diff --git a/media-gfx/gimp/files/digest-gimp-2.0_pre2 b/media-gfx/gimp/files/digest-gimp-2.0_pre2
deleted file mode 100644
index 282ad34da9f8..000000000000
--- a/media-gfx/gimp/files/digest-gimp-2.0_pre2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 97898e176c5753269fc869cbe9590517 gimp-2.0pre2.tar.bz2 12029513
diff --git a/media-gfx/gimp/gimp-2.0_pre2.ebuild b/media-gfx/gimp/gimp-2.0.0.ebuild
index db8289bb20d6..429104c68e01 100644
--- a/media-gfx/gimp/gimp-2.0_pre2.ebuild
+++ b/media-gfx/gimp/gimp-2.0.0.ebuild
@@ -1,23 +1,20 @@
 # 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_pre2.ebuild,v 1.2 2004/01/31 14:02:07 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.0.0.ebuild,v 1.1 2004/03/26 20:17:25 foser Exp $
 
-inherit debug flag-o-matic libtool
-
-MY_PV=${PV/_/}
-MY_P=${PN}-${MY_PV}
-S=${WORKDIR}/${MY_P}
+inherit flag-o-matic libtool eutils
 
 DESCRIPTION="GNU Image Manipulation Program - Development series"
-SRC_URI="mirror://gimp/v2.0/testing/${MY_P}.tar.bz2"
+SRC_URI="mirror://gimp/v2.0/${P}.tar.bz2"
 HOMEPAGE="http://www.gimp.org/"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~hppa ~sparc"
-IUSE="doc python aalib png jpeg tiff wmf gimpprint gtkhtml mmx sse X altivec"
+KEYWORDS="~x86 ~ppc ~hppa ~sparc ~amd64"
+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
@@ -27,37 +24,35 @@ RDEPEND=">=dev-libs/glib-2.2
 	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 )
 
 	aalib?	( media-libs/aalib )
 	python?	( >=dev-lang/python-2.2
-		>=dev-python/pygtk-1.99.13 )
+		>=dev-python/pygtk-2 )
 
 	X? ( virtual/x11 )"
 
-
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0
 	dev-util/intltool
 	doc? ( >=dev-util/gtk-doc-1 )"
-#	sys-devel/gettext
 
 src_unpack() {
 
 	unpack ${A}
 
 	cd ${S}
-	# fix gimp-remote behavior
-	epatch ${FILESDIR}/${P}-remote_new_behaviour.patch
-	epatch ${FILESDIR}/${P}-cpuaccel-pic.patch
+	# 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
 
 }
 
@@ -74,7 +69,8 @@ src_compile() {
 	# gimp uses inline functions (plug-ins/common/grid.c) (#23078)
 	filter-flags "-fno-inline"
 
-	econf ${myconf} \
+	econf \
+		${myconf} \
 		`use_enable mmx` \
 		`use_enable sse` \
 		`use_enable altivec` \
@@ -86,8 +82,9 @@ src_compile() {
 		`use_with jpeg libjpeg` \
 		`use_with jpeg libexif` \
 		`use_with tiff libtiff` \
+		`use_with mng libmng` \
 		`use_with aalib aa` \
-		--enable-debug || die
+		`use_enable debug` || die
 
 	emake || die
 
@@ -98,24 +95,15 @@ 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
 
-	# Install desktop file in the right place
-	insinto /usr/share/applications
-	newins ${S}/data/misc/gimp.desktop gimp-${PV}.desktop
+	# Remove unversioned link to 2.0 binary
+	rm ${D}/usr/bin/gimp
 
 	dodoc AUTHORS COPYING ChangeL* HACKING INSTALL \
 		MAINTAINERS NEWS PLUGIN_MAINTAINERS README* TODO*
 
 }
-
-pkg_postinst() {
-
-	ewarn "The development Gimp series have been reslotted to SLOT 2"
-	ewarn "To clean up old 1.3 versions use 'emerge -C =gimp-1.3* -vp'"
-	echo ""
-	ewarn "If you are upgrading from an earlier 1.3/2.0_pre release, please note that"
-	ewarn "the gimprc and sessionrc file formats changed. We suggest you remove"
-	ewarn "your personal ~/.gimp-1.3 directory and do a fresh user installation."
-
-}
diff --git a/media-gfx/gimp/gimp-2.0_pre3-r1.ebuild b/media-gfx/gimp/gimp-2.0_pre3-r1.ebuild
index 36a5ad0680eb..a38e9540f0c4 100644
--- a/media-gfx/gimp/gimp-2.0_pre3-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.0_pre3-r1.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_pre3-r1.ebuild,v 1.2 2004/02/22 17:44:40 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.0_pre3-r1.ebuild,v 1.3 2004/03/26 20:17:25 foser Exp $
 
 inherit debug flag-o-matic libtool
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gimp.org/"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~hppa ~sparc amd64"
+KEYWORDS="~x86 ~ppc ~hppa ~sparc ~amd64"
 IUSE="doc python aalib png jpeg tiff wmf gimpprint gtkhtml mmx sse X altivec"
 
 # FIXME : some more things can be (local) USE flagged