Removal, bug #381263

21 files changed, 0 insertions, 1061 deletions

diff --git a/app-laptop/thinkpad/ChangeLog b/app-laptop/thinkpad/ChangeLog
deleted file mode 100644
index 70c208117942..000000000000
--- a/app-laptop/thinkpad/ChangeLog
+++ /dev/null
@@ -1,145 +0,0 @@
-# ChangeLog for app-laptop/thinkpad
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/ChangeLog,v 1.22 2011/06/26 09:35:33 hwoarang Exp $
-
-  26 Jun 2011; Markos Chandras <hwoarang@gentoo.org> thinkpad-5.9-r1.ebuild,
-  +files/thinkpad-5.9-ioctl.patch:
-  Apply patch from Mateusz Dziadko <matidz.gentoo@gmail.com> to compile against
-  new kernels. Bug #342161
-
-  25 May 2007; Christian Faulhammer <opfer@gentoo.org> ChangeLog:
-  corrected ChangeLog, so it conforms to our standards
-
-  21 Mar 2007; Steev Klimaszewski <steev@gentoo.org> thinkpad-5.9-r1.ebuild:
-  Add set_kvobj so that the kernel modules get installed properly.
-
-  25 Feb 2007; <genstef@gentoo.org> ChangeLog:
-  use KV_DIR only after pkg setup
-
-  10 Feb 2007; Steev Klimaszewski <steev@gentoo.org>
-  -files/thinkpad-5.8-cpu_ptr.patch, -thinkpad-3.2.ebuild,
-  -thinkpad-4.1.ebuild, -thinkpad-4.3.ebuild, -thinkpad-4.3-r1.ebuild,
-  -thinkpad-4.8.ebuild:
-  Remove old thinkpad versions.  Fixes bug #159708
-
-  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,
-  -thinkpad-5.8.ebuild, thinkpad-5.9-r1.ebuild:
-  Fix compilation on Linux 2.6.17, thanks to Henryk Plotz in bug #137646
-
-  09 May 2006; John N. Laliberte <allanonjl@gentoo.org>
-  thinkpad-5.9-r1.ebuild:
-  mark stable on x86, #131971
-
-*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)
-
-  18 Feb 2006; Steev Klimaszewski <steev@gentoo.org> +thinkpad-5.9.ebuild:
-  New upstream revision, works with kernel 2.6.15-r3 through -r5 here.  Removes
-  the thinkpadpm module (upstream). Closes Bug #123163 as well as, Bug #93658.
-  Thank you to Mr. Karlsson, and Mr. Romano for reporting.
-
-  11 Jan 2006; Benjamin Schindler <config@gentoo.org> thinkpad-3.2.ebuild,
-  thinkpad-4.1.ebuild, thinkpad-4.3.ebuild, thinkpad-4.3-r1.ebuild,
-  thinkpad-4.8.ebuild, thinkpad-5.7.ebuild:
-  Remove amd64 keywordalltogether since there is no amd64 thinkpad laptop 
-  closing bug #101488.
-
-  24 Dec 2005; Petteri Räty <betelgeuse@gentoo.org> thinkpad-5.8.ebuild:
-  Marked stable on x86 for bug #101488.
-
-  24 Dec 2005; Steev Klimaszewski <steev@gentoo.org> metadata.xml:
-  Take over as maintainer.
-
-*thinkpad-5.8 (08 Jan 2005)
-
-  08 Jan 2005; Henrik Brix Andersen <brix@gentoo.org>
-  +files/thinkpad-5.8-cpu_ptr.patch, +thinkpad-5.8.ebuild:
-  Version bump, ported to use linux-mod.eclass. Fixes bug #39943 and bug #69669.
-
-  01 Oct 2004; Scott W Taylor <swtaylor@gentoo.org> thinkpad-5.7.ebuild:
-  fix typo
-
-*thinkpad-5.7 (01 Oct 2004)
-
-  01 Oct 2004; Scott W Taylor <swtaylor@gentoo.org> +thinkpad-5.7.ebuild:
-  new source, plays nicely with 2.6 kernel
-
-  18 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> thinkpad-4.8.ebuild:
-  stable on x86.
-
-  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> thinkpad-4.8.ebuild:
-  glibc -> libc
-
-*thinkpad-3.2 (07 Mar 2004)
-
-  07 Mar 2004; Peter Johanson <latexer@gentoo.org> metadata.xml,
-  thinkpad-3.2.ebuild, thinkpad-4.1.ebuild, thinkpad-4.3-r1.ebuild,
-  thinkpad-4.3.ebuild, thinkpad-4.8.ebuild, files/thinkpad:
-  Moved to new app-laptop category
-
-*thinkpad-4.8 (25 Dec 2003)
-
-  25 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
-  Add thinkpad group for devfs #35706.
-
-  25 Dec 2003; Robin H. Johnson <robbat2@gentoo.org> thinkpad-4.8.ebuild:
-  version bump
-
-  28 Nov 2003; Karl Trygve Kalleberg <karltk@gentoo.org> 
-  thinkpad-4.3-r1.ebuild :
-  Fixes #33778. No revision bump, as it doesn't change anything for
-  users who has this installed already.
-  
-*thinkpad-4.3-r1 (27 Jun 2003)
-
-  25 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
-  Add thinkpad group for devfs #35706.
-
-  27 Jun 2003; Karl Trygve Kalleberg <karltk@gentoo.org> thinkpad-4.3-r1.ebuild :
-  version bump, installs man page now.
-
-*thinkpad-4.3 (04 May 2003)
-
-  04 May 2003; Wout Mertens <wmertens@gentoo.org> thinkpad-4.3.ebuild :
-  version bump, fixing #20072. Also improved kernel stuff and discovered
-  the /etc/devfs.d directory
-
-*thinkpad-4.1 (17 Feb 2003)
-
-  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> thinkpad-4.1.ebuild :
-  This is definitely not for mips.
-
-  17 Feb 2003; Wout Mertens <wmertens@gentoo.org>:
-  version bump and correct kernel version detection
-
-*thinkpad-3.2 (25 Apr 2002)
-
-  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> thinkpad-3.2.ebuild :
-  This is definitely not for mips.
-
-  21 Jul 2002; Mark Guertin <gerk@gentoo.org>:
-  updated keywords (-ppc)
-
-  14 Jul 2002; phoen][x <phoenix@gentoo.org> thinkpad-3.2.ebuild :
-  Added LICENSE, KEYWORDS, SLOT.
-
-  25 April 2002; Wout Mertens <Wout.Mertens@advalvas.be> ChangeLog :
-
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
diff --git a/app-laptop/thinkpad/Manifest b/app-laptop/thinkpad/Manifest
deleted file mode 100644
index 538b98d3bba0..000000000000
--- a/app-laptop/thinkpad/Manifest
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-AUX thinkpad 545 RMD160 6ac014699371fccc7387315fbaf09080e5368977 SHA1 aa90a5ae350609c3aa51ee9d94aa77aecfe89b71 SHA256 f33d6e2fd998bc4dad0f372c9f2ab139369b415ecff5489c41944fc35decb5ee
-AUX thinkpad-5.9-ioctl.patch 764 RMD160 4b1430e4ee35db3bb02162b517c9d25f71d8aa35 SHA1 10a60b87945cac8fe8363436595b2f1a787727c7 SHA256 59eb94c1225796fd2e3e958c0603b421373d789c95f1a67821f9915171acfec2
-AUX thinkpad-5.9-module-param.patch 992 RMD160 80bc42d8d92da4174e6e9d23f733f3658c9e1a7f SHA1 6cd5facfcb3d9745f769bc7422e917e8acd39014 SHA256 4bc08dae456cf96bcfcaf416967657c079982b38a1b89ec6d71b684f2a4688bf
-AUX thinkpad-5.9-remove-inter_module.patch 5974 RMD160 12ff7660f880fb2b731f5aa02d5a45861eb59e6f SHA1 f75ad677eb158c0b82fb005b530a94cc9b1b7dd5 SHA256 f75291cbc0aac1cbc5531be6788e343682684d80562d7a82ec6d4c6759925418
-AUX thinkpad-5.9-remove-thinkpadapm-argument.patch 1052 RMD160 e1c7831dea7ace73cb619005ade0652d6b0ab992 SHA1 527c9c690da0ab3ae5d42c0c0a0ec4a2534a589b SHA256 57fe17e7d1644f16815d8b052efd8a5cbd34564b5539247b57a23f27a05eb1c8
-DIST thinkpad-5.9.tar.gz 74779 RMD160 93d3d8ff6d64191ff07252654489a9bc5d878457 SHA1 c3f88d36ed39f83e6d888c9d174de9bc80724ea6 SHA256 49d2eab42e57d71cb0f175a645c703fce458a852552842ea56e0c81547d8f715
-EBUILD thinkpad-5.9-r1.ebuild 1508 RMD160 1708e9a5cc8c4553afd8e76b8800ffb54f5b730c SHA1 ccfda9bd7108ef3d4dcb684522ebcc55eee9411c SHA256 8a675083e4732720bd79af3a18b180a3ddd26120deeabd865f26fa2b5619b6d7
-MISC ChangeLog 5505 RMD160 3e8f1195d76df8bd2d69927c8f71e029918eab57 SHA1 bc8cd0059c0c88df1f5818a05a8464298181ca14 SHA256 1560dbc2806b664ff8bacda414be49d857cc864024c913935f4193b993165c6f
-MISC metadata.xml 257 RMD160 7f24abacd3c499b06eb4314a0cbd618acc9b3b86 SHA1 5dcc7e2d25909c0340fcba06a149e0bc79162c2e SHA256 3870cf69413cacc58e43006c91b3e37453c57ee34f19a335eb40fb31fc6b4ffe
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJOBv30AAoJEPqDWhW0r/LCNRAP/3h7lNcpb3YCRbFFgbgTv3NQ
-7y5molQXm0Uh6gBkgJW3QYlHQSFqwNBc3AN0ZBlbMwItmEMGENZhha9NANS8iGn8
-+JpMejWkKak/mJVjDqSxvYtgZo63PGvDRNPqOhfEChFb3s5CLyRPDwraGHLF50RR
-gFYTxAHhJyi9wdFJUT1JF0AeW8hP9FpkRoZ6nWjI08eP86VcucgzIU1lQo0liQK1
-oF84RKelng+Vw69g5eHIrw9gmwFRq1pWsirIbbadyNsgzpUwLp9iqFpsdgzr4ZWU
-Z1dtu0dmA2EIZD2KLOLBY0hZxS9BQXm7+6aez9aljfnDpgqlrEGGT2m3NJZGi40E
-kCDtP60ohsLAr3d5PjQBaC0tcuRuIH1CeG/24Qmx34dBRVcWVnV/FGB/BDl3D2Mh
-lP6CnDtMPkLQpHelfdviS444ddGUGPggdwDKkqFvSpoP7NO6ka7YuyXuwliGJxcR
-MAQx/TcdCWzY8Iua0zvmCRJzo5OIczpkeVFu3pwrymXoBRNKs0NghOEQ/TgVHStm
-23BWbiyQYyZ/ifUObtTQVochA20kwZ9p0RFok82m2y1p6QuEvf74FpZyb/JaUW7S
-IxIJMTm5jGTzgSLvDRpSgazHMSi2I1NfAaTSnMLUU9jzJtev2UvGkhTuYpd9jHUt
-3Rrn28BTuCOgv4VlCIPC
-=t4rf
------END PGP SIGNATURE-----
diff --git a/app-laptop/thinkpad/files/thinkpad b/app-laptop/thinkpad/files/thinkpad
deleted file mode 100644
index c333d880777f..000000000000
--- a/app-laptop/thinkpad/files/thinkpad
+++ /dev/null
@@ -1,15 +0,0 @@
-keep
-path[thinkpad]=/lib/modules/%KV%/thinkpad
-
-# Uncomment this with the options you like.
-#options thinkpad enable_smapi=1 enable_superio=1 enable_rtcmosram=1 enable_thinkpadpm=1
-
-# Uncomment this if you are not using devfs for some reason, and comment the
-# rest. Otherwise, leave it as is.
-#alias char-major-10-170 thinkpad
-alias /dev/thinkpad thinkpad
-alias /dev/thinkpad/thinkpad thinkpad
-alias /dev/thinkpad/smapi smapi
-alias /dev/thinkpad/superio superio
-alias /dev/thinkpad/rtcmosram rtcmosram
-alias /dev/thinkpad/thinkpadpm thinkpadpm
diff --git a/app-laptop/thinkpad/files/thinkpad-5.9-ioctl.patch b/app-laptop/thinkpad/files/thinkpad-5.9-ioctl.patch
deleted file mode 100644
index 3f20744265b8..000000000000
--- a/app-laptop/thinkpad/files/thinkpad-5.9-ioctl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- thinkpad-5.9.orig/2.6/drivers/thinkpad.c	2010-11-19 01:35:10.610000017 +0100
-+++ thinkpad-5.9/2.6/drivers/thinkpad.c	2010-11-19 01:35:37.215000017 +0100
-@@ -66,7 +66,6 @@
- 	struct file * pfileThe 
- );
- static int thinkpad_ioctl(
--	struct inode * pinodeThe,
- 	struct file * pfileThe,
- 	unsigned int uintIoctlNum,
- 	unsigned long ulongIoctlArg
-@@ -111,7 +110,7 @@
- static flag_t _fInUse = 1;
- 
- static struct file_operations _fileopsThinkpad = {
--	.ioctl   = thinkpad_ioctl,
-+	.unlocked_ioctl   = thinkpad_ioctl,
- 	.open    = thinkpad_open,
- 	.release = thinkpad_release,
- 	.owner   = THIS_MODULE
-@@ -169,7 +168,6 @@
- 
- 
- static int thinkpad_ioctl(
--	struct inode * pinodeThe,
- 	struct file * pfileThe,
- 	unsigned int uintIoctlNum,
- 	unsigned long ulongIoctlArg
diff --git a/app-laptop/thinkpad/files/thinkpad-5.9-module-param.patch b/app-laptop/thinkpad/files/thinkpad-5.9-module-param.patch
deleted file mode 100644
index e573b59f4cce..000000000000
--- a/app-laptop/thinkpad/files/thinkpad-5.9-module-param.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -purN 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-07-15 12:27:38.000000000 +0200
-+++ thinkpad-5.9/2.6/drivers/thinkpad.c	2006-07-15 12:42:55.000000000 +0200
-@@ -91,11 +91,11 @@ static int enable_smapi = 1;
- static int enable_superio = 1;
- static int enable_rtcmosram = 1;
- #ifdef MODULE
--MODULE_PARM( enable_smapi, "i" );
-+module_param( enable_smapi, int, S_IRUGO );
- MODULE_PARM_DESC( enable_smapi, "Enable/disable (1/0) use of the smapi module" );
--MODULE_PARM( enable_superio, "i" );
-+module_param( enable_superio, int, S_IRUGO );
- MODULE_PARM_DESC( enable_superio, "Enable/disable (1/0) use of the superio module" );
--MODULE_PARM( enable_rtcmosram, "i" );
-+module_param( enable_rtcmosram, int, S_IRUGO );
- MODULE_PARM_DESC( enable_rtcmosram, "Enable/disable (1/0) use of the rtcmosram module" );
- MODULE_AUTHOR( "Thomas Hood" );
- MODULE_DESCRIPTION( "Metadriver for IBM ThinkPad hardware drivers" );
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
deleted file mode 100644
index 952d84906edf..000000000000
--- a/app-laptop/thinkpad/files/thinkpad-5.9-remove-inter_module.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-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
deleted file mode 100644
index 62f5d829fe9f..000000000000
--- a/app-laptop/thinkpad/files/thinkpad-5.9-remove-thinkpadapm-argument.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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/metadata.xml b/app-laptop/thinkpad/metadata.xml
deleted file mode 100644
index 9701f1708ffd..000000000000
--- a/app-laptop/thinkpad/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>mobile</herd>
-	<maintainer>
-		<email>steev@gentoo.org</email>
-		<name>Steev Klimaszewski</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-laptop/thinkpad/thinkpad-5.9-r1.ebuild b/app-laptop/thinkpad/thinkpad-5.9-r1.ebuild
deleted file mode 100644
index 108e26062cf7..000000000000
--- a/app-laptop/thinkpad/thinkpad-5.9-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2011 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.7 2011/06/26 09:35:33 hwoarang Exp $
-
-inherit eutils linux-mod
-
-DESCRIPTION="Thinkpad system control kernel modules"
-
-HOMEPAGE="http://tpctl.sourceforge.net"
-SRC_URI="mirror://sourceforge/tpctl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-IUSE=""
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	case ${KV_MINOR} in
-		4)
-			BUILD_TARGETS="all"
-			;;
-		6)
-			BUILD_TARGETS="default"
-			;;
-		*)
-			die "Unsupported kernel version."
-			;;
-	esac
-
-	MODULE_NAMES="thinkpad(thinkpad:${S}/${KV_MAJOR}.${KV_MINOR}/drivers)
-				smapi(thinkpad:${S}/${KV_MAJOR}.${KV_MINOR}/drivers)
-				superio(thinkpad:${S}/${KV_MAJOR}.${KV_MINOR}/drivers)
-				rtcmosram(thinkpad:${S}/${KV_MAJOR}.${KV_MINOR}/drivers)"
-	MODULESD_THINKPAD_DOCS="README"
-	BUILD_PARAMS="KSRC=${KV_DIR}"
-}
-
-src_unpack() {
-	unpack ${A}
-	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
-	# bug 342161
-	epatch "${FILESDIR}"/${P}-ioctl.patch
-	kernel_is ge 2 6 0 && epatch "${FILESDIR}"/${P}-module-param.patch
-}
-
-src_install() {
-	# Fix from Jaakko Perttilä  - not sure if it is proper, but it works.
-	set_kvobj
-	linux-mod_src_install
-
-	dodoc AUTHORS ChangeLog SUPPORTED-MODELS TECHNOTES
-
-	doman man/*
-}
diff --git a/app-laptop/tpctl/ChangeLog b/app-laptop/tpctl/ChangeLog
deleted file mode 100644
index c206bd566418..000000000000
--- a/app-laptop/tpctl/ChangeLog
+++ /dev/null
@@ -1,97 +0,0 @@
-# ChangeLog for app-laptop/tpctl
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tpctl/ChangeLog,v 1.17 2008/07/31 11:49:32 ulm Exp $
-
-  31 Jul 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
-  Add USE flag description to metadata wrt GLEP 56.
-
-  25 May 2007; Christian Faulhammer <opfer@gentoo.org> ChangeLog:
-  corrected ChangeLog, so it conforms to our standards
-
-  28 Apr 2007; Sven Wegener <swegener@gentoo.org> tpctl-3.2.ebuild,
-  tpctl-4.2.ebuild, tpctl-4.4.ebuild, tpctl-4.4-r1.ebuild, tpctl-4.8.ebuild:
-  Fix *initd, *confd and *envd calls (#173884, #174266)
-
-  21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
-  Transition to Manifest2.
-
-  27 Apr 2006; Marien Zwart <marienz@gentoo.org> files/digest-tpctl-3.2,
-  files/digest-tpctl-4.2, files/digest-tpctl-4.4, files/digest-tpctl-4.4-r1,
-  files/digest-tpctl-4.8, files/digest-tpctl-4.16, Manifest:
-  Fixing SHA256 digest for real, pass three...
-
-*tpctl-4.17 (12 Mar 2006)
-
-  12 Mar 2006; Steev Klimaszewski <steev@gentoo.org> metadata.xml,
-  +tpctl-4.17.ebuild:
-  Update meta to show mobile as herd.
-  Version bump to 4.17, which closes bug #120067
-  Thanks to Tobias Sager for reporting.
-
-  12 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> tpctl-4.4-r1.ebuild,
-  tpctl-4.8.ebuild:
-  Drop amd64 keyword, there are no amd64 ThinkPad for now.
-
-  30 Aug 2005; Robin H. Johnson <robbat2@gentoo.org> tpctl-4.16.ebuild:
-  Stable on x86.
-
-  31 Mar 2005; <blubb@gentoo.org> tpctl-4.8.ebuild:
-  stable on amd64
-
-*tpctl-4.16 (08 Jan 2005)
-
-  08 Jan 2005; Henrik Brix Andersen <brix@gentoo.org> +tpctl-4.16.ebuild:
-  Version bump. Fixes bug #39943 and bug #69669.
-
-  18 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> tpctl-4.8.ebuild:
-  stable on x86.
-
-*tpctl-4.4-r1 (07 Mar 2004)
-
-  07 Mar 2004; Peter Johanson <latexer@gentoo.org> metadata.xml,
-  tpctl-3.2.ebuild, tpctl-4.2.ebuild, tpctl-4.4-r1.ebuild, tpctl-4.4.ebuild,
-  tpctl-4.8.ebuild, files/apmiser.rc, files/tpctlir-cli-4.4-r1.diff:
-  Moved to new app-laptop category
-
-  26 Feb 2004; Gustavo Felisberto <humpback@gentoo.org>; tpctl-3.2.ebuild,
-  tpctl-4.2.ebuild, tpctl-4.4-r1.ebuild, tpctl-4.4.ebuild, tpctl-4.8.ebuild:
-  Adding -* and maintaining x86 or ~x86. There are only x86 thinkpads. See bug
-  34495
-
-*tpctl-4.8 (25 Dec 2003)
-
-  25 Dec 2003; Robin H. Johnson <robbat2@gentoo.org> tpctl-4.8.ebuild:
-  version bump
-
-  03 Sep 2003; Karl Trygve Kalleberg (karltk@gentoo.org) tpctl-4.4-r1.ebuild :
-  USE=tpctlir incompatible with SMP-enabled kernel, patched tpctlir/tpctlir.c
-  Fixes #26820.
-  
-*tpctl-4.4-r1 (28 Jun 2003)
-  28 Jun 2003; Karl Trygve Kalleberg (karltk@gentoo.org) tpctl-4.4-r1.ebuild :
-  Version bump, installing manpages
-
-*tpctl-4.4 (04 May 2003)
-  17 Feb 2003; Wout Mertens (wmertens@gentoo.org) tpctl-4.4.ebuild :
-  Version bump, fixing #20072
-  
-*tpctl-4.2 (17 Feb 2003)
-
-  17 Feb 2003; Wout Mertens (wmertens@gentoo.org) tpctl-4.2.ebuild :
-  Version bump
-
-*tpctl-3.2 (25 Apr 2002)
-
-  21 Jul 2002; Mark Guertin <gerk@gentoo.org>:
-  updated keywords (-ppc)
-
-  14 Jul 2002; phoen][x <phoenix@gentoo.org> tpctl-3.2.ebuild :
-  Added LICENSE, KEYWORDS, SLOT.
-
-  25 Apr 2002; Wout Mertens <Wout.Mertens@advalvas.be> ChangeLog :
-
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
diff --git a/app-laptop/tpctl/Manifest b/app-laptop/tpctl/Manifest
deleted file mode 100644
index 0b5fbcbbcf2a..000000000000
--- a/app-laptop/tpctl/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-AUX apmiser.rc 560 RMD160 63f6f4ad375462571af799dccfc75dc11de51e6f SHA1 13ee50b983af166c198fe674fdd63c5934805bd5 SHA256 ee1216be5da02297f0a4d70e68c8af1d2f25c6cac90379b6c8ff8fd85b89e9d8
-AUX tpctlir-cli-4.4-r1.diff 770 RMD160 378285addb18218102b43da3383da2cf01f8d492 SHA1 72ec076358ff2ac33ade18f125b7c19f20fb5662 SHA256 daf48325ac03b5cf5eeead8be35e7b8d97140d2443bd6309f4301d55ba418b60
-DIST tpctl_3.2.tar.gz 79506 RMD160 c32d91659f1182b1b80f94e94fb58dc57eff9030 SHA1 75b41bbe805fa8421e044a80ab0512b7a5329321 SHA256 803a044eb1295dd47023fba6a37e4c19fb3b3bd1d908c749bcb06ef5d93b948b
-DIST tpctl_4.16.tar.gz 79775 RMD160 c8adfde84a9e7c4f20bbebf3ac775aa38a0a31c3 SHA1 d0ed11b1ea384af1b0edf19dcaf71d4d62fda445 SHA256 9b1d2063d850857c4dcc45deba427fc5f1fffec1cebc045c33435b7719b0a24d
-DIST tpctl_4.17.tar.gz 79817 RMD160 65aa75308848d011f2b762ead227bd6a07415d5c SHA1 56fb446a73e39cb98536c0351f2e8c0461f16023 SHA256 74d6b9e60047e968dd06705d4db5eb1405c3c16634d794151d09b9177f39decd
-DIST tpctl_4.2.tar.gz 82900 RMD160 61fcc82850df3eee99767ef9e2d3860f6b0853c0 SHA1 ac3b40c7ce6abb68ac72e928b0a69caddc19814f SHA256 180d8844f73f2acba1836f6a75f113acda756540910bc2a1f09562ea88d09688
-DIST tpctl_4.4.tar.gz 83113 RMD160 c4d77da7d28eaf3cf6188ef0b22045a9f8d68ad4 SHA1 cf7ed11039af3eed3c663cc3e57688bcf37c6435 SHA256 6aa7b110cc53ca428ad8e198a5ae04a6d35134bf5ead602afb4bf3ed6b13ebe1
-DIST tpctl_4.8.tar.gz 89430 RMD160 cc012077fa8e24cc518ed850ea8fa528319e434c SHA1 9c3b0e5d754ce0573412ecba913f191ef6ea5603 SHA256 c80f75b819cb3edee56377e7900a851fe8e49b35ad52d8f0e9663973ef8b1ea3
-EBUILD tpctl-3.2.ebuild 1459 RMD160 3e47c092706fda7d5ed62a5bd07eaa3ef5ed3998 SHA1 b98bbd7be715739d64cbd370fde498422d627f76 SHA256 c2db8b0f946c56014a108fee0ac2e27374bf53bed7d098816f16cde32b1239c1
-EBUILD tpctl-4.16.ebuild 1021 RMD160 d5ec25bd36418c08f40ffb946057d5abcf0c19ca SHA1 5f951bad9a6df3f4e4ee9cc1c6171e06daed8435 SHA256 19853b74180bdc7c9b84f7659cff3f38dc0700993d3a968f54a9a98a23108a73
-EBUILD tpctl-4.17.ebuild 1021 RMD160 c5b150c2352486f72d7bbb105bd35f5b3645db1d SHA1 327c8198ae074c9d46d3e3f78c7518e05a8e6889 SHA256 04f0e312e461dd4646c4fea2e53a21e7e9aa50bcfc5e160ca6381f2f3faca8b8
-EBUILD tpctl-4.2.ebuild 1459 RMD160 2a6f4ab68e8050100ae12d4272db587c994a53cc SHA1 b6fa5d41270f3065694b7474c95ea9beccd754b0 SHA256 c653dc2fd35b7a00e6316ad8cd4ae8073450115d69cb2c90984ebdf866712306
-EBUILD tpctl-4.4-r1.ebuild 1606 RMD160 d4acba6c6357a39f421af94ef12766e98c4cd633 SHA1 bf2435233a3b2a364de6a7e637130e5a36e1f8cb SHA256 c33efdb62ec7e98e4e51215733d79e80728b67c34178d6a824ea9c0c86f19530
-EBUILD tpctl-4.4.ebuild 1457 RMD160 b6297d8cc05b24082bef56b01ad10f34cfec37fc SHA1 9df1a79632338d9d0a6fda085e67b27daf882bee SHA256 9a710238d032353258e3cbb84107aef7aeb82b9697b0db1559bd34df89c2be2d
-EBUILD tpctl-4.8.ebuild 1602 RMD160 14edffa24df1903ffc8b2c007e8c063dd6fb68d7 SHA1 ffc7383bbfbec00511e1d48133a78eb97fc7ebd3 SHA256 6dd747324fdfa85411230f83c170cd89759f321d767ac6f886f6e2dfcf6fbc1b
-MISC ChangeLog 3619 RMD160 3594cff5b70ea84d07c625903474d8ea769c65dd SHA1 502b6ae7a392d302cf5e02fed38ed4c1c8a4853d SHA256 3a7b2c775b89f3594753ba0a675054c8c72b0026d861dd9e85ea00d9e09d8cde
-MISC metadata.xml 249 RMD160 68208164186bc97f7b0a4540a3d3690d2a0f3ec0 SHA1 3376ed88da4569262a56b5d1725876ef26b89837 SHA256 19bfa1c88d530f2fe5346900ce3f67bdc9ed7a75f9913f201f7b43a32438c4a3
diff --git a/app-laptop/tpctl/files/apmiser.rc b/app-laptop/tpctl/files/apmiser.rc
deleted file mode 100644
index fb21fdd47a0c..000000000000
--- a/app-laptop/tpctl/files/apmiser.rc
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tpctl/files/apmiser.rc,v 1.2 2004/07/14 21:31:16 agriffis Exp $
-
-start() {
-	ebegin "Starting Thinkpad Battery Maximiser"
-	start-stop-daemon --start --background --quiet --make-pidfile \
-		--pidfile /var/run/apmiser.pid --exec /usr/sbin/apmiser
-	eend $?
-}
-
-stop () {
-	ebegin "Shutting down Thinkpad Battery Maximiser"
-	start-stop-daemon --stop --quiet --pid /var/run/apmiser.pid
-	eend $?
-}
diff --git a/app-laptop/tpctl/files/tpctlir-cli-4.4-r1.diff b/app-laptop/tpctl/files/tpctlir-cli-4.4-r1.diff
deleted file mode 100644
index 1eec002ab9d8..000000000000
--- a/app-laptop/tpctl/files/tpctlir-cli-4.4-r1.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ur tpctl-4.4/tpctlir/tpctlir.c tpctl-4.4/tpctlir/tpctlir.c
---- tpctl-4.4/tpctlir/tpctlir.c	2002-03-01 14:46:14.000000000 +0100
-+++ tpctl-4.4/tpctlir/tpctlir.c	2003-10-04 18:00:40.000000000 +0200
-@@ -1,6 +1,7 @@
- #include <asm/system.h>
- #include <sys/io.h>
- #include <stdio.h>
-+#include <string.h>
- 
- /*
-  * enable/disable IR on IBM ThinkPads with
-@@ -29,7 +30,7 @@
-         return 2;
-     }
- 
--    cli();
-+    asm("cli");
- 
-     val94 = inb(0x94);              /* POS mask register */
-     outb(0xfE, 0x94);               /* mask bit (0) for IR; changes enabled */
-@@ -44,7 +45,7 @@
-     outb(val94, 0x94);              /* restore POS mask to prevent changing */
-     outb(val94, 0x47);              /* pause */
- 
--    sti();
-+    asm("sti");
- 
-     return 0;
- }
diff --git a/app-laptop/tpctl/metadata.xml b/app-laptop/tpctl/metadata.xml
deleted file mode 100644
index 5b84f883d1a8..000000000000
--- a/app-laptop/tpctl/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>mobile</herd>
-<use>
-  <flag name='tpctlir'>Enable support for thinkpad models 760 and 765</flag>
-</use>
-</pkgmetadata>
diff --git a/app-laptop/tpctl/tpctl-3.2.ebuild b/app-laptop/tpctl/tpctl-3.2.ebuild
deleted file mode 100644
index e70331df5c73..000000000000
--- a/app-laptop/tpctl/tpctl-3.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tpctl/tpctl-3.2.ebuild,v 1.6 2010/01/01 21:12:27 ssuominen Exp $
-
-#transform P to match tarball versioning
-MYPV=${PV/_beta/beta}
-MYP="${PN}_${MYPV}"
-KV=""
-
-DESCRIPTION="Thinkpad system control user space programs"
-HOMEPAGE="http://tpctl.sourceforge.net/tpctlhome.htm"
-SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE="ncurses tpctlir perl"
-
-DEPEND="app-laptop/thinkpad
-	ncurses? ( sys-libs/ncurses )"
-RDEPEND="${DEPEND}
-	perl? ( dev-lang/perl )"
-
-src_compile() {
-	emake -C lib || die "lib make failed"
-	emake -C tpctl || die "tpctl make failed"
-	if use ncurses ; then
-		emake -C ntpctl || die "ntpctl make failed"
-	fi
-
-	# Only for thinkpad models 760 and 765
-	# build with:
-	# $ USE=tpctlir emerge tpctl
-	if use tpctlir ; then
-		emake -C tpctlir || die "tpctlir make failed"
-	fi
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog README SUPPORTED-MODELS TROUBLESHOOTING VGA-MODES
-	dolib lib/libsmapidev.so.1.0
-	dobin tpctl/tpctl
-	[ -e ntpctl/ntpctl ] && dobin ntpctl/ntpctl
-	if use tpctlir &&  [ -e tpctlir/tpctlir ]; then
-		mv tpctlir/README README.tpctlir
-		dodoc README.tpctlir
-		dobin tpctlir/tpctlir
-	fi
-	if use perl ; then
-		mv apmiser/README README.apmiser
-		dodoc README.apmiser
-		dosbin apmiser/apmiser
-		newinitd "${FILESDIR}"/apmiser.rc apmiser
-	fi
-}
diff --git a/app-laptop/tpctl/tpctl-4.16.ebuild b/app-laptop/tpctl/tpctl-4.16.ebuild
deleted file mode 100644
index b502c5412616..000000000000
--- a/app-laptop/tpctl/tpctl-4.16.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tpctl/tpctl-4.16.ebuild,v 1.3 2010/01/01 21:12:27 ssuominen Exp $
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="Thinkpad system control user space programs"
-
-HOMEPAGE="http://tpctl.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-IUSE="tpctlir"
-
-DEPEND="app-laptop/thinkpad
-		dev-lang/perl
-		sys-libs/ncurses"
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use tpctlir; then
-		emake -C tpctlir || die "emake -C tpctlir failed"
-	fi
-}
-
-src_install() {
-	if use tpctlir; then
-		dodir /usr/sbin
-		newdoc tpctlir/README README.tpctlir
-		doman tpctlir/tpctlir.8
-	fi
-
-	emake DEST="${D}" install_libraries install_binaries install_man || die "emake install failed"
-
-	newinitd "${FILESDIR}"/apmiser.rc apmiser
-
-	dodoc ChangeLog SUPPORTED-MODELS TROUBLESHOOTING AUTHORS README VGA-MODES
-	newdoc apmiser/README README.apmiser
-}
diff --git a/app-laptop/tpctl/tpctl-4.17.ebuild b/app-laptop/tpctl/tpctl-4.17.ebuild
deleted file mode 100644
index 492839c8f382..000000000000
--- a/app-laptop/tpctl/tpctl-4.17.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tpctl/tpctl-4.17.ebuild,v 1.2 2010/01/01 21:12:27 ssuominen Exp $
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="Thinkpad system control user space programs"
-
-HOMEPAGE="http://tpctl.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-IUSE="tpctlir"
-
-DEPEND="app-laptop/thinkpad
-		dev-lang/perl
-		sys-libs/ncurses"
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use tpctlir; then
-		emake -C tpctlir || die "emake -C tpctlir failed"
-	fi
-}
-
-src_install() {
-	if use tpctlir; then
-		dodir /usr/sbin
-		newdoc tpctlir/README README.tpctlir
-		doman tpctlir/tpctlir.8
-	fi
-
-	emake DEST="${D}" install_libraries install_binaries install_man || die "emake install failed"
-
-	newinitd "${FILESDIR}"/apmiser.rc apmiser
-
-	dodoc ChangeLog SUPPORTED-MODELS TROUBLESHOOTING AUTHORS README VGA-MODES
-	newdoc apmiser/README README.apmiser
-}
diff --git a/app-laptop/tpctl/tpctl-4.2.ebuild b/app-laptop/tpctl/tpctl-4.2.ebuild
deleted file mode 100644
index e876036d4903..000000000000
--- a/app-laptop/tpctl/tpctl-4.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tpctl/tpctl-4.2.ebuild,v 1.6 2010/01/01 21:12:27 ssuominen Exp $
-
-#transform P to match tarball versioning
-MYPV=${PV/_beta/beta}
-MYP="${PN}_${MYPV}"
-
-DESCRIPTION="Thinkpad system control user space programs"
-HOMEPAGE="http://tpctl.sourceforge.net/tpctlhome.htm"
-SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE="ncurses tpctlir perl"
-
-DEPEND=">=app-laptop/thinkpad-4.1
-	ncurses? ( sys-libs/ncurses )"
-RDEPEND="${DEPEND}
-	perl? ( dev-lang/perl )"
-
-src_compile() {
-	emake -C lib || die "lib make failed"
-	emake -C tpctl || die "tpctl make failed"
-	if use ncurses ; then
-		emake -C ntpctl || die "ntpctl make failed"
-	fi
-
-	# Only for thinkpad models 760 and 765
-	# build with:
-	# $ USE=tpctlir emerge tpctl
-	if use tpctlir ; then
-		emake -C tpctlir || die "tpctlir make failed"
-	fi
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog README SUPPORTED-MODELS TROUBLESHOOTING VGA-MODES
-	dolib lib/libsmapidev.so.2.0
-	dobin tpctl/tpctl
-	[ -e ntpctl/ntpctl ] && dobin ntpctl/ntpctl
-	if use tpctlir &&  [ -e tpctlir/tpctlir ]; then
-		mv tpctlir/README README.tpctlir
-		dodoc README.tpctlir
-		dobin tpctlir/tpctlir
-	fi
-	if use perl ; then
-		mv apmiser/README README.apmiser
-		dodoc README.apmiser
-		dosbin apmiser/apmiser
-		newinitd "${FILESDIR}"/apmiser.rc apmiser
-	fi
-}
diff --git a/app-laptop/tpctl/tpctl-4.4-r1.ebuild b/app-laptop/tpctl/tpctl-4.4-r1.ebuild
deleted file mode 100644
index 1d724fa61ccc..000000000000
--- a/app-laptop/tpctl/tpctl-4.4-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tpctl/tpctl-4.4-r1.ebuild,v 1.7 2010/01/01 21:12:27 ssuominen Exp $
-
-inherit eutils
-
-#transform P to match tarball versioning
-MYPV=${PV/_beta/beta}
-MYP="${PN}_${MYPV}"
-
-DESCRIPTION="Thinkpad system control user space programs"
-HOMEPAGE="http://tpctl.sourceforge.net/tpctlhome.htm"
-SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE="ncurses tpctlir perl"
-
-DEPEND=">=app-laptop/thinkpad-4.3
-	ncurses? ( sys-libs/ncurses )"
-RDEPEND="${DEPEND}
-	perl? ( dev-lang/perl )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/tpctlir-cli-4.4-r1.diff
-}
-
-src_compile() {
-	emake -C lib || die "lib make failed"
-	emake -C tpctl || die "tpctl make failed"
-	if use ncurses ; then
-		emake -C ntpctl || die "ntpctl make failed"
-	fi
-
-	# Only for thinkpad models 760 and 765
-	# build with:
-	# $ USE=tpctlir emerge tpctl
-	if use tpctlir; then
-		emake -C tpctlir || die "tpctlir make failed"
-	fi
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog README SUPPORTED-MODELS TROUBLESHOOTING VGA-MODES
-	dolib lib/libsmapidev.so.2.0
-	dobin tpctl/tpctl
-	[ -e ntpctl/ntpctl ] && dobin ntpctl/ntpctl
-	if use tpctlir && [ -e tpctlir/tpctlir ]; then
-		mv tpctlir/README README.tpctlir
-		dodoc README.tpctlir
-		dobin tpctlir/tpctlir
-	fi
-	if use perl ; then
-		mv apmiser/README README.apmiser
-		dodoc README.apmiser
-		dosbin apmiser/apmiser
-		newinitd "${FILESDIR}"/apmiser.rc apmiser
-	fi
-	doman man/{ntpctl,tpctl}.1 man/apmiser.8
-}
diff --git a/app-laptop/tpctl/tpctl-4.4.ebuild b/app-laptop/tpctl/tpctl-4.4.ebuild
deleted file mode 100644
index e62b4a1dcc0f..000000000000
--- a/app-laptop/tpctl/tpctl-4.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tpctl/tpctl-4.4.ebuild,v 1.6 2010/01/01 21:13:26 ssuominen Exp $
-
-#transform P to match tarball versioning
-MYPV=${PV/_beta/beta}
-MYP="${PN}_${MYPV}"
-
-DESCRIPTION="Thinkpad system control user space programs"
-HOMEPAGE="http://tpctl.sourceforge.net/tpctlhome.htm"
-SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE="ncurses tpctlir perl"
-
-DEPEND=">=app-laptop/thinkpad-4.3
-	ncurses? ( sys-libs/ncurses )"
-RDEPEND="${DEPEND}
-	perl? ( dev-lang/perl )"
-
-src_compile() {
-	emake -C lib || die "lib make failed"
-	emake -C tpctl || die "tpctl make failed"
-	if use ncurses ; then
-		emake -C ntpctl || die "ntpctl make failed"
-	fi
-
-	# Only for thinkpad models 760 and 765
-	# build with:
-	# $ USE=tpctlir emerge tpctl
-	if use tpctlir; then
-		emake -C tpctlir || die "tpctlir make failed"
-	fi
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog README SUPPORTED-MODELS TROUBLESHOOTING VGA-MODES
-	dolib lib/libsmapidev.so.2.0
-	dobin tpctl/tpctl
-	[ -e ntpctl/ntpctl ] && dobin ntpctl/ntpctl
-	if use tpctlir && [ -e tpctlir/tpctlir ]; then
-		mv tpctlir/README README.tpctlir
-		dodoc README.tpctlir
-		dobin tpctlir/tpctlir
-	fi
-	if use perl ; then
-		mv apmiser/README README.apmiser
-		dodoc README.apmiser
-		dosbin apmiser/apmiser
-		newinitd "${FILESDIR}"/apmiser.rc apmiser
-	fi
-}
diff --git a/app-laptop/tpctl/tpctl-4.8.ebuild b/app-laptop/tpctl/tpctl-4.8.ebuild
deleted file mode 100644
index 62ca6cfb7ab9..000000000000
--- a/app-laptop/tpctl/tpctl-4.8.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tpctl/tpctl-4.8.ebuild,v 1.11 2010/01/01 21:13:26 ssuominen Exp $
-
-inherit eutils
-
-#transform P to match tarball versioning
-MYPV=${PV/_beta/beta}
-MYP="${PN}_${MYPV}"
-
-DESCRIPTION="Thinkpad system control user space programs"
-HOMEPAGE="http://tpctl.sourceforge.net/tpctlhome.htm"
-SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE="ncurses tpctlir perl"
-
-DEPEND=">=app-laptop/thinkpad-4.8
-	ncurses? ( sys-libs/ncurses )"
-RDEPEND="${DEPEND}
-	perl? ( dev-lang/perl )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/tpctlir-cli-4.4-r1.diff
-}
-
-src_compile() {
-	emake -C lib || die "lib make failed"
-	emake -C tpctl || die "tpctl make failed"
-	if use ncurses; then
-		emake -C ntpctl || die "ntpctl make failed"
-	fi
-
-	# Only for thinkpad models 760 and 765
-	# build with:
-	# $ USE=tpctlir emerge tpctl
-	if use tpctlir; then
-		emake -C tpctlir || die "tpctlir make failed"
-	fi
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog README SUPPORTED-MODELS TROUBLESHOOTING VGA-MODES
-	dolib lib/libsmapidev.so.2.0
-	dobin tpctl/tpctl
-	[ -e ntpctl/ntpctl ] && dobin ntpctl/ntpctl
-	if use tpctlir && [ -e tpctlir/tpctlir ]; then
-		mv tpctlir/README README.tpctlir
-		dodoc README.tpctlir
-		dobin tpctlir/tpctlir
-	fi
-	if use perl; then
-		mv apmiser/README README.apmiser
-		dodoc README.apmiser
-		dosbin apmiser/apmiser
-		newinitd "${FILESDIR}"/apmiser.rc apmiser
-	fi
-	doman man/{ntpctl,tpctl}.1 man/apmiser.8
-}