Patch to fix ac adapter status on some machines.

Package-Manager: portage-2.1_pre7-r4

5 files changed, 67 insertions, 2 deletions

diff --git a/xfce-extra/xfce4-battery/ChangeLog b/xfce-extra/xfce4-battery/ChangeLog
index 897db77e8689..ad8462bfd57a 100644
--- a/xfce-extra/xfce4-battery/ChangeLog
+++ b/xfce-extra/xfce4-battery/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-extra/xfce4-battery
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-battery/ChangeLog,v 1.22 2006/02/20 18:20:02 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-battery/ChangeLog,v 1.23 2006/04/09 17:45:29 dostrow Exp $
+
+*xfce4-battery-0.3.0-r2 (09 Apr 2006)
+
+  09 Apr 2006; Daniel Ostrow <dostrow@gentoo.org> +files/ac_adapter.patch,
+  +xfce4-battery-0.3.0-r2.ebuild:
+  Patch to fix ac adapter status on some machines.
 
   20 Feb 2006; Markus Rothe <corsair@gentoo.org>
   xfce4-battery-0.3.0-r1.ebuild:
diff --git a/xfce-extra/xfce4-battery/Manifest b/xfce-extra/xfce4-battery/Manifest
index d1dab5a5957b..99ea81476ecd 100644
--- a/xfce-extra/xfce4-battery/Manifest
+++ b/xfce-extra/xfce4-battery/Manifest
@@ -1,8 +1,33 @@
-MD5 dec348d63e270ebcdbb5d156f3cf4125 ChangeLog 2500
+MD5 85039e45a21c7e57fed47841d85ac973 ChangeLog 2700
+RMD160 f92207ed10382a508d0c6476237b0e9205bc5c7c ChangeLog 2700
+SHA256 9259b14efb295a36b58b64458d1d0be3957dd1190c5a7e7f9859dfdc2b965f5e ChangeLog 2700
+MD5 7e83c3e57eb87b819dec88cdfeb289df files/ac_adapter.patch 844
+RMD160 f45412afe6fd641f6ca0ed2c4ea8e16e19a62652 files/ac_adapter.patch 844
+SHA256 c95c971fdef386dd71efad82963a2dab74fb9295d6bc323565488c16c5301b9d files/ac_adapter.patch 844
 MD5 62b116cba4726ccaafa617391576b91e files/digest-xfce4-battery-0.2.0-r1 78
+RMD160 1b128d2afbf089af59dc43f10ee8075182e827e5 files/digest-xfce4-battery-0.2.0-r1 78
+SHA256 e31cb7f0ffb28ad9b137f1bcc189b9ce5263c9ef4329b22d53b03baf6fc1c31f files/digest-xfce4-battery-0.2.0-r1 78
 MD5 04f73a252cf92df0af61a44a4fc2054f files/digest-xfce4-battery-0.3.0 78
+RMD160 2cc244437a8a27190d53ecd4727c162fae7a2fe8 files/digest-xfce4-battery-0.3.0 78
+SHA256 1bffdbda19c43efc0cb0d6d4ef894fb211a30d46e9296ff3d7bda8f4448e24bc files/digest-xfce4-battery-0.3.0 78
 MD5 04f73a252cf92df0af61a44a4fc2054f files/digest-xfce4-battery-0.3.0-r1 78
+RMD160 2cc244437a8a27190d53ecd4727c162fae7a2fe8 files/digest-xfce4-battery-0.3.0-r1 78
+SHA256 1bffdbda19c43efc0cb0d6d4ef894fb211a30d46e9296ff3d7bda8f4448e24bc files/digest-xfce4-battery-0.3.0-r1 78
+MD5 d387d3afd6b224e639838e4880947dea files/digest-xfce4-battery-0.3.0-r2 280
+RMD160 b6be9ba99cb4d9898f30eadd70bfd9d3dbaf335d files/digest-xfce4-battery-0.3.0-r2 280
+SHA256 0c7e1b4ff261588c586e56316f9ebd579d627d56dd2e13256b5949c093fe8a3e files/digest-xfce4-battery-0.3.0-r2 280
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
+SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61 metadata.xml 157
 MD5 a92454bf80f23e99ba33c674436d0cec xfce4-battery-0.2.0-r1.ebuild 395
+RMD160 890438bbfea4c592dd8e122df9ed5eac758cec9f xfce4-battery-0.2.0-r1.ebuild 395
+SHA256 1821b0aafe7d2268c99ec96e7e7f1c6c91b42d9ec5ceb4efa604d7b42c2175f6 xfce4-battery-0.2.0-r1.ebuild 395
 MD5 023237f1b99b2cea798cf8b23553cea9 xfce4-battery-0.3.0-r1.ebuild 382
+RMD160 90c2550ac380e2fd313ee2d21d9f1623355a05df xfce4-battery-0.3.0-r1.ebuild 382
+SHA256 1d28d712f33882cb674abbbb5915c4af3bbfd9ac1cfc14672617e90d0a8921f9 xfce4-battery-0.3.0-r1.ebuild 382
+MD5 3861de49caddbc6ae6b5b99dbe852ec3 xfce4-battery-0.3.0-r2.ebuild 475
+RMD160 23ebc1d5f781b55a118c7cbfab976c38f73b9446 xfce4-battery-0.3.0-r2.ebuild 475
+SHA256 1b831e599712615f2d438619a7826bc5ee980230222f30a7e294f955dcea0747 xfce4-battery-0.3.0-r2.ebuild 475
 MD5 75f39ce9a71022ec8c9e4898f934c605 xfce4-battery-0.3.0.ebuild 400
+RMD160 de7c1212012643841674eca08cef8010fe81a141 xfce4-battery-0.3.0.ebuild 400
+SHA256 d30c9169e2bca32c3bc1721a0ee9b7849d63ceb0e09b3cb140820f4ee7564c4f xfce4-battery-0.3.0.ebuild 400
diff --git a/xfce-extra/xfce4-battery/files/ac_adapter.patch b/xfce-extra/xfce4-battery/files/ac_adapter.patch
new file mode 100644
index 000000000000..e1626d85d9d7
--- /dev/null
+++ b/xfce-extra/xfce4-battery/files/ac_adapter.patch
@@ -0,0 +1,15 @@
+diff -Naur xfce4-battery-plugin-0.3.0.orig/panel-plugin/libacpi.c xfce4-battery-plugin-0.3.0/panel-plugin/libacpi.c
+--- xfce4-battery-plugin-0.3.0.orig/panel-plugin/libacpi.c	2003-09-09 09:49:16.000000000 -0400
++++ xfce4-battery-plugin-0.3.0/panel-plugin/libacpi.c	2006-04-09 13:37:21.000000000 -0400
+@@ -277,7 +277,10 @@
+     if (!(acpi = fopen ("/proc/acpi/ac_adapter/ACAD/state", "r")))
+       if (!(acpi = fopen ("/proc/acpi/ac_adapter/AC/state", "r")))
+         if (!(acpi = fopen ("/proc/acpi/ac_adapter/ADP1/state", "r")))
+-	        return -1;
++          if (!(acpi = fopen ("/proc/acpi/ac_adapter/AC0/state", "r")))
++        if (!(acpi = fopen ("/proc/acpi/ac_adapter/ADP0/state", "r")))
++          if (!(acpi = fopen ("/proc/acpi/ac_adapter/C11B/state", "r")))
++            return -1;
+ 
+   fread (buf, 512, 1, acpi);
+   fclose (acpi);
diff --git a/xfce-extra/xfce4-battery/files/digest-xfce4-battery-0.3.0-r2 b/xfce-extra/xfce4-battery/files/digest-xfce4-battery-0.3.0-r2
new file mode 100644
index 000000000000..f16f06205cb8
--- /dev/null
+++ b/xfce-extra/xfce4-battery/files/digest-xfce4-battery-0.3.0-r2
@@ -0,0 +1,3 @@
+MD5 04e121df1ff264281e56e12a8ff5f155 xfce4-battery-plugin-0.3.0.tar.gz 322286
+RMD160 3fbf0f1cf8851b59967105a95b43c8d1adf5417e xfce4-battery-plugin-0.3.0.tar.gz 322286
+SHA256 8044995f61f12fcd8ec2a44739293ed0adbe7adf04587aee3a31630fb5bb93b4 xfce4-battery-plugin-0.3.0.tar.gz 322286
diff --git a/xfce-extra/xfce4-battery/xfce4-battery-0.3.0-r2.ebuild b/xfce-extra/xfce4-battery/xfce4-battery-0.3.0-r2.ebuild
new file mode 100644
index 000000000000..46b344150f54
--- /dev/null
+++ b/xfce-extra/xfce4-battery/xfce4-battery-0.3.0-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-battery/xfce4-battery-0.3.0-r2.ebuild,v 1.1 2006/04/09 17:45:29 dostrow Exp $
+
+inherit xfce42 eutils
+
+DESCRIPTION="Xfce4 panel battery monitor plugin"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+goodies_plugin
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/ac_adapter.patch
+}