correct dbus deps (bug #187369)

Package-Manager: portage-2.1.2.9

16 files changed, 47 insertions, 50 deletions

diff --git a/gnome-extra/deskbar-applet/ChangeLog b/gnome-extra/deskbar-applet/ChangeLog
index e61f1a19ef16..2dda426c3ee7 100644
--- a/gnome-extra/deskbar-applet/ChangeLog
+++ b/gnome-extra/deskbar-applet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/deskbar-applet
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.55 2007/07/08 05:45:49 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.56 2007/08/02 05:39:12 mr_bones_ Exp $
+
+  02 Aug 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  deskbar-applet-2.16.2-r1.ebuild, deskbar-applet-2.18.1.ebuild:
+  correct dbus deps (bug #187369)
 
   08 Jul 2007; Michael Sterrett <mr_bones_@gentoo.org>
   deskbar-applet-2.16.2-r1.ebuild, deskbar-applet-2.18.1.ebuild:
diff --git a/gnome-extra/deskbar-applet/deskbar-applet-2.16.2-r1.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.16.2-r1.ebuild
index 41d56a1aba41..b5a187ea8dc5 100644
--- a/gnome-extra/deskbar-applet/deskbar-applet-2.16.2-r1.ebuild
+++ b/gnome-extra/deskbar-applet/deskbar-applet-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-extra/deskbar-applet/deskbar-applet-2.16.2-r1.ebuild,v 1.11 2007/07/08 05:45:49 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.16.2-r1.ebuild,v 1.12 2007/08/02 05:39:12 mr_bones_ Exp $
 
 inherit gnome2 eutils autotools python
 
@@ -17,10 +17,7 @@ RDEPEND=">=dev-lang/python-2.4
 		 >=dev-python/pygtk-2.6
 		 >=dev-python/gnome-python-2.10
 		 >=gnome-base/gnome-desktop-2.10
-		 || (
-				>=dev-python/dbus-python-0.71
-				>=sys-apps/dbus-0.60
-			)
+		 >=dev-python/dbus-python-0.71
 		 >=dev-python/gnome-python-desktop-2.14.0
 		 >=dev-python/gnome-python-extras-2.14
 		 >=gnome-base/gconf-2
diff --git a/gnome-extra/deskbar-applet/deskbar-applet-2.18.1.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.18.1.ebuild
index fc331f3ebc04..efd0fe952e7b 100644
--- a/gnome-extra/deskbar-applet/deskbar-applet-2.18.1.ebuild
+++ b/gnome-extra/deskbar-applet/deskbar-applet-2.18.1.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-extra/deskbar-applet/deskbar-applet-2.18.1.ebuild,v 1.3 2007/07/08 05:45:49 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.18.1.ebuild,v 1.4 2007/08/02 05:39:12 mr_bones_ Exp $
 
 inherit gnome2 eutils autotools python
 
@@ -17,10 +17,7 @@ RDEPEND=">=dev-lang/python-2.4
 		 >=dev-python/pygtk-2.6
 		 >=dev-python/gnome-python-2.10
 		 >=gnome-base/gnome-desktop-2.10
-		 || (
-				>=dev-python/dbus-python-0.71
-				>=sys-apps/dbus-0.60
-			)
+		 >=dev-python/dbus-python-0.71
 		 >=dev-python/gnome-python-desktop-2.14.0
 		 >=dev-python/gnome-python-extras-2.14
 		 >=gnome-base/gconf-2
diff --git a/gnome-extra/hal-device-manager/ChangeLog b/gnome-extra/hal-device-manager/ChangeLog
index c09a9978d545..5f0d8dbe4f50 100644
--- a/gnome-extra/hal-device-manager/ChangeLog
+++ b/gnome-extra/hal-device-manager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/hal-device-manager
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hal-device-manager/ChangeLog,v 1.14 2007/07/08 05:54:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hal-device-manager/ChangeLog,v 1.15 2007/08/02 05:42:20 mr_bones_ Exp $
+
+  02 Aug 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  hal-device-manager-0.5-r1.ebuild:
+  correct dbus deps (bug #187369)
 
   08 Jul 2007; Michael Sterrett <mr_bones_@gentoo.org>
   hal-device-manager-0.5-r1.ebuild:
diff --git a/gnome-extra/hal-device-manager/hal-device-manager-0.5-r1.ebuild b/gnome-extra/hal-device-manager/hal-device-manager-0.5-r1.ebuild
index 05bafc9bcaec..b8bbfbb1e440 100644
--- a/gnome-extra/hal-device-manager/hal-device-manager-0.5-r1.ebuild
+++ b/gnome-extra/hal-device-manager/hal-device-manager-0.5-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-extra/hal-device-manager/hal-device-manager-0.5-r1.ebuild,v 1.6 2007/07/08 05:54:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hal-device-manager/hal-device-manager-0.5-r1.ebuild,v 1.7 2007/08/02 05:42:20 mr_bones_ Exp $
 
 inherit eutils
 
@@ -14,8 +14,7 @@ KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=sys-apps/hal-${PV}-r1
-	|| ( >=dev-python/dbus-python-0.71
-		>=sys-apps/dbus-0.60 )
+	>=dev-python/dbus-python-0.71
 	>=dev-python/gnome-python-2.0.0-r1"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
diff --git a/gnome-extra/nautilus-cd-burner/ChangeLog b/gnome-extra/nautilus-cd-burner/ChangeLog
index 0e019fc477ff..8897c1560003 100644
--- a/gnome-extra/nautilus-cd-burner/ChangeLog
+++ b/gnome-extra/nautilus-cd-burner/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/nautilus-cd-burner
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/ChangeLog,v 1.170 2007/07/25 21:46:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/ChangeLog,v 1.171 2007/08/02 05:44:18 mr_bones_ Exp $
+
+  02 Aug 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  nautilus-cd-burner-2.16.2.ebuild, nautilus-cd-burner-2.16.3.ebuild:
+  correct dbus deps (bug #187369)
 
   25 Jul 2007; Raúl Porcel <armin76@gentoo.org>
   nautilus-cd-burner-2.16.3.ebuild:
diff --git a/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.16.2.ebuild b/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.16.2.ebuild
index 6495e416c9ad..849bc3310624 100644
--- a/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.16.2.ebuild
+++ b/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-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-extra/nautilus-cd-burner/nautilus-cd-burner-2.16.2.ebuild,v 1.11 2007/07/08 05:48:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.16.2.ebuild,v 1.12 2007/08/02 05:44:18 mr_bones_ Exp $
 
 inherit gnome2 eutils
 
@@ -22,10 +22,7 @@ RDEPEND=">=gnome-base/gnome-vfs-2.1.3.1
 	>=gnome-base/gconf-2
 	>=gnome-base/gnome-mount-0.4
 	>=sys-apps/hal-0.5.7
-	||	(
-			>=dev-libs/dbus-glib-0.71
-			>=sys-apps/dbus-0.6.0
-		)
+	>=dev-libs/dbus-glib-0.71
 	cdr? ( virtual/cdrtools )
 	dvdr? ( >=app-cdr/dvd+rw-tools-6.1 )"
 DEPEND="${RDEPEND}
diff --git a/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.16.3.ebuild b/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.16.3.ebuild
index cae2a1c352ed..6fcdbedfbe8d 100644
--- a/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.16.3.ebuild
+++ b/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.16.3.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-extra/nautilus-cd-burner/nautilus-cd-burner-2.16.3.ebuild,v 1.11 2007/07/25 21:46:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.16.3.ebuild,v 1.12 2007/08/02 05:44:18 mr_bones_ Exp $
 
 inherit gnome2 eutils
 
@@ -22,10 +22,7 @@ RDEPEND=">=gnome-base/gnome-vfs-2.1.3.1
 	>=gnome-base/gconf-2
 	>=gnome-base/gnome-mount-0.4
 	>=sys-apps/hal-0.5.7
-	||	(
-			>=dev-libs/dbus-glib-0.71
-			>=sys-apps/dbus-0.6.0
-		)
+	>=dev-libs/dbus-glib-0.71
 	cdr? ( virtual/cdrtools )
 	dvdr? ( >=app-cdr/dvd+rw-tools-6.1 )"
 DEPEND="${RDEPEND}
diff --git a/gnome-extra/nautilus-sendto/ChangeLog b/gnome-extra/nautilus-sendto/ChangeLog
index ba884fcc8bca..e5afcd8273af 100644
--- a/gnome-extra/nautilus-sendto/ChangeLog
+++ b/gnome-extra/nautilus-sendto/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/nautilus-sendto
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/ChangeLog,v 1.16 2007/07/08 05:49:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/ChangeLog,v 1.17 2007/08/02 05:46:10 mr_bones_ Exp $
+
+  02 Aug 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  nautilus-sendto-0.8-r1.ebuild, nautilus-sendto-0.10.ebuild:
+  correct dbus deps (bug #187369)
 
   08 Jul 2007; Michael Sterrett <mr_bones_@gentoo.org>
   nautilus-sendto-0.8-r1.ebuild, nautilus-sendto-0.10.ebuild:
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-0.10.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-0.10.ebuild
index 659217cbb8a4..4aff62f8f9d2 100644
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-0.10.ebuild
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-0.10.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-extra/nautilus-sendto/nautilus-sendto-0.10.ebuild,v 1.4 2007/07/08 05:49:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-0.10.ebuild,v 1.5 2007/08/02 05:46:10 mr_bones_ Exp $
 
 inherit gnome2 eutils autotools
 
@@ -21,10 +21,7 @@ RDEPEND=">=x11-libs/gtk+-2.4
 		 >=gnome-base/libgnomeui-2.13.0
 		 >=gnome-base/nautilus-2.13.3
 		 >=gnome-base/gconf-2.13.0
-		 ||	(
-				>=dev-libs/dbus-glib-0.71
-				>=sys-apps/dbus-0.60
-			)
+		 >=dev-libs/dbus-glib-0.71
 		 bluetooth? ( >=net-wireless/gnome-bluetooth-0.6 )
 		 eds? ( >=gnome-extra/evolution-data-server-1.5.3 )
 		 gaim? ( >=net-im/gaim-1.5.0 )
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-0.8-r1.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-0.8-r1.ebuild
index 5d1f06fda15e..6938b48350d7 100644
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-0.8-r1.ebuild
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-0.8-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-extra/nautilus-sendto/nautilus-sendto-0.8-r1.ebuild,v 1.4 2007/07/08 05:49:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-0.8-r1.ebuild,v 1.5 2007/08/02 05:46:10 mr_bones_ Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -24,10 +24,7 @@ RDEPEND=">=x11-libs/gtk+-2.4
 		 >=gnome-base/libgnomeui-2.13.0
 		 >=gnome-base/nautilus-2.13.3
 		 >=gnome-base/gconf-2.13.0
-		 ||	(
-				>=dev-libs/dbus-glib-0.71
-				>=sys-apps/dbus-0.60
-			)
+		 >=dev-libs/dbus-glib-0.71
 		 bluetooth? ( >=net-wireless/gnome-bluetooth-0.6 )
 		 eds? ( >=gnome-extra/evolution-data-server-1.5.3 )
 		 gaim? ( net-im/gaim )
diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index f099fa23c483..43a8475f3940 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.154 2007/07/25 03:22:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.155 2007/08/02 05:49:28 mr_bones_ Exp $
+
+  02 Aug 2007; Michael Sterrett <mr_bones_@gentoo.org> yelp-2.16.1.ebuild,
+  yelp-2.16.2.ebuild, yelp-2.18.0.ebuild, yelp-2.18.1.ebuild:
+  correct dbus deps (bug #187369)
 
   25 Jul 2007; Michael Sterrett <mr_bones_@gentoo.org> yelp-2.18.0.ebuild,
   yelp-2.18.1.ebuild:
diff --git a/gnome-extra/yelp/yelp-2.16.1.ebuild b/gnome-extra/yelp/yelp-2.16.1.ebuild
index b33a45519421..b67eac359326 100644
--- a/gnome-extra/yelp/yelp-2.16.1.ebuild
+++ b/gnome-extra/yelp/yelp-2.16.1.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-extra/yelp/yelp-2.16.1.ebuild,v 1.11 2007/07/08 05:02:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.16.1.ebuild,v 1.12 2007/08/02 05:49:28 mr_bones_ Exp $
 
 inherit gnome2
 
@@ -23,8 +23,7 @@ RDEPEND=">=gnome-base/gconf-2
 	>=dev-libs/libxslt-1.1.4
 	>=x11-libs/startup-notification-0.8
 	>=dev-libs/glib-2
-	|| ( >=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-0.30 )
+	>=dev-libs/dbus-glib-0.71
 	beagle? ( >=app-misc/beagle-0.2.4 )
 	!sh? ( >=www-client/mozilla-firefox-1.0.2-r1 )
 	sys-libs/zlib
diff --git a/gnome-extra/yelp/yelp-2.16.2.ebuild b/gnome-extra/yelp/yelp-2.16.2.ebuild
index 5dc83d8362c1..44b064eb9aab 100644
--- a/gnome-extra/yelp/yelp-2.16.2.ebuild
+++ b/gnome-extra/yelp/yelp-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-extra/yelp/yelp-2.16.2.ebuild,v 1.13 2007/07/08 05:02:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.16.2.ebuild,v 1.14 2007/08/02 05:49:28 mr_bones_ Exp $
 
 inherit gnome2
 
@@ -23,8 +23,7 @@ RDEPEND=">=gnome-base/gconf-2
 	>=dev-libs/libxslt-1.1.4
 	>=x11-libs/startup-notification-0.8
 	>=dev-libs/glib-2
-	|| ( >=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-0.30 )
+	>=dev-libs/dbus-glib-0.71
 	beagle? ( >=app-misc/beagle-0.2.4 )
 	!sh? ( >=www-client/mozilla-firefox-1.0.2-r1 )
 	sys-libs/zlib
diff --git a/gnome-extra/yelp/yelp-2.18.0.ebuild b/gnome-extra/yelp/yelp-2.18.0.ebuild
index aa439ceffa08..7e7184440eba 100644
--- a/gnome-extra/yelp/yelp-2.18.0.ebuild
+++ b/gnome-extra/yelp/yelp-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-extra/yelp/yelp-2.18.0.ebuild,v 1.3 2007/07/25 03:22:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.18.0.ebuild,v 1.4 2007/08/02 05:49:28 mr_bones_ Exp $
 
 inherit gnome2
 
@@ -23,8 +23,7 @@ RDEPEND=">=gnome-base/gconf-2
 	>=dev-libs/libxslt-1.1.4
 	>=x11-libs/startup-notification-0.8
 	>=dev-libs/glib-2
-	|| ( >=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-0.30 )
+	>=dev-libs/dbus-glib-0.71
 	beagle? ( >=app-misc/beagle-0.2.4 )
 	!xulrunner? ( >=www-client/mozilla-firefox-1.5 )
 	xulrunner? ( net-libs/xulrunner )
diff --git a/gnome-extra/yelp/yelp-2.18.1.ebuild b/gnome-extra/yelp/yelp-2.18.1.ebuild
index 11df56d15fbb..2bc80900ca6e 100644
--- a/gnome-extra/yelp/yelp-2.18.1.ebuild
+++ b/gnome-extra/yelp/yelp-2.18.1.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-extra/yelp/yelp-2.18.1.ebuild,v 1.3 2007/07/25 03:22:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.18.1.ebuild,v 1.4 2007/08/02 05:49:28 mr_bones_ Exp $
 
 inherit gnome2
 
@@ -23,8 +23,7 @@ RDEPEND=">=gnome-base/gconf-2
 	>=dev-libs/libxslt-1.1.4
 	>=x11-libs/startup-notification-0.8
 	>=dev-libs/glib-2
-	|| ( >=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-0.30 )
+	>=dev-libs/dbus-glib-0.71
 	beagle? ( >=app-misc/beagle-0.2.4 )
 	!xulrunner? ( >=www-client/mozilla-firefox-1.5 )
 	xulrunner? ( net-libs/xulrunner )