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.

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

5 files changed, 39 insertions, 54 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/Manifest b/sys-apps/lm_sensors/Manifest
index 47bbcef31c0d..494069e91103 100644
--- a/sys-apps/lm_sensors/Manifest
+++ b/sys-apps/lm_sensors/Manifest
@@ -12,8 +12,9 @@ DIST lm_sensors-2.10.8.tar.gz 935982 RMD160 a47884771ff1368e6609b8ae1dc686d36226
 DIST lm_sensors-3.0.2.tar.bz2 149734 RMD160 d896eb8360b5285a2446b94ba659d5bcdcf1f4b8 SHA1 8f28c11d00e68fc4b8249e02d224427f8f836d68 SHA256 1461fc2e8661ded28b73ed2f7a06cbecf852aa641df974e38aaa0e23977c5b57
 DIST lm_sensors-3.0.3.tar.bz2 152900 RMD160 d8af5c3c0dde5b07010c8c834dcf7a2c04fb509a SHA1 2f68d003aef8f83bbef006c5b7b26a88bd9fd036 SHA256 b45661f4c3a7f19d67ee4783e8270f462e874d7c909c8f4228692de97aad0ec6
 EBUILD lm_sensors-2.10.7.ebuild 4633 RMD160 ab45f72e19b4987e186fe7ba2597baffe3a0b728 SHA1 7de1669247a46fb08d460dd12a3a2352a30f39c8 SHA256 690ecd5b4983b116d037883cdc562a79ea3d34c9856850e0ce50950ad84abb54
-EBUILD lm_sensors-2.10.8.ebuild 4646 RMD160 3ff7980cb22e5808a84139f478592edd7609fa99 SHA1 b75b7b17d4d6961b0e850229a736116e66278cb5 SHA256 a81392ebf47b398a319f56a84e29b6b7ed3f380a643bbb8a03cb1a4a2eab94c0
-EBUILD lm_sensors-3.0.2.ebuild 3260 RMD160 d30aafe53f958ecd2772d62c52e80b07571a3c04 SHA1 8318f1f3889a4eed0c4ae1348c17b9469d4bbc6c SHA256 3d3c83f8dba9896a32f705e44fb0903689f6a99c77d5630939347a1e9fbd948d
-EBUILD lm_sensors-3.0.3.ebuild 3254 RMD160 aa3c57f7d7b3126acc424feb56a35b64aa2bb64c SHA1 2ebd94cc4dfeb534c3a3cd76baf692b83bafbea7 SHA256 9486d1cee5927a0345cf44053f470b37eac249fe565242c9dac2e35b6d9bee3b
-MISC ChangeLog 10478 RMD160 3df6caa72899283f9ebc459f5391fccbbd199564 SHA1 14dd301fb1fa3e00db106c95a1eff0111cdafa2e SHA256 1da0ba2fb9fe700a3dd5db8090b11e64ea3e9894675b13e5f248a4dd1d75db85
+EBUILD lm_sensors-2.10.8.ebuild 5041 RMD160 a6831e5789153b86867c8ea48c146be09d022c0e SHA1 af641c54b3b0c8ad770732ce225b44b3599f861c SHA256 6895ebb757a4b571e49295e960e211699d22a2dd3d69f7928fb88dfa30953d7a
+EBUILD lm_sensors-3.0.2.ebuild 3066 RMD160 606ade62fa203669ed819a5ef10f539d1edb7d70 SHA1 62b2a50b6dd9ebcde9e5ec0f998447c4b568fbd8 SHA256 02fd5606aca71fe10d5e76dcc03a8d54e32583871180936224eb9cbcfc7766b6
+EBUILD lm_sensors-3.0.3.ebuild 3061 RMD160 4c151b8a1397282d18f79a44b6b748fe900fcdff SHA1 3c343af0548f70e11e6961d815fa089c1ed3039f SHA256 711e49b56654066ea7ff0c398c103d04f9e04024c439d4d24c2908a8e9a9c09a
+MISC ChangeLog 10798 RMD160 c89b79a325ed9cdf261a4f5676f1ee0a16a06f71 SHA1 1657bf99b9a1abe7a2bcafd5baa18adfdab9c324 SHA256 f43a61c5121189c8f8f398ed6bc773c7f6e3d4a81bc31bebb28359ae380c4c56
+MISC lm_sensors-3.0.2.ebuild.orig 3260 RMD160 d30aafe53f958ecd2772d62c52e80b07571a3c04 SHA1 8318f1f3889a4eed0c4ae1348c17b9469d4bbc6c SHA256 3d3c83f8dba9896a32f705e44fb0903689f6a99c77d5630939347a1e9fbd948d
 MISC metadata.xml 328 RMD160 102d79ccb2dfd783b5d5baf50f5ac633d915f712 SHA1 b19178b1ba16d245cd04ea70c9532ee8dc37097c SHA256 aa83681ad6865347f45c3911d408b253ab27e43bf0e3f0e58624a2b4958b425b
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