diff --git a/app-laptop/thinkpad/ChangeLog b/app-laptop/thinkpad/ChangeLog new file mode 100644 index 0000000..58cff8c --- /dev/null +++ b/app-laptop/thinkpad/ChangeLog @@ -0,0 +1,134 @@ +# ChangeLog for app-laptop/thinkpad +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/ChangeLog,v 1.19 2007/02/25 08:57:47 genstef Exp $ + + 25 Feb 2007; ChangeLog: + use KV_DIR only after pkg setup + + 10 Feb 2007; Steev Klimaszewski + -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 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 + +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 + thinkpad-5.9-r1.ebuild: + mark stable on x86, #131971 + +*thinkpad-5.9-r1 (25 Mar 2006) + + 25 Mar 2006; Steev Klimaszewski + +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 to + allow compilation with kernel 2.6.16. Closes bug #127453 + +*thinkpad-5.9 (18 Feb 2006) + + 18 Feb 2006; Steev Klimaszewski +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 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 thinkpad-5.8.ebuild: + Marked stable on x86 for bug #101488. + + 24 Dec 2005; Steev Klimaszewski metadata.xml: + Take over as maintainer. + +*thinkpad-5.8 (08 Jan 2005) + + 08 Jan 2005; Henrik Brix Andersen + +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 thinkpad-5.7.ebuild: + fix typo + +*thinkpad-5.7 (01 Oct 2004) + + 01 Oct 2004; Scott W Taylor +thinkpad-5.7.ebuild: + new source, plays nicely with 2.6 kernel + + 18 Jul 2004; Robin H. Johnson thinkpad-4.8.ebuild: + stable on x86. + + 29 Jun 2004; Aron Griffis thinkpad-4.8.ebuild: + glibc -> libc + +*thinkpad-3.2 (07 Mar 2004) + + 07 Mar 2004; Peter Johanson 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 : + Add thinkpad group for devfs #35706. + + 25 Dec 2003; Robin H. Johnson thinkpad-4.8.ebuild: + version bump + + 28 Nov 2003; Karl Trygve Kalleberg + 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 : + Add thinkpad group for devfs #35706. + + 27 Jun 2003; Karl Trygve Kalleberg thinkpad-4.3-r1.ebuild : + version bump, installs man page now. + +*thinkpad-4.3 (04 May 2003) + + 04 May 2003; Wout Mertens 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 thinkpad-4.1.ebuild : + This is definitely not for mips. + + 17 Feb 2003; Wout Mertens : + version bump and correct kernel version detection + +*thinkpad-3.2 (25 April 2002) + + 24 Feb 2003; Nicholas Wourms thinkpad-3.2.ebuild : + This is definitely not for mips. + + 21 Jul 2002; Mark Guertin : + updated keywords (-ppc) + + 14 Jul 2002; phoen][x thinkpad-3.2.ebuild : + Added LICENSE, KEYWORDS, SLOT. + + 25 April 2002; Wout Mertens 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 new file mode 100644 index 0000000..240071b --- /dev/null +++ b/app-laptop/thinkpad/Manifest @@ -0,0 +1,32 @@ +AUX thinkpad 545 RMD160 6ac014699371fccc7387315fbaf09080e5368977 SHA1 aa90a5ae350609c3aa51ee9d94aa77aecfe89b71 SHA256 f33d6e2fd998bc4dad0f372c9f2ab139369b415ecff5489c41944fc35decb5ee +MD5 26886c3a2e8b9c3b807371e643dd5c75 files/thinkpad 545 +RMD160 6ac014699371fccc7387315fbaf09080e5368977 files/thinkpad 545 +SHA256 f33d6e2fd998bc4dad0f372c9f2ab139369b415ecff5489c41944fc35decb5ee files/thinkpad 545 +AUX thinkpad-5.9-module-param.patch 992 RMD160 80bc42d8d92da4174e6e9d23f733f3658c9e1a7f SHA1 6cd5facfcb3d9745f769bc7422e917e8acd39014 SHA256 4bc08dae456cf96bcfcaf416967657c079982b38a1b89ec6d71b684f2a4688bf +MD5 4ad05575956f8ff9619a3a2084dea724 files/thinkpad-5.9-module-param.patch 992 +RMD160 80bc42d8d92da4174e6e9d23f733f3658c9e1a7f files/thinkpad-5.9-module-param.patch 992 +SHA256 4bc08dae456cf96bcfcaf416967657c079982b38a1b89ec6d71b684f2a4688bf files/thinkpad-5.9-module-param.patch 992 +AUX thinkpad-5.9-remove-inter_module.patch 5974 RMD160 12ff7660f880fb2b731f5aa02d5a45861eb59e6f SHA1 f75ad677eb158c0b82fb005b530a94cc9b1b7dd5 SHA256 f75291cbc0aac1cbc5531be6788e343682684d80562d7a82ec6d4c6759925418 +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 +AUX thinkpad-5.9-remove-thinkpadapm-argument.patch 1052 RMD160 e1c7831dea7ace73cb619005ade0652d6b0ab992 SHA1 527c9c690da0ab3ae5d42c0c0a0ec4a2534a589b SHA256 57fe17e7d1644f16815d8b052efd8a5cbd34564b5539247b57a23f27a05eb1c8 +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 +DIST thinkpad-5.9.tar.gz 74779 RMD160 93d3d8ff6d64191ff07252654489a9bc5d878457 SHA1 c3f88d36ed39f83e6d888c9d174de9bc80724ea6 SHA256 49d2eab42e57d71cb0f175a645c703fce458a852552842ea56e0c81547d8f715 +EBUILD thinkpad-5.9-r1.ebuild 1384 RMD160 5d2e9faa1a8fe0814a8965dd6e2f1f9b8275eb2c SHA1 ee833b148edd82dfed09be2e9dc27f01a1e66889 SHA256 aa1a09488ffc6886a6bd4d7c99e2a67998c9ae3adc11a035405bd74038fe8683 +MD5 68d6cc6df3a3f174efe751ee3c80fde9 thinkpad-5.9-r1.ebuild 1384 +RMD160 5d2e9faa1a8fe0814a8965dd6e2f1f9b8275eb2c thinkpad-5.9-r1.ebuild 1384 +SHA256 aa1a09488ffc6886a6bd4d7c99e2a67998c9ae3adc11a035405bd74038fe8683 thinkpad-5.9-r1.ebuild 1384 +MISC ChangeLog 5019 RMD160 9bf12e95f022433d429a8d78849c01bbe3701b6c SHA1 ca6259466bfaba5bcce4d056b4d241a5145b6cc4 SHA256 5d48816497c12526473978a435d6621868b5c06b78e9fd82adb3d7f564695c40 +MD5 9a2b0676019a1e22456f4fbf15ad2bcd ChangeLog 5019 +RMD160 9bf12e95f022433d429a8d78849c01bbe3701b6c ChangeLog 5019 +SHA256 5d48816497c12526473978a435d6621868b5c06b78e9fd82adb3d7f564695c40 ChangeLog 5019 +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 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 diff --git a/app-laptop/thinkpad/files/digest-thinkpad-5.9-r1 b/app-laptop/thinkpad/files/digest-thinkpad-5.9-r1 new file mode 100644 index 0000000..ee4c585 --- /dev/null +++ b/app-laptop/thinkpad/files/digest-thinkpad-5.9-r1 @@ -0,0 +1,3 @@ +MD5 9cd4e86277bb7baeca97e93f57f49e87 thinkpad-5.9.tar.gz 74779 +RMD160 93d3d8ff6d64191ff07252654489a9bc5d878457 thinkpad-5.9.tar.gz 74779 +SHA256 49d2eab42e57d71cb0f175a645c703fce458a852552842ea56e0c81547d8f715 thinkpad-5.9.tar.gz 74779 diff --git a/app-laptop/thinkpad/files/thinkpad b/app-laptop/thinkpad/files/thinkpad new file mode 100644 index 0000000..c333d88 --- /dev/null +++ b/app-laptop/thinkpad/files/thinkpad @@ -0,0 +1,15 @@ +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-module-param.patch b/app-laptop/thinkpad/files/thinkpad-5.9-module-param.patch new file mode 100644 index 0000000..e573b59 --- /dev/null +++ b/app-laptop/thinkpad/files/thinkpad-5.9-module-param.patch @@ -0,0 +1,18 @@ +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 new file mode 100644 index 0000000..952d849 --- /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 0000000..62f5d82 --- /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/metadata.xml b/app-laptop/thinkpad/metadata.xml new file mode 100644 index 0000000..9701f17 --- /dev/null +++ b/app-laptop/thinkpad/metadata.xml @@ -0,0 +1,9 @@ + + + + mobile + + steev@gentoo.org + Steev Klimaszewski + + diff --git a/app-laptop/thinkpad/thinkpad-5.9-r1.ebuild b/app-laptop/thinkpad/thinkpad-5.9-r1.ebuild new file mode 100644 index 0000000..036ab2b --- /dev/null +++ b/app-laptop/thinkpad/thinkpad-5.9-r1.ebuild @@ -0,0 +1,62 @@ +# 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.5 2007/02/25 08:57:47 genstef 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 + + kernel_is ge 2 6 0 && epatch "${FILESDIR}"/${P}-module-param.patch +} + +src_install() { + set_kvobj + + linux-mod_src_install + + dodoc AUTHORS ChangeLog SUPPORTED-MODELS TECHNOTES + + doman man/* +} diff --git a/media-sound/mt-daapd/Manifest b/media-sound/mt-daapd/Manifest new file mode 100644 index 0000000..1a58410 --- /dev/null +++ b/media-sound/mt-daapd/Manifest @@ -0,0 +1,16 @@ +AUX mt-daapd.conf.example 8404 RMD160 caaa958ce0d495c09ec219ef0284df2adb544b33 SHA1 f0039dff3f305db683b8210bbe0b8db2856779ae SHA256 09666e7653f09b96dcedec51124d7fae9801b0bd902646ed3bda10b8ec32c753 +MD5 52d1ad5e83c798afd782c336835cdf82 files/mt-daapd.conf.example 8404 +RMD160 caaa958ce0d495c09ec219ef0284df2adb544b33 files/mt-daapd.conf.example 8404 +SHA256 09666e7653f09b96dcedec51124d7fae9801b0bd902646ed3bda10b8ec32c753 files/mt-daapd.conf.example 8404 +AUX mt-daapd.init.2 1200 RMD160 b5dc96a1bf7c390d9a818ea5a8018ac6c1f8a90c SHA1 96187b2ca0ac89e5a69834df87c10997ae013cf5 SHA256 6e4336639ead7da81d659a289fad0600b30b112420016fd63bf426eeae2098a1 +MD5 674db97976bcc4e34df95a17ffe8750c files/mt-daapd.init.2 1200 +RMD160 b5dc96a1bf7c390d9a818ea5a8018ac6c1f8a90c files/mt-daapd.init.2 1200 +SHA256 6e4336639ead7da81d659a289fad0600b30b112420016fd63bf426eeae2098a1 files/mt-daapd.init.2 1200 +DIST mt-daapd-svn-1545.tar.gz 1281818 RMD160 5b986cb85628af11e0bdfb64886c806c7548fe6b SHA1 f29e0b135f959689498b503e053cb4110487ce62 SHA256 99e48c0e6caabcf82536164b9a09aee2fd9bceabf1d1883900f5ef4bf837640f +EBUILD mt-daapd-0.3.0_pre1545.ebuild 3795 RMD160 558279dcf26ec22cc91e7c6b57b671d1c80b2635 SHA1 36dc15c5a80006acf8633a6cb28db1ddec6486e4 SHA256 40e2b4aca4c1dfd3b844cf269242719f9903492c999722592ef79bcb92c11c3f +MD5 b71f9d9be0f3ada265bdc413d55ae6b5 mt-daapd-0.3.0_pre1545.ebuild 3795 +RMD160 558279dcf26ec22cc91e7c6b57b671d1c80b2635 mt-daapd-0.3.0_pre1545.ebuild 3795 +SHA256 40e2b4aca4c1dfd3b844cf269242719f9903492c999722592ef79bcb92c11c3f mt-daapd-0.3.0_pre1545.ebuild 3795 +MD5 b4fc03f5093424d06675344bb411f9c8 files/digest-mt-daapd-0.3.0_pre1545 256 +RMD160 b38d327a3946cbaafcf75d098642356fdcb24d76 files/digest-mt-daapd-0.3.0_pre1545 256 +SHA256 f01e4c7ebdcf8921b36eaef9e6631f99719f5e28a67e4dbdeaa9a5c4233bb142 files/digest-mt-daapd-0.3.0_pre1545 256 diff --git a/media-sound/mt-daapd/files/digest-mt-daapd-0.3.0_pre1545 b/media-sound/mt-daapd/files/digest-mt-daapd-0.3.0_pre1545 new file mode 100644 index 0000000..54771e4 --- /dev/null +++ b/media-sound/mt-daapd/files/digest-mt-daapd-0.3.0_pre1545 @@ -0,0 +1,3 @@ +MD5 d82ac2c53a83f1ca6abbf66546d895fd mt-daapd-svn-1545.tar.gz 1281818 +RMD160 5b986cb85628af11e0bdfb64886c806c7548fe6b mt-daapd-svn-1545.tar.gz 1281818 +SHA256 99e48c0e6caabcf82536164b9a09aee2fd9bceabf1d1883900f5ef4bf837640f mt-daapd-svn-1545.tar.gz 1281818 diff --git a/media-sound/mt-daapd/files/mt-daapd.conf.example b/media-sound/mt-daapd/files/mt-daapd.conf.example new file mode 100644 index 0000000..b4fe882 --- /dev/null +++ b/media-sound/mt-daapd/files/mt-daapd.conf.example @@ -0,0 +1,305 @@ +# $Id: mt-daapd.conf.example,v 1.1 2006/03/17 23:08:54 flameeyes Exp $ +# +# This is the mt-daapd config file. +# +# If you have problems or questions with the format of this file, +# direct your questions to rpedde@users.sourceforge.net. +# +# You can also check the website at http://mt-daapd.sourceforge.net, +# as there is a growing documentation library there, peer-supported +# forums and possibly more. +# + +[general] + +# +# web_root (required) +# +# Location of the admin web pages. +# +# If you installed from .RPM, .deb, or tarball with --prefix=/usr, then +# this is correct. +# +# If you installed from tarball without --prefix=/usr, then the correct +# path is probably /usr/local/share/mt-daapd/admin-root. +# + +web_root = /usr/share/mt-daapd/admin-root + +# +# port (required) +# +# What port to listen on. It is possible to use a different +# port, but this is the default iTunes port +# + +port = 3689 + +# +# admin_pw (required) +# +# This is the password to the administrative pages +# + +admin_pw = mt-daapd + + +# +# db_type (required) +# +# This is what kind of backend database to store the song +# info in. Valid choices are "sqlite" and "sqlite3". +# + +db_type = sqlite + +# +# db_parms +# +# This is any extra information the db needs to connect. +# in the case of sqlite and sqlite3, this is the name +# of the directory to store the database in +# +# If you installed from RPM or .deb, this path likely already +# exists. If not, then you must create it. The directory itself +# must be writable by the "runas" user. +# + +db_parms = /var/cache/mt-daapd + +# +# mp3_dir (required) +# +# Location of the mp3 files to share. Note that because the +# files are stored in the database by inode, these must be +# in the same physical filesystem. +# + +mp3_dir = /mnt/mp3 + +# +# servername (required) +# +# This is both the name of the server as advertised +# via rendezvous, and the name of the database +# exported via DAAP. Also know as "What shows up in iTunes". +# + +servername = mt-daapd + +# +# runas (required) +# +# This is the user to drop privs to if running as +# root. If mt-daapd is not started as root, this +# configuration option is ignored. Notice that this +# must be specified whether the server is running +# as root or not. +# + +runas = nobody + +# +# playlist (optional) +# +# This is the location of a playlist file. +# This is for Apple-style "Smart Playlists" +# See the mt-daapd.playlist file in the +# contrib directory for syntax and examples +# +# This doesn't control static playlists... these +# are controlled with the "process_m3u" directive +# below. +# + +playlist = /etc/mt-daapd.playlist + +# +# password (optional) +# +# This is the password required to listen to MP3 files +# i.e. the password that iTunes prompts for +# + +#password = mp3 + +# +# extensions (optional) +# +# These are the file extensions that the daap server will +# try to index and serve. By default, it only indexes and +# serves .mp3 files. It can also server .m4a and .m4p files, +# and just about any other files, really. Unfortunately, while +# it can *attempt* to serve other files (.ogg?), iTunes won't +# play them. Perhaps this would be useful on Linux with +# Rhythmbox, once it understands daap. (hurry up!) +# +# Failing that, one can use server-side conversion to transcode +# non-standard (.ogg, .flac) music to wav on the server side. +# See the ssc_* options below. +# + +extensions = .mp3,.m4a,.m4p,.ogg + +# +# ssc_codectypes (optional) +# +# List of codectypes for files that the daap server should +# perform internal format conversion and present to clients +# as WAV files. The file extensions that these codectypes correspond +# to must also be present in 'extensions' +# configuration value, or files are not probed in the first +# place. +# +# Valid codectypes: +# +# mp4a - for AAC (.aac, .mp4, .m4a, .m4p) +# mpeg - for mp3 +# wav - for wav +# wma - for wma +# ogg - for ogg +# flac - for flac (.flac, .fla) +# mpc for musepack (.mpc, .mpp, .mp+) +# alac for alac (.m4a) +# + +ssc_codectypes = ogg,flac,alac + +# +# ssc_prog (optional) +# +# Program that is used in server side format conversion. +# Program must accept following command line syntax: +# ssc_prog filename offset length ... +# Parameter filename is the real name of the file that is +# to be converted and streamed, offset is number of bytes +# that are skipped from the beginning of the _output_ file +# before streaming is started, length is length of the song +# in seconds (or zero). All other possible arguments must +# be ignored. The resulting wav file (or the rest of +# the file after initial seek) is written to the standard +# output by the ssc_prog program. This is typically +# a script that is a front end for different conversion tools +# handling different formats. +# + +ssc_prog = /etc/mt-daapd-ssc-script + +# +# logfile (optional) +# +# This is the file to log to. If this is not configured, +# then it will log to the syslog. +# +# Not that the -d switch will control the log verbosity. +# By default, it runs at log level 1. Log level 9 will churn +# out scads of useless debugging information. Values in between +# will vary the amount of logging you get. +# + +#logfile = /var/log/mt-daapd.log + +# +# art_filename (optional) +# +# There is experimental support thanks to Hiren Joshi +# (hirenj@mooh.org) for dynamically adding art to the id3v2 +# header as it is streamed (!!). If you were using a music system +# like zina or andromeda, for example, with cover art called +# "_folderOpenImage.jpg", you could use the parameter +# art_file _folderOpenImage.jpg and if the file _folderOpenImage.jpg +# was located in the same folder as the .mp3 file, it would appear +# in iTunes. Cool, eh? +# + +#art_filename = _folderOpenImage.jpg + +# +# rescan_interval +# +# How often to check the file system to see if any mp3 files +# have been added or removed. +# +# if not specified, the default is 0, which disables background scanning. +# +# If background rescanning is disabled, a scan can still be forced from the +# "status" page of the administrative web interface +# +# Setting a rescan_interval lower than the time it takes to rescan +# won't hurt anything, it will just waste CPU, and make connect times +# to the daap server longer. +# +# + +#rescan_interval = 300 + +# always_scan +# +# The default behavior is not not do background rescans of the +# filesystem unless there are clients connected. The thought is to +# allow the drives to spin down unless they are in use. This might be +# of more importance in IDE drives that aren't designed to be run +# 24x7. Forcing a scan through the web interface will always work +# though, even if no users are connected. + +# always_scan = 0 + +# +# process_m3u +# +# By default m3u processing is turned off, since most m3u files +# sitting around in peoples mp3 directories have bad paths, and +# I hear about it. :) +# +# If you are sure your m3u files have good paths (i.e. unixly pathed, +# with relative paths relative to the directory the m3u is in), then +# you can turn on m3u processing by setting this directive to 1. +# +# I'm not sure "unixly" is a word, but you get the idea. +# + +# process_m3u = 0 + +# +# scan_type +# +# +# This sets how aggressively mp3 files should be scanned to determine +# file length. There are three values: +# +# 0 (Normal) +# Just scan the first mp3 frame to try and calculate size. This will +# be accurate for most files, but VBR files without an Xing tag will +# probably have wildly inaccurate file times. This is the default. +# +# 1 (Aggressive) +# This checks the bitrates of 10 frames in the middle of the song. +# This will still be inaccurate for VBR files without an Xing tag, +# but they probably won't be quite as inaccurate as 0. This takes +# more time, obviously, although the time hit will only happen the +# first time you scan a particular file. +# +# 2 (Painfully aggressive) +# This walks through the entire song, counting the number of frames. +# This should result in accurate song times, but will take the most +# time. Again, this will only have to be incurred the first time +# the file is indexed. +# + +# scan_type = 0 + +# +# compress +# +# Whether to use gzip content-encoding when transferring playlists etc. +# This was contributed as a patch by Ciamac Moallemi just prior to the 0.2.1 +# release, and as such, hasn't gotten as much testing as other features. +# +# This feature should substantially speed up transfers of large databases +# and playlists. +# +# It will eventually default to 1, but currently it defaults to 0. +# + +# compress = 0 + diff --git a/media-sound/mt-daapd/files/mt-daapd.init.2 b/media-sound/mt-daapd/files/mt-daapd.init.2 new file mode 100755 index 0000000..4f38b52 --- /dev/null +++ b/media-sound/mt-daapd/files/mt-daapd.init.2 @@ -0,0 +1,41 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/files/mt-daapd.init.2,v 1.2 2005/10/30 17:33:17 flameeyes Exp $ +# Somehow based on init.d file shipped with mt-daapd itself. +# +# You can run multiple copies of this service just symlinking them to +# mt-daapd., then it will load /etc/mt-daapd.d/.conf as config +# file. +# Remember to give them different logs and cache directories. +# +# The main instance (with no ) uses /etc/mt-daapd.conf + +CONF="${myservice##*.}" +if [[ -n ${CONF} && ${myservice} != "mt-daapd" ]]; then + PIDFILE="/var/run/mt-daapd.${CONF}.pid" + CONFFILE="/etc/mt-daapd.d/${CONF}.conf" +else + PIDFILE="/var/run/mt-daapd.pid" + CONFFILE="/etc/mt-daapd.conf" +fi + +depend() { + need net + #USEHOWL need mDNSResponder +} + +start() { + ebegin "Starting mt-daapd DAAP server" + start-stop-daemon --start --quiet --pidfile ${PIDFILE} \ + --exec /usr/sbin/mt-daapd -- -P ${PIDFILE} -c ${CONFFILE} + eend $? +} + +stop() { + ebegin "Stopping mt-daapd DAAP server" + start-stop-daemon --stop --quiet --pidfile ${PIDFILE} --signal 2 + eend $? + + rm -f ${PIDFILE} +} diff --git a/media-sound/mt-daapd/mt-daapd-0.3.0_pre1545.ebuild b/media-sound/mt-daapd/mt-daapd-0.3.0_pre1545.ebuild new file mode 100644 index 0000000..4f4d650 --- /dev/null +++ b/media-sound/mt-daapd/mt-daapd-0.3.0_pre1545.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/mt-daapd-0.3.0_pre1376.ebuild,v 1.3 2007/02/17 01:02:34 flameeyes Exp $ + +inherit eutils flag-o-matic base + +SVN="${PV#*pre}" + +if [[ -n ${SVN} ]] ; then + MY_P="${PN}-svn-${SVN}" + SRC_URI="http://nightlies.mt-daapd.org/${MY_P}.tar.gz" +else + MY_P="${P/_/-}" + SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" +fi + +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="A multi-threaded implementation of Apple's DAAP server" +HOMEPAGE="http://www.mt-daapd.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sh ~sparc ~x86" +IUSE="howl vorbis avahi sqlite3 flac ffmpeg" + +DEPEND="sys-libs/zlib + media-libs/libid3tag + !sqlite3? ( =dev-db/sqlite-2* ) + sqlite3? ( =dev-db/sqlite-3* ) + howl? ( !avahi? ( >=net-misc/howl-0.9.2 ) + avahi? ( net-dns/avahi ) ) + vorbis? ( media-libs/libvorbis ) + flac? ( media-libs/flac ) + ffmpeg? ( media-video/ffmpeg )" + +pkg_setup() { + if use howl && use avahi && ! built_with_use net-dns/avahi howl-compat; then + eerror "You requested avahi support, but this package requires" + eerror "the howl-compat support enabled in net-dns/avahi to work" + eerror "with it." + eerror + eerror "Please recompile net-dns/avahi with +howl-compat." + die "Missing howl-compat support in avahi." + fi +} + +src_compile() { + local myconf="" + local howlincludes + + append-flags -fno-strict-aliasing + + # howl support? + if use howl; then + use avahi && \ + howlincludes="/usr/include/avahi-compat-howl" || \ + howlincludes="/usr/include/howl" + + myconf="${myconf} + --enable-howl + --with-howl-libs=/usr/$(get_libdir) + --with-howl-includes=${howlincludes}" + fi + + # Bug 65723 + if use vorbis; then + myconf="${myconf} --enable-oggvorbis" + fi + + econf \ + $(use_enable vorbis oggvorbis) \ + $(use_enable flac) \ + $(use_enable !sqlite3 sqlite) \ + $(use_enable sqlite3) \ + $(use_enable ffmpeg) \ + --with-ffmpeg-includes=/usr/include/ffmpeg \ + ${myconf} || die "configure failed" + emake || die "make failed" + + cp ${FILESDIR}/${PN}.init.2 ${WORKDIR}/initd + if ! use howl; then + sed -i -e '/#USEHOWL/d' ${WORKDIR}/initd + elif ! use avahi; then + sed -i -e 's:#USEHOWL ::' ${WORKDIR}/initd + else + sed -i -e 's:#USEHOWL ::; s:mDNSResponder:avahi-daemon:' ${WORKDIR}/initd + fi +} + +src_install() { + make DESTDIR=${D} install || die "make install failed" + + insinto /etc + newins ${FILESDIR}/mt-daapd.conf.example mt-daapd.conf.example + doins contrib/mt-daapd.playlist + + newinitd ${WORKDIR}/initd ${PN} + + keepdir /var/cache/mt-daapd /etc/mt-daapd.d + + dodoc AUTHORS CREDITS ChangeLog NEWS README TODO +} + +pkg_postinst() { + einfo + elog "You have to configure your mt-daapd.conf following" + elog "/etc/mt-daapd.conf.example file." + einfo + + if use howl; then + use avahi && \ + howlservice="avahi-daemon" || \ + howlservice="mDNSResponder" + + einfo + elog "Since you want to use howl instead of the internal mdnsd" + elog "you need to make sure that you have ${howlservice} configured" + elog "and running to use mt-daapd." + einfo + + if use avahi; then + elog "Avahi support is currently experimental, it does not work" + elog "as intended when using more than one mt-daapd instance." + elog "If you want to run more than one mt-daapd, just use the" + elog "internal mdnsd by building with -howl flag." + fi + fi + + if use vorbis; then + einfo + elog "You need to edit you extensions list in /etc/mt-daapd.conf" + elog "if you want your mt-daapd to serve ogg files." + einfo + fi + + einfo + elog "If you want to start more than one ${PN} service, symlink" + elog "/etc/init.d/${PN} to /etc/init.d/${PN}., and it will" + elog "load the data from /etc/${PN}.d/.conf." + elog "Make sure that you have different cache directories for them." + einfo +}