| 1 |
commit: 50241131ba628cbf7a393e710cfae7c25a44cf49 |
| 2 |
Author: Donnie Berkholz <dberkholz <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 26 01:05:17 2011 +0000 |
| 4 |
Commit: Donnie Berkholz <dberkholz <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 26 14:03:04 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dberkholz.git;a=commit;h=50241131 |
| 7 |
|
| 8 |
tp_smapi: Whitelist X120e and T520 so thinkpad_ec will load. |
| 9 |
|
| 10 |
--- |
| 11 |
app-laptop/tp_smapi/ChangeLog | 59 +++++++++++++++++++- |
| 12 |
app-laptop/tp_smapi/Manifest | 14 ++-- |
| 13 |
app-laptop/tp_smapi/files/0.33-remove-cdev.patch | 19 ------ |
| 14 |
.../0.40-add-x120e-and-t520-to-whitelist.patch | 12 ++++ |
| 15 |
app-laptop/tp_smapi/files/fix_header_check.patch | 19 ++++++ |
| 16 |
.../tp_smapi/files/tp_smapi-0.40-2.6.37.patch | 30 ++++++++++ |
| 17 |
app-laptop/tp_smapi/metadata.xml | 9 +-- |
| 18 |
app-laptop/tp_smapi/tp_smapi-0.36.ebuild | 57 ------------------- |
| 19 |
...p_smapi-0.37.ebuild => tp_smapi-0.40-r2.ebuild} | 41 ++++++------- |
| 20 |
9 files changed, 148 insertions(+), 112 deletions(-) |
| 21 |
|
| 22 |
diff --git a/app-laptop/tp_smapi/ChangeLog b/app-laptop/tp_smapi/ChangeLog |
| 23 |
index 7c7b3c9..58f5872 100644 |
| 24 |
--- a/app-laptop/tp_smapi/ChangeLog |
| 25 |
+++ b/app-laptop/tp_smapi/ChangeLog |
| 26 |
@@ -1,6 +1,61 @@ |
| 27 |
# ChangeLog for app-laptop/tp_smapi |
| 28 |
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tp_smapi/ChangeLog,v 1.23 2007/12/31 18:30:43 welp Exp $ |
| 30 |
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 31 |
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/tp_smapi/ChangeLog,v 1.38 2011/05/20 11:20:42 tomka Exp $ |
| 32 |
+ |
| 33 |
+ 20 May 2011; Thomas Kahle <tomka@g.o> tp_smapi-0.40-r1.ebuild: |
| 34 |
+ x86 stable per bug 365559 |
| 35 |
+ |
| 36 |
+ 04 May 2011; Markos Chandras <hwoarang@g.o> tp_smapi-0.40-r1.ebuild: |
| 37 |
+ Stable on amd64 wrt bug #342239 |
| 38 |
+ |
| 39 |
+ 02 Apr 2011; Alexey Shvetsov <alexxy@g.o> tp_smapi-0.40-r1.ebuild: |
| 40 |
+ Fix bug #348751 |
| 41 |
+ |
| 42 |
+*tp_smapi-0.40-r1 (29 Nov 2010) |
| 43 |
+ |
| 44 |
+ 29 Nov 2010; Alexey Shvetsov <alexxy@g.o> +tp_smapi-0.40-r1.ebuild, |
| 45 |
+ +files/tp_smapi-0.40-2.6.37.patch, +files/fix_header_check.patch: |
| 46 |
+ Fix bugs #294251 #346493 |
| 47 |
+ |
| 48 |
+ 01 Dec 2009; Christian Faulhammer <fauli@g.o> tp_smapi-0.40.ebuild: |
| 49 |
+ stable x86, bug 289124 |
| 50 |
+ |
| 51 |
+ 25 Oct 2009; Torsten Veller <tove@g.o> metadata.xml: |
| 52 |
+ Remove welp from metadata.xml (#141007) |
| 53 |
+ |
| 54 |
+ 06 Sep 2009; Robin H. Johnson <robbat2@g.o> tp_smapi-0.37.ebuild, |
| 55 |
+ tp_smapi-0.39.ebuild, tp_smapi-0.40.ebuild: |
| 56 |
+ Cleaning up for linux-info work: inherit linux-mod implies inherit |
| 57 |
+ linux-info. |
| 58 |
+ |
| 59 |
+ 08 Jul 2009; Markus Meier <maekke@g.o> tp_smapi-0.40.ebuild: |
| 60 |
+ amd64 stable, bug #274086 |
| 61 |
+ |
| 62 |
+*tp_smapi-0.40 (25 Mar 2009) |
| 63 |
+ |
| 64 |
+ 25 Mar 2009; Patrick McLean <chutzpah@g.o> +tp_smapi-0.40.ebuild: |
| 65 |
+ Version bump (bug #254043). Use updated ebuild provided by Anton Bolshakov |
| 66 |
+ <anton.bugs@×××××.com>. |
| 67 |
+ |
| 68 |
+*tp_smapi-0.39 (20 Oct 2008) |
| 69 |
+ |
| 70 |
+ 20 Oct 2008; <welp@g.o> +tp_smapi-0.39.ebuild: |
| 71 |
+ Bump to 0.39; Bug 239033 |
| 72 |
+ |
| 73 |
+ 22 Sep 2008; Hanno Boeck <hanno@g.o> |
| 74 |
+ +files/thinkpad_ec_semaphore.patch, tp_smapi-0.37.ebuild: |
| 75 |
+ Add support for 2.6.27. |
| 76 |
+ |
| 77 |
+ 31 Jul 2008; Ulrich Mueller <ulm@g.o> metadata.xml: |
| 78 |
+ Add USE flag description to metadata wrt GLEP 56. |
| 79 |
+ |
| 80 |
+ 31 Mar 2008; Peter Weller <welp@g.o> tp_smapi-0.37.ebuild: |
| 81 |
+ s/linux_info-pkg-setup/linux-info_pkg_setup/ |
| 82 |
+ |
| 83 |
+*tp_smapi-0.37 (30 Mar 2008) |
| 84 |
+ |
| 85 |
+ 30 Mar 2008; Peter Weller <welp@g.o> +tp_smapi-0.37.ebuild: |
| 86 |
+ Bump; bugs 141565 and 208627 |
| 87 |
|
| 88 |
*tp_smapi-0.33 (31 Dec 2007) |
| 89 |
|
| 90 |
|
| 91 |
diff --git a/app-laptop/tp_smapi/Manifest b/app-laptop/tp_smapi/Manifest |
| 92 |
index 9082a9a..340bc26 100644 |
| 93 |
--- a/app-laptop/tp_smapi/Manifest |
| 94 |
+++ b/app-laptop/tp_smapi/Manifest |
| 95 |
@@ -1,7 +1,7 @@ |
| 96 |
-AUX 0.33-remove-cdev.patch 871 RMD160 aa03041890a2ff70587fd6db4d89076fda4f6699 SHA1 577f8e793fb5a25c74ea4b4991e571d6f7cc90e9 SHA256 ebd1531b3a99af67a95180a1d2f5b8d7c17129999ef4626da86c662ee9f1d702 |
| 97 |
-DIST tp_smapi-0.36.tgz 37597 RMD160 627e49fb5389af1613f3be423140a40c7776d84c SHA1 a44c346a6ca3954563f733465ed02052ba72fcc2 SHA256 ed70f240f56206493f699478d1a0b392eb7230cc1f0ecb57b1103d6cabe1e113 |
| 98 |
-DIST tp_smapi-0.37.tgz 38261 RMD160 003d575a83351060703f8f8c5dd096f5c2f6173b SHA1 cebc7c0912aac997b99ecbd81b2afeb6ee7c0876 SHA256 2455a12c0c7a7e1cc36ff47a6f92036e11da87f10caef86a206688498b4d1fb5 |
| 99 |
-EBUILD tp_smapi-0.36.ebuild 1213 RMD160 c90686f2662d11e7ca4c628d80c3eb7049dad695 SHA1 9367db9fc0ad90de90e1727646df57eee65ce88e SHA256 39313f39320f42ca1fff354aaa65e5a4a48270af1319df8256c96d7dd062b9e9 |
| 100 |
-EBUILD tp_smapi-0.37.ebuild 1470 RMD160 e91401eb15d43447ecf6685ee11beb67e8cce300 SHA1 bbfed199587a4046b2096e9d49a96bb3173e2209 SHA256 c3a5350c101eb6b15e118f869c03504201ed05b74e07d3fab203cea78edc95ac |
| 101 |
-MISC ChangeLog 2948 RMD160 25dca704075bb5b7183220bdf7c4c7412b7559f3 SHA1 7df385e3ff69efb387e463c6ca009b42fb81c710 SHA256 04f62e34a0f540c9a7224f076b5b29fb0ff77fe4940cf879b99633eda70db4bb |
| 102 |
-MISC metadata.xml 247 RMD160 b3f1fa5b78abd67407da3071742319c07697ef8f SHA1 f44979eefe1314886e71e3796ecc964f2f86ef62 SHA256 7cb16124facba1f3e602873bd816878fa6f052500dd007e308c187f916e7e01f |
| 103 |
+AUX 0.40-add-x120e-and-t520-to-whitelist.patch 523 RMD160 248746f18ff43ebb199be9c43ae88d6260518cb1 SHA1 1622a683b14e02f2d2c1e5da263ff56e1fe0436a SHA256 304be734d3b14faa9bb80720454e158959554539c09908f89c81ae7dc5f06308 |
| 104 |
+AUX fix_header_check.patch 701 RMD160 c1a79ee4d8501831b3f7522848f979993be5eb8d SHA1 17941fc5583c4740618627d4c1c925e6217dcedd SHA256 5cfc979ac6f9f3f1fb94625b3bf3a31fc6132d3ad8670d38cff2b2116400015c |
| 105 |
+AUX tp_smapi-0.40-2.6.37.patch 1181 RMD160 602ba1598ee7175abfda516fe61ab96b80e2691e SHA1 ed3fbf2e06def4572e8dd2b9ee16e6aac8f500ed SHA256 b36523686dd1710ee8dae2b9ba6598572afe0d564c2278a7105a0fa27fe3d4d5 |
| 106 |
+DIST tp_smapi-0.40.tgz 39002 RMD160 8b564396afe6255476e73c9c78bd47294eeb8d53 SHA1 bc1bd1c6558d1972501e816308234d48ac530fc6 SHA256 ccb0965684cad076160750f2ac380f99373fa73f0bcc1091ffce2492f56349ab |
| 107 |
+EBUILD tp_smapi-0.40-r2.ebuild 1566 RMD160 43bfabf20c6cd68efc65a9a8d05cd627e502c330 SHA1 e5aea170c7a72641d3c1e3240627e4edc03cc1da SHA256 d8692ab3654567fdf0d8beaac9ca411fd8d082c5f35e6c970fdf1e4cd28ff363 |
| 108 |
+MISC ChangeLog 4793 RMD160 6dd3e2c030353a0825bddf8a05df82b8694a8287 SHA1 be3cc29fb45bbccc310200b87d5eaeca665b201f SHA256 e0f40126b37889170c857e209219814804c37e00660614ae888c8582ff852272 |
| 109 |
+MISC metadata.xml 242 RMD160 ae266e9b31780c5bf3de48ff64cb377c484be043 SHA1 1e42ee4142d75d4d5a98ebe944b225178ec57680 SHA256 c4b5ad1432ce813ea0f307e9ff1c1bad05cc4aed39c0344be243259400a45372 |
| 110 |
|
| 111 |
diff --git a/app-laptop/tp_smapi/files/0.33-remove-cdev.patch b/app-laptop/tp_smapi/files/0.33-remove-cdev.patch |
| 112 |
deleted file mode 100644 |
| 113 |
index 69445e6..0000000 |
| 114 |
--- a/app-laptop/tp_smapi/files/0.33-remove-cdev.patch |
| 115 |
+++ /dev/null |
| 116 |
@@ -1,19 +0,0 @@ |
| 117 |
-diff -urN tp_smapi-0.33.orig/hdaps.c tp_smapi-0.33/hdaps.c |
| 118 |
---- tp_smapi-0.33.orig/hdaps.c 2008-03-12 00:42:20.000000000 -0700 |
| 119 |
-+++ tp_smapi-0.33/hdaps.c 2008-03-12 00:43:30.000000000 -0700 |
| 120 |
-@@ -827,7 +827,6 @@ |
| 121 |
- hdaps_idev->id.vendor = HDAPS_INPUT_VENDOR; |
| 122 |
- hdaps_idev->id.product = HDAPS_INPUT_PRODUCT; |
| 123 |
- hdaps_idev->id.version = HDAPS_INPUT_JS_VERSION; |
| 124 |
-- hdaps_idev->cdev.dev = &pdev->dev; |
| 125 |
- hdaps_idev->evbit[0] = BIT(EV_ABS); |
| 126 |
- hdaps_idev->open = hdaps_mousedev_open; |
| 127 |
- hdaps_idev->close = hdaps_mousedev_close; |
| 128 |
-@@ -847,7 +846,6 @@ |
| 129 |
- hdaps_idev_raw->id.vendor = HDAPS_INPUT_VENDOR; |
| 130 |
- hdaps_idev_raw->id.product = HDAPS_INPUT_PRODUCT; |
| 131 |
- hdaps_idev_raw->id.version = HDAPS_INPUT_RAW_VERSION; |
| 132 |
-- hdaps_idev_raw->cdev.dev = &pdev->dev; |
| 133 |
- hdaps_idev_raw->evbit[0] = BIT(EV_ABS); |
| 134 |
- hdaps_idev_raw->open = hdaps_mousedev_open; |
| 135 |
- hdaps_idev_raw->close = hdaps_mousedev_close; |
| 136 |
|
| 137 |
diff --git a/app-laptop/tp_smapi/files/0.40-add-x120e-and-t520-to-whitelist.patch b/app-laptop/tp_smapi/files/0.40-add-x120e-and-t520-to-whitelist.patch |
| 138 |
new file mode 100644 |
| 139 |
index 0000000..6e0c8d9 |
| 140 |
--- /dev/null |
| 141 |
+++ b/app-laptop/tp_smapi/files/0.40-add-x120e-and-t520-to-whitelist.patch |
| 142 |
@@ -0,0 +1,12 @@ |
| 143 |
+diff -ur tp_smapi-0.40.orig//thinkpad_ec.c tp_smapi-0.40//thinkpad_ec.c |
| 144 |
+--- tp_smapi-0.40.orig//thinkpad_ec.c 2011-05-25 20:01:04.623516726 -0500 |
| 145 |
++++ tp_smapi-0.40//thinkpad_ec.c 2011-05-25 20:02:01.303273850 -0500 |
| 146 |
+@@ -456,6 +456,8 @@ |
| 147 |
+ TP_DMI_MATCH("IBM", "ThinkPad A30"), |
| 148 |
+ TP_DMI_MATCH("IBM", "ThinkPad T23"), |
| 149 |
+ TP_DMI_MATCH("IBM", "ThinkPad X24"), |
| 150 |
++ TP_DMI_MATCH("LENOVO", "ThinkPad X120e"), |
| 151 |
++ TP_DMI_MATCH("LENOVO", "ThinkPad T520"), |
| 152 |
+ { .ident = NULL } |
| 153 |
+ }; |
| 154 |
+ return dmi_find_substring(DMI_DEV_TYPE_OEM_STRING, |
| 155 |
|
| 156 |
diff --git a/app-laptop/tp_smapi/files/fix_header_check.patch b/app-laptop/tp_smapi/files/fix_header_check.patch |
| 157 |
new file mode 100644 |
| 158 |
index 0000000..97b6569 |
| 159 |
--- /dev/null |
| 160 |
+++ b/app-laptop/tp_smapi/files/fix_header_check.patch |
| 161 |
@@ -0,0 +1,19 @@ |
| 162 |
+*** Makefile.orig Mon Nov 23 08:55:42 2009 |
| 163 |
+--- Makefile Mon Nov 23 08:57:48 2009 |
| 164 |
+*************** |
| 165 |
+*** 27,33 **** |
| 166 |
+ |
| 167 |
+ DEBUG := 0 |
| 168 |
+ |
| 169 |
+! ifneq ($(shell [ -f $(KBUILD)/include/linux/aio_abi.h ] && echo 1),1) |
| 170 |
+ $(warning Building tp_smapi requires Linux kernel 2.6.19 or newer, and matching kernel headers.) |
| 171 |
+ $(warning You may need to override the following Make variables:) |
| 172 |
+ $(warning . KVER=$(KVER)) |
| 173 |
+--- 27,33 ---- |
| 174 |
+ |
| 175 |
+ DEBUG := 0 |
| 176 |
+ |
| 177 |
+! ifneq ($(shell [ -f $(KSRC)/include/linux/aio_abi.h ] && echo 1),1) |
| 178 |
+ $(warning Building tp_smapi requires Linux kernel 2.6.19 or newer, and matching kernel headers.) |
| 179 |
+ $(warning You may need to override the following Make variables:) |
| 180 |
+ $(warning . KVER=$(KVER)) |
| 181 |
|
| 182 |
diff --git a/app-laptop/tp_smapi/files/tp_smapi-0.40-2.6.37.patch b/app-laptop/tp_smapi/files/tp_smapi-0.40-2.6.37.patch |
| 183 |
new file mode 100644 |
| 184 |
index 0000000..60f0599 |
| 185 |
--- /dev/null |
| 186 |
+++ b/app-laptop/tp_smapi/files/tp_smapi-0.40-2.6.37.patch |
| 187 |
@@ -0,0 +1,30 @@ |
| 188 |
+diff -urN tp_smapi-0.40.orig/thinkpad_ec.c tp_smapi-0.40/thinkpad_ec.c |
| 189 |
+--- tp_smapi-0.40.orig/thinkpad_ec.c 2008-12-16 08:03:06.000000000 +0300 |
| 190 |
++++ tp_smapi-0.40/thinkpad_ec.c 2010-11-22 18:16:54.000000000 +0300 |
| 191 |
+@@ -88,7 +88,11 @@ |
| 192 |
+ #define TPC_PREFETCH_JUNK (INITIAL_JIFFIES+1) /* Ignore prefetch */ |
| 193 |
+ |
| 194 |
+ /* Locking: */ |
| 195 |
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) |
| 196 |
+ static DECLARE_MUTEX(thinkpad_ec_mutex); |
| 197 |
++#else |
| 198 |
++static DEFINE_SEMAPHORE(thinkpad_ec_mutex); |
| 199 |
++#endif |
| 200 |
+ |
| 201 |
+ /* Kludge in case the ACPI DSDT reserves the ports we need. */ |
| 202 |
+ static int force_io; /* Willing to do IO to ports we couldn't reserve? */ |
| 203 |
+diff -urN tp_smapi-0.40.orig/tp_smapi.c tp_smapi-0.40/tp_smapi.c |
| 204 |
+--- tp_smapi-0.40.orig/tp_smapi.c 2008-12-16 08:03:06.000000000 +0300 |
| 205 |
++++ tp_smapi-0.40/tp_smapi.c 2010-11-22 18:17:29.000000000 +0300 |
| 206 |
+@@ -109,7 +109,11 @@ |
| 207 |
+ #define SMAPI_PORT2 0x4F /* fixed port, meaning unclear */ |
| 208 |
+ static unsigned short smapi_port; /* APM control port, normally 0xB2 */ |
| 209 |
+ |
| 210 |
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) |
| 211 |
+ static DECLARE_MUTEX(smapi_mutex); |
| 212 |
++#else |
| 213 |
++static DEFINE_SEMAPHORE(smapi_mutex); |
| 214 |
++#endif |
| 215 |
+ |
| 216 |
+ /** |
| 217 |
+ * find_smapi_port - read SMAPI port from NVRAM |
| 218 |
|
| 219 |
diff --git a/app-laptop/tp_smapi/metadata.xml b/app-laptop/tp_smapi/metadata.xml |
| 220 |
index d391ed0..b2d0e4c 100644 |
| 221 |
--- a/app-laptop/tp_smapi/metadata.xml |
| 222 |
+++ b/app-laptop/tp_smapi/metadata.xml |
| 223 |
@@ -1,9 +1,8 @@ |
| 224 |
<?xml version="1.0" encoding="UTF-8"?> |
| 225 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 226 |
<pkgmetadata> |
| 227 |
-<herd>mobile</herd> |
| 228 |
-<maintainer> |
| 229 |
- <email>welp@g.o</email> |
| 230 |
- <name>Peter Weller</name> |
| 231 |
-</maintainer> |
| 232 |
+ <herd>mobile</herd> |
| 233 |
+ <use> |
| 234 |
+ <flag name="hdaps">Install a compatible HDAPS module</flag> |
| 235 |
+ </use> |
| 236 |
</pkgmetadata> |
| 237 |
|
| 238 |
diff --git a/app-laptop/tp_smapi/tp_smapi-0.36.ebuild b/app-laptop/tp_smapi/tp_smapi-0.36.ebuild |
| 239 |
deleted file mode 100644 |
| 240 |
index b2decff..0000000 |
| 241 |
--- a/app-laptop/tp_smapi/tp_smapi-0.36.ebuild |
| 242 |
+++ /dev/null |
| 243 |
@@ -1,57 +0,0 @@ |
| 244 |
-# Copyright 1999-2007 Gentoo Foundation |
| 245 |
-# Distributed under the terms of the GNU General Public License v2 |
| 246 |
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tp_smapi/tp_smapi-0.33.ebuild,v 1.1 2007/12/31 18:30:43 welp Exp $ |
| 247 |
- |
| 248 |
-inherit linux-mod |
| 249 |
- |
| 250 |
-DESCRIPTION="IBM ThinkPad SMAPI BIOS driver" |
| 251 |
-HOMEPAGE="http://tpctl.sourceforge.net/" |
| 252 |
-SRC_URI="mirror://sourceforge/tpctl/${P}.tgz" |
| 253 |
- |
| 254 |
-LICENSE="GPL-2" |
| 255 |
-SLOT="0" |
| 256 |
-KEYWORDS="~amd64 ~x86" |
| 257 |
- |
| 258 |
-IUSE="hdaps" |
| 259 |
- |
| 260 |
-RESTRICT="userpriv" |
| 261 |
- |
| 262 |
-# We need dmideode if the kernel does not support DMI_DEV_TYPE_OEM_STRING |
| 263 |
-# in dmi.h |
| 264 |
-DEPEND="sys-apps/dmidecode" |
| 265 |
- |
| 266 |
-pkg_setup() { |
| 267 |
- linux-mod_pkg_setup |
| 268 |
- |
| 269 |
- if kernel_is lt 2 6 19; then |
| 270 |
- eerror |
| 271 |
- eerror "${P} requires Linux kernel 2.6.19 or above." |
| 272 |
- eerror |
| 273 |
- die "Unsupported kernel version" |
| 274 |
- fi |
| 275 |
- |
| 276 |
- MODULE_NAMES="thinkpad_ec(extra:) tp_smapi(extra:)" |
| 277 |
- BUILD_PARAMS="KSRC=${KV_DIR} KBUILD=${KV_DIR}" |
| 278 |
- BUILD_TARGETS="default" |
| 279 |
- |
| 280 |
- if use hdaps; then |
| 281 |
- MODULE_NAMES="${MODULE_NAMES} hdaps(extra:)" |
| 282 |
- BUILD_PARAMS="${BUILD_PARAMS} HDAPS=1" |
| 283 |
- fi |
| 284 |
-} |
| 285 |
- |
| 286 |
-src_unpack() { |
| 287 |
- unpack ${A} |
| 288 |
- cd "${S}" |
| 289 |
- |
| 290 |
- epatch "${FILESDIR}"/0.33-remove-cdev.patch |
| 291 |
- |
| 292 |
- # Remove usage of `sudo` in Makefile. |
| 293 |
- sed -i 's,sudo ,,' Makefile |
| 294 |
-} |
| 295 |
- |
| 296 |
-src_install() { |
| 297 |
- linux-mod_src_install |
| 298 |
- |
| 299 |
- dodoc CHANGES README |
| 300 |
-} |
| 301 |
|
| 302 |
diff --git a/app-laptop/tp_smapi/tp_smapi-0.37.ebuild b/app-laptop/tp_smapi/tp_smapi-0.40-r2.ebuild |
| 303 |
similarity index 57% |
| 304 |
rename from app-laptop/tp_smapi/tp_smapi-0.37.ebuild |
| 305 |
rename to app-laptop/tp_smapi/tp_smapi-0.40-r2.ebuild |
| 306 |
index 468c9f2..226f2c2 100644 |
| 307 |
--- a/app-laptop/tp_smapi/tp_smapi-0.37.ebuild |
| 308 |
+++ b/app-laptop/tp_smapi/tp_smapi-0.40-r2.ebuild |
| 309 |
@@ -1,8 +1,10 @@ |
| 310 |
-# Copyright 1999-2008 Gentoo Foundation |
| 311 |
+# Copyright 1999-2011 Gentoo Foundation |
| 312 |
# Distributed under the terms of the GNU General Public License v2 |
| 313 |
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tp_smapi/tp_smapi-0.37.ebuild,v 1.2 2008/03/31 08:34:42 welp Exp $ |
| 314 |
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/tp_smapi/tp_smapi-0.40-r1.ebuild,v 1.4 2011/05/20 11:20:42 tomka Exp $ |
| 315 |
|
| 316 |
-inherit linux-mod linux-info |
| 317 |
+EAPI="3" |
| 318 |
+ |
| 319 |
+inherit eutils linux-mod |
| 320 |
|
| 321 |
DESCRIPTION="IBM ThinkPad SMAPI BIOS driver" |
| 322 |
HOMEPAGE="http://tpctl.sourceforge.net/" |
| 323 |
@@ -10,7 +12,7 @@ SRC_URI="mirror://sourceforge/tpctl/${P}.tgz" |
| 324 |
|
| 325 |
LICENSE="GPL-2" |
| 326 |
SLOT="0" |
| 327 |
-KEYWORDS="~amd64 ~x86" |
| 328 |
+KEYWORDS="amd64 x86" |
| 329 |
|
| 330 |
IUSE="hdaps" |
| 331 |
|
| 332 |
@@ -19,6 +21,7 @@ RESTRICT="userpriv" |
| 333 |
# We need dmideode if the kernel does not support DMI_DEV_TYPE_OEM_STRING |
| 334 |
# in dmi.h |
| 335 |
DEPEND="sys-apps/dmidecode" |
| 336 |
+RDEPEND="${DEPEND}" |
| 337 |
|
| 338 |
pkg_setup() { |
| 339 |
linux-mod_pkg_setup |
| 340 |
@@ -31,37 +34,31 @@ pkg_setup() { |
| 341 |
fi |
| 342 |
|
| 343 |
MODULE_NAMES="thinkpad_ec(extra:) tp_smapi(extra:)" |
| 344 |
- BUILD_PARAMS="KSRC=${KV_DIR} KBUILD=${KV_DIR}" |
| 345 |
+ BUILD_PARAMS="KSRC=${KV_DIR} KBUILD=${KV_OUT_DIR}" |
| 346 |
BUILD_TARGETS="default" |
| 347 |
|
| 348 |
if use hdaps; then |
| 349 |
+ |
| 350 |
+ CONFIG_CHECK="~INPUT_UINPUT" |
| 351 |
+ WARNING_INPUT_UINPUT="Your kernel needs uinput for the hdaps module to perform better" |
| 352 |
+ linux-info_pkg_setup |
| 353 |
+ |
| 354 |
MODULE_NAMES="${MODULE_NAMES} hdaps(extra:)" |
| 355 |
BUILD_PARAMS="${BUILD_PARAMS} HDAPS=1" |
| 356 |
|
| 357 |
-# CONFIG_CHECK="!SENSORS_HDAPS" |
| 358 |
-# ERROR_SENSORS_HDAPS="${P} with USE=hdaps conflicts with in-kernel HDAPS (CONFIG_SENSORS_HDAPS)" |
| 359 |
+ CONFIG_CHECK="!SENSORS_HDAPS" |
| 360 |
+ ERROR_SENSORS_HDAPS="${P} with USE=hdaps conflicts with in-kernel HDAPS (CONFIG_SENSORS_HDAPS)" |
| 361 |
linux-info_pkg_setup |
| 362 |
fi |
| 363 |
} |
| 364 |
|
| 365 |
-src_unpack() { |
| 366 |
- unpack ${A} |
| 367 |
- cd "${S}" |
| 368 |
- |
| 369 |
- # Remove usage of `sudo` in Makefile. |
| 370 |
- sed -i 's,sudo ,,' Makefile |
| 371 |
- |
| 372 |
- # compile with 2.6.27 |
| 373 |
- if kernel_is ge 2 6 27; then |
| 374 |
- sed -i \ |
| 375 |
- -e "s:asm/semaphore.h:linux/semaphore.h:g" \ |
| 376 |
- *.c \ |
| 377 |
- || die |
| 378 |
- fi |
| 379 |
+src_prepare() { |
| 380 |
+ epatch "${FILESDIR}/${P}-2.6.37.patch" |
| 381 |
+ epatch "${FILESDIR}"/fix_header_check.patch |
| 382 |
+ epatch "${FILESDIR}"/0.40-add-x120e-and-t520-to-whitelist.patch |
| 383 |
} |
| 384 |
|
| 385 |
src_install() { |
| 386 |
linux-mod_src_install |
| 387 |
- |
| 388 |
dodoc CHANGES README |
| 389 |
} |
Archives