correct dbus deps (bug #187369)

Package-Manager: portage-2.1.2.9

9 files changed, 30 insertions, 31 deletions

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index 742a6050613e..86b8781f9b32 100644
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-applets
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.223 2007/07/22 10:21:36 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.224 2007/08/02 05:22:20 mr_bones_ Exp $
+
+  02 Aug 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  gnome-applets-2.14.2.ebuild, gnome-applets-2.14.2-r1.ebuild,
+  gnome-applets-2.16.2.ebuild, gnome-applets-2.16.2-r1.ebuild,
+  gnome-applets-2.18.0.ebuild, gnome-applets-2.18.0-r2.ebuild:
+  correct dbus deps (bug #187369)
 
   22 Jul 2007; Hans de Graaff <graaff@gentoo.org>
   gnome-applets-2.14.2.ebuild, gnome-applets-2.14.2-r1.ebuild:
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 8b206545ba1a..fd487638b492 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-2007 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.6 2007/07/22 10:21:36 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.14.2-r1.ebuild,v 1.7 2007/08/02 05:22:21 mr_bones_ Exp $
 
 WANT_AUTOMAKE=1.8
 inherit eutils gnome2 autotools
@@ -27,9 +27,9 @@ 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
-		|| ( >=dev-libs/dbus-glib-0.71
-			>=sys-apps/dbus-0.34 )
+	hal? (
+		>=sys-apps/hal-0.5.3
+		>=dev-libs/dbus-glib-0.71
 	)
 	>=gnome-extra/gucharmap-1.4
 	apm? ( sys-apps/apmd )
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 39014bf5a9fa..8ea17da95350 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-2007 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.13 2007/07/22 10:21:36 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.14.2.ebuild,v 1.14 2007/08/02 05:22:21 mr_bones_ Exp $
 
 inherit eutils gnome2
 
@@ -26,9 +26,9 @@ 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
-		|| ( >=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-0.34 )
+	hal? (
+		>=sys-apps/hal-0.5.3
+		>=dev-libs/dbus-glib-0.71
 	)
 	>=gnome-extra/gucharmap-1.4
 	apm? ( sys-apps/apmd )
diff --git a/gnome-base/gnome-applets/gnome-applets-2.16.2-r1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.16.2-r1.ebuild
index 6151272f617f..e1faf31026f5 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.16.2-r1.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.16.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.2-r1.ebuild,v 1.8 2007/07/10 17:31:00 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.16.2-r1.ebuild,v 1.9 2007/08/02 05:22:20 mr_bones_ Exp $
 
 inherit eutils gnome2 autotools
 
@@ -28,8 +28,7 @@ RDEPEND=">=x11-libs/gtk+-2.6
 		>=gnome-base/gnome-desktop-2.11.1
 		>=x11-libs/libnotify-0.3.2
 		hal? ( >=sys-apps/hal-0.5.3 )
-		|| ( >=dev-libs/dbus-glib-0.71
-			>=sys-apps/dbus-0.34 )
+		>=dev-libs/dbus-glib-0.71
 		>=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.2.ebuild b/gnome-base/gnome-applets/gnome-applets-2.16.2.ebuild
index e09ae20051c9..1f613c5715ce 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.16.2.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.16.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.2.ebuild,v 1.14 2007/07/08 04:40:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.16.2.ebuild,v 1.15 2007/08/02 05:22:20 mr_bones_ Exp $
 
 inherit eutils gnome2 autotools
 
@@ -28,8 +28,7 @@ RDEPEND=">=x11-libs/gtk+-2.6
 		>=gnome-base/gnome-desktop-2.11.1
 		>=x11-libs/libnotify-0.3.2
 		hal? ( >=sys-apps/hal-0.5.3 )
-		|| ( >=dev-libs/dbus-glib-0.71
-			>=sys-apps/dbus-0.34 )
+		>=dev-libs/dbus-glib-0.71
 		>=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.18.0-r2.ebuild b/gnome-base/gnome-applets/gnome-applets-2.18.0-r2.ebuild
index f4ed0764d66d..208d8690f27b 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.18.0-r2.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.18.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.18.0-r2.ebuild,v 1.2 2007/07/08 04:40:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.18.0-r2.ebuild,v 1.3 2007/08/02 05:22:20 mr_bones_ Exp $
 
 inherit eutils gnome2 autotools
 
@@ -26,10 +26,7 @@ RDEPEND=">=x11-libs/gtk+-2.6
 		>=gnome-base/gnome-desktop-2.11.1
 		>=x11-libs/libnotify-0.3.2
 		hal? ( >=sys-apps/hal-0.5.3 )
-		||  (
-				>=dev-libs/dbus-glib-0.71
-				>=sys-apps/dbus-0.34
-			)
+		>=dev-libs/dbus-glib-0.71
 		>=x11-themes/gnome-icon-theme-2.15.91
 		>=dev-libs/libxml2-2.5.0
 		>=virtual/python-2.4
diff --git a/gnome-base/gnome-applets/gnome-applets-2.18.0.ebuild b/gnome-base/gnome-applets/gnome-applets-2.18.0.ebuild
index 27178918c035..95770fc5582e 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.18.0.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.18.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.18.0.ebuild,v 1.4 2007/07/08 04:40:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.18.0.ebuild,v 1.5 2007/08/02 05:22:21 mr_bones_ Exp $
 
 inherit eutils gnome2 autotools
 
@@ -26,10 +26,7 @@ RDEPEND=">=x11-libs/gtk+-2.6
 		>=gnome-base/gnome-desktop-2.11.1
 		>=x11-libs/libnotify-0.3.2
 		hal? ( >=sys-apps/hal-0.5.3 )
-		||  (
-				>=dev-libs/dbus-glib-0.71
-				>=sys-apps/dbus-0.34
-			)
+		>=dev-libs/dbus-glib-0.71
 		>=x11-themes/gnome-icon-theme-2.15.91
 		>=dev-libs/libxml2-2.5.0
 		>=virtual/python-2.4
diff --git a/gnome-base/gnome-mount/ChangeLog b/gnome-base/gnome-mount/ChangeLog
index a5b6100e449f..edab11326665 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/ChangeLog,v 1.38 2007/07/08 05:53:52 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/ChangeLog,v 1.39 2007/08/02 05:25:01 mr_bones_ Exp $
+
+  02 Aug 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  gnome-mount-0.4-r5.ebuild:
+  correct dbus deps (bug #187369)
 
   08 Jul 2007; Michael Sterrett <mr_bones_@gentoo.org>
   gnome-mount-0.4-r5.ebuild:
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 69a6cba7ef20..e3acc1e8657a 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-2007 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.14 2007/07/08 05:53:52 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/gnome-mount-0.4-r5.ebuild,v 1.15 2007/08/02 05:25:01 mr_bones_ Exp $
 
 inherit eutils gnome2
 
@@ -19,10 +19,7 @@ RDEPEND=">=gnome-base/libgnomeui-2.13
 	gnome-base/gnome-keyring
 	>=gnome-base/libglade-2
 	>=gnome-base/gconf-2
-	||  (
-			>=dev-libs/dbus-glib-0.71
-			>=sys-apps/dbus-0.60
-		)"
+	>=dev-libs/dbus-glib-0.71"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	>=dev-util/intltool-0.29"