Fix dependencies from HAL to udisks/upower.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/xfce-extra/xfce4-power-manager/ChangeLog b/xfce-extra/xfce4-power-manager/ChangeLog
index 591a72ee3f53fca09eafa7033f9560e86ad1e9d9..bb6021197d62713d525b63a00a9bee60ac163174 100644 (file)
--- a/xfce-extra/xfce4-power-manager/ChangeLog
+++ b/xfce-extra/xfce4-power-manager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-extra/xfce4-power-manager
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/ChangeLog,v 1.17 2010/02/22 18:42:06 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/ChangeLog,v 1.18 2010/04/07 14:25:21 ssuominen Exp $
+
+  07 Apr 2010; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-power-manager-0.9.90.ebuild:
+  Fix dependencies from HAL to udisks/upower.
 
   22 Feb 2010; Christian Faulhammer <fauli@gentoo.org>
   xfce4-power-manager-0.8.4.2.ebuild:

diff --git a/xfce-extra/xfce4-power-manager/Manifest b/xfce-extra/xfce4-power-manager/Manifest
index 8fc52b6406baa8ecf78ceb37205940a52f7f67b0..f484992349ce4789046ba2d5cece878c7987a9e5 100644 (file)
--- a/xfce-extra/xfce4-power-manager/Manifest
+++ b/xfce-extra/xfce4-power-manager/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST xfce4-power-manager-0.8.4.2.tar.bz2 691980 RMD160 b3e60ab0078177bd6671d7833ef92aa5c4daa442 SHA1 51cb5d36aa045f5aeb35098a1fb91760010c4781 SHA256 16cc04bf613ecfbc9ea43514ccb5f7d7923b7fc4ebf8117c0ce32fa1422334e1
 DIST xfce4-power-manager-0.9.90.tar.bz2 987390 RMD160 5b7a4db9f663d5d0ed4c8ddf7d095bb7164ec42d SHA1 d9f8918a8e838be814f9a0f5d46c9f4f0082a1da SHA256 67ecb46d66bed87863acf7c59f93d395d5b68c2909909c51d48769b20db50535
 EBUILD xfce4-power-manager-0.8.4.2.ebuild 1204 RMD160 19677c5896699df88e7a6edf02fbb68a72b8d8de SHA1 44c536454677d7c655361d8e86b68fcfcfd96557 SHA256 0634220b9c8b60636b63c602025e8f897cc81bac413b3a7508aa21d8e5df9846
-EBUILD xfce4-power-manager-0.9.90.ebuild 1428 RMD160 722421403986000b1c6f1307237e52ea96c2601b SHA1 60314951e18e0e0070fdcbeb8529962c25e494fe SHA256 8552ce3aa3785d565cf9b8784bdec084b5d5a56ecb83f4e4a28f45965fc44fb6
-MISC ChangeLog 3186 RMD160 d6c2f70a90bea1e0c39f34c13895c6f566d50b6f SHA1 6a76b23b38be51bea7eb626e5a60f584a137d5e3 SHA256 afc34ca51b120ee582621472304959ad365e9e98ce94b4adba2ae136d167b615
+EBUILD xfce4-power-manager-0.9.90.ebuild 1422 RMD160 5683899dabb197e96c94e9487fddf20b026ab0cb SHA1 163264a65721272dfe525e34455a3792355720d0 SHA256 6f957e5ccd6e0ff93a64dc71d31e93686147a4c8e3ed8c0e4523c409943b1c52
+MISC ChangeLog 3328 RMD160 85bda6dab5aa9a0b3ba5b1630ee19a4e242c471b SHA1 a73bdfea25bb18a50fc1ddda6bcc2771feaa5476 SHA256 4797e400c9b5b2a63e04724fe3f7e808ee162a86d5fa70c3c81de8c53220a869
 MISC metadata.xml 228 RMD160 03b1d3fb0f080d0357fc5c9489fd014ded5a0cee SHA1 84d45786e3004ac9d6c7718764e6aa838854e42d SHA256 aab849d07f4e267c08f7352f77a3eed71024e109e09fe1b8300da6a5539995a6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuC0AQACgkQNQqtfCuFneMnZgCePJ+iHRU2o0XAldCmp8rmTmBb
-Nx4AnArMbdj2kAFXGsVjkNQkvZb29Ujo
-=iheP
------END PGP SIGNATURE-----

diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-0.9.90.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-0.9.90.ebuild
index 50c99f2f74f8eb55bcafe6cdc56bb63a8c540f28..5e04ee2b5c36f040432959907cac86caaa14f2c1 100644 (file)
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-0.9.90.ebuild
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-0.9.90.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/xfce4-power-manager-0.9.90.ebuild,v 1.1 2010/02/20 13:10:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/xfce4-power-manager-0.9.90.ebuild,v 1.2 2010/04/07 14:25:21 ssuominen Exp $
 
 EAPI=2
 inherit xfconf
@@ -12,7 +12,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/0.9/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug doc hal networkmanager +plugins policykit"
+IUSE="debug doc networkmanager +plugins policykit"
 
 COMMON_DEPEND=">=x11-libs/gtk+-2.18:2
        >=dev-libs/glib-2.16:2
@@ -24,7 +24,8 @@ COMMON_DEPEND=">=x11-libs/gtk+-2.18:2
        >=x11-libs/libXrandr-1.2
        x11-libs/libX11
        x11-libs/libXext
-       hal? ( >=sys-apps/hal-0.5.6 )
+       sys-fs/udisks
+       sys-power/upower
        plugins? ( >=xfce-base/xfce4-panel-4.6 )
        policykit? ( >=sys-auth/polkit-0.91 )"
 RDEPEND="${COMMON_DEPEND}
@@ -39,7 +40,7 @@ DEPEND="${COMMON_DEPEND}
 pkg_setup() {
        XFCONF="--disable-dependency-tracking
                $(use_enable policykit polkit)
-               $(use_enable hal)
+               --disable-hal
                --enable-dpms
                $(use_enable networkmanager network-manager)
                $(use_enable plugins panel-plugins)