Update deps w.r.t. bug 264230

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

4 files changed, 48 insertions, 16 deletions

diff --git a/app-text/poppler-bindings/ChangeLog b/app-text/poppler-bindings/ChangeLog
index 752afb95ed66..389a8520672f 100644
--- a/app-text/poppler-bindings/ChangeLog
+++ b/app-text/poppler-bindings/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/poppler-bindings
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/ChangeLog,v 1.131 2009/03/11 23:39:45 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/ChangeLog,v 1.132 2009/04/01 14:42:45 loki_val Exp $
+
+  01 Apr 2009; Peter Alfredsen <loki_val@gentoo.org>
+  poppler-bindings-0.8.7.ebuild, poppler-bindings-0.10.4.ebuild,
+  poppler-bindings-0.10.5.ebuild:
+  Update deps w.r.t. bug 264230
 
 *poppler-bindings-0.10.5 (11 Mar 2009)
 
diff --git a/app-text/poppler-bindings/poppler-bindings-0.10.4.ebuild b/app-text/poppler-bindings/poppler-bindings-0.10.4.ebuild
index c1a63275c132..97cdbfbe18eb 100644
--- a/app-text/poppler-bindings/poppler-bindings-0.10.4.ebuild
+++ b/app-text/poppler-bindings/poppler-bindings-0.10.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/app-text/poppler-bindings/poppler-bindings-0.10.4.ebuild,v 1.8 2009/03/04 20:16:13 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/poppler-bindings-0.10.4.ebuild,v 1.9 2009/04/01 14:42:45 loki_val Exp $
 
 EAPI="2"
 
@@ -28,7 +28,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="gtk qt3 cairo qt4 test"
 
-RDEPEND="~app-text/poppler-${PV}
+RDEPEND="
+	~app-text/poppler-${PV}
 	cairo? (
 		>=x11-libs/cairo-1.4
 		!gtk? (
@@ -49,10 +50,18 @@ RDEPEND="~app-text/poppler-${PV}
 
 			=x11-libs/qt-4.3*
 		)
-	)"
-DEPEND="${RDEPEND}
+	)
+	!dev-libs/poppler-qt3
+	!dev-libs/poppler-qt4
+	!dev-libs/poppler
+	!dev-libs/poppler-glib
+	!app-text/poppler-utils
+	"
+DEPEND="
+	${RDEPEND}
 	dev-util/pkgconfig
-	test? ( gtk? ( >=gnome-base/libglade-2 ) )"
+	test? ( gtk? ( >=gnome-base/libglade-2 ) )
+	"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-text/poppler-bindings/poppler-bindings-0.10.5.ebuild b/app-text/poppler-bindings/poppler-bindings-0.10.5.ebuild
index e3e7320f94f5..61fb5be531bd 100644
--- a/app-text/poppler-bindings/poppler-bindings-0.10.5.ebuild
+++ b/app-text/poppler-bindings/poppler-bindings-0.10.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/app-text/poppler-bindings/poppler-bindings-0.10.5.ebuild,v 1.1 2009/03/11 23:39:45 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/poppler-bindings-0.10.5.ebuild,v 1.2 2009/04/01 14:42:45 loki_val Exp $
 
 EAPI="2"
 
@@ -28,7 +28,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="gtk qt3 cairo qt4 test"
 
-RDEPEND="~app-text/poppler-${PV}
+RDEPEND="
+	~app-text/poppler-${PV}
 	cairo? (
 		>=x11-libs/cairo-1.4
 		!gtk? (
@@ -49,10 +50,18 @@ RDEPEND="~app-text/poppler-${PV}
 
 			=x11-libs/qt-4.3*
 		)
-	)"
-DEPEND="${RDEPEND}
+	)
+	!dev-libs/poppler-qt3
+	!dev-libs/poppler-qt4
+	!dev-libs/poppler
+	!dev-libs/poppler-glib
+	!app-text/poppler-utils
+	"
+DEPEND="
+	${RDEPEND}
 	dev-util/pkgconfig
-	test? ( gtk? ( >=gnome-base/libglade-2 ) )"
+	test? ( gtk? ( >=gnome-base/libglade-2 ) )
+	"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-text/poppler-bindings/poppler-bindings-0.8.7.ebuild b/app-text/poppler-bindings/poppler-bindings-0.8.7.ebuild
index 4e74219b70f0..ebbfc1605f4b 100644
--- a/app-text/poppler-bindings/poppler-bindings-0.8.7.ebuild
+++ b/app-text/poppler-bindings/poppler-bindings-0.8.7.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/app-text/poppler-bindings/poppler-bindings-0.8.7.ebuild,v 1.16 2009/02/27 14:41:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/poppler-bindings-0.8.7.ebuild,v 1.17 2009/04/01 14:42:45 loki_val Exp $
 
 EAPI="1"
 
@@ -27,7 +27,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="gtk qt3 cairo qt4 test"
 
-RDEPEND="~app-text/poppler-${PV}
+RDEPEND="
+	~app-text/poppler-${PV}
 	cairo? ( >=x11-libs/cairo-1.4 )
 	gtk? (
 		>=x11-libs/gtk+-2.8
@@ -42,9 +43,17 @@ RDEPEND="~app-text/poppler-${PV}
 
 			=x11-libs/qt-4.3*
 		)
-	)"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	)
+	!dev-libs/poppler-qt3
+	!dev-libs/poppler-qt4
+	!dev-libs/poppler
+	!dev-libs/poppler-glib
+	!app-text/poppler-utils
+	"
+DEPEND="
+	${RDEPEND}
+	dev-util/pkgconfig
+	"
 
 S="${WORKDIR}/${MY_P}"