Fixed D-Bus dependancies

Package-Manager: portage-2.1.2_rc2

diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index c73508899003194432984837f70c78cfd57f6911..4ff75e792b3350224ca83ff6e5e1bd196bd173e5 100644 (file)
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -36,22 +36,22 @@ EBUILD gaim-1.5.0.ebuild 3993 RMD160 c590613b9c54e16c9aa6d427893d47924a86cf68 SH
 MD5 33700f7439472df3bb31923316010694 gaim-1.5.0.ebuild 3993
 RMD160 c590613b9c54e16c9aa6d427893d47924a86cf68 gaim-1.5.0.ebuild 3993
 SHA256 f644ac37595f2727fa58198a7d16409a4b3102fae684bfc7e8acc91a8ad0db63 gaim-1.5.0.ebuild 3993
-EBUILD gaim-2.0.0_beta4-r1.ebuild 6524 RMD160 bf86248469f8d3478f867e38a6f231e5a14f1298 SHA1 a912e269403661f27bf177e21f17c470fe91a26a SHA256 a002bf9c858dbdb10a70561ca6b5ddb44c6e397246931fb256531b74946d6297
-MD5 fae3ce886ecf9cbdca0433d11ede4e02 gaim-2.0.0_beta4-r1.ebuild 6524
-RMD160 bf86248469f8d3478f867e38a6f231e5a14f1298 gaim-2.0.0_beta4-r1.ebuild 6524
-SHA256 a002bf9c858dbdb10a70561ca6b5ddb44c6e397246931fb256531b74946d6297 gaim-2.0.0_beta4-r1.ebuild 6524
-EBUILD gaim-2.0.0_beta4-r2.ebuild 6583 RMD160 0cd29ed89fd1b1d1f0395f6b6fac6c9af0e0fec5 SHA1 594ee074970865bf5416497f0a40749e01d587f8 SHA256 042baa901aa834aabbd34b5446a1718c7b5aa1263276057a04bb09878951699f
-MD5 c9f1ece49ad26dda8e8feb4631f8693b gaim-2.0.0_beta4-r2.ebuild 6583
-RMD160 0cd29ed89fd1b1d1f0395f6b6fac6c9af0e0fec5 gaim-2.0.0_beta4-r2.ebuild 6583
-SHA256 042baa901aa834aabbd34b5446a1718c7b5aa1263276057a04bb09878951699f gaim-2.0.0_beta4-r2.ebuild 6583
-EBUILD gaim-2.0.0_beta4.ebuild 6416 RMD160 c51357a21e0d6fb9ffed3c47b3f7f36decefd679 SHA1 ce4f93e73f1c05680cc3eef0e6cd70d2efa09724 SHA256 1dce90fae617eb3ca5ef7d0dbff0283b8e1c8cd5f8b149c1040efb1cfd9fab69
-MD5 f8decc9b9a6cdbab21f1b5f1e2799676 gaim-2.0.0_beta4.ebuild 6416
-RMD160 c51357a21e0d6fb9ffed3c47b3f7f36decefd679 gaim-2.0.0_beta4.ebuild 6416
-SHA256 1dce90fae617eb3ca5ef7d0dbff0283b8e1c8cd5f8b149c1040efb1cfd9fab69 gaim-2.0.0_beta4.ebuild 6416
-EBUILD gaim-2.0.0_beta5.ebuild 6530 RMD160 af75f419a90517b8b0e7cf1cb4af9c605c5544b7 SHA1 ae88ce4ea176058f05429fc2bab797b0213a99ac SHA256 ff5a3ed02fb8cd37d17208438457a744b6ce7bb931bdc86a6380d090ad455267
-MD5 e9da28a28d200e8d731f9d7872018dd1 gaim-2.0.0_beta5.ebuild 6530
-RMD160 af75f419a90517b8b0e7cf1cb4af9c605c5544b7 gaim-2.0.0_beta5.ebuild 6530
-SHA256 ff5a3ed02fb8cd37d17208438457a744b6ce7bb931bdc86a6380d090ad455267 gaim-2.0.0_beta5.ebuild 6530
+EBUILD gaim-2.0.0_beta4-r1.ebuild 6625 RMD160 6d4157be8c515ddd97f3047af4a7b7437170524a SHA1 4ed945251ff03bb59e5609dede31573771d868ae SHA256 02a86689ba88481cfaeb244c9dd1b4427d35c2e03baa7169ba5ea5c43348ad97
+MD5 a5c3a0b600e7479a7e7b6ec0067752db gaim-2.0.0_beta4-r1.ebuild 6625
+RMD160 6d4157be8c515ddd97f3047af4a7b7437170524a gaim-2.0.0_beta4-r1.ebuild 6625
+SHA256 02a86689ba88481cfaeb244c9dd1b4427d35c2e03baa7169ba5ea5c43348ad97 gaim-2.0.0_beta4-r1.ebuild 6625
+EBUILD gaim-2.0.0_beta4-r2.ebuild 6684 RMD160 750addc8e7552cdeb6f0fff184ce6748e0d63593 SHA1 abdacd8cfe64bb766a4f44a2bdc47d4f75686bd6 SHA256 05cfc6afb301f9142b2c01197c166706c12ebe22ea366ec44cd43922f2980bc6
+MD5 6c2abcc4356e0878b41bd191d1b856a7 gaim-2.0.0_beta4-r2.ebuild 6684
+RMD160 750addc8e7552cdeb6f0fff184ce6748e0d63593 gaim-2.0.0_beta4-r2.ebuild 6684
+SHA256 05cfc6afb301f9142b2c01197c166706c12ebe22ea366ec44cd43922f2980bc6 gaim-2.0.0_beta4-r2.ebuild 6684
+EBUILD gaim-2.0.0_beta4.ebuild 6517 RMD160 89e88a5247b8fb36063a2f3dbd0ca5e619a5889c SHA1 aa20ee4de2770edc98b051f2c11cc40c03fa9e98 SHA256 0936b788134ffe122c00528f070283e278ecf517d07cd441af9260644018a171
+MD5 92201d8baf53afdda09be61bbbf6d313 gaim-2.0.0_beta4.ebuild 6517
+RMD160 89e88a5247b8fb36063a2f3dbd0ca5e619a5889c gaim-2.0.0_beta4.ebuild 6517
+SHA256 0936b788134ffe122c00528f070283e278ecf517d07cd441af9260644018a171 gaim-2.0.0_beta4.ebuild 6517
+EBUILD gaim-2.0.0_beta5.ebuild 6633 RMD160 b4ef1feeb7e758e4da6c7d8db796a0d9d0ae0c92 SHA1 458ecd9a30437695f7456c509cdfde4cf128dbde SHA256 aa934161d3ba10715dba730fb2cde05952bcd9643bd4975c8dcf0534fcebf19c
+MD5 e5879ae6ca7137a352a5d6f5a8376bd9 gaim-2.0.0_beta5.ebuild 6633
+RMD160 b4ef1feeb7e758e4da6c7d8db796a0d9d0ae0c92 gaim-2.0.0_beta5.ebuild 6633
+SHA256 aa934161d3ba10715dba730fb2cde05952bcd9643bd4975c8dcf0534fcebf19c gaim-2.0.0_beta5.ebuild 6633
 MISC ChangeLog 61478 RMD160 d6f33b5e05d36f1cbf6271afb9d29c52e85c0298 SHA1 aea6bb87dc9ea99a70d7a28ad509629478eeb4ea SHA256 52ccf5b297985050be8cc2eb5aca041fe9ccbe28a03372da0b6d054c91188a0c
 MD5 0b1f4b92fb10d796eba1afa1c58afa00 ChangeLog 61478
 RMD160 d6f33b5e05d36f1cbf6271afb9d29c52e85c0298 ChangeLog 61478
@@ -78,7 +78,7 @@ SHA256 609d8796cdf2888aae84b2d384a750f17ab9d48516c4e229d46a92c789bc668b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFVjKrmOfEJZHYOKcRAlHMAJ9xuaswLK6/x/Nu415Z2m+CPLZoHACff9Xk
-wWm8YX2VEzlPzWSHpiRXyQs=
-=Rblc
+iD8DBQFFXrmwoeSe8B0zEfwRAhplAJ93chAjvZz/thM+vf6ZXwvTKyQDRACggzfU
+aKE6qugcot0yZJwoxPDR/lc=
+=l7jZ
 -----END PGP SIGNATURE-----

diff --git a/net-im/gaim/gaim-2.0.0_beta4-r1.ebuild b/net-im/gaim/gaim-2.0.0_beta4-r1.ebuild
index 0f4c97013c8903e67df4155f0565baef9a101a5a..85e158e9bb0670df087079104992885151c527ac 100644 (file)
--- a/net-im/gaim/gaim-2.0.0_beta4-r1.ebuild
+++ b/net-im/gaim/gaim-2.0.0_beta4-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/net-im/gaim/gaim-2.0.0_beta4-r1.ebuild,v 1.2 2006/10/23 04:25:37 gothgirl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta4-r1.ebuild,v 1.3 2006/11/18 07:42:50 cardoe Exp $
 
 inherit flag-o-matic eutils toolchain-funcs debug multilib mono autotools perl-app gnome2
 
@@ -20,7 +20,10 @@ IUSE="avahi bonjour cjk crypt dbus debug doc eds gadu gnutls gstreamer meanwhile
 RDEPEND="
        bonjour? ( !avahi? ( net-misc/howl )
                   avahi? ( net-dns/avahi ) )
-       dbus? ( >=sys-apps/dbus-0.35
+       dbus? ( || (
+                               ( >=dev-libs/dbus-glib-0.71 >=dev-python/dbus-python-0.71 )
+                               ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 )
+                               )
                >=dev-lang/python-2.4 )
        >=x11-libs/gtk+-2.0
        >=dev-libs/glib-2.0

diff --git a/net-im/gaim/gaim-2.0.0_beta4-r2.ebuild b/net-im/gaim/gaim-2.0.0_beta4-r2.ebuild
index a795cfc91e5758c964d1de6897fb734c3567623f..90cd313c37cf7be63f071c7fead46944dd6dd2f2 100644 (file)
--- a/net-im/gaim/gaim-2.0.0_beta4-r2.ebuild
+++ b/net-im/gaim/gaim-2.0.0_beta4-r2.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/gaim/gaim-2.0.0_beta4-r2.ebuild,v 1.1 2006/10/23 22:55:55 gothgirl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta4-r2.ebuild,v 1.2 2006/11/18 07:42:50 cardoe Exp $
 
 inherit flag-o-matic eutils toolchain-funcs debug multilib mono autotools perl-app gnome2
 
@@ -20,7 +20,10 @@ IUSE="avahi bonjour cjk crypt dbus debug doc eds gadu gnutls gstreamer meanwhile
 RDEPEND="
        bonjour? ( !avahi? ( net-misc/howl )
                   avahi? ( net-dns/avahi ) )
-       dbus? ( >=sys-apps/dbus-0.35
+       dbus? ( || (
+                               ( >=dev-libs/dbus-glib-0.71 >=dev-python/dbus-python-0.71 )
+                               ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 )
+                               )
                >=dev-lang/python-2.4 )
        >=x11-libs/gtk+-2.0
        >=dev-libs/glib-2.0

diff --git a/net-im/gaim/gaim-2.0.0_beta4.ebuild b/net-im/gaim/gaim-2.0.0_beta4.ebuild
index 7010ec6f055fbb5337c6686113bd00da5f4eff0c..12fd02fc70042d151d4c20bc85f2a36628599a51 100644 (file)
--- a/net-im/gaim/gaim-2.0.0_beta4.ebuild
+++ b/net-im/gaim/gaim-2.0.0_beta4.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/gaim/gaim-2.0.0_beta4.ebuild,v 1.2 2006/10/21 01:42:12 gothgirl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta4.ebuild,v 1.3 2006/11/18 07:42:50 cardoe Exp $
 
 inherit flag-o-matic eutils toolchain-funcs debug multilib mono autotools perl-app gnome2
 
@@ -22,7 +22,10 @@ RDEPEND="
                media-libs/audiofile )
        bonjour? ( !avahi? ( net-misc/howl )
                   avahi? ( net-dns/avahi ) )
-       dbus? ( >=sys-apps/dbus-0.35
+       dbus? ( || (
+                               ( >=dev-libs/dbus-glib-0.71 >=dev-python/dbus-python-0.71 )
+                               ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 )
+                               )
                >=dev-lang/python-2.4 )
        >=x11-libs/gtk+-2.0
        >=dev-libs/glib-2.0

diff --git a/net-im/gaim/gaim-2.0.0_beta5.ebuild b/net-im/gaim/gaim-2.0.0_beta5.ebuild
index a6eddd3fb492df7ddf4e1389b1662b1df916af0a..1da77363f8942543438ab089b1e5b83b058fb0f7 100644 (file)
--- a/net-im/gaim/gaim-2.0.0_beta5.ebuild
+++ b/net-im/gaim/gaim-2.0.0_beta5.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/gaim/gaim-2.0.0_beta5.ebuild,v 1.2 2006/11/11 20:29:15 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta5.ebuild,v 1.3 2006/11/18 07:42:50 cardoe Exp $
 
 inherit flag-o-matic eutils toolchain-funcs debug multilib mono autotools perl-app gnome2
 
@@ -20,7 +20,10 @@ IUSE="avahi bonjour cjk crypt dbus debug doc eds gadu gnutls gstreamer meanwhile
 RDEPEND="
        bonjour? ( !avahi? ( net-misc/howl )
                   avahi? ( net-dns/avahi ) )
-       dbus? ( >=sys-apps/dbus-0.35
+       dbus? ( || (
+                               ( >=dev-libs/dbus-glib-0.71 >=dev-python/dbus-python-0.71 )
+                               ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 )
+                               )
                >=dev-lang/python-2.4 )
        >=x11-libs/gtk+-2.0
        >=dev-libs/glib-2.0