clean up old versions

Package-Manager: portage-2.2_rc67/cvs/Linux i686

8 files changed, 10 insertions, 660 deletions

diff --git a/sys-apps/lm_sensors/ChangeLog b/sys-apps/lm_sensors/ChangeLog
index 476af1170e63..42655994880a 100644
--- a/sys-apps/lm_sensors/ChangeLog
+++ b/sys-apps/lm_sensors/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/lm_sensors
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.98 2010/02/15 10:08:18 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.99 2010/05/26 18:56:26 bangert Exp $
+
+  26 May 2010; Thilo Bangert <bangert@gentoo.org>
+  -files/lm_sensors-3.0.1-sensors-detect-gentoo.patch,
+  -lm_sensors-3.0.2.ebuild, -lm_sensors-3.0.3.ebuild,
+  -files/lm_sensors-3.0.3-sensors-detect-gentoo.patch,
+  -lm_sensors-3.1.1.ebuild,
+  -files/lm_sensors-3.1.1-sensors-detect-gentoo.patch:
+  clean up old versions
 
 *lm_sensors-3.1.2 (15 Feb 2010)
 
diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest
index 3a66c893577c..ee40bcd78afa 100644
--- a/sys-apps/lm_sensors/Manifest
+++ b/sys-apps/lm_sensors/Manifest
@@ -2,9 +2,6 @@ AUX fancontrol-init.d 726 RMD160 444eedc0044a61e0a79d79565e6399156b8f9b9c SHA1 a
 AUX lm_sensors-2.10.4-sensors-detect-gentoo.patch 4350 RMD160 962c2ddcd5b59926d2ccaa0ba0b65bd05d758d45 SHA1 3ba0c151f1dbecfed52444561c73897902270574 SHA256 1ace0bb0f88c0f6f235ca47317fddf723d4e8900f9ba66aae432b44274ca192b
 AUX lm_sensors-2.10.7-sensors-detect-gentoo.patch 4016 RMD160 27cbc052b65e903fe01360e8cde4c4a1c8bdf7eb SHA1 dfe0916e0d063b447131e2e0a1cb8751c091df16 SHA256 aa29dbddec4947f4fa645a9af70b58c6fbfeaf815fdf28d4cf6ff46d775d9025
 AUX lm_sensors-3-init.d 2466 RMD160 54b58e00914e9c1f8b21e6a73cc215335d9dd647 SHA1 6250e4e28cd936efa6d05846b16175e85fe821c5 SHA256 9b018f9f7a0975988387858823fe59a5cd8af6413d8c3170db0e24aac6021ec3
-AUX lm_sensors-3.0.1-sensors-detect-gentoo.patch 4708 RMD160 bebfd29cbb5ec39efc78e140ebd4115291ecd632 SHA1 3dd7635f0e126c54aa3ccc90b8e33977d85fc0d0 SHA256 bcaee3c4b9001339222445a7c5ea328c5fff379c969bde3cfe382266cf4f4824
-AUX lm_sensors-3.0.3-sensors-detect-gentoo.patch 4698 RMD160 bb5c321473a7519837583868ae0516507ee8c679 SHA1 941521987e0dc818c3ac5873eeaa2105bd36ddb4 SHA256 dc3f9b7a32f4844f907b9192f3990c5bca702f2f9a6b73446bc71b2f80ad9f46
-AUX lm_sensors-3.1.1-sensors-detect-gentoo.patch 4398 RMD160 3bafa465c410be328ffc1d78c81d80f21af328ec SHA1 ab1ddf27e2133d21f1955a722c68c37bc49e6d30 SHA256 911093670675df50c836e72d0eafd8af49a7837e8c0a4ec7f38305b61a7a9d49
 AUX lm_sensors-3.1.2-sensors-detect-gentoo.patch 4502 RMD160 8d5f528e654ee8422de3d4190531b22a841d7acf SHA1 9b21848fc22866721ca6e9fed4b9039abe954a82 SHA256 c9686202da0529e695c3ea872961870884c0474526fee3e3053f3e5d3bd0949e
 AUX lm_sensors-init.d 2457 RMD160 5e7c90dc926e5df4426e3ab3f42f3d61dd4c7696 SHA1 b2fdb2d08da3491f4128714bb7ba6006420dcc07 SHA256 2271f55d96946ee15d907715ec59d55724a0bb9f81e1b25beef399bc18579b4a
 AUX sensord-3-init.d 712 RMD160 7f5be22a8e1e0b7adb56d4ba74e685eb3789cbf2 SHA1 05f4ed45896e708accab73057719ec866e9351af SHA256 8a3debf0b84af9944a467e377b0e4b0db67d428083675f0fcf33ec55a8b2a709
@@ -12,15 +9,9 @@ AUX sensord-conf.d 104 RMD160 c4a06a8492d6c0fd966dea64d92f798a9b716a92 SHA1 4309
 AUX sensord-init.d 708 RMD160 31e5a4ac844333bc9689346bb68c206ded13f1a3 SHA1 45dd30ba6d158022e8290ea9b09fd2a1053c5b58 SHA256 9f6d0e7bcdc1b4b3bc0835b40f246f7caf76e1b3bbfcf76a5d5b235eb8243d89
 DIST lm_sensors-2.10.7.tar.gz 933974 RMD160 34801542e2ac6b3305c8caf891415e99a1b94bc3 SHA1 2a5491aa8fa3d855bf14b06c4c0869e6ee45e434 SHA256 b180f5b429427847e734c212f51c4b3c043d4c11fddca0d6b4b59f8fbb36be99
 DIST lm_sensors-2.10.8.tar.gz 935982 RMD160 a47884771ff1368e6609b8ae1dc686d36226a63d SHA1 8356c19d1528d061d7b7f1468621c6628f401f07 SHA256 d1410d41304ad601d8475f790a23a05e75f612c6b425df105784f5e3aee34f7d
-DIST lm_sensors-3.0.2.tar.bz2 149734 RMD160 d896eb8360b5285a2446b94ba659d5bcdcf1f4b8 SHA1 8f28c11d00e68fc4b8249e02d224427f8f836d68 SHA256 1461fc2e8661ded28b73ed2f7a06cbecf852aa641df974e38aaa0e23977c5b57
-DIST lm_sensors-3.0.3.tar.bz2 152900 RMD160 d8af5c3c0dde5b07010c8c834dcf7a2c04fb509a SHA1 2f68d003aef8f83bbef006c5b7b26a88bd9fd036 SHA256 b45661f4c3a7f19d67ee4783e8270f462e874d7c909c8f4228692de97aad0ec6
-DIST lm_sensors-3.1.1.tar.bz2 154551 RMD160 7a333f42f598ee8366f70157037c63ebb5b33387 SHA1 8be15806d229305491f11b77c67496074480faf4 SHA256 d95a3f2a6526f4da2ae145b7bbf45d16f0fb17bfe0d2017c7e02964199d059ef
 DIST lm_sensors-3.1.2.tar.bz2 157644 RMD160 161e626bf401cd0213c821c95b32248e0bd6a1f5 SHA1 4a3b13e4f9c18c29e7f853739bdd88ca7799fcc7 SHA256 a4f9553417f4c6592e87cbcbefb04d5c16710d58fa6fd02ca46a309f3b613d6e
 EBUILD lm_sensors-2.10.7.ebuild 4725 RMD160 653c3674909c028926a89768030737f56fa0cfab SHA1 17c1236e1610b1735920534e728936e3eda930ae SHA256 6d8063d8151e14b150f6b4d0a90652f74b1b46bb39b56f6018f1a4d48881b347
 EBUILD lm_sensors-2.10.8.ebuild 5158 RMD160 58308d899c93750856b3fd63f5773ed8e28ddc65 SHA1 a2b1d650c90d3522c88424e22d2b447e3335eb9d SHA256 597815e327dea2741da64920b76a6b579ef6c631b85978647a2e2fe78bbff5b7
-EBUILD lm_sensors-3.0.2.ebuild 3066 RMD160 606ade62fa203669ed819a5ef10f539d1edb7d70 SHA1 62b2a50b6dd9ebcde9e5ec0f998447c4b568fbd8 SHA256 02fd5606aca71fe10d5e76dcc03a8d54e32583871180936224eb9cbcfc7766b6
-EBUILD lm_sensors-3.0.3.ebuild 3061 RMD160 4c151b8a1397282d18f79a44b6b748fe900fcdff SHA1 3c343af0548f70e11e6961d815fa089c1ed3039f SHA256 711e49b56654066ea7ff0c398c103d04f9e04024c439d4d24c2908a8e9a9c09a
-EBUILD lm_sensors-3.1.1.ebuild 3145 RMD160 faec436cbc7bbc901c90dca840fa2a5d11429ea6 SHA1 5a5b2b8bfe04f7051bac4017d1b07014ea5dbe54 SHA256 b8ba651158d5dc6e337be97a31b43a54f21ffac2434c87fd4974a710be2dc800
 EBUILD lm_sensors-3.1.2.ebuild 3054 RMD160 cef14938be99c6eb053a729efd5a5b5496edfa94 SHA1 7ecc173642946fd42216e31a78e3941ea4bcc539 SHA256 9f7cf4724afa008dbacfcf59007e41b59a579c73217bc3b0e823a1e6d62a8ec0
-MISC ChangeLog 11447 RMD160 7ebfadab37462f601f1be4aa7daffbb247aead3e SHA1 8cfa4c97434bde51e1c610ea840020b57882b027 SHA256 2b91224485d0d3335396d45b93fb138b56b8372000437cbf322078cb0d102727
+MISC ChangeLog 11769 RMD160 ba3b56e86f6cef879c2502a7fccd02850e162e05 SHA1 2a5171ec47824fa8b9bcb1c8d789a71d7a0bd423 SHA256 1fffbf12f0dbd050397a105a5e654b966f90cf8f918283c7e104bc2b15b3158f
 MISC metadata.xml 328 RMD160 102d79ccb2dfd783b5d5baf50f5ac633d915f712 SHA1 b19178b1ba16d245cd04ea70c9532ee8dc37097c SHA256 aa83681ad6865347f45c3911d408b253ab27e43bf0e3f0e58624a2b4958b425b
diff --git a/sys-apps/lm_sensors/files/lm_sensors-3.0.1-sensors-detect-gentoo.patch b/sys-apps/lm_sensors/files/lm_sensors-3.0.1-sensors-detect-gentoo.patch
deleted file mode 100644
index a17cf1aa8d4c..000000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-3.0.1-sensors-detect-gentoo.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-diff -urN lm_sensors-3.0.1.orig/prog/detect/sensors-detect lm_sensors-3.0.1/prog/detect/sensors-detect
---- lm_sensors-3.0.1.orig/prog/detect/sensors-detect	2008-01-22 04:22:47.000000000 -0800
-+++ lm_sensors-3.0.1/prog/detect/sensors-detect	2008-03-16 15:52:15.000000000 -0700
-@@ -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;
-@@ -5871,29 +5874,35 @@
-       print MODPROBE_D $configfile;
-       close(MODPROBE_D);
-     } else {
-+      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";
-     }
-   }
- 
--  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
-+  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
-@@ -5921,12 +5930,21 @@
- # 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) {
-@@ -5936,10 +5954,8 @@
-     }
-     print SYSCONFIG $sysconfig;
-     close(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";
- 
-     if (-x "/sbin/insserv" && -f "/etc/init.d/lm_sensors") {
-       system("/sbin/insserv", "/etc/init.d/lm_sensors");
-@@ -5948,15 +5964,6 @@
-             "kernel modules.\n\n";
-     }
-   } else {
--    print "To load everything that is needed, add this to one of the system\n".
--          "initialization scripts (e.g. /etc/rc.d/rc.local):\n\n";
--    print "#----cut here----\n".
--          $modprobes.
--          (-e '/usr/bin/sensors' ?
--            "/usr/bin/sensors -s\n" :
--            "/usr/local/bin/sensors -s\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".
diff --git a/sys-apps/lm_sensors/files/lm_sensors-3.0.3-sensors-detect-gentoo.patch b/sys-apps/lm_sensors/files/lm_sensors-3.0.3-sensors-detect-gentoo.patch
deleted file mode 100644
index ff353f957b58..000000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-3.0.3-sensors-detect-gentoo.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-diff -urN lm_sensors-3.0.3.orig/prog/detect/sensors-detect lm_sensors-3.0.3/prog/detect/sensors-detect
---- lm_sensors-3.0.3.orig/prog/detect/sensors-detect	2008-09-19 17:05:28.000000000 +0200
-+++ lm_sensors-3.0.3/prog/detect/sensors-detect	2008-10-27 10:03:39.000000000 +0100
-@@ -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;
-@@ -6076,29 +6079,35 @@
-       print MODPROBE_D $configfile;
-       close(MODPROBE_D);
-     } else {
-+      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";
-     }
-   }
- 
--  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
-+  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
-@@ -6127,12 +6136,21 @@
- # 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) {
-@@ -6142,10 +6160,8 @@
-     }
-     print SYSCONFIG $sysconfig;
-     close(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";
- 
-     if (-x "/sbin/insserv" && -f "/etc/init.d/lm_sensors") {
-       system("/sbin/insserv", "/etc/init.d/lm_sensors");
-@@ -6159,15 +6175,6 @@
-             "kernel modules.\n\n";
-     }
-   } else {
--    print "To load everything that is needed, add this to one of the system\n".
--          "initialization scripts (e.g. /etc/rc.d/rc.local):\n\n";
--    print "#----cut here----\n".
--          $modprobes.
--          (-e '/usr/bin/sensors' ?
--            "/usr/bin/sensors -s\n" :
--            "/usr/local/bin/sensors -s\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".
diff --git a/sys-apps/lm_sensors/files/lm_sensors-3.1.1-sensors-detect-gentoo.patch b/sys-apps/lm_sensors/files/lm_sensors-3.1.1-sensors-detect-gentoo.patch
deleted file mode 100644
index 79882da7f5c8..000000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-3.1.1-sensors-detect-gentoo.patch
+++ /dev/null
@@ -1,114 +0,0 @@
---- lm_sensors-3.1.1.orig/prog/detect/sensors-detect	2009-03-04 15:18:39.000000000 +0100
-+++ lm_sensors-3.1.1/prog/detect/sensors-detect	2009-03-04 15:21:26.000000000 +0100
-@@ -20,6 +20,9 @@
- #    MA 02110-1301 USA.
- #
- 
-+# Gentoo specific modifications based on a patch from Rudo Thomas
-+# <thomr9am@ss1000.ms.mff.cuni.cz>
-+
- require 5.004;
- 
- use strict;
-@@ -5274,26 +5277,33 @@
- 			print MODPROBE_D $configfile;
- 			close(MODPROBE_D);
- 		} else {
-+			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".
--			      "/etc/modprobe.conf:\n\n";
-+			      "/etc/modules.d/lm_sensors and run modules-update:\n\n";
- 			print "#----cut here----\n".
- 			      $configfile.
- 			      "#----cut here----\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 ($!)";
-+	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(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors")
--			or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)";
-+		open(SYSCONFIG, ">".$filename)
-+			 or die "Sorry, can't create $filename ($!).";
- 		print SYSCONFIG "# Generated by sensors-detect on " . scalar localtime() . "\n";
- 		print SYSCONFIG <<'EOT';
- # This file is sourced by /etc/init.d/lm_sensors and defines the modules to
-@@ -5304,6 +5314,11 @@
- # BUS_MODULES for any required bus driver module (for example for I2C or SPI).
- 
- EOT
-+		print SYSCONFIG
-+			"# Load modules at startup\n".
-+			"LOADMODULES=yes\n\n".
-+			"# Initialize sensors at startup\n".
-+			"INITSENSORS=yes\n\n";
- 		print SYSCONFIG "BUS_MODULES=\"", join(" ", @{$bus_modules}), "\"\n"
- 			if @{$bus_modules};
- 		print SYSCONFIG "HWMON_MODULES=\"", join(" ", @{$hwmon_modules}), "\"\n";
-@@ -5312,6 +5327,10 @@
- 
- # For compatibility reasons, modules are also listed individually as variables
- #    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.
-+#
- # You should use BUS_MODULES and HWMON_MODULES instead if possible.
- 
- EOT
-@@ -5321,10 +5340,7 @@
- 			$i++;
- 		}
- 		close(SYSCONFIG);
--
--		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";
-+		print "Done.\n";
- 
- 		if (-x "/sbin/insserv" && -f "/etc/init.d/lm_sensors") {
- 			system("/sbin/insserv", "/etc/init.d/lm_sensors");
-@@ -5338,20 +5354,6 @@
- 			      "kernel modules.\n\n";
- 		}
- 	} else {
--		print "To load everything that is needed, add this to one of the system\n".
--		      "initialization scripts (e.g. /etc/rc.d/rc.local):\n\n";
--		print "#----cut here----\n";
--		if (@{$bus_modules}) {
--			print "# Adapter drivers\n";
--			print "modprobe $_\n" foreach (@{$bus_modules});
--		}
--		print "# Chip drivers\n";
--		print "modprobe $_\n" foreach (@{$hwmon_modules});
--		print((-e '/usr/bin/sensors' ?
--		       "/usr/bin/sensors -s\n" :
--		       "/usr/local/bin/sensors -s\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".
diff --git a/sys-apps/lm_sensors/lm_sensors-3.0.2.ebuild b/sys-apps/lm_sensors/lm_sensors-3.0.2.ebuild
deleted file mode 100644
index 36c9952d315a..000000000000
--- a/sys-apps/lm_sensors/lm_sensors-3.0.2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-3.0.2.ebuild,v 1.3 2009/10/17 01:18:04 robbat2 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.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-
-IUSE="sensord"
-
-COMMON="sensord? ( net-analyzer/rrdtool )"
-DEPEND="${COMMON}
-		sys-apps/sed"
-RDEPEND="${COMMON}
-		dev-lang/perl
-		virtual/logger"
-
-CONFIG_CHECK="~HWMON ~I2C_CHARDEV ~I2C"
-WARNING_HWMON="${PN} requires CONFIG_HWMON to be enabled for use."
-WARNING_I2C_CHARDEV="sensors-detect requires CONFIG_I2C_CHARDEV to be enabled."
-WARNING_I2C="${PN} requires CONFIG_I2C to be enabled for most sensors."
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-3.0.1-sensors-detect-gentoo.patch
-
-	if use sensord; then
-		sed -i -e 's:^# \(PROG_EXTRA\):\1:' "${S}"/Makefile
-	fi
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile
-	sed -i -e 's/\$(LIBSHSONAME) -o/$(LIBSHSONAME) \$(LDFLAGS) -o/g' lib/Module.mk
-}
-
-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) \
-		|| die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man LIBDIR=/usr/$(get_libdir) \
-		install || die "emake install failed"
-
-	newinitd "${FILESDIR}"/lm_sensors-3-init.d lm_sensors
-	newinitd "${FILESDIR}"/fancontrol-init.d fancontrol
-
-	if use sensord; then
-		newconfd "${FILESDIR}"/sensord-conf.d sensord
-		newinitd "${FILESDIR}"/sensord-init.d sensord
-	fi
-
-	dodoc CHANGES CONTRIBUTORS INSTALL README*
-
-	dodoc doc/donations doc/fancontrol.txt doc/fan-divisors \
-		doc/progs doc/temperature-sensors doc/vid
-
-	dohtml doc/lm_sensors-FAQ.html doc/useful_addresses.html
-
-	docinto chips
-	dodoc doc/chips/*
-
-	docinto developers
-	dodoc doc/developers/applications
-}
-
-pkg_postinst() {
-	elog
-	elog "Please run \`/usr/sbin/sensors-detect' in order to setup"
-	elog "/etc/conf.d/lm_sensors."
-	elog
-	elog "/etc/conf.d/lm_sensors is vital to the init-script."
-	elog "Please make sure you also add lm_sensors to the desired"
-	elog "runlevel. Otherwise your I2C modules won't get loaded"
-	elog "on the next startup."
-	elog
-	elog "You will also need to run the above command if you're upgrading from"
-	elog "<=${PN}-2, as the needed entries in /etc/conf.d/lm_sensors has"
-	elog "changed."
-	elog
-	elog "Be warned, the probing of hardware in your system performed by"
-	elog "sensors-detect could freeze your system. Also make sure you read"
-	elog "the documentation before running lm_sensors on IBM ThinkPads."
-	elog
-	elog "Please refer to the lm_sensors documentation for more information."
-	elog "(http://www.lm-sensors.org/wiki/Documentation)"
-	elog
-}
diff --git a/sys-apps/lm_sensors/lm_sensors-3.0.3.ebuild b/sys-apps/lm_sensors/lm_sensors-3.0.3.ebuild
deleted file mode 100644
index d72da2504f62..000000000000
--- a/sys-apps/lm_sensors/lm_sensors-3.0.3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-3.0.3.ebuild,v 1.2 2009/10/17 01:18:04 robbat2 Exp $
-
-EAPI=2
-
-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.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="sensord"
-
-COMMON="sensord? ( net-analyzer/rrdtool )"
-DEPEND="${COMMON}
-		sys-apps/sed"
-RDEPEND="${COMMON}
-		dev-lang/perl
-		virtual/logger"
-
-CONFIG_CHECK="~HWMON ~I2C_CHARDEV ~I2C"
-WARNING_HWMON="${PN} requires CONFIG_HWMON to be enabled for use."
-WARNING_I2C_CHARDEV="sensors-detect requires CONFIG_I2C_CHARDEV to be enabled."
-WARNING_I2C="${PN} requires CONFIG_I2C to be enabled for most sensors."
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0.3-sensors-detect-gentoo.patch
-
-	if use sensord; then
-		sed -i -e 's:^# \(PROG_EXTRA\):\1:' "${S}"/Makefile || die
-	fi
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile || die
-	sed -i -e 's/\$(LIBSHSONAME) -o/$(LIBSHSONAME) \$(LDFLAGS) -o/g' lib/Module.mk || die
-}
-
-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) || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man LIBDIR=/usr/$(get_libdir) \
-		install || die "emake install failed"
-
-	newinitd "${FILESDIR}"/lm_sensors-3-init.d lm_sensors || die
-	newinitd "${FILESDIR}"/fancontrol-init.d fancontrol || die
-
-	if use sensord; then
-		newconfd "${FILESDIR}"/sensord-conf.d sensord || die
-		newinitd "${FILESDIR}"/sensord-init.d sensord || die
-	fi
-
-	dodoc CHANGES CONTRIBUTORS INSTALL README* || die
-
-	dodoc doc/donations doc/fancontrol.txt doc/fan-divisors \
-		doc/progs doc/temperature-sensors doc/vid || die
-
-	docinto chips
-	dodoc doc/chips/* || die
-
-	docinto developers
-	dodoc doc/developers/applications || die
-}
-
-pkg_postinst() {
-	elog
-	elog "Please run \`/usr/sbin/sensors-detect' in order to setup"
-	elog "/etc/conf.d/lm_sensors."
-	elog
-	elog "/etc/conf.d/lm_sensors is vital to the init-script."
-	elog "Please make sure you also add lm_sensors to the desired"
-	elog "runlevel. Otherwise your I2C modules won't get loaded"
-	elog "on the next startup."
-	elog
-	elog "You will also need to run the above command if you're upgrading from"
-	elog "<=${PN}-2, as the needed entries in /etc/conf.d/lm_sensors has"
-	elog "changed."
-	elog
-	elog "Be warned, the probing of hardware in your system performed by"
-	elog "sensors-detect could freeze your system. Also make sure you read"
-	elog "the documentation before running lm_sensors on IBM ThinkPads."
-	elog
-	elog "Please refer to the lm_sensors documentation for more information."
-	elog "(http://www.lm-sensors.org/wiki/Documentation)"
-	elog
-}
diff --git a/sys-apps/lm_sensors/lm_sensors-3.1.1.ebuild b/sys-apps/lm_sensors/lm_sensors-3.1.1.ebuild
deleted file mode 100644
index 93a8dd0c1cb8..000000000000
--- a/sys-apps/lm_sensors/lm_sensors-3.1.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-3.1.1.ebuild,v 1.2 2009/11/29 13:13:08 bangert Exp $
-
-EAPI="2"
-
-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.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="sensord"
-
-DEPEND="sys-apps/sed
-	sensord? ( net-analyzer/rrdtool )"
-RDEPEND="dev-lang/perl
-		virtual/logger"
-
-CONFIG_CHECK="~HWMON ~I2C_CHARDEV ~I2C"
-WARNING_HWMON="${PN} requires CONFIG_HWMON to be enabled for use."
-WARNING_I2C_CHARDEV="sensors-detect requires CONFIG_I2C_CHARDEV to be enabled."
-WARNING_I2C="${PN} requires CONFIG_I2C to be enabled for most sensors."
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sensors-detect-gentoo.patch
-
-	if use sensord; then
-		sed -i -e 's:^#\(PROG_EXTRA.*\):\1:' "${S}"/Makefile || die
-	fi
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile || die
-	sed -i -e 's/\$(LIBSHSONAME) -o/$(LIBSHSONAME) \$(LDFLAGS) -o/g' \
-		lib/Module.mk || die
-}
-
-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) \
-		|| die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man LIBDIR=/usr/$(get_libdir) \
-		install || die "emake install failed"
-
-	newinitd "${FILESDIR}"/lm_sensors-3-init.d lm_sensors || die
-	newinitd "${FILESDIR}"/fancontrol-init.d fancontrol || die
-
-	if use sensord; then
-		newconfd "${FILESDIR}"/sensord-conf.d sensord || die
-		newinitd "${FILESDIR}"/sensord-3-init.d sensord || die
-	fi
-
-	dodoc CHANGES CONTRIBUTORS INSTALL README*
-
-	dodoc doc/donations doc/fancontrol.txt doc/fan-divisors \
-		doc/progs doc/temperature-sensors doc/vid
-
-	docinto chips
-	dodoc doc/chips/*
-
-	docinto developers
-	dodoc doc/developers/applications
-}
-
-pkg_postinst() {
-	elog
-	elog "Please run \`/usr/sbin/sensors-detect' in order to setup"
-	elog "/etc/conf.d/lm_sensors."
-	elog
-	elog "/etc/conf.d/lm_sensors is vital to the init-script."
-	elog "Please make sure you also add lm_sensors to the desired"
-	elog "runlevel. Otherwise your I2C modules won't get loaded"
-	elog "on the next startup."
-	elog
-	elog "You will also need to run the above command if you're upgrading from"
-	elog "<=${PN}-2, as the needed entries in /etc/conf.d/lm_sensors has"
-	elog "changed."
-	elog
-	elog "Be warned, the probing of hardware in your system performed by"
-	elog "sensors-detect could freeze your system. Also make sure you read"
-	elog "the documentation before running lm_sensors on IBM ThinkPads."
-	elog
-	elog "Also make sure you have read:"
-	elog "http://www.lm-sensors.org/wiki/FAQ/Chapter3#Mysensorshavestoppedworkinginkernel2.6.31"
-	elog
-	elog "Please refer to the lm_sensors documentation for more information."
-	elog "(http://www.lm-sensors.org/wiki/Documentation)"
-	elog
-}