Patch from Stefan Knoblich fixes compilation against 2.6.39 kernels; closes bug #372819 by Philipp Kugle. As requested by Diego "Flameeyes" Petteno, udev rules are now installed in /lib as they are not intended for user modification/customisation. CONFIG_MODULES is now also checked as the eclass does not do it for us.

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

3 files changed, 82 insertions, 5 deletions

diff --git a/net-misc/dahdi/ChangeLog b/net-misc/dahdi/ChangeLog
index 5db67998ee32..a25a407e3d2c 100644
--- a/net-misc/dahdi/ChangeLog
+++ b/net-misc/dahdi/ChangeLog
@@ -1,6 +1,15 @@
 # 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.18 2011/07/05 09:03:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/ChangeLog,v 1.19 2011/07/06 11:19:13 chainsaw Exp $
+
+*dahdi-2.4.1-r1 (06 Jul 2011)
+
+  06 Jul 2011; Tony Vroon <chainsaw@gentoo.org> +dahdi-2.4.1-r1.ebuild:
+  Patch from Stefan Knoblich fixes compilation against 2.6.39 kernels; closes
+  bug #372819 by Philipp Kugle. As requested by Diego "Flameeyes" Petteno, udev
+  rules are now installed in /lib as they are not intended for user
+  modification/customisation. CONFIG_MODULES is now also checked as the eclass
+  does not do it for us.
 
   05 Jul 2011; Diego E. Pettenò <flameeyes@gentoo.org> dahdi-2.4.1.ebuild:
   Check whether CRC_CCITT is enabled in kernel configuration; if it is not, it
diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index acb0aef65b2b..cf82bb292c94 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -28,6 +28,7 @@ DIST gentoo-dahdi-patchset-0.2.tar.bz2 59398 RMD160 c940d0783c89cd6e4a8c3d92fe42
 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
+DIST gentoo-dahdi-patchset-0.6.tar.bz2 60759 RMD160 d5115d485abfbcba18094409c97bda947a9e85c0 SHA1 607c924e34b13a03bc1f60586134d5b0e6879faa SHA256 5dc02244e88d65cf3af81c58b0266e36d9f5e9ffdfc0dc223b3ab0da3df64621
 EBUILD dahdi-2.1.0.4.ebuild 2029 RMD160 a19cc091f8ba9e4da5b6a2535fd5684223e2e662 SHA1 49a71dab58a58b1604988630c6deac92d797ad0e SHA256 c5d45dc494fbb57571277c84c14a6bd4ea04fbcd5d4adb9134d64d9b9faa7824
 EBUILD dahdi-2.2.0.2.ebuild 2477 RMD160 a3e1a191076117003b0e3be40b34da1c3e20f5fc SHA1 b90e5967f360700fe479d1f021e66306ed5c60ed SHA256 2e42ebfd8f28e0354af03b43fc71ff324a472d07442535eeeac542e17316252c
 EBUILD dahdi-2.2.1.1.ebuild 1945 RMD160 3f6f97a5d6534fe565746e1f6dc4da626b84e8eb SHA1 88e53d608016c41204f32e01c83c1114b249d1df SHA256 94cc56ea21e7e616a4d0666d944c77ca2afe7ac385527de87bf033bc2dbb5ba7
@@ -35,13 +36,14 @@ 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
+EBUILD dahdi-2.4.1-r1.ebuild 2207 RMD160 a9a7f74fc0bc67cab868f26920e84cc8a95e30fb SHA1 69fa5a30600e543ac98f9c33b44380ab227960da SHA256 836689f686dacccaab5c1e89b128eee01de390ddb1b2993033f4fbe335c488f7
 EBUILD dahdi-2.4.1.ebuild 2188 RMD160 65bdb3ef2d8405074ec5dd4392d3a015192b5eb8 SHA1 a61898889163ba430e0dcb53e81bcda0bba7a226 SHA256 d4659e430f6def29986870c60fd2a9ac69ab7c295ad6f76350ab418b6844d8bc
-MISC ChangeLog 4604 RMD160 0f893f63d55cb9e967a027a46271e4aef01a26c3 SHA1 ee1ae957da7be7f5e2e8308ba62e4896fed8c533 SHA256 04efc748bc362b8eca1120babd24044e5af46860c8203f9fea8a0669be8ac9b6
+MISC ChangeLog 5037 RMD160 c816f3e0cd4e6d796605e32faf5c99c1bebb7817 SHA1 393c9c93d5c0283dae81534b4a28b143f724d6b3 SHA256 0bcafd94e4d497e1fdc4696c731a2f033f52efb24d2800195939c1ea815f69c0
 MISC metadata.xml 333 RMD160 4a7f243a6d4b1de974e5c52592cdb310d5c68664 SHA1 f9b073c0c00e12f5f154a7d4209430ac8a736393 SHA256 c7cf56ea7b6f0f6d3707fe2c8a0ac3ff9d13414093c4332dcb2201d8b0966691
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4S02EACgkQAiZjviIA2XgZiwCgz/YH8R5A2hcLfuVJc3qaEv+h
-WmoAoNJ04FyfBwV3H5okt1RpBPdCii4V
-=+8XI
+iEYEARECAAYFAk4URKgACgkQp5vW4rUFj5ozXACghyWWGtqlRwUJfN4oZM2cRY2S
+ELYAn3qn0Mm9smSImpVpmw6xmJRMP8uo
+=fkZE
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dahdi/dahdi-2.4.1-r1.ebuild b/net-misc/dahdi/dahdi-2.4.1-r1.ebuild
new file mode 100644
index 000000000000..71600fb129b0
--- /dev/null
+++ b/net-misc/dahdi/dahdi-2.4.1-r1.ebuild
@@ -0,0 +1,66 @@
+# 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-r1.ebuild,v 1.1 2011/07/06 11:19:13 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.6.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="flash"
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND=""
+
+EPATCH_SUFFIX="diff"
+PATCHES=( "${WORKDIR}/dahdi-patchset" )
+
+CONFIG_CHECK="CONFIG_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/
+}
+
+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.*
+}