summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Vroon <chainsaw@gentoo.org>2011-09-02 09:03:34 +0000
committerTony Vroon <chainsaw@gentoo.org>2011-09-02 09:03:34 +0000
commit8ced29e84b8fc1b8dd1620e94ff6d26caf8c6014 (patch)
tree8c7587300b6c4e4205c3955e46d040297b0b8211 /net-misc/dahdi-tools
parentClean up old ebuilds and patches. (diff)
downloadgentoo-2-8ced29e84b8fc1b8dd1620e94ff6d26caf8c6014.tar.gz
gentoo-2-8ced29e84b8fc1b8dd1620e94ff6d26caf8c6014.tar.bz2
gentoo-2-8ced29e84b8fc1b8dd1620e94ff6d26caf8c6014.zip
Clean up old ebuilds and patches.
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/dahdi-tools')
-rw-r--r--net-misc/dahdi-tools/ChangeLog11
-rw-r--r--net-misc/dahdi-tools/dahdi-tools-2.1.0.2.ebuild33
-rw-r--r--net-misc/dahdi-tools/dahdi-tools-2.2.0-r1.ebuild39
-rw-r--r--net-misc/dahdi-tools/dahdi-tools-2.3.0.ebuild35
-rw-r--r--net-misc/dahdi-tools/dahdi-tools-2.4.0.ebuild46
-rw-r--r--net-misc/dahdi-tools/files/dahdi-tools-2.1.0.2-asneeded.patch33
-rw-r--r--net-misc/dahdi-tools/files/dahdi-tools-2.2.0-ifreq.patch12
-rw-r--r--net-misc/dahdi-tools/files/dahdi-tools-2.2.0-modprobe-suffix.patch14
-rw-r--r--net-misc/dahdi-tools/files/dahdi-tools-2.2.0-no-hardware-fiddling.patch22
-rw-r--r--net-misc/dahdi-tools/files/dahdi-tools-2.2.0-vendorlib.patch12
-rw-r--r--net-misc/dahdi-tools/files/dahdi.init31
11 files changed, 10 insertions, 278 deletions
diff --git a/net-misc/dahdi-tools/ChangeLog b/net-misc/dahdi-tools/ChangeLog
index b3fb870ee85c..8f8720cc7433 100644
--- a/net-misc/dahdi-tools/ChangeLog
+++ b/net-misc/dahdi-tools/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for net-misc/dahdi-tools
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi-tools/ChangeLog,v 1.13 2011/04/28 21:39:02 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi-tools/ChangeLog,v 1.14 2011/09/02 09:03:33 chainsaw Exp $
+
+ 02 Sep 2011; Tony Vroon <chainsaw@gentoo.org> -dahdi-tools-2.1.0.2.ebuild,
+ -files/dahdi-tools-2.1.0.2-asneeded.patch, -dahdi-tools-2.2.0-r1.ebuild,
+ -files/dahdi-tools-2.2.0-ifreq.patch,
+ -files/dahdi-tools-2.2.0-modprobe-suffix.patch,
+ -files/dahdi-tools-2.2.0-no-hardware-fiddling.patch,
+ -files/dahdi-tools-2.2.0-vendorlib.patch, -dahdi-tools-2.3.0.ebuild,
+ -dahdi-tools-2.4.0.ebuild, -files/dahdi.init:
+ Clean up old ebuilds and patches.
28 Apr 2011; Thomas Kahle <tomka@gentoo.org> dahdi-tools-2.4.1.ebuild:
x86 stable per bug 364887
diff --git a/net-misc/dahdi-tools/dahdi-tools-2.1.0.2.ebuild b/net-misc/dahdi-tools/dahdi-tools-2.1.0.2.ebuild
deleted file mode 100644
index 8982329ed403..000000000000
--- a/net-misc/dahdi-tools/dahdi-tools-2.1.0.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi-tools/dahdi-tools-2.1.0.2.ebuild,v 1.1 2009/03/10 17:08:00 chainsaw Exp $
-
-inherit eutils
-
-DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://downloads.digium.com/pub/telephony/dahdi-tools/releases/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="net-misc/dahdi
- dev-libs/libusb"
-
-RDEPEND="${DEPEND}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}/${P}-asneeded.patch"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "failed to install package"
- emake DESTDIR="${D}" config || die "failed to install package"
-
- # install init script
- newinitd "${FILESDIR}"/dahdi.init dahdi
-}
diff --git a/net-misc/dahdi-tools/dahdi-tools-2.2.0-r1.ebuild b/net-misc/dahdi-tools/dahdi-tools-2.2.0-r1.ebuild
deleted file mode 100644
index 440a08a4fe27..000000000000
--- a/net-misc/dahdi-tools/dahdi-tools-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi-tools/dahdi-tools-2.2.0-r1.ebuild,v 1.4 2009/12/22 14:27:48 chainsaw Exp $
-
-EAPI=1
-inherit eutils
-
-DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://downloads.digium.com/pub/telephony/dahdi-tools/releases/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="net-misc/dahdi
- !net-misc/zaptel
- >=sys-kernel/linux-headers-2.6.29
- virtual/libusb:0"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}/${P}-ifreq.patch"
- epatch "${FILESDIR}/${P}-modprobe-suffix.patch"
- epatch "${FILESDIR}/${P}-vendorlib.patch"
- epatch "${FILESDIR}/${P}-no-hardware-fiddling.patch"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "Failed to install binaries"
- emake DESTDIR="${D}" config || die "Failed to install configuration files"
-
- # install init script
- newinitd "${FILESDIR}"/dahdi.init2 dahdi
-}
diff --git a/net-misc/dahdi-tools/dahdi-tools-2.3.0.ebuild b/net-misc/dahdi-tools/dahdi-tools-2.3.0.ebuild
deleted file mode 100644
index c2c5d3cdc758..000000000000
--- a/net-misc/dahdi-tools/dahdi-tools-2.3.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi-tools/dahdi-tools-2.3.0.ebuild,v 1.1 2010/05/25 15:22:37 chainsaw Exp $
-
-EAPI=3
-
-inherit base
-
-DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://downloads.digium.com/pub/telephony/dahdi-tools/releases/${P}.tar.gz
- mirror://gentoo/gentoo-dahdi-tools-patchset-0.1.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/newt
- net-misc/dahdi
- !net-misc/zaptel
- >=sys-kernel/linux-headers-2.6.29
- virtual/libusb:0"
-RDEPEND="${DEPEND}"
-
-EPATCH_SUFFIX="diff"
-PATCHES=( "${WORKDIR}/dahdi-tools-patchset" )
-
-src_install() {
- emake DESTDIR="${D}" install || die "Failed to install binaries"
- emake DESTDIR="${D}" config || die "Failed to install configuration files"
-
- # install init script
- newinitd "${FILESDIR}"/dahdi.init2 dahdi
-}
diff --git a/net-misc/dahdi-tools/dahdi-tools-2.4.0.ebuild b/net-misc/dahdi-tools/dahdi-tools-2.4.0.ebuild
deleted file mode 100644
index 7ff0eaf848cc..000000000000
--- a/net-misc/dahdi-tools/dahdi-tools-2.4.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi-tools/dahdi-tools-2.4.0.ebuild,v 1.4 2011/02/27 18:58:35 chainsaw Exp $
-
-EAPI=3
-
-inherit base
-
-DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://downloads.digium.com/pub/telephony/dahdi-tools/releases/${P}.tar.gz
- mirror://gentoo/gentoo-dahdi-tools-patchset-0.2.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ppp"
-
-DEPEND="dev-libs/newt
- ppp? ( net-dialup/ppp )
- net-misc/dahdi
- !net-misc/zaptel
- >=sys-kernel/linux-headers-2.6.35
- virtual/libusb:0"
-RDEPEND="${DEPEND}"
-
-EPATCH_SUFFIX="diff"
-PATCHES=( "${WORKDIR}/dahdi-tools-patchset" )
-
-src_compile() {
- default_src_compile
- if use ppp; then
- emake -C ppp || die "Failed compiling ppp plugin"
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "Failed to install binaries"
- if use ppp; then
- emake DESTDIR="${D}" -C ppp install || die "Failed to install ppp plugin"
- fi
- emake DESTDIR="${D}" config || die "Failed to install configuration files"
-
- # install init script
- newinitd "${FILESDIR}"/dahdi.init2 dahdi
-}
diff --git a/net-misc/dahdi-tools/files/dahdi-tools-2.1.0.2-asneeded.patch b/net-misc/dahdi-tools/files/dahdi-tools-2.1.0.2-asneeded.patch
deleted file mode 100644
index 2801aae5ab51..000000000000
--- a/net-misc/dahdi-tools/files/dahdi-tools-2.1.0.2-asneeded.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -uNr dahdi-tools-2.1.0.2.ORIG/Makefile dahdi-tools-2.1.0.2/Makefile
---- dahdi-tools-2.1.0.2.ORIG/Makefile 2009-03-10 16:48:48.000000000 +0000
-+++ dahdi-tools-2.1.0.2/Makefile 2009-03-10 16:53:46.000000000 +0000
-@@ -156,12 +156,12 @@
- $(CC) $(CFLAGS) $(MAKE_DEPS) -c -o $@ $<
-
- %: %.o
-- $(CC) $(LDFLAGS) -o $@ $^
-+ $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
-
- prereq: config.status
-
- dahdi_tool: CFLAGS+=$(NEWT_INCLUDE)
--dahdi_tool: LDFLAGS+=$(NEWT_LIB)
-+dahdi_tool: LIBS+=$(NEWT_LIB)
-
- dahdi_speed: CFLAGS+=-O0
-
-@@ -173,11 +173,11 @@
- $(CC) $(CFLAGS) -shared -Wl,-soname,$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) -o $@ $^ -lm
-
- dahdi_cfg: $(LTZ_A)
--dahdi_cfg: LDFLAGS+=-lm
-+dahdi_cfg: LIBS+=-lm
-
- fxstest: $(LTZ_SO)
--fxstest: LDFLAGS+=-lm
--fxotune: LDFLAGS+=-lm
-+fxstest: LIBS+=-lm
-+fxotune: LIBS+=-lm
-
- tonezones.txt: zonedata.c
- perl -ne 'next unless (/\.(country|description) = *"([^"]*)/); \
diff --git a/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-ifreq.patch b/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-ifreq.patch
deleted file mode 100644
index 98ce2db7973b..000000000000
--- a/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-ifreq.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr dahdi-tools-2.2.0.ORIG/sethdlc.c dahdi-tools-2.2.0/sethdlc.c
---- dahdi-tools-2.2.0.ORIG/sethdlc.c 2009-10-28 11:07:37.000000000 +0000
-+++ dahdi-tools-2.2.0/sethdlc.c 2009-10-28 11:08:10.000000000 +0000
-@@ -43,6 +43,8 @@
- #warning "No kernel support for Ethernet over Frame Relay / HDLC, skipping it"
- #endif
-
-+#define ifreq __kernel_ifreq
-+
-
- static struct ifreq req; /* for ioctl */
- static int argc;
diff --git a/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-modprobe-suffix.patch b/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-modprobe-suffix.patch
deleted file mode 100644
index eea4a7a9948a..000000000000
--- a/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-modprobe-suffix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN dahdi-tools-2.2.0.orig/Makefile dahdi-tools-2.2.0/Makefile
---- dahdi-tools-2.2.0.orig/Makefile 2009-06-08 19:02:48.000000000 +0200
-+++ dahdi-tools-2.2.0/Makefile 2009-07-19 14:32:44.246071785 +0200
-@@ -70,8 +70,8 @@
- RCCONF_FILE = /etc/dahdi/init.conf
- MODULES_FILE = /etc/dahdi/modules
- GENCONF_FILE = /etc/dahdi/genconf_parameters
--MODPROBE_FILE = /etc/modprobe.d/dahdi
--BLACKLIST_FILE = /etc/modprobe.d/dahdi.blacklist
-+MODPROBE_FILE = /etc/modprobe.d/dahdi.conf
-+BLACKLIST_FILE = /etc/modprobe.d/dahdi.blacklist.conf
-
- NETSCR_DIR := $(firstword $(wildcard $(DESTDIR)/etc/sysconfig/network-scripts ))
- ifneq (,$(NETSCR_DIR))
diff --git a/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-no-hardware-fiddling.patch b/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-no-hardware-fiddling.patch
deleted file mode 100644
index c04e66241d8e..000000000000
--- a/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-no-hardware-fiddling.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -uNr dahdi-tools-2.2.0.ORIG/Makefile dahdi-tools-2.2.0/Makefile
---- dahdi-tools-2.2.0.ORIG/Makefile 2009-12-22 12:20:03.000000000 +0000
-+++ dahdi-tools-2.2.0/Makefile 2009-12-22 12:20:46.000000000 +0000
-@@ -293,18 +293,6 @@
- $(ADD_INITD)
- endif
- @echo "DAHDI has been configured."
-- @echo ""
-- @echo "List of detected DAHDI devices:"
-- @echo ""
-- @if [ `xpp/dahdi_hardware | tee /dev/stderr | wc -l` -eq 0 ]; then \
-- echo "No hardware found"; \
-- else \
-- echo ""; \
-- echo "run 'dahdi_genconf modules' to load support for only " ;\
-- echo "the DAHDI hardware installed in this system. By "; \
-- echo "default support for all DAHDI hardware is loaded at "; \
-- echo "DAHDI start. "; \
-- fi
-
- update:
- @if [ -d .svn ]; then \
diff --git a/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-vendorlib.patch b/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-vendorlib.patch
deleted file mode 100644
index 03bc27e05702..000000000000
--- a/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-vendorlib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr dahdi-tools-2.2.0.ORIG/xpp/Makefile dahdi-tools-2.2.0/xpp/Makefile
---- dahdi-tools-2.2.0.ORIG/xpp/Makefile 2009-12-22 11:31:02.000000000 +0000
-+++ dahdi-tools-2.2.0/xpp/Makefile 2009-12-22 11:32:59.000000000 +0000
-@@ -28,7 +28,7 @@
- DATADIR = $(datadir)/dahdi
- MANDIR = $(mandir)/man8
- HOTPLUG_USB_DIR = /etc/hotplug/usb
--PERLLIBDIR := $(shell eval `perl -V:sitelib`; echo "$$sitelib")
-+PERLLIBDIR := $(shell eval `perl -V:vendorlib`; echo "$$vendorlib")
- PERL_DIRS := $(shell cd perl_modules; find * -name '[A-Z]*' -type d| xargs)
- PERL_MODS_PAT := *.pm $(PERL_DIRS:%=%/*.pm)
- PERL_MODS := $(shell cd perl_modules; echo $(PERL_MODS_PAT))
diff --git a/net-misc/dahdi-tools/files/dahdi.init b/net-misc/dahdi-tools/files/dahdi.init
deleted file mode 100644
index 483ec33df9df..000000000000
--- a/net-misc/dahdi-tools/files/dahdi.init
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi-tools/files/dahdi.init,v 1.1 2009/03/10 17:08:01 chainsaw Exp $
-
-depend() {
- need net
-}
-
-checkconfig() {
- if [ ! -f /etc/dahdi/system.conf ]; then
- eerror "/etc/dahdi/system.conf not found. Nothing to do."
- return 1
- fi
-
- return 0
-}
-
-start() {
- checkconfig || return 1
-
- ebegin "Starting DAHDI"
- /usr/sbin/dahdi_cfg
- eend $?
-}
-
-stop() {
- ebegin "Stopping DAHDI"
- /usr/sbin/dahdi_cfg -s
- eend
-}