version bump thanks to kolla and stkn for help, clean up old

(Portage version: 2.1.2_pre2-r1)
 (Unsigned Manifest commit)

12 files changed, 0 insertions, 759 deletions

diff --git a/net-misc/zaptel/files/digest-zaptel-1.0.7-r1 b/net-misc/zaptel/files/digest-zaptel-1.0.7-r1
deleted file mode 100644
index eb0dc1c057ab..000000000000
--- a/net-misc/zaptel/files/digest-zaptel-1.0.7-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 7a5ff01d3befff1fbd3de1c303cb10d1 bristuff-0.2.0-RC8g.tar.gz 139013
-RMD160 c0a037e0819b8985be2df60a010309335527f203 bristuff-0.2.0-RC8g.tar.gz 139013
-SHA256 19a0a7fdbb192fed4ea086251d5653abbe8525232dd5b613f9366400c97b213b bristuff-0.2.0-RC8g.tar.gz 139013
-MD5 cc91bd69d6e880f89a1f95a27aa714c9 zaphfc_0.2.0-RC8a_florz-6.diff.gz 10428
-RMD160 59117c086427dc30e10730900952e00063b4c01c zaphfc_0.2.0-RC8a_florz-6.diff.gz 10428
-SHA256 175541f22c725d9b2c32249b44e918e6335bc2c1fe1830a8c76d19c6d5a2ae46 zaphfc_0.2.0-RC8a_florz-6.diff.gz 10428
-MD5 d043f54f38b6262ab3cd5599982a7032 zaptel-1.0.7.tar.gz 316693
-RMD160 999240424d743f0b7f47aaaedea37f241d971147 zaptel-1.0.7.tar.gz 316693
-SHA256 0d42b52642c8803c90186dfa568489a598df61903238e94051b51739bc68217e zaptel-1.0.7.tar.gz 316693
diff --git a/net-misc/zaptel/files/digest-zaptel-1.0.8 b/net-misc/zaptel/files/digest-zaptel-1.0.8
deleted file mode 100644
index d568eb28f05c..000000000000
--- a/net-misc/zaptel/files/digest-zaptel-1.0.8
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 3b264a75b1a17735572920655bf1a0f8 bristuff-0.2.0-RC8h.tar.gz 150270
-RMD160 a958bc8418618ca892f0fbdb8d8cf203375d3865 bristuff-0.2.0-RC8h.tar.gz 150270
-SHA256 74c2e40cd665a2a9ac29d5ddd31892c8ca15ca9b55e2a08523e9db5ca75ba207 bristuff-0.2.0-RC8h.tar.gz 150270
-MD5 cc91bd69d6e880f89a1f95a27aa714c9 zaphfc_0.2.0-RC8a_florz-6.diff.gz 10428
-RMD160 59117c086427dc30e10730900952e00063b4c01c zaphfc_0.2.0-RC8a_florz-6.diff.gz 10428
-SHA256 175541f22c725d9b2c32249b44e918e6335bc2c1fe1830a8c76d19c6d5a2ae46 zaphfc_0.2.0-RC8a_florz-6.diff.gz 10428
-MD5 5553225a5c536231d9d7d23112d1bd11 zaptel-1.0.8.tar.gz 326128
-RMD160 f55ecfa8a8263b9342e2a0e7625c8e6083165880 zaptel-1.0.8.tar.gz 326128
-SHA256 a3ffc91f246c8d2092d6022d78479e305879dca1a2b409217cbe080c3c9b4853 zaptel-1.0.8.tar.gz 326128
diff --git a/net-misc/zaptel/files/digest-zaptel-1.0.9_p2 b/net-misc/zaptel/files/digest-zaptel-1.0.9_p2
deleted file mode 100644
index ce808f053e0b..000000000000
--- a/net-misc/zaptel/files/digest-zaptel-1.0.9_p2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 a6b5c61c16b35f02c616c8abadb9999d bristuff-0.2.0-RC8n.tar.gz 143979
-RMD160 922b6b807bb48aa690412de3916eeb54c1454486 bristuff-0.2.0-RC8n.tar.gz 143979
-SHA256 a92d9d8e9777c0637d2db0375794fe011fd8ecf1461f0b8e6587c74670da637c bristuff-0.2.0-RC8n.tar.gz 143979
-MD5 717f869f45ec20ceda216285cd90455a zaphfc_0.2.0-RC8j_florz-8.diff.gz 10559
-RMD160 81d490557da7dcb3771022d590b2fa69871d2662 zaphfc_0.2.0-RC8j_florz-8.diff.gz 10559
-SHA256 20aa0da6008ac9ebf989db0f1a8c052d1c86b5444ec28c8c1dd7779ba5627309 zaphfc_0.2.0-RC8j_florz-8.diff.gz 10559
-MD5 4d9dc3afbe7e61c557115bd5442d3e5e zaptel-1.0.9.2.tar.gz 327362
-RMD160 22fb125e6a4e93b4d05a01c6ead99a58a4bf3e31 zaptel-1.0.9.2.tar.gz 327362
-SHA256 2734767ef00d6ddba8dba74801975d56082a48bb5e4c8299aa08210d73d09803 zaptel-1.0.9.2.tar.gz 327362
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.5 b/net-misc/zaptel/files/digest-zaptel-1.2.5
deleted file mode 100644
index 91a39f7073c2..000000000000
--- a/net-misc/zaptel/files/digest-zaptel-1.2.5
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 a0c78e7676acbc06b26d2c68ef3e0c86 bristuff-0.3.0-PRE-1n.tar.gz 248488
-RMD160 3da3043a88551578b4495ae8e54ffb6a4f3bfd2c bristuff-0.3.0-PRE-1n.tar.gz 248488
-SHA256 31b894bdd2741e309dfed23963db1cda3d74a8d616de8df9f1281b5558aa27f1 bristuff-0.3.0-PRE-1n.tar.gz 248488
-MD5 8e072de546cce9db77a65036819361a4 zaphfc_0.3.0-PRE-1n_florz-11.diff.gz 10647
-RMD160 31f1f82a5452bafa191b2023cfa559b8431786c6 zaphfc_0.3.0-PRE-1n_florz-11.diff.gz 10647
-SHA256 923f6f8fa8a520d14978aab5ff2911234e587bee1fae085f76fb992ed9e1f9b1 zaphfc_0.3.0-PRE-1n_florz-11.diff.gz 10647
-MD5 8c8561259d29a314aa5a076050124697 zaptel-1.2.5.tar.gz 673161
-RMD160 7de580a8424b436d77504501ef59c47f2498e04d zaptel-1.2.5.tar.gz 673161
-SHA256 8a80ccd9b2852de8a0ccf0036819d8e5cc0f73516f1fdcee3392c813a26ada5c zaptel-1.2.5.tar.gz 673161
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.5-r1 b/net-misc/zaptel/files/digest-zaptel-1.2.5-r1
deleted file mode 100644
index ac29b0152e3e..000000000000
--- a/net-misc/zaptel/files/digest-zaptel-1.2.5-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 93bb8a5661aaf3022cf4a102ea061f83 bristuff-0.3.0-PRE-1o.tar.gz 252770
-RMD160 60f1656a815bd1ff7d86ca7cb657c1d850a84804 bristuff-0.3.0-PRE-1o.tar.gz 252770
-SHA256 aec95d12959181b601d7d10f05bb16eff715859dc8ea9fbb10e670296f61b6e9 bristuff-0.3.0-PRE-1o.tar.gz 252770
-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 8c8561259d29a314aa5a076050124697 zaptel-1.2.5.tar.gz 673161
-RMD160 7de580a8424b436d77504501ef59c47f2498e04d zaptel-1.2.5.tar.gz 673161
-SHA256 8a80ccd9b2852de8a0ccf0036819d8e5cc0f73516f1fdcee3392c813a26ada5c zaptel-1.2.5.tar.gz 673161
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.6 b/net-misc/zaptel/files/digest-zaptel-1.2.6
deleted file mode 100644
index 963775db42e2..000000000000
--- a/net-misc/zaptel/files/digest-zaptel-1.2.6
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 842636e711ff9d9977099db5af091fd7 bristuff-0.3.0-PRE-1p.tar.gz 254003
-RMD160 e87c0289bc598b52b962d192bc54008edc9b38a9 bristuff-0.3.0-PRE-1p.tar.gz 254003
-SHA256 d7dbb352ac68d64458919b94f815c8c97418c54fa8ae5411084370325528c164 bristuff-0.3.0-PRE-1p.tar.gz 254003
-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 c6058b74f43ae12a29e486cf1e919562 zaptel-1.2.6.tar.gz 676658
-RMD160 599cf3c78bb5b71a921dea9ca4716131224cd872 zaptel-1.2.6.tar.gz 676658
-SHA256 24cd078469f2a3f131c3d28977f88426a45d9810f5a5d22109d5d57e43320938 zaptel-1.2.6.tar.gz 676658
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.8 b/net-misc/zaptel/files/digest-zaptel-1.2.8
deleted file mode 100644
index 1d93851cc785..000000000000
--- a/net-misc/zaptel/files/digest-zaptel-1.2.8
+++ /dev/null
@@ -1,9 +0,0 @@
-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 f79ba7a843f86b1a072d808b712b8d44 zaptel-1.2.8.tar.gz 1139177
-RMD160 89d69ab74b3d460c87ef9b6536a68b453ea59447 zaptel-1.2.8.tar.gz 1139177
-SHA256 e1b41e13e6ff2cfd99ef47ab5a872fca8e19d73ebfde4db6bd7d33c5e452bac3 zaptel-1.2.8.tar.gz 1139177
diff --git a/net-misc/zaptel/files/zaptel-1.2.0-devfs26.diff b/net-misc/zaptel/files/zaptel-1.2.0-devfs26.diff
deleted file mode 100644
index d9cfef230180..000000000000
--- a/net-misc/zaptel/files/zaptel-1.2.0-devfs26.diff
+++ /dev/null
@@ -1,220 +0,0 @@
---- zaptel-1.2.0-beta2/zaptel.c.orig	2005-10-04 20:34:36.000000000 +0000
-+++ zaptel-1.2.0-beta2/zaptel.c	2005-11-07 21:08:39.000000000 +0000
-@@ -148,12 +148,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
-@@ -1123,6 +1125,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];
-@@ -1165,6 +1168,36 @@
- 
- 	return chan_dev;
- }
-+#else
-+static dev_t register_devfs_channel(struct zt_chan *chan, dev_t dir)
-+{
-+#ifdef HAS_DEVFS_MK_SYMLINK
-+	char link[100];
-+	char path[100];
-+#endif
-+	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;
-+	}
-+
-+#ifdef HAS_DEVFS_MK_SYMLINK
-+	/* link /dev/zap/span%d/%d -> /dev/zap/%d ?!? */
-+	sprintf(path, "zap/span%d/%d", dir, chan->chanpos);
-+	sprintf(link, "zap/%d", chan->channo);
-+	devfs_mk_symlink(link, path);
-+#else
-+	/* register /dev/zap/%d channel node directly */
-+	if(devfs_mk_cdev(MKDEV(ZT_MAJOR, chan->channo), mode, "zap/%d", chan->channo) < 0) {
-+		printk("zaptel: Unable to register compat devfs entry\n");
-+	}
-+#endif
-+	return chan_dev;
-+}
-+#endif
- #endif /* CONFIG_DEVFS_FS */
- 
- static int zt_chan_reg(struct zt_chan *chan)
-@@ -4429,6 +4462,7 @@
- #endif
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	{
- 		char span_name[50];
- 		sprintf(span_name, "span%d", span->spanno);
-@@ -4438,6 +4472,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
-@@ -4485,11 +4528,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/compat device first */
-+		devfs_remove("zap/%d", span->chans[x].channo);
-+		/* remove channel device */
-+		devfs_remove("zap/span%d/%d", span->spanno, span->chans[x].chanpos);
-+	}
-+	/* remove span dir */
-+	devfs_remove("zap/span%d", span->spanno);
-+#endif
- #endif /* CONFIG_DEVFS_FS */
- 
- #ifdef CONFIG_ZAP_UDEV
-@@ -6510,6 +6564,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);
-@@ -6521,6 +6576,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;
-@@ -6551,6 +6622,7 @@
- 		if (tone_zones[x])
- 			kfree(tone_zones[x]);
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	devfs_unregister(timer);
- 	devfs_unregister(channel);
- 	devfs_unregister(pseudo);
-@@ -6566,6 +6638,16 @@
- 	class_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.2.0-beta2/zaptel.h.orig	2005-10-27 16:05:07.000000000 +0000
-+++ zaptel-1.2.0-beta2/zaptel.h	2005-11-07 21:08:39.000000000 +0000
-@@ -52,18 +52,17 @@
- #define zap_pci_module pci_register_driver
- #else
- #define zap_pci_module pci_module_init
-+/* devfs_mk_symlink has been removed in 2.6.10 */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
-+#define HAS_DEVFS_MK_SYMLINK
-+#endif
- #endif
- 
- #include "ecdis.h"
- #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>
- 
-@@ -71,6 +70,8 @@
- #define ELAST 500
- #endif
- 
-+
-+
- /* Per-span configuration values */
- #define	ZT_CONFIG_TXLEVEL	7	/* bits 0-2 are tx level */
- 
-@@ -1172,8 +1173,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 */
- };
- 
-@@ -1309,7 +1312,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.2.1-gentoo.diff b/net-misc/zaptel/files/zaptel-1.2.1-gentoo.diff
deleted file mode 100644
index 9cf6c0a83fc7..000000000000
--- a/net-misc/zaptel/files/zaptel-1.2.1-gentoo.diff
+++ /dev/null
@@ -1,117 +0,0 @@
---- zaptel-1.2.1/Makefile.orig	2005-12-04 20:29:27.000000000 +0100
-+++ zaptel-1.2.1/Makefile	2005-12-14 19:45:38.000000000 +0100
-@@ -21,7 +21,7 @@
- endif
- KINCLUDES:=$(KSRC)/include
- 
--CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
-+CFLAGS+=-I. -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)
-@@ -55,31 +55,7 @@
-   BUILDVER:=linux24
- endif
- 
--ifeq ($(BUILDVER),linux26)
--  ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modprobe.d))
--    MODCONF:=$(ROOT_PREFIX)/etc/modprobe.d/zaptel
--  else
--    ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modules.d))
--      MODCONF:=$(ROOT_PREFIX)/etc/modules.d/zaptel
--    else
--      ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modprobe.conf))
--        MODCONF:=$(ROOT_PREFIX)/etc/modprobe.conf
--      else
--        ifneq (,$(wildcard $(ROOT_PREFIX)/etc/conf.modules))
--          MODCONF:=$(ROOT_PREFIX)/etc/conf.modules
--        endif
--      endif
--    endif
--  endif
--else # BUILDVER == linux24
--  ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modutils))
--    MODCONF:=$(ROOT_PREFIX)/etc/modutils/zaptel
--   else
--    ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modules.conf))
--      MODCONF:=$(ROOT_PREFIX)/etc/modules.conf
--     endif
--  endif
--endif
-+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
-@@ -87,7 +63,7 @@
- endif
- ifeq (${BUILDVER},linux26)
- #Tests for newer linux-2.6 udev support
--DYNFS:=$(shell ps ax | grep -v grep | grep udevd && echo "yes")
-+DYNFS:=$(shell ps ax | grep -v grep | grep -q udevd && echo "yes")
- endif
- 
- CHKCONFIG:=$(shell sh -c 'type -p chkconfig' 2> /dev/null)
-@@ -302,7 +278,7 @@
- 	@echo "**** If you are running udev, read README.udev"
- endif
- 
--install: all devices
-+install: devices
- 	install -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg
- 	if [ -f sethdlc-new ]; then \
- 		install -D -m 755 sethdlc-new $(INSTALL_PREFIX)/sbin/sethdlc; \
-@@ -329,39 +305,22 @@
- 		rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxs.o; \
- 	fi
- 	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) $(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
-+	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
-+	if [ ! -d `dirname $(MODCONF)` ]; then install -d -m 755 `dirname $(MODCONF)` ; fi
- 	if [ -n "$(MODCONF)" ]; then \
--		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" | \
--		grep -v "post-install wcfxsusb /sbin/ztcfg" | \
--		grep -v "alias wctdm" | \
--		grep -v "post-install wctdm /sbin/ztcfg" > $(MODCONF); \
- 		if ! grep "options torisa" $(MODCONF); then \
- 			echo "options torisa base=$(BASEADDR)" >> $(MODCONF); \
- 		fi; \
- 		if ! grep "alias char-major-196" $(MODCONF); then \
- 			echo "alias char-major-196 $(PRIMARY)" >> $(MODCONF); \
- 		fi; \
--		for x in $(MODULES); do \
--			if ! grep -q "post-install $$x" $(MODCONF); then \
--				if ! grep -q "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 ! grep "ias wcfxs" $(MODCONF); then \
- 			echo "alias wcfxs wctdm" >> $(MODCONF); \
- 		fi; \
-@@ -369,10 +328,6 @@
- 			echo "alias wct2xxp wct4xxp" >> $(MODCONF); \
- 		fi; \
- 	fi
--	if [ -d /etc/modutils ]; then \
--		/sbin/update-modules ; \
--	fi
--	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
- 	[ -f $(CONFIG_FILE) ] || install -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
- 
- install-udev:
diff --git a/net-misc/zaptel/files/zaptel-1.2.2-gentoo.diff b/net-misc/zaptel/files/zaptel-1.2.2-gentoo.diff
deleted file mode 100644
index 960e98bcc328..000000000000
--- a/net-misc/zaptel/files/zaptel-1.2.2-gentoo.diff
+++ /dev/null
@@ -1,166 +0,0 @@
---- zaptel-1.2.2/Makefile.orig	2006-01-19 00:04:48.000000000 +0100
-+++ zaptel-1.2.2/Makefile	2006-01-19 00:09:24.000000000 +0100
-@@ -21,7 +21,7 @@
- endif
- KINCLUDES:=$(KSRC)/include
- 
--CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
-+CFLAGS+=-I. -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)
-@@ -55,31 +55,7 @@
-   BUILDVER:=linux24
- endif
- 
--ifeq ($(BUILDVER),linux26)
--  ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modprobe.d))
--    MODCONF:=$(ROOT_PREFIX)/etc/modprobe.d/zaptel
--  else
--    ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modules.d))
--      MODCONF:=$(ROOT_PREFIX)/etc/modules.d/zaptel
--    else
--      ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modprobe.conf))
--        MODCONF:=$(ROOT_PREFIX)/etc/modprobe.conf
--      else
--        ifneq (,$(wildcard $(ROOT_PREFIX)/etc/conf.modules))
--          MODCONF:=$(ROOT_PREFIX)/etc/conf.modules
--        endif
--      endif
--    endif
--  endif
--else # BUILDVER == linux24
--  ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modutils))
--    MODCONF:=$(ROOT_PREFIX)/etc/modutils/zaptel
--   else
--    ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modules.conf))
--      MODCONF:=$(ROOT_PREFIX)/etc/modules.conf
--     endif
--  endif
--endif
-+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
-@@ -87,8 +63,8 @@
- endif
- 
- ifeq (${BUILDVER},linux26)
-+  DYNFS:=$(shell ps ax | grep -v grep | grep -q "devfsd\|udevd" && echo "yes")
-   ifneq (,$(wildcard $(ROOT_PREFIX)/etc/udev/rules.d))
--    DYNFS=yes
-     UDEVRULES=yes
-     ifneq (,$(wildcard $(ROOT_PREFIX)/etc/udev/permissions.d))
-       UDEVPERMISSIONS=yes
-@@ -328,17 +304,17 @@
- else # DYNFS
-   ifdef UDEVRULES
-     ifdef UDEVPERMISSIONS
--	install -m 444 udev/zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d
--	install -m 444 udev/zaptel.permissions $(INSTALL_PREFIX)/etc/udev/permissions.d
-+	install -D -m 444 udev/zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d/10-zaptel.rules
-+	install -D -m 444 udev/zaptel.permissions $(INSTALL_PREFIX)/etc/udev/permissions.d/10-zaptel.permissions
-     else # !UDEVPERMISSIONS (newer, combined syntax)
--	install -m 444 udev/zaptel.rules-combined $(INSTALL_PREFIX)/etc/udev/rules.d/zaptel.rules
-+	install -D -m 444 udev/zaptel.rules-combined $(INSTALL_PREFIX)/etc/udev/rules.d/10-zaptel.rules
-     endif
-   else # !UDEVRULES
- 	@echo "**** Dynamic filesystem detected -- not creating device nodes"
-   endif
- endif
- 
--install: all devices
-+install: devices
- 	install -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg
- 	if [ -f sethdlc-new ]; then \
- 		install -D -m 755 sethdlc-new $(INSTALL_PREFIX)/sbin/sethdlc; \
-@@ -365,42 +341,25 @@
- 		rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxs.o; \
- 	fi
- 	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
-+	install -D -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8/ztcfg.8
-+	install -D -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8/zttool.8
-+	if [ ! -d `dirname $(MODCONF)` ]; then install -d -m 755 `dirname $(MODCONF)` ; fi
- 	if [ -n "$(MODCONF)" ]; then \
--		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" | \
--		grep -v "post-install wcfxsusb /sbin/ztcfg" | \
--		grep -v "alias wctdm" | \
--		grep -v "post-install wctdm /sbin/ztcfg" > $(MODCONF); \
- 		if ! grep "options torisa" $(MODCONF); then \
- 			echo "options torisa base=$(BASEADDR)" >> $(MODCONF); \
- 		fi; \
- 		if ! grep "alias char-major-196" $(MODCONF); then \
- 			echo "alias char-major-196 $(PRIMARY)" >> $(MODCONF); \
- 		fi; \
--		for x in $(MODULES); do \
--			if ! grep -q "post-install $$x" $(MODCONF); then \
--				if ! grep -q "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 ! grep "ias wcfxs" $(MODCONF); then \
- 			echo "alias wcfxs wctdm" >> $(MODCONF); \
- 		fi; \
-@@ -408,19 +367,15 @@
- 			echo "alias wct2xxp wct4xxp" >> $(MODCONF); \
- 		fi; \
- 	fi
--	if [ -d /etc/modutils ]; then \
--		/sbin/update-modules ; \
--	fi
--	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
- 	[ -f $(CONFIG_FILE) ] || install -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
- 
- install-udev:
-   ifdef UDEVRULES
-     ifdef UDEVPERMISSIONS
--	install -m 444 udev/zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d
--	install -m 444 udev/zaptel.permissions $(INSTALL_PREFIX)/etc/udev/permissions.d
-+	install -D -m 444 udev/zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d/10-zaptel.rules
-+	install -D -m 444 udev/zaptel.permissions $(INSTALL_PREFIX)/etc/udev/permissions.d/10-zaptel.permissions
-     else # !UDEVPERMISSIONS (newer, combined syntax)
--	install -m 444 udev/zaptel.rules-combined $(INSTALL_PREFIX)/etc/udev/rules.d/zaptel.rules
-+	install -D -m 444 udev/zaptel.rules-combined $(INSTALL_PREFIX)/etc/udev/rules.d/10-zaptel.rules
-     endif
-   endif
- 
---- zaptel-1.2.2/udev/zaptel.permissions.orig	2006-01-19 00:11:04.000000000 +0100
-+++ zaptel-1.2.2/udev/zaptel.permissions	2006-01-19 00:11:17.000000000 +0100
-@@ -1,2 +1,2 @@
- # zaptel devices -- for running asterisk as non-root
--zap/*:asterisk:asterisk:660
-+zap/*:root:dialout:660
---- zaptel-1.2.2/udev/zaptel.rules-combined.orig	2006-01-19 00:11:25.000000000 +0100
-+++ zaptel-1.2.2/udev/zaptel.rules-combined	2006-01-19 00:12:12.000000000 +0100
-@@ -1,6 +1,6 @@
- # zaptel devices with ownership/permissions for running as non-root
--KERNEL="zapctl",     NAME="zap/ctl", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL="zaptimer",   NAME="zap/timer", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL="zapchannel", NAME="zap/channel", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL="zappseudo",  NAME="zap/pseudo", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL="zap[0-9]*",  NAME="zap/%n", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-+KERNEL="zapctl",     NAME="zap/ctl", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL="zaptimer",   NAME="zap/timer", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL="zapchannel", NAME="zap/channel", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL="zappseudo",  NAME="zap/pseudo", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL="zap[0-9]*",  NAME="zap/%n", OWNER="root", GROUP="dialout", MODE="0660"
diff --git a/net-misc/zaptel/files/zaptel-1.2.6-gentoo.diff b/net-misc/zaptel/files/zaptel-1.2.6-gentoo.diff
deleted file mode 100644
index cb666412d171..000000000000
--- a/net-misc/zaptel/files/zaptel-1.2.6-gentoo.diff
+++ /dev/null
@@ -1,91 +0,0 @@
---- zaptel-1.2.6/build_tools/genudevrules.orig	2006-06-04 15:57:29.000000000 +0200
-+++ zaptel-1.2.6/build_tools/genudevrules	2006-06-04 15:58:11.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
---- zaptel-1.2.6/build_tools/genmodconf.orig	2006-06-04 15:59:02.000000000 +0200
-+++ zaptel-1.2.6/build_tools/genmodconf	2006-06-04 15:59:13.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;
---- zaptel-1.2.6/Makefile.orig	2006-06-04 19:27:17.000000000 +0200
-+++ zaptel-1.2.6/Makefile	2006-06-04 19:28:11.000000000 +0200
-@@ -22,7 +22,7 @@
- endif
- KINCLUDES:=$(KSRC)/include
- 
--CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
-+CFLAGS+=-I. -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)
-@@ -294,7 +294,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
-@@ -323,24 +324,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 --git a/net-misc/zaptel/files/zaptel-1.2.7-gentoo.diff b/net-misc/zaptel/files/zaptel-1.2.7-gentoo.diff
deleted file mode 100644
index c3c1d234a8f6..000000000000
--- a/net-misc/zaptel/files/zaptel-1.2.7-gentoo.diff
+++ /dev/null
@@ -1,102 +0,0 @@
---- zaptel-1.2.7/Makefile.orig	2006-07-07 20:03:59.000000000 +0200
-+++ zaptel-1.2.7/Makefile	2006-07-17 19:52:09.000000000 +0200
-@@ -24,7 +24,7 @@
- endif
- KINCLUDES:=$(KSRC)/include
- 
--CFLAGS+=-I. -Iinclude -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)
-@@ -308,7 +308,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
-@@ -337,24 +338,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
- 
---- zaptel-1.2.6/build_tools/genudevrules.orig	2006-06-04 15:57:29.000000000 +0200
-+++ zaptel-1.2.6/build_tools/genudevrules	2006-06-04 15:58:11.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
---- zaptel-1.2.6/build_tools/genmodconf.orig	2006-06-04 15:59:02.000000000 +0200
-+++ zaptel-1.2.6/build_tools/genmodconf	2006-06-04 15:59:13.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;
---- zaptel-1.2.8/Makefile.orig	2006-09-05 23:34:53.000000000 +0000
-+++ zaptel-1.2.8/Makefile	2006-09-05 23:35:23.000000000 +0000
-@@ -337,7 +337,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; \