summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Vroon <chainsaw@gentoo.org>2015-02-12 16:09:35 +0000
committerTony Vroon <chainsaw@gentoo.org>2015-02-12 16:09:35 +0000
commit96d0042169024b2b2af9f356b3e139cce054a5dc (patch)
treeed4bd8d0502e13ecd663ee645a072e8ed82cd17e /net-misc/dahdi
parentadded ~amd64-linux (tested by me) (diff)
downloadgentoo-2-96d0042169024b2b2af9f356b3e139cce054a5dc.tar.gz
gentoo-2-96d0042169024b2b2af9f356b3e139cce054a5dc.tar.bz2
gentoo-2-96d0042169024b2b2af9f356b3e139cce054a5dc.zip
Scavenge upstream commit as identified by Erich Seifert in bug #539594 to allow building against 3.19 kernels.
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0xB5058F9A)
Diffstat (limited to 'net-misc/dahdi')
-rw-r--r--net-misc/dahdi/ChangeLog10
-rw-r--r--net-misc/dahdi/dahdi-2.10.0.1-r1.ebuild (renamed from net-misc/dahdi/dahdi-2.10.0.ebuild)6
-rw-r--r--net-misc/dahdi/dahdi-2.6.2.ebuild71
-rw-r--r--net-misc/dahdi/dahdi-2.7.0.1.ebuild74
-rw-r--r--net-misc/dahdi/dahdi-2.8.0.1.ebuild79
-rw-r--r--net-misc/dahdi/dahdi-2.9.0-r1.ebuild79
-rw-r--r--net-misc/dahdi/dahdi-2.9.0.ebuild79
7 files changed, 12 insertions, 386 deletions
diff --git a/net-misc/dahdi/ChangeLog b/net-misc/dahdi/ChangeLog
index 3027f124a87a..d7ca9da23a5b 100644
--- a/net-misc/dahdi/ChangeLog
+++ b/net-misc/dahdi/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for net-misc/dahdi
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/ChangeLog,v 1.68 2015/01/16 09:49:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/ChangeLog,v 1.69 2015/02/12 16:09:35 chainsaw Exp $
+
+*dahdi-2.10.0.1-r1 (12 Feb 2015)
+
+ 12 Feb 2015; Tony Vroon <chainsaw@gentoo.org> -dahdi-2.6.2.ebuild,
+ -dahdi-2.7.0.1.ebuild, -dahdi-2.8.0.1.ebuild, -dahdi-2.9.0.ebuild,
+ -dahdi-2.9.0-r1.ebuild, -dahdi-2.10.0.ebuild, +dahdi-2.10.0.1-r1.ebuild:
+ Scavenge upstream commit as identified by Erich Seifert in bug #539594 to
+ allow building against 3.19 kernels.
16 Jan 2015; Agostino Sarubbo <ago@gentoo.org> dahdi-2.10.0.1.ebuild:
Stable for x86, wrt bug #533104
diff --git a/net-misc/dahdi/dahdi-2.10.0.ebuild b/net-misc/dahdi/dahdi-2.10.0.1-r1.ebuild
index 45292ae7935e..489b21759c75 100644
--- a/net-misc/dahdi/dahdi-2.10.0.ebuild
+++ b/net-misc/dahdi/dahdi-2.10.0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/dahdi-2.10.0.ebuild,v 1.1 2014/08/19 08:23:47 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/dahdi-2.10.0.1-r1.ebuild,v 1.1 2015/02/12 16:09:35 chainsaw Exp $
EAPI=5
@@ -8,7 +8,7 @@ inherit base linux-mod eutils flag-o-matic toolchain-funcs
MY_P="${P/dahdi/dahdi-linux}"
JNET=1.0.14
-GENTOO=1.1.9
+GENTOO=1.2.0
S="${WORKDIR}/${MY_P}"
DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)"
diff --git a/net-misc/dahdi/dahdi-2.6.2.ebuild b/net-misc/dahdi/dahdi-2.6.2.ebuild
deleted file mode 100644
index a3d5f378142b..000000000000
--- a/net-misc/dahdi/dahdi-2.6.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/dahdi-2.6.2.ebuild,v 1.5 2014/08/10 20:43:50 slyfox Exp $
-
-EAPI=5
-
-inherit base linux-mod eutils flag-o-matic toolchain-funcs
-
-MY_P="${P/dahdi/dahdi-linux}"
-JNET=1.0.14
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
-mirror://gentoo/gentoo-dahdi-patchset-1.1.5.tar.bz2
-http://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="flash"
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND=""
-
-EPATCH_SUFFIX="diff"
-PATCHES=( "${WORKDIR}/dahdi-patchset" )
-
-CONFIG_CHECK="MODULES ~CRC_CCITT"
-
-src_unpack() {
- unpack ${A}
- # Copy the firmware tarballs over, the makefile will try and download them otherwise
- for file in ${A} ; do
- cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/
- done
- # But without the .bin's it'll still fall over and die, so copy those too.
- cp *.bin "${MY_P}"/drivers/dahdi/firmware/
- cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/cwain/*.[ch] "${MY_P}"/drivers/dahdi/
- cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/qozap/*.[ch] "${MY_P}"/drivers/dahdi/
- cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/ztgsm/*.[ch] "${MY_P}"/drivers/dahdi/
-}
-
-src_prepare() {
- if use flash; then
- sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || die "Failed to define FXSFLASH"
- sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
- fi
- base_src_prepare
-}
-
-src_compile() {
- unset ARCH
- emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" all
-}
-
-src_install() {
- einfo "Installing kernel module"
- emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" install
- rm -rf "$D"/lib/modules/*/modules.*
-}
diff --git a/net-misc/dahdi/dahdi-2.7.0.1.ebuild b/net-misc/dahdi/dahdi-2.7.0.1.ebuild
deleted file mode 100644
index 921fd148bb91..000000000000
--- a/net-misc/dahdi/dahdi-2.7.0.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/dahdi-2.7.0.1.ebuild,v 1.6 2014/08/10 20:43:50 slyfox Exp $
-
-EAPI=5
-
-inherit base linux-mod eutils flag-o-matic toolchain-funcs
-
-MY_P="${P/dahdi/dahdi-linux}"
-JNET=1.0.14
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-6f0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-6f0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
-mirror://gentoo/gentoo-dahdi-patchset-1.1.6.tar.bz2
-http://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="flash"
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND=""
-
-EPATCH_SUFFIX="diff"
-PATCHES=( "${WORKDIR}/dahdi-patchset" )
-
-CONFIG_CHECK="MODULES ~CRC_CCITT"
-
-src_unpack() {
- unpack ${A}
- # Copy the firmware tarballs over, the makefile will try and download them otherwise
- for file in ${A} ; do
- cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/
- done
- # But without the .bin's it'll still fall over and die, so copy those too.
- cp *.bin "${MY_P}"/drivers/dahdi/firmware/
- cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/cwain/*.[ch] "${MY_P}"/drivers/dahdi/
- cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/qozap/*.[ch] "${MY_P}"/drivers/dahdi/
- cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/ztgsm/*.[ch] "${MY_P}"/drivers/dahdi/
-}
-
-src_prepare() {
- if use flash; then
- sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || die "Failed to define FXSFLASH"
- sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
- fi
- base_src_prepare
-}
-
-src_compile() {
- unset ARCH
- emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" all
-}
-
-src_install() {
- einfo "Installing kernel module"
- emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" install
- rm -rf "$D"/lib/modules/*/modules.*
-}
diff --git a/net-misc/dahdi/dahdi-2.8.0.1.ebuild b/net-misc/dahdi/dahdi-2.8.0.1.ebuild
deleted file mode 100644
index acc86849205e..000000000000
--- a/net-misc/dahdi/dahdi-2.8.0.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/dahdi-2.8.0.1.ebuild,v 1.5 2014/08/10 20:43:50 slyfox Exp $
-
-EAPI=5
-
-inherit base linux-mod eutils flag-o-matic toolchain-funcs
-
-MY_P="${P/dahdi/dahdi-linux}"
-JNET=1.0.14
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-b0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1d0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-6f0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-6f0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-e0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
-mirror://gentoo/gentoo-dahdi-patchset-1.1.7.tar.bz2
-http://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="flash"
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND=""
-
-EPATCH_SUFFIX="diff"
-PATCHES=( "${WORKDIR}/dahdi-patchset" )
-
-CONFIG_CHECK="MODULES ~CRC_CCITT"
-
-src_unpack() {
- unpack ${A}
- # Copy the firmware tarballs over, the makefile will try and download them otherwise
- for file in ${A} ; do
- cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/
- done
- # But without the .bin's it'll still fall over and die, so copy those too.
- cp *.bin "${MY_P}"/drivers/dahdi/firmware/
- cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/cwain/*.[ch] "${MY_P}"/drivers/dahdi/
- cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/qozap/*.[ch] "${MY_P}"/drivers/dahdi/
- cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/ztgsm/*.[ch] "${MY_P}"/drivers/dahdi/
-}
-
-src_prepare() {
- if use flash; then
- sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || die "Failed to define FXSFLASH"
- sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
- fi
- base_src_prepare
-}
-
-src_compile() {
- unset ARCH
- emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" all
-}
-
-src_install() {
- einfo "Installing kernel module"
- emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" install
- rm -rf "$D"/lib/modules/*/modules.*
-}
diff --git a/net-misc/dahdi/dahdi-2.9.0-r1.ebuild b/net-misc/dahdi/dahdi-2.9.0-r1.ebuild
deleted file mode 100644
index 45c038dc8107..000000000000
--- a/net-misc/dahdi/dahdi-2.9.0-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/dahdi-2.9.0-r1.ebuild,v 1.4 2014/08/10 20:43:50 slyfox Exp $
-
-EAPI=5
-
-inherit base linux-mod eutils flag-o-matic toolchain-funcs
-
-MY_P="${P/dahdi/dahdi-linux}"
-JNET=1.0.14
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-b0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1d0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-780017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-e0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
-mirror://gentoo/gentoo-dahdi-patchset-1.1.8.tar.bz2
-http://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="flash"
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND=""
-
-EPATCH_SUFFIX="diff"
-PATCHES=( "${WORKDIR}/dahdi-patchset" )
-
-CONFIG_CHECK="MODULES ~CRC_CCITT"
-
-src_unpack() {
- unpack ${A}
- # Copy the firmware tarballs over, the makefile will try and download them otherwise
- for file in ${A} ; do
- cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/
- done
- # But without the .bin's it'll still fall over and die, so copy those too.
- cp *.bin "${MY_P}"/drivers/dahdi/firmware/
- cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/cwain/*.[ch] "${MY_P}"/drivers/dahdi/
- cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/qozap/*.[ch] "${MY_P}"/drivers/dahdi/
- cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/ztgsm/*.[ch] "${MY_P}"/drivers/dahdi/
-}
-
-src_prepare() {
- if use flash; then
- sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || die "Failed to define FXSFLASH"
- sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
- fi
- base_src_prepare
-}
-
-src_compile() {
- unset ARCH
- emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" all
-}
-
-src_install() {
- einfo "Installing kernel module"
- emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" install
- rm -rf "$D"/lib/modules/*/modules.*
-}
diff --git a/net-misc/dahdi/dahdi-2.9.0.ebuild b/net-misc/dahdi/dahdi-2.9.0.ebuild
deleted file mode 100644
index 61c58b1b755c..000000000000
--- a/net-misc/dahdi/dahdi-2.9.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/dahdi-2.9.0.ebuild,v 1.3 2014/08/10 20:43:50 slyfox Exp $
-
-EAPI=5
-
-inherit base linux-mod eutils flag-o-matic toolchain-funcs
-
-MY_P="${P/dahdi/dahdi-linux}"
-JNET=1.0.14
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-b0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1d0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-780017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-e0017.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
-mirror://gentoo/gentoo-dahdi-patchset-1.1.7.tar.bz2
-http://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="flash"
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND=""
-
-EPATCH_SUFFIX="diff"
-PATCHES=( "${WORKDIR}/dahdi-patchset" )
-
-CONFIG_CHECK="MODULES ~CRC_CCITT"
-
-src_unpack() {
- unpack ${A}
- # Copy the firmware tarballs over, the makefile will try and download them otherwise
- for file in ${A} ; do
- cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/
- done
- # But without the .bin's it'll still fall over and die, so copy those too.
- cp *.bin "${MY_P}"/drivers/dahdi/firmware/
- cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/cwain/*.[ch] "${MY_P}"/drivers/dahdi/
- cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/qozap/*.[ch] "${MY_P}"/drivers/dahdi/
- cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/ztgsm/*.[ch] "${MY_P}"/drivers/dahdi/
-}
-
-src_prepare() {
- if use flash; then
- sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || die "Failed to define FXSFLASH"
- sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
- fi
- base_src_prepare
-}
-
-src_compile() {
- unset ARCH
- emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" all
-}
-
-src_install() {
- einfo "Installing kernel module"
- emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" install
- rm -rf "$D"/lib/modules/*/modules.*
-}