Revbump with updated udev rules to avoid b0rkage with new stable udev

Package-Manager: portage-2.1.1-r2

10 files changed, 33 insertions, 1518 deletions

diff --git a/net-misc/zaptel/Manifest b/net-misc/zaptel/Manifest
index 70ae1a522218..bb3f03ae9bc6 100644
--- a/net-misc/zaptel/Manifest
+++ b/net-misc/zaptel/Manifest
@@ -33,10 +33,6 @@ AUX zaptel-1.2.0-ukcid.patch 3787 RMD160 4c4c3b9036db8051643901892a40fbcd153184d
 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.10-gentoo.diff 5178 RMD160 29595663ff4cde4852926525b0ccb29ef5b1aed7 SHA1 52f7af64f01dabd5bad0d080a30d04a5405e769c SHA256 d8edce4d8796c7d9d18b85ab1b4758e9c9cd65182b3cad13d1021cedf0cf04a9
-MD5 74e9e15a5dc001835bcfdfd86d1baab0 files/zaptel-1.2.10-gentoo.diff 5178
-RMD160 29595663ff4cde4852926525b0ccb29ef5b1aed7 files/zaptel-1.2.10-gentoo.diff 5178
-SHA256 d8edce4d8796c7d9d18b85ab1b4758e9c9cd65182b3cad13d1021cedf0cf04a9 files/zaptel-1.2.10-gentoo.diff 5178
 AUX zaptel-1.2.11-gentoo.diff 5090 RMD160 1a3b1b2b0d1f06ee05f0212a76e3a78a9963f011 SHA1 e69c4175c8ae1bf7e7e1a7c606a61e2bbf86388d SHA256 ed70a2f784f191a9c9cb47bcca90209e6f29b3fda6bee649f361a7ae4fb0cf80
 MD5 b5b5c88abb3d8b1efabdd1d34935c052 files/zaptel-1.2.11-gentoo.diff 5090
 RMD160 1a3b1b2b0d1f06ee05f0212a76e3a78a9963f011 files/zaptel-1.2.11-gentoo.diff 5090
@@ -69,58 +65,50 @@ AUX zaptel.rc6 972 RMD160 898806437812819568f6801faf682302e20bbdde SHA1 d427875a
 MD5 a1ef57fe463da11030f2e18d87535466 files/zaptel.rc6 972
 RMD160 898806437812819568f6801faf682302e20bbdde files/zaptel.rc6 972
 SHA256 0558aa032de92fa9ae54076d9268fc3e704317eb54985656f0f21e2d334b6d84 files/zaptel.rc6 972
-AUX zaptel.udevd 358 RMD160 fc92cf8fcbf9ed49b7918557670417e15f84f281 SHA1 36410cd48fbe9a6695bbcfd88133408af9365bd9 SHA256 9be02c6b22db788d8a8fabc5bc2574102b50c3b329cff12c342d39896c7615b5
-MD5 3bff3fd5d8dc52513ceeac546e1e11bf files/zaptel.udevd 358
-RMD160 fc92cf8fcbf9ed49b7918557670417e15f84f281 files/zaptel.udevd 358
-SHA256 9be02c6b22db788d8a8fabc5bc2574102b50c3b329cff12c342d39896c7615b5 files/zaptel.udevd 358
+AUX zaptel.udevd 363 RMD160 79e8c3815e0f8dbd75b21b6b99fc85cf27de7fc9 SHA1 473c41c281adf11cf2da563b4819cdecc750985d SHA256 1a50fb553fd44ee7fcc64a5a855bae09afbdbcd302c6fcd8731bb4976637fc3c
+MD5 11c41aeb339655bbebcf40666e2f29ef files/zaptel.udevd 363
+RMD160 79e8c3815e0f8dbd75b21b6b99fc85cf27de7fc9 files/zaptel.udevd 363
+SHA256 1a50fb553fd44ee7fcc64a5a855bae09afbdbcd302c6fcd8731bb4976637fc3c files/zaptel.udevd 363
 DIST bristuff-0.2.0-RC8q.tar.gz 152037 RMD160 aaa9ca23eaeb74abc96dd7240f67e7886d4d6ad9 SHA1 27a6f56f47aa7ee5459d2625da7cff310909764e SHA256 8ba7a1e1e6ee8e9d77853d6d790d0de5deced7c11679b9b0e108cca817ed9728
 DIST bristuff-0.3.0-PRE-1s.tar.gz 265953 RMD160 8d3abdbbae4c376d52225395c72f4538e1f84a94 SHA1 1d942df9e4fd963755080e011caba88a33601c1b SHA256 30adea4f070ed44d1952163e850c177f976857b96965e18844ccd492ccef968d
 DIST bristuff-0.3.0-PRE-1v.tar.gz 267644 RMD160 5c5f034d29f4156351a495f40c9c4b176f65e06e SHA1 0ffbe79cd44119b09eb744eb9bf1b6fb90fa1bab SHA256 91254dd6c71b74a5990df622b523d06c2f0399c6e47630e5155392c1598fd39e
 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.2.10.tar.gz 1258750 RMD160 3e33a496127c78e52178a73255f6da55c2b9a5d2 SHA1 6b69c4822b9cc1dbc48868eb61bc88e3212b7545 SHA256 170a0c18efe2da3cd17946850c6249a9824f753d6705a27ffef47fb8e8a7f9d7
 DIST zaptel-1.2.11.tar.gz 1425625 RMD160 6ae43a2f5801dab17216912f976e67371d8e51d2 SHA1 30a2001449ff50b5a47970b76a77500986602211 SHA256 3641c8ef684862b3cc9fd3c3341d25095909a9c2f901d31b7cc9394210cb50e8
 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.2.10.ebuild 8582 RMD160 a4547a159b07ac039081d686777ea8ec927542c3 SHA1 173f455dad45956460205355b64010aa9b70f50b SHA256 7f6265635c0f97b7cd6a2cda017b1691038308d4c56f2e114f97098234e2ca3a
-MD5 666bb17698ac00689d63042a4d0937da zaptel-1.2.10.ebuild 8582
-RMD160 a4547a159b07ac039081d686777ea8ec927542c3 zaptel-1.2.10.ebuild 8582
-SHA256 7f6265635c0f97b7cd6a2cda017b1691038308d4c56f2e114f97098234e2ca3a zaptel-1.2.10.ebuild 8582
-EBUILD zaptel-1.2.11.ebuild 9001 RMD160 c20e06a9c716f68a839b7d29686a7f2e58b3778f SHA1 ae5c4991c6d0a944a7f7f2db41674bfa45f47d7d SHA256 fd632ae7f751b1ff3935bd1f49acb36f8cff440c4de4b66a560e254a0b4310a7
-MD5 39bddcd1abb9631eb7aa31942cdf8177 zaptel-1.2.11.ebuild 9001
-RMD160 c20e06a9c716f68a839b7d29686a7f2e58b3778f zaptel-1.2.11.ebuild 9001
-SHA256 fd632ae7f751b1ff3935bd1f49acb36f8cff440c4de4b66a560e254a0b4310a7 zaptel-1.2.11.ebuild 9001
-EBUILD zaptel-1.2.9.1.ebuild 8574 RMD160 cd382f76b994968506eff1b47adb7f3f89711acb SHA1 624312f6d96de7031fcc49013469fac286472232 SHA256 e601e9db582419d90e015a40500ba4473cbf0f00bc9fadf89ce8acc08536c8af
-MD5 855074ab185dd77d5d0851657c61f313 zaptel-1.2.9.1.ebuild 8574
-RMD160 cd382f76b994968506eff1b47adb7f3f89711acb zaptel-1.2.9.1.ebuild 8574
-SHA256 e601e9db582419d90e015a40500ba4473cbf0f00bc9fadf89ce8acc08536c8af zaptel-1.2.9.1.ebuild 8574
-MISC ChangeLog 16733 RMD160 4a4425f87761fe43dfdb4dc5a9321a2555a07f18 SHA1 fd5c10e87e9f18527a8fb162253dc78e32b95b5f SHA256 abc2e9d04e201648f408401593595cc31f865b5d6f170724e8a6c4b6f5782a93
-MD5 ae5d1fc3500ceaa3b37f7ef463ea5844 ChangeLog 16733
-RMD160 4a4425f87761fe43dfdb4dc5a9321a2555a07f18 ChangeLog 16733
-SHA256 abc2e9d04e201648f408401593595cc31f865b5d6f170724e8a6c4b6f5782a93 ChangeLog 16733
+EBUILD zaptel-1.0.10-r2.ebuild 7200 RMD160 b2c3dc3d5a3df8926e9fafd7051a831ca64c3ec1 SHA1 48e6fa1749f31e9054ff3baf00568debccd436f5 SHA256 3f387be5cb5604e11953f6cfef79e3544357774616396c1325b8e407f3cfea94
+MD5 c7680ee19e6e9fb426a1fff90fa32829 zaptel-1.0.10-r2.ebuild 7200
+RMD160 b2c3dc3d5a3df8926e9fafd7051a831ca64c3ec1 zaptel-1.0.10-r2.ebuild 7200
+SHA256 3f387be5cb5604e11953f6cfef79e3544357774616396c1325b8e407f3cfea94 zaptel-1.0.10-r2.ebuild 7200
+EBUILD zaptel-1.2.11-r1.ebuild 9006 RMD160 7f02b0170ae1b2e08afb58d5f6aa2c52818269cb SHA1 a07f37c90b5fdf1e14d3e6d08d3c0f1829cbc8a5 SHA256 e007307b88ef66b6215d3278e3f4d2978988d1d9a1348367d4657193643ab73a
+MD5 a40a04d235bf4ff424eef8390a474f4c zaptel-1.2.11-r1.ebuild 9006
+RMD160 7f02b0170ae1b2e08afb58d5f6aa2c52818269cb zaptel-1.2.11-r1.ebuild 9006
+SHA256 e007307b88ef66b6215d3278e3f4d2978988d1d9a1348367d4657193643ab73a zaptel-1.2.11-r1.ebuild 9006
+EBUILD zaptel-1.2.9.1-r1.ebuild 8577 RMD160 b487dfe2f52b91b5cd5a75667a2c702bb65397c5 SHA1 b304a51b4e762ca281a54ddac822f3e2deabc4b7 SHA256 36b1e47f352425665c6ed1c77ba9a53374b5bb04e8aaabd8b9483b4c377df8bd
+MD5 3137e2eae66b020b7ac2d239b8d4008b zaptel-1.2.9.1-r1.ebuild 8577
+RMD160 b487dfe2f52b91b5cd5a75667a2c702bb65397c5 zaptel-1.2.9.1-r1.ebuild 8577
+SHA256 36b1e47f352425665c6ed1c77ba9a53374b5bb04e8aaabd8b9483b4c377df8bd zaptel-1.2.9.1-r1.ebuild 8577
+MISC ChangeLog 17197 RMD160 e5e08372e477226b7b86ab9fa5d39412505c253e SHA1 1f55d7c9112029e966db2f7fca515126e4fcfdb2 SHA256 6e7168a2872008afee5653785398c021dff1474a0be2e6341fcce2357791281d
+MD5 0ddf2868182575c31a616f89f04a48cd ChangeLog 17197
+RMD160 e5e08372e477226b7b86ab9fa5d39412505c253e ChangeLog 17197
+SHA256 6e7168a2872008afee5653785398c021dff1474a0be2e6341fcce2357791281d ChangeLog 17197
 MISC metadata.xml 382 RMD160 315172442a4bfaa87b855d4c421b22a2527e97b2 SHA1 7b95f41def10946742929592db1d76b7e3bb0a19 SHA256 f79d5cd273e9ecc2181e60ea226a7cb0128011d877fc7531b2df30bd5fd9ae20
 MD5 f3d5d5b8a638e7a9a83fe0eb0d94282c metadata.xml 382
 RMD160 315172442a4bfaa87b855d4c421b22a2527e97b2 metadata.xml 382
 SHA256 f79d5cd273e9ecc2181e60ea226a7cb0128011d877fc7531b2df30bd5fd9ae20 metadata.xml 382
-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 41c03c826202769a4ae6f92c8a5d5226 files/digest-zaptel-1.2.10 795
-RMD160 b51b15adcc314cd6f5a6bc11a9730e3a572cfa97 files/digest-zaptel-1.2.10 795
-SHA256 00cda49073896bdb9fb26651a85643ae15b02136adfe28feb846db17729c2e37 files/digest-zaptel-1.2.10 795
-MD5 5be62fb2c9ceb80dd67e273749b36f5b files/digest-zaptel-1.2.11 795
-RMD160 f548947b52714f039cb62714ae2baef8049098f0 files/digest-zaptel-1.2.11 795
-SHA256 f25c5f1b434635c05e59971a2061b49113e3ad69290169f5fb0d7a5c83364311 files/digest-zaptel-1.2.11 795
-MD5 1e13a9665022158b1d78f47b331688ed files/digest-zaptel-1.2.9.1 798
-RMD160 f10faf8fefa2221dfa0fd8e8a85b658a095d803c files/digest-zaptel-1.2.9.1 798
-SHA256 367d7228a51892a9ad986338a37a3355564b2fc324af014a65f7af78bf676b3d files/digest-zaptel-1.2.9.1 798
+MD5 b50b5a655448b6b066496c55efe49458 files/digest-zaptel-1.0.10-r2 364
+RMD160 92b40cf655af41ba56cc1e22ae17e891a2758fe4 files/digest-zaptel-1.0.10-r2 364
+SHA256 13a19426a8ee67a67ad505257a3a6d4fa5a43d0b6d1283d8ef5f4572aea135ec files/digest-zaptel-1.0.10-r2 364
+MD5 13582f65600092848d103ebc5bb8b9fe files/digest-zaptel-1.2.11-r1 576
+RMD160 37aa687168271da533f8c7ef42c5de3e00c6eee8 files/digest-zaptel-1.2.11-r1 576
+SHA256 02ff50e0b21b94d9ffa032716579ed4417c12ea496847236661c718e782a9515 files/digest-zaptel-1.2.11-r1 576
+MD5 b7ece6e3cffa6e1eba97ff9e4c4705df files/digest-zaptel-1.2.9.1-r1 578
+RMD160 bae9a9beddbf3e456f02c7581d851179664706cd files/digest-zaptel-1.2.9.1-r1 578
+SHA256 b27a3e6b2c72741af2faf684df42f2785563f728624bf105b4a0899edcd07781 files/digest-zaptel-1.2.9.1-r1 578
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFFYIs1GDyatLGpTbYRAoA5AJ9WBuf7wpW0enQdxjHRZcYuKpAWWwCfZAMc
-5kbPLzasPfQ5+DBwxqAJ14k=
-=9+ZE
+iD8DBQFFavfYKRy60XGEcJIRAr88AJ4scTFt2rd3vkEZU7/WChKnaNd6dACeJr0g
+g4hDKoPfK5Uzd/2iqSa9ePA=
+=4488
 -----END PGP SIGNATURE-----
diff --git a/net-misc/zaptel/files/digest-zaptel-1.0.10-r1 b/net-misc/zaptel/files/digest-zaptel-1.0.10-r1
deleted file mode 100644
index dda57b1c8ec3..000000000000
--- a/net-misc/zaptel/files/digest-zaptel-1.0.10-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 215dd795ce8ea72370b2e9d1bb7d8f6a bristuff-0.2.0-RC8q.tar.gz 152037
-RMD160 aaa9ca23eaeb74abc96dd7240f67e7886d4d6ad9 bristuff-0.2.0-RC8q.tar.gz 152037
-SHA256 8ba7a1e1e6ee8e9d77853d6d790d0de5deced7c11679b9b0e108cca817ed9728 bristuff-0.2.0-RC8q.tar.gz 152037
-MD5 a0ee0e7b276abe8ef88030d1252d6a3d zaptel-1.0.10.tar.gz 327832
-RMD160 a797bb36f35e50c51d30705ad1d628f5728d87ed zaptel-1.0.10.tar.gz 327832
-SHA256 7978f3c56a95033bf2bc2cb8d0cb2830c5371aae21e0021503c6dbf2361795d1 zaptel-1.0.10.tar.gz 327832
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.10 b/net-misc/zaptel/files/digest-zaptel-1.2.10
deleted file mode 100644
index 2b2ac12e48d2..000000000000
--- a/net-misc/zaptel/files/digest-zaptel-1.2.10
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 9da38a78556eb09749d1f789a8a2631c bristuff-0.3.0-PRE-1v.tar.gz 267644
-RMD160 5c5f034d29f4156351a495f40c9c4b176f65e06e bristuff-0.3.0-PRE-1v.tar.gz 267644
-SHA256 91254dd6c71b74a5990df622b523d06c2f0399c6e47630e5155392c1598fd39e bristuff-0.3.0-PRE-1v.tar.gz 267644
-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 25f9a78272104efdbd44261e33edb725 zaptel-1.2.10.tar.gz 1258750
-RMD160 3e33a496127c78e52178a73255f6da55c2b9a5d2 zaptel-1.2.10.tar.gz 1258750
-SHA256 170a0c18efe2da3cd17946850c6249a9824f753d6705a27ffef47fb8e8a7f9d7 zaptel-1.2.10.tar.gz 1258750
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.11 b/net-misc/zaptel/files/digest-zaptel-1.2.11
deleted file mode 100644
index fdeb525e2e3b..000000000000
--- a/net-misc/zaptel/files/digest-zaptel-1.2.11
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 9da38a78556eb09749d1f789a8a2631c bristuff-0.3.0-PRE-1v.tar.gz 267644
-RMD160 5c5f034d29f4156351a495f40c9c4b176f65e06e bristuff-0.3.0-PRE-1v.tar.gz 267644
-SHA256 91254dd6c71b74a5990df622b523d06c2f0399c6e47630e5155392c1598fd39e bristuff-0.3.0-PRE-1v.tar.gz 267644
-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 f61f77ec35ccf2e5518e23ac315f67b1 zaptel-1.2.11.tar.gz 1425625
-RMD160 6ae43a2f5801dab17216912f976e67371d8e51d2 zaptel-1.2.11.tar.gz 1425625
-SHA256 3641c8ef684862b3cc9fd3c3341d25095909a9c2f901d31b7cc9394210cb50e8 zaptel-1.2.11.tar.gz 1425625
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.9.1 b/net-misc/zaptel/files/digest-zaptel-1.2.9.1
deleted file mode 100644
index 0e5dc7eddaa4..000000000000
--- a/net-misc/zaptel/files/digest-zaptel-1.2.9.1
+++ /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 c2f5798196ac1b53f4161547cc4efb2c zaptel-1.2.9.1.tar.gz 1255412
-RMD160 caf2ad931e2ae439500805a6ca4376dc8083de5a zaptel-1.2.9.1.tar.gz 1255412
-SHA256 7def44c259352397af2ad80f3c0eb103ff640ffbc7c95f37c3802fee75c10ede zaptel-1.2.9.1.tar.gz 1255412
diff --git a/net-misc/zaptel/files/zaptel-1.2.10-gentoo.diff b/net-misc/zaptel/files/zaptel-1.2.10-gentoo.diff
deleted file mode 100644
index ab4b77e3b440..000000000000
--- a/net-misc/zaptel/files/zaptel-1.2.10-gentoo.diff
+++ /dev/null
@@ -1,104 +0,0 @@
-diff -Nura zaptel-1.2.10/build_tools/genmodconf zaptel-1.2.10.gentoo/build_tools/genmodconf
---- zaptel-1.2.10/build_tools/genmodconf	2006-05-23 14:51:00.000000000 -0300
-+++ zaptel-1.2.10.gentoo/build_tools/genmodconf	2006-11-07 16:50:50.334340709 -0300
-@@ -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;
-diff -Nura zaptel-1.2.10/build_tools/genudevrules zaptel-1.2.10.gentoo/build_tools/genudevrules
---- zaptel-1.2.10/build_tools/genudevrules	2006-05-17 13:49:46.000000000 -0300
-+++ zaptel-1.2.10.gentoo/build_tools/genudevrules	2006-11-07 16:50:50.335340457 -0300
-@@ -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
-diff -Nura zaptel-1.2.10/Makefile zaptel-1.2.10.gentoo/Makefile
---- zaptel-1.2.10/Makefile	2006-10-11 14:22:10.000000000 -0300
-+++ zaptel-1.2.10.gentoo/Makefile	2006-11-07 16:52:46.910007121 -0300
-@@ -23,7 +23,7 @@
- endif
- KINCLUDES:=$(KSRC)/include
- 
--CFLAGS+=-I. -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)
-@@ -300,7 +300,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
-@@ -315,7 +316,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; \
-@@ -338,24 +339,21 @@
- 	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 $(INSTALL_PREFIX)/usr/share/man/man8
-+	install -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8/
-+	install -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/zaptel-1.0.10-r1.ebuild b/net-misc/zaptel/zaptel-1.0.10-r1.ebuild
deleted file mode 100644
index 1187c12803e2..000000000000
--- a/net-misc/zaptel/zaptel-1.0.10-r1.ebuild
+++ /dev/null
@@ -1,263 +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.0.10-r1.ebuild,v 1.2 2006/06/12 12:41:36 rajiv Exp $
-
-IUSE="bri devfs26 rtc ukcid"
-
-inherit toolchain-funcs eutils linux-mod
-
-BRI_VERSION="0.2.0-RC8q"
-#FLORZ_VERSION="0.2.0-RC8o_florz-9"
-
-MY_PV="${PV/_p/.}"
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://ftp1.digium.com/pub/telephony/zaptel/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="~amd64 ~ppc x86"
-
-DEPEND="virtual/libc
-	virtual/linux-sources
-	>=dev-libs/newt-0.50.0"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
-
-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.10-gentoo.diff
-
-	# devfs support
-	if use devfs26; then
-		einfo "Enabling experimental devfs support for linux-2.6..."
-		epatch ${FILESDIR}/${PN}-1.0.10-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 ${S_BRI}
-
-#		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
-
-		# replace uname -r with $(KVERS) 
-		# and add KVERS?="$(uname -r)" to all bristuff Makefiles
-		find ${S_BRI} -iname "Makefile" -exec sed -i \
-			-e "s:\`uname -r\`:\$(KVERS):g" \
-			-e "s:uname -r:echo -n \$(KVERS):g" \
-			-e "1 i KVERS?=\$(shell uname -r)" {} \;
-	fi
-
-
-	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
-
-
-	# UK callerid patch, adds support for british-telecoms callerid to x100p cards
-	# see http://www.lusyn.com/asterisk/patches.html for more information
-	use ukcid && \
-		epatch ${FILESDIR}/${PN}-1.0.10-ukcid.patch
-
-	# buy some time to get 1.2 into shape,
-	# fix 2.6.16 compile errors and CONFIG_ZAPATA_DEBUG undefined warnings
-	epatch ${FILESDIR}/zaptel-1.0.10-linux2.6.16.diff
-	epatch ${FILESDIR}/zaptel-1.0.10-fix-zapata-debug-undefined-warnings.diff
-}
-
-src_compile() {
-	make \
-		KVERS=${KV_FULL} ARCH=$(tc-arch-kernel) \
-		KERNEL_SOURCE=/usr/src/linux || die
-
-	if use bri; then
-		cd ${S_BRI}
-		for x in cwain qozap zaphfc; do
-			make \
-				KVERS=${KV_FULL} \
-				ARCH=$(tc-arch-kernel) \
-				KERNEL_SOURCE=/usr/src/linux \
-				-C ${x} || die "make ${x} failed"
-		done
-	fi
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} ARCH=$(tc-arch-kernel) \
-		KVERS=${KV_FULL} KERNEL_SOURCE=/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 for 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
-	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.10.ebuild b/net-misc/zaptel/zaptel-1.2.10.ebuild
deleted file mode 100644
index baebdbbe56b7..000000000000
--- a/net-misc/zaptel/zaptel-1.2.10.ebuild
+++ /dev/null
@@ -1,352 +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.10.ebuild,v 1.1 2006/11/07 20:09:34 gustavoz Exp $
-
-inherit toolchain-funcs eutils linux-mod
-
-## NOTE:
-#
-#
-
-BRI_VERSION="0.3.0-PRE-1v"
-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}/${P}-gentoo.diff
-	epatch ${FILESDIR}/zaptel-1.2.9.1-gcc411_is_a_retard-kbuild.patch
-	epatch ${FILESDIR}/zaptel-1.2.9.1-ar.patch
-
-	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=${KV_DIR} 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 fxotune
-
-	# 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
-}
diff --git a/net-misc/zaptel/zaptel-1.2.11.ebuild b/net-misc/zaptel/zaptel-1.2.11.ebuild
deleted file mode 100644
index aba34c901218..000000000000
--- a/net-misc/zaptel/zaptel-1.2.11.ebuild
+++ /dev/null
@@ -1,369 +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.11.ebuild,v 1.2 2006/11/19 16:50:09 drizzt Exp $
-
-inherit toolchain-funcs eutils linux-mod
-
-## NOTE:
-#
-#
-
-BRI_VERSION="0.3.0-PRE-1v"
-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 kernel_is 2 4 ; then
-		if ! linux_chkconfig_present CRC32; then
-			echo
-			eerror "Your kernel lacks CRC32 support!"
-			eerror "Enable CONFIG_CRC32!"
-			result=$((result+1))
-		fi
-	else
-		if ! linux_chkconfig_present CRC_CCITT; then
-			echo
-			eerror "Your kernel lacks CRC_CCIT support!"
-			eerror "Enable CONFIG_CRC_CCIT!"
-			result=$((result+1))
-		fi
-	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}/${P}-gentoo.diff
-	epatch ${FILESDIR}/zaptel-1.2.9.1-gcc411_is_a_retard-kbuild.patch
-	epatch ${FILESDIR}/zaptel-1.2.9.1-ar.patch
-
-	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=${KV_DIR} ARCH=$(tc-arch-kernel) || die
-
-	cd ${S}/xpp/utils
-	make || die "make xpp utils failed"
-
-	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() {
-	kernel_is 2 4 && cp /etc/modules.conf ${D}/etc
-	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 README.fxotune
-
-	# additional tools
-	dobin ztmonitor ztspeed zttest fxotune
-
-	# 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
-
-	# install xpp utils
-	cd ${S}/xpp/utils
-	make DESTDIR=${D} install || die "failed xpp utils install"
-}
-
-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
-}
diff --git a/net-misc/zaptel/zaptel-1.2.9.1.ebuild b/net-misc/zaptel/zaptel-1.2.9.1.ebuild
deleted file mode 100644
index 70121053cd6d..000000000000
--- a/net-misc/zaptel/zaptel-1.2.9.1.ebuild
+++ /dev/null
@@ -1,352 +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.9.1.ebuild,v 1.3 2006/10/06 22:54:22 wolf31o2 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}/${P}-gentoo.diff
-	epatch ${FILESDIR}/zaptel-1.2.9.1-gcc411_is_a_retard-kbuild.patch
-	epatch ${FILESDIR}/zaptel-1.2.9.1-ar.patch
-
-	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=${KV_DIR} 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
-}