Check for CONFIG_HWMON on kernel 2.6.14+, bug #107494.

Package-Manager: portage-2.0.51.22-r3

diff --git a/sys-apps/lm_sensors/ChangeLog b/sys-apps/lm_sensors/ChangeLog
index 45555265f26db1aacbe96ec89dba63406725851b..1922286bf6c9dd460fcd29ee9f534dcf58d38d44 100644 (file)
--- a/sys-apps/lm_sensors/ChangeLog
+++ b/sys-apps/lm_sensors/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/lm_sensors
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.39 2005/09/06 21:06:02 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.40 2005/10/21 15:19:45 brix Exp $
+
+  21 Oct 2005; Henrik Brix Andersen <brix@gentoo.org>
+  lm_sensors-2.9.2.ebuild:
+  Check for CONFIG_HWMON on kernel 2.6.14+, bug #107494.
 
 *lm_sensors-2.9.2 (06 Sep 2005)
 

diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest
index 07889af687184ad7bee9b4c82301b2a6f994e3b6..7d37776b8a222042a82c1c509f1a251d8099116c 100644 (file)
--- a/sys-apps/lm_sensors/Manifest
+++ b/sys-apps/lm_sensors/Manifest
@@ -1,6 +1,6 @@
-MD5 97227fb3dbc260565ced0e9c4166ecf7 lm_sensors-2.9.2.ebuild 3809
+MD5 aed12249229acf6cc7c21037b9535efe lm_sensors-2.9.2.ebuild 4008
 MD5 593fa43923e4215d93a56f47e74c71f5 lm_sensors-2.9.1-r1.ebuild 3865
-MD5 47dadad1fdb6e89ead2c59bdcc4077a4 ChangeLog 14993
+MD5 6d33971f59fb6380630ddfbdb47f814d ChangeLog 15132
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 6caf3a2ef7bd1503aac7e3c8129c88a8 files/rc 2332
 MD5 8c53cf91a74a24b3c2187c551df425aa files/lm_sensors-2.9.2-sensord-conf.d 342

diff --git a/sys-apps/lm_sensors/lm_sensors-2.9.2.ebuild b/sys-apps/lm_sensors/lm_sensors-2.9.2.ebuild
index cfb4b6ba22a74fae969073a6414d2da02ebee52b..2399b6647c46da455a214d63ccf5b7422e5f3648 100644 (file)
--- a/sys-apps/lm_sensors/lm_sensors-2.9.2.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-2.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.9.2.ebuild,v 1.1 2005/09/06 21:06:02 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.9.2.ebuild,v 1.2 2005/10/21 15:19:45 brix Exp $
 
 inherit eutils flag-o-matic linux-info toolchain-funcs multilib
 
@@ -37,11 +37,16 @@ pkg_setup() {
                        die "sys-apps/lm_sensors-modules-${PV} not installed"
                fi
        else
-               if ! (linux_chkconfig_present I2C_SENSOR); then
+               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"
+               elif ! (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"
                fi
                if ! (linux_chkconfig_present I2C_CHARDEV); then
                        eerror