version bump (bug #244598)

Package-Manager: portage-2.2_rc46/cvs/Linux i686

4 files changed, 225 insertions, 3 deletions

diff --git a/sys-apps/lm_sensors/ChangeLog b/sys-apps/lm_sensors/ChangeLog
index dbb419bcc979..269860aa25b4 100644
--- a/sys-apps/lm_sensors/ChangeLog
+++ b/sys-apps/lm_sensors/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/lm_sensors
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.94 2009/10/17 01:18:04 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.95 2009/10/27 08:26:24 bangert Exp $
+
+*lm_sensors-3.1.1 (27 Oct 2009)
+
+  27 Oct 2009; Thilo Bangert <bangert@gentoo.org> +lm_sensors-3.1.1.ebuild,
+  +files/lm_sensors-3.1.1-sensors-detect-gentoo.patch:
+  version bump (bug #244598)
 
   17 Oct 2009; Robin H. Johnson <robbat2@gentoo.org>
   lm_sensors-2.10.8.ebuild, lm_sensors-3.0.2.ebuild,
diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest
index 494069e91103..a1c584e2e96a 100644
--- a/sys-apps/lm_sensors/Manifest
+++ b/sys-apps/lm_sensors/Manifest
@@ -4,6 +4,7 @@ AUX lm_sensors-2.10.7-sensors-detect-gentoo.patch 4016 RMD160 27cbc052b65e903fe0
 AUX lm_sensors-3-init.d 2466 RMD160 54b58e00914e9c1f8b21e6a73cc215335d9dd647 SHA1 6250e4e28cd936efa6d05846b16175e85fe821c5 SHA256 9b018f9f7a0975988387858823fe59a5cd8af6413d8c3170db0e24aac6021ec3
 AUX lm_sensors-3.0.1-sensors-detect-gentoo.patch 4708 RMD160 bebfd29cbb5ec39efc78e140ebd4115291ecd632 SHA1 3dd7635f0e126c54aa3ccc90b8e33977d85fc0d0 SHA256 bcaee3c4b9001339222445a7c5ea328c5fff379c969bde3cfe382266cf4f4824
 AUX lm_sensors-3.0.3-sensors-detect-gentoo.patch 4698 RMD160 bb5c321473a7519837583868ae0516507ee8c679 SHA1 941521987e0dc818c3ac5873eeaa2105bd36ddb4 SHA256 dc3f9b7a32f4844f907b9192f3990c5bca702f2f9a6b73446bc71b2f80ad9f46
+AUX lm_sensors-3.1.1-sensors-detect-gentoo.patch 4398 RMD160 3bafa465c410be328ffc1d78c81d80f21af328ec SHA1 ab1ddf27e2133d21f1955a722c68c37bc49e6d30 SHA256 911093670675df50c836e72d0eafd8af49a7837e8c0a4ec7f38305b61a7a9d49
 AUX lm_sensors-init.d 2457 RMD160 5e7c90dc926e5df4426e3ab3f42f3d61dd4c7696 SHA1 b2fdb2d08da3491f4128714bb7ba6006420dcc07 SHA256 2271f55d96946ee15d907715ec59d55724a0bb9f81e1b25beef399bc18579b4a
 AUX sensord-conf.d 104 RMD160 c4a06a8492d6c0fd966dea64d92f798a9b716a92 SHA1 43090c58c918969caa359d3b6e89237585759f46 SHA256 02230edf5efbb0a4de3840cd76f9ebf431c57a246fa7388e9dbeb0fe26fe7b8d
 AUX sensord-init.d 708 RMD160 31e5a4ac844333bc9689346bb68c206ded13f1a3 SHA1 45dd30ba6d158022e8290ea9b09fd2a1053c5b58 SHA256 9f6d0e7bcdc1b4b3bc0835b40f246f7caf76e1b3bbfcf76a5d5b235eb8243d89
@@ -11,10 +12,11 @@ DIST lm_sensors-2.10.7.tar.gz 933974 RMD160 34801542e2ac6b3305c8caf891415e99a1b9
 DIST lm_sensors-2.10.8.tar.gz 935982 RMD160 a47884771ff1368e6609b8ae1dc686d36226a63d SHA1 8356c19d1528d061d7b7f1468621c6628f401f07 SHA256 d1410d41304ad601d8475f790a23a05e75f612c6b425df105784f5e3aee34f7d
 DIST lm_sensors-3.0.2.tar.bz2 149734 RMD160 d896eb8360b5285a2446b94ba659d5bcdcf1f4b8 SHA1 8f28c11d00e68fc4b8249e02d224427f8f836d68 SHA256 1461fc2e8661ded28b73ed2f7a06cbecf852aa641df974e38aaa0e23977c5b57
 DIST lm_sensors-3.0.3.tar.bz2 152900 RMD160 d8af5c3c0dde5b07010c8c834dcf7a2c04fb509a SHA1 2f68d003aef8f83bbef006c5b7b26a88bd9fd036 SHA256 b45661f4c3a7f19d67ee4783e8270f462e874d7c909c8f4228692de97aad0ec6
+DIST lm_sensors-3.1.1.tar.bz2 154551 RMD160 7a333f42f598ee8366f70157037c63ebb5b33387 SHA1 8be15806d229305491f11b77c67496074480faf4 SHA256 d95a3f2a6526f4da2ae145b7bbf45d16f0fb17bfe0d2017c7e02964199d059ef
 EBUILD lm_sensors-2.10.7.ebuild 4633 RMD160 ab45f72e19b4987e186fe7ba2597baffe3a0b728 SHA1 7de1669247a46fb08d460dd12a3a2352a30f39c8 SHA256 690ecd5b4983b116d037883cdc562a79ea3d34c9856850e0ce50950ad84abb54
 EBUILD lm_sensors-2.10.8.ebuild 5041 RMD160 a6831e5789153b86867c8ea48c146be09d022c0e SHA1 af641c54b3b0c8ad770732ce225b44b3599f861c SHA256 6895ebb757a4b571e49295e960e211699d22a2dd3d69f7928fb88dfa30953d7a
 EBUILD lm_sensors-3.0.2.ebuild 3066 RMD160 606ade62fa203669ed819a5ef10f539d1edb7d70 SHA1 62b2a50b6dd9ebcde9e5ec0f998447c4b568fbd8 SHA256 02fd5606aca71fe10d5e76dcc03a8d54e32583871180936224eb9cbcfc7766b6
 EBUILD lm_sensors-3.0.3.ebuild 3061 RMD160 4c151b8a1397282d18f79a44b6b748fe900fcdff SHA1 3c343af0548f70e11e6961d815fa089c1ed3039f SHA256 711e49b56654066ea7ff0c398c103d04f9e04024c439d4d24c2908a8e9a9c09a
-MISC ChangeLog 10798 RMD160 c89b79a325ed9cdf261a4f5676f1ee0a16a06f71 SHA1 1657bf99b9a1abe7a2bcafd5baa18adfdab9c324 SHA256 f43a61c5121189c8f8f398ed6bc773c7f6e3d4a81bc31bebb28359ae380c4c56
-MISC lm_sensors-3.0.2.ebuild.orig 3260 RMD160 d30aafe53f958ecd2772d62c52e80b07571a3c04 SHA1 8318f1f3889a4eed0c4ae1348c17b9469d4bbc6c SHA256 3d3c83f8dba9896a32f705e44fb0903689f6a99c77d5630939347a1e9fbd948d
+EBUILD lm_sensors-3.1.1.ebuild 3107 RMD160 456cf7ed2fa486d2e291e326e81459a27fe2ef3a SHA1 47f30dfae7b433972a4e32bb6635e686f0baa1ae SHA256 9174dadc545a971aad9b9f6bbe0e8dc01cc278fd7608b64b54db3ab76acc2939
+MISC ChangeLog 10992 RMD160 52cab0ee1d6c3be9bff63c941c19226d48ff139c SHA1 898de2cbe6fe54172f95ccb9cc7b34f52bde4ba0 SHA256 b123c990a114933366eeee096d3c0bdab75ae08c6c416429f0ead7b1ea12cd03
 MISC metadata.xml 328 RMD160 102d79ccb2dfd783b5d5baf50f5ac633d915f712 SHA1 b19178b1ba16d245cd04ea70c9532ee8dc37097c SHA256 aa83681ad6865347f45c3911d408b253ab27e43bf0e3f0e58624a2b4958b425b
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
new file mode 100644
index 000000000000..79882da7f5c8
--- /dev/null
+++ b/sys-apps/lm_sensors/files/lm_sensors-3.1.1-sensors-detect-gentoo.patch
@@ -0,0 +1,114 @@
+--- 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".
diff --git a/sys-apps/lm_sensors/lm_sensors-3.1.1.ebuild b/sys-apps/lm_sensors/lm_sensors-3.1.1.ebuild
new file mode 100644
index 000000000000..cb9be7b392ca
--- /dev/null
+++ b/sys-apps/lm_sensors/lm_sensors-3.1.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2009 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.1.1.ebuild,v 1.1 2009/10/27 08:26:24 bangert Exp $
+
+EAPI="2"
+
+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"
+
+DEPEND="sys-apps/sed"
+RDEPEND="dev-lang/perl
+		virtual/logger"
+
+CONFIG_CHECK="~HWMON ~I2C_CHARDEV ~I2C"
+WARNING_HWMON="${PN} requires CONFIG_HWMON to be enabled for use."
+WARNING_I2C_CHARDEV="sensors-detect requires CONFIG_I2C_CHARDEV to be enabled."
+WARNING_I2C="${PN} requires CONFIG_I2C to be enabled for most sensors."
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-sensors-detect-gentoo.patch
+
+	if use sensord; then
+		sed -i -e 's:^# \(PROG_EXTRA\):\1:' "${S}"/Makefile || die
+	fi
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile || die
+	sed -i -e 's/\$(LIBSHSONAME) -o/$(LIBSHSONAME) \$(LDFLAGS) -o/g' \
+		lib/Module.mk || die
+}
+
+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 || die
+	newinitd "${FILESDIR}"/fancontrol-init.d fancontrol || die
+
+	if use sensord; then
+		newconfd "${FILESDIR}"/sensord-conf.d sensord || die
+		newinitd "${FILESDIR}"/sensord-init.d sensord || die
+	fi
+
+	dodoc CHANGES CONTRIBUTORS INSTALL README*
+
+	dodoc doc/donations doc/fancontrol.txt doc/fan-divisors \
+		doc/progs doc/temperature-sensors doc/vid
+
+	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 "Also make sure you have read:"
+	elog "http://www.lm-sensors.org/wiki/FAQ/Chapter3#Mysensorshavestoppedworkinginkernel2.6.31"
+	elog
+	elog "Please refer to the lm_sensors documentation for more information."
+	elog "(http://www.lm-sensors.org/wiki/Documentation)"
+	elog
+}