old

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 0 insertions, 348 deletions

diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.10.4-sensors-detect-gentoo.patch b/sys-apps/lm_sensors/files/lm_sensors-2.10.4-sensors-detect-gentoo.patch
deleted file mode 100644
index 00b76b992b0d..000000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-2.10.4-sensors-detect-gentoo.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-diff -ur lm_sensors-2.10.4.orig/prog/detect/sensors-detect lm_sensors-2.10.4/prog/detect/sensors-detect
---- lm_sensors-2.10.4.orig/prog/detect/sensors-detect	2007-07-31 00:41:52.000000000 +0200
-+++ lm_sensors-2.10.4/prog/detect/sensors-detect	2007-07-31 00:45:12.000000000 +0200
-@@ -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;
-@@ -5708,8 +5711,11 @@
-      
-   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";
-@@ -5728,22 +5734,33 @@
-         "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
-@@ -5771,12 +5788,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) {
-@@ -5785,10 +5811,8 @@
-       $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.10.7-sensors-detect-gentoo.patch b/sys-apps/lm_sensors/files/lm_sensors-2.10.7-sensors-detect-gentoo.patch
deleted file mode 100644
index 7da7acc2f22c..000000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-2.10.7-sensors-detect-gentoo.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -u ../../../lm_sensors-2.10.7.orig/prog/detect/sensors-detect ./sensors-detect
---- ../../../lm_sensors-2.10.7.orig/prog/detect/sensors-detect	2008-07-19 10:26:32.000000000 +0200
-+++ ./sensors-detect	2008-07-19 11:01:16.000000000 +0200
-@@ -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;
-@@ -5899,29 +5902,40 @@
-       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 update-modules:\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'),
-+  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_sysconfig = -f '/etc/conf.d/lm_sensors';
-+  printf "Do you want to \%s /etc/conf.d/lm_sensors? Enter s for other filename (\%s/s): ",
-+         ($have_sysconfig ? '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 ($!)";
-+  if (m/^\s*s/i or ($have_sysconfig and not m/^\s*n/i) or m/^\s*y/i) {
-+    my $filename = '/etc/conf.d/lm_sensors';
-+    if (m/^\s*s/i) {
-+      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(local *SYSCONFIG, ">$filename")
-+      or die "Sorry, can't create $filename ($!)";
-     print SYSCONFIG <<'EOT';
--#    /etc/sysconfig/lm_sensors - Defines modules loaded by
--#                                /etc/init.d/lm_sensors
-+#    /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
-@@ -5950,12 +5964,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";
-     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) {
-@@ -5966,9 +5989,7 @@
-     print SYSCONFIG $sysconfig;
-     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");
diff --git a/sys-apps/lm_sensors/files/lm_sensors-init.d b/sys-apps/lm_sensors/files/lm_sensors-init.d
deleted file mode 100644
index c80ed31eb6a5..000000000000
--- a/sys-apps/lm_sensors/files/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-init.d,v 1.3 2007/06/12 08:52:16 zzam 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 2>&1
-		if [ ${?} = 0 ]; then
-			if ! ( [ -e /sys/i2c ] || [ -e /sys/bus/i2c ] ); then
-				ebegin "  Loading i2c-core"
-				modprobe i2c-core >/dev/null 2>&1
-				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 2>&1
-			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 2>&1
-			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 2>&1
-		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 2>&1
-			eend $?
-		done
-
-		if [ -e /proc/sys/dev/sensors ] ; then
-			ebegin "  Unloading i2c-proc"
-			rmmod i2c-proc >/dev/null 2>&1
-			eend $?
-		fi
-	fi
-}
diff --git a/sys-apps/lm_sensors/files/sensord-init.d b/sys-apps/lm_sensors/files/sensord-init.d
deleted file mode 100644
index cb99dce3f050..000000000000
--- a/sys-apps/lm_sensors/files/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/sensord-init.d,v 1.1 2007/05/17 07:31:41 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 ${?}
-}