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

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

3 files changed, 12 insertions, 30 deletions

diff --git a/kde-base/kpdf/ChangeLog b/kde-base/kpdf/ChangeLog
index 59a79e2947d9..f9c8b0fbcc8f 100644
--- a/kde-base/kpdf/ChangeLog
+++ b/kde-base/kpdf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kpdf
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/ChangeLog,v 1.163 2008/09/13 23:59:27 carlo Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/ChangeLog,v 1.164 2009/03/30 13:01:09 loki_val Exp $
+
+  30 Mar 2009; Peter Alfredsen <loki_val@gentoo.org> kpdf-3.5.9.ebuild,
+  kpdf-3.5.10.ebuild:
+  Update dependencies w.r.t. bug 264230, fully-split-out poppler transition.
 
 *kpdf-3.5.10 (13 Sep 2008)
 
diff --git a/kde-base/kpdf/kpdf-3.5.10.ebuild b/kde-base/kpdf/kpdf-3.5.10.ebuild
index 4c0f7cf76f96..de97d36cb200 100644
--- a/kde-base/kpdf/kpdf-3.5.10.ebuild
+++ b/kde-base/kpdf/kpdf-3.5.10.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/kde-base/kpdf/kpdf-3.5.10.ebuild,v 1.1 2008/09/13 23:59:27 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.5.10.ebuild,v 1.2 2009/03/30 13:01:09 loki_val Exp $
 
 KMNAME=kdegraphics
 EAPI="1"
@@ -13,21 +13,10 @@ KMEXTRA="kfile-plugins/pdf"
 
 DEPEND=">=media-libs/freetype-2.3
 	media-libs/t1lib
-	>=app-text/poppler-0.6.1
-	>=app-text/poppler-bindings-0.6.1"
+	>=virtual/poppler-qt3-0.6.1"
 RDEPEND="${DEPEND}
 	|| ( >=kde-base/kdeprint-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"
 
-pkg_setup() {
-	kde_pkg_setup
-	# check for qt still until it had a revision bump in both ~arch and stable.
-	if ! built_with_use app-text/poppler-bindings qt3; then
-		eerror "This package requires app-text/poppler-bindings compiled with Qt 3.x support."
-		eerror "Please reemerge app-text/poppler-bindings with USE=\"qt3\"."
-		die "Please reemerge app-text/poppler-bindings with USE=\"qt3\"."
-	fi
-}
-
 src_compile() {
 	local myconf="--with-poppler"
 	replace-flags "-Os" "-O2" # see bug 114822
diff --git a/kde-base/kpdf/kpdf-3.5.9.ebuild b/kde-base/kpdf/kpdf-3.5.9.ebuild
index c0fe72729cd4..85c2607d6e20 100644
--- a/kde-base/kpdf/kpdf-3.5.9.ebuild
+++ b/kde-base/kpdf/kpdf-3.5.9.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/kde-base/kpdf/kpdf-3.5.9.ebuild,v 1.8 2008/05/18 21:13:10 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.5.9.ebuild,v 1.9 2009/03/30 13:01:09 loki_val Exp $
 
 KMNAME=kdegraphics
 EAPI="1"
@@ -13,21 +13,10 @@ KMEXTRA="kfile-plugins/pdf"
 
 DEPEND=">=media-libs/freetype-2.3
 	media-libs/t1lib
-	>=app-text/poppler-0.6.1
-	>=app-text/poppler-bindings-0.6.1"
+	>=virtual/poppler-qt3-0.6.1"
 RDEPEND="${DEPEND}
 	|| ( >=kde-base/kdeprint-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"
 
-pkg_setup() {
-	kde_pkg_setup
-	# check for qt still until it had a revision bump in both ~arch and stable.
-	if ! built_with_use app-text/poppler-bindings qt3; then
-		eerror "This package requires app-text/poppler-bindings compiled with Qt 3.x support."
-		eerror "Please reemerge app-text/poppler-bindings with USE=\"qt3\"."
-		die "Please reemerge app-text/poppler-bindings with USE=\"qt3\"."
-	fi
-}
-
 src_compile() {
 	local myconf="--with-poppler"
 	replace-flags "-Os" "-O2" # see bug 114822