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

(Portage version: 2.2_rc28/cvs/Linux x86_64)

8 files changed, 24 insertions, 53 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/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\"."