Moving the asm-file around (thanks to Daniel in #149354), fixing compilation for 2.6.18.

Package-Manager: portage-2.1.2_pre3-r5

8 files changed, 57 insertions, 30 deletions

diff --git a/app-laptop/thinkpad/ChangeLog b/app-laptop/thinkpad/ChangeLog
index 28775b40eeca..d55e5de0f4a9 100644
--- a/app-laptop/thinkpad/ChangeLog
+++ b/app-laptop/thinkpad/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-laptop/thinkpad
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/ChangeLog,v 1.16 2006/07/17 20:02:35 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/ChangeLog,v 1.17 2006/10/20 19:01:59 phreak Exp $
+
+  20 Oct 2006; Christian Heim <phreak@gentoo.org> thinkpad-5.9-r1.ebuild:
+  Moving the asm-file around (thanks to Daniel in #149354), fixing compilation
+  for 2.6.18.
 
   17 Jul 2006; Daniel Drake <dsd@gentoo.org>
   +files/thinkpad-5.9-module-param.patch, -thinkpad-5.7.ebuild,
diff --git a/app-laptop/thinkpad/Manifest b/app-laptop/thinkpad/Manifest
index d96bc6795e03..f54bfaa6113f 100644
--- a/app-laptop/thinkpad/Manifest
+++ b/app-laptop/thinkpad/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX thinkpad 545 RMD160 6ac014699371fccc7387315fbaf09080e5368977 SHA1 aa90a5ae350609c3aa51ee9d94aa77aecfe89b71 SHA256 f33d6e2fd998bc4dad0f372c9f2ab139369b415ecff5489c41944fc35decb5ee
 MD5 26886c3a2e8b9c3b807371e643dd5c75 files/thinkpad 545
 RMD160 6ac014699371fccc7387315fbaf09080e5368977 files/thinkpad 545
@@ -19,10 +22,10 @@ MD5 000dd629c39dced23bd711480551c81c files/thinkpad-5.9-remove-thinkpadapm-argum
 RMD160 e1c7831dea7ace73cb619005ade0652d6b0ab992 files/thinkpad-5.9-remove-thinkpadapm-argument.patch 1052
 SHA256 57fe17e7d1644f16815d8b052efd8a5cbd34564b5539247b57a23f27a05eb1c8 files/thinkpad-5.9-remove-thinkpadapm-argument.patch 1052
 DIST thinkpad-5.9.tar.gz 74779 RMD160 93d3d8ff6d64191ff07252654489a9bc5d878457 SHA1 c3f88d36ed39f83e6d888c9d174de9bc80724ea6 SHA256 49d2eab42e57d71cb0f175a645c703fce458a852552842ea56e0c81547d8f715
-DIST thinkpad_3.2.tar.gz 64386
-DIST thinkpad_4.1.tar.gz 84278
-DIST thinkpad_4.3.tar.gz 84492
-DIST thinkpad_4.8.tar.gz 88476
+DIST thinkpad_3.2.tar.gz 64386 RMD160 2b0ab66ad52edf3ade7e4af89f438c695b5b77cb SHA1 838e6f5106b035807b9f504dc6741794af036fb0 SHA256 da1b16c5bffccc0fe6f1241eecb59c4b9f52083e064a039b7530cd14b8ad7feb
+DIST thinkpad_4.1.tar.gz 84278 RMD160 4d4adbce9258c01f92d6c6c52f173c8de19d536b SHA1 631a2564d78925a2d919e8bc3ca08284036a34fc SHA256 32fab98027a943453de77d98fb06517e5d8147942dcd0e53be9b29d123fb3481
+DIST thinkpad_4.3.tar.gz 84492 RMD160 6ff84cae894165d09262cce0ad6468768bd9cc45 SHA1 2e9ca96e964f5acf14bce1b7f99ebfcee076d867 SHA256 611a6be19b1970f18c2899685afcc44742c4b9a1550b5847e264d5689afe5213
+DIST thinkpad_4.8.tar.gz 88476 RMD160 2bc9fb8560c12e0f2e5ac4be83d79e893438ff95 SHA1 25411babcbb1cc86e9751b35cdadde62ea956ac6 SHA256 1c8cbbbd9ed6705e542eb4b4937df064641944e89cf7457ac56e00edefbf7281
 EBUILD thinkpad-3.2.ebuild 1102 RMD160 3fb34954ac2cd8a6be405a557d067ba4c4834230 SHA1 7537345f9b82f61f2364d685e952c8f993c05383 SHA256 c5e4cfb4037377935a401c9ff7947be53a9a731ec40db6935191b8c851ff1fc2
 MD5 f931aa8596c2b096214b3cb7af3b894f thinkpad-3.2.ebuild 1102
 RMD160 3fb34954ac2cd8a6be405a557d067ba4c4834230 thinkpad-3.2.ebuild 1102
@@ -43,33 +46,40 @@ EBUILD thinkpad-4.8.ebuild 2004 RMD160 79dfab40f86bb56ea62df660cc83b665b6f766df
 MD5 5a3b38a8550c1f5f07daa4e60052bfe1 thinkpad-4.8.ebuild 2004
 RMD160 79dfab40f86bb56ea62df660cc83b665b6f766df thinkpad-4.8.ebuild 2004
 SHA256 3cd71ce210ad60245eb38f80884a99b9aa19495a8bee4a47ceceb7ef57d41bc8 thinkpad-4.8.ebuild 2004
-EBUILD thinkpad-5.9-r1.ebuild 1307 RMD160 86f672fc432bdce4595e1557fc0063cdceac0daa SHA1 a3a2c6ffa1e156005742c29d28c3992864da354a SHA256 b247dd0b1b0859c0a8efc3005770605bc294da43b60f7f5bc3db7d3a6079ba4b
-MD5 a3e008159556e8132c1c4694a5e9fa97 thinkpad-5.9-r1.ebuild 1307
-RMD160 86f672fc432bdce4595e1557fc0063cdceac0daa thinkpad-5.9-r1.ebuild 1307
-SHA256 b247dd0b1b0859c0a8efc3005770605bc294da43b60f7f5bc3db7d3a6079ba4b thinkpad-5.9-r1.ebuild 1307
-MISC ChangeLog 4506 RMD160 42bf4859cb50f5bb1f94dadb81068ebea885ab65 SHA1 e5f7852695b09574cf9f508132d4b73261033980 SHA256 1d43f77d11858f844d1c3b56f26c0fdd466eb77c14efaf871649f23f67ccfc13
-MD5 f49ae54fb2a22a3affa9219ae9d520f4 ChangeLog 4506
-RMD160 42bf4859cb50f5bb1f94dadb81068ebea885ab65 ChangeLog 4506
-SHA256 1d43f77d11858f844d1c3b56f26c0fdd466eb77c14efaf871649f23f67ccfc13 ChangeLog 4506
+EBUILD thinkpad-5.9-r1.ebuild 1393 RMD160 321590b5a4b99764593c49a6526d47ce1f8c8571 SHA1 fc87690032161a6e0e34380a611374f46a41bf29 SHA256 08eb77b377fc514824a1db08aac0b9409c13bb63ef5ce2d69c6d31f3f2bcea6e
+MD5 4299b25d1bc1a835cb12a8a12c19bbb0 thinkpad-5.9-r1.ebuild 1393
+RMD160 321590b5a4b99764593c49a6526d47ce1f8c8571 thinkpad-5.9-r1.ebuild 1393
+SHA256 08eb77b377fc514824a1db08aac0b9409c13bb63ef5ce2d69c6d31f3f2bcea6e thinkpad-5.9-r1.ebuild 1393
+MISC ChangeLog 4677 RMD160 4149f4a80978d2f7687c7b3ecd5cfdde0ded79d8 SHA1 20435f9e683e05bfdc7e1d9ebfa0a3b0f571c5d0 SHA256 f6a58cdd2c22e4a667f261878d8719f39933967d797fae2df506c5512481af46
+MD5 d5fb008fdfda5c6c8fa68b9c630bcf9f ChangeLog 4677
+RMD160 4149f4a80978d2f7687c7b3ecd5cfdde0ded79d8 ChangeLog 4677
+SHA256 f6a58cdd2c22e4a667f261878d8719f39933967d797fae2df506c5512481af46 ChangeLog 4677
 MISC metadata.xml 257 RMD160 7f24abacd3c499b06eb4314a0cbd618acc9b3b86 SHA1 5dcc7e2d25909c0340fcba06a149e0bc79162c2e SHA256 3870cf69413cacc58e43006c91b3e37453c57ee34f19a335eb40fb31fc6b4ffe
 MD5 9cb8c919fc98f51c73bb8e42f2057867 metadata.xml 257
 RMD160 7f24abacd3c499b06eb4314a0cbd618acc9b3b86 metadata.xml 257
 SHA256 3870cf69413cacc58e43006c91b3e37453c57ee34f19a335eb40fb31fc6b4ffe metadata.xml 257
-MD5 67a420196c59076408625a82b1b0f3eb files/digest-thinkpad-3.2 63
-RMD160 58155f070055eb224c807ca1630a73fc6a15bbf8 files/digest-thinkpad-3.2 63
-SHA256 536ee04ab1afc3a2f4f72fe6e7a3157f70da48825164e3f505abc02d67767f04 files/digest-thinkpad-3.2 63
-MD5 f6711c6d29ed136c770235acf6bebf4a files/digest-thinkpad-4.1 63
-RMD160 9817ab7a44c98cb5e117adcae031ce0b6b35569d files/digest-thinkpad-4.1 63
-SHA256 ed1ee915994528695bf010f4605a7c3020cab0ba6817822528165f05d5aeed94 files/digest-thinkpad-4.1 63
-MD5 c4bd4b11c836429cb452ababe9575efd files/digest-thinkpad-4.3 63
-RMD160 60ced668d4e104182d3a8787716c16eb9bd94de4 files/digest-thinkpad-4.3 63
-SHA256 f01caf1163b4bb68eb7653cc16732c49268cbe94eaabcbeeb1a163a951e4ad85 files/digest-thinkpad-4.3 63
-MD5 c4bd4b11c836429cb452ababe9575efd files/digest-thinkpad-4.3-r1 63
-RMD160 60ced668d4e104182d3a8787716c16eb9bd94de4 files/digest-thinkpad-4.3-r1 63
-SHA256 f01caf1163b4bb68eb7653cc16732c49268cbe94eaabcbeeb1a163a951e4ad85 files/digest-thinkpad-4.3-r1 63
-MD5 feffa2e3a3d70a62bd850ad019807206 files/digest-thinkpad-4.8 63
-RMD160 cbc759e3db1877be2626255ede332b86a08d42bf files/digest-thinkpad-4.8 63
-SHA256 a8cec4339f2f28e1331e66d485039928c0dacdc84c31c52058b8a05236b32124 files/digest-thinkpad-4.8 63
+MD5 35fb8eee63227e2567b3ace905bdc87b files/digest-thinkpad-3.2 235
+RMD160 0c73f5a1f9cf106042c043f365dc5dac7f155aa7 files/digest-thinkpad-3.2 235
+SHA256 b57403d25caefbb14185fa7ae1c3d29d575fcb7ea5caf2018c627ade3fc5b2c0 files/digest-thinkpad-3.2 235
+MD5 b37be30d0e813cee8c2505f571af5210 files/digest-thinkpad-4.1 235
+RMD160 138d97c167f538ad13dd561117a968576f28f7b6 files/digest-thinkpad-4.1 235
+SHA256 baeb9b8e38d54b43ff66e1d81f2401f2032c465617929790fca1d6768e49a53c files/digest-thinkpad-4.1 235
+MD5 0f5816047d46ec751538e7feefb49405 files/digest-thinkpad-4.3 235
+RMD160 1e92d4cdd8943a741c83c921639414ba1ce6bf30 files/digest-thinkpad-4.3 235
+SHA256 f94ab11a2c76c70100425caf3f77800a5be78f41911385b7a599c2dee5f26823 files/digest-thinkpad-4.3 235
+MD5 0f5816047d46ec751538e7feefb49405 files/digest-thinkpad-4.3-r1 235
+RMD160 1e92d4cdd8943a741c83c921639414ba1ce6bf30 files/digest-thinkpad-4.3-r1 235
+SHA256 f94ab11a2c76c70100425caf3f77800a5be78f41911385b7a599c2dee5f26823 files/digest-thinkpad-4.3-r1 235
+MD5 0540e63fbcb6a69792648daf4d5dca08 files/digest-thinkpad-4.8 235
+RMD160 542959a6d7220a777071e6bcff532f5186ca75df files/digest-thinkpad-4.8 235
+SHA256 7df34853a954641d72983664ba8bc4044049cef840906c202c11a312ee8ad2ba files/digest-thinkpad-4.8 235
 MD5 c35ad826276df3cf38204f217c633902 files/digest-thinkpad-5.9-r1 235
 RMD160 d5c3f521d5bc24abe05caa4e230afaaa13a806c5 files/digest-thinkpad-5.9-r1 235
 SHA256 8178715d1dd873c669ce74f5ff1a6a300dce69c2af42ec7bcca9fc457b579ecf files/digest-thinkpad-5.9-r1 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFOR0vyuNVb5qfaOYRAhXuAKDB7YMgQ1+irzRuWyhY5wGqgJvZsgCgxyX1
+4ykjLbzyqz67EDLXmzeTJf0=
+=uoYA
+-----END PGP SIGNATURE-----
diff --git a/app-laptop/thinkpad/files/digest-thinkpad-3.2 b/app-laptop/thinkpad/files/digest-thinkpad-3.2
index 92ef91fe42d1..ebef006f1603 100644
--- a/app-laptop/thinkpad/files/digest-thinkpad-3.2
+++ b/app-laptop/thinkpad/files/digest-thinkpad-3.2
@@ -1 +1,3 @@
 MD5 545dbc10f694b98075c2a57a01638278 thinkpad_3.2.tar.gz 64386
+RMD160 2b0ab66ad52edf3ade7e4af89f438c695b5b77cb thinkpad_3.2.tar.gz 64386
+SHA256 da1b16c5bffccc0fe6f1241eecb59c4b9f52083e064a039b7530cd14b8ad7feb thinkpad_3.2.tar.gz 64386
diff --git a/app-laptop/thinkpad/files/digest-thinkpad-4.1 b/app-laptop/thinkpad/files/digest-thinkpad-4.1
index 98f0219e8da1..d250922a389e 100644
--- a/app-laptop/thinkpad/files/digest-thinkpad-4.1
+++ b/app-laptop/thinkpad/files/digest-thinkpad-4.1
@@ -1 +1,3 @@
 MD5 d077a0081553e236e0231fc6076b5128 thinkpad_4.1.tar.gz 84278
+RMD160 4d4adbce9258c01f92d6c6c52f173c8de19d536b thinkpad_4.1.tar.gz 84278
+SHA256 32fab98027a943453de77d98fb06517e5d8147942dcd0e53be9b29d123fb3481 thinkpad_4.1.tar.gz 84278
diff --git a/app-laptop/thinkpad/files/digest-thinkpad-4.3 b/app-laptop/thinkpad/files/digest-thinkpad-4.3
index 53dacb1f3fe8..f5c2b37d966a 100644
--- a/app-laptop/thinkpad/files/digest-thinkpad-4.3
+++ b/app-laptop/thinkpad/files/digest-thinkpad-4.3
@@ -1 +1,3 @@
 MD5 af8dfd6e1529ee07620c2e4f11f05702 thinkpad_4.3.tar.gz 84492
+RMD160 6ff84cae894165d09262cce0ad6468768bd9cc45 thinkpad_4.3.tar.gz 84492
+SHA256 611a6be19b1970f18c2899685afcc44742c4b9a1550b5847e264d5689afe5213 thinkpad_4.3.tar.gz 84492
diff --git a/app-laptop/thinkpad/files/digest-thinkpad-4.3-r1 b/app-laptop/thinkpad/files/digest-thinkpad-4.3-r1
index 53dacb1f3fe8..f5c2b37d966a 100644
--- a/app-laptop/thinkpad/files/digest-thinkpad-4.3-r1
+++ b/app-laptop/thinkpad/files/digest-thinkpad-4.3-r1
@@ -1 +1,3 @@
 MD5 af8dfd6e1529ee07620c2e4f11f05702 thinkpad_4.3.tar.gz 84492
+RMD160 6ff84cae894165d09262cce0ad6468768bd9cc45 thinkpad_4.3.tar.gz 84492
+SHA256 611a6be19b1970f18c2899685afcc44742c4b9a1550b5847e264d5689afe5213 thinkpad_4.3.tar.gz 84492
diff --git a/app-laptop/thinkpad/files/digest-thinkpad-4.8 b/app-laptop/thinkpad/files/digest-thinkpad-4.8
index 05be8a6dd807..4b1c5e9694ec 100644
--- a/app-laptop/thinkpad/files/digest-thinkpad-4.8
+++ b/app-laptop/thinkpad/files/digest-thinkpad-4.8
@@ -1 +1,3 @@
 MD5 e2ac5d61784fe92d7384322c0718ded6 thinkpad_4.8.tar.gz 88476
+RMD160 2bc9fb8560c12e0f2e5ac4be83d79e893438ff95 thinkpad_4.8.tar.gz 88476
+SHA256 1c8cbbbd9ed6705e542eb4b4937df064641944e89cf7457ac56e00edefbf7281 thinkpad_4.8.tar.gz 88476
diff --git a/app-laptop/thinkpad/thinkpad-5.9-r1.ebuild b/app-laptop/thinkpad/thinkpad-5.9-r1.ebuild
index f5c11af609e4..2e63b9e3494f 100644
--- a/app-laptop/thinkpad/thinkpad-5.9-r1.ebuild
+++ b/app-laptop/thinkpad/thinkpad-5.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/thinkpad-5.9-r1.ebuild,v 1.3 2006/07/17 20:02:35 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/thinkpad-5.9-r1.ebuild,v 1.4 2006/10/20 19:01:59 phreak Exp $
 
 inherit eutils linux-mod
 
@@ -44,7 +44,10 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
+
+	# New kernels only see .S files as asm
+	mv "${S}"/2.6/drivers/smapi_call.{s,S}
 
 	epatch "${FILESDIR}"/${PN}-5.9-remove-thinkpadapm-argument.patch
 	epatch "${FILESDIR}"/${PN}-5.9-remove-inter_module.patch