Revision bump of thinkpad, with patches from TGL <degrenier@easyconnect.fr> to allow compilation with kernel 2.6.16. Closes bug #127453

(Portage version: 2.1_pre6-r6)

6 files changed, 243 insertions, 8 deletions

diff --git a/app-laptop/thinkpad/ChangeLog b/app-laptop/thinkpad/ChangeLog
index 97a3e3eb1460..f4fbd3883f1c 100644
--- a/app-laptop/thinkpad/ChangeLog
+++ b/app-laptop/thinkpad/ChangeLog
@@ -1,6 +1,15 @@
 # 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.13 2006/02/18 13:20:14 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/ChangeLog,v 1.14 2006/03/25 11:57:08 steev Exp $
+
+*thinkpad-5.9-r1 (25 Mar 2006)
+
+  25 Mar 2006; Steev Klimaszewski <steev@gentoo.org>
+  +files/thinkpad-5.9-remove-inter_module.patch,
+  +files/thinkpad-5.9-remove-thinkpadapm-argument.patch,
+  -thinkpad-5.9.ebuild, +thinkpad-5.9-r1.ebuild:
+  Revision bump of thinkpad, with patches from TGL <degrenier@easyconnect.fr> to
+  allow compilation with kernel 2.6.16. Closes bug #127453
 
 *thinkpad-5.9 (18 Feb 2006)
 
diff --git a/app-laptop/thinkpad/Manifest b/app-laptop/thinkpad/Manifest
index 84f1ec777c82..f24a806bd515 100644
--- a/app-laptop/thinkpad/Manifest
+++ b/app-laptop/thinkpad/Manifest
@@ -22,15 +22,21 @@ SHA256 d5e55a058531417a5a86f8d10cb599f141cac27dc2c6ce4bf97196bc964e627d files/di
 MD5 87bb1964098b9b0fd2093bc245c16699 files/digest-thinkpad-5.8 63
 RMD160 fb14b1c43e5dfc96eaed34c5bddce2ba208e9ff7 files/digest-thinkpad-5.8 63
 SHA256 0de9ad3e903e6330e9379951bda2296da486fd7b650b1e0b200fe69334bde723 files/digest-thinkpad-5.8 63
-MD5 c35ad826276df3cf38204f217c633902 files/digest-thinkpad-5.9 235
-RMD160 d5c3f521d5bc24abe05caa4e230afaaa13a806c5 files/digest-thinkpad-5.9 235
-SHA256 8178715d1dd873c669ce74f5ff1a6a300dce69c2af42ec7bcca9fc457b579ecf files/digest-thinkpad-5.9 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
 MD5 26886c3a2e8b9c3b807371e643dd5c75 files/thinkpad 545
 RMD160 6ac014699371fccc7387315fbaf09080e5368977 files/thinkpad 545
 SHA256 f33d6e2fd998bc4dad0f372c9f2ab139369b415ecff5489c41944fc35decb5ee files/thinkpad 545
 MD5 53ea99e36366006d376acc68b63762eb files/thinkpad-5.8-cpu_ptr.patch 634
 RMD160 0fd6cc16f71e228f13a9cce01055f4bc4a96f806 files/thinkpad-5.8-cpu_ptr.patch 634
 SHA256 48418d14851cba7c9f3b280e4c0674ac2214348ccd543248fd24d6e6747e693a files/thinkpad-5.8-cpu_ptr.patch 634
+MD5 59791b4b3c27736dee2bdc9c4a5520ec files/thinkpad-5.9-remove-inter_module.patch 5974
+RMD160 12ff7660f880fb2b731f5aa02d5a45861eb59e6f files/thinkpad-5.9-remove-inter_module.patch 5974
+SHA256 f75291cbc0aac1cbc5531be6788e343682684d80562d7a82ec6d4c6759925418 files/thinkpad-5.9-remove-inter_module.patch 5974
+MD5 000dd629c39dced23bd711480551c81c files/thinkpad-5.9-remove-thinkpadapm-argument.patch 1052
+RMD160 e1c7831dea7ace73cb619005ade0652d6b0ab992 files/thinkpad-5.9-remove-thinkpadapm-argument.patch 1052
+SHA256 57fe17e7d1644f16815d8b052efd8a5cbd34564b5539247b57a23f27a05eb1c8 files/thinkpad-5.9-remove-thinkpadapm-argument.patch 1052
 MD5 9cb8c919fc98f51c73bb8e42f2057867 metadata.xml 257
 RMD160 7f24abacd3c499b06eb4314a0cbd618acc9b3b86 metadata.xml 257
 SHA256 3870cf69413cacc58e43006c91b3e37453c57ee34f19a335eb40fb31fc6b4ffe metadata.xml 257
@@ -55,6 +61,6 @@ SHA256 eadfb4c43ab27a879459c467001b073f2e22d1c13223cff8908fb5fc693279ba thinkpad
 MD5 bed148d23e0d3c49ca3ff29ed6aa81f2 thinkpad-5.8.ebuild 1240
 RMD160 7181e0c4cb2a473b13008f3f97c5cb727b457d3c thinkpad-5.8.ebuild 1240
 SHA256 8de6ed1cb646e1f8a6b1873a66b436cb34ad21d3d7c582ea39bfbe2d31415016 thinkpad-5.8.ebuild 1240
-MD5 50fa8243874f8fc32b6dc3c341406763 thinkpad-5.9.ebuild 1073
-RMD160 31a7e615d0a783702d391cb443113414f873a536 thinkpad-5.9.ebuild 1073
-SHA256 5311b615073139928290f139979109d59cbb04c74261a6bb5f3a9f148387f7ba thinkpad-5.9.ebuild 1073
+MD5 ffad6a16dc66924034eb2498ea0b19dc thinkpad-5.9-r1.ebuild 1238
+RMD160 fca26b9a792929a96b52010f068c8d6bf85f64f9 thinkpad-5.9-r1.ebuild 1238
+SHA256 4d03592cd8d98ee473414698e306acd3bd936801ad3b5f3e2db5815d7a3fc142 thinkpad-5.9-r1.ebuild 1238
diff --git a/app-laptop/thinkpad/files/digest-thinkpad-5.9 b/app-laptop/thinkpad/files/digest-thinkpad-5.9-r1
index ee4c585812c2..ee4c585812c2 100644
--- a/app-laptop/thinkpad/files/digest-thinkpad-5.9
+++ b/app-laptop/thinkpad/files/digest-thinkpad-5.9-r1
diff --git a/app-laptop/thinkpad/files/thinkpad-5.9-remove-inter_module.patch b/app-laptop/thinkpad/files/thinkpad-5.9-remove-inter_module.patch
new file mode 100644
index 000000000000..952d84906edf
--- /dev/null
+++ b/app-laptop/thinkpad/files/thinkpad-5.9-remove-inter_module.patch
@@ -0,0 +1,192 @@
+diff -uNr thinkpad-5.9.orig/2.6/drivers/rtcmosram.c thinkpad-5.9/2.6/drivers/rtcmosram.c
+--- thinkpad-5.9.orig/2.6/drivers/rtcmosram.c	2006-03-24 18:45:52.000000000 +0100
++++ thinkpad-5.9/2.6/drivers/rtcmosram.c	2006-03-24 18:50:36.000000000 +0100
+@@ -52,7 +52,6 @@
+ /****** variables ******/
+ 
+ static const char _szMyName[] = "rtcmosram";
+-static const char _szImName[] = "rtcmosram_do";
+ static const char _szMyVersion[] = "5.0";
+ static const char _szProcfile[] = "driver/thinkpad/rtcmosram";
+ static struct resource *_presourceRtcmosram;
+@@ -226,8 +225,6 @@
+ 	}
+ 	/* proc entry created */
+ 
+-	inter_module_register( _szImName, THIS_MODULE, &rtcmosram_do );
+-
+ 	return 0;
+ }
+ 
+@@ -235,8 +232,6 @@
+ static void __exit rtcmosram_exit( void )
+ {
+ 
+-	inter_module_unregister( _szImName );
+-
+  	remove_proc_entry( _szProcfile, NULL );
+ 
+ 	if ( _presourceRtcmosram != NULL ) release_resource( _presourceRtcmosram );
+@@ -244,5 +239,6 @@
+ 	return;
+ }
+ 
++EXPORT_SYMBOL(rtcmosram_do);
+ module_init(rtcmosram_init);
+ module_exit(rtcmosram_exit);
+diff -uNr thinkpad-5.9.orig/2.6/drivers/smapi_core.c thinkpad-5.9/2.6/drivers/smapi_core.c
+--- thinkpad-5.9.orig/2.6/drivers/smapi_core.c	2006-03-24 18:45:52.000000000 +0100
++++ thinkpad-5.9/2.6/drivers/smapi_core.c	2006-03-24 18:53:55.000000000 +0100
+@@ -52,7 +52,6 @@
+ /****** variables ******/
+ 
+ static const char _szMyName[] = "smapi";
+-static const char _szImName[] = "smapi_do";
+ static const char _szMyVersion[] = "5.0";
+ static const char _szProcfile[] = "driver/thinkpad/smapi";
+ 
+@@ -298,8 +297,6 @@
+ 	}
+ 	/* proc entry created */
+ 
+-	inter_module_register( _szImName, THIS_MODULE, &smapi_do );
+-
+ 	return 0;
+ }
+ 
+@@ -307,12 +304,11 @@
+ static void __exit smapi_exit( void )
+ {
+ 
+-	inter_module_unregister( _szImName );
+-
+ 	remove_proc_entry( _szProcfile, NULL );
+ 
+ 	return;
+ }
+ 
++EXPORT_SYMBOL(smapi_do);
+ module_init(smapi_init);
+ module_exit(smapi_exit);
+diff -uNr thinkpad-5.9.orig/2.6/drivers/superio.c thinkpad-5.9/2.6/drivers/superio.c
+--- thinkpad-5.9.orig/2.6/drivers/superio.c	2006-03-24 18:45:52.000000000 +0100
++++ thinkpad-5.9/2.6/drivers/superio.c	2006-03-24 18:53:06.000000000 +0100
+@@ -52,7 +52,6 @@
+ 
+ /****** variables ******/
+ static const char _szMyName[] = "superio";
+-static const char _szImName[] = "superio_do";
+ static const char _szMyVersion[] = "5.0";
+ static const char _szProcfile[] = "driver/thinkpad/superio";
+ static word _wPortIndex, _wPortData;
+@@ -887,8 +886,6 @@
+ 	}
+ 	/* proc entry created */
+ 
+-	inter_module_register( _szImName, THIS_MODULE, &superio_do );
+-
+ 	return 0;
+ }
+ 
+@@ -896,8 +893,6 @@
+ static void __exit superio_exit( void )
+ {
+ 
+-	inter_module_unregister( _szImName );
+-
+  	remove_proc_entry( _szProcfile, NULL );
+ 
+ 	if ( _presourceSuperio != NULL ) release_resource( _presourceSuperio );
+@@ -905,5 +900,6 @@
+ 	return;
+ }
+ 
++EXPORT_SYMBOL(superio_do);
+ module_init(superio_init);
+ module_exit(superio_exit);
+diff -uNr thinkpad-5.9.orig/2.6/drivers/thinkpad.c thinkpad-5.9/2.6/drivers/thinkpad.c
+--- thinkpad-5.9.orig/2.6/drivers/thinkpad.c	2006-03-24 18:45:52.000000000 +0100
++++ thinkpad-5.9/2.6/drivers/thinkpad.c	2006-03-24 18:58:40.000000000 +0100
+@@ -230,13 +230,13 @@
+ 			pxint_do_t pxint_doSmapi;
+ 			int intRet;
+ 			if ( ! enable_smapi ) return -ETHINKPAD_MODULE_DISABLED;
+-			pxint_doSmapi = (pxint_do_t)inter_module_get_request( "smapi_do" , _szSmapiName );
++			pxint_doSmapi = (pxint_do_t)try_then_request_module( __symbol_get("smapi_do") , _szSmapiName );
+ 			if ( pxint_doSmapi == NULL ) return -ETHINKPAD_MODULE_NOT_FOUND;
+ 			intRet = (*pxint_doSmapi)(
+ 				ulongIoctlArg, 
+ 				caller_has_w( pfileThe )
+ 			);
+-			inter_module_put("smapi_do");
++			__symbol_put("smapi_do");
+ 			if ( intRet > 0 ) intRet = -ETHINKPAD_PROGRAMMING;
+ 			return intRet;
+ 		}
+@@ -245,13 +245,13 @@
+ 			pxint_do_t pxint_doSuperio;
+ 			int intRet;
+ 			if ( ! enable_superio ) return -ETHINKPAD_MODULE_DISABLED;
+-			pxint_doSuperio = (pxint_do_t)inter_module_get_request( "superio_do" , _szSuperioName );
++			pxint_doSuperio = (pxint_do_t)try_then_request_module( __symbol_get("superio_do") , _szSuperioName );
+ 			if ( pxint_doSuperio == NULL ) return -ETHINKPAD_MODULE_NOT_FOUND;
+ 			intRet = (*pxint_doSuperio)(
+ 				ulongIoctlArg, 
+ 				caller_has_w( pfileThe )
+ 			);
+-			inter_module_put("superio_do");
++			__symbol_put("superio_do");
+ 			if ( intRet > 0 ) intRet = -ETHINKPAD_PROGRAMMING;
+ 			return intRet;
+ 		}
+@@ -260,13 +260,13 @@
+ 			pxint_do_t pxint_doRtcmosram;
+ 			int intRet;
+ 			if ( ! enable_rtcmosram ) return -ETHINKPAD_MODULE_DISABLED;
+-			pxint_doRtcmosram = (pxint_do_t)inter_module_get_request( "rtcmosram_do" , _szRtcmosramName );
++			pxint_doRtcmosram = (pxint_do_t)try_then_request_module( __symbol_get("rtcmosram_do") , _szRtcmosramName );
+ 			if ( pxint_doRtcmosram == NULL ) return -ETHINKPAD_MODULE_NOT_FOUND;
+ 			intRet = (*pxint_doRtcmosram)(
+ 				ulongIoctlArg, 
+ 				caller_has_w( pfileThe )
+ 			);
+-			inter_module_put("rtcmosram_do");
++			__symbol_put("rtcmosram_do");
+ 			if ( intRet > 0 ) intRet = -ETHINKPAD_PROGRAMMING;
+ 			return intRet;
+ 		}
+diff -uNr thinkpad-5.9.orig/2.6/drivers/thinkpadpm.c thinkpad-5.9/2.6/drivers/thinkpadpm.c
+--- thinkpad-5.9.orig/2.6/drivers/thinkpadpm.c	2006-03-24 18:45:52.000000000 +0100
++++ thinkpad-5.9/2.6/drivers/thinkpadpm.c	2006-03-24 18:52:04.000000000 +0100
+@@ -57,7 +57,6 @@
+ /****** variables ******/
+ 
+ static const char _szMyName[] = "thinkpadpm";
+-static const char _szImName[] = "thinkpadpm_do";
+ static const char _szMyVersion[] = "5.9";
+ static const char _szProcfile[] = "driver/thinkpad/thinkpadpm";
+ 
+@@ -516,21 +515,18 @@
+ 	}
+ 	/* proc entry created */
+ 
+-	inter_module_register( _szImName, THIS_MODULE, &thinkpadpm_do );
+-
+ 	return 0;
+ }
+ 
+ 
+ static void __exit thinkpadpm_exit( void )
+ {
+-
+-	inter_module_unregister( _szImName );
+-
++	
+ 	remove_proc_entry( _szProcfile, NULL );
+ 
+ 	return;
+ }
+ 
++EXPORT_SYMBOL(thinkpadpm_do);
+ module_init(thinkpadpm_init);
+ module_exit(thinkpadpm_exit);
diff --git a/app-laptop/thinkpad/files/thinkpad-5.9-remove-thinkpadapm-argument.patch b/app-laptop/thinkpad/files/thinkpad-5.9-remove-thinkpadapm-argument.patch
new file mode 100644
index 000000000000..62f5d829fe9f
--- /dev/null
+++ b/app-laptop/thinkpad/files/thinkpad-5.9-remove-thinkpadapm-argument.patch
@@ -0,0 +1,20 @@
+diff -uNr thinkpad-5.9.orig2/2.6/drivers/thinkpad.c thinkpad-5.9/2.6/drivers/thinkpad.c
+--- thinkpad-5.9.orig2/2.6/drivers/thinkpad.c	2006-03-24 19:10:35.000000000 +0100
++++ thinkpad-5.9/2.6/drivers/thinkpad.c	2006-03-24 19:11:11.000000000 +0100
+@@ -90,7 +90,6 @@
+ static int enable_smapi = 1;
+ static int enable_superio = 1;
+ static int enable_rtcmosram = 1;
+-static int enable_thinkpadpm = 1; /* obsolete */
+ #ifdef MODULE
+ MODULE_PARM( enable_smapi, "i" );
+ MODULE_PARM_DESC( enable_smapi, "Enable/disable (1/0) use of the smapi module" );
+@@ -98,8 +97,6 @@
+ MODULE_PARM_DESC( enable_superio, "Enable/disable (1/0) use of the superio module" );
+ MODULE_PARM( enable_rtcmosram, "i" );
+ MODULE_PARM_DESC( enable_rtcmosram, "Enable/disable (1/0) use of the rtcmosram module" );
+-MODULE_PARM( enable_thinkpadpm, "i" );
+-MODULE_PARM_DESC( enable_thinkpadpm, "Enable/disable (1/0) use of the thinkpadpm module (obsolete)" );
+ MODULE_AUTHOR( "Thomas Hood" );
+ MODULE_DESCRIPTION( "Metadriver for IBM ThinkPad hardware drivers" );
+ MODULE_LICENSE( "GPL" );
diff --git a/app-laptop/thinkpad/thinkpad-5.9.ebuild b/app-laptop/thinkpad/thinkpad-5.9-r1.ebuild
index 0ba8f9464d54..b13764205a3f 100644
--- a/app-laptop/thinkpad/thinkpad-5.9.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.ebuild,v 1.1 2006/02/18 13:20:14 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/thinkpad-5.9-r1.ebuild,v 1.1 2006/03/25 11:57:08 steev Exp $
 
 inherit eutils linux-mod
 
@@ -42,6 +42,14 @@ pkg_setup() {
 	linux-mod_pkg_setup
 }
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}"/${PN}-5.9-remove-thinkpadapm-argument.patch
+	epatch "${FILESDIR}"/${PN}-5.9-remove-inter_module.patch
+}
+
 src_install() {
 	linux-mod_src_install