The ACPI battery test must not be fatal if kernel sources are not present to validate...

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

diff --git a/sys-apps/devicekit-power/ChangeLog b/sys-apps/devicekit-power/ChangeLog
index 722c065e29a49fc6480f8f6b2a2dfcd9d7e4b7a9..39cce5d2809d52c8aee62597d542d90e367a075e 100644 (file)
--- a/sys-apps/devicekit-power/ChangeLog
+++ b/sys-apps/devicekit-power/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/devicekit-power
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/devicekit-power/ChangeLog,v 1.11 2010/06/04 21:03:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/devicekit-power/ChangeLog,v 1.12 2010/06/17 23:44:36 robbat2 Exp $
+
+  17 Jun 2010; Robin H. Johnson <robbat2@gentoo.org>
+  devicekit-power-014.ebuild:
+  The ACPI battery test must not be fatal if kernel sources are not present
+  to validate the option.
 
   04 Jun 2010; Markus Meier <maekke@gentoo.org> devicekit-power-014.ebuild:
   x86 stable, bug #314899

diff --git a/sys-apps/devicekit-power/Manifest b/sys-apps/devicekit-power/Manifest
index 73a3f62880ca5fabcd8e2636f1c41cb697b9de12..b5ea609c27ade45cbeb3bfb416c410fb3a4f60ef 100644 (file)
--- a/sys-apps/devicekit-power/Manifest
+++ b/sys-apps/devicekit-power/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX devicekit-power-007-maintainer-cflags.patch 1286 RMD160 4d9f55caa936969ffe5df1dfdc6dfd00639322d4 SHA1 95dedce5b49dfcb06c935c0dcf5f1c8b23670534 SHA256 a87bdb4703e1c238949d951b1c7fbfedfce95af66ea9334bbaeb21a5e06d274c
 AUX devicekit-power-009-build-gcc-4.1.2.patch 392 RMD160 1dd85f5341aca85372e3f2e77e73b8381c5c56c9 SHA1 decbd6d042a5439e399166ebaebd58aacb076908 SHA256 f1613aece0da2af8d5ad8a67493bab8030f418ccf51f655617c0e21254f891e0
 DIST DeviceKit-power-009.tar.gz 496455 RMD160 46eabd609d3dc706a7651b4d34b5b6f4d3107738 SHA1 93f1d276d530107d4f49aa035cc03175b7f32ffa SHA256 438ac7f22533e04f5b44e0cf23d8b51a5cb69906ea2bbdef0581dc3c7cf19e55
 DIST DeviceKit-power-014.tar.gz 545297 RMD160 53334ef8771b229ab6a0e7a3dcfddb65322c3701 SHA1 564dbf627138c6bcf7e18a9fbaa08ab04bc098fe SHA256 ad3e9a8bd9525d66fadc7fa53ef99e0632aa8cca8fd5bc27483956261153b373
 EBUILD devicekit-power-009.ebuild 1680 RMD160 808eda2c2a6f352639d457e56ffb1ad3c0287193 SHA1 446c03d1e2bff2ca7a75c2fab3ec8fddbcc692e0 SHA256 2fcd96d385b8be049c53c2b9982ff151616c0050c5ab14e7980abc4a976035ea
-EBUILD devicekit-power-014.ebuild 1947 RMD160 9e109e8c0cf990163d5f4d7806108971e2fd24be SHA1 07c14ffb6bb1a184c18c92c0b92fefd75070facb SHA256 22cc00dafa648c190f8730b8e122162e749d6e5d7ef896f70d314141767dbcc2
-MISC ChangeLog 2575 RMD160 06a151559e7df2be214dcd9693b637c87098c33f SHA1 1250a9eb28a1226fb0c78bc71d86aba8f5675880 SHA256 b7971100bf026813b228ae2b844e0e33888aa9e51a6e31ea7b65c3e15e4505db
+EBUILD devicekit-power-014.ebuild 1949 RMD160 49c7dff2cab9b4e78922458404a792828f766c1f SHA1 ccdd57883cb6e196474c197725a6c5207e380580 SHA256 69a21ffb7a0f59d8aedca02926027cee2dab730778231cf2f86995635bc5b158
+MISC ChangeLog 2762 RMD160 cb8c176a407d9913c1fde9d7f35ded7b8aa35971 SHA1 6d08ab851279cec5c1ea7b60c646b92000ab6315 SHA256 443ced634bf3fa923927c98f48310c598eda402d57b4dbf66a7713d44f5c3cfa
 MISC metadata.xml 164 RMD160 7d567afe05ca87a772eedf19f5b1fd1e2a9798a7 SHA1 e7b1ab05868d9feb1fa1677c052836fd7dd6a171 SHA256 66cdaff449660e99dfaee8d19b47413fc8ced6d5a1eccd3c842a48e9d9668d48
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwJadQACgkQkKaRLQcq0GKH9QCfYGsyNIfjrPcEtV+xBEj8ZocL
-ojYAoKP++GtCyCQfLtHy2kLSFSYgI0Yb
-=zk26
------END PGP SIGNATURE-----

diff --git a/sys-apps/devicekit-power/devicekit-power-014.ebuild b/sys-apps/devicekit-power/devicekit-power-014.ebuild
index bafd2455010f42a2d2d344a1144c65fab3e08f69..5f8ad32325a89c8fe5621a19938bd8680bfbad07 100644 (file)
--- a/sys-apps/devicekit-power/devicekit-power-014.ebuild
+++ b/sys-apps/devicekit-power/devicekit-power-014.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-apps/devicekit-power/devicekit-power-014.ebuild,v 1.5 2010/06/04 21:03:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/devicekit-power/devicekit-power-014.ebuild,v 1.6 2010/06/17 23:44:36 robbat2 Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -44,7 +44,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 function check_battery() {
        # check sysfs power interface, bug #263959
-       local CONFIG_CHECK="ACPI_SYSFS_POWER"
+       local CONFIG_CHECK="~ACPI_SYSFS_POWER"
        check_extra_config
 }