Updated error messages in the lm-sensors-2.8 ebuilds, and also updated the init script to work with the more recent 2.6 kernels - closes bug #37083.

6 files changed, 17 insertions, 14 deletions

diff --git a/sys-apps/lm-sensors/ChangeLog b/sys-apps/lm-sensors/ChangeLog
index 89fc047ba469..9656734b87dd 100644
--- a/sys-apps/lm-sensors/ChangeLog
+++ b/sys-apps/lm-sensors/ChangeLog
@@ -1,6 +1,9 @@
 # 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.13 2003/12/26 15:19:20 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/ChangeLog,v 1.14 2004/01/04 20:12:25 plasmaroo Exp $
+
+  04 Jan 2004; <plasmaroo@gentoo.org> files/rc:
+  Updated initialization script - closes bug #37083.
 
   26 Dec 2003; Jason Wever <weeve@gentoo.org> lm-sensors-2.6.5.ebuild:
   Masked on sparc.
diff --git a/sys-apps/lm-sensors/Manifest b/sys-apps/lm-sensors/Manifest
index 61274bdb2999..bc7765091a0b 100644
--- a/sys-apps/lm-sensors/Manifest
+++ b/sys-apps/lm-sensors/Manifest
@@ -1,11 +1,11 @@
-MD5 6f2e92d53002c24e7b628fe1e9350ba3 ChangeLog 5251
+MD5 7900e9c1d2a5c137832f543afd03664d ChangeLog 5357
 MD5 2bf0a19b70a2d6934eb9a38fe84d6702 lm-sensors-2.6.5.ebuild 2039
-MD5 ed602af1af46b56b5a859f53ac182aed lm-sensors-2.8.0.ebuild 3756
+MD5 28373b812640d00c88c1b25d8e27d1f4 lm-sensors-2.8.0.ebuild 3697
 MD5 37443e54165d5bcdaa8550d52edafa98 metadata.xml 228
 MD5 0a8a5b7c595d62f66dedb4e0c81c81db lm-sensors-2.7.0.ebuild 2323
-MD5 047bab9156d7955ff3cd9b52974c771e lm-sensors-2.8.2.ebuild 4745
+MD5 319f68b91b516c01ba436f7952fa9c3f lm-sensors-2.8.2.ebuild 4752
 MD5 846852ccef6091ef1bc98bf955e69cee lm-sensors-2.7.0-r1.ebuild 2668
-MD5 929b2ddc5b1ca7604addbba83d4c0303 lm-sensors-2.8.1.ebuild 3884
+MD5 fce52fbef3d736da7592583a1255affc lm-sensors-2.8.1.ebuild 3825
 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 da3f607a8942a5d0e970d24b49a6e4e6 files/rc 1952
+MD5 2217cbce56dd9da8bbe4188a24c9412f files/rc 2006
diff --git a/sys-apps/lm-sensors/files/rc b/sys-apps/lm-sensors/files/rc
index 459794ed209d..46be26a68bd8 100644
--- a/sys-apps/lm-sensors/files/rc
+++ b/sys-apps/lm-sensors/files/rc
@@ -17,14 +17,14 @@ start() {
 
 	mount | grep sysfs &>/dev/null
 	if [ $? == 0 ]; then
-		if ! [ -e /sys/i2c ]; then
+		if ! ( [ -e /sys/i2c ] || [ -e /sys/bus/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
+			( [ -e /sys/i2c ] || [ -e /sys/bus/i2c ] ) || return 1
 			eend 0
 		fi
 	elif ! [ -e /proc/sys/dev/sensors ]; then
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 7660ce07103b..b93a1c86aa48 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-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.0.ebuild,v 1.8 2004/01/04 18:29:46 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/lm-sensors-2.8.0.ebuild,v 1.9 2004/01/04 20:12:25 plasmaroo Exp $
 
 inherit flag-o-matic
 
@@ -75,7 +75,7 @@ src_compile()  {
 
 	cd ${S}
 	emake clean
-	emake 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.0 support built as modules. This support is included in gentoo-sources as of 2.4.20-r1"
+	emake 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.0 support built as modules."
 }
 
 src_install() {
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 a347a19d45b5..6ac7f09e1abe 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-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.1.ebuild,v 1.5 2004/01/04 19:53:26 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/lm-sensors-2.8.1.ebuild,v 1.6 2004/01/04 20:12:25 plasmaroo Exp $
 
 inherit flag-o-matic
 
@@ -81,7 +81,7 @@ src_compile()  {
 
 	cd ${S}
 	emake clean
-	emake 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.0 support built as modules. This support is included in gentoo-sources as of 2.4.20-r1"
+	emake 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."
 }
 
 src_install() {
diff --git a/sys-apps/lm-sensors/lm-sensors-2.8.2.ebuild b/sys-apps/lm-sensors/lm-sensors-2.8.2.ebuild
index 076bac262b39..0dde614c2add 100644
--- a/sys-apps/lm-sensors/lm-sensors-2.8.2.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-2.8.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.4 2004/01/04 18:29:46 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/lm-sensors-2.8.2.ebuild,v 1.5 2004/01/04 20:12:25 plasmaroo Exp $
 
 inherit flag-o-matic
 
@@ -88,7 +88,7 @@ src_compile()  {
 	if [ ${UserModeOnly} == true ]; then
 		emake I2C_HEADERS=${MYI2C} user || die "Could not compile user-mode utilities!"
 	else
-		emake 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.0 support built as modules. This support is included in gentoo-sources as of 2.4.20-r1"
+		emake 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
 }