fix dependencies for dbus 1.0

Package-Manager: portage-2.1.2_rc1-r7

diff --git a/sys-apps/galago-daemon/ChangeLog b/sys-apps/galago-daemon/ChangeLog
index 03d47bb819e97e4ab0311ae744b8330c9c308fd5..d7c827fb7647330b4ac2aa3706992a7fb2ac8bb5 100644 (file)
--- a/sys-apps/galago-daemon/ChangeLog
+++ b/sys-apps/galago-daemon/ChangeLog
@@ -1,10 +1,15 @@
 # ChangeLog for sys-apps/galago-daemon
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/galago-daemon/ChangeLog,v 1.6 2006/10/16 08:02:15 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/galago-daemon/ChangeLog,v 1.7 2006/11/17 08:46:06 compnerd Exp $
+
+  17 Nov 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  galago-daemon-0.5.0.ebuild, galago-daemon-0.5.1.ebuild:
+  Fix dependencies for dbus 1.0
 
 *galago-daemon-0.5.1 (16 Oct 2006)
 
-  16 Oct 2006; <compnerd@gentoo.org> +galago-daemon-0.5.1.ebuild:
+  16 Oct 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  +galago-daemon-0.5.1.ebuild:
   version bump from upstream
 
   27 Aug 2006; Saleem Abdulrasool <compnerd@gentoo.org>

diff --git a/sys-apps/galago-daemon/Manifest b/sys-apps/galago-daemon/Manifest
index 3bb8295080324eaf7f1b339568a5997c5a8b6cb1..0ce10bf31255e903cff2c730a7c6dcdc8644049b 100644 (file)
--- a/sys-apps/galago-daemon/Manifest
+++ b/sys-apps/galago-daemon/Manifest
@@ -9,18 +9,18 @@ EBUILD galago-daemon-0.3.4.ebuild 994 RMD160 2c01053839f313c5c142af777d49a1359eb
 MD5 fa519451f1ab3e8fa15396f055ddd611 galago-daemon-0.3.4.ebuild 994
 RMD160 2c01053839f313c5c142af777d49a1359ebaafd3 galago-daemon-0.3.4.ebuild 994
 SHA256 29b48f451dbb918f81a9eedc8a663c9870a26dcd2972ec67de20506752ca135d galago-daemon-0.3.4.ebuild 994
-EBUILD galago-daemon-0.5.0.ebuild 859 RMD160 be120f2084cc91ebee8b14f95957c22392ac7247 SHA1 b9316f07d5600ab41450e5c5060b6475e8d5d7bb SHA256 4e9e23d4b289adb03158fcc7c64effcb27d627cbb7f870cbe43f87e654a4a116
-MD5 098a2d9b83c481e7b55ea5a615e46d76 galago-daemon-0.5.0.ebuild 859
-RMD160 be120f2084cc91ebee8b14f95957c22392ac7247 galago-daemon-0.5.0.ebuild 859
-SHA256 4e9e23d4b289adb03158fcc7c64effcb27d627cbb7f870cbe43f87e654a4a116 galago-daemon-0.5.0.ebuild 859
-EBUILD galago-daemon-0.5.1.ebuild 859 RMD160 3602f0e48257384035a9220ed54970cc19f44187 SHA1 aee38eadc87597da075a8ae8e7c7eb874e2534c1 SHA256 5d58ac20ae56bbe132f13e43fc62740b6402fae425c0a8cb7fe93cb3672014c8
-MD5 100bb2d9cbb3646be44f3d4231b657ad galago-daemon-0.5.1.ebuild 859
-RMD160 3602f0e48257384035a9220ed54970cc19f44187 galago-daemon-0.5.1.ebuild 859
-SHA256 5d58ac20ae56bbe132f13e43fc62740b6402fae425c0a8cb7fe93cb3672014c8 galago-daemon-0.5.1.ebuild 859
-MISC ChangeLog 1072 RMD160 58ef1c8eda00e6a441cb9ab2e7d59ebf00fef712 SHA1 1e850bc4cbf284b83f2d45a5e8f2df477f0279cd SHA256 049c41b6c53d0c9c94c02e2850957c55374b6e0d490e638760c744938ac0569b
-MD5 4b388f2355e101548c3c584ef434caa6 ChangeLog 1072
-RMD160 58ef1c8eda00e6a441cb9ab2e7d59ebf00fef712 ChangeLog 1072
-SHA256 049c41b6c53d0c9c94c02e2850957c55374b6e0d490e638760c744938ac0569b ChangeLog 1072
+EBUILD galago-daemon-0.5.0.ebuild 927 RMD160 c0d27fff9c0307fd2cb60d2252401ea86b107ff9 SHA1 03d6ffd16f72aeafe0ea103b013c8f5abd6bbbae SHA256 4f12773dbcf2edb9f500a5893b4ac30ba684205ecde94b474123508ed95f12c9
+MD5 cdb4f7a14be0b5adbc1a917922fbddfa galago-daemon-0.5.0.ebuild 927
+RMD160 c0d27fff9c0307fd2cb60d2252401ea86b107ff9 galago-daemon-0.5.0.ebuild 927
+SHA256 4f12773dbcf2edb9f500a5893b4ac30ba684205ecde94b474123508ed95f12c9 galago-daemon-0.5.0.ebuild 927
+EBUILD galago-daemon-0.5.1.ebuild 927 RMD160 a1ad4ff7344a05cac292e2881baad5fbb8248091 SHA1 b31d673b2a31ff55bed4fd6f69dc9a936b357b26 SHA256 9f14bb094e5688e4c70433194b0c40271f36ee086b482b73ef1e990a5a21ff7f
+MD5 0a41c69a9cd26dfaabf47648a6f9637b galago-daemon-0.5.1.ebuild 927
+RMD160 a1ad4ff7344a05cac292e2881baad5fbb8248091 galago-daemon-0.5.1.ebuild 927
+SHA256 9f14bb094e5688e4c70433194b0c40271f36ee086b482b73ef1e990a5a21ff7f galago-daemon-0.5.1.ebuild 927
+MISC ChangeLog 1240 RMD160 6dafa63aa0195283aa601e79921a3d45895ea87c SHA1 7d163c943f874b4639307c6faf52cb8e652b9dda SHA256 3d0b87d1499f79fa42227c856374a5170641f8c4ff19bacfeefaaebc0755e58e
+MD5 afa10bc85dc02f44ecd36d7e1fb9eae1 ChangeLog 1240
+RMD160 6dafa63aa0195283aa601e79921a3d45895ea87c ChangeLog 1240
+SHA256 3d0b87d1499f79fa42227c856374a5170641f8c4ff19bacfeefaaebc0755e58e ChangeLog 1240
 MISC metadata.xml 312 RMD160 03fef86ca203ec541f1488fb88f7f653558da537 SHA1 4f573c6e28157baeac51ae5cfd45597831e9bd2b SHA256 247d6e467251565ff33d6c40f4cee2897eb2f0d803c49b4d5f62a767b5785995
 MD5 987b824d47696574408ff794a1669990 metadata.xml 312
 RMD160 03fef86ca203ec541f1488fb88f7f653558da537 metadata.xml 312

diff --git a/sys-apps/galago-daemon/galago-daemon-0.5.0.ebuild b/sys-apps/galago-daemon/galago-daemon-0.5.0.ebuild
index 025890ad580f550bf1a6b51ee7ebe43ea8cce7cd..92d2f4ae7c332ab470feb9b268e972c94cbad84e 100644 (file)
--- a/sys-apps/galago-daemon/galago-daemon-0.5.0.ebuild
+++ b/sys-apps/galago-daemon/galago-daemon-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/sys-apps/galago-daemon/galago-daemon-0.5.0.ebuild,v 1.1 2006/08/08 04:04:23 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/galago-daemon/galago-daemon-0.5.0.ebuild,v 1.2 2006/11/17 08:46:06 compnerd Exp $
 
 inherit eutils autotools
 
@@ -15,7 +15,10 @@ IUSE="test"
 
 RDEPEND=">=dev-libs/glib-2.8
                 >=dev-libs/libgalago-0.5.0
-                >=sys-apps/dbus-0.36"
+                || (
+                               >=dev-libs/dbus-glib-0.71
+                               ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.36 )
+                       )"
 DEPEND="${RDEPEND}
                >=dev-util/pkgconfig-0.9
                test? ( dev-libs/check )"

diff --git a/sys-apps/galago-daemon/galago-daemon-0.5.1.ebuild b/sys-apps/galago-daemon/galago-daemon-0.5.1.ebuild
index f7ec9c70de5ac156b4437e8f4c2784f1a23682b7..dc8449c923944c255ed521d01fa89cfbf602eea2 100644 (file)
--- a/sys-apps/galago-daemon/galago-daemon-0.5.1.ebuild
+++ b/sys-apps/galago-daemon/galago-daemon-0.5.1.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/sys-apps/galago-daemon/galago-daemon-0.5.1.ebuild,v 1.1 2006/10/16 08:02:15 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/galago-daemon/galago-daemon-0.5.1.ebuild,v 1.2 2006/11/17 08:46:06 compnerd Exp $
 
 inherit eutils autotools
 
@@ -15,7 +15,10 @@ IUSE="test"
 
 RDEPEND=">=dev-libs/glib-2.8
                 >=dev-libs/libgalago-0.5.2
-                >=sys-apps/dbus-0.36"
+                || (
+                               >=dev-libs/dbus-glib-0.71
+                               ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.36 )
+                       )"
 DEPEND="${RDEPEND}
                >=dev-util/pkgconfig-0.9
                test? ( dev-libs/check )"