Accept dbus-qt3-old aside from dbus proper, and don't do the useflag check for that case.

Package-Manager: portage-2.1.1_rc1-r7

4 files changed, 36 insertions, 19 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 9e96bcd45662..7c554475963c 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.161 2006/09/07 17:02:56 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.162 2006/09/08 21:04:23 flameeyes Exp $
+
+  08 Sep 2006; Diego Pettenò <flameeyes@gentoo.org> k3b-0.12.17.ebuild,
+  k3b-1.0_pre2.ebuild:
+  Accept dbus-qt3-old aside from dbus proper, and don't do the useflag check
+  for that case.
 
 *k3b-1.0_pre2 (07 Sep 2006)
 
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index 819c67a349f9..ae3dd2d630ac 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST k3b-0.12.14.tar.bz2 4096391 RMD160 fc06fce15d7f4140de9810257c46a217f022caf9 SHA1 02cef09cb6d8f3bfcfd60099aa55fb2706dd5a8e SHA256 00e88c3c1f04b0f8c5e124fced6729bfc7e078fe5d1d449bb07b1f3746eb6ead
 DIST k3b-0.12.15.tar.bz2 4000389 RMD160 9d0ff14b394153d97ef61fcf7b46894ec5d3d511 SHA1 4f2768f6473032fbf6cde2d13b1c2729b7e91e3f SHA256 5e6cb62f38dcb17c5296e53df89d7bb709f0d336b6a41db9be1b464d4638f32a
 DIST k3b-0.12.16.tar.bz2 4004784 RMD160 b4b64924096581bcb0c3432f99f0e27ffe0aca79 SHA1 875ebae1e5bc4ef0f186c1025087ed8005c10248 SHA256 bc686f6e596df32f2c305a1f4948ceddbbfb067045e6b9b314af615319d11fe6
@@ -20,22 +23,22 @@ EBUILD k3b-0.12.16.ebuild 3216 RMD160 99f700836a5d95a27d1de99a6dd526f1c44c20d7 S
 MD5 2370c8c12d208a202a3b1f2499e3587f k3b-0.12.16.ebuild 3216
 RMD160 99f700836a5d95a27d1de99a6dd526f1c44c20d7 k3b-0.12.16.ebuild 3216
 SHA256 6dccadd7c794f47f2fd55eb8fff0bd7fda3356d2cb17400c3485367475847355 k3b-0.12.16.ebuild 3216
-EBUILD k3b-0.12.17.ebuild 3212 RMD160 c4161dea1c0e2e5f0ea10a8e33f78ef93a23c758 SHA1 08525c768ab4c7231de6784cd03b49e75bddd008 SHA256 1fde16a4183a3feb3a21bb8f716827684cc29abbb4a0d9e6b7a58f0c13c5a7aa
-MD5 ea4284d270ad45e577af7c67af0944e9 k3b-0.12.17.ebuild 3212
-RMD160 c4161dea1c0e2e5f0ea10a8e33f78ef93a23c758 k3b-0.12.17.ebuild 3212
-SHA256 1fde16a4183a3feb3a21bb8f716827684cc29abbb4a0d9e6b7a58f0c13c5a7aa k3b-0.12.17.ebuild 3212
+EBUILD k3b-0.12.17.ebuild 3284 RMD160 57e0e46ee79583c470b85364a787d26c1a7dc43e SHA1 4d9ac7af9769e1e7c3e160645980d4f3d1474a4b SHA256 89c60399d13ebb7da0304291ec58c0d3037a854724a5974da576e692a73c33e4
+MD5 9726475b8cd86efab70f7fe1b78111e4 k3b-0.12.17.ebuild 3284
+RMD160 57e0e46ee79583c470b85364a787d26c1a7dc43e k3b-0.12.17.ebuild 3284
+SHA256 89c60399d13ebb7da0304291ec58c0d3037a854724a5974da576e692a73c33e4 k3b-0.12.17.ebuild 3284
 EBUILD k3b-1.0_pre1.ebuild 3724 RMD160 4160c5d8eb09d8c5d2d154725227eeaa03ae6de1 SHA1 cc3740fcc622d75b00e2fa13375f321378c85948 SHA256 93c023c9dae64f73d0e3a971790e84474d45d9b1395c04ab173cba744454885a
 MD5 b51eab12fb8bc25ae34c3ad7b820e378 k3b-1.0_pre1.ebuild 3724
 RMD160 4160c5d8eb09d8c5d2d154725227eeaa03ae6de1 k3b-1.0_pre1.ebuild 3724
 SHA256 93c023c9dae64f73d0e3a971790e84474d45d9b1395c04ab173cba744454885a k3b-1.0_pre1.ebuild 3724
-EBUILD k3b-1.0_pre2.ebuild 3921 RMD160 d5b0241f53b072bc0b96d3aa9aafb6e8f13e9def SHA1 77331da2627fd03917ffe49184e7ee486cac956e SHA256 b4b51cfcb71d7c186d49a60c8412e840bd60781635270cc05edfdff977f75dc9
-MD5 cb3df253514e5f703a5056cbba97790d k3b-1.0_pre2.ebuild 3921
-RMD160 d5b0241f53b072bc0b96d3aa9aafb6e8f13e9def k3b-1.0_pre2.ebuild 3921
-SHA256 b4b51cfcb71d7c186d49a60c8412e840bd60781635270cc05edfdff977f75dc9 k3b-1.0_pre2.ebuild 3921
-MISC ChangeLog 22941 RMD160 382b175b46eec00f946400b29b68c8ea4ccbf41f SHA1 49ab992df18ecf8bfde8a5f0cdcf01481e2c49b1 SHA256 ef6e6f001e063ed1c6fef39b5763f6663a1aedc6c9caa983dff663c2a75a372c
-MD5 0037c7583523cec5aeada18e785d7861 ChangeLog 22941
-RMD160 382b175b46eec00f946400b29b68c8ea4ccbf41f ChangeLog 22941
-SHA256 ef6e6f001e063ed1c6fef39b5763f6663a1aedc6c9caa983dff663c2a75a372c ChangeLog 22941
+EBUILD k3b-1.0_pre2.ebuild 3987 RMD160 e78edd89ba0788d8bd16ccddb4c5c9066d667ec1 SHA1 c4f3ae32879c194c9d3bef9244dc20fea7826fb2 SHA256 49f8b8d30d8f7631d4239a28e04953969399c04998df3965a0c61a7804418a4c
+MD5 0f8ab1efdff50a009f9939f93e481e89 k3b-1.0_pre2.ebuild 3987
+RMD160 e78edd89ba0788d8bd16ccddb4c5c9066d667ec1 k3b-1.0_pre2.ebuild 3987
+SHA256 49f8b8d30d8f7631d4239a28e04953969399c04998df3965a0c61a7804418a4c k3b-1.0_pre2.ebuild 3987
+MISC ChangeLog 23130 RMD160 601344f66487d6fc89ae3055be8769b113fbb82d SHA1 b1a1cc1b37359bcdddc2902801fdc36baa1d35a5 SHA256 3703396554323a0e9213a14eb9ade2aaafde74bf536ef4a7df0f90ec88b722a5
+MD5 b4f4c5b502e39ed0597f8775f569498c ChangeLog 23130
+RMD160 601344f66487d6fc89ae3055be8769b113fbb82d ChangeLog 23130
+SHA256 3703396554323a0e9213a14eb9ade2aaafde74bf536ef4a7df0f90ec88b722a5 ChangeLog 23130
 MISC metadata.xml 183 RMD160 dfdbe8a9663c05a4c6ab7aaf0e1d5b35ac030e2f SHA1 44581aca775d8ca4854c53861174b6147da706b4 SHA256 d004a7535807ea599189a046ac582ca032a91f868bbcf4b72195773dfaf15462
 MD5 6cac9f56ab7373612097cef824badcf7 metadata.xml 183
 RMD160 dfdbe8a9663c05a4c6ab7aaf0e1d5b35ac030e2f metadata.xml 183
@@ -58,3 +61,10 @@ SHA256 a391a1aae9365f6d0aafeb79773bfe9a9c32e166a82406e7f2aee01d0d7c8007 files/di
 MD5 06c8228dcc70c7328e92858119e31378 files/digest-k3b-1.0_pre2 241
 RMD160 a0da4d6c56cec28f5b218bba7846654795425464 files/digest-k3b-1.0_pre2 241
 SHA256 d44cce2ed2deb1116b03f9b749e054956130ae925bc54ec7158d35e7e126dd76 files/digest-k3b-1.0_pre2 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFAdroAiZjviIA2XgRAulLAJ0WWqmfR0qA9n6Mqz0uexiVrI2kEACePmEs
+jVzgPkpH+UL60YNCAupYBRs=
+=Si0G
+-----END PGP SIGNATURE-----
diff --git a/app-cdr/k3b/k3b-0.12.17.ebuild b/app-cdr/k3b/k3b-0.12.17.ebuild
index da02538b64e2..45e414528a7c 100644
--- a/app-cdr/k3b/k3b-0.12.17.ebuild
+++ b/app-cdr/k3b/k3b-0.12.17.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/app-cdr/k3b/k3b-0.12.17.ebuild,v 1.1 2006/08/23 16:30:07 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.12.17.ebuild,v 1.2 2006/09/08 21:04:23 flameeyes Exp $
 
 inherit kde eutils
 
@@ -14,7 +14,8 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="alsa css dvdr encode ffmpeg flac hal kde mp3 musepack musicbrainz sndfile vcd vorbis"
 
 DEPEND="kde? ( || ( kde-base/kdesu kde-base/kdebase ) )
-	hal? ( sys-apps/dbus sys-apps/hal )
+	hal? ( || ( dev-libs/dbus-qt3-old sys-apps/dbus )
+		sys-apps/hal )
 	media-libs/libsamplerate
 	media-libs/taglib
 	>=media-sound/cdparanoia-3.9.8
@@ -54,7 +55,7 @@ for X in ${LANGS}; do
 done
 
 pkg_setup() {
-	if use hal && ! built_with_use sys-apps/dbus qt3; then
+	if use hal && has_version '<sys-apps/dbus-0.91' && ! built_with_use sys-apps/dbus qt3; then
 		eerror "You are trying to compile ${CATEGORY}/${PF} with the \"hal\" USE flag enabled,"
 		eerror "but sys-apps/dbus is not built with Qt3 support."
 		die "rebuild sys-apps/dbus with the qt3 useflag"
diff --git a/app-cdr/k3b/k3b-1.0_pre2.ebuild b/app-cdr/k3b/k3b-1.0_pre2.ebuild
index 762371929c3c..e8d4efdad6d1 100644
--- a/app-cdr/k3b/k3b-1.0_pre2.ebuild
+++ b/app-cdr/k3b/k3b-1.0_pre2.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/app-cdr/k3b/k3b-1.0_pre2.ebuild,v 1.1 2006/09/07 17:02:56 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0_pre2.ebuild,v 1.2 2006/09/08 21:04:23 flameeyes Exp $
 
 inherit kde eutils
 
@@ -17,7 +17,8 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="alsa css dvdr dvdread encode ffmpeg flac hal kde mp3 musepack musicbrainz sndfile vcd vorbis"
 
 DEPEND="kde? ( || ( kde-base/kdesu kde-base/kdebase ) )
-	hal? ( sys-apps/dbus sys-apps/hal )
+	hal? ( || ( dev-libs/dbus-qt3-old sys-apps/dbus )
+		sys-apps/hal )
 	media-libs/libsamplerate
 	media-libs/taglib
 	>=media-sound/cdparanoia-3.9.8
@@ -60,7 +61,7 @@ need-kde 3.2
 #done
 
 pkg_setup() {
-	if use hal && ! built_with_use sys-apps/dbus qt3; then
+	if use hal && has_version '<sys-apps/dbus-0.91' && ! built_with_use sys-apps/dbus qt3; then
 		eerror "You are trying to compile ${CATEGORY}/${PF} with the \"hal\" USE flag enabled,"
 		eerror "but sys-apps/dbus is not built with Qt3 support."
 		die "Please, rebuild sys-apps/dbus with the \"qt3\" USE flag."