Flip include order for bug 210218 to fix conflicting types between linux-headers-2.6.24 and glibc-2.7.

Package-Manager: portage-2.1.4.4

4 files changed, 26 insertions, 6 deletions

diff --git a/xfce-extra/xfce4-battery/ChangeLog b/xfce-extra/xfce4-battery/ChangeLog
index ec7f77d673f6..57265dbc9c1a 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.58 2007/10/26 13:18:29 angelos Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-battery/ChangeLog,v 1.59 2008/03/19 14:27:17 drac Exp $
+
+  19 Mar 2008; Samuli Suominen <drac@gentoo.org>
+  +files/xfce4-battery-0.5.0-2.6.24-headers.patch,
+  xfce4-battery-0.5.0-r2.ebuild:
+  Flip include order for bug 210218 to fix conflicting types between
+  linux-headers-2.6.24 and glibc-2.7.
 
   26 Oct 2007; Christoph Mende <angelos@gentoo.org>
   xfce4-battery-0.5.0-r2.ebuild:
diff --git a/xfce-extra/xfce4-battery/Manifest b/xfce-extra/xfce4-battery/Manifest
index f356eb7f4518..9b897be525ee 100644
--- a/xfce-extra/xfce4-battery/Manifest
+++ b/xfce-extra/xfce4-battery/Manifest
@@ -1,7 +1,8 @@
 AUX xfce4-battery-0.5.0-2.6.21.patch 738 RMD160 0e6f30e886f4e5a51835475d25188f5fd9d60a3e SHA1 c011b637f5d32c4c692e77f659caf287e33f827c SHA256 ea2f0220d6505615b27dd200b87ff99fc767606ec95e0c32cee82872c5a04d8b
+AUX xfce4-battery-0.5.0-2.6.24-headers.patch 422 RMD160 f8d0895dfef8b67569fcc253f2cde2330bfe89e7 SHA1 a8818bd9111dd0feca524244ca3504d8475396df SHA256 c44e0db7010b12b9de40c4072b84088761e5b1f08775445eaa6d6bbca242680d
 AUX xfce4-battery-0.5.0-freebsd.patch 675 RMD160 f670161edade82ecf78aee3ef9da0e230a667cd6 SHA1 a5bd15629095e7cd922c3550ff01d6332d7b463d SHA256 7dee4e6556334cd985e69e70992719f7fca21dce3bed75b8780153fddda1a175
 AUX xfce4-battery-0.5.0-libacpi.patch 1505 RMD160 709bd01ddbbfb2bf117d0e87d0642c463676c167 SHA1 e14de88cab52ed6e6146122f9997b8b93b3a301e SHA256 1f49924a10c5e53f88912db3e63dc382052e68fdd4c1ea439771a504f5f08566
 DIST xfce4-battery-plugin-0.5.0.tar.bz2 222269 RMD160 bbf64994c7686b11b6a51bd7728569cd2a5d9777 SHA1 63439d32bfe8411458d41c38824cb393bc31d6e0 SHA256 4428f2fe1f5f28e6cc711278fd9c5c90f325cf0c5298f98a5d60940116cbcef8
-EBUILD xfce4-battery-0.5.0-r2.ebuild 743 RMD160 6e0cf2b81e6bdaba30a13df5966b4d9d89942fc9 SHA1 1d2eb42eef87c5025dad44a88a4ff809750c496f SHA256 d8aad889c9e0d4502ba4dbe4a7ae860bf15368f35ccc8adc2b06bf75c15ba78e
-MISC ChangeLog 7999 RMD160 4896e2ffc526ade135c08018efe8df25ed965d76 SHA1 4cab2cc39c1f674d8501af276efd775de4c00ebc SHA256 c5b63a0d49b6bbcfed9454576b3f5c5f15155b5ab47604d78fdb1cba14c874d2
+EBUILD xfce4-battery-0.5.0-r2.ebuild 788 RMD160 e1081fbb283755a5c88c7ec90985d6313bbca5ff SHA1 55f9066689437e11d28f8e68efc9e370bb28d2e4 SHA256 377e9ffd758bc3f54d03df66d7d6688857313b9e5070a378581d8591523ea9c1
+MISC ChangeLog 8237 RMD160 a02a989bb74453c9f7da8cec84482653ea44a3a1 SHA1 6d64b8fb3d7eb41d1bf8b3b0666e2a8525f1bf24 SHA256 af6c0805d33c0a38abe3d31ef9280eb838d1bba367899e64deb5be5f502540ac
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-extra/xfce4-battery/files/xfce4-battery-0.5.0-2.6.24-headers.patch b/xfce-extra/xfce4-battery/files/xfce4-battery-0.5.0-2.6.24-headers.patch
new file mode 100644
index 000000000000..080707a3be3f
--- /dev/null
+++ b/xfce-extra/xfce4-battery/files/xfce4-battery-0.5.0-2.6.24-headers.patch
@@ -0,0 +1,12 @@
+--- xfce4-battery-plugin-0.5.0/panel-plugin/libapm.h.orig	2008-03-18 20:10:58.000000000 +0100
++++ xfce4-battery-plugin-0.5.0/panel-plugin/libapm.h	2008-03-18 20:14:45.000000000 +0100
+@@ -17,8 +17,8 @@
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
+-#include <linux/apm_bios.h>
+ #include <sys/types.h>
++#include <linux/apm_bios.h>
+ 
+ #define APM_PROC   "/proc/apm"
+ #define APM_DEVICE "/dev/apm_bios"
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
index d3d3a48b35a6..6c88a16cbafb 100644
--- a/xfce-extra/xfce4-battery/xfce4-battery-0.5.0-r2.ebuild
+++ b/xfce-extra/xfce4-battery/xfce4-battery-0.5.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.7 2007/10/26 13:18:29 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-battery/xfce4-battery-0.5.0-r2.ebuild,v 1.8 2008/03/19 14:27:17 drac Exp $
 
 inherit autotools eutils xfce44
 
@@ -19,6 +19,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-freebsd.patch
 	epatch "${FILESDIR}"/${P}-libacpi.patch
 	epatch "${FILESDIR}"/${P}-2.6.21.patch
+	epatch "${FILESDIR}"/${P}-2.6.24-headers.patch
 
 	sed -i -e "/^AC_INIT/s/battery_version()/battery_version/" configure.in
 	eautoconf