summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThilo Bangert <bangert@gentoo.org>2010-01-19 10:47:57 +0000
committerThilo Bangert <bangert@gentoo.org>2010-01-19 10:47:57 +0000
commita44ab06d68221cb27a72f94b482a4a9f68877fe6 (patch)
tree6713fa2313c83032148121a32a0dc21d13793e4c /sys-apps/lm_sensors
parentKeyword ~amd64-linux/~x86-linux (diff)
downloadhistorical-a44ab06d68221cb27a72f94b482a4a9f68877fe6.tar.gz
historical-a44ab06d68221cb27a72f94b482a4a9f68877fe6.tar.bz2
historical-a44ab06d68221cb27a72f94b482a4a9f68877fe6.zip
fix building with newer kernels (#282261)
Package-Manager: portage-2.2_rc61/cvs/Linux i686
Diffstat (limited to 'sys-apps/lm_sensors')
-rw-r--r--sys-apps/lm_sensors/ChangeLog8
-rw-r--r--sys-apps/lm_sensors/Manifest6
-rw-r--r--sys-apps/lm_sensors/lm_sensors-2.10.7.ebuild16
-rw-r--r--sys-apps/lm_sensors/lm_sensors-2.10.8.ebuild14
4 files changed, 28 insertions, 16 deletions
diff --git a/sys-apps/lm_sensors/ChangeLog b/sys-apps/lm_sensors/ChangeLog
index efd15a9db4a0..be8fb5a8a1cf 100644
--- a/sys-apps/lm_sensors/ChangeLog
+++ b/sys-apps/lm_sensors/ChangeLog
@@ -1,6 +1,10 @@
# 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.96 2009/11/29 13:13:08 bangert Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.97 2010/01/19 10:47:57 bangert Exp $
+
+ 19 Jan 2010; Thilo Bangert <bangert@gentoo.org> lm_sensors-2.10.7.ebuild,
+ lm_sensors-2.10.8.ebuild:
+ fix building with newer kernels (#282261)
29 Nov 2009; Thilo Bangert <bangert@gentoo.org> lm_sensors-3.1.1.ebuild,
+files/sensord-3-init.d:
diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest
index 19f7d4b0e8dd..798efbc52986 100644
--- a/sys-apps/lm_sensors/Manifest
+++ b/sys-apps/lm_sensors/Manifest
@@ -14,10 +14,10 @@ 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
DIST lm_sensors-3.1.1.tar.bz2 154551 RMD160 7a333f42f598ee8366f70157037c63ebb5b33387 SHA1 8be15806d229305491f11b77c67496074480faf4 SHA256 d95a3f2a6526f4da2ae145b7bbf45d16f0fb17bfe0d2017c7e02964199d059ef
-EBUILD lm_sensors-2.10.7.ebuild 4633 RMD160 ab45f72e19b4987e186fe7ba2597baffe3a0b728 SHA1 7de1669247a46fb08d460dd12a3a2352a30f39c8 SHA256 690ecd5b4983b116d037883cdc562a79ea3d34c9856850e0ce50950ad84abb54
-EBUILD lm_sensors-2.10.8.ebuild 5041 RMD160 a6831e5789153b86867c8ea48c146be09d022c0e SHA1 af641c54b3b0c8ad770732ce225b44b3599f861c SHA256 6895ebb757a4b571e49295e960e211699d22a2dd3d69f7928fb88dfa30953d7a
+EBUILD lm_sensors-2.10.7.ebuild 4725 RMD160 653c3674909c028926a89768030737f56fa0cfab SHA1 17c1236e1610b1735920534e728936e3eda930ae SHA256 6d8063d8151e14b150f6b4d0a90652f74b1b46bb39b56f6018f1a4d48881b347
+EBUILD lm_sensors-2.10.8.ebuild 5158 RMD160 58308d899c93750856b3fd63f5773ed8e28ddc65 SHA1 a2b1d650c90d3522c88424e22d2b447e3335eb9d SHA256 597815e327dea2741da64920b76a6b579ef6c631b85978647a2e2fe78bbff5b7
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
EBUILD lm_sensors-3.1.1.ebuild 3145 RMD160 faec436cbc7bbc901c90dca840fa2a5d11429ea6 SHA1 5a5b2b8bfe04f7051bac4017d1b07014ea5dbe54 SHA256 b8ba651158d5dc6e337be97a31b43a54f21ffac2434c87fd4974a710be2dc800
-MISC ChangeLog 11118 RMD160 b20fcbd0d53502d5609dec671af1d07d3bc727bd SHA1 470b297df812e618112e067c227b0dd3cac14438 SHA256 8e539bde4b89a36c79d5e8be8453f8c7a54d7d4d4036f6a3dcd209475f6b0b91
+MISC ChangeLog 11267 RMD160 0da6bf048390a8083792e6291356a8c6c08db68b SHA1 19461f548e4381a47da7dd6b78a729bb18f7973f SHA256 72a0d792286d22b28c78166e7106ca2f40111210f7de38450598e4e4ff117311
MISC metadata.xml 328 RMD160 102d79ccb2dfd783b5d5baf50f5ac633d915f712 SHA1 b19178b1ba16d245cd04ea70c9532ee8dc37097c SHA256 aa83681ad6865347f45c3911d408b253ab27e43bf0e3f0e58624a2b4958b425b
diff --git a/sys-apps/lm_sensors/lm_sensors-2.10.7.ebuild b/sys-apps/lm_sensors/lm_sensors-2.10.7.ebuild
index 9512aa7def44..9a6298978cfb 100644
--- a/sys-apps/lm_sensors/lm_sensors-2.10.7.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-2.10.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 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.7.ebuild,v 1.5 2008/10/18 18:07:40 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.10.7.ebuild,v 1.6 2010/01/19 10:47:57 bangert Exp $
inherit eutils flag-o-matic linux-info toolchain-funcs multilib
@@ -91,9 +91,13 @@ src_compile() {
einfo
filter-flags -fstack-protector
-
- emake CC=$(tc-getCC) LINUX=${KV_DIR} I2C_HEADERS=${KV_DIR}/include user \
- || die "emake user failed"
+ if kernel_is lt 2 6 31; then
+ emake CC=$(tc-getCC) LINUX=${KV_DIR} I2C_HEADERS=${KV_DIR}/include user \
+ || die "emake user failed"
+ else
+ emake CC=$(tc-getCC) LINUX=${KV_DIR} user \
+ || die "emake user failed"
+ fi
}
src_install() {
@@ -114,7 +118,7 @@ src_install() {
dodoc 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
+ dohtml doc/lm_sensors-FAQ.html
docinto busses
dodoc doc/busses/*
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 2bf8f2c608ee..cb8563cc1ab0 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
+# Copyright 1999-2010 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.2 2009/10/17 01:18:04 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.10.8.ebuild,v 1.3 2010/01/19 10:47:57 bangert Exp $
inherit eutils flag-o-matic linux-info toolchain-funcs multilib
@@ -100,9 +100,13 @@ src_compile() {
einfo
filter-flags -fstack-protector
-
- emake CC=$(tc-getCC) LINUX=${KV_DIR} I2C_HEADERS=${KV_DIR}/include user \
- || die "emake user failed"
+ if kernel_is lt 2 6 31; then
+ emake CC=$(tc-getCC) LINUX=${KV_DIR} I2C_HEADERS=${KV_DIR}/include user \
+ || die "emake user failed"
+ else
+ emake CC=$(tc-getCC) LINUX=${KV_DIR} user \
+ || die "emake user failed"
+ fi
}
src_install() {