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

(Portage version: 2.1.2_pre3-r5)

7 files changed, 20 insertions, 3 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/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