Removed outdated ebuilds.

Package-Manager: portage-2.0.51.22-r2

14 files changed, 32 insertions, 1228 deletions

diff --git a/net-misc/zaptel/ChangeLog b/net-misc/zaptel/ChangeLog
index c1a93bdfd878..063ca03809fa 100644
--- a/net-misc/zaptel/ChangeLog
+++ b/net-misc/zaptel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/zaptel
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.63 2005/09/17 01:01:47 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.64 2005/09/19 19:45:56 stkn Exp $
+
+  19 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
+  -files/zaptel-1.0.0-experimental-devfs26.diff,
+  -files/zaptel-1.0.3-gcc34.patch, -zaptel-1.0.3.ebuild,
+  -zaptel-1.0.4.ebuild, -zaptel-1.0.6.ebuild, -zaptel-1.0.7.ebuild,
+  -zaptel-1.0.9_p1.ebuild:
+  Removed outdated ebuilds.
 
   17 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org>
   zaptel-1.2.0_beta1.ebuild:
diff --git a/net-misc/zaptel/Manifest b/net-misc/zaptel/Manifest
index 8dde16ff8ef3..c7473aefb121 100644
--- a/net-misc/zaptel/Manifest
+++ b/net-misc/zaptel/Manifest
@@ -1,56 +1,34 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 276ca202b6c1471af85d43ce0eb6b94f zaptel-1.0.7-r1.ebuild 6517
-MD5 42f062a13ffcf3c15e50b910ca4f2443 zaptel-1.0.3.ebuild 3512
-MD5 05517ce3f7bdb892f419c01c24442bba zaptel-1.0.7.ebuild 6089
-MD5 1ab383ffeab849e778401125f478fc6d zaptel-1.0.4-r1.ebuild 4417
 MD5 ac774e9b1e15c4e3060c325560be97d3 zaptel-1.0.6-r1.ebuild 6217
-MD5 a9b97edfc9559f48e71f9f232590143f zaptel-1.0.9_p1-r1.ebuild 6641
-MD5 0b745c4f596e378862e200cfdecb2a45 zaptel-1.0.4.ebuild 4457
-MD5 9cad7ade4727d907fd31d95ff881f3e2 zaptel-1.0.6.ebuild 6259
-MD5 7b71dc1e0aeb7f40043afe45ef467c74 zaptel-1.2.0_beta1.ebuild 9003
+MD5 1ab383ffeab849e778401125f478fc6d zaptel-1.0.4-r1.ebuild 4417
 MD5 5c63aa4881f27d9421f5e005c6333687 zaptel-1.0.9_p2.ebuild 6637
-MD5 935e1670d5ab508f6459fb45838d3bf3 zaptel-1.0.9_p1.ebuild 6445
-MD5 6263a968f86b50a23db0b3bcaf19b0ae zaptel-1.0.8.ebuild 6370
 MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
-MD5 474e6bd789df7d867652a5387dd1b069 ChangeLog 11561
-MD5 cce31b4380f9c62e91293dff1523d5e0 files/zaptel-bristuff-0.2.0-RC8g.patch 5551
-MD5 077231bb1ba50aedfd08476b9d4eb18b files/zaptel-1.0.9_p2-gentoo.diff 5179
-MD5 090668aabb8e77cfd0d83835f52bd105 files/zaptel-1.0.4-gcc34.patch 821
-MD5 144ec2aec65f20a934f7affe613c69aa files/zaptel-1.2.0_beta1-gentoo.diff 4867
-MD5 74863c2b19f217f2f23daa1cd617c4f9 files/zaptel-bristuff-0.2.0-RC7k.patch 6065
-MD5 3a4f554056143ac54f033cc3356821b5 files/digest-zaptel-1.0.9_p1-r1 214
+MD5 276ca202b6c1471af85d43ce0eb6b94f zaptel-1.0.7-r1.ebuild 6517
+MD5 6263a968f86b50a23db0b3bcaf19b0ae zaptel-1.0.8.ebuild 6370
+MD5 a9b97edfc9559f48e71f9f232590143f zaptel-1.0.9_p1-r1.ebuild 6641
+MD5 e85646b140faa58366e07dac6d933aea ChangeLog 11837
+MD5 7b71dc1e0aeb7f40043afe45ef467c74 zaptel-1.2.0_beta1.ebuild 9003
+MD5 f06df1defd75000b5fdfa7f81b4ef78b files/zaptel-bristuff-0.2.0-RC8l.patch 5551
 MD5 3bff3fd5d8dc52513ceeac546e1e11bf files/zaptel.udevd 358
-MD5 60910db3ceada75031a91d419832871d files/zaptel-1.0.0-experimental-devfs26.diff 5474
 MD5 62b106ceaf6f69da6e1051c37b33f3f5 files/digest-zaptel-1.2.0_beta1 70
-MD5 f5d81a19c52c5e88fefed12251674134 files/zaptel-bristuff-0.2.0-RC8n.patch 6064
-MD5 66c86744220e6716f15393caf0ee408d files/digest-zaptel-1.0.3 64
-MD5 9abebf47ce7e7122a184a62e5baed146 files/zaptel-1.0.3-gcc34.patch 1540
-MD5 ede13eb6a35e876076adeed8a253e1e7 files/digest-zaptel-1.0.9_p1 214
-MD5 a1ef57fe463da11030f2e18d87535466 files/zaptel.rc6 972
-MD5 296ec9da581d5768ca13840b1a32c33f files/digest-zaptel-1.0.7 212
-MD5 0c81001d4c9efeeffeb1332580fb4cdc files/digest-zaptel-1.0.6-r1 212
+MD5 144ec2aec65f20a934f7affe613c69aa files/zaptel-1.2.0_beta1-gentoo.diff 4867
+MD5 fae1145da422b8838c2a6ac3405dc4c4 files/zaptel.confd 371
+MD5 6fec683d2df451d8094093511d1138db files/zaptel.devfsd 204
+MD5 051e2ff3f1222e2b551a70e9cd1b31f0 files/digest-zaptel-1.0.4-r1 64
 MD5 8471d7eb15aebff9c72f67861cb1ad88 files/zaptel-1.0.7-gentoo.diff 4459
-MD5 e5a799243335f31a494bb4f90edbb9e4 files/zaptel-1.0.3-gentoo.diff 3456
+MD5 f46e4409c0bb701f8a6214e793de72a2 files/digest-zaptel-1.0.8 212
+MD5 cce31b4380f9c62e91293dff1523d5e0 files/zaptel-bristuff-0.2.0-RC8g.patch 5551
+MD5 a1ef57fe463da11030f2e18d87535466 files/zaptel.rc6 972
 MD5 6029a1280d38d8c67577bc7a873fd336 files/zaptel-1.0.9-rtc.patch 4238
-MD5 5fe59834ed82727b3297f9e39eb855be files/zaptel-1.0.9-gentoo.diff 4855
-MD5 0c81001d4c9efeeffeb1332580fb4cdc files/digest-zaptel-1.0.6 212
-MD5 f06df1defd75000b5fdfa7f81b4ef78b files/zaptel-bristuff-0.2.0-RC8l.patch 5551
+MD5 0c81001d4c9efeeffeb1332580fb4cdc files/digest-zaptel-1.0.6-r1 212
+MD5 69d0c3831715ccac6422b13a99fc6557 files/digest-zaptel-1.0.9_p2 214
+MD5 3a4f554056143ac54f033cc3356821b5 files/digest-zaptel-1.0.9_p1-r1 214
+MD5 090668aabb8e77cfd0d83835f52bd105 files/zaptel-1.0.4-gcc34.patch 821
+MD5 d40a84eeea5866a3afbac2603e970e7b files/zaptel-1.0.4-experimental-devfs26.diff 5982
+MD5 f5d81a19c52c5e88fefed12251674134 files/zaptel-bristuff-0.2.0-RC8n.patch 6064
 MD5 e72dc0fa3cbcd55182b6f05d8c731694 files/zaptel-1.0.8-gentoo.diff 4747
-MD5 051e2ff3f1222e2b551a70e9cd1b31f0 files/digest-zaptel-1.0.4 64
 MD5 9be11ef13f32ceaffef87920fe47a93e files/digest-zaptel-1.0.7-r1 212
 MD5 d893c36bffff825ab0e6d48e1ad0acea files/zaptel-bristuff-0.2.0-RC8h.patch 6064
-MD5 051e2ff3f1222e2b551a70e9cd1b31f0 files/digest-zaptel-1.0.4-r1 64
-MD5 fae1145da422b8838c2a6ac3405dc4c4 files/zaptel.confd 371
-MD5 f46e4409c0bb701f8a6214e793de72a2 files/digest-zaptel-1.0.8 212
-MD5 69d0c3831715ccac6422b13a99fc6557 files/digest-zaptel-1.0.9_p2 214
-MD5 6fec683d2df451d8094093511d1138db files/zaptel.devfsd 204
-MD5 d40a84eeea5866a3afbac2603e970e7b files/zaptel-1.0.4-experimental-devfs26.diff 5982
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDK2svLLFUmVNQ7rkRAhLeAKDQdeUKgbUlUEhejGkFEoX5yGAOpQCg1iVM
-cRpa85ujrLm/SHciOCtvPyo=
-=0oUJ
------END PGP SIGNATURE-----
+MD5 e5a799243335f31a494bb4f90edbb9e4 files/zaptel-1.0.3-gentoo.diff 3456
+MD5 74863c2b19f217f2f23daa1cd617c4f9 files/zaptel-bristuff-0.2.0-RC7k.patch 6065
+MD5 5fe59834ed82727b3297f9e39eb855be files/zaptel-1.0.9-gentoo.diff 4855
+MD5 077231bb1ba50aedfd08476b9d4eb18b files/zaptel-1.0.9_p2-gentoo.diff 5179
diff --git a/net-misc/zaptel/files/digest-zaptel-1.0.3 b/net-misc/zaptel/files/digest-zaptel-1.0.3
deleted file mode 100644
index 9d54fa51df8c..000000000000
--- a/net-misc/zaptel/files/digest-zaptel-1.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6d6063f2181fc55ed4a240ccc1984933 zaptel-1.0.3.tar.gz 315184
diff --git a/net-misc/zaptel/files/digest-zaptel-1.0.4 b/net-misc/zaptel/files/digest-zaptel-1.0.4
deleted file mode 100644
index 7aab20d1e64e..000000000000
--- a/net-misc/zaptel/files/digest-zaptel-1.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ef189a00c823b3739cc706fe290433a2 zaptel-1.0.4.tar.gz 316205
diff --git a/net-misc/zaptel/files/digest-zaptel-1.0.6 b/net-misc/zaptel/files/digest-zaptel-1.0.6
deleted file mode 100644
index cfa408f2679f..000000000000
--- a/net-misc/zaptel/files/digest-zaptel-1.0.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4f6b2627b45537774ac1aba3c17624c6 zaptel-1.0.6.tar.gz 316568
-MD5 b07d5f949b90677a2925ba2dd50593cb bristuff-0.2.0-RC7k.tar.gz 114265
-MD5 510ab7103516fd574fd5f38db2a08c81 zaphfc_0.2.0-RC7j_florz-4.diff.gz 10204
diff --git a/net-misc/zaptel/files/digest-zaptel-1.0.7 b/net-misc/zaptel/files/digest-zaptel-1.0.7
deleted file mode 100644
index 78d43d0998b0..000000000000
--- a/net-misc/zaptel/files/digest-zaptel-1.0.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d043f54f38b6262ab3cd5599982a7032 zaptel-1.0.7.tar.gz 316693
-MD5 b07d5f949b90677a2925ba2dd50593cb bristuff-0.2.0-RC7k.tar.gz 114265
-MD5 510ab7103516fd574fd5f38db2a08c81 zaphfc_0.2.0-RC7j_florz-4.diff.gz 10204
diff --git a/net-misc/zaptel/files/digest-zaptel-1.0.9_p1 b/net-misc/zaptel/files/digest-zaptel-1.0.9_p1
deleted file mode 100644
index 5bf41cd1aaf4..000000000000
--- a/net-misc/zaptel/files/digest-zaptel-1.0.9_p1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f29205a100d2f7bede64aaf039577677 zaptel-1.0.9.1.tar.gz 326603
-MD5 1ec812a912de461b6847c64a88b70d1e bristuff-0.2.0-RC8l.tar.gz 141245
-MD5 717f869f45ec20ceda216285cd90455a zaphfc_0.2.0-RC8j_florz-8.diff.gz 10559
diff --git a/net-misc/zaptel/files/zaptel-1.0.0-experimental-devfs26.diff b/net-misc/zaptel/files/zaptel-1.0.0-experimental-devfs26.diff
deleted file mode 100644
index 1357661a5612..000000000000
--- a/net-misc/zaptel/files/zaptel-1.0.0-experimental-devfs26.diff
+++ /dev/null
@@ -1,202 +0,0 @@
---- zaptel-1.0.0/zaptel.c.orig	2004-09-11 17:48:45.000000000 +0200
-+++ zaptel-1.0.0/zaptel.c	2004-09-24 00:41:48.856014048 +0200
-@@ -143,12 +143,14 @@
- 
- /* Here are a couple important little additions for devfs */
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- static devfs_handle_t zaptel_devfs_dir;
- static devfs_handle_t channel;
- static devfs_handle_t pseudo;
- static devfs_handle_t ctl;
- static devfs_handle_t timer;
- #endif
-+#endif
- 
- /* udev necessary data structures.  Yeah! */
- #ifdef CONFIG_ZAP_UDEV
-@@ -1087,6 +1089,7 @@
- }
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- static devfs_handle_t register_devfs_channel(struct zt_chan *chan, devfs_handle_t dir)
- {
- 	char path[100];
-@@ -1129,6 +1132,28 @@
- 
- 	return chan_dev;
- }
-+#else
-+static dev_t register_devfs_channel(struct zt_chan *chan, dev_t dir)
-+{
-+	char path[100];
-+	char link[100];
-+	dev_t chan_dev;
-+	umode_t mode = S_IFCHR|S_IRUGO|S_IWUGO;
-+
-+	/* create /dev/zap/span%d/%d channel device node */
-+	if ((chan_dev = devfs_mk_cdev(MKDEV(ZT_MAJOR, chan->channo), mode, "zap/span%d/%d", dir, chan->chanpos)) < 0) {
-+                printk("zaptel: Something really bad happened.  Unable to register devfs entry\n");
-+                return 0;
-+	}
-+
-+	/* link /dev/zap/span%d/%d -> /dev/zap/%d ?!? */
-+	sprintf(path, "zap/span%d/%d", dir, chan->chanpos);
-+	sprintf(link, "zap/%d", chan->chanpos);
-+	devfs_mk_symlink(link, path);
-+
-+	return chan_dev;
-+}
-+#endif
- #endif /* CONFIG_DEVFS_FS */
- 
- static int zt_chan_reg(struct zt_chan *chan)
-@@ -4285,6 +4310,7 @@
- #endif
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	{
- 		char span_name[50];
- 		sprintf(span_name, "span%d", span->spanno);
-@@ -4294,6 +4320,15 @@
- 			chan->fhandle = register_devfs_channel(chan, chan->span->dhandle); /* Register our stuff with devfs */
- 		}
- 	}
-+#else
-+	{
-+		devfs_mk_dir("zap/span%d", span->spanno);
-+		for (x = 0; x < span->channels; x++) {
-+			struct zt_chan *chan = &span->chans[x];
-+			register_devfs_channel(chan, span->spanno); /* Register our stuff with devfs */
-+		}
-+	}
-+#endif
- #endif /* CONFIG_DEVFS_FS */
- 
- #ifdef CONFIG_ZAP_UDEV
-@@ -4341,11 +4376,22 @@
-         remove_proc_entry(tempfile, NULL);
- #endif /* CONFIG_PROC_FS */
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	for (x = 0; x < span->channels; x++) {
- 		devfs_unregister(span->chans[x].fhandle);
- 		devfs_unregister(span->chans[x].fhandle_symlink);
- 	}
- 	devfs_unregister(span->dhandle);
-+#else
-+	for (x = 0; x < span->channels; x++) {
-+		/* remove symlink first */
-+		devfs_remove("zap/span%d/%d", span->spanno, span->chans[x].chanpos);
-+		/* remove channel device */
-+		devfs_remove("zap/%d", span->chans[x].chanpos);
-+	}
-+	/* remove span dir */
-+	devfs_remove("zap/span%d", span->spanno);
-+#endif
- #endif /* CONFIG_DEVFS_FS */
- 
- #ifdef CONFIG_ZAP_UDEV
-@@ -6282,6 +6328,7 @@
- #endif /* CONFIG_ZAP_UDEV */
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	{
- 	umode_t mode = S_IFCHR|S_IRUGO|S_IWUGO;
- 	devfs_register_chrdev(ZT_MAJOR, "zaptel", &zt_fops);
-@@ -6293,6 +6340,22 @@
- 	ctl = devfs_register(zaptel_devfs_dir, "ctl", DEVFS_FL_DEFAULT, ZT_MAJOR, 0, mode, &zt_fops, NULL);
- 	}
- #else
-+	{
-+		umode_t mode = S_IFCHR|S_IRUGO|S_IWUGO;
-+		if ((res = register_chrdev(ZT_MAJOR, "zaptel", &zt_fops)) < 0) {
-+                	printk(KERN_ERR "Unable to register for device on %d, error: %d\n", ZT_MAJOR, res);
-+                	return res;
-+		}
-+
-+		devfs_mk_dir("zap");
-+
-+		devfs_mk_cdev(MKDEV(ZT_MAJOR, 253), mode, "zap/timer");
-+		devfs_mk_cdev(MKDEV(ZT_MAJOR, 254), mode, "zap/channel");
-+		devfs_mk_cdev(MKDEV(ZT_MAJOR, 255), mode, "zap/pseudo");
-+		devfs_mk_cdev(MKDEV(ZT_MAJOR, 0),   mode, "zap/ctl");
-+	}
-+#endif
-+#else
- 	if ((res = register_chrdev(ZT_MAJOR, "zaptel", &zt_fops))) {
- 		printk(KERN_ERR "Unable to register tor device on %d\n", ZT_MAJOR);
- 		return res;
-@@ -6323,6 +6386,7 @@
- 		if (tone_zones[x])
- 			kfree(tone_zones[x]);
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	devfs_unregister(timer);
- 	devfs_unregister(channel);
- 	devfs_unregister(pseudo);
-@@ -6338,6 +6402,16 @@
- 	class_simple_destroy(zap_class);
- #endif /* CONFIG_ZAP_UDEV */
- 	unregister_chrdev(ZT_MAJOR, "zaptel");
-+
-+	devfs_remove("zap/timer");
-+	devfs_remove("zap/ctl");
-+	devfs_remove("zap/pseudo");
-+	devfs_remove("zap/channel");
-+
-+	devfs_remove("zap");
-+#endif
-+#else
-+	unregister_chrdev(ZT_MAJOR, "zaptel");
- #endif
- #ifdef CONFIG_ZAPTEL_WATCHDOG
- 	watchdog_cleanup();
---- zaptel-1.0.0/zaptel.h.orig	2004-09-11 17:48:45.000000000 +0200
-+++ zaptel-1.0.0/zaptel.h	2004-09-24 00:40:26.169584296 +0200
-@@ -52,12 +52,7 @@
- #include "fasthdlc.h"
- #endif
- #ifdef CONFIG_DEVFS_FS
--#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
- #include <linux/devfs_fs_kernel.h>
--#else
--#undef CONFIG_DEVFS_FS
--//#warning "Zaptel doesn't support DEVFS in post 2.4 kernels.  Disabling DEVFS in zaptel"
--#endif
- #endif /* CONFIG_DEVFS_FS */
- #include <linux/ioctl.h>
- 
-@@ -65,6 +60,8 @@
- #define ELAST 500
- #endif
- 
-+
-+
- /* Per-span configuration values */
- #define	ZT_CONFIG_TXLEVEL	7	/* bits 0-2 are tx level */
- 
-@@ -1122,8 +1119,10 @@
- #endif
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	devfs_handle_t fhandle;  /* File handle in devfs for the channel */
- 	devfs_handle_t fhandle_symlink;
-+#endif
- #endif /* CONFIG_DEVFS_FS */
- };
- 
-@@ -1253,7 +1252,9 @@
- 	int lastalarms;		/* Previous alarms */
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	devfs_handle_t dhandle;  /* Directory name */
-+#endif
- #endif	
- 	/* If the watchdog detects no received data, it will call the
- 	   watchdog routine */
diff --git a/net-misc/zaptel/files/zaptel-1.0.3-gcc34.patch b/net-misc/zaptel/files/zaptel-1.0.3-gcc34.patch
deleted file mode 100644
index d27f7956cd25..000000000000
--- a/net-misc/zaptel/files/zaptel-1.0.3-gcc34.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -r -u -b -B zaptel-1.0.3.orig/wcfxs.c zaptel-1.0.3/wcfxs.c
---- zaptel-1.0.3.orig/wcfxs.c	2004-09-15 14:40:16.000000000 -0500
-+++ zaptel-1.0.3/wcfxs.c	2005-01-07 14:17:10.000000000 -0600
-@@ -469,9 +469,9 @@
- 	zt_receive(&wc->span);
- }
- 
--static inline void wcfxs_voicedaa_check_hook(struct wcfxs *wc, int card);
--static inline void wcfxs_proslic_check_hook(struct wcfxs *wc, int card);
--static inline void wcfxs_proslic_recheck_sanity(struct wcfxs *wc, int card);
-+static void wcfxs_voicedaa_check_hook(struct wcfxs *wc, int card);
-+static void wcfxs_proslic_check_hook(struct wcfxs *wc, int card);
-+static void wcfxs_proslic_recheck_sanity(struct wcfxs *wc, int card);
- 
- static void wcfxs_stop_dma(struct wcfxs *wc);
- static void wcfxs_reset_tdm(struct wcfxs *wc);
-
---- zaptel-1.0.3/wcfxs.c.orig	2005-01-10 19:33:37.304026336 +0000
-+++ zaptel-1.0.3/wcfxs.c	2005-01-10 19:35:11.453713408 +0000
-@@ -1356,7 +1356,7 @@
- 	return 0;
- }
- 
--static inline void wcfxs_proslic_recheck_sanity(struct wcfxs *wc, int card)
-+static void wcfxs_proslic_recheck_sanity(struct wcfxs *wc, int card)
- {
- 	int res;
- 	/* Check loopback */
-@@ -1380,7 +1380,7 @@
- 	}
- }
- 
--static inline void wcfxs_voicedaa_check_hook(struct wcfxs *wc, int card)
-+static void wcfxs_voicedaa_check_hook(struct wcfxs *wc, int card)
- {
- #ifndef AUDIO_RINGCHECK
- 	unsigned char res;
-@@ -1524,7 +1524,7 @@
- 	}
- }
- 
--static inline void wcfxs_proslic_check_hook(struct wcfxs *wc, int card)
-+static void wcfxs_proslic_check_hook(struct wcfxs *wc, int card)
- {
- 	char res;
- 	int hook;
diff --git a/net-misc/zaptel/zaptel-1.0.3.ebuild b/net-misc/zaptel/zaptel-1.0.3.ebuild
deleted file mode 100644
index 8bf23634f7fe..000000000000
--- a/net-misc/zaptel/zaptel-1.0.3.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.3.ebuild,v 1.7 2005/09/15 02:38:26 stkn Exp $
-
-IUSE="devfs26"
-
-inherit eutils kernel-mod toolchain-funcs
-
-DESCRIPTION="Pseudo-TDM engine"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="ftp://ftp.digium.com/pub/telephony/zaptel/old/zaptel-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-
-DEPEND="virtual/libc
-	virtual/linux-sources
-	>=dev-libs/newt-0.50.0"
-
-pkg_setup() {
-	einfo "Please make sure that your kernel has the appropriate"
-	einfo "ppp support enabled or present as modules before merging"
-	einfo "e.g."
-	einfo "CONFIG_PPP=m"
-	einfo "CONFIG_PPP_ASYNC=m"
-	einfo "CONFIG_PPP_DEFLATE=m"
-	einfo "CONFIG_PPPOE=m"
-	einfo "Otherwise quit this ebuild, rebuild your kernel and reboot"
-
-	# show an nice warning message about zaptel not supporting devfs on 2.6
-	if [ $(echo $KV | cut -d. -f1) -eq 2 ] && [ $(echo $KV|cut -d. -f2) -eq 6 ]; then
-		echo
-		einfo "You're using zaptel with linux-2.6:"
-		ewarn "   Zaptel doesn't support devfs with 2.6, your options:"
-		ewarn "   * use udev and disable devfs"
-		ewarn "   * use devfs and write a script that re-creates the necessary device nodes for you"
-		ewarn "   * enable the devfs26 useflag (see below)"
-		ewarn ""
-		ewarn "There's an experimental patch which adds devfs support when using linux-2.6, but:"
-		ewarn "  1. It's an ugly hack atm and needs a cleanup..."
-		ewarn "  2. I was only abled to test loding / unloading with the ztd-eth driver..."
-		ewarn "  3. I _really_ don't know if it works with real hardware..."
-		eerror "  4. And more important: This is not officially supported by Digium / the Asterisk project!!!"
-		ewarn ""
-		ewarn "If you're still interested, abort now (ctrl+c) and enable the devfs26 USE-flag"
-		einfo "Feedback and bug-reports should go to: stkn@gentoo.org"
-		ewarn "You have been warned!"
-		echo
-		einfo "Sleeping 20 Seconds..."
-		epause 20
-	else
-		echo
-		einfo "Sleeping 10 Seconds..."
-		epause 10
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# >= 1.0.3 requires new patch (-modulesd patch renamed to -gentoo)
-	epatch ${FILESDIR}/${PN}-1.0.3-gentoo.diff
-
-	# remove all from install target
-	sed -i -e "s#^\(install:\)[ \t]\+all[ \t]\+\(.*\)#\1 \2#" Makefile
-
-	# enable ztdummy...
-	sed -i -e "s:#\( ztdummy.*\):\1:" Makefile
-
-	# devfs support
-	if use devfs26; then
-		einfo "Enabling experimental devfs support for linux-2.6..."
-		epatch ${FILESDIR}/${PN}-1.0.0-experimental-devfs26.diff
-	fi
-
-	# apply patch for gcc-3.4.x if that's the compiler in use...
-	# fixes (#76707)
-	if use x86 && [[ `gcc-fullversion` = "3.4.3" ]]; then
-		epatch ${FILESDIR}/${P}-gcc34.patch
-	fi
-}
-
-src_compile() {
-	make ARCH=$(tc-arch-kernel) || die
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} install || die
-
-	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init zaptel.sysconfig
-	dodoc zaptel.conf.sample LICENSE
-
-	# additional tools
-	dobin ztmonitor ztspeed zttest
-
-	# install init script
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/zaptel.rc6 zaptel
-	insinto /etc/conf.d
-	newins ${FILESDIR}/zaptel.confd zaptel
-}
-
-pkg_postinst() {
-	if use devfs26; then
-		ewarn "*** Warning! ***"
-		ewarn "Devfs support for linux-2.6 is experimental and not"
-		ewarn "supported by digium or the asterisk project!"
-		echo
-		ewarn "Send bug-reports to: stkn@gentoo.org"
-	fi
-
-	echo
-	einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
-}
diff --git a/net-misc/zaptel/zaptel-1.0.4.ebuild b/net-misc/zaptel/zaptel-1.0.4.ebuild
deleted file mode 100644
index 5d42808dcfac..000000000000
--- a/net-misc/zaptel/zaptel-1.0.4.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.4.ebuild,v 1.8 2005/09/15 02:38:26 stkn Exp $
-
-IUSE="devfs26"
-
-inherit toolchain-funcs eutils linux-info
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="ftp://ftp.digium.com/pub/telephony/zaptel/old/zaptel-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-DEPEND="virtual/libc
-	virtual/linux-sources
-	>=dev-libs/newt-0.50.0"
-
-pkg_setup() {
-	local pause_sec=0
-	linux-info_pkg_setup
-
-	if ! linux_chkconfig_present PPP ; then
-		einfo ""
-		einfo "PPP support isn't enabled or available as a module."
-		einfo ""
-
-		einfo "If you aren't using PPP (eg. you're using voice ISDN"
-		einfo "or non-PPP data), then this is okay."
-
-		einfo "Otherwise, if you want to use PPP over your hardware"
-		einfo "please quit now and reconfigure your kernel to include"
-		einfo "CONFIG_PPP, CONFIG_PPP_ASYNC, CONFIG_PPP_DEFLATE"
-		einfo "and CONFIG_PPPOE."
-		einfo ""
-		pause_sec=10
-	fi
-
-	# show an nice warning message about zaptel not supporting devfs on 2.6
-	if kernel_is 2 6 && linux_chkconfig_present DEVFS_FS ; then
-		echo
-		einfo "You're using a 2.6 kernel with DEVFS."
-		einfo "The Zaptel drivers won't work unless you either:"
-		einfo "   * switch to udev"
-		einfo "   * write a script that re-creates the necessary device nodes for you"
-		einfo "   * enable the devfs26 useflag (see below)"
-		einfo ""
-		einfo "There's an experimental patch which adds devfs support when using linux-2.6, but:"
-		einfo "  1. It's an ugly hack atm and needs a cleanup..."
-		einfo "  2. I was only abled to test loding / unloading with the ztd-eth driver..."
-		einfo "  3. I _really_ don't know if it works with real hardware..."
-		einfo "  4. It disables udev support to avoid conflicts"
-		eerror "  5. And more important: This is not officially supported by Digium / the Asterisk project!"
-		einfo ""
-		einfo "If you're still interested, abort now (ctrl+c) and enable the devfs26 USE-flag"
-		einfo "Feedback and bug-reports should go to: stkn@gentoo.org"
-		einfo "You have been warned!"
-		echo
-		pause_sec=$(($pause_sec + 20))
-	fi
-
-	# wait once, not multiple times
-	if [[ $pause_sec -gt 0 ]]; then
-		einfo "Sleeping $pause_sec seconds"
-		epause $pause_sec
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# >= 1.0.3 requires new patch (-modulesd patch renamed to -gentoo)
-	epatch ${FILESDIR}/${PN}-1.0.3-gentoo.diff
-
-	# remove all from install target
-	sed -i -e "s#^\(install:\)[ \t]\+all[ \t]\+\(.*\)#\1 \2#" Makefile
-
-	# enable ztdummy...
-	sed -i -e "s:#\( ztdummy.*\):\1:" Makefile
-
-	# devfs support
-	if use devfs26; then
-		einfo "Enabling experimental devfs support for linux-2.6..."
-		epatch ${FILESDIR}/${PN}-1.0.4-experimental-devfs26.diff
-
-		# disable udev
-		sed -i -e "s:#define[\t ]\+\(CONFIG_ZAP_UDEV\):#undef \1:" \
-			zconfig.h
-	fi
-
-	# apply patch for gcc-3.4.x if that's the compiler in use...
-	# fixes (#76707)
-	if use x86 && [[ `gcc-fullversion` = "3.4.3" ]]; then
-		epatch ${FILESDIR}/${P}-gcc34.patch
-	fi
-}
-
-src_compile() {
-	make ARCH=$(tc-arch-kernel) || die
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} install || die
-
-	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
-	dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
-
-	# additional tools
-	dobin ztmonitor ztspeed zttest
-
-	# install init script
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/zaptel.rc6 zaptel
-	insinto /etc/conf.d
-	newins ${FILESDIR}/zaptel.confd zaptel
-}
-
-pkg_postinst() {
-	if use devfs26; then
-		ewarn "*** Warning! ***"
-		ewarn "Devfs support for linux-2.6 is experimental and not"
-		ewarn "supported by digium or the asterisk project!"
-		echo
-		ewarn "Send bug-reports to: stkn@gentoo.org"
-	fi
-
-	echo
-	einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
-	echo
-
-	# devfs26 disables udev ... so don't nag users
-	if ! use devfs26; then
-# FIXME!! Can we (we should) do this automatically
-		einfo "If you're using udev add the following to"
-		einfo "/etc/udev/rules.d/50-udev.rules (as in README.udev):"
-		einfo "# Section for zaptel device"
-		einfo "KERNEL=\"zapctl\",     NAME=\"zap/ctl\""
-		einfo "KERNEL=\"zaptimer\",   NAME=\"zap/timer\""
-		einfo "KERNEL=\"zapchannel\", NAME=\"zap/channel\""
-		einfo "KERNEL=\"zappseudo\",  NAME=\"zap/pseudo\""
-		einfo "KERNEL=\"zap[0-9]*\",  NAME=\"zap/%n\""
-	fi
-}
diff --git a/net-misc/zaptel/zaptel-1.0.6.ebuild b/net-misc/zaptel/zaptel-1.0.6.ebuild
deleted file mode 100644
index 2937195cf432..000000000000
--- a/net-misc/zaptel/zaptel-1.0.6.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.6.ebuild,v 1.10 2005/09/15 02:38:26 stkn Exp $
-
-IUSE="devfs26 bri florz"
-
-inherit toolchain-funcs eutils linux-mod
-
-BRI_VERSION="0.2.0-RC7k"
-FLORZ_VERSION="0.2.0-RC7j_florz-4"
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="ftp://ftp.digium.com/pub/telephony/zaptel/old/zaptel-${PV}.tar.gz
-	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
-	 florz? ( http://zaphfc.florz.dyndns.org/zaphfc_${FLORZ_VERSION}.diff.gz )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-DEPEND="virtual/libc
-	virtual/linux-sources
-	>=dev-libs/newt-0.50.0"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	# show an nice warning message about zaptel not supporting devfs on 2.6
-	if kernel_is 2 6 && linux_chkconfig_present DEVFS_FS ; then
-		echo
-		einfo "You're using a 2.6 kernel with DEVFS."
-		einfo "The Zaptel drivers won't work unless you either:"
-		einfo "   * switch to udev"
-		einfo "   * write a script that re-creates the necessary device nodes for you"
-		einfo "   * enable the devfs26 useflag (see below)"
-		einfo ""
-		einfo "There's an experimental patch which adds devfs support when using linux-2.6, but:"
-		einfo "  1. It's an ugly hack atm and needs a cleanup..."
-		einfo "  2. I was only abled to test loding / unloading with the ztd-eth driver..."
-		einfo "  3. I _really_ don't know if it works with real hardware..."
-		einfo "  4. It disables udev support to avoid conflicts"
-		eerror "  5. And more important: This is not officially supported by Digium / the Asterisk project!"
-		einfo ""
-		einfo "If you're still interested, abort now (ctrl+c) and enable the devfs26 USE-flag"
-		einfo "Feedback and bug-reports should go to: stkn@gentoo.org"
-		einfo "You have been warned!"
-		echo
-		einfo "Sleeping 20 Seconds..."
-		epause 20
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# >= 1.0.3 requires new patch (-modulesd patch renamed to -gentoo)
-	epatch ${FILESDIR}/${PN}-1.0.3-gentoo.diff
-
-	# remove all from install target
-	sed -i -e "s#^\(install:\)[ \t]\+all[ \t]\+\(.*\)#\1 \2#" Makefile
-
-	# enable ztdummy...
-	sed -i -e "s:#\( ztdummy.*\):\1:" Makefile
-
-	# devfs support
-	if use devfs26; then
-		einfo "Enabling experimental devfs support for linux-2.6..."
-		epatch ${FILESDIR}/${PN}-1.0.4-experimental-devfs26.diff
-
-		# disable udev
-		sed -i -e "s:#define[\t ]\+\(CONFIG_ZAP_UDEV\):#undef \1:" \
-			zconfig.h
-	fi
-
-	# apply patch for gcc-3.4.x if that's the compiler in use...
-	# fixes (#76707)
-	if use x86 && [[ `gcc-fullversion` = "3.4.3" ]]; then
-		epatch ${FILESDIR}/${PN}-1.0.4-gcc34.patch
-	fi
-
-	# try to apply bristuff patch
-	if use bri; then
-		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
-		epatch ${FILESDIR}/zaptel-bristuff-${BRI_VERSION}.patch
-
-		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-
-		if use florz; then
-			einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
-			epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-		fi
-
-		# patch includes
-		sed -i  -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \
-			qozap/qozap.c \
-			zaphfc/zaphfc.c
-
-		# 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
-
-		sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
-			zaphfc/Makefile
-	fi
-
-	# replace `uname -r` with ${KV_FULL} in all Makefiles
-	find ${WORKDIR} -iname "Makefile" -exec sed -i -e "s:\`uname -r\`:${KV_FULL}:g" {} \;
-}
-
-src_compile() {
-	# TODO: bristuff modules
-
-	make ARCH=$(tc-arch-kernel) KERNEL_SOURCE=/usr/src/linux || die
-
-	if use bri; then
-		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-		make ARCH=$(tc-arch-kernel) -C qozap || die
-		make ARCH=$(tc-arch-kernel) -C zaphfc || die
-	fi
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} install || die
-
-	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
-	dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
-
-	# additional tools
-	dobin ztmonitor ztspeed zttest
-
-	if use bri; then
-		einfo "Installing bri"
-		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-
-		insinto /lib/modules/${KV_FULL}/misc
-		doins qozap/qozap.${KV_OBJ}
-		doins zaphfc/zaphfc.${KV_OBJ}
-
-		# 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
-	fi
-
-	# install init script
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/zaptel.rc6 zaptel
-	insinto /etc/conf.d
-	newins ${FILESDIR}/zaptel.confd zaptel
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if use devfs26; then
-		ewarn "*** Warning! ***"
-		ewarn "Devfs support for linux-2.6 is experimental and not"
-		ewarn "supported by digium or the asterisk project!"
-		echo
-		ewarn "Send bug-reports to: stkn@gentoo.org"
-	fi
-
-	echo
-	einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
-	echo
-
-	# devfs26 disables udev ... so don't nag users
-	if ! use devfs26; then
-# FIXME!! Can we (we should) do this automatically
-		einfo "If you're using udev add the following to"
-		einfo "/etc/udev/rules.d/50-udev.rules (as in README.udev):"
-		einfo "# Section for zaptel device"
-		einfo "KERNEL=\"zapctl\",     NAME=\"zap/ctl\""
-		einfo "KERNEL=\"zaptimer\",   NAME=\"zap/timer\""
-		einfo "KERNEL=\"zapchannel\", NAME=\"zap/channel\""
-		einfo "KERNEL=\"zappseudo\",  NAME=\"zap/pseudo\""
-		einfo "KERNEL=\"zap[0-9]*\",  NAME=\"zap/%n\""
-		echo
-	fi
-
-	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
-}
diff --git a/net-misc/zaptel/zaptel-1.0.7.ebuild b/net-misc/zaptel/zaptel-1.0.7.ebuild
deleted file mode 100644
index e4cde2b412dc..000000000000
--- a/net-misc/zaptel/zaptel-1.0.7.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.7.ebuild,v 1.6 2005/09/15 02:38:26 stkn Exp $
-
-IUSE="devfs26 bri florz"
-
-inherit toolchain-funcs eutils linux-mod
-
-BRI_VERSION="0.2.0-RC7k"
-FLORZ_VERSION="0.2.0-RC7j_florz-4"
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="ftp://ftp.digium.com/pub/telephony/zaptel/old/zaptel-${PV}.tar.gz
-	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
-	 florz? ( http://zaphfc.florz.dyndns.org/zaphfc_${FLORZ_VERSION}.diff.gz )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-DEPEND="virtual/libc
-	virtual/linux-sources
-	>=dev-libs/newt-0.50.0"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	# show an nice warning message about zaptel not supporting devfs on 2.6
-	if kernel_is 2 6 && linux_chkconfig_present DEVFS_FS ; then
-		echo
-		einfo "You're using a 2.6 kernel with DEVFS."
-		einfo "The Zaptel drivers won't work unless you either:"
-		einfo "   * switch to udev"
-		einfo "   * write a script that re-creates the necessary device nodes for you"
-		einfo "   * enable the devfs26 useflag (see below)"
-		einfo ""
-		einfo "There's an experimental patch which adds devfs support when using linux-2.6, but:"
-		einfo "  1. It's an ugly hack atm and needs a cleanup..."
-		einfo "  2. I was only abled to test loding / unloading with the ztd-eth driver..."
-		einfo "  3. I _really_ don't know if it works with real hardware..."
-		einfo "  4. It disables udev support to avoid conflicts"
-		eerror "  5. And more important: This is not officially supported by Digium / the Asterisk project!"
-		einfo ""
-		einfo "If you're still interested, abort now (ctrl+c) and enable the devfs26 USE-flag"
-		einfo "Feedback and bug-reports should go to: stkn@gentoo.org"
-		einfo "You have been warned!"
-		echo
-		einfo "Sleeping 20 Seconds..."
-		epause 20
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# >= 1.0.7 requires new patch (-modulesd patch renamed to -gentoo)
-	epatch ${FILESDIR}/${PN}-1.0.7-gentoo.diff
-
-	# devfs support
-	if use devfs26; then
-		einfo "Enabling experimental devfs support for linux-2.6..."
-		epatch ${FILESDIR}/${PN}-1.0.4-experimental-devfs26.diff
-
-		# disable udev
-		sed -i -e "s:#define[\t ]\+\(CONFIG_ZAP_UDEV\):#undef \1:" \
-			zconfig.h
-	fi
-
-	# apply patch for gcc-3.4.x if that's the compiler in use...
-	# fixes (#76707)
-	if use x86 && [[ `gcc-fullversion` = "3.4.3" ]]; then
-		epatch ${FILESDIR}/${PN}-1.0.4-gcc34.patch
-	fi
-
-	# try to apply bristuff patch
-	if use bri; then
-		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
-		epatch ${FILESDIR}/zaptel-bristuff-${BRI_VERSION}.patch
-
-		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-
-		if use florz; then
-			einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
-			epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-		fi
-
-		# patch includes
-		sed -i  -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \
-			qozap/qozap.c \
-			zaphfc/zaphfc.c
-
-		# 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
-
-		sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
-			zaphfc/Makefile
-	fi
-
-	# replace `uname -r` with ${KV_FULL} in all Makefiles
-	find ${WORKDIR} -iname "Makefile" -exec sed -i -e "s:\`uname -r\`:${KV_FULL}:g" {} \;
-}
-
-src_compile() {
-	# TODO: bristuff modules
-
-	make ARCH=$(tc-arch-kernel) KERNEL_SOURCE=/usr/src/linux || die
-
-	if use bri; then
-		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-		make ARCH=$(tc-arch-kernel) -C qozap || die
-		make ARCH=$(tc-arch-kernel) -C zaphfc || die
-	fi
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} install || die
-
-	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
-	dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
-
-	# additional tools
-	dobin ztmonitor ztspeed zttest
-
-	if use bri; then
-		einfo "Installing bri"
-		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-
-		insinto /lib/modules/${KV_FULL}/misc
-		doins qozap/qozap.${KV_OBJ}
-		doins zaphfc/zaphfc.${KV_OBJ}
-
-		# 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
-	fi
-
-	# install init script
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/zaptel.rc6 zaptel
-	insinto /etc/conf.d
-	newins ${FILESDIR}/zaptel.confd zaptel
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if use devfs26; then
-		ewarn "*** Warning! ***"
-		ewarn "Devfs support for linux-2.6 is experimental and not"
-		ewarn "supported by digium or the asterisk project!"
-		echo
-		ewarn "Send bug-reports to: stkn@gentoo.org"
-	fi
-
-	echo
-	einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
-	echo
-
-	# devfs26 disables udev ... so don't nag users
-	if ! use devfs26; then
-# FIXME!! Can we (we should) do this automatically
-		einfo "If you're using udev add the following to"
-		einfo "/etc/udev/rules.d/50-udev.rules (as in README.udev):"
-		einfo "# Section for zaptel device"
-		einfo "KERNEL=\"zapctl\",     NAME=\"zap/ctl\""
-		einfo "KERNEL=\"zaptimer\",   NAME=\"zap/timer\""
-		einfo "KERNEL=\"zapchannel\", NAME=\"zap/channel\""
-		einfo "KERNEL=\"zappseudo\",  NAME=\"zap/pseudo\""
-		einfo "KERNEL=\"zap[0-9]*\",  NAME=\"zap/%n\""
-		echo
-	fi
-
-	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
-}
diff --git a/net-misc/zaptel/zaptel-1.0.9_p1.ebuild b/net-misc/zaptel/zaptel-1.0.9_p1.ebuild
deleted file mode 100644
index f3b2acb1a7aa..000000000000
--- a/net-misc/zaptel/zaptel-1.0.9_p1.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.9_p1.ebuild,v 1.3 2005/09/15 02:38:26 stkn Exp $
-
-IUSE="devfs26 bri florz rtc"
-
-inherit toolchain-funcs eutils linux-mod
-
-BRI_VERSION="0.2.0-RC8l"
-FLORZ_VERSION="0.2.0-RC8j_florz-8"
-
-MY_PV="${PV/_p/.}"
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="ftp://ftp.digium.com/pub/telephony/zaptel/old/zaptel-${MY_PV}.tar.gz
-	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
-	 florz? ( http://zaphfc.florz.dyndns.org/zaphfc_${FLORZ_VERSION}.diff.gz )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-DEPEND="virtual/libc
-	virtual/linux-sources
-	>=dev-libs/newt-0.50.0"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	# show an nice warning message about zaptel not supporting devfs on 2.6
-	if kernel_is 2 6 && linux_chkconfig_present DEVFS_FS ; then
-		echo
-		einfo "You're using a 2.6 kernel with DEVFS."
-		einfo "The Zaptel drivers won't work unless you either:"
-		einfo "   * switch to udev"
-		einfo "   * write a script that re-creates the necessary device nodes for you"
-		einfo "   * enable the devfs26 useflag (see below)"
-		einfo ""
-		einfo "There's an experimental patch which adds devfs support when using linux-2.6, but:"
-		einfo "   1. It disables udev support to avoid conflicts"
-		ewarn "   2. It is not supported by Digium / the Asterisk project!"
-		einfo ""
-		einfo "If you're still interested, abort now (ctrl+c) and enable the devfs26 USE-flag"
-		einfo "Feedback and bug-reports should go to: stkn@gentoo.org"
-		einfo "You have been warned!"
-		echo
-		einfo "Sleeping 20 Seconds..."
-		epause 20
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# patch makefile(s) for gentoo
-	epatch ${FILESDIR}/${PN}-1.0.9-gentoo.diff
-
-	# devfs support
-	if use devfs26; then
-		einfo "Enabling experimental devfs support for linux-2.6..."
-		epatch ${FILESDIR}/${PN}-1.0.4-experimental-devfs26.diff
-
-		# disable udev
-		sed -i -e "s:#define[\t ]\+\(CONFIG_ZAP_UDEV\):#undef \1:" \
-			zconfig.h
-	fi
-
-	# apply patch for gcc-3.4.x if that's the compiler in use...
-	# fixes (#76707)
-	if use x86 && [[ `gcc-fullversion` = "3.4.3" ]]; then
-		epatch ${FILESDIR}/${PN}-1.0.4-gcc34.patch
-	fi
-
-	# try to apply bristuff patch
-	if use bri; then
-		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
-		epatch ${FILESDIR}/zaptel-bristuff-${BRI_VERSION}.patch
-
-		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-
-		if use florz; then
-			einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
-
-			epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-		fi
-
-		# patch includes
-		sed -i  -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \
-			qozap/qozap.c \
-			zaphfc/zaphfc.c \
-			cwain/cwain.c
-
-		# patch makefiles
-		sed -i  -e "s:^ZAP[\t ]*=.*:ZAP=-I${S}:" \
-			-e "s:^MODCONF=.*:MODCONF=/etc/modules.d/zaptel:" \
-			-e "s:linux-2.6:linux:g" \
-			qozap/Makefile \
-			zaphfc/Makefile \
-			cwain/Makefile
-
-		sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
-			zaphfc/Makefile
-	fi
-
-	# replace `uname -r` with ${KV_FULL} in all Makefiles
-	find ${WORKDIR} -iname "Makefile" -exec sed -i -e "s:\`uname -r\`:${KV_FULL}:g" {} \;
-
-	cd ${S}
-	#######################################################################
-	# apply other patches here,
-	# make sure they work with things that have been added before!
-	#
-
-	# apply x86 rtc patch for ztdummy (http://bugs.digium.com/view.php?id=4301)
-	# this won't have any effect on non-x86 systems...
-	if use rtc; then
-		if use x86 || use amd64; then
-			epatch ${FILESDIR}/${PN}-1.0.9-rtc.patch
-		else
-			ewarn "RTC is unsupported on your arch, skipping patch"
-		fi
-	fi
-}
-
-src_compile() {
-	make ARCH=$(tc-arch-kernel) KERNEL_SOURCE=/usr/src/linux || die
-
-	if use bri; then
-		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-		make ARCH=$(tc-arch-kernel) -C qozap  || die
-		make ARCH=$(tc-arch-kernel) -C zaphfc || die
-		make ARCH=$(tc-arch-kernel) -C cwain  || die
-	fi
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} install || die
-
-	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
-	dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
-
-	# additional tools
-	dobin ztmonitor ztspeed zttest
-
-	if use bri; then
-		einfo "Installing bri"
-		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-
-		insinto /lib/modules/${KV_FULL}/misc
-		doins qozap/qozap.${KV_OBJ}
-		doins zaphfc/zaphfc.${KV_OBJ}
-		doins cwain/cwain.${KV_OBJ}
-
-		# install example configs for octoBRI and quadBRI
-		insinto /etc
-		doins qozap/zaptel.conf.octoBRI
-		newins qozap/zaptel.conf zaptel.conf.quadBRI
-		newins zaphfc/zaptel.conf zaptel.conf.zaphfc
-
-		insinto /etc/asterisk
-		doins qozap/zapata.conf.octoBRI
-		newins qozap/zapata.conf zapata.conf.quadBRI
-		newins zaphfc/zapata.conf zapata.conf.zaphfc
-
-		docinto bristuff
-		dodoc CHANGES INSTALL
-
-		docinto bristuff/qozap
-		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
-
-		docinto bristuff/zaphfc
-		dodoc zaphfc/LICENSE zaphfc/*.conf
-
-		docinto bristuff/cwain
-		dodoc cwain/TODO cwain/LICENSE
-	fi
-
-	# install init script
-	newinitd ${FILESDIR}/zaptel.rc6 zaptel
-	newconfd ${FILESDIR}/zaptel.confd zaptel
-
-	# install devfsd rule file
-	insinto /etc/devfs.d
-	newins ${FILESDIR}/zaptel.devfsd zaptel
-
-	# install udev rule file
-	insinto /etc/udev/rules.d
-	newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${D}/dev/zap ]]; then
-		chown -R root:dialout	${D}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
-	fi
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if use devfs26; then
-		ewarn "*** Warning! ***"
-		ewarn "Devfs support for linux-2.6 is experimental and not"
-		ewarn "supported by digium or the asterisk project!"
-		echo
-		ewarn "Send bug-reports to: stkn@gentoo.org"
-	fi
-
-	echo
-	einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
-	echo
-
-	if use bri; then
-		einfo "Bristuff configs have been merged as:"
-		einfo ""
-		einfo "${ROOT}etc/"
-		einfo "    zaptel.conf.zaphfc"
-		einfo "    zaptel.conf.quadBRI"
-		einfo "    zaptel.conf.octoBRI"
-		einfo ""
-		einfo "${ROOT}etc/asterisk/"
-		einfo "    zapata.conf.zaphfc"
-		einfo "    zapata.conf.quadBRI"
-		einfo "    zapata.conf.octoBRI"
-		echo
-	fi
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${ROOT}/dev/zap ]]; then
-		chown -R root:dialout	${ROOT}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${ROOT}/dev/zap
-	fi
-}