Cleanup and added network devices to the hddtemp patch, bug 233727

(Portage version: 2.2_rc9/cvs/Linux 2.6.27-rc6 x86_64)

5 files changed, 36 insertions, 48 deletions

diff --git a/xfce-extra/xfce4-sensors/ChangeLog b/xfce-extra/xfce4-sensors/ChangeLog
index 75c0c9e45c4c..5dddcf740836 100644
--- a/xfce-extra/xfce4-sensors/ChangeLog
+++ b/xfce-extra/xfce4-sensors/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for xfce-extra/xfce4-sensors
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-sensors/ChangeLog,v 1.35 2008/08/22 21:20:34 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-sensors/ChangeLog,v 1.36 2008/09/26 14:18:47 angelos Exp $
+
+*xfce4-sensors-0.10.99.3-r3 (26 Sep 2008)
+
+  26 Sep 2008; Christoph Mende <angelos@gentoo.org>
+  -files/xfce4-sensors-0.10.99.3-acpi.patch,
+  +files/xfce4-sensors-0.10.99.3-hddtemp2.patch,
+  -xfce4-sensors-0.10.99.3.ebuild, -xfce4-sensors-0.10.99.3-r1.ebuild,
+  +xfce4-sensors-0.10.99.3-r3.ebuild:
+  Cleanup and added network devices to the hddtemp patch, bug 233727
 
   22 Aug 2008; Markus Meier <maekke@gentoo.org>
   xfce4-sensors-0.10.99.3-r2.ebuild:
diff --git a/xfce-extra/xfce4-sensors/files/xfce4-sensors-0.10.99.3-acpi.patch b/xfce-extra/xfce4-sensors/files/xfce4-sensors-0.10.99.3-acpi.patch
deleted file mode 100644
index 08afcb99aa00..000000000000
--- a/xfce-extra/xfce4-sensors/files/xfce4-sensors-0.10.99.3-acpi.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur xfce4-sensors-plugin-0.10.99.3_a/panel-plugin/middlelayer.c xfce4-sensors-plugin-0.10.99.3_b/panel-plugin/middlelayer.c
---- xfce4-sensors-plugin-0.10.99.3_a/panel-plugin/middlelayer.c	2007-11-24 16:03:25.000000000 +0100
-+++ xfce4-sensors-plugin-0.10.99.3_b/panel-plugin/middlelayer.c	2008-04-16 12:04:48.000000000 +0200
-@@ -187,7 +187,7 @@
-             feature = (t_chipfeature *) g_ptr_array_index (chip->chip_features, number);
-             g_assert (feature!=NULL);
-             /*  *value = get_acpi_zone_value (feature->name); */
--            /* refresh_acpi ((gpointer) feature);   */
-+            refresh_acpi ((gpointer) feature, NULL);
-             *value = feature->raw_value;
-             return 0; /* HERE    I    AM,    I    WANNA    BE    FIXED    */
-         #else
diff --git a/xfce-extra/xfce4-sensors/files/xfce4-sensors-0.10.99.3-hddtemp2.patch b/xfce-extra/xfce4-sensors/files/xfce4-sensors-0.10.99.3-hddtemp2.patch
new file mode 100644
index 000000000000..ac9d521e5871
--- /dev/null
+++ b/xfce-extra/xfce4-sensors/files/xfce4-sensors-0.10.99.3-hddtemp2.patch
@@ -0,0 +1,21 @@
+--- panel-plugin/hddtemp.c	2008-08-02 16:50:41.000000000 +0100
++++ panel-plugin/hddtemp.c.new	2008-08-02 16:50:51.000000000 +0100
+@@ -122,6 +122,9 @@ read_disks_linux26 (t_chip *chip)
+     while ( (dirname = g_dir_read_name (gdir))!=NULL ) {
+         if ( strncmp (dirname, "ram", 3)!=0 &&
+              strncmp (dirname, "loop", 4)!=0 &&
++	     strncmp (dirname, "md", 2)!=0 &&
++	     strncmp (dirname, "fd", 2)!=0 &&
++	     strncmp (dirname, "nbd", 3)!=0 &&
+              strncmp (dirname, "dm-", 3)!=0 ) {
+             /* TODO: look, if /dev/dirname exists? */
+             chipfeature = g_new0 (t_chipfeature, 1);
+@@ -283,7 +286,7 @@ get_hddtemp_value (char* disk)
+ 
+     TRACE ("enters get_hddtemp_value for %s", disk);
+ 
+-    cmd_line = g_strdup_printf ( "%s -F -n -q %s", PATH_HDDTEMP, disk);
++    cmd_line = g_strdup_printf ( "%s -n -q %s", PATH_HDDTEMP, disk);
+ 
+     msg_text = NULL;
+ 
diff --git a/xfce-extra/xfce4-sensors/xfce4-sensors-0.10.99.3-r1.ebuild b/xfce-extra/xfce4-sensors/xfce4-sensors-0.10.99.3-r3.ebuild
index 3b0da415e6de..889fc7c46984 100644
--- a/xfce-extra/xfce4-sensors/xfce4-sensors-0.10.99.3-r1.ebuild
+++ b/xfce-extra/xfce4-sensors/xfce4-sensors-0.10.99.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-sensors/xfce4-sensors-0.10.99.3-r1.ebuild,v 1.1 2008/05/31 11:48:21 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-sensors/xfce4-sensors-0.10.99.3-r3.ebuild,v 1.1 2008/09/26 14:18:47 angelos Exp $
 
 inherit eutils xfce44
 
@@ -23,15 +23,15 @@ pkg_setup() {
 		XFCE_CONFIG+=" --enable-procacpi"
 		ewarn "Because you disabled all USE flags, selecting acpi for you."
 	fi
-
-	DOCS="AUTHORS ChangeLog NEWS NOTES README TODO"
 }
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-hddtemp.patch \
-		"${FILESDIR}"/${P}-acpi.patch
+
+	epatch "${FILESDIR}"/${P}-hddtemp2.patch
 }
 
+DOCS="AUTHORS ChangeLog NEWS NOTES README TODO"
+
 xfce44_goodies_panel_plugin
diff --git a/xfce-extra/xfce4-sensors/xfce4-sensors-0.10.99.3.ebuild b/xfce-extra/xfce4-sensors/xfce4-sensors-0.10.99.3.ebuild
deleted file mode 100644
index f24eef6f3ec4..000000000000
--- a/xfce-extra/xfce4-sensors/xfce4-sensors-0.10.99.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-sensors/xfce4-sensors-0.10.99.3.ebuild,v 1.4 2008/03/22 11:22:41 nixnut Exp $
-
-inherit xfce44
-
-xfce44
-
-DESCRIPTION="acpi, lm_sensors and hddtemp panel plugin"
-KEYWORDS="amd64 ppc x86"
-IUSE="acpi debug hddtemp lm_sensors"
-
-RDEPEND="lm_sensors? ( sys-apps/lm_sensors )
-	hddtemp? ( app-admin/hddtemp )"
-DEPEND="dev-util/intltool"
-
-pkg_setup() {
-	XFCE_CONFIG+=" $(use_enable hddtemp)
-		$(use_enable lm_sensors libsensors)
-		$(use_enable acpi procacpi)"
-
-	if ! use hddtemp && ! use lm_sensors && ! use acpi; then
-		XFCE_CONFIG+=" --enable-procacpi"
-		ewarn "Because you disabled all USE flags, selecting acpi for you."
-	fi
-}
-
-DOCS="AUTHORS ChangeLog NEWS NOTES README TODO"
-
-xfce44_goodies_panel_plugin