old

(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

3 files changed, 6 insertions, 101 deletions

diff --git a/xfce-extra/xfce4-battery-plugin/ChangeLog b/xfce-extra/xfce4-battery-plugin/ChangeLog
index a6f2abe0629d..0000a2ede489 100644
--- a/xfce-extra/xfce4-battery-plugin/ChangeLog
+++ b/xfce-extra/xfce4-battery-plugin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-extra/xfce4-battery-plugin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-battery-plugin/ChangeLog,v 1.20 2012/05/22 05:14:35 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-battery-plugin/ChangeLog,v 1.21 2012/05/22 06:41:17 ssuominen Exp $
+
+  22 May 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -xfce4-battery-plugin-1.0.0-r1.ebuild,
+  -files/xfce4-battery-plugin-1.0.0-sysfs.patch:
+  old
 
   22 May 2012; Jeff Horelick <jdhore@gentoo.org>
   xfce4-battery-plugin-1.0.4.ebuild:
diff --git a/xfce-extra/xfce4-battery-plugin/files/xfce4-battery-plugin-1.0.0-sysfs.patch b/xfce-extra/xfce4-battery-plugin/files/xfce4-battery-plugin-1.0.0-sysfs.patch
deleted file mode 100644
index d20680ed8d90..000000000000
--- a/xfce-extra/xfce4-battery-plugin/files/xfce4-battery-plugin-1.0.0-sysfs.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From e33899de3205edfc0b2c330f43da6a4bc8141b85 Mon Sep 17 00:00:00 2001
-From: Florian Rivoal <frivoal@xfce.org>
-Date: Sat, 26 Feb 2011 13:53:09 +0000
-Subject: Add support for getting the temperature from sysfs
-
-Up to the linux kernel version 2.6.37, this information was available in
-the proc file system, but after that, it is only available from the sys
-file system.
-
-This fixes bug #7339.
----
-diff --git a/panel-plugin/libacpi.c b/panel-plugin/libacpi.c
-index 838a760..0e368f4 100644
---- a/panel-plugin/libacpi.c
-+++ b/panel-plugin/libacpi.c
-@@ -1002,18 +1002,36 @@ const char *get_temperature(void)
- #ifdef __linux__
-   FILE *fp;
-   char *proc_temperature="/proc/acpi/thermal_zone/*/temperature";
--  static char *p,line[256];
--
--  if ( (fp=fopen_glob(proc_temperature, "r")) == NULL) return NULL;
--  fgets(line,255,fp);
--  fclose(fp);
--  p=strtok(line," ");
--  if (!p) return NULL;
--  p=p+strlen(p)+1;
--  while (p && *p ==' ') p++;
--  if (*p==0) return NULL;
--  if (strchr(p,'\n')) p=strtok(p,"\n");
--  return (const char *)p;
-+  char *sys_temperature="/sys/class/thermal/thermal_zone*/temp";
-+  static char *p,*p2,line[256];
-+
-+  if ( (fp=fopen_glob(proc_temperature, "r")) != NULL )
-+  {
-+    fgets(line,255,fp);
-+    fclose(fp);
-+    p=strtok(line," ");
-+    if (!p) return NULL;
-+    p=p+strlen(p)+1;
-+    while (p && *p ==' ') p++;
-+    if (*p==0) return NULL;
-+    if (strchr(p,'\n')) p=strtok(p,"\n");
-+    return (const char *)p;
-+  }
-+  else if ( (fp=fopen_glob(sys_temperature, "r")) != NULL )
-+  {
-+    fgets(line,255,fp);
-+    fclose(fp);
-+    p = line;
-+    if (strchr(p,'\n')) *strchr(p,'\n') = 0;
-+    if (strlen(p) <= 3) return NULL;
-+    p2 = p + strlen(p) - 3;
-+    strcpy(p2, " C");
-+    return (const char *)p;
-+  }
-+  else
-+  {
-+    return NULL;
-+  }
- #else
- #ifdef HAVE_SYSCTL
-   static char buf[BUFSIZ];
---
-cgit v0.8.3.4
diff --git a/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.0.0-r1.ebuild b/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.0.0-r1.ebuild
deleted file mode 100644
index 949060d9cf09..000000000000
--- a/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.0.0-r1.ebuild,v 1.8 2012/05/20 19:45:26 ssuominen Exp $
-
-EAPI=4
-inherit multilib xfconf
-
-DESCRIPTION="A battery monitor panel plugin for the Xfce desktop environment"
-HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="debug"
-
-RDEPEND=">=x11-libs/gtk+-2.6:2
-	>=xfce-base/libxfce4util-4.8
-	>=xfce-base/libxfcegui4-4.8
-	>=xfce-base/xfce4-panel-4.8"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-pkg_setup() {
-	PATCHES=( "${FILESDIR}"/${P}-sysfs.patch )
-
-	XFCONF=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README )
-}