version bump thanks to kolla and stkn for help, clean up old

(Portage version: 2.1.2_pre2-r1)
 (Unsigned Manifest commit)

20 files changed, 20 insertions, 3014 deletions

diff --git a/net-misc/zaptel/Manifest b/net-misc/zaptel/Manifest
index fd0ad648beae..1210081b9302 100644
--- a/net-misc/zaptel/Manifest
+++ b/net-misc/zaptel/Manifest
@@ -46,30 +46,18 @@ AUX zaptel-1.0.9_p2-gentoo.diff 5179 RMD160 cd93992bd6ca2b5da23a87d388fc467bf47c
 MD5 077231bb1ba50aedfd08476b9d4eb18b files/zaptel-1.0.9_p2-gentoo.diff 5179
 RMD160 cd93992bd6ca2b5da23a87d388fc467bf47cdc7b files/zaptel-1.0.9_p2-gentoo.diff 5179
 SHA256 bcd27714804472e020003663ee641d99eab80f1034328605f9442c5c3b960bf7 files/zaptel-1.0.9_p2-gentoo.diff 5179
-AUX zaptel-1.2.0-devfs26.diff 6046 RMD160 46be740e37e026a9bd7e19136b6c7094def445ef SHA1 0169f0a13563565756eb5c41b641ba2d557c0b66 SHA256 b63bd43dae1e61f55ee4dbbf25d3401532d728ca4dd79c747835e9907c011856
-MD5 c0f95d699055c3b46e5d3078bfaa2afb files/zaptel-1.2.0-devfs26.diff 6046
-RMD160 46be740e37e026a9bd7e19136b6c7094def445ef files/zaptel-1.2.0-devfs26.diff 6046
-SHA256 b63bd43dae1e61f55ee4dbbf25d3401532d728ca4dd79c747835e9907c011856 files/zaptel-1.2.0-devfs26.diff 6046
 AUX zaptel-1.2.0-ukcid.patch 3787 RMD160 4c4c3b9036db8051643901892a40fbcd153184d6 SHA1 f4da18f52f6dc92c84d9534c10882f3b657d93a3 SHA256 d60c436b44481ec68272572643e83055ec5766f3d0331be0209e789637fb5720
 MD5 699723eb0b0ad059702af4fc4de7bf95 files/zaptel-1.2.0-ukcid.patch 3787
 RMD160 4c4c3b9036db8051643901892a40fbcd153184d6 files/zaptel-1.2.0-ukcid.patch 3787
 SHA256 d60c436b44481ec68272572643e83055ec5766f3d0331be0209e789637fb5720 files/zaptel-1.2.0-ukcid.patch 3787
-AUX zaptel-1.2.1-gentoo.diff 4756 RMD160 1ce3b91f5a6be87566d56fa49605f7e6ce5ac470 SHA1 fc7f97a078d542be5d7acdf2722f2fb09b70ec94 SHA256 f92466fb92dae6c0168fd27978aa75bb262c37d037d25ecd334ccc5e9a5939ea
-MD5 bc9d66166d440e69b69286ef26b4c52d files/zaptel-1.2.1-gentoo.diff 4756
-RMD160 1ce3b91f5a6be87566d56fa49605f7e6ce5ac470 files/zaptel-1.2.1-gentoo.diff 4756
-SHA256 f92466fb92dae6c0168fd27978aa75bb262c37d037d25ecd334ccc5e9a5939ea files/zaptel-1.2.1-gentoo.diff 4756
-AUX zaptel-1.2.2-gentoo.diff 7740 RMD160 70b52156389d66952f3f498bdc9af7d4092b3cdc SHA1 a2dd4ee7c7c8ab34c50f1618e23f3c212fdf97d0 SHA256 58ce489e499697a57ad9e939b119a2f07418c2cd48158efc89b8c46a1bd6b946
-MD5 51c21f33dde21f00000ccf671ac0ebff files/zaptel-1.2.2-gentoo.diff 7740
-RMD160 70b52156389d66952f3f498bdc9af7d4092b3cdc files/zaptel-1.2.2-gentoo.diff 7740
-SHA256 58ce489e499697a57ad9e939b119a2f07418c2cd48158efc89b8c46a1bd6b946 files/zaptel-1.2.2-gentoo.diff 7740
-AUX zaptel-1.2.6-gentoo.diff 4565 RMD160 ed630e59ca0f100c7f69ef918a4a15ddb580a256 SHA1 f4a48026c12b2a22486724fc32913b3eeb49a689 SHA256 49c3e58b351d9e7ec16d19f9e361a13ee041c5ed4dbdf389dfb34dabb4eaab1e
-MD5 e641eafe0366cfa523df967a7d31241c files/zaptel-1.2.6-gentoo.diff 4565
-RMD160 ed630e59ca0f100c7f69ef918a4a15ddb580a256 files/zaptel-1.2.6-gentoo.diff 4565
-SHA256 49c3e58b351d9e7ec16d19f9e361a13ee041c5ed4dbdf389dfb34dabb4eaab1e files/zaptel-1.2.6-gentoo.diff 4565
-AUX zaptel-1.2.7-gentoo.diff 5007 RMD160 569c7ad06f1e4c4314109f9e071f6ca935060691 SHA1 391631fdbe69998bb9b886b40d9d28edcda5925d SHA256 5a32fe69d7263e46ec61e456d17bd6e8b427628ceff5638d8a399342c9a5f5a4
-MD5 798e6cbda44bd9af20aea83128f7bb5a files/zaptel-1.2.7-gentoo.diff 5007
-RMD160 569c7ad06f1e4c4314109f9e071f6ca935060691 files/zaptel-1.2.7-gentoo.diff 5007
-SHA256 5a32fe69d7263e46ec61e456d17bd6e8b427628ceff5638d8a399342c9a5f5a4 files/zaptel-1.2.7-gentoo.diff 5007
+AUX zaptel-1.2.9.1-gcc411_is_a_retard-kbuild.patch 306 RMD160 565eb368b1b05a177caee5a43206738cb8302b2d SHA1 950ab0c803564831a8258e6df4b09688e0b18d9f SHA256 08b1d97bb66c9594dddec108404220fa499f4ac8b2b211f63f7d8cc98b0a78bf
+MD5 93494506ca6c66b90a6175a2f50965ec files/zaptel-1.2.9.1-gcc411_is_a_retard-kbuild.patch 306
+RMD160 565eb368b1b05a177caee5a43206738cb8302b2d files/zaptel-1.2.9.1-gcc411_is_a_retard-kbuild.patch 306
+SHA256 08b1d97bb66c9594dddec108404220fa499f4ac8b2b211f63f7d8cc98b0a78bf files/zaptel-1.2.9.1-gcc411_is_a_retard-kbuild.patch 306
+AUX zaptel-1.2.9.1-gentoo.diff 5129 RMD160 b85980028878905c8db0821c5f5d59d500591a8f SHA1 fecf5625cb849d2bdc6bd28370fca3775ae987ad SHA256 2414a99c0608e562afaa84446756cb8df59cdb91b8f81aecaef65d6a0db3b3ed
+MD5 2ba3db989e7bacdefb157b6bb6d57f61 files/zaptel-1.2.9.1-gentoo.diff 5129
+RMD160 b85980028878905c8db0821c5f5d59d500591a8f files/zaptel-1.2.9.1-gentoo.diff 5129
+SHA256 2414a99c0608e562afaa84446756cb8df59cdb91b8f81aecaef65d6a0db3b3ed files/zaptel-1.2.9.1-gentoo.diff 5129
 AUX zaptel-bristuff-0.2.0-RC8g.patch 5551 RMD160 9592e1f860ca0ef8cdb206a3f0379520937766da SHA1 5c6429756616a4a66363e0d62f927e25b0f4980d SHA256 9a637faa2891a7b2773f2a0f8124cb89041b64a1e33bf2b35e9e916ddc62dca2
 MD5 cce31b4380f9c62e91293dff1523d5e0 files/zaptel-bristuff-0.2.0-RC8g.patch 5551
 RMD160 9592e1f860ca0ef8cdb206a3f0379520937766da files/zaptel-bristuff-0.2.0-RC8g.patch 5551
@@ -102,61 +90,23 @@ AUX zaptel.udevd 358 RMD160 fc92cf8fcbf9ed49b7918557670417e15f84f281 SHA1 36410c
 MD5 3bff3fd5d8dc52513ceeac546e1e11bf files/zaptel.udevd 358
 RMD160 fc92cf8fcbf9ed49b7918557670417e15f84f281 files/zaptel.udevd 358
 SHA256 9be02c6b22db788d8a8fabc5bc2574102b50c3b329cff12c342d39896c7615b5 files/zaptel.udevd 358
-DIST bristuff-0.2.0-RC8g.tar.gz 139013 RMD160 c0a037e0819b8985be2df60a010309335527f203 SHA1 d4289553e12260a24814b045c26a77c087e39daf SHA256 19a0a7fdbb192fed4ea086251d5653abbe8525232dd5b613f9366400c97b213b
-DIST bristuff-0.2.0-RC8h.tar.gz 150270 RMD160 a958bc8418618ca892f0fbdb8d8cf203375d3865 SHA1 93420f41e6383167505f5ef8b65cde7ddf7f42ea SHA256 74c2e40cd665a2a9ac29d5ddd31892c8ca15ca9b55e2a08523e9db5ca75ba207
-DIST bristuff-0.2.0-RC8n.tar.gz 143979 RMD160 922b6b807bb48aa690412de3916eeb54c1454486 SHA1 83342bebe9a2c5804ea81edc2c80d5675366b3b5 SHA256 a92d9d8e9777c0637d2db0375794fe011fd8ecf1461f0b8e6587c74670da637c
 DIST bristuff-0.2.0-RC8q.tar.gz 152037 RMD160 aaa9ca23eaeb74abc96dd7240f67e7886d4d6ad9 SHA1 27a6f56f47aa7ee5459d2625da7cff310909764e SHA256 8ba7a1e1e6ee8e9d77853d6d790d0de5deced7c11679b9b0e108cca817ed9728
-DIST bristuff-0.3.0-PRE-1n.tar.gz 248488 RMD160 3da3043a88551578b4495ae8e54ffb6a4f3bfd2c SHA1 c4aa937dffa7dec4ffed1c08bc228f6521c52306 SHA256 31b894bdd2741e309dfed23963db1cda3d74a8d616de8df9f1281b5558aa27f1
-DIST bristuff-0.3.0-PRE-1o.tar.gz 252770 RMD160 60f1656a815bd1ff7d86ca7cb657c1d850a84804 SHA1 fd215b07533532c04f60212284a4cd1d6f18d5ba SHA256 aec95d12959181b601d7d10f05bb16eff715859dc8ea9fbb10e670296f61b6e9
-DIST bristuff-0.3.0-PRE-1p.tar.gz 254003 RMD160 e87c0289bc598b52b962d192bc54008edc9b38a9 SHA1 5372bf13be0f5c7dd36046a8ac1cf5ed0fbb1f0b SHA256 d7dbb352ac68d64458919b94f815c8c97418c54fa8ae5411084370325528c164
 DIST bristuff-0.3.0-PRE-1s.tar.gz 265953 RMD160 8d3abdbbae4c376d52225395c72f4538e1f84a94 SHA1 1d942df9e4fd963755080e011caba88a33601c1b SHA256 30adea4f070ed44d1952163e850c177f976857b96965e18844ccd492ccef968d
-DIST zaphfc_0.2.0-RC8a_florz-6.diff.gz 10428 RMD160 59117c086427dc30e10730900952e00063b4c01c SHA1 02724214e592c1b1e0bbb6e7284b7f85aeec3bf5 SHA256 175541f22c725d9b2c32249b44e918e6335bc2c1fe1830a8c76d19c6d5a2ae46
-DIST zaphfc_0.2.0-RC8j_florz-8.diff.gz 10559 RMD160 81d490557da7dcb3771022d590b2fa69871d2662 SHA1 48e232dcb1c4f21a13bd8ec11187caae74cbcdaa SHA256 20aa0da6008ac9ebf989db0f1a8c052d1c86b5444ec28c8c1dd7779ba5627309
-DIST zaphfc_0.3.0-PRE-1n_florz-11.diff.gz 10647 RMD160 31f1f82a5452bafa191b2023cfa559b8431786c6 SHA1 b34928127b7a2dafbbcc0d2761e76b8ecb6daa1a SHA256 923f6f8fa8a520d14978aab5ff2911234e587bee1fae085f76fb992ed9e1f9b1
 DIST zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736 RMD160 b95d2301402e1108bc480ce0e66e87e3062eccf8 SHA1 f8ab2f312c6a2b2f607b9e7f3ccbcca0858c53a7 SHA256 04a8dd22d581b5d28d46a589d695f6eb634bf2bf355347a637fe2d560a63528c
 DIST zaptel-1.0.10.tar.gz 327832 RMD160 a797bb36f35e50c51d30705ad1d628f5728d87ed SHA1 98544260fca2afbcd304f7354b62a56138e15a09 SHA256 7978f3c56a95033bf2bc2cb8d0cb2830c5371aae21e0021503c6dbf2361795d1
-DIST zaptel-1.0.7.tar.gz 316693 RMD160 999240424d743f0b7f47aaaedea37f241d971147 SHA1 ec51c1ddece93142b978565e4377c89155704edc SHA256 0d42b52642c8803c90186dfa568489a598df61903238e94051b51739bc68217e
-DIST zaptel-1.0.8.tar.gz 326128 RMD160 f55ecfa8a8263b9342e2a0e7625c8e6083165880 SHA1 c856f10de2b3873ff59301e7d61ed42764213221 SHA256 a3ffc91f246c8d2092d6022d78479e305879dca1a2b409217cbe080c3c9b4853
-DIST zaptel-1.0.9.2.tar.gz 327362 RMD160 22fb125e6a4e93b4d05a01c6ead99a58a4bf3e31 SHA1 c3725086a6fb122f30b77cb59ada2ac872a19ba8 SHA256 2734767ef00d6ddba8dba74801975d56082a48bb5e4c8299aa08210d73d09803
-DIST zaptel-1.2.5.tar.gz 673161 RMD160 7de580a8424b436d77504501ef59c47f2498e04d SHA1 ac740850e49daed77683eaffba5732086a88f54f SHA256 8a80ccd9b2852de8a0ccf0036819d8e5cc0f73516f1fdcee3392c813a26ada5c
-DIST zaptel-1.2.6.tar.gz 676658 RMD160 599cf3c78bb5b71a921dea9ca4716131224cd872 SHA1 cd61a2e7efdab4c5400af5c44c4009702daf5ea2 SHA256 24cd078469f2a3f131c3d28977f88426a45d9810f5a5d22109d5d57e43320938
-DIST zaptel-1.2.8.tar.gz 1139177 RMD160 89d69ab74b3d460c87ef9b6536a68b453ea59447 SHA1 0c074bda31634825f1290a45780929083431da99 SHA256 e1b41e13e6ff2cfd99ef47ab5a872fca8e19d73ebfde4db6bd7d33c5e452bac3
+DIST zaptel-1.2.9.1.tar.gz 1255412 RMD160 caf2ad931e2ae439500805a6ca4376dc8083de5a SHA1 6145301bb47107c0910a098e26b4ca5cdb2377ab SHA256 7def44c259352397af2ad80f3c0eb103ff640ffbc7c95f37c3802fee75c10ede
 EBUILD zaptel-1.0.10-r1.ebuild 7197 RMD160 2f60f18488f4b49ac43e4310fe4501939f96b405 SHA1 e919d6ca40ee2efcc2afe1f898c4118207a1cf6b SHA256 e533d31fd85708fec97e0e315ee738ad964aadfeb84f8f9595059a6efca501a3
 MD5 33564fe4757a198a8f2a627408c9a9b1 zaptel-1.0.10-r1.ebuild 7197
 RMD160 2f60f18488f4b49ac43e4310fe4501939f96b405 zaptel-1.0.10-r1.ebuild 7197
 SHA256 e533d31fd85708fec97e0e315ee738ad964aadfeb84f8f9595059a6efca501a3 zaptel-1.0.10-r1.ebuild 7197
-EBUILD zaptel-1.0.7-r1.ebuild 6517 RMD160 a40ddb6c4fb789193710d9595ed438e715d625b0 SHA1 7f60b010124d3c6e48f4b2314d77d3ab966e309e SHA256 93a80dd479b068dae7aa27c157d4bc2cc84df7084f1f50a9178ae9b22e857ede
-MD5 276ca202b6c1471af85d43ce0eb6b94f zaptel-1.0.7-r1.ebuild 6517
-RMD160 a40ddb6c4fb789193710d9595ed438e715d625b0 zaptel-1.0.7-r1.ebuild 6517
-SHA256 93a80dd479b068dae7aa27c157d4bc2cc84df7084f1f50a9178ae9b22e857ede zaptel-1.0.7-r1.ebuild 6517
-EBUILD zaptel-1.0.8.ebuild 6370 RMD160 1149a607111018d635b1317c9fc90be7c11c176d SHA1 7bb79a23064b51b74cfa609b8afb239ed7e910c4 SHA256 3e6294eeee570aa0c380320d32d39e7f5e62a9d5c4579d961b8598e2566a9e9f
-MD5 6263a968f86b50a23db0b3bcaf19b0ae zaptel-1.0.8.ebuild 6370
-RMD160 1149a607111018d635b1317c9fc90be7c11c176d zaptel-1.0.8.ebuild 6370
-SHA256 3e6294eeee570aa0c380320d32d39e7f5e62a9d5c4579d961b8598e2566a9e9f zaptel-1.0.8.ebuild 6370
-EBUILD zaptel-1.0.9_p2.ebuild 6641 RMD160 cc6b4981c59e4dc1af4e82cefb4fd46dd5643424 SHA1 819d86f429b7aea37a3a2ccb3afb18e313026c33 SHA256 da2d007c41e8d29acce870e7096f3c36997ecbff534b1fbb802c0182c653b08a
-MD5 f0c8a8a514efa543a36618d72d4ade3d zaptel-1.0.9_p2.ebuild 6641
-RMD160 cc6b4981c59e4dc1af4e82cefb4fd46dd5643424 zaptel-1.0.9_p2.ebuild 6641
-SHA256 da2d007c41e8d29acce870e7096f3c36997ecbff534b1fbb802c0182c653b08a zaptel-1.0.9_p2.ebuild 6641
-EBUILD zaptel-1.2.5-r1.ebuild 9220 RMD160 ec2200c048cad9380ba5ae2726c1ce6483573fdc SHA1 6319ab4c5df394e1a4b8320dc69630abab1f5210 SHA256 fd183f72896ce56d687dc5b64f1249e31eea6f72f7210c7dfbb057d0479d3afa
-MD5 9273548a3972e880ced95f63792ba294 zaptel-1.2.5-r1.ebuild 9220
-RMD160 ec2200c048cad9380ba5ae2726c1ce6483573fdc zaptel-1.2.5-r1.ebuild 9220
-SHA256 fd183f72896ce56d687dc5b64f1249e31eea6f72f7210c7dfbb057d0479d3afa zaptel-1.2.5-r1.ebuild 9220
-EBUILD zaptel-1.2.5.ebuild 9221 RMD160 4b39f9664495c4162adb157f0e7f51bd9ef9213f SHA1 5d152be00af3c62781606fb33a1508586104ff41 SHA256 06df422491b8a59e33297fa975b678d6234cdf750c3ed6683a06e099ed7d01a0
-MD5 8aa98093c199df2bc70cca0d5420a48a zaptel-1.2.5.ebuild 9221
-RMD160 4b39f9664495c4162adb157f0e7f51bd9ef9213f zaptel-1.2.5.ebuild 9221
-SHA256 06df422491b8a59e33297fa975b678d6234cdf750c3ed6683a06e099ed7d01a0 zaptel-1.2.5.ebuild 9221
-EBUILD zaptel-1.2.6.ebuild 9205 RMD160 8e08b39c2b1aa7792dc74fa4f9db1188a2430fab SHA1 b175fbbedfff66d42c6dc9408eb964ce741865f3 SHA256 445058b42d6cedb7f2edeb50bdea4b92907e20c3c80cc679654b8d7447c92546
-MD5 682c943ca7a293de4b933a3a675e2c40 zaptel-1.2.6.ebuild 9205
-RMD160 8e08b39c2b1aa7792dc74fa4f9db1188a2430fab zaptel-1.2.6.ebuild 9205
-SHA256 445058b42d6cedb7f2edeb50bdea4b92907e20c3c80cc679654b8d7447c92546 zaptel-1.2.6.ebuild 9205
-EBUILD zaptel-1.2.8.ebuild 8470 RMD160 a0e4e9036e086b825e7f9242325e2472db3338c4 SHA1 c509e136e01d8e72bb2cbeca382356131d81a5dc SHA256 0e1bb6822909be89da6839136a92cdd4c80e6eb8364d3939890ecd2f11105e02
-MD5 a2d6af00e71b4fa772b1a92ea9e7f77e zaptel-1.2.8.ebuild 8470
-RMD160 a0e4e9036e086b825e7f9242325e2472db3338c4 zaptel-1.2.8.ebuild 8470
-SHA256 0e1bb6822909be89da6839136a92cdd4c80e6eb8364d3939890ecd2f11105e02 zaptel-1.2.8.ebuild 8470
-MISC ChangeLog 14973 RMD160 e311a55a0f0640e4642a1aa80f4200ec86e91e17 SHA1 41ad016ddc7a964c51a1302dacc096559dd9d07c SHA256 156267b3708da309ed76deb256b29883b2c5307aad053313f3007a80d120ee21
-MD5 9eef29c0d969617ba458a2dc1238af79 ChangeLog 14973
-RMD160 e311a55a0f0640e4642a1aa80f4200ec86e91e17 ChangeLog 14973
-SHA256 156267b3708da309ed76deb256b29883b2c5307aad053313f3007a80d120ee21 ChangeLog 14973
+EBUILD zaptel-1.2.9.1.ebuild 8530 RMD160 cbfcbdd1add7eed4f6e9461ea31878258fcba2bd SHA1 a0ae0d0a807cfa343bce578748f18411073ea5d7 SHA256 a0786f264e7b0a943adb0ed79df1295b77a8150c8e765ef62a4752084d789a59
+MD5 959182587bbbbb2a8e16f2f95aff1827 zaptel-1.2.9.1.ebuild 8530
+RMD160 cbfcbdd1add7eed4f6e9461ea31878258fcba2bd zaptel-1.2.9.1.ebuild 8530
+SHA256 a0786f264e7b0a943adb0ed79df1295b77a8150c8e765ef62a4752084d789a59 zaptel-1.2.9.1.ebuild 8530
+MISC ChangeLog 15583 RMD160 bbb6e5e85633366b4aa91cb41ed38a977f4d2937 SHA1 c55199a66190e3adb5947e3fd55e02e530d4fe09 SHA256 ad21ff3dd83438b3b8d84bd052fbebcd4f2fd2a2f4a616d4a6a7df77a052ec85
+MD5 d474bc25940e2680d7b4607f39966fda ChangeLog 15583
+RMD160 bbb6e5e85633366b4aa91cb41ed38a977f4d2937 ChangeLog 15583
+SHA256 ad21ff3dd83438b3b8d84bd052fbebcd4f2fd2a2f4a616d4a6a7df77a052ec85 ChangeLog 15583
 MISC metadata.xml 382 RMD160 315172442a4bfaa87b855d4c421b22a2527e97b2 SHA1 7b95f41def10946742929592db1d76b7e3bb0a19 SHA256 f79d5cd273e9ecc2181e60ea226a7cb0128011d877fc7531b2df30bd5fd9ae20
 MD5 f3d5d5b8a638e7a9a83fe0eb0d94282c metadata.xml 382
 RMD160 315172442a4bfaa87b855d4c421b22a2527e97b2 metadata.xml 382
@@ -164,24 +114,6 @@ SHA256 f79d5cd273e9ecc2181e60ea226a7cb0128011d877fc7531b2df30bd5fd9ae20 metadata
 MD5 35f5df1004da005d708c3c6c99269aed files/digest-zaptel-1.0.10-r1 500
 RMD160 276619c3b2cd6e00ca47a0f6196de3fd375f78f1 files/digest-zaptel-1.0.10-r1 500
 SHA256 97f4cbc2c2075338a5fbb1c0da7f79f365725d49e9d6cb89a974db23c6e5a83d files/digest-zaptel-1.0.10-r1 500
-MD5 31cfe33ae95bc44ce469378beb6eea1e files/digest-zaptel-1.0.7-r1 774
-RMD160 0b587972db9a42ccc49531632baa44767ae90f2e files/digest-zaptel-1.0.7-r1 774
-SHA256 324fddbe9062fbe768bde123be4f4431396b1f86bea1ae7bba799d43caa2c13e files/digest-zaptel-1.0.7-r1 774
-MD5 d74030feeb462c5b70bbb255d59fa7a9 files/digest-zaptel-1.0.8 774
-RMD160 703e2ffe9083714a24657a89a7148a6c007ead52 files/digest-zaptel-1.0.8 774
-SHA256 b727e7f6d0c64269fd1c58ca036b04bca3a20ae095cfb23af91482d4395a3bdd files/digest-zaptel-1.0.8 774
-MD5 192d621db46752b0d262d4bf174b5385 files/digest-zaptel-1.0.9_p2 780
-RMD160 49c1631de2cc5baddf2058ef0536b52293bf6557 files/digest-zaptel-1.0.9_p2 780
-SHA256 cb097568a90e6a776fcd17e0e21c9407e89b8254e1bcf5b0fbbf8c2f486c6b69 files/digest-zaptel-1.0.9_p2 780
-MD5 da865311bc3aaa4dc53c3cc0e79a6017 files/digest-zaptel-1.2.5 789
-RMD160 c1ed31a2fdcfb97907e77540ab9011dd22096324 files/digest-zaptel-1.2.5 789
-SHA256 0ab3c45417e958d58d38e1d71b95128b764f0508f089854403cef599b19653b2 files/digest-zaptel-1.2.5 789
-MD5 4118282f88566778acf16320b66df5ba files/digest-zaptel-1.2.5-r1 789
-RMD160 a6bba0a2dcd5438b5b10bbf78053c84a823ac039 files/digest-zaptel-1.2.5-r1 789
-SHA256 c43892c542017555e81b888881227364230be6fb9fb95a8b0d3331a099ea3b7c files/digest-zaptel-1.2.5-r1 789
-MD5 3708063a489c0d321af32910c0ed7aa8 files/digest-zaptel-1.2.6 789
-RMD160 3b5f6a6d32b45ba78ab69b9d8e9d8af4354f40de files/digest-zaptel-1.2.6 789
-SHA256 e0c1e502dc6c176d176a5877ce51ece60d7b8e99f20d47f048e0ebcf760fe30c files/digest-zaptel-1.2.6 789
-MD5 a6e1954ca54083eaf0f9079164edc071 files/digest-zaptel-1.2.8 792
-RMD160 51ea672befd612e49938bac1e559706f704f0ec1 files/digest-zaptel-1.2.8 792
-SHA256 b6dfd4fefc934bb72147a6be58d94f058d0ac097d03cd58e2011aedad80d5f13 files/digest-zaptel-1.2.8 792
+MD5 e2e7717e2b2b91f4467e4033eb8607ab files/digest-zaptel-1.2.9.1 718
+RMD160 bbbf4cfe894f55f780600625ef67ddfe1df3857f files/digest-zaptel-1.2.9.1 718
+SHA256 7fd0cc0e5893f855fd9543b817ca20d2bcf6101634c7483a6b29eb2bbb8fabae files/digest-zaptel-1.2.9.1 718
diff --git a/net-misc/zaptel/files/digest-zaptel-1.0.7-r1 b/net-misc/zaptel/files/digest-zaptel-1.0.7-r1
deleted file mode 100644
index eb0dc1c057ab..000000000000
--- a/net-misc/zaptel/files/digest-zaptel-1.0.7-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 7a5ff01d3befff1fbd3de1c303cb10d1 bristuff-0.2.0-RC8g.tar.gz 139013
-RMD160 c0a037e0819b8985be2df60a010309335527f203 bristuff-0.2.0-RC8g.tar.gz 139013
-SHA256 19a0a7fdbb192fed4ea086251d5653abbe8525232dd5b613f9366400c97b213b bristuff-0.2.0-RC8g.tar.gz 139013
-MD5 cc91bd69d6e880f89a1f95a27aa714c9 zaphfc_0.2.0-RC8a_florz-6.diff.gz 10428
-RMD160 59117c086427dc30e10730900952e00063b4c01c zaphfc_0.2.0-RC8a_florz-6.diff.gz 10428
-SHA256 175541f22c725d9b2c32249b44e918e6335bc2c1fe1830a8c76d19c6d5a2ae46 zaphfc_0.2.0-RC8a_florz-6.diff.gz 10428
-MD5 d043f54f38b6262ab3cd5599982a7032 zaptel-1.0.7.tar.gz 316693
-RMD160 999240424d743f0b7f47aaaedea37f241d971147 zaptel-1.0.7.tar.gz 316693
-SHA256 0d42b52642c8803c90186dfa568489a598df61903238e94051b51739bc68217e zaptel-1.0.7.tar.gz 316693
diff --git a/net-misc/zaptel/files/digest-zaptel-1.0.8 b/net-misc/zaptel/files/digest-zaptel-1.0.8
deleted file mode 100644
index d568eb28f05c..000000000000
--- a/net-misc/zaptel/files/digest-zaptel-1.0.8
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 3b264a75b1a17735572920655bf1a0f8 bristuff-0.2.0-RC8h.tar.gz 150270
-RMD160 a958bc8418618ca892f0fbdb8d8cf203375d3865 bristuff-0.2.0-RC8h.tar.gz 150270
-SHA256 74c2e40cd665a2a9ac29d5ddd31892c8ca15ca9b55e2a08523e9db5ca75ba207 bristuff-0.2.0-RC8h.tar.gz 150270
-MD5 cc91bd69d6e880f89a1f95a27aa714c9 zaphfc_0.2.0-RC8a_florz-6.diff.gz 10428
-RMD160 59117c086427dc30e10730900952e00063b4c01c zaphfc_0.2.0-RC8a_florz-6.diff.gz 10428
-SHA256 175541f22c725d9b2c32249b44e918e6335bc2c1fe1830a8c76d19c6d5a2ae46 zaphfc_0.2.0-RC8a_florz-6.diff.gz 10428
-MD5 5553225a5c536231d9d7d23112d1bd11 zaptel-1.0.8.tar.gz 326128
-RMD160 f55ecfa8a8263b9342e2a0e7625c8e6083165880 zaptel-1.0.8.tar.gz 326128
-SHA256 a3ffc91f246c8d2092d6022d78479e305879dca1a2b409217cbe080c3c9b4853 zaptel-1.0.8.tar.gz 326128
diff --git a/net-misc/zaptel/files/digest-zaptel-1.0.9_p2 b/net-misc/zaptel/files/digest-zaptel-1.0.9_p2
deleted file mode 100644
index ce808f053e0b..000000000000
--- a/net-misc/zaptel/files/digest-zaptel-1.0.9_p2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 a6b5c61c16b35f02c616c8abadb9999d bristuff-0.2.0-RC8n.tar.gz 143979
-RMD160 922b6b807bb48aa690412de3916eeb54c1454486 bristuff-0.2.0-RC8n.tar.gz 143979
-SHA256 a92d9d8e9777c0637d2db0375794fe011fd8ecf1461f0b8e6587c74670da637c bristuff-0.2.0-RC8n.tar.gz 143979
-MD5 717f869f45ec20ceda216285cd90455a zaphfc_0.2.0-RC8j_florz-8.diff.gz 10559
-RMD160 81d490557da7dcb3771022d590b2fa69871d2662 zaphfc_0.2.0-RC8j_florz-8.diff.gz 10559
-SHA256 20aa0da6008ac9ebf989db0f1a8c052d1c86b5444ec28c8c1dd7779ba5627309 zaphfc_0.2.0-RC8j_florz-8.diff.gz 10559
-MD5 4d9dc3afbe7e61c557115bd5442d3e5e zaptel-1.0.9.2.tar.gz 327362
-RMD160 22fb125e6a4e93b4d05a01c6ead99a58a4bf3e31 zaptel-1.0.9.2.tar.gz 327362
-SHA256 2734767ef00d6ddba8dba74801975d56082a48bb5e4c8299aa08210d73d09803 zaptel-1.0.9.2.tar.gz 327362
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.5 b/net-misc/zaptel/files/digest-zaptel-1.2.5
deleted file mode 100644
index 91a39f7073c2..000000000000
--- a/net-misc/zaptel/files/digest-zaptel-1.2.5
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 a0c78e7676acbc06b26d2c68ef3e0c86 bristuff-0.3.0-PRE-1n.tar.gz 248488
-RMD160 3da3043a88551578b4495ae8e54ffb6a4f3bfd2c bristuff-0.3.0-PRE-1n.tar.gz 248488
-SHA256 31b894bdd2741e309dfed23963db1cda3d74a8d616de8df9f1281b5558aa27f1 bristuff-0.3.0-PRE-1n.tar.gz 248488
-MD5 8e072de546cce9db77a65036819361a4 zaphfc_0.3.0-PRE-1n_florz-11.diff.gz 10647
-RMD160 31f1f82a5452bafa191b2023cfa559b8431786c6 zaphfc_0.3.0-PRE-1n_florz-11.diff.gz 10647
-SHA256 923f6f8fa8a520d14978aab5ff2911234e587bee1fae085f76fb992ed9e1f9b1 zaphfc_0.3.0-PRE-1n_florz-11.diff.gz 10647
-MD5 8c8561259d29a314aa5a076050124697 zaptel-1.2.5.tar.gz 673161
-RMD160 7de580a8424b436d77504501ef59c47f2498e04d zaptel-1.2.5.tar.gz 673161
-SHA256 8a80ccd9b2852de8a0ccf0036819d8e5cc0f73516f1fdcee3392c813a26ada5c zaptel-1.2.5.tar.gz 673161
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.5-r1 b/net-misc/zaptel/files/digest-zaptel-1.2.5-r1
deleted file mode 100644
index ac29b0152e3e..000000000000
--- a/net-misc/zaptel/files/digest-zaptel-1.2.5-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 93bb8a5661aaf3022cf4a102ea061f83 bristuff-0.3.0-PRE-1o.tar.gz 252770
-RMD160 60f1656a815bd1ff7d86ca7cb657c1d850a84804 bristuff-0.3.0-PRE-1o.tar.gz 252770
-SHA256 aec95d12959181b601d7d10f05bb16eff715859dc8ea9fbb10e670296f61b6e9 bristuff-0.3.0-PRE-1o.tar.gz 252770
-MD5 541b0a5910843d3c0b6a9de9467b9401 zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736
-RMD160 b95d2301402e1108bc480ce0e66e87e3062eccf8 zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736
-SHA256 04a8dd22d581b5d28d46a589d695f6eb634bf2bf355347a637fe2d560a63528c zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736
-MD5 8c8561259d29a314aa5a076050124697 zaptel-1.2.5.tar.gz 673161
-RMD160 7de580a8424b436d77504501ef59c47f2498e04d zaptel-1.2.5.tar.gz 673161
-SHA256 8a80ccd9b2852de8a0ccf0036819d8e5cc0f73516f1fdcee3392c813a26ada5c zaptel-1.2.5.tar.gz 673161
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.6 b/net-misc/zaptel/files/digest-zaptel-1.2.6
deleted file mode 100644
index 963775db42e2..000000000000
--- a/net-misc/zaptel/files/digest-zaptel-1.2.6
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 842636e711ff9d9977099db5af091fd7 bristuff-0.3.0-PRE-1p.tar.gz 254003
-RMD160 e87c0289bc598b52b962d192bc54008edc9b38a9 bristuff-0.3.0-PRE-1p.tar.gz 254003
-SHA256 d7dbb352ac68d64458919b94f815c8c97418c54fa8ae5411084370325528c164 bristuff-0.3.0-PRE-1p.tar.gz 254003
-MD5 541b0a5910843d3c0b6a9de9467b9401 zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736
-RMD160 b95d2301402e1108bc480ce0e66e87e3062eccf8 zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736
-SHA256 04a8dd22d581b5d28d46a589d695f6eb634bf2bf355347a637fe2d560a63528c zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736
-MD5 c6058b74f43ae12a29e486cf1e919562 zaptel-1.2.6.tar.gz 676658
-RMD160 599cf3c78bb5b71a921dea9ca4716131224cd872 zaptel-1.2.6.tar.gz 676658
-SHA256 24cd078469f2a3f131c3d28977f88426a45d9810f5a5d22109d5d57e43320938 zaptel-1.2.6.tar.gz 676658
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.8 b/net-misc/zaptel/files/digest-zaptel-1.2.8
deleted file mode 100644
index 1d93851cc785..000000000000
--- a/net-misc/zaptel/files/digest-zaptel-1.2.8
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 760eba19b03d03cd1dc8648d6239b4af bristuff-0.3.0-PRE-1s.tar.gz 265953
-RMD160 8d3abdbbae4c376d52225395c72f4538e1f84a94 bristuff-0.3.0-PRE-1s.tar.gz 265953
-SHA256 30adea4f070ed44d1952163e850c177f976857b96965e18844ccd492ccef968d bristuff-0.3.0-PRE-1s.tar.gz 265953
-MD5 541b0a5910843d3c0b6a9de9467b9401 zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736
-RMD160 b95d2301402e1108bc480ce0e66e87e3062eccf8 zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736
-SHA256 04a8dd22d581b5d28d46a589d695f6eb634bf2bf355347a637fe2d560a63528c zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736
-MD5 f79ba7a843f86b1a072d808b712b8d44 zaptel-1.2.8.tar.gz 1139177
-RMD160 89d69ab74b3d460c87ef9b6536a68b453ea59447 zaptel-1.2.8.tar.gz 1139177
-SHA256 e1b41e13e6ff2cfd99ef47ab5a872fca8e19d73ebfde4db6bd7d33c5e452bac3 zaptel-1.2.8.tar.gz 1139177
diff --git a/net-misc/zaptel/files/zaptel-1.2.0-devfs26.diff b/net-misc/zaptel/files/zaptel-1.2.0-devfs26.diff
deleted file mode 100644
index d9cfef230180..000000000000
--- a/net-misc/zaptel/files/zaptel-1.2.0-devfs26.diff
+++ /dev/null
@@ -1,220 +0,0 @@
---- zaptel-1.2.0-beta2/zaptel.c.orig	2005-10-04 20:34:36.000000000 +0000
-+++ zaptel-1.2.0-beta2/zaptel.c	2005-11-07 21:08:39.000000000 +0000
-@@ -148,12 +148,14 @@
- 
- /* Here are a couple important little additions for devfs */
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- static devfs_handle_t zaptel_devfs_dir;
- static devfs_handle_t channel;
- static devfs_handle_t pseudo;
- static devfs_handle_t ctl;
- static devfs_handle_t timer;
- #endif
-+#endif
- 
- /* udev necessary data structures.  Yeah! */
- #ifdef CONFIG_ZAP_UDEV
-@@ -1123,6 +1125,7 @@
- }
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- static devfs_handle_t register_devfs_channel(struct zt_chan *chan, devfs_handle_t dir)
- {
- 	char path[100];
-@@ -1165,6 +1168,36 @@
- 
- 	return chan_dev;
- }
-+#else
-+static dev_t register_devfs_channel(struct zt_chan *chan, dev_t dir)
-+{
-+#ifdef HAS_DEVFS_MK_SYMLINK
-+	char link[100];
-+	char path[100];
-+#endif
-+	dev_t chan_dev;
-+	umode_t mode = S_IFCHR|S_IRUGO|S_IWUGO;
-+
-+	/* create /dev/zap/span%d/%d channel device node */
-+	if ((chan_dev = devfs_mk_cdev(MKDEV(ZT_MAJOR, chan->channo), mode, "zap/span%d/%d", dir, chan->chanpos)) < 0) {
-+                printk("zaptel: Something really bad happened.  Unable to register devfs entry\n");
-+                return 0;
-+	}
-+
-+#ifdef HAS_DEVFS_MK_SYMLINK
-+	/* link /dev/zap/span%d/%d -> /dev/zap/%d ?!? */
-+	sprintf(path, "zap/span%d/%d", dir, chan->chanpos);
-+	sprintf(link, "zap/%d", chan->channo);
-+	devfs_mk_symlink(link, path);
-+#else
-+	/* register /dev/zap/%d channel node directly */
-+	if(devfs_mk_cdev(MKDEV(ZT_MAJOR, chan->channo), mode, "zap/%d", chan->channo) < 0) {
-+		printk("zaptel: Unable to register compat devfs entry\n");
-+	}
-+#endif
-+	return chan_dev;
-+}
-+#endif
- #endif /* CONFIG_DEVFS_FS */
- 
- static int zt_chan_reg(struct zt_chan *chan)
-@@ -4429,6 +4462,7 @@
- #endif
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	{
- 		char span_name[50];
- 		sprintf(span_name, "span%d", span->spanno);
-@@ -4438,6 +4472,15 @@
- 			chan->fhandle = register_devfs_channel(chan, chan->span->dhandle); /* Register our stuff with devfs */
- 		}
- 	}
-+#else
-+	{
-+		devfs_mk_dir("zap/span%d", span->spanno);
-+		for (x = 0; x < span->channels; x++) {
-+			struct zt_chan *chan = &span->chans[x];
-+			register_devfs_channel(chan, span->spanno); /* Register our stuff with devfs */
-+		}
-+	}
-+#endif
- #endif /* CONFIG_DEVFS_FS */
- 
- #ifdef CONFIG_ZAP_UDEV
-@@ -4485,11 +4528,22 @@
-         remove_proc_entry(tempfile, NULL);
- #endif /* CONFIG_PROC_FS */
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	for (x = 0; x < span->channels; x++) {
- 		devfs_unregister(span->chans[x].fhandle);
- 		devfs_unregister(span->chans[x].fhandle_symlink);
- 	}
- 	devfs_unregister(span->dhandle);
-+#else
-+	for (x = 0; x < span->channels; x++) {
-+		/* remove symlink/compat device first */
-+		devfs_remove("zap/%d", span->chans[x].channo);
-+		/* remove channel device */
-+		devfs_remove("zap/span%d/%d", span->spanno, span->chans[x].chanpos);
-+	}
-+	/* remove span dir */
-+	devfs_remove("zap/span%d", span->spanno);
-+#endif
- #endif /* CONFIG_DEVFS_FS */
- 
- #ifdef CONFIG_ZAP_UDEV
-@@ -6510,6 +6564,7 @@
- #endif /* CONFIG_ZAP_UDEV */
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	{
- 	umode_t mode = S_IFCHR|S_IRUGO|S_IWUGO;
- 	devfs_register_chrdev(ZT_MAJOR, "zaptel", &zt_fops);
-@@ -6521,6 +6576,22 @@
- 	ctl = devfs_register(zaptel_devfs_dir, "ctl", DEVFS_FL_DEFAULT, ZT_MAJOR, 0, mode, &zt_fops, NULL);
- 	}
- #else
-+	{
-+		umode_t mode = S_IFCHR|S_IRUGO|S_IWUGO;
-+		if ((res = register_chrdev(ZT_MAJOR, "zaptel", &zt_fops)) < 0) {
-+                	printk(KERN_ERR "Unable to register for device on %d, error: %d\n", ZT_MAJOR, res);
-+                	return res;
-+		}
-+
-+		devfs_mk_dir("zap");
-+
-+		devfs_mk_cdev(MKDEV(ZT_MAJOR, 253), mode, "zap/timer");
-+		devfs_mk_cdev(MKDEV(ZT_MAJOR, 254), mode, "zap/channel");
-+		devfs_mk_cdev(MKDEV(ZT_MAJOR, 255), mode, "zap/pseudo");
-+		devfs_mk_cdev(MKDEV(ZT_MAJOR, 0),   mode, "zap/ctl");
-+	}
-+#endif
-+#else
- 	if ((res = register_chrdev(ZT_MAJOR, "zaptel", &zt_fops))) {
- 		printk(KERN_ERR "Unable to register tor device on %d\n", ZT_MAJOR);
- 		return res;
-@@ -6551,6 +6622,7 @@
- 		if (tone_zones[x])
- 			kfree(tone_zones[x]);
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	devfs_unregister(timer);
- 	devfs_unregister(channel);
- 	devfs_unregister(pseudo);
-@@ -6566,6 +6638,16 @@
- 	class_destroy(zap_class);
- #endif /* CONFIG_ZAP_UDEV */
- 	unregister_chrdev(ZT_MAJOR, "zaptel");
-+
-+	devfs_remove("zap/timer");
-+	devfs_remove("zap/ctl");
-+	devfs_remove("zap/pseudo");
-+	devfs_remove("zap/channel");
-+
-+	devfs_remove("zap");
-+#endif
-+#else
-+	unregister_chrdev(ZT_MAJOR, "zaptel");
- #endif
- #ifdef CONFIG_ZAPTEL_WATCHDOG
- 	watchdog_cleanup();
---- zaptel-1.2.0-beta2/zaptel.h.orig	2005-10-27 16:05:07.000000000 +0000
-+++ zaptel-1.2.0-beta2/zaptel.h	2005-11-07 21:08:39.000000000 +0000
-@@ -52,18 +52,17 @@
- #define zap_pci_module pci_register_driver
- #else
- #define zap_pci_module pci_module_init
-+/* devfs_mk_symlink has been removed in 2.6.10 */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
-+#define HAS_DEVFS_MK_SYMLINK
-+#endif
- #endif
- 
- #include "ecdis.h"
- #include "fasthdlc.h"
- #endif
- #ifdef CONFIG_DEVFS_FS
--#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
- #include <linux/devfs_fs_kernel.h>
--#else
--#undef CONFIG_DEVFS_FS
--//#warning "Zaptel doesn't support DEVFS in post 2.4 kernels.  Disabling DEVFS in zaptel"
--#endif
- #endif /* CONFIG_DEVFS_FS */
- #include <linux/ioctl.h>
- 
-@@ -71,6 +70,8 @@
- #define ELAST 500
- #endif
- 
-+
-+
- /* Per-span configuration values */
- #define	ZT_CONFIG_TXLEVEL	7	/* bits 0-2 are tx level */
- 
-@@ -1172,8 +1173,10 @@
- #endif
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	devfs_handle_t fhandle;  /* File handle in devfs for the channel */
- 	devfs_handle_t fhandle_symlink;
-+#endif
- #endif /* CONFIG_DEVFS_FS */
- };
- 
-@@ -1309,7 +1312,9 @@
- 	int lastalarms;		/* Previous alarms */
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	devfs_handle_t dhandle;  /* Directory name */
-+#endif
- #endif	
- 	/* If the watchdog detects no received data, it will call the
- 	   watchdog routine */
diff --git a/net-misc/zaptel/files/zaptel-1.2.1-gentoo.diff b/net-misc/zaptel/files/zaptel-1.2.1-gentoo.diff
deleted file mode 100644
index 9cf6c0a83fc7..000000000000
--- a/net-misc/zaptel/files/zaptel-1.2.1-gentoo.diff
+++ /dev/null
@@ -1,117 +0,0 @@
---- zaptel-1.2.1/Makefile.orig	2005-12-04 20:29:27.000000000 +0100
-+++ zaptel-1.2.1/Makefile	2005-12-14 19:45:38.000000000 +0100
-@@ -21,7 +21,7 @@
- endif
- KINCLUDES:=$(KSRC)/include
- 
--CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
-+CFLAGS+=-I. -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
- CFLAGS_PPC:=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
- CFLAGS_X86-64:=$(shell if uname -m | grep -q x86_64; then echo "-m64"; fi)
- CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_X86-64)
-@@ -55,31 +55,7 @@
-   BUILDVER:=linux24
- endif
- 
--ifeq ($(BUILDVER),linux26)
--  ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modprobe.d))
--    MODCONF:=$(ROOT_PREFIX)/etc/modprobe.d/zaptel
--  else
--    ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modules.d))
--      MODCONF:=$(ROOT_PREFIX)/etc/modules.d/zaptel
--    else
--      ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modprobe.conf))
--        MODCONF:=$(ROOT_PREFIX)/etc/modprobe.conf
--      else
--        ifneq (,$(wildcard $(ROOT_PREFIX)/etc/conf.modules))
--          MODCONF:=$(ROOT_PREFIX)/etc/conf.modules
--        endif
--      endif
--    endif
--  endif
--else # BUILDVER == linux24
--  ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modutils))
--    MODCONF:=$(ROOT_PREFIX)/etc/modutils/zaptel
--   else
--    ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modules.conf))
--      MODCONF:=$(ROOT_PREFIX)/etc/modules.conf
--     endif
--  endif
--endif
-+MODCONF:=$(INSTALL_PREFIX)/etc/modules.d/zaptel
- 
- ifeq (${BUILDVER},linux24)
- #We only support DEVFS in linux 2.4 kernels, since its considered obsolete post 2.4
-@@ -87,7 +63,7 @@
- endif
- ifeq (${BUILDVER},linux26)
- #Tests for newer linux-2.6 udev support
--DYNFS:=$(shell ps ax | grep -v grep | grep udevd && echo "yes")
-+DYNFS:=$(shell ps ax | grep -v grep | grep -q udevd && echo "yes")
- endif
- 
- CHKCONFIG:=$(shell sh -c 'type -p chkconfig' 2> /dev/null)
-@@ -302,7 +278,7 @@
- 	@echo "**** If you are running udev, read README.udev"
- endif
- 
--install: all devices
-+install: devices
- 	install -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg
- 	if [ -f sethdlc-new ]; then \
- 		install -D -m 755 sethdlc-new $(INSTALL_PREFIX)/sbin/sethdlc; \
-@@ -329,39 +305,22 @@
- 		rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxs.o; \
- 	fi
- 	install -D -m 755 $(LIBTONEZONE_SO) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
--	[ `id -u` = 0 ] && /sbin/ldconfig || :
-+	[ `id -u` = 0 ] && /sbin/ldconfig -n $(INSTALL_PREFIX)/usr/lib || :
- 	rm -f $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
- 	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
--	if [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO); fi
- 	install -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/linux/zaptel.h
- 	install -D -m 644 torisa.h $(INSTALL_PREFIX)/usr/include/linux/torisa.h
- 	install -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
--	install -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
--	install -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
-+	install -D -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
-+	install -D -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
-+	if [ ! -d `dirname $(MODCONF)` ]; then install -d -m 755 `dirname $(MODCONF)` ; fi
- 	if [ -n "$(MODCONF)" ]; then \
--		if [ -f $(MODCONF) ]; then mv -f $(MODCONF) $(MODCONF).bak ; fi; \
--		cat $(MODCONF).bak | grep -v "alias char-major-250" | \
--		grep -v "post-install torisa /sbin/ztcfg" | \
--		grep -v "post-install wcfxsusb /sbin/ztcfg" | \
--		grep -v "alias wctdm" | \
--		grep -v "post-install wctdm /sbin/ztcfg" > $(MODCONF); \
- 		if ! grep "options torisa" $(MODCONF); then \
- 			echo "options torisa base=$(BASEADDR)" >> $(MODCONF); \
- 		fi; \
- 		if ! grep "alias char-major-196" $(MODCONF); then \
- 			echo "alias char-major-196 $(PRIMARY)" >> $(MODCONF); \
- 		fi; \
--		for x in $(MODULES); do \
--			if ! grep -q "post-install $$x" $(MODCONF); then \
--				if ! grep -q "install $$x " $(MODCONF); then \
--					if [ "$$x" != "zaptel" ] ; then \
--						if [ -f zaptel.ko ]; then echo "install $$x /sbin/modprobe --ignore-install $$x && /sbin/ztcfg" >> $(MODCONF); \
--						else echo "post-install $$x /sbin/ztcfg" >> $(MODCONF); \
--						fi; \
--					fi; \
--				fi; \
--			fi; \
--		done; \
- 		if ! grep "ias wcfxs" $(MODCONF); then \
- 			echo "alias wcfxs wctdm" >> $(MODCONF); \
- 		fi; \
-@@ -369,10 +328,6 @@
- 			echo "alias wct2xxp wct4xxp" >> $(MODCONF); \
- 		fi; \
- 	fi
--	if [ -d /etc/modutils ]; then \
--		/sbin/update-modules ; \
--	fi
--	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
- 	[ -f $(CONFIG_FILE) ] || install -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
- 
- install-udev:
diff --git a/net-misc/zaptel/files/zaptel-1.2.2-gentoo.diff b/net-misc/zaptel/files/zaptel-1.2.2-gentoo.diff
deleted file mode 100644
index 960e98bcc328..000000000000
--- a/net-misc/zaptel/files/zaptel-1.2.2-gentoo.diff
+++ /dev/null
@@ -1,166 +0,0 @@
---- zaptel-1.2.2/Makefile.orig	2006-01-19 00:04:48.000000000 +0100
-+++ zaptel-1.2.2/Makefile	2006-01-19 00:09:24.000000000 +0100
-@@ -21,7 +21,7 @@
- endif
- KINCLUDES:=$(KSRC)/include
- 
--CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
-+CFLAGS+=-I. -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
- CFLAGS_PPC:=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
- CFLAGS_X86-64:=$(shell if uname -m | grep -q x86_64; then echo "-m64"; fi)
- CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_X86-64)
-@@ -55,31 +55,7 @@
-   BUILDVER:=linux24
- endif
- 
--ifeq ($(BUILDVER),linux26)
--  ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modprobe.d))
--    MODCONF:=$(ROOT_PREFIX)/etc/modprobe.d/zaptel
--  else
--    ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modules.d))
--      MODCONF:=$(ROOT_PREFIX)/etc/modules.d/zaptel
--    else
--      ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modprobe.conf))
--        MODCONF:=$(ROOT_PREFIX)/etc/modprobe.conf
--      else
--        ifneq (,$(wildcard $(ROOT_PREFIX)/etc/conf.modules))
--          MODCONF:=$(ROOT_PREFIX)/etc/conf.modules
--        endif
--      endif
--    endif
--  endif
--else # BUILDVER == linux24
--  ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modutils))
--    MODCONF:=$(ROOT_PREFIX)/etc/modutils/zaptel
--   else
--    ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modules.conf))
--      MODCONF:=$(ROOT_PREFIX)/etc/modules.conf
--     endif
--  endif
--endif
-+MODCONF:=$(INSTALL_PREFIX)/etc/modules.d/zaptel
- 
- ifeq (${BUILDVER},linux24)
- #We only support DEVFS in linux 2.4 kernels, since its considered obsolete post 2.4
-@@ -87,8 +63,8 @@
- endif
- 
- ifeq (${BUILDVER},linux26)
-+  DYNFS:=$(shell ps ax | grep -v grep | grep -q "devfsd\|udevd" && echo "yes")
-   ifneq (,$(wildcard $(ROOT_PREFIX)/etc/udev/rules.d))
--    DYNFS=yes
-     UDEVRULES=yes
-     ifneq (,$(wildcard $(ROOT_PREFIX)/etc/udev/permissions.d))
-       UDEVPERMISSIONS=yes
-@@ -328,17 +304,17 @@
- else # DYNFS
-   ifdef UDEVRULES
-     ifdef UDEVPERMISSIONS
--	install -m 444 udev/zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d
--	install -m 444 udev/zaptel.permissions $(INSTALL_PREFIX)/etc/udev/permissions.d
-+	install -D -m 444 udev/zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d/10-zaptel.rules
-+	install -D -m 444 udev/zaptel.permissions $(INSTALL_PREFIX)/etc/udev/permissions.d/10-zaptel.permissions
-     else # !UDEVPERMISSIONS (newer, combined syntax)
--	install -m 444 udev/zaptel.rules-combined $(INSTALL_PREFIX)/etc/udev/rules.d/zaptel.rules
-+	install -D -m 444 udev/zaptel.rules-combined $(INSTALL_PREFIX)/etc/udev/rules.d/10-zaptel.rules
-     endif
-   else # !UDEVRULES
- 	@echo "**** Dynamic filesystem detected -- not creating device nodes"
-   endif
- endif
- 
--install: all devices
-+install: devices
- 	install -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg
- 	if [ -f sethdlc-new ]; then \
- 		install -D -m 755 sethdlc-new $(INSTALL_PREFIX)/sbin/sethdlc; \
-@@ -365,42 +341,25 @@
- 		rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxs.o; \
- 	fi
- 	install -D -m 755 $(LIBTONEZONE_SO) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
--	[ `id -u` = 0 ] && /sbin/ldconfig || :
-+	[ `id -u` = 0 ] && /sbin/ldconfig -n $(INSTALL_PREFIX)/usr/lib || :
- 	rm -f $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
- 	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
- 		$(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER)
- 	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
- 		$(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
--	if [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO); fi
- 	install -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/linux/zaptel.h
- 	install -D -m 644 torisa.h $(INSTALL_PREFIX)/usr/include/linux/torisa.h
- 	install -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
--	install -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
--	install -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
-+	install -D -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8/ztcfg.8
-+	install -D -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8/zttool.8
-+	if [ ! -d `dirname $(MODCONF)` ]; then install -d -m 755 `dirname $(MODCONF)` ; fi
- 	if [ -n "$(MODCONF)" ]; then \
--		if [ -f $(MODCONF) ]; then mv -f $(MODCONF) $(MODCONF).bak ; fi; \
--		cat $(MODCONF).bak | grep -v "alias char-major-250" | \
--		grep -v "post-install torisa /sbin/ztcfg" | \
--		grep -v "post-install wcfxsusb /sbin/ztcfg" | \
--		grep -v "alias wctdm" | \
--		grep -v "post-install wctdm /sbin/ztcfg" > $(MODCONF); \
- 		if ! grep "options torisa" $(MODCONF); then \
- 			echo "options torisa base=$(BASEADDR)" >> $(MODCONF); \
- 		fi; \
- 		if ! grep "alias char-major-196" $(MODCONF); then \
- 			echo "alias char-major-196 $(PRIMARY)" >> $(MODCONF); \
- 		fi; \
--		for x in $(MODULES); do \
--			if ! grep -q "post-install $$x" $(MODCONF); then \
--				if ! grep -q "install $$x " $(MODCONF); then \
--					if [ "$$x" != "zaptel" ] ; then \
--						if [ -f zaptel.ko ]; then echo "install $$x /sbin/modprobe --ignore-install $$x && /sbin/ztcfg" >> $(MODCONF); \
--						else echo "post-install $$x /sbin/ztcfg" >> $(MODCONF); \
--						fi; \
--					fi; \
--				fi; \
--			fi; \
--		done; \
- 		if ! grep "ias wcfxs" $(MODCONF); then \
- 			echo "alias wcfxs wctdm" >> $(MODCONF); \
- 		fi; \
-@@ -408,19 +367,15 @@
- 			echo "alias wct2xxp wct4xxp" >> $(MODCONF); \
- 		fi; \
- 	fi
--	if [ -d /etc/modutils ]; then \
--		/sbin/update-modules ; \
--	fi
--	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
- 	[ -f $(CONFIG_FILE) ] || install -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
- 
- install-udev:
-   ifdef UDEVRULES
-     ifdef UDEVPERMISSIONS
--	install -m 444 udev/zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d
--	install -m 444 udev/zaptel.permissions $(INSTALL_PREFIX)/etc/udev/permissions.d
-+	install -D -m 444 udev/zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d/10-zaptel.rules
-+	install -D -m 444 udev/zaptel.permissions $(INSTALL_PREFIX)/etc/udev/permissions.d/10-zaptel.permissions
-     else # !UDEVPERMISSIONS (newer, combined syntax)
--	install -m 444 udev/zaptel.rules-combined $(INSTALL_PREFIX)/etc/udev/rules.d/zaptel.rules
-+	install -D -m 444 udev/zaptel.rules-combined $(INSTALL_PREFIX)/etc/udev/rules.d/10-zaptel.rules
-     endif
-   endif
- 
---- zaptel-1.2.2/udev/zaptel.permissions.orig	2006-01-19 00:11:04.000000000 +0100
-+++ zaptel-1.2.2/udev/zaptel.permissions	2006-01-19 00:11:17.000000000 +0100
-@@ -1,2 +1,2 @@
- # zaptel devices -- for running asterisk as non-root
--zap/*:asterisk:asterisk:660
-+zap/*:root:dialout:660
---- zaptel-1.2.2/udev/zaptel.rules-combined.orig	2006-01-19 00:11:25.000000000 +0100
-+++ zaptel-1.2.2/udev/zaptel.rules-combined	2006-01-19 00:12:12.000000000 +0100
-@@ -1,6 +1,6 @@
- # zaptel devices with ownership/permissions for running as non-root
--KERNEL="zapctl",     NAME="zap/ctl", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL="zaptimer",   NAME="zap/timer", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL="zapchannel", NAME="zap/channel", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL="zappseudo",  NAME="zap/pseudo", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL="zap[0-9]*",  NAME="zap/%n", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-+KERNEL="zapctl",     NAME="zap/ctl", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL="zaptimer",   NAME="zap/timer", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL="zapchannel", NAME="zap/channel", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL="zappseudo",  NAME="zap/pseudo", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL="zap[0-9]*",  NAME="zap/%n", OWNER="root", GROUP="dialout", MODE="0660"
diff --git a/net-misc/zaptel/files/zaptel-1.2.6-gentoo.diff b/net-misc/zaptel/files/zaptel-1.2.6-gentoo.diff
deleted file mode 100644
index cb666412d171..000000000000
--- a/net-misc/zaptel/files/zaptel-1.2.6-gentoo.diff
+++ /dev/null
@@ -1,91 +0,0 @@
---- zaptel-1.2.6/build_tools/genudevrules.orig	2006-06-04 15:57:29.000000000 +0200
-+++ zaptel-1.2.6/build_tools/genudevrules	2006-06-04 15:58:11.000000000 +0200
-@@ -22,9 +22,9 @@
- 
- cat <<EOF
- # zaptel devices with ownership/permissions for running as non-root
--KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-+KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="root", GROUP="dialout", MODE="0660"
- EOF
---- zaptel-1.2.6/build_tools/genmodconf.orig	2006-06-04 15:59:02.000000000 +0200
-+++ zaptel-1.2.6/build_tools/genmodconf	2006-06-04 15:59:13.000000000 +0200
-@@ -79,20 +79,6 @@
- 
- echo Building ${target}...
- 
--if [ "${1}" == "linux24" ]; then
--    for mod in ${3}; do
--	if ! grep -q "post-install ${mod} " ${target}; then
--	    echo "post-install ${mod} /sbin/ztcfg" >> ${target}
--	fi
--    done
--elif [ "${1}" == "linux26" ]; then
--    for mod in ${3}; do
--	if ! grep -q "install ${mod} " ${target}; then
--	    echo "install ${mod} /sbin/modprobe --ignore-install ${mod} ${cmdopts} && /sbin/ztcfg" >> ${target}
--	fi
--    done
--fi
--
- if ! grep -q "alias wcfxs" ${target}; then
-     echo "alias wcfxs wctdm" >> ${target};
- fi;
---- zaptel-1.2.6/Makefile.orig	2006-06-04 19:27:17.000000000 +0200
-+++ zaptel-1.2.6/Makefile	2006-06-04 19:28:11.000000000 +0200
-@@ -22,7 +22,7 @@
- endif
- KINCLUDES:=$(KSRC)/include
- 
--CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
-+CFLAGS+=-I. -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
- CFLAGS_PPC:=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
- CFLAGS_X86-64:=$(shell if uname -m | grep -q x86_64; then echo "-m64"; fi)
- CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_X86-64)
-@@ -294,7 +294,8 @@
- 	done
- else # DYNFS
-   ifdef UDEVRULES
--	build_tools/genudevrules > $(INSTALL_PREFIX)/etc/udev/rules.d/zaptel.rules
-+	build_tools/genudevrules > zaptel.rules
-+	install -D -m 644 zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d/10-zaptel.rules
-   else # !UDEVRULES
- 	@echo "**** Dynamic filesystem detected -- not creating device nodes"
-   endif
-@@ -323,24 +324,20 @@
- 	fi; \
- 	rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxs.o
- 	install -D -m 755 $(LIBTONEZONE_SO) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
--	[ `id -u` = 0 ] && /sbin/ldconfig || :
-+	[ `id -u` = 0 ] && /sbin/ldconfig -n $(INSTALL_PREFIX)/usr/lib || :
- 	rm -f $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
- 	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
- 		$(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER)
- 	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
- 		$(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
--	if [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO); fi
- 	install -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/linux/zaptel.h
- 	install -D -m 644 torisa.h $(INSTALL_PREFIX)/usr/include/linux/torisa.h
- 	install -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
--	install -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
--	install -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
--	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
-+	install -D -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
-+	install -D -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
- 	[ -f $(CONFIG_FILE) ] || install -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
--	build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out zaptel,$(MODULES))"
--	@if [ -d /etc/modutils ]; then \
--		/sbin/update-modules ; \
--	fi
-+	install -d -m 755 $(INSTALL_PREFIX)/etc/modules.d
-+	build_tools/genmodconf $(BUILDVER) "$(INSTALL_PREFIX)" "$(filter-out zaptel,$(MODULES))"
- 
- install-udev: devices
- 
diff --git a/net-misc/zaptel/files/zaptel-1.2.7-gentoo.diff b/net-misc/zaptel/files/zaptel-1.2.7-gentoo.diff
deleted file mode 100644
index c3c1d234a8f6..000000000000
--- a/net-misc/zaptel/files/zaptel-1.2.7-gentoo.diff
+++ /dev/null
@@ -1,102 +0,0 @@
---- zaptel-1.2.7/Makefile.orig	2006-07-07 20:03:59.000000000 +0200
-+++ zaptel-1.2.7/Makefile	2006-07-17 19:52:09.000000000 +0200
-@@ -24,7 +24,7 @@
- endif
- KINCLUDES:=$(KSRC)/include
- 
--CFLAGS+=-I. -Iinclude -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
-+CFLAGS+=-I. -Iinclude -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
- CFLAGS_PPC:=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
- CFLAGS_X86-64:=$(shell if uname -m | grep -q x86_64; then echo "-m64"; fi)
- CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_X86-64)
-@@ -308,7 +308,8 @@
- 	done
- else # DYNFS
-   ifdef UDEVRULES
--	build_tools/genudevrules > $(INSTALL_PREFIX)/etc/udev/rules.d/zaptel.rules
-+	build_tools/genudevrules > zaptel.rules
-+	install -D -m 644 zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d/10-zaptel.rules
-   else # !UDEVRULES
- 	@echo "**** Dynamic filesystem detected -- not creating device nodes"
-   endif
-@@ -337,24 +338,20 @@
- 	fi; \
- 	rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxs.o
- 	install -D -m 755 $(LIBTONEZONE_SO) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
--	[ `id -u` = 0 ] && /sbin/ldconfig || :
-+	[ `id -u` = 0 ] && /sbin/ldconfig -n $(INSTALL_PREFIX)/usr/lib || :
- 	rm -f $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
- 	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
- 		$(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER)
- 	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
- 		$(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
--	if [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO); fi
- 	install -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/linux/zaptel.h
- 	install -D -m 644 torisa.h $(INSTALL_PREFIX)/usr/include/linux/torisa.h
- 	install -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
--	install -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
--	install -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
--	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
-+	install -D -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
-+	install -D -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
- 	[ -f $(CONFIG_FILE) ] || install -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
--	build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out zaptel,$(MODULES))"
--	@if [ -d /etc/modutils ]; then \
--		/sbin/update-modules ; \
--	fi
-+	install -d -m 755 $(INSTALL_PREFIX)/etc/modules.d
-+	build_tools/genmodconf $(BUILDVER) "$(INSTALL_PREFIX)" "$(filter-out zaptel,$(MODULES))"
- 
- install-udev: devices
- 
---- zaptel-1.2.6/build_tools/genudevrules.orig	2006-06-04 15:57:29.000000000 +0200
-+++ zaptel-1.2.6/build_tools/genudevrules	2006-06-04 15:58:11.000000000 +0200
-@@ -22,9 +22,9 @@
- 
- cat <<EOF
- # zaptel devices with ownership/permissions for running as non-root
--KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-+KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="root", GROUP="dialout", MODE="0660"
- EOF
---- zaptel-1.2.6/build_tools/genmodconf.orig	2006-06-04 15:59:02.000000000 +0200
-+++ zaptel-1.2.6/build_tools/genmodconf	2006-06-04 15:59:13.000000000 +0200
-@@ -79,20 +79,6 @@
- 
- echo Building ${target}...
- 
--if [ "${1}" == "linux24" ]; then
--    for mod in ${3}; do
--	if ! grep -q "post-install ${mod} " ${target}; then
--	    echo "post-install ${mod} /sbin/ztcfg" >> ${target}
--	fi
--    done
--elif [ "${1}" == "linux26" ]; then
--    for mod in ${3}; do
--	if ! grep -q "install ${mod} " ${target}; then
--	    echo "install ${mod} /sbin/modprobe --ignore-install ${mod} ${cmdopts} && /sbin/ztcfg" >> ${target}
--	fi
--    done
--fi
--
- if ! grep -q "alias wcfxs" ${target}; then
-     echo "alias wcfxs wctdm" >> ${target};
- fi;
---- zaptel-1.2.8/Makefile.orig	2006-09-05 23:34:53.000000000 +0000
-+++ zaptel-1.2.8/Makefile	2006-09-05 23:35:23.000000000 +0000
-@@ -337,7 +337,7 @@
- 	tar -zxf mISDNuser.tar.gz
- 	$(MAKE) -C mISDNuser install
- 
--install: all devices firmware
-+install: devices firmware
- 	install -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg
- 	if [ -f sethdlc-new ]; then \
- 		install -D -m 755 sethdlc-new $(INSTALL_PREFIX)/sbin/sethdlc; \
diff --git a/net-misc/zaptel/zaptel-1.0.7-r1.ebuild b/net-misc/zaptel/zaptel-1.0.7-r1.ebuild
deleted file mode 100644
index 0dbc3dfdd002..000000000000
--- a/net-misc/zaptel/zaptel-1.0.7-r1.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.7-r1.ebuild,v 1.11 2005/09/15 02:38:26 stkn Exp $
-
-IUSE="devfs26 bri florz"
-
-inherit toolchain-funcs eutils linux-mod
-
-BRI_VERSION="0.2.0-RC8g"
-FLORZ_VERSION="0.2.0-RC8a_florz-6"
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="ftp://ftp.digium.com/pub/telephony/zaptel/old/zaptel-${PV}.tar.gz
-	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
-	 florz? ( http://zaphfc.florz.dyndns.org/zaphfc_${FLORZ_VERSION}.diff.gz )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~amd64"
-
-DEPEND="virtual/libc
-	virtual/linux-sources
-	>=dev-libs/newt-0.50.0"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	# show an nice warning message about zaptel not supporting devfs on 2.6
-	if kernel_is 2 6 && linux_chkconfig_present DEVFS_FS ; then
-		echo
-		einfo "You're using a 2.6 kernel with DEVFS."
-		einfo "The Zaptel drivers won't work unless you either:"
-		einfo "   * switch to udev"
-		einfo "   * write a script that re-creates the necessary device nodes for you"
-		einfo "   * enable the devfs26 useflag (see below)"
-		einfo ""
-		einfo "There's an experimental patch which adds devfs support when using linux-2.6, but:"
-		einfo "  1. It's an ugly hack atm and needs a cleanup..."
-		einfo "  2. I was only abled to test loding / unloading with the ztd-eth driver..."
-		einfo "  3. I _really_ don't know if it works with real hardware..."
-		einfo "  4. It disables udev support to avoid conflicts"
-		eerror "  5. And more important: This is not officially supported by Digium / the Asterisk project!"
-		einfo ""
-		einfo "If you're still interested, abort now (ctrl+c) and enable the devfs26 USE-flag"
-		einfo "Feedback and bug-reports should go to: stkn@gentoo.org"
-		einfo "You have been warned!"
-		echo
-		einfo "Sleeping 20 Seconds..."
-		epause 20
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# >= 1.0.7 requires new patch (-modulesd patch renamed to -gentoo)
-	epatch ${FILESDIR}/${PN}-1.0.7-gentoo.diff
-
-	# devfs support
-	if use devfs26; then
-		einfo "Enabling experimental devfs support for linux-2.6..."
-		epatch ${FILESDIR}/${PN}-1.0.4-experimental-devfs26.diff
-
-		# disable udev
-		sed -i -e "s:#define[\t ]\+\(CONFIG_ZAP_UDEV\):#undef \1:" \
-			zconfig.h
-	fi
-
-	# apply patch for gcc-3.4.x if that's the compiler in use...
-	# fixes (#76707)
-	if use x86 && [[ `gcc-fullversion` = "3.4.3" ]]; then
-		epatch ${FILESDIR}/${PN}-1.0.4-gcc34.patch
-	fi
-
-	# try to apply bristuff patch
-	if use bri; then
-		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
-		epatch ${FILESDIR}/zaptel-bristuff-${BRI_VERSION}.patch
-
-		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-
-		if use florz; then
-			einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
-			epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-		fi
-
-		# patch includes
-		sed -i  -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \
-			qozap/qozap.c \
-			zaphfc/zaphfc.c \
-			cwain/cwain.c
-
-		# patch makefiles
-		sed -i  -e "s:^ZAP[\t ]*=.*:ZAP=-I${S}:" \
-			-e "s:^MODCONF=.*:MODCONF=/etc/modules.d/zaptel:" \
-			-e "s:linux-2.6:linux:g" \
-			qozap/Makefile \
-			zaphfc/Makefile \
-			cwain/Makefile
-
-		sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
-			zaphfc/Makefile
-	fi
-
-	# replace `uname -r` with ${KV_FULL} in all Makefiles
-	find ${WORKDIR} -iname "Makefile" -exec sed -i -e "s:\`uname -r\`:${KV_FULL}:g" {} \;
-}
-
-src_compile() {
-	# TODO: bristuff modules
-
-	make ARCH=$(tc-arch-kernel) KERNEL_SOURCE=/usr/src/linux || die
-
-	if use bri; then
-		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-		make ARCH=$(tc-arch-kernel) -C qozap  || die
-		make ARCH=$(tc-arch-kernel) -C zaphfc || die
-		make ARCH=$(tc-arch-kernel) -C cwain  || die
-	fi
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} install || die
-
-	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
-	dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
-
-	# additional tools
-	dobin ztmonitor ztspeed zttest
-
-	if use bri; then
-		einfo "Installing bri"
-		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-
-		insinto /lib/modules/${KV_FULL}/misc
-		doins qozap/qozap.${KV_OBJ}
-		doins zaphfc/zaphfc.${KV_OBJ}
-		doins cwain/cwain.${KV_OBJ}
-
-		# install example configs for octoBRI and quadBRI
-		insinto /etc
-		doins qozap/zaptel.conf.octoBRI
-		doins cwain/zaptel.conf.doubleE1
-		newins qozap/zaptel.conf zaptel.conf.quadBRI
-		newins zaphfc/zaptel.conf zaptel.conf.zaphfc
-		newins cwain/zaptel.conf  zaptel.conf.E1
-
-		insinto /etc/asterisk
-		doins qozap/zapata.conf.octoBRI
-		doins cwain/zapata.conf.doubleE1
-		newins qozap/zapata.conf zapata.conf.quadBRI
-		newins zaphfc/zapata.conf zapata.conf.zaphfc
-		newins cwain/zapata.conf  zapata.conf.E1
-
-		docinto bristuff
-		dodoc CHANGES INSTALL
-
-		docinto bristuff/qozap
-		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
-
-		docinto bristuff/zaphfc
-		dodoc zaphfc/LICENSE zaphfc/*.conf
-
-		docinto bristuff/cwain
-		dodoc cwain/TODO cwain/LICENSE cwain/*.conf
-	fi
-
-	# install init script
-	newinitd ${FILESDIR}/zaptel.rc6 zaptel
-	newconfd ${FILESDIR}/zaptel.confd zaptel
-
-	# install devfsd rule file
-	insinto /etc/devfs.d
-	newins ${FILESDIR}/zaptel.devfsd zaptel
-
-	# install udev rule file
-	insinto /etc/udev/rules.d
-	newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${D}/dev/zap ]]; then
-		chown -R root:dialout	${D}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
-	fi
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if use devfs26; then
-		ewarn "*** Warning! ***"
-		ewarn "Devfs support for linux-2.6 is experimental and not"
-		ewarn "supported by digium or the asterisk project!"
-		echo
-		ewarn "Send bug-reports to: stkn@gentoo.org"
-	fi
-
-	echo
-	einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
-	echo
-
-	if use bri; then
-		einfo "Bristuff configs have been merged as:"
-		einfo ""
-		einfo "${ROOT}etc/"
-		einfo "    zaptel.conf.E1"
-		einfo "    zaptel.conf.zaphfc"
-		einfo "    zaptel.conf.quadBRI"
-		einfo "    zaptel.conf.octoBRI"
-		einfo "    zaptel.conf.doubleE1"
-		einfo ""
-		einfo "${ROOT}etc/asterisk/"
-		einfo "    zapata.conf.E1"
-		einfo "    zapata.conf.zaphfc"
-		einfo "    zapata.conf.quadBRI"
-		einfo "    zapata.conf.octoBRI"
-		einfo "    zapata.conf.doubleE1"
-		echo
-	fi
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${ROOT}/dev/zap ]]; then
-		chown -R root:dialout	${ROOT}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${ROOT}/dev/zap
-	fi
-}
diff --git a/net-misc/zaptel/zaptel-1.0.8.ebuild b/net-misc/zaptel/zaptel-1.0.8.ebuild
deleted file mode 100644
index bf543e7b4279..000000000000
--- a/net-misc/zaptel/zaptel-1.0.8.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.8.ebuild,v 1.5 2005/09/15 02:38:26 stkn Exp $
-
-IUSE="devfs26 bri florz"
-
-inherit toolchain-funcs eutils linux-mod
-
-BRI_VERSION="0.2.0-RC8h"
-FLORZ_VERSION="0.2.0-RC8a_florz-6"
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="ftp://ftp.digium.com/pub/telephony/zaptel/old/zaptel-${PV}.tar.gz
-	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
-	 florz? ( http://zaphfc.florz.dyndns.org/zaphfc_${FLORZ_VERSION}.diff.gz )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~amd64"
-
-DEPEND="virtual/libc
-	virtual/linux-sources
-	>=dev-libs/newt-0.50.0"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	# show an nice warning message about zaptel not supporting devfs on 2.6
-	if kernel_is 2 6 && linux_chkconfig_present DEVFS_FS ; then
-		echo
-		einfo "You're using a 2.6 kernel with DEVFS."
-		einfo "The Zaptel drivers won't work unless you either:"
-		einfo "   * switch to udev"
-		einfo "   * write a script that re-creates the necessary device nodes for you"
-		einfo "   * enable the devfs26 useflag (see below)"
-		einfo ""
-		einfo "There's an experimental patch which adds devfs support when using linux-2.6, but:"
-		einfo "  1. It's an ugly hack atm and needs a cleanup..."
-		einfo "  2. I was only abled to test loding / unloading with the ztd-eth driver..."
-		einfo "  3. I _really_ don't know if it works with real hardware..."
-		einfo "  4. It disables udev support to avoid conflicts"
-		eerror "  5. And more important: This is not officially supported by Digium / the Asterisk project!"
-		einfo ""
-		einfo "If you're still interested, abort now (ctrl+c) and enable the devfs26 USE-flag"
-		einfo "Feedback and bug-reports should go to: stkn@gentoo.org"
-		einfo "You have been warned!"
-		echo
-		einfo "Sleeping 20 Seconds..."
-		epause 20
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# >= 1.0.7 requires new patch (-modulesd patch renamed to -gentoo)
-	epatch ${FILESDIR}/${PN}-1.0.8-gentoo.diff
-
-	# devfs support
-	if use devfs26; then
-		einfo "Enabling experimental devfs support for linux-2.6..."
-		epatch ${FILESDIR}/${PN}-1.0.4-experimental-devfs26.diff
-
-		# disable udev
-		sed -i -e "s:#define[\t ]\+\(CONFIG_ZAP_UDEV\):#undef \1:" \
-			zconfig.h
-	fi
-
-	# apply patch for gcc-3.4.x if that's the compiler in use...
-	# fixes (#76707)
-	if use x86 && [[ `gcc-fullversion` = "3.4.3" ]]; then
-		epatch ${FILESDIR}/${PN}-1.0.4-gcc34.patch
-	fi
-
-	# try to apply bristuff patch
-	if use bri; then
-		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
-		epatch ${FILESDIR}/zaptel-bristuff-${BRI_VERSION}.patch
-
-		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-
-		if use florz; then
-			einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
-
-			# remove as soon as there's a new florz patch available
-			sed -i -e "s:zaptel-1\.0\.7:zaptel-1.0.8:g" \
-				${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-
-			epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-		fi
-
-		# patch includes
-		sed -i  -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \
-			qozap/qozap.c \
-			zaphfc/zaphfc.c \
-			cwain/cwain.c
-
-		# patch makefiles
-		sed -i  -e "s:^ZAP[\t ]*=.*:ZAP=-I${S}:" \
-			-e "s:^MODCONF=.*:MODCONF=/etc/modules.d/zaptel:" \
-			-e "s:linux-2.6:linux:g" \
-			qozap/Makefile \
-			zaphfc/Makefile \
-			cwain/Makefile
-
-		sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
-			zaphfc/Makefile
-	fi
-
-	# replace `uname -r` with ${KV_FULL} in all Makefiles
-	find ${WORKDIR} -iname "Makefile" -exec sed -i -e "s:\`uname -r\`:${KV_FULL}:g" {} \;
-}
-
-src_compile() {
-	# TODO: bristuff modules
-
-	make ARCH=$(tc-arch-kernel) KERNEL_SOURCE=/usr/src/linux || die
-
-	if use bri; then
-		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-		make ARCH=$(tc-arch-kernel) -C qozap  || die
-		make ARCH=$(tc-arch-kernel) -C zaphfc || die
-		make ARCH=$(tc-arch-kernel) -C cwain  || die
-	fi
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} install || die
-
-	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
-	dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
-
-	# additional tools
-	dobin ztmonitor ztspeed zttest
-
-	if use bri; then
-		einfo "Installing bri"
-		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-
-		insinto /lib/modules/${KV_FULL}/misc
-		doins qozap/qozap.${KV_OBJ}
-		doins zaphfc/zaphfc.${KV_OBJ}
-		doins cwain/cwain.${KV_OBJ}
-
-		# install example configs for octoBRI and quadBRI
-		insinto /etc
-		doins qozap/zaptel.conf.octoBRI
-		newins qozap/zaptel.conf zaptel.conf.quadBRI
-		newins zaphfc/zaptel.conf zaptel.conf.zaphfc
-
-		insinto /etc/asterisk
-		doins qozap/zapata.conf.octoBRI
-		newins qozap/zapata.conf zapata.conf.quadBRI
-		newins zaphfc/zapata.conf zapata.conf.zaphfc
-
-		docinto bristuff
-		dodoc CHANGES INSTALL
-
-		docinto bristuff/qozap
-		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
-
-		docinto bristuff/zaphfc
-		dodoc zaphfc/LICENSE zaphfc/*.conf
-
-		docinto bristuff/cwain
-		dodoc cwain/TODO cwain/LICENSE
-	fi
-
-	# install init script
-	newinitd ${FILESDIR}/zaptel.rc6 zaptel
-	newconfd ${FILESDIR}/zaptel.confd zaptel
-
-	# install devfsd rule file
-	insinto /etc/devfs.d
-	newins ${FILESDIR}/zaptel.devfsd zaptel
-
-	# install udev rule file
-	insinto /etc/udev/rules.d
-	newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${D}/dev/zap ]]; then
-		chown -R root:dialout	${D}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
-	fi
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if use devfs26; then
-		ewarn "*** Warning! ***"
-		ewarn "Devfs support for linux-2.6 is experimental and not"
-		ewarn "supported by digium or the asterisk project!"
-		echo
-		ewarn "Send bug-reports to: stkn@gentoo.org"
-	fi
-
-	echo
-	einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
-	echo
-
-	if use bri; then
-		einfo "Bristuff configs have been merged as:"
-		einfo ""
-		einfo "${ROOT}etc/"
-		einfo "    zaptel.conf.zaphfc"
-		einfo "    zaptel.conf.quadBRI"
-		einfo "    zaptel.conf.octoBRI"
-		einfo ""
-		einfo "${ROOT}etc/asterisk/"
-		einfo "    zapata.conf.zaphfc"
-		einfo "    zapata.conf.quadBRI"
-		einfo "    zapata.conf.octoBRI"
-		echo
-	fi
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${ROOT}/dev/zap ]]; then
-		chown -R root:dialout	${ROOT}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${ROOT}/dev/zap
-	fi
-}
diff --git a/net-misc/zaptel/zaptel-1.0.9_p2.ebuild b/net-misc/zaptel/zaptel-1.0.9_p2.ebuild
deleted file mode 100644
index 4ff6e1a53d53..000000000000
--- a/net-misc/zaptel/zaptel-1.0.9_p2.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.9_p2.ebuild,v 1.2 2005/12/02 03:32:51 stkn Exp $
-
-IUSE="devfs26 bri florz rtc"
-
-inherit toolchain-funcs eutils linux-mod
-
-BRI_VERSION="0.2.0-RC8n"
-FLORZ_VERSION="0.2.0-RC8j_florz-8"
-
-MY_PV="${PV/_p/.}"
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="ftp://ftp.digium.com/pub/telephony/zaptel/old/zaptel-${MY_PV}.tar.gz
-	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
-	 florz? ( http://zaphfc.florz.dyndns.org/zaphfc_${FLORZ_VERSION}.diff.gz )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-DEPEND="virtual/libc
-	virtual/linux-sources
-	>=dev-libs/newt-0.50.0"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	# show an nice warning message about zaptel not supporting devfs on 2.6
-	if kernel_is 2 6 && linux_chkconfig_present DEVFS_FS ; then
-		echo
-		einfo "You're using a 2.6 kernel with DEVFS."
-		einfo "The Zaptel drivers won't work unless you either:"
-		einfo "   * switch to udev"
-		einfo "   * write a script that re-creates the necessary device nodes for you"
-		einfo "   * enable the devfs26 useflag (see below)"
-		einfo ""
-		einfo "There's an experimental patch which adds devfs support when using linux-2.6, but:"
-		einfo "   1. It disables udev support to avoid conflicts"
-		ewarn "   2. It is not supported by Digium / the Asterisk project!"
-		einfo ""
-		einfo "If you're still interested, abort now (ctrl+c) and enable the devfs26 USE-flag"
-		einfo "Feedback and bug-reports should go to: stkn@gentoo.org"
-		einfo "You have been warned!"
-		echo
-		einfo "Sleeping 20 Seconds..."
-		epause 20
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# patch makefile(s) for gentoo
-	epatch ${FILESDIR}/${PN}-1.0.9_p2-gentoo.diff
-
-	# devfs support
-	if use devfs26; then
-		einfo "Enabling experimental devfs support for linux-2.6..."
-		epatch ${FILESDIR}/${PN}-1.0.4-experimental-devfs26.diff
-
-		# disable udev
-		sed -i -e "s:#define[\t ]\+\(CONFIG_ZAP_UDEV\):#undef \1:" \
-			zconfig.h
-
-		# fix Makefile to not create device nodes for
-		# devfs enabled 2.6 kernels
-		sed -i -e 's:grep udevd:grep -q \"udevd\\|devfsd\":' \
-			Makefile || die "QA error: No substitution performed"
-	fi
-
-	# apply patch for gcc-3.4.x if that's the compiler in use...
-	# fixes (#76707)
-	if use x86 && [[ `gcc-fullversion` = "3.4.3" ]]; then
-		epatch ${FILESDIR}/${PN}-1.0.4-gcc34.patch
-	fi
-
-	# try to apply bristuff patch
-	if use bri; then
-		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
-		epatch ${FILESDIR}/zaptel-bristuff-${BRI_VERSION}.patch
-
-		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-
-		if use florz; then
-			einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
-
-			epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-		fi
-
-		# patch includes
-		sed -i  -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \
-			qozap/qozap.c \
-			zaphfc/zaphfc.c \
-			cwain/cwain.c
-
-		# patch makefiles
-		sed -i  -e "s:^ZAP[\t ]*=.*:ZAP=-I${S}:" \
-			-e "s:^MODCONF=.*:MODCONF=/etc/modules.d/zaptel:" \
-			-e "s:linux-2.6:linux:g" \
-			qozap/Makefile \
-			zaphfc/Makefile \
-			cwain/Makefile
-
-		sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
-			zaphfc/Makefile
-	fi
-
-	# replace `uname -r` with ${KV_FULL} in all Makefiles
-	find ${WORKDIR} -iname "Makefile" -exec sed -i -e "s:\`uname -r\`:${KV_FULL}:g" {} \;
-
-	cd ${S}
-	#######################################################################
-	# apply other patches here,
-	# make sure they work with things that have been added before!
-	#
-
-	# apply x86 rtc patch for ztdummy (http://bugs.digium.com/view.php?id=4301)
-	# this won't have any effect on non-x86 systems...
-	if use rtc; then
-		if use x86 || use amd64; then
-			epatch ${FILESDIR}/${PN}-1.0.9-rtc.patch
-		else
-			ewarn "RTC is unsupported on your arch, skipping patch"
-		fi
-	fi
-}
-
-src_compile() {
-	make ARCH=$(tc-arch-kernel) KERNEL_SOURCE=/usr/src/linux || die
-
-	if use bri; then
-		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-		make ARCH=$(tc-arch-kernel) -C qozap  || die
-		make ARCH=$(tc-arch-kernel) -C zaphfc || die
-		make ARCH=$(tc-arch-kernel) -C cwain  || die
-	fi
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} install || die
-
-	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
-	dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
-
-	# additional tools
-	dobin ztmonitor ztspeed zttest
-
-	if use bri; then
-		einfo "Installing bri"
-		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-
-		insinto /lib/modules/${KV_FULL}/misc
-		doins qozap/qozap.${KV_OBJ}
-		doins zaphfc/zaphfc.${KV_OBJ}
-		doins cwain/cwain.${KV_OBJ}
-
-		# install example configs for octoBRI and quadBRI
-		insinto /etc
-		doins qozap/zaptel.conf.octoBRI
-		newins qozap/zaptel.conf zaptel.conf.quadBRI
-		newins zaphfc/zaptel.conf zaptel.conf.zaphfc
-
-		insinto /etc/asterisk
-		doins qozap/zapata.conf.octoBRI
-		newins qozap/zapata.conf zapata.conf.quadBRI
-		newins zaphfc/zapata.conf zapata.conf.zaphfc
-
-		docinto bristuff
-		dodoc CHANGES INSTALL
-
-		docinto bristuff/qozap
-		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
-
-		docinto bristuff/zaphfc
-		dodoc zaphfc/LICENSE zaphfc/*.conf
-
-		docinto bristuff/cwain
-		dodoc cwain/TODO cwain/LICENSE
-	fi
-
-	# install init script
-	newinitd ${FILESDIR}/zaptel.rc6 zaptel
-	newconfd ${FILESDIR}/zaptel.confd zaptel
-
-	# install devfsd rule file
-	insinto /etc/devfs.d
-	newins ${FILESDIR}/zaptel.devfsd zaptel
-
-	# install udev rule file
-	insinto /etc/udev/rules.d
-	newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${D}/dev/zap ]]; then
-		chown -R root:dialout	${D}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
-	fi
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if use devfs26; then
-		ewarn "*** Warning! ***"
-		ewarn "Devfs support for linux-2.6 is experimental and not"
-		ewarn "supported by digium or the asterisk project!"
-		echo
-		ewarn "Send bug-reports to: stkn@gentoo.org"
-	fi
-
-	echo
-	einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
-	echo
-
-	if use bri; then
-		einfo "Bristuff configs have been merged as:"
-		einfo ""
-		einfo "${ROOT}etc/"
-		einfo "    zaptel.conf.zaphfc"
-		einfo "    zaptel.conf.quadBRI"
-		einfo "    zaptel.conf.octoBRI"
-		einfo ""
-		einfo "${ROOT}etc/asterisk/"
-		einfo "    zapata.conf.zaphfc"
-		einfo "    zapata.conf.quadBRI"
-		einfo "    zapata.conf.octoBRI"
-		echo
-	fi
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${ROOT}/dev/zap ]]; then
-		chown -R root:dialout	${ROOT}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${ROOT}/dev/zap
-	fi
-}
diff --git a/net-misc/zaptel/zaptel-1.2.5-r1.ebuild b/net-misc/zaptel/zaptel-1.2.5-r1.ebuild
deleted file mode 100644
index 7f8ba6c9e7ba..000000000000
--- a/net-misc/zaptel/zaptel-1.2.5-r1.ebuild
+++ /dev/null
@@ -1,375 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.5-r1.ebuild,v 1.1 2006/05/06 14:39:24 stkn Exp $
-
-inherit toolchain-funcs eutils linux-mod
-
-## NOTE:
-#
-# this is zaptel-1.2.5-r2 in the overlay
-#
-
-BRI_VERSION="0.3.0-PRE-1o"
-FLORZ_VERSION="0.3.0-PRE-1o_florz-12"
-
-IUSE="bri devfs26 ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2 florz rtc ukcid watchdog zapras zapnet"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://ftp.digium.com/pub/zaptel/${MY_P}.tar.gz
-	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
-	 florz? ( http://zaphfc.florz.dyndns.org/zaphfc_${FLORZ_VERSION}.diff.gz )"
-
-S="${WORKDIR}/${MY_P}"
-
-S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="virtual/libc
-	virtual/linux-sources
-	>=dev-libs/newt-0.50.0"
-
-# list of echo canceller use flags,
-# first active in this list is selected (=order does matter)
-ZAP_EC_FLAGS="ecmark ecmark2 ecmark3 ecsteve ecsteve2 eckb1 ecmg2"
-
-### Begin: Helper functions
-
-select_echo_cancel() {
-	local myEC=""
-
-	for x in ${ZAP_EC_FLAGS}; do
-		if use $x; then
-			myEC=$(echo "$x" | sed -e "s:^ec::" | tr '[:lower:]' '[:upper:]')
-			break;
-		fi
-	done
-
-	echo ${myEC}
-}
-
-zconfig_disable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		# match a little more than ${1} so we can use zconfig_disable
-		# to disable all echo cancellers in zconfig.h w/o calling it several times
-		sed -i -e "s:^[ \t]*#define[ \t]\+\(${1}[a-zA-Z0-9_-]*\).*:#undef \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-zconfig_enable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		sed -i  -e "s:^/\*[ \t]*#define[ \t]\+\(${1}\).*:#define \1:" \
-			-e "s:^[ \t]*#undef[ \t]\+\(${1}\).*:#define \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-### End: Helper functions
-
-pkg_setup() {
-	local result=0 numec=0
-
-	linux-mod_pkg_setup
-
-	einfo "Running pre-flight checks..."
-
-	# basic zaptel checks
-	if ! linux_chkconfig_present CRC_CCITT; then
-		echo
-		eerror "Your kernel lacks CRC_CCIT support!"
-		eerror "Enable CONFIG_CRC_CCIT!"
-		result=$((result+1))
-	fi
-
-	# check if multiple echo cancellers have been selected
-	for x in ${ZAP_EC_FLAGS}; do
-		use $x && numec=$((numec+1))
-	done
-	if [[ $numec -gt 1 ]]; then
-		# multiple flags are active, only the first in the ZAP_EC_FLAGS list
-		# will be used, make sure the user knows about this
-		echo
-		ewarn "Multiple echo canceller flags are active but only one will be used!"
-		ewarn "Selected: $(select_echo_cancel)"
-	fi
-
-	# we need at least HDLC generic support
-	if use zapnet && ! linux_chkconfig_present HDLC; then
-		echo
-		eerror "zapnet: Your kernel lacks HDLC support!"
-		eerror "zapnet: Enable CONFIG_HDLC* to use zaptel network support!"
-		result=$((result+1))
-	fi
-
-	# zapras needs PPP support
-	if use zapras && ! linux_chkconfig_present PPP; then
-		echo
-		eerror "zapras: Your kernel lacks PPP support!"
-		eerror "zapras: Enable CONFIG_PPP* to use zaptel ras support!"
-		result=$((result+1))
-	fi
-
-	# rtc needs linux-2.6 and CONFIG_RTC
-	if use rtc; then
-		if ! kernel_is 2 6; then
-			echo
-			eerror "rtc: >=Linux-2.6.0 is needed for rtc support!"
-			result=$((result+1))
-		fi
-
-		if ! linux_chkconfig_present RTC; then
-			eerror "rtc: Your kernel lacks RealTime-Clock support!"
-			result=$((result+1))
-		fi
-	fi
-
-	if [[ $result -gt 0 ]]; then
-		echo
-		ewarn "One or more of the neccessary precondition(s) is/are not met!"
-		ewarn "Look at the messages above, resolve the problem (or disable the use-flag) and try again"
-		echo
-
-		if [[ $result -lt 3 ]]; then
-			eerror "[$result Error(s)] Zaptel is not happy :("
-		else
-			eerror "[$result Error(s)] You're making zaptel cry :'("
-		fi
-		die "[$result] Precondition(s) not met"
-	fi
-
-	echo
-	einfo "Zaptel is happy and continues... :)"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.2.2-gentoo.diff
-
-	if kernel_is 2 6 && use devfs26; then
-		if [[ ${KV_PATCH} -ge 14 ]]; then
-			eerror "Devfs has been removed in linux-2.6.14, skipping devfs26!"
-		else
-			epatch ${FILESDIR}/${PN}-1.2.0-devfs26.diff
-
-			# fix Makefile to not create device nodes for
-			# devfs enabled 2.6 kernels
-			sed -i -e 's:grep -q udevd:grep -q \"udevd\\|devfsd\":' \
-				Makefile
-
-			# disable udev support on devfs26 systems
-			zconfig_disable CONFIG_ZAP_UDEV
-		fi
-	fi
-
-	use ukcid && \
-		epatch ${FILESDIR}/${PN}-1.2.0-ukcid.patch
-
-	# try to apply bristuff patch
-	if use bri; then
-		# fix for userpriv
-		chmod -R a=rwX ${S_BRI}
-
-		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
-		epatch ${S_BRI}/patches/zaptel.patch
-
-		cd ${S_BRI}
-
-		if use florz; then
-			einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
-
-		#	# remove as soon as there's a new florz patch available
-		#	sed -i -e "s:zaptel-1\.2\.1:zaptel-1.2.5:g" \
-		#		${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-
-			epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-		fi
-
-		# patch includes
-		sed -i  -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \
-			qozap/qozap.c \
-			zaphfc/zaphfc.c \
-			cwain/cwain.c
-
-		# patch makefiles
-		sed -i  -e "s:^ZAP[\t ]*=.*:ZAP=-I${S}:" \
-			-e "s:^MODCONF=.*:MODCONF=/etc/modules.d/zaptel:" \
-			-e "s:linux-2.6:linux:g" \
-			qozap/Makefile \
-			zaphfc/Makefile \
-			cwain/Makefile
-
-		sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
-			zaphfc/Makefile
-
-		cd ${S}
-	fi
-
-### Configuration changes
-	local myEC
-
-	# prepare zconfig.h
-	myEC=$(select_echo_cancel)
-	if [[ -n "${myEC}" ]]; then
-		einfo "Selected echo canceller: ${myEC}"
-		# disable default first, set new selected ec afterwards
-		zconfig_disable ECHO_CAN
-		zconfig_enable ECHO_CAN_${myEC}
-	fi
-
-	# enable rtc support on 2.6
-	if use rtc && linux_chkconfig_present RTC && kernel_is 2 6; then
-		einfo "Enabling ztdummy RTC support"
-		zconfig_enable USE_RTC
-	fi
-
-	# enable agressive echo surpression
-	use ecaggressive && \
-		zconfig_enable AGGRESSIVE_SUPPRESSOR
-
-	# ppp ras support
-	use zapras && \
-		zconfig_enable CONFIG_ZAPATA_PPP
-
-	# frame relay, syncppp...
-	use zapnet && \
-		zconfig_enable CONFIG_ZAPATA_NET
-
-	# zaptel watchdog
-	use watchdog && \
-		zconfig_enable CONFIG_ZAPTEL_WATCHDOG
-}
-
-src_compile() {
-	# build
-	make KVERS=${KV_FULL} \
-	     KSRC=/usr/src/linux ARCH=$(tc-arch-kernel) || die
-
-	if use bri; then
-		cd ${S_BRI}
-		for x in cwain qozap zaphfc; do
-			einfo "Building ${x}..."
-			make KVERS=${KV_FULL} \
-				KSRC=/usr/src/linux \
-				ARCH=$(tc-arch-kernel) \
-				-C ${x} || die "make ${x} failed"
-		done
-	fi
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} ARCH=$(tc-arch-kernel) \
-	     KVERS=${KV_FULL} KSRC=/usr/src/linux install || die
-
-	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
-	dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
-
-	# additional tools
-	dobin ztmonitor ztspeed zttest
-
-	# install all header files, several packages need the complete set
-	# (e.g. sangoma wanpipe)
-	insinto /usr/include/zaptel
-	doins *.h
-
-	if use bri; then
-		einfo "Installing bri"
-		cd ${S_BRI}
-
-		insinto /lib/modules/${KV_FULL}/misc
-		doins qozap/qozap.${KV_OBJ}
-		doins zaphfc/zaphfc.${KV_OBJ}
-		doins cwain/cwain.${KV_OBJ}
-
-		# install example configs for octoBRI and quadBRI
-		insinto /etc
-		doins qozap/zaptel.conf.octoBRI
-		newins qozap/zaptel.conf zaptel.conf.quadBRI
-		newins zaphfc/zaptel.conf zaptel.conf.zaphfc
-
-		insinto /etc/asterisk
-		doins qozap/zapata.conf.octoBRI
-		newins qozap/zapata.conf zapata.conf.quadBRI
-		newins zaphfc/zapata.conf zapata.conf.zaphfc
-
-		docinto bristuff
-		dodoc CHANGES INSTALL
-
-		docinto bristuff/qozap
-		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
-
-		docinto bristuff/zaphfc
-		dodoc zaphfc/LICENSE zaphfc/*.conf
-
-		docinto bristuff/cwain
-		dodoc cwain/TODO cwain/LICENSE
-
-		cd ${S}
-	fi
-
-	# install init script
-	newinitd ${FILESDIR}/zaptel.rc6 zaptel
-	newconfd ${FILESDIR}/zaptel.confd zaptel
-
-	# install devfsd rule file
-	insinto /etc/devfs.d
-	newins ${FILESDIR}/zaptel.devfsd zaptel
-
-	# install udev rule file
-	insinto /etc/udev/rules.d
-	newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${D}/dev/zap ]]; then
-		chown -R root:dialout	${D}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
-	fi
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if kernel_is 2 6 && [[ ${KV_PATCH} -lt 14 ]] && use devfs26; then
-		ewarn "*** Warning! ***"
-		ewarn "Devfs support for linux-2.6 is experimental and not"
-		ewarn "supported by digium or the asterisk project!"
-		echo
-		ewarn "Send bug-reports to: stkn@gentoo.org"
-	fi
-
-	echo
-	einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
-	echo
-
-	if use bri; then
-		einfo "Bristuff configs have been merged as:"
-		einfo ""
-		einfo "${ROOT}etc/"
-		einfo "    zaptel.conf.zaphfc"
-		einfo "    zaptel.conf.quadBRI"
-		einfo "    zaptel.conf.octoBRI"
-		einfo ""
-		einfo "${ROOT}etc/asterisk/"
-		einfo "    zapata.conf.zaphfc"
-		einfo "    zapata.conf.quadBRI"
-		einfo "    zapata.conf.octoBRI"
-		echo
-	fi
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${ROOT}dev/zap ]]; then
-		chown -R root:dialout	${ROOT}dev/zap
-		chmod -R u=rwX,g=rwX,o= ${ROOT}dev/zap
-	fi
-}
diff --git a/net-misc/zaptel/zaptel-1.2.5.ebuild b/net-misc/zaptel/zaptel-1.2.5.ebuild
deleted file mode 100644
index 358d0b90f4ef..000000000000
--- a/net-misc/zaptel/zaptel-1.2.5.ebuild
+++ /dev/null
@@ -1,373 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.5.ebuild,v 1.1 2006/04/16 00:50:40 stkn Exp $
-
-inherit toolchain-funcs eutils linux-mod
-
-## NOTE:
-# this is zaptel-1.2.5-r1 in the overlay
-
-BRI_VERSION="0.3.0-PRE-1n"
-FLORZ_VERSION="0.3.0-PRE-1n_florz-11"
-
-IUSE="bri devfs26 ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2 florz rtc ukcid watchdog zapras zapnet"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://ftp.digium.com/pub/zaptel/${MY_P}.tar.gz
-	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
-	 florz? ( http://www.netdomination.org/pub/asterisk/zaphfc_${FLORZ_VERSION}.diff.gz )"
-
-S="${WORKDIR}/${MY_P}"
-
-S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="virtual/libc
-	virtual/linux-sources
-	>=dev-libs/newt-0.50.0"
-
-# list of echo canceller use flags,
-# first active in this list is selected (=order does matter)
-ZAP_EC_FLAGS="ecmark ecmark2 ecmark3 ecsteve ecsteve2 eckb1 ecmg2"
-
-### Begin: Helper functions
-
-select_echo_cancel() {
-	local myEC=""
-
-	for x in ${ZAP_EC_FLAGS}; do
-		if use $x; then
-			myEC=$(echo "$x" | sed -e "s:^ec::" | tr '[:lower:]' '[:upper:]')
-			break;
-		fi
-	done
-
-	echo ${myEC}
-}
-
-zconfig_disable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		# match a little more than ${1} so we can use zconfig_disable
-		# to disable all echo cancellers in zconfig.h w/o calling it several times
-		sed -i -e "s:^[ \t]*#define[ \t]\+\(${1}[a-zA-Z0-9_-]*\).*:#undef \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-zconfig_enable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		sed -i  -e "s:^/\*[ \t]*#define[ \t]\+\(${1}\).*:#define \1:" \
-			-e "s:^[ \t]*#undef[ \t]\+\(${1}\).*:#define \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-### End: Helper functions
-
-pkg_setup() {
-	local result=0 numec=0
-
-	linux-mod_pkg_setup
-
-	einfo "Running pre-flight checks..."
-
-	# basic zaptel checks
-	if ! linux_chkconfig_present CRC_CCITT; then
-		echo
-		eerror "Your kernel lacks CRC_CCIT support!"
-		eerror "Enable CONFIG_CRC_CCIT!"
-		result=$((result+1))
-	fi
-
-	# check if multiple echo cancellers have been selected
-	for x in ${ZAP_EC_FLAGS}; do
-		use $x && numec=$((numec+1))
-	done
-	if [[ $numec -gt 1 ]]; then
-		# multiple flags are active, only the first in the ZAP_EC_FLAGS list
-		# will be used, make sure the user knows about this
-		echo
-		ewarn "Multiple echo canceller flags are active but only one will be used!"
-		ewarn "Selected: $(select_echo_cancel)"
-	fi
-
-	# we need at least HDLC generic support
-	if use zapnet && ! linux_chkconfig_present HDLC; then
-		echo
-		eerror "zapnet: Your kernel lacks HDLC support!"
-		eerror "zapnet: Enable CONFIG_HDLC* to use zaptel network support!"
-		result=$((result+1))
-	fi
-
-	# zapras needs PPP support
-	if use zapras && ! linux_chkconfig_present PPP; then
-		echo
-		eerror "zapras: Your kernel lacks PPP support!"
-		eerror "zapras: Enable CONFIG_PPP* to use zaptel ras support!"
-		result=$((result+1))
-	fi
-
-	# rtc needs linux-2.6 and CONFIG_RTC
-	if use rtc; then
-		if ! kernel_is 2 6; then
-			echo
-			eerror "rtc: >=Linux-2.6.0 is needed for rtc support!"
-			result=$((result+1))
-		fi
-
-		if ! linux_chkconfig_present RTC; then
-			eerror "rtc: Your kernel lacks RealTime-Clock support!"
-			result=$((result+1))
-		fi
-	fi
-
-	if [[ $result -gt 0 ]]; then
-		echo
-		ewarn "One or more of the neccessary precondition(s) is/are not met!"
-		ewarn "Look at the messages above, resolve the problem (or disable the use-flag) and try again"
-		echo
-
-		if [[ $result -lt 3 ]]; then
-			eerror "[$result Error(s)] Zaptel is not happy :("
-		else
-			eerror "[$result Error(s)] You're making zaptel cry :'("
-		fi
-		die "[$result] Precondition(s) not met"
-	fi
-
-	echo
-	einfo "Zaptel is happy and continues... :)"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.2.2-gentoo.diff
-
-	if kernel_is 2 6 && use devfs26; then
-		if [[ ${KV_PATCH} -ge 14 ]]; then
-			eerror "Devfs has been removed in linux-2.6.14, skipping devfs26!"
-		else
-			epatch ${FILESDIR}/${PN}-1.2.0-devfs26.diff
-
-			# fix Makefile to not create device nodes for
-			# devfs enabled 2.6 kernels
-			sed -i -e 's:grep -q udevd:grep -q \"udevd\\|devfsd\":' \
-				Makefile
-
-			# disable udev support on devfs26 systems
-			zconfig_disable CONFIG_ZAP_UDEV
-		fi
-	fi
-
-	use ukcid && \
-		epatch ${FILESDIR}/${PN}-1.2.0-ukcid.patch
-
-	# try to apply bristuff patch
-	if use bri; then
-		# fix for userpriv
-		chmod -R a=rwX ${S_BRI}
-
-		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
-		epatch ${S_BRI}/patches/zaptel.patch
-
-		cd ${S_BRI}
-
-		if use florz; then
-			einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
-
-			# remove as soon as there's a new florz patch available
-			sed -i -e "s:zaptel-1\.2\.1:zaptel-1.2.3:g" \
-				${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-
-			epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-		fi
-
-		# patch includes
-		sed -i  -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \
-			qozap/qozap.c \
-			zaphfc/zaphfc.c \
-			cwain/cwain.c
-
-		# patch makefiles
-		sed -i  -e "s:^ZAP[\t ]*=.*:ZAP=-I${S}:" \
-			-e "s:^MODCONF=.*:MODCONF=/etc/modules.d/zaptel:" \
-			-e "s:linux-2.6:linux:g" \
-			qozap/Makefile \
-			zaphfc/Makefile \
-			cwain/Makefile
-
-		sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
-			zaphfc/Makefile
-
-		cd ${S}
-	fi
-
-### Configuration changes
-	local myEC
-
-	# prepare zconfig.h
-	myEC=$(select_echo_cancel)
-	if [[ -n "${myEC}" ]]; then
-		einfo "Selected echo canceller: ${myEC}"
-		# disable default first, set new selected ec afterwards
-		zconfig_disable ECHO_CAN
-		zconfig_enable ECHO_CAN_${myEC}
-	fi
-
-	# enable rtc support on 2.6
-	if use rtc && linux_chkconfig_present RTC && kernel_is 2 6; then
-		einfo "Enabling ztdummy RTC support"
-		zconfig_enable USE_RTC
-	fi
-
-	# enable agressive echo surpression
-	use ecaggressive && \
-		zconfig_enable AGGRESSIVE_SUPPRESSOR
-
-	# ppp ras support
-	use zapras && \
-		zconfig_enable CONFIG_ZAPATA_PPP
-
-	# frame relay, syncppp...
-	use zapnet && \
-		zconfig_enable CONFIG_ZAPATA_NET
-
-	# zaptel watchdog
-	use watchdog && \
-		zconfig_enable CONFIG_ZAPTEL_WATCHDOG
-}
-
-src_compile() {
-	# build
-	make KVERS=${KV_FULL} \
-	     KSRC=/usr/src/linux ARCH=$(tc-arch-kernel) || die
-
-	if use bri; then
-		cd ${S_BRI}
-		for x in cwain qozap zaphfc; do
-			einfo "Building ${x}..."
-			make KVERS=${KV_FULL} \
-				KSRC=/usr/src/linux \
-				ARCH=$(tc-arch-kernel) \
-				-C ${x} || die "make ${x} failed"
-		done
-	fi
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} ARCH=$(tc-arch-kernel) \
-	     KVERS=${KV_FULL} KSRC=/usr/src/linux install || die
-
-	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
-	dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
-
-	# additional tools
-	dobin ztmonitor ztspeed zttest
-
-	# install all header files, several packages need the complete set
-	# (e.g. sangoma wanpipe)
-	insinto /usr/include/zaptel
-	doins *.h
-
-	if use bri; then
-		einfo "Installing bri"
-		cd ${S_BRI}
-
-		insinto /lib/modules/${KV_FULL}/misc
-		doins qozap/qozap.${KV_OBJ}
-		doins zaphfc/zaphfc.${KV_OBJ}
-		doins cwain/cwain.${KV_OBJ}
-
-		# install example configs for octoBRI and quadBRI
-		insinto /etc
-		doins qozap/zaptel.conf.octoBRI
-		newins qozap/zaptel.conf zaptel.conf.quadBRI
-		newins zaphfc/zaptel.conf zaptel.conf.zaphfc
-
-		insinto /etc/asterisk
-		doins qozap/zapata.conf.octoBRI
-		newins qozap/zapata.conf zapata.conf.quadBRI
-		newins zaphfc/zapata.conf zapata.conf.zaphfc
-
-		docinto bristuff
-		dodoc CHANGES INSTALL
-
-		docinto bristuff/qozap
-		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
-
-		docinto bristuff/zaphfc
-		dodoc zaphfc/LICENSE zaphfc/*.conf
-
-		docinto bristuff/cwain
-		dodoc cwain/TODO cwain/LICENSE
-
-		cd ${S}
-	fi
-
-	# install init script
-	newinitd ${FILESDIR}/zaptel.rc6 zaptel
-	newconfd ${FILESDIR}/zaptel.confd zaptel
-
-	# install devfsd rule file
-	insinto /etc/devfs.d
-	newins ${FILESDIR}/zaptel.devfsd zaptel
-
-	# install udev rule file
-	insinto /etc/udev/rules.d
-	newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${D}/dev/zap ]]; then
-		chown -R root:dialout	${D}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
-	fi
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if kernel_is 2 6 && [[ ${KV_PATCH} -lt 14 ]] && use devfs26; then
-		ewarn "*** Warning! ***"
-		ewarn "Devfs support for linux-2.6 is experimental and not"
-		ewarn "supported by digium or the asterisk project!"
-		echo
-		ewarn "Send bug-reports to: stkn@gentoo.org"
-	fi
-
-	echo
-	einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
-	echo
-
-	if use bri; then
-		einfo "Bristuff configs have been merged as:"
-		einfo ""
-		einfo "${ROOT}etc/"
-		einfo "    zaptel.conf.zaphfc"
-		einfo "    zaptel.conf.quadBRI"
-		einfo "    zaptel.conf.octoBRI"
-		einfo ""
-		einfo "${ROOT}etc/asterisk/"
-		einfo "    zapata.conf.zaphfc"
-		einfo "    zapata.conf.quadBRI"
-		einfo "    zapata.conf.octoBRI"
-		echo
-	fi
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${ROOT}dev/zap ]]; then
-		chown -R root:dialout	${ROOT}dev/zap
-		chmod -R u=rwX,g=rwX,o= ${ROOT}dev/zap
-	fi
-}
diff --git a/net-misc/zaptel/zaptel-1.2.6.ebuild b/net-misc/zaptel/zaptel-1.2.6.ebuild
deleted file mode 100644
index eea89c41fdfb..000000000000
--- a/net-misc/zaptel/zaptel-1.2.6.ebuild
+++ /dev/null
@@ -1,375 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.6.ebuild,v 1.1 2006/06/07 17:55:54 stkn Exp $
-
-inherit toolchain-funcs eutils linux-mod
-
-## NOTE:
-#
-#
-
-BRI_VERSION="0.3.0-PRE-1p"
-FLORZ_VERSION="0.3.0-PRE-1o_florz-12"
-
-IUSE="bri ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2 florz rtc ukcid watchdog zapras zapnet"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://ftp.digium.com/pub/zaptel/${MY_P}.tar.gz
-	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
-	 florz? ( http://www.netdomination.org/pub/asterisk/zaphfc_${FLORZ_VERSION}.diff.gz )"
-
-S="${WORKDIR}/${MY_P}"
-
-S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="virtual/libc
-	virtual/linux-sources
-	>=dev-libs/newt-0.50.0"
-
-# list of echo canceller use flags,
-# first active in this list is selected (=order does matter)
-ZAP_EC_FLAGS="ecmark ecmark2 ecmark3 ecsteve ecsteve2 eckb1 ecmg2"
-
-### Begin: Helper functions
-
-select_echo_cancel() {
-	local myEC=""
-
-	for x in ${ZAP_EC_FLAGS}; do
-		if use $x; then
-			myEC=$(echo "$x" | sed -e "s:^ec::" | tr '[:lower:]' '[:upper:]')
-			break;
-		fi
-	done
-
-	echo ${myEC}
-}
-
-zconfig_disable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		# match a little more than ${1} so we can use zconfig_disable
-		# to disable all echo cancellers in zconfig.h w/o calling it several times
-		sed -i -e "s:^[ \t]*#define[ \t]\+\(${1}[a-zA-Z0-9_-]*\).*:#undef \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-zconfig_enable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		sed -i  -e "s:^/\*[ \t]*#define[ \t]\+\(${1}\).*:#define \1:" \
-			-e "s:^[ \t]*#undef[ \t]\+\(${1}\).*:#define \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-### End: Helper functions
-
-pkg_setup() {
-	local result=0 numec=0
-
-	linux-mod_pkg_setup
-
-	einfo "Running pre-flight checks..."
-
-	# basic zaptel checks
-	if ! linux_chkconfig_present CRC_CCITT; then
-		echo
-		eerror "Your kernel lacks CRC_CCIT support!"
-		eerror "Enable CONFIG_CRC_CCIT!"
-		result=$((result+1))
-	fi
-
-	# check if multiple echo cancellers have been selected
-	for x in ${ZAP_EC_FLAGS}; do
-		use $x && numec=$((numec+1))
-	done
-	if [[ $numec -gt 1 ]]; then
-		# multiple flags are active, only the first in the ZAP_EC_FLAGS list
-		# will be used, make sure the user knows about this
-		echo
-		ewarn "Multiple echo canceller flags are active but only one will be used!"
-		ewarn "Selected: $(select_echo_cancel)"
-	fi
-
-	# we need at least HDLC generic support
-	if use zapnet && ! linux_chkconfig_present HDLC; then
-		echo
-		eerror "zapnet: Your kernel lacks HDLC support!"
-		eerror "zapnet: Enable CONFIG_HDLC* to use zaptel network support!"
-		result=$((result+1))
-	fi
-
-	# zapras needs PPP support
-	if use zapras && ! linux_chkconfig_present PPP; then
-		echo
-		eerror "zapras: Your kernel lacks PPP support!"
-		eerror "zapras: Enable CONFIG_PPP* to use zaptel ras support!"
-		result=$((result+1))
-	fi
-
-	# rtc needs linux-2.6 and CONFIG_RTC
-	if use rtc; then
-		if ! kernel_is 2 6; then
-			echo
-			eerror "rtc: >=Linux-2.6.0 is needed for rtc support!"
-			result=$((result+1))
-		fi
-
-		if ! linux_chkconfig_present RTC; then
-			eerror "rtc: Your kernel lacks RealTime-Clock support!"
-			result=$((result+1))
-		fi
-	fi
-
-	if [[ $result -gt 0 ]]; then
-		echo
-		ewarn "One or more of the neccessary precondition(s) is/are not met!"
-		ewarn "Look at the messages above, resolve the problem (or disable the use-flag) and try again"
-		echo
-
-		if [[ $result -lt 3 ]]; then
-			eerror "[$result Error(s)] Zaptel is not happy :("
-		else
-			eerror "[$result Error(s)] You're making zaptel cry :'("
-		fi
-		die "[$result] Precondition(s) not met"
-	fi
-
-	echo
-	einfo "Zaptel is happy and continues... :)"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.2.6-gentoo.diff
-
-# gone
-#	if kernel_is 2 6 && use devfs26; then
-#		if [[ ${KV_PATCH} -ge 14 ]]; then
-#			eerror "Devfs has been removed in linux-2.6.14, skipping devfs26!"
-#		else
-#			epatch ${FILESDIR}/${PN}-1.2.0-devfs26.diff
-#
-#			# fix Makefile to not create device nodes for
-#			# devfs enabled 2.6 kernels
-#			sed -i -e 's:grep -q udevd:grep -q \"udevd\\|devfsd\":' \
-#				Makefile
-#
-#			# disable udev support on devfs26 systems
-#			zconfig_disable CONFIG_ZAP_UDEV
-#		fi
-#	fi
-
-	use ukcid && \
-		epatch ${FILESDIR}/${PN}-1.2.0-ukcid.patch
-
-	# try to apply bristuff patch
-	if use bri; then
-		# fix for userpriv
-		chmod -R a=rwX ${S_BRI}
-
-		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
-		epatch ${S_BRI}/patches/zaptel.patch
-
-		cd ${S_BRI}
-
-		if use florz; then
-			einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
-
-			# remove as soon as there's a new florz patch available
-			sed -i -e "s:zaptel-1\.2\.5:zaptel-1.2.6:g" \
-				${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-
-			epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-		fi
-
-		# patch includes
-		sed -i  -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \
-			qozap/qozap.c \
-			zaphfc/zaphfc.c \
-			cwain/cwain.c
-
-		# patch makefiles
-		sed -i  -e "s:^ZAP[\t ]*=.*:ZAP=-I${S}:" \
-			-e "s:^MODCONF=.*:MODCONF=/etc/modules.d/zaptel:" \
-			-e "s:linux-2.6:linux:g" \
-			qozap/Makefile \
-			zaphfc/Makefile \
-			cwain/Makefile
-
-		sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
-			zaphfc/Makefile
-
-		cd ${S}
-	fi
-
-### Configuration changes
-	local myEC
-
-	# prepare zconfig.h
-	myEC=$(select_echo_cancel)
-	if [[ -n "${myEC}" ]]; then
-		einfo "Selected echo canceller: ${myEC}"
-		# disable default first, set new selected ec afterwards
-		zconfig_disable ECHO_CAN
-		zconfig_enable ECHO_CAN_${myEC}
-	fi
-
-	# enable rtc support on 2.6
-	if use rtc && linux_chkconfig_present RTC && kernel_is 2 6; then
-		einfo "Enabling ztdummy RTC support"
-		zconfig_enable USE_RTC
-	fi
-
-	# enable agressive echo surpression
-	use ecaggressive && \
-		zconfig_enable AGGRESSIVE_SUPPRESSOR
-
-	# ppp ras support
-	use zapras && \
-		zconfig_enable CONFIG_ZAPATA_PPP
-
-	# frame relay, syncppp...
-	use zapnet && \
-		zconfig_enable CONFIG_ZAPATA_NET
-
-	# zaptel watchdog
-	use watchdog && \
-		zconfig_enable CONFIG_ZAPTEL_WATCHDOG
-}
-
-src_compile() {
-	# build
-	make KVERS=${KV_FULL} \
-	     KSRC=/usr/src/linux ARCH=$(tc-arch-kernel) || die
-
-	if use bri; then
-		cd ${S_BRI}
-		for x in cwain qozap zaphfc; do
-			einfo "Building ${x}..."
-			make KVERS=${KV_FULL} \
-				KSRC=/usr/src/linux \
-				ARCH=$(tc-arch-kernel) \
-				-C ${x} || die "make ${x} failed"
-		done
-	fi
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} ARCH=$(tc-arch-kernel) \
-	     KVERS=${KV_FULL} KSRC=/usr/src/linux install || die
-
-	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
-	dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
-
-	# additional tools
-	dobin ztmonitor ztspeed zttest
-
-	# install all header files, several packages need the complete set
-	# (e.g. sangoma wanpipe)
-	insinto /usr/include/zaptel
-	doins *.h
-
-	if use bri; then
-		einfo "Installing bri"
-		cd ${S_BRI}
-
-		insinto /lib/modules/${KV_FULL}/misc
-		doins qozap/qozap.${KV_OBJ}
-		doins zaphfc/zaphfc.${KV_OBJ}
-		doins cwain/cwain.${KV_OBJ}
-
-		# install example configs for octoBRI and quadBRI
-		insinto /etc
-		doins qozap/zaptel.conf.octoBRI
-		newins qozap/zaptel.conf zaptel.conf.quadBRI
-		newins zaphfc/zaptel.conf zaptel.conf.zaphfc
-
-		insinto /etc/asterisk
-		doins qozap/zapata.conf.octoBRI
-		newins qozap/zapata.conf zapata.conf.quadBRI
-		newins zaphfc/zapata.conf zapata.conf.zaphfc
-
-		docinto bristuff
-		dodoc CHANGES INSTALL
-
-		docinto bristuff/qozap
-		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
-
-		docinto bristuff/zaphfc
-		dodoc zaphfc/LICENSE zaphfc/*.conf
-
-		docinto bristuff/cwain
-		dodoc cwain/TODO cwain/LICENSE
-
-		cd ${S}
-	fi
-
-	# install init script
-	newinitd ${FILESDIR}/zaptel.rc6 zaptel
-	newconfd ${FILESDIR}/zaptel.confd zaptel
-
-	# install devfsd rule file
-	insinto /etc/devfs.d
-	newins ${FILESDIR}/zaptel.devfsd zaptel
-
-	# install udev rule file
-	insinto /etc/udev/rules.d
-	newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${D}/dev/zap ]]; then
-		chown -R root:dialout	${D}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
-	fi
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-#	if kernel_is 2 6 && [[ ${KV_PATCH} -lt 14 ]] && use devfs26; then
-#		ewarn "*** Warning! ***"
-#		ewarn "Devfs support for linux-2.6 is experimental and not"
-#		ewarn "supported by digium or the asterisk project!"
-#		echo
-#		ewarn "Send bug-reports to: stkn@gentoo.org"
-#	fi
-
-	echo
-	einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
-	echo
-
-	if use bri; then
-		einfo "Bristuff configs have been merged as:"
-		einfo ""
-		einfo "${ROOT}etc/"
-		einfo "    zaptel.conf.zaphfc"
-		einfo "    zaptel.conf.quadBRI"
-		einfo "    zaptel.conf.octoBRI"
-		einfo ""
-		einfo "${ROOT}etc/asterisk/"
-		einfo "    zapata.conf.zaphfc"
-		einfo "    zapata.conf.quadBRI"
-		einfo "    zapata.conf.octoBRI"
-		echo
-	fi
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${ROOT}dev/zap ]]; then
-		chown -R root:dialout	${ROOT}dev/zap
-		chmod -R u=rwX,g=rwX,o= ${ROOT}dev/zap
-	fi
-}
diff --git a/net-misc/zaptel/zaptel-1.2.8.ebuild b/net-misc/zaptel/zaptel-1.2.8.ebuild
deleted file mode 100644
index 5615ed7ab468..000000000000
--- a/net-misc/zaptel/zaptel-1.2.8.ebuild
+++ /dev/null
@@ -1,350 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.8.ebuild,v 1.1 2006/09/05 19:15:11 stkn Exp $
-
-inherit toolchain-funcs eutils linux-mod
-
-## NOTE:
-#
-#
-
-BRI_VERSION="0.3.0-PRE-1s"
-FLORZ_VERSION="0.3.0-PRE-1o_florz-12"
-
-IUSE="bri ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2 florz rtc ukcid watchdog zapras zapnet"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://ftp.digium.com/pub/zaptel/releases/${MY_P}.tar.gz
-	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
-	 florz? ( http://www.netdomination.org/pub/asterisk/zaphfc_${FLORZ_VERSION}.diff.gz )"
-
-S="${WORKDIR}/${MY_P}"
-
-S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="virtual/libc
-	virtual/linux-sources
-	>=dev-libs/newt-0.50.0"
-
-# list of echo canceller use flags,
-# first active in this list is selected (=order does matter)
-ZAP_EC_FLAGS="ecmark ecmark2 ecmark3 ecsteve ecsteve2 eckb1 ecmg2"
-
-### Begin: Helper functions
-
-select_echo_cancel() {
-	local myEC=""
-
-	for x in ${ZAP_EC_FLAGS}; do
-		if use $x; then
-			myEC=$(echo "$x" | sed -e "s:^ec::" | tr '[:lower:]' '[:upper:]')
-			break;
-		fi
-	done
-
-	echo ${myEC}
-}
-
-zconfig_disable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		# match a little more than ${1} so we can use zconfig_disable
-		# to disable all echo cancellers in zconfig.h w/o calling it several times
-		sed -i -e "s:^[ \t]*#define[ \t]\+\(${1}[a-zA-Z0-9_-]*\).*:#undef \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-zconfig_enable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		sed -i  -e "s:^/\*[ \t]*#define[ \t]\+\(${1}\).*:#define \1:" \
-			-e "s:^[ \t]*#undef[ \t]\+\(${1}\).*:#define \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-### End: Helper functions
-
-pkg_setup() {
-	local result=0 numec=0
-
-	linux-mod_pkg_setup
-
-	einfo "Running pre-flight checks..."
-
-	# basic zaptel checks
-	if ! linux_chkconfig_present CRC_CCITT; then
-		echo
-		eerror "Your kernel lacks CRC_CCIT support!"
-		eerror "Enable CONFIG_CRC_CCIT!"
-		result=$((result+1))
-	fi
-
-	# check if multiple echo cancellers have been selected
-	for x in ${ZAP_EC_FLAGS}; do
-		use $x && numec=$((numec+1))
-	done
-	if [[ $numec -gt 1 ]]; then
-		# multiple flags are active, only the first in the ZAP_EC_FLAGS list
-		# will be used, make sure the user knows about this
-		echo
-		ewarn "Multiple echo canceller flags are active but only one will be used!"
-		ewarn "Selected: $(select_echo_cancel)"
-	fi
-
-	# we need at least HDLC generic support
-	if use zapnet && ! linux_chkconfig_present HDLC; then
-		echo
-		eerror "zapnet: Your kernel lacks HDLC support!"
-		eerror "zapnet: Enable CONFIG_HDLC* to use zaptel network support!"
-		result=$((result+1))
-	fi
-
-	# zapras needs PPP support
-	if use zapras && ! linux_chkconfig_present PPP; then
-		echo
-		eerror "zapras: Your kernel lacks PPP support!"
-		eerror "zapras: Enable CONFIG_PPP* to use zaptel ras support!"
-		result=$((result+1))
-	fi
-
-	# rtc needs linux-2.6 and CONFIG_RTC
-	if use rtc; then
-		if ! kernel_is 2 6; then
-			echo
-			eerror "rtc: >=Linux-2.6.0 is needed for rtc support!"
-			result=$((result+1))
-		fi
-
-		if ! linux_chkconfig_present RTC; then
-			eerror "rtc: Your kernel lacks RealTime-Clock support!"
-			result=$((result+1))
-		fi
-	fi
-
-	if [[ $result -gt 0 ]]; then
-		echo
-		ewarn "One or more of the neccessary precondition(s) is/are not met!"
-		ewarn "Look at the messages above, resolve the problem (or disable the use-flag) and try again"
-		echo
-
-		if [[ $result -lt 3 ]]; then
-			eerror "[$result Error(s)] Zaptel is not happy :("
-		else
-			eerror "[$result Error(s)] You're making zaptel cry :'("
-		fi
-		die "[$result] Precondition(s) not met"
-	fi
-
-	echo
-	einfo "Zaptel is happy and continues... :)"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.2.7-gentoo.diff
-
-	use ukcid && \
-		epatch ${FILESDIR}/${PN}-1.2.0-ukcid.patch
-
-	# try to apply bristuff patch
-	if use bri; then
-		# fix for userpriv
-		chmod -R a=rwX ${S_BRI}
-
-		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
-		epatch ${S_BRI}/patches/zaptel.patch
-
-		cd ${S_BRI}
-
-		if use florz; then
-			einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
-
-			# remove as soon as there's a new florz patch available
-			sed -i -e "s:zaptel-1\.2\.5:zaptel-1.2.6:g" \
-				${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-
-			epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-		fi
-
-		# patch includes
-		sed -i  -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \
-			qozap/qozap.c \
-			zaphfc/zaphfc.c \
-			cwain/cwain.c
-
-		# patch makefiles
-		sed -i  -e "s:^ZAP[\t ]*=.*:ZAP=-I${S}:" \
-			-e "s:^MODCONF=.*:MODCONF=/etc/modules.d/zaptel:" \
-			-e "s:linux-2.6:linux:g" \
-			qozap/Makefile \
-			zaphfc/Makefile \
-			cwain/Makefile
-
-		sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
-			zaphfc/Makefile
-
-		cd ${S}
-	fi
-
-### Configuration changes
-	local myEC
-
-	# prepare zconfig.h
-	myEC=$(select_echo_cancel)
-	if [[ -n "${myEC}" ]]; then
-		einfo "Selected echo canceller: ${myEC}"
-		# disable default first, set new selected ec afterwards
-		zconfig_disable ECHO_CAN
-		zconfig_enable ECHO_CAN_${myEC}
-	fi
-
-	# enable rtc support on 2.6
-	if use rtc && linux_chkconfig_present RTC && kernel_is 2 6; then
-		einfo "Enabling ztdummy RTC support"
-		zconfig_enable USE_RTC
-	fi
-
-	# enable agressive echo surpression
-	use ecaggressive && \
-		zconfig_enable AGGRESSIVE_SUPPRESSOR
-
-	# ppp ras support
-	use zapras && \
-		zconfig_enable CONFIG_ZAPATA_PPP
-
-	# frame relay, syncppp...
-	use zapnet && \
-		zconfig_enable CONFIG_ZAPATA_NET
-
-	# zaptel watchdog
-	use watchdog && \
-		zconfig_enable CONFIG_ZAPTEL_WATCHDOG
-}
-
-src_compile() {
-	# build
-	make KVERS=${KV_FULL} \
-	     KSRC=/usr/src/linux ARCH=$(tc-arch-kernel) || die
-
-	if use bri; then
-		cd ${S_BRI}
-		for x in cwain qozap zaphfc; do
-			einfo "Building ${x}..."
-			make KVERS=${KV_FULL} \
-				KSRC=/usr/src/linux \
-				ARCH=$(tc-arch-kernel) \
-				-C ${x} || die "make ${x} failed"
-		done
-	fi
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} ARCH=$(tc-arch-kernel) \
-	     KVERS=${KV_FULL} KSRC=/usr/src/linux install || die
-
-	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
-	dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
-
-	# additional tools
-	dobin ztmonitor ztspeed zttest
-
-	# install all header files, several packages need the complete set
-	# (e.g. sangoma wanpipe)
-	insinto /usr/include/zaptel
-	doins *.h
-
-	if use bri; then
-		einfo "Installing bri"
-		cd ${S_BRI}
-
-		insinto /lib/modules/${KV_FULL}/misc
-		doins qozap/qozap.${KV_OBJ}
-		doins zaphfc/zaphfc.${KV_OBJ}
-		doins cwain/cwain.${KV_OBJ}
-
-		# install example configs for octoBRI and quadBRI
-		insinto /etc
-		doins qozap/zaptel.conf.octoBRI
-		newins qozap/zaptel.conf zaptel.conf.quadBRI
-		newins zaphfc/zaptel.conf zaptel.conf.zaphfc
-
-		insinto /etc/asterisk
-		doins qozap/zapata.conf.octoBRI
-		newins qozap/zapata.conf zapata.conf.quadBRI
-		newins zaphfc/zapata.conf zapata.conf.zaphfc
-
-		docinto bristuff
-		dodoc CHANGES INSTALL
-
-		docinto bristuff/qozap
-		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
-
-		docinto bristuff/zaphfc
-		dodoc zaphfc/LICENSE zaphfc/*.conf
-
-		docinto bristuff/cwain
-		dodoc cwain/TODO cwain/LICENSE
-
-		cd ${S}
-	fi
-
-	# install init script
-	newinitd ${FILESDIR}/zaptel.rc6 zaptel
-	newconfd ${FILESDIR}/zaptel.confd zaptel
-
-	# install devfsd rule file
-	insinto /etc/devfs.d
-	newins ${FILESDIR}/zaptel.devfsd zaptel
-
-	# install udev rule file
-	insinto /etc/udev/rules.d
-	newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${D}/dev/zap ]]; then
-		chown -R root:dialout	${D}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
-	fi
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	echo
-	einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
-	echo
-
-	if use bri; then
-		einfo "Bristuff configs have been merged as:"
-		einfo ""
-		einfo "${ROOT}etc/"
-		einfo "    zaptel.conf.zaphfc"
-		einfo "    zaptel.conf.quadBRI"
-		einfo "    zaptel.conf.octoBRI"
-		einfo ""
-		einfo "${ROOT}etc/asterisk/"
-		einfo "    zapata.conf.zaphfc"
-		einfo "    zapata.conf.quadBRI"
-		einfo "    zapata.conf.octoBRI"
-		echo
-	fi
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${ROOT}dev/zap ]]; then
-		chown -R root:dialout	${ROOT}dev/zap
-		chmod -R u=rwX,g=rwX,o= ${ROOT}dev/zap
-	fi
-}