Fix support of multiple chips wrt #325083 by Horst Prote.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 163 insertions, 2 deletions

diff --git a/sys-apps/lm_sensors/ChangeLog b/sys-apps/lm_sensors/ChangeLog
index f673dc4e5451..bff01a66580e 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.106 2010/06/27 17:44:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.107 2010/06/27 18:48:45 ssuominen Exp $
+
+*lm_sensors-3.1.2-r1 (27 Jun 2010)
+
+  27 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +lm_sensors-3.1.2-r1.ebuild,
+  +files/lm_sensors-3.1.2-changeset_r5835.patch:
+  Fix support of multiple chips wrt #325083 by Horst Prote.
 
   27 Jun 2010; Raúl Porcel <armin76@gentoo.org> lm_sensors-3.1.2.ebuild:
   alpha stable wrt #301474
diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest
index 286c136c932c..6a3b00eaf8fe 100644
--- a/sys-apps/lm_sensors/Manifest
+++ b/sys-apps/lm_sensors/Manifest
@@ -2,6 +2,7 @@ AUX fancontrol-init.d 726 RMD160 444eedc0044a61e0a79d79565e6399156b8f9b9c SHA1 a
 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 1404 RMD160 37f6d88752c91c767f63ae71c68349cb6a342cf3 SHA1 2b280dec53495810f5f33d94694ca05d51bea1ed SHA256 d022b4666965a922cd526379c5b47d0dc075089d0f83d3c82017524c0d38f00f
 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
@@ -12,6 +13,7 @@ DIST lm_sensors-2.10.8.tar.gz 935982 RMD160 a47884771ff1368e6609b8ae1dc686d36226
 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 12297 RMD160 fc7d28e34d5d315bc07b6b11c5bef2a67019a87c SHA1 73da6be6cda0b8e58aabe38e5b486d0266981919 SHA256 02125e2e4956328232f32983c65046a1b35eb250765f0adfc20292809d5a901a
+MISC ChangeLog 12530 RMD160 0d4fc15a6d4ee40502362fe35b9f06d472d42b1c SHA1 46281f45b97062dc29fc4babfca96b24fd9e4924 SHA256 2c282d6093a4c66ce419e09064d146ad0e88f822f173a4133f6ac346fe962403
 MISC metadata.xml 328 RMD160 102d79ccb2dfd783b5d5baf50f5ac633d915f712 SHA1 b19178b1ba16d245cd04ea70c9532ee8dc37097c SHA256 aa83681ad6865347f45c3911d408b253ab27e43bf0e3f0e58624a2b4958b425b
diff --git a/sys-apps/lm_sensors/files/lm_sensors-3.1.2-changeset_r5835.patch b/sys-apps/lm_sensors/files/lm_sensors-3.1.2-changeset_r5835.patch
new file mode 100644
index 000000000000..d7d9d3cf4176
--- /dev/null
+++ b/sys-apps/lm_sensors/files/lm_sensors-3.1.2-changeset_r5835.patch
@@ -0,0 +1,54 @@
+http://bugs.gentoo.org/325083

+http://www.lm-sensors.org/changeset/5835

+

+--- prog/sensord/rrd.c

++++ prog/sensord/rrd.c

+@@ -138,7 +138,9 @@

+ }

+ 

++/* Returns the number of features processed, or -1 on error */

+ static int _applyToFeatures(FeatureFN fn, void *data,

+ 			    const sensors_chip_name *chip,

+-			    const ChipDescriptor *desc)

++			    const ChipDescriptor *desc,

++			    int labelOffset)

+ {

+ 	int i;

+@@ -148,5 +150,5 @@

+ 	char *label;

+ 

+-	for (i = 0; i < MAX_RRD_SENSORS && features[i].format; ++i) {

++	for (i = 0; labelOffset + i < MAX_RRD_SENSORS && features[i].format; ++i) {

+ 		feature = features + i;

+ 		rawLabel = feature->feature->name;

+@@ -159,9 +161,9 @@

+ 		}

+ 

+-		rrdCheckLabel(rawLabel, i);

+-		fn(data, rrdLabels[i], label, feature);

++		rrdCheckLabel(rawLabel, labelOffset + i);

++		fn(data, rrdLabels[labelOffset + i], label, feature);

+ 		free(label);

+ 	}

+-	return 0;

++	return i;

+ }

+ 

+@@ -185,5 +187,5 @@

+ static int applyToFeatures(FeatureFN fn, void *data)

+ {

+-	int i, i_detected, ret;

++	int i, i_detected, ret, labelOffset = 0;

+ 	const sensors_chip_name *chip, *chip_arg;

+ 	ChipDescriptor *desc;

+@@ -198,7 +200,8 @@

+ 				continue;

+ 

+-			ret = _applyToFeatures(fn, data, chip, desc);

+-			if (ret)

++			ret = _applyToFeatures(fn, data, chip, desc, labelOffset);

++			if (ret < 0)

+ 				return ret;

++			labelOffset += ret;

+ 		}

+ 	}

diff --git a/sys-apps/lm_sensors/lm_sensors-3.1.2-r1.ebuild b/sys-apps/lm_sensors/lm_sensors-3.1.2-r1.ebuild
new file mode 100644
index 000000000000..02efafb02e07
--- /dev/null
+++ b/sys-apps/lm_sensors/lm_sensors-3.1.2-r1.ebuild
@@ -0,0 +1,98 @@
+# 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-r1.ebuild,v 1.1 2010/06/27 18:48:45 ssuominen 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 \
+		"${FILESDIR}"/${P}-changeset_r5835.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
+
+	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
+}