Fix dependencies for dbus 1.0

(Portage version: 2.1.2_rc1-r7)

3 files changed, 26 insertions, 16 deletions

diff --git a/gnome-extra/gnome-power-manager/ChangeLog b/gnome-extra/gnome-power-manager/ChangeLog
index a76fbd9d0f10..ab25d2f18981 100644
--- a/gnome-extra/gnome-power-manager/ChangeLog
+++ b/gnome-extra/gnome-power-manager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gnome-power-manager
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.23 2006/11/09 05:41:00 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.24 2006/11/17 09:49:42 compnerd Exp $
+
+  17 Nov 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  gnome-power-manager-2.16.1-r1.ebuild, gnome-power-manager-2.16.2.ebuild:
+  Fix deps for dbus 1.0
 
   09 Nov 2006; Mart Raudsepp <leio@gentoo.org>
   gnome-power-manager-2.16.2.ebuild:
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.16.1-r1.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.16.1-r1.ebuild
index df5661939450..763f260dee87 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.16.1-r1.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-2.16.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/gnome-extra/gnome-power-manager/gnome-power-manager-2.16.1-r1.ebuild,v 1.4 2006/11/07 20:46:17 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.16.1-r1.ebuild,v 1.5 2006/11/17 09:49:42 compnerd Exp $
 
 GNOME_TARBALL_SUFFIX="gz"
 
@@ -18,16 +18,19 @@ RDEPEND=">=dev-libs/glib-2.6.0
 		 >=x11-libs/gtk+-2.6.0
 		 >=gnome-base/libgnome-2.14.0
 		 >=gnome-base/libgnomeui-2.10.0
-		 >=sys-apps/dbus-0.61
 		 >=sys-apps/hal-0.5.7-r1
 		 >=gnome-base/libglade-2.5.0
 		 >=x11-libs/libwnck-2.10.0
 		 >=x11-libs/cairo-1.0.0
 		 >=gnome-base/gconf-2
-		x11-libs/libX11
-		x11-libs/libXext
+		 x11-libs/libX11
+		 x11-libs/libXext
+		 || (
+				>=dev-libs/dbus-glib-0.71
+				( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.61 )
+			)
 		 libnotify? (
-		 				>=x11-libs/libnotify-0.3
+						>=x11-libs/libnotify-0.3
 						>=x11-misc/notification-daemon-0.2.1
 					)"
 DEPEND="${RDEPEND}
@@ -35,10 +38,10 @@ DEPEND="${RDEPEND}
 		dev-util/pkgconfig
 		>=dev-util/intltool-0.35
 		doc? (
-			app-text/xmlto
-			app-text/gnome-doc-utils
-			app-text/docbook-sgml-utils
-		)"
+				app-text/xmlto
+				app-text/gnome-doc-utils
+				app-text/docbook-sgml-utils
+			 )"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.16.2.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.16.2.ebuild
index db2c46c8c6c7..3216aca7ede2 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.16.2.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-2.16.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-extra/gnome-power-manager/gnome-power-manager-2.16.2.ebuild,v 1.2 2006/11/09 05:41:00 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.16.2.ebuild,v 1.3 2006/11/17 09:49:42 compnerd Exp $
 
 GNOME_TARBALL_SUFFIX="gz"
 
@@ -18,7 +18,6 @@ RDEPEND=">=dev-libs/glib-2.6.0
 		 >=x11-libs/gtk+-2.10.0
 		 >=gnome-base/libgnome-2.14.0
 		 >=gnome-base/libgnomeui-2.10.0
-		 >=sys-apps/dbus-0.61
 		 >=sys-apps/hal-0.5.7-r1
 		 >=gnome-base/libglade-2.5.0
 		 >=x11-libs/libwnck-2.10.0
@@ -26,6 +25,10 @@ RDEPEND=">=dev-libs/glib-2.6.0
 		 >=gnome-base/gconf-2
 		 x11-libs/libX11
 		 x11-libs/libXext
+		 || (
+				>=dev-libs/dbus-glib-0.71
+				( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.61 )
+			)
 		 libnotify? (
 						>=x11-libs/libnotify-0.4.3
 						>=x11-misc/notification-daemon-0.2.1
@@ -35,10 +38,10 @@ DEPEND="${RDEPEND}
 		dev-util/pkgconfig
 		>=dev-util/intltool-0.35
 		doc? (
-			app-text/xmlto
-			app-text/gnome-doc-utils
-			app-text/docbook-sgml-utils
-		)"
+				app-text/xmlto
+				app-text/gnome-doc-utils
+				app-text/docbook-sgml-utils
+			 )"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"