fix repoman warnings in zaptel-1.2.23, other versions will be removed soon.
authorRajiv Aaron Manglani <rajiv@gentoo.org>
Sun, 24 Feb 2008 18:25:49 +0000 (18:25 +0000)
committerRajiv Aaron Manglani <rajiv@gentoo.org>
Sun, 24 Feb 2008 18:25:49 +0000 (18:25 +0000)
cleanup and remove old ebuilds and patches.
Package-Manager: portage-2.1.4.4

18 files changed:
net-misc/zaptel/ChangeLog
net-misc/zaptel/Manifest
net-misc/zaptel/files/zaptel-1.2.0-ukcid.patch [deleted file]
net-misc/zaptel/files/zaptel-1.2.11-gentoo.diff [deleted file]
net-misc/zaptel/files/zaptel-1.2.12-gentoo.diff [deleted file]
net-misc/zaptel/files/zaptel-1.2.16-gentoo.diff [deleted file]
net-misc/zaptel/files/zaptel-1.2.22.1-gentoo.diff [deleted file]
net-misc/zaptel/files/zaptel-1.2.9.1-gcc411_is_a_retard-kbuild.patch [deleted file]
net-misc/zaptel/files/zaptel-1.2.9.1-gentoo.diff [deleted file]
net-misc/zaptel/files/zaptel-bristuff-0.2.0-RC8q.patch [deleted file]
net-misc/zaptel/zaptel-1.2.11-r1.ebuild [deleted file]
net-misc/zaptel/zaptel-1.2.12-r1.ebuild [deleted file]
net-misc/zaptel/zaptel-1.2.12.ebuild [deleted file]
net-misc/zaptel/zaptel-1.2.16.ebuild [deleted file]
net-misc/zaptel/zaptel-1.2.22.1-r1.ebuild [deleted file]
net-misc/zaptel/zaptel-1.2.22.1.ebuild [deleted file]
net-misc/zaptel/zaptel-1.2.23.ebuild
net-misc/zaptel/zaptel-1.2.9.1-r1.ebuild [deleted file]

index c91d90e8644ff572b6ea69b7adcc612143fa58b7..e6a2d4cf92938ac7958605a54ad391cd1f1539e2 100644 (file)
@@ -1,6 +1,18 @@
 # ChangeLog for net-misc/zaptel
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.103 2008/02/01 10:46:12 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.104 2008/02/24 18:25:48 rajiv Exp $
+
+  24 Feb 2008; Rajiv Aaron Manglani <rajiv@gentoo.org>
+  -files/zaptel-bristuff-0.2.0-RC8q.patch, -files/zaptel-1.2.0-ukcid.patch,
+  -files/zaptel-1.2.9.1-gcc411_is_a_retard-kbuild.patch,
+  -files/zaptel-1.2.9.1-gentoo.diff, -files/zaptel-1.2.11-gentoo.diff,
+  -files/zaptel-1.2.12-gentoo.diff, -files/zaptel-1.2.16-gentoo.diff,
+  -files/zaptel-1.2.22.1-gentoo.diff, -zaptel-1.2.9.1-r1.ebuild,
+  -zaptel-1.2.11-r1.ebuild, -zaptel-1.2.12.ebuild, -zaptel-1.2.12-r1.ebuild,
+  -zaptel-1.2.16.ebuild, -zaptel-1.2.22.1.ebuild,
+  -zaptel-1.2.22.1-r1.ebuild, zaptel-1.2.23.ebuild:
+  fix repoman warnings in zaptel-1.2.23, other versions will be removed soon.
+  cleanup and remove old ebuilds and patches.
 
   01 Feb 2008; Christian Faulhammer <opfer@gentoo.org> zaptel-1.2.23.ebuild:
   stable x86, bug 207993
index ea661d9f14ae042d073d4fc671257a88048db467..fd2363c97e16fcda156d15390e9d1e5b4955f6ad 100644 (file)
@@ -1,56 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX zaptel-1.2.0-ukcid.patch 3787 RMD160 4c4c3b9036db8051643901892a40fbcd153184d6 SHA1 f4da18f52f6dc92c84d9534c10882f3b657d93a3 SHA256 d60c436b44481ec68272572643e83055ec5766f3d0331be0209e789637fb5720
-AUX zaptel-1.2.11-gentoo.diff 5090 RMD160 1a3b1b2b0d1f06ee05f0212a76e3a78a9963f011 SHA1 e69c4175c8ae1bf7e7e1a7c606a61e2bbf86388d SHA256 ed70a2f784f191a9c9cb47bcca90209e6f29b3fda6bee649f361a7ae4fb0cf80
-AUX zaptel-1.2.12-gentoo.diff 5088 RMD160 ebf8bd689f7b9e051f3476a2cad429d95458dafc SHA1 2123b41246258dbeae8be069e0b8d0c1ec832c69 SHA256 797226ee1ee56d13829ac9a027d9176503c850777beed6442299935953bcb198
-AUX zaptel-1.2.16-gentoo.diff 5295 RMD160 fe847e40ecdf041970bf91fe38f088cf3e1be4c3 SHA1 03badeb90d7b97e69878d6fed64d6ce317a09ea5 SHA256 f7caa5824fc7ef39149b6a52dd9b4520d4580db20211b0c8995275ae89ff2c31
 AUX zaptel-1.2.18-2.6.22.diff 1172 RMD160 d285a3a76fb9023db10207467c6cdbdb06677574 SHA1 186ce56d54d0c9cc8ac6df1f78472ed3e165fa82 SHA256 e90a922d549d2a10532cd20f053c48beb0510c1465cb40de0a515a1ad7bb7ccd
 AUX zaptel-1.2.18-gentoo.diff 5295 RMD160 fe847e40ecdf041970bf91fe38f088cf3e1be4c3 SHA1 03badeb90d7b97e69878d6fed64d6ce317a09ea5 SHA256 f7caa5824fc7ef39149b6a52dd9b4520d4580db20211b0c8995275ae89ff2c31
-AUX zaptel-1.2.22.1-gentoo.diff 3650 RMD160 c2f44b093562d73bb675457bbb181f9e286a37e8 SHA1 ee9326d397bae0e26eb2edf49f23547a13032ac8 SHA256 9235a39a67b3fc581dceca284b7add5f3bdd0bffaa9a682b7d25ea7b5996d878
 AUX zaptel-1.2.23-gentoo.diff 2352 RMD160 33bfa3ad9645eb8a26576e680916dfbf52762beb SHA1 8518953978d1f4e9ac27c7a5e1f4dc2d49c1452d SHA256 43a66b279a7c65f94b728e146bc206f82119fc057230d517c30dc894f47b0361
 AUX zaptel-1.2.9.1-ar.patch 924 RMD160 24eac6e9c5a9576b04df1e595fa6a2e2487772fe SHA1 fdf329d360508d8e629d196d4f0e6ccfabf24dff SHA256 8a8374b2689ed70108d10eb704bb6d3b35550f33a183e039e7efd69c7a681485
-AUX zaptel-1.2.9.1-gcc411_is_a_retard-kbuild.patch 306 RMD160 565eb368b1b05a177caee5a43206738cb8302b2d SHA1 950ab0c803564831a8258e6df4b09688e0b18d9f SHA256 08b1d97bb66c9594dddec108404220fa499f4ac8b2b211f63f7d8cc98b0a78bf
-AUX zaptel-1.2.9.1-gentoo.diff 5129 RMD160 b85980028878905c8db0821c5f5d59d500591a8f SHA1 fecf5625cb849d2bdc6bd28370fca3775ae987ad SHA256 2414a99c0608e562afaa84446756cb8df59cdb91b8f81aecaef65d6a0db3b3ed
-AUX zaptel-bristuff-0.2.0-RC8q.patch 6080 RMD160 39e063f8716198a78e1bc5a232bc60de355db1f6 SHA1 c310dc130a66b9479b99d248933086d7f75d2a1a SHA256 7344aa1fbdfb4ead188ed3d26695cfe93e9c650e1dc4f9ef2de067e88a21eefa
 AUX zaptel.confd 371 RMD160 1867454626e66743b26d8726e330534c9117c8a4 SHA1 c2ccc3eada8ccb28527fcacfe4b89cf25131867e SHA256 f1cf6c46282645567481118bfcd814b64c88510499c4f423ff2df4ced34c434f
 AUX zaptel.devfsd 204 RMD160 765385b9f70f9d8dff7356408712aaf02a30e9e2 SHA1 cc4a1f987fd2cc6fc5dcb6c7e4f98842339966be SHA256 908dbe8a33b9ae2f9622654bac1a8aeb69f15081a72866886edf5cd56eb48980
 AUX zaptel.rc6 972 RMD160 898806437812819568f6801faf682302e20bbdde SHA1 d427875ae8ece8ca00cf0ac1f2ee92c6e1b9e321 SHA256 0558aa032de92fa9ae54076d9268fc3e704317eb54985656f0f21e2d334b6d84
 AUX zaptel.udevd 363 RMD160 79e8c3815e0f8dbd75b21b6b99fc85cf27de7fc9 SHA1 473c41c281adf11cf2da563b4819cdecc750985d SHA256 1a50fb553fd44ee7fcc64a5a855bae09afbdbcd302c6fcd8731bb4976637fc3c
-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 bristuff-0.3.0-PRE-1x.tar.gz 279200 RMD160 bc84aa50370627cfead9e0646cf87c16ddff7b00 SHA1 e02a82cebaefa0d666ad56532369310aae818d91 SHA256 13d98160d4a10b46b77c822577e6c64ad7dadbc2df1b4cd0a1007ae3bbbd4aa8
-DIST bristuff-0.3.0-PRE-1y-d.tar.gz 286165 RMD160 7424e3f6876ff1e9415c11d3c8ed70014c5a0f4f SHA1 cb984daf1616c847d02d4824e36e13d55a142ade SHA256 99688819bce753910b154ad0866d77f861e25842a1e810d0baf80a0a02cfef25
 DIST bristuff-0.3.0-PRE-1y-h.tar.gz 286224 RMD160 bf0b9fce76c68565837b56676262fdd055240653 SHA1 cefd78476b6e394672de27849ca4a02b81a7ef1d SHA256 5657e2a50cfe35a64d9aa8caea4c3306539ed81a4ac955a9792a5d58c471a03f
 DIST bristuff-0.3.0-PRE-1y-l.tar.gz 300381 RMD160 808862df63edf85997753e1e857cc907c54f2b60 SHA1 cc5c050e68bfa48df5a86299819deefecfeaf67e SHA256 d083b6529e34c3192e91f34b68c542106ebaa5e3046d816061709297061d3576
 DIST oslec-0.1-zaptel-1.2.18.diff.gz 2956 RMD160 a4b325c3c989e96459c8b8947139a64c6b909a51 SHA1 249aaebb8e21b3dc5c9304c38bbea8ced81561d8 SHA256 38d840cbe6bf2b846d75de5f977c4c0f8d413173d59180e9d39b96205a10e4d3
 DIST oslec-0.1.tar.gz 1287860 RMD160 f9689f05563b34f4fb44a518d449498d9edb8301 SHA1 bd778f2630974240fc295ad6eee21f8df67db7f7 SHA256 7a8ee97c8f79544b5b30fe509a502966f748c152ee26520f8279cb2d75ec7c38
-DIST zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736 RMD160 b95d2301402e1108bc480ce0e66e87e3062eccf8 SHA1 f8ab2f312c6a2b2f607b9e7f3ccbcca0858c53a7 SHA256 04a8dd22d581b5d28d46a589d695f6eb634bf2bf355347a637fe2d560a63528c
 DIST zaphfc_0.3.0-PRE-1y-h_florz-12.diff.gz 10806 RMD160 34834559a99e3a52ade9ff7e9804742e9bc5260f SHA1 4e890b2ae27f3c46061e6a1f6ccd7b205470f3e2 SHA256 83d3705a55fbf265b97e37bbc45facd4f040331f6c9c1b6b98c94957e92eba11
 DIST zaphfc_0.3.0-PRE-1y-l_florz-12.1.diff.gz 10277 RMD160 20507dfa5fa9f882ebcd26b0634c07f34c4f0874 SHA1 3cbf5e061b7efe0103b2b80a4b42183a0da7bed8 SHA256 e564ae8c5da0c27899dff3d9c32c4579cc86f9eaf848f972dbb361050c8c86f4
-DIST zaptel-1.2.11.tar.gz 1425625 RMD160 6ae43a2f5801dab17216912f976e67371d8e51d2 SHA1 30a2001449ff50b5a47970b76a77500986602211 SHA256 3641c8ef684862b3cc9fd3c3341d25095909a9c2f901d31b7cc9394210cb50e8
-DIST zaptel-1.2.12.tar.gz 1487021 RMD160 4cbf2627a8bbbad65ec43578c1c89e79f1682bdb SHA1 733dcc3f90a7485808ff2e76832d6e78dca5728c SHA256 ab1e87645ceaae9269493f4e448596045732389197a9bb8c21bd5be88533e48f
-DIST zaptel-1.2.16.tar.gz 3047775 RMD160 dba8d97334aa7668166b33ef64498d2e3a27b6ad SHA1 b39e23012127ddad586335c0163850ce828c6370 SHA256 efe0a3ecc36cf8c8cd8dc2e017c71fa9d2c32ee7bdae60818f9ba64b9c11924c
 DIST zaptel-1.2.18.tar.gz 3076214 RMD160 e051b06311681c281a70c4826705b2ab315377c1 SHA1 9ec57df2548b77d4e591aa9253393153455177db SHA256 c1bfd262dcb428456cf590c6740f146d409faceeba9969585d8bec4ceb376b4d
-DIST zaptel-1.2.22.1.tar.gz 3602765 RMD160 ffe5173ddcf6bc8ddaaa1ef0e2b4f1f42ad06d2b SHA1 0105cd8b936d2299e72274a6bf3d165440ee6126 SHA256 762c593ceaa8b2b910ce4f9edea9be087d88f4453a99a004a78abac6e2ef31fd
 DIST zaptel-1.2.23.tar.gz 3696838 RMD160 717f376273810310858c28d3cbf700c778b70d71 SHA1 992b8ca44076b8ebdbe39909753b585324c44082 SHA256 1b8a77b999ff60b37d6f4163d07458ca3f4c54c9bdba43b3385168a127705e5b
-DIST zaptel-1.2.9.1.tar.gz 1255412 RMD160 caf2ad931e2ae439500805a6ca4376dc8083de5a SHA1 6145301bb47107c0910a098e26b4ca5cdb2377ab SHA256 7def44c259352397af2ad80f3c0eb103ff640ffbc7c95f37c3802fee75c10ede
-EBUILD zaptel-1.2.11-r1.ebuild 9023 RMD160 a85a0f5225e67234ff5c1bda1c12b63b354e5a10 SHA1 1bfff3ce189db21c4ab62dbe120807191cc0702b SHA256 3c719f62712fe3ed83389c28dc94ab1cbe2ee2022187db225dc3183cd1c4d584
-EBUILD zaptel-1.2.12-r1.ebuild 8972 RMD160 747a47d8f4cc5a49dace98164e3550bb3aa99c38 SHA1 bae273f565b85201aec58441a96d6d7f12b0abba SHA256 b80e5e9eeafc5c1dad77d10f6f699c53dfa51bd262fa1730e8257c19b4e2c9b7
-EBUILD zaptel-1.2.12.ebuild 9018 RMD160 98db97e401944feff969a6bdd884fe21cb53b0c6 SHA1 6b3dfd2e1f5afd9ff539ba6d230b8475cba8a333 SHA256 350fab1289b413a6714a4965a3caefdd1c457f2b362d9f1537729f1a424de0a2
-EBUILD zaptel-1.2.16.ebuild 9121 RMD160 b2470ddebf0d0a875fec81c76036be783fcdff22 SHA1 ea5124f2363d3ba029fc01cdbf5c079efc62f0f7 SHA256 7b87297ebfa39603effc47c12d2aa90547bc9b7b1831e067fdcc37213054d40a
 EBUILD zaptel-1.2.18-r1.ebuild 11135 RMD160 4f16f3e055e5f19aedf0a6e05ca40d2ac4ec7318 SHA1 a50d7a2e5dee7be8119034c8360d6501c1deb37f SHA256 ff1351ea9269cb30c3a6eb28ec873f52e18e88ae5bbf3ec5e970c8ad4d83b1b6
 EBUILD zaptel-1.2.18.ebuild 9344 RMD160 f27247f4e762009092e02a59b2edefed97d16e8c SHA1 a3c05a521c7246bf65c5e504ca2e17ec53b99488 SHA256 86b0b1bffac3a8be89161b2f087eed44fb3e509a3765daca32d3919891c50ceb
-EBUILD zaptel-1.2.22.1-r1.ebuild 9067 RMD160 5426472310f01d4411242e072df51d1276d78f2c SHA1 b8ef8bede00aed300c70fe6490f58f083939df22 SHA256 d415ebcb66fa8da53b3de2db98aa7fef0156d7e661acfbc0bdb279899101bb11
-EBUILD zaptel-1.2.22.1.ebuild 8803 RMD160 f350ff77a6724ff3e73a83dea2cde96add6f3db3 SHA1 4aff639033c378a503bec7e2c0d56b041581fdff SHA256 721a85c350aabd9a8eb44ed311b014d44808efcfe38418239e9440a9389adeaa
-EBUILD zaptel-1.2.23.ebuild 8912 RMD160 5d26a79d5eb3d437b948b326532151b3b8e19e94 SHA1 a1a92fbfe074f56a61f06fc628ce04a22c204900 SHA256 efbc52be645b6268c8e5aa1a37c036cbf7dec2c522999f2467576d84d38075de
-EBUILD zaptel-1.2.9.1-r1.ebuild 8577 RMD160 b487dfe2f52b91b5cd5a75667a2c702bb65397c5 SHA1 b304a51b4e762ca281a54ddac822f3e2deabc4b7 SHA256 36b1e47f352425665c6ed1c77ba9a53374b5bb04e8aaabd8b9483b4c377df8bd
-MISC ChangeLog 20234 RMD160 a7a186c2353288639a12b93131e548e6d1913afc SHA1 2b1c757e6188e84b23a9be4022637e2b102c98c6 SHA256 b42e6a84aa28793a77bc5c12866039285942101da52065cb4e71c49a4f56103f
+EBUILD zaptel-1.2.23.ebuild 8950 RMD160 ae775faa15c11d49b042943f163c186a06d39383 SHA1 6f18504009a31fafca054044197897468795d615 SHA256 489ad83ed52f6ee6b558241d483f4d30af0334008dd0360cd24b53cd6511e6ad
+MISC ChangeLog 20932 RMD160 bef231efa9a57b88a555b73f113980bcf212d3d4 SHA1 6e03bbf2e5133061256886a239bca74b0dfc746a SHA256 546902f68236754c1b80c9842f408e96c29e239c2da2393a1615fbc891322add
 MISC metadata.xml 345 RMD160 ce0076215245b28c91df8fcaf8a62c26c4f6b17e SHA1 b5d75d0687c1bb698d4ead8663aae5b7e73728fe SHA256 79f621be31d2899b13106f9a518c4c34971005fee3dd15564582d107e62da2e8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHovisNQqtfCuFneMRAs+kAJsFriwocxEiQTbr5pCuiQFd5n5gIwCfU2Im
-/HN2KBwcaQlMWsBWY9XN6p4=
-=aFul
------END PGP SIGNATURE-----
diff --git a/net-misc/zaptel/files/zaptel-1.2.0-ukcid.patch b/net-misc/zaptel/files/zaptel-1.2.0-ukcid.patch
deleted file mode 100644 (file)
index 940abf8..0000000
+++ /dev/null
@@ -1,139 +0,0 @@
-Index: zaptel.c
-===================================================================
-RCS file: /usr/cvsroot/zaptel/zaptel.c,v
-retrieving revision 1.95.2.1
-diff -u -r1.95.2.1 zaptel.c
---- zaptel.c   6 Oct 2004 22:11:41 -0000       1.95.2.1
-+++ zaptel.c   2 Nov 2004 10:59:16 -0000
-@@ -703,6 +703,20 @@
-       unsigned char *newbuf, *oldbuf;
-       unsigned long flags;
-       int x;
-+
-+        /* Allocate history buffer, or not.  This probably shouldn't
-+       *            be here, but it's convenient */
-+       if(!j)
-+       {
-+          if(ss->history) kfree(ss->history);
-+          ss->history = NULL;
-+       }
-+       else
-+       {
-+         if(!ss->history) ss->history=kmalloc(ZT_HISTORY_BUF_LEN, GFP_KERNEL);
-+       }
-+       ss->historypos=0;
-+
-       /* Check numbufs */
-       if (numbufs < 2)
-               numbufs = 2;
-@@ -3856,11 +3870,12 @@
- {
-       struct zt_chan *chan = chans[unit];
-       unsigned long flags;
--      int j, rv;
-+      int j, k1, k2, rv;
-       int ret;
-       int oldconf;
-       void *rxgain=NULL;
-       echo_can_state_t *ec, *tec;
-+      struct zt_history hist;
- 
-       if (!chan)
-               return -ENOSYS;
-@@ -4186,6 +4201,29 @@
-                       return -EINVAL;
-               break;
- #endif
-+      case ZT_GET_HISTORY:
-+              if (copy_from_user(&hist,(struct zt_history *) data,sizeof(hist)))
-+                      return -EIO;
-+
-+              if (!(chan->flags & ZT_FLAG_AUDIO)) return (-EINVAL);
-+              if (!chan->history) return -EINVAL;
-+              j=hist.len;
-+              k1=ZT_HISTORY_BUF_LEN-chan->historypos;
-+              k2=chan->historypos;
-+              if(j>0 && k1>0)
-+              {
-+                      if (copy_to_user(hist.buf,chan->history+chan->historypos,min(j,k1)))
-+                              return -EIO;
-+                      j-=min(j,k1);
-+              }
-+              if(j>0 && k2>0)
-+              {
-+                      if (copy_to_user(hist.buf+k1,chan->history,min(j,k2)))
-+                              return -EIO;
-+                      j-=min(j,k2);
-+              }
-+              /* Probably should assert j==0 here */
-+              break;
-       default:
-               return zt_chanandpseudo_ioctl(inode, file, cmd, data, unit);
-       }
-@@ -5371,6 +5409,15 @@
-       if (!(ms->flags &  ZT_FLAG_PSEUDO)) {
-               memcpy(ms->putlin, putlin, ZT_CHUNKSIZE * sizeof(short));
-               memcpy(ms->putraw, rxb, ZT_CHUNKSIZE);
-+      }
-+
-+      /* Store in the history buffer */
-+      if(ms->history)
-+      {
-+              memcpy(ms->history+ms->historypos,rxb,ZT_CHUNKSIZE);
-+              ms->historypos+=ZT_CHUNKSIZE;
-+              if(ms->historypos >= ZT_HISTORY_BUF_LEN)
-+                      ms->historypos=0;
-       }
-       
-       /* Take the rxc, twiddle it for conferencing if appropriate and put it
-Index: zaptel.h
-===================================================================
-RCS file: /usr/cvsroot/zaptel/zaptel.h,v
-retrieving revision 1.38
-diff -u -r1.38 zaptel.h
---- zaptel.h   27 Sep 2004 19:50:03 -0000      1.38
-+++ zaptel.h   2 Nov 2004 10:59:17 -0000
-@@ -137,6 +137,8 @@
- #define ZT_MAX_NUM_BUFS                32
- #define ZT_MAX_BUF_SPACE         32768
- 
-+#define ZT_HISTORY_BUF_LEN       16384 /* Count of ulaw samples */
-+
- #define ZT_DEFAULT_BLOCKSIZE 1024
- #define ZT_DEFAULT_MTR_MRU     2048
- 
-@@ -277,6 +279,11 @@
- int reserved[4];      /* Reserved for future expansion -- always set to 0 */
- } ZT_DIAL_PARAMS;
- 
-+typedef struct zt_history
-+{
-+      unsigned char   *buf;           /* Sample buffer */
-+      int len;                /* Length of buffer, in bytes */
-+} ZT_HISTORY;
- 
- typedef struct zt_dynamic_span {
-       char driver[20];        /* Which low-level driver to use */
-@@ -584,6 +591,11 @@
- #define ZT_TIMERPONG _IOW (ZT_CODE, 53, int)
- 
- /*
-+ * Return history buffer
-+ */
-+#define ZT_GET_HISTORY _IOR(ZT_CODE, 54, struct zt_history)
-+
-+/*
-  * Set/get signalling freeze
-  */
- #define ZT_SIGFREEZE _IOW (ZT_CODE, 54, int)
-@@ -989,6 +1001,10 @@
-       wait_queue_head_t writebufq; /* write wait queue */
-       
-       int             blocksize;      /* Block size */
-+
-+
-+        u_char          *history;       /* History buffer, for pre-ring caller ID (ZT_HISTORY_BUF_LEN) */
-+        u_short         historypos;     /* Current position within buffer */
- 
-       int             eventinidx;  /* out index in event buf (circular) */
-       int             eventoutidx;  /* in index in event buf (circular) */
diff --git a/net-misc/zaptel/files/zaptel-1.2.11-gentoo.diff b/net-misc/zaptel/files/zaptel-1.2.11-gentoo.diff
deleted file mode 100644 (file)
index ea702ef..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-diff -Nura zaptel-1.2.11/build_tools/genmodconf zaptel-1.2.11.gentoo/build_tools/genmodconf
---- zaptel-1.2.11/build_tools/genmodconf       2006-05-23 14:51:00.000000000 -0300
-+++ zaptel-1.2.11.gentoo/build_tools/genmodconf        2006-11-14 11:54:53.624386476 -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.11/build_tools/genudevrules zaptel-1.2.11.gentoo/build_tools/genudevrules
---- zaptel-1.2.11/build_tools/genudevrules     2006-05-17 13:49:46.000000000 -0300
-+++ zaptel-1.2.11.gentoo/build_tools/genudevrules      2006-11-14 11:54:53.625386224 -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.11/Makefile zaptel-1.2.11.gentoo/Makefile
---- zaptel-1.2.11/Makefile     2006-10-31 03:25:16.000000000 -0300
-+++ zaptel-1.2.11.gentoo/Makefile      2006-11-14 12:00:45.451857178 -0300
-@@ -25,7 +25,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)
-@@ -299,7 +299,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
-@@ -314,7 +315,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; \
-@@ -337,24 +338,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)
-+      install -d -m 755 $(INSTALL_PREFIX)/etc/modules.d
-       build_tools/genmodconf $(BUILDVER) "$(INSTALL_PREFIX)" "$(filter-out zaptel,$(MODULES))"
--      @if [ -d /etc/modutils ]; then \
--              /sbin/update-modules ; \
--      fi
- 
- install-udev: devices
- 
diff --git a/net-misc/zaptel/files/zaptel-1.2.12-gentoo.diff b/net-misc/zaptel/files/zaptel-1.2.12-gentoo.diff
deleted file mode 100644 (file)
index d1a2fb6..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-diff -Nura zaptel-1.2.11/build_tools/genmodconf zaptel-1.2.11.gentoo/build_tools/genmodconf
---- zaptel-1.2.11/build_tools/genmodconf       2006-05-23 14:51:00.000000000 -0300
-+++ zaptel-1.2.11.gentoo/build_tools/genmodconf        2006-11-14 11:54:53.624386476 -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.11/build_tools/genudevrules zaptel-1.2.11.gentoo/build_tools/genudevrules
---- zaptel-1.2.11/build_tools/genudevrules     2006-05-17 13:49:46.000000000 -0300
-+++ zaptel-1.2.11.gentoo/build_tools/genudevrules      2006-11-14 11:54:53.625386224 -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.11/Makefile zaptel-1.2.11.gentoo/Makefile
---- zaptel-1.2.11/Makefile     2006-10-31 03:25:16.000000000 -0300
-+++ zaptel-1.2.11.gentoo/Makefile      2006-11-14 12:00:45.451857178 -0300
-@@ -25,7 +25,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)
-@@ -299,7 +299,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
-@@ -314,7 +315,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; \
-@@ -337,24 +338,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)
-+      install -d -m 755 $(INSTALL_PREFIX)/etc/modules.d
-       build_tools/genmodconf $(BUILDVER) "$(INSTALL_PREFIX)" "$(filter-out zaptel,$(MODULES))"
--      @if [ -d /etc/modutils ]; then \
--              /sbin/update-modules ; \
--      fi
- 
- install-udev: devices
- 
diff --git a/net-misc/zaptel/files/zaptel-1.2.16-gentoo.diff b/net-misc/zaptel/files/zaptel-1.2.16-gentoo.diff
deleted file mode 100644 (file)
index 6b60d8e..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-diff -Nura zaptel-1.2.16/build_tools/genmodconf zaptel-1.2.16.gentoo/build_tools/genmodconf
---- zaptel-1.2.16/build_tools/genmodconf       2007-01-31 11:06:34.000000000 -0300
-+++ zaptel-1.2.16.gentoo/build_tools/genmodconf        2007-04-19 12:21:11.955803761 -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 [ -z "${combined}" ]; then
-     echo "***"
-     echo "*** WARNING:"
-diff -Nura zaptel-1.2.16/build_tools/genudevrules zaptel-1.2.16.gentoo/build_tools/genudevrules
---- zaptel-1.2.16/build_tools/genudevrules     2007-01-31 14:27:30.000000000 -0300
-+++ zaptel-1.2.16.gentoo/build_tools/genudevrules      2007-04-19 12:28:20.390284221 -0300
-@@ -22,10 +22,10 @@
- 
- 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}"zaptranscode", NAME="zap/transcode", 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}"zaptranscode", NAME="zap/transcode", 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.16/Makefile zaptel-1.2.16.gentoo/Makefile
---- zaptel-1.2.16/Makefile     2007-03-07 16:14:30.000000000 -0300
-+++ zaptel-1.2.16.gentoo/Makefile      2007-04-19 12:39:39.943874878 -0300
-@@ -93,7 +93,7 @@
- 
- INSTALL_PREFIX:=$(DESTDIR)
- 
--CFLAGS+=-I. -O4 -g -Wall
-+CFLAGS+=-I. -Iinclude -g -Wall
- 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)
-@@ -331,7 +331,8 @@
- else # DYNFS
-   ifdef UDEVRULES
-       install -d $(INSTALL_PREFIX)/etc/udev/rules.d
--      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
-@@ -346,7 +347,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; \
-@@ -370,24 +371,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 /sbin/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)
-+      install -d -m 755 $(INSTALL_PREFIX)/etc/modules.d
-       build_tools/genmodconf $(BUILDVER) "$(INSTALL_PREFIX)" "$(filter-out zaptel ztdummy zttranscode wctc4xxp ztdynamic xpp_usb,$(MODULES)) $(MODULE_ALIASES)"
--      @if [ -d /etc/modutils ]; then \
--              /sbin/update-modules ; \
--      fi
- 
- install-udev: devices
- 
diff --git a/net-misc/zaptel/files/zaptel-1.2.22.1-gentoo.diff b/net-misc/zaptel/files/zaptel-1.2.22.1-gentoo.diff
deleted file mode 100644 (file)
index eaf7f1d..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -uNr zaptel-1.2.22.1/build_tools/genmodconf zaptel-1.2.22.1.gentoo/build_tools/genmodconf
---- zaptel-1.2.22.1/build_tools/genmodconf     2007-07-11 14:58:09.000000000 -0400
-+++ zaptel-1.2.22.1.gentoo/build_tools/genmodconf      2007-12-23 18:21:29.000000000 -0500
-@@ -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 [ -z "${combined}" ]; then
-     echo "***"
-     echo "*** WARNING:"
-diff -uNr zaptel-1.2.22.1/build_tools/genudevrules zaptel-1.2.22.1.gentoo/build_tools/genudevrules
---- zaptel-1.2.22.1/build_tools/genudevrules   2007-01-31 12:27:30.000000000 -0500
-+++ zaptel-1.2.22.1.gentoo/build_tools/genudevrules    2007-12-23 18:24:05.000000000 -0500
-@@ -22,10 +22,10 @@
- 
- 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}"zaptranscode", NAME="zap/transcode", 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}"zaptranscode", NAME="zap/transcode", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="root", GROUP="dialout", MODE="0660"
- EOF
-diff -uNr zaptel-1.2.22.1/Makefile zaptel-1.2.22.1.gentoo/Makefile
---- zaptel-1.2.22.1/Makefile   2007-10-05 15:45:31.000000000 -0400
-+++ zaptel-1.2.22.1.gentoo/Makefile    2007-12-23 21:56:57.000000000 -0500
-@@ -108,7 +108,7 @@
- 
- INSTALL_PREFIX        := /usr
- 
--CFLAGS+=-I. -O4 -g -fPIC -Wall
-+CFLAGS+=-I. -g -Wall
- ifneq (,$(findstring ppc,$(MACHINE)))
-   CFLAGS      += -fsigned-char
-   KFLAGS      += -msoft-float -fsigned-char
-@@ -391,7 +391,7 @@
- else # DYNFS
-   ifdef UDEVRULES
-       install -d $(DESTDIR)/etc/udev/rules.d
--      build_tools/genudevrules > $(DESTDIR)/etc/udev/rules.d/zaptel.rules
-+      build_tools/genudevrules > $(DESTDIR)/etc/udev/rules.d/10-zaptel.rules
-   else # !UDEVRULES
-       @echo "**** Dynamic filesystem detected -- not creating device nodes"
-   endif
-@@ -460,11 +460,10 @@
-       rm -f $(DESTDIR)$(MODS_DIR)/wcfxsusb.o
- endif
-       rm -f $(DESTDIR)$(MODS_DIR)/wcfxs.o
--      [ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
- 
- install-libs: libs
-       install -D -m 755 $(LIBTONEZONE_SO) $(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
--      [ `id -u` = 0 ] && /sbin/ldconfig || :
-+      [ `id -u` = 0 ] && /sbin/ldconfig -n $(DESTDIR)$(LIBDIR) || :
-       rm -f $(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO)
-       ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
-               $(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER)
diff --git a/net-misc/zaptel/files/zaptel-1.2.9.1-gcc411_is_a_retard-kbuild.patch b/net-misc/zaptel/files/zaptel-1.2.9.1-gcc411_is_a_retard-kbuild.patch
deleted file mode 100644 (file)
index 485a337..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
---- zaptel-1.2.9.1/wct4xxp/Kbuild.orig 2006-09-28 01:47:38.000000000 +0000
-+++ zaptel-1.2.9.1/wct4xxp/Kbuild      2006-09-28 01:47:53.000000000 +0000
-@@ -2,6 +2,7 @@
- # but we need to be able to support older verions as well
- host-progs := fw2h
- hostprogs-y := fw2h
-+fw2h-objs := fw2h.o
- 
- obj-m += wct4xxp.o
- 
diff --git a/net-misc/zaptel/files/zaptel-1.2.9.1-gentoo.diff b/net-misc/zaptel/files/zaptel-1.2.9.1-gentoo.diff
deleted file mode 100644 (file)
index 34ac155..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-diff -Nru zaptel-1.2.9.1.orig/Makefile zaptel-1.2.9.1/Makefile
---- zaptel-1.2.9.1.orig/Makefile       2006-09-09 01:49:43.000000000 +0200
-+++ zaptel-1.2.9.1/Makefile    2006-09-15 02:14:35.000000000 +0200
-@@ -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,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 -Nru zaptel-1.2.9.1.orig/build_tools/genmodconf zaptel-1.2.9.1/build_tools/genmodconf
---- zaptel-1.2.9.1.orig/build_tools/genmodconf 2006-05-23 19:51:00.000000000 +0200
-+++ zaptel-1.2.9.1/build_tools/genmodconf      2006-09-15 02:13:37.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;
-diff -Nru zaptel-1.2.9.1.orig/build_tools/genudevrules zaptel-1.2.9.1/build_tools/genudevrules
---- zaptel-1.2.9.1.orig/build_tools/genudevrules       2006-05-17 18:49:46.000000000 +0200
-+++ zaptel-1.2.9.1/build_tools/genudevrules    2006-09-15 02:12:19.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
diff --git a/net-misc/zaptel/files/zaptel-bristuff-0.2.0-RC8q.patch b/net-misc/zaptel/files/zaptel-bristuff-0.2.0-RC8q.patch
deleted file mode 100644 (file)
index d513f3e..0000000
+++ /dev/null
@@ -1,191 +0,0 @@
-diff -ur zaptel-1.0.10.orig/Makefile zaptel-1.0.10/Makefile
---- zaptel-1.0.10.orig/Makefile        2005-11-04 06:03:38.000000000 +0100
-+++ zaptel-1.0.10/Makefile     2005-11-30 13:10:47.000000000 +0100
-@@ -346,7 +346,7 @@
- 
- clean:
-       rm -f torisatool makefw tor2fw.h
--      rm -f zttool
-+      rm -f zttool ztspeed zttest ztmonitor
-       rm -f *.o ztcfg tzdriver sethdlc sethdlc-new
-       rm -f $(TZOBJS) $(LIBTONEZONE) *.lo
-       rm -f *.ko *.mod.c .*o.cmd
-@@ -354,3 +354,4 @@
-       rm -f libtonezone*
-       rm -f tor2ee
-       rm -f core
-+      rm -rf .tmp_versions
-diff -ur zaptel-1.0.10.orig/zaptel.c zaptel-1.0.10/zaptel.c
---- zaptel-1.0.10.orig/zaptel.c        2005-09-02 22:27:45.000000000 +0200
-+++ zaptel-1.0.10/zaptel.c     2005-11-30 13:10:47.000000000 +0100
-@@ -4875,11 +4875,40 @@
-                                       *(txb++) = fasthdlc_tx_run_nocheck(&ms->txhdlc);
-                               }
-                               bytes -= left;
-+#ifdef CONFIG_ZAPATA_BRI_DCHANS
-+                      } else if (ms->flags & ZT_FLAG_BRIDCHAN) {
-+                          /*
-+                           * Let's get this right, we want to transmit complete frames only.
-+                           * The card driver will do the dirty HDLC work for us.
-+                           * txb (transmit buffer) is supposed to be big enough to store one frame
-+                           * we will make this as big as the D fifo (1KB or 2KB)
-+                           */
-+
-+                          /* there are 'left' bytes in the user buffer left to transmit */
-+                          left = ms->writen[ms->outwritebuf] - ms->writeidx[ms->outwritebuf] - 2;
-+                          if (left > ms->maxbytes2transmit) {
-+                              memcpy(txb, buf + ms->writeidx[ms->outwritebuf], ms->maxbytes2transmit);
-+                              ms->writeidx[ms->outwritebuf] += ms->maxbytes2transmit;
-+                              txb += ms->maxbytes2transmit;
-+                              ms->bytes2transmit = ms->maxbytes2transmit;
-+                              ms->eoftx = 0;
-+                          } else {
-+                              memcpy(txb, buf + ms->writeidx[ms->outwritebuf], left);
-+                              ms->writeidx[ms->outwritebuf] += left + 2;
-+                              txb += left;
-+                              ms->bytes2transmit = left;
-+                              ms->eoftx = 1;
-+                          }
-+                          bytes = 0;
-+#endif
-                       } else {
-                               memcpy(txb, buf + ms->writeidx[ms->outwritebuf], left);
-                               ms->writeidx[ms->outwritebuf]+=left;
-                               txb += left;
-                               bytes -= left;
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS) 
-+                              ms->bytes2transmit=ZT_CHUNKSIZE;
-+#endif
-                       }
-                       /* Check buffer status */
-                       if (ms->writeidx[ms->outwritebuf] >= ms->writen[ms->outwritebuf]) {
-@@ -4924,6 +4953,17 @@
-                               /* Transmit a flag if this is an HDLC channel */
-                               if (ms->flags & ZT_FLAG_HDLC)
-                                       fasthdlc_tx_frame_nocheck(&ms->txhdlc);
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS) 
-+                              if(ms->flags & ZT_FLAG_BRIDCHAN) { 
-+                      //          if (ms->bytes2transmit > 0) {
-+                                      // txb += 2;
-+                                      // ms->bytes2transmit -= 2;
-+                          bytes=0;
-+                                      ms->eoftx = 1;
-+//                                    printk(KERN_CRIT "zaptel EOF(%d) bytes2transmit %d\n",ms->eoftx,ms->bytes2transmit);
-+                      //          }
-+                              }
-+#endif
- #ifdef CONFIG_ZAPATA_NET
-                               if (ms->flags & ZT_FLAG_NETDEV)
-                                       netif_wake_queue(ztchan_to_dev(ms));
-@@ -4934,7 +4974,7 @@
-                                       tasklet_schedule(&ms->ppp_calls);
-                               }
- #endif
--                      }
-+                      } 
-               } else if (ms->curtone && !(ms->flags & ZT_FLAG_PSEUDO)) {
-                       left = ms->curtone->tonesamples - ms->tonep;
-                       if (left > bytes)
-@@ -4972,8 +5012,17 @@
-               } else if (ms->flags & ZT_FLAG_CLEAR) {
-                       /* Clear channels should idle with 0xff for the sake
-                       of silly PRI's that care about idle B channels */
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS) 
-+      //              ms->bytes2transmit=0;
-+#endif
-                       memset(txb, 0xff, bytes);
-                       bytes = 0;
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS) 
-+              } else if(ms->flags & ZT_FLAG_BRIDCHAN) { 
-+                  // ms->bytes2transmit = ZT_CHUNKSIZE - bytes;
-+                  bytes = 0;
-+                  if (ms->bytes2transmit > 0) printk(KERN_CRIT "bytes2transmit %d\n",ms->bytes2transmit); 
-+#endif
-               } else {
-                       memset(txb, ZT_LIN2X(0, ms), bytes);    /* Lastly we use silence on telephony channels */
-                       bytes = 0;
-@@ -5672,6 +5721,13 @@
-       int left, x;
- 
-       int bytes = ZT_CHUNKSIZE;
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS) 
-+      if (ms->flags & ZT_FLAG_BRIDCHAN) {
-+          bytes = ms->bytes2receive;
-+          if (bytes < 1) return;
-+//        printk(KERN_CRIT "bytes2receive %d\n",ms->bytes2receive);
-+      }
-+#endif
- 
-       while(bytes) {
- #if defined(CONFIG_ZAPATA_NET)  || defined(CONFIG_ZAPATA_PPP)
-@@ -5730,6 +5786,19 @@
-                                               }
-                                       }
-                               }
-+#ifdef CONFIG_ZAPATA_BRI_DCHANS
-+                      } else if (ms->flags & ZT_FLAG_BRIDCHAN) {
-+                          memcpy(buf + ms->readidx[ms->inreadbuf], rxb, left);
-+                          rxb += left;
-+                          ms->readidx[ms->inreadbuf] += left;
-+                          bytes -= left;
-+                          if (ms->eofrx == 1) {
-+                              eof=1;
-+                          }
-+//                        printk(KERN_CRIT "receiving %d bytes\n",ms->bytes2receive);
-+                          ms->bytes2receive = 0;
-+                          ms->eofrx = 0;
-+#endif
-                       } else {
-                               /* Not HDLC */
-                               memcpy(buf + ms->readidx[ms->inreadbuf], rxb, left);
-diff -ur zaptel-1.0.10.orig/zaptel.h zaptel-1.0.10/zaptel.h
---- zaptel-1.0.10.orig/zaptel.h        2005-11-15 15:28:44.000000000 +0100
-+++ zaptel-1.0.10/zaptel.h     2005-11-30 13:10:47.000000000 +0100
-@@ -962,6 +962,13 @@
-       int do_ppp_error;
-       struct sk_buff_head ppp_rq;
- #endif
-+#ifdef CONFIG_ZAPATA_BRI_DCHANS
-+      int bytes2receive;
-+      int maxbytes2transmit; /* size of the tx buffer in the card driver */
-+      int bytes2transmit;
-+      int eofrx;
-+      int eoftx;
-+#endif
-       spinlock_t lock;
-       char name[40];          /* Name */
-       /* Specified by zaptel */
-@@ -1036,7 +1043,7 @@
-       int             txbufpolicy;                    /* Buffer policy */
-       int             rxbufpolicy;                    /* Buffer policy */
-       int             txdisable;                              /* Disable transmitter */
--      int     rxdisable;                              /* Disable receiver */
-+      int             rxdisable;                              /* Disable receiver */
-       
-       
-       /* Tone zone stuff */
-@@ -1199,6 +1206,10 @@
- #define ZT_FLAG_T1PPP                 (1 << 15)
- #define ZT_FLAG_SIGFREEZE             (1 << 16)       /* Freeze signalling */
- 
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS) 
-+#define ZT_FLAG_BRIDCHAN              (1 << 17)
-+#endif
-+
- struct zt_span {
-       spinlock_t lock;
-       void *pvt;                      /* Private stuff */
-diff -ur zaptel-1.0.10.orig/zconfig.h zaptel-1.0.10/zconfig.h
---- zaptel-1.0.10.orig/zconfig.h       2005-01-02 01:19:57.000000000 +0100
-+++ zaptel-1.0.10/zconfig.h    2005-11-30 13:10:47.000000000 +0100
-@@ -127,4 +127,10 @@
-  */
- /* #define TDM_REVH_MATCHALL */
- 
-+/*
-+ * Uncomment the following for BRI D channels
-+ *
-+ */
-+#define CONFIG_ZAPATA_BRI_DCHANS
-+
- #endif
diff --git a/net-misc/zaptel/zaptel-1.2.11-r1.ebuild b/net-misc/zaptel/zaptel-1.2.11-r1.ebuild
deleted file mode 100644 (file)
index 1984b43..0000000
+++ /dev/null
@@ -1,370 +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-r1.ebuild,v 1.2 2006/11/27 14:59:50 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/libusb
-       >=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.12-r1.ebuild b/net-misc/zaptel/zaptel-1.2.12-r1.ebuild
deleted file mode 100644 (file)
index f125bd4..0000000
+++ /dev/null
@@ -1,368 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.12-r1.ebuild,v 1.3 2007/03/13 19:57:38 opfer Exp $
-
-inherit toolchain-funcs eutils linux-mod
-
-## NOTE:
-#
-#
-
-BRI_VERSION="0.3.0-PRE-1x"
-FLORZ_VERSION="0.3.0-PRE-1o_florz-12"
-
-IUSE="bri ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2 florz rtc 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"
-
-RDEPEND="virtual/libc
-       dev-libs/libusb
-       >=dev-libs/newt-0.50.0"
-
-DEPEND="${RDEPEND} virtual/linux-sources"
-
-# 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
-
-       # 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.12.ebuild b/net-misc/zaptel/zaptel-1.2.12.ebuild
deleted file mode 100644 (file)
index 7ce9d72..0000000
+++ /dev/null
@@ -1,370 +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.12.ebuild,v 1.1 2006/12/19 09:36:30 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/libusb
-       >=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.16.ebuild b/net-misc/zaptel/zaptel-1.2.16.ebuild
deleted file mode 100644 (file)
index ae8b893..0000000
+++ /dev/null
@@ -1,373 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.16.ebuild,v 1.2 2007/04/27 11:04:53 armin76 Exp $
-
-inherit toolchain-funcs eutils linux-mod
-
-BRI_VERSION="0.3.0-PRE-1y-d"
-FLORZ_VERSION="0.3.0-PRE-1o_florz-12"
-
-IUSE="bri ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2 florz
-rtc 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"
-
-RDEPEND="virtual/libc
-       dev-libs/libusb
-       >=dev-libs/newt-0.50.0"
-
-DEPEND="${RDEPEND} virtual/linux-sources"
-
-# 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
-               if ! linux_chkconfig_present FW_LOADER; then
-                       echo
-                       eerror "Your kernel lacks FW_LOADER support!"
-                       eerror "Enable CONFIG_FW_LOADER!"
-                       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-ar.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() {
-       # Create firmware directory
-       mkdir -p ${D}/lib/firmware/
-
-       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.22.1-r1.ebuild b/net-misc/zaptel/zaptel-1.2.22.1-r1.ebuild
deleted file mode 100644 (file)
index a1ab4d8..0000000
+++ /dev/null
@@ -1,372 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.22.1-r1.ebuild,v 1.1 2008/01/15 05:34:53 rajiv Exp $
-
-inherit toolchain-funcs eutils linux-mod
-
-BRI_VERSION="0.3.0-PRE-1y-l"
-FLORZ_VERSION="0.3.0-PRE-1y-l_florz-12.1"
-
-IUSE="astribank bri ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2 florz
-rtc watchdog zapras zapnet"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://downloads.digium.com/pub/zaptel/releases/${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"
-
-RDEPEND="virtual/libc
-       dev-libs/libusb
-       >=dev-libs/newt-0.50.0
-       astribank? ( dev-lang/perl )"
-
-DEPEND="${RDEPEND} virtual/linux-sources"
-
-# 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
-               if ! linux_chkconfig_present FW_LOADER; then
-                       echo
-                       eerror "Your kernel lacks FW_LOADER support!"
-                       eerror "Enable CONFIG_FW_LOADER!"
-                       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-ar.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 "Patching zaptel with florz (${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
-
-               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 astribank; then
-               cd ${S}/xpp/utils
-               make || die "make xpp utils failed"
-       fi
-
-       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() {
-       # Create firmware directory
-       mkdir -p ${D}/lib/firmware/
-
-       kernel_is 2 4 && cp /etc/modules.conf ${D}/etc
-       make DESTDIR=${D} ARCH=$(tc-arch-kernel) \
-       KVERS=${KV_FULL} KSRC=/usr/src/linux devices firmware \
-       install-modules install-programs || die
-
-       dodoc ChangeLog README README.udev README.fxsusb zaptel.init
-       dodoc zaptel.conf.sample 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 udev rule file
-       insinto /etc/udev/rules.d
-       newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
-
-       # fix permissions if there's no udev 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
-
-       if use astribank; then
-               cd ${S}/xpp/utils
-               eval `perl '-V:installarchlib'`
-               make DESTDIR=${D} PERLLIBDIR=${installarchlib} install || die "failed xpp utils install"
-               dosbin zt_registration xpp_sync lszaptel
-       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 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.22.1.ebuild b/net-misc/zaptel/zaptel-1.2.22.1.ebuild
deleted file mode 100644 (file)
index 92a6051..0000000
+++ /dev/null
@@ -1,365 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.22.1.ebuild,v 1.1 2007/12/25 06:26:11 rajiv Exp $
-
-inherit toolchain-funcs eutils linux-mod
-
-BRI_VERSION="0.3.0-PRE-1y-l"
-
-IUSE="astribank bri ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2
-rtc watchdog zapras zapnet"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://downloads.digium.com/pub/zaptel/releases/${MY_P}.tar.gz
-        bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
-        "
-
-S="${WORKDIR}/${MY_P}"
-
-S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND="virtual/libc
-       dev-libs/libusb
-       >=dev-libs/newt-0.50.0
-       astribank? ( dev-lang/perl )"
-
-DEPEND="${RDEPEND} virtual/linux-sources"
-
-# 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
-               if ! linux_chkconfig_present FW_LOADER; then
-                       echo
-                       eerror "Your kernel lacks FW_LOADER support!"
-                       eerror "Enable CONFIG_FW_LOADER!"
-                       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-ar.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}
-
-               # 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 astribank; then
-               cd ${S}/xpp/utils
-               make || die "make xpp utils failed"
-       fi
-
-       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() {
-       # Create firmware directory
-       mkdir -p ${D}/lib/firmware/
-
-       kernel_is 2 4 && cp /etc/modules.conf ${D}/etc
-       make DESTDIR=${D} ARCH=$(tc-arch-kernel) \
-       KVERS=${KV_FULL} KSRC=/usr/src/linux devices firmware \
-       install-modules install-programs || die
-
-       dodoc ChangeLog README README.udev 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 udev rule file
-       insinto /etc/udev/rules.d
-       newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
-
-       # fix permissions if there's no udev 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
-
-       if use astribank; then
-               cd ${S}/xpp/utils
-               eval `perl '-V:installarchlib'`
-               make DESTDIR=${D} PERLLIBDIR=${installarchlib} install || die "failed xpp utils install"
-               dosbin zt_registration xpp_sync lszaptel
-       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 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
-}
index 42ebf49c0ab7da8170b0eeca804318195d7f78a1..91728f881164560d645fdf0acd7e0ed0e1ebd42c 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.23.ebuild,v 1.2 2008/02/01 10:46:12 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.23.ebuild,v 1.3 2008/02/24 18:25:48 rajiv Exp $
 
 inherit toolchain-funcs eutils linux-mod flag-o-matic
 
@@ -54,21 +54,21 @@ select_echo_cancel() {
 }
 
 zconfig_disable() {
-       if grep -q "${1}" ${S}/zconfig.h; then
+       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
+                       "${S}"/zconfig.h
        fi
 
        return $?
 }
 
 zconfig_enable() {
-       if grep -q "${1}" ${S}/zconfig.h; then
+       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
+                       "${S}"/zconfig.h
        fi
 
        return $?
@@ -169,9 +169,9 @@ pkg_setup() {
 src_unpack() {
        unpack ${A}
 
-       cd ${S}
-       epatch ${FILESDIR}/${P}-gentoo.diff
-       epatch ${FILESDIR}/zaptel-1.2.9.1-ar.patch
+       cd "${S}"
+       epatch "${FILESDIR}"/${P}-gentoo.diff
+       epatch "${FILESDIR}"/zaptel-1.2.9.1-ar.patch
 
        # try to apply bristuff patch
        if use bri; then
@@ -185,7 +185,7 @@ src_unpack() {
 
                if use florz; then
                        einfo "Patching zaptel with florz (${FLORZ_VERSION}) for zaphfc"
-                       epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
+                       epatch "${WORKDIR}"/zaphfc_${FLORZ_VERSION}.diff
                fi
 
                # patch includes
@@ -205,7 +205,7 @@ src_unpack() {
                sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
                        zaphfc/Makefile
 
-               cd ${S}
+               cd "${S}"
        fi
 
 ### Configuration changes
@@ -249,7 +249,7 @@ src_compile() {
             KSRC=${KV_DIR} ARCH=$(tc-arch-kernel) || die
 
        if use astribank; then
-               cd ${S}/xpp/utils
+               cd "${S}"/xpp/utils
                make || die "make xpp utils failed"
        fi
 
@@ -267,10 +267,10 @@ src_compile() {
 
 src_install() {
        # Create firmware directory
-       mkdir -p ${D}/lib/firmware/
+       mkdir -p "${D}"/lib/firmware/
 
-       kernel_is 2 4 && cp /etc/modules.conf ${D}/etc
-       make DESTDIR=${D} ARCH=$(tc-arch-kernel) \
+       kernel_is 2 4 && cp /etc/modules.conf "${D}"/etc
+       make DESTDIR="${D}" ARCH=$(tc-arch-kernel) \
        KVERS=${KV_FULL} KSRC=/usr/src/linux devices firmware \
        install-modules install-programs || die
 
@@ -317,21 +317,21 @@ src_install() {
                docinto bristuff/cwain
                dodoc cwain/TODO
 
-               cd ${S}
+               cd "${S}"
        fi
 
        # install init script
-       newinitd ${FILESDIR}/zaptel.rc6 zaptel
-       newconfd ${FILESDIR}/zaptel.confd zaptel
+       newinitd "${FILESDIR}"/zaptel.rc6 zaptel
+       newconfd "${FILESDIR}"/zaptel.confd zaptel
 
        # install udev rule file
        insinto /etc/udev/rules.d
-       newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
+       newins "${FILESDIR}"/zaptel.udevd 10-zaptel.rules
 
        if use astribank; then
-               cd ${S}/xpp/utils
+               cd "${S}"/xpp/utils
                eval `perl '-V:installarchlib'`
-               make DESTDIR=${D} PERLLIBDIR=${installarchlib} install || die "failed xpp utils install"
+               make DESTDIR="${D}" PERLLIBDIR=${installarchlib} install || die "failed xpp utils install"
                dosbin zt_registration xpp_sync lszaptel
        fi
 }
diff --git a/net-misc/zaptel/zaptel-1.2.9.1-r1.ebuild b/net-misc/zaptel/zaptel-1.2.9.1-r1.ebuild
deleted file mode 100644 (file)
index 9ac5507..0000000
+++ /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-r1.ebuild,v 1.1 2006/11/27 14:36:00 gustavoz 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
-}