net-misc/zaptel: version bump - most work by kolla, with evil hacks by me, but working

svn path=/trunk/; revision=363

6 files changed, 494 insertions, 11 deletions

diff --git a/net-misc/zaptel/ChangeLog b/net-misc/zaptel/ChangeLog
index b0de7a7..a94b648 100644
--- a/net-misc/zaptel/ChangeLog
+++ b/net-misc/zaptel/ChangeLog
@@ -421,3 +421,7 @@
 	  metadata.xml, zaptel-1.2.0_beta1.ebuild:
 	  Initial import of private gentoo-voip repos
 
+  24 Sep 2006; Stefan Schweizer <genstef@gentoo.org> +zaptel-1.2.9.1.ebuild,
+  +files/zaptel-1.2.9.1-gentoo.diff:
+  version bump - most work by kolla, with evil hacks by me, but working
+
diff --git a/net-misc/zaptel/Manifest b/net-misc/zaptel/Manifest
index 3c5bf4e..b175dfe 100644
--- a/net-misc/zaptel/Manifest
+++ b/net-misc/zaptel/Manifest
@@ -46,6 +46,10 @@ AUX zaptel-1.2.7-gentoo.diff 4585 RMD160 e857675102e6b9ffc8429f59ba6e12548494ce2
 MD5 5d537ff7c9b103e3f541a9278e64acc1 files/zaptel-1.2.7-gentoo.diff 4585
 RMD160 e857675102e6b9ffc8429f59ba6e12548494ce23 files/zaptel-1.2.7-gentoo.diff 4585
 SHA256 98a4b3f34aa43e7954e5a0e48474c4466461e6ca5706b652fe51bdb5171dd9e2 files/zaptel-1.2.7-gentoo.diff 4585
+AUX zaptel-1.2.9.1-gentoo.diff 5129 RMD160 b85980028878905c8db0821c5f5d59d500591a8f SHA1 fecf5625cb849d2bdc6bd28370fca3775ae987ad SHA256 2414a99c0608e562afaa84446756cb8df59cdb91b8f81aecaef65d6a0db3b3ed
+MD5 2ba3db989e7bacdefb157b6bb6d57f61 files/zaptel-1.2.9.1-gentoo.diff 5129
+RMD160 b85980028878905c8db0821c5f5d59d500591a8f files/zaptel-1.2.9.1-gentoo.diff 5129
+SHA256 2414a99c0608e562afaa84446756cb8df59cdb91b8f81aecaef65d6a0db3b3ed files/zaptel-1.2.9.1-gentoo.diff 5129
 AUX zaptel.confd 371 RMD160 1867454626e66743b26d8726e330534c9117c8a4 SHA1 c2ccc3eada8ccb28527fcacfe4b89cf25131867e SHA256 f1cf6c46282645567481118bfcd814b64c88510499c4f423ff2df4ced34c434f
 MD5 fae1145da422b8838c2a6ac3405dc4c4 files/zaptel.confd 371
 RMD160 1867454626e66743b26d8726e330534c9117c8a4 files/zaptel.confd 371
@@ -62,17 +66,18 @@ AUX zaptel.udevd 358 RMD160 fc92cf8fcbf9ed49b7918557670417e15f84f281 SHA1 36410c
 MD5 3bff3fd5d8dc52513ceeac546e1e11bf files/zaptel.udevd 358
 RMD160 fc92cf8fcbf9ed49b7918557670417e15f84f281 files/zaptel.udevd 358
 SHA256 9be02c6b22db788d8a8fabc5bc2574102b50c3b329cff12c342d39896c7615b5 files/zaptel.udevd 358
-DIST bristuff-0.3.0-PRE-1c.tar.gz 167219 RMD160 d826786216ca1dd85bb2f011b6273d8329e107fc SHA256 2b43a263f508194f0d6438c0c07655979261941b2041c4713f0aebc1d1cb993c
+DIST bristuff-0.3.0-PRE-1c.tar.gz 167219 RMD160 d826786216ca1dd85bb2f011b6273d8329e107fc SHA1 fd780e10ccb6586872f592b9498f1b57e2f5b30d SHA256 2b43a263f508194f0d6438c0c07655979261941b2041c4713f0aebc1d1cb993c
 DIST bristuff-0.3.0-PRE-1f.tar.gz 264428
 DIST bristuff-0.3.0-PRE-1h.tar.gz 207158 RMD160 a01dceb5ac8bf85265d322e2bc109e11df556f02 SHA256 46ce98670f184498126b5d3bbe1310ea4ec2ac7e063532e1832593a121e89681
-DIST bristuff-0.3.0-PRE-1i.tar.gz 207735
-DIST bristuff-0.3.0-PRE-1k.tar.gz 207577 RMD160 c06919d8d9878aeda822c8e07af0fc4f7a0c51ca SHA256 1e8544b966012f9ea44f30b36123c205ca8745c8756a8c0ac88e6f4406d86e6c
+DIST bristuff-0.3.0-PRE-1i.tar.gz 207735 RMD160 d34f47c2f18f7732e80177bad557e36c08600b3f SHA1 f031fc76cb7915f93089af1b3fa1e731a7890e86 SHA256 4162bd62c1b168a5cfdfaed15bab74a706771d2d629af0d0c79caeedb629bef2
+DIST bristuff-0.3.0-PRE-1k.tar.gz 207577 RMD160 c06919d8d9878aeda822c8e07af0fc4f7a0c51ca SHA1 e58a2d407a4f9d96d062c1378b97c5380a626508 SHA256 1e8544b966012f9ea44f30b36123c205ca8745c8756a8c0ac88e6f4406d86e6c
 DIST bristuff-0.3.0-PRE-1n.tar.gz 248488 RMD160 3da3043a88551578b4495ae8e54ffb6a4f3bfd2c SHA1 c4aa937dffa7dec4ffed1c08bc228f6521c52306 SHA256 31b894bdd2741e309dfed23963db1cda3d74a8d616de8df9f1281b5558aa27f1
 DIST bristuff-0.3.0-PRE-1o.tar.gz 252770 RMD160 60f1656a815bd1ff7d86ca7cb657c1d850a84804 SHA1 fd215b07533532c04f60212284a4cd1d6f18d5ba SHA256 aec95d12959181b601d7d10f05bb16eff715859dc8ea9fbb10e670296f61b6e9
 DIST bristuff-0.3.0-PRE-1p.tar.gz 254003 RMD160 e87c0289bc598b52b962d192bc54008edc9b38a9 SHA1 5372bf13be0f5c7dd36046a8ac1cf5ed0fbb1f0b SHA256 d7dbb352ac68d64458919b94f815c8c97418c54fa8ae5411084370325528c164
 DIST bristuff-0.3.0-PRE-1r.tar.gz 262348 RMD160 c2f7e937fc7452d8abb392f6c17246c3f8291b01 SHA1 cfb957bb12000107db906bfd456e8e3dc52f5ca2 SHA256 944be5544eae6cbbc00ac30d63f76ea78cc355dac07732ed2c52f7bdec91117e
+DIST bristuff-0.3.0-PRE-1s.tar.gz 265953 RMD160 8d3abdbbae4c376d52225395c72f4538e1f84a94 SHA1 1d942df9e4fd963755080e011caba88a33601c1b SHA256 30adea4f070ed44d1952163e850c177f976857b96965e18844ccd492ccef968d
 DIST zaphfc_0.3.0-PRE-1_florz-10.diff.gz 10555 RMD160 d7e0492b994951d0c13ddea58e3703701619325e SHA256 538498913dc71ad5944f5e5d4edfcfad67907e5621f2d90127c567649dc1534b
-DIST zaphfc_0.3.0-PRE-1f_florz-11.diff.gz 10563 RMD160 7ab9166da63bb81902d3b6eaeaa6691dade108b7 SHA256 efa70642be1913007423a6b177af55c5678522f9e71e2bd5a19275c6f57e79ae
+DIST zaphfc_0.3.0-PRE-1f_florz-11.diff.gz 10563 RMD160 7ab9166da63bb81902d3b6eaeaa6691dade108b7 SHA1 a605939305a8346401cc6d1997ab4fae2968d644 SHA256 efa70642be1913007423a6b177af55c5678522f9e71e2bd5a19275c6f57e79ae
 DIST zaphfc_0.3.0-PRE-1n_florz-11.diff.gz 10647 RMD160 31f1f82a5452bafa191b2023cfa559b8431786c6 SHA1 b34928127b7a2dafbbcc0d2761e76b8ecb6daa1a SHA256 923f6f8fa8a520d14978aab5ff2911234e587bee1fae085f76fb992ed9e1f9b1
 DIST zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736 RMD160 b95d2301402e1108bc480ce0e66e87e3062eccf8 SHA1 f8ab2f312c6a2b2f607b9e7f3ccbcca0858c53a7 SHA256 04a8dd22d581b5d28d46a589d695f6eb634bf2bf355347a637fe2d560a63528c
 DIST zaptel-1.2.0.tar.gz 596257 RMD160 de4b944d0e14671750fa5ef6ddbe92c2b246039f SHA256 4debb42372421019a532f919424af7ad14e7e06eac0b8fe1cbc11d81346b3116
@@ -83,6 +88,7 @@ DIST zaptel-1.2.4.tar.gz 673090 RMD160 05396ac7227762b9c052a3ff3642b99d47a8dd85
 DIST zaptel-1.2.5.tar.gz 673161 RMD160 7de580a8424b436d77504501ef59c47f2498e04d SHA1 ac740850e49daed77683eaffba5732086a88f54f SHA256 8a80ccd9b2852de8a0ccf0036819d8e5cc0f73516f1fdcee3392c813a26ada5c
 DIST zaptel-1.2.6.tar.gz 676658 RMD160 599cf3c78bb5b71a921dea9ca4716131224cd872 SHA1 cd61a2e7efdab4c5400af5c44c4009702daf5ea2 SHA256 24cd078469f2a3f131c3d28977f88426a45d9810f5a5d22109d5d57e43320938
 DIST zaptel-1.2.7.tar.gz 1137409 RMD160 76cb57b0c57fc25f6210de285bbc4291ee9fb4b9 SHA1 790a106ee975a77c413a01584c59ea7d91ca9efd SHA256 db6768c88380a1b5eaf6adea97eb1c9837ee83d284d87cec84853ae984994a00
+DIST zaptel-1.2.9.1.tar.gz 1255412 RMD160 caf2ad931e2ae439500805a6ca4376dc8083de5a SHA1 6145301bb47107c0910a098e26b4ca5cdb2377ab SHA256 7def44c259352397af2ad80f3c0eb103ff640ffbc7c95f37c3802fee75c10ede
 EBUILD zaptel-1.2.0.ebuild 9088 RMD160 0a4672dbfa7101836a7c418a663a81aa825c6041 SHA1 f10ea0d3eddb283f045001dcbe7f6587bc388e43 SHA256 720aefb754ef4261a481cf0fed6fb292d802159e698343ebdb816d86752cd8a9
 MD5 5768ae3fe215f65c6a97ab80dec67b19 zaptel-1.2.0.ebuild 9088
 RMD160 0a4672dbfa7101836a7c418a663a81aa825c6041 zaptel-1.2.0.ebuild 9088
@@ -135,10 +141,14 @@ EBUILD zaptel-1.2.7.ebuild 9332 RMD160 9b47018d6846b0677ff2412cf86284a491056c8f
 MD5 8e354fb682a7a8329b4a429b1458eb1f zaptel-1.2.7.ebuild 9332
 RMD160 9b47018d6846b0677ff2412cf86284a491056c8f zaptel-1.2.7.ebuild 9332
 SHA256 6ea7cfb256d8ba98402fbc26546ba7b5ef2d4d47fa338a2dc4cbbd742a4b2864 zaptel-1.2.7.ebuild 9332
-MISC ChangeLog 17663 RMD160 45365093578f57f2cca3669588a489fffae94c18 SHA1 71dfc88b818893efbf608890c28626984865fce8 SHA256 56801e076327dc54dced04afcd1eae0a4ddf0e8f9cab7b0d663e85a1260799c9
-MD5 8e09efb1d1762510a1a8ac0b4913bf29 ChangeLog 17663
-RMD160 45365093578f57f2cca3669588a489fffae94c18 ChangeLog 17663
-SHA256 56801e076327dc54dced04afcd1eae0a4ddf0e8f9cab7b0d663e85a1260799c9 ChangeLog 17663
+EBUILD zaptel-1.2.9.1.ebuild 8490 RMD160 1433e2a90cba46a9821742246bae15cb2160c85f SHA1 cc8bc370f219655af16f07000298b15946b2f8de SHA256 30e00fa38e53ded2cd1b44b1280231a23a7a3a73cb4cb0e91a1af7169df3775b
+MD5 5f4dd2315ff3501043768b717b9296d5 zaptel-1.2.9.1.ebuild 8490
+RMD160 1433e2a90cba46a9821742246bae15cb2160c85f zaptel-1.2.9.1.ebuild 8490
+SHA256 30e00fa38e53ded2cd1b44b1280231a23a7a3a73cb4cb0e91a1af7169df3775b zaptel-1.2.9.1.ebuild 8490
+MISC ChangeLog 17850 RMD160 db5355685188683abf04fb577c7161f0bf27badb SHA1 0f2cdf9e703179e596c23a321e0a90735f74053b SHA256 aa907d560f5a2df28639d4d94623bf139951269a0555c7c21423e4bf8c49c721
+MD5 ac66867aba87edc0c0778d498ce86d8c ChangeLog 17850
+RMD160 db5355685188683abf04fb577c7161f0bf27badb ChangeLog 17850
+SHA256 aa907d560f5a2df28639d4d94623bf139951269a0555c7c21423e4bf8c49c721 ChangeLog 17850
 MISC metadata.xml 248 RMD160 a989fff0cebc82a58a75fb3a2eec8da0712ad57e SHA1 10bea6cd152e9f0ecb627eaacc19980a9d5f5dc4 SHA256 d0e3ab77a8a7b859511b8d5fda83dc018351e6367724b097dcc13c4aa0a3ee6b
 MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
 RMD160 a989fff0cebc82a58a75fb3a2eec8da0712ad57e metadata.xml 248
@@ -155,9 +165,9 @@ SHA256 4de1d1f36ab1b15be04b4d28e92f10fb856b6b48078e12792ede392b960e6633 files/di
 MD5 d384c736914b20ca66d45a9035eb625a files/digest-zaptel-1.2.2 615
 RMD160 facdd1bb7fb34a64b2bc1cf28d425d7356600d0f files/digest-zaptel-1.2.2 615
 SHA256 707d51bff87081085cabf9e7b170952b5fc84a7cca044188b3a0046285f9628b files/digest-zaptel-1.2.2 615
-MD5 02a9b70bc51179a925ae82f8222cc5bb files/digest-zaptel-1.2.3 597
-RMD160 f89b1427c1a16a83deb315b022f7a17c46fc544a files/digest-zaptel-1.2.3 597
-SHA256 0394d72087a386361de22f42a53961b13844457dfd568ecbdd3f67ca0f1af353 files/digest-zaptel-1.2.3 597
+MD5 b8a1bacda1d185c8da271bed275445ae files/digest-zaptel-1.2.3 789
+RMD160 4e2ae5b553a3acb421ed05bd448315f675ad7f61 files/digest-zaptel-1.2.3 789
+SHA256 6619ec9161fbcbb19e009e3d65cbfda6d41d0413fb95f5d48a8d3af4b27c35aa files/digest-zaptel-1.2.3 789
 MD5 5f7da2cec142455e571667cb0618a2f5 files/digest-zaptel-1.2.3-r1 789
 RMD160 69158994b88578254a2ce6904911c01121a48575 files/digest-zaptel-1.2.3-r1 789
 SHA256 2666bd2e6d771d07e2cb8e793aed5603c994eeb3069070eb232ae68a36db703e files/digest-zaptel-1.2.3-r1 789
@@ -182,3 +192,6 @@ SHA256 e0c1e502dc6c176d176a5877ce51ece60d7b8e99f20d47f048e0ebcf760fe30c files/di
 MD5 399d589bcd69d3f411f3fd4772cfe395 files/digest-zaptel-1.2.7 792
 RMD160 6a73a6eaa51d4eae507d8ae1b8f70134d051aef6 files/digest-zaptel-1.2.7 792
 SHA256 653e57cf54d5c60cefd58b4b5cbea157f00ec74e68f08ab5a63787612cee2f19 files/digest-zaptel-1.2.7 792
+MD5 1e13a9665022158b1d78f47b331688ed files/digest-zaptel-1.2.9.1 798
+RMD160 f10faf8fefa2221dfa0fd8e8a85b658a095d803c files/digest-zaptel-1.2.9.1 798
+SHA256 367d7228a51892a9ad986338a37a3355564b2fc324af014a65f7af78bf676b3d files/digest-zaptel-1.2.9.1 798
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.3 b/net-misc/zaptel/files/digest-zaptel-1.2.3
index 8a79990..21ea694 100644
--- a/net-misc/zaptel/files/digest-zaptel-1.2.3
+++ b/net-misc/zaptel/files/digest-zaptel-1.2.3
@@ -1,4 +1,6 @@
 MD5 78e72cf28ced39483b76c61a6c363ce4 bristuff-0.3.0-PRE-1i.tar.gz 207735
+RMD160 d34f47c2f18f7732e80177bad557e36c08600b3f bristuff-0.3.0-PRE-1i.tar.gz 207735
+SHA256 4162bd62c1b168a5cfdfaed15bab74a706771d2d629af0d0c79caeedb629bef2 bristuff-0.3.0-PRE-1i.tar.gz 207735
 MD5 88160b95c990e8bc92e7d0a755df6792 zaphfc_0.3.0-PRE-1f_florz-11.diff.gz 10563
 RMD160 7ab9166da63bb81902d3b6eaeaa6691dade108b7 zaphfc_0.3.0-PRE-1f_florz-11.diff.gz 10563
 SHA256 efa70642be1913007423a6b177af55c5678522f9e71e2bd5a19275c6f57e79ae zaphfc_0.3.0-PRE-1f_florz-11.diff.gz 10563
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.9.1 b/net-misc/zaptel/files/digest-zaptel-1.2.9.1
new file mode 100644
index 0000000..0e5dc7e
--- /dev/null
+++ b/net-misc/zaptel/files/digest-zaptel-1.2.9.1
@@ -0,0 +1,9 @@
+MD5 760eba19b03d03cd1dc8648d6239b4af bristuff-0.3.0-PRE-1s.tar.gz 265953
+RMD160 8d3abdbbae4c376d52225395c72f4538e1f84a94 bristuff-0.3.0-PRE-1s.tar.gz 265953
+SHA256 30adea4f070ed44d1952163e850c177f976857b96965e18844ccd492ccef968d bristuff-0.3.0-PRE-1s.tar.gz 265953
+MD5 541b0a5910843d3c0b6a9de9467b9401 zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736
+RMD160 b95d2301402e1108bc480ce0e66e87e3062eccf8 zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736
+SHA256 04a8dd22d581b5d28d46a589d695f6eb634bf2bf355347a637fe2d560a63528c zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736
+MD5 c2f5798196ac1b53f4161547cc4efb2c zaptel-1.2.9.1.tar.gz 1255412
+RMD160 caf2ad931e2ae439500805a6ca4376dc8083de5a zaptel-1.2.9.1.tar.gz 1255412
+SHA256 7def44c259352397af2ad80f3c0eb103ff640ffbc7c95f37c3802fee75c10ede zaptel-1.2.9.1.tar.gz 1255412
diff --git a/net-misc/zaptel/files/zaptel-1.2.9.1-gentoo.diff b/net-misc/zaptel/files/zaptel-1.2.9.1-gentoo.diff
new file mode 100644
index 0000000..34ac155
--- /dev/null
+++ b/net-misc/zaptel/files/zaptel-1.2.9.1-gentoo.diff
@@ -0,0 +1,103 @@
+diff -Nru zaptel-1.2.9.1.orig/Makefile zaptel-1.2.9.1/Makefile
+--- zaptel-1.2.9.1.orig/Makefile	2006-09-09 01:49:43.000000000 +0200
++++ zaptel-1.2.9.1/Makefile	2006-09-15 02:14:35.000000000 +0200
+@@ -23,7 +23,7 @@
+ endif
+ KINCLUDES:=$(KSRC)/include
+ 
+-CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
++CFLAGS+=-I. -Iinclude -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
+ CFLAGS_PPC:=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
+ CFLAGS_X86-64:=$(shell if uname -m | grep -q x86_64; then echo "-m64"; fi)
+ CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_X86-64)
+@@ -300,7 +300,8 @@
+ 	done
+ else # DYNFS
+   ifdef UDEVRULES
+-	build_tools/genudevrules > $(INSTALL_PREFIX)/etc/udev/rules.d/zaptel.rules
++	build_tools/genudevrules > zaptel.rules
++	install -D -m 644 zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d/10-zaptel.rules
+   else # !UDEVRULES
+ 	@echo "**** Dynamic filesystem detected -- not creating device nodes"
+   endif
+@@ -315,7 +316,7 @@
+ 	tar -zxf mISDNuser.tar.gz
+ 	$(MAKE) -C mISDNuser install
+ 
+-install: all devices firmware
++install: devices firmware
+ 	install -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg
+ 	if [ -f sethdlc-new ]; then \
+ 		install -D -m 755 sethdlc-new $(INSTALL_PREFIX)/sbin/sethdlc; \
+@@ -338,24 +339,20 @@
+ 	fi; \
+ 	rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxs.o
+ 	install -D -m 755 $(LIBTONEZONE_SO) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
+-	[ `id -u` = 0 ] && /sbin/ldconfig || :
++	[ `id -u` = 0 ] && /sbin/ldconfig -n $(INSTALL_PREFIX)/usr/lib || :
+ 	rm -f $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
+ 	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
+ 		$(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER)
+ 	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
+ 		$(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
+-	if [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO); fi
+ 	install -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/linux/zaptel.h
+ 	install -D -m 644 torisa.h $(INSTALL_PREFIX)/usr/include/linux/torisa.h
+ 	install -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
+-	install -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
+-	install -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
+-	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
++	install -D -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
++	install -D -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
+ 	[ -f $(CONFIG_FILE) ] || install -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
+-	build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out zaptel,$(MODULES))"
+-	@if [ -d /etc/modutils ]; then \
+-		/sbin/update-modules ; \
+-	fi
++	install -d -m 755 $(INSTALL_PREFIX)/etc/modules.d
++	build_tools/genmodconf $(BUILDVER) "$(INSTALL_PREFIX)" "$(filter-out zaptel,$(MODULES))"
+ 
+ install-udev: devices
+ 
+diff -Nru zaptel-1.2.9.1.orig/build_tools/genmodconf zaptel-1.2.9.1/build_tools/genmodconf
+--- zaptel-1.2.9.1.orig/build_tools/genmodconf	2006-05-23 19:51:00.000000000 +0200
++++ zaptel-1.2.9.1/build_tools/genmodconf	2006-09-15 02:13:37.000000000 +0200
+@@ -79,20 +79,6 @@
+ 
+ echo Building ${target}...
+ 
+-if [ "${1}" == "linux24" ]; then
+-    for mod in ${3}; do
+-	if ! grep -q "post-install ${mod} " ${target}; then
+-	    echo "post-install ${mod} /sbin/ztcfg" >> ${target}
+-	fi
+-    done
+-elif [ "${1}" == "linux26" ]; then
+-    for mod in ${3}; do
+-	if ! grep -q "install ${mod} " ${target}; then
+-	    echo "install ${mod} /sbin/modprobe --ignore-install ${mod} ${cmdopts} && /sbin/ztcfg" >> ${target}
+-	fi
+-    done
+-fi
+-
+ if ! grep -q "alias wcfxs" ${target}; then
+     echo "alias wcfxs wctdm" >> ${target};
+ fi;
+diff -Nru zaptel-1.2.9.1.orig/build_tools/genudevrules zaptel-1.2.9.1/build_tools/genudevrules
+--- zaptel-1.2.9.1.orig/build_tools/genudevrules	2006-05-17 18:49:46.000000000 +0200
++++ zaptel-1.2.9.1/build_tools/genudevrules	2006-09-15 02:12:19.000000000 +0200
+@@ -22,9 +22,9 @@
+ 
+ cat <<EOF
+ # zaptel devices with ownership/permissions for running as non-root
+-KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="asterisk", GROUP="asterisk", MODE="0660"
+-KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="asterisk", GROUP="asterisk", MODE="0660"
+-KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="asterisk", GROUP="asterisk", MODE="0660"
+-KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="asterisk", GROUP="asterisk", MODE="0660"
+-KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="asterisk", GROUP="asterisk", MODE="0660"
++KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="root", GROUP="dialout", MODE="0660"
++KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="root", GROUP="dialout", MODE="0660"
++KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="root", GROUP="dialout", MODE="0660"
++KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="root", GROUP="dialout", MODE="0660"
++KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="root", GROUP="dialout", MODE="0660"
+ EOF
diff --git a/net-misc/zaptel/zaptel-1.2.9.1.ebuild b/net-misc/zaptel/zaptel-1.2.9.1.ebuild
new file mode 100644
index 0000000..cb487a9
--- /dev/null
+++ b/net-misc/zaptel/zaptel-1.2.9.1.ebuild
@@ -0,0 +1,352 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.8.ebuild,v 1.1 2006/09/05 19:15:11 stkn Exp $
+
+inherit toolchain-funcs eutils linux-mod
+
+## NOTE:
+#
+#
+
+BRI_VERSION="0.3.0-PRE-1s"
+FLORZ_VERSION="0.3.0-PRE-1o_florz-12"
+
+IUSE="bri ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2 florz rtc ukcid watchdog zapras zapnet"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
+HOMEPAGE="http://www.asterisk.org"
+SRC_URI="http://ftp.digium.com/pub/zaptel/releases/${MY_P}.tar.gz
+	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
+	 florz? ( http://www.netdomination.org/pub/asterisk/zaphfc_${FLORZ_VERSION}.diff.gz )"
+
+S="${WORKDIR}/${MY_P}"
+
+S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="virtual/libc
+	virtual/linux-sources
+	>=dev-libs/newt-0.50.0"
+
+# list of echo canceller use flags,
+# first active in this list is selected (=order does matter)
+ZAP_EC_FLAGS="ecmark ecmark2 ecmark3 ecsteve ecsteve2 eckb1 ecmg2"
+
+### Begin: Helper functions
+
+select_echo_cancel() {
+	local myEC=""
+
+	for x in ${ZAP_EC_FLAGS}; do
+		if use $x; then
+			myEC=$(echo "$x" | sed -e "s:^ec::" | tr '[:lower:]' '[:upper:]')
+			break;
+		fi
+	done
+
+	echo ${myEC}
+}
+
+zconfig_disable() {
+	if grep -q "${1}" ${S}/zconfig.h; then
+		# match a little more than ${1} so we can use zconfig_disable
+		# to disable all echo cancellers in zconfig.h w/o calling it several times
+		sed -i -e "s:^[ \t]*#define[ \t]\+\(${1}[a-zA-Z0-9_-]*\).*:#undef \1:" \
+			${S}/zconfig.h
+	fi
+
+	return $?
+}
+
+zconfig_enable() {
+	if grep -q "${1}" ${S}/zconfig.h; then
+		sed -i  -e "s:^/\*[ \t]*#define[ \t]\+\(${1}\).*:#define \1:" \
+			-e "s:^[ \t]*#undef[ \t]\+\(${1}\).*:#define \1:" \
+			${S}/zconfig.h
+	fi
+
+	return $?
+}
+
+### End: Helper functions
+
+pkg_setup() {
+	local result=0 numec=0
+
+	linux-mod_pkg_setup
+
+	einfo "Running pre-flight checks..."
+
+	# basic zaptel checks
+	if ! linux_chkconfig_present CRC_CCITT; then
+		echo
+		eerror "Your kernel lacks CRC_CCIT support!"
+		eerror "Enable CONFIG_CRC_CCIT!"
+		result=$((result+1))
+	fi
+
+	# check if multiple echo cancellers have been selected
+	for x in ${ZAP_EC_FLAGS}; do
+		use $x && numec=$((numec+1))
+	done
+	if [[ $numec -gt 1 ]]; then
+		# multiple flags are active, only the first in the ZAP_EC_FLAGS list
+		# will be used, make sure the user knows about this
+		echo
+		ewarn "Multiple echo canceller flags are active but only one will be used!"
+		ewarn "Selected: $(select_echo_cancel)"
+	fi
+
+	# we need at least HDLC generic support
+	if use zapnet && ! linux_chkconfig_present HDLC; then
+		echo
+		eerror "zapnet: Your kernel lacks HDLC support!"
+		eerror "zapnet: Enable CONFIG_HDLC* to use zaptel network support!"
+		result=$((result+1))
+	fi
+
+	# zapras needs PPP support
+	if use zapras && ! linux_chkconfig_present PPP; then
+		echo
+		eerror "zapras: Your kernel lacks PPP support!"
+		eerror "zapras: Enable CONFIG_PPP* to use zaptel ras support!"
+		result=$((result+1))
+	fi
+
+	# rtc needs linux-2.6 and CONFIG_RTC
+	if use rtc; then
+		if ! kernel_is 2 6; then
+			echo
+			eerror "rtc: >=Linux-2.6.0 is needed for rtc support!"
+			result=$((result+1))
+		fi
+
+		if ! linux_chkconfig_present RTC; then
+			eerror "rtc: Your kernel lacks RealTime-Clock support!"
+			result=$((result+1))
+		fi
+	fi
+
+	if [[ $result -gt 0 ]]; then
+		echo
+		ewarn "One or more of the neccessary precondition(s) is/are not met!"
+		ewarn "Look at the messages above, resolve the problem (or disable the use-flag) and try again"
+		echo
+
+		if [[ $result -lt 3 ]]; then
+			eerror "[$result Error(s)] Zaptel is not happy :("
+		else
+			eerror "[$result Error(s)] You're making zaptel cry :'("
+		fi
+		die "[$result] Precondition(s) not met"
+	fi
+
+	echo
+	einfo "Zaptel is happy and continues... :)"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+
+	use ukcid && \
+		epatch ${FILESDIR}/${PN}-1.2.0-ukcid.patch
+
+	# try to apply bristuff patch
+	if use bri; then
+		# fix for userpriv
+		chmod -R a=rwX ${S_BRI}
+
+		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
+		epatch ${S_BRI}/patches/zaptel.patch
+
+		cd ${S_BRI}
+
+		if use florz; then
+			einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
+
+			# remove as soon as there's a new florz patch available
+			sed -i -e "s:zaptel-1\.2\.5:zaptel-1.2.6:g" \
+				${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
+
+			epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
+		fi
+
+		# patch includes
+		sed -i  -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \
+			qozap/qozap.c \
+			zaphfc/zaphfc.c \
+			cwain/cwain.c
+
+		# patch makefiles
+		sed -i  -e "s:^ZAP[\t ]*=.*:ZAP=-I${S}:" \
+			-e "s:^MODCONF=.*:MODCONF=/etc/modules.d/zaptel:" \
+			-e "s:linux-2.6:linux:g" \
+			qozap/Makefile \
+			zaphfc/Makefile \
+			cwain/Makefile
+
+		sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
+			zaphfc/Makefile
+
+		cd ${S}
+	fi
+
+### Configuration changes
+	local myEC
+
+	# prepare zconfig.h
+	myEC=$(select_echo_cancel)
+	if [[ -n "${myEC}" ]]; then
+		einfo "Selected echo canceller: ${myEC}"
+		# disable default first, set new selected ec afterwards
+		zconfig_disable ECHO_CAN
+		zconfig_enable ECHO_CAN_${myEC}
+	fi
+
+	# enable rtc support on 2.6
+	if use rtc && linux_chkconfig_present RTC && kernel_is 2 6; then
+		einfo "Enabling ztdummy RTC support"
+		zconfig_enable USE_RTC
+	fi
+
+	# enable agressive echo surpression
+	use ecaggressive && \
+		zconfig_enable AGGRESSIVE_SUPPRESSOR
+
+	# ppp ras support
+	use zapras && \
+		zconfig_enable CONFIG_ZAPATA_PPP
+
+	# frame relay, syncppp...
+	use zapnet && \
+		zconfig_enable CONFIG_ZAPATA_NET
+
+	# zaptel watchdog
+	use watchdog && \
+		zconfig_enable CONFIG_ZAPTEL_WATCHDOG
+}
+
+src_compile() {
+	#evil hack
+	addwrite ${KV_DIR}
+	# build
+	make KVERS=${KV_FULL} \
+	     KSRC=${KV_DIR} ARCH=$(tc-arch-kernel) || die
+
+	if use bri; then
+		cd ${S_BRI}
+		for x in cwain qozap zaphfc; do
+			einfo "Building ${x}..."
+			make KVERS=${KV_FULL} \
+				KSRC=/usr/src/linux \
+				ARCH=$(tc-arch-kernel) \
+				-C ${x} || die "make ${x} failed"
+		done
+	fi
+}
+
+src_install() {
+	make INSTALL_PREFIX=${D} ARCH=$(tc-arch-kernel) \
+	     KVERS=${KV_FULL} KSRC=/usr/src/linux install || die
+
+	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
+	dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
+
+	# additional tools
+	dobin ztmonitor ztspeed zttest
+
+	# install all header files, several packages need the complete set
+	# (e.g. sangoma wanpipe)
+	insinto /usr/include/zaptel
+	doins *.h
+
+	if use bri; then
+		einfo "Installing bri"
+		cd ${S_BRI}
+
+		insinto /lib/modules/${KV_FULL}/misc
+		doins qozap/qozap.${KV_OBJ}
+		doins zaphfc/zaphfc.${KV_OBJ}
+		doins cwain/cwain.${KV_OBJ}
+
+		# install example configs for octoBRI and quadBRI
+		insinto /etc
+		doins qozap/zaptel.conf.octoBRI
+		newins qozap/zaptel.conf zaptel.conf.quadBRI
+		newins zaphfc/zaptel.conf zaptel.conf.zaphfc
+
+		insinto /etc/asterisk
+		doins qozap/zapata.conf.octoBRI
+		newins qozap/zapata.conf zapata.conf.quadBRI
+		newins zaphfc/zapata.conf zapata.conf.zaphfc
+
+		docinto bristuff
+		dodoc CHANGES INSTALL
+
+		docinto bristuff/qozap
+		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
+
+		docinto bristuff/zaphfc
+		dodoc zaphfc/LICENSE zaphfc/*.conf
+
+		docinto bristuff/cwain
+		dodoc cwain/TODO cwain/LICENSE
+
+		cd ${S}
+	fi
+
+	# install init script
+	newinitd ${FILESDIR}/zaptel.rc6 zaptel
+	newconfd ${FILESDIR}/zaptel.confd zaptel
+
+	# install devfsd rule file
+	insinto /etc/devfs.d
+	newins ${FILESDIR}/zaptel.devfsd zaptel
+
+	# install udev rule file
+	insinto /etc/udev/rules.d
+	newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
+
+	# fix permissions if there's no udev / devfs around
+	if [[ -d ${D}/dev/zap ]]; then
+		chown -R root:dialout	${D}/dev/zap
+		chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
+	fi
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	echo
+	einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
+	echo
+
+	if use bri; then
+		einfo "Bristuff configs have been merged as:"
+		einfo ""
+		einfo "${ROOT}etc/"
+		einfo "    zaptel.conf.zaphfc"
+		einfo "    zaptel.conf.quadBRI"
+		einfo "    zaptel.conf.octoBRI"
+		einfo ""
+		einfo "${ROOT}etc/asterisk/"
+		einfo "    zapata.conf.zaphfc"
+		einfo "    zapata.conf.quadBRI"
+		einfo "    zapata.conf.octoBRI"
+		echo
+	fi
+
+	# fix permissions if there's no udev / devfs around
+	if [[ -d ${ROOT}dev/zap ]]; then
+		chown -R root:dialout	${ROOT}dev/zap
+		chmod -R u=rwX,g=rwX,o= ${ROOT}dev/zap
+	fi
+}