Fix the init-script to also rmmod i2c-core (#140051 thanks to <lefti at bk.ru>)

Package-Manager: portage-2.1.1_pre3

8 files changed, 341 insertions, 18 deletions

diff --git a/sys-apps/lm_sensors/ChangeLog b/sys-apps/lm_sensors/ChangeLog
index d12e92170b64..45d5bd3cb276 100644
--- a/sys-apps/lm_sensors/ChangeLog
+++ b/sys-apps/lm_sensors/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/lm_sensors
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.54 2006/07/16 09:15:05 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.55 2006/07/16 09:18:36 phreak Exp $
+
+*lm_sensors-2.10.0-r1 (16 Jul 2006)
+*lm_sensors-2.9.2-r1 (16 Jul 2006)
+
+  16 Jul 2006; Christian Heim <phreak@gentoo.org>
+  files/lm_sensors-2.9.2-lm_sensors-init.d,
+  files/lm_sensors-2.10.0-lm_sensors-init.d, +lm_sensors-2.9.2-r1.ebuild,
+  +lm_sensors-2.10.0-r1.ebuild:
+  Fix the init-script to also rmmod i2c-core (#140051 thanks to <lefti at bk.ru>)
 
   16 Jul 2006; Christian Heim <phreak@gentoo.org> lm_sensors-2.9.2.ebuild,
   lm_sensors-2.10.0.ebuild:
diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest
index fcb28266f32b..e50113c43b59 100644
--- a/sys-apps/lm_sensors/Manifest
+++ b/sys-apps/lm_sensors/Manifest
@@ -5,10 +5,10 @@ AUX lm_sensors-2.10.0-fancontrol-init.d 742 RMD160 5764496bbf458a198e9fd33deaf8d
 MD5 9256ad9507e5277c37efac49a28335e9 files/lm_sensors-2.10.0-fancontrol-init.d 742
 RMD160 5764496bbf458a198e9fd33deaf8d29436b5f74e files/lm_sensors-2.10.0-fancontrol-init.d 742
 SHA256 a7d118ef835b86a0b69c983f53fdaa386714bf70d5785746476f626d636dbfa0 files/lm_sensors-2.10.0-fancontrol-init.d 742
-AUX lm_sensors-2.10.0-lm_sensors-init.d 2452 RMD160 e98288285811fd6008ebc96c6cae707340e3a856 SHA1 2b0f35e98ed3a0c6d68f5b213e8bd7e8bcf414b6 SHA256 4426801b022ab0450dff7af30090b14607e375ba8791e0dc6e1dac3036e1d6d1
-MD5 b63e425d42e60a7339ad36fe595e8f7c files/lm_sensors-2.10.0-lm_sensors-init.d 2452
-RMD160 e98288285811fd6008ebc96c6cae707340e3a856 files/lm_sensors-2.10.0-lm_sensors-init.d 2452
-SHA256 4426801b022ab0450dff7af30090b14607e375ba8791e0dc6e1dac3036e1d6d1 files/lm_sensors-2.10.0-lm_sensors-init.d 2452
+AUX lm_sensors-2.10.0-lm_sensors-init.d 2581 RMD160 0fe59a8d5457eefa1ee28e2369492f5c38f78a82 SHA1 f3661b4cf92442c69a84295ad1858cf6904be8d3 SHA256 e1ecc88068507c6608b1a752415c14ed001111bdb1e2c59d46eec2f7db24c4e1
+MD5 036555c976dd7c684389486d7dcc90b9 files/lm_sensors-2.10.0-lm_sensors-init.d 2581
+RMD160 0fe59a8d5457eefa1ee28e2369492f5c38f78a82 files/lm_sensors-2.10.0-lm_sensors-init.d 2581
+SHA256 e1ecc88068507c6608b1a752415c14ed001111bdb1e2c59d46eec2f7db24c4e1 files/lm_sensors-2.10.0-lm_sensors-init.d 2581
 AUX lm_sensors-2.10.0-sensord-conf.d 104 RMD160 c4a06a8492d6c0fd966dea64d92f798a9b716a92 SHA1 43090c58c918969caa359d3b6e89237585759f46 SHA256 02230edf5efbb0a4de3840cd76f9ebf431c57a246fa7388e9dbeb0fe26fe7b8d
 MD5 82e075236a61334abb3adf46280380d3 files/lm_sensors-2.10.0-sensord-conf.d 104
 RMD160 c4a06a8492d6c0fd966dea64d92f798a9b716a92 files/lm_sensors-2.10.0-sensord-conf.d 104
@@ -21,10 +21,10 @@ AUX lm_sensors-2.10.0-sensors-detect-gentoo.patch 5422 RMD160 1e3b66a8223bf8faf9
 MD5 40a7140c570d5c5ac82a5643a3ed0137 files/lm_sensors-2.10.0-sensors-detect-gentoo.patch 5422
 RMD160 1e3b66a8223bf8faf9d255550d88ea375015c114 files/lm_sensors-2.10.0-sensors-detect-gentoo.patch 5422
 SHA256 fbc79f9f93a4e21a2a1755c481d1630612f908049a457077baf0e1d631fa5baa files/lm_sensors-2.10.0-sensors-detect-gentoo.patch 5422
-AUX lm_sensors-2.9.2-lm_sensors-init.d 2451 RMD160 9e083d404726183ff9b140a7daed892d7c92b3b7 SHA1 941298f9920fc76c24191cce8911bf8022923762 SHA256 8fd54f9682a135ca3c694d565fa3fb0cf8f3b6c56baf355a32135cbe25b4a3f4
-MD5 1820ac1922d3df87cc3627a3dd587cf6 files/lm_sensors-2.9.2-lm_sensors-init.d 2451
-RMD160 9e083d404726183ff9b140a7daed892d7c92b3b7 files/lm_sensors-2.9.2-lm_sensors-init.d 2451
-SHA256 8fd54f9682a135ca3c694d565fa3fb0cf8f3b6c56baf355a32135cbe25b4a3f4 files/lm_sensors-2.9.2-lm_sensors-init.d 2451
+AUX lm_sensors-2.9.2-lm_sensors-init.d 2580 RMD160 bcf7ee00d095f7e960921d0b96192b5119c09c37 SHA1 0f8c9ca44fb7bf66a7faf435ce4719f6811a6eb3 SHA256 1bd8697daf6067e70a3d1448807960f1163c1bc17229c323f940184ce0e54f61
+MD5 d1cfd830ea987d0786c4e99d49b5cb52 files/lm_sensors-2.9.2-lm_sensors-init.d 2580
+RMD160 bcf7ee00d095f7e960921d0b96192b5119c09c37 files/lm_sensors-2.9.2-lm_sensors-init.d 2580
+SHA256 1bd8697daf6067e70a3d1448807960f1163c1bc17229c323f940184ce0e54f61 files/lm_sensors-2.9.2-lm_sensors-init.d 2580
 AUX lm_sensors-2.9.2-sensord-conf.d 342 RMD160 70019e0becd5c410e12425eace4b6309bde7fc83 SHA1 a11cfd06966149c928bf75997d3a520c1f262639 SHA256 8c199e206536392e1e98eff63088f5f2a20b46d9921cd25a411363a7d3bf53f8
 MD5 8c53cf91a74a24b3c2187c551df425aa files/lm_sensors-2.9.2-sensord-conf.d 342
 RMD160 70019e0becd5c410e12425eace4b6309bde7fc83 files/lm_sensors-2.9.2-sensord-conf.d 342
@@ -39,18 +39,26 @@ RMD160 67912fd5dbb75ef7c7e2ceba4b42cb817e6c1f15 files/lm_sensors-2.9.2-sensors-d
 SHA256 524178ae9648be66ae161598394aec26c51f3b2b17e30df1b347efc58c317c61 files/lm_sensors-2.9.2-sensors-detect-gentoo.patch 5446
 DIST lm_sensors-2.10.0.tar.gz 879631 RMD160 8bb5dd4fbb9b7fba2f60f8a8d00d7b54231ddf37 SHA1 bb45194eebfdc92cf233b7cfe24196cbad6ee721 SHA256 e2fe2c79dc1f219ae85606ad1e556edcd2e55adbabf8bb45dc3c11c00503050d
 DIST lm_sensors-2.9.2.tar.gz 860624 RMD160 1facd2f05ab31d819b12da73067952d74496fbcb SHA1 849f21d94e81dca5ff67191ef2f33b937b1aebbd SHA256 e40573335a895c88bdc040126fd6bb73199bef0169b2b88c6a1ef916c03803c7
+EBUILD lm_sensors-2.10.0-r1.ebuild 4194 RMD160 40ee158b5912e817209ba16b0afd9cf56e48cedf SHA1 feba9dd1c30aa4a3e4186b50127bf5f26937aae2 SHA256 4c051e832ab119ac0518dbcf7d38bb7c95c657d0979bf34fab386cf37ebc44c0
+MD5 564435fe2b29c49dd9128652e846bfbb lm_sensors-2.10.0-r1.ebuild 4194
+RMD160 40ee158b5912e817209ba16b0afd9cf56e48cedf lm_sensors-2.10.0-r1.ebuild 4194
+SHA256 4c051e832ab119ac0518dbcf7d38bb7c95c657d0979bf34fab386cf37ebc44c0 lm_sensors-2.10.0-r1.ebuild 4194
 EBUILD lm_sensors-2.10.0.ebuild 4189 RMD160 d910b9341cd8131234d882ce90371d2951760be2 SHA1 13df8eea5a95e63a628520d2a1355f015fbe4561 SHA256 f89d2c99b6a909a88665fbe08fe5ee36fe7637f7a47f62a80ffb37474a1e4b8e
 MD5 431548a8b937a8cbbf9c816faa1dcd5e lm_sensors-2.10.0.ebuild 4189
 RMD160 d910b9341cd8131234d882ce90371d2951760be2 lm_sensors-2.10.0.ebuild 4189
 SHA256 f89d2c99b6a909a88665fbe08fe5ee36fe7637f7a47f62a80ffb37474a1e4b8e lm_sensors-2.10.0.ebuild 4189
+EBUILD lm_sensors-2.9.2-r1.ebuild 4115 RMD160 9483f1f461d398704dbadab03c47a6d567f49b86 SHA1 bf306c34c217f9487862fbd1f6ab2ab8cdae9796 SHA256 587a31fc11b48484177b968ad296e618e247e6c609f9a398c7704b647fff9b2c
+MD5 c8177b7ba1781a680d87e461171dab2f lm_sensors-2.9.2-r1.ebuild 4115
+RMD160 9483f1f461d398704dbadab03c47a6d567f49b86 lm_sensors-2.9.2-r1.ebuild 4115
+SHA256 587a31fc11b48484177b968ad296e618e247e6c609f9a398c7704b647fff9b2c lm_sensors-2.9.2-r1.ebuild 4115
 EBUILD lm_sensors-2.9.2.ebuild 4110 RMD160 68d053bdfe85f95c3d62102708aff018f8d04301 SHA1 1038377da8b53dde9bec6c67fbe340cd6a078d8e SHA256 22d26813b22112b813d0a288a415dbac7e0877b2c2ddc0ccdb1b2f232492ce63
 MD5 7b279df7fad3b24eeb2062e2171b849e lm_sensors-2.9.2.ebuild 4110
 RMD160 68d053bdfe85f95c3d62102708aff018f8d04301 lm_sensors-2.9.2.ebuild 4110
 SHA256 22d26813b22112b813d0a288a415dbac7e0877b2c2ddc0ccdb1b2f232492ce63 lm_sensors-2.9.2.ebuild 4110
-MISC ChangeLog 1476 RMD160 8c9bc52667551c5d2b30664a76bd3db0cfe6fcdc SHA1 d77f9ad9c80b0c41e14dfaba58bb46df72c282ea SHA256 985a9a4177278f13927220a7940880b91a90e1d36a8a042c9e3d8c5f85d21a19
-MD5 41fd4ca94067dffdfbf3b2eda5bc061f ChangeLog 1476
-RMD160 8c9bc52667551c5d2b30664a76bd3db0cfe6fcdc ChangeLog 1476
-SHA256 985a9a4177278f13927220a7940880b91a90e1d36a8a042c9e3d8c5f85d21a19 ChangeLog 1476
+MISC ChangeLog 1831 RMD160 d35b7ffb1a2ad8f1a31dbe06f272fe8b9a527860 SHA1 31546f0f9fec707c5e2f36fc8bc312f66c12e41f SHA256 df7cddec08abeafcffa3657f4b4320339acac6693d5491e66891642286bd0b32
+MD5 28c2a306c11e44ff2edcddefb4e1fac5 ChangeLog 1831
+RMD160 d35b7ffb1a2ad8f1a31dbe06f272fe8b9a527860 ChangeLog 1831
+SHA256 df7cddec08abeafcffa3657f4b4320339acac6693d5491e66891642286bd0b32 ChangeLog 1831
 MISC metadata.xml 254 RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f SHA1 653c702fdb89577e9d15e9cbca3891e4acdba061 SHA256 9bffc4ff1cf574848699e33b09ff0f6137d6b64b69d82c7b95cafb32ee75becb
 MD5 f3e68295a919220f58e91a1d3468c851 metadata.xml 254
 RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f metadata.xml 254
@@ -58,13 +66,19 @@ SHA256 9bffc4ff1cf574848699e33b09ff0f6137d6b64b69d82c7b95cafb32ee75becb metadata
 MD5 c049c65d0e7a0c29752c295fdd1f1972 files/digest-lm_sensors-2.10.0 253
 RMD160 ccc9d585517326653d39c0e626af336c8cff269b files/digest-lm_sensors-2.10.0 253
 SHA256 64630ede6a432e80c2386c37675ba5463212430f53041e071957f2b20ba01a9b files/digest-lm_sensors-2.10.0 253
+MD5 c049c65d0e7a0c29752c295fdd1f1972 files/digest-lm_sensors-2.10.0-r1 253
+RMD160 ccc9d585517326653d39c0e626af336c8cff269b files/digest-lm_sensors-2.10.0-r1 253
+SHA256 64630ede6a432e80c2386c37675ba5463212430f53041e071957f2b20ba01a9b files/digest-lm_sensors-2.10.0-r1 253
 MD5 d569a1b2682fe1fe3ca977f6017f712c files/digest-lm_sensors-2.9.2 250
 RMD160 0370575f9c4aa29ef313ec05929caad61c7b7caa files/digest-lm_sensors-2.9.2 250
 SHA256 e5acc8f4b135fb18ef10fb67cf04b3aabcf000cd4358fa3cb3bd51ea743ee3a6 files/digest-lm_sensors-2.9.2 250
+MD5 d569a1b2682fe1fe3ca977f6017f712c files/digest-lm_sensors-2.9.2-r1 250
+RMD160 0370575f9c4aa29ef313ec05929caad61c7b7caa files/digest-lm_sensors-2.9.2-r1 250
+SHA256 e5acc8f4b135fb18ef10fb67cf04b3aabcf000cd4358fa3cb3bd51ea743ee3a6 files/digest-lm_sensors-2.9.2-r1 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEugOsflZ8QqxhrsMRAuAQAKCWEhdLVC06wkMDLiBfD8ERLiTkAgCffp0R
-S4sT+JRry7uaPFW3SlUb1Ls=
-=8yqZ
+iD8DBQFEugR/flZ8QqxhrsMRAvhiAJ4w+/BH7k9xfXuxYpR16cvbcmzo8wCfQht3
+lDKCh/sLXzLZv/+vL9wNOGA=
+=EqBY
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/lm_sensors/files/digest-lm_sensors-2.10.0-r1 b/sys-apps/lm_sensors/files/digest-lm_sensors-2.10.0-r1
new file mode 100644
index 000000000000..cd0598b2a998
--- /dev/null
+++ b/sys-apps/lm_sensors/files/digest-lm_sensors-2.10.0-r1
@@ -0,0 +1,3 @@
+MD5 6a5327c9e291c5e2bef62e2277bce962 lm_sensors-2.10.0.tar.gz 879631
+RMD160 8bb5dd4fbb9b7fba2f60f8a8d00d7b54231ddf37 lm_sensors-2.10.0.tar.gz 879631
+SHA256 e2fe2c79dc1f219ae85606ad1e556edcd2e55adbabf8bb45dc3c11c00503050d lm_sensors-2.10.0.tar.gz 879631
diff --git a/sys-apps/lm_sensors/files/digest-lm_sensors-2.9.2-r1 b/sys-apps/lm_sensors/files/digest-lm_sensors-2.9.2-r1
new file mode 100644
index 000000000000..48df55c1337f
--- /dev/null
+++ b/sys-apps/lm_sensors/files/digest-lm_sensors-2.9.2-r1
@@ -0,0 +1,3 @@
+MD5 229f83cfbd081d5e7bd46885efec1c72 lm_sensors-2.9.2.tar.gz 860624
+RMD160 1facd2f05ab31d819b12da73067952d74496fbcb lm_sensors-2.9.2.tar.gz 860624
+SHA256 e40573335a895c88bdc040126fd6bb73199bef0169b2b88c6a1ef916c03803c7 lm_sensors-2.9.2.tar.gz 860624
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.10.0-lm_sensors-init.d b/sys-apps/lm_sensors/files/lm_sensors-2.10.0-lm_sensors-init.d
index 78e40734b6b6..224906885d63 100644
--- a/sys-apps/lm_sensors/files/lm_sensors-2.10.0-lm_sensors-init.d
+++ b/sys-apps/lm_sensors/files/lm_sensors-2.10.0-lm_sensors-init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-2.10.0-lm_sensors-init.d,v 1.1 2006/02/15 18:40:21 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-2.10.0-lm_sensors-init.d,v 1.2 2006/07/16 09:18:36 phreak Exp $
 
 checkconfig() {
 	if [ ! -f /etc/conf.d/lm_sensors ]; then
@@ -101,5 +101,11 @@ stop() {
 			rmmod i2c-proc &> /dev/null
 			eend $?
 		fi
+
+		if [[ -e /sys/i2c || /sys/bus/i2c ]] ; then
+			ebegin "  Unloading i2c-core"
+			rmmod i2c-core &> /dev/null
+			eend $?
+		fi
 	fi
 }
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.9.2-lm_sensors-init.d b/sys-apps/lm_sensors/files/lm_sensors-2.9.2-lm_sensors-init.d
index 730b30df6c09..18bbfc781b2c 100644
--- a/sys-apps/lm_sensors/files/lm_sensors-2.9.2-lm_sensors-init.d
+++ b/sys-apps/lm_sensors/files/lm_sensors-2.9.2-lm_sensors-init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # 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/files/lm_sensors-2.9.2-lm_sensors-init.d,v 1.1 2005/09/06 21:06:02 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-2.9.2-lm_sensors-init.d,v 1.2 2006/07/16 09:18:36 phreak Exp $
 
 checkconfig() {
 	if [ ! -f /etc/conf.d/lm_sensors ]; then
@@ -101,5 +101,11 @@ stop() {
 			rmmod i2c-proc &> /dev/null
 			eend $?
 		fi
+
+		if [[ -e /sys/bus/i2c || /sys/i2c ]] ; then
+			ebegin "  Unloading i2c-core"
+			rmmod i2c-core &> /dev/null
+			eend $?
+		fi
 	fi
 }
diff --git a/sys-apps/lm_sensors/lm_sensors-2.10.0-r1.ebuild b/sys-apps/lm_sensors/lm_sensors-2.10.0-r1.ebuild
new file mode 100644
index 000000000000..88c44effb949
--- /dev/null
+++ b/sys-apps/lm_sensors/lm_sensors-2.10.0-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2006 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.0-r1.ebuild,v 1.1 2006/07/16 09:18:36 phreak Exp $
+
+inherit eutils flag-o-matic linux-info toolchain-funcs multilib
+
+DESCRIPTION="Hardware Monitoring user-space utilities"
+
+HOMEPAGE="http://www.lm-sensors.org/"
+SRC_URI="http://dl.lm-sensors.org/lm-sensors/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="sensord"
+
+COMMON="sys-fs/sysfsutils
+		sensord? ( net-analyzer/rrdtool )"
+DEPEND="${COMMON}
+		sys-apps/sed
+		ppc? ( >=virtual/linux-sources-2.5 )
+		amd64? ( >=virtual/linux-sources-2.5 )
+		x86? ( || ( >=virtual/linux-sources-2.5 sys-apps/lm_sensors-modules ) )"
+RDEPEND="${COMMON}
+		dev-lang/perl"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if 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."
+		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"
+		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"
+		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"
+		fi
+		if ! (linux_chkconfig_present I2C_CHARDEV); then
+			ewarn
+			ewarn "sensors-detect requires CONFIG_I2C_CHARDEV to be enabled for non-2.4.x kernels."
+			ewarn
+		fi
+		if ! (linux_chkconfig_present I2C); then
+			eerror
+			eerror "${P} requires CONFIG_I2C to be enabled for non-2.4.x kernels."
+			eerror
+			die "CONFIG_I2C not detected"
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-sensors-detect-gentoo.patch
+
+	if use sensord; then
+		sed -i -e 's:^# \(PROG_EXTRA\):\1:' "${S}"/Makefile
+	fi
+}
+
+src_compile()  {
+	einfo
+	einfo "You may safely ignore any errors from compilation"
+	einfo "that contain \"No such file or directory\" references."
+	einfo
+
+	filter-flags -fstack-protector
+
+	emake CC=$(tc-getCC) LINUX=${KV_DIR} I2C_HEADERS=${KV_DIR}/include user \
+		|| die "emake user failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man LIBDIR=/usr/$(get_libdir) \
+		KERNELINCLUDEFILES="" user_install || die "emake user_install failed"
+
+	newinitd "${FILESDIR}"/${P}-lm_sensors-init.d lm_sensors
+	newinitd "${FILESDIR}"/${P}-fancontrol-init.d fancontrol
+
+	if use sensord; then
+		newconfd "${FILESDIR}"/${P}-sensord-conf.d sensord
+		newinitd "${FILESDIR}"/${P}-sensord-init.d sensord
+	fi
+
+	dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS INSTALL QUICKSTART \
+		README* TODO
+
+	dodoc doc/cvs doc/donations doc/fancontrol.txt doc/fan-divisors doc/FAQ \
+		doc/progs doc/temperature-sensors doc/vid
+
+	dohtml doc/lm_sensors-FAQ.html doc/useful_addresses.html
+
+	docinto busses
+	dodoc doc/busses/*
+
+	docinto chips
+	dodoc doc/chips/*
+
+	docinto developers
+	dodoc doc/developers/applications doc/developers/design \
+		doc/developers/new_drivers doc/developers/proc \
+		doc/developers/sysctl doc/developers/sysfs-interface
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Next you need to run:"
+	einfo "  /usr/sbin/sensors-detect"
+	einfo "to detect the I2C hardware of your system and create the file:"
+	einfo "  /etc/conf.d/lm_sensors"
+	einfo
+	einfo "You will also need to run the above command if you're upgrading from"
+	einfo "<=${PN}-2.9.0, as the needed entries in /etc/conf.d/lm_sensors has"
+	einfo "changed."
+	einfo
+	einfo "Be warned, the probing of hardware in your system performed by"
+	einfo "sensors-detect could freeze your system. Also make sure you read"
+	einfo "the documentation before running lm_sensors on IBM ThinkPads."
+	einfo
+	einfo "Please see the lm_sensors documentation and website for more information."
+	einfo
+}
diff --git a/sys-apps/lm_sensors/lm_sensors-2.9.2-r1.ebuild b/sys-apps/lm_sensors/lm_sensors-2.9.2-r1.ebuild
new file mode 100644
index 000000000000..cabe1143aec7
--- /dev/null
+++ b/sys-apps/lm_sensors/lm_sensors-2.9.2-r1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2006 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-r1.ebuild,v 1.1 2006/07/16 09:18:36 phreak Exp $
+
+inherit eutils flag-o-matic linux-info toolchain-funcs multilib
+
+DESCRIPTION="Hardware Monitoring user-space utilities"
+
+HOMEPAGE="http://www.lm-sensors.org/"
+SRC_URI="http://dl.lm-sensors.org/lm-sensors/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="sensord"
+
+COMMON="sensord? ( net-analyzer/rrdtool )"
+DEPEND="${COMMON}
+		sys-apps/sed
+		ppc? ( >=virtual/linux-sources-2.5 )
+		amd64? ( >=virtual/linux-sources-2.5 )
+		x86? ( || ( >=virtual/linux-sources-2.5 sys-apps/lm_sensors-modules ) )"
+RDEPEND="${COMMON}
+		dev-lang/perl"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if 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."
+		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"
+		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"
+		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"
+		fi
+		if ! (linux_chkconfig_present I2C_CHARDEV); then
+			ewarn
+			ewarn "sensors-detect requires CONFIG_I2C_CHARDEV to be enabled for non-2.4.x kernels."
+			ewarn
+		fi
+		if ! (linux_chkconfig_present I2C); then
+			eerror
+			eerror "${P} requires CONFIG_I2C to be enabled for non-2.4.x kernels."
+			eerror
+			die "CONFIG_I2C not detected"
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-sensors-detect-gentoo.patch
+
+	if use sensord; then
+		sed -i -e 's:^# \(PROG_EXTRA\):\1:' "${S}"/Makefile
+	fi
+}
+
+src_compile()  {
+	einfo
+	einfo "You may safely ignore any errors from compilation"
+	einfo "that contain \"No such file or directory\" references."
+	einfo
+
+	filter-flags -fstack-protector
+
+	emake CC=$(tc-getCC) LINUX=${KV_DIR} I2C_HEADERS=${KV_DIR}/include user \
+		|| die "emake user failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man LIBDIR=/usr/$(get_libdir) \
+		KERNELINCLUDEFILES="" user_install || die "emake user_install failed"
+
+	newinitd "${FILESDIR}"/${P}-lm_sensors-init.d lm_sensors
+
+	if use sensord; then
+		newconfd "${FILESDIR}"/${P}-sensord-conf.d sensord
+		newinitd "${FILESDIR}"/${P}-sensord-init.d sensord
+	fi
+
+	dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS INSTALL QUICKSTART \
+		README* TODO
+
+	dodoc doc/cvs doc/donations doc/fancontrol.txt doc/fan-divisors doc/FAQ \
+		doc/progs doc/temperature-sensors doc/vid
+
+	dohtml doc/lm_sensors-FAQ.html doc/useful_addresses.html
+
+	docinto busses
+	dodoc doc/busses/*
+
+	docinto chips
+	dodoc doc/chips/*
+
+	docinto developers
+	dodoc doc/developers/applications doc/developers/design \
+		doc/developers/new_drivers doc/developers/proc \
+		doc/developers/sysctl doc/developers/sysfs-interface
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Next you need to run:"
+	einfo "  /usr/sbin/sensors-detect"
+	einfo "to detect the I2C hardware of your system and create the file:"
+	einfo "  /etc/conf.d/lm_sensors"
+	einfo
+	einfo "You will also need to run the above command if you're upgrading from"
+	einfo "<=${PN}-2.9.0, as the needed entries in /etc/conf.d/lm_sensors has"
+	einfo "changed."
+	einfo
+	einfo "Be warned, the probing of hardware in your system performed by"
+	einfo "sensors-detect could freeze your system. Also make sure you read"
+	einfo "the documentation before running lm_sensors on IBM ThinkPads."
+	einfo
+	einfo "Please see the lm_sensors documentation and website for more information."
+	einfo
+}