summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThilo Bangert <bangert@gentoo.org>2010-05-26 18:56:27 +0000
committerThilo Bangert <bangert@gentoo.org>2010-05-26 18:56:27 +0000
commit1b30fc3f2837dd9ec36601719439117b900c4f66 (patch)
treece41a9d36f7d4f76760dd303555972ec270585be /sys-apps/lm_sensors/files
parentold (diff)
downloadgentoo-2-1b30fc3f2837dd9ec36601719439117b900c4f66.tar.gz
gentoo-2-1b30fc3f2837dd9ec36601719439117b900c4f66.tar.bz2
gentoo-2-1b30fc3f2837dd9ec36601719439117b900c4f66.zip
clean up old versions
(Portage version: 2.2_rc67/cvs/Linux i686)
Diffstat (limited to 'sys-apps/lm_sensors/files')
-rw-r--r--sys-apps/lm_sensors/files/lm_sensors-3.0.1-sensors-detect-gentoo.patch116
-rw-r--r--sys-apps/lm_sensors/files/lm_sensors-3.0.3-sensors-detect-gentoo.patch116
-rw-r--r--sys-apps/lm_sensors/files/lm_sensors-3.1.1-sensors-detect-gentoo.patch114
3 files changed, 0 insertions, 346 deletions
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".