Version bump, as requested by Oliver Jaksch in bug #357309.

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

3 files changed, 73 insertions, 12 deletions

diff --git a/net-misc/dahdi/ChangeLog b/net-misc/dahdi/ChangeLog
index a790a7e49a5b..7af0fe093e8f 100644
--- a/net-misc/dahdi/ChangeLog
+++ b/net-misc/dahdi/ChangeLog
@@ -1,6 +1,11 @@
 # 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.14 2011/02/27 18:57:01 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/ChangeLog,v 1.15 2011/04/17 13:35:27 chainsaw Exp $
+
+*dahdi-2.4.1 (17 Apr 2011)
+
+  17 Apr 2011; Tony Vroon <chainsaw@gentoo.org> +dahdi-2.4.1.ebuild:
+  Version bump, as requested by Oliver Jaksch in bug #357309.
 
   27 Feb 2011; Tony Vroon <chainsaw@gentoo.org> dahdi-2.4.0-r1.ebuild:
   Mark stable on AMD64 for security bug #352059. Arch testing by Agostino "ago"
diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index 08c830a9bb22..7c9ed6fe0c45 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX dahdi-2.1.0.4-netdev-2-6-29.patch 14161 RMD160 5921cae421af76bf64f1d85b0a672e1008afb2f9 SHA1 4b9cdb478448b901edb33edbf6fc875c452a244a SHA256 9e452519097fa46baa6f7ef8b813ca3141c3c20da4e2a48d67d56db368d9a5f5
 AUX dahdi-2.1.0.4-no-depmod.patch 507 RMD160 3a776e29dc79df4fcac8d1f91bfb064a82b73d1d SHA1 7b344653100e9c34d11343bf7e2fc0a9bcaa1a1b SHA256 f4b2fb9fa23209da0644345dbc29b6585b49a589e16b9bbfafbc22f989ba1b41
 AUX dahdi-2.2.0.2-driver_data-2.6.32.patch 2509 RMD160 8559b3aee3212bf2e35b1d94a6f077a87955edff SHA1 575a1dac65a687b2c69c0088b647518c6f466f14 SHA256 e8e8cd58487fd1407a5f737d322081a467ff1a153bfd9635e1b3fdfa03d74915
@@ -22,6 +19,7 @@ DIST dahdi-linux-2.2.1.1.tar.gz 1418259 RMD160 c7c17bb7def165cb6487baf421c7b7c06
 DIST dahdi-linux-2.3.0.1.tar.gz 1474833 RMD160 e201ca83d62136bd9a4bef3bacb8fc2ab8c158e1 SHA1 df7814c5837745737baea8e16deb4d8d3d848ce6 SHA256 4ab83417689e43fa20f5ca2873d2b15b2f4a6d7532982fc6e8c4434263464973
 DIST dahdi-linux-2.3.0.tar.gz 1473577 RMD160 5aed25c13bfc934df32a22f3b3fb9748bcc6b71b SHA1 32153aff2acf56c7b60ed4ce1390f01cd084a491 SHA256 8bc28cd0b979a52b8db12619fde2b6eba060b6a747309642f803616618d209c5
 DIST dahdi-linux-2.4.0.tar.gz 1499694 RMD160 34d6a22d1e1be44f4ea9dda1774b9a1a5fee0b27 SHA1 4431db887dba8a5a8089d60d4a62b9d704d03034 SHA256 082c6e44ad32f71157797b22add19f6f448abdf060d86b9d4f6d3b98e2896a23
+DIST dahdi-linux-2.4.1.tar.gz 1516954 RMD160 7423df78eeefabe1dce3801c7b671842fb4950cd SHA1 a236f0100fc3209c8da6d4ae77a776d8165923d9 SHA256 c5c328ae0b7ad7134950ef6bbd05ec89ff7f07ef4ea64c738b4907eb3922424e
 DIST gentoo-dahdi-patchset-0.1.tar.bz2 62493 RMD160 ce12f54ce29ebb62fc883aba17d2f2ac75bc1d02 SHA1 3f55307c64abc77b9ca3ac4f6786a042cfde54c2 SHA256 b1325c52bc29cc7c705d246c9c3df1cb58a521d466427fbedf9afb50e5fc878e
 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
@@ -34,12 +32,6 @@ EBUILD dahdi-2.3.0.1.ebuild 2004 RMD160 b34b3bf35f70116e3a2987900055e4465419161e
 EBUILD dahdi-2.3.0.ebuild 2002 RMD160 bf7fef4d87f7907a0a73b045c9adb968b48c8cc5 SHA1 7ec1f81b890f750207203d5310ad6fa450b80ac0 SHA256 d087d365ded22ea500518ad9c5b9a94a08a0b53e1889b3971405471ae0285bf9
 EBUILD dahdi-2.4.0-r1.ebuild 2164 RMD160 5522611a4683bc69861133f520153d31a2cdb11e SHA1 7f78d15df1da155d628da8dd6738285e94148548 SHA256 3a470b5fcdb4c279c991290c078404e06e0f56ad085a052ad68d468f9d04b829
 EBUILD dahdi-2.4.0.ebuild 1905 RMD160 21f419adce64ce3cf1c048d0e15ddfb793323eab SHA1 8f8983e9eb0500895d70597afeac4b4873169e26 SHA256 7bc27009549ba23dbc5d0b5be9311c89d258118bddafba76adb3317a8b470754
-MISC ChangeLog 3976 RMD160 4cb24e12e852829bf5426ac326126c35bb474b26 SHA1 2898726421cca6b7154dbd9479b38940e3ff32b3 SHA256 a4a8160092e6d99f4a6b3ad07598d426a0c3170089ebaa6c8d8a595ee4aeaa03
+EBUILD dahdi-2.4.1.ebuild 2163 RMD160 c6147917b2961312b26130764cc9c140d2cd8e3a SHA1 41909cd48390fabe1337e4f3232f6155cf62011f SHA256 3b20d0584eb5da0b977b0e7f3e5d0bec4709161ba179e8f420f798af663860ef
+MISC ChangeLog 4136 RMD160 a41c9b3fcf36db55eb490226cedc19d9d1826e45 SHA1 fa6184217975069c2012fbab9b20e810ac5580f6 SHA256 02f62bb2530eca348896df81e8f76473d21aa0a6e082d2512f5ff5a00a1d6d30
 MISC metadata.xml 333 RMD160 4a7f243a6d4b1de974e5c52592cdb310d5c68664 SHA1 f9b073c0c00e12f5f154a7d4209430ac8a736393 SHA256 c7cf56ea7b6f0f6d3707fe2c8a0ac3ff9d13414093c4332dcb2201d8b0966691
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk1qnncACgkQp5vW4rUFj5rnFACgrJ0SqBYYa8TTViChb1iLWbmG
-VIAAniIvUEZl8oeWUcw1KxoGNxA2SZCU
-=w3dA
------END PGP SIGNATURE-----
diff --git a/net-misc/dahdi/dahdi-2.4.1.ebuild b/net-misc/dahdi/dahdi-2.4.1.ebuild
new file mode 100644
index 000000000000..027865cc84cc
--- /dev/null
+++ b/net-misc/dahdi/dahdi-2.4.1.ebuild
@@ -0,0 +1,64 @@
+# 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.4.1.ebuild,v 1.1 2011/04/17 13:35:27 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"
+RESTRICT="test"
+
+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.*
+}