From: Caleb Tennis <caleb@gentoo.org>
Date: Sun, 12 Nov 2006 20:49:56 +0000 (+0000)
Subject: Fix dbus dep per bug #154251
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b648142d51f0e7d407c99d83ff9ebbb309a0089d;p=gentoo.git

Fix dbus dep per bug #154251
Package-Manager: portage-2.1.2_rc1-r1
---

diff --git a/kde-base/kdebase-kioslaves/ChangeLog b/kde-base/kdebase-kioslaves/ChangeLog
index 1cce5c2ebaba..78ddd82a175a 100644
--- a/kde-base/kdebase-kioslaves/ChangeLog
+++ b/kde-base/kdebase-kioslaves/ChangeLog
@@ -1,6 +1,10 @@
 # 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.71 2006/10/16 21:58:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.72 2006/11/12 20:49:56 caleb Exp $
+
+  12 Nov 2006; Caleb Tennis <caleb@gentoo.org>
+  kdebase-kioslaves-3.5.5-r1.ebuild:
+  Fix dbus dep per bug #154521
 
 *kdebase-kioslaves-3.5.5-r1 (16 Oct 2006)
 
diff --git a/kde-base/kdebase-kioslaves/Manifest b/kde-base/kdebase-kioslaves/Manifest
index 047e5b517790..f4a36f9a0cac 100644
--- a/kde-base/kdebase-kioslaves/Manifest
+++ b/kde-base/kdebase-kioslaves/Manifest
@@ -1,6 +1,3 @@
------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
@@ -38,18 +35,18 @@ EBUILD kdebase-kioslaves-3.5.4.ebuild 1452 RMD160 437acb52ddbab86d7f3001d604ace5
 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
-EBUILD kdebase-kioslaves-3.5.5-r1.ebuild 1776 RMD160 b073c18985483510c2c25519f73d5415e70131fe SHA1 19a425ab203b8d0971fe0fbbb3edbadb45a153b1 SHA256 c7ea16ec83f9d358a695089dba05144adca20685e0e70e0b04be4b3bab473fcb
-MD5 d1f82805bd150a79b2530bea6fc02354 kdebase-kioslaves-3.5.5-r1.ebuild 1776
-RMD160 b073c18985483510c2c25519f73d5415e70131fe kdebase-kioslaves-3.5.5-r1.ebuild 1776
-SHA256 c7ea16ec83f9d358a695089dba05144adca20685e0e70e0b04be4b3bab473fcb kdebase-kioslaves-3.5.5-r1.ebuild 1776
+EBUILD kdebase-kioslaves-3.5.5-r1.ebuild 1796 RMD160 fa7698501068dcb041137fef341296855542dab2 SHA1 8aa32605e806c32304936664d1a44c1e93a06eff SHA256 3ef748cb5d04d88f0371cce6d19277e8964f9d35bc200f6d4719abb2cbeef902
+MD5 19d56db1c17aba3af26926aa2c60bb60 kdebase-kioslaves-3.5.5-r1.ebuild 1796
+RMD160 fa7698501068dcb041137fef341296855542dab2 kdebase-kioslaves-3.5.5-r1.ebuild 1796
+SHA256 3ef748cb5d04d88f0371cce6d19277e8964f9d35bc200f6d4719abb2cbeef902 kdebase-kioslaves-3.5.5-r1.ebuild 1796
 EBUILD kdebase-kioslaves-3.5.5.ebuild 1732 RMD160 d5312e74eb2e0043581bb03060a969c4f7f92b94 SHA1 e60e89b3e6617cfd868e88c9afb4508ea07ca39f SHA256 042401175cf311041cbfa04f10403b8f4ecd9551fdafadc8f539f553b91df942
 MD5 3a323f4d59ce952ce9f63c5e62d828da kdebase-kioslaves-3.5.5.ebuild 1732
 RMD160 d5312e74eb2e0043581bb03060a969c4f7f92b94 kdebase-kioslaves-3.5.5.ebuild 1732
 SHA256 042401175cf311041cbfa04f10403b8f4ecd9551fdafadc8f539f553b91df942 kdebase-kioslaves-3.5.5.ebuild 1732
-MISC ChangeLog 10698 RMD160 faf173bcb63e0661ef9442372bcdc25c43ded64e SHA1 02f4c732fd2efc965486bb5f64aa0bd1a3ab22e1 SHA256 098fe27a968b9787bd19c7f838085d4db93e429b0f492b8519067a027ba95876
-MD5 27137dc737a55884b94c821311407f1f ChangeLog 10698
-RMD160 faf173bcb63e0661ef9442372bcdc25c43ded64e ChangeLog 10698
-SHA256 098fe27a968b9787bd19c7f838085d4db93e429b0f492b8519067a027ba95876 ChangeLog 10698
+MISC ChangeLog 10810 RMD160 74c36d9603f0c9a25b4c8ecb291155592d44ad2e SHA1 9dc450b3bccbccbad0d096f2ff58b5378dcb1c39 SHA256 7ed53995d23cde8627b4df8f333f5be11ac2924abe6bbcffbcde59e11800fd06
+MD5 234184a32b93a126c13708129cc32503 ChangeLog 10810
+RMD160 74c36d9603f0c9a25b4c8ecb291155592d44ad2e ChangeLog 10810
+SHA256 7ed53995d23cde8627b4df8f333f5be11ac2924abe6bbcffbcde59e11800fd06 ChangeLog 10810
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -72,10 +69,3 @@ SHA256 f8d736f629130da8e0d90a8ebd0a550634334af2739900a17d0e04c688b248e2 files/di
 MD5 4413bb62e0a3313d499ee48fb91adfaf files/digest-kdebase-kioslaves-3.5.5-r1 521
 RMD160 4631b6a312d8f0a17d62d4a7f98bb92ab09fa8d1 files/digest-kdebase-kioslaves-3.5.5-r1 521
 SHA256 f8d736f629130da8e0d90a8ebd0a550634334af2739900a17d0e04c688b248e2 files/digest-kdebase-kioslaves-3.5.5-r1 521
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFNAB4AiZjviIA2XgRAgiTAKDx84e/PagajEbVewDV8tYJEo/oPACg4xRS
-/rFsqapLuwLzzKuCWbuX35w=
-=MBsN
------END PGP SIGNATURE-----
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.5-r1.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.5-r1.ebuild
index 3a4d08d61f1f..2d12e35eac41 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.5-r1.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.5-r1.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.5-r1.ebuild,v 1.1 2006/10/16 21:58:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.5-r1.ebuild,v 1.2 2006/11/12 20:49:56 caleb Exp $
 
 KMNAME=kdebase
 KMMODULE=kioslave
@@ -17,7 +17,7 @@ IUSE="hal ldap samba openexr"
 DEPEND="ldap? ( net-nds/openldap )
 	samba? ( >=net-fs/samba-3.0.1 )
 	>=dev-libs/cyrus-sasl-2
-	hal? ( || ( dev-libs/dbus-qt3-old >=sys-apps/dbus-0.33 )
+	hal? ( || ( dev-libs/dbus-qt3-old ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.34 ) )
 		   =sys-apps/hal-0.5*
 		   sys-apps/pmount )
 	openexr? ( >=media-libs/openexr-1.2.2-r2 )"