Add the next-generation version of lm_sensors. This is now chip-independent and is userspace-only, no kernel modules. The lm_sensors 2.x code was split into this and a separate package called i2c-tools. Non-i2c hardware monitoring stays here, and i2c monitoring is provided by that package. Bump OK'd by genstef.

(Portage version: 2.1.4.4)

4 files changed, 350 insertions, 1 deletions

diff --git a/sys-apps/lm_sensors/ChangeLog b/sys-apps/lm_sensors/ChangeLog
index 504ca764d2e1..8d70dfc7c6fa 100644
--- a/sys-apps/lm_sensors/ChangeLog
+++ b/sys-apps/lm_sensors/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-apps/lm_sensors
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.81 2008/02/26 08:29:32 zlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.82 2008/03/17 07:59:27 dberkholz Exp $
+
+*lm_sensors-3.0.1 (17 Mar 2008)
+
+  17 Mar 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/lm_sensors-3.0.1-sensors-detect-gentoo.patch,
+  +files/lm_sensors-3-init.d, +lm_sensors-3.0.1.ebuild:
+  Add the next-generation version of lm_sensors. This is now chip-independent
+  and is userspace-only, no kernel modules. The lm_sensors 2.x code was split
+  into this and a separate package called i2c-tools. Non-i2c hardware
+  monitoring stays here, and i2c monitoring is provided by that package. Bump
+  OK'd by genstef.
 
   26 Feb 2008; Bo Ørsted Andresen <zlin@gentoo.org>
   lm_sensors-2.10.1.ebuild, lm_sensors-2.10.2.ebuild,
diff --git a/sys-apps/lm_sensors/files/lm_sensors-3-init.d b/sys-apps/lm_sensors/files/lm_sensors-3-init.d
new file mode 100644
index 000000000000..18fb3537062d
--- /dev/null
+++ b/sys-apps/lm_sensors/files/lm_sensors-3-init.d
@@ -0,0 +1,105 @@
+#!/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-3-init.d,v 1.1 2008/03/17 07:59:28 dberkholz 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/sensors3.conf ]; then
+			eerror "/etc/sensors3.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/lm_sensors-3.0.1-sensors-detect-gentoo.patch b/sys-apps/lm_sensors/files/lm_sensors-3.0.1-sensors-detect-gentoo.patch
new file mode 100644
index 000000000000..a17cf1aa8d4c
--- /dev/null
+++ b/sys-apps/lm_sensors/files/lm_sensors-3.0.1-sensors-detect-gentoo.patch
@@ -0,0 +1,116 @@
+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/lm_sensors-3.0.1.ebuild b/sys-apps/lm_sensors/lm_sensors-3.0.1.ebuild
new file mode 100644
index 000000000000..9b7d7e3950e7
--- /dev/null
+++ b/sys-apps/lm_sensors/lm_sensors-3.0.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2008 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.1.ebuild,v 1.1 2008/03/17 07:59:27 dberkholz 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"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if ! linux_chkconfig_present HWMON; then
+		eerror
+		eerror "${P} requires CONFIG_HWMON to be enabled."
+		eerror
+		die "CONFIG_HWMON not detected"
+	fi
+	if ! linux_chkconfig_present I2C_CHARDEV; then
+		ewarn
+		ewarn "sensors-detect requires CONFIG_I2C_CHARDEV to be enabled."
+		ewarn
+	fi
+	if ! linux_chkconfig_present I2C; then
+		ewarn
+		ewarn "${P} requires CONFIG_I2C to be enabled for most sensors."
+		ewarn
+	fi
+}
+
+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
+}
+
+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 BACKGROUND BUGS CHANGES CONTRIBUTORS INSTALL QUICKSTART \
+		README* TODO
+
+	dodoc 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 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
+}