Correct poppler dependency.

Package-Manager: portage-2.0.54

5 files changed, 33 insertions, 10 deletions

diff --git a/kde-base/kdegraphics/ChangeLog b/kde-base/kdegraphics/ChangeLog
index 47bc02cff5a9..da14c450bbc0 100644
--- a/kde-base/kdegraphics/ChangeLog
+++ b/kde-base/kdegraphics/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdegraphics
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.226 2006/01/31 23:32:14 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.227 2006/02/01 11:54:27 carlo Exp $
+
+  01 Feb 2006; Carsten Lohrke <carlo@gentoo.org>
+  kdegraphics-3.4.3-r3.ebuild, kdegraphics-3.5.1.ebuild:
+  Correct poppler dependency.
 
   31 Jan 2006; Carsten Lohrke <carlo@gentoo.org>
   +files/kpdf-3.5.1-saveas.patch, kdegraphics-3.5.1.ebuild:
diff --git a/kde-base/kdegraphics/kdegraphics-3.4.3-r3.ebuild b/kde-base/kdegraphics/kdegraphics-3.4.3-r3.ebuild
index 2041f870828b..49b7ca43265d 100644
--- a/kde-base/kdegraphics/kdegraphics-3.4.3-r3.ebuild
+++ b/kde-base/kdegraphics/kdegraphics-3.4.3-r3.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/kde-base/kdegraphics/kdegraphics-3.4.3-r3.ebuild,v 1.8 2006/01/22 11:16:45 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.4.3-r3.ebuild,v 1.9 2006/02/01 11:54:27 carlo Exp $
 
 inherit kde-dist eutils
 
@@ -25,7 +25,7 @@ DEPEND="~kde-base/kdebase-${PV}
 		  virtual/opengl )"
 
 RDEPEND="${DEPEND}
-	|| ( >=app-text/poppler-0.4.3-r1
+	|| ( >=app-text/poppler-bindings-0.4.3-r1
 	     <app-text/xpdf-3.01-r4 )
 	tetex? (
 	|| ( >=app-text/tetex-2
@@ -37,6 +37,14 @@ RDEPEND="${DEPEND}
 DEPEND="${DEPEND}
 	dev-util/pkgconfig"
 
+pkg_setup() {
+	if ! built_with_use app-text/poppler-bindings qt; then
+		eerror "This package requires app-text/poppler-bindings compiled with Qt support."
+		eerror "Please reemerge app-text/poppler-bindings with USE=\"qt\"."
+		die "Please reemerge app-text/poppler-bindings with USE=\"qt\"."
+	fi
+}
+
 src_unpack() {
 	kde_src_unpack
 
diff --git a/kde-base/kdegraphics/kdegraphics-3.5.1.ebuild b/kde-base/kdegraphics/kdegraphics-3.5.1.ebuild
index e9ed7a632ab0..09e03c01162b 100644
--- a/kde-base/kdegraphics/kdegraphics-3.5.1.ebuild
+++ b/kde-base/kdegraphics/kdegraphics-3.5.1.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/kde-base/kdegraphics/kdegraphics-3.5.1.ebuild,v 1.2 2006/01/31 23:32:15 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.5.1.ebuild,v 1.3 2006/02/01 11:54:27 carlo Exp $
 
 inherit kde-dist eutils
 
@@ -23,7 +23,7 @@ DEPEND="~kde-base/kdebase-${PV}
 	openexr? ( >=media-libs/openexr-1.2 )
 	povray? ( media-gfx/povray
 		  virtual/opengl )
-	pdf? ( >=app-text/poppler-0.3.1 )"
+	pdf? ( >=app-text/poppler-bindings-0.3.1 )"
 
 RDEPEND="${DEPEND}
 	tetex? (
@@ -43,7 +43,7 @@ pkg_setup() {
 		eerror "Please reemerge virtual/ghostscript with USE=\"X\"."
 		die "Please reemerge virtual/ghostscript with USE=\"X\"."
 	fi
-	if use pdf && ! built_with_use app-text/poppler qt; then
+	if use pdf && ! built_with_use app-text/poppler-bindings qt; then
 		eerror "This package requires app-text/poppler compiled with Qt support."
 		eerror "Please reemerge app-text/poppler with USE=\"qt\"."
 		die "Please reemerge app-text/poppler with USE=\"qt\"."
diff --git a/kde-base/kpdf/ChangeLog b/kde-base/kpdf/ChangeLog
index 1f8c688411d7..27459047d784 100644
--- a/kde-base/kpdf/ChangeLog
+++ b/kde-base/kpdf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kpdf
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/ChangeLog,v 1.69 2006/01/24 19:52:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/ChangeLog,v 1.70 2006/02/01 11:56:08 carlo Exp $
+
+  01 Feb 2006; Carsten Lohrke <carlo@gentoo.org> kpdf-3.4.3-r3.ebuild:
+  Correct poppler dependency.
 
   24 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/kpdf-3.5.1-saveas.patch, kpdf-3.5.1.ebuild:
diff --git a/kde-base/kpdf/kpdf-3.4.3-r3.ebuild b/kde-base/kpdf/kpdf-3.4.3-r3.ebuild
index 0eafa4b16fef..27d734f5b7c9 100644
--- a/kde-base/kpdf/kpdf-3.4.3-r3.ebuild
+++ b/kde-base/kpdf/kpdf-3.4.3-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.4.3-r3.ebuild,v 1.8 2005/12/29 11:13:13 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.4.3-r3.ebuild,v 1.9 2006/02/01 11:56:08 carlo Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -15,11 +15,19 @@ KMEXTRA="kfile-plugins/pdf"
 DEPEND=">=media-libs/freetype-2.0.5
 	media-libs/t1lib"
 RDEPEND="${DEPEND}
-	|| ( >=app-text/poppler-0.4.3-r1
+	|| ( >=app-text/poppler-bindings-0.4.3-r1
 	     <app-text/xpdf-3.01-r4 )" # kfile-plugins/pdf depends on "pdfinfo"
 
 PATCHES="${FILESDIR}/post-3.4.3-kdegraphics-CAN-2005-3193.diff"
 
+pkg_setup() {
+	if ! built_with_use app-text/poppler-bindings qt; then
+		eerror "This package requires app-text/poppler-bindings compiled with Qt support."
+		eerror "Please reemerge app-text/poppler-bindings with USE=\"qt\"."
+		die "Please reemerge app-text/poppler-bindings with USE=\"qt\"."
+	fi
+}
+
 src_compile() {
 	myconf="${myconf} $(use_enable !nodrm kpdf-drm)"