new version required for using with a 2.6.4 or later kernel

4 files changed, 160 insertions, 13 deletions

diff --git a/sys-apps/lm-sensors/ChangeLog b/sys-apps/lm-sensors/ChangeLog
index 502f7170996d..f409c30a9585 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-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/ChangeLog,v 1.24 2004/03/31 21:17:18 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/ChangeLog,v 1.25 2004/04/08 03:43:43 lv Exp $
+
+*lm-sensors-2.8.6 (07 Apr 2004)
+
+  07 Apr 2004; Travis Tilley <lv@gentoo.org> lm-sensors-2.8.6.ebuild:
+  added 2.8.6, which appears to be a requirement for using lm-sensors with a
+  2.6.4 or later kernel
 
 *lm-sensors-2.8.3 (31 Mar 2004)
 
diff --git a/sys-apps/lm-sensors/Manifest b/sys-apps/lm-sensors/Manifest
index 9598be08b974..0fc6ce9044c3 100644
--- a/sys-apps/lm-sensors/Manifest
+++ b/sys-apps/lm-sensors/Manifest
@@ -1,22 +1,24 @@
-MD5 cd5b735638cf48438cf907a1142a621f ChangeLog 7202
+MD5 f61c6d86382fec991901e252d9ce1610 ChangeLog 7426
 MD5 e4c90be0b8769f3616567470e3c89ade lm-sensors-2.6.5.ebuild 2030
+MD5 846852ccef6091ef1bc98bf955e69cee lm-sensors-2.7.0-r1.ebuild 2668
+MD5 2ecab444f734d95a7828c3a68576b52f lm-sensors-2.8.1.ebuild 3852
+MD5 3b7dcbe60aa725b0c141f9f93d36af7a lm-sensors-2.8.2.ebuild 4720
 MD5 4b12fb7335665fcdd2df7067da32f82f lm-sensors-2.8.3.ebuild 4726
-MD5 37443e54165d5bcdaa8550d52edafa98 metadata.xml 228
 MD5 05513b77c44891f917ead3e3a08b9908 lm-sensors-2.8.4.ebuild 4673
-MD5 3b7dcbe60aa725b0c141f9f93d36af7a lm-sensors-2.8.2.ebuild 4720
-MD5 846852ccef6091ef1bc98bf955e69cee lm-sensors-2.7.0-r1.ebuild 2668
 MD5 2da144fbd943fa2de066b6d8ada80c2d lm-sensors-2.8.5.ebuild 4674
-MD5 2ecab444f734d95a7828c3a68576b52f lm-sensors-2.8.1.ebuild 3852
-MD5 e7d4c59852cf30645216f50ef7a3377b files/digest-lm-sensors-2.8.1 68
-MD5 f07f401256b40cdec1c0518d28ee1aca files/digest-lm-sensors-2.7.0-r1 158
-MD5 2634b37f6b5e364df64f34d79506ca51 files/lm-sensors-2.8.1-sensors-detect-gentoo.diff 5006
+MD5 37443e54165d5bcdaa8550d52edafa98 metadata.xml 228
+MD5 2da144fbd943fa2de066b6d8ada80c2d lm-sensors-2.8.6.ebuild 4674
 MD5 4e8f1427a529eb217c00370357991f73 files/digest-lm-sensors-2.6.5 68
+MD5 f07f401256b40cdec1c0518d28ee1aca files/digest-lm-sensors-2.7.0-r1 158
+MD5 e7d4c59852cf30645216f50ef7a3377b files/digest-lm-sensors-2.8.1 68
 MD5 499af1d2975507a304a16c6a1bcba3cd files/digest-lm-sensors-2.8.2 68
 MD5 8fa08bc4e8fe32a411003d7a018c9536 files/digest-lm-sensors-2.8.3 68
-MD5 f2c16790be781d921f5da5f1905e0c43 files/lm-sensors-2.8.0-sensors-detect-gentoo.diff 5206
-MD5 f0520fc5631209ae9278e18d9b464d8e files/no-isadump-ppc.patch 1193
 MD5 2008fdc749bfa5f92bc90711e9d0d34d files/digest-lm-sensors-2.8.4 68
-MD5 2634b37f6b5e364df64f34d79506ca51 files/lm-sensors-2.8.2-sensors-detect-gentoo.diff 5006
-MD5 d8c62d91275ce75f12c70d068db57a97 files/rc_lm_sensors 621
 MD5 456d41bfdda2f5df2208f6c4a232a6c4 files/digest-lm-sensors-2.8.5 68
+MD5 f2c16790be781d921f5da5f1905e0c43 files/lm-sensors-2.8.0-sensors-detect-gentoo.diff 5206
+MD5 2634b37f6b5e364df64f34d79506ca51 files/lm-sensors-2.8.1-sensors-detect-gentoo.diff 5006
+MD5 2634b37f6b5e364df64f34d79506ca51 files/lm-sensors-2.8.2-sensors-detect-gentoo.diff 5006
+MD5 f0520fc5631209ae9278e18d9b464d8e files/no-isadump-ppc.patch 1193
 MD5 2217cbce56dd9da8bbe4188a24c9412f files/rc 2006
+MD5 d8c62d91275ce75f12c70d068db57a97 files/rc_lm_sensors 621
+MD5 d15b006ea7a9ea424d03cca949f1053c files/digest-lm-sensors-2.8.6 68
diff --git a/sys-apps/lm-sensors/files/digest-lm-sensors-2.8.6 b/sys-apps/lm-sensors/files/digest-lm-sensors-2.8.6
new file mode 100644
index 000000000000..8e1d89e27876
--- /dev/null
+++ b/sys-apps/lm-sensors/files/digest-lm-sensors-2.8.6
@@ -0,0 +1 @@
+MD5 baa836e7b31eeb991b105008ab7458a4 lm_sensors-2.8.6.tar.gz 737505
diff --git a/sys-apps/lm-sensors/lm-sensors-2.8.6.ebuild b/sys-apps/lm-sensors/lm-sensors-2.8.6.ebuild
new file mode 100644
index 000000000000..182d110c27af
--- /dev/null
+++ b/sys-apps/lm-sensors/lm-sensors-2.8.6.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/lm-sensors-2.8.6.ebuild,v 1.1 2004/04/08 03:43:43 lv Exp $
+
+inherit flag-o-matic
+
+MY_P=${PN/-/_}-${PV}
+S="${WORKDIR}/${MY_P}"
+MYI2C="${WORKDIR}/i2c-headers"
+
+DESCRIPTION="Hardware Sensors Monitoring by lm_sensors"
+SRC_URI="http://www.lm-sensors.nu/archive/${MY_P}.tar.gz"
+HOMEPAGE="http://www2.lm-sensors.nu/~lm78"
+
+SLOT="${KV}"
+
+KEYWORDS="~amd64 -ppc -sparc -x86"
+LICENSE="GPL-2"
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S} || die
+	epatch ${FILESDIR}/${PN}-2.8.2-sensors-detect-gentoo.diff > /dev/null || die
+
+	# Get the right I2C includes without dropping the kernel includes
+	mkdir -p ${MYI2C}/linux
+	cp /usr/include/linux/i2c* ${MYI2C}/linux/
+}
+
+src_compile()  {
+	echo
+	einfo "*****************************************************************"
+	einfo
+	einfo "This ebuild assumes your /usr/src/linux kernel is the one you"
+	einfo "used to build i2c-2.8.2."
+	einfo
+	einfo "For 2.5+ series kernels, use the support already in the kernel"
+	einfo "under 'Character devices' -> 'I2C support' and then merge this"
+	einfo "ebuild."
+	einfo
+	einfo "To cross-compile, 'export LINUX=\"/lib/modules/<version>/build\"'"
+	einfo "or symlink /usr/src/linux to another kernel."
+	einfo
+	einfo "*****************************************************************"
+	echo
+
+	UserModeOnly=false
+	if [ "$LINUX" != "" ]; then
+		einfo "Cross-compiling using:- $LINUX"
+		LINUX=`echo $LINUX | sed 's/build\//build/'`
+		KV=`cut -d\  -f3 ${LINUX}/include/linux/version.h | grep \" | sed -e 's/"//' -e 's/"//'`
+		if [ "${KV}" == "" ]; then
+			die "Could not get kernel version; make sure ${LINUX}/include/linux/version.h is there!"
+		fi
+	else
+		LINUX='/usr/src/linux'
+		check_KV || die "Cannot find kernel in /usr/src/linux!"
+		einfo "Using kernel in /usr/src/linux/:- ${KV}"
+	fi
+	if [ `echo ${KV} | grep 2\.[56]\.` ]; then
+		einfo "You are using a 2.5 / 2.6 series kernel; only building utilities..."
+		UserModeOnly=true
+	else
+		einfo "You are using a `echo ${KV} | cut -d. -f-2` series kernel; building everything..."
+	fi
+	if [ "${KV}" != "${SLOT}" ]; then
+		echo
+		ewarn "WARNING:- Specified and running kernels do not match!"
+		ewarn "WARNING:- This package will be slotted as ${SLOT}!"
+	fi
+
+	if [ ! -e ${MYI2C}/linux/i2c.h ]; then
+		cp $LINUX/include/linux/i2c* ${MYI2C}/linux || die "No I2C Includes! Install I2C!"
+	fi
+
+	echo; einfo "You may safely ignore any errors from compilation"
+	einfo "that contain 'No such file' references."
+
+	echo
+	filter-flags -fPIC -fstack-protector
+
+	cd ${S}
+	emake clean
+
+	if [ ${UserModeOnly} == true ]; then
+		emake CC=${CC} I2C_HEADERS=${MYI2C} user || die "Could not compile user-mode utilities!"
+	else
+		emake CC=${CC} I2C_HEADERS=${MYI2C} LINUX=$LINUX || die "lm_sensors requires the source of a compatible kernel version in /usr/src/linux or specified in \$LINUX and >=i2c-2.8.1 support built as modules. Make sure that I2C >=2.8.1 is on your system before filing a bug."
+	fi
+}
+
+src_install() {
+
+	mkdir -p ${D}/usr/bin
+	mkdir -p ${D}/usr/sbin
+	if [ ${UserModeOnly} == true ]; then
+		emake DESTDIR=${D} PREFIX=${D}/usr MANDIR=${D}/usr/share/man user_install || die "Install failed!"
+	else
+		emake LINUX=$LINUX DESTDIR=${D} PREFIX=${D}/usr MANDIR=${D}/usr/share/man install || die "Install failed!"
+	fi
+	cp ${D}/${D}* ${D} -Rf
+	rm ${D}/var -Rf
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/rc lm_sensors
+	dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS COPYING INSTALL QUICKSTART \
+		README* TODO
+	cp -a doc/* ${D}/usr/share/doc/${PF}
+
+}
+
+pkg_postinst() {
+	[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
+
+	echo
+	einfo
+	einfo "The lm_sensors hardware sensors package has been installed."
+	einfo
+	einfo "It is recommended that you read the lm_sensors documentation."
+	einfo "To enable lm_sensors you will need to compile i2c support in"
+	einfo "your kernel as a module and run /usr/sbin/sensors-detect to"
+	einfo "detect the hardware in your system."
+	einfo
+	einfo "Be warned, the probing of hardware in your system performed by"
+	einfo "sensors-detect could freeze your system.  Also do not use"
+	einfo "lm_sensors on certain laptop models from IBM.  See the lm_sensors"
+	einfo "documentation and website for more information."
+	einfo
+	einfo "IMPORTANT: When you merge this package it installs kernel modules"
+	einfo "that can only be used with the specific kernel version whose"
+	einfo "source is located in /usr/src/linux.  If you upgrade to a new"
+	einfo "kernel, you will need to remerge the lm_sensors package to build"
+	einfo "new kernel modules."
+	einfo
+	echo
+}