Fix hal & dbus deps

Package-Manager: portage-2.0.51.22-r2

5 files changed, 41 insertions, 35 deletions

diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index 34e561bc0dd2..f534ab3a70bf 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -1,34 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8de92aeb8fbf8f17c8bd810f4650d995 gnome-vfs-2.11.92.ebuild 1995
+MD5 9b77764e6b4431b358ace1ba41c30c45 ChangeLog 20377
 MD5 ed7cf04e9deeacff0d7c7848a5985556 gnome-vfs-1.0.5-r4.ebuild 2122
-MD5 cfdb8710cc69e7499005550d464a56d4 gnome-vfs-2.10.1-r2.ebuild 2243
-MD5 5c37214d9aecc7f5aef92160839ceeb6 gnome-vfs-2.10.0-r2.ebuild 2045
-MD5 b38fd6ba659d5d63d370a8bc36c43733 gnome-vfs-2.10.1-r1.ebuild 2049
-MD5 0d05bef7848464ea62f4c72bed606c4b ChangeLog 20214
+MD5 cd9d76dffa670f71199e71b15498b227 gnome-vfs-2.10.0-r2.ebuild 2065
+MD5 8de92aeb8fbf8f17c8bd810f4650d995 gnome-vfs-2.11.92.ebuild 1995
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 09f0fab6d414a859d0f979bef3e10dfb files/gnome-vfs-2.8.3-reiser4_support.patch 710
-MD5 ba8ad5c040af8bd498c9ec71ac1df40e files/gnome-vfs-2-CAN-2005-0706.patch 490
-MD5 b0c503dc8276be2fae063259ca0f2514 files/digest-gnome-vfs-2.11.92 71
-MD5 75d0133c9ee4ef3355b25dad13c6cd9a files/gnome-vfs-2.10.1-samba-close_fn.patch 1895
-MD5 c599d081cb908d1fe6851ab69d80a7fa files/gnome-vfs-2.10.1-fbsd.patch 1505
+MD5 727db72c01bae43bd15e0127bb8b1ac4 gnome-vfs-2.10.1-r1.ebuild 2069
+MD5 d911c7df303c96fa782def7e34d25c02 gnome-vfs-2.10.1-r2.ebuild 2265
 MD5 a88e201c8f2ec5444db0bea2e8c302b4 files/digest-gnome-vfs-1.0.5-r4 68
 MD5 2bebfc7d172b325dc37efef679cbf545 files/digest-gnome-vfs-2.10.0-r2 70
 MD5 d20a2ead9fd45768a182fe24423b0842 files/digest-gnome-vfs-2.10.1-r1 70
-MD5 d20a2ead9fd45768a182fe24423b0842 files/digest-gnome-vfs-2.10.1-r2 70
+MD5 c4482dd33a470e671d27a00eb8fbe044 files/gnome-vfs-2.10.1-date_time_stamp.patch 2297
+MD5 c599d081cb908d1fe6851ab69d80a7fa files/gnome-vfs-2.10.1-fbsd.patch 1505
 MD5 6aa77e036ebb110dad9bc8244c3a7081 files/gnome-vfs-2.11.92-fbsd.patch 1036
+MD5 75d0133c9ee4ef3355b25dad13c6cd9a files/gnome-vfs-2.10.1-samba-close_fn.patch 1895
+MD5 ba8ad5c040af8bd498c9ec71ac1df40e files/gnome-vfs-2-CAN-2005-0706.patch 490
 MD5 aa105582688e7798d87c46739348cfad files/gnome-vfs-2.11.92-samba-close_fn.patch 1901
-MD5 c4482dd33a470e671d27a00eb8fbe044 files/gnome-vfs-2.10.1-date_time_stamp.patch 2297
-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
-MD5 2ae3110a6e6fb30cfa593e4210535dc2 files/1.0/gnome-vfs-1.0.5-gcc3.4.patch 837
+MD5 09f0fab6d414a859d0f979bef3e10dfb files/gnome-vfs-2.8.3-reiser4_support.patch 710
+MD5 d20a2ead9fd45768a182fe24423b0842 files/digest-gnome-vfs-2.10.1-r2 70
+MD5 b0c503dc8276be2fae063259ca0f2514 files/digest-gnome-vfs-2.11.92 71
 MD5 4072a11c3c98c493cbc0bb851176fb44 files/1.0/gnome-vfs-1.0.5-codeset.patch 1762
 MD5 071edd844b13f596a2f7d986b4512521 files/1.0/gnome-vfs-1.0.5-fix-segfault.patch 430
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDGMC1omPajV0RnrERAg7YAJ9zSgknZPuFs7DHyJdB0mIQ/jOScgCfZs3H
-UApcemqrV+1SOZgv4ZKUewE=
-=37EZ
------END PGP SIGNATURE-----
+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
diff --git a/gnome-base/gnome-volume-manager/ChangeLog b/gnome-base/gnome-volume-manager/ChangeLog
index 32337317aea8..04a44e379236 100644
--- a/gnome-base/gnome-volume-manager/ChangeLog
+++ b/gnome-base/gnome-volume-manager/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for gnome-base/gnome-volume-manager
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/ChangeLog,v 1.33 2005/09/03 20:24:54 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/ChangeLog,v 1.34 2005/09/05 20:34:03 cardoe Exp $
 
   03 Sep 2005; Markus Rothe <corsair@gentoo.org>
   gnome-volume-manager-1.2.2.ebuild:
@@ -10,6 +10,10 @@
   gnome-volume-manager-1.2.2.ebuild:
   Stable on ppc.
 
+  05 Sep 2005; Doug Goldstein <cardoe@gentoo.org>
+  gnome-volume-manager-1.2.1.ebuild, gnome-volume-manager-1.2.2.ebuild:
+  Fix HAL & dbus deps
+
   31 Aug 2005; Herbie Hopkins <herbs@gentoo.org>
   gnome-volume-manager-1.2.2.ebuild:
   Stable on amd64.
diff --git a/gnome-base/gnome-volume-manager/Manifest b/gnome-base/gnome-volume-manager/Manifest
index 4d6011e7c76d..dd8267be5e42 100644
--- a/gnome-base/gnome-volume-manager/Manifest
+++ b/gnome-base/gnome-volume-manager/Manifest
@@ -1,9 +1,19 @@
-MD5 99711fec2c34d05b51aff69dc4ae4443 ChangeLog 4372
-MD5 233215d2c975f665aacead6fe5727f52 gnome-volume-manager-1.2.2.ebuild 1027
-MD5 e686074972da9266f00210b851924735 gnome-volume-manager-1.5.0.ebuild 1606
-MD5 bad4bf06519d240210c0997886ae31df gnome-volume-manager-1.2.1.ebuild 1012
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 08a264f6b60a7be3c83bbfd490fe54ac ChangeLog 4516
+MD5 bc7bad0f25634532bcb9ad91a6775022 gnome-volume-manager-1.2.2.ebuild 1045
+MD5 475e26d4d0dd7864b602d896023d10d7 gnome-volume-manager-1.2.1.ebuild 1029
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 e686074972da9266f00210b851924735 gnome-volume-manager-1.5.0.ebuild 1606
 MD5 16d8909214e29b02eb989b948601461c files/digest-gnome-volume-manager-1.2.2 79
 MD5 8204147a3c0e44731e1baef264383fc1 files/digest-gnome-volume-manager-1.5.0 173
-MD5 a037ca860b7fc7519f2e19ab5c1c0c82 files/gvm-use-pmount-if-available-nochangelog.patch 1741
 MD5 fcd04d3a6284a16bdffaddaf7311cfe8 files/digest-gnome-volume-manager-1.2.1 79
+MD5 a037ca860b7fc7519f2e19ab5c1c0c82 files/gvm-use-pmount-if-available-nochangelog.patch 1741
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDHKvYBtvusYtCZMsRAix6AKCBadW+iYTxNOq2zL3IeAPSJxkLYwCcDenY
+sVZ4p0aYjMPN7rLk3H8hxaU=
+=izK0
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-volume-manager/gnome-volume-manager-1.2.1.ebuild b/gnome-base/gnome-volume-manager/gnome-volume-manager-1.2.1.ebuild
index de7de554b075..907cbaa2ec81 100644
--- a/gnome-base/gnome-volume-manager/gnome-volume-manager-1.2.1.ebuild
+++ b/gnome-base/gnome-volume-manager/gnome-volume-manager-1.2.1.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-volume-manager/gnome-volume-manager-1.2.1.ebuild,v 1.8 2005/08/23 01:31:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/gnome-volume-manager-1.2.1.ebuild,v 1.9 2005/09/05 20:34:03 cardoe Exp $
 
 inherit gnome2 eutils
 
@@ -14,8 +14,9 @@ IUSE=""
 
 # we just require the latest of the utopia stack to be on the safe side
 RDEPEND=">=x11-libs/gtk+-2.6
-	>=sys-apps/dbus-0.22
+	=sys-apps/dbus-0.23*
 	>=sys-apps/hal-0.2.98
+	<sys-apps/hal-0.5
 	>=gnome-base/libglade-2
 	>=gnome-base/libgnomeui-2.2"
 
diff --git a/gnome-base/gnome-volume-manager/gnome-volume-manager-1.2.2.ebuild b/gnome-base/gnome-volume-manager/gnome-volume-manager-1.2.2.ebuild
index fff025eab551..1a39e331f6c2 100644
--- a/gnome-base/gnome-volume-manager/gnome-volume-manager-1.2.2.ebuild
+++ b/gnome-base/gnome-volume-manager/gnome-volume-manager-1.2.2.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-volume-manager/gnome-volume-manager-1.2.2.ebuild,v 1.6 2005/09/03 20:24:54 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/gnome-volume-manager-1.2.2.ebuild,v 1.7 2005/09/05 20:34:03 cardoe Exp $
 
 inherit gnome2
 
@@ -14,8 +14,9 @@ IUSE=""
 
 # we just require the latest of the utopia stack to be on the safe side
 RDEPEND=">=x11-libs/gtk+-2.6
-	>=sys-apps/dbus-0.22
+	=sys-apps/dbus-0.23*
 	>=sys-apps/hal-0.2.98
+	<sys-apps/hal-0.5
 	>=gnome-base/libglade-2
 	>=gnome-base/gconf-2
 	>=gnome-base/libgnomeui-2.2"