Pruned vulnerable versions, bug #103568.

(Portage version: 2.0.51.22-r2)

9 files changed, 8 insertions, 656 deletions

diff --git a/sys-apps/lm_sensors/ChangeLog b/sys-apps/lm_sensors/ChangeLog
index 6656ba82fffa..d85870caef02 100644
--- a/sys-apps/lm_sensors/ChangeLog
+++ b/sys-apps/lm_sensors/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/lm_sensors
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.37 2005/08/25 18:25:40 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.38 2005/08/26 10:25:43 brix Exp $
+
+  26 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
+  -files/lm_sensors-2.8.7-sensors-detect-gentoo.diff,
+  -files/lm_sensors-2.8.8-sensors-detect-gentoo.diff,
+  -lm_sensors-2.8.7.ebuild, -lm_sensors-2.9.0.ebuild,
+  -lm_sensors-2.9.1.ebuild:
+  Pruned vulnerable versions, bug #103568.
 
   25 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
   lm_sensors-2.9.1-r1.ebuild:
diff --git a/sys-apps/lm_sensors/files/digest-lm_sensors-2.8.7 b/sys-apps/lm_sensors/files/digest-lm_sensors-2.8.7
deleted file mode 100644
index c2d377771b6f..000000000000
--- a/sys-apps/lm_sensors/files/digest-lm_sensors-2.8.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 64b4a4f547b2e1eab8a574d871867ca5 lm_sensors-2.8.7.tar.gz 791187
diff --git a/sys-apps/lm_sensors/files/digest-lm_sensors-2.9.0 b/sys-apps/lm_sensors/files/digest-lm_sensors-2.9.0
deleted file mode 100644
index 010152f9cdc3..000000000000
--- a/sys-apps/lm_sensors/files/digest-lm_sensors-2.9.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 add1f403c619e84bec2fbdfa12eda56f lm_sensors-2.9.0.tar.gz 823545
diff --git a/sys-apps/lm_sensors/files/digest-lm_sensors-2.9.1 b/sys-apps/lm_sensors/files/digest-lm_sensors-2.9.1
deleted file mode 100644
index 9b9f92a218ca..000000000000
--- a/sys-apps/lm_sensors/files/digest-lm_sensors-2.9.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f5af615e39441d95471bdb72a3f01709 lm_sensors-2.9.1.tar.gz 870765
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.8.7-sensors-detect-gentoo.diff b/sys-apps/lm_sensors/files/lm_sensors-2.8.7-sensors-detect-gentoo.diff
deleted file mode 100644
index 45e1ff3c5d58..000000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-2.8.7-sensors-detect-gentoo.diff
+++ /dev/null
@@ -1,119 +0,0 @@
---- prog/detect/sensors-detect	2004-06-11 19:47:13.000000000 +0100
-+++ prog/detect/sensors-detect-2.8.7	2004-07-12 15:44:13.715998584 +0100
-@@ -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;
-@@ -4803,39 +4811,44 @@
-   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(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
-@@ -4856,13 +4869,17 @@
- # 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
-@@ -4878,9 +4895,7 @@
-       }
-       print SYSCONFIG $sysconfig;
-       close(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.8.8-sensors-detect-gentoo.diff b/sys-apps/lm_sensors/files/lm_sensors-2.8.8-sensors-detect-gentoo.diff
deleted file mode 100644
index a35525fa3107..000000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-2.8.8-sensors-detect-gentoo.diff
+++ /dev/null
@@ -1,119 +0,0 @@
---- lm_sensors-2.8.8/prog/detect/sensors-detect	2004-10-03 21:51:47.000000000 +0100
-+++ lm_sensors-2.8.8/prog/detect/sensors-detect.plasmaroo	2004-10-24 12:33:39.837299960 +0100
-@@ -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;
-@@ -4882,39 +4890,44 @@
-   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
-@@ -4935,13 +4948,17 @@
- # 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
-@@ -4956,9 +4973,7 @@
-         $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/lm_sensors-2.8.7.ebuild b/sys-apps/lm_sensors/lm_sensors-2.8.7.ebuild
deleted file mode 100644
index 17f43ef66434..000000000000
--- a/sys-apps/lm_sensors/lm_sensors-2.8.7.ebuild
+++ /dev/null
@@ -1,147 +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/lm_sensors-2.8.7.ebuild,v 1.5 2005/06/12 07:42:27 brix Exp $
-
-inherit flag-o-matic eutils toolchain-funcs multilib
-
-MYI2C="${WORKDIR}/i2c-headers"
-
-DESCRIPTION="Hardware Sensors Monitoring by lm_sensors"
-SRC_URI="http://www.lm-sensors.nu/archive/${P}.tar.gz"
-HOMEPAGE="http://www2.lm-sensors.nu/~lm78"
-
-SLOT="0"
-
-KEYWORDS="-ppc -sparc x86 amd64"
-IUSE="rrdtool"
-LICENSE="GPL-2"
-
-DEPEND=">=sys-apps/i2c-${PV}
-	rrdtool? ( net-analyzer/rrdtool )"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-	epatch ${FILESDIR}/lm_sensors-2.8.7-sensors-detect-gentoo.diff > /dev/null || die
-
-	# Get the right I2C includes without dropping the kernel includes
-	mkdir -p ${MYI2C}/linux
-	cp /usr/include/linux/i2c* ${MYI2C}/linux/
-
-	# Add sensord to the make targets if the rrdtool USE flag is on...
-	use rrdtool && sed -i -e 's:# PROG_EXTRA:PROG_EXTRA:' Makefile
-}
-
-src_compile()  {
-	echo
-	einfo "This ebuild assumes your /usr/src/linux kernel is the one you"
-	einfo "used to build i2c-2.8.7."
-	einfo
-	einfo "For 2.5+ series kernels, use the support already in the kernel"
-	einfo "under 'Character devices' -> 'I2C support' and then merge this"
-	einfo "ebuild."
-	einfo
-	einfo "To cross-compile, 'export LINUX=\"/lib/modules/<version>/build\"'"
-	einfo "or symlink /usr/src/linux to another kernel."
-	echo
-
-	UserModeOnly=false
-	if [ "$LINUX" != "" ]; then
-		einfo "Cross-compiling using:- $LINUX"
-		LINUX=`echo $LINUX | sed 's/build\//build/'`
-		KV=`cut -d\  -f3 ${LINUX}/include/linux/version.h | grep \" | sed -e 's/"//' -e 's/"//'`
-		if [ "${KV}" == "" ]; then
-			die "Could not get kernel version; make sure ${LINUX}/include/linux/version.h is there!"
-		fi
-	else
-		LINUX='/usr/src/linux'
-		check_KV || die "Cannot find kernel in /usr/src/linux!"
-		einfo "Using kernel in /usr/src/linux/:- ${KV}"
-	fi
-	if [ `echo ${KV} | grep 2\.[56]\.` ]; then
-		einfo "You are using a 2.5 / 2.6 series kernel; only building utilities..."
-		UserModeOnly=true
-	else
-		einfo "You are using a `echo ${KV} | cut -d. -f-2` series kernel; building everything..."
-	fi
-	if [ "${KV}" != "${SLOT}" ]; then
-		echo
-		ewarn "WARNING:- Specified and running kernels do not match!"
-		ewarn "WARNING:- This package will be slotted as ${SLOT}!"
-	fi
-
-	if [ ! -e ${MYI2C}/linux/i2c.h ]; then
-		cp $LINUX/include/linux/i2c* ${MYI2C}/linux || die "No I2C Includes! Install I2C!"
-	fi
-
-	echo; einfo "You may safely ignore any errors from compilation"
-	einfo "that contain 'No such file' references."
-
-	echo
-
-	# Please _don't_ use filter-flags -fPIC on apps that need it!
-	# [ amd64, hppa, ia64, etc... ]
-	# Danny van Dyk <kugelfang@gentoo.org> 2004/05/28
-	case "${ARCH}" in
-		"amd64")
-			filter-flags -fstack-protector
-			;;
-		*)
-			filter-flags -fPIC -fstack-protector
-			;;
-	esac
-
-	cd ${S}
-	emake clean
-
-	if [ ${UserModeOnly} == true ]; then
-		emake CC=$(tc-getCC) I2C_HEADERS=${MYI2C} user || die "Could not compile user-mode utilities!"
-	else
-		emake CC=$(tc-getCC) I2C_HEADERS=${MYI2C} LINUX=$LINUX || die "lm_sensors requires the source of a compatible kernel version in /usr/src/linux or specified in \$LINUX and >=i2c-2.8.1 support built as modules. Make sure that I2C >=2.8.1 is on your system before filing a bug."
-	fi
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/sbin
-	if [ ${UserModeOnly} == true ]; then
-		emake DESTDIR=${D} LIBDIR=/usr/$(get_libdir) PREFIX=/usr MANDIR=/usr/share/man user_install || die "Install failed!"
-	else
-		emake LINUX=$LINUX DESTDIR=${D} LIBDIR=/usr/$(get_libdir) PREFIX=/usr MANDIR=/usr/share/man install || die "Install failed!"
-	fi
-	rm ${D}/var -Rf
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/rc lm_sensors
-	dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS COPYING INSTALL QUICKSTART \
-		README* TODO
-
-	[ -e ${ROOT}/usr/include/linux/i2c-dev.h -a -e ${D}/usr/include/linux/i2c-dev.h ] && rm ${D}/usr/include/linux/i2c-dev.h
-	cp -a doc/* ${D}/usr/share/doc/${PF}
-}
-
-pkg_postinst() {
-	[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
-
-	echo
-	einfo
-	einfo "The lm_sensors hardware sensors package has been installed."
-	einfo
-	einfo "It is recommended that you read the lm_sensors documentation."
-	einfo "To enable lm_sensors you will need to compile i2c support in"
-	einfo "your kernel as a module and run /usr/sbin/sensors-detect to"
-	einfo "detect the hardware in your system."
-	einfo
-	einfo "Be warned, the probing of hardware in your system performed by"
-	einfo "sensors-detect could freeze your system.  Also do not use"
-	einfo "lm_sensors on certain laptop models from IBM.  See the lm_sensors"
-	einfo "documentation and website for more information."
-	einfo
-	einfo "IMPORTANT: When you merge this package it installs kernel modules"
-	einfo "that can only be used with the specific kernel version whose"
-	einfo "source is located in /usr/src/linux.  If you upgrade to a new"
-	einfo "kernel, you will need to remerge the lm_sensors package to build"
-	einfo "new kernel modules."
-	einfo
-	echo
-}
diff --git a/sys-apps/lm_sensors/lm_sensors-2.9.0.ebuild b/sys-apps/lm_sensors/lm_sensors-2.9.0.ebuild
deleted file mode 100644
index 58f5e4bb47ed..000000000000
--- a/sys-apps/lm_sensors/lm_sensors-2.9.0.ebuild
+++ /dev/null
@@ -1,136 +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/lm_sensors-2.9.0.ebuild,v 1.7 2005/08/19 15:35:32 brix Exp $
-
-inherit flag-o-matic eutils toolchain-funcs multilib
-
-MYI2C="${WORKDIR}/i2c-headers"
-
-DESCRIPTION="Hardware Sensors Monitoring by lm_sensors"
-SRC_URI="http://www.lm-sensors.nu/archive/${P}.tar.gz"
-HOMEPAGE="http://www2.lm-sensors.nu/~lm78"
-
-SLOT="0"
-
-KEYWORDS="~amd64 -ppc ~x86"
-IUSE="rrdtool"
-LICENSE="GPL-2"
-
-DEPEND=">=sys-apps/i2c-${PV}
-	rrdtool? ( net-analyzer/rrdtool )"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-	epatch ${FILESDIR}/lm_sensors-2.8.8-sensors-detect-gentoo.diff > /dev/null || die
-
-	# Get the right I2C includes without dropping the kernel includes
-	mkdir -p ${MYI2C}/linux
-	cp /usr/include/linux/i2c* ${MYI2C}/linux/
-
-	# Add sensord to the make targets if the rrdtool USE flag is on...
-	use rrdtool && sed -i -e 's:# PROG_EXTRA:PROG_EXTRA:' Makefile
-}
-
-src_compile()  {
-	echo
-	einfo "This ebuild assumes your /usr/src/linux kernel is the one you"
-	einfo "used to build i2c-${PV}."
-	einfo
-	einfo "For 2.5+ series kernels, use the support already in the kernel"
-	einfo "under 'Character devices' -> 'I2C support' and then merge this"
-	einfo "ebuild."
-	einfo
-	einfo "To cross-compile, 'export LINUX=\"/lib/modules/<version>/build\"'"
-	einfo "or symlink /usr/src/linux to another kernel."
-	echo
-
-	UserModeOnly=false
-	if [ "$LINUX" != "" ]; then
-		einfo "Cross-compiling using:- $LINUX"
-		LINUX=`echo $LINUX | sed 's/build\//build/'`
-		KV=`cut -d\  -f3 ${LINUX}/include/linux/version.h | grep \" | sed -e 's/"//' -e 's/"//'`
-		if [ "${KV}" == "" ]; then
-			die "Could not get kernel version; make sure ${LINUX}/include/linux/version.h is there!"
-		fi
-	else
-		LINUX='/usr/src/linux'
-		check_KV || die "Cannot find kernel in /usr/src/linux!"
-		einfo "Using kernel in /usr/src/linux/:- ${KV}"
-	fi
-	if [ `echo ${KV} | grep 2\.[56]\.` ]; then
-		einfo "You are using a 2.5 / 2.6 series kernel; only building utilities..."
-		UserModeOnly=true
-	else
-		einfo "You are using a `echo ${KV} | cut -d. -f-2` series kernel; building everything..."
-	fi
-	if [ "${KV}" != "${SLOT}" ]; then
-		echo
-		ewarn "WARNING:- Specified and running kernels do not match!"
-		ewarn "WARNING:- This package will be slotted as ${SLOT}!"
-	fi
-
-	if [ ! -e ${MYI2C}/linux/i2c.h ]; then
-		cp $LINUX/include/linux/i2c* ${MYI2C}/linux || die "No I2C Includes! Install I2C!"
-	fi
-
-	echo; einfo "You may safely ignore any errors from compilation"
-	einfo "that contain 'No such file' references."
-
-	echo
-	filter-flags -fstack-protector
-
-	cd ${S}
-	emake clean
-
-	if [ ${UserModeOnly} == true ]; then
-		emake CC=$(tc-getCC) I2C_HEADERS=${MYI2C} user || die "Could not compile user-mode utilities!"
-	else
-		emake CC=$(tc-getCC) I2C_HEADERS=${MYI2C} LINUX=$LINUX || die "lm_sensors requires the source of a compatible kernel version in /usr/src/linux or specified in \$LINUX and >=i2c-2.8.1 support built as modules. Make sure that I2C >=2.8.1 is on your system before filing a bug."
-	fi
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/sbin
-	if [ ${UserModeOnly} == true ]; then
-		emake DESTDIR=${D} LIBDIR=/usr/$(get_libdir) PREFIX=/usr MANDIR=/usr/share/man user_install || die "Install failed!"
-	else
-		emake LINUX=${LINUX} DESTDIR=${D} LIBDIR=/usr/$(get_libdir) PREFIX=/usr MANDIR=/usr/share/man install || die "Install failed!"
-	fi
-	rm ${D}/var -Rf
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/rc lm_sensors
-	dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS COPYING INSTALL QUICKSTART \
-		README* TODO
-
-	[ -e ${ROOT}/usr/include/linux/i2c-dev.h -a -e ${D}/usr/include/linux/i2c-dev.h ] && rm ${D}/usr/include/linux/i2c-dev.h
-	cp -a doc/* ${D}/usr/share/doc/${PF}
-}
-
-pkg_postinst() {
-	[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
-
-	echo
-	einfo
-	einfo "The lm_sensors hardware sensors package has been installed."
-	einfo
-	einfo "It is recommended that you read the lm_sensors documentation."
-	einfo "To enable lm_sensors you will need to compile i2c support in"
-	einfo "your kernel as a module and run /usr/sbin/sensors-detect to"
-	einfo "detect the hardware in your system."
-	einfo
-	einfo "Be warned, the probing of hardware in your system performed by"
-	einfo "sensors-detect could freeze your system.  Also do not use"
-	einfo "lm_sensors on certain laptop models from IBM.  See the lm_sensors"
-	einfo "documentation and website for more information."
-	einfo
-	einfo "IMPORTANT: When you merge this package it installs kernel modules"
-	einfo "that can only be used with the specific kernel version whose"
-	einfo "source is located in /usr/src/linux.  If you upgrade to a new"
-	einfo "kernel, you will need to remerge the lm_sensors package to build"
-	einfo "new kernel modules."
-	einfo
-	echo
-}
diff --git a/sys-apps/lm_sensors/lm_sensors-2.9.1.ebuild b/sys-apps/lm_sensors/lm_sensors-2.9.1.ebuild
deleted file mode 100644
index 404df6befa18..000000000000
--- a/sys-apps/lm_sensors/lm_sensors-2.9.1.ebuild
+++ /dev/null
@@ -1,131 +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/lm_sensors-2.9.1.ebuild,v 1.7 2005/08/19 18:00:46 hansmi Exp $
-
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib
-
-DESCRIPTION="Linux System Hardware Monitoring user-space utilities"
-
-HOMEPAGE="http://secure.netroedge.com/~lm78/"
-SRC_URI="http://secure.netroedge.com/~lm78/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-IUSE="sensord"
-DEPEND="sys-apps/sed
-		ppc? ( >=virtual/linux-sources-2.5 )
-		!ppc? ( || (  >=virtual/linux-sources-2.5 sys-apps/lm_sensors-modules ) )"
-RDEPEND="dev-lang/perl
-		sensord? ( net-analyzer/rrdtool )"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is 2 4; then
-		if use ppc; then
-			eerror
-			eerror "${P} does not support kernel 2.4.x under PPC."
-			eerror
-			die "${P} does not support kernel 2.4.x under PPC."
-		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 ! (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"
-		fi
-		if ! (linux_chkconfig_present I2C_CHARDEV); then
-			eerror
-			eerror "${P} requires CONFIG_I2C_CHARDEV to be enabled for non-2.4.x kernels."
-			eerror
-			die "CONFIG_I2C_CHARDEV not detected"
-		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 need to run the above command even if you're just upgrading,"
-	einfo "as the needed entries in /etc/conf.d/lm_sensors has 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
-}