Version bump thanks to cilly <cilly@cilly.mine.nu> in bug 186720

(Portage version: 2.1.3_rc9)

4 files changed, 268 insertions, 1 deletions

diff --git a/sys-apps/lm_sensors/ChangeLog b/sys-apps/lm_sensors/ChangeLog
index 9a7640fe828e..2d936dcdfa85 100644
--- a/sys-apps/lm_sensors/ChangeLog
+++ b/sys-apps/lm_sensors/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/lm_sensors
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.74 2007/07/03 13:40:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.75 2007/07/30 23:12:24 genstef Exp $
+
+*lm_sensors-2.10.4 (30 Jul 2007)
+
+  30 Jul 2007; Stefan Schweizer <genstef@gentoo.org>
+  +files/lm_sensors-2.10.4-sensors-detect-gentoo.patch,
+  +lm_sensors-2.10.4.ebuild:
+  Version bump thanks to cilly <cilly@cilly.mine.nu> in bug 186720
 
   03 Jul 2007; Raúl Porcel <armin76@gentoo.org> lm_sensors-2.10.3.ebuild:
   Add ~alpha wrt #144319
diff --git a/sys-apps/lm_sensors/files/digest-lm_sensors-2.10.4 b/sys-apps/lm_sensors/files/digest-lm_sensors-2.10.4
new file mode 100644
index 000000000000..6285e456f78d
--- /dev/null
+++ b/sys-apps/lm_sensors/files/digest-lm_sensors-2.10.4
@@ -0,0 +1,3 @@
+MD5 96eb9ca1a1f1cb308757a7b8f0af93d6 lm_sensors-2.10.4.tar.gz 932773
+RMD160 d181d887b40c8f933e1e48aa06dfc15fbd0cf9fc lm_sensors-2.10.4.tar.gz 932773
+SHA256 205ca01af602b6b3e798b204a1c79fd46df8c70ce2ad67edd17be53ea559e05f lm_sensors-2.10.4.tar.gz 932773
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
new file mode 100644
index 000000000000..00b76b992b0d
--- /dev/null
+++ b/sys-apps/lm_sensors/files/lm_sensors-2.10.4-sensors-detect-gentoo.patch
@@ -0,0 +1,111 @@
+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/lm_sensors-2.10.4.ebuild b/sys-apps/lm_sensors/lm_sensors-2.10.4.ebuild
new file mode 100644
index 000000000000..24ee39c92baa
--- /dev/null
+++ b/sys-apps/lm_sensors/lm_sensors-2.10.4.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.10.4.ebuild,v 1.1 2007/07/30 23:12:24 genstef 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.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+
+IUSE="sensord"
+
+COMMON="sys-fs/sysfsutils
+		sensord? ( net-analyzer/rrdtool )"
+DEPEND="${COMMON}
+		sys-apps/sed
+		ppc? ( >=virtual/linux-sources-2.5 )
+		amd64? ( || ( >=virtual/linux-sources-2.5 >=sys-kernel/vserver-sources-2.0 ) )
+		x86? ( || ( >=virtual/linux-sources-2.5 >=sys-kernel/vserver-sources-2.0 sys-apps/lm_sensors-modules ) )"
+RDEPEND="${COMMON}
+		dev-lang/perl
+		>=x11-misc/read-edid-1.4.1-r1"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if kernel_is 2 4; then
+		if use ppc || use amd64; then
+			eerror
+			eerror "${P} does not support kernel 2.4.x under PPC and AMD64."
+			eerror
+			die "${P} does not support kernel 2.4.x under PPC and AMD64."
+		elif ! has_version =sys-apps/lm_sensors-modules-${PV}; then
+			eerror
+			eerror "${P} needs sys-apps/lm_sensors-modules-${PV} to be installed"
+			eerror "for kernel 2.4.x"
+			eerror
+			die "sys-apps/lm_sensors-modules-${PV} not installed"
+		fi
+	else
+		if kernel_is lt 2 6 14 && ! (linux_chkconfig_present I2C_SENSOR); then
+			eerror
+			eerror "${P} requires CONFIG_I2C_SENSOR to be enabled for non-2.4.x kernels."
+			eerror
+			die "CONFIG_I2C_SENSOR not detected"
+		elif kernel_is gt 2 6 13 && ! (linux_chkconfig_present HWMON); then
+			eerror
+			eerror "${P} requires CONFIG_HWMON to be enabled for 2.6.14+ kernels."
+			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 for non-2.4.x kernels."
+			ewarn
+		fi
+		if ! (linux_chkconfig_present I2C); then
+			ewarn
+			ewarn "${P} requires CONFIG_I2C to be enabled for non-2.4.x kernels for most sensors."
+			ewarn
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-2.10.4-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) LINUX=${KV_DIR} I2C_HEADERS=${KV_DIR}/include user \
+		|| die "emake user failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man LIBDIR=/usr/$(get_libdir) \
+		KERNELINCLUDEFILES="" user_install || die "emake user_install failed"
+
+	newinitd "${FILESDIR}"/lm_sensors-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 busses
+	dodoc doc/busses/*
+
+	docinto chips
+	dodoc doc/chips/*
+
+	docinto developers
+	dodoc doc/developers/applications doc/developers/design \
+		doc/developers/new_drivers doc/developers/proc \
+		doc/developers/sysctl doc/developers/sysfs-interface
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Please run \`/usr/sbin/sensors-detect' in order to setup"
+	einfo "/etc/conf.d/lm_sensors."
+	einfo
+	einfo "/etc/conf.d/lm_sensors is vital to the init-script."
+	einfo "Please make sure you also add lm_sensors to the desired"
+	einfo "runlevel. Otherwise your I2C modules won't get loaded"
+	einfo "on the next startup."
+	einfo
+	einfo "You will also need to run the above command if you're upgrading from"
+	einfo "<=${PN}-2.9.0, as the needed entries in /etc/conf.d/lm_sensors has"
+	einfo "changed."
+	einfo
+	einfo "Be warned, the probing of hardware in your system performed by"
+	einfo "sensors-detect could freeze your system. Also make sure you read"
+	einfo "the documentation before running lm_sensors on IBM ThinkPads."
+	einfo
+	einfo "Please refer to the lm_sensors documentation for more information."
+	einfo "(http://www.lm-sensors.org/wiki/Documentation)"
+	einfo
+}