version bump, mqueue has been merged back into head, remove old ebuilds

Package-Manager: portage-2.1_pre6-r4

16 files changed, 523 insertions, 540 deletions

diff --git a/net-dialup/misdn/ChangeLog b/net-dialup/misdn/ChangeLog
index 1b0ee067ca82..00cdc758e7c3 100644
--- a/net-dialup/misdn/ChangeLog
+++ b/net-dialup/misdn/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dialup/misdn
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/ChangeLog,v 1.8 2006/02/28 00:12:54 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/ChangeLog,v 1.9 2006/03/21 20:47:39 genstef Exp $
+
+*misdn-20060321 (21 Mar 2006)
+
+  21 Mar 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/module-param.diff, +files/packed.diff, -misdn-20050409.ebuild,
+  -misdn-20050508.ebuild, -misdn-20050514.ebuild, -misdn-20050519.ebuild,
+  -misdn-20051228.ebuild, -misdn-20060222.ebuild, +misdn-20060321.ebuild:
+  version bump, mqueue has been merged back into head, remove old ebuilds
 
 *misdn-20060222 (28 Feb 2006)
 
diff --git a/net-dialup/misdn/Manifest b/net-dialup/misdn/Manifest
index dc01885681a1..7f6aaf032ffe 100644
--- a/net-dialup/misdn/Manifest
+++ b/net-dialup/misdn/Manifest
@@ -1,60 +1,36 @@
-MD5 108adbf9bffe94a8ead946fac701962e ChangeLog 1543
-RMD160 269aa4fdeab29d25f173926542dd0e1c178297e8 ChangeLog 1543
-SHA256 7a79573ed8fbf28c18f503472053ecd83671cb0cc930844a5ffcc4b3451a4939 ChangeLog 1543
+MD5 44b626273bea669ea557ef040612873c ChangeLog 1922
+RMD160 a51c88e1095257c84354fa41c6e757db787f25de ChangeLog 1922
+SHA256 681e7ecd86914cbb6e2d3ae268322efb864af400ec7c5b051a15745e4ef6b953 ChangeLog 1922
 MD5 4be2313e0dafa1a491fc57e2bf3edca8 files/README.hfcmulti 2488
 RMD160 6c4e62fdfd6ce872b0ec270271ce97954c6374f4 files/README.hfcmulti 2488
 SHA256 29793879cd9a752fb1f71e9f9aebc8988024b5ec8cdb53d0d551fc75ade0377f files/README.hfcmulti 2488
 MD5 591b7a0690f210221ae79ac9f1ae5633 files/change-pci_find_subsys-to-pci_get_subsys.patch 919
 RMD160 6ffab592dd7b8ab20108051bf10bebdfbc9d878b files/change-pci_find_subsys-to-pci_get_subsys.patch 919
 SHA256 cc307bf4fb73140c86fe3999c48756ebbf8aca3dbf230eb0263c4787b1f1197e files/change-pci_find_subsys-to-pci_get_subsys.patch 919
-MD5 9b0b0d0760eb4e9f26bd420c16a1dc5d files/digest-misdn-20050409 73
-RMD160 63bdec9b3787b2e2f91756eed6b9cb99f15fba66 files/digest-misdn-20050409 73
-SHA256 148e4abe4e3ce0d6da457ca3ca1ac7ea01f1020a2db56310ea32cbb2cc33095e files/digest-misdn-20050409 73
-MD5 3df61544e763fc35f2001a51edfc6f3b files/digest-misdn-20050508 73
-RMD160 f563689454a0171f1b9e5fd1edaa032f453c032e files/digest-misdn-20050508 73
-SHA256 323f4fc5f264b38dbe6e4972ad6ff92cbbf73117c7e1f57f06fb1d456c5a336a files/digest-misdn-20050508 73
-MD5 be8104b2e9408328f43ee4fe05d6bab4 files/digest-misdn-20050514 73
-RMD160 7e43dd4c7ef8dec8dcb61ee8f5efa3093abc4eaf files/digest-misdn-20050514 73
-SHA256 cb0f96d3cb7204822e37c9fefed151b322559d367890e50ce78baf0add89eb1a files/digest-misdn-20050514 73
-MD5 92c3a36fcea882f904ffe816753b5447 files/digest-misdn-20050519 73
-RMD160 12a49e80e426e5b669eb7998ceaa090ae1b6ef7a files/digest-misdn-20050519 73
-SHA256 44cf8987a050896d1faa9106d56c33ede6ee72b62b9ccfcb865a09d37aa45d1f files/digest-misdn-20050519 73
 MD5 967da5f09499c4d24de3c6030bafd180 files/digest-misdn-20051017 73
 RMD160 dfc4a3895905fa877d95d82ee99c433180c599da files/digest-misdn-20051017 73
 SHA256 10efdfe963d51fbfe4d6bc3f2588f74b79f67a5374e8314b3d5c9e066e58f6b7 files/digest-misdn-20051017 73
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-misdn-20051228 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-misdn-20051228 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-misdn-20051228 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-misdn-20060222 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-misdn-20060222 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-misdn-20060222 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-misdn-20060321 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-misdn-20060321 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-misdn-20060321 0
 MD5 4966ea8f0ed13958aac99675523e0b57 files/misdn.modulesd 2909
 RMD160 c089a2a5f3032873f87df81bf1769b0016860ce4 files/misdn.modulesd 2909
 SHA256 682c4f299c3a5296b630f23dc3dd8e9d4902ebf5b90fb87987de8febe4b5afe8 files/misdn.modulesd 2909
+MD5 08f2bd140b69161d7f07e6a84536391f files/module-param.diff 10189
+RMD160 f6728b55df62bf01565ca64e79aaf51ed83edea9 files/module-param.diff 10189
+SHA256 105e066fcac2eaa5fdd1842928fd0e7a8899908959463b5a6a0db5b6a78233c7 files/module-param.diff 10189
 MD5 2e3de2a37e6ce9be6c8b7892a25de0a5 files/mqueue.modulesd 2900
 RMD160 9367f81188c53d71c02985c3adce3944eb6fb2a3 files/mqueue.modulesd 2900
 SHA256 9d7108a0e7c9cdb4bb721f8dd7c60e9aca64cec28031be533ad446007bb5fcb8 files/mqueue.modulesd 2900
+MD5 f575d20408bfa0a1b7fecc36d701ea9d files/packed.diff 6119
+RMD160 dab624bed851da2de70ba36c653c9b692d03df2a files/packed.diff 6119
+SHA256 c4c5e3df8d4ab87e1b691769f904ff7cb4b9cea0a8b873a968402be6737de8e3 files/packed.diff 6119
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163
 SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3 metadata.xml 163
-MD5 1788ac55437d5f1f6753542295913557 misdn-20050409.ebuild 3316
-RMD160 77e055ea860edabefc23468726662a88d6517546 misdn-20050409.ebuild 3316
-SHA256 b117e77572c19dfcdeda3e410aa1297c38bd5528205d292906b4aa4d8664060d misdn-20050409.ebuild 3316
-MD5 ebea3cc6a50b31c2733de19ec1898085 misdn-20050508.ebuild 3342
-RMD160 0bbc43a76cf4c6930b404ce32c6798bdfd741013 misdn-20050508.ebuild 3342
-SHA256 8587751eb7619caefec1f8a33c842dc3f3ff96f60358b155cbb2e2133e98a3b9 misdn-20050508.ebuild 3342
-MD5 4fa04d78d54dfa1346e895e697011466 misdn-20050514.ebuild 3342
-RMD160 d2e2cc15f8df9a3fe3a0cd386a76e77eed1ed24d misdn-20050514.ebuild 3342
-SHA256 e2d39240705959fe893655915dce09c7a7474e66c9e52c4b39f9f9283a00c219 misdn-20050514.ebuild 3342
-MD5 ec4d12a72b13796107b3f34417e2f80d misdn-20050519.ebuild 3342
-RMD160 d0330e923285564ab2961feb2f2bc86fa6bfff19 misdn-20050519.ebuild 3342
-SHA256 2e391bd662fa84dcf9ca3ad3962ed87e36699417362830ca705a21b5037c3075 misdn-20050519.ebuild 3342
 MD5 7c81f695492a9f6e97ce6a350e5a3194 misdn-20051017.ebuild 3531
 RMD160 aa32c5151756ae75fdc386f834e6a37224332e7f misdn-20051017.ebuild 3531
 SHA256 8b35082418c949a4be0820de2eb6537b2ba0e637de378cb89c3cc012524c47a8 misdn-20051017.ebuild 3531
-MD5 62df3397b4ec41da0abcc423ab262989 misdn-20051228.ebuild 3577
-RMD160 3f6c45bbf22c2a6517556262034d57be30d6f0fd misdn-20051228.ebuild 3577
-SHA256 8f8eb026848544e34df280b3ac6fdbebb4f0be2334cae452e51cd6cb203562b9 misdn-20051228.ebuild 3577
-MD5 60235849311475dced636d5f9ecc61c3 misdn-20060222.ebuild 3535
-RMD160 4cb8cca6dd3a7b3898bbe92763f8a2f3334ca9ea misdn-20060222.ebuild 3535
-SHA256 1257376e556f34e85126101f6d3e8ed63f477df14e581a7235d2657424f9bbe8 misdn-20060222.ebuild 3535
+MD5 e6d42dded9a5eb5d203d481e0cbe72d2 misdn-20060321.ebuild 3521
+RMD160 e7b013ee2ee4dbeb56cb0e0bad9e6fb0bccce53b misdn-20060321.ebuild 3521
+SHA256 1ac8d31e41642900ac33ee89d78f8e00650d00b00987b0f82311afd50092f6e3 misdn-20060321.ebuild 3521
diff --git a/net-dialup/misdn/files/digest-misdn-20050409 b/net-dialup/misdn/files/digest-misdn-20050409
deleted file mode 100644
index a7f37b0a3c11..000000000000
--- a/net-dialup/misdn/files/digest-misdn-20050409
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c12e84e162054a090250648eef318723 mISDN-CVS-2005-04-09.tar.bz2 256956
diff --git a/net-dialup/misdn/files/digest-misdn-20050508 b/net-dialup/misdn/files/digest-misdn-20050508
deleted file mode 100644
index dc34e57551c0..000000000000
--- a/net-dialup/misdn/files/digest-misdn-20050508
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d469094eb39a2d1a23ae18782d425eca mISDN-CVS-2005-05-08.tar.bz2 257039
diff --git a/net-dialup/misdn/files/digest-misdn-20050514 b/net-dialup/misdn/files/digest-misdn-20050514
deleted file mode 100644
index 37714bdb9fdc..000000000000
--- a/net-dialup/misdn/files/digest-misdn-20050514
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ec06e37802f86a2d0a3e98842e9108a5 mISDN-CVS-2005-05-14.tar.bz2 256773
diff --git a/net-dialup/misdn/files/digest-misdn-20050519 b/net-dialup/misdn/files/digest-misdn-20050519
deleted file mode 100644
index addeffb385c6..000000000000
--- a/net-dialup/misdn/files/digest-misdn-20050519
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9179beecd43171b750b7fff693fb829d mISDN-CVS-2005-05-19.tar.bz2 256813
diff --git a/net-dialup/misdn/files/digest-misdn-20060222 b/net-dialup/misdn/files/digest-misdn-20060222
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/net-dialup/misdn/files/digest-misdn-20060222
+++ /dev/null
diff --git a/net-dialup/misdn/files/digest-misdn-20051228 b/net-dialup/misdn/files/digest-misdn-20060321
index e69de29bb2d1..e69de29bb2d1 100644
--- a/net-dialup/misdn/files/digest-misdn-20051228
+++ b/net-dialup/misdn/files/digest-misdn-20060321
diff --git a/net-dialup/misdn/files/module-param.diff b/net-dialup/misdn/files/module-param.diff
new file mode 100644
index 000000000000..d5f0e3c2e6e3
--- /dev/null
+++ b/net-dialup/misdn/files/module-param.diff
@@ -0,0 +1,308 @@
+diff -urp mISDN.orig/avm_fritz.c mISDN/avm_fritz.c
+--- mISDN.orig/avm_fritz.c	2006-03-21 20:04:45.000000000 +0100
++++ mISDN/avm_fritz.c	2006-03-21 20:13:50.000000000 +0100
+@@ -932,7 +932,6 @@ static int init_card(fritzpnppci *fc)
+ }
+ 
+ #define MAX_CARDS	4
+-#define MODULE_PARM_T	"1-4i"
+ static int fritz_cnt;
+ static u_int protocol[MAX_CARDS];
+ static int layermask[MAX_CARDS];
+@@ -945,9 +944,9 @@ MODULE_AUTHOR("Karsten Keil");
+ #ifdef MODULE_LICENSE
+ MODULE_LICENSE("GPL");
+ #endif
+-MODULE_PARM(debug, "1i");
+-MODULE_PARM(protocol, MODULE_PARM_T);
+-MODULE_PARM(layermask, MODULE_PARM_T);
++module_param(debug, uint, S_IRUGO | S_IWUSR);
++module_param_array(protocol, uint, NULL, S_IRUGO | S_IWUSR);
++module_param_array(layermask, uint, NULL, S_IRUGO | S_IWUSR);
+ #endif
+ 
+ int
+diff -urp mISDN.orig/capi.c mISDN/capi.c
+--- mISDN.orig/capi.c	2006-03-21 20:04:45.000000000 +0100
++++ mISDN/capi.c	2006-03-21 20:04:55.000000000 +0100
+@@ -19,7 +19,7 @@ MODULE_AUTHOR("Karsten Keil");
+ #ifdef MODULE_LICENSE
+ MODULE_LICENSE("GPL");
+ #endif
+-MODULE_PARM(debug, "1i");
++module_param(debug, uint, S_IRUGO | S_IWUSR);
+ #endif
+ 
+ static char deb_buf[256];
+diff -urp mISDN.orig/dsp_core.c mISDN/dsp_core.c
+--- mISDN.orig/dsp_core.c	2006-03-21 20:04:45.000000000 +0100
++++ mISDN/dsp_core.c	2006-03-21 20:04:55.000000000 +0100
+@@ -192,9 +192,9 @@ int dsp_poll, dsp_tics;
+ 
+ #ifdef MODULE
+ MODULE_AUTHOR("Andreas Eversberg");
+-MODULE_PARM(debug, "1i");
+-MODULE_PARM(options, "1i");
+-MODULE_PARM(poll, "1i");
++module_param(debug, uint, S_IRUGO | S_IWUSR);
++module_param(options, uint, S_IRUGO | S_IWUSR);
++module_param(poll, uint, S_IRUGO | S_IWUSR);
+ #ifdef MODULE_LICENSE
+ MODULE_LICENSE("GPL");
+ #endif
+diff -urp mISDN.orig/faxl3.c mISDN/faxl3.c
+--- mISDN.orig/faxl3.c	2006-03-21 20:04:45.000000000 +0100
++++ mISDN/faxl3.c	2006-03-21 20:04:55.000000000 +0100
+@@ -1920,8 +1920,8 @@ static char MName[] = "FAXL3";
+ 
+ #ifdef MODULE
+ MODULE_AUTHOR("Karsten Keil");
+-MODULE_PARM(debug, "1i");
+-MODULE_PARM(ttt, "1i");
++module_param(debug, uint, S_IRUGO | S_IWUSR);
++module_param(ttt, uint, S_IRUGO | S_IWUSR);
+ #ifdef MODULE_LICENSE
+ MODULE_LICENSE("GPL");
+ #endif
+diff -urp mISDN.orig/hfc_multi.c mISDN/hfc_multi.c
+--- mISDN.orig/hfc_multi.c	2006-03-21 20:04:45.000000000 +0100
++++ mISDN/hfc_multi.c	2006-03-21 20:17:10.000000000 +0100
+@@ -207,8 +207,6 @@ static const PCI_ENTRY id_list[] =
+ /* NOTE: MAX_PORTS must be 8*MAX_CARDS */
+ #define MAX_CARDS	16
+ #define MAX_PORTS	128
+-#define MODULE_CARDS_T	"1-16i"
+-#define MODULE_PORTS_T	"1-128i" /* 16 cards can have 128 ports */
+ static u_int type[MAX_CARDS];
+ static BYTE allocated[MAX_CARDS];  // remember if card is found
+ static int pcm[MAX_PORTS];
+@@ -222,12 +220,12 @@ MODULE_AUTHOR("Andreas Eversberg");
+ #ifdef MODULE_LICENSE
+ MODULE_LICENSE("GPL");
+ #endif
+-MODULE_PARM(debug, "1i");
+-MODULE_PARM(poll, "1i");
+-MODULE_PARM(type, MODULE_CARDS_T);
+-MODULE_PARM(pcm, MODULE_CARDS_T);
+-MODULE_PARM(protocol, MODULE_PORTS_T);
+-MODULE_PARM(layermask, MODULE_PORTS_T);
++module_param(debug, uint, S_IRUGO | S_IWUSR);
++module_param(poll, uint, S_IRUGO | S_IWUSR);
++module_param_array(type, uint, NULL, S_IRUGO | S_IWUSR);
++module_param_array(pcm, uint, NULL, S_IRUGO | S_IWUSR);
++module_param_array(protocol, uint, NULL, S_IRUGO | S_IWUSR);
++module_param_array(layermask, uint, NULL, S_IRUGO | S_IWUSR);
+ #endif
+ 
+ static void
+diff -urp mISDN.orig/hfcs_mini.c mISDN/hfcs_mini.c
+--- mISDN.orig/hfcs_mini.c	2006-03-21 20:04:45.000000000 +0100
++++ mISDN/hfcs_mini.c	2006-03-21 20:17:54.000000000 +0100
+@@ -69,17 +69,15 @@ static int card_cnt;
+ static u_int protocol[MAX_CARDS];
+ static int layermask[MAX_CARDS];
+ 
+-#ifdef MODULE
+-MODULE_LICENSE("GPL");
+-#define MODULE_PARM_T	"1-8i"
+-MODULE_PARM(debug, "1i");
+-MODULE_PARM(protocol, MODULE_PARM_T);
+-MODULE_PARM(layermask, MODULE_PARM_T);
+-#endif
+-
+ static mISDNobject_t hw_mISDNObj;
+ static int debug = 0;
+ 
++#ifdef MODULE
++MODULE_LICENSE("GPL");
++module_param(debug, uint, S_IRUGO | S_IWUSR);
++module_param_array(protocol, uint, NULL, S_IRUGO | S_IWUSR);
++module_param_array(layermask, uint, NULL, S_IRUGO | S_IWUSR);
++#endif
+ 
+ #if HFCBRIDGE == BRIDGE_HFCPCI
+ 
+diff -urp mISDN.orig/hfcs_usb.c mISDN/hfcs_usb.c
+--- mISDN.orig/hfcs_usb.c	2006-03-21 20:04:45.000000000 +0100
++++ mISDN/hfcs_usb.c	2006-03-21 20:18:28.000000000 +0100
+@@ -42,7 +42,6 @@
+ const char *hfcsusb_rev = "$Revision: 1.1 $";
+ 
+ #define MAX_CARDS	8
+-#define MODULE_PARM_T	"1-8i"
+ static int hfcsusb_cnt;
+ static u_int protocol[MAX_CARDS] = {2,2,2,2,2,2,2,2};
+ static int layermask[MAX_CARDS];
+@@ -54,9 +53,9 @@ static int debug = 0x1FFFF; // 0;
+ #ifdef MODULE_LICENSE
+ MODULE_LICENSE("GPL");
+ #endif
+-MODULE_PARM(debug, "1i");
+-MODULE_PARM(protocol, MODULE_PARM_T);
+-MODULE_PARM(layermask, MODULE_PARM_T);
++module_param(debug, uint, S_IRUGO | S_IWUSR);
++module_param_array(protocol, uint, NULL, S_IRUGO | S_IWUSR);
++module_param_array(layermask, uint, NULL, S_IRUGO | S_IWUSR);
+ #endif
+ 
+ 
+diff -urp mISDN.orig/i4l_mISDN.c mISDN/i4l_mISDN.c
+--- mISDN.orig/i4l_mISDN.c	2006-03-21 20:04:45.000000000 +0100
++++ mISDN/i4l_mISDN.c	2006-03-21 20:04:55.000000000 +0100
+@@ -157,7 +157,7 @@ MODULE_AUTHOR("Karsten Keil");
+ #ifdef MODULE_LICENSE
+ MODULE_LICENSE("GPL");
+ #endif
+-MODULE_PARM(debug, "1i");
++module_param(debug, uint, S_IRUGO | S_IWUSR);
+ #endif
+ 
+ static void
+diff -urp mISDN.orig/l1oip.c mISDN/l1oip.c
+--- mISDN.orig/l1oip.c	2006-03-21 20:04:45.000000000 +0100
++++ mISDN/l1oip.c	2006-03-21 20:19:26.000000000 +0100
+@@ -238,7 +238,6 @@ static char l1oipName[] = "Layer1oIP";
+ /****************/
+ 
+ #define MAX_CARDS	16
+-#define MODULE_CARDS_T	"1-16i"
+ static u_int type[MAX_CARDS];
+ static u_int codec[MAX_CARDS];
+ static u_int protocol[MAX_CARDS];
+@@ -250,11 +249,11 @@ MODULE_AUTHOR("Andreas Eversberg");
+ #ifdef MODULE_LICENSE
+ MODULE_LICENSE("GPL");
+ #endif
+-MODULE_PARM(type, MODULE_CARDS_T);
+-MODULE_PARM(codec, MODULE_CARDS_T);
+-MODULE_PARM(protocol, MODULE_CARDS_T);
+-MODULE_PARM(layermask, MODULE_CARDS_T);
+-MODULE_PARM(debug, "1i");
++module_param_array(type, uint, NULL, S_IRUGO | S_IWUSR);
++module_param_array(codec, uint, NULL, S_IRUGO | S_IWUSR);
++module_param_array(protocol, uint, NULL, S_IRUGO | S_IWUSR);
++module_param_array(layermask, uint, NULL, S_IRUGO | S_IWUSR);
++module_param(debug, uint, S_IRUGO | S_IWUSR);
+ #endif
+ 
+ 
+diff -urp mISDN.orig/l3_udss1.c mISDN/l3_udss1.c
+--- mISDN.orig/l3_udss1.c	2006-03-21 20:04:45.000000000 +0100
++++ mISDN/l3_udss1.c	2006-03-21 20:04:55.000000000 +0100
+@@ -2922,7 +2922,7 @@ MODULE_AUTHOR("Karsten Keil");
+ #ifdef MODULE_LICENSE
+ MODULE_LICENSE("GPL");
+ #endif
+-MODULE_PARM(debug, "1i");
++module_param(debug, uint, S_IRUGO | S_IWUSR);
+ #endif
+ 
+ static int
+diff -urp mISDN.orig/layer1.c mISDN/layer1.c
+--- mISDN.orig/layer1.c	2006-03-21 20:04:45.000000000 +0100
++++ mISDN/layer1.c	2006-03-21 20:04:55.000000000 +0100
+@@ -737,7 +737,7 @@ static char MName[] = "ISDNL1";
+ 
+ #ifdef MODULE
+ MODULE_AUTHOR("Karsten Keil");
+-MODULE_PARM(debug, "1i");
++module_param(debug, uint, S_IRUGO | S_IWUSR);
+ #ifdef MODULE_LICENSE
+ MODULE_LICENSE("GPL");
+ #endif
+diff -urp mISDN.orig/layer2.c mISDN/layer2.c
+--- mISDN.orig/layer2.c	2006-03-21 20:04:45.000000000 +0100
++++ mISDN/layer2.c	2006-03-21 20:04:55.000000000 +0100
+@@ -2408,7 +2408,7 @@ MODULE_AUTHOR("Karsten Keil");
+ #ifdef MODULE_LICENSE
+ MODULE_LICENSE("GPL");
+ #endif
+-MODULE_PARM(debug, "1i");
++module_param(debug, uint, S_IRUGO | S_IWUSR);
+ #endif
+ 
+ static int
+diff -urp mISDN.orig/loop.c mISDN/loop.c
+--- mISDN.orig/loop.c	2006-03-21 20:04:45.000000000 +0100
++++ mISDN/loop.c	2006-03-21 20:04:55.000000000 +0100
+@@ -57,8 +57,8 @@ MODULE_AUTHOR("Andreas Eversberg");
+ #ifdef MODULE_LICENSE
+ MODULE_LICENSE("GPL");
+ #endif
+-MODULE_PARM(interfaces, "1i");
+-MODULE_PARM(debug, "1i");
++module_param(interfaces, uint, S_IRUGO | S_IWUSR);
++module_param(debug, uint, S_IRUGO | S_IWUSR);
+ #endif
+ 
+ 
+diff -urp mISDN.orig/w6692.c mISDN/w6692.c
+--- mISDN.orig/w6692.c	2006-03-21 20:04:45.000000000 +0100
++++ mISDN/w6692.c	2006-03-21 20:20:28.000000000 +0100
+@@ -992,7 +992,6 @@ static int init_card(w6692pci *card)
+ }
+ 
+ #define MAX_CARDS	4
+-#define MODULE_PARM_T	"1-4i"
+ static int w6692_cnt;
+ static u_int protocol[MAX_CARDS];
+ static int layermask[MAX_CARDS];
+@@ -1007,11 +1006,11 @@ MODULE_AUTHOR("Karsten Keil");
+ #ifdef MODULE_LICENSE
+ MODULE_LICENSE("GPL");
+ #endif
+-MODULE_PARM(debug, "1i");
+-MODULE_PARM(led, MODULE_PARM_T);
+-MODULE_PARM(pots, MODULE_PARM_T);
+-MODULE_PARM(protocol, MODULE_PARM_T);
+-MODULE_PARM(layermask, MODULE_PARM_T);
++module_param(debug, uint, S_IRUGO | S_IWUSR);
++module_param_array(led, uint, NULL, S_IRUGO | S_IWUSR);
++module_param_array(pots, uint, NULL, S_IRUGO | S_IWUSR);
++module_param_array(protocol, uint, NULL, S_IRUGO | S_IWUSR);
++module_param_array(layermask, uint, NULL, S_IRUGO | S_IWUSR);
+ #endif
+ 
+ /******************************/
+diff -urp mISDN.orig/x25_dte.c mISDN/x25_dte.c
+--- mISDN.orig/x25_dte.c	2006-03-21 20:04:45.000000000 +0100
++++ mISDN/x25_dte.c	2006-03-21 20:04:55.000000000 +0100
+@@ -1256,7 +1256,7 @@ static char MName[] = "X25_DTE";
+ 
+ #ifdef MODULE
+ MODULE_AUTHOR("Karsten Keil");
+-MODULE_PARM(debug, "1i");
++module_param(debug, uint, S_IRUGO | S_IWUSR);
+ #ifdef MODULE_LICENSE
+ MODULE_LICENSE("GPL");
+ #endif
+diff -urp mISDN.orig/xhfc_su.c mISDN/xhfc_su.c
+--- mISDN.orig/xhfc_su.c	2006-03-21 20:04:45.000000000 +0100
++++ mISDN/xhfc_su.c	2006-03-21 20:21:06.000000000 +0100
+@@ -72,20 +72,18 @@ static int card_cnt;
+ static u_int protocol[MAX_CARDS * MAX_PORT];
+ static int layermask[MAX_CARDS * MAX_PORT];
+ 
++static mISDNobject_t hw_mISDNObj;
++static int debug = 0;
++
+ #ifdef MODULE
+ #ifdef MODULE_LICENSE
+ MODULE_LICENSE("GPL");
+ #endif
+-#define MODULE_PARM_T	"1-8i"
+-MODULE_PARM(debug, "1i");
+-MODULE_PARM(protocol, MODULE_PARM_T);
+-MODULE_PARM(layermask, MODULE_PARM_T);
++module_param(debug, uint, S_IRUGO | S_IWUSR);
++module_param_array(protocol, uint, NULL, S_IRUGO | S_IWUSR);
++module_param_array(layermask, uint, NULL, S_IRUGO | S_IWUSR);
+ #endif
+ 
+-static mISDNobject_t hw_mISDNObj;
+-static int debug = 0;
+-
+-
+ /* static function prototypes */
+ static void release_card(xhfc_pi * pi);
+ static void setup_fifo(xhfc_t * xhfc, __u8 fifo, __u8 conhdlc, __u8 subcfg,
diff --git a/net-dialup/misdn/files/packed.diff b/net-dialup/misdn/files/packed.diff
new file mode 100644
index 000000000000..79b33fff94c2
--- /dev/null
+++ b/net-dialup/misdn/files/packed.diff
@@ -0,0 +1,185 @@
+diff -upr mISDN.orig/drivers/isdn/hardware/mISDN/avm_fritz.c mISDN/drivers/isdn/hardware/mISDN/avm_fritz.c
+--- mISDN.orig/drivers/isdn/hardware/mISDN/avm_fritz.c	2006-03-21 20:38:47.000000000 +0100
++++ mISDN/drivers/isdn/hardware/mISDN/avm_fritz.c	2006-03-21 20:44:53.000000000 +0100
+@@ -103,17 +103,17 @@ enum {
+ 
+ struct hdlc_stat_reg {
+ #ifdef __BIG_ENDIAN
+-	u_char fill __attribute__((packed));
+-	u_char mode __attribute__((packed));
+-	u_char xml  __attribute__((packed));
+-	u_char cmd  __attribute__((packed));
++	u_char fill;
++	u_char mode;
++	u_char xml;
++	u_char cmd;
+ #else
+-	u_char cmd  __attribute__((packed));
+-	u_char xml  __attribute__((packed));
+-	u_char mode __attribute__((packed));
+-	u_char fill __attribute__((packed));
++	u_char cmd;
++	u_char xml;
++	u_char mode;
++	u_char fill;
+ #endif
+-};
++} __attribute__((packed));
+ 
+ typedef struct hdlc_hw {
+ 	union {
+diff -upr mISDN.orig/drivers/isdn/hardware/mISDN/ncci.c mISDN/drivers/isdn/hardware/mISDN/ncci.c
+--- mISDN.orig/drivers/isdn/hardware/mISDN/ncci.c	2006-03-21 20:38:47.000000000 +0100
++++ mISDN/drivers/isdn/hardware/mISDN/ncci.c	2006-03-21 20:45:40.000000000 +0100
+@@ -380,14 +380,14 @@ ncci_manufacturer_req(struct FsmInst *fi
+ 	_cmsg	*cmsg = arg;
+ 	int	err, op;
+ 	struct  _manu_conf_para {
+-			u8	len	__attribute__((packed));
+-			u16	Info	__attribute__((packed));
+-			u16	vol	__attribute__((packed));
++			u8	len;
++			u16	Info;
++			u16	vol;
+ 		} mcp = {2, CAPI_NOERROR,0};
+ 	struct  _manu_req_para {
+-			u8	len	__attribute__((packed));
+-			u16	vol	__attribute__((packed));
+-		} *mrp;
++			u8	len;
++			u16	vol;
++		} __attribute__((packed)) *mrp;
+ 
+ 	if (!ncci->appl)
+ 		return;
+diff -upr mISDN.orig/drivers/isdn/hardware/mISDN/x25_l3.h mISDN/drivers/isdn/hardware/mISDN/x25_l3.h
+--- mISDN.orig/drivers/isdn/hardware/mISDN/x25_l3.h	2006-03-21 20:38:47.000000000 +0100
++++ mISDN/drivers/isdn/hardware/mISDN/x25_l3.h	2006-03-21 20:46:14.000000000 +0100
+@@ -32,12 +32,12 @@ struct _x25_B3_cfg {
+ #define DEFAULT_X25_B3_CFG	{0, 0, 1, 1, 0, 0, 8, 2}
+ 
+ struct _x25_ncpi {
+-	__u8	len		__attribute__((packed));
+-	__u8	Flags		__attribute__((packed));
+-	__u8	Group		__attribute__((packed));
+-	__u8	Channel		__attribute__((packed));
+-	__u8	Contens[4]	__attribute__((packed)); /* Note this can be less/more bytes in use */ 
+-};
++	__u8	len;
++	__u8	Flags;
++	__u8	Group;
++	__u8	Channel;
++	__u8	Contens[4]; /* Note this can be less/more bytes in use */ 
++} __attribute__((packed));
+ 
+ struct _x25_ConfQueue { 
+ 	__u32		PktId; 
+diff -upr mISDN.orig/include/linux/mISDNif.h mISDN/include/linux/mISDNif.h
+--- mISDN.orig/include/linux/mISDNif.h	2006-03-21 20:38:47.000000000 +0100
++++ mISDN/include/linux/mISDNif.h	2006-03-21 20:41:30.000000000 +0100
+@@ -579,11 +579,11 @@
+ #define STATUS_INFO_L2	2
+ 
+ typedef struct _mISDN_head {
+-	u_int	addr __attribute__((packed));
+-	u_int	prim __attribute__((packed));
+-	int	dinfo __attribute__((packed));
+-	int	len __attribute__((packed));
+-} mISDN_head_t;
++	u_int	addr;
++	u_int	prim;
++	int	dinfo;
++	int	len;
++} __attribute__((packed)) mISDN_head_t;
+ 
+ #define mISDN_HEADER_LEN	sizeof(mISDN_head_t)
+ 
+@@ -693,47 +693,47 @@ typedef struct _ie_info_ext {
+ } __attribute__((packed)) ie_info_ext_t;
+ 
+ typedef struct _Q931_info {
+-	u_char		type __attribute__((packed));
+-	u_char		crlen __attribute__((packed));
+-	u16		cr __attribute__((packed));
+-	ie_info_t	bearer_capability __attribute__((packed));
+-	ie_info_t	cause __attribute__((packed));
+-	ie_info_t	call_id __attribute__((packed));
+-	ie_info_t	call_state __attribute__((packed));
+-	ie_info_t	channel_id __attribute__((packed));
+-	ie_info_t	facility __attribute__((packed));
+-	ie_info_t	progress __attribute__((packed));
+-	ie_info_t	net_fac __attribute__((packed));
+-	ie_info_t	notify __attribute__((packed));
+-	ie_info_t	display __attribute__((packed));
+-	ie_info_t	date __attribute__((packed));
+-	ie_info_t	keypad __attribute__((packed));
+-	ie_info_t	signal __attribute__((packed));
+-	ie_info_t	info_rate __attribute__((packed));
+-	ie_info_t	end2end_transit __attribute__((packed));
+-	ie_info_t	transit_delay_sel __attribute__((packed));
+-	ie_info_t	pktl_bin_para __attribute__((packed));
+-	ie_info_t	pktl_window __attribute__((packed));
+-	ie_info_t	pkt_size __attribute__((packed));
+-	ie_info_t	closed_userg __attribute__((packed));
+-	ie_info_t	connected_nr __attribute__((packed));
+-	ie_info_t	connected_sub __attribute__((packed));
+-	ie_info_t	calling_nr __attribute__((packed));
+-	ie_info_t	calling_sub __attribute__((packed));
+-	ie_info_t	called_nr __attribute__((packed));
+-	ie_info_t	called_sub __attribute__((packed));
+-	ie_info_t	redirect_nr __attribute__((packed));
+-	ie_info_t	transit_net_sel __attribute__((packed));
+-	ie_info_t	restart_ind __attribute__((packed));
+-	ie_info_t	llc __attribute__((packed));
+-	ie_info_t	hlc __attribute__((packed));
+-	ie_info_t	useruser __attribute__((packed));
+-	ie_info_t	more_data __attribute__((packed));
+-	ie_info_t	sending_complete __attribute__((packed));
+-	ie_info_t	congestion_level __attribute__((packed));
+-	ie_info_t	fill1 __attribute__((packed));
+-	ie_info_ext_t	ext[8] __attribute__((packed));
+-} Q931_info_t;
++	u_char		type;
++	u_char		crlen;
++	u16		cr;
++	ie_info_t	bearer_capability;
++	ie_info_t	cause;
++	ie_info_t	call_id;
++	ie_info_t	call_state;
++	ie_info_t	channel_id;
++	ie_info_t	facility;
++	ie_info_t	progress;
++	ie_info_t	net_fac;
++	ie_info_t	notify;
++	ie_info_t	display;
++	ie_info_t	date;
++	ie_info_t	keypad;
++	ie_info_t	signal;
++	ie_info_t	info_rate;
++	ie_info_t	end2end_transit;
++	ie_info_t	transit_delay_sel;
++	ie_info_t	pktl_bin_para;
++	ie_info_t	pktl_window;
++	ie_info_t	pkt_size;
++	ie_info_t	closed_userg;
++	ie_info_t	connected_nr;
++	ie_info_t	connected_sub;
++	ie_info_t	calling_nr;
++	ie_info_t	calling_sub;
++	ie_info_t	called_nr;
++	ie_info_t	called_sub;
++	ie_info_t	redirect_nr;
++	ie_info_t	transit_net_sel;
++	ie_info_t	restart_ind;
++	ie_info_t	llc;
++	ie_info_t	hlc;
++	ie_info_t	useruser;
++	ie_info_t	more_data;
++	ie_info_t	sending_complete;
++	ie_info_t	congestion_level;
++	ie_info_t	fill1;
++	ie_info_ext_t	ext[8];
++} __attribute__((packed)) Q931_info_t;
+ 
+ #define L3_EXTRA_SIZE	sizeof(Q931_info_t)
+ 
diff --git a/net-dialup/misdn/misdn-20050409.ebuild b/net-dialup/misdn/misdn-20050409.ebuild
deleted file mode 100644
index 2004abb27577..000000000000
--- a/net-dialup/misdn/misdn-20050409.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/misdn-20050409.ebuild,v 1.1 2005/04/24 13:37:58 genstef Exp $
-
-inherit eutils linux-mod
-
-MY_P=mISDN-CVS-${PV:0:4}-${PV:4:2}-${PV:6:2}
-DESCRIPTION="mISDN (modular ISDN) is the new ISDN stack of the linux kernel version 2.6."
-HOMEPAGE="http://www.isdn4linux.de/mISDN"
-SRC_URI="ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots/${MY_P}.tar.bz2
-	ftp://linux.mathematik.tu-darmstadt.de/pub/linux/mirrors/misc/isdn4linux/CVS-Snapshots/${MY_P}.tar.bz2
-	ftp://ftp.cs.tu-berlin.de/pub/net/isdn/isdn4linux/CVS-Snapshots/${MY_P}.tar.bz2
-	ftp://ftp.gwdg.de/pub/linux/isdn/isdn4linux/CVS-Snapshots/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-RDEPEND=">=net-dialup/capi4k-utils-20050322-r1"
-S=${WORKDIR}/${MY_P}/drivers/isdn/hardware/mISDN/
-
-MISDN_MODULES=("avmfritz" "hfcpci" "hfcmulti" "hfcsusb" "sedlfax" "w6692pci")
-MISDN_KCONFIG=("AVM_FRITZ" "HFCPCI" "HFCMULTI" "HFCUSB" "SPEEDFAX" "W6692" )
-
-pkg_setup() {
-	CONFIG_CHECK="ISDN_CAPI ISDN_CAPI_CAPI20 ISDN_CAPI_CAPIFS_BOOL"
-	linux-mod_pkg_setup
-	MODULE_NAMES="mISDN_capi(net:) mISDN_dtmf(net:) mISDN_l1(net:)
-	mISDN_x25dte(net:) l3udss1(net:) mISDN_core(net:) mISDN_isac(net:)
-	mISDN_l2(net:) faxl3(net:) mISDN_dsp(net:)"
-	BUILD_PARAMS="-C ${KV_DIR} SUBDIRS=${S} EXTRA_CFLAGS=-I${WORKDIR}/${MY_P}/include CONFIG_MISDN_DRV=m CONFIG_MISDN_DSP=y"
-	BUILD_TARGETS="modules"
-	#I4LmISDN(net:) does not compile :( CONFIG_I4L_CAPI_LAYER=m
-	# the i4l->capi simulation seems to be only for kernel 2.4
-
-	if [ -n "${MISDN_CARDS}" ]; then
-		#Check existence of user selected cards
-		for USERCARD in ${MISDN_CARDS} ; do
-			for ((CARD=0; CARD < ${#MISDN_MODULES[*]}; CARD++)); do
-				if [ "${USERCARD}" = "${MISDN_MODULES[CARD]}" ]; then
-					MODULE_NAMES="${MODULE_NAMES} ${MISDN_MODULES[CARD]}(net:)"
-					BUILD_PARAMS="${BUILD_PARAMS} CONFIG_MISDN_${MISDN_KCONFIG[CARD]}=y"
-					continue 2
-				fi
-			done
-			die "Module ${USERCARD} not present in ${P}"
-		done
-	else
-		einfo
-		einfo "You can control the modules which are built with the variable"
-		einfo "MISDN_CARDS which should contain a blank separated list"
-		einfo "of a selection from the following cards:"
-		einfo "   ${MISDN_MODULES[*]}"
-		einfo
-		ewarn "I give you the chance of hitting Ctrl-C and make the necessary"
-		ewarn "adjustments in /etc/make.conf."
-
-		# enable everything
-		for ((CARD=0; CARD < ${#MISDN_MODULES[*]}; CARD++)); do
-			MODULE_NAMES="${MODULE_NAMES} ${MISDN_MODULES[CARD]}(net:)"
-			BUILD_PARAMS="${BUILD_PARAMS} CONFIG_MISDN_${MISDN_KCONFIG[CARD]}=y"
-		done
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${MY_P}
-	kernel_is ge 2 6 10 && epatch ${FILESDIR}/change-pci_find_subsys-to-pci_get_subsys.patch
-}
-
-src_compile() {
-	mv Makefile.v2.6 Makefile
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /etc/modules.d
-	newins ${FILESDIR}/misdn.modulesd misdn
-
-	dodoc Kconfig.v2.6
-}
-
-pkg_postinst() {
-	update_depmod
-	update_modules
-
-	ewarn
-	ewarn "This driver is still under heavy development"
-	ewarn "Please report ebuild related bugs / wishes to http://bugs.gentoo.org"
-	ewarn "Please report driver bugs to the mISDN mailing-list:"
-	ewarn "    https://www.isdn4linux.de/mailman/listinfo/isdn4linux"
-}
diff --git a/net-dialup/misdn/misdn-20050508.ebuild b/net-dialup/misdn/misdn-20050508.ebuild
deleted file mode 100644
index 764717bad575..000000000000
--- a/net-dialup/misdn/misdn-20050508.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/misdn-20050508.ebuild,v 1.1 2005/05/08 21:10:40 genstef Exp $
-
-inherit eutils linux-mod
-
-MY_P=mISDN-CVS-${PV:0:4}-${PV:4:2}-${PV:6:2}
-DESCRIPTION="mISDN (modular ISDN) is the new ISDN stack of the linux kernel version 2.6."
-HOMEPAGE="http://www.isdn4linux.de/mISDN"
-SRC_URI="ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots/${MY_P}.tar.bz2
-	ftp://linux.mathematik.tu-darmstadt.de/pub/linux/mirrors/misc/isdn4linux/CVS-Snapshots/${MY_P}.tar.bz2
-	ftp://ftp.cs.tu-berlin.de/pub/net/isdn/isdn4linux/CVS-Snapshots/${MY_P}.tar.bz2
-	ftp://ftp.gwdg.de/pub/linux/isdn/isdn4linux/CVS-Snapshots/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-RDEPEND=">=net-dialup/capi4k-utils-20050322-r1"
-S=${WORKDIR}/${MY_P}/drivers/isdn/hardware/mISDN/
-
-MISDN_MODULES=("avmfritz" "hfcpci" "hfcmulti" "hfcsusb" "sedlfax" "w6692pci")
-MISDN_KCONFIG=("AVM_FRITZ" "HFCPCI" "HFCMULTI" "HFCUSB" "SPEEDFAX" "W6692" )
-
-pkg_setup() {
-	CONFIG_CHECK="ISDN_CAPI ISDN_CAPI_CAPI20 ISDN_CAPI_CAPIFS_BOOL"
-	linux-mod_pkg_setup
-	MODULE_NAMES="mISDN_capi(net:) mISDN_dtmf(net:) mISDN_l1(net:)
-	mISDN_x25dte(net:) l3udss1(net:) mISDN_core(net:) mISDN_isac(net:)
-	mISDN_l2(net:) faxl3(net:) mISDN_dsp(net:)"
-	BUILD_PARAMS="-C ${KV_DIR} SUBDIRS=${S} EXTRA_CFLAGS=-I${WORKDIR}/${MY_P}/include CONFIG_MISDN_DRV=m CONFIG_MISDN_DSP=y"
-	BUILD_TARGETS="modules"
-	#I4LmISDN(net:) does not compile :( CONFIG_I4L_CAPI_LAYER=m
-	# the i4l->capi simulation seems to be only for kernel 2.4
-
-	if [ -n "${MISDN_CARDS}" ]; then
-		#Check existence of user selected cards
-		for USERCARD in ${MISDN_CARDS} ; do
-			for ((CARD=0; CARD < ${#MISDN_MODULES[*]}; CARD++)); do
-				if [ "${USERCARD}" = "${MISDN_MODULES[CARD]}" ]; then
-					MODULE_NAMES="${MODULE_NAMES} ${MISDN_MODULES[CARD]}(net:)"
-					BUILD_PARAMS="${BUILD_PARAMS} CONFIG_MISDN_${MISDN_KCONFIG[CARD]}=y"
-					continue 2
-				fi
-			done
-			die "Module ${USERCARD} not present in ${P}"
-		done
-	else
-		einfo
-		einfo "You can control the modules which are built with the variable"
-		einfo "MISDN_CARDS which should contain a blank separated list"
-		einfo "of a selection from the following cards:"
-		einfo "   ${MISDN_MODULES[*]}"
-		einfo
-		ewarn "I give you the chance of hitting Ctrl-C and make the necessary"
-		ewarn "adjustments in /etc/make.conf."
-
-		# enable everything
-		for ((CARD=0; CARD < ${#MISDN_MODULES[*]}; CARD++)); do
-			MODULE_NAMES="${MODULE_NAMES} ${MISDN_MODULES[CARD]}(net:)"
-			BUILD_PARAMS="${BUILD_PARAMS} CONFIG_MISDN_${MISDN_KCONFIG[CARD]}=y"
-		done
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${MY_P}
-	kernel_is ge 2 6 10 && \
-		sed -i 's:pci_find_subsys:pci_get_subsys:g' \
-		drivers/isdn/hardware/mISDN/hfc_multi.c
-}
-
-src_compile() {
-	mv Makefile.v2.6 Makefile
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /etc/modules.d
-	newins ${FILESDIR}/misdn.modulesd misdn
-
-	dodoc Kconfig.v2.6
-}
-
-pkg_postinst() {
-	update_depmod
-	update_modules
-
-	ewarn
-	ewarn "This driver is still under heavy development"
-	ewarn "Please report ebuild related bugs / wishes to http://bugs.gentoo.org"
-	ewarn "Please report driver bugs to the mISDN mailing-list:"
-	ewarn "    https://www.isdn4linux.de/mailman/listinfo/isdn4linux"
-}
diff --git a/net-dialup/misdn/misdn-20050514.ebuild b/net-dialup/misdn/misdn-20050514.ebuild
deleted file mode 100644
index 65e044c29909..000000000000
--- a/net-dialup/misdn/misdn-20050514.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/misdn-20050514.ebuild,v 1.1 2005/05/16 08:53:37 genstef Exp $
-
-inherit eutils linux-mod
-
-MY_P=mISDN-CVS-${PV:0:4}-${PV:4:2}-${PV:6:2}
-DESCRIPTION="mISDN (modular ISDN) is the new ISDN stack of the linux kernel version 2.6."
-HOMEPAGE="http://www.isdn4linux.de/mISDN"
-SRC_URI="ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots/${MY_P}.tar.bz2
-	ftp://linux.mathematik.tu-darmstadt.de/pub/linux/mirrors/misc/isdn4linux/CVS-Snapshots/${MY_P}.tar.bz2
-	ftp://ftp.cs.tu-berlin.de/pub/net/isdn/isdn4linux/CVS-Snapshots/${MY_P}.tar.bz2
-	ftp://ftp.gwdg.de/pub/linux/isdn/isdn4linux/CVS-Snapshots/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-RDEPEND=">=net-dialup/capi4k-utils-20050322-r1"
-S=${WORKDIR}/${MY_P}/drivers/isdn/hardware/mISDN/
-
-MISDN_MODULES=("avmfritz" "hfcpci" "hfcmulti" "hfcsusb" "sedlfax" "w6692pci")
-MISDN_KCONFIG=("AVM_FRITZ" "HFCPCI" "HFCMULTI" "HFCUSB" "SPEEDFAX" "W6692" )
-
-pkg_setup() {
-	CONFIG_CHECK="ISDN_CAPI ISDN_CAPI_CAPI20 ISDN_CAPI_CAPIFS_BOOL"
-	linux-mod_pkg_setup
-	MODULE_NAMES="mISDN_capi(net:) mISDN_dtmf(net:) mISDN_l1(net:)
-	mISDN_x25dte(net:) l3udss1(net:) mISDN_core(net:) mISDN_isac(net:)
-	mISDN_l2(net:) faxl3(net:) mISDN_dsp(net:)"
-	BUILD_PARAMS="-C ${KV_DIR} SUBDIRS=${S} EXTRA_CFLAGS=-I${WORKDIR}/${MY_P}/include CONFIG_MISDN_DRV=m CONFIG_MISDN_DSP=y"
-	BUILD_TARGETS="modules"
-	#I4LmISDN(net:) does not compile :( CONFIG_I4L_CAPI_LAYER=m
-	# the i4l->capi simulation seems to be only for kernel 2.4
-
-	if [ -n "${MISDN_CARDS}" ]; then
-		#Check existence of user selected cards
-		for USERCARD in ${MISDN_CARDS} ; do
-			for ((CARD=0; CARD < ${#MISDN_MODULES[*]}; CARD++)); do
-				if [ "${USERCARD}" = "${MISDN_MODULES[CARD]}" ]; then
-					MODULE_NAMES="${MODULE_NAMES} ${MISDN_MODULES[CARD]}(net:)"
-					BUILD_PARAMS="${BUILD_PARAMS} CONFIG_MISDN_${MISDN_KCONFIG[CARD]}=y"
-					continue 2
-				fi
-			done
-			die "Module ${USERCARD} not present in ${P}"
-		done
-	else
-		einfo
-		einfo "You can control the modules which are built with the variable"
-		einfo "MISDN_CARDS which should contain a blank separated list"
-		einfo "of a selection from the following cards:"
-		einfo "   ${MISDN_MODULES[*]}"
-		einfo
-		ewarn "I give you the chance of hitting Ctrl-C and make the necessary"
-		ewarn "adjustments in /etc/make.conf."
-
-		# enable everything
-		for ((CARD=0; CARD < ${#MISDN_MODULES[*]}; CARD++)); do
-			MODULE_NAMES="${MODULE_NAMES} ${MISDN_MODULES[CARD]}(net:)"
-			BUILD_PARAMS="${BUILD_PARAMS} CONFIG_MISDN_${MISDN_KCONFIG[CARD]}=y"
-		done
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${MY_P}
-	kernel_is ge 2 6 10 && \
-		sed -i 's:pci_find_subsys:pci_get_subsys:g' \
-		drivers/isdn/hardware/mISDN/hfc_multi.c
-}
-
-src_compile() {
-	mv Makefile.v2.6 Makefile
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /etc/modules.d
-	newins ${FILESDIR}/misdn.modulesd misdn
-
-	dodoc Kconfig.v2.6
-}
-
-pkg_postinst() {
-	update_depmod
-	update_modules
-
-	ewarn
-	ewarn "This driver is still under heavy development"
-	ewarn "Please report ebuild related bugs / wishes to http://bugs.gentoo.org"
-	ewarn "Please report driver bugs to the mISDN mailing-list:"
-	ewarn "    https://www.isdn4linux.de/mailman/listinfo/isdn4linux"
-}
diff --git a/net-dialup/misdn/misdn-20050519.ebuild b/net-dialup/misdn/misdn-20050519.ebuild
deleted file mode 100644
index a1ac94fe6686..000000000000
--- a/net-dialup/misdn/misdn-20050519.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/misdn-20050519.ebuild,v 1.1 2005/05/30 19:00:12 genstef Exp $
-
-inherit eutils linux-mod
-
-MY_P=mISDN-CVS-${PV:0:4}-${PV:4:2}-${PV:6:2}
-DESCRIPTION="mISDN (modular ISDN) is the new ISDN stack of the linux kernel version 2.6."
-HOMEPAGE="http://www.isdn4linux.de/mISDN"
-SRC_URI="ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots/${MY_P}.tar.bz2
-	ftp://linux.mathematik.tu-darmstadt.de/pub/linux/mirrors/misc/isdn4linux/CVS-Snapshots/${MY_P}.tar.bz2
-	ftp://ftp.cs.tu-berlin.de/pub/net/isdn/isdn4linux/CVS-Snapshots/${MY_P}.tar.bz2
-	ftp://ftp.gwdg.de/pub/linux/isdn/isdn4linux/CVS-Snapshots/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-RDEPEND=">=net-dialup/capi4k-utils-20050322-r1"
-S=${WORKDIR}/${MY_P}/drivers/isdn/hardware/mISDN/
-
-MISDN_MODULES=("avmfritz" "hfcpci" "hfcmulti" "hfcsusb" "sedlfax" "w6692pci")
-MISDN_KCONFIG=("AVM_FRITZ" "HFCPCI" "HFCMULTI" "HFCUSB" "SPEEDFAX" "W6692" )
-
-pkg_setup() {
-	CONFIG_CHECK="ISDN_CAPI ISDN_CAPI_CAPI20 ISDN_CAPI_CAPIFS_BOOL"
-	linux-mod_pkg_setup
-	MODULE_NAMES="mISDN_capi(net:) mISDN_dtmf(net:) mISDN_l1(net:)
-	mISDN_x25dte(net:) l3udss1(net:) mISDN_core(net:) mISDN_isac(net:)
-	mISDN_l2(net:) faxl3(net:) mISDN_dsp(net:)"
-	BUILD_PARAMS="-C ${KV_DIR} SUBDIRS=${S} EXTRA_CFLAGS=-I${WORKDIR}/${MY_P}/include CONFIG_MISDN_DRV=m CONFIG_MISDN_DSP=y"
-	BUILD_TARGETS="modules"
-	#I4LmISDN(net:) does not compile :( CONFIG_I4L_CAPI_LAYER=m
-	# the i4l->capi simulation seems to be only for kernel 2.4
-
-	if [ -n "${MISDN_CARDS}" ]; then
-		#Check existence of user selected cards
-		for USERCARD in ${MISDN_CARDS} ; do
-			for ((CARD=0; CARD < ${#MISDN_MODULES[*]}; CARD++)); do
-				if [ "${USERCARD}" = "${MISDN_MODULES[CARD]}" ]; then
-					MODULE_NAMES="${MODULE_NAMES} ${MISDN_MODULES[CARD]}(net:)"
-					BUILD_PARAMS="${BUILD_PARAMS} CONFIG_MISDN_${MISDN_KCONFIG[CARD]}=y"
-					continue 2
-				fi
-			done
-			die "Module ${USERCARD} not present in ${P}"
-		done
-	else
-		einfo
-		einfo "You can control the modules which are built with the variable"
-		einfo "MISDN_CARDS which should contain a blank separated list"
-		einfo "of a selection from the following cards:"
-		einfo "   ${MISDN_MODULES[*]}"
-		einfo
-		ewarn "I give you the chance of hitting Ctrl-C and make the necessary"
-		ewarn "adjustments in /etc/make.conf."
-
-		# enable everything
-		for ((CARD=0; CARD < ${#MISDN_MODULES[*]}; CARD++)); do
-			MODULE_NAMES="${MODULE_NAMES} ${MISDN_MODULES[CARD]}(net:)"
-			BUILD_PARAMS="${BUILD_PARAMS} CONFIG_MISDN_${MISDN_KCONFIG[CARD]}=y"
-		done
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${MY_P}
-	kernel_is ge 2 6 10 && \
-		sed -i 's:pci_find_subsys:pci_get_subsys:g' \
-		drivers/isdn/hardware/mISDN/hfc_multi.c
-}
-
-src_compile() {
-	mv Makefile.v2.6 Makefile
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /etc/modules.d
-	newins ${FILESDIR}/misdn.modulesd misdn
-
-	dodoc Kconfig.v2.6
-}
-
-pkg_postinst() {
-	update_depmod
-	update_modules
-
-	ewarn
-	ewarn "This driver is still under heavy development"
-	ewarn "Please report ebuild related bugs / wishes to http://bugs.gentoo.org"
-	ewarn "Please report driver bugs to the mISDN mailing-list:"
-	ewarn "    https://www.isdn4linux.de/mailman/listinfo/isdn4linux"
-}
diff --git a/net-dialup/misdn/misdn-20051228.ebuild b/net-dialup/misdn/misdn-20051228.ebuild
deleted file mode 100644
index 8c54d1b65c1a..000000000000
--- a/net-dialup/misdn/misdn-20051228.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/misdn-20051228.ebuild,v 1.1 2006/01/01 17:35:07 genstef Exp $
-
-inherit eutils linux-mod cvs
-
-MY_P="mISDN"
-DESCRIPTION="mISDN is the new ISDN stack of the linux kernel 2.6 (mqueue branch)."
-HOMEPAGE="http://www.isdn4linux.de/mISDN"
-SRC_URI=""
-ECVS_SERVER="cvs.isdn4linux.de:/i4ldev"
-ECVS_MODULE="${MY_P}"
-ECVS_TOP_DIR="${DISTDIR}/cvs-src/${MY_P}"
-ECVS_BRANCH="mqueue"
-ECVS_PASS="readonly"
-ECVS_CO_OPTS="-D ${PV}"
-ECVS_UP_OPTS="-dP ${ECVS_CO_OPTS}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE=""
-RDEPEND=">=net-dialup/capi4k-utils-20050322-r1"
-S="${WORKDIR}/${MY_P}/drivers/isdn/hardware/mISDN"
-
-MISDN_MODULES=("avmfritz" "hfcpci" "hfcmulti" "hfcsusb" "hfcsmini" "xhfc" "sedlfax" "w6692pci")
-MISDN_KCONFIG=("AVM_FRITZ" "HFCPCI" "HFCMULTI" "HFCUSB" "HFCMINI" "XHFC" "SPEEDFAX" "W6692" )
-
-pkg_setup() {
-	CONFIG_CHECK="ISDN_CAPI ISDN_CAPI_CAPI20 ISDN_CAPI_CAPIFS_BOOL"
-	linux-mod_pkg_setup
-	MODULE_NAMES="mISDN_capi(net:) mISDN_dtmf(net:) mISDN_l1(net:)
-	mISDN_x25dte(net:) l3udss1(net:) mISDN_core(net:) mISDN_isac(net:)
-	mISDN_l2(net:) mISDN_dsp(net:)"
-	BUILD_PARAMS="-C ${KV_DIR} SUBDIRS=${S} MINCLUDES=${WORKDIR}/${MY_P}/include CONFIG_MISDN_DRV=m CONFIG_MISDN_DSP=y"
-	BUILD_TARGETS="modules"
-	#I4LmISDN(net:) does not compile :( CONFIG_I4L_CAPI_LAYER=m
-	# the i4l->capi simulation seems to be only for kernel 2.4
-
-	if [ -n "${MISDN_CARDS}" ]; then
-		#Check existence of user selected cards
-		for USERCARD in ${MISDN_CARDS} ; do
-			for ((CARD=0; CARD < ${#MISDN_MODULES[*]}; CARD++)); do
-				if [ "${USERCARD}" = "${MISDN_MODULES[CARD]}" ]; then
-					MODULE_NAMES="${MODULE_NAMES} ${MISDN_MODULES[CARD]}(net:)"
-					#[ "sedlfax" = "${MISDN_MODULES[CARD]}" ] && MODULE_NAMES="${MODULE_NAMES} faxl3(net:)"
-					BUILD_PARAMS="${BUILD_PARAMS} CONFIG_MISDN_${MISDN_KCONFIG[CARD]}=y"
-					continue 2
-				fi
-			done
-			die "Module ${USERCARD} not present in ${P}"
-		done
-	else
-		einfo
-		einfo "You can control the modules which are built with the variable"
-		einfo "MISDN_CARDS which should contain a blank separated list"
-		einfo "of a selection from the following cards:"
-		einfo "   ${MISDN_MODULES[*]}"
-		einfo
-		ewarn "I give you the chance of hitting Ctrl-C and make the necessary"
-		ewarn "adjustments in /etc/make.conf."
-
-		# enable everything
-		for ((CARD=0; CARD < ${#MISDN_MODULES[*]}; CARD++)); do
-			MODULE_NAMES="${MODULE_NAMES} ${MISDN_MODULES[CARD]}(net:)"
-			#[ "sedlfax" = "${MISDN_MODULES[CARD]}" ] && MODULE_NAMES="${MODULE_NAMES} faxl3(net:)"
-			BUILD_PARAMS="${BUILD_PARAMS} CONFIG_MISDN_${MISDN_KCONFIG[CARD]}=y"
-		done
-	fi
-}
-
-src_unpack() {
-	cvs_src_unpack
-	cd ${S}
-	mv Makefile.v2.6 Makefile
-	sed -i "s:^\s.owner = THIS_MODULE,$::" hfcs_usb.c || die 1
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/include/linux
-	doins "${WORKDIR}/${MY_P}/include/linux/"*.h
-
-	insinto /etc/modules.d
-	newins "${FILESDIR}/${ECVS_BRANCH}.modulesd" "${PN}"
-
-	dodir /etc/udev/rules.d
-	echo 'KERNEL="obj-*", NAME="mISDN", GROUP="dialout"' \
-		> "${D}/etc/udev/rules.d/53-${PN}.rules"
-
-	dodoc Kconfig.v2.6
-	dodoc "${WORKDIR}/${MY_P}/"*misdn-init
-	dodoc "${FILESDIR}/README.hfcmulti"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	ewarn
-	ewarn "This driver is still under heavy development"
-	ewarn "Please report ebuild related bugs / wishes to http://bugs.gentoo.org"
-	ewarn "Please report driver bugs to the mISDN mailing-list:"
-	ewarn "    https://www.isdn4linux.de/mailman/listinfo/isdn4linux"
-}
diff --git a/net-dialup/misdn/misdn-20060222.ebuild b/net-dialup/misdn/misdn-20060321.ebuild
index 2dc522c7b5d1..2c52b36c6419 100644
--- a/net-dialup/misdn/misdn-20060222.ebuild
+++ b/net-dialup/misdn/misdn-20060321.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/misdn-20060222.ebuild,v 1.1 2006/02/28 00:12:54 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/misdn-20060321.ebuild,v 1.1 2006/03/21 20:47:39 genstef Exp $
 
 inherit eutils linux-mod cvs
 
 MY_P="mISDN"
-DESCRIPTION="mISDN is the new ISDN stack of the linux kernel 2.6 (mqueue branch)."
+DESCRIPTION="mISDN is the new ISDN stack of the linux kernel 2.6."
 HOMEPAGE="http://www.isdn4linux.de/mISDN"
 SRC_URI=""
 ECVS_SERVER="cvs.isdn4linux.de:/i4ldev"
 ECVS_MODULE="${MY_P}"
-ECVS_BRANCH="mqueue"
 ECVS_PASS="readonly"
 ECVS_CO_OPTS="-D ${PV}"
 ECVS_UP_OPTS="-dP ${ECVS_CO_OPTS}"
@@ -70,9 +69,11 @@ pkg_setup() {
 
 src_unpack() {
 	cvs_src_unpack
+	cd ${WORKDIR}/mISDN
+	epatch ${FILESDIR}/packed.diff
 	cd ${S}
 	mv Makefile.v2.6 Makefile
-	sed -i "s:^\s.owner = THIS_MODULE,$::" hfcs_usb.c || die 1
+	epatch ${FILESDIR}/module-param.diff
 }
 
 src_install() {
@@ -82,7 +83,7 @@ src_install() {
 	doins "${WORKDIR}/${MY_P}/include/linux/"*.h
 
 	insinto /etc/modules.d
-	newins "${FILESDIR}/${ECVS_BRANCH}.modulesd" "${PN}"
+	newins "${FILESDIR}/mqueue.modulesd" "${PN}"
 
 	dodir /etc/udev/rules.d
 	echo 'KERNEL="obj-*", NAME="mISDN", GROUP="dialout"' \