3 files changed, 6 insertions, 49 deletions
diff --git a/xfce-extra/xfce4-battery/ChangeLog b/xfce-extra/xfce4-battery/ChangeLog
index 5811cfa5db1f..c48c4d91d113 100644
--- a/xfce-extra/xfce4-battery/ChangeLog
+++ b/xfce-extra/xfce4-battery/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-extra/xfce4-battery
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-battery/ChangeLog,v 1.72 2008/11/10 13:26:40 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-battery/ChangeLog,v 1.73 2008/12/09 15:50:16 angelos Exp $
+
+  09 Dec 2008; Christoph Mende <angelos@gentoo.org>
+  -files/xfce4-battery-0.5.0-2.6.21.patch,
+  -files/xfce4-battery-0.5.0-freebsd.patch:
+  Removed unused patches
 
   10 Nov 2008; Christoph Mende <angelos@gentoo.org>
   -xfce4-battery-0.5.0-r2.ebuild, -xfce4-battery-0.5.0-r3.ebuild:
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
deleted file mode 100644
index 61fe3dacf70a..000000000000
--- a/xfce-extra/xfce4-battery/files/xfce4-battery-0.5.0-2.6.21.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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/files/xfce4-battery-0.5.0-freebsd.patch b/xfce-extra/xfce4-battery/files/xfce4-battery-0.5.0-freebsd.patch
deleted file mode 100644
index b4644fef4b3e..000000000000
--- a/xfce-extra/xfce4-battery/files/xfce4-battery-0.5.0-freebsd.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- panel-plugin/battery.c.orig	Wed Jan 24 20:42:09 2007
-+++ panel-plugin/battery.c	Wed Jan 24 20:46:51 2007
-@@ -378,6 +378,7 @@
-           rate = last_rate;
-         }
-         
-+#ifdef __linux__	
-         charge = (((float)ccapacity)/((float)lcapacity))*100;
- 
-         if ( last_acline )
-@@ -389,6 +390,20 @@
-             time_remaining = 0;
-         
-         last_acline = acline;
-+
-+#elif __FreeBSD__
-+	charge = acpistate->percentage;
-+
-+	if ( last_acline )
-+	    time_remaining = acpistate->rtime;
-+	else
-+	    time_remaining = acpistate->rtime;
-+
-+	if ( time_remaining < 0 )
-+	    time_remaining = 0;
-+
-+	last_acline = acline;
-+#endif
- 
-     }    
- #ifdef __linux__
-