--- /usr/portage/net-misc/dahdi/dahdi-2.2.0.2.ebuild	2009-10-22 19:19:35.000000000 +0100
+++ dahdi-2.2.1.ebuild	2010-01-30 13:00:26.749597408 +0000
@@ -1,16 +1,17 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/dahdi-2.2.0.2.ebuild,v 1.1 2009/10/22 18:19:35 chainsaw Exp $
+# $Header: $
 
 inherit linux-mod eutils flag-o-matic
 
-MY_P="${P/dahdi/dahdi-linux}"
+MY_PN="${PN/dahdi/dahdi-linux}"
+MY_P="${MY_PN}-${PV/_/-}"
 MY_S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)."
 HOMEPAGE="http://www.asterisk.org"
 SRC_URI="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.17.0.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.21.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
@@ -38,19 +39,7 @@
 	cp *.bin "${MY_P}"/drivers/dahdi/firmware/
 
 	epatch "${FILESDIR}"/${P}-no-depmod.patch
-
-	# https://issues.asterisk.org/view.php?id=15747
-	epatch "${FILESDIR}"/${P}-net-device-ops.patch
-
-	# If you want TASK_INTERRUPTIBLE you need <linux/sched.h>, hmmkay?
-	epatch "${FILESDIR}"/${P}-includes.patch
-
-	# https://issues.asterisk.org/view.php?id=16114
-	epatch "${FILESDIR}"/${P}-driver_data-2.6.32.patch
-
-	# GCC 4.4 compatibility, the quick 'n dirty way
-	# error: dereferencing pointer to incomplete type
-	epatch "${FILESDIR}"/${P}-gcc44-hack.patch
+	epatch "${FILESDIR}"/${P}-parallel-make.patch
 }
 
 src_compile() {