From: Michael Januszewski <spock@gentoo.org>
Date: Mon, 4 Dec 2006 19:24:45 +0000 (+0000)
Subject: Fix dependencies for dbus 1.0 (bug #154521).
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aafc824060b1175a8d64ed8fde675f3e97e2dbdc;p=gentoo.git

Fix dependencies for dbus 1.0 (bug #154521).
Package-Manager: portage-2.1.2_rc2-r4
---

diff --git a/net-im/gnugadu/ChangeLog b/net-im/gnugadu/ChangeLog
index b3d993cd2db8..3e9c1277f135 100644
--- a/net-im/gnugadu/ChangeLog
+++ b/net-im/gnugadu/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/gnugadu
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnugadu/ChangeLog,v 1.45 2006/10/23 18:13:11 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnugadu/ChangeLog,v 1.46 2006/12/04 19:24:45 spock Exp $
+
+  04 Dec 2006; Michał Januszewski <spock@gentoo.org> gnugadu-2.3.0.ebuild:
+  Fix dependencies for dbus 1.0 (bug #154521).
 
 *gnugadu-2.3.0 (23 Oct 2006)
 
diff --git a/net-im/gnugadu/Manifest b/net-im/gnugadu/Manifest
index aa41b69450f1..b544ef543c98 100644
--- a/net-im/gnugadu/Manifest
+++ b/net-im/gnugadu/Manifest
@@ -17,14 +17,14 @@ EBUILD gnugadu-2.2.9.ebuild 1890 RMD160 c45c7df496118a896984bd93eb225de51f120cd1
 MD5 5dd2934729c11fc1f7c6e69b759c567b gnugadu-2.2.9.ebuild 1890
 RMD160 c45c7df496118a896984bd93eb225de51f120cd1 gnugadu-2.2.9.ebuild 1890
 SHA256 ed782f1aa20e383ee574ceeb9014de36e6844438a374cee837b55bfd95152309 gnugadu-2.2.9.ebuild 1890
-EBUILD gnugadu-2.3.0.ebuild 1936 RMD160 b9de250266c1970fe2949d4dac1f082588ba3b35 SHA1 03c8ef8b3153bd8df8ff4d289144d3600044b2e0 SHA256 9411f1ee051def4ddc5f5d768ba6ac5e8d6d924a0799ff29c317fcfd69662a92
-MD5 2ab0eaadc35284c0f874dd9299476aa9 gnugadu-2.3.0.ebuild 1936
-RMD160 b9de250266c1970fe2949d4dac1f082588ba3b35 gnugadu-2.3.0.ebuild 1936
-SHA256 9411f1ee051def4ddc5f5d768ba6ac5e8d6d924a0799ff29c317fcfd69662a92 gnugadu-2.3.0.ebuild 1936
-MISC ChangeLog 6762 RMD160 10146d86ae8278ecb4eb25b63c88a0581c11c881 SHA1 100631aba1d971b9232ed2459f371b1b52cad77a SHA256 825e986ed2af9b870477c4a73eeceb734c3b27828c764454cffb58426d8811d1
-MD5 b4f95ec3bf67758f7377d53b7dbfb77a ChangeLog 6762
-RMD160 10146d86ae8278ecb4eb25b63c88a0581c11c881 ChangeLog 6762
-SHA256 825e986ed2af9b870477c4a73eeceb734c3b27828c764454cffb58426d8811d1 ChangeLog 6762
+EBUILD gnugadu-2.3.0.ebuild 1975 RMD160 edbfe1d8409e31093ba1d6f31ba27230979ecf85 SHA1 740938ea22d360b16fe99e2ed1f96839a88685f6 SHA256 28493aa91aef16d6fd2c884fc236ef96703308d843924c667133479a29e22c81
+MD5 39a1f3dc52df1695509ebc4955fc568d gnugadu-2.3.0.ebuild 1975
+RMD160 edbfe1d8409e31093ba1d6f31ba27230979ecf85 gnugadu-2.3.0.ebuild 1975
+SHA256 28493aa91aef16d6fd2c884fc236ef96703308d843924c667133479a29e22c81 gnugadu-2.3.0.ebuild 1975
+MISC ChangeLog 6886 RMD160 f804d7cc026b1a3552fbdac241f187c48d76b04e SHA1 03bc2b95351cab1222b85fbcc8da62fd5f3194ba SHA256 6692dbde4337c85c8c67c267e903e139cb772c5b9da2f81f815b96fe3d5cbfb1
+MD5 b74d16b4b4d9b354696220b2d85abbf5 ChangeLog 6886
+RMD160 f804d7cc026b1a3552fbdac241f187c48d76b04e ChangeLog 6886
+SHA256 6692dbde4337c85c8c67c267e903e139cb772c5b9da2f81f815b96fe3d5cbfb1 ChangeLog 6886
 MISC metadata.xml 255 RMD160 399f78e98260d4f311124e71c6d294e368a76976 SHA1 61f663af9ea0cb4967a12878352e65b095dcd473 SHA256 b2dfe92cb4cae7ec4ecb4af91e94b9aa507a3c8214af32f75cf44f6011a13cc5
 MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
 RMD160 399f78e98260d4f311124e71c6d294e368a76976 metadata.xml 255
@@ -44,7 +44,7 @@ SHA256 3665f2d5c8a741cc9b98bf394e22697b4f6a3c7fb153dc8ed63abd246e570690 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFPQZIchej4aZK9/cRApkvAJ4wT/egbPBxgKFy80uJ4gMVAXOzNQCdFxyP
-oXySJgI/ORCtbnqxWKLCiQs=
-=o62l
+iD8DBQFFdHYKchej4aZK9/cRAqxWAJ9M0MOwBRTvBisI3WdPwDrSG4jgXwCbBJ+1
+Po53WQA/LBWE8H49iJmb22E=
+=wAPJ
 -----END PGP SIGNATURE-----
diff --git a/net-im/gnugadu/gnugadu-2.3.0.ebuild b/net-im/gnugadu/gnugadu-2.3.0.ebuild
index aea98400c1a3..d357c53801a1 100644
--- a/net-im/gnugadu/gnugadu-2.3.0.ebuild
+++ b/net-im/gnugadu/gnugadu-2.3.0.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/net-im/gnugadu/gnugadu-2.3.0.ebuild,v 1.1 2006/10/23 18:13:11 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnugadu/gnugadu-2.3.0.ebuild,v 1.2 2006/12/04 19:24:45 spock Exp $
 
 IUSE="debug dbus tlen esd oss xosd arts jabber perl spell gnutls"
 
@@ -29,7 +29,7 @@ RDEPEND="net-libs/libgadu
 	tlen? ( net-libs/libtlen )
 	spell? ( app-text/gtkspell )
 	gnutls? ( net-libs/gnutls )
-	dbus? ( sys-apps/dbus )
+	dbus? (	|| ( >=dev-libs/dbus-glib-0.71 <sys-apps/dbus-0.90 ) )
 	|| ( x11-libs/libXScrnSaver virtual/x11 )"
 DEPEND="${RDEPEND}
 	|| ( x11-proto/scrnsaverproto virtual/x11 )"