From: Leonardo Boshell <leonardop@gentoo.org>
Date: Mon, 20 Nov 2006 23:32:24 +0000 (+0000)
Subject: Adjust dbus dependency (bug #154521).
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5d052faa17953e2f0eb27a72c402d367661f1ec2;p=gentoo.git

Adjust dbus dependency (bug #154521).
Package-Manager: portage-2.1.2_rc1-r7
---

diff --git a/app-editors/katoob/ChangeLog b/app-editors/katoob/ChangeLog
index dc8b7768548f..fa2d1cc65fec 100644
--- a/app-editors/katoob/ChangeLog
+++ b/app-editors/katoob/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/katoob
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/katoob/ChangeLog,v 1.14 2006/11/01 00:17:15 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/katoob/ChangeLog,v 1.15 2006/11/20 23:32:24 leonardop Exp $
+
+  20 Nov 2006; Leonardo Boshell <leonardop@gentoo.org> katoob-0.5.4.ebuild:
+  Adjust dbus dependency (bug #154521).
 
 *katoob-0.5.4 (31 Oct 2006)
 
diff --git a/app-editors/katoob/Manifest b/app-editors/katoob/Manifest
index cb78d8216777..966b232d7d13 100644
--- a/app-editors/katoob/Manifest
+++ b/app-editors/katoob/Manifest
@@ -4,14 +4,14 @@ EBUILD katoob-0.3.8.ebuild 1009 RMD160 31157467d7cbc3aa38bc8f5a01b95a81a389b138
 MD5 697a7d124a60557dda245451116139bc katoob-0.3.8.ebuild 1009
 RMD160 31157467d7cbc3aa38bc8f5a01b95a81a389b138 katoob-0.3.8.ebuild 1009
 SHA256 4ed57b35d8c38c4390ec299658e3c13587fb68d552f656d69d6ebdd11a5aadde katoob-0.3.8.ebuild 1009
-EBUILD katoob-0.5.4.ebuild 1190 RMD160 f9504a2230700e7b69b1567a783d920252e9cbe3 SHA1 27481241cf842aa6cb7e715f5de47d222a7acfb8 SHA256 eb662e9189b7bbfe3ecf0c8116902e5d304a1bf8701e35b09479ae2fe092695f
-MD5 4cdb95ad308288050a642662070c068c katoob-0.5.4.ebuild 1190
-RMD160 f9504a2230700e7b69b1567a783d920252e9cbe3 katoob-0.5.4.ebuild 1190
-SHA256 eb662e9189b7bbfe3ecf0c8116902e5d304a1bf8701e35b09479ae2fe092695f katoob-0.5.4.ebuild 1190
-MISC ChangeLog 1929 RMD160 11b23d6dff0c839a7c5c6415e0626b7cc3d4893d SHA1 503ec5caa31c897bad95a1be0d2c389c930ebc9a SHA256 372f5a3e028c11d15c4204f1e768fd45a04ed00fef7a06a9427073150c3d2434
-MD5 5730b61744ea6ac2bbb52c2f3ddc3fa0 ChangeLog 1929
-RMD160 11b23d6dff0c839a7c5c6415e0626b7cc3d4893d ChangeLog 1929
-SHA256 372f5a3e028c11d15c4204f1e768fd45a04ed00fef7a06a9427073150c3d2434 ChangeLog 1929
+EBUILD katoob-0.5.4.ebuild 1226 RMD160 0dd6664809ad69b1fc28e6603c9d510ac0c517b0 SHA1 8ac77bb09465fd28875c14de6e629e08bee1130a SHA256 3a8869c145444b6ef02e0fe8c049f4abc32f77b77ba05d6ea15f346f02bb5e9f
+MD5 b28ca80bd04b79aea4acccf3d34fd110 katoob-0.5.4.ebuild 1226
+RMD160 0dd6664809ad69b1fc28e6603c9d510ac0c517b0 katoob-0.5.4.ebuild 1226
+SHA256 3a8869c145444b6ef02e0fe8c049f4abc32f77b77ba05d6ea15f346f02bb5e9f katoob-0.5.4.ebuild 1226
+MISC ChangeLog 2046 RMD160 4caa18c5b38054d86d794c9bec99f062c478c1e3 SHA1 11b0e01acd2a0d4fa939db0bda49f5a591c171bd SHA256 f284990912776d1cfe49fccfb6935e92cb74a6db4358b83a71e8bac218935e0d
+MD5 7ae5fef1ee607f483d0df27430ae6d4f ChangeLog 2046
+RMD160 4caa18c5b38054d86d794c9bec99f062c478c1e3 ChangeLog 2046
+SHA256 f284990912776d1cfe49fccfb6935e92cb74a6db4358b83a71e8bac218935e0d ChangeLog 2046
 MISC metadata.xml 587 RMD160 4f0ee3ab9c1cdea37e603e0a63a5997cdb65e332 SHA1 782ce16f23fa988d3c2a95080dfbe8399c663093 SHA256 e84d33d6ece6aaa80086140d4b0f25685ad672ced27189025da3fa430c4f1f97
 MD5 66ffd4acc7a0faa943d27eae92186e98 metadata.xml 587
 RMD160 4f0ee3ab9c1cdea37e603e0a63a5997cdb65e332 metadata.xml 587
diff --git a/app-editors/katoob/katoob-0.5.4.ebuild b/app-editors/katoob/katoob-0.5.4.ebuild
index 9c324b0ea3e1..c3684d80a71b 100644
--- a/app-editors/katoob/katoob-0.5.4.ebuild
+++ b/app-editors/katoob/katoob-0.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/app-editors/katoob/katoob-0.5.4.ebuild,v 1.1 2006/11/01 00:17:15 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/katoob/katoob-0.5.4.ebuild,v 1.2 2006/11/20 23:32:24 leonardop Exp $
 
 inherit eutils
 
@@ -21,7 +21,9 @@ RDEPEND=">=dev-cpp/gtkmm-2.6
 		>=net-print/cups-1.1.23
 		>=x11-libs/pango-1 )
 	bzip2? ( app-arch/bzip2 )
-	dbus? ( sys-apps/dbus )"
+	dbus? ( || (
+		dev-libs/dbus-glib
+		~sys-apps/dbus-0.62 ) )"
 
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.28