This package builds and runs perfectly without any kernel sources present, the kernel checks are bogus. The user is responsible for their kernel being sane if we cannot check it.

(Portage version: 2.2_rc42/cvs/Linux x86_64)

4 files changed, 34 insertions, 50 deletions

diff --git a/sys-apps/lm_sensors/ChangeLog b/sys-apps/lm_sensors/ChangeLog
index bdb240b11e44..dbb419bcc979 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.93 2009/07/25 01:03:21 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.94 2009/10/17 01:18:04 robbat2 Exp $
+
+  17 Oct 2009; Robin H. Johnson <robbat2@gentoo.org>
+  lm_sensors-2.10.8.ebuild, lm_sensors-3.0.2.ebuild,
+  lm_sensors-3.0.3.ebuild:
+  This package builds and runs perfectly without any kernel sources present,
+  the kernel checks are bogus. The user is responsible for their kernel
+  being sane if we cannot check it.
 
 *lm_sensors-3.0.3 (25 Jul 2009)
 
diff --git a/sys-apps/lm_sensors/lm_sensors-2.10.8.ebuild b/sys-apps/lm_sensors/lm_sensors-2.10.8.ebuild
index 9923b9285023..2bf8f2c608ee 100644
--- a/sys-apps/lm_sensors/lm_sensors-2.10.8.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-2.10.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.10.8.ebuild,v 1.1 2009/06/07 14:48:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.10.8.ebuild,v 1.2 2009/10/17 01:18:04 robbat2 Exp $
 
 inherit eutils flag-o-matic linux-info toolchain-funcs multilib
 
@@ -31,30 +31,39 @@ RDEPEND="${COMMON}
 pkg_setup() {
 	linux-info_pkg_setup
 
-	if kernel_is 2 4; then
+	if ! linux_config_src_exists; then
+		CONFIG_CHECK="I2C_SENSOR HWMON I2C CONFIG_I2C_CHARDEV"
+		ewarn "Unable to check for the following kernel config options due"
+		ewarn "to absence of any configured kernel sources or compiled"
+		ewarn "config:"
+		for config in ${CONFIG_CHECK}; do
+			ewarn " - ${config#\~}"
+		done
+		ewarn "You're on your own to make sure they are set if needed."
+	elif kernel_is 2 4; then
 		if use ppc || use amd64; then
 			eerror
 			eerror "${P} does not support kernel 2.4.x under PPC and AMD64."
 			eerror
-			die "${P} does not support kernel 2.4.x under PPC and AMD64."
+			eerror "${P} does not support kernel 2.4.x under PPC and AMD64."
 		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"
+			eerror "sys-apps/lm_sensors-modules-${PV} not installed"
 		fi
 	else
 		if kernel_is lt 2 6 14 && ! (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"
+			ewarn "CONFIG_I2C_SENSOR not detected"
 		elif kernel_is gt 2 6 13 && ! (linux_chkconfig_present HWMON); then
 			eerror
 			eerror "${P} requires CONFIG_HWMON to be enabled for 2.6.14+ kernels."
 			eerror
-			die "CONFIG_HWMON not detected"
+			ewarn "CONFIG_HWMON not detected"
 		fi
 		if ! (linux_chkconfig_present I2C_CHARDEV); then
 			ewarn
diff --git a/sys-apps/lm_sensors/lm_sensors-3.0.2.ebuild b/sys-apps/lm_sensors/lm_sensors-3.0.2.ebuild
index fcab67327a01..36c9952d315a 100644
--- a/sys-apps/lm_sensors/lm_sensors-3.0.2.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-3.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.0.2.ebuild,v 1.2 2008/08/13 16:13:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-3.0.2.ebuild,v 1.3 2009/10/17 01:18:04 robbat2 Exp $
 
 inherit eutils flag-o-matic linux-info toolchain-funcs multilib
 
@@ -22,26 +22,10 @@ RDEPEND="${COMMON}
 		dev-lang/perl
 		virtual/logger"
 
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if ! linux_chkconfig_present HWMON; then
-		eerror
-		eerror "${P} requires CONFIG_HWMON to be enabled."
-		eerror
-		die "CONFIG_HWMON not detected"
-	fi
-	if ! linux_chkconfig_present I2C_CHARDEV; then
-		ewarn
-		ewarn "sensors-detect requires CONFIG_I2C_CHARDEV to be enabled."
-		ewarn
-	fi
-	if ! linux_chkconfig_present I2C; then
-		ewarn
-		ewarn "${P} requires CONFIG_I2C to be enabled for most sensors."
-		ewarn
-	fi
-}
+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_unpack() {
 	unpack ${A}
diff --git a/sys-apps/lm_sensors/lm_sensors-3.0.3.ebuild b/sys-apps/lm_sensors/lm_sensors-3.0.3.ebuild
index 4d8bd26bb280..d72da2504f62 100644
--- a/sys-apps/lm_sensors/lm_sensors-3.0.3.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-3.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.0.3.ebuild,v 1.1 2009/07/25 01:03:21 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-3.0.3.ebuild,v 1.2 2009/10/17 01:18:04 robbat2 Exp $
 
 EAPI=2
 
@@ -22,26 +22,10 @@ RDEPEND="${COMMON}
 		dev-lang/perl
 		virtual/logger"
 
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if ! linux_chkconfig_present HWMON; then
-		eerror
-		eerror "${P} requires CONFIG_HWMON to be enabled."
-		eerror
-		die "CONFIG_HWMON not detected"
-	fi
-	if ! linux_chkconfig_present I2C_CHARDEV; then
-		ewarn
-		ewarn "sensors-detect requires CONFIG_I2C_CHARDEV to be enabled."
-		ewarn
-	fi
-	if ! linux_chkconfig_present I2C; then
-		ewarn
-		ewarn "${P} requires CONFIG_I2C to be enabled for most sensors."
-		ewarn
-	fi
-}
+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}"/${PN}-3.0.3-sensors-detect-gentoo.patch