Fixed dbus deps wrt bug #158018

Package-Manager: portage-2.1.1-r2

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index 99d3cce690f0df2720d139ce4098fab4bc91336b..1fdf0d9905100ebe568d980b0d58180b44793dad 100644 (file)
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/gajim
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.39 2007/01/13 14:39:00 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.40 2007/01/20 10:22:17 welp Exp $
+
+  20 Jan 2007; Peter Weller (welp) <welp@gentoo.org> gajim-0.10.1.ebuild:
+  Fixed dbus deps wrt bug #158018
 
   13 Jan 2007; nixnut <nixnut@gentoo.org> gajim-0.11-r3.ebuild:
   Added ~ppc wrt bug 158541

diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 949b5c01cfbf15e84e4d36be9b32d2cad97ba46f..4d4da1889616562e614923a5c059bf580d0093fd 100644 (file)
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -8,18 +8,18 @@ RMD160 7bad6b10f48a3bc8a5bcd53c7e96f444a7f9c941 files/gajim-10.1-Makefile.patch
 SHA256 df756da82d1bfa05f5df0658ff24e6f5401aeb302025b5f98c6f35f4392b4dc1 files/gajim-10.1-Makefile.patch 475
 DIST gajim-0.10.1.tar.bz2 2066396 RMD160 405b813db9b7e4aa4c690a77108948886c61fc62 SHA1 909f197594f1d9f0ca678bd6b0b8edbb45d357af SHA256 b167a3405d8a5e9a3913fe711562a9cb8bb8dbfc78240dbb5b3c9c51a1610174
 DIST gajim-0.11.tar.bz2 2684957 RMD160 ff92f3914eb14596f725a47efa04acb402053723 SHA1 b4cea429f67d4cf241873cf7079827b160d25cb2 SHA256 1b660d2516b918fdba7533aab3dead8c222c98964ea459c5e4204c4949055422
-EBUILD gajim-0.10.1.ebuild 2070 RMD160 2219943d92b5ec5b2b46b78126f956aac5d3c3a2 SHA1 a70b7ae647796d574b98e40ea3bfbafb64d2508c SHA256 b4e5a6aecfbdfc302cce7aa3aa248aaa0fd55278cde39f47f41951e2dfb7201f
-MD5 0d84f145c9486434d5ef8ff1f784dcc5 gajim-0.10.1.ebuild 2070
-RMD160 2219943d92b5ec5b2b46b78126f956aac5d3c3a2 gajim-0.10.1.ebuild 2070
-SHA256 b4e5a6aecfbdfc302cce7aa3aa248aaa0fd55278cde39f47f41951e2dfb7201f gajim-0.10.1.ebuild 2070
+EBUILD gajim-0.10.1.ebuild 2218 RMD160 d99097890ae3638138c6d8ba415d7c37e7c89588 SHA1 5bff2a5d694fd28ac87840e189d6621c23932b2e SHA256 02fe05399ac8fb31d97db975953998c1708e1e0e04100e0bcc799cc9781594ed
+MD5 30beb2f98560422ae864764bbf2f9c24 gajim-0.10.1.ebuild 2218
+RMD160 d99097890ae3638138c6d8ba415d7c37e7c89588 gajim-0.10.1.ebuild 2218
+SHA256 02fe05399ac8fb31d97db975953998c1708e1e0e04100e0bcc799cc9781594ed gajim-0.10.1.ebuild 2218
 EBUILD gajim-0.11-r3.ebuild 2512 RMD160 43e2815b83ae844dcae361800c4a422f91dfda7a SHA1 b6acca68db52178d80265a4922a6208ca392193a SHA256 6056a5a556cb500e19f063737973c3ac106e2261befdff00e1672da8fc149688
 MD5 b57a86ca0697f8ca0de7b7c66ef8d991 gajim-0.11-r3.ebuild 2512
 RMD160 43e2815b83ae844dcae361800c4a422f91dfda7a gajim-0.11-r3.ebuild 2512
 SHA256 6056a5a556cb500e19f063737973c3ac106e2261befdff00e1672da8fc149688 gajim-0.11-r3.ebuild 2512
-MISC ChangeLog 5847 RMD160 d7c9a1df43fba037a196ec235c5b7a0bcc8beac9 SHA1 efa787016a785b3581cb21eb0d13200d03710633 SHA256 b1556e108097f7c0a55cc8a2d91fb4d21033008c1f4eec53ddd87afb7cb89ec6
-MD5 4b1b157fe158e8bd6f8b084445489be0 ChangeLog 5847
-RMD160 d7c9a1df43fba037a196ec235c5b7a0bcc8beac9 ChangeLog 5847
-SHA256 b1556e108097f7c0a55cc8a2d91fb4d21033008c1f4eec53ddd87afb7cb89ec6 ChangeLog 5847
+MISC ChangeLog 5954 RMD160 b53e1a7ca82d57af14f1e95c8636338c45b256ab SHA1 02ca7cea76f94aeaf89b9fd2128e93605b36afbf SHA256 5abfe0b680e8ebbb910535dc8ced9d178c4a1893b30d0a66cc9846c87b37f514
+MD5 6a2c721a534767214879efdb4273eb64 ChangeLog 5954
+RMD160 b53e1a7ca82d57af14f1e95c8636338c45b256ab ChangeLog 5954
+SHA256 5abfe0b680e8ebbb910535dc8ced9d178c4a1893b30d0a66cc9846c87b37f514 ChangeLog 5954
 MISC metadata.xml 369 RMD160 b5684f22a8b81f5213bda704ee8d123d1cd796f7 SHA1 873a1e33738638929c94655538bf9d46d0df79f6 SHA256 7b181490899f19191e60d8b702571f6a642fbe355c37c25d8cd710bfe2f2fe0d
 MD5 bd9809fa23d644d4ee6cb9497f22654c metadata.xml 369
 RMD160 b5684f22a8b81f5213bda704ee8d123d1cd796f7 metadata.xml 369

diff --git a/net-im/gajim/gajim-0.10.1.ebuild b/net-im/gajim/gajim-0.10.1.ebuild
index 536c24a3a99b41ebf4620adeb9598606f03f06a1..43cf83bae17ae28475155cd28573b5a9a460802f 100644 (file)
--- a/net-im/gajim/gajim-0.10.1.ebuild
+++ b/net-im/gajim/gajim-0.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.10.1.ebuild,v 1.13 2007/01/06 16:05:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.10.1.ebuild,v 1.14 2007/01/20 10:22:17 welp Exp $
 
 inherit virtualx multilib eutils
 
@@ -16,7 +16,15 @@ IUSE="dbus gnome libnotify nls spell srv"
 RDEPEND="!<=dev-python/gnome-python-2
        >=dev-python/pygtk-2.8.2
        >=dev-python/pysqlite-2.0.5
-       dbus? ( >=sys-apps/dbus-0.60 )
+       dbus? (
+               || (
+                       ( >=sys-apps/dbus-0.90
+                               dev-python/dbus-python
+                               dev-libs/dbus-glib
+                       )
+                       ( <sys-apps/dbus-0.90 )
+               )
+       )
        gnome? ( >=dev-python/gnome-python-extras-2.10 )
        libnotify? ( x11-misc/notification-daemon )
        srv? ( net-dns/bind-tools )"
@@ -27,11 +35,12 @@ DEPEND="dev-util/intltool
        input_devices_keyboard? ( x11-libs/libXScrnSaver )"
 
 pkg_setup() {
-       if use dbus && ! built_with_use sys-apps/dbus python; then
-               eerror "Please rebuild dbus with USE=\"python\"."
-               die "Python D-bus support missing."
+       if use dbus; then
+               if has_version "<sys-apps/dbus-0.90" && ! built_with_use sys-apps/dbus python; then
+                       eerror "Please rebuild dbus with USE=\"python\"."
+                       die "Python D-bus support missing."
+               fi
        fi
-
        if use libnotify && ! use dbus; then
                eerror "With libnotify useflag, you must also enable dbus useflag."
                die "Please enable dbus useflag."