summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThilo Bangert <bangert@gentoo.org>2010-02-15 10:08:19 +0000
committerThilo Bangert <bangert@gentoo.org>2010-02-15 10:08:19 +0000
commit70c46f3e3194b91b1ca038a1e3564ff5c9856849 (patch)
tree2ff15829ce84aa12b8a8bb8e3b07aee1c0e1a431 /sys-apps/lm_sensors
parentVersion bump (diff)
downloadhistorical-70c46f3e3194b91b1ca038a1e3564ff5c9856849.tar.gz
historical-70c46f3e3194b91b1ca038a1e3564ff5c9856849.tar.bz2
historical-70c46f3e3194b91b1ca038a1e3564ff5c9856849.zip
version bump
Package-Manager: portage-2.2_rc62/cvs/Linux i686
Diffstat (limited to 'sys-apps/lm_sensors')
-rw-r--r--sys-apps/lm_sensors/ChangeLog8
-rw-r--r--sys-apps/lm_sensors/Manifest5
-rw-r--r--sys-apps/lm_sensors/files/lm_sensors-3.1.2-sensors-detect-gentoo.patch115
-rw-r--r--sys-apps/lm_sensors/lm_sensors-3.1.2.ebuild99
4 files changed, 225 insertions, 2 deletions
diff --git a/sys-apps/lm_sensors/ChangeLog b/sys-apps/lm_sensors/ChangeLog
index be8fb5a8a1cf..476af1170e63 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.97 2010/01/19 10:47:57 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.98 2010/02/15 10:08:18 bangert Exp $
+
+*lm_sensors-3.1.2 (15 Feb 2010)
+
+ 15 Feb 2010; Thilo Bangert <bangert@gentoo.org> +lm_sensors-3.1.2.ebuild,
+ +files/lm_sensors-3.1.2-sensors-detect-gentoo.patch:
+ version bump
19 Jan 2010; Thilo Bangert <bangert@gentoo.org> lm_sensors-2.10.7.ebuild,
lm_sensors-2.10.8.ebuild:
diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest
index 798efbc52986..3a66c893577c 100644
--- a/sys-apps/lm_sensors/Manifest
+++ b/sys-apps/lm_sensors/Manifest
@@ -5,6 +5,7 @@ AUX lm_sensors-3-init.d 2466 RMD160 54b58e00914e9c1f8b21e6a73cc215335d9dd647 SHA
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-3.1.2-sensors-detect-gentoo.patch 4502 RMD160 8d5f528e654ee8422de3d4190531b22a841d7acf SHA1 9b21848fc22866721ca6e9fed4b9039abe954a82 SHA256 c9686202da0529e695c3ea872961870884c0474526fee3e3053f3e5d3bd0949e
AUX lm_sensors-init.d 2457 RMD160 5e7c90dc926e5df4426e3ab3f42f3d61dd4c7696 SHA1 b2fdb2d08da3491f4128714bb7ba6006420dcc07 SHA256 2271f55d96946ee15d907715ec59d55724a0bb9f81e1b25beef399bc18579b4a
AUX sensord-3-init.d 712 RMD160 7f5be22a8e1e0b7adb56d4ba74e685eb3789cbf2 SHA1 05f4ed45896e708accab73057719ec866e9351af SHA256 8a3debf0b84af9944a467e377b0e4b0db67d428083675f0fcf33ec55a8b2a709
AUX sensord-conf.d 104 RMD160 c4a06a8492d6c0fd966dea64d92f798a9b716a92 SHA1 43090c58c918969caa359d3b6e89237585759f46 SHA256 02230edf5efbb0a4de3840cd76f9ebf431c57a246fa7388e9dbeb0fe26fe7b8d
@@ -14,10 +15,12 @@ DIST lm_sensors-2.10.8.tar.gz 935982 RMD160 a47884771ff1368e6609b8ae1dc686d36226
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
+DIST lm_sensors-3.1.2.tar.bz2 157644 RMD160 161e626bf401cd0213c821c95b32248e0bd6a1f5 SHA1 4a3b13e4f9c18c29e7f853739bdd88ca7799fcc7 SHA256 a4f9553417f4c6592e87cbcbefb04d5c16710d58fa6fd02ca46a309f3b613d6e
EBUILD lm_sensors-2.10.7.ebuild 4725 RMD160 653c3674909c028926a89768030737f56fa0cfab SHA1 17c1236e1610b1735920534e728936e3eda930ae SHA256 6d8063d8151e14b150f6b4d0a90652f74b1b46bb39b56f6018f1a4d48881b347
EBUILD lm_sensors-2.10.8.ebuild 5158 RMD160 58308d899c93750856b3fd63f5773ed8e28ddc65 SHA1 a2b1d650c90d3522c88424e22d2b447e3335eb9d SHA256 597815e327dea2741da64920b76a6b579ef6c631b85978647a2e2fe78bbff5b7
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
EBUILD lm_sensors-3.1.1.ebuild 3145 RMD160 faec436cbc7bbc901c90dca840fa2a5d11429ea6 SHA1 5a5b2b8bfe04f7051bac4017d1b07014ea5dbe54 SHA256 b8ba651158d5dc6e337be97a31b43a54f21ffac2434c87fd4974a710be2dc800
-MISC ChangeLog 11267 RMD160 0da6bf048390a8083792e6291356a8c6c08db68b SHA1 19461f548e4381a47da7dd6b78a729bb18f7973f SHA256 72a0d792286d22b28c78166e7106ca2f40111210f7de38450598e4e4ff117311
+EBUILD lm_sensors-3.1.2.ebuild 3054 RMD160 cef14938be99c6eb053a729efd5a5b5496edfa94 SHA1 7ecc173642946fd42216e31a78e3941ea4bcc539 SHA256 9f7cf4724afa008dbacfcf59007e41b59a579c73217bc3b0e823a1e6d62a8ec0
+MISC ChangeLog 11447 RMD160 7ebfadab37462f601f1be4aa7daffbb247aead3e SHA1 8cfa4c97434bde51e1c610ea840020b57882b027 SHA256 2b91224485d0d3335396d45b93fb138b56b8372000437cbf322078cb0d102727
MISC metadata.xml 328 RMD160 102d79ccb2dfd783b5d5baf50f5ac633d915f712 SHA1 b19178b1ba16d245cd04ea70c9532ee8dc37097c SHA256 aa83681ad6865347f45c3911d408b253ab27e43bf0e3f0e58624a2b4958b425b
diff --git a/sys-apps/lm_sensors/files/lm_sensors-3.1.2-sensors-detect-gentoo.patch b/sys-apps/lm_sensors/files/lm_sensors-3.1.2-sensors-detect-gentoo.patch
new file mode 100644
index 000000000000..3657e12df6a4
--- /dev/null
+++ b/sys-apps/lm_sensors/files/lm_sensors-3.1.2-sensors-detect-gentoo.patch
@@ -0,0 +1,115 @@
+diff -Naur lm_sensors-3.1.2.orig/prog/detect/sensors-detect lm_sensors-3.1.2/prog/detect/sensors-detect
+--- lm_sensors-3.1.2.orig/prog/detect/sensors-detect 2010-02-15 10:34:26.000000000 +0100
++++ lm_sensors-3.1.2/prog/detect/sensors-detect 2010-02-15 10:38:14.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;
+@@ -5687,26 +5690,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
+@@ -5717,6 +5727,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";
+@@ -5725,6 +5740,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
+@@ -5734,10 +5753,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");
+@@ -5751,20 +5767,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.2.ebuild b/sys-apps/lm_sensors/lm_sensors-3.1.2.ebuild
new file mode 100644
index 000000000000..7078003ca65b
--- /dev/null
+++ b/sys-apps/lm_sensors/lm_sensors-3.1.2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2010 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.2.ebuild,v 1.1 2010/02/15 10:08:18 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
+ sensord? ( net-analyzer/rrdtool )"
+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
+}
+
+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-3-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
+}