Fix dependencies for dbus 1.0

Package-Manager: portage-2.1.2_rc1-r7

diff --git a/gnome-extra/gnome-power-manager/ChangeLog b/gnome-extra/gnome-power-manager/ChangeLog
index a76fbd9d0f1074a2fcc41596692a72f631b516c3..ab25d2f18981ae40ff32534f826e395ae4786a23 100644 (file)
--- 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/Manifest b/gnome-extra/gnome-power-manager/Manifest
index 52fb2b70951cb1fd1ae75fbcb8a62c780c720a26..b4be4449c07d2f700ee14e5c77cf32ed8424902a 100644 (file)
--- a/gnome-extra/gnome-power-manager/Manifest
+++ b/gnome-extra/gnome-power-manager/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST gnome-power-manager-2.14.3.tar.gz 953547 RMD160 25c8ebaac33529e4b15faf877da60975d2a0853f SHA1 3eccde6f49c5c66a9d4a81812f33e44e24d88f60 SHA256 adddb071871ee02b506576b151f9d2515ce77bfbc1366666b4e5842404c78324
 DIST gnome-power-manager-2.16.1.tar.gz 2357084 RMD160 565370c5ecc4673def863dbbe048714e4673ca16 SHA1 45e5ad94e10b4abd04332d1bff15741b69c075ea SHA256 6c66379f94b8560520a3e19f363810c91a6105059af0b8ffcac4387400ed4c39
 DIST gnome-power-manager-2.16.2.tar.gz 2389790 RMD160 a926525d92fa97f46166cadbad9175685b597718 SHA1 13f1d6f8fc7dafab3fba7cb54dc6cd9fafead8a2 SHA256 8b9c27386f516f9ea2f31e42163e1e52040e07d610d769ece2274455b0a9e28e
@@ -12,18 +9,18 @@ EBUILD gnome-power-manager-2.14.3.ebuild 1136 RMD160 9a48a6d05ab8c32878e3e991448
 MD5 3fe220b223993124ef82ef91f357b9b2 gnome-power-manager-2.14.3.ebuild 1136
 RMD160 9a48a6d05ab8c32878e3e9914481e777d83b6549 gnome-power-manager-2.14.3.ebuild 1136
 SHA256 65da5b62d5b9a91be8e1619faa7c5bc36f6d59f52b103e039e9e7acd2c19c1ab gnome-power-manager-2.14.3.ebuild 1136
-EBUILD gnome-power-manager-2.16.1-r1.ebuild 1453 RMD160 0065d55e667e6e72a8bea57ac84a5bfc5b7ac60b SHA1 4c119745ac7b9031b00493312869cf2bd7658ebb SHA256 373c174bdb10c920ad0e94616c3e11a7170e1a783d07ac4c12c2524da4a53898
-MD5 245db7fa060ce6d288860529133e16d6 gnome-power-manager-2.16.1-r1.ebuild 1453
-RMD160 0065d55e667e6e72a8bea57ac84a5bfc5b7ac60b gnome-power-manager-2.16.1-r1.ebuild 1453
-SHA256 373c174bdb10c920ad0e94616c3e11a7170e1a783d07ac4c12c2524da4a53898 gnome-power-manager-2.16.1-r1.ebuild 1453
-EBUILD gnome-power-manager-2.16.2.ebuild 1479 RMD160 954b05e0dfeecdb87f548c75787f11f01829e68e SHA1 346f891abea45be812edc6ba663623bb8a17fff9 SHA256 f68ffd7593a6340ffb6540dc69359fd6aace283579530ace8bc818a7ff84c988
-MD5 7975104e7182d7e9aecf6797b6465a2e gnome-power-manager-2.16.2.ebuild 1479
-RMD160 954b05e0dfeecdb87f548c75787f11f01829e68e gnome-power-manager-2.16.2.ebuild 1479
-SHA256 f68ffd7593a6340ffb6540dc69359fd6aace283579530ace8bc818a7ff84c988 gnome-power-manager-2.16.2.ebuild 1479
-MISC ChangeLog 4136 RMD160 578c699fe3922f1a25b505050c5d180e3134328d SHA1 4d0273c7833d3de6278ff61c94d39e2ac07add41 SHA256 d764b9e68c18a560b0190bbf3eda63cadbb04eba01b50e6c059ceb2f4d59354b
-MD5 f2c6476847a5a7a8ecda42e8eb01e03c ChangeLog 4136
-RMD160 578c699fe3922f1a25b505050c5d180e3134328d ChangeLog 4136
-SHA256 d764b9e68c18a560b0190bbf3eda63cadbb04eba01b50e6c059ceb2f4d59354b ChangeLog 4136
+EBUILD gnome-power-manager-2.16.1-r1.ebuild 1531 RMD160 697a8f69597e1a5f359f8c42809ae23778e82f17 SHA1 39ca9ad6f76355e47e4706adef03a4f9af0b7791 SHA256 b65a4e11c9a93095157eea1c89e256906ace7e5d6a84d5c18a38e8e617caecb5
+MD5 47bb1c6bcaff3f13682df3a731a4d11c gnome-power-manager-2.16.1-r1.ebuild 1531
+RMD160 697a8f69597e1a5f359f8c42809ae23778e82f17 gnome-power-manager-2.16.1-r1.ebuild 1531
+SHA256 b65a4e11c9a93095157eea1c89e256906ace7e5d6a84d5c18a38e8e617caecb5 gnome-power-manager-2.16.1-r1.ebuild 1531
+EBUILD gnome-power-manager-2.16.2.ebuild 1556 RMD160 7f66bcd523f500575d2b768d32ddc9e976967b7a SHA1 4f06a77114ef287c4a1a07e5e5171cc429349cb1 SHA256 c3e5375d59279c1d374a6798ece45c4f31d586c1d9768ad75828f07fe48c4c9b
+MD5 bb06bdccdebf2655222b004ca995ccc2 gnome-power-manager-2.16.2.ebuild 1556
+RMD160 7f66bcd523f500575d2b768d32ddc9e976967b7a gnome-power-manager-2.16.2.ebuild 1556
+SHA256 c3e5375d59279c1d374a6798ece45c4f31d586c1d9768ad75828f07fe48c4c9b gnome-power-manager-2.16.2.ebuild 1556
+MISC ChangeLog 4296 RMD160 f47402f0cfd7aa0c7877de1e5ce7b013ed6cfc7f SHA1 a99b4adac005124c8550af0038dfbd1e7d0d3e83 SHA256 315bcf60e380c3e3c07906cb4690855f1868cd74bd64f0fa664c36be18e56c5c
+MD5 568f18334cfb902ba5599b62846d79a7 ChangeLog 4296
+RMD160 f47402f0cfd7aa0c7877de1e5ce7b013ed6cfc7f ChangeLog 4296
+SHA256 315bcf60e380c3e3c07906cb4690855f1868cd74bd64f0fa664c36be18e56c5c ChangeLog 4296
 MISC metadata.xml 328 RMD160 e83b5cef91422ece7e4991cc9f9422220d36b775 SHA1 c25df9c021e54eaf6c9add8db1c9954ac710b95e SHA256 2507b21284e65f9e7f5608d9865921192d0d6cdf46a35a705b0b2cb220583794
 MD5 a3d3afe281a135c24beb634426857a1d metadata.xml 328
 RMD160 e83b5cef91422ece7e4991cc9f9422220d36b775 metadata.xml 328
@@ -40,10 +37,3 @@ SHA256 355b57fac4c30f7a700b485ecaebf1310f6bf631b6c720d58fc823eb689a78ad files/di
 MD5 e5c5d04823f614cda5bdc08d2a1f572b files/digest-gnome-power-manager-2.16.2 283
 RMD160 430868e75f07726eb2c2263aac4d9da0ea9c3eff files/digest-gnome-power-manager-2.16.2 283
 SHA256 926ab8a257da1f380e906cfa84ffbe694781cf24847961d9af134a6b810bc2b8 files/digest-gnome-power-manager-2.16.2 283
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFUr93keYb6olFHJcRAovEAJ4hAm3lOCIVX+2ZLwXUNNCTJgIPDQCgjOEw
-fX9BAY0jddQc5Qh9wWqWEfo=
-=dEyu
------END PGP SIGNATURE-----

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 df5661939450a6e45478247729c8d9669df206bd..763f260dee879da3ac691fe624874c3294664a65 100644 (file)
--- 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 db2c46c8c6c7bfbe551f5757f776b07443e3b8db..3216aca7ede2c1cdb7ce8568c8f123a02e34cf6b 100644 (file)
--- 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"