Update dependencies w.r.t. bug 264230, fully-split-out poppler transition.

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

9 files changed, 32 insertions, 61 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 7519c94ee19d..1eb070e6b367 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.286 2009/03/22 16:36:50 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.287 2009/03/30 13:28:41 loki_val Exp $
+
+  30 Mar 2009; Peter Alfredsen <loki_val@gentoo.org> gimp-2.3.19.ebuild,
+  gimp-2.4.6.ebuild, gimp-2.4.7.ebuild, gimp-2.6.4.ebuild,
+  gimp-2.6.5.ebuild, gimp-2.6.6.ebuild, gimp-9999.ebuild:
+  Update dependencies w.r.t. bug 264230, fully-split-out poppler transition.
 
   22 Mar 2009; Tobias Klausmann <klausman@gentoo.org> gimp-2.6.4.ebuild:
   Stable on alpha, bug #258344
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index bee818228faa..da725d3790d6 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -7,12 +7,12 @@ DIST gimp-2.4.7.tar.bz2 18977384 RMD160 79062e60db1fe172e2a91ff0601462462d3a61cb
 DIST gimp-2.6.4.tar.bz2 16012685 RMD160 64aa55def0e97cfc85f27dc7461f18455619ed41 SHA1 f68ca1e1dce7ef8c100ce74e0c1ee5c493a589a1 SHA256 86d27a45b45f3df3bf6de28718f691e8bedaf1de7dae287b39054eaddad797e2
 DIST gimp-2.6.5.tar.bz2 16043778 RMD160 1de4ffdf13d3edd47e150e4289a8d93677d3f538 SHA1 ee57298fe5572ecce17137ff879e4aad6509d289 SHA256 6209081f5c29fc22e0d376367b017618f7afb0b179f994b16b4cc68106cbe521
 DIST gimp-2.6.6.tar.bz2 16075908 RMD160 9a171baf6007d3a8acfce6ff5e880e412f4225ae SHA1 71aec5cd671a2431daa91dea91abb6d3822a896b SHA256 53c261fa5045f4ca4b5e887a1eb394d28ebb08d108f065ef55bde33c892f0751
-EBUILD gimp-2.3.19.ebuild 3420 RMD160 6b764050ce4a20bc249fdf34246b9036c9498f4b SHA1 0f394608c2b25669ad886ee13b61407c474bc02c SHA256 0550dc8499e285dcaff590f31f014d5e5303ee6e03978f80eb49a810d3dbec7b
-EBUILD gimp-2.4.6.ebuild 3844 RMD160 1d071e845eaea37a31c346190cc2d68445664cc6 SHA1 f4f828712e7fdeb9c3929c859f927f515346fd61 SHA256 ab657c07a9676324282b18c9e400e4515a944d107520bef7cf660373f2539233
-EBUILD gimp-2.4.7.ebuild 3851 RMD160 1c4e786a176b229acd6f4ec4d1d89201ea04deab SHA1 e583b34bafb4b52cf71ceff4a3303ebad55fb472 SHA256 0d4234105fa5df9f3feba2442f46ec24150ab15b4b82c94d041684339335994c
-EBUILD gimp-2.6.4.ebuild 2988 RMD160 9a50a6c097fbeb529274c20d2ded199377630ddd SHA1 056150a3d6a6496bb6fcb06304043613533901cd SHA256 6d01f49f05ed0267e74d19fc383679d4dc94274f17f7e48f8693fcb4fd74ac37
-EBUILD gimp-2.6.5.ebuild 2954 RMD160 c2600dc6aa4c76b931a8904a272db2a76050d70e SHA1 81dd400ec43bae75aa0fd4a6d0ad1af67b98981e SHA256 992a03b2ec89ced0d58233199f9dea470e3b9f2d005273c9724d129c2f1559f8
-EBUILD gimp-2.6.6.ebuild 2953 RMD160 20416fbe928a4a726cbab890eea271be294a7e18 SHA1 4d47d7c11ee14f6223535734934d941e64b06b4b SHA256 e7f388381b75de9a2e018abeca9b5a11432fe63e7c4c8a380ec605d6cfd75c9d
-EBUILD gimp-9999.ebuild 3765 RMD160 4eb85d08786ba8d73536e5bb60118fe2f9b42382 SHA1 c8a20283d95e2e8d274bde17cb97bb2a255a56b4 SHA256 b24670ec12036af85fab20131f8a0c0e377dd889a4d7bc8168ad124af187f464
-MISC ChangeLog 38292 RMD160 aa16024ad8cc6ea32c7660232f443e5dd00d5e95 SHA1 18fc3ac7806674a550c6c372b9e5deb7eadc649e SHA256 811279f9ff982dcd8a45b010754f959df19527e8b9fb8e2fc03477b36d45cf3d
+EBUILD gimp-2.3.19.ebuild 3085 RMD160 25aaadca3a3099442ccfd8345c8787f5af6c2793 SHA1 451921a37fbfc7ca52a902023b15a0767a19b64c SHA256 307575758e4b831a7396ee781d71342aab5d313cb3d4a1251fa32ce425e8d2c3
+EBUILD gimp-2.4.6.ebuild 3614 RMD160 430e439c39f51797ba95b347ae25a5455f419178 SHA1 571d67813a731991ef54b94784948613d053dad9 SHA256 313c659617f610353302c97808446046f65e33b47813bf236a8e1362af6cc4c2
+EBUILD gimp-2.4.7.ebuild 3622 RMD160 f8e34b3890b040d53847cbf79c5cd4f631a73387 SHA1 91c1870df935b9f12f3152bcdbd2f8058959d38a SHA256 c5fe935f57d5e83d0be351f251da3b05154a4c2e65f12ac48db0fa32083d21d5
+EBUILD gimp-2.6.4.ebuild 2756 RMD160 d9ca1524c48cc3e86968e9753807f84674d7dd96 SHA1 b417a6bcc9b934ca7b88ccbb5ca25f856df09134 SHA256 7a84cb909da57e16517d4356e2d11f40af889538063fab7d7d470d8e864fdac1
+EBUILD gimp-2.6.5.ebuild 2724 RMD160 8e25623833f71e122bc2ff83b815ffdc7d9c46e3 SHA1 c032266af72f60c0b3a6a41b2fb12457cb257d5b SHA256 6a641ff3260a3670152ad60d01256a4a84205df3865bb34a1d57c6b2159e0702
+EBUILD gimp-2.6.6.ebuild 2724 RMD160 ac6cbd3db475b8c3ebd6b0ca122f0a72cf89d92f SHA1 29373118c2b8a075ddfca3d4319953992b271918 SHA256 748dd0510d150b9197a5fa933e4d6a357a8b67cea5f62b5397a375ef4a58f567
+EBUILD gimp-9999.ebuild 3536 RMD160 9621b387e6ef5e4e522e55061494b4d13a84f350 SHA1 8b7ef68c13bbfb6f338b34d3accb08d7d2737c3b SHA256 b0865f76c62c509c6dec04495eb9472c343bb747c677796d8ba11b975c001a41
+MISC ChangeLog 38560 RMD160 ac7ecfaf0eb134084e5530ca16e302750b35787b SHA1 28a8f623eac8de371536239446d01ed7d77829c8 SHA256 3ed2b674f125e0ecbc90960a83541bba62fc7a0a518d453742666dbae82854b6
 MISC metadata.xml 366 RMD160 5ae566a82314bb47784051f6ca13fc1a9ecd137e SHA1 dce399814102ba9802439497439e2e00ecc3b82e SHA256 380bccccb72b527f81e02fd37b41b584316fcd7c802b959b8eae27fcef0c0db5
diff --git a/media-gfx/gimp/gimp-2.3.19.ebuild b/media-gfx/gimp/gimp-2.3.19.ebuild
index 18539f1f1ed3..1b6cd27bed0e 100644
--- a/media-gfx/gimp/gimp-2.3.19.ebuild
+++ b/media-gfx/gimp/gimp-2.3.19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.3.19.ebuild,v 1.7 2008/05/18 02:08:03 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.3.19.ebuild,v 1.8 2009/03/30 13:28:41 loki_val Exp $
 
 inherit fdo-mime flag-o-matic multilib python
 
@@ -37,7 +37,7 @@ RDEPEND=">=dev-libs/glib-2.12.3
 		>=media-libs/libexif-0.6.15 )
 	lcms? ( media-libs/lcms )
 	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-bindings-0.3.1 )
+	pdf? ( >=virtual/poppler-glib-0.3.1 )
 	png? ( >=media-libs/libpng-1.2.2 )
 	python?	( >=dev-lang/python-2.2.1
 		>=dev-python/pygtk-2.10.4 )
@@ -49,16 +49,6 @@ DEPEND="${RDEPEND}
 		>=dev-util/intltool-0.31
 		doc? ( >=dev-util/gtk-doc-1 )"
 
-pkg_setup() {
-	if use pdf && ! built_with_use app-text/poppler-bindings gtk; then
-		eerror
-		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-bindings with USE=\"gtk\"."
-	fi
-}
-
 src_compile() {
 	# workaround portage variable leakage
 	local AA=
diff --git a/media-gfx/gimp/gimp-2.4.6.ebuild b/media-gfx/gimp/gimp-2.4.6.ebuild
index 2a10a2ab6b5b..9f83296fb6a8 100644
--- a/media-gfx/gimp/gimp-2.4.6.ebuild
+++ b/media-gfx/gimp/gimp-2.4.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.4.6.ebuild,v 1.8 2008/10/14 20:25:54 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.4.6.ebuild,v 1.9 2009/03/30 13:28:41 loki_val Exp $
 
 inherit gnome2 fdo-mime flag-o-matic multilib python eutils autotools
 
@@ -39,7 +39,7 @@ RDEPEND=">=dev-libs/glib-2.12.3
 	exif? ( >=media-libs/libexif-0.6.15 )
 	lcms? ( media-libs/lcms )
 	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-bindings-0.3.1 )
+	pdf? ( >=virtual/poppler-glib-0.3.1 )
 	png? ( >=media-libs/libpng-1.2.2 )
 	python?	( >=dev-lang/python-2.2.1
 		>=dev-python/pygtk-2.10.4 )
@@ -55,10 +55,6 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
 
 pkg_setup() {
-	if use pdf && ! built_with_use app-text/poppler-bindings gtk; then
-		eerror "This package requires app-text/poppler-bindings compiled with GTK+ support."
-		die "Please reemerge app-text/poppler-bindings with USE=\"gtk\"."
-	fi
 	if use alsa && ! built_with_use media-libs/alsa-lib midi; then
 		eerror "This package requires media-libs/alsa-lib compiled with midi support."
 		die "Please reemerge media-libs/alsa-lib with USE=\"midi\"."
diff --git a/media-gfx/gimp/gimp-2.4.7.ebuild b/media-gfx/gimp/gimp-2.4.7.ebuild
index 557ffeca8517..dfef6a8797a5 100644
--- a/media-gfx/gimp/gimp-2.4.7.ebuild
+++ b/media-gfx/gimp/gimp-2.4.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.4.7.ebuild,v 1.1 2008/09/14 11:29:02 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.4.7.ebuild,v 1.2 2009/03/30 13:28:41 loki_val Exp $
 
 inherit gnome2 fdo-mime flag-o-matic multilib python eutils autotools
 
@@ -39,7 +39,7 @@ RDEPEND=">=dev-libs/glib-2.12.3
 	exif? ( >=media-libs/libexif-0.6.15 )
 	lcms? ( media-libs/lcms )
 	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-bindings-0.3.1 )
+	pdf? ( >=virtual/poppler-glib-0.3.1 )
 	png? ( >=media-libs/libpng-1.2.2 )
 	python?	( >=dev-lang/python-2.2.1
 		>=dev-python/pygtk-2.10.4 )
@@ -55,10 +55,6 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
 
 pkg_setup() {
-	if use pdf && ! built_with_use app-text/poppler-bindings gtk; then
-		eerror "This package requires app-text/poppler-bindings compiled with GTK+ support."
-		die "Please reemerge app-text/poppler-bindings with USE=\"gtk\"."
-	fi
 	if use alsa && ! built_with_use media-libs/alsa-lib midi; then
 		eerror "This package requires media-libs/alsa-lib compiled with midi support."
 		die "Please reemerge media-libs/alsa-lib with USE=\"midi\"."
diff --git a/media-gfx/gimp/gimp-2.6.4.ebuild b/media-gfx/gimp/gimp-2.6.4.ebuild
index e04be47f2623..2ba792035eba 100644
--- a/media-gfx/gimp/gimp-2.6.4.ebuild
+++ b/media-gfx/gimp/gimp-2.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.4.ebuild,v 1.5 2009/03/22 16:36:50 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.4.ebuild,v 1.6 2009/03/30 13:28:41 loki_val Exp $
 
 inherit eutils gnome2 fdo-mime multilib python
 
@@ -37,7 +37,7 @@ RDEPEND=">=dev-libs/glib-2.18.1
 	exif? ( >=media-libs/libexif-0.6.15 )
 	lcms? ( media-libs/lcms )
 	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-bindings-0.3.1 )
+	pdf? ( >=virtual/poppler-glib-0.3.1 )
 	png? ( >=media-libs/libpng-1.2.2 )
 	python?	( >=dev-lang/python-2.5.0
 		>=dev-python/pygtk-2.10.4 )
@@ -53,10 +53,6 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
 
 pkg_setup() {
-	if use pdf && ! built_with_use app-text/poppler-bindings gtk; then
-		eerror "This package requires app-text/poppler-bindings compiled with GTK+ support."
-		die "Please reemerge app-text/poppler-bindings with USE=\"gtk\"."
-	fi
 	if use alsa && ! built_with_use media-libs/alsa-lib midi; then
 		eerror "This package requires media-libs/alsa-lib compiled with midi support."
 		die "Please reemerge media-libs/alsa-lib with USE=\"midi\"."
diff --git a/media-gfx/gimp/gimp-2.6.5.ebuild b/media-gfx/gimp/gimp-2.6.5.ebuild
index 244dd701cb86..c2fc476553d6 100644
--- a/media-gfx/gimp/gimp-2.6.5.ebuild
+++ b/media-gfx/gimp/gimp-2.6.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.5.ebuild,v 1.2 2009/03/15 15:06:01 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.5.ebuild,v 1.3 2009/03/30 13:28:41 loki_val Exp $
 
 inherit eutils gnome2 fdo-mime multilib python
 
@@ -36,7 +36,7 @@ RDEPEND=">=dev-libs/glib-2.18.1
 	exif? ( >=media-libs/libexif-0.6.15 )
 	lcms? ( media-libs/lcms )
 	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-bindings-0.3.1 )
+	pdf? ( >=virtual/poppler-glib-0.3.1 )
 	png? ( >=media-libs/libpng-1.2.2 )
 	python?	( >=dev-lang/python-2.5.0
 		>=dev-python/pygtk-2.10.4 )
@@ -52,10 +52,6 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
 
 pkg_setup() {
-	if use pdf && ! built_with_use app-text/poppler-bindings gtk; then
-		eerror "This package requires app-text/poppler-bindings compiled with GTK+ support."
-		die "Please reemerge app-text/poppler-bindings with USE=\"gtk\"."
-	fi
 	if use alsa && ! built_with_use media-libs/alsa-lib midi; then
 		eerror "This package requires media-libs/alsa-lib compiled with midi support."
 		die "Please reemerge media-libs/alsa-lib with USE=\"midi\"."
diff --git a/media-gfx/gimp/gimp-2.6.6.ebuild b/media-gfx/gimp/gimp-2.6.6.ebuild
index 0ce802d4a3f6..5575c76af5e1 100644
--- a/media-gfx/gimp/gimp-2.6.6.ebuild
+++ b/media-gfx/gimp/gimp-2.6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.6.ebuild,v 1.1 2009/03/18 20:08:52 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.6.ebuild,v 1.2 2009/03/30 13:28:41 loki_val Exp $
 
 inherit eutils gnome2 fdo-mime multilib python
 
@@ -36,7 +36,7 @@ RDEPEND=">=dev-libs/glib-2.18.1
 	exif? ( >=media-libs/libexif-0.6.15 )
 	lcms? ( media-libs/lcms )
 	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-bindings-0.3.1 )
+	pdf? ( >=virtual/poppler-glib-0.3.1 )
 	png? ( >=media-libs/libpng-1.2.2 )
 	python?	( >=dev-lang/python-2.5.0
 		>=dev-python/pygtk-2.10.4 )
@@ -52,10 +52,6 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
 
 pkg_setup() {
-	if use pdf && ! built_with_use app-text/poppler-bindings gtk; then
-		eerror "This package requires app-text/poppler-bindings compiled with GTK+ support."
-		die "Please reemerge app-text/poppler-bindings with USE=\"gtk\"."
-	fi
 	if use alsa && ! built_with_use media-libs/alsa-lib midi; then
 		eerror "This package requires media-libs/alsa-lib compiled with midi support."
 		die "Please reemerge media-libs/alsa-lib with USE=\"midi\"."
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index bedb2e8f5ca1..05390a7a6b1a 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.17 2008/05/18 02:08:03 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.18 2009/03/30 13:28:41 loki_val Exp $
 
 inherit subversion fdo-mime flag-o-matic multilib python
 
@@ -39,7 +39,7 @@ RDEPEND=">=dev-libs/glib-2.12.3
 		>=media-libs/libexif-0.6.15 )
 	lcms? ( media-libs/lcms )
 	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-bindings-0.3.1 )
+	pdf? ( >=virtual/poppler-glib-0.3.1 )
 	png? ( >=media-libs/libpng-1.2.2 )
 	python?	( >=dev-lang/python-2.2.1
 		>=dev-python/pygtk-2.10.4 )
@@ -53,10 +53,6 @@ DEPEND="${RDEPEND}
 	doc? ( >=dev-util/gtk-doc-1 )"
 
 pkg_setup() {
-	if use pdf && ! built_with_use app-text/poppler-bindings gtk; then
-		eerror "This package requires app-text/poppler-bindings compiled with GTK+ support."
-		die "Please reemerge app-text/poppler-bindings with USE=\"gtk\"."
-	fi
 	if use alsa && ! built_with_use media-libs/alsa-lib midi; then
 		eerror "This package requires media-libs/alsa-lib compiled with midi support."
 		die "Please reemerge media-libs/alsa-lib with USE=\"midi\"."