Fix bug #398823. Thanks to nvinson for the report and patch.

Package-Manager: portage-2.1.10.41/cvs/Linux i686

4 files changed, 29 insertions, 10 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 46d9480b8c21..071403b814bb 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/conky
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.169 2011/11/16 19:50:34 billie Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.170 2012/01/16 20:04:45 billie Exp $
+
+*conky-1.8.1-r6 (16 Jan 2012)
+
+  16 Jan 2012; Daniel Pielmeier <billie@gentoo.org> -conky-1.8.1-r5.ebuild,
+  +conky-1.8.1-r6.ebuild, +files/conky-1.8.1-battery-time.patch:
+  Fix bug #398823. Thanks to nvinson for the report and patch.
 
 *conky-1.8.1-r5 (16 Nov 2011)
 
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 04f3bbeefccd..72328e4d235c 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX conky-1.8.1-acpitemp.patch 2415 RMD160 dcef233f8ba2ca192bfac3b16f0c671e1381fffe SHA1 d5000bfdddb134c4cd61e90e8bcc3bce5866c33c SHA256 57815044cd972139171b76e75267792821c783e03537eb6cf7ba8105c46cdf8d
+AUX conky-1.8.1-battery-time.patch 655 RMD160 f34ace5294f3f2163bc2311c640542de699a3c3a SHA1 b55cb7ed9f1b4780c43bcd3a49d382b04fae1bd2 SHA256 d47e966e61a212048a8c752f1885e567a6b2c497da508dee8be64b205a5a422d
 AUX conky-1.8.1-curl-headers.patch 494 RMD160 26c0e9060991a9ece1e38a552da828109566daa3 SHA1 0cb58b354bbd91a44af183e4ac7022246843552d SHA256 53ff30aa933163a1feb646720ea21b4727d515e33521ac53e77b8bd9d0473eba
 AUX conky-1.8.1-maxinterfaces.patch 1605 RMD160 f4b6f51cd2ab6172f6aac9982eccc02c5c0d4f0b SHA1 9b9282e1f3866e9b1c6c7a379c67450f360375cc SHA256 34f1e53fb145fb252e1f91bcd60803870f12e4e0b31d691accc4cd83dda970ad
 AUX conky-1.8.1-nvidia-x.patch 883 RMD160 f6e85e117ba5b895ba23db0d6e4160a0c0141c21 SHA1 1e3dc3f2a8e44d62e25ab2ab22726e0e91ecf666 SHA256 290ffdf4094167715bf11b86ee2cf73574a3af32ffb50fa09517d89c56bc0853
@@ -10,13 +11,13 @@ AUX conky-1.8.1-utf8-scroll.patch 2814 RMD160 edd1436b440f80717cfb85ca69b8bd6942
 AUX conky-1.8.1-xmms2.patch 1190 RMD160 6ec093e08f55c198b5b2321acc7f3d1d7f74e267 SHA1 0e05fe363521145bde14eca99d3aebc28e258833 SHA256 1b64047f04239dbf24b3171fcd8d5c950e9f8aa6af5e94cd4836cd14c70e2bdc
 DIST conky-1.8.1.tar.bz2 612481 RMD160 f3203131e2d8f3756eb29f5c5a9034b9c269fdc6 SHA1 9581419b1a53a8a7e37b0291cd4e55ab166d221a SHA256 f85a278f2869596b1fd68b6d26d58c93af8dcc39d5186bbcfd587d4c545e5e43
 EBUILD conky-1.8.1-r4.ebuild 4080 RMD160 604af025c5392aa76a138578c3835b6d497ff547 SHA1 e87f7f6a5d6e7b41be0e21e93f8e0af904226cf9 SHA256 d731a91fb3fdf989cb9d952d61757177f5271bd4d0338df01adc6464f1b6e355
-EBUILD conky-1.8.1-r5.ebuild 4127 RMD160 af8c81106b934a3342138d24440fb2691c647dfb SHA1 2d2f9c94c3686aee4ad3f820ea82766268415517 SHA256 809b370b8404692adbc503c993cfc5c02d2197a197dd8f45a1ee9b343dbe5b7c
-MISC ChangeLog 26202 RMD160 f77850ad0f37a54f88653061900706a9a7f43e88 SHA1 69323b469dd61b4552018f21e799434862aa337c SHA256 8e15706014ca4fa7f140c60fbdf85b4c74c4af44490bba50f1e1f316507c7aea
+EBUILD conky-1.8.1-r6.ebuild 4169 RMD160 d5f5c71db5b276cb5d5a5be203a3627498f19e26 SHA1 7719b29ddb64c1e618effa64161c7bc4d83321fb SHA256 eb5254abfda9b5586bf43c073163e1eed50a567773e753eb9afb065577fc9eb1
+MISC ChangeLog 26438 RMD160 d02e34c27ef8b93c54b6d372fbc24a7b2ff700b3 SHA1 54ffb2d647aac3cd44d78c1026ed90348936f99a SHA256 734a03a4dc51ff87bf68d9cb0075219e32c4d45fd5a590ad3695f08f9d65528f
 MISC metadata.xml 2035 RMD160 c4c5aca3e9d74df22ceec820eab9b1f25798cdb0 SHA1 791f5991269e7d531c11c3f9eeb784607a3730b0 SHA256 7629c0d86a74d086f1b9934919881b5ee82c285e94d58d4a802694633ea11302
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk7EFA8ACgkQlcuUeyFa0U1iEwCfYaw5TpFPwDcHXnDs7e8pQlJ8
-QH0AoJpzuQnii8A3aSkB2kqOQ/VYwGKq
-=Apd4
+iEYEAREIAAYFAk8UgugACgkQlcuUeyFa0U3dhQCeMGBVJ+1N8N1smzX+K+p9YI6+
+NEUAoIHDd0f/DBSh82CKYZU0WXE/r6IO
+=zkFu
 -----END PGP SIGNATURE-----
diff --git a/app-admin/conky/conky-1.8.1-r5.ebuild b/app-admin/conky/conky-1.8.1-r6.ebuild
index 7e1669d20e71..c629496b8a41 100644
--- a/app-admin/conky/conky-1.8.1-r5.ebuild
+++ b/app-admin/conky/conky-1.8.1-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.1-r5.ebuild,v 1.1 2011/11/16 19:50:34 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.1-r6.ebuild,v 1.1 2012/01/16 20:04:45 billie Exp $
 
 EAPI=2
 
@@ -59,7 +59,8 @@ src_prepare() {
 		"${FILESDIR}/${P}-acpitemp.patch" \
 		"${FILESDIR}/${P}-curl-headers.patch" \
 		"${FILESDIR}/${P}-maxinterfaces.patch" \
-		"${FILESDIR}/${P}-utf8-scroll.patch"
+		"${FILESDIR}/${P}-utf8-scroll.patch" \
+		"${FILESDIR}/${P}-battery-time.patch"
 	eautoreconf
 }
 
diff --git a/app-admin/conky/files/conky-1.8.1-battery-time.patch b/app-admin/conky/files/conky-1.8.1-battery-time.patch
new file mode 100644
index 000000000000..66e37958a075
--- /dev/null
+++ b/app-admin/conky/files/conky-1.8.1-battery-time.patch
@@ -0,0 +1,11 @@
+--- a/src/linux.c.old	2012-01-12 08:18:58.525502553 -0500
++++ b/src/linux.c	2012-01-12 08:19:29.786069277 -0500
+@@ -1671,6 +1671,8 @@ void get_battery_stuff(char *buffer, uns
+  			the tradition! */
+  			else if (strncmp(buf, "POWER_SUPPLY_CURRENT_NOW=", 25) == 0)
+  				sscanf(buf, "POWER_SUPPLY_CURRENT_NOW=%d", &present_rate);
++			else if (strncmp(buf, "POWER_SUPPLY_POWER_NOW=", 23) == 0)
++				sscanf(buf, "POWER_SUPPLY_POWER_NOW=%d", &present_rate);
+  			else if (strncmp(buf, "POWER_SUPPLY_ENERGY_NOW=", 24) == 0)
+  				sscanf(buf, "POWER_SUPPLY_ENERGY_NOW=%d", &remaining_capacity);
+  			else if (strncmp(buf, "POWER_SUPPLY_ENERGY_FULL=", 25) == 0)