Change built_with_use poppler-bindings check to also allow qt3

Package-Manager: portage-2.1.1_pre1-r3

5 files changed, 34 insertions, 23 deletions

diff --git a/kde-base/kdegraphics/ChangeLog b/kde-base/kdegraphics/ChangeLog
index 11d46e876f1e..2ef2ef69b892 100644
--- a/kde-base/kdegraphics/ChangeLog
+++ b/kde-base/kdegraphics/ChangeLog
@@ -1,6 +1,11 @@
 # 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.260 2006/06/03 12:42:36 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.261 2006/06/27 21:04:19 genstef Exp $
+
+  27 Jun 2006; Stefan Schweizer <genstef@gentoo.org>
+  kdegraphics-3.4.3-r4.ebuild, kdegraphics-3.5.2.ebuild,
+  kdegraphics-3.5.3.ebuild:
+  Change built_with_use poppler-bindings check to also allow qt3
 
   03 Jun 2006; Guy Martin <gmsoft@gentoo.org> kdegraphics-3.5.2.ebuild:
   Stable on hppa.
diff --git a/kde-base/kdegraphics/Manifest b/kde-base/kdegraphics/Manifest
index 892e7021c6b9..694e9e1e360a 100644
--- a/kde-base/kdegraphics/Manifest
+++ b/kde-base/kdegraphics/Manifest
@@ -40,22 +40,22 @@ EBUILD kdegraphics-3.3.2-r3.ebuild 1615 RMD160 9183b71c80ecff21bb2829ca8cfc68583
 MD5 2e5068285399de959f7257f5309dfbb9 kdegraphics-3.3.2-r3.ebuild 1615
 RMD160 9183b71c80ecff21bb2829ca8cfc68583fd24ce3 kdegraphics-3.3.2-r3.ebuild 1615
 SHA256 3d1ffb672b0bdb49fac6e26636cee4b1de946264283a0be5dc1d2d9f7ce4d60b kdegraphics-3.3.2-r3.ebuild 1615
-EBUILD kdegraphics-3.4.3-r4.ebuild 2211 RMD160 385e4810cdc746867e80729696383c5410b40b46 SHA1 8cf8d62dc7f61ad5b96695df04fa43d90410e2e1 SHA256 b27d6a8179e807ff377a6a4ac2a5532ddd00e89e89e06b98ce8af8bf1462168a
-MD5 f7b6e61a2021c264686f236708f580b3 kdegraphics-3.4.3-r4.ebuild 2211
-RMD160 385e4810cdc746867e80729696383c5410b40b46 kdegraphics-3.4.3-r4.ebuild 2211
-SHA256 b27d6a8179e807ff377a6a4ac2a5532ddd00e89e89e06b98ce8af8bf1462168a kdegraphics-3.4.3-r4.ebuild 2211
-EBUILD kdegraphics-3.5.2.ebuild 2295 RMD160 ba40923669a85898af03a6c05be8c92a7ebe574a SHA1 8a4cc82222ff7a03de39f228301fbe51cc3c8b8a SHA256 d31242ee4d322158feb8d900256e2e93baafd2076319cf37beb9c75a598784fd
-MD5 c855eee9adec0392badaef443b027526 kdegraphics-3.5.2.ebuild 2295
-RMD160 ba40923669a85898af03a6c05be8c92a7ebe574a kdegraphics-3.5.2.ebuild 2295
-SHA256 d31242ee4d322158feb8d900256e2e93baafd2076319cf37beb9c75a598784fd kdegraphics-3.5.2.ebuild 2295
-EBUILD kdegraphics-3.5.3.ebuild 2265 RMD160 d7a6c89088a164ec4ab2f46d4176cb3bb4b63ab0 SHA1 10b7cd7446ce9b53bbf7e25481f3fa3b2e460750 SHA256 8dd451eb6c37323d7f20c8efb3cb5e2682e490d7f590367775799cec023e8e27
-MD5 caeafc8b2d877bf0bfa3ea1768901ca3 kdegraphics-3.5.3.ebuild 2265
-RMD160 d7a6c89088a164ec4ab2f46d4176cb3bb4b63ab0 kdegraphics-3.5.3.ebuild 2265
-SHA256 8dd451eb6c37323d7f20c8efb3cb5e2682e490d7f590367775799cec023e8e27 kdegraphics-3.5.3.ebuild 2265
-MISC ChangeLog 37936 RMD160 23b23b903af7ede32c349b395ce631ab236fa1d0 SHA1 134abd20084bb5c7727647338433c17c27b69a88 SHA256 102fdd235d3852ab877010402662ce49559b5179561d4086793d903d98905348
-MD5 eed09ea7a0d22dd0d11962d7fc7d1174 ChangeLog 37936
-RMD160 23b23b903af7ede32c349b395ce631ab236fa1d0 ChangeLog 37936
-SHA256 102fdd235d3852ab877010402662ce49559b5179561d4086793d903d98905348 ChangeLog 37936
+EBUILD kdegraphics-3.4.3-r4.ebuild 2342 RMD160 66dc47ee8f8e6b3a05b9d952a033261bf570b7e5 SHA1 6dc111be8848ac0b15601be82d5186231bb683ca SHA256 2672c3353348e7f414d25de17491d46494d4226103f9c7cadbc7ff82a8159813
+MD5 38fdfd381a085f4a76dbbb5cefa46401 kdegraphics-3.4.3-r4.ebuild 2342
+RMD160 66dc47ee8f8e6b3a05b9d952a033261bf570b7e5 kdegraphics-3.4.3-r4.ebuild 2342
+SHA256 2672c3353348e7f414d25de17491d46494d4226103f9c7cadbc7ff82a8159813 kdegraphics-3.4.3-r4.ebuild 2342
+EBUILD kdegraphics-3.5.2.ebuild 2427 RMD160 f4585faf57090b0c053de582ed667c445c917a47 SHA1 71b6d6fb98f2a2e9d257fddf6c23dbbb5f648bf8 SHA256 eee086a1bab8cc60ef8adda00031ac4c8bf048ded82d056c94e8347f1391324f
+MD5 cb65a1a98bf8d3bd01fb76a856f62255 kdegraphics-3.5.2.ebuild 2427
+RMD160 f4585faf57090b0c053de582ed667c445c917a47 kdegraphics-3.5.2.ebuild 2427
+SHA256 eee086a1bab8cc60ef8adda00031ac4c8bf048ded82d056c94e8347f1391324f kdegraphics-3.5.2.ebuild 2427
+EBUILD kdegraphics-3.5.3.ebuild 2396 RMD160 c7ed2efd2e8389bec12c3f63e9e0652552184c04 SHA1 89155600d72e651629c6f4187610a886c5a818eb SHA256 d7fe2d925f4751821263d89384c05f25fd2b82a328a2371c2aee972bfe5a3d71
+MD5 3618bc20bca1821c69f7494e64ee2fae kdegraphics-3.5.3.ebuild 2396
+RMD160 c7ed2efd2e8389bec12c3f63e9e0652552184c04 kdegraphics-3.5.3.ebuild 2396
+SHA256 d7fe2d925f4751821263d89384c05f25fd2b82a328a2371c2aee972bfe5a3d71 kdegraphics-3.5.3.ebuild 2396
+MISC ChangeLog 38141 RMD160 891ca73707fa112badd1d60af951259d3ad11e8a SHA1 9ab0c3b25b0ebf7cc336417149f9177861d1234a SHA256 0e8fce87860b42d4d6a9c1444c1bc5b11f78b970096a53ef44aff63dd5ccfb7d
+MD5 d782099512e0c82432e18333d1f0973b ChangeLog 38141
+RMD160 891ca73707fa112badd1d60af951259d3ad11e8a ChangeLog 38141
+SHA256 0e8fce87860b42d4d6a9c1444c1bc5b11f78b970096a53ef44aff63dd5ccfb7d ChangeLog 38141
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
diff --git a/kde-base/kdegraphics/kdegraphics-3.4.3-r4.ebuild b/kde-base/kdegraphics/kdegraphics-3.4.3-r4.ebuild
index 92a898ce2670..043aebe2dbe8 100644
--- a/kde-base/kdegraphics/kdegraphics-3.4.3-r4.ebuild
+++ b/kde-base/kdegraphics/kdegraphics-3.4.3-r4.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-r4.ebuild,v 1.10 2006/04/04 20:53:00 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.4.3-r4.ebuild,v 1.11 2006/06/27 21:04:19 genstef Exp $
 
 inherit kde-dist eutils
 
@@ -37,7 +37,9 @@ DEPEND="${DEPEND}
 	dev-util/pkgconfig"
 
 pkg_setup() {
-	if ! built_with_use app-text/poppler-bindings qt; then
+	# check for qt still until it had a revision bump in both ~arch and stable.
+	if ! built_with_use app-text/poppler-bindings qt && \
+		! built_with_use app-text/poppler-bindings qt3; 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\"."
diff --git a/kde-base/kdegraphics/kdegraphics-3.5.2.ebuild b/kde-base/kdegraphics/kdegraphics-3.5.2.ebuild
index baf70f7315ae..d636126d7fb9 100644
--- a/kde-base/kdegraphics/kdegraphics-3.5.2.ebuild
+++ b/kde-base/kdegraphics/kdegraphics-3.5.2.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.2.ebuild,v 1.13 2006/06/03 12:42:36 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.5.2.ebuild,v 1.14 2006/06/27 21:04:19 genstef Exp $
 
 inherit kde-dist eutils
 
@@ -50,7 +50,9 @@ pkg_setup() {
 			die "Please reemerge ${ghostscript} with USE=\"X\"."
 		fi
 	done
-	if use pdf && ! built_with_use app-text/poppler-bindings qt; then
+	# check for qt still until it had a revision bump in both ~arch and stable.
+	if use pdf && ! built_with_use app-text/poppler-bindings qt && \
+		! built_with_use app-text/poppler-bindings qt3; 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\"."
diff --git a/kde-base/kdegraphics/kdegraphics-3.5.3.ebuild b/kde-base/kdegraphics/kdegraphics-3.5.3.ebuild
index 9b31e6ee4227..52bb14e47d43 100644
--- a/kde-base/kdegraphics/kdegraphics-3.5.3.ebuild
+++ b/kde-base/kdegraphics/kdegraphics-3.5.3.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.3.ebuild,v 1.1 2006/06/02 20:01:13 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.5.3.ebuild,v 1.2 2006/06/27 21:04:19 genstef Exp $
 
 inherit kde-dist eutils
 
@@ -50,7 +50,9 @@ pkg_setup() {
 			die "Please reemerge ${ghostscript} with USE=\"X\"."
 		fi
 	done
-	if use pdf && ! built_with_use app-text/poppler-bindings qt; then
+	# check for qt still until it had a revision bump in both ~arch and stable.
+	if use pdf && ! built_with_use app-text/poppler-bindings qt && \
+		! built_with_use app-text/poppler-bindings qt3; 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\"."