Updated the KEYWORDS to reflect the availability of I2C 2.8.1 in gentoo-sources and also updated the initialization script to support 2.6. kernels. This closes bugs #36243 and #35709.

5 files changed, 50 insertions, 26 deletions

diff --git a/sys-apps/lm-sensors/ChangeLog b/sys-apps/lm-sensors/ChangeLog
index 3884f4cdabe3..7d6d4f6394f1 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-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/ChangeLog,v 1.11 2003/12/13 23:22:27 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/ChangeLog,v 1.12 2003/12/26 10:24:33 plasmaroo Exp $
+
+  26 Dec 2003; <plasmaroo@gentoo.org> lm-sensors-2.8.0.ebuild,
+  lm-sensors-2.8.1.ebuild, files/rc:
+  Changed KEYWORDS to reflect the availability of I2C 2.8.1 in
+  gentoo-sources-2.4.22. Also updated the initialization script to support 2.6
+  kernels. This closes bug #36243 and bug #35709.
 
 *lm-sensors-2.8.2 (13 Dec 2003)
 
diff --git a/sys-apps/lm-sensors/Manifest b/sys-apps/lm-sensors/Manifest
index f6cbd604e93d..67242937ca4d 100644
--- a/sys-apps/lm-sensors/Manifest
+++ b/sys-apps/lm-sensors/Manifest
@@ -1,11 +1,11 @@
-MD5 ba77a3417bf248f760a8360e3827a56b ChangeLog 4871
+MD5 29f4a4fd47e8fe40aed7de2171d8cee4 ChangeLog 5164
 MD5 efdd071257ee7e4314b70e1903efab32 lm-sensors-2.6.5.ebuild 2036
-MD5 07940dcd0942c7b3b6b238fb09eede72 lm-sensors-2.8.0.ebuild 3919
+MD5 054c26054a0b4d0ef7f52c02ee72a325 lm-sensors-2.8.0.ebuild 3756
 MD5 37443e54165d5bcdaa8550d52edafa98 metadata.xml 228
 MD5 655b7e9df1b01c8a7f9cdb30d5daa475 lm-sensors-2.7.0.ebuild 2321
 MD5 9d9d2e94e87e1c2ccb44695b6abe1685 lm-sensors-2.8.2.ebuild 4654
 MD5 4114af2a24bbb2cce7e2b199279f45d7 lm-sensors-2.7.0-r1.ebuild 2666
-MD5 f0ffc9035755aae9c0ac6ceb3e85de80 lm-sensors-2.8.1.ebuild 3919
+MD5 107895d2b4e000d9d3caf4d0cb02cdf3 lm-sensors-2.8.1.ebuild 3902
 MD5 e7d4c59852cf30645216f50ef7a3377b files/digest-lm-sensors-2.8.1 68
 MD5 f07f401256b40cdec1c0518d28ee1aca files/digest-lm-sensors-2.7.0-r1 158
 MD5 72151bdd499b580ff965dd1a2e4216fb files/lm-sensors-2.8.1-sensors-detect-gentoo.diff 4973
@@ -17,4 +17,4 @@ MD5 265c3ccaffdf984cbd371aec994b3162 files/lm-sensors-2.8.0-sensors-detect-gento
 MD5 f0520fc5631209ae9278e18d9b464d8e files/no-isadump-ppc.patch 1193
 MD5 72151bdd499b580ff965dd1a2e4216fb files/lm-sensors-2.8.2-sensors-detect-gentoo.diff 4973
 MD5 d8c62d91275ce75f12c70d068db57a97 files/rc_lm_sensors 621
-MD5 ccd4e8e4cf67698c5de0a258feb68f97 files/rc 1595
+MD5 da3f607a8942a5d0e970d24b49a6e4e6 files/rc 1952
diff --git a/sys-apps/lm-sensors/files/rc b/sys-apps/lm-sensors/files/rc
index 1b5d8cc3c2d0..459794ed209d 100644
--- a/sys-apps/lm-sensors/files/rc
+++ b/sys-apps/lm-sensors/files/rc
@@ -13,14 +13,30 @@ start() {
 		return 1
 	fi
 
-	ebegin "Loading lm_sensors modules"
-	eend $?
-	if ! [ -e /proc/sys/dev/sensors ] ; then
+	einfo "Loading lm_sensors modules..."
+
+	mount | grep sysfs &>/dev/null
+	if [ $? == 0 ]; then
+		if ! [ -e /sys/i2c ]; then
+			ebegin "  Loading i2c-core"
+			modprobe i2c-core &>/dev/null
+			if [ $? != 0 ]; then
+				eerror "    Could not load i2c-core!"
+				eend 1
+			fi
+			[ -e /sys/i2c ] || return 1
+			eend 0
+		fi
+	elif ! [ -e /proc/sys/dev/sensors ]; then
 		ebegin "  Loading i2c-proc"
 		modprobe i2c-proc &>/dev/null
-		eend $?
+		if [ $? != 0 ]; then
+			eerror "    Could not load i2c-proc!"
+			eend 1
+		fi
+		[ -e /proc/sys/dev/sensors ] || return 1
+		eend 0
 	fi
-	[ -e /proc/sys/dev/sensors ] || return 1
 
 	i=0
 	while true; do
@@ -71,10 +87,12 @@ stop() {
 		eend $?
 	done
 
-	# should we actually remove i2c-proc???
-	ebegin "  Removing i2c-proc"
-	rmmod i2c-proc &>/dev/null
-	eend $?
+	if [ -e /proc/sys/dev/sensors ] ; then
+		ebegin "  Removing i2c-proc"
+		rmmod i2c-proc &>/dev/null
+		eend $?
+	fi
 
 	return 0
+
 }
diff --git a/sys-apps/lm-sensors/lm-sensors-2.8.0.ebuild b/sys-apps/lm-sensors/lm-sensors-2.8.0.ebuild
index 9d05b243a019..9f48db6b8ea4 100644
--- a/sys-apps/lm-sensors/lm-sensors-2.8.0.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-2.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.0.ebuild,v 1.6 2003/10/30 22:18:32 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/lm-sensors-2.8.0.ebuild,v 1.7 2003/12/26 10:24:33 plasmaroo Exp $
 
 inherit flag-o-matic
 
@@ -13,10 +13,7 @@ SRC_URI="http://www.lm-sensors.nu/archive/${MY_P}.tar.gz"
 HOMEPAGE="http://www2.lm-sensors.nu/~lm78"
 
 SLOT="${KV}"
-# gentoo-sources-2.4.20-r1 and xfs-sources-2.4.20-r1 will
-# have support for this package, do not change these to ~
-# until your arch has i2c-2.7.0 in it's kernel.
-KEYWORDS="~x86 ~amd64 -ppc -sparc"
+KEYWORDS="x86 ~amd64 -ppc -sparc"
 LICENSE="GPL-2"
 
 DEPEND=">=sys-apps/i2c-2.8.0"
diff --git a/sys-apps/lm-sensors/lm-sensors-2.8.1.ebuild b/sys-apps/lm-sensors/lm-sensors-2.8.1.ebuild
index 96b16dcfca8b..7378ef845302 100644
--- a/sys-apps/lm-sensors/lm-sensors-2.8.1.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-2.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.1.ebuild,v 1.1 2003/11/27 19:11:40 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/lm-sensors-2.8.1.ebuild,v 1.2 2003/12/26 10:24:33 plasmaroo Exp $
 
 inherit flag-o-matic
 
@@ -13,13 +13,14 @@ SRC_URI="http://www.lm-sensors.nu/archive/${MY_P}.tar.gz"
 HOMEPAGE="http://www2.lm-sensors.nu/~lm78"
 
 SLOT="${KV}"
-# gentoo-sources-2.4.20-r1 and xfs-sources-2.4.20-r1 will
-# have support for this package, do not change these to ~
-# until your arch has i2c-2.7.0 in it's kernel.
+
+# Dependencies here are either for I2C or gentoo-sources 2.4.22
 KEYWORDS="~x86 ~amd64 -ppc -sparc"
 LICENSE="GPL-2"
 
-DEPEND=">=sys-apps/i2c-2.8.1"
+DEPEND="|| (	>=sys-apps/i2c-2.8.1
+		>=sys-kernel/gentoo-sources-2.4.22
+	)"
 
 src_unpack() {
 	unpack ${A} || die
@@ -36,10 +37,11 @@ src_compile()  {
 	einfo "*****************************************************************"
 	einfo
 	einfo "This ebuild assumes your /usr/src/linux kernel is the one you"
-	einfo "used to build i2c-2.8.0. and is >=2.4.9 && < 2.5+"
+	einfo "used to build i2c-2.8.1. and is >=2.4.9 && < 2.5+"
 	einfo
 	einfo "For 2.5+ series kernels, use the support already in the kernel"
-	einfo "under 'Character devices' -> 'I2C support'."
+	einfo "under 'Character devices' -> 'I2C support' and get lm-sensors"
+	einfo "2.8.2."
 	einfo
 	einfo "To cross-compile, 'export LINUX=\"/lib/modules/<version>/build\"'"
 	einfo "or symlink /usr/src/linux to another kernel."
@@ -89,6 +91,7 @@ src_install() {
 	dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS COPYING INSTALL QUICKSTART \
 		README* RPM TODO
 	cp -a doc/* ${D}/usr/share/doc/${PF}
+
 }
 
 pkg_postinst() {