Fix for bug #103568.

(Portage version: 2.0.51.22-r2)

5 files changed, 170 insertions, 9 deletions

diff --git a/sys-apps/lm_sensors/ChangeLog b/sys-apps/lm_sensors/ChangeLog
index 362db7efc698..47279a823f61 100644
--- a/sys-apps/lm_sensors/ChangeLog
+++ b/sys-apps/lm_sensors/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/lm_sensors
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.33 2005/08/19 18:00:46 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.34 2005/08/24 14:44:01 brix Exp $
+
+*lm_sensors-2.9.1-r1 (24 Aug 2005)
+
+  24 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/lm_sensors-2.9.1-pwmconfig.patch, +lm_sensors-2.9.1-r1.ebuild:
+  Fix for bug #103568.
 
   19 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
   lm_sensors-2.9.1.ebuild:
diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest
index 34f02d7afe5a..f84ab4ac9019 100644
--- a/sys-apps/lm_sensors/Manifest
+++ b/sys-apps/lm_sensors/Manifest
@@ -1,15 +1,18 @@
+MD5 f6b49a498de542b8a58db591bc5a34ea lm_sensors-2.9.1-r1.ebuild 3760
+MD5 866f8f45ee79abc048f7f073d99b3cbe lm_sensors-2.9.1.ebuild 3798
+MD5 e3973955ca55885005b2938c7119a8d0 lm_sensors-2.8.7.ebuild 5051
+MD5 551cfe4a05ff534c17aeba6277ea3a7f ChangeLog 14050
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 a05fd9d0abd721e9fe8070123edd4a30 lm_sensors-2.9.0.ebuild 4805
-MD5 4b3c402e769e2b2b9ccec383e0936f6a ChangeLog 13864
-MD5 e3973955ca55885005b2938c7119a8d0 lm_sensors-2.8.7.ebuild 5051
-MD5 866f8f45ee79abc048f7f073d99b3cbe lm_sensors-2.9.1.ebuild 3798
-MD5 669cd7ea438a54d3269ff5e9d06847b6 files/digest-lm_sensors-2.9.1 68
-MD5 46b6afde1f6a202ceaf607af2d905cd0 files/lm_sensors-2.9.1-sensord-init.d 739
-MD5 b8924278f856bf6a5d01a476a6c6c017 files/lm_sensors-2.9.1-sensord-conf.d 342
-MD5 311fc2ac49c876ff12c485cb2a53d9ac files/digest-lm_sensors-2.8.7 68
 MD5 6caf3a2ef7bd1503aac7e3c8129c88a8 files/rc 2332
 MD5 2045929b325d2e459a6ab9236d2764eb files/lm_sensors-2.9.1-sensors-detect-gentoo.patch 5526
-MD5 7f118aec7c81c482c292c7d228c80119 files/digest-lm_sensors-2.9.0 68
+MD5 b8924278f856bf6a5d01a476a6c6c017 files/lm_sensors-2.9.1-sensord-conf.d 342
 MD5 2d203b24a5474fe336ae65203c1efe8c files/lm_sensors-2.9.1-lm_sensors-init.d 2451
 MD5 62d5eaa6c0f7bec20849a635b32616b6 files/lm_sensors-2.8.8-sensors-detect-gentoo.diff 4843
+MD5 46b6afde1f6a202ceaf607af2d905cd0 files/lm_sensors-2.9.1-sensord-init.d 739
+MD5 512e167e34ba06a004990fc298616a20 files/lm_sensors-2.9.1-pwmconfig.patch 1186
+MD5 669cd7ea438a54d3269ff5e9d06847b6 files/digest-lm_sensors-2.9.1-r1 68
 MD5 596bd3e0fc473e83d13e6c194e50a3f2 files/lm_sensors-2.8.7-sensors-detect-gentoo.diff 4815
+MD5 311fc2ac49c876ff12c485cb2a53d9ac files/digest-lm_sensors-2.8.7 68
+MD5 7f118aec7c81c482c292c7d228c80119 files/digest-lm_sensors-2.9.0 68
+MD5 669cd7ea438a54d3269ff5e9d06847b6 files/digest-lm_sensors-2.9.1 68
diff --git a/sys-apps/lm_sensors/files/digest-lm_sensors-2.9.1-r1 b/sys-apps/lm_sensors/files/digest-lm_sensors-2.9.1-r1
new file mode 100644
index 000000000000..9b9f92a218ca
--- /dev/null
+++ b/sys-apps/lm_sensors/files/digest-lm_sensors-2.9.1-r1
@@ -0,0 +1 @@
+MD5 f5af615e39441d95471bdb72a3f01709 lm_sensors-2.9.1.tar.gz 870765
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.9.1-pwmconfig.patch b/sys-apps/lm_sensors/files/lm_sensors-2.9.1-pwmconfig.patch
new file mode 100644
index 000000000000..af214e768afb
--- /dev/null
+++ b/sys-apps/lm_sensors/files/lm_sensors-2.9.1-pwmconfig.patch
@@ -0,0 +1,18 @@
+diff -urp lm_sensors-2.9.1/prog/pwm/pwmconfig /home/brix/projects/lm_sensors/lm_sensors2/prog/pwm/pwmconfig
+--- lm_sensors-2.9.1/prog/pwm/pwmconfig	2005-03-15 20:24:25.000000000 +0100
++++ /home/brix/projects/lm_sensors/lm_sensors2/prog/pwm/pwmconfig	2005-08-21 15:15:41.000000000 +0200
+@@ -465,9 +465,11 @@ function TestMinStop {
+ function SaveConfig {
+ 	echo
+ 	echo "Saving configuration to $FCCONFIG..."
+-	egrep -v '(INTERVAL|FCTEMPS|FCFANS|MAXTEMP|MINTEMP|MINSTART|MINSTOP)' $FCCONFIG >/tmp/fancontrol
+-	echo -e "INTERVAL=$INTERVAL\nFCTEMPS=$FCTEMPS\nFCFANS=$FCFANS\nMINTEMP=$MINTEMP\nMAXTEMP=$MAXTEMP\nMINSTART=$MINSTART\nMINSTOP=$MINSTOP" >>/tmp/fancontrol
+-	mv /tmp/fancontrol $FCCONFIG
++	tmpfile=`tempfile` || { echo "$0: Cannot create temporary file" >&2; exit 1;  }
++	trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15
++	egrep -v '(INTERVAL|FCTEMPS|FCFANS|MAXTEMP|MINTEMP|MINSTART|MINSTOP)' $FCCONFIG >$tmpfile
++	echo -e "INTERVAL=$INTERVAL\nFCTEMPS=$FCTEMPS\nFCFANS=$FCFANS\nMINTEMP=$MINTEMP\nMAXTEMP=$MAXTEMP\nMINSTART=$MINSTART\nMINSTOP=$MINSTOP" >>$tmpfile
++	mv $tmpfile $FCCONFIG
+ 	#check if file was written correctly
+ 	echo 'Configuration saved'
+ }
diff --git a/sys-apps/lm_sensors/lm_sensors-2.9.1-r1.ebuild b/sys-apps/lm_sensors/lm_sensors-2.9.1-r1.ebuild
new file mode 100644
index 000000000000..116d3aa5501a
--- /dev/null
+++ b/sys-apps/lm_sensors/lm_sensors-2.9.1-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2005 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.9.1-r1.ebuild,v 1.1 2005/08/24 14:44:01 brix Exp $
+
+inherit eutils flag-o-matic linux-info toolchain-funcs multilib
+
+DESCRIPTION="Linux System Hardware Monitoring user-space utilities"
+
+HOMEPAGE="http://secure.netroedge.com/~lm78/"
+SRC_URI="http://secure.netroedge.com/~lm78/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="sensord"
+DEPEND="sys-apps/sed
+		ppc? ( >=virtual/linux-sources-2.5 )
+		!ppc? ( || (  >=virtual/linux-sources-2.5 sys-apps/lm_sensors-modules ) )"
+RDEPEND="dev-lang/perl
+		sensord? ( net-analyzer/rrdtool )"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if kernel_is 2 4; then
+		if use ppc; then
+			eerror
+			eerror "${P} does not support kernel 2.4.x under PPC."
+			eerror
+			die "${P} does not support kernel 2.4.x under PPC."
+		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 ! (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"
+		fi
+		if ! (linux_chkconfig_present I2C_CHARDEV); then
+			eerror
+			eerror "${P} requires CONFIG_I2C_CHARDEV to be enabled for non-2.4.x kernels."
+			eerror
+			die "CONFIG_I2C_CHARDEV not detected"
+		fi
+		if ! (linux_chkconfig_present I2C); then
+			eerror
+			eerror "${P} requires CONFIG_I2C to be enabled for non-2.4.x kernels."
+			eerror
+			die "CONFIG_I2C not detected"
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-sensors-detect-gentoo.patch
+	epatch ${FILESDIR}/${P}-pwmconfig.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}/${P}-lm_sensors-init.d lm_sensors
+
+	if use sensord; then
+		newconfd ${FILESDIR}/${P}-sensord-conf.d sensord
+		newinitd ${FILESDIR}/${P}-sensord-init.d sensord
+	fi
+
+	dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS INSTALL QUICKSTART \
+		README* TODO
+
+	dodoc doc/cvs 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 "Next you need to run:"
+	einfo "  /usr/sbin/sensors-detect"
+	einfo "to detect the I2C hardware of your system and create the file:"
+	einfo "  /etc/conf.d/lm_sensors"
+	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 see the lm_sensors documentation and website for more information."
+	einfo
+}