fix dbus dependency for dbus-1.0

Package-Manager: portage-2.1.2_rc2

4 files changed, 27 insertions, 20 deletions

diff --git a/gnome-base/gnome-mount/ChangeLog b/gnome-base/gnome-mount/ChangeLog
index ab29c8242c72..ea1869c7b35a 100644
--- a/gnome-base/gnome-mount/ChangeLog
+++ b/gnome-base/gnome-mount/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-mount
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/ChangeLog,v 1.20 2006/10/21 23:43:43 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/ChangeLog,v 1.21 2006/11/18 22:04:19 compnerd Exp $
+
+  18 Nov 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  gnome-mount-0.4-r5.ebuild:
+  Fix dbus dependency for dbus-1.0 (bug #155293)
 
   21 Oct 2006; Bryan Østergaard <kloeri@gentoo.org>
   gnome-mount-0.4-r5.ebuild:
diff --git a/gnome-base/gnome-mount/Manifest b/gnome-base/gnome-mount/Manifest
index d43f74589d51..d505c9a7029e 100644
--- a/gnome-base/gnome-mount/Manifest
+++ b/gnome-base/gnome-mount/Manifest
@@ -27,14 +27,14 @@ EBUILD gnome-mount-0.4-r4.ebuild 959 RMD160 a0bd5d7d66c475dbe2747e69d765170902e0
 MD5 2289ba6e1b939582e378932220f8ccee gnome-mount-0.4-r4.ebuild 959
 RMD160 a0bd5d7d66c475dbe2747e69d765170902e0981e gnome-mount-0.4-r4.ebuild 959
 SHA256 7b9d3fc4fe61fa8cd37ece80fc6840d3f35bfe46734d4f9f57553379be82f2a0 gnome-mount-0.4-r4.ebuild 959
-EBUILD gnome-mount-0.4-r5.ebuild 1051 RMD160 be9a7262e44aa03d5a2583700f3558a81323bdec SHA1 e64eb4b0f24979e6103ccbcc8aa363ca054e9759 SHA256 dc93c66c3852e84f8b775db4b3b3916277a6b66d15bbe8c473c4ca767597b6fd
-MD5 88a679e18759d04dd732507164622baa gnome-mount-0.4-r5.ebuild 1051
-RMD160 be9a7262e44aa03d5a2583700f3558a81323bdec gnome-mount-0.4-r5.ebuild 1051
-SHA256 dc93c66c3852e84f8b775db4b3b3916277a6b66d15bbe8c473c4ca767597b6fd gnome-mount-0.4-r5.ebuild 1051
-MISC ChangeLog 3046 RMD160 664b0f8522c6570b8b09c54d96576586dab68c5e SHA1 806507f0bd502ba3eb779a9721b1fa20da875d74 SHA256 79e6c126e138393a58d9160e50cbf4e4c3e8ade492e5daf3e9cca5e42259f2b7
-MD5 ccea0ca66f80c9592e6b1aab83ea62d8 ChangeLog 3046
-RMD160 664b0f8522c6570b8b09c54d96576586dab68c5e ChangeLog 3046
-SHA256 79e6c126e138393a58d9160e50cbf4e4c3e8ade492e5daf3e9cca5e42259f2b7 ChangeLog 3046
+EBUILD gnome-mount-0.4-r5.ebuild 1119 RMD160 d2b0d576f32d646e62d2c4c2cbf79cf6005b863f SHA1 3953744c42b74d155f08d08453d2ed8fc5f0e059 SHA256 1783b970b15607d6f095ec7e049075de9cf90486d40f21881b8445ead40adaaa
+MD5 95326a26c4ed4f988247a47f8af87464 gnome-mount-0.4-r5.ebuild 1119
+RMD160 d2b0d576f32d646e62d2c4c2cbf79cf6005b863f gnome-mount-0.4-r5.ebuild 1119
+SHA256 1783b970b15607d6f095ec7e049075de9cf90486d40f21881b8445ead40adaaa gnome-mount-0.4-r5.ebuild 1119
+MISC ChangeLog 3183 RMD160 249efb9b5a87522012b7e20ea8935f541402efa5 SHA1 163c372d8f01aa8bcf3d38590f6c07963b2a23cf SHA256 16764c38b624385463e52fe469493ff00ba526ddb1533ddfda714d47bfb2bd52
+MD5 c1295cf85eac6403983eb732f7322588 ChangeLog 3183
+RMD160 249efb9b5a87522012b7e20ea8935f541402efa5 ChangeLog 3183
+SHA256 16764c38b624385463e52fe469493ff00ba526ddb1533ddfda714d47bfb2bd52 ChangeLog 3183
 MISC metadata.xml 206 RMD160 61d950942f566dfc272d4f115fa2fb390fbbe301 SHA1 3f059bf106cd99ac3eb9aab89e0708f5fa86ddf9 SHA256 91b15066df76a399233847c54c04eca1d95ab2b73fdef41207dfeb17dbb38193
 MD5 8f804bac2d3835f24ed9a73034f969a1 metadata.xml 206
 RMD160 61d950942f566dfc272d4f115fa2fb390fbbe301 metadata.xml 206
diff --git a/gnome-base/gnome-mount/gnome-mount-0.4-r5.ebuild b/gnome-base/gnome-mount/gnome-mount-0.4-r5.ebuild
index ae0ef23b8c57..4a27912abbdd 100644
--- a/gnome-base/gnome-mount/gnome-mount-0.4-r5.ebuild
+++ b/gnome-base/gnome-mount/gnome-mount-0.4-r5.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/gnome-base/gnome-mount/gnome-mount-0.4-r5.ebuild,v 1.3 2006/10/21 23:43:43 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/gnome-mount-0.4-r5.ebuild,v 1.4 2006/11/18 22:04:19 compnerd Exp $
 
 inherit eutils gnome2
 
@@ -14,12 +14,15 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="debug"
 
 RDEPEND=">=gnome-base/libgnomeui-2.13
-	>=sys-apps/dbus-0.60
 	>=sys-apps/hal-0.5.7-r1
 	>=x11-libs/gtk+-2.8
 	gnome-base/gnome-keyring
 	>=gnome-base/libglade-2
-	>=gnome-base/gconf-2"
+	>=gnome-base/gconf-2
+	||  (
+			>=dev-libs/dbus-glib-0.71
+			( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.60 )
+		)"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index dc31a8e961c2..406e296f988a 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -43,14 +43,14 @@ EBUILD gnome-session-2.14.2.ebuild 2187 RMD160 3bd311d7d691b50089846c0333ead1674
 MD5 c2dd0ab2756080c2fd69e4a592827829 gnome-session-2.14.2.ebuild 2187
 RMD160 3bd311d7d691b50089846c0333ead16740be8ae3 gnome-session-2.14.2.ebuild 2187
 SHA256 d33e6e1ca343b6d74a1917793f553393bbec450cd70ad69511ac7866bbc2ef41 gnome-session-2.14.2.ebuild 2187
-EBUILD gnome-session-2.16.1.ebuild 2106 RMD160 9f4bba7cf67d4803c58f79f87401b274ff554f5b SHA1 ff164666b2efb4bfa02819f2f6f0afef72f237d4 SHA256 24c9d66298952d9bbf399b130290ff981a0d6bc3fc5480aec34f56576a97568f
-MD5 4cca51a793ee2e2112347bbedc9a74b1 gnome-session-2.16.1.ebuild 2106
-RMD160 9f4bba7cf67d4803c58f79f87401b274ff554f5b gnome-session-2.16.1.ebuild 2106
-SHA256 24c9d66298952d9bbf399b130290ff981a0d6bc3fc5480aec34f56576a97568f gnome-session-2.16.1.ebuild 2106
-MISC ChangeLog 20124 RMD160 849ba07e2b68f4251e67878a539cbe2bc4e7aa4a SHA1 2d1fa13669df539bf8b547e93b3e0bbabc1e75ac SHA256 7a8c425a3892709c677e5782a6c98b37578a8a4226b9d8ab8b47663d76728470
-MD5 f9b230fe8aa35ff50b79cfbd1c5cfead ChangeLog 20124
-RMD160 849ba07e2b68f4251e67878a539cbe2bc4e7aa4a ChangeLog 20124
-SHA256 7a8c425a3892709c677e5782a6c98b37578a8a4226b9d8ab8b47663d76728470 ChangeLog 20124
+EBUILD gnome-session-2.16.1.ebuild 2178 RMD160 e573cd5c4edb1b714bd67981c2864b1c565be211 SHA1 927bf0548eda630c607db8eb7779ebc91d52882d SHA256 93221c46b7916fe2640b6b3d860c589eb27b7a7c35bfca00066d8625e1ff2dbd
+MD5 0733e9fe326635f82bb1914344354f33 gnome-session-2.16.1.ebuild 2178
+RMD160 e573cd5c4edb1b714bd67981c2864b1c565be211 gnome-session-2.16.1.ebuild 2178
+SHA256 93221c46b7916fe2640b6b3d860c589eb27b7a7c35bfca00066d8625e1ff2dbd gnome-session-2.16.1.ebuild 2178
+MISC ChangeLog 20263 RMD160 ce023a100606196199ca36b4e88afc352504586c SHA1 c72731d89fa65fb82edcab47f0d40c20219884ce SHA256 88d7c7b9d337e6adb7003de466581cdf12639cb7261ce98cf86829d67c051983
+MD5 a665457b7926c83a212a0e2612b4d146 ChangeLog 20263
+RMD160 ce023a100606196199ca36b4e88afc352504586c ChangeLog 20263
+SHA256 88d7c7b9d337e6adb7003de466581cdf12639cb7261ce98cf86829d67c051983 ChangeLog 20263
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158