Add USE-flag to enable FXS flash support, closes bug #324879 by Olivier Voortman. zaphfc fixups by Oliver Jaksch, closes bug #337589.

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

4 files changed, 80 insertions, 6 deletions

diff --git a/net-misc/dahdi/ChangeLog b/net-misc/dahdi/ChangeLog
index 4184ea6e5f28..5274a674786a 100644
--- a/net-misc/dahdi/ChangeLog
+++ b/net-misc/dahdi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/dahdi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/ChangeLog,v 1.10 2010/09/14 14:01:28 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/ChangeLog,v 1.11 2010/12/03 14:25:45 chainsaw Exp $
+
+*dahdi-2.4.0-r1 (03 Dec 2010)
+
+  03 Dec 2010; <chainsaw@gentoo.org> +dahdi-2.4.0-r1.ebuild, metadata.xml:
+  Add USE-flag to enable FXS flash support, closes bug #324879 by Olivier
+  Voortman. zaphfc fixups by Oliver Jaksch, closes bug #337589.
 
   14 Sep 2010; <chainsaw@gentoo.org> dahdi-2.4.0.ebuild:
   Clear up inadvertent duplication of the vpmadt032 firmware download, as
diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index 1baf06451140..b6366769d4f8 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -26,18 +26,20 @@ DIST gentoo-dahdi-patchset-0.1.tar.bz2 62493 RMD160 ce12f54ce29ebb62fc883aba17d2
 DIST gentoo-dahdi-patchset-0.2.tar.bz2 59398 RMD160 c940d0783c89cd6e4a8c3d92fe42f372e35249db SHA1 62f967c1ae67df64e5a333862a2d0aa9dddad150 SHA256 79041e9ae2b64bcdac51bea48559e712e324989b2662b362dadfe043706ce7e0
 DIST gentoo-dahdi-patchset-0.3.tar.bz2 58732 RMD160 5ce6efbc254b703371b4bfd5c991cb1183774930 SHA1 3f7e2d9aeba2356dcf79c77509ef93ba1d2f6c28 SHA256 38b07a683b7819b3334193a5cc9867bd429a94e5985efce78abb5902fe7aeb0b
 DIST gentoo-dahdi-patchset-0.4.tar.bz2 58810 RMD160 fd23d5ba1b0ad4f34309ed83324f5c9de5157207 SHA1 c46c85720ffff68d2e1fbb4aedeea085fe6a74a8 SHA256 75a1fc1a0898191969d3ac3d842c6a7676fe822c344b608f927ffb890240e637
+DIST gentoo-dahdi-patchset-0.5.tar.bz2 58931 RMD160 ae7e48f596a4a037d7fd4b97fdc56fac13a84adc SHA1 b82071afa8fbb84e418b378d0a6a5bb91a0a0ce6 SHA256 63771f0d74dbf8c3e943be0c8a8db53002897628aa6b14937cea849a9ad7885d
 EBUILD dahdi-2.1.0.4.ebuild 2013 RMD160 aa7afb709a1cf953d777df2e3eb1776b37ddef80 SHA1 34a7578870776db3946528baebf0ebb4cbc287ae SHA256 5adbdc44c46864b536460f43bbbfc6ff98ec2e9a05465dd8564f4016b2de69e3
 EBUILD dahdi-2.2.0.2.ebuild 2461 RMD160 f517b7185e4d7969e20e4dea54f09b13373304c0 SHA1 d71058c5bb098277b8aae4022d09412044b7bd5c SHA256 e9cd7c69607a49d44c53171ea74a6d10b1233f3e4107d0071af9e5c2751c6c0a
 EBUILD dahdi-2.2.1.1.ebuild 1929 RMD160 444ff26a2ec178aff4a54e44e20e051812daf0f0 SHA1 ab6d55c63754a8276677d444fc5613b5444af351 SHA256 67cf9a353be51a7875bcd577759707fe37c9e629182a7327d03dad9d13909da2
 EBUILD dahdi-2.3.0.1.ebuild 1988 RMD160 94c27b24361d28ea56003cb5c6633ea20a5f668c SHA1 2050f7715764dba43f7372966e491dd2b4e8064b SHA256 d21706c68369423a86a5e523b1a152b5a17fbee79083f5a707cbcdba3b8bb42f
 EBUILD dahdi-2.3.0.ebuild 1986 RMD160 1fad5d461cbc3e06e281779ef7db0eca39c5b92d SHA1 366dc409e943a0f2c18739682e881b22f658781e SHA256 b7e52c9b164ec740b94a013ca5fb7162a25ab1b51894f92515404353f1188029
+EBUILD dahdi-2.4.0-r1.ebuild 2150 RMD160 df3910c0a9933d80120c8d4bff187c7b036fe730 SHA1 c8d96eac1e4acfa7fae68d107e5e78988f210aa8 SHA256 d75576b163fe4d3df3461a040ad52aeab348b2862c5c792bad2ed9864698364f
 EBUILD dahdi-2.4.0.ebuild 1889 RMD160 e028538060424b2c2156c61824750297d4ec9323 SHA1 71162fc38c0073a4e020b79dac182068fda6941b SHA256 bf174fe9d8b6fdbe13d0a998263420c1c2cc0123abb0a8c97f86988c2b0b9084
-MISC ChangeLog 3018 RMD160 006fad96051b5a9968b8edeab5491cb6955158f2 SHA1 a766eed8387f3d290384c48585a67ce7df55dca3 SHA256 eb8ded9b2dc955ca9cdd23ab5b34018d5fd2cc9c5d707596f2055249f453eb8a
-MISC metadata.xml 257 RMD160 310ad9c194b37abe9bb814131148f5cc78c77625 SHA1 9f8b9263984b3fca531dcd3c859b0f0945d9920f SHA256 ad64812c2b7c47f6071002a0d7614aff3d4ba8349958093745d0a637b265d23b
+MISC ChangeLog 3263 RMD160 eae732312535cf90794b50f809441e43eb05f7dc SHA1 3a6a615cdceb5711d90c59f680bd03439f5a714d SHA256 4d00936239c0123cf3dbb4cbbf8b8fcf03c127e8a9fc71129f48d85b6338791e
+MISC metadata.xml 333 RMD160 4a7f243a6d4b1de974e5c52592cdb310d5c68664 SHA1 f9b073c0c00e12f5f154a7d4209430ac8a736393 SHA256 c7cf56ea7b6f0f6d3707fe2c8a0ac3ff9d13414093c4332dcb2201d8b0966691
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyPgEIACgkQp5vW4rUFj5pBaQCfUfjy82bEARcaHanInkeN9S4E
-kiIAoK/HbxThYnocAWq4An5ofKqGK7PL
-=RdqM
+iEYEARECAAYFAkz4/f0ACgkQp5vW4rUFj5rzxACeNhWzX+OldjC+68H6rm+AILWD
+k5EAn13i0/csrO2ITTzo0oXPYKUv+DGY
+=VvoE
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dahdi/dahdi-2.4.0-r1.ebuild b/net-misc/dahdi/dahdi-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..7221b5a143f0
--- /dev/null
+++ b/net-misc/dahdi/dahdi-2.4.0-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/dahdi-2.4.0-r1.ebuild,v 1.1 2010/12/03 14:25:45 chainsaw Exp $
+
+EAPI=3
+
+inherit base linux-mod eutils flag-o-matic
+
+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-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.5.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="flash"
+
+DEPEND=""
+RDEPEND=""
+
+EPATCH_SUFFIX="diff"
+PATCHES=( "${WORKDIR}/dahdi-patchset" )
+
+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/
+}
+
+src_prepare() {
+	if use flash; then
+		sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h
+		sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" include/dahdi/dahdi_config.h
+	fi
+	base_src_prepare
+}
+
+src_compile() {
+	unset ARCH
+	emake KSRC="${KERNEL_DIR}" DESTDIR="${D}" all || die "Compilation failed"
+}
+
+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}" install || die "Installation failed"
+	rm -rf "$D"/lib/modules/*/modules.*
+}
diff --git a/net-misc/dahdi/metadata.xml b/net-misc/dahdi/metadata.xml
index 66a09d837718..c7604ff3dfaa 100644
--- a/net-misc/dahdi/metadata.xml
+++ b/net-misc/dahdi/metadata.xml
@@ -6,4 +6,7 @@
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>
+  <use>
+    <flag name="flash">Support (short) flash on FXS</flag>
+  </use>
 </pkgmetadata>