Update D-Bus depends to new bindings

(Portage version: 2.1.2_rc1-r3)

5 files changed, 22 insertions, 9 deletions

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index d901e9fff7a6..5b4f61d7ebcb 100644
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-applets
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.192 2006/10/27 19:31:22 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.193 2006/11/09 02:54:10 cardoe Exp $
+
+  09 Nov 2006; Doug Goldstein <cardoe@gentoo.org>
+  gnome-applets-2.14.2.ebuild, gnome-applets-2.14.2-r1.ebuild,
+  gnome-applets-2.16.0.1.ebuild, gnome-applets-2.16.1.ebuild:
+  Update D-Bus depends to new bindings
 
   27 Oct 2006; Daniel Gryniewicz <dang@gentoo.org> ChangeLog:
   Bump to 2.16.1
diff --git a/gnome-base/gnome-applets/gnome-applets-2.14.2-r1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.14.2-r1.ebuild
index 84ea7cd3a911..0644f780aace 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.14.2-r1.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.14.2-r1.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-applets/gnome-applets-2.14.2-r1.ebuild,v 1.3 2006/09/24 21:23:50 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.14.2-r1.ebuild,v 1.4 2006/11/09 02:54:10 cardoe Exp $
 
 WANT_AUTOMAKE=1.8
 inherit eutils gnome2 autotools
@@ -27,7 +27,10 @@ RDEPEND=">=x11-libs/gtk+-2.5
 	>=x11-libs/libwnck-2.9.3
 	>=app-admin/system-tools-backends-1.1.3
 	>=gnome-base/gnome-desktop-2.11.1
-	hal? ( >=sys-apps/hal-0.5.3 >=sys-apps/dbus-0.34 )
+	hal? ( >=sys-apps/hal-0.5.3
+		|| ( >=dev-libs/dbus-glib-0.71
+			( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.34 ) )
+	)
 	>=gnome-extra/gucharmap-1.4
 	apm? ( sys-apps/apmd )
 	acpi? ( sys-power/acpid )
diff --git a/gnome-base/gnome-applets/gnome-applets-2.14.2.ebuild b/gnome-base/gnome-applets/gnome-applets-2.14.2.ebuild
index 80bd5be94560..697d4bd92be5 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.14.2.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.14.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/gnome-base/gnome-applets/gnome-applets-2.14.2.ebuild,v 1.10 2006/10/20 19:54:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.14.2.ebuild,v 1.11 2006/11/09 02:54:10 cardoe Exp $
 
 inherit eutils gnome2
 
@@ -26,7 +26,10 @@ RDEPEND=">=x11-libs/gtk+-2.5
 	>=x11-libs/libwnck-2.9.3
 	>=app-admin/system-tools-backends-1.1.3
 	>=gnome-base/gnome-desktop-2.11.1
-	hal? ( >=sys-apps/hal-0.5.3 >=sys-apps/dbus-0.34 )
+	hal? ( >=sys-apps/hal-0.5.3
+		|| ( >=dev-libs/dbus-glib-0.71
+		( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.34 ) )
+	)
 	>=gnome-extra/gucharmap-1.4
 	apm? ( sys-apps/apmd )
 	acpi? ( sys-power/acpid )
diff --git a/gnome-base/gnome-applets/gnome-applets-2.16.0.1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.16.0.1.ebuild
index c7ea1d20d3f1..d74b8f205603 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.16.0.1.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.16.0.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/gnome-base/gnome-applets/gnome-applets-2.16.0.1.ebuild,v 1.7 2006/10/06 17:39:39 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.16.0.1.ebuild,v 1.8 2006/11/09 02:54:10 cardoe Exp $
 
 inherit eutils gnome2 autotools
 
@@ -28,7 +28,8 @@ RDEPEND=">=x11-libs/gtk+-2.6
 		>=gnome-base/gnome-desktop-2.11.1
 		>=x11-libs/libnotify-0.3.2
 		>=sys-apps/hal-0.5.3
-		>=sys-apps/dbus-0.34
+		|| ( >=dev-libs/dbus-glib-0.71
+			( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.34 ) )
 		>=dev-python/pygtk-2.6
 		>=dev-python/gnome-python-2.10
 		>=x11-themes/gnome-icon-theme-2.15.91
diff --git a/gnome-base/gnome-applets/gnome-applets-2.16.1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.16.1.ebuild
index 9b9d49aafaf4..7c9f177b4bce 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.16.1.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.16.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/gnome-base/gnome-applets/gnome-applets-2.16.1.ebuild,v 1.1 2006/10/27 19:31:22 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.16.1.ebuild,v 1.2 2006/11/09 02:54:10 cardoe Exp $
 
 inherit eutils gnome2 autotools
 
@@ -28,7 +28,8 @@ RDEPEND=">=x11-libs/gtk+-2.6
 		>=gnome-base/gnome-desktop-2.11.1
 		>=x11-libs/libnotify-0.3.2
 		>=sys-apps/hal-0.5.3
-		>=sys-apps/dbus-0.34
+		|| ( >=dev-libs/dbus-glib-0.71
+			( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.34 ) )
 		>=dev-python/pygtk-2.6
 		>=dev-python/gnome-python-2.10
 		>=x11-themes/gnome-icon-theme-2.15.91