The gimp-print and gnome-print plug-ins were removed upstream, new GTK+ print plug-in awaits addition of gtk+-2.9.3. Cleaned up a bit.

Package-Manager: portage-2.1

3 files changed, 31 insertions, 25 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 33e684ad3c76..01b6db9b0fc0 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.151 2006/06/18 20:03:59 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.152 2006/06/25 00:29:26 brix Exp $
+
+  25 Jun 2006; Henrik Brix Andersen <brix@gentoo.org> gimp-9999.ebuild:
+  The gimp-print and gnome-print plug-ins were removed upstream, new GTK+
+  print plug-in awaits addition of gtk+-2.9.3. Cleaned up a bit.
 
   18 Jun 2006; Henrik Brix Andersen <brix@gentoo.org> gimp-9999.ebuild:
   Work around AA variable (strictly only needed for non-CVS ebuilds), do not
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 033ea80a55e5..223ef9719ed5 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -60,14 +60,14 @@ EBUILD gimp-2.2.9.ebuild 4402 RMD160 314d4f318845bfb602cf648b857170fa247a62c9 SH
 MD5 48eb45febb4d78146c4b9f48b6b511a7 gimp-2.2.9.ebuild 4402
 RMD160 314d4f318845bfb602cf648b857170fa247a62c9 gimp-2.2.9.ebuild 4402
 SHA256 79dc33dbd739ffc2e96e1baa670c23b929ce0d0f4e79f3536ec893998a9cc4bb gimp-2.2.9.ebuild 4402
-EBUILD gimp-9999.ebuild 3674 RMD160 89a36c832653e369ca3f9d10a1a7287bbfb6e773 SHA1 5ea40291d3dc1688afac732ec480b1325bd0163a SHA256 54c3a47a52f773bce2e44a921309c05a049a11571073b84a7f58d973c266a54c
-MD5 b48b186f357b13644a60abf3ecbb369d gimp-9999.ebuild 3674
-RMD160 89a36c832653e369ca3f9d10a1a7287bbfb6e773 gimp-9999.ebuild 3674
-SHA256 54c3a47a52f773bce2e44a921309c05a049a11571073b84a7f58d973c266a54c gimp-9999.ebuild 3674
-MISC ChangeLog 22232 RMD160 d44066f51e203c847fddfb8b6a5cf56bf9cff5a5 SHA1 347be962607a5d12afec5e909c031066bed5b481 SHA256 214d92f533b9875ddc0730d5efa7da88b8f5ba804c471de0adc85d45c0bc4800
-MD5 d2c87fbf124594945bb2be2e3814406b ChangeLog 22232
-RMD160 d44066f51e203c847fddfb8b6a5cf56bf9cff5a5 ChangeLog 22232
-SHA256 214d92f533b9875ddc0730d5efa7da88b8f5ba804c471de0adc85d45c0bc4800 ChangeLog 22232
+EBUILD gimp-9999.ebuild 3747 RMD160 966a6cddc7b66ef865e4e4bfe300e4cfc9f28530 SHA1 695bc45ef36450fd8dd6feee7fa9ad315ae404f2 SHA256 c89fc4b85a5f70b43a28d352edaffcc2ef2e52fd0a48817d9d5687213e8cf51b
+MD5 cb28e0f4fd31a202c20e3fa91b8b79b8 gimp-9999.ebuild 3747
+RMD160 966a6cddc7b66ef865e4e4bfe300e4cfc9f28530 gimp-9999.ebuild 3747
+SHA256 c89fc4b85a5f70b43a28d352edaffcc2ef2e52fd0a48817d9d5687213e8cf51b gimp-9999.ebuild 3747
+MISC ChangeLog 22444 RMD160 4b71ea6aca13ec914b95ad9ba7de6bd50f959ecb SHA1 98593f78cb01cefc2d10252c7fcab1a655542763 SHA256 9c9ff16521540107818bd0337e5e1b9e38fda643d621a3459b81d41b34819302
+MD5 bfdf8ab35daa6b30ba5ebc0368b75f8c ChangeLog 22444
+RMD160 4b71ea6aca13ec914b95ad9ba7de6bd50f959ecb ChangeLog 22444
+SHA256 9c9ff16521540107818bd0337e5e1b9e38fda643d621a3459b81d41b34819302 ChangeLog 22444
 MISC metadata.xml 369 RMD160 b71b3f982cd3a530df18bb05a2a32430e0c1daea SHA1 1c448e18bc74a560156318c4d9186b4e31ccba0c SHA256 4fbdad87f03de0aa7de4d07707a4d870d2c0cba55fc3cd563dae0945620d763d
 MD5 cda75d04f4767d3920ffc234e66d95c7 metadata.xml 369
 RMD160 b71b3f982cd3a530df18bb05a2a32430e0c1daea metadata.xml 369
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index a86dd75dd9c3..d98f3ea91991 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.4 2006/06/18 20:03:59 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.5 2006/06/25 00:29:26 brix Exp $
 
 inherit alternatives cvs eutils fdo-mime flag-o-matic
 
@@ -19,8 +19,11 @@ LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="-*"
 
-IUSE="alsa aalib altivec debug doc gtkhtml gimpprint gnome jpeg lcms mmx mng pdf png python smp sse svg tiff wmf"
+# add 'print' when >=x11-libs/gtk+-2.9.3 hits portage
+IUSE="alsa aalib altivec debug doc gtkhtml gnome jpeg lcms mmx mng pdf png python smp sse svg tiff wmf"
 
+# not yet in portage:
+#		print? ( >=x11-libs/gtk+-2.9.3 )
 RDEPEND=">=dev-libs/glib-2.8.2
 		>=x11-libs/gtk+-2.8.8
 		>=x11-libs/pango-1.4
@@ -34,14 +37,12 @@ RDEPEND=">=dev-libs/glib-2.8.2
 		aalib? ( media-libs/aalib )
 		alsa? ( >=media-libs/alsa-lib-1.0.0 )
 		doc? ( app-doc/gimp-help )
-		gimpprint? ( =media-gfx/gimp-print-4.2* )
 		gnome? ( >=gnome-base/gnome-vfs-2.10.0
 				>=gnome-base/libgnomeui-2.10.0
-				>=gnome-base/gnome-keyring-0.4.5
-				>=gnome-base/libgnomeprint-2.10.0 )
+				>=gnome-base/gnome-keyring-0.4.5 )
 		gtkhtml? ( =gnome-extra/gtkhtml-2* )
 		jpeg? ( >=media-libs/jpeg-6b-r2
-				media-libs/libexif )
+				>=media-libs/libexif-0.6.0 )
 		lcms? ( media-libs/lcms )
 		mng? ( media-libs/libmng )
 		pdf? ( >=app-text/poppler-bindings-0.3.1 )
@@ -50,7 +51,7 @@ RDEPEND=">=dev-libs/glib-2.8.2
 				>=dev-python/pygtk-2 )
 		tiff? ( >=media-libs/tiff-3.5.7 )
 		svg? ( >=gnome-base/librsvg-2.2 )
-		wmf? ( >=media-libs/libwmf-0.2.8.2 )"
+		wmf? ( >=media-libs/libwmf-0.2.8 )"
 DEPEND="${RDEPEND}
 		>=dev-util/pkgconfig-0.12.0
 		>=dev-util/intltool-0.31
@@ -59,10 +60,10 @@ DEPEND="${RDEPEND}
 pkg_setup() {
 	if use pdf && ! built_with_use app-text/poppler-bindings gtk; then
 		eerror
-		eerror "This package requires app-text/poppler compiled with GTK+ support."
-		eerror "Please reemerge app-text/poppler with USE=\"gtk\"."
+		eerror "This package requires app-text/poppler-bindings compiled with GTK+ support."
+		eerror "Please reemerge app-text/poppler-bindings with USE=\"gtk\"."
 		eerror
-		die "Please reemerge app-text/poppler with USE=\"gtk\"."
+		die "Please reemerge app-text/poppler-bindings with USE=\"gtk\"."
 	fi
 }
 
@@ -74,14 +75,17 @@ src_unpack() {
 }
 
 src_compile() {
-	# gimp uses inline functions (plug-ins/common/grid.c) (#23078)
+	# workaround portage variable leakage
+	local AA=
+
+	# gimp uses inline functions (e.g. plug-ins/common/grid.c) (#23078)
 	# gimp uses floating point math, needs accuracy (#98685)
 	filter-flags "-fno-inline" "-ffast-math"
 
 	"${S}"/autogen.sh $(use_enable doc gtk-doc) || die "autogen.sh failed"
 
-	# Workaround portage variable leakage
-	local AA=
+	# requires >=x11-libs/gtk+-2.9.3, which is not yet in portaqe
+	# $(use_with print) \
 
 	econf \
 		--disable-default-binary \
@@ -91,8 +95,6 @@ src_compile() {
 		$(use_enable altivec) \
 		$(use_enable debug) \
 		$(use_enable doc gtk-doc) \
-		$(use_enable gimpprint print) \
-		$(use_with gnome gnome-print) \
 		$(use_with gtkhtml gtkhtml2) \
 		$(use_with jpeg libjpeg) \
 		$(use_with jpeg libexif) \
@@ -120,7 +122,7 @@ src_install() {
 pkg_postinst() {
 	local binary
 
-	# install symlinks for everything but gimptool (bug #136012)
+	# install symlinks for everything but gimptool (#136012)
 	for binary in gimp gimp-console gimp-remote; do
 		alternatives_auto_makesym "/usr/bin/${binary}" "/usr/bin/${binary}-[0-9].[0-9]"
 	done