Cleaning up FILESDIR, cleaning up some of the older versions. Fixing the bashisms in the init-script (thanks to Mike Arthur <mike at mikearthur.co.uk> in #178781).

(Portage version: 2.1.2.7)

30 files changed, 52 insertions, 1485 deletions

diff --git a/sys-apps/lm_sensors/ChangeLog b/sys-apps/lm_sensors/ChangeLog
index 4dd404a11704..9eca95e31da3 100644
--- a/sys-apps/lm_sensors/ChangeLog
+++ b/sys-apps/lm_sensors/ChangeLog
@@ -1,6 +1,34 @@
 # ChangeLog for sys-apps/lm_sensors
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.67 2007/04/11 19:51:21 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.68 2007/05/17 07:31:41 phreak Exp $
+
+  17 May 2007; Christian Heim <phreak@gentoo.org>
+  -files/lm_sensors-2.9.2-lm_sensors-init.d,
+  -files/lm_sensors-2.9.2-sensord-conf.d,
+  -files/lm_sensors-2.9.2-sensord-init.d,
+  -files/lm_sensors-2.9.2-sensors-detect-gentoo.patch,
+  -files/lm_sensors-2.10.0-fancontrol-init.d,
+  -files/lm_sensors-2.10.0-lm_sensors-init.d,
+  -files/lm_sensors-2.10.0-sensord-conf.d,
+  -files/lm_sensors-2.10.0-sensord-init.d,
+  -files/lm_sensors-2.10.0-sensors-detect-gentoo.patch,
+  -files/lm_sensors-2.10.1-fancontrol-init.d,
+  -files/lm_sensors-2.10.1-lm_sensors-init.d,
+  -files/lm_sensors-2.10.1-sensord-conf.d,
+  -files/lm_sensors-2.10.1-sensord-init.d,
+  -files/lm_sensors-2.10.2-fancontrol-init.d,
+  -files/lm_sensors-2.10.2-lm_sensors-init.d,
+  -files/lm_sensors-2.10.2-sensord-conf.d,
+  -files/lm_sensors-2.10.2-sensord-init.d,
+  -files/lm_sensors-2.10.2-sensors-detect-gentoo.patch,
+  +files/fancontrol-init.d, +files/lm_sensors-init.d, +files/sensord-conf.d,
+  +files/sensord-init.d, -lm_sensors-2.9.2.ebuild,
+  -lm_sensors-2.9.2-r2.ebuild, -lm_sensors-2.10.0.ebuild,
+  -lm_sensors-2.10.0-r2.ebuild, lm_sensors-2.10.1.ebuild,
+  lm_sensors-2.10.2.ebuild, lm_sensors-2.10.3.ebuild:
+  Cleaning up FILESDIR, cleaning up some of the older versions. Fixing the
+  bashisms in the init-script (thanks to Mike Arthur <mike at
+  mikearthur.co.uk> in #178781).
 
 *lm_sensors-2.10.3 (11 Apr 2007)
 
diff --git a/sys-apps/lm_sensors/files/digest-lm_sensors-2.10.0 b/sys-apps/lm_sensors/files/digest-lm_sensors-2.10.0
deleted file mode 100644
index cd0598b2a998..000000000000
--- a/sys-apps/lm_sensors/files/digest-lm_sensors-2.10.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6a5327c9e291c5e2bef62e2277bce962 lm_sensors-2.10.0.tar.gz 879631
-RMD160 8bb5dd4fbb9b7fba2f60f8a8d00d7b54231ddf37 lm_sensors-2.10.0.tar.gz 879631
-SHA256 e2fe2c79dc1f219ae85606ad1e556edcd2e55adbabf8bb45dc3c11c00503050d lm_sensors-2.10.0.tar.gz 879631
diff --git a/sys-apps/lm_sensors/files/digest-lm_sensors-2.10.0-r2 b/sys-apps/lm_sensors/files/digest-lm_sensors-2.10.0-r2
deleted file mode 100644
index cd0598b2a998..000000000000
--- a/sys-apps/lm_sensors/files/digest-lm_sensors-2.10.0-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6a5327c9e291c5e2bef62e2277bce962 lm_sensors-2.10.0.tar.gz 879631
-RMD160 8bb5dd4fbb9b7fba2f60f8a8d00d7b54231ddf37 lm_sensors-2.10.0.tar.gz 879631
-SHA256 e2fe2c79dc1f219ae85606ad1e556edcd2e55adbabf8bb45dc3c11c00503050d lm_sensors-2.10.0.tar.gz 879631
diff --git a/sys-apps/lm_sensors/files/digest-lm_sensors-2.9.2 b/sys-apps/lm_sensors/files/digest-lm_sensors-2.9.2
deleted file mode 100644
index 48df55c1337f..000000000000
--- a/sys-apps/lm_sensors/files/digest-lm_sensors-2.9.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 229f83cfbd081d5e7bd46885efec1c72 lm_sensors-2.9.2.tar.gz 860624
-RMD160 1facd2f05ab31d819b12da73067952d74496fbcb lm_sensors-2.9.2.tar.gz 860624
-SHA256 e40573335a895c88bdc040126fd6bb73199bef0169b2b88c6a1ef916c03803c7 lm_sensors-2.9.2.tar.gz 860624
diff --git a/sys-apps/lm_sensors/files/digest-lm_sensors-2.9.2-r2 b/sys-apps/lm_sensors/files/digest-lm_sensors-2.9.2-r2
deleted file mode 100644
index 48df55c1337f..000000000000
--- a/sys-apps/lm_sensors/files/digest-lm_sensors-2.9.2-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 229f83cfbd081d5e7bd46885efec1c72 lm_sensors-2.9.2.tar.gz 860624
-RMD160 1facd2f05ab31d819b12da73067952d74496fbcb lm_sensors-2.9.2.tar.gz 860624
-SHA256 e40573335a895c88bdc040126fd6bb73199bef0169b2b88c6a1ef916c03803c7 lm_sensors-2.9.2.tar.gz 860624
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.10.0-fancontrol-init.d b/sys-apps/lm_sensors/files/fancontrol-init.d
index af25572d396d..fb163abc23b2 100644
--- a/sys-apps/lm_sensors/files/lm_sensors-2.10.0-fancontrol-init.d
+++ b/sys-apps/lm_sensors/files/fancontrol-init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-2.10.0-fancontrol-init.d,v 1.2 2006/02/15 20:30:52 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/fancontrol-init.d,v 1.1 2007/05/17 07:31:41 phreak Exp $
 
 CONFIG=/etc/fancontrol
 PID=/var/run/fancontrol.pid
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.10.0-sensors-detect-gentoo.patch b/sys-apps/lm_sensors/files/lm_sensors-2.10.0-sensors-detect-gentoo.patch
deleted file mode 100644
index bb624cc9fbb5..000000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-2.10.0-sensors-detect-gentoo.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-diff -urp lm_sensors-2.10.0/prog/detect/sensors-detect lm_sensors-2.10.0-sensors-detect-gentoo/prog/detect/sensors-detect
---- lm_sensors-2.10.0/prog/detect/sensors-detect	2006-02-15 02:46:49.000000000 +0100
-+++ lm_sensors-2.10.0-sensors-detect-gentoo/prog/detect/sensors-detect	2006-02-15 18:43:41.000000000 +0100
-@@ -26,6 +26,9 @@
- # each be put in a separate file, using modules and packages. That is beyond
- # me.
- 
-+# Gentoo specific modifications based on a patch from Rudo Thomas
-+# <thomr9am@ss1000.ms.mff.cuni.cz>
-+
- require 5.004;
- 
- use strict;
-@@ -5227,39 +5230,46 @@ sub main
-         "I will now generate the commands needed to load the I2C modules.\n";
-      
-   my ($modprobes, $configfile) = generate_modprobes 1;	# 1 == prefer ISA
-+  print "\nIf you want to load the modules at startup, generate a config file\n",
-+        "below and make sure lm_sensors gets started at boot time; e.g\n",
-+        "\$ rc-update add lm_sensors default\n";
-   print "\nTo make the sensors modules behave correctly, add these lines to\n",
--        "$modules_conf:\n\n";
-+        "/etc/modules.d/lm_sensors and run modules-update:\n\n";
-   print "#----cut here----\n";
-   print $configfile;
--  print "#----cut here----\n";
--  print "\nTo load everything that is needed, add this to some /etc/rc* ",
--        "file:\n\n";
--  print "#----cut here----\n";
--  print $modprobes;
--  print "# sleep 2 # optional\n",
--        "/usr/local/bin/sensors -s # recommended\n";
--  print "#----cut here----\n";
-+  print "#----end cut here----\n";
-   print "\nWARNING! If you have some things built into your kernel, the list above\n",
-         "will contain too many modules. Skip the appropriate ones! You really should\n",
-         "try these commands right now to make sure everything is working properly.\n",
-         "Monitoring programs won't work until it's done.\n";
-   
--  my $have_sysconfig = -d '/etc/sysconfig';
--  print "\nDo you want to generate /etc/sysconfig/lm_sensors? (".
--    ($have_sysconfig?"YES/no":"yes/NO")."): ";
--  if ($> != 0) {
--    print "\nAs you are not root, we shall skip this step.\n";
--  } else {
--    $_ = <STDIN>;
--    if (($have_sysconfig and not m/^\s*[Nn]/) or m/^\s*[Yy]/) {
--      unless ($have_sysconfig) {
--        mkdir '/etc/sysconfig', 0777
--          or die "Sorry, can't create /etc/sysconfig ($!)?!?";
--      }
--      open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors")
--        or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)?!?";
--      print SYSCONFIG <<'EOT';
--#    /etc/sysconfig/sensors - Defines modules loaded by /etc/rc.d/init.d/lm_sensors
-+
-+  print "To load everything that is needed, execute the commands below...";
-+
-+  print "\n\n#----cut here----\n";
-+  print $modprobes;
-+  print "# sleep 2 # optional\n",
-+        "/usr/bin/sensors -s # recommended\n";
-+  print "#----end cut here----\n";
-+
-+  my $have_config = -f '/etc/conf.d/lm_sensors';
-+  print "\nDo you want to ".($have_config?"overwrite":"generate").
-+	    " /etc/conf.d/lm_sensors? Enter s to specify other file name?\n",
-+        "  (".($have_config?"yes/NO":"YES/no")."/s): ";
-+  my $reply = <STDIN>;
-+
-+  if (($have_config and $reply =~ /^\s*[Yy]/) or
-+	  (not $have_config and not $reply =~ /^\s*[Nn]/) or
-+	  $reply =~ /^\s*[Ss]/) {
-+	  my $filename = "/etc/conf.d/lm_sensors";
-+	  if ($reply =~ /^\s*[Ss]/) {
-+		  print "Specify the file to store the configuration to: ";
-+		  $filename = <STDIN>;
-+	  }
-+	  open(SYSCONFIG, ">".$filename)
-+		  or die "Sorry, can't create $filename ($!).";
-+	  print SYSCONFIG <<'EOT';
-+#    /etc/conf.d/sensors - Defines modules loaded by /etc/init.d/lm_sensors
- #    Copyright (c) 1998 - 2001  Frodo Looijaard <frodol@dds.nl>
- #
- #    This program is free software; you can redistribute it and/or modify
-@@ -5280,18 +5290,27 @@ sub main
- # See also the lm_sensors homepage at:
- #     http://www2.lm-sensors.nu/~lm78/index.html
- #
--# This file is used by /etc/rc.d/init.d/lm_sensors and defines the modules to
--# be loaded/unloaded. This file is sourced into /etc/rc.d/init.d/lm_sensors.
-+# This file is used by /etc/init.d/lm_sensors and defines the modules to
-+# be loaded/unloaded. This file is sourced into /etc/init.d/lm_sensors.
- #
- # The format of this file is a shell script that simply defines the modules
- # in order as normal variables with the special names:
- #    MODULE_0, MODULE_1, MODULE_2, etc.
- #
-+# Please note that the numbers in MODULE_X must start at 0 and increase in
-+# steps of 1. Any number that is missing will make the init script skip the
-+# rest of the modules. Use MODULE_X_ARGS for arguments.
-+#
- # List the modules that are to be loaded for your system
- #
- EOT
-       print SYSCONFIG
--       "# Generated by sensors-detect on " . scalar localtime() . "\n";
-+	  "# Generated by sensors-detect on " . scalar localtime() . "\n\n";
-+      print SYSCONFIG
-+		  "# Load modules at startup\n".
-+		  "LOADMODULES=yes\n\n".
-+		  "# Initialize sensors at startup\n".
-+		  "INITSENSORS=yes\n\n";
-       my @modules = grep /^modprobe /, split "\n", $modprobes;
-       my $i = 0;
-       my $sysconfig = "";
-@@ -5301,9 +5320,7 @@ EOT
-         $i++;
-       }
-       print SYSCONFIG $sysconfig;
--      print "Copy prog/init/lm_sensors.init to /etc/rc.d/init.d/lm_sensors\n";
--      print "for initialization at boot time.\n";
--    }
-+      print "Done.\n";
-   }
- }
- 
-Only in lm_sensors-2.10.0-sensors-detect-gentoo/prog/detect: sensors-detect~
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.10.1-fancontrol-init.d b/sys-apps/lm_sensors/files/lm_sensors-2.10.1-fancontrol-init.d
deleted file mode 100644
index 99b961681601..000000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-2.10.1-fancontrol-init.d
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-2.10.1-fancontrol-init.d,v 1.1 2006/09/29 15:04:55 phreak Exp $
-
-CONFIG=/etc/fancontrol
-PID=/var/run/fancontrol.pid
-
-depend() {
-	after lm_sensors
-}
-
-checkconfig() {
-	if [ ! -f ${CONFIG} ]; then
-		eerror "Configuration file ${CONFIG} not found"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting fancontrol"
-	start-stop-daemon --start --quiet --background --pidfile ${PID} \
-		--exec /usr/sbin/fancontrol -- ${CONFIG}
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping fancontrol"
-	start-stop-daemon --stop --pidfile ${PID}
-	eend ${?}
-}
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.10.1-lm_sensors-init.d b/sys-apps/lm_sensors/files/lm_sensors-2.10.1-lm_sensors-init.d
deleted file mode 100644
index eb77c2abc250..000000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-2.10.1-lm_sensors-init.d
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-2.10.1-lm_sensors-init.d,v 1.1 2006/09/29 15:04:55 phreak Exp $
-
-checkconfig() {
-	if [ ! -f /etc/conf.d/lm_sensors ]; then
-		eerror "/etc/conf.d/lm_sensors does not exist, try running sensors-detect"
-		return 1
-	fi
-
-	if [ "${LOADMODULES}" = "yes" -a -f /proc/modules ]; then
-		if [ -z "${MODULE_0}" ]; then
-			eerror "MODULE_0 is not set in /etc/conf.d/lm_sensors, try running sensors-detect"
-			return 1
-		fi
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	if [ "${LOADMODULES}" = "yes" -a -f /proc/modules ]; then
-		einfo "Loading lm_sensors modules..."
-
-		mount | grep sysfs &> /dev/null
-		if [ ${?} == 0 ]; then
-			if ! ( [ -e /sys/i2c ] || [ -e /sys/bus/i2c ] ); then
-				ebegin "  Loading i2c-core"
-				modprobe i2c-core &> /dev/null
-				if [ ${?} != 0 ]; then
-					eerror "    Could not load i2c-core!"
-					eend 1
-				fi
-				( [ -e /sys/i2c ] || [ -e /sys/bus/i2c ] ) || return 1
-				eend 0
-			fi
-		elif ! [ -e /proc/sys/dev/sensors ]; then
-			ebegin "  Loading i2c-proc"
-			modprobe i2c-proc &> /dev/null
-			if [ ${?} != 0 ]; then
-				eerror "    Could not load i2c-proc!"
-				eend 1
-			fi
-			[ -e /proc/sys/dev/sensors ] || return 1
-			eend 0
-		fi
-
-		i=0
-		while true; do
-			module=`eval echo '$'MODULE_${i}`
-			module_args=`eval echo '$'MODULE_${i}_ARGS`
-			if [ -z "${module}" ]; then
-				break
-			fi
-			ebegin "  Loading ${module}"
-			modprobe ${module} ${module_args} &> /dev/null
-			eend $?
-			i=$((i+1))
-		done
-	fi
-
-	if [ "${INITSENSORS}" = "yes" ]; then
-		if ! [ -f /etc/sensors.conf ]; then
-			eerror "/etc/sensors.conf does not exist!"
-			return 1
-		fi
-
-		ebegin "Initializing sensors"
-		/usr/bin/sensors -s &> /dev/null
-		eend ${?}
-	fi
-}
-
-stop() {
-	checkconfig || return 1
-
-	if [ "${LOADMODULES}" = "yes" -a -f /proc/modules ]; then
-		einfo "Unloading lm_sensors modules..."
-
-		# find the highest possible MODULE_ number
-		i=0
-		while true; do
-			module=`eval echo '$'MODULE_${i}`
-			if [ -z "${module}" ] ; then
-				break
-			fi
-			i=$((i+1))
-		done
-
-		while [ ${i} -gt 0 ]; do
-			i=$((i-1))
-			module=`eval echo '$'MODULE_${i}`
-			ebegin "  Unloading ${module}"
-			rmmod ${module} &> /dev/null
-			eend $?
-		done
-
-		if [ -e /proc/sys/dev/sensors ] ; then
-			ebegin "  Unloading i2c-proc"
-			rmmod i2c-proc &> /dev/null
-			eend $?
-		fi
-	fi
-}
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.10.1-sensord-conf.d b/sys-apps/lm_sensors/files/lm_sensors-2.10.1-sensord-conf.d
deleted file mode 100644
index d82841aebd4a..000000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-2.10.1-sensord-conf.d
+++ /dev/null
@@ -1,3 +0,0 @@
-# Extra options to pass to the sensord daemon,
-# see sensord(8) for more information
-SENSORD_OPTIONS=""
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.10.1-sensord-init.d b/sys-apps/lm_sensors/files/lm_sensors-2.10.1-sensord-init.d
deleted file mode 100644
index c224e5568b0e..000000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-2.10.1-sensord-init.d
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-2.10.1-sensord-init.d,v 1.1 2006/09/29 15:04:55 phreak Exp $
-
-CONFIG=/etc/sensors.conf
-
-depend() {
-	need logger
-	use lm_sensors
-}
-
-checkconfig() {
-	if [ ! -f ${CONFIG} ]; then
-		eerror "Configuration file ${CONFIG} not found"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting sensord"
-	start-stop-daemon --start --exec /usr/sbin/sensord \
-		-- --config-file ${CONFIG} ${SENSORD_OPTIONS}
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping sensord"
-	start-stop-daemon --stop --pidfile /var/run/sensord.pid
-	eend ${?}
-}
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.10.2-fancontrol-init.d b/sys-apps/lm_sensors/files/lm_sensors-2.10.2-fancontrol-init.d
deleted file mode 100644
index 4e832dc53440..000000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-2.10.2-fancontrol-init.d
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-2.10.2-fancontrol-init.d,v 1.1 2007/01/20 18:20:03 phreak Exp $
-
-CONFIG=/etc/fancontrol
-PID=/var/run/fancontrol.pid
-
-depend() {
-	after lm_sensors
-}
-
-checkconfig() {
-	if [ ! -f ${CONFIG} ]; then
-		eerror "Configuration file ${CONFIG} not found"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting fancontrol"
-	start-stop-daemon --start --quiet --background --pidfile ${PID} \
-		--exec /usr/sbin/fancontrol -- ${CONFIG}
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping fancontrol"
-	start-stop-daemon --stop --pidfile ${PID}
-	eend ${?}
-}
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.10.2-lm_sensors-init.d b/sys-apps/lm_sensors/files/lm_sensors-2.10.2-lm_sensors-init.d
deleted file mode 100644
index 95e26ff84764..000000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-2.10.2-lm_sensors-init.d
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-2.10.2-lm_sensors-init.d,v 1.1 2007/01/20 18:20:03 phreak Exp $
-
-checkconfig() {
-	if [ ! -f /etc/conf.d/lm_sensors ]; then
-		eerror "/etc/conf.d/lm_sensors does not exist, try running sensors-detect"
-		return 1
-	fi
-
-	if [ "${LOADMODULES}" = "yes" -a -f /proc/modules ]; then
-		if [ -z "${MODULE_0}" ]; then
-			eerror "MODULE_0 is not set in /etc/conf.d/lm_sensors, try running sensors-detect"
-			return 1
-		fi
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	if [ "${LOADMODULES}" = "yes" -a -f /proc/modules ]; then
-		einfo "Loading lm_sensors modules..."
-
-		mount | grep sysfs &> /dev/null
-		if [ ${?} == 0 ]; then
-			if ! ( [ -e /sys/i2c ] || [ -e /sys/bus/i2c ] ); then
-				ebegin "  Loading i2c-core"
-				modprobe i2c-core &> /dev/null
-				if [ ${?} != 0 ]; then
-					eerror "    Could not load i2c-core!"
-					eend 1
-				fi
-				( [ -e /sys/i2c ] || [ -e /sys/bus/i2c ] ) || return 1
-				eend 0
-			fi
-		elif ! [ -e /proc/sys/dev/sensors ]; then
-			ebegin "  Loading i2c-proc"
-			modprobe i2c-proc &> /dev/null
-			if [ ${?} != 0 ]; then
-				eerror "    Could not load i2c-proc!"
-				eend 1
-			fi
-			[ -e /proc/sys/dev/sensors ] || return 1
-			eend 0
-		fi
-
-		i=0
-		while true; do
-			module=`eval echo '$'MODULE_${i}`
-			module_args=`eval echo '$'MODULE_${i}_ARGS`
-			if [ -z "${module}" ]; then
-				break
-			fi
-			ebegin "  Loading ${module}"
-			modprobe ${module} ${module_args} &> /dev/null
-			eend $?
-			i=$((i+1))
-		done
-	fi
-
-	if [ "${INITSENSORS}" = "yes" ]; then
-		if ! [ -f /etc/sensors.conf ]; then
-			eerror "/etc/sensors.conf does not exist!"
-			return 1
-		fi
-
-		ebegin "Initializing sensors"
-		/usr/bin/sensors -s &> /dev/null
-		eend ${?}
-	fi
-}
-
-stop() {
-	checkconfig || return 1
-
-	if [ "${LOADMODULES}" = "yes" -a -f /proc/modules ]; then
-		einfo "Unloading lm_sensors modules..."
-
-		# find the highest possible MODULE_ number
-		i=0
-		while true; do
-			module=`eval echo '$'MODULE_${i}`
-			if [ -z "${module}" ] ; then
-				break
-			fi
-			i=$((i+1))
-		done
-
-		while [ ${i} -gt 0 ]; do
-			i=$((i-1))
-			module=`eval echo '$'MODULE_${i}`
-			ebegin "  Unloading ${module}"
-			rmmod ${module} &> /dev/null
-			eend $?
-		done
-
-		if [ -e /proc/sys/dev/sensors ] ; then
-			ebegin "  Unloading i2c-proc"
-			rmmod i2c-proc &> /dev/null
-			eend $?
-		fi
-	fi
-}
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.10.2-sensord-conf.d b/sys-apps/lm_sensors/files/lm_sensors-2.10.2-sensord-conf.d
deleted file mode 100644
index d82841aebd4a..000000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-2.10.2-sensord-conf.d
+++ /dev/null
@@ -1,3 +0,0 @@
-# Extra options to pass to the sensord daemon,
-# see sensord(8) for more information
-SENSORD_OPTIONS=""
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.10.2-sensord-init.d b/sys-apps/lm_sensors/files/lm_sensors-2.10.2-sensord-init.d
deleted file mode 100644
index c943a5235eae..000000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-2.10.2-sensord-init.d
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-2.10.2-sensord-init.d,v 1.1 2007/01/20 18:20:03 phreak Exp $
-
-CONFIG=/etc/sensors.conf
-
-depend() {
-	need logger
-	use lm_sensors
-}
-
-checkconfig() {
-	if [ ! -f ${CONFIG} ]; then
-		eerror "Configuration file ${CONFIG} not found"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting sensord"
-	start-stop-daemon --start --exec /usr/sbin/sensord \
-		-- --config-file ${CONFIG} ${SENSORD_OPTIONS}
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping sensord"
-	start-stop-daemon --stop --pidfile /var/run/sensord.pid
-	eend ${?}
-}
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.10.2-sensors-detect-gentoo.patch b/sys-apps/lm_sensors/files/lm_sensors-2.10.2-sensors-detect-gentoo.patch
deleted file mode 100644
index 748c56a31cac..000000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-2.10.2-sensors-detect-gentoo.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-Index: lm_sensors-2.10.1/prog/detect/sensors-detect
-===================================================================
---- lm_sensors-2.10.1.orig/prog/detect/sensors-detect
-+++ lm_sensors-2.10.1/prog/detect/sensors-detect
-@@ -27,6 +27,9 @@
- # each be put in a separate file, using modules and packages. That is beyond
- # me.
- 
-+# Gentoo specific modifications based on a patch from Rudo Thomas
-+# <thomr9am@ss1000.ms.mff.cuni.cz>
-+
- require 5.004;
- 
- use strict;
-@@ -5420,40 +5423,47 @@ sub main
-      
-   print "\n";
-   my ($modprobes, $configfile) = generate_modprobes 1;	# 1 == prefer ISA
-+  print "\nIf you want to load the modules at startup, generate a config file\n",
-+        "below and make sure lm_sensors gets started at boot time; e.g\n",
-+        "\$ rc-update add lm_sensors default\n";
-   print "To make the sensors modules behave correctly, add these lines to\n".
--        "$modules_conf:\n\n";
-+        "/etc/modules.d/lm_sensors and run modules-update:\n\n";
-   print "#----cut here----\n".
-         $configfile.
-         "#----cut here----\n\n";
- 
--  print "To load everything that is needed, add this to some /etc/rc* file:\n\n";
--  print "#----cut here----\n".
--        $modprobes.
--        "# sleep 2 # optional\n".
--        "/usr/local/bin/sensors -s # recommended\n".
--        "#----cut here----\n\n";
--
-   print "If you have some drivers built into your kernel, the list above will\n".
-         "contain too many modules. Skip the appropriate ones! You really\n".
-         "should try these commands right now to make sure everything is\n".
-         "working properly. Monitoring programs won't work until the needed\n".
-         "modules are loaded.\n\n";
--  
--  my $have_sysconfig = -d '/etc/sysconfig';
--  printf "Do you want to \%s /etc/sysconfig/lm_sensors? (\%s): ",
--         (-e '/etc/sysconfig/lm_sensors' ? 'overwrite' : 'generate'),
--         ($have_sysconfig ? 'YES/no' : 'yes/NO');
--  $_ = <STDIN>;
--  if (($have_sysconfig and not m/^\s*n/i) or m/^\s*y/i) {
--    unless ($have_sysconfig) {
--      mkdir '/etc/sysconfig', 0777
--        or die "Sorry, can't create /etc/sysconfig ($!)";
--    }
--    open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors")
--      or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)";
--    print SYSCONFIG <<'EOT';
--#    /etc/sysconfig/lm_sensors - Defines modules loaded by
--#                                /etc/init.d/lm_sensors
-+
-+  print "To load everything that is needed, execute the commands below...";
-+
-+  print "\n\n#----cut here----\n";
-+  print $modprobes;
-+  print "# sleep 2 # optional\n",
-+        "/usr/bin/sensors -s # recommended\n";
-+  print "#----end cut here----\n";
-+
-+  my $have_config = -f '/etc/conf.d/lm_sensors';
-+  print "\nDo you want to ".($have_config?"overwrite":"generate").
-+	    " /etc/conf.d/lm_sensors? Enter s to specify other file name?\n",
-+        "  (".($have_config?"yes/NO":"YES/no")."/s): ";
-+  my $reply = <STDIN>;
-+
-+  if (($have_config and $reply =~ /^\s*[Yy]/) or
-+	  (not $have_config and not $reply =~ /^\s*[Nn]/) or
-+	  $reply =~ /^\s*[Ss]/) {
-+	  my $filename = "/etc/conf.d/lm_sensors";
-+	  if ($reply =~ /^\s*[Ss]/) {
-+		  print "Specify the file to store the configuration to: ";
-+		  $filename = <STDIN>;
-+	  }
-+	  open(SYSCONFIG, ">".$filename)
-+		  or die "Sorry, can't create $filename ($!).";
-+	  print SYSCONFIG <<'EOT';
-+#    /etc/conf.d/sensors - Defines modules loaded by /etc/init.d/lm_sensors
- #    Copyright (c) 1998 - 2001  Frodo Looijaard <frodol@dds.nl>
- #
- #    This program is free software; you can redistribute it and/or modify
-@@ -5481,12 +5491,21 @@ sub main
- # in order as normal variables with the special names:
- #    MODULE_0, MODULE_1, MODULE_2, etc.
- #
-+# Please note that the numbers in MODULE_X must start at 0 and increase in
-+# steps of 1. Any number that is missing will make the init script skip the
-+# rest of the modules. Use MODULE_X_ARGS for arguments.
-+#
- # List the modules that are to be loaded for your system
- #
- EOT
-     print SYSCONFIG
--      "# Generated by sensors-detect on " . scalar localtime() . "\n";
-+      "# Generated by sensors-detect on " . scalar localtime() . "\n\n";
-     my @modules = grep /^modprobe /, split "\n", $modprobes;
-+    print SYSCONFIG
-+		  "# Load modules at startup\n".
-+		  "LOADMODULES=yes\n\n".
-+		  "# Initialize sensors at startup\n".
-+		  "INITSENSORS=yes\n\n";
-     my $i = 0;
-     my $sysconfig = "";
-     foreach (@modules) {
-@@ -5495,10 +5514,8 @@ EOT
-       $i++;
-     }
-     print SYSCONFIG $sysconfig;
-+    print "Done.\n";
- 
--    print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n".
--          "for initialization at boot time.\n"
--      unless -f "/etc/init.d/lm_sensors";
-   }
- }
- 
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.9.2-lm_sensors-init.d b/sys-apps/lm_sensors/files/lm_sensors-2.9.2-lm_sensors-init.d
deleted file mode 100644
index 461675da7daa..000000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-2.9.2-lm_sensors-init.d
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-2.9.2-lm_sensors-init.d,v 1.3 2006/07/17 08:46:01 phreak Exp $
-
-checkconfig() {
-	if [ ! -f /etc/conf.d/lm_sensors ]; then
-		eerror "/etc/conf.d/lm_sensors does not exist, try running sensors-detect"
-		return 1
-	fi
-
-	if [ "${LOADMODULES}" = "yes" -a -f /proc/modules ]; then
-		if [ -z "${MODULE_0}" ]; then
-			eerror "MODULE_0 is not set in /etc/conf.d/lm_sensors, try running sensors-detect"
-			return 1
-		fi
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	if [ "${LOADMODULES}" = "yes" -a -f /proc/modules ]; then
-		einfo "Loading lm_sensors modules..."
-
-		mount | grep sysfs &> /dev/null
-		if [ ${?} == 0 ]; then
-			if ! ( [ -e /sys/i2c ] || [ -e /sys/bus/i2c ] ); then
-				ebegin "  Loading i2c-core"
-				modprobe i2c-core &> /dev/null
-				if [ ${?} != 0 ]; then
-					eerror "    Could not load i2c-core!"
-					eend 1
-				fi
-				( [ -e /sys/i2c ] || [ -e /sys/bus/i2c ] ) || return 1
-				eend 0
-			fi
-		elif ! [ -e /proc/sys/dev/sensors ]; then
-			ebegin "  Loading i2c-proc"
-			modprobe i2c-proc &> /dev/null
-			if [ ${?} != 0 ]; then
-				eerror "    Could not load i2c-proc!"
-				eend 1
-			fi
-			[ -e /proc/sys/dev/sensors ] || return 1
-			eend 0
-		fi
-
-		i=0
-		while true; do
-			module=`eval echo '$'MODULE_${i}`
-			module_args=`eval echo '$'MODULE_${i}_ARGS`
-			if [ -z "${module}" ]; then
-				break
-			fi
-			ebegin "  Loading ${module}"
-			modprobe ${module} ${module_args} &> /dev/null
-			eend $?
-			i=$((i+1))
-		done
-	fi
-
-	if [ "${INITSENSORS}" = "yes" ]; then
-		if ! [ -f /etc/sensors.conf ]; then
-			eerror "/etc/sensors.conf does not exist!"
-			return 1
-		fi
-
-		ebegin "Initializing sensors"
-		/usr/bin/sensors -s &> /dev/null
-		eend ${?}
-	fi
-}
-
-stop() {
-	checkconfig || return 1
-
-	if [ "${LOADMODULES}" = "yes" -a -f /proc/modules ]; then
-		einfo "Unloading lm_sensors modules..."
-
-		# find the highest possible MODULE_ number
-		i=0
-		while true; do
-			module=`eval echo '$'MODULE_${i}`
-			if [ -z "${module}" ] ; then
-				break
-			fi
-			i=$((i+1))
-		done
-
-		while [ ${i} -gt 0 ]; do
-			i=$((i-1))
-			module=`eval echo '$'MODULE_${i}`
-			ebegin "  Unloading ${module}"
-			rmmod ${module} &> /dev/null
-			eend $?
-		done
-
-		if [ -e /proc/sys/dev/sensors ] ; then
-			ebegin "  Unloading i2c-proc"
-			rmmod i2c-proc &> /dev/null
-			eend $?
-		fi
-	fi
-}
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.9.2-sensord-conf.d b/sys-apps/lm_sensors/files/lm_sensors-2.9.2-sensord-conf.d
deleted file mode 100644
index a75efbc99d0d..000000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-2.9.2-sensord-conf.d
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-2.9.2-sensord-conf.d,v 1.1 2005/09/06 21:06:02 brix Exp $
-
-# Extra options to pass to the sensord daemon,
-# see sensord(8) for more information
-SENSORD_OPTIONS=""
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.9.2-sensord-init.d b/sys-apps/lm_sensors/files/lm_sensors-2.9.2-sensord-init.d
deleted file mode 100644
index 2d26e045a9a3..000000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-2.9.2-sensord-init.d
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-2.9.2-sensord-init.d,v 1.1 2005/09/06 21:06:02 brix Exp $
-
-CONFIG=/etc/sensors.conf
-
-depend() {
-	need logger
-	use lm_sensors
-}
-
-checkconfig() {
-	if [ ! -f ${CONFIG} ]; then
-		eerror "Configuration file ${CONFIG} not found"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting sensord"
-	start-stop-daemon --start --quiet --exec /usr/sbin/sensord \
-		-- --config-file ${CONFIG} ${SENSORD_OPTIONS}
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping sensord"
-	start-stop-daemon --stop --quiet --pidfile /var/run/sensord.pid
-	eend ${?}
-}
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.9.2-sensors-detect-gentoo.patch b/sys-apps/lm_sensors/files/lm_sensors-2.9.2-sensors-detect-gentoo.patch
deleted file mode 100644
index 235ead9f3ba1..000000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-2.9.2-sensors-detect-gentoo.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-diff -urp lm_sensors-2.9.2/prog/detect/sensors-detect lm_sensors-2.9.2-sensors-detect-gentoo/prog/detect/sensors-detect
---- lm_sensors-2.9.2/prog/detect/sensors-detect	2005-09-06 21:38:10.000000000 +0200
-+++ lm_sensors-2.9.2-sensors-detect-gentoo/prog/detect/sensors-detect	2005-09-06 22:43:30.000000000 +0200
-@@ -26,6 +26,14 @@
- # each be put in a separate file, using modules and packages. That is beyond
- # me.
- 
-+# Changelog
-+#  02/Mar/2003, Rudo Thomas <thomr9am@ss1000.ms.mff.cuni.cz>
-+#    * a few small changes in config file output to reflect Gentoo Linux layout
-+#      - /etc/sysconfig -> /etc/conf.d
-+#      - /etc/rc.d/init.d -> /etc/init.d
-+#      - added a warning to the generated config file
-+#      - small change when asking about writing the new config file
-+
- require 5.004;
- 
- use strict;
-@@ -5201,39 +5209,44 @@ sub main
-   my $use_isa = not <STDIN> =~ /\s*[Ss]/;
-      
-   my ($modprobes,$configfile) = generate_modprobes $use_isa;
-+  print "\nIf you want to load the modules at startup, generate a config file\n",
-+	"below and make sure lm_sensors gets started; e.g\n",
-+	"\$ rc-update add lm_sensors default.\n";
-   print "\nTo make the sensors modules behave correctly, add these lines to\n",
--        "$modules_conf:\n\n";
-+	"/etc/modules.conf:\n\n";
-   print "#----cut here----\n";
-   print $configfile;
--  print "#----cut here----\n";
--  print "\nTo load everything that is needed, add this to some /etc/rc* ",
--        "file:\n\n";
--  print "#----cut here----\n";
--  print $modprobes;
--  print "# sleep 2 # optional\n",
--        "/usr/local/bin/sensors -s # recommended\n";
--  print "#----cut here----\n";
-+  print "#----end cut here----\n";
-   print "\nWARNING! If you have some things built into your kernel, the list above\n",
-         "will contain too many modules. Skip the appropriate ones! You really should\n",
-         "try these commands right now to make sure everything is working properly.\n",
-         "Monitoring programs won't work until it's done.\n";
--  
--  my $have_sysconfig = -d '/etc/sysconfig';
--  print "\nDo you want to generate /etc/sysconfig/lm_sensors? (".
--    ($have_sysconfig?"YES/no":"yes/NO")."): ";
--  if ($> != 0) {
--    print "\nAs you are not root, we shall skip this step.\n";
--  } else {
--    $_ = <STDIN>;
--    if (($have_sysconfig and not m/^\s*[Nn]/) or m/^\s*[Yy]/) {
--      unless ($have_sysconfig) {
--        mkdir '/etc/sysconfig', 0777
--          or die "Sorry, can't create /etc/sysconfig ($!)?!?";
--      }
--      open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors")
--        or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)?!?";
--      print SYSCONFIG <<'EOT';
--#    /etc/sysconfig/sensors - Defines modules loaded by /etc/rc.d/init.d/lm_sensors
-+
-+  print "To load everything that is needed, execute the commands above...";
-+
-+  print "\n\n#----cut here----\n";
-+  print $modprobes;
-+  print "# sleep 2 # optional\n",
-+        "/usr/bin/sensors -s # recommended\n";
-+
-+  my $have_config = -f '/etc/conf.d/lm_sensors';
-+  print "\nDo you want to ".($have_config?"overwrite":"generate").
-+	" /etc/conf.d/lm_sensors? Enter s to specify other file name?\n",
-+        "  (".($have_config?"yes/NO":"YES/no")."/s): ";
-+  my $reply = <STDIN>;
-+
-+  if (($have_config and $reply =~ /^\s*[Yy]/) or
-+	(not $have_config and not $reply =~ /^\s*[Nn]/) or
-+	$reply =~ /^\s*[Ss]/) {
-+  my $filename = "/etc/conf.d/lm_sensors";
-+  if ($reply =~ /^\s*[Ss]/) {
-+	print "Specify the file to store the configuration to: ";
-+	$filename = <STDIN>;
-+  }
-+  open(SYSCONFIG, ">".$filename)
-+	or die "Sorry, can't create $filename ($!).";
-+	print SYSCONFIG <<'EOT';
-+#    /etc/conf.d/sensors - Defines modules loaded by /etc/init.d/lm_sensors
- #    Copyright (c) 1998 - 2001  Frodo Looijaard <frodol@dds.nl>
- #
- #    This program is free software; you can redistribute it and/or modify
-@@ -5254,18 +5267,27 @@ sub main
- # See also the lm_sensors homepage at:
- #     http://www2.lm-sensors.nu/~lm78/index.html
- #
--# This file is used by /etc/rc.d/init.d/lm_sensors and defines the modules to
--# be loaded/unloaded. This file is sourced into /etc/rc.d/init.d/lm_sensors.
-+# This file is used by /etc/init.d/lm_sensors and defines the modules to
-+# be loaded/unloaded. This file is sourced into /etc/init.d/lm_sensors.
- #
- # The format of this file is a shell script that simply defines the modules
- # in order as normal variables with the special names:
- #    MODULE_0, MODULE_1, MODULE_2, etc.
- #
-+# Please note that the numbers in MODULE_X must start at 0 and increase in
-+# steps of 1. Any number that is missing will make the init script skip the
-+# rest of the modules. Use MODULE_X_ARGS for arguments.
-+#
- # List the modules that are to be loaded for your system
- #
- EOT
-       print SYSCONFIG
--       "# Generated by sensors-detect on " . scalar localtime() . "\n";
-+       "# Generated by sensors-detect on " . scalar localtime() . "\n\n";
-+      print SYSCONFIG
-+       "# Load modules at startup\n".
-+       "LOADMODULES=yes\n\n".
-+       "# Initialize sensors at startup\n".
-+       "INITSENSORS=yes\n\n";
-       my @modules = grep /^modprobe /, split "\n", $modprobes;
-       my $i = 0;
-       my $sysconfig = "";
-@@ -5275,9 +5297,7 @@ EOT
-         $i++;
-       }
-       print SYSCONFIG $sysconfig;
--      print "Copy prog/init/lm_sensors.init to /etc/rc.d/init.d/lm_sensors\n";
--      print "for initialization at boot time.\n";
--    }
-+      print "Done.\n";
-   }
- }
- 
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.10.0-lm_sensors-init.d b/sys-apps/lm_sensors/files/lm_sensors-init.d
index 1717d3a64002..73656c228ecb 100644
--- a/sys-apps/lm_sensors/files/lm_sensors-2.10.0-lm_sensors-init.d
+++ b/sys-apps/lm_sensors/files/lm_sensors-init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-2.10.0-lm_sensors-init.d,v 1.3 2006/07/17 08:46:01 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-init.d,v 1.1 2007/05/17 07:31:41 phreak Exp $
 
 checkconfig() {
 	if [ ! -f /etc/conf.d/lm_sensors ]; then
@@ -24,7 +24,7 @@ start() {
 		einfo "Loading lm_sensors modules..."
 
 		mount | grep sysfs &> /dev/null
-		if [ ${?} == 0 ]; then
+		if [ ${?} = 0 ]; then
 			if ! ( [ -e /sys/i2c ] || [ -e /sys/bus/i2c ] ); then
 				ebegin "  Loading i2c-core"
 				modprobe i2c-core &> /dev/null
@@ -56,7 +56,7 @@ start() {
 			ebegin "  Loading ${module}"
 			modprobe ${module} ${module_args} &> /dev/null
 			eend $?
-			i=$((i+1))
+			i=$((${i}+1))
 		done
 	fi
 
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.10.0-sensord-conf.d b/sys-apps/lm_sensors/files/sensord-conf.d
index d82841aebd4a..d82841aebd4a 100644
--- a/sys-apps/lm_sensors/files/lm_sensors-2.10.0-sensord-conf.d
+++ b/sys-apps/lm_sensors/files/sensord-conf.d
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.10.0-sensord-init.d b/sys-apps/lm_sensors/files/sensord-init.d
index 0e6c661d9d25..cb99dce3f050 100644
--- a/sys-apps/lm_sensors/files/lm_sensors-2.10.0-sensord-init.d
+++ b/sys-apps/lm_sensors/files/sensord-init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-2.10.0-sensord-init.d,v 1.1 2006/02/15 18:40:21 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/sensord-init.d,v 1.1 2007/05/17 07:31:41 phreak Exp $
 
 CONFIG=/etc/sensors.conf
 
diff --git a/sys-apps/lm_sensors/lm_sensors-2.10.0-r2.ebuild b/sys-apps/lm_sensors/lm_sensors-2.10.0-r2.ebuild
deleted file mode 100644
index c31a3656689f..000000000000
--- a/sys-apps/lm_sensors/lm_sensors-2.10.0-r2.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.10.0-r2.ebuild,v 1.2 2007/01/09 21:32:35 phreak Exp $
-
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib
-
-DESCRIPTION="Hardware Monitoring user-space utilities"
-
-HOMEPAGE="http://www.lm-sensors.org/"
-SRC_URI="http://dl.lm-sensors.org/lm-sensors/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="sensord"
-
-COMMON="sys-fs/sysfsutils
-		sensord? ( net-analyzer/rrdtool )"
-DEPEND="${COMMON}
-		sys-apps/sed
-		ppc? ( >=virtual/linux-sources-2.5 )
-		amd64? ( >=virtual/linux-sources-2.5 )
-		x86? ( || ( >=virtual/linux-sources-2.5 sys-apps/lm_sensors-modules ) )"
-RDEPEND="${COMMON}
-		dev-lang/perl"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is 2 4; then
-		if use ppc || use amd64; then
-			eerror
-			eerror "${P} does not support kernel 2.4.x under PPC and AMD64."
-			eerror
-			die "${P} does not support kernel 2.4.x under PPC and AMD64."
-		elif ! has_version =sys-apps/lm_sensors-modules-${PV}; then
-			eerror
-			eerror "${P} needs sys-apps/lm_sensors-modules-${PV} to be installed"
-			eerror "for kernel 2.4.x"
-			eerror
-			die "sys-apps/lm_sensors-modules-${PV} not installed"
-		fi
-	else
-		if kernel_is lt 2 6 14 && ! (linux_chkconfig_present I2C_SENSOR); then
-			eerror
-			eerror "${P} requires CONFIG_I2C_SENSOR to be enabled for non-2.4.x kernels."
-			eerror
-			die "CONFIG_I2C_SENSOR not detected"
-		elif kernel_is gt 2 6 13 && ! (linux_chkconfig_present HWMON); then
-			eerror
-			eerror "${P} requires CONFIG_HWMON to be enabled for 2.6.14+ kernels."
-			eerror
-			die "CONFIG_HWMON not detected"
-		fi
-		if ! (linux_chkconfig_present I2C_CHARDEV); then
-			ewarn
-			ewarn "sensors-detect requires CONFIG_I2C_CHARDEV to be enabled for non-2.4.x kernels."
-			ewarn
-		fi
-		if ! (linux_chkconfig_present I2C); then
-			eerror
-			eerror "${P} requires CONFIG_I2C to be enabled for non-2.4.x kernels."
-			eerror
-			die "CONFIG_I2C not detected"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-sensors-detect-gentoo.patch
-
-	if use sensord; then
-		sed -i -e 's:^# \(PROG_EXTRA\):\1:' "${S}"/Makefile
-	fi
-}
-
-src_compile()  {
-	einfo
-	einfo "You may safely ignore any errors from compilation"
-	einfo "that contain \"No such file or directory\" references."
-	einfo
-
-	filter-flags -fstack-protector
-
-	emake CC=$(tc-getCC) LINUX=${KV_DIR} I2C_HEADERS=${KV_DIR}/include user \
-		|| die "emake user failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man LIBDIR=/usr/$(get_libdir) \
-		KERNELINCLUDEFILES="" user_install || die "emake user_install failed"
-
-	newinitd "${FILESDIR}"/${P}-lm_sensors-init.d lm_sensors
-	newinitd "${FILESDIR}"/${P}-fancontrol-init.d fancontrol
-
-	if use sensord; then
-		newconfd "${FILESDIR}"/${P}-sensord-conf.d sensord
-		newinitd "${FILESDIR}"/${P}-sensord-init.d sensord
-	fi
-
-	dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS INSTALL QUICKSTART \
-		README* TODO
-
-	dodoc doc/cvs doc/donations doc/fancontrol.txt doc/fan-divisors doc/FAQ \
-		doc/progs doc/temperature-sensors doc/vid
-
-	dohtml doc/lm_sensors-FAQ.html doc/useful_addresses.html
-
-	docinto busses
-	dodoc doc/busses/*
-
-	docinto chips
-	dodoc doc/chips/*
-
-	docinto developers
-	dodoc doc/developers/applications doc/developers/design \
-		doc/developers/new_drivers doc/developers/proc \
-		doc/developers/sysctl doc/developers/sysfs-interface
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Next you need to run:"
-	einfo "  /usr/sbin/sensors-detect"
-	einfo "to detect the I2C hardware of your system and create the file:"
-	einfo "  /etc/conf.d/lm_sensors"
-	einfo
-	einfo "You will also need to run the above command if you're upgrading from"
-	einfo "<=${PN}-2.9.0, as the needed entries in /etc/conf.d/lm_sensors has"
-	einfo "changed."
-	einfo
-	einfo "Be warned, the probing of hardware in your system performed by"
-	einfo "sensors-detect could freeze your system. Also make sure you read"
-	einfo "the documentation before running lm_sensors on IBM ThinkPads."
-	einfo
-	einfo "Please refer to the lm_sensors documentation for more information."
-	einfo "(http://www.lm-sensors.org/wiki/Documentation)"
-	einfo ""
-}
-
-# Reminder: bug 157085 is blocking the sensors-detect in pkg_config (bug 159137).
diff --git a/sys-apps/lm_sensors/lm_sensors-2.10.0.ebuild b/sys-apps/lm_sensors/lm_sensors-2.10.0.ebuild
deleted file mode 100644
index eded6ad0ee92..000000000000
--- a/sys-apps/lm_sensors/lm_sensors-2.10.0.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.10.0.ebuild,v 1.8 2007/01/09 21:32:35 phreak Exp $
-
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib
-
-DESCRIPTION="Hardware Monitoring user-space utilities"
-
-HOMEPAGE="http://www.lm-sensors.org/"
-SRC_URI="http://dl.lm-sensors.org/lm-sensors/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-IUSE="sensord"
-
-COMMON="sys-fs/sysfsutils
-		sensord? ( net-analyzer/rrdtool )"
-DEPEND="${COMMON}
-		sys-apps/sed
-		ppc? ( >=virtual/linux-sources-2.5 )
-		amd64? ( >=virtual/linux-sources-2.5 )
-		x86? ( || ( >=virtual/linux-sources-2.5 sys-apps/lm_sensors-modules ) )"
-RDEPEND="${COMMON}
-		dev-lang/perl"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is 2 4; then
-		if use ppc || use amd64; then
-			eerror
-			eerror "${P} does not support kernel 2.4.x under PPC and AMD64."
-			eerror
-			die "${P} does not support kernel 2.4.x under PPC and AMD64."
-		elif ! has_version =sys-apps/lm_sensors-modules-${PV}; then
-			eerror
-			eerror "${P} needs sys-apps/lm_sensors-modules-${PV} to be installed"
-			eerror "for kernel 2.4.x"
-			eerror
-			die "sys-apps/lm_sensors-modules-${PV} not installed"
-		fi
-	else
-		if kernel_is lt 2 6 14 && ! (linux_chkconfig_present I2C_SENSOR); then
-			eerror
-			eerror "${P} requires CONFIG_I2C_SENSOR to be enabled for non-2.4.x kernels."
-			eerror
-			die "CONFIG_I2C_SENSOR not detected"
-		elif kernel_is gt 2 6 13 && ! (linux_chkconfig_present HWMON); then
-			eerror
-			eerror "${P} requires CONFIG_HWMON to be enabled for 2.6.14+ kernels."
-			eerror
-			die "CONFIG_HWMON not detected"
-		fi
-		if ! (linux_chkconfig_present I2C_CHARDEV); then
-			ewarn
-			ewarn "sensors-detect requires CONFIG_I2C_CHARDEV to be enabled for non-2.4.x kernels."
-			ewarn
-		fi
-		if ! (linux_chkconfig_present I2C); then
-			eerror
-			eerror "${P} requires CONFIG_I2C to be enabled for non-2.4.x kernels."
-			eerror
-			die "CONFIG_I2C not detected"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-sensors-detect-gentoo.patch
-
-	if use sensord; then
-		sed -i -e 's:^# \(PROG_EXTRA\):\1:' "${S}"/Makefile
-	fi
-}
-
-src_compile()  {
-	einfo
-	einfo "You may safely ignore any errors from compilation"
-	einfo "that contain \"No such file or directory\" references."
-	einfo
-
-	filter-flags -fstack-protector
-
-	emake CC=$(tc-getCC) LINUX=${KV_DIR} I2C_HEADERS=${KV_DIR}/include user \
-		|| die "emake user failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man LIBDIR=/usr/$(get_libdir) \
-		KERNELINCLUDEFILES="" user_install || die "emake user_install failed"
-
-	newinitd "${FILESDIR}"/${P}-lm_sensors-init.d lm_sensors
-	newinitd "${FILESDIR}"/${P}-fancontrol-init.d fancontrol
-
-	if use sensord; then
-		newconfd "${FILESDIR}"/${P}-sensord-conf.d sensord
-		newinitd "${FILESDIR}"/${P}-sensord-init.d sensord
-	fi
-
-	dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS INSTALL QUICKSTART \
-		README* TODO
-
-	dodoc doc/cvs doc/donations doc/fancontrol.txt doc/fan-divisors doc/FAQ \
-		doc/progs doc/temperature-sensors doc/vid
-
-	dohtml doc/lm_sensors-FAQ.html doc/useful_addresses.html
-
-	docinto busses
-	dodoc doc/busses/*
-
-	docinto chips
-	dodoc doc/chips/*
-
-	docinto developers
-	dodoc doc/developers/applications doc/developers/design \
-		doc/developers/new_drivers doc/developers/proc \
-		doc/developers/sysctl doc/developers/sysfs-interface
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Next you need to run:"
-	einfo "  /usr/sbin/sensors-detect"
-	einfo "to detect the I2C hardware of your system and create the file:"
-	einfo "  /etc/conf.d/lm_sensors"
-	einfo
-	einfo "You will also need to run the above command if you're upgrading from"
-	einfo "<=${PN}-2.9.0, as the needed entries in /etc/conf.d/lm_sensors has"
-	einfo "changed."
-	einfo
-	einfo "Be warned, the probing of hardware in your system performed by"
-	einfo "sensors-detect could freeze your system. Also make sure you read"
-	einfo "the documentation before running lm_sensors on IBM ThinkPads."
-	einfo
-	einfo "Please refer to the lm_sensors documentation for more information."
-	einfo "(http://www.lm-sensors.org/wiki/Documentation)"
-	einfo
-}
-
-# Reminder: bug 157085 is blocking the sensors-detect in pkg_config (bug 159137).
diff --git a/sys-apps/lm_sensors/lm_sensors-2.10.1.ebuild b/sys-apps/lm_sensors/lm_sensors-2.10.1.ebuild
index 89292eee9ca3..5d6a0df8e420 100644
--- a/sys-apps/lm_sensors/lm_sensors-2.10.1.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-2.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.10.1.ebuild,v 1.8 2007/02/10 03:19:02 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.10.1.ebuild,v 1.9 2007/05/17 07:31:41 phreak Exp $
 
 inherit eutils flag-o-matic linux-info toolchain-funcs multilib
 
@@ -71,7 +71,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd "${S}"
-	epatch "${FILESDIR}/${P}-sensors-detect-gentoo.patch"
+	epatch "${FILESDIR}"/${P}-sensors-detect-gentoo.patch
 
 	if use sensord; then
 		sed -i -e 's:^# \(PROG_EXTRA\):\1:' "${S}"/Makefile
@@ -94,12 +94,12 @@ src_install() {
 	emake DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man LIBDIR=/usr/$(get_libdir) \
 		KERNELINCLUDEFILES="" user_install || die "emake user_install failed"
 
-	newinitd "${FILESDIR}"/${P}-lm_sensors-init.d lm_sensors
-	newinitd "${FILESDIR}"/${P}-fancontrol-init.d fancontrol
+	newinitd "${FILESDIR}"/lm_sensors-init.d lm_sensors
+	newinitd "${FILESDIR}"/fancontrol-init.d fancontrol
 
 	if use sensord; then
-		newconfd "${FILESDIR}"/${P}-sensord-conf.d sensord
-		newinitd "${FILESDIR}"/${P}-sensord-init.d sensord
+		newconfd "${FILESDIR}"/sensord-conf.d sensord
+		newinitd "${FILESDIR}"/sensord-init.d sensord
 	fi
 
 	dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS INSTALL QUICKSTART \
diff --git a/sys-apps/lm_sensors/lm_sensors-2.10.2.ebuild b/sys-apps/lm_sensors/lm_sensors-2.10.2.ebuild
index a5447ec126aa..a950c323b421 100644
--- a/sys-apps/lm_sensors/lm_sensors-2.10.2.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-2.10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.10.2.ebuild,v 1.2 2007/02/09 12:46:16 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.10.2.ebuild,v 1.3 2007/05/17 07:31:41 phreak Exp $
 
 inherit eutils flag-o-matic linux-info toolchain-funcs multilib
 
@@ -71,7 +71,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd "${S}"
-	epatch "${FILESDIR}/${P}-sensors-detect-gentoo.patch"
+	epatch "${FILESDIR}"/${PN}-2.10.1-sensors-detect-gentoo.patch
 
 	if use sensord; then
 		sed -i -e 's:^# \(PROG_EXTRA\):\1:' "${S}"/Makefile
@@ -94,12 +94,12 @@ src_install() {
 	emake DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man LIBDIR=/usr/$(get_libdir) \
 		KERNELINCLUDEFILES="" user_install || die "emake user_install failed"
 
-	newinitd "${FILESDIR}"/${P}-lm_sensors-init.d lm_sensors
-	newinitd "${FILESDIR}"/${P}-fancontrol-init.d fancontrol
+	newinitd "${FILESDIR}"/lm_sensors-init.d lm_sensors
+	newinitd "${FILESDIR}"/fancontrol-init.d fancontrol
 
 	if use sensord; then
-		newconfd "${FILESDIR}"/${P}-sensord-conf.d sensord
-		newinitd "${FILESDIR}"/${P}-sensord-init.d sensord
+		newconfd "${FILESDIR}"/sensord-conf.d sensord
+		newinitd "${FILESDIR}"/sensord-init.d sensord
 	fi
 
 	dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS INSTALL QUICKSTART \
diff --git a/sys-apps/lm_sensors/lm_sensors-2.10.3.ebuild b/sys-apps/lm_sensors/lm_sensors-2.10.3.ebuild
index f571aa624966..fb0df5066eb6 100644
--- a/sys-apps/lm_sensors/lm_sensors-2.10.3.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-2.10.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.10.3.ebuild,v 1.1 2007/04/11 19:51:21 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.10.3.ebuild,v 1.2 2007/05/17 07:31:41 phreak Exp $
 
 inherit eutils flag-o-matic linux-info toolchain-funcs multilib
 
@@ -71,7 +71,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-2.10.2-sensors-detect-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-2.10.1-sensors-detect-gentoo.patch
 
 	if use sensord; then
 		sed -i -e 's:^# \(PROG_EXTRA\):\1:' "${S}"/Makefile
@@ -94,12 +94,12 @@ src_install() {
 	emake DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man LIBDIR=/usr/$(get_libdir) \
 		KERNELINCLUDEFILES="" user_install || die "emake user_install failed"
 
-	newinitd "${FILESDIR}"/${PN}-2.10.2-lm_sensors-init.d lm_sensors
-	newinitd "${FILESDIR}"/${PN}-2.10.2-fancontrol-init.d fancontrol
+	newinitd "${FILESDIR}"/lm_sensors-init.d lm_sensors
+	newinitd "${FILESDIR}"/fancontrol-init.d fancontrol
 
 	if use sensord; then
-		newconfd "${FILESDIR}"/${PN}-2.10.2-sensord-conf.d sensord
-		newinitd "${FILESDIR}"/${PN}-2.10.2-sensord-init.d sensord
+		newconfd "${FILESDIR}"/sensord-conf.d sensord
+		newinitd "${FILESDIR}"/sensord-init.d sensord
 	fi
 
 	dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS INSTALL QUICKSTART \
diff --git a/sys-apps/lm_sensors/lm_sensors-2.9.2-r2.ebuild b/sys-apps/lm_sensors/lm_sensors-2.9.2-r2.ebuild
deleted file mode 100644
index 943447ec6a85..000000000000
--- a/sys-apps/lm_sensors/lm_sensors-2.9.2-r2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.9.2-r2.ebuild,v 1.2 2007/01/09 21:32:35 phreak Exp $
-
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib
-
-DESCRIPTION="Hardware Monitoring user-space utilities"
-
-HOMEPAGE="http://www.lm-sensors.org/"
-SRC_URI="http://dl.lm-sensors.org/lm-sensors/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="sensord"
-
-COMMON="sensord? ( net-analyzer/rrdtool )"
-DEPEND="${COMMON}
-		sys-apps/sed
-		ppc? ( >=virtual/linux-sources-2.5 )
-		amd64? ( >=virtual/linux-sources-2.5 )
-		x86? ( || ( >=virtual/linux-sources-2.5 sys-apps/lm_sensors-modules ) )"
-RDEPEND="${COMMON}
-		dev-lang/perl"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is 2 4; then
-		if use ppc || use amd64; then
-			eerror
-			eerror "${P} does not support kernel 2.4.x under PPC and AMD64."
-			eerror
-			die "${P} does not support kernel 2.4.x under PPC and AMD64."
-		elif ! has_version =sys-apps/lm_sensors-modules-${PV}; then
-			eerror
-			eerror "${P} needs sys-apps/lm_sensors-modules-${PV} to be installed"
-			eerror "for kernel 2.4.x"
-			eerror
-			die "sys-apps/lm_sensors-modules-${PV} not installed"
-		fi
-	else
-		if kernel_is lt 2 6 14 && ! (linux_chkconfig_present I2C_SENSOR); then
-			eerror
-			eerror "${P} requires CONFIG_I2C_SENSOR to be enabled for non-2.4.x kernels."
-			eerror
-			die "CONFIG_I2C_SENSOR not detected"
-		elif kernel_is gt 2 6 13 && ! (linux_chkconfig_present HWMON); then
-			eerror
-			eerror "${P} requires CONFIG_HWMON to be enabled for 2.6.14+ kernels."
-			eerror
-			die "CONFIG_HWMON not detected"
-		fi
-		if ! (linux_chkconfig_present I2C_CHARDEV); then
-			ewarn
-			ewarn "sensors-detect requires CONFIG_I2C_CHARDEV to be enabled for non-2.4.x kernels."
-			ewarn
-		fi
-		if ! (linux_chkconfig_present I2C); then
-			eerror
-			eerror "${P} requires CONFIG_I2C to be enabled for non-2.4.x kernels."
-			eerror
-			die "CONFIG_I2C not detected"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-sensors-detect-gentoo.patch
-
-	if use sensord; then
-		sed -i -e 's:^# \(PROG_EXTRA\):\1:' "${S}"/Makefile
-	fi
-}
-
-src_compile()  {
-	einfo
-	einfo "You may safely ignore any errors from compilation"
-	einfo "that contain \"No such file or directory\" references."
-	einfo
-
-	filter-flags -fstack-protector
-
-	emake CC=$(tc-getCC) LINUX=${KV_DIR} I2C_HEADERS=${KV_DIR}/include user \
-		|| die "emake user failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man LIBDIR=/usr/$(get_libdir) \
-		KERNELINCLUDEFILES="" user_install || die "emake user_install failed"
-
-	newinitd "${FILESDIR}"/${P}-lm_sensors-init.d lm_sensors
-
-	if use sensord; then
-		newconfd "${FILESDIR}"/${P}-sensord-conf.d sensord
-		newinitd "${FILESDIR}"/${P}-sensord-init.d sensord
-	fi
-
-	dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS INSTALL QUICKSTART \
-		README* TODO
-
-	dodoc doc/cvs doc/donations doc/fancontrol.txt doc/fan-divisors doc/FAQ \
-		doc/progs doc/temperature-sensors doc/vid
-
-	dohtml doc/lm_sensors-FAQ.html doc/useful_addresses.html
-
-	docinto busses
-	dodoc doc/busses/*
-
-	docinto chips
-	dodoc doc/chips/*
-
-	docinto developers
-	dodoc doc/developers/applications doc/developers/design \
-		doc/developers/new_drivers doc/developers/proc \
-		doc/developers/sysctl doc/developers/sysfs-interface
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Next you need to run:"
-	einfo "  /usr/sbin/sensors-detect"
-	einfo "to detect the I2C hardware of your system and create the file:"
-	einfo "  /etc/conf.d/lm_sensors"
-	einfo
-	einfo "You will also need to run the above command if you're upgrading from"
-	einfo "<=${PN}-2.9.0, as the needed entries in /etc/conf.d/lm_sensors has"
-	einfo "changed."
-	einfo
-	einfo "Be warned, the probing of hardware in your system performed by"
-	einfo "sensors-detect could freeze your system. Also make sure you read"
-	einfo "the documentation before running lm_sensors on IBM ThinkPads."
-	einfo
-	einfo "Please see the lm_sensors documentation and website for more information."
-	einfo "(http://www.lm-sensors.org/wiki/Documentation)"
-	einfo ""
-}
-
-# Reminder: bug 157085 is blocking the sensors-detect in pkg_config (bug 159137).
diff --git a/sys-apps/lm_sensors/lm_sensors-2.9.2.ebuild b/sys-apps/lm_sensors/lm_sensors-2.9.2.ebuild
deleted file mode 100644
index a030b484a0f2..000000000000
--- a/sys-apps/lm_sensors/lm_sensors-2.9.2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.9.2.ebuild,v 1.12 2007/01/09 21:32:35 phreak Exp $
-
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib
-
-DESCRIPTION="Hardware Monitoring user-space utilities"
-
-HOMEPAGE="http://www.lm-sensors.org/"
-SRC_URI="http://dl.lm-sensors.org/lm-sensors/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-IUSE="sensord"
-
-COMMON="sensord? ( net-analyzer/rrdtool )"
-DEPEND="${COMMON}
-		sys-apps/sed
-		ppc? ( >=virtual/linux-sources-2.5 )
-		amd64? ( >=virtual/linux-sources-2.5 )
-		x86? ( || ( >=virtual/linux-sources-2.5 sys-apps/lm_sensors-modules ) )"
-RDEPEND="${COMMON}
-		dev-lang/perl"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is 2 4; then
-		if use ppc || use amd64; then
-			eerror
-			eerror "${P} does not support kernel 2.4.x under PPC and AMD64."
-			eerror
-			die "${P} does not support kernel 2.4.x under PPC and AMD64."
-		elif ! has_version =sys-apps/lm_sensors-modules-${PV}; then
-			eerror
-			eerror "${P} needs sys-apps/lm_sensors-modules-${PV} to be installed"
-			eerror "for kernel 2.4.x"
-			eerror
-			die "sys-apps/lm_sensors-modules-${PV} not installed"
-		fi
-	else
-		if kernel_is lt 2 6 14 && ! (linux_chkconfig_present I2C_SENSOR); then
-			eerror
-			eerror "${P} requires CONFIG_I2C_SENSOR to be enabled for non-2.4.x kernels."
-			eerror
-			die "CONFIG_I2C_SENSOR not detected"
-		elif kernel_is gt 2 6 13 && ! (linux_chkconfig_present HWMON); then
-			eerror
-			eerror "${P} requires CONFIG_HWMON to be enabled for 2.6.14+ kernels."
-			eerror
-			die "CONFIG_HWMON not detected"
-		fi
-		if ! (linux_chkconfig_present I2C_CHARDEV); then
-			ewarn
-			ewarn "sensors-detect requires CONFIG_I2C_CHARDEV to be enabled for non-2.4.x kernels."
-			ewarn
-		fi
-		if ! (linux_chkconfig_present I2C); then
-			eerror
-			eerror "${P} requires CONFIG_I2C to be enabled for non-2.4.x kernels."
-			eerror
-			die "CONFIG_I2C not detected"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-sensors-detect-gentoo.patch
-
-	if use sensord; then
-		sed -i -e 's:^# \(PROG_EXTRA\):\1:' "${S}"/Makefile
-	fi
-}
-
-src_compile()  {
-	einfo
-	einfo "You may safely ignore any errors from compilation"
-	einfo "that contain \"No such file or directory\" references."
-	einfo
-
-	filter-flags -fstack-protector
-
-	emake CC=$(tc-getCC) LINUX=${KV_DIR} I2C_HEADERS=${KV_DIR}/include user \
-		|| die "emake user failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man LIBDIR=/usr/$(get_libdir) \
-		KERNELINCLUDEFILES="" user_install || die "emake user_install failed"
-
-	newinitd "${FILESDIR}"/${P}-lm_sensors-init.d lm_sensors
-
-	if use sensord; then
-		newconfd "${FILESDIR}"/${P}-sensord-conf.d sensord
-		newinitd "${FILESDIR}"/${P}-sensord-init.d sensord
-	fi
-
-	dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS INSTALL QUICKSTART \
-		README* TODO
-
-	dodoc doc/cvs doc/donations doc/fancontrol.txt doc/fan-divisors doc/FAQ \
-		doc/progs doc/temperature-sensors doc/vid
-
-	dohtml doc/lm_sensors-FAQ.html doc/useful_addresses.html
-
-	docinto busses
-	dodoc doc/busses/*
-
-	docinto chips
-	dodoc doc/chips/*
-
-	docinto developers
-	dodoc doc/developers/applications doc/developers/design \
-		doc/developers/new_drivers doc/developers/proc \
-		doc/developers/sysctl doc/developers/sysfs-interface
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Next you need to run:"
-	einfo "  /usr/sbin/sensors-detect"
-	einfo "to detect the I2C hardware of your system and create the file:"
-	einfo "  /etc/conf.d/lm_sensors"
-	einfo
-	einfo "You will also need to run the above command if you're upgrading from"
-	einfo "<=${PN}-2.9.0, as the needed entries in /etc/conf.d/lm_sensors has"
-	einfo "changed."
-	einfo
-	einfo "Be warned, the probing of hardware in your system performed by"
-	einfo "sensors-detect could freeze your system. Also make sure you read"
-	einfo "the documentation before running lm_sensors on IBM ThinkPads."
-	einfo
-	einfo "Please refer to the lm_sensors documentation for more information."
-	einfo "(http://www.lm-sensors.org/wiki/Documentation)"
-	einfo
-}
-
-# Reminder: bug 157085 is blocking the sensors-detect in pkg_config (bug 159137).