Add support for junghanns.net BRI adapters, ebuild work by Felix Tiede closes bug #354321. Stop calling CC/LD directly, closes bug #376705 by Agostino "ago" Sarubbo. Drop unnecessary patch from set, as per Erik Wallin in bug #381335.

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

3 files changed, 87 insertions, 5 deletions

diff --git a/net-misc/dahdi/ChangeLog b/net-misc/dahdi/ChangeLog
index 8e74b8149475..7ce56353162d 100644
--- a/net-misc/dahdi/ChangeLog
+++ b/net-misc/dahdi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/dahdi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/ChangeLog,v 1.24 2011/09/02 08:41:03 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/ChangeLog,v 1.25 2011/09/02 10:56:25 chainsaw Exp $
+
+*dahdi-2.5.0-r1 (02 Sep 2011)
+
+  02 Sep 2011; Tony Vroon <chainsaw@gentoo.org> +dahdi-2.5.0-r1.ebuild:
+  Add support for junghanns.net BRI adapters, ebuild work by Felix Tiede closes
+  bug #354321. Stop calling CC/LD directly, closes bug #376705 by Agostino
+  "ago" Sarubbo. Drop unnecessary patch from set, as per Erik Wallin in bug
+  #381335.
 
   02 Sep 2011; Tony Vroon <chainsaw@gentoo.org> -dahdi-2.1.0.4.ebuild,
   -files/dahdi-2.1.0.4-netdev-2-6-29.patch,
diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index 45512569e392..a93435761029 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -11,14 +11,17 @@ DIST dahdi-linux-2.4.1.tar.gz 1516954 RMD160 7423df78eeefabe1dce3801c7b671842fb4
 DIST dahdi-linux-2.5.0.tar.gz 1546486 RMD160 a6ab21554965e403e5869bbae5e404200caaef2c SHA1 90d5f75df45426c01320fa5c3a0f58a6a9d00fb5 SHA256 08953e96a59f313594ee83caad45687293433c21603f0edbefd6b6513dbd80ad
 DIST gentoo-dahdi-patchset-0.6.tar.bz2 60759 RMD160 d5115d485abfbcba18094409c97bda947a9e85c0 SHA1 607c924e34b13a03bc1f60586134d5b0e6879faa SHA256 5dc02244e88d65cf3af81c58b0266e36d9f5e9ffdfc0dc223b3ab0da3df64621
 DIST gentoo-dahdi-patchset-0.7.tar.bz2 59254 RMD160 b38f73e62a2cac324e9b93ef19544bb1d32c551f SHA1 a273fdc07f7b887caf6a54aeff7e36ca12623126 SHA256 d597c521932c6746df7829e13d40df72de80de5d65745d5d5e8b2ebb9b032eda
+DIST gentoo-dahdi-patchset-0.8.tar.bz2 60647 RMD160 89d86cc0081747713d779949792059732ed1de20 SHA1 4a91fb2524481fd12e7274a36fd743486fabeb9f SHA256 63e34f435e3b76fc918ba0434b7804d2efa9020f9c546b411a3b4866f54b459f
+DIST jnet-dahdi-drivers-1.0.11.tar.gz 60945 RMD160 629c9993e460ca30bfc5adddf1bcd8edbe3694d7 SHA1 31ec44b7a892e8052b6c2cbe5b10e72646960e2d SHA256 31f0a856f0b75533d4880428c29f2e8a4ca4bbab6c062b7ffe70f335126e9234
 EBUILD dahdi-2.4.1-r1.ebuild 2196 RMD160 0774f46d81d678d159dd23e0c8ee040be7192f52 SHA1 c7c53be0c9d256e73b49d5e330faf5c666d21a74 SHA256 25b3b8826f636f328b833fec776e350a90fda2fcf8e9b8e11d348d6f2bddba97
+EBUILD dahdi-2.5.0-r1.ebuild 2771 RMD160 a5602f442cb1878f7e8e5c78cba265f88a66bcb2 SHA1 c18ae65dc097c0b1767f454670b029c661bb0da8 SHA256 ff85b859e5ff1ec4cb722da95b87b4696d9e3c0e648edac30e5527e7ac83ba11
 EBUILD dahdi-2.5.0.ebuild 2310 RMD160 11d363bc2aea6423127c7c2eb32c0e26da9a4605 SHA1 cda83436ab6029ea3c6f3c92cda60f44f7071808 SHA256 9b51870975621ead03287d37e2567420c030aa803c9e6359a806c9e2f3e91c9b
-MISC ChangeLog 6268 RMD160 387f0b35af2602a29d04a73886eb50583b3663fa SHA1 b8c694699dcc32e7d7c1d80b500b8638eda5ad73 SHA256 eabebefaa46d47d6ebc52a3cdf712cc484207b2ae6a3e3af5b68b3317515361b
+MISC ChangeLog 6614 RMD160 ae274a933816ae073ce78a4306335ad25b316571 SHA1 1c82597c847b0636cde19d82e2c62233b8139b6a SHA256 fd6d395dd7c7b37a4782bede3f512dbf45a37dbcb9da13de5a3f93161276e429
 MISC metadata.xml 333 RMD160 4a7f243a6d4b1de974e5c52592cdb310d5c68664 SHA1 f9b073c0c00e12f5f154a7d4209430ac8a736393 SHA256 c7cf56ea7b6f0f6d3707fe2c8a0ac3ff9d13414093c4332dcb2201d8b0966691
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5glqgACgkQp5vW4rUFj5po7ACgh6DMfDmo2/Xda9Rw8kD6YoWm
-0h4An2jW6TygBtCRYMQKsyr7ZAJW008H
-=WU08
+iEYEARECAAYFAk5gtmIACgkQp5vW4rUFj5rNSwCfdBYo2in9+B0fV/BQGju/yeml
+IggAniQ/kI6vG6uObGPo4r0qosXkdcWr
+=rkcx
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dahdi/dahdi-2.5.0-r1.ebuild b/net-misc/dahdi/dahdi-2.5.0-r1.ebuild
new file mode 100644
index 000000000000..7a1c0162ec3b
--- /dev/null
+++ b/net-misc/dahdi/dahdi-2.5.0-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/dahdi-2.5.0-r1.ebuild,v 1.1 2011/09/02 10:56:25 chainsaw Exp $
+
+EAPI=4
+
+inherit base linux-mod eutils flag-o-matic toolchain-funcs
+
+MY_P="${P/dahdi/dahdi-linux}"
+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.8.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-tc400m-MR6.12.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
+mirror://gentoo/gentoo-dahdi-patchset-0.8.tar.bz2
+http://www.junghanns.net/downloads/jnet-dahdi-drivers-1.0.11.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-1.0.11/cwain/*.[ch] "${MY_P}"/drivers/dahdi/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-1.0.11/qozap/*.[ch] "${MY_P}"/drivers/dahdi/
+	cp -p "${WORKDIR}"/jnet-dahdi-drivers-1.0.11/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 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KERNEL_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" all
+}
+
+src_install() {
+	# setup directory structure so udev rules get installed
+	mkdir -p "${D}"/etc/udev/rules.d
+
+	einfo "Installing kernel module"
+	emake KSRC="${KERNEL_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" install
+	rm -rf "$D"/lib/modules/*/modules.*
+}