Renamed xfce4-battery and xfce4-cellmodem.

13 files changed, 0 insertions, 905 deletions

diff --git a/xfce-extra/xfce4-battery/ChangeLog b/xfce-extra/xfce4-battery/ChangeLog
deleted file mode 100644
index c48c4d91d113..000000000000
--- a/xfce-extra/xfce4-battery/ChangeLog
+++ /dev/null
@@ -1,305 +0,0 @@
-# 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.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:
-  Remove old
-
-  10 Nov 2008; Raúl Porcel <armin76@gentoo.org> xfce4-battery-0.5.1.ebuild:
-  arm stable
-
-  09 Nov 2008; Markus Meier <maekke@gentoo.org> xfce4-battery-0.5.1.ebuild:
-  x86 stable, bug #244583
-
-  01 Nov 2008; nixnut <nixnut@gentoo.org> xfce4-battery-0.5.1.ebuild:
-  Stable on ppc wrt bug 244583
-
-  27 Oct 2008; Jeremy Olexa <darkside@gentoo.org>
-  xfce4-battery-0.5.1.ebuild:
-  amd64 stable, bug 244583
-
-  26 Sep 2008; Christoph Mende <angelos@gentoo.org>
-  xfce4-battery-0.5.1.ebuild:
-  Removed unneeded inherit autotools
-
-*xfce4-battery-0.5.1 (08 Sep 2008)
-
-  08 Sep 2008; Christoph Mende <angelos@gentoo.org>
-  +files/xfce4-battery-0.5.1-freebsd.patch, +xfce4-battery-0.5.1.ebuild:
-  Version bump
-
-  24 Aug 2008; Markus Rothe <corsair@gentoo.org>
-  xfce4-battery-0.5.0-r2.ebuild, xfce4-battery-0.5.0-r3.ebuild:
-  Remove ppc64 keywords. There are no ppc64 machines with batteries...
-
-  22 Aug 2008; Markus Meier <maekke@gentoo.org>
-  xfce4-battery-0.5.0-r3.ebuild:
-  x86 stable, bug #235407
-
-  22 Aug 2008; nixnut <nixnut@gentoo.org> xfce4-battery-0.5.0-r3.ebuild:
-  Stable on ppc wrt bug 235407
-
-  22 Aug 2008; <angelos@gentoo.org> xfce4-battery-0.5.0-r3.ebuild:
-  Stable on amd64, bug #235407
-
-*xfce4-battery-0.5.0-r3 (21 Aug 2008)
-
-  21 Aug 2008; Christoph Mende <angelos@gentoo.org>
-  +files/xfce4-battery-0.5.0-sysfs.patch, +xfce4-battery-0.5.0-r3.ebuild:
-  Using sysfs instead of proc, bug 219690
-
-  25 Apr 2008; Samuli Suominen <drac@gentoo.org>
-  xfce4-battery-0.5.0-r2.ebuild:
-  Run full eautoreconf for bug 219259.
-
-  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:
-  Fix test suite and unrestrict it
-
-  08 Jun 2007; Samuli Suominen <drac@gentoo.org>
-  -xfce4-battery-0.5.0-r1.ebuild, xfce4-battery-0.5.0-r2.ebuild:
-  Stable on arm.
-
-  01 Jun 2007; Brent Baude <ranger@gentoo.org>
-  xfce4-battery-0.5.0-r2.ebuild:
-  Marking xfce4-battery-0.5.0-r2 ppc64 stable for bug #178510
-
-  24 May 2007; Lars Weiler <pylon@gentoo.org> xfce4-battery-0.5.0-r2.ebuild:
-  Stable on ppc; bug #178510.
-
-  19 May 2007; Peter Weller <welp@gentoo.org> xfce4-battery-0.5.0-r2.ebuild:
-  Stable on amd64 wrt bug 178510
-
-  18 May 2007; Raúl Porcel <armin76@gentoo.org>
-  xfce4-battery-0.5.0-r2.ebuild:
-  x86 stable wrt #178510
-
-*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:
-  RESTRICT="test" which is not supported by goodies upstream.
-
-  15 Mar 2007; Markus Rothe <corsair@gentoo.org>
-  xfce4-battery-0.5.0-r1.ebuild:
-  Stable on ppc64; bug #169987
-
-  10 Mar 2007; nixnut <nixnut@gentoo.org> xfce4-battery-0.5.0-r1.ebuild:
-  Stable on ppc wrt bug 169987
-
-  10 Mar 2007; Peter Weller <welp@gentoo.org> xfce4-battery-0.5.0-r1.ebuild:
-  Stable on amd64 wrt bug 169987
-
-  09 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
-  xfce4-battery-0.5.0-r1.ebuild:
-  stable x86; bug #169987
-
-  02 Mar 2007; Samuli Suominen <drac@gentoo.org>
-  xfce4-battery-0.3.0-r2.ebuild, xfce4-battery-0.5.0-r1.ebuild:
-  Fix remaining keywords for bug 157881.
-
-  02 Mar 2007; Peter Weller <welp@gentoo.org> xfce4-battery-0.5.0-r1.ebuild:
-  Keyworded on x86-fbsd
-
-  02 Mar 2007; Samuli Suominen <drac@gentoo.org>
-  xfce4-battery-0.3.0-r2.ebuild:
-  Drop ~alpha keyword wrt/ http://bugs.gentoo.org/show_bug.cgi?id=157881#c6
-
-  26 Feb 2007; Samuli Suominen <drac@gentoo.org>
-  xfce4-battery-0.5.0-r1.ebuild:
-  Fix bug 168373.
-
-*xfce4-battery-0.5.0-r1 (09 Feb 2007)
-
-  09 Feb 2007; Samuli Suominen <drac@gentoo.org>
-  +files/xfce4-battery-0.5.0-libacpi.patch, +xfce4-battery-0.5.0-r1.ebuild:
-  Patch from bug 165989 to fix temperature and fan status.
-
-  05 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
-  xfce4-battery-0.3.0-r2.ebuild:
-  stable x86; bug #157881
-
-  04 Feb 2007; Joshua Nichols <nichoj@gentoo.org>
-  xfce4-battery-0.5.0.ebuild:
-  Updated to use final 4.4 release.
-
-  30 Jan 2007; Steve Dibb <beandog@gentoo.org>
-  xfce4-battery-0.3.0-r2.ebuild:
-  amd64 stable, bug 157881
-
-  29 Jan 2007; Peter Weller <welp@gentoo.org>
-  +files/xfce4-battery-0.5.0-freebsd.patch, xfce4-battery-0.5.0.ebuild:
-  A number of fixes, patch to make it work on gentoo/freebsd
-
-  23 Jan 2007; Peter Weller <welp@gentoo.org> xfce4-battery-0.5.0.ebuild:
-  Fix depends for bug 163244. Fix meta builds.
-
-*xfce4-battery-0.5.0 (21 Jan 2007)
-
-  21 Jan 2007; Joshua Nichols <nichoj@gentoo.org>
-  +xfce4-battery-0.5.0.ebuild:
-  Version bump reported by Samuli Suominen <sasuomin@uusikaupunki.fi> on bug
-  #163072. Dropped dependencies which get brought in by the eclass.
-
-  28 Dec 2006; Joshua Nichols <nichoj@gentoo.org>
-  xfce4-battery-0.3.0-r2.ebuild:
-  Fixed dependencies, see bug #130573.
-
-  21 Dec 2006; Markus Rothe <corsair@gentoo.org>
-  xfce4-battery-0.3.0-r2.ebuild:
-  Stable on ppc64; bug #157881
-
-  21 Dec 2006; Jeroen Roovers <jer@gentoo.org>
-  xfce4-battery-0.3.0-r1.ebuild, xfce4-battery-0.3.0-r2.ebuild,
-  xfce4-battery-0.4.90.3.ebuild, xfce4-battery-0.4.90.3-r1.ebuild:
-  Bah. Easier to keyword an extra package than to sift through meta-packages.
-  Reverting previous changes.
-
-  21 Dec 2006; Jeroen Roovers <jer@gentoo.org>
-  xfce4-battery-0.3.0-r1.ebuild, xfce4-battery-0.3.0-r2.ebuild,
-  xfce4-battery-0.4.90.3.ebuild, xfce4-battery-0.4.90.3-r1.ebuild:
-  Removing hppa keywording; unless someone comes up with a battery-supported
-  PARISC system <http://openpa.net/systems/index.html#portable> running Gentoo
-  Linux (bug #157881).
-
-  17 Dec 2006; Tobias Scherbaum <dertobi123@gentoo.org>
-  xfce4-battery-0.3.0-r2.ebuild:
-  Stable on ppc wrt bug #157881.
-
-  10 Dec 2006; Joshua Nichols <nichoj@gentoo.org>
-  xfce4-battery-0.4.90.3-r1.ebuild:
-  Fixed RDEPEND.
-
-*xfce4-battery-0.4.90.3-r1 (10 Dec 2006)
-
-  10 Dec 2006; Joshua Nichols <nichoj@gentoo.org>
-  +xfce4-battery-0.4.90.3-r1.ebuild:
-  Improvements suggested by Sideris Michael <msid@daemons.gr>, in bug #157562.
-
-  07 Dec 2006; Joshua Nichols <nichoj@gentoo.org>
-  -xfce4-battery-0.2.0-r1.ebuild, -xfce4-battery-0.3.0.ebuild:
-  Pruned old versions with new versions with same or better keywords.
-
-  07 Dec 2006; Joshua Nichols <nichoj@gentoo.org>
-  -files/digest-xfce4-battery-0.2.0-r1, -files/digest-xfce4-battery-0.3.0,
-  Manifest:
-  Pruned old versions with new versions with same or better keywords.
-
-*xfce4-battery-0.4.90.3 (10 Dec 2006)
-
-  06 Dec 2006; Joshua Nichols <nichoj@gentoo.org>
-  +xfce4-battery-0.4.90.3.ebuild:
-  Version bump for XFCE 4.4.
-
-  02 Dec 2006; Tiziano Müller <dev-zero@gentoo.org>
-  xfce4-battery-0.3.0-r2.ebuild:
-  ~x86-fbsd keyword added
-
-  10 Apr 2006; Gustavo Zacarias <gustavoz@gentoo.org>
-  xfce4-battery-0.3.0-r1.ebuild:
-  Stable on sparc wrt #129371
-
-*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:
-  Stable on ppc64
-
-  09 Feb 2006; Aron Griffis <agriffis@gentoo.org>
-  xfce4-battery-0.3.0-r1.ebuild:
-  Mark 0.3.0-r1 stable on alpha
-
-  07 Feb 2006; Simon Stelling <blubb@gentoo.org>
-  xfce4-battery-0.3.0-r1.ebuild:
-  stable on amd64
-
-  27 Jan 2006; Michael Hanselmann <hansmi@gentoo.org>
-  xfce4-battery-0.3.0-r1.ebuild:
-  Stable on ppc.
-
-*xfce4-battery-0.3.0-r1 (06 Oct 2005)
-
-  06 Oct 2005; Brad Cowan <bcowan@gentoo.org>
-  +xfce4-battery-0.3.0-r1.ebuild:
-  Xfce builds for new eclass and modular Xorg.
-
-*xfce4-battery-0.3.0 (14 Aug 2005)
-
-  14 Aug 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-battery-0.3.0.ebuild:
-  Version bump.
-
-  18 Jun 2005; Markus Rothe <corsair@gentoo.org>
-  xfce4-battery-0.2.0-r1.ebuild:
-  Stable on ppc64
-
-  13 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
-  xfce4-battery-0.2.0-r1.ebuild:
-  Stable on alpha.
-
-  31 Jan 2005; lanius@gentoo.org xfce4-battery-0.2.0-r1.ebuild:
-  stable on amd64
-
-  29 Jan 2005; Lars Weiler <pylon@gentoo.org> xfce4-battery-0.2.0-r1.ebuild:
-  Stable on ppc.
-
-  24 Jan 2005; Guy Martin <gmsoft@gentoo.org> xfce4-battery-0.2.0-r1.ebuild:
-  Stable on hppa.
-
-*xfce4-battery-0.2.0-r1 (06 Jan 2005)
-
-  06 Jan 2005; Brad Cowan <bcowan@gentoo.org>
-  +xfce4-battery-0.2.0-r1.ebuild:
-  Updated to use Xfce4 eclass.
-
-  18 Sep 2004; Tom Gall <tgall@gentoo.org> xfce4-battery-0.2.0.ebuild:
-  stable on ppc64, bug #57744
-
-  10 Mar 2004; <agriffis@gentoo.org> xfce4-battery-0.2.0.ebuild:
-  stable on alpha
-
-  08 Mar 2004; Bret Curtis <psi29a@gentoo.org> xfce4-battery-0.2.0.ebuild:
-  Added ~mips to KEYWORDS
-
-  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> :
-  manifest fix
-
-  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org>
-  xfce4-battery-0.2.0.ebuild:
-  set ppc in keywords
-
-  18 Dec 2003; Jason Wever <weeve@gentoo.org> xfce4-battery-0.2.0.ebuild:
-  Marked stable on sparc.
-
-*xfce4-battery-0.2.0 (26 Oct 2003)
-
-  16 Nov 2003; Guy martin <gmsoft@gentoo.org> xfce4-battery-0.2.0.ebuild :
-  Added hppa to KEYWORDS.
-
-  26 Oct 2003; Daniel Ahlberg <aliz@gentoo.org> xfce4-battery-0.2.0.ebuild:
-  Version bump
-
-*xfce4-battery-0.1.2 (15 Aug 2003)
-
-  15 Aug 2003; Brad Cowan <bcowan@gentoo.org> xfce4-battery-0.1.2.ebuild:
-  Initial import.
-
diff --git a/xfce-extra/xfce4-battery/Manifest b/xfce-extra/xfce4-battery/Manifest
deleted file mode 100644
index 92a6d0ea4bce..000000000000
--- a/xfce-extra/xfce4-battery/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX xfce4-battery-0.5.0-2.6.24-headers.patch 422 RMD160 f8d0895dfef8b67569fcc253f2cde2330bfe89e7 SHA1 a8818bd9111dd0feca524244ca3504d8475396df SHA256 c44e0db7010b12b9de40c4072b84088761e5b1f08775445eaa6d6bbca242680d
-AUX xfce4-battery-0.5.0-libacpi.patch 1505 RMD160 709bd01ddbbfb2bf117d0e87d0642c463676c167 SHA1 e14de88cab52ed6e6146122f9997b8b93b3a301e SHA256 1f49924a10c5e53f88912db3e63dc382052e68fdd4c1ea439771a504f5f08566
-AUX xfce4-battery-0.5.0-sysfs.patch 8838 RMD160 3295285f56473996c168cc0a265714f134c359c2 SHA1 1573a3269045cf8baa73bf156d49bd9f3a09bdb2 SHA256 725692d98eead435099e6a27f527523d4984c792751379d7b9b501be04072e39
-AUX xfce4-battery-0.5.1-freebsd.patch 654 RMD160 fd42146bc6fd149a03a48f656c1108c5b8833b0e SHA1 28f8049c305a4f2b3aaa9ad483897083ecb15055 SHA256 750596b88e43f6bac05eaa8f63dd753d9b42a89a31063562905785555be1b919
-DIST xfce4-battery-plugin-0.5.1.tar.bz2 227940 RMD160 ee770f06226cf8dfed95892c152ae3a2a446079a SHA1 f97c1b6445c8da07c17353ae385b5fadb2fd5f1a SHA256 6b90a37d8f01d2f042679a3f3f92f08dee96510096115f52fb9210ef4cad7c61
-EBUILD xfce4-battery-0.5.1.ebuild 741 RMD160 d1c93ee343aba8ac5a629fd10ccd44ebf4914024 SHA1 d602053e15df25d1713e4a31d564427cd4b4e621 SHA256 bae52d92c20fce5977e919828a17c37cf87775bfb6613e82a5ed94499086d025
-MISC ChangeLog 10065 RMD160 ba5659d3ca4b0d216c0d8bcb728b0a14440352b8 SHA1 b14d75f24be1c49264304c24b5e8a9e71d487bda SHA256 f0509a8525c8718e9d6a2cb71c030ec252361aa1d0bf8a251e6e81e7a52628cc
-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
deleted file mode 100644
index 080707a3be3f..000000000000
--- a/xfce-extra/xfce4-battery/files/xfce4-battery-0.5.0-2.6.24-headers.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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/files/xfce4-battery-0.5.0-libacpi.patch b/xfce-extra/xfce4-battery/files/xfce4-battery-0.5.0-libacpi.patch
deleted file mode 100644
index c683b3e002f8..000000000000
--- a/xfce-extra/xfce4-battery/files/xfce4-battery-0.5.0-libacpi.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -ur xfce4-battery-plugin-0.5.0.orig/panel-plugin/libacpi.c xfce4-battery-plugin-0.5.0/panel-plugin/libacpi.c
---- xfce4-battery-plugin-0.5.0.orig/panel-plugin/libacpi.c	2007-01-17 19:56:51.000000000 +0200
-+++ xfce4-battery-plugin-0.5.0/panel-plugin/libacpi.c	2007-02-09 16:34:40.000000000 +0200
-@@ -30,6 +30,7 @@
- #include <stdlib.h>
- #include <sys/types.h>
- #include <dirent.h>
-+#include <glob.h>
- 
- #if HAVE_SYSCTL
- 
-@@ -181,6 +182,22 @@
- #endif
- #endif
- 
-+/* expand file name and fopen first match */
-+static FILE *
-+fopen_glob(const char *name, const char *mode)
-+{
-+  glob_t globbuf;
-+  FILE *fd;
-+
-+  if (glob(name, 0, NULL, &globbuf) != 0)
-+    return NULL;
-+
-+  fd = fopen(globbuf.gl_pathv[0], mode);
-+  globfree(&globbuf);
-+
-+  return fd;
-+}
-+
- /* see if we have ACPI support */
- int check_acpi(void)
- {
-@@ -693,7 +710,7 @@
-     	  else return 0;
-     }
-     proc_fan_status="/proc/acpi/fan/*/state";
--    if ( (fp=fopen(proc_fan_status, "r")) == NULL ) return 0;
-+    if ( (fp=fopen_glob(proc_fan_status, "r")) == NULL ) return 0;
- 
-     fgets(line,255,fp);
-     fclose(fp);
-@@ -706,10 +723,10 @@
- {
- #ifdef __linux__
-   FILE *fp;
--  char *proc_temperature="/proc/acpi/thermal_zone/*0/temperature";
-+  char *proc_temperature="/proc/acpi/thermal_zone/*/temperature";
-   static char *p,line[256];
- 
--  if ( (fp=fopen(proc_temperature, "r")) == NULL) return NULL;
-+  if ( (fp=fopen_glob(proc_temperature, "r")) == NULL) return NULL;
-   fgets(line,255,fp);
-   fclose(fp);
-   p=strtok(line," ");
diff --git a/xfce-extra/xfce4-battery/files/xfce4-battery-0.5.0-sysfs.patch b/xfce-extra/xfce4-battery/files/xfce4-battery-0.5.0-sysfs.patch
deleted file mode 100644
index 640048f519f1..000000000000
--- a/xfce-extra/xfce4-battery/files/xfce4-battery-0.5.0-sysfs.patch
+++ /dev/null
@@ -1,356 +0,0 @@
-diff -ru xfce4-battery-plugin-0.5.0.orig/panel-plugin/libacpi.c xfce4-battery-plugin-0.5.0-fixed/panel-plugin/libacpi.c
---- xfce4-battery-plugin-0.5.0.orig/panel-plugin/libacpi.c	2008-04-06 02:56:10.502679698 +0200
-+++ xfce4-battery-plugin-0.5.0-fixed/panel-plugin/libacpi.c	2008-04-06 03:15:11.306678469 +0200
-@@ -54,6 +54,10 @@
- 
- static char batteries[MAXBATT][128];
- static char battinfo[MAXBATT][128];
-+/* path to AC adapter because not all AC adapter are listed 
-+in /sys/class/power_supply/AC/ this obviously only supports one AC adapter. */
-+static char sysfsacdir[128]; 
-+
- #ifndef __linux__
- #if HAVE_SYSCTL
-  static int
-@@ -181,9 +185,76 @@
- #endif
- #endif
- 
-+int check_acpi_sysfs(void)
-+{
-+	DIR *sysfs;
-+	struct dirent *batt;
-+	char *name;
-+	FILE *typefile;
-+	char typepath[128];
-+	char tmptype[8];
-+
-+	sysfs = opendir("/sys/class/power_supply");
-+	if (sysfs == 0)
-+	{
-+	#ifdef DEBUG
-+	  printf("DBG:No acpi support for sysfs. Trying procfs...\n");
-+	#endif
-+	return 2;
-+	}
-+	
-+	while ((batt = readdir(sysfs)))
-+	{
-+		name = batt->d_name;
-+		if (!strncmp(".", name, 1)) continue;
-+		/* check whether /sys/class/power_supply/$name/type exists and 
-+		contains "Battery" or "Mains" */
-+		sprintf(typepath, "/sys/class/power_supply/%s/type",name);
-+		if(!(typefile = fopen(typepath, "r"))) continue;
-+		fgets(tmptype, 8, typefile);
-+		fclose(typefile);
-+		if(strncmp("Battery", tmptype, 7)==0)
-+		{
-+			sprintf(batteries[batt_count], "/sys/class/power_supply/%s", name);
-+		#ifdef DEBUG
-+			printf("DBG:battery number %d at:\n",batt_count);
-+			printf("DBG:sysfs dir->%s\n",batteries[batt_count]);
-+			printf("DBG:------------------------\n");
-+		#endif
-+			batt_count++;
-+		}
-+		/* I guess that the type of the AC adapter is always "Mains" (?) */
-+		else if(strncmp("Mains", tmptype, 5)==0){
-+			sprintf(sysfsacdir, "/sys/class/power_supply/%s", name);
-+		#ifdef DEBUG
-+			printf("DBG:sysfs AC dir->%s\n",sysfsacdir);
-+			printf("DBG:------------------------\n");
-+		#endif	
-+		}
-+	}
-+	closedir(sysfs);
-+	if ( batt_count == 0 )
-+	{
-+#ifdef DEBUG
-+	  printf("DBG:No acpi support for sysfs. Trying procfs...\n");
-+#endif
-+		acpi_sysfs = 0;
-+		return 2;
-+	}
-+	else
-+	{
-+		acpi_sysfs = 1;
-+		return 0;
-+	}
-+}
-+
- /* see if we have ACPI support */
- int check_acpi(void)
- {
-+#ifdef __linux__
-+	if ( check_acpi_sysfs() == 0 )
-+		return 0;
-+#endif
-   DIR *battdir;
-   struct dirent *batt;
-   char *name;
-@@ -262,9 +333,82 @@
- #endif
- }
- 
-+int read_sysfs_int(char* filename)
-+{
-+	FILE* f;
-+	f = fopen(filename,"r");
-+	if ( !f )
-+	{
-+#ifdef DEBUG
-+	  printf("DBG:Could not open %s\n",filename);
-+#endif
-+		return 0;
-+	}
-+	int out;
-+	fscanf(f,"%d",&out);
-+	fclose(f);
-+	return out;
-+}
-+
-+char* read_sysfs_string(char* filename)
-+{
-+	FILE* f;
-+	f = fopen(filename,"r");
-+	if ( !f )
-+	{
-+#ifdef DEBUG
-+	  printf("DBG:Could not open %s\n",filename);
-+#endif
-+		return NULL;
-+	}
-+	fscanf(f,"%s",buf2);
-+	fclose(f);
-+	return buf2;
-+}
-+
-+int read_acad_state_sysfs(void)
-+{
-+	DIR *sysfs;
-+	struct dirent *propety;
-+	char *name;
-+	char onlinefilepath[128];
-+	
-+	sysfs = opendir(sysfsacdir);
-+	if (sysfs == 0)
-+	{
-+	#ifdef DEBUG
-+		printf("DBG:Can't open %s",sysfsacdir);
-+	#endif
-+		return 0;
-+	}
-+	closedir(sysfs);
-+	
-+	if (!acadstate) acadstate=(ACADstate *)malloc(sizeof(ACADstate));
-+	/* this code doesn't make much sense.. why look at the whole directory?!
-+	while ((propety = readdir(sysfs)))
-+	{
-+		name = propety->d_name;
-+		if (!strncmp(".", name, 1) || !strncmp("..", name, 2)) continue;
-+		
-+		if (strcmp(name,"online") == 0)
-+		{
-+			acadstate->state = ( read_sysfs_int("/sys/class/power_supply/AC/online") == 1 ) ;
-+		}
-+	} 
-+	*/
-+	sprintf(onlinefilepath, "%s/online", sysfsacdir);
-+	/* if onlinefilepath doesn't exist read_sysfs_int() will return 0
-+	so acadstate->state will be 0, that should be ok */
-+	acadstate->state = ( read_sysfs_int(onlinefilepath) == 1 );
-+	
-+	return acadstate->state;
-+}
-+
- int read_acad_state(void)
- {
- #ifdef __linux__
-+	if (acpi_sysfs)
-+		return read_acad_state_sysfs();
-   FILE *acpi;
-   char *ptr;
-   char stat;
-@@ -354,20 +498,83 @@
- #endif
- }
- 
-+int read_acpi_info_sysfs(int battery)
-+{
-+	DIR *sysfs;
-+	struct dirent *propety;
-+	char *name;
-+
-+	sysfs = opendir(batteries[battery]);
-+	if (sysfs == 0)
-+	{
-+	#ifdef DEBUG
-+		  printf("DBG:Can't open %s!\n", batteries[battery]);
-+	#endif
-+	    return 0;
-+	}
-+	/* malloc.. might explain the random battery level values on 2.6.24 
-+	systems (energe_full is called charge_full so the value isn't initialised
-+	and some random data from the heap is displayed..) 
-+	if (!acpiinfo) acpiinfo=(ACPIinfo *)malloc(sizeof(ACPIinfo)); 
-+	*/
-+	if (!acpiinfo) acpiinfo=(ACPIinfo *)calloc(1, sizeof(ACPIinfo));
-+	
-+	while ((propety = readdir(sysfs)))
-+	{
-+		name = propety->d_name;
-+		if (!strncmp(".", name, 1) || !strncmp("..", name, 2)) continue;
-+		/* at least on my system this is called charge_full */
-+		if ((strcmp(name,"energy_full") == 0) || (strcmp(name,"charge_full") == 0))
-+		{
-+			sprintf(buf,"%s/%s",batteries[battery], name);
-+			acpiinfo->last_full_capacity = read_sysfs_int(buf);
-+		}
-+		if ((strcmp(name,"energy_full_design") == 0) || (strcmp(name,"charge_full_design") == 0))
-+		{
-+			sprintf(buf,"%s/%s",batteries[battery], name);
-+			acpiinfo->design_capacity = read_sysfs_int(buf);
-+		}
-+		if (strcmp(name,"technology") == 0)
-+		{
-+			char *tmp;
-+			sprintf(buf,"%s/%s",batteries[battery], name);
-+			tmp = read_sysfs_string(buf);
-+			if (tmp != NULL)
-+			{
-+				if (strcmp(tmp,"Li-ion") == 0)
-+					acpiinfo->battery_technology = 1;
-+				else
-+					acpiinfo->battery_technology = 0;
-+			}
-+		}
-+		if (strcmp(name,"present") == 0)
-+		{
-+			sprintf(buf,"%s/%s",batteries[battery], name);
-+			acpiinfo->present = read_sysfs_int(buf);
-+		}
-+	}
-+	closedir(sysfs);
-+	return acpiinfo->present;
-+}
-+
- int read_acpi_info(int battery)
- {
- #ifdef __linux__
--  FILE *acpi;
--  char *ptr;
--  char stat;
--  int temp;
--
-   if (battery > MAXBATT) {
- #ifdef DEBUG
- 	  printf("DBG: error, battery > MAXBATT (%d)\n",MAXBATT);
- #endif
- 	  return 0;
-   }
-+
-+	if (acpi_sysfs)
-+		return read_acpi_info_sysfs(battery);
-+  
-+	FILE *acpi;
-+  char *ptr;
-+  char stat;
-+  int temp;
-+
-   if (!(acpi = fopen (battinfo[battery], "r"))) {
- #ifdef DEBUG
- 	  printf("DBG:cannot open %s for read!\n",battinfo[battery]);
-@@ -514,9 +721,80 @@
- 
- }
- 
-+int read_acpi_state_sysfs(int battery)
-+{
-+	DIR *sysfs;
-+	struct dirent *propety;
-+	char *name;
-+
-+	sysfs = opendir(batteries[battery]);
-+	if (sysfs == 0)
-+	{
-+	#ifdef DEBUG
-+	  printf("DBG:Can't open %s!\n", batteries[battery]);
-+	#endif
-+	return 0;
-+	}
-+  
-+	/* again it might be better to use calloc 
-+	if (!acpistate) acpistate=(ACPIstate *)malloc(sizeof(ACPIstate));
-+	*/
-+	if (!acpistate) acpistate=(ACPIstate *)calloc(1, sizeof(ACPIstate));
-+
-+	while ((propety = readdir(sysfs)))
-+	{
-+		name = propety->d_name;
-+		if (!strncmp(".", name, 1) || !strncmp("..", name, 2)) continue;
-+		
-+		if (strcmp(name,"status") == 0)
-+		{
-+			char *tmp;
-+			sprintf(buf,"%s/%s",batteries[battery], name);
-+			tmp = read_sysfs_string(buf);
-+			if ( tmp != NULL )
-+			{
-+				if (strcmp(tmp,"Charging") == 0)
-+					acpistate->state = CHARGING;
-+				else if (strcmp(tmp,"Discharging") == 0)
-+					acpistate->state = DISCHARGING;
-+				else if (strcmp(tmp,"Full") == 0)
-+					acpistate->state = POWER;
-+				else
-+					acpistate->state = UNKNOW;
-+			}
-+		}
-+		/* on my system this is called charge_now */
-+		if ((strcmp(name,"energy_now") == 0) || (strcmp(name,"charge_now") == 0))
-+		{
-+			sprintf(buf,"%s/%s",batteries[battery], name);
-+			acpistate->rcapacity = read_sysfs_int(buf);
-+			acpistate->percentage = (((float) acpistate->rcapacity)/acpiinfo->last_full_capacity) * 100;
-+		}
-+		if (strcmp(name,"current_now") == 0)
-+		{
-+			sprintf(buf,"%s/%s",batteries[battery], name);
-+			acpistate->prate = read_sysfs_int(buf);
-+			if ( acpistate->prate < 0 )
-+				acpistate->prate = 0;
-+			if ( acpistate->prate > 0 )
-+				acpistate->rtime = (((float) acpistate->rcapacity) / acpistate->prate) * 60;
-+		}
-+		if (strcmp(name,"voltage_now") == 0)
-+		{
-+			sprintf(buf,"%s/%s",batteries[battery], name);
-+			acpistate->pvoltage = read_sysfs_int(buf);
-+		}
-+	}
-+	closedir(sysfs);
-+	return acpiinfo->present;
-+}
-+
- int read_acpi_state(int battery)
- {
- #ifdef __linux__
-+	if (acpi_sysfs)
-+		return read_acpi_state_sysfs(battery);
-+
-   FILE *acpi;
-   char *ptr;
-   char stat;
-diff -ru xfce4-battery-plugin-0.5.0.orig/panel-plugin/libacpi.h xfce4-battery-plugin-0.5.0-fixed/panel-plugin/libacpi.h
---- xfce4-battery-plugin-0.5.0.orig/panel-plugin/libacpi.h	2007-01-17 18:56:51.000000000 +0100
-+++ xfce4-battery-plugin-0.5.0-fixed/panel-plugin/libacpi.h	2008-04-05 22:13:55.522679792 +0200
-@@ -80,6 +80,8 @@
- int batt_count;
- /* temp buffer */
- char buf[512];
-+char buf2[512];
-+int acpi_sysfs;
- #else
- extern int batt_count;
- extern ACPIstate *acpistate;
diff --git a/xfce-extra/xfce4-battery/files/xfce4-battery-0.5.1-freebsd.patch b/xfce-extra/xfce4-battery/files/xfce4-battery-0.5.1-freebsd.patch
deleted file mode 100644
index 1d929c9b7f3d..000000000000
--- a/xfce-extra/xfce4-battery/files/xfce4-battery-0.5.1-freebsd.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- panel-plugin/battery.c.orig	2008-09-04 22:53:40.000000000 +0200
-+++ panel-plugin/battery.c	2008-09-08 18:12:12.000000000 +0200
-@@ -382,6 +382,7 @@
-           rate = last_rate;
-         }
- 
-+#ifdef __linux__
-         charge = (((float)ccapacity)/((float)lcapacity))*100;
- 
-         if ( last_acline )
-@@ -394,6 +395,20 @@
- 
-         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__
-     else {
diff --git a/xfce-extra/xfce4-battery/metadata.xml b/xfce-extra/xfce4-battery/metadata.xml
deleted file mode 100644
index 826e2ca93209..000000000000
--- a/xfce-extra/xfce4-battery/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>xfce</herd>
-</pkgmetadata>
diff --git a/xfce-extra/xfce4-battery/xfce4-battery-0.5.1.ebuild b/xfce-extra/xfce4-battery/xfce4-battery-0.5.1.ebuild
deleted file mode 100644
index 636273c9e49b..000000000000
--- a/xfce-extra/xfce4-battery/xfce4-battery-0.5.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2009 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.1.ebuild,v 1.7 2009/08/23 21:21:42 ssuominen Exp $
-
-inherit eutils xfce44
-
-xfce44
-
-DESCRIPTION="Battery status panel plugin"
-KEYWORDS="amd64 arm ppc x86 ~x86-fbsd"
-IUSE="debug"
-
-RDEPEND="xfce-base/xfce4-panel"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-freebsd.patch \
-		"${FILESDIR}"/${PN}-0.5.0-libacpi.patch \
-		"${FILESDIR}"/${PN}-0.5.0-2.6.24-headers.patch \
-		"${FILESDIR}"/${PN}-0.5.0-sysfs.patch
-}
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-xfce44_goodies_panel_plugin
diff --git a/xfce-extra/xfce4-cellmodem/ChangeLog b/xfce-extra/xfce4-cellmodem/ChangeLog
deleted file mode 100644
index 6ad2c1a02016..000000000000
--- a/xfce-extra/xfce4-cellmodem/ChangeLog
+++ /dev/null
@@ -1,46 +0,0 @@
-# ChangeLog for xfce-extra/xfce4-cellmodem
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cellmodem/ChangeLog,v 1.9 2009/08/01 01:48:23 darkside Exp $
-
-  01 Aug 2009; Jeremy Olexa <darkside@gentoo.org>
-  xfce4-cellmodem-0.0.5.ebuild:
-  RESTRICT=test, bug 277146
-
-  20 May 2009; Jeremy Olexa <darkside@gentoo.org>
-  xfce4-cellmodem-0.0.5.ebuild:
-  thx for robbat2 for reviewing the code, the virtual should be safe
-
-  20 May 2009; Jeremy Olexa <darkside@gentoo.org>
-  xfce4-cellmodem-0.0.5.ebuild:
-  Depend on SLOT=0 of dev-libs/libusb, bug 270039
-
-  17 Nov 2008; Jeremy Olexa <darkside@gentoo.org>
-  xfce4-cellmodem-0.0.5.ebuild:
-  add missing intltoolize call, bug #239651
-
-  23 Jun 2008; Samuli Suominen <drac@gentoo.org>
-  xfce4-cellmodem-0.0.5.ebuild:
-  Fix xfce4-dev-tools dep.
-
-  23 Jun 2008; Samuli Suominen <drac@gentoo.org>
-  xfce4-cellmodem-0.0.5.ebuild:
-  Fix xfce4-dev-tools dep.
-
-  24 Aug 2007; Christoph Mende <angelos@gentoo.org>
-  xfce4-cellmodem-0.0.5.ebuild:
-  Stable on amd64
-
-  10 Mar 2007; Peter Weller <welp@gentoo.org> xfce4-cellmodem-0.0.5.ebuild:
-  Keyworded on amd64 wrt bug 169987
-
-  09 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
-  xfce4-cellmodem-0.0.5.ebuild:
-  stable x86; bug #169987
-
-*xfce4-cellmodem-0.0.5 (27 Feb 2007)
-
-  27 Feb 2007; Samuli Suominen <drac@gentoo.org>
-  +files/xfce4-cellmodem-0.0.5-asneeded.patch,
-  +xfce4-cellmodem-0.0.5.ebuild:
-  Initial commit for bug 168353. Thanks to Jakub Moc.
-
diff --git a/xfce-extra/xfce4-cellmodem/Manifest b/xfce-extra/xfce4-cellmodem/Manifest
deleted file mode 100644
index 09ddeed50d5b..000000000000
--- a/xfce-extra/xfce4-cellmodem/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX xfce4-cellmodem-0.0.5-asneeded.patch 539 RMD160 cd34cc815a20b44ce30905346be86bb215e34e51 SHA1 5f46549065862861daecb2b260694747dd3f0707 SHA256 a9c098b8bce4539ee34f7b69194ad3538ced111e45c2065775221d22d3701dd6
-DIST xfce4-cellmodem-plugin-0.0.5.tar.gz 155935 RMD160 79fc2e8f02f30a07f4bd39f56e96589e7ac6cc43 SHA1 abbfd359cf8b6eb7f9ec7a925f934f9e2503f298 SHA256 0debba5007f20382bb7135bd0c37fe6e3075ca8fbc810166d5b5fca26965bdce
-EBUILD xfce4-cellmodem-0.0.5.ebuild 958 RMD160 08259a2dd7a01114d62326ffb466f3600df800c0 SHA1 6cc570267e5fcf8ac4ebe783b127062891e1db3b SHA256 9e45a2a46c8232bedee1e802cfae4682b31d98869b03de5601a43348aab082a7
-MISC ChangeLog 1520 RMD160 a38a5a9b79bc22bc9366239a7234264b341514ce SHA1 2707a231545d4bb59430a7fe579e2199810e0246 SHA256 90414b10cceb01797be52ff9220ad50daa52571f5a3c8e16e1ba4c528faf99e5
-MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-extra/xfce4-cellmodem/files/xfce4-cellmodem-0.0.5-asneeded.patch b/xfce-extra/xfce4-cellmodem/files/xfce4-cellmodem-0.0.5-asneeded.patch
deleted file mode 100644
index af854d2dfd1c..000000000000
--- a/xfce-extra/xfce4-cellmodem/files/xfce4-cellmodem-0.0.5-asneeded.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur xfce4-cellmodem-plugin-0.0.5.orig/panel-plugin/Makefile.am xfce4-cellmodem-plugin-0.0.5/panel-plugin/Makefile.am
---- xfce4-cellmodem-plugin-0.0.5.orig/panel-plugin/Makefile.am	2007-01-16 21:58:53.000000000 +0200
-+++ xfce4-cellmodem-plugin-0.0.5/panel-plugin/Makefile.am	2007-02-27 22:55:19.000000000 +0200
-@@ -5,7 +5,7 @@
-         -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
- 	@LIBXFCE4PANEL_CFLAGS@
- 
--xfce4_cellmodem_plugin_LDFLAGS = \
-+xfce4_cellmodem_plugin_LDADD = \
- 	@LIBXFCE4PANEL_LIBS@ 
- 
- xfce4_cellmodem_plugin_SOURCES = \
diff --git a/xfce-extra/xfce4-cellmodem/metadata.xml b/xfce-extra/xfce4-cellmodem/metadata.xml
deleted file mode 100644
index 826e2ca93209..000000000000
--- a/xfce-extra/xfce4-cellmodem/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>xfce</herd>
-</pkgmetadata>
diff --git a/xfce-extra/xfce4-cellmodem/xfce4-cellmodem-0.0.5.ebuild b/xfce-extra/xfce4-cellmodem/xfce4-cellmodem-0.0.5.ebuild
deleted file mode 100644
index 82f4a18ec803..000000000000
--- a/xfce-extra/xfce4-cellmodem/xfce4-cellmodem-0.0.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cellmodem/xfce4-cellmodem-0.0.5.ebuild,v 1.9 2009/08/01 01:48:23 darkside Exp $
-
-# This is the wrong approach, but there is no motivation to fix tests here. bug
-# 277146
-RESTRICT="test"
-
-inherit autotools eutils xfce44
-
-xfce44
-xfce44_gzipped
-
-DESCRIPTION="Panel plugin for monitoring cellular modems - GPRS/UMTS(3G)/HSDPA(3.5G)"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND="sys-apps/pciutils
-	=virtual/libusb-0*"
-DEPEND="${RDEPEND}
-	>=dev-util/xfce4-dev-tools-${XFCE_MASTER_VERSION}
-	dev-util/pkgconfig
-	dev-util/intltool"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-	intltoolize --force --copy --automake || die "intltoolize failed."
-	AT_M4DIR=/usr/share/xfce4/dev-tools/m4macros eautoreconf
-}
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-xfce44_goodies_panel_plugin