diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-19 19:53:55 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-19 19:53:55 +0000 |
commit | 98e03f6bcd8b3acdc07058224e035b41a52dab9b (patch) | |
tree | b94ff30fedc79fa7290ff95cfdcd59fe3f26617c | |
parent | punt lm_sensors-modules (linux 2.4), lm_sensors-2 only (diff) | |
download | gentoo-2-98e03f6bcd8b3acdc07058224e035b41a52dab9b.tar.gz gentoo-2-98e03f6bcd8b3acdc07058224e035b41a52dab9b.tar.bz2 gentoo-2-98e03f6bcd8b3acdc07058224e035b41a52dab9b.zip |
old
(Portage version: 2.2_rc67/cvs/Linux x86_64)
-rw-r--r-- | sys-apps/lm_sensors/Manifest | 8 | ||||
-rw-r--r-- | sys-apps/lm_sensors/files/lm_sensors-2.10.4-sensors-detect-gentoo.patch | 111 | ||||
-rw-r--r-- | sys-apps/lm_sensors/files/lm_sensors-2.10.7-sensors-detect-gentoo.patch | 99 | ||||
-rw-r--r-- | sys-apps/lm_sensors/files/lm_sensors-init.d | 105 | ||||
-rw-r--r-- | sys-apps/lm_sensors/files/sensord-init.d | 33 | ||||
-rw-r--r-- | sys-apps/lm_sensors/lm_sensors-2.10.7.ebuild | 156 | ||||
-rw-r--r-- | sys-apps/lm_sensors/lm_sensors-2.10.8.ebuild | 165 |
7 files changed, 0 insertions, 677 deletions
diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest index 2e936ad52ae1..851ddf50a6b5 100644 --- a/sys-apps/lm_sensors/Manifest +++ b/sys-apps/lm_sensors/Manifest @@ -1,18 +1,10 @@ AUX fancontrol-init.d 726 RMD160 444eedc0044a61e0a79d79565e6399156b8f9b9c SHA1 aabcdaf530f6d49f3de01e9b6d78470c6538ff38 SHA256 b231b76d5b32bb303a8e42727f48a4405cec71eedfe392e837acba5e46532783 -AUX lm_sensors-2.10.4-sensors-detect-gentoo.patch 4350 RMD160 962c2ddcd5b59926d2ccaa0ba0b65bd05d758d45 SHA1 3ba0c151f1dbecfed52444561c73897902270574 SHA256 1ace0bb0f88c0f6f235ca47317fddf723d4e8900f9ba66aae432b44274ca192b -AUX lm_sensors-2.10.7-sensors-detect-gentoo.patch 4016 RMD160 27cbc052b65e903fe01360e8cde4c4a1c8bdf7eb SHA1 dfe0916e0d063b447131e2e0a1cb8751c091df16 SHA256 aa29dbddec4947f4fa645a9af70b58c6fbfeaf815fdf28d4cf6ff46d775d9025 AUX lm_sensors-3-init.d 2466 RMD160 54b58e00914e9c1f8b21e6a73cc215335d9dd647 SHA1 6250e4e28cd936efa6d05846b16175e85fe821c5 SHA256 9b018f9f7a0975988387858823fe59a5cd8af6413d8c3170db0e24aac6021ec3 AUX lm_sensors-3.1.2-changeset_r5835.patch 1486 RMD160 ae5d8141d157a41b11fe212bf7a9a1d797a8039e SHA1 81297fbf114000935dce0c71578636d58522b1fb SHA256 daf1f6cdc96abf7139a73be1e230dfa221c4da5f1a31251da5bbea4d4e08453a 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 -AUX sensord-init.d 708 RMD160 31e5a4ac844333bc9689346bb68c206ded13f1a3 SHA1 45dd30ba6d158022e8290ea9b09fd2a1053c5b58 SHA256 9f6d0e7bcdc1b4b3bc0835b40f246f7caf76e1b3bbfcf76a5d5b235eb8243d89 -DIST lm_sensors-2.10.7.tar.gz 933974 RMD160 34801542e2ac6b3305c8caf891415e99a1b94bc3 SHA1 2a5491aa8fa3d855bf14b06c4c0869e6ee45e434 SHA256 b180f5b429427847e734c212f51c4b3c043d4c11fddca0d6b4b59f8fbb36be99 -DIST lm_sensors-2.10.8.tar.gz 935982 RMD160 a47884771ff1368e6609b8ae1dc686d36226a63d SHA1 8356c19d1528d061d7b7f1468621c6628f401f07 SHA256 d1410d41304ad601d8475f790a23a05e75f612c6b425df105784f5e3aee34f7d 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.1.2-r1.ebuild 3071 RMD160 52f4da2e3d0c3f3aa6d1fa6e70002ce32e8e8ca2 SHA1 4004eeb56edbea518a84d1d5ecec559f3ed53458 SHA256 9d2947f3ecd6e56f6821d8fcd7871f4f1c19e077f8fb95539ac0361904e6f1e9 EBUILD lm_sensors-3.1.2.ebuild 3017 RMD160 7ad94fac6f7c8e5083bfc9774c4cd7ad193b9bf7 SHA1 4ed5a7cdc593a919c067e2fbf449406bd51b9895 SHA256 666e3778052def5ee7915c5a5e6ef0189fd62b4f872939cfe9fc4a0cc03519d7 MISC ChangeLog 12530 RMD160 0d4fc15a6d4ee40502362fe35b9f06d472d42b1c SHA1 46281f45b97062dc29fc4babfca96b24fd9e4924 SHA256 2c282d6093a4c66ce419e09064d146ad0e88f822f173a4133f6ac346fe962403 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 deleted file mode 100644 index 00b76b992b0d..000000000000 --- a/sys-apps/lm_sensors/files/lm_sensors-2.10.4-sensors-detect-gentoo.patch +++ /dev/null @@ -1,111 +0,0 @@ -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/files/lm_sensors-2.10.7-sensors-detect-gentoo.patch b/sys-apps/lm_sensors/files/lm_sensors-2.10.7-sensors-detect-gentoo.patch deleted file mode 100644 index 7da7acc2f22c..000000000000 --- a/sys-apps/lm_sensors/files/lm_sensors-2.10.7-sensors-detect-gentoo.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff -u ../../../lm_sensors-2.10.7.orig/prog/detect/sensors-detect ./sensors-detect ---- ../../../lm_sensors-2.10.7.orig/prog/detect/sensors-detect 2008-07-19 10:26:32.000000000 +0200 -+++ ./sensors-detect 2008-07-19 11:01:16.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; -@@ -5899,29 +5902,40 @@ - 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 update-modules:\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'), -+ 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_sysconfig = -f '/etc/conf.d/lm_sensors'; -+ printf "Do you want to \%s /etc/conf.d/lm_sensors? Enter s for other filename (\%s/s): ", -+ ($have_sysconfig ? '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 ($!)"; -+ if (m/^\s*s/i or ($have_sysconfig and not m/^\s*n/i) or m/^\s*y/i) { -+ my $filename = '/etc/conf.d/lm_sensors'; -+ if (m/^\s*s/i) { -+ 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(local *SYSCONFIG, ">$filename") -+ or die "Sorry, can't create $filename ($!)"; - print SYSCONFIG <<'EOT'; --# /etc/sysconfig/lm_sensors - Defines modules loaded by --# /etc/init.d/lm_sensors -+# /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 -@@ -5950,12 +5964,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"; - 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) { -@@ -5966,9 +5989,7 @@ - print SYSCONFIG $sysconfig; - 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"); diff --git a/sys-apps/lm_sensors/files/lm_sensors-init.d b/sys-apps/lm_sensors/files/lm_sensors-init.d deleted file mode 100644 index c80ed31eb6a5..000000000000 --- a/sys-apps/lm_sensors/files/lm_sensors-init.d +++ /dev/null @@ -1,105 +0,0 @@ -#!/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-init.d,v 1.3 2007/06/12 08:52:16 zzam 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/sensors.conf ]; then - eerror "/etc/sensors.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/sensord-init.d b/sys-apps/lm_sensors/files/sensord-init.d deleted file mode 100644 index cb99dce3f050..000000000000 --- a/sys-apps/lm_sensors/files/sensord-init.d +++ /dev/null @@ -1,33 +0,0 @@ -#!/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/sensord-init.d,v 1.1 2007/05/17 07:31:41 phreak Exp $ - -CONFIG=/etc/sensors.conf - -depend() { - need logger - use lm_sensors -} - -checkconfig() { - if [ ! -f ${CONFIG} ]; then - eerror "Configuration file ${CONFIG} not found" - return 1 - fi -} - -start() { - checkconfig || return 1 - - ebegin "Starting sensord" - start-stop-daemon --start --exec /usr/sbin/sensord \ - -- --config-file ${CONFIG} ${SENSORD_OPTIONS} - eend ${?} -} - -stop() { - ebegin "Stopping sensord" - start-stop-daemon --stop --pidfile /var/run/sensord.pid - eend ${?} -} diff --git a/sys-apps/lm_sensors/lm_sensors-2.10.7.ebuild b/sys-apps/lm_sensors/lm_sensors-2.10.7.ebuild deleted file mode 100644 index 9a6298978cfb..000000000000 --- a/sys-apps/lm_sensors/lm_sensors-2.10.7.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# 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-2.10.7.ebuild,v 1.6 2010/01/19 10:47:57 bangert 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 ~sparc x86" - -IUSE="sensord" - -COMMON="sys-fs/sysfsutils - !sys-apps/i2c-tools - 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 - virtual/logger" - -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}"/${P}-sensors-detect-gentoo.patch - - if use sensord; then - sed -i -e 's:^# \(PROG_EXTRA\):\1:' Makefile - fi - - # Respect LDFLAGS - sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile - sed -i -e 's/\$(LIBSHSONAME) -o/$(LIBSHSONAME) \$(LDFLAGS) -o/g' lib/Module.mk -} - -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 - if kernel_is lt 2 6 31; then - emake CC=$(tc-getCC) LINUX=${KV_DIR} I2C_HEADERS=${KV_DIR}/include user \ - || die "emake user failed" - else - emake CC=$(tc-getCC) LINUX=${KV_DIR} user \ - || die "emake user failed" - fi -} - -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 - - 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() { - 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.9.0, 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 -} diff --git a/sys-apps/lm_sensors/lm_sensors-2.10.8.ebuild b/sys-apps/lm_sensors/lm_sensors-2.10.8.ebuild deleted file mode 100644 index cb8563cc1ab0..000000000000 --- a/sys-apps/lm_sensors/lm_sensors-2.10.8.ebuild +++ /dev/null @@ -1,165 +0,0 @@ -# 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-2.10.8.ebuild,v 1.3 2010/01/19 10:47:57 bangert 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 ~sparc ~x86" - -IUSE="sensord" - -COMMON="sys-fs/sysfsutils - !sys-apps/i2c-tools - 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 - virtual/logger" - -pkg_setup() { - linux-info_pkg_setup - - if ! linux_config_src_exists; then - CONFIG_CHECK="I2C_SENSOR HWMON I2C CONFIG_I2C_CHARDEV" - ewarn "Unable to check for the following kernel config options due" - ewarn "to absence of any configured kernel sources or compiled" - ewarn "config:" - for config in ${CONFIG_CHECK}; do - ewarn " - ${config#\~}" - done - ewarn "You're on your own to make sure they are set if needed." - elif 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 - eerror "${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 - eerror "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 - ewarn "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 - ewarn "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.7-sensors-detect-gentoo.patch - - if use sensord; then - sed -i -e 's:^# \(PROG_EXTRA\):\1:' Makefile - fi - - # Respect LDFLAGS - sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile - sed -i -e 's/\$(LIBSHSONAME) -o/$(LIBSHSONAME) \$(LDFLAGS) -o/g' lib/Module.mk -} - -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 - if kernel_is lt 2 6 31; then - emake CC=$(tc-getCC) LINUX=${KV_DIR} I2C_HEADERS=${KV_DIR}/include user \ - || die "emake user failed" - else - emake CC=$(tc-getCC) LINUX=${KV_DIR} user \ - || die "emake user failed" - fi -} - -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() { - 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.9.0, 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 -} |