Update D-Bus dependancy to use new D-Bus bindings.

(Portage version: 2.1.2_rc1-r3)

6 files changed, 22 insertions, 11 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index 35d8fead2202..829bc37bbf88 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/epiphany
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.89 2006/11/06 20:26:36 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.90 2006/11/07 01:06:47 cardoe Exp $
+
+  07 Nov 2006; Doug Goldstein <cardoe@gentoo.org>
+  epiphany-1.8.4.1-r1.ebuild, epiphany-2.14.2.1-r1.ebuild,
+  epiphany-2.14.3.ebuild, epiphany-2.16.0.ebuild, epiphany-2.16.1.ebuild:
+  Update D-Bus dependancy to use new D-Bus bindings.
 
   06 Nov 2006; Daniel Gryniewicz <dang@gentoo.org>
   epiphany-2.14.2.1-r1.ebuild, epiphany-2.14.3.ebuild:
diff --git a/www-client/epiphany/epiphany-1.8.4.1-r1.ebuild b/www-client/epiphany/epiphany-1.8.4.1-r1.ebuild
index ac954b3bf72e..a640734122b3 100644
--- a/www-client/epiphany/epiphany-1.8.4.1-r1.ebuild
+++ b/www-client/epiphany/epiphany-1.8.4.1-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/www-client/epiphany/epiphany-1.8.4.1-r1.ebuild,v 1.3 2006/07/04 13:14:40 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.8.4.1-r1.ebuild,v 1.4 2006/11/07 01:06:47 cardoe Exp $
 
 inherit eutils gnome2 autotools
 
@@ -38,7 +38,9 @@ RDEPEND=">=dev-libs/glib-2.8
 		!firefox? ( www-client/seamonkey )
 		) )
 	firefox? ( >=www-client/mozilla-firefox-1.0.5 )
-	dbus? ( >=sys-apps/dbus-0.34 )
+	dbus? ( || ( >=dev-libs/dbus-glib-0.71 
+				( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.34 ) )
+		)
 	python? (
 		>=dev-lang/python-2.3
 		>=dev-python/pygtk-2.7.1
diff --git a/www-client/epiphany/epiphany-2.14.2.1-r1.ebuild b/www-client/epiphany/epiphany-2.14.2.1-r1.ebuild
index 551b60539cac..916697159a9e 100644
--- a/www-client/epiphany/epiphany-2.14.2.1-r1.ebuild
+++ b/www-client/epiphany/epiphany-2.14.2.1-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/www-client/epiphany/epiphany-2.14.2.1-r1.ebuild,v 1.10 2006/11/06 20:26:36 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.14.2.1-r1.ebuild,v 1.11 2006/11/07 01:06:47 cardoe Exp $
 
 inherit eutils gnome2 multilib autotools
 
@@ -40,7 +40,8 @@ RDEPEND=">=dev-libs/glib-2.8
 		!firefox? ( www-client/seamonkey )
 		) )
 	firefox? ( =www-client/mozilla-firefox-1* )
-	>=sys-apps/dbus-0.35
+	|| ( >=dev-libs/dbus-glib-0.71
+		( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 ) )
 	python? (
 		>=dev-lang/python-2.3
 		>=dev-python/pygtk-2.7.1
diff --git a/www-client/epiphany/epiphany-2.14.3.ebuild b/www-client/epiphany/epiphany-2.14.3.ebuild
index f071ea577baf..ddf90f43637d 100644
--- a/www-client/epiphany/epiphany-2.14.3.ebuild
+++ b/www-client/epiphany/epiphany-2.14.3.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/www-client/epiphany/epiphany-2.14.3.ebuild,v 1.3 2006/11/06 20:26:36 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.14.3.ebuild,v 1.4 2006/11/07 01:06:47 cardoe Exp $
 
 inherit eutils gnome2 multilib autotools
 
@@ -40,7 +40,8 @@ RDEPEND=">=dev-libs/glib-2.8
 		!firefox? ( www-client/seamonkey )
 		) )
 	firefox? ( =www-client/mozilla-firefox-1* )
-	>=sys-apps/dbus-0.35
+	|| ( >=dev-libs/dbus-glib-0.71
+		( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 ) )
 	python? (
 		>=dev-lang/python-2.3
 		>=dev-python/pygtk-2.7.1
diff --git a/www-client/epiphany/epiphany-2.16.0.ebuild b/www-client/epiphany/epiphany-2.16.0.ebuild
index 9b2187d4a031..080f26ed68e5 100644
--- a/www-client/epiphany/epiphany-2.16.0.ebuild
+++ b/www-client/epiphany/epiphany-2.16.0.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/www-client/epiphany/epiphany-2.16.0.ebuild,v 1.4 2006/10/08 18:08:43 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.16.0.ebuild,v 1.5 2006/11/07 01:06:48 cardoe Exp $
 
 inherit eutils gnome2 multilib autotools
 
@@ -25,7 +25,8 @@ RDEPEND=">=dev-libs/glib-2.12
 	>=gnome-base/gconf-2
 	>=app-text/iso-codes-0.35
 	>=www-client/mozilla-firefox-1.5
-	>=sys-apps/dbus-0.35
+	|| ( >=dev-libs/dbus-glib-0.71
+		( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 ) )
 	python? (
 		>=dev-lang/python-2.3
 		>=dev-python/pygtk-2.7.1
diff --git a/www-client/epiphany/epiphany-2.16.1.ebuild b/www-client/epiphany/epiphany-2.16.1.ebuild
index 1b7c16ad6b82..3393fc1608a0 100644
--- a/www-client/epiphany/epiphany-2.16.1.ebuild
+++ b/www-client/epiphany/epiphany-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/www-client/epiphany/epiphany-2.16.1.ebuild,v 1.1 2006/10/13 12:47:05 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.16.1.ebuild,v 1.2 2006/11/07 01:06:47 cardoe Exp $
 
 inherit eutils gnome2 multilib autotools
 
@@ -25,7 +25,8 @@ RDEPEND=">=dev-libs/glib-2.12
 	>=gnome-base/gconf-2
 	>=app-text/iso-codes-0.35
 	>=www-client/mozilla-firefox-1.5
-	>=sys-apps/dbus-0.35
+	|| ( >=dev-libs/dbus-glib-0.71
+		( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 ) )
 	python? (
 		>=dev-lang/python-2.3
 		>=dev-python/pygtk-2.7.1