Removing old version

(Portage version: 2.0.51.19)

5 files changed, 6 insertions, 395 deletions

diff --git a/net-misc/zaptel/ChangeLog b/net-misc/zaptel/ChangeLog
index 3d0f5baa5768..9cb3e4868832 100644
--- a/net-misc/zaptel/ChangeLog
+++ b/net-misc/zaptel/ChangeLog
@@ -1,6 +1,11 @@
 # 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.50 2005/07/12 20:54:40 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.51 2005/07/25 22:31:20 stkn Exp $
+
+  26 Jul 2005; <stkn@gentoo.org>
+  -files/zaptel-0.9.1-experimental-devfs26.diff,
+  -files/zaptel-0.9.1-modulesd.diff, -zaptel-0.9.1.ebuild:
+  Removing old version.
 
   12 Jul 2005; Stefan Knoblich <stkn@gentoo.org> zaptel-1.0.3.ebuild,
   zaptel-1.0.4-r1.ebuild, zaptel-1.0.4.ebuild, zaptel-1.0.6-r1.ebuild,
diff --git a/net-misc/zaptel/files/digest-zaptel-0.9.1 b/net-misc/zaptel/files/digest-zaptel-0.9.1
deleted file mode 100644
index cb250fd5c37d..000000000000
--- a/net-misc/zaptel/files/digest-zaptel-0.9.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8833bdaf0670b4b5f48e4823887be8d5 zaptel-0.9.1.tar.gz 291865
diff --git a/net-misc/zaptel/files/zaptel-0.9.1-experimental-devfs26.diff b/net-misc/zaptel/files/zaptel-0.9.1-experimental-devfs26.diff
deleted file mode 100644
index 62db79720ad8..000000000000
--- a/net-misc/zaptel/files/zaptel-0.9.1-experimental-devfs26.diff
+++ /dev/null
@@ -1,221 +0,0 @@
-diff -Naurp -x .svn zaptel-0.9.1/zaptel.c zaptel-0.9.1-devfs26/zaptel.c
---- zaptel-0.9.1/zaptel.c	2004-04-09 19:55:31.000000000 +0200
-+++ zaptel-0.9.1-devfs26/zaptel.c	2004-05-04 23:17:44.243915848 +0200
-@@ -137,12 +137,14 @@ static struct proc_dir_entry *proc_entri
- 
- /* 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
- /* There is a table like this in the PPP driver, too */
- 
- static int deftaps = 64;
-@@ -1062,6 +1064,7 @@ static void zt_set_law(struct zt_chan *c
- }
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- static devfs_handle_t register_devfs_channel(struct zt_chan *chan, devfs_handle_t dir)
- {
- 	char path[100];
-@@ -1104,6 +1107,28 @@ static devfs_handle_t register_devfs_cha
- 
- 	return chan_dev;
- }
-+#else
-+static dev_t register_devfs_channel(struct zt_chan *chan, dev_t dir)
-+{
-+	char path[100];
-+	char link[100];
-+	dev_t chan_dev;
-+	umode_t mode = S_IFCHR|S_IRUGO|S_IWUGO;
-+
-+	/* create /dev/zap/span%d/%d channel device node */
-+	if ((chan_dev = devfs_mk_cdev(MKDEV(ZT_MAJOR, chan->channo), mode, "zap/span%d/%d", dir, chan->chanpos)) < 0) {
-+                printk("zaptel: Something really bad happened.  Unable to register devfs entry\n");
-+                return 0;
-+	}
-+
-+	/* link /dev/zap/span%d/%d -> /dev/zap/%d ?!? */
-+	sprintf(path, "zap/span%d/%d", dir, chan->chanpos);
-+	sprintf(link, "zap/%d", chan->chanpos);
-+	devfs_mk_symlink(link, path);
-+
-+	return chan_dev;
-+}
-+#endif
- #endif /* CONFIG_DEVFS_FS */
- 
- static int zt_chan_reg(struct zt_chan *chan)
-@@ -4111,6 +4136,7 @@ int zt_register(struct zt_span *span, in
- #endif
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	{
- 		char span_name[50];
- 		sprintf(span_name, "span%d", span->spanno);
-@@ -4120,6 +4146,15 @@ int zt_register(struct zt_span *span, in
- 			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 */
- 
- 	if (debug)
-@@ -4159,11 +4194,22 @@ int zt_unregister(struct zt_span *span)
-         remove_proc_entry(tempfile, NULL);
- #endif /* CONFIG_PROC_FS */
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	for (x = 0; x < span->channels; x++) {
- 		devfs_unregister(span->chans[x].fhandle);
- 		devfs_unregister(span->chans[x].fhandle_symlink);
- 	}
- 	devfs_unregister(span->dhandle);
-+#else
-+	for (x = 0; x < span->channels; x++) {
-+		/* remove symlink first */
-+		devfs_remove("zap/span%d/%d", span->spanno, span->chans[x].chanpos);
-+		/* remove channel device */
-+		devfs_remove("zap/%d", span->chans[x].chanpos);
-+	}
-+	/* remove span dir */
-+	devfs_remove("zap/span%d", span->spanno);
-+#endif
- #endif /* CONFIG_DEVFS_FS */
- 	spans[span->spanno] = NULL;
- 	span->spanno = 0;
-@@ -6016,6 +6062,7 @@ static int __init zt_init(void) {
- 	proc_entries[0] = proc_mkdir("zaptel", NULL);
- #endif
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	{
- 	umode_t mode = S_IFCHR|S_IRUGO|S_IWUGO;
- 	devfs_register_chrdev(ZT_MAJOR, "zaptel", &zt_fops);
-@@ -6027,6 +6074,22 @@ static int __init zt_init(void) {
- 	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;
-@@ -6057,6 +6120,7 @@ static void __exit zt_cleanup(void) {
- 		if (tone_zones[x])
- 			kfree(tone_zones[x]);
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	devfs_unregister(timer);
- 	devfs_unregister(channel);
- 	devfs_unregister(pseudo);
-@@ -6065,6 +6129,16 @@ static void __exit zt_cleanup(void) {
- 	devfs_unregister_chrdev(ZT_MAJOR, "zaptel");
- #else
- 	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();
-diff -Naurp -x .svn zaptel-0.9.1/zaptel.h zaptel-0.9.1-devfs26/zaptel.h
---- zaptel-0.9.1/zaptel.h	2004-03-26 08:44:19.000000000 +0100
-+++ zaptel-0.9.1-devfs26/zaptel.h	2004-05-04 23:16:07.000000000 +0200
-@@ -46,14 +46,13 @@
- 
- #include "ecdis.h"
- #include "fasthdlc.h"
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#define LINUX26
- #endif
-+#endif /* __KERNEL__ */
- #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>
- 
-@@ -61,6 +60,8 @@
- #define ELAST 500
- #endif
- 
-+
-+
- /* Per-span configuration values */
- #define	ZT_CONFIG_TXLEVEL	7	/* bits 0-2 are tx level */
- 
-@@ -1089,8 +1090,10 @@ struct zt_chan {
- #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 */
- };
- 
-@@ -1219,7 +1222,9 @@ struct zt_span {
- 	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 */
-@@ -1404,10 +1409,6 @@ static inline short zt_txtone_nextsample
- 
- #endif /* CONFIG_CALC_XLAW */
- 
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
--#define LINUX26
--#endif
--
- #endif /* __KERNEL__ */
- 
- #endif /* _LINUX_ZAPTEL_H */
diff --git a/net-misc/zaptel/files/zaptel-0.9.1-modulesd.diff b/net-misc/zaptel/files/zaptel-0.9.1-modulesd.diff
deleted file mode 100644
index 3c9d2f8de4d1..000000000000
--- a/net-misc/zaptel/files/zaptel-0.9.1-modulesd.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- Makefile.orig	2004-05-03 01:10:37.392241008 +0200
-+++ Makefile	2004-05-03 01:11:30.235207656 +0200
-@@ -33,7 +33,8 @@
- INSTALL_PREFIX=
- 
- BUILDVER=$(shell if uname -r | grep -q ^2.6; then echo "linux26"; else echo "linux24"; fi)
--MODCONF=$(shell if [ -d $(INSTALL_PREFIX)/etc/modprobe.d ]; then echo "$(INSTALL_PREFIX)/etc/modprobe.d/zaptel"; elif [ -d $(INSTALL_PREFIX)/etc/modutils ]; then echo "$(INSTALL_PREFIX)/etc/modutils/zaptel"; elif [ -f $(INSTALL_PREFIX)/etc/modprobe.conf ]; then echo "$(INSTALL_PREFIX)/etc/modprobe.conf"; elif [ -f $(INSTALL_PREFIX)/etc/modules.conf ]; then echo "$(INSTALL_PREFIX)/etc/modules.conf"; else echo $(INSTALL_PREFIX)/etc/conf.modules ; fi)
-+# Patch for Gentoo, uses modules.d
-+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
-@@ -272,6 +273,7 @@
- 	install -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include
- 	( cd $(INSTALL_PREFIX)/usr/lib ; rm -f libtonezone.so ; ln -sf $(LIBTONEZONE) libtonezone.so )
- 	/sbin/ldconfig
-+	mkdir -p $(INSTALL_PREFIX)/etc/modules.d
- 	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" | \
-@@ -296,10 +298,6 @@
- 		fi; \
- 	done
- 
--	if [ -d /etc/modutils ]; then \
--		/sbin/update-modules ; \
--	fi
--	-/sbin/depmod -a
- 	[ -f $(INSTALL_PREFIX)/etc/zaptel.conf ] || install -m 644 zaptel.conf.sample $(INSTALL_PREFIX)/etc/zaptel.conf
- 
- config:
---- Makefile.orig	2004-05-03 01:16:52.352238424 +0200
-+++ Makefile	2004-05-03 01:17:09.821582680 +0200
-@@ -64,8 +64,7 @@
- 
- linux26: 
- linux26: prereq $(BINS)
--	@if ! [ -d /usr/src/linux-2.6 ]; then echo "Link /usr/src/linux-2.6 to your kernel sources first!"; exit 1 ; fi
--	make -C /usr/src/linux-2.6 SUBDIRS=$(PWD) modules
-+	make -C /usr/src/linux SUBDIRS=$(PWD) modules
- 
- obj-m := $(MODULESO)
- 
diff --git a/net-misc/zaptel/zaptel-0.9.1.ebuild b/net-misc/zaptel/zaptel-0.9.1.ebuild
deleted file mode 100644
index d740ce9a4bec..000000000000
--- a/net-misc/zaptel/zaptel-0.9.1.ebuild
+++ /dev/null
@@ -1,129 +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-0.9.1.ebuild,v 1.8 2005/01/05 01:49:19 stkn Exp $
-
-inherit eutils
-
-IUSE="devfs26"
-
-DESCRIPTION="Pseudo-TDM engine"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="ftp://ftp.asterisk.org/pub/telephony/zaptel/old/zaptel-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
-
-DEPEND="virtual/libc
-	virtual/linux-sources
-	>=dev-libs/newt-0.50.0"
-
-# hardcoded for now,
-# change if other archs are supported (unlikely)
-MY_ARCH="i386"
-
-pkg_setup() {
-	einfo "Please make sure that your kernel has the appropriate"
-	einfo "ppp support enabled or present as modules before merging"
-	einfo "e.g."
-	einfo "CONFIG_PPP=m"
-	einfo "CONFIG_PPP_ASYNC=m"
-	einfo "CONFIG_PPP_DEFLATE=m"
-	einfo "CONFIG_PPPOE=m"
-	einfo "Otherwise quit this ebuild, rebuild your kernel and reboot"
-
-	# show an nice warning message about zaptel not supporting devfs on 2.6
-	if [ $(echo $KV | cut -d. -f1) -eq 2 ] && [ $(echo $KV|cut -d. -f2) -eq 6 ]; then
-		echo
-		einfo "You're using zaptel with linux-2.6:"
-		ewarn "   Zaptel doesn't support devfs with 2.6, you'll need to use udev or disable devfs"
-		ewarn "   or use devfs and write a script which re-creates the device nodes for you"
-		echo
-		ewarn "There's an experimental patch which adds devfs support when using linux-2.6, but:"
-		ewarn "  1. It's an ugly hack atm and needs a cleanup..."
-		ewarn "  2. I was only abled to test loding / unloading with the ztd-eth driver..."
-		ewarn "  3. I _really_ don't know if it works with real hardware..."
-		echo
-		eerror "  4. And more important: This is not officially supported by Digium / the Asterisk project!!!"
-		echo
-		ewarn "If you're still interested, abort now (ctrl+c) and enable the devfs26 USE-flag"
-		einfo "Feedback and bug-reports should go to: stkn@gentoo.org"
-		echo
-		ewarn "You have been warned!"
-
-		echo
-		einfo "Sleeping 30 Seconds..."
-		epause 30
-	else
-		echo
-		einfo "Sleeping 10 Seconds..."
-		epause 10
-	fi
-
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-mkdir-usrincludelinux.patch
-
-	# >= 0.9.1 requires new patch
-	epatch ${FILESDIR}/${P}-modulesd.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}/${P}-experimental-devfs26.diff
-	fi
-}
-
-src_compile() {
-	# workaround for 2.6 build system
-	if [ $(echo $KV | cut -d. -f1) -eq 2 ] && [ $(echo $KV|cut -d. -f2) -eq 6 ]; then
-		einfo "Enabled 2.6 module building workaround..."
-		addwrite /usr/src/linux
-	fi
-
-	if use x86; then
-		make ARCH=${MY_ARCH} || die
-	else
-		make || die
-	fi
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} install || die
-
-	dodoc ChangeLog README README.Linux26 README.fxsusb zaptel.init zaptel.sysconfig
-	dodoc zaptel.conf.sample
-
-	dobin ztmonitor ztspeed
-
-	# install init script
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/zaptel.rc6 zaptel
-	insinto /etc/conf.d
-	newins ${FILESDIR}/zaptel.confd zaptel
-
-	# remove device files if devfs is running
-	if [ -f /dev/.devfsd ]; then
-		rm -rf ${D}/dev
-	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
-}