Removed old 1.0.x versions.

(Portage version: 2.0.53)

11 files changed, 8 insertions, 1057 deletions

diff --git a/net-misc/zaptel/ChangeLog b/net-misc/zaptel/ChangeLog
index a9564dd0fe83..161cac6a079e 100644
--- a/net-misc/zaptel/ChangeLog
+++ b/net-misc/zaptel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/zaptel
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.70 2006/02/02 01:14:58 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.71 2006/02/28 02:20:53 stkn Exp $
+
+  28 Feb 2006; Stefan Knoblich <stkn@gentoo.org>
+  -files/zaptel-bristuff-0.2.0-RC7k.patch,
+  -files/zaptel-bristuff-0.2.0-RC8l.patch, -files/zaptel-1.0.3-gentoo.diff,
+  -zaptel-1.0.4-r1.ebuild, -zaptel-1.0.6-r1.ebuild,
+  -zaptel-1.0.9_p1-r1.ebuild:
+  Removed old 1.0.x versions.
 
 *zaptel-1.2.3 (02 Feb 2006)
 
diff --git a/net-misc/zaptel/Manifest b/net-misc/zaptel/Manifest
index 48ca3ab6cd5f..a5e42f844660 100644
--- a/net-misc/zaptel/Manifest
+++ b/net-misc/zaptel/Manifest
@@ -1,10 +1,7 @@
 MD5 a891adbf8ee71bf54379a8cd50171f74 ChangeLog 13205
 MD5 5d92c84f7e556e1552efc5531483a727 files/digest-zaptel-1.0.10 136
-MD5 051e2ff3f1222e2b551a70e9cd1b31f0 files/digest-zaptel-1.0.4-r1 64
-MD5 0c81001d4c9efeeffeb1332580fb4cdc files/digest-zaptel-1.0.6-r1 212
 MD5 9be11ef13f32ceaffef87920fe47a93e files/digest-zaptel-1.0.7-r1 212
 MD5 f46e4409c0bb701f8a6214e793de72a2 files/digest-zaptel-1.0.8 212
-MD5 3a4f554056143ac54f033cc3356821b5 files/digest-zaptel-1.0.9_p1-r1 214
 MD5 69d0c3831715ccac6422b13a99fc6557 files/digest-zaptel-1.0.9_p2 214
 MD5 f574df759efe80013bc3e7fa04d95232 files/digest-zaptel-1.2.0 136
 MD5 a43d347e67130e0ab4f15e17b34c8ba0 files/digest-zaptel-1.2.1 216
@@ -12,7 +9,6 @@ MD5 cd2c0020b56060f6ba55d0b9a2d04a00 files/digest-zaptel-1.2.3 217
 MD5 24ffa9ff867ef807083a53f61465fe02 files/zaptel-1.0.10-devfs26.diff 6026
 MD5 64804093a66dad967c34de55d3f0633a files/zaptel-1.0.10-gentoo.diff 5489
 MD5 699723eb0b0ad059702af4fc4de7bf95 files/zaptel-1.0.10-ukcid.patch 3787
-MD5 e5a799243335f31a494bb4f90edbb9e4 files/zaptel-1.0.3-gentoo.diff 3456
 MD5 d40a84eeea5866a3afbac2603e970e7b files/zaptel-1.0.4-experimental-devfs26.diff 5982
 MD5 090668aabb8e77cfd0d83835f52bd105 files/zaptel-1.0.4-gcc34.patch 821
 MD5 8471d7eb15aebff9c72f67861cb1ad88 files/zaptel-1.0.7-gentoo.diff 4459
@@ -25,10 +21,8 @@ MD5 e6c7407f2478a1836a087eec78ecd69d files/zaptel-1.2.0-gentoo.diff 4626
 MD5 699723eb0b0ad059702af4fc4de7bf95 files/zaptel-1.2.0-ukcid.patch 3787
 MD5 bc9d66166d440e69b69286ef26b4c52d files/zaptel-1.2.1-gentoo.diff 4756
 MD5 51c21f33dde21f00000ccf671ac0ebff files/zaptel-1.2.2-gentoo.diff 7740
-MD5 74863c2b19f217f2f23daa1cd617c4f9 files/zaptel-bristuff-0.2.0-RC7k.patch 6065
 MD5 cce31b4380f9c62e91293dff1523d5e0 files/zaptel-bristuff-0.2.0-RC8g.patch 5551
 MD5 d893c36bffff825ab0e6d48e1ad0acea files/zaptel-bristuff-0.2.0-RC8h.patch 6064
-MD5 f06df1defd75000b5fdfa7f81b4ef78b files/zaptel-bristuff-0.2.0-RC8l.patch 5551
 MD5 f5d81a19c52c5e88fefed12251674134 files/zaptel-bristuff-0.2.0-RC8n.patch 6064
 MD5 5ebdd425fca1594698e4f21e44c5e055 files/zaptel-bristuff-0.2.0-RC8q.patch 6080
 MD5 fae1145da422b8838c2a6ac3405dc4c4 files/zaptel.confd 371
@@ -37,11 +31,8 @@ MD5 a1ef57fe463da11030f2e18d87535466 files/zaptel.rc6 972
 MD5 3bff3fd5d8dc52513ceeac546e1e11bf files/zaptel.udevd 358
 MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
 MD5 a937510da057c2f6c0ab67872b1086fe zaptel-1.0.10.ebuild 6955
-MD5 1ab383ffeab849e778401125f478fc6d zaptel-1.0.4-r1.ebuild 4417
-MD5 ac774e9b1e15c4e3060c325560be97d3 zaptel-1.0.6-r1.ebuild 6217
 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 f0c8a8a514efa543a36618d72d4ade3d zaptel-1.0.9_p2.ebuild 6641
 MD5 a170d2a6dba63bc4de86eb9766c8d8f3 zaptel-1.2.0.ebuild 9102
 MD5 5f7d588d0581d344b87cc078bf54af1f zaptel-1.2.1.ebuild 9125
diff --git a/net-misc/zaptel/files/digest-zaptel-1.0.4-r1 b/net-misc/zaptel/files/digest-zaptel-1.0.4-r1
deleted file mode 100644
index 7aab20d1e64e..000000000000
--- a/net-misc/zaptel/files/digest-zaptel-1.0.4-r1
+++ /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-r1 b/net-misc/zaptel/files/digest-zaptel-1.0.6-r1
deleted file mode 100644
index cfa408f2679f..000000000000
--- a/net-misc/zaptel/files/digest-zaptel-1.0.6-r1
+++ /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.9_p1-r1 b/net-misc/zaptel/files/digest-zaptel-1.0.9_p1-r1
deleted file mode 100644
index 5d8fadf6e0c4..000000000000
--- a/net-misc/zaptel/files/digest-zaptel-1.0.9_p1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f29205a100d2f7bede64aaf039577677 zaptel-1.0.9.1.tar.gz 326603
-MD5 a6b5c61c16b35f02c616c8abadb9999d bristuff-0.2.0-RC8n.tar.gz 143979
-MD5 717f869f45ec20ceda216285cd90455a zaphfc_0.2.0-RC8j_florz-8.diff.gz 10559
diff --git a/net-misc/zaptel/files/zaptel-1.0.3-gentoo.diff b/net-misc/zaptel/files/zaptel-1.0.3-gentoo.diff
deleted file mode 100644
index ef124759c3e1..000000000000
--- a/net-misc/zaptel/files/zaptel-1.0.3-gentoo.diff
+++ /dev/null
@@ -1,65 +0,0 @@
---- zaptel-1.0.3/Makefile.orig	2004-12-19 00:45:36.697309064 +0100
-+++ zaptel-1.0.3/Makefile	2004-12-19 00:48:07.578371656 +0100
-@@ -19,7 +19,7 @@
- CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
- CFLAGS+=$(shell if uname -m | grep -q x86_64; then echo "-m64"; fi)
- LCFLAGS=-fPIC $(CFLAGS) -DBUILDING_TONEZONE
--KFLAGS+=-I/usr/src/linux-2.4/include -O6
-+KFLAGS+=-I/usr/src/linux/include -O6
- KFLAGS+=-DMODULE -D__KERNEL__ -DEXPORT_SYMTAB -I/usr/src/linux/drivers/net \
- 	-Wall -I. -Wstrict-prototypes -fomit-frame-pointer -I/usr/src/linux/drivers/net/wan -I /usr/src/linux/include -I/usr/src/linux/include/net
- KFLAGS+=$(shell [ -f $(KINCLUDES)/linux/modversions.h ] && echo "-DMODVERSIONS -include $(KINCLUDES)/linux/modversions.h")
-@@ -39,7 +39,8 @@
- CFLAGS+=-DZAPTEL_CONFIG=\"$(CONFIG_FILE)\"
- 
- BUILDVER=$(shell if uname -r | grep -q ^2.6; then echo "linux26"; else echo "linux24"; fi)
--MODCONF=$(shell if [ -d $(ROOT_PREFIX)/etc/modprobe.d ]; then echo "$(ROOT_PREFIX)/etc/modprobe.d/zaptel"; elif [ -d $(ROOT_PREFIX)/etc/modutils ]; then echo "$(ROOT_PREFIX)/etc/modutils/zaptel"; elif [ -f $(ROOT_PREFIX)/etc/modprobe.conf ]; then echo "$(ROOT_PREFIX)/etc/modprobe.conf"; elif [ -f $(ROOT_PREFIX)/etc/modules.conf ]; then echo "$(ROOT_PREFIX)/etc/modules.conf"; else echo $(ROOT_PREFIX)/etc/conf.modules ; fi)
-+# Gentoo uses /etc/modules.d/zaptel
-+MODCONF=$(INSTALL_PREFIX)/etc/modules.d/zaptel
- 
- ifeq (${BUILDVER},linux24)
- #We only support DEVFS in linux 2.4 kernels, since its considered obsolete post 2.4
-@@ -286,7 +287,7 @@
- 	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
- 	( cd $(INSTALL_PREFIX)/usr/lib ; rm -f libtonezone.so ; ln -sf $(LIBTONEZONE) libtonezone.so )
--	[ `id -u` = 0 ] && /sbin/ldconfig || :
-+	if [ ! -d `dirname $(MODCONF)` ]; then install -d -m 755 `dirname $(MODCONF)` ; fi
- 	if [ -f $(MODCONF) ]; then mv -f $(MODCONF) $(MODCONF).bak ; fi
- 	cat $(MODCONF).bak | grep -v "alias char-major-250" | \
- 	grep -v "post-install torisa /sbin/ztcfg" | \
-@@ -298,23 +299,7 @@
- 	if ! grep "alias char-major-196" $(MODCONF); then \
- 		echo "alias char-major-196 $(PRIMARY)" >> $(MODCONF); \
- 	fi
--		
--	for x in $(MODULES); do \
--		if ! grep "post-install $$x" $(MODCONF); then \
--			if ! grep "install $$x " $(MODCONF); then \
--				if [ "$$x" != "zaptel" ] ; then \
--					if [ -f zaptel.ko ]; then echo "install $$x /sbin/modprobe --ignore-install $$x && /sbin/ztcfg" >> $(MODCONF); \
--					else echo "post-install $$x /sbin/ztcfg" >> $(MODCONF); \
--					fi; \
--				fi; \
--			fi; \
--		fi; \
--	done
- 
--	if [ -d /etc/modutils ]; then \
--		/sbin/update-modules ; \
--	fi
--	[ `id -u` = 0 ] && /sbin/depmod -a || :
- 	[ -f $(CONFIG_FILE) ] || install -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
- 
- config:
---- zaptel-1.0.3/Makefile.orig	2004-12-19 00:58:31.599506024 +0100
-+++ zaptel-1.0.3/Makefile	2004-12-19 01:00:45.109209464 +0100
-@@ -15,7 +15,7 @@
- HOSTCC=gcc
- KINCLUDES=$(shell if [ -d /usr/src/linux-2.4/include ]; then echo /usr/src/linux-2.4/include ; else echo /usr/src/linux/include ; fi)
- 
--CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
-+CFLAGS+=-I. -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
- CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
- CFLAGS+=$(shell if uname -m | grep -q x86_64; then echo "-m64"; fi)
- LCFLAGS=-fPIC $(CFLAGS) -DBUILDING_TONEZONE
diff --git a/net-misc/zaptel/files/zaptel-bristuff-0.2.0-RC7k.patch b/net-misc/zaptel/files/zaptel-bristuff-0.2.0-RC7k.patch
deleted file mode 100644
index b622ba8f19e9..000000000000
--- a/net-misc/zaptel/files/zaptel-bristuff-0.2.0-RC7k.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-diff -ur zaptel-1.0.6.orig/Makefile zaptel-1.0.6/Makefile
---- zaptel-1.0.6.orig/Makefile	2005-02-07 05:20:33.000000000 +0100
-+++ zaptel-1.0.6/Makefile	2005-02-28 10:58:47.381479600 +0100
-@@ -334,7 +334,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
-@@ -342,3 +342,4 @@
- 	rm -f libtonezone*
- 	rm -f tor2ee
- 	rm -f core
-+	rm -rf .tmp_versions
-diff -ur zaptel-1.0.6.orig/zaptel.c zaptel-1.0.6/zaptel.c
---- zaptel-1.0.6.orig/zaptel.c	2005-01-17 02:58:09.000000000 +0100
-+++ zaptel-1.0.6/zaptel.c	2005-02-28 10:58:47.389478384 +0100
-@@ -4775,11 +4775,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]) {
-@@ -4824,6 +4853,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));
-@@ -4834,7 +4874,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)
-@@ -4872,8 +4912,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;
-@@ -5533,6 +5582,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)
-@@ -5591,6 +5647,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.6.orig/zaptel.h zaptel-1.0.6/zaptel.h
---- zaptel-1.0.6.orig/zaptel.h	2004-09-27 21:50:03.000000000 +0200
-+++ zaptel-1.0.6/zaptel.h	2005-02-28 10:58:47.392477928 +0100
-@@ -932,6 +932,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 */
-@@ -1006,7 +1013,7 @@
- 	int		txbufpolicy;			/* Buffer policy */
- 	int		rxbufpolicy;			/* Buffer policy */
- 	int		txdisable;				/* Disable transmitter */
--	int 	rxdisable;				/* Disable receiver */
-+	int 		rxdisable;				/* Disable receiver */
- 	
- 	
- 	/* Tone zone stuff */
-@@ -1169,6 +1176,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.6.orig/zconfig.h zaptel-1.0.6/zconfig.h
---- zaptel-1.0.6.orig/zconfig.h	2005-01-02 01:19:57.000000000 +0100
-+++ zaptel-1.0.6/zconfig.h	2005-02-28 10:58:47.393477776 +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/files/zaptel-bristuff-0.2.0-RC8l.patch b/net-misc/zaptel/files/zaptel-bristuff-0.2.0-RC8l.patch
deleted file mode 100644
index 3b2037261d5c..000000000000
--- a/net-misc/zaptel/files/zaptel-bristuff-0.2.0-RC8l.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-diff -ur zaptel-1.0.9.orig/zaptel.c zaptel-1.0.9/zaptel.c
---- zaptel-1.0.9.orig/zaptel.c	2005-06-15 23:31:22.000000000 +0200
-+++ zaptel-1.0.9/zaptel.c	2005-07-03 13:36:31.000000000 +0200
-@@ -4851,11 +4851,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]) {
-@@ -4900,6 +4929,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));
-@@ -4910,7 +4950,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)
-@@ -4948,8 +4988,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;
-@@ -5648,6 +5697,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)
-@@ -5706,6 +5762,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.9.orig/zaptel.h zaptel-1.0.9/zaptel.h
---- zaptel-1.0.9.orig/zaptel.h	2005-06-15 23:31:22.000000000 +0200
-+++ zaptel-1.0.9/zaptel.h	2005-07-03 13:36:31.000000000 +0200
-@@ -956,6 +956,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 */
-@@ -1030,7 +1037,7 @@
- 	int		txbufpolicy;			/* Buffer policy */
- 	int		rxbufpolicy;			/* Buffer policy */
- 	int		txdisable;				/* Disable transmitter */
--	int 	rxdisable;				/* Disable receiver */
-+	int 		rxdisable;				/* Disable receiver */
- 	
- 	
- 	/* Tone zone stuff */
-@@ -1193,6 +1200,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.9.orig/zconfig.h zaptel-1.0.9/zconfig.h
---- zaptel-1.0.9.orig/zconfig.h	2005-01-02 01:19:57.000000000 +0100
-+++ zaptel-1.0.9/zconfig.h	2005-07-03 13:36:31.000000000 +0200
-@@ -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.0.4-r1.ebuild b/net-misc/zaptel/zaptel-1.0.4-r1.ebuild
deleted file mode 100644
index 6e79bc5739d2..000000000000
--- a/net-misc/zaptel/zaptel-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,150 +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-r1.ebuild,v 1.4 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
-	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() {
-	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!"
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${ROOT}/dev/zap ]]; then
-		chown -R root:dialout   ${ROOT}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${ROOT}/dev/zap
-	fi
-}
diff --git a/net-misc/zaptel/zaptel-1.0.6-r1.ebuild b/net-misc/zaptel/zaptel-1.0.6-r1.ebuild
deleted file mode 100644
index 886da3862bb9..000000000000
--- a/net-misc/zaptel/zaptel-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,219 +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-r1.ebuild,v 1.5 2005/09/15 02:38:26 stkn Exp $
-
-IUSE="devfs26 bri florz"
-
-inherit toolchain-funcs eutils linux-mod
-
-BRI_VERSION="0.2.0-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
-	newinitd ${FILESDIR}/zaptel.rc6 zaptel
-	newconfd ${FILESDIR}/zaptel.confd zaptel
-
-	# install devfsd rule file
-	insinto /etc/devfs.d
-	newins ${FILESDIR}/zaptel.devfsd zaptel
-
-	# install udev rule file
-	insinto /etc/udev/rules.d
-	newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${D}/dev/zap ]]; then
-		chown -R root:dialout   ${D}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
-	fi
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if use devfs26; then
-		ewarn "*** Warning! ***"
-		ewarn "Devfs support for linux-2.6 is experimental and not"
-		ewarn "supported by digium or the asterisk project!"
-		echo
-		ewarn "Send bug-reports to: stkn@gentoo.org"
-	fi
-
-	echo
-	einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
-	echo
-
-	if use bri; then
-		einfo "Bristuff configs have been merged as:"
-		einfo ""
-		einfo "${ROOT}etc/"
-		einfo "    zaptel.conf.zaphfc"
-		einfo "    zaptel.conf.quadBRI"
-		einfo "    zaptel.conf.octoBRI"
-		einfo ""
-		einfo "${ROOT}etc/asterisk/"
-		einfo "    zapata.conf.zaphfc"
-		einfo "    zapata.conf.quadBRI"
-		einfo "    zapata.conf.octoBRI"
-		echo
-	fi
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${ROOT}/dev/zap ]]; then
-		chown -R root:dialout   ${ROOT}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${ROOT}/dev/zap
-	fi
-}
diff --git a/net-misc/zaptel/zaptel-1.0.9_p1-r1.ebuild b/net-misc/zaptel/zaptel-1.0.9_p1-r1.ebuild
deleted file mode 100644
index de93f2c112f9..000000000000
--- a/net-misc/zaptel/zaptel-1.0.9_p1-r1.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.9_p1-r1.ebuild,v 1.2 2005/09/15 02:38:26 stkn Exp $
-
-IUSE="devfs26 bri florz rtc"
-
-inherit toolchain-funcs eutils linux-mod
-
-BRI_VERSION="0.2.0-RC8n"
-FLORZ_VERSION="0.2.0-RC8j_florz-8"
-
-MY_PV="${PV/_p/.}"
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="ftp://ftp.digium.com/pub/telephony/zaptel/old/zaptel-${MY_PV}.tar.gz
-	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
-	 florz? ( http://zaphfc.florz.dyndns.org/zaphfc_${FLORZ_VERSION}.diff.gz )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-DEPEND="virtual/libc
-	virtual/linux-sources
-	>=dev-libs/newt-0.50.0"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	# show an nice warning message about zaptel not supporting devfs on 2.6
-	if kernel_is 2 6 && linux_chkconfig_present DEVFS_FS ; then
-		echo
-		einfo "You're using a 2.6 kernel with DEVFS."
-		einfo "The Zaptel drivers won't work unless you either:"
-		einfo "   * switch to udev"
-		einfo "   * write a script that re-creates the necessary device nodes for you"
-		einfo "   * enable the devfs26 useflag (see below)"
-		einfo ""
-		einfo "There's an experimental patch which adds devfs support when using linux-2.6, but:"
-		einfo "   1. It disables udev support to avoid conflicts"
-		ewarn "   2. It is not supported by Digium / the Asterisk project!"
-		einfo ""
-		einfo "If you're still interested, abort now (ctrl+c) and enable the devfs26 USE-flag"
-		einfo "Feedback and bug-reports should go to: stkn@gentoo.org"
-		einfo "You have been warned!"
-		echo
-		einfo "Sleeping 20 Seconds..."
-		epause 20
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# patch makefile(s) for gentoo
-	epatch ${FILESDIR}/${PN}-1.0.9-gentoo.diff
-
-	# devfs support
-	if use devfs26; then
-		einfo "Enabling experimental devfs support for linux-2.6..."
-		epatch ${FILESDIR}/${PN}-1.0.4-experimental-devfs26.diff
-
-		# disable udev
-		sed -i -e "s:#define[\t ]\+\(CONFIG_ZAP_UDEV\):#undef \1:" \
-			zconfig.h
-
-		# fix Makefile to not create device nodes for
-		# devfs enabled 2.6 kernels
-		sed -i -e 's:grep udevd:grep -q \"udevd\\|devfsd\":' \
-			Makefile || die "QA error: No substitution performed"
-	fi
-
-	# apply patch for gcc-3.4.x if that's the compiler in use...
-	# fixes (#76707)
-	if use x86 && [[ `gcc-fullversion` = "3.4.3" ]]; then
-		epatch ${FILESDIR}/${PN}-1.0.4-gcc34.patch
-	fi
-
-	# try to apply bristuff patch
-	if use bri; then
-		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
-		epatch ${FILESDIR}/zaptel-bristuff-${BRI_VERSION}.patch
-
-		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-
-		if use florz; then
-			einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
-
-			epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-		fi
-
-		# patch includes
-		sed -i  -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \
-			qozap/qozap.c \
-			zaphfc/zaphfc.c \
-			cwain/cwain.c
-
-		# patch makefiles
-		sed -i  -e "s:^ZAP[\t ]*=.*:ZAP=-I${S}:" \
-			-e "s:^MODCONF=.*:MODCONF=/etc/modules.d/zaptel:" \
-			-e "s:linux-2.6:linux:g" \
-			qozap/Makefile \
-			zaphfc/Makefile \
-			cwain/Makefile
-
-		sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
-			zaphfc/Makefile
-	fi
-
-	# replace `uname -r` with ${KV_FULL} in all Makefiles
-	find ${WORKDIR} -iname "Makefile" -exec sed -i -e "s:\`uname -r\`:${KV_FULL}:g" {} \;
-
-	cd ${S}
-	#######################################################################
-	# apply other patches here,
-	# make sure they work with things that have been added before!
-	#
-
-	# apply x86 rtc patch for ztdummy (http://bugs.digium.com/view.php?id=4301)
-	# this won't have any effect on non-x86 systems...
-	if use rtc; then
-		if use x86 || use amd64; then
-			epatch ${FILESDIR}/${PN}-1.0.9-rtc.patch
-		else
-			ewarn "RTC is unsupported on your arch, skipping patch"
-		fi
-	fi
-}
-
-src_compile() {
-	make ARCH=$(tc-arch-kernel) KERNEL_SOURCE=/usr/src/linux || die
-
-	if use bri; then
-		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-		make ARCH=$(tc-arch-kernel) -C qozap  || die
-		make ARCH=$(tc-arch-kernel) -C zaphfc || die
-		make ARCH=$(tc-arch-kernel) -C cwain  || die
-	fi
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} install || die
-
-	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
-	dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
-
-	# additional tools
-	dobin ztmonitor ztspeed zttest
-
-	if use bri; then
-		einfo "Installing bri"
-		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-
-		insinto /lib/modules/${KV_FULL}/misc
-		doins qozap/qozap.${KV_OBJ}
-		doins zaphfc/zaphfc.${KV_OBJ}
-		doins cwain/cwain.${KV_OBJ}
-
-		# install example configs for octoBRI and quadBRI
-		insinto /etc
-		doins qozap/zaptel.conf.octoBRI
-		newins qozap/zaptel.conf zaptel.conf.quadBRI
-		newins zaphfc/zaptel.conf zaptel.conf.zaphfc
-
-		insinto /etc/asterisk
-		doins qozap/zapata.conf.octoBRI
-		newins qozap/zapata.conf zapata.conf.quadBRI
-		newins zaphfc/zapata.conf zapata.conf.zaphfc
-
-		docinto bristuff
-		dodoc CHANGES INSTALL
-
-		docinto bristuff/qozap
-		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
-
-		docinto bristuff/zaphfc
-		dodoc zaphfc/LICENSE zaphfc/*.conf
-
-		docinto bristuff/cwain
-		dodoc cwain/TODO cwain/LICENSE
-	fi
-
-	# install init script
-	newinitd ${FILESDIR}/zaptel.rc6 zaptel
-	newconfd ${FILESDIR}/zaptel.confd zaptel
-
-	# install devfsd rule file
-	insinto /etc/devfs.d
-	newins ${FILESDIR}/zaptel.devfsd zaptel
-
-	# install udev rule file
-	insinto /etc/udev/rules.d
-	newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${D}/dev/zap ]]; then
-		chown -R root:dialout	${D}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
-	fi
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if use devfs26; then
-		ewarn "*** Warning! ***"
-		ewarn "Devfs support for linux-2.6 is experimental and not"
-		ewarn "supported by digium or the asterisk project!"
-		echo
-		ewarn "Send bug-reports to: stkn@gentoo.org"
-	fi
-
-	echo
-	einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
-	echo
-
-	if use bri; then
-		einfo "Bristuff configs have been merged as:"
-		einfo ""
-		einfo "${ROOT}etc/"
-		einfo "    zaptel.conf.zaphfc"
-		einfo "    zaptel.conf.quadBRI"
-		einfo "    zaptel.conf.octoBRI"
-		einfo ""
-		einfo "${ROOT}etc/asterisk/"
-		einfo "    zapata.conf.zaphfc"
-		einfo "    zapata.conf.quadBRI"
-		einfo "    zapata.conf.octoBRI"
-		echo
-	fi
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${ROOT}/dev/zap ]]; then
-		chown -R root:dialout	${ROOT}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${ROOT}/dev/zap
-	fi
-}