Patch libacpi to support Linux 2.6.21 for bug 176458, thanks to Phillip Berndt.

Package-Manager: portage-2.1.2.4

5 files changed, 69 insertions, 5 deletions

diff --git a/xfce-extra/xfce4-battery/ChangeLog b/xfce-extra/xfce4-battery/ChangeLog
index 8ae612c4b44a..ecd939f11c71 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-battery/ChangeLog,v 1.51 2007/03/15 15:54:29 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-battery/ChangeLog,v 1.52 2007/04/29 14:23:46 drac Exp $
+
+*xfce4-battery-0.5.0-r2 (29 Apr 2007)
+
+  29 Apr 2007; Samuli Suominen <drac@gentoo.org>
+  +files/xfce4-battery-0.5.0-2.6.21.patch, +xfce4-battery-0.5.0-r2.ebuild:
+  Patch libacpi to support Linux 2.6.21 for bug 176458, thanks to Phillip Berndt.
 
   15 Mar 2007; Samuli Suominen <drac@gentoo.org>
   xfce4-battery-0.5.0-r1.ebuild:
diff --git a/xfce-extra/xfce4-battery/Manifest b/xfce-extra/xfce4-battery/Manifest
index 6508daeab44a..0c49cfafeae1 100644
--- a/xfce-extra/xfce4-battery/Manifest
+++ b/xfce-extra/xfce4-battery/Manifest
@@ -1,3 +1,7 @@
+AUX xfce4-battery-0.5.0-2.6.21.patch 738 RMD160 0e6f30e886f4e5a51835475d25188f5fd9d60a3e SHA1 c011b637f5d32c4c692e77f659caf287e33f827c SHA256 ea2f0220d6505615b27dd200b87ff99fc767606ec95e0c32cee82872c5a04d8b
+MD5 59de52ccd8b1fab605c074c0fc899a1e files/xfce4-battery-0.5.0-2.6.21.patch 738
+RMD160 0e6f30e886f4e5a51835475d25188f5fd9d60a3e files/xfce4-battery-0.5.0-2.6.21.patch 738
+SHA256 ea2f0220d6505615b27dd200b87ff99fc767606ec95e0c32cee82872c5a04d8b files/xfce4-battery-0.5.0-2.6.21.patch 738
 AUX xfce4-battery-0.5.0-freebsd.patch 675 RMD160 f670161edade82ecf78aee3ef9da0e230a667cd6 SHA1 a5bd15629095e7cd922c3550ff01d6332d7b463d SHA256 7dee4e6556334cd985e69e70992719f7fca21dce3bed75b8780153fddda1a175
 MD5 09af8d61b1894f6799ddcb1dbe30afb9 files/xfce4-battery-0.5.0-freebsd.patch 675
 RMD160 f670161edade82ecf78aee3ef9da0e230a667cd6 files/xfce4-battery-0.5.0-freebsd.patch 675
@@ -11,10 +15,14 @@ EBUILD xfce4-battery-0.5.0-r1.ebuild 625 RMD160 a848b6af15dfb895276b86e68f30778d
 MD5 2a2567108aba678bf24acadafa27e78b xfce4-battery-0.5.0-r1.ebuild 625
 RMD160 a848b6af15dfb895276b86e68f30778d1c523a24 xfce4-battery-0.5.0-r1.ebuild 625
 SHA256 285e59dd96538813e4d4a44a2b0ffe17bfa088598a74eacae5a8e492193e8f3d xfce4-battery-0.5.0-r1.ebuild 625
-MISC ChangeLog 7027 RMD160 a33363310108ae61a4f79f4ba469d7acaa85f6e1 SHA1 3d3dd4755fd28fb66b1b5be51069b993c66f2c94 SHA256 93c56c2ed0aca7731ff8f60870f380f8edd00e34b5d47e0924440ed6e21dd6ad
-MD5 3aade1a67ecfd1039662e2e0d024e894 ChangeLog 7027
-RMD160 a33363310108ae61a4f79f4ba469d7acaa85f6e1 ChangeLog 7027
-SHA256 93c56c2ed0aca7731ff8f60870f380f8edd00e34b5d47e0924440ed6e21dd6ad ChangeLog 7027
+EBUILD xfce4-battery-0.5.0-r2.ebuild 667 RMD160 982843f2390c2c2f00ec021a6ebaa1df44593afc SHA1 797a79165410ce3312b207b7d30760d23e4fede0 SHA256 83d04803085a377fb23925e883cd538dc907d89ac9d9145a18d652a64f31fcaa
+MD5 7ec8bcbfd4f56a97bf05d04a9707c5d7 xfce4-battery-0.5.0-r2.ebuild 667
+RMD160 982843f2390c2c2f00ec021a6ebaa1df44593afc xfce4-battery-0.5.0-r2.ebuild 667
+SHA256 83d04803085a377fb23925e883cd538dc907d89ac9d9145a18d652a64f31fcaa xfce4-battery-0.5.0-r2.ebuild 667
+MISC ChangeLog 7273 RMD160 379ff24e3dd8ca9b85d7c9ef8d1bc03c4671b465 SHA1 05331035531c3160e1dbb545e1d2aa7a1acea9eb SHA256 9215a2d97fa3e5a24fb24532e4405ad621b827c09d32dd7bef62a68c7dfa5c5a
+MD5 00c26eb6a040179d1b0e1328afc8b87e ChangeLog 7273
+RMD160 379ff24e3dd8ca9b85d7c9ef8d1bc03c4671b465 ChangeLog 7273
+SHA256 9215a2d97fa3e5a24fb24532e4405ad621b827c09d32dd7bef62a68c7dfa5c5a ChangeLog 7273
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
@@ -22,3 +30,6 @@ SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61 metadata
 MD5 e2eec6e047896be338d150e33d940ace files/digest-xfce4-battery-0.5.0-r1 283
 RMD160 9e29a0847e5a193a1ac5d9808f367b45d39f9817 files/digest-xfce4-battery-0.5.0-r1 283
 SHA256 45a858bae490c0a8e69b0891d7d8c1ccf7274476e0b27d34e33130d1a3720272 files/digest-xfce4-battery-0.5.0-r1 283
+MD5 e2eec6e047896be338d150e33d940ace files/digest-xfce4-battery-0.5.0-r2 283
+RMD160 9e29a0847e5a193a1ac5d9808f367b45d39f9817 files/digest-xfce4-battery-0.5.0-r2 283
+SHA256 45a858bae490c0a8e69b0891d7d8c1ccf7274476e0b27d34e33130d1a3720272 files/digest-xfce4-battery-0.5.0-r2 283
diff --git a/xfce-extra/xfce4-battery/files/digest-xfce4-battery-0.5.0-r2 b/xfce-extra/xfce4-battery/files/digest-xfce4-battery-0.5.0-r2
new file mode 100644
index 000000000000..6ccdc2f2dd92
--- /dev/null
+++ b/xfce-extra/xfce4-battery/files/digest-xfce4-battery-0.5.0-r2
@@ -0,0 +1,3 @@
+MD5 c1d923bb90b79087ca7044bcc24bab5a xfce4-battery-plugin-0.5.0.tar.bz2 222269
+RMD160 bbf64994c7686b11b6a51bd7728569cd2a5d9777 xfce4-battery-plugin-0.5.0.tar.bz2 222269
+SHA256 4428f2fe1f5f28e6cc711278fd9c5c90f325cf0c5298f98a5d60940116cbcef8 xfce4-battery-plugin-0.5.0.tar.bz2 222269
diff --git a/xfce-extra/xfce4-battery/files/xfce4-battery-0.5.0-2.6.21.patch b/xfce-extra/xfce4-battery/files/xfce4-battery-0.5.0-2.6.21.patch
new file mode 100644
index 000000000000..61fe3dacf70a
--- /dev/null
+++ b/xfce-extra/xfce4-battery/files/xfce4-battery-0.5.0-2.6.21.patch
@@ -0,0 +1,16 @@
+diff -Nru xfce4-battery-plugin-0.5.0-old/panel-plugin/libacpi.c xfce4-battery-plugin-0.5.0/panel-plugin/libacpi.c
+--- xfce4-battery-plugin-0.5.0-old/panel-plugin/libacpi.c	2007-04-29 15:08:23.670477251 +0000
++++ xfce4-battery-plugin-0.5.0/panel-plugin/libacpi.c	2007-04-29 15:17:23.213224040 +0000
+@@ -207,10 +207,10 @@
+ #ifdef __linux__
+   FILE *acpi;
+ 
+-  if (!(acpi = fopen ("/proc/acpi/info", "r")))
++  if ( (!(acpi = fopen ("/proc/acpi/info", "r"))) && (!(acpi = fopen ("/sys/module/acpi/parameters/acpica_version", "r"))) )
+   {
+ #ifdef DEBUG
+-	  printf("DBG:no acpi: /proc/acpi/info not found!\n");
++	  printf("DBG:no acpi: /proc/acpi/info and /sys/module/acpi/parameters/acpica_version not found!\n");
+ #endif
+     return 1;
+   }
diff --git a/xfce-extra/xfce4-battery/xfce4-battery-0.5.0-r2.ebuild b/xfce-extra/xfce4-battery/xfce4-battery-0.5.0-r2.ebuild
new file mode 100644
index 000000000000..758ba45491a7
--- /dev/null
+++ b/xfce-extra/xfce4-battery/xfce4-battery-0.5.0-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2007 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.5.0-r2.ebuild,v 1.1 2007/04/29 14:23:46 drac Exp $
+
+inherit eutils xfce44
+
+xfce44
+
+RESTRICT="test"
+
+DESCRIPTION="Battery status panel plugin"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="debug"
+
+DEPEND="dev-util/pkgconfig
+	dev-util/intltool"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-freebsd.patch
+	epatch "${FILESDIR}"/${P}-libacpi.patch
+	epatch "${FILESDIR}"/${P}-2.6.21.patch
+}
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+xfce44_goodies_panel_plugin