Moved from sys-apps/lm-sensors to sys-apps/lm_sensors.

5 files changed, 352 insertions, 0 deletions

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
new file mode 100644
index 000000000000..c2d377771b6f
--- /dev/null
+++ b/sys-apps/lm_sensors/files/digest-lm_sensors-2.8.7
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000000..010152f9cdc3
--- /dev/null
+++ b/sys-apps/lm_sensors/files/digest-lm_sensors-2.9.0
@@ -0,0 +1 @@
+MD5 add1f403c619e84bec2fbdfa12eda56f lm_sensors-2.9.0.tar.gz 823545
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
new file mode 100644
index 000000000000..45e1ff3c5d58
--- /dev/null
+++ b/sys-apps/lm_sensors/files/lm_sensors-2.8.7-sensors-detect-gentoo.diff
@@ -0,0 +1,119 @@
+--- 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
new file mode 100644
index 000000000000..a35525fa3107
--- /dev/null
+++ b/sys-apps/lm_sensors/files/lm_sensors-2.8.8-sensors-detect-gentoo.diff
@@ -0,0 +1,119 @@
+--- 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/files/rc b/sys-apps/lm_sensors/files/rc
new file mode 100644
index 000000000000..a8baed5c2539
--- /dev/null
+++ b/sys-apps/lm_sensors/files/rc
@@ -0,0 +1,112 @@
+#!/sbin/runscript
+
+start() {
+	if ! [ -f /etc/conf.d/lm_sensors ] ; then
+		eerror "/etc/conf.d/lm_sensors does not exist, try running sensors-detect"
+		return 1
+	fi
+
+	. /etc/conf.d/lm_sensors
+
+	if [ -z "${NOLOADMODULES}" ] ; 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
+
+		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 ! [ -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 $?
+
+	return 0
+}
+
+stop() {
+	if ! [ -f /etc/conf.d/lm_sensors ] ; then
+		eerror "/etc/conf.d/lm_sensors does not exist, try running sensors-detect"
+		return 1
+	fi
+
+	. /etc/conf.d/lm_sensors
+
+	if [ -z "${NOLOADMODULES}" ] ; 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
+
+		ebegin "Removing lm_sensors modules"
+		eend $?
+	
+		# 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 "  Removing ${module}"
+			rmmod ${module} &>/dev/null
+			eend $?
+		done
+
+		if [ -e /proc/sys/dev/sensors ] ; then
+			ebegin "  Removing i2c-proc"
+			rmmod i2c-proc &>/dev/null
+			eend $?
+		fi
+	fi
+	
+	return 0
+
+}