Rebasing patchset against upstream 2.3.0.1 release; updated semaphore include patch to be portable against <2.6.26 kernels as per Digiums

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

3 files changed, 71 insertions, 5 deletions

diff --git a/net-misc/dahdi/ChangeLog b/net-misc/dahdi/ChangeLog
index 8b8f48b2143d..14abedb1a8f2 100644
--- a/net-misc/dahdi/ChangeLog
+++ b/net-misc/dahdi/ChangeLog
@@ -1,6 +1,13 @@
 # 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.6 2010/05/24 18:47:10 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/ChangeLog,v 1.7 2010/06/08 16:47:44 chainsaw Exp $
+
+*dahdi-2.3.0.1 (08 Jun 2010)
+
+  08 Jun 2010; <chainsaw@gentoo.org> +dahdi-2.3.0.1.ebuild:
+  Rebasing patchset against upstream 2.3.0.1 release; updated semaphore
+  include patch to be portable against <2.6.26 kernels as per Digiums
+  request. Upstream bugs
 
 *dahdi-2.3.0 (24 May 2010)
 
diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index 174a4d7d2abb..5e36e910efed 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -18,19 +18,22 @@ DIST dahdi-fwload-vpmadt032-1.20.0.tar.gz 146556 RMD160 eb7bbff9980f3723ba7eb84a
 DIST dahdi-linux-2.1.0.4.tar.gz 1251822 RMD160 746a6b266e51003726046582bdbfcca2f6d11194 SHA1 e5fa4220b995b2841f1658e29fe710a649b1bd9c SHA256 42fde494ed205026037f6164f9112a7a7cac55adc8f8a535e3867ca83ae8c239
 DIST dahdi-linux-2.2.0.2.tar.gz 1387811 RMD160 2fec5a75bb9be328d5de4a9282355490c787d266 SHA1 58a5244ee589d50cd3add601f6867cc82ee2e7cd SHA256 55da659f6acd5f706c0eaf74be8ed3d7fa3a5b1337954b5b663633e1300e4593
 DIST dahdi-linux-2.2.1.1.tar.gz 1418259 RMD160 c7c17bb7def165cb6487baf421c7b7c06f1d12c8 SHA1 bd8df4beffe7bdaba347a6692876528eab82f21b SHA256 0570ae088429dffcd032ed60d130c096ad2bf27b78a8da81e2cab2f416b2ef91
+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 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
 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
-MISC ChangeLog 2340 RMD160 dbf217a8aa454c4739e93196d002cafc748276f6 SHA1 24478b7a8339ef716a9406449f71e8b332cb7a29 SHA256 2d8fde29ea3d0c6be7835433905513e6c8324f370523a51e80af5c1f93562160
+MISC ChangeLog 2598 RMD160 28985a63f8555dbd77ed6313bded2e4323e44bd3 SHA1 ed50651fbc765d2f3d31f124a38131f539840d62 SHA256 6c850d839a2050ea7ee4b64d8f732998992f285ae71a68c499320bcf8da65916
 MISC metadata.xml 257 RMD160 310ad9c194b37abe9bb814131148f5cc78c77625 SHA1 9f8b9263984b3fca531dcd3c859b0f0945d9920f SHA256 ad64812c2b7c47f6071002a0d7614aff3d4ba8349958093745d0a637b265d23b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkv6ybgACgkQp5vW4rUFj5plvACgjUE2rVUQhJchGVuOA5FG1LkR
-bD4An0X1jlHZ8Fl8FxGQjyP3lbfSPPuI
-=j6CN
+iEYEARECAAYFAkwOdDoACgkQp5vW4rUFj5ol7wCgluY/12smXXydbiFL8qq6clfT
+z1cAoJjjK8WTtQoP641tyPvwzRUYs40j
+=vk/t
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dahdi/dahdi-2.3.0.1.ebuild b/net-misc/dahdi/dahdi-2.3.0.1.ebuild
new file mode 100644
index 000000000000..2c605990530f
--- /dev/null
+++ b/net-misc/dahdi/dahdi-2.3.0.1.ebuild
@@ -0,0 +1,56 @@
+# 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.3.0.1.ebuild,v 1.1 2010/06/08 16:47:44 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.20.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-fwload-vpmadt032-1.20.0.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
+mirror://gentoo/gentoo-dahdi-patchset-0.3.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+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_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.*
+}