fix hal & dbus deps

Package-Manager: portage-2.0.51.22-r2

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index 178ceeee2f1de846d9d50b732b8cdff8b7cc4dc9..c636518d2c605cc9229802e25fbe07b2d8346808 100644 (file)
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-vfs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.168 2005/09/02 21:13:55 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.169 2005/09/05 20:37:19 cardoe Exp $
+
+  05 Sep 2005; Doug Goldstein <cardoe@gentoo.org>
+  gnome-vfs-2.10.0-r2.ebuild, gnome-vfs-2.10.1-r1.ebuild,
+  gnome-vfs-2.10.1-r2.ebuild:
+  Fix hal & dbus deps
 
   02 Sep 2005; <dang@gentoo.org>
   +files/gnome-vfs-2.10.1-samba-close_fn.patch,

diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index f534ab3a70bf595c049454675155198e36cc30a0..bc9c8c3d0c47f7302b9ad62990a026d177deb0d9 100644 (file)
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 9b77764e6b4431b358ace1ba41c30c45 ChangeLog 20377
 MD5 ed7cf04e9deeacff0d7c7848a5985556 gnome-vfs-1.0.5-r4.ebuild 2122
 MD5 cd9d76dffa670f71199e71b15498b227 gnome-vfs-2.10.0-r2.ebuild 2065
@@ -22,3 +25,10 @@ MD5 071edd844b13f596a2f7d986b4512521 files/1.0/gnome-vfs-1.0.5-fix-segfault.patc
 MD5 2ae3110a6e6fb30cfa593e4210535dc2 files/1.0/gnome-vfs-1.0.5-gcc3.4.patch 837
 MD5 7320d4ac9d4f99766075061daa53ea63 files/1.0/gnome-vfs-1.0.5-gtkdoc_fixes.patch 4892
 MD5 25d42b1a4cf935fbedd3465bc4a8dd7c files/1.0/gnome-vfs-1.0.5-proxy.patch 2863
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDHK0pBtvusYtCZMsRArQrAJ93JhpvpJDgSEBgYVVYPD7xG8x+5wCfW/GQ
+ao7VoU9opw1UvCDYUSFDLes=
+=vYCA
+-----END PGP SIGNATURE-----

diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.10.0-r2.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.10.0-r2.ebuild
index 1553930d8e7cf8e16e9b5ac40a58fbf5c48a09a2..b4059d98d8bbb24431e7a46ea241a51b36a2582b 100644 (file)
--- a/gnome-base/gnome-vfs/gnome-vfs-2.10.0-r2.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.10.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.10.0-r2.ebuild,v 1.10 2005/07/11 23:48:11 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.10.0-r2.ebuild,v 1.11 2005/09/05 20:37:19 cardoe Exp $
 
 inherit gnome2 eutils
 
@@ -32,7 +32,8 @@ RDEPEND=">=dev-libs/glib-2.6
        samba? ( >=net-fs/samba-3
                !gnome-extra/gnome-vfs-extras )
        hal? ( >=sys-apps/hal-0.4
-               >=sys-apps/dbus-0.22 )
+               <sys-apps/hal-0.5
+               =sys-apps/dbus-0.23* )
        howl? ( >=net-misc/howl-0.9.6-r1 )"
 
 # ssl/gnutls USE deps : if both are enabled choose openssl

diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.10.1-r1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.10.1-r1.ebuild
index 8525bde9c06125b5f65901dd74d995ee39c9e286..789713f612066b7e1c048698bfa3b90896f4cac8 100644 (file)
--- a/gnome-base/gnome-vfs/gnome-vfs-2.10.1-r1.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.10.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.10.1-r1.ebuild,v 1.10 2005/08/24 01:23:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.10.1-r1.ebuild,v 1.11 2005/09/05 20:37:19 cardoe Exp $
 
 inherit gnome2 eutils
 
@@ -32,7 +32,8 @@ RDEPEND=">=dev-libs/glib-2.6
        samba? ( >=net-fs/samba-3
                !gnome-extra/gnome-vfs-extras )
        hal? ( >=sys-apps/hal-0.4
-               >=sys-apps/dbus-0.22 )
+               <sys-apps/hal-0.5
+               =sys-apps/dbus-0.23* )
        howl? ( >=net-misc/howl-0.9.6-r1 )"
 
 # ssl/gnutls USE deps : if both are enabled choose openssl

diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.10.1-r2.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.10.1-r2.ebuild
index f6815cc50adb6f041303f01469489e202cf7715d..40e466bfb5a27766cf3f4d5a6d3f2e750a666d68 100644 (file)
--- a/gnome-base/gnome-vfs/gnome-vfs-2.10.1-r2.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.10.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.10.1-r2.ebuild,v 1.2 2005/09/02 21:13:55 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.10.1-r2.ebuild,v 1.3 2005/09/05 20:37:19 cardoe Exp $
 
 inherit gnome2 eutils
 
@@ -32,7 +32,8 @@ RDEPEND=">=dev-libs/glib-2.6
        samba? ( >=net-fs/samba-3
                !gnome-extra/gnome-vfs-extras )
        hal? ( >=sys-apps/hal-0.4
-               >=sys-apps/dbus-0.22 )
+               <sys-apps/hal-0.5
+               =sys-apps/dbus-0.23* )
        howl? ( >=net-misc/howl-0.9.6-r1 )"
 
 # ssl/gnutls USE deps : if both are enabled choose openssl