Try UPower for on_ac_power before DeviceKit-power and HAL wrt #315663.

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

5 files changed, 103 insertions, 26 deletions

diff --git a/sys-power/pm-utils/ChangeLog b/sys-power/pm-utils/ChangeLog
index 0c87feec288c..ad92aa5a4df9 100644
--- a/sys-power/pm-utils/ChangeLog
+++ b/sys-power/pm-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/pm-utils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/ChangeLog,v 1.34 2010/04/07 21:55:11 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/ChangeLog,v 1.35 2010/04/17 11:37:20 ssuominen Exp $
+
+*pm-utils-1.3.0-r2 (17 Apr 2010)
+
+  17 Apr 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +files/1.3.0-on_ac_power-upower.patch, +pm-utils-1.3.0-r2.ebuild:
+  Try UPower for on_ac_power before DeviceKit-power and HAL wrt #315663.
 
   07 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   pm-utils-1.3.0-r1.ebuild:
diff --git a/sys-power/pm-utils/Manifest b/sys-power/pm-utils/Manifest
index 2c6e1b8dfb26..1d7928c564cc 100644
--- a/sys-power/pm-utils/Manifest
+++ b/sys-power/pm-utils/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.3.0-fix_autotools.patch 1965 RMD160 7a05f0c4774531d2cac75f42750eac7ca16774d0 SHA1 e4fa3a0d72f94126f898bef06c9193f8810df49c SHA256 2c6dc817cf72ff6ce5a5d4e56a7fc7ad4f5bc0d8bcaecf4d9a9e04628c2a9ece
+AUX 1.3.0-on_ac_power-upower.patch 2948 RMD160 5ffeff42862ac80eef619bc10391b3d1047ec8cf SHA1 86c7d9dfc59c7ba75e1bcb68f9f1600b34faf656 SHA256 95c776aa43bba1f364e813691294726c9c4ff825454fe2d6c729380b17ab4392
 DIST pm-utils-1.2.5.tar.gz 174592 RMD160 987a795e0cada9aeabcab2053d1de33af2635e7a SHA1 1e413f65d947179a675ab5d1ee1ac4dd06314cb6 SHA256 84cf07c7771ffe91c1b6f3a60c43fc76a44ae8d6c90e47bfdd6b1a7482a0e4ce
 DIST pm-utils-1.2.6.1.tar.gz 183819 RMD160 d47ca38f34d1cf89caee6b55d90670cf7fbc292e SHA1 84e421aaac5a0c98f8f078c2184419b02dd92d68 SHA256 e5ad45930b20931bed9a44678f72fd53ff85f2a0fc694d9ea2c02180431c5e35
 DIST pm-utils-1.3.0.tar.gz 197344 RMD160 52d257a5440bbdafd7d814351b9a59deb36536ba SHA1 30f6c0a7f470d2c2874d3b13046c1883363c06f3 SHA256 586cc4a6d40e5d659d9d634ba9d3cde6268a0543fd7f29026a3069bcd726806e
 EBUILD pm-utils-1.2.5.ebuild 1631 RMD160 5197fae7c6da3c3ecbf0ec5431d94c31d8874f1c SHA1 cf7d15cb07f376503b1a47771b5d467431620bf7 SHA256 6cd03cb334243d6dcaa75fc8e684176842ebabc0d633add68001b9d220b3fa67
 EBUILD pm-utils-1.2.6.1.ebuild 1630 RMD160 7e9c2b3c2ba379e5a8c78c0c0df4c47cfd3c68ca SHA1 69e5e7f9c5127a09484e2c9480851f35c2b88391 SHA256 16ab545ac97e39f82e9fe2950e4a61a15a057a0459071d65b8e47965d19a6617
-EBUILD pm-utils-1.3.0-r1.ebuild 1506 RMD160 39f67230597fc88126a779dd78c13263455eae23 SHA1 55b338401c5c95941e2150fe26cbfef8d3f20b2c SHA256 db8ff6b64a57e4c5498fa206874ce5f4c003557dfa8d088ca79e6bcd2c362674
-MISC ChangeLog 5111 RMD160 5ec0d0bbce2f3ea61c4c1cad95c206f3a1cf139a SHA1 6b680212afdb6fd8984db8f0e206c9fc5df49a74 SHA256 ddbc22c20b0849121095c274094c341680ef5cfbdb6712e999b942ab514374ee
+EBUILD pm-utils-1.3.0-r2.ebuild 1552 RMD160 640d04d6414ab9e6c19dbe6ce8d5b9bef5a046d9 SHA1 643f888ed27013de759b6e17bbc7c3124b82d800 SHA256 c7683ad87d509be8674f8559a7082dd9d0f97377aa4374708f230f9f22c96e63
+MISC ChangeLog 5341 RMD160 b9b18945c838b25561b6e807da21584bd4e2c6c4 SHA1 6678f46ffa5e9fe155fc1bbd14f4633c274e1472 SHA256 df7a1b76fe8f298cd8aa0907f6d0cb99077a125d23f230a91d95621fcbacb091
 MISC metadata.xml 250 RMD160 08588db6e1637c16aa4063e7cbb1f954e55a3445 SHA1 da190958f6305db16f8e39b0acacf4e0547bb7f4 SHA256 558a1eef7dd3a566d55bd1d69a9eb1b0fba9b30a77e181af3011afb99d040ceb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAku8/tgACgkQHB6c3gNBRYd4ZgCfTn76SjJ2uL/H57ql4Drkxgbg
-JeQAoJRPHz+eKmd7IBbZb3Y5is/pqI2E
-=17yG
------END PGP SIGNATURE-----
diff --git a/sys-power/pm-utils/files/1.3.0-on_ac_power-upower.patch b/sys-power/pm-utils/files/1.3.0-on_ac_power-upower.patch
new file mode 100644
index 000000000000..4483ef00749c
--- /dev/null
+++ b/sys-power/pm-utils/files/1.3.0-on_ac_power-upower.patch
@@ -0,0 +1,89 @@
+From e8d0b58a9df080f021d04b4c2d358003974092f3 Mon Sep 17 00:00:00 2001
+From: Michal Schmidt <mschmidt@redhat.com>
+Date: Tue, 23 Feb 2010 13:57:05 +0000
+Subject: on_ac_power: support UPower (new name for DeviceKit-power)
+
+DeviceKit-power got renamed to UPower and its D-Bus interface changed
+accordingly.
+
+Try UPower first in on_ac_power.
+If it fails, try DeviceKit-power.
+It if fails too, try hal.
+
+Also update documentation.
+
+Signed-off-by: Michael Biebl <mbiebl@gmail.com>
+---
+diff --git a/man/pm-action.xml b/man/pm-action.xml
+index ccb4153..6e9f639 100644
+--- a/man/pm-action.xml
++++ b/man/pm-action.xml
+@@ -104,7 +104,7 @@
+       For some options external programs are needed.
+     </para>
+     <para>
+-      These commands will usually be called by <command>DeviceKit-power</command>
++      These commands will usually be called by <command>UPower</command>
+       or <command>hald</command> when triggered to do so by a program
+       in a desktop session such as <command>gnome-power-manager</command>. 
+       Calling them from the command line is also possible, but it is not 
+diff --git a/man/pm-is-supported.xml b/man/pm-is-supported.xml
+index 88bb9fd..d07c87d 100644
+--- a/man/pm-is-supported.xml
++++ b/man/pm-is-supported.xml
+@@ -89,7 +89,7 @@
+     <para>
+       The intended purpose of <command>&dhpackage;</command> is to
+       find out which power management modes are supported by the 
+-      system. hald(8) will call it to do just that. (Note that DeviceKit-power
++      system. hald(8) will call it to do just that. (Note that UPower
+       does not use this.)
+     </para>
+   </refsect1>
+@@ -161,10 +161,6 @@
+     <!-- In alpabetical order. -->
+     <para>
+       <citerefentry>
+-	<refentrytitle>DeviceKit-power</refentrytitle>
+-	<manvolnum>7</manvolnum>
+-      </citerefentry>,
+-      <citerefentry>
+ 	<refentrytitle>hald</refentrytitle>
+ 	<manvolnum>8</manvolnum>
+       </citerefentry>,
+@@ -175,6 +171,10 @@
+       <citerefentry>
+ 	<refentrytitle>s2both</refentrytitle>
+ 	<manvolnum>8</manvolnum>
++      </citerefentry>,
++      <citerefentry>
++	<refentrytitle>UPower</refentrytitle>
++	<manvolnum>7</manvolnum>
+       </citerefentry>
+     </para>
+   </refsect1>
+diff --git a/src/on_ac_power b/src/on_ac_power
+index fdbcb36..1f9c59e 100755
+--- a/src/on_ac_power
++++ b/src/on_ac_power
+@@ -30,7 +30,17 @@
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ #
+ 
+-# prefer DeviceKit-power if available
++# prefer UPower if available
++if s="$(dbus-send --system --print-reply \
++    --dest=org.freedesktop.UPower \
++    /org/freedesktop/UPower \
++    org.freedesktop.DBus.Properties.Get \
++    string:org.freedesktop.UPower string:OnBattery)"; then
++    echo "$s" | grep -q 'boolean false'
++    exit $?
++fi
++
++# try its old name 'DeviceKit-power' too
+ if s="$(dbus-send --system --print-reply \
+     --dest=org.freedesktop.DeviceKit.Power \
+     /org/freedesktop/DeviceKit/Power \
+--
+cgit v0.8.3-6-g21f6
diff --git a/sys-power/pm-utils/pm-utils-1.3.0-r1.ebuild b/sys-power/pm-utils/pm-utils-1.3.0-r2.ebuild
index b9079e4e4ecf..cc39c6a403c8 100644
--- a/sys-power/pm-utils/pm-utils-1.3.0-r1.ebuild
+++ b/sys-power/pm-utils/pm-utils-1.3.0-r2.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/sys-power/pm-utils/pm-utils-1.3.0-r1.ebuild,v 1.2 2010/04/07 21:55:11 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/pm-utils-1.3.0-r2.ebuild,v 1.1 2010/04/17 11:37:20 ssuominen Exp $
 
 EAPI="2"
 
@@ -32,6 +32,7 @@ DEPEND="doc? ( app-text/xmlto )"
 
 PATCHES=(
 	"${FILESDIR}/${PV}-fix_autotools.patch"
+	"${FILESDIR}/${PV}-on_ac_power-upower.patch"
 )
 
 src_prepare() {
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index 524a3fdbff62..b1dcd1e3a412 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST upower-0.9.2.tar.bz2 467544 RMD160 2ae3639c42e292fd2f879f0748f32614eb3691e0 SHA1 7f6daa167eee3a2e1d74322c15c5b2f93213563e SHA256 4a0532fbda7afee29984f7b96b3b3114c68b0525278beb10c98ef287ca5a8377
-EBUILD upower-0.9.2.ebuild 1869 RMD160 17fdd0c8542384d8410b5103916f2d4a91cb7414 SHA1 576ee2b5e878c4231d2bb635ce2031c3144426cd SHA256 c26a6d76d22a588dd74723613cb049a77721b16f45e5b0b25c72f26e62e40d49
-MISC ChangeLog 503 RMD160 768b2878ec05fe81a385396a547697033b71e17c SHA1 6e025bc9c257aaa5ac53262b5fc9116b33d2ae17 SHA256 98cdd059d2434553e140972f5bde96ad343dcf7bcf2f975ce306d47475228c5e
+EBUILD upower-0.9.2.ebuild 1873 RMD160 1c6151a846ac93b99e2de51fa55388717fd5f2a2 SHA1 9005db39fd9ceea5c2bdcc1a0e727dc0e677897f SHA256 ef4cba6a3512c33b3e01d8c25232b4f5c81e42e0974b4cf024211858a82c8997
+MISC ChangeLog 653 RMD160 9e556cf3043eb8beb170d01fe37b4ec605eab25e SHA1 4d4729d14406dbe5c8f946c4ea34b3625cee55af SHA256 a9563c2edee9d7f047d7205b6a49ad1cd350841c78eaa73d3f3ab6934a477589
 MISC metadata.xml 244 RMD160 244bfcdb5c3c5eab051189d8adf5e572866b8c64 SHA1 580ce8a447f3237ea98b1d289b440bc89245e89b SHA256 552982cb042dce6d0051aef928f3cca7553e6d7327e0556f97f9e6e52e651b6c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvElNAACgkQvFcC4BYPU0qwYwCdEfTi3D/x/1OW490Y3DTEKRye
-tnYAni1znoqTPhEOXIb22mvj/NxaMwoA
-=KxLd
------END PGP SIGNATURE-----