Bugfix bump and removal from p.mask. Added gtkhtml to IUSE

(Portage version: 2.0.51-r15)

11 files changed, 181 insertions, 23 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 6ab1c7e3d96c..be3f7e397741 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/gimp
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.102 2004/12/22 16:43:11 obz Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.103 2005/02/03 04:18:25 joem Exp $
+
+*gimp-2.2.3 (02 Feb 2005)
+
+  02 Feb 2005; Joe McCann <joem@gentoo.org> gimp-2.0.6.ebuild,
+  +gimp-2.2.3.ebuild:
+  Bugfix bump and removal from p.mask. Added gtkhtml to IUSE
 
   23 Dec 2004; Mike Gardiner <obz@gentoo.org> gimp-2.2.0.ebuild, gimp-2.0.6.ebuild:
   More fixes, changed doc? to gtkhtml? (bug #74848), and fixed USE=-doc to not install any developer documentation in 2.2.0
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index d49821c526ab..bc30c20bb2c9 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,21 +1,23 @@
 MD5 4a3f1162ae671016ab360876aeb25ae6 ChangeLog 15102
-MD5 d7a9ef0b998d360ae6254fc0508e2f7d gimp-2.0.2.ebuild 2570
 MD5 e7cbfba89facb9cca1a3117df924f41b gimp-1.2.5.ebuild 3206
 MD5 2951e3093e294629908f060f0d55a381 gimp-2.0.0.ebuild 2655
+MD5 d7a9ef0b998d360ae6254fc0508e2f7d gimp-2.0.2.ebuild 2570
 MD5 1fbffd70f406bee33a8827ebf6f43c48 gimp-2.0.4.ebuild 3205
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 df316b1d4bd1c70f25f7ef811a14e5bc gimp-2.0.5.ebuild 3219
 MD5 b56ad7481b4838ae420404ee8f2c84cc gimp-2.0.6.ebuild 3238
 MD5 96c65f5342f348f53c92a85499d12870 gimp-2.2.0.ebuild 3517
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 96c65f5342f348f53c92a85499d12870 gimp-2.2.3.ebuild 3517
+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
 MD5 0d3108f9120d6976ce4ccb29a131aea7 files/digest-gimp-2.0.4 133
-MD5 662e7b51f4c882429b73dea3263b39de files/digest-gimp-1.2.5 65
 MD5 397055832117d5c76e873af50a2e6f30 files/digest-gimp-2.0.5 134
 MD5 bbe7cd6ece5455900adcaeed9b467679 files/digest-gimp-2.0.6 134
 MD5 204a8065e28141810fbda423e4118b9e files/digest-gimp-2.2.0 134
-MD5 8bf83fb83ce1c66006a27a7d9ec29dd7 files/pygimp-logo.png 19823
+MD5 be326cb198ec1f1f6c21a5a5a1460415 files/gimp-2.0.0-gcc34.patch 1148
 MD5 9696bde4a1b70dd2816d46bed477ebc0 files/gimp.desktop 2404
 MD5 12ff6c7c980ee34dc7d4d94aa40059b0 files/ltmain_sh-1.5.0-fix-relink.patch 1718
 MD5 f2b58299eceabecfe5df955198c267d6 files/psd_save.c 49151
-MD5 568ba885fc51613466e3b0039e21946c files/digest-gimp-2.0.0 65
-MD5 be326cb198ec1f1f6c21a5a5a1460415 files/gimp-2.0.0-gcc34.patch 1148
+MD5 8bf83fb83ce1c66006a27a7d9ec29dd7 files/pygimp-logo.png 19823
+MD5 675541af3f64fc4acdd1bd3e759b607d files/digest-gimp-2.2.3 134
diff --git a/media-gfx/gimp/files/digest-gimp-2.2.3 b/media-gfx/gimp/files/digest-gimp-2.2.3
new file mode 100644
index 000000000000..127beb0b1135
--- /dev/null
+++ b/media-gfx/gimp/files/digest-gimp-2.2.3
@@ -0,0 +1,2 @@
+MD5 a65ea578d42a8c6658296aa52547063d gimp-2.2.3.tar.bz2 13810493
+MD5 4a5f7f6f31d14977718b62b5a3d79872 gimp-help-2-0.6.tar.gz 14156511
diff --git a/media-gfx/gimp/gimp-1.2.5.ebuild b/media-gfx/gimp/gimp-1.2.5.ebuild
index 7f0ad5af4a68..69e6c575768d 100644
--- a/media-gfx/gimp/gimp-1.2.5.ebuild
+++ b/media-gfx/gimp/gimp-1.2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.5.ebuild,v 1.20 2004/06/24 22:38:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.5.ebuild,v 1.21 2005/02/03 04:18:25 joem Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/media-gfx/gimp/gimp-2.0.0.ebuild b/media-gfx/gimp/gimp-2.0.0.ebuild
index c6c63d1ac572..73d7321d13a0 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 Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # 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.10 2004/07/24 02:39:32 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.0.0.ebuild,v 1.11 2005/02/03 04:18:25 joem Exp $
 
 inherit flag-o-matic libtool eutils
 
diff --git a/media-gfx/gimp/gimp-2.0.2.ebuild b/media-gfx/gimp/gimp-2.0.2.ebuild
index b559eac17b5f..9d8382271fd8 100644
--- a/media-gfx/gimp/gimp-2.0.2.ebuild
+++ b/media-gfx/gimp/gimp-2.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # 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.4 2004/07/30 03:48:53 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.0.2.ebuild,v 1.5 2005/02/03 04:18:25 joem Exp $
 
 inherit flag-o-matic libtool eutils
 
diff --git a/media-gfx/gimp/gimp-2.0.4.ebuild b/media-gfx/gimp/gimp-2.0.4.ebuild
index b83c36ba2927..6073562e2cf6 100644
--- a/media-gfx/gimp/gimp-2.0.4.ebuild
+++ b/media-gfx/gimp/gimp-2.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.0.4.ebuild,v 1.9 2004/12/17 21:27:51 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.0.4.ebuild,v 1.10 2005/02/03 04:18:25 joem Exp $
 
 inherit flag-o-matic libtool eutils
 
diff --git a/media-gfx/gimp/gimp-2.0.5.ebuild b/media-gfx/gimp/gimp-2.0.5.ebuild
index b94dd4e25180..9b27c2cca7eb 100644
--- a/media-gfx/gimp/gimp-2.0.5.ebuild
+++ b/media-gfx/gimp/gimp-2.0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.0.5.ebuild,v 1.3 2004/11/03 23:58:44 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.0.5.ebuild,v 1.4 2005/02/03 04:18:25 joem Exp $
 
 inherit flag-o-matic libtool eutils
 
diff --git a/media-gfx/gimp/gimp-2.0.6.ebuild b/media-gfx/gimp/gimp-2.0.6.ebuild
index 4e6b39524c67..1c9db30737e1 100644
--- a/media-gfx/gimp/gimp-2.0.6.ebuild
+++ b/media-gfx/gimp/gimp-2.0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.0.6.ebuild,v 1.2 2004/12/22 16:43:11 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.0.6.ebuild,v 1.3 2005/02/03 04:18:25 joem Exp $
 
 inherit flag-o-matic libtool eutils
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://gimp/v2.0/${P}.tar.bz2
 SLOT="2"
 KEYWORDS="~x86 ~ppc ~hppa ~sparc ~amd64 ~mips ~ppc64 ~alpha"
 #IUSE="X aalib altivec debug doc gimpprint jpeg mmx mng png python sse svg tiff wmf"
-IUSE="aalib altivec debug doc gimpprint jpeg mmx mng png python sse svg tiff wmf"
+IUSE="aalib altivec debug doc gimpprint gtkhtml jpeg mmx mng png python sse svg tiff wmf"
 
 # FIXME : some more things can be (local) USE flagged
 # a few options are detection only, fix them to switch
diff --git a/media-gfx/gimp/gimp-2.2.0.ebuild b/media-gfx/gimp/gimp-2.2.0.ebuild
index d13b7a0a46c9..c900142bbde4 100644
--- a/media-gfx/gimp/gimp-2.2.0.ebuild
+++ b/media-gfx/gimp/gimp-2.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.0.ebuild,v 1.5 2004/12/28 11:27:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.0.ebuild,v 1.6 2005/02/03 04:18:25 joem Exp $
 
 inherit flag-o-matic libtool eutils
 
diff --git a/media-gfx/gimp/gimp-2.2.3.ebuild b/media-gfx/gimp/gimp-2.2.3.ebuild
new file mode 100644
index 000000000000..3c59e814452b
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.2.3.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.3.ebuild,v 1.1 2005/02/03 04:18:25 joem Exp $
+
+inherit flag-o-matic libtool eutils
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="http://www.gimp.org/"
+LICENSE="GPL-2"
+
+P_HELP="gimp-help-2-0.6" #gimp-help-2-{version}
+S_HELP="$WORKDIR/${P_HELP}"
+SRC_URI="mirror://gimp/v2.2/${P}.tar.bz2
+	doc? ( mirror://gimp/help/testing/${P_HELP}.tar.gz )"
+
+SLOT="2"
+KEYWORDS="~x86 ~ppc ~hppa ~sparc ~amd64 ~mips ~ppc64 ~alpha"
+#IUSE="X aalib altivec debug doc gimpprint jpeg mmx mng png python sse svg tiff wmf"
+IUSE="aalib altivec debug doc gtkhtml gimpprint jpeg mmx mng png python sse svg tiff wmf"
+
+# FIXME : some more things can be (local) USE flagged
+# a few options are detection only, fix them to switch
+
+#	X? ( virtual/x11 )"
+RDEPEND="virtual/x11
+	>=dev-libs/glib-2.4.5
+	>=x11-libs/gtk+-2.4.4
+	>=x11-libs/pango-1.4
+	>=media-libs/freetype-2.1.7
+	>=media-libs/fontconfig-2.2
+	>=media-libs/libart_lgpl-2.3.8-r1
+	sys-libs/zlib
+	dev-libs/libxml2
+	dev-libs/libxslt
+
+	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.2 )
+	svg? ( >=gnome-base/librsvg-2.2 )
+
+	aalib?	( media-libs/aalib )
+	python?	( >=dev-lang/python-2.2
+		>=dev-python/pygtk-2 )"
+
+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
+	# Install the missing pygimp logo
+	cp ${FILESDIR}/pygimp-logo.png ${S}/plug-ins/pygimp/
+
+}
+
+src_compile() {
+
+	# Since 1.3.16, fixes linker problems when upgrading
+	elibtoolize
+
+	# Workaround portage variable leakage
+	local AA=
+
+	# only use mmx if hardened is not set
+	local USE_MMX=
+
+	replace-flags "-march=k6*" "-march=i586"
+
+	# gimp uses inline functions (plug-ins/common/grid.c) (#23078)
+	filter-flags "-fno-inline"
+
+	if use hardened; then
+		ewarn "hardened use flag suppressing mmx use flag"
+		HARDENED_SUPPRESS_MMX="--disable-mmx"
+	else
+		HARDENED_SUPPRESS_MMX="`use_enable mmx`"
+	fi
+
+	local myconf
+	use doc || myconf="${myconf} --disable-devel-docs"
+
+	econf \
+		--disable-default-binary \
+		--with-x \
+		"${HARDENED_SUPPRESS_MMX}" \
+		${myconf} \
+		`use_enable sse` \
+		`use_enable altivec` \
+		`use_enable doc gtk-doc` \
+		`use_enable python` \
+		`use_enable gimpprint print` \
+		`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
+
+	# X isn't optional (#58003) atm
+	#	`use_with X x` \
+
+	emake || die
+
+	if use doc; then
+		cd ${S_HELP}
+		econf --without-gimp || die
+		emake || die
+	fi
+
+}
+
+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 ChangeLog* HACKING NEWS README*
+
+	if use doc; then
+		cd ${S_HELP}
+		make DESTDIR=${D} install || die
+	fi
+
+	# Create the gimp-remote link, see bug #36648
+	dosym gimp-remote-2.2 /usr/bin/gimp-remote
+
+}
+