fix dbus deps for 1.0

Package-Manager: portage-2.1.2_rc1-r7

4 files changed, 28 insertions, 18 deletions

diff --git a/dev-libs/libgalago/ChangeLog b/dev-libs/libgalago/ChangeLog
index d1a9fbf730fc..e7aa382c5849 100644
--- a/dev-libs/libgalago/ChangeLog
+++ b/dev-libs/libgalago/ChangeLog
@@ -1,10 +1,14 @@
 # ChangeLog for dev-libs/libgalago
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgalago/ChangeLog,v 1.8 2006/10/16 08:00:42 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgalago/ChangeLog,v 1.9 2006/11/17 07:28:09 compnerd Exp $
+
+  17 Nov 2006; Saleem Abdulrasool <compnerd@gentoo.org> libgalago-0.5.0.ebuild,
+  libgalago-0.5.2.ebuild:
+  Fix dbus dependencies for 1.0
 
 *libgalago-0.5.2 (16 Oct 2006)
 
-  16 Oct 2006; <compnerd@gentoo.org> +libgalago-0.5.2.ebuild:
+  16 Oct 2006; Saleem Abdulrasool <compnerd@gentoo.org> +libgalago-0.5.2.ebuild:
   version bump from upstream
 
   27 Aug 2006; Saleem Abdulrasool <compnerd@gentoo.org>
diff --git a/dev-libs/libgalago/Manifest b/dev-libs/libgalago/Manifest
index 6fab12e832f4..cb6a8a1ef6d4 100644
--- a/dev-libs/libgalago/Manifest
+++ b/dev-libs/libgalago/Manifest
@@ -9,18 +9,18 @@ EBUILD libgalago-0.3.3.ebuild 1045 RMD160 a8fb13cd9c0cab33ff3fde0a94e2da5c1cce50
 MD5 1999fd51deee0cce791940e5a47ef2f4 libgalago-0.3.3.ebuild 1045
 RMD160 a8fb13cd9c0cab33ff3fde0a94e2da5c1cce5036 libgalago-0.3.3.ebuild 1045
 SHA256 7f64eec95431312596e5db5ef5d81ec04721c85625120f654479802440da3c95 libgalago-0.3.3.ebuild 1045
-EBUILD libgalago-0.5.0.ebuild 900 RMD160 bae19233d1a94554fe60a2f28861d05e888b62b8 SHA1 c2a729d037927e4c7ac335e38d3387d416211b93 SHA256 d76e9f57db32567d405f5f2fb584fe5fc44163aee423bbc1562b14e6e235153e
-MD5 d8b896514ed840d702cf889a355094db libgalago-0.5.0.ebuild 900
-RMD160 bae19233d1a94554fe60a2f28861d05e888b62b8 libgalago-0.5.0.ebuild 900
-SHA256 d76e9f57db32567d405f5f2fb584fe5fc44163aee423bbc1562b14e6e235153e libgalago-0.5.0.ebuild 900
-EBUILD libgalago-0.5.2.ebuild 900 RMD160 14583f8c51be3a6dca40f1f1008f2aa0ddf46618 SHA1 a62db8e4ca5d2218f2ca06ada0e3e9e4e633f578 SHA256 0150ab4ed4bde054843fc69d0921e98a16b6c0a9f2ab9ab5165445c51c789018
-MD5 8853d902b0ef226436a99e916440ff94 libgalago-0.5.2.ebuild 900
-RMD160 14583f8c51be3a6dca40f1f1008f2aa0ddf46618 libgalago-0.5.2.ebuild 900
-SHA256 0150ab4ed4bde054843fc69d0921e98a16b6c0a9f2ab9ab5165445c51c789018 libgalago-0.5.2.ebuild 900
-MISC ChangeLog 1237 RMD160 5df2b1374459c631f2615ee00ed4a11e5e9b3fe1 SHA1 9659ccc03fb2e1acb07319fd653fcb2dc0a03b6f SHA256 07cba4f973cb6d5eeb1807905419c412d4ad6f7305dd261e76d0307230b2289d
-MD5 4a2099f1527702607b9a76ec3213ebe9 ChangeLog 1237
-RMD160 5df2b1374459c631f2615ee00ed4a11e5e9b3fe1 ChangeLog 1237
-SHA256 07cba4f973cb6d5eeb1807905419c412d4ad6f7305dd261e76d0307230b2289d ChangeLog 1237
+EBUILD libgalago-0.5.0.ebuild 969 RMD160 5c5d198305f71f8ffc51e032e2b63e99809a12c9 SHA1 e74b7e3de935dbf77b95559b10d41f88341c6f84 SHA256 cc9a5e5c6a2d18aa238ee84a16da4e7185718fc57f9e44b608fd271fc093282d
+MD5 99e2a0e5021c0ee399454eafdc9e8e4d libgalago-0.5.0.ebuild 969
+RMD160 5c5d198305f71f8ffc51e032e2b63e99809a12c9 libgalago-0.5.0.ebuild 969
+SHA256 cc9a5e5c6a2d18aa238ee84a16da4e7185718fc57f9e44b608fd271fc093282d libgalago-0.5.0.ebuild 969
+EBUILD libgalago-0.5.2.ebuild 968 RMD160 15c5e70c0c6f9fc4066d737314cf7264749de12b SHA1 d358c3adc5b8746dc61a37cd55305412f7fd5dff SHA256 e43ef31bc85be01f8cc470da75b50b8667d8649ba2463c27c24c7bf02e50845e
+MD5 4ecfa2c84a658bbb11a2712687fafcae libgalago-0.5.2.ebuild 968
+RMD160 15c5e70c0c6f9fc4066d737314cf7264749de12b libgalago-0.5.2.ebuild 968
+SHA256 e43ef31bc85be01f8cc470da75b50b8667d8649ba2463c27c24c7bf02e50845e libgalago-0.5.2.ebuild 968
+MISC ChangeLog 1395 RMD160 a358fe6bc0428cdc1363e37b2406d189e3379d06 SHA1 bd80e7753079739ef552649c48e14dc15d42402a SHA256 d0a8d2f243d8a21577a0238d5b292c1f8e8f733fcc8aae577826150a59718a93
+MD5 e1711bad9c13cc700fe77c656ba231ee ChangeLog 1395
+RMD160 a358fe6bc0428cdc1363e37b2406d189e3379d06 ChangeLog 1395
+SHA256 d0a8d2f243d8a21577a0238d5b292c1f8e8f733fcc8aae577826150a59718a93 ChangeLog 1395
 MISC metadata.xml 312 RMD160 03fef86ca203ec541f1488fb88f7f653558da537 SHA1 4f573c6e28157baeac51ae5cfd45597831e9bd2b SHA256 247d6e467251565ff33d6c40f4cee2897eb2f0d803c49b4d5f62a767b5785995
 MD5 987b824d47696574408ff794a1669990 metadata.xml 312
 RMD160 03fef86ca203ec541f1488fb88f7f653558da537 metadata.xml 312
diff --git a/dev-libs/libgalago/libgalago-0.5.0.ebuild b/dev-libs/libgalago/libgalago-0.5.0.ebuild
index 8aab04e897cf..5924f1b8bce7 100644
--- a/dev-libs/libgalago/libgalago-0.5.0.ebuild
+++ b/dev-libs/libgalago/libgalago-0.5.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/dev-libs/libgalago/libgalago-0.5.0.ebuild,v 1.1 2006/08/08 04:08:13 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgalago/libgalago-0.5.0.ebuild,v 1.2 2006/11/17 07:28:09 compnerd Exp $
 
 inherit eutils autotools
 
@@ -14,7 +14,10 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="test"
 
 RDEPEND=">=dev-libs/glib-2.8
-		 >=sys-apps/dbus-0.36"
+		 || (
+				>=dev-libs/dbus-glib-0.71
+				( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.36 )
+		 	)"
 DEPEND="${RDEPEND}
 		>=sys-devel/gettext-0.10.40
 		>=dev-util/pkgconfig-0.9
diff --git a/dev-libs/libgalago/libgalago-0.5.2.ebuild b/dev-libs/libgalago/libgalago-0.5.2.ebuild
index a8be10fb0e20..7a3a07621482 100644
--- a/dev-libs/libgalago/libgalago-0.5.2.ebuild
+++ b/dev-libs/libgalago/libgalago-0.5.2.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/dev-libs/libgalago/libgalago-0.5.2.ebuild,v 1.1 2006/10/16 08:00:42 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgalago/libgalago-0.5.2.ebuild,v 1.2 2006/11/17 07:28:09 compnerd Exp $
 
 inherit eutils autotools
 
@@ -14,7 +14,10 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="test"
 
 RDEPEND=">=dev-libs/glib-2.8
-		 >=sys-apps/dbus-0.36"
+		 || (
+				>=dev-libs/dbus-glib-0.71
+				( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.36 )
+			)"
 DEPEND="${RDEPEND}
 		>=sys-devel/gettext-0.10.40
 		>=dev-util/pkgconfig-0.9