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

3 files changed, 27 insertions, 12 deletions

diff --git a/kde-base/kdebase-kioslaves/ChangeLog b/kde-base/kdebase-kioslaves/ChangeLog
index fcaeabba8ed3..2b45acfb71f8 100644
--- a/kde-base/kdebase-kioslaves/ChangeLog
+++ b/kde-base/kdebase-kioslaves/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdebase-kioslaves
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.63 2006/09/03 12:24:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.64 2006/09/08 19:26:30 flameeyes Exp $
+
+  08 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
+  kdebase-kioslaves-3.5.4.ebuild:
+  Accept dbus-qt3-old aside from dbus proper, and don't do the useflag check
+  for that case.
 
   03 Sep 2006; Bryan Østergaard <kloeri@gentoo.org>
   kdebase-kioslaves-3.5.2.ebuild:
diff --git a/kde-base/kdebase-kioslaves/Manifest b/kde-base/kdebase-kioslaves/Manifest
index cbd1d6c45c7e..b9783c1eb5c0 100644
--- a/kde-base/kdebase-kioslaves/Manifest
+++ b/kde-base/kdebase-kioslaves/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX configure-fix-kdebase-openexr.patch 703 RMD160 eeb4b4f6b72623ae03cfba2235b716db004dc9df SHA1 b01873758c9b0e14880008a2131b04c4468aba2c SHA256 bf022da589e51215c9849f750b7b251ac57a8e48724644c30a50e69d9b7cb94a
 MD5 00c42877b616c0d2c5df33a6eaecbfdd files/configure-fix-kdebase-openexr.patch 703
 RMD160 eeb4b4f6b72623ae03cfba2235b716db004dc9df files/configure-fix-kdebase-openexr.patch 703
@@ -27,14 +30,14 @@ EBUILD kdebase-kioslaves-3.5.3.ebuild 1349 RMD160 08d6629fe2e50dffdce0374a7ced62
 MD5 3ac1611c37467f6785d665fd8b383e8b kdebase-kioslaves-3.5.3.ebuild 1349
 RMD160 08d6629fe2e50dffdce0374a7ced626efa1815a8 kdebase-kioslaves-3.5.3.ebuild 1349
 SHA256 2134cd07cbb97ab6d00c53556b4dd3f68ebeefa452ccab29d545751cb13424e9 kdebase-kioslaves-3.5.3.ebuild 1349
-EBUILD kdebase-kioslaves-3.5.4.ebuild 1386 RMD160 725b427be7cd9acb2232d1dcda46c851bd1a362d SHA1 415ae07719e054936ff909938947eab5b1b3ce04 SHA256 f864e6825883d677fa9272f3a3f07ce97f270d313c1fb021e5c31eea2dec2047
-MD5 35235173d2b1825cc739a5fc9f28ab38 kdebase-kioslaves-3.5.4.ebuild 1386
-RMD160 725b427be7cd9acb2232d1dcda46c851bd1a362d kdebase-kioslaves-3.5.4.ebuild 1386
-SHA256 f864e6825883d677fa9272f3a3f07ce97f270d313c1fb021e5c31eea2dec2047 kdebase-kioslaves-3.5.4.ebuild 1386
-MISC ChangeLog 9404 RMD160 5a093bcc042b6079244c0e3a662fee3c71bc9025 SHA1 c028d50899f21e5db7cfa1d92966b29ceb027dcb SHA256 fabfdaa60ea4b98359e3b6ae863cf29edcf97a2753b047b543d32505079f5566
-MD5 803639afd160dc024524aba4bdd91974 ChangeLog 9404
-RMD160 5a093bcc042b6079244c0e3a662fee3c71bc9025 ChangeLog 9404
-SHA256 fabfdaa60ea4b98359e3b6ae863cf29edcf97a2753b047b543d32505079f5566 ChangeLog 9404
+EBUILD kdebase-kioslaves-3.5.4.ebuild 1452 RMD160 437acb52ddbab86d7f3001d604ace50f33670dc7 SHA1 cf540340a5e09d538a7cd16faba0708f1b7e43ed SHA256 b9abff4694d0de346fdbb20690f65c7437e96dff04efcaa4e7790721e76b9a91
+MD5 bb9c0ad38279aa04fd0f059f27559719 kdebase-kioslaves-3.5.4.ebuild 1452
+RMD160 437acb52ddbab86d7f3001d604ace50f33670dc7 kdebase-kioslaves-3.5.4.ebuild 1452
+SHA256 b9abff4694d0de346fdbb20690f65c7437e96dff04efcaa4e7790721e76b9a91 kdebase-kioslaves-3.5.4.ebuild 1452
+MISC ChangeLog 9589 RMD160 cdc933ea8b82f16ed8d0d172380d189a6daab98f SHA1 6500ce3376fa3ed5272dce7a2ea333c33b7b44b7 SHA256 b76d68c5c1e7cc8d7191201b8699efc8775fb34253bb732bf85a1b0e5d483828
+MD5 264d1e8658c504b6f92af7ffed704450 ChangeLog 9589
+RMD160 cdc933ea8b82f16ed8d0d172380d189a6daab98f ChangeLog 9589
+SHA256 b76d68c5c1e7cc8d7191201b8699efc8775fb34253bb732bf85a1b0e5d483828 ChangeLog 9589
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -51,3 +54,10 @@ SHA256 fbadbab6d9ca54d395d9e1f91808dadbb485cbeffbaf1b50b90f1e5efd772f27 files/di
 MD5 bde197069a871b30d86101bcf804b28f files/digest-kdebase-kioslaves-3.5.4 250
 RMD160 a476573af6620325dc0f2ebef9d1ece778566ad9 files/digest-kdebase-kioslaves-3.5.4 250
 SHA256 b707b2d4d2479a72a3fdffaeae923b9a5941e9a9b59affa98d0b785c351a0764 files/digest-kdebase-kioslaves-3.5.4 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFAcPxAiZjviIA2XgRAllVAJ9hKMfkUcIvk0TaFxOKlUWAjEYaRwCgl7dq
+mR11Ds7tATuyUKtXDvmoVOA=
+=VmD7
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.4.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.4.ebuild
index 9a8ccd37b184..54c893d70a94 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.4.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.4.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/kdebase-kioslaves/kdebase-kioslaves-3.5.4.ebuild,v 1.3 2006/08/02 07:42:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.4.ebuild,v 1.4 2006/09/08 19:26:30 flameeyes Exp $
 
 KMNAME=kdebase
 KMMODULE=kioslave
@@ -14,7 +14,7 @@ IUSE="hal ldap samba openexr"
 DEPEND="ldap? ( net-nds/openldap )
 	samba? ( >=net-fs/samba-3.0.1 )
 	>=dev-libs/cyrus-sasl-2
-	hal? ( >=sys-apps/dbus-0.33
+	hal? ( || ( dev-libs/dbus-qt3-old >=sys-apps/dbus-0.33 )
 		   =sys-apps/hal-0.5*
 		   sys-apps/pmount )
 	openexr? ( media-libs/openexr )"
@@ -25,7 +25,7 @@ PATCHES="${FILESDIR}/${P}-dbuscrash.patch"
 
 pkg_setup() {
 	kde_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 "To enable HAL support in this package is required to have"
 		eerror "sys-apps/dbus compiled with Qt 3 support."
 		eerror "Please reemerge sys-apps/dbus with USE=\"qt3\"."