Fix dbus dep per bug #154521

Package-Manager: portage-2.1.2_rc1-r1

diff --git a/kde-misc/kdbus/ChangeLog b/kde-misc/kdbus/ChangeLog
index 74c5d43277884bcd9263a0bcc18139759b3d588a..22953e5869263b289f621aa0059a09e6d559761e 100644 (file)
--- a/kde-misc/kdbus/ChangeLog
+++ b/kde-misc/kdbus/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-misc/kdbus
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdbus/ChangeLog,v 1.4 2006/10/31 09:09:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdbus/ChangeLog,v 1.5 2006/11/12 20:40:33 caleb Exp $
+
+  12 Nov 2006; Caleb Tennis <caleb@gentoo.org> kdbus-0.8.6.ebuild:
+  Fix dbus dep per bug #154521
 
   31 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> kdbus-0.8.6.ebuild:
   Remove dbus-core dependencies.

diff --git a/kde-misc/kdbus/Manifest b/kde-misc/kdbus/Manifest
index 1d87d98fa6a4d7ec69f7ec02576c2062edf4474f..2862e033a8b507af23a43896103644d54c87c0ab 100644 (file)
--- a/kde-misc/kdbus/Manifest
+++ b/kde-misc/kdbus/Manifest
@@ -1,19 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX kdbus-0.8.6-desktop.patch 932 RMD160 f8875dfaac885448637ad67fd0562f4a21105633 SHA1 511067c547feb706c5a6952abcd3f675520836f6 SHA256 fe9ae1ecab939bd8da73483c834255e5b2b78408bfb6b8154b7ed0892c9d8fd0
 MD5 95f1e223afc491596223a87e516b9b32 files/kdbus-0.8.6-desktop.patch 932
 RMD160 f8875dfaac885448637ad67fd0562f4a21105633 files/kdbus-0.8.6-desktop.patch 932
 SHA256 fe9ae1ecab939bd8da73483c834255e5b2b78408bfb6b8154b7ed0892c9d8fd0 files/kdbus-0.8.6-desktop.patch 932
 DIST kdbus-0.8.6.tar.gz 496119 RMD160 be63bed74061f4910485bcd1fcaae13a852bdeea SHA1 f9365eb720ccfa98db6a6a3cd94e94a5ff937f7d SHA256 0b2afb16368bcce6654cdda4c4a991dc402ef01f9875d2179262acced5969885
-EBUILD kdbus-0.8.6.ebuild 525 RMD160 e237a144973fa8cb224cc2bf7a8670b54dabf3c9 SHA1 da2ede530f0788668ebe78d2efe0a7bdead184a3 SHA256 07b0a85e23ba9b9e367c55d7a01f720891f4b2b0219310707e635bb2d993864a
-MD5 064327f487797b76ce481f1095b65351 kdbus-0.8.6.ebuild 525
-RMD160 e237a144973fa8cb224cc2bf7a8670b54dabf3c9 kdbus-0.8.6.ebuild 525
-SHA256 07b0a85e23ba9b9e367c55d7a01f720891f4b2b0219310707e635bb2d993864a kdbus-0.8.6.ebuild 525
-MISC ChangeLog 779 RMD160 2fd9835ceb5fa6c4297a08bdd04c7046aae15202 SHA1 aa5bb894c8f5f116ebbb18cff412c598a3bb94a0 SHA256 59d6a31258739f29cf5a59875c997636c5989f969a71e05843c8dcc980f7aced
-MD5 d8b1179ce47a6a895896431443224dfd ChangeLog 779
-RMD160 2fd9835ceb5fa6c4297a08bdd04c7046aae15202 ChangeLog 779
-SHA256 59d6a31258739f29cf5a59875c997636c5989f969a71e05843c8dcc980f7aced ChangeLog 779
+EBUILD kdbus-0.8.6.ebuild 579 RMD160 4dd6d0b636cbc36e5274bf0951db0c87b8800fd4 SHA1 1106e0a5b258d3bc77024d430c8913e0c38bf41f SHA256 66bbf5c1a39b355d55328aa2cecb3d33c3dbe3dde378f2b0561e12728053867b
+MD5 bba9b0034350e13561c1c871657a6891 kdbus-0.8.6.ebuild 579
+RMD160 4dd6d0b636cbc36e5274bf0951db0c87b8800fd4 kdbus-0.8.6.ebuild 579
+SHA256 66bbf5c1a39b355d55328aa2cecb3d33c3dbe3dde378f2b0561e12728053867b kdbus-0.8.6.ebuild 579
+MISC ChangeLog 874 RMD160 4cb488805df8516b6b57fcb0f548a33f4425bf51 SHA1 b7158d4213ec5934ba247c4e7f79c48aaa77a190 SHA256 873007b59f0ff296b2e8252d745fc013c31b96967ad5e0dbf0f6452b4aee98ae
+MD5 2c68642dd050219832eba3c9ece1554f ChangeLog 874
+RMD160 4cb488805df8516b6b57fcb0f548a33f4425bf51 ChangeLog 874
+SHA256 873007b59f0ff296b2e8252d745fc013c31b96967ad5e0dbf0f6452b4aee98ae ChangeLog 874
 MISC metadata.xml 446 RMD160 7fe65b9abe297c4c56f40d7a2a84e5deaaaeb1a2 SHA1 6ce3270659c2a50cef7e7a1a63785bbfb87e7f61 SHA256 f41eb74674386a4724f014f8ae4229c4a0c30c9a7a0c4d631b74fd6066c3dc63
 MD5 7fd8863eb2ac2b60802736b4478eaefa metadata.xml 446
 RMD160 7fe65b9abe297c4c56f40d7a2a84e5deaaaeb1a2 metadata.xml 446
@@ -21,10 +18,3 @@ SHA256 f41eb74674386a4724f014f8ae4229c4a0c30c9a7a0c4d631b74fd6066c3dc63 metadata
 MD5 ba0406bbe43068b68c0e8ad9b6e2b240 files/digest-kdbus-0.8.6 235
 RMD160 45f75451da6e294a62c212c5e5db2509887dfea4 files/digest-kdbus-0.8.6 235
 SHA256 1db6176ab9c012303ac6c6ff33194bce78ac5e264eb5b71b875217c59397d218 files/digest-kdbus-0.8.6 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFRxK1AiZjviIA2XgRAhnjAKCLTyd+fbjAG9wsWvvljHa5WPZjIwCgswH6
-/QBrx29wWRANl/YdwhGtY9k=
-=A7YM
------END PGP SIGNATURE-----

diff --git a/kde-misc/kdbus/kdbus-0.8.6.ebuild b/kde-misc/kdbus/kdbus-0.8.6.ebuild
index 37c91f4bcd3e78f428866324198d0e2bb27625ac..1ea17e9c26945cf3e877b36792ca6d92d367cf45 100644 (file)
--- a/kde-misc/kdbus/kdbus-0.8.6.ebuild
+++ b/kde-misc/kdbus/kdbus-0.8.6.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-misc/kdbus/kdbus-0.8.6.ebuild,v 1.5 2006/10/31 09:09:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdbus/kdbus-0.8.6.ebuild,v 1.6 2006/11/12 20:40:33 caleb Exp $
 
 inherit kde
 
@@ -14,7 +14,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND=">=sys-apps/dbus-0.50"
+DEPEND="( || ( dev-libs/dbus-qt3-old
+       ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.34 ) ) )"
 RDEPEND="${DEPEND}"
 
 need-kde 3.3