Version bump (bristuff update) and fixed bristuff part of SRC_URI (after site redesign)

Package-Manager: portage-2.0.51.22-r2

11 files changed, 467 insertions, 20 deletions

diff --git a/net-misc/zaptel/ChangeLog b/net-misc/zaptel/ChangeLog
index c5e23edf9a62..8c6eaafe4e8f 100644
--- a/net-misc/zaptel/ChangeLog
+++ b/net-misc/zaptel/ChangeLog
@@ -1,6 +1,15 @@
 # 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.54 2005/07/29 01:12:43 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.55 2005/08/18 17:55:09 stkn Exp $
+
+*zaptel-1.0.9_p1-r1 (18 Aug 2005)
+
+  18 Aug 2005; <stkn@gentoo.org> +files/zaptel-bristuff-0.2.0-RC8n.patch,
+  zaptel-1.0.6.ebuild, zaptel-1.0.6-r1.ebuild, zaptel-1.0.7.ebuild,
+  zaptel-1.0.7-r1.ebuild, zaptel-1.0.8.ebuild, zaptel-1.0.9_p1.ebuild,
+  +zaptel-1.0.9_p1-r1.ebuild:
+  Version bump (bristuff update) and fixed bristuff part of SRC_URI (after
+  site redesign).
 
 *zaptel-1.0.9_p1 (28 Jul 2005)
 
diff --git a/net-misc/zaptel/Manifest b/net-misc/zaptel/Manifest
index 30bbe57ceccc..e580c1650141 100644
--- a/net-misc/zaptel/Manifest
+++ b/net-misc/zaptel/Manifest
@@ -1,17 +1,20 @@
-MD5 3e99f4aad34341a7e82127ff2e55d242 zaptel-1.0.7-r1.ebuild 6527
-MD5 b640a29e6e8188d8b58820ec864fbec3 zaptel-1.0.6-r1.ebuild 6228
-MD5 bdd64a23a77814d8650fde13846da594 zaptel-1.0.9_p1.ebuild 6452
+MD5 a46c51a5645181b1857a15dcb22ef059 zaptel-1.0.7-r1.ebuild 6519
+MD5 1d3d7de660c5d7d7ac69936ce01511ad zaptel-1.0.6-r1.ebuild 6219
+MD5 bba9f419aa6824a54d1d7ab65db430c1 zaptel-1.0.9_p1.ebuild 6443
 MD5 6748a058fe2c9650c3ad2fbc1d31b5b7 zaptel-1.0.4-r1.ebuild 4419
-MD5 17a2b338a9226425c4d7f81328fa71ef zaptel-1.0.8.ebuild 6381
-MD5 18b9c41a98574311faaea931786e304c zaptel-1.0.7.ebuild 6100
+MD5 9bc4a2dc36d5ed75ef0ab15de1377219 zaptel-1.0.8.ebuild 6372
+MD5 cc8489411f25210c8bc5e95c9787d8e1 zaptel-1.0.7.ebuild 6091
+MD5 eba1c1de60b3265358142667f9ffa29b zaptel-1.0.9_p1-r1.ebuild 6639
 MD5 a2f85c43f924825aa60f686fac8a18e2 zaptel-1.0.3.ebuild 3514
-MD5 8557c37abd20a8f19a4d05cddf411ee6 zaptel-1.0.6.ebuild 6269
+MD5 17f9150ae20c23fc5d81a51bdc1d8eab zaptel-1.0.6.ebuild 6260
 MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
-MD5 313b4002cbda386481848bf6fdc8f86c ChangeLog 9864
+MD5 20ca497edaec3b185313b28ed4e593eb ChangeLog 10236
 MD5 3f9ea369b365b565b7e3fefd79d32c9e zaptel-1.0.4.ebuild 4459
 MD5 66c86744220e6716f15393caf0ee408d files/digest-zaptel-1.0.3 64
 MD5 6029a1280d38d8c67577bc7a873fd336 files/zaptel-1.0.9-rtc.patch 4238
+MD5 3a4f554056143ac54f033cc3356821b5 files/digest-zaptel-1.0.9_p1-r1 214
 MD5 f46e4409c0bb701f8a6214e793de72a2 files/digest-zaptel-1.0.8 212
+MD5 f5d81a19c52c5e88fefed12251674134 files/zaptel-bristuff-0.2.0-RC8n.patch 6064
 MD5 60910db3ceada75031a91d419832871d files/zaptel-1.0.0-experimental-devfs26.diff 5474
 MD5 e5a799243335f31a494bb4f90edbb9e4 files/zaptel-1.0.3-gentoo.diff 3456
 MD5 3bff3fd5d8dc52513ceeac546e1e11bf files/zaptel.udevd 358
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
new file mode 100644
index 000000000000..5d8fadf6e0c4
--- /dev/null
+++ b/net-misc/zaptel/files/digest-zaptel-1.0.9_p1-r1
@@ -0,0 +1,3 @@
+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-bristuff-0.2.0-RC8n.patch b/net-misc/zaptel/files/zaptel-bristuff-0.2.0-RC8n.patch
new file mode 100644
index 000000000000..8e55f0ece855
--- /dev/null
+++ b/net-misc/zaptel/files/zaptel-bristuff-0.2.0-RC8n.patch
@@ -0,0 +1,191 @@
+diff -ur zaptel-1.0.9.orig/Makefile zaptel-1.0.9/Makefile
+--- zaptel-1.0.9.orig/Makefile	2005-05-12 04:26:49.000000000 +0200
++++ zaptel-1.0.9/Makefile	2005-07-03 13:36:31.000000000 +0200
+@@ -343,7 +343,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
+@@ -351,3 +351,4 @@
+ 	rm -f libtonezone*
+ 	rm -f tor2ee
+ 	rm -f core
++	rm -rf .tmp_versions
+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.6-r1.ebuild b/net-misc/zaptel/zaptel-1.0.6-r1.ebuild
index 34c1ffd5b367..a9b9f93f0457 100644
--- a/net-misc/zaptel/zaptel-1.0.6-r1.ebuild
+++ b/net-misc/zaptel/zaptel-1.0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2005/07/12 20:54:40 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.6-r1.ebuild,v 1.4 2005/08/18 17:55:09 stkn Exp $
 
 IUSE="devfs26 bri florz"
 
@@ -12,7 +12,7 @@ FLORZ_VERSION="0.2.0-RC7j_florz-4"
 DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
 HOMEPAGE="http://www.asterisk.org"
 SRC_URI="ftp://ftp.asterisk.org/pub/telephony/zaptel/old/zaptel-${PV}.tar.gz
-	 bri? ( http://www.junghanns.net/asterisk/downloads/bristuff-${BRI_VERSION}.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"
diff --git a/net-misc/zaptel/zaptel-1.0.6.ebuild b/net-misc/zaptel/zaptel-1.0.6.ebuild
index fedc82edba41..919bf3ccb8ab 100644
--- a/net-misc/zaptel/zaptel-1.0.6.ebuild
+++ b/net-misc/zaptel/zaptel-1.0.6.ebuild
@@ -1,6 +1,6 @@
 # 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.8 2005/07/12 20:54:40 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.6.ebuild,v 1.9 2005/08/18 17:55:09 stkn Exp $
 
 IUSE="devfs26 bri florz"
 
@@ -12,7 +12,7 @@ FLORZ_VERSION="0.2.0-RC7j_florz-4"
 DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
 HOMEPAGE="http://www.asterisk.org"
 SRC_URI="ftp://ftp.asterisk.org/pub/telephony/zaptel/old/zaptel-${PV}.tar.gz
-	 bri? ( http://www.junghanns.net/asterisk/downloads/bristuff-${BRI_VERSION}.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"
diff --git a/net-misc/zaptel/zaptel-1.0.7-r1.ebuild b/net-misc/zaptel/zaptel-1.0.7-r1.ebuild
index a6e9619cb0a5..8def6ca34620 100644
--- a/net-misc/zaptel/zaptel-1.0.7-r1.ebuild
+++ b/net-misc/zaptel/zaptel-1.0.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.7-r1.ebuild,v 1.9 2005/07/12 20:54:40 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.7-r1.ebuild,v 1.10 2005/08/18 17:55:09 stkn Exp $
 
 IUSE="devfs26 bri florz"
 
@@ -12,7 +12,7 @@ FLORZ_VERSION="0.2.0-RC8a_florz-6"
 DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
 HOMEPAGE="http://www.asterisk.org"
 SRC_URI="ftp://ftp.asterisk.org/pub/telephony/zaptel/old/zaptel-${PV}.tar.gz
-	 bri? ( http://www.junghanns.net/asterisk/downloads/bristuff-${BRI_VERSION}.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"
diff --git a/net-misc/zaptel/zaptel-1.0.7.ebuild b/net-misc/zaptel/zaptel-1.0.7.ebuild
index d38c5f58a751..8b250478ff34 100644
--- a/net-misc/zaptel/zaptel-1.0.7.ebuild
+++ b/net-misc/zaptel/zaptel-1.0.7.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2005/07/12 20:54:40 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.7.ebuild,v 1.5 2005/08/18 17:55:09 stkn Exp $
 
 IUSE="devfs26 bri florz"
 
@@ -12,7 +12,7 @@ FLORZ_VERSION="0.2.0-RC7j_florz-4"
 DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
 HOMEPAGE="http://www.asterisk.org"
 SRC_URI="ftp://ftp.asterisk.org/pub/telephony/zaptel/old/zaptel-${PV}.tar.gz
-	 bri? ( http://www.junghanns.net/asterisk/downloads/bristuff-${BRI_VERSION}.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"
diff --git a/net-misc/zaptel/zaptel-1.0.8.ebuild b/net-misc/zaptel/zaptel-1.0.8.ebuild
index dcb8a285f3bd..f3910753db18 100644
--- a/net-misc/zaptel/zaptel-1.0.8.ebuild
+++ b/net-misc/zaptel/zaptel-1.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.8.ebuild,v 1.3 2005/07/25 22:43:32 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.8.ebuild,v 1.4 2005/08/18 17:55:09 stkn Exp $
 
 IUSE="devfs26 bri florz"
 
@@ -12,7 +12,7 @@ FLORZ_VERSION="0.2.0-RC8a_florz-6"
 DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
 HOMEPAGE="http://www.asterisk.org"
 SRC_URI="ftp://ftp.asterisk.org/pub/telephony/zaptel/old/zaptel-${PV}.tar.gz
-	 bri? ( http://www.junghanns.net/asterisk/downloads/bristuff-${BRI_VERSION}.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"
diff --git a/net-misc/zaptel/zaptel-1.0.9_p1-r1.ebuild b/net-misc/zaptel/zaptel-1.0.9_p1-r1.ebuild
new file mode 100644
index 000000000000..b64355c5024f
--- /dev/null
+++ b/net-misc/zaptel/zaptel-1.0.9_p1-r1.ebuild
@@ -0,0 +1,241 @@
+# 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.1 2005/08/18 17:55:09 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.asterisk.org/pub/telephony/zaptel/zaptel-${MY_PV}.tar.gz
+	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
+	 florz? ( http://zaphfc.florz.dyndns.org/zaphfc_${FLORZ_VERSION}.diff.gz )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~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
+}
diff --git a/net-misc/zaptel/zaptel-1.0.9_p1.ebuild b/net-misc/zaptel/zaptel-1.0.9_p1.ebuild
index 0c36d6c25694..bb7fb45c2be7 100644
--- a/net-misc/zaptel/zaptel-1.0.9_p1.ebuild
+++ b/net-misc/zaptel/zaptel-1.0.9_p1.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2005/07/29 01:12:44 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.9_p1.ebuild,v 1.2 2005/08/18 17:55:09 stkn Exp $
 
 IUSE="devfs26 bri florz rtc"
 
@@ -14,7 +14,7 @@ MY_PV="${PV/_p/.}"
 DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
 HOMEPAGE="http://www.asterisk.org"
 SRC_URI="ftp://ftp.asterisk.org/pub/telephony/zaptel/zaptel-${MY_PV}.tar.gz
-	 bri? ( http://www.junghanns.net/asterisk/downloads/bristuff-${BRI_VERSION}.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"