Clean up old ebuilds and patches.

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

17 files changed, 16 insertions, 1316 deletions

diff --git a/net-misc/dahdi/ChangeLog b/net-misc/dahdi/ChangeLog
index 47da5e148adf..8e74b8149475 100644
--- a/net-misc/dahdi/ChangeLog
+++ b/net-misc/dahdi/ChangeLog
@@ -1,6 +1,17 @@
 # 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.23 2011/08/26 09:57:43 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/ChangeLog,v 1.24 2011/09/02 08:41:03 chainsaw Exp $
+
+  02 Sep 2011; Tony Vroon <chainsaw@gentoo.org> -dahdi-2.1.0.4.ebuild,
+  -files/dahdi-2.1.0.4-netdev-2-6-29.patch,
+  -files/dahdi-2.1.0.4-no-depmod.patch, -dahdi-2.2.0.2.ebuild,
+  -files/dahdi-2.2.0.2-driver_data-2.6.32.patch,
+  -files/dahdi-2.2.0.2-gcc44-hack.patch, -files/dahdi-2.2.0.2-includes.patch,
+  -files/dahdi-2.2.0.2-net-device-ops.patch,
+  -files/dahdi-2.2.0.2-no-depmod.patch, -dahdi-2.2.1.1.ebuild,
+  -dahdi-2.3.0.ebuild, -dahdi-2.3.0.1.ebuild, -dahdi-2.4.0.ebuild,
+  -dahdi-2.4.0-r1.ebuild, -dahdi-2.4.1.ebuild:
+  Clean up old ebuilds and patches.
 
 *dahdi-2.5.0 (26 Aug 2011)
 
diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index e7554c8d15bb..45512569e392 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -1,53 +1,24 @@
 -----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
-AUX dahdi-2.2.0.2-gcc44-hack.patch 1040 RMD160 4261fd6015de727ce1bdec53ac330062b4fbd6b5 SHA1 bac51fd13a42176f6f1e82f0d07185765de6bed7 SHA256 8e496eb27e0c2aa8ce47b45a4d2ce099a06e86083f47f564db8862ac3855cb06
-AUX dahdi-2.2.0.2-includes.patch 4210 RMD160 fda2de7f76823c1da1a6bcd2e7eaa9ead5134ec0 SHA1 8ee8efa3507e85f6bd7773a25b6befeca78bede4 SHA256 c01cd7b1645b9c878d47fec867db364a50b5bcf36ea0c973b885f4e511cb784a
-AUX dahdi-2.2.0.2-net-device-ops.patch 1318 RMD160 7346306d427bfb47823d831328c3731fe374055c SHA1 4664d990a1b96ccbb7e6bd09db1f59da60cc72e9 SHA256 075efd926545085c00730761f70c3edbd1f45c5cc860721f472a56e2faa79060
-AUX dahdi-2.2.0.2-no-depmod.patch 507 RMD160 0516001b6def8ba84e69ecb1315aa2136c0ea9fd SHA1 04088a84b120190d2b059277c2b8860b8fba433d SHA256 46d3d87d1f93f036076eaa8caf7e516947de25dc8a564aa2ee146307989631bf
 DIST dahdi-fw-hx8-2.06.tar.gz 29252 RMD160 b039d046a029dd9ed0dd32df4d8560809429d964 SHA1 56c59081b1bd29c97f352b62c9667c409ca99f69 SHA256 449ab3fd03d55d808e999efb7677cd04de202b92c9fcb039539a7e48a39a80f5
 DIST dahdi-fw-oct6114-064-1.05.01.tar.gz 165869 RMD160 bef97e3741c4d5b21d1e728a08984dc1f0431eb0 SHA1 2fb8e5f4f7aedb285ffa21632efd45af877eacd4 SHA256 56bac1f2024c76ecf9b6f40992eeea29a1fbee676bb2a37a058179bacfbb1c91
 DIST dahdi-fw-oct6114-128-1.05.01.tar.gz 165849 RMD160 3c31b6d4ab7d3455eda75e42f5447880ea491b71 SHA1 bcf07434f4589d07d9b5f67f7b3a8fb115aa9229 SHA256 e1146749d205c41603b9b76852c3f8104dac233d0025d700db24504d10c99775
 DIST dahdi-fw-tc400m-MR6.12.tar.gz 1750035 RMD160 8181ffd4bc861122c338e1eb2748e797210f3150 SHA1 9206abda4c9cf192e8cae7e707f2e4e65beb8f87 SHA256 11dd8d009809e41fc9a3a36766f59ff73d29075eede5b8724331d9a6e5259774
-DIST dahdi-fw-vpmadt032-1.07.tar.gz 41376 RMD160 33dfc6da198065a33de516bdd2e4185bb7355e75 SHA1 fd470e7aec0db62e3750aa4819ff03b70c6e9977 SHA256 f566cc82203bc3a49f4850ac08dec613d1a2eeda437482e1d0c2da1e9e8bb68e
 DIST dahdi-fw-vpmoct032-1.8.0.tar.gz 443665 RMD160 a1ec32a19f3fd191e09a49724a33541b4814871d SHA1 4568ef1bcef9b5648ef8e71caf5872dff43588c2 SHA256 9ba13f96f4fb0f65564699c23777b28f144235bd4362c4a760d8009a8f248465
-DIST dahdi-fwload-vpmadt032-1.17.0.tar.gz 147425 RMD160 f13f96b23a8865e17f6d171102508682b1011a87 SHA1 76cb695c845e0a56972cf28490d70e03a260d929 SHA256 a94f5fc4944112706642e360878f81fed2fa524b24ec0981a25da5232e5952c8
-DIST dahdi-fwload-vpmadt032-1.20.0.tar.gz 146556 RMD160 eb7bbff9980f3723ba7eb84aed91778c4cf3a40f SHA1 3b4df3872a991c88daf058611f6663b069f2a4e8 SHA256 858043b38d09a70371d762c37b949f1031a11fb7623a4cce58389ec4d3246dc2
 DIST dahdi-fwload-vpmadt032-1.25.0.tar.gz 149360 RMD160 03854bebe670501a15bd8d5691c71dbafd4cc7f7 SHA1 0615613f6179ef927d23ed23daeaf7a718490200 SHA256 3ff26cf80555fd7470b43a87c51d03c1db2a75abcd4561d79f69b6c48298e4a1
-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 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 dahdi-linux-2.5.0.tar.gz 1546486 RMD160 a6ab21554965e403e5869bbae5e404200caaef2c SHA1 90d5f75df45426c01320fa5c3a0f58a6a9d00fb5 SHA256 08953e96a59f313594ee83caad45687293433c21603f0edbefd6b6513dbd80ad
-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
-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
 DIST gentoo-dahdi-patchset-0.7.tar.bz2 59254 RMD160 b38f73e62a2cac324e9b93ef19544bb1d32c551f SHA1 a273fdc07f7b887caf6a54aeff7e36ca12623126 SHA256 d597c521932c6746df7829e13d40df72de80de5d65745d5d5e8b2ebb9b032eda
-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
-EBUILD dahdi-2.3.0.1.ebuild 2004 RMD160 b34b3bf35f70116e3a2987900055e4465419161e SHA1 183727623a04d29e88cab9f656e058cfa3301d1b SHA256 c6d90a933d2e84977adfcc1d1ea7b80be74d3b791bb2242750b05d7571f3e4b5
-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 2196 RMD160 0774f46d81d678d159dd23e0c8ee040be7192f52 SHA1 c7c53be0c9d256e73b49d5e330faf5c666d21a74 SHA256 25b3b8826f636f328b833fec776e350a90fda2fcf8e9b8e11d348d6f2bddba97
-EBUILD dahdi-2.4.1.ebuild 2188 RMD160 65bdb3ef2d8405074ec5dd4392d3a015192b5eb8 SHA1 a61898889163ba430e0dcb53e81bcda0bba7a226 SHA256 d4659e430f6def29986870c60fd2a9ac69ab7c295ad6f76350ab418b6844d8bc
 EBUILD dahdi-2.5.0.ebuild 2310 RMD160 11d363bc2aea6423127c7c2eb32c0e26da9a4605 SHA1 cda83436ab6029ea3c6f3c92cda60f44f7071808 SHA256 9b51870975621ead03287d37e2567420c030aa803c9e6359a806c9e2f3e91c9b
-MISC ChangeLog 5704 RMD160 4833b29081a1b80e73fc970edd4b5546b23154fb SHA1 b6c47ebd4e7dd05268a870b780783c51b4da6ac8 SHA256 95d08f5c77fa1f153c88d15e87753924f0694663b4715fb1c42b1cb6f8cab490
+MISC ChangeLog 6268 RMD160 387f0b35af2602a29d04a73886eb50583b3663fa SHA1 b8c694699dcc32e7d7c1d80b500b8638eda5ad73 SHA256 eabebefaa46d47d6ebc52a3cdf712cc484207b2ae6a3e3af5b68b3317515361b
 MISC metadata.xml 333 RMD160 4a7f243a6d4b1de974e5c52592cdb310d5c68664 SHA1 f9b073c0c00e12f5f154a7d4209430ac8a736393 SHA256 c7cf56ea7b6f0f6d3707fe2c8a0ac3ff9d13414093c4332dcb2201d8b0966691
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5Xbh8ACgkQp5vW4rUFj5pkhwCfVbzzBpsnNzIww2UD5gEzaHCC
-Fd0An1JCwq5JU2SkSxccY8bntYs7enI6
-=Yuiw
+iEYEARECAAYFAk5glqgACgkQp5vW4rUFj5po7ACgh6DMfDmo2/Xda9Rw8kD6YoWm
+0h4An2jW6TygBtCRYMQKsyr7ZAJW008H
+=WU08
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dahdi/dahdi-2.1.0.4.ebuild b/net-misc/dahdi/dahdi-2.1.0.4.ebuild
deleted file mode 100644
index 89079dc436d0..000000000000
--- a/net-misc/dahdi/dahdi-2.1.0.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.1.0.4.ebuild,v 1.3 2011/01/19 16:54:16 chainsaw Exp $
-
-inherit linux-mod eutils flag-o-matic
-
-MY_P="${P/dahdi/dahdi-linux}"
-MY_S="${WORKDIR}/${MY_P}"
-RESTRICT="test"
-
-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-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-vpmadt032-1.07.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-
-	# Fix udev rules to work with both asterisk and callweaver
-	sed -i 's/GROUP="asterisk"/GROUP="dialout"/' "${MY_S}"/build_tools/genudevrules
-
-	# 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/
-
-	epatch "${FILESDIR}"/${P}-no-depmod.patch
-
-	# http://bugs.digium.com/view.php?id=14285
-	epatch "${FILESDIR}"/${P}-netdev-2-6-29.patch
-}
-
-src_compile() {
-	cd "${MY_P}"
-	unset ARCH
-	emake KSRC="${KERNEL_DIR}" DESTDIR="${D}" modules || die "failed to build module"
-}
-
-src_install() {
-	cd "${MY_P}"
-
-	# 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 "failed to install module"
-	rm -rf "$D"/lib/modules/*/modules.*
-}
diff --git a/net-misc/dahdi/dahdi-2.2.0.2.ebuild b/net-misc/dahdi/dahdi-2.2.0.2.ebuild
deleted file mode 100644
index 900d7b98bdcc..000000000000
--- a/net-misc/dahdi/dahdi-2.2.0.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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.2.0.2.ebuild,v 1.3 2011/01/19 16:54:16 chainsaw Exp $
-
-inherit linux-mod eutils flag-o-matic
-
-MY_P="${P/dahdi/dahdi-linux}"
-MY_S="${WORKDIR}/${MY_P}"
-RESTRICT="test"
-
-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-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-vpmadt032-1.07.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-
-	# Fix udev rules to work with both asterisk and callweaver
-	sed -i 's/GROUP="asterisk"/GROUP="dialout"/' "${MY_S}"/build_tools/genudevrules
-
-	# 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/
-
-	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
-}
-
-src_compile() {
-	cd "${MY_P}"
-	unset ARCH
-	emake KSRC="${KERNEL_DIR}" DESTDIR="${D}" all || die "Compilation failed"
-}
-
-src_install() {
-	cd "${MY_P}"
-
-	# 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/dahdi-2.2.1.1.ebuild b/net-misc/dahdi/dahdi-2.2.1.1.ebuild
deleted file mode 100644
index f1d08d42bd49..000000000000
--- a/net-misc/dahdi/dahdi-2.2.1.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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.2.1.1.ebuild,v 1.4 2011/01/19 16:54:16 chainsaw Exp $
-
-EAPI=3
-
-inherit base linux-mod eutils flag-o-matic
-
-MY_P="${P/dahdi/dahdi-linux}"
-S="${WORKDIR}/${MY_P}"
-RESTRICT="test"
-
-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.asterisk.org/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.17.0.tar.gz
-http://downloads.asterisk.org/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
-http://downloads.asterisk.org/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
-http://downloads.asterisk.org/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
-http://downloads.asterisk.org/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.20.0.tar.gz
-mirror://gentoo/gentoo-dahdi-patchset-0.1.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-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_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/dahdi-2.3.0.1.ebuild b/net-misc/dahdi/dahdi-2.3.0.1.ebuild
deleted file mode 100644
index f664ac7e2922..000000000000
--- a/net-misc/dahdi/dahdi-2.3.0.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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.3.0.1.ebuild,v 1.2 2011/01/19 16:54:16 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=""
-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_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/dahdi-2.3.0.ebuild b/net-misc/dahdi/dahdi-2.3.0.ebuild
deleted file mode 100644
index cfaabbc49d25..000000000000
--- a/net-misc/dahdi/dahdi-2.3.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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.3.0.ebuild,v 1.2 2011/01/19 16:54:16 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.2.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-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_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/dahdi-2.4.0-r1.ebuild b/net-misc/dahdi/dahdi-2.4.0-r1.ebuild
deleted file mode 100644
index fc55da5cd78e..000000000000
--- a/net-misc/dahdi/dahdi-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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.0-r1.ebuild,v 1.4 2011/02/27 18:57:01 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.*
-}
diff --git a/net-misc/dahdi/dahdi-2.4.0.ebuild b/net-misc/dahdi/dahdi-2.4.0.ebuild
deleted file mode 100644
index 756775856098..000000000000
--- a/net-misc/dahdi/dahdi-2.4.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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.0.ebuild,v 1.3 2011/01/19 16:54:16 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.4.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-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_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/dahdi-2.4.1.ebuild b/net-misc/dahdi/dahdi-2.4.1.ebuild
deleted file mode 100644
index 5c3b6624335d..000000000000
--- a/net-misc/dahdi/dahdi-2.4.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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.4 2011/07/05 09:03:45 flameeyes 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" )
-
-CONFIG_CHECK="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.*
-}
diff --git a/net-misc/dahdi/files/dahdi-2.1.0.4-netdev-2-6-29.patch b/net-misc/dahdi/files/dahdi-2.1.0.4-netdev-2-6-29.patch
deleted file mode 100644
index b40378d4490f..000000000000
--- a/net-misc/dahdi/files/dahdi-2.1.0.4-netdev-2-6-29.patch
+++ /dev/null
@@ -1,513 +0,0 @@
-diff -uNr dahdi-linux-2.1.0.4.ORIG/drivers/dahdi/wctc4xxp/base.c dahdi-linux-2.1.0.4/drivers/dahdi/wctc4xxp/base.c
---- dahdi-linux-2.1.0.4.ORIG/drivers/dahdi/wctc4xxp/base.c	2009-03-10 15:41:57.000000000 +0000
-+++ dahdi-linux-2.1.0.4/drivers/dahdi/wctc4xxp/base.c	2009-03-10 15:43:04.000000000 +0000
-@@ -73,6 +73,7 @@
- 	}                                                                   \
- 
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
-+#ifndef WARN_ON_ONCE
- #define WARN_ON_ONCE(__condition) do {         \
- 	static int __once = 1;                 \
- 	if (unlikely(__condition)) {           \
-@@ -83,6 +84,7 @@
- 	}                                      \
- } while(0) 
- #endif
-+#endif
- 
- #define INVALID 999 /* Used to mark invalid channels, commands, etc.. */
- #define MAX_CHANNEL_PACKETS  5 /* Never let more than 5 outstanding packets exist for any channel. */
-@@ -265,6 +267,7 @@
- /* Supervisor function codes */
- #define SUPVSR_CREATE_CHANNEL  0x0010
- 
-+#define MONITOR_LIVE_INDICATION_TYPE 0x75
- #define CONFIG_CHANGE_TYPE        0x00 
- #define CONFIG_DEVICE_CLASS       0x06
- 
-@@ -456,10 +459,12 @@
- 	unsigned long flags;
- 
- 	spinlock_t cmd_list_lock;
-+	spinlock_t rx_list_lock;
- 	/* This is a device-global list of commands that are waiting to be
- 	 * transmited (and did not fit on the transmit descriptor ring) */
- 	struct list_head cmd_list;
- 	struct list_head waiting_for_response_list;
-+	struct list_head rx_list;
- 
- 	unsigned int seq_num;
- 	unsigned char numchannels;
-@@ -498,6 +503,25 @@
- 
- };
- 
-+#ifdef HAVE_NETDEV_PRIV
-+struct wcdte_netdev_priv {
-+	struct wcdte *wc;
-+};
-+#endif
-+
-+static inline struct wcdte *
-+wcdte_from_netdev(struct net_device *netdev)
-+{
-+#ifdef HAVE_NETDEV_PRIV
-+	struct wcdte_netdev_priv *priv;
-+	priv = netdev_priv(netdev);
-+	return priv->wc;
-+#else
-+	return netdev->priv;
-+#endif
-+}
-+
-+
- static inline void wctc4xxp_set_ready(struct wcdte *wc) {
- 	set_bit(DTE_READY, &wc->flags);
- }
-@@ -563,7 +587,6 @@
- 	return pt;
- }
- 
--
- static struct sk_buff * 
- tcb_to_skb(struct net_device *netdev, const struct tcb *cmd)
- {
-@@ -613,7 +636,7 @@
- static void 
- wctc4xxp_net_set_multi(struct net_device *netdev)
- {
--	struct wcdte *wc = netdev->priv;
-+	struct wcdte *wc = wcdte_from_netdev(netdev);
- 	DTE_DEBUG(DTE_DEBUG_GENERAL, "%s promiscuity:%d\n", 
- 	   __FUNCTION__, netdev->promiscuity);
- }
-@@ -621,7 +644,7 @@
- static int 
- wctc4xxp_net_up(struct net_device *netdev)
- {
--	struct wcdte *wc = netdev->priv;
-+	struct wcdte *wc = wcdte_from_netdev(netdev);
- 	DTE_DEBUG(DTE_DEBUG_GENERAL, "%s\n", __FUNCTION__);
- #if 1
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
-@@ -636,7 +659,7 @@
- static int 
- wctc4xxp_net_down(struct net_device *netdev)
- {
--	struct wcdte *wc = netdev->priv;
-+	struct wcdte *wc = wcdte_from_netdev(netdev);
- 	DTE_DEBUG(DTE_DEBUG_GENERAL, "%s\n", __FUNCTION__);
- #if 1
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
-@@ -653,7 +676,7 @@
- static int 
- wctc4xxp_net_hard_start_xmit(struct sk_buff *skb, struct net_device *netdev)
- {
--	struct wcdte *wc = netdev->priv;
-+	struct wcdte *wc = wcdte_from_netdev(netdev);
- 	struct tcb *cmd;
- 
- 	/* We set DO_NOT_CAPTURE because this packet was already captured by
-@@ -688,7 +711,7 @@
- static int 
- wctc4xxp_poll(struct net_device *netdev, int *budget)
- {
--	struct wcdte *wc = netdev->priv;
-+	struct wcdte *wc = wcdte_from_netdev(netdev);
- 	int count = 0;
- 	int quota = min(netdev->quota, *budget);
- 
-@@ -714,7 +737,11 @@
- 	count = wctc4xxp_net_receive(wc, budget);
- 
- 	if (!skb_queue_len(&wc->captured_packets)) {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
- 		netif_rx_complete(wc->netdev, &wc->napi);
-+#else
-+		netif_rx_complete(&wc->napi);
-+#endif
- 	}
- 	return count;
- }
-@@ -723,7 +750,7 @@
- static struct net_device_stats *
- wctc4xxp_net_get_stats(struct net_device *netdev)
- {
--	struct wcdte *wc = netdev->priv;
-+	struct wcdte *wc = wcdte_from_netdev(netdev);
- 	return &wc->net_stats;
- }
- 
-@@ -760,7 +787,7 @@
- static int 
- wctc4xxp_net_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
- {
--	struct wcdte *wc = netdev->priv;
-+	struct wcdte *wc = wcdte_from_netdev(netdev);
- 	switch(cmd) {
- 	case 0x89f0:
- 		down(&wc->chansem);
-@@ -789,14 +816,25 @@
- {
- 	int res;
- 	struct net_device *netdev;
-+#	ifdef HAVE_NETDEV_PRIV
-+	struct wcdte_netdev_priv *priv;
-+#endif
- 	const char our_mac[] = { 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff};
- 
--	if (!(netdev = alloc_netdev(0, wc->board_name, ether_setup))) {
-+#	ifdef HAVE_NETDEV_PRIV
-+	netdev = alloc_netdev(sizeof(struct wcdte_netdev_priv),
-+			wc->board_name, ether_setup);
-+	if (!netdev)
-+		return -ENOMEM;
-+	priv = netdev_priv(netdev);
-+	priv->wc = wc;
-+#	else
-+	netdev = alloc_netdev(0, wc->board_name, ether_setup);
-+	if (!netdev)
- 		return -ENOMEM;
--	}
--
--	memcpy(netdev->dev_addr, our_mac, sizeof(our_mac));
- 	netdev->priv = wc;
-+#	endif
-+	memcpy(netdev->dev_addr, our_mac, sizeof(our_mac));
- 	netdev->set_multicast_list = &wctc4xxp_net_set_multi;
- 	netdev->open = &wctc4xxp_net_up;
- 	netdev->stop = &wctc4xxp_net_down;
-@@ -885,10 +923,12 @@
- 	}
- 
- 	skb_queue_tail(&wc->captured_packets, skb);
--#	if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
-+#	if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)
- 	netif_rx_schedule(netdev);
--#	else
-+#	elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
- 	netif_rx_schedule(netdev, &wc->napi);
-+#	else
-+	netif_rx_schedule(&wc->napi);
- #	endif
- 	return;
- }
-@@ -1005,6 +1045,7 @@
- {
- 	volatile struct wctc4xxp_descriptor *d;
- 	unsigned int len;
-+	unsigned long flags;
- 
- 	WARN_ON(!c);
- 	len = (c->data_len < MIN_PACKET_LEN) ? MIN_PACKET_LEN : c->data_len;
-@@ -1013,11 +1054,11 @@
- 		c->data_len = MAX_FRAME_SIZE;
- 	}
- 
--	spin_lock_bh(&dr->lock);
-+	spin_lock_irqsave(&dr->lock, flags);
- 	d = wctc4xxp_descriptor(dr, dr->tail); 
- 	WARN_ON(!d);
- 	if (d->buffer1) {
--		spin_unlock_bh(&dr->lock);
-+		spin_unlock_irqrestore(&dr->lock, flags);
- 		/* Do not overwrite a buffer that is still in progress. */
- 		return -EBUSY;
- 	}
-@@ -1030,7 +1071,7 @@
- 	dr->pending[dr->tail] = c;
- 	dr->tail = ++dr->tail & DRING_MASK;
- 	++dr->count;
--	spin_unlock_bh(&dr->lock);
-+	spin_unlock_irqrestore(&dr->lock, flags);
- 	return 0;
- }
- 
-@@ -1040,7 +1081,8 @@
- 	volatile struct wctc4xxp_descriptor *d;
- 	struct tcb *c;
- 	unsigned int head = dr->head;
--	spin_lock_bh(&dr->lock);
-+	unsigned long flags;
-+	spin_lock_irqsave(&dr->lock, flags);
- 	d = wctc4xxp_descriptor(dr, head);
- 	if (d->buffer1 && !OWNED(d)) {
- 		pci_unmap_single(dr->pdev, d->buffer1, 
-@@ -1056,16 +1098,17 @@
- 	} else {
- 		c = NULL;
- 	}
--	spin_unlock_bh(&dr->lock);
-+	spin_unlock_irqrestore(&dr->lock, flags);
- 	return c;
- }
- 
- static inline int wctc4xxp_getcount(struct wctc4xxp_descriptor_ring *dr) 
- {
- 	int count;
--	spin_lock_bh(&dr->lock);
-+	unsigned long flags;
-+	spin_lock_irqsave(&dr->lock, flags);
- 	count = dr->count;
--	spin_unlock_bh(&dr->lock);
-+	spin_unlock_irqrestore(&dr->lock, flags);
- 	return count;
- }
- 
-@@ -1256,9 +1299,10 @@
- {
- 	int i; 
- 	struct wctc4xxp_descriptor *d;
-+	unsigned long flags;
- 	
- 	/* NOTE: The DTE must be in the stopped state. */
--	spin_lock_bh(&dr->lock);
-+	spin_lock_irqsave(&dr->lock, flags);
- 	for (i = 0; i < DRING_SIZE; ++i) {
- 		d = wctc4xxp_descriptor(dr, i);
- 		if (d->buffer1) {
-@@ -1276,7 +1320,7 @@
- 	dr->head = 0;
- 	dr->tail = 0;
- 	dr->count = 0;
--	spin_unlock_bh(&dr->lock);
-+	spin_unlock_irqrestore(&dr->lock, flags);
- 	pci_free_consistent(dr->pdev, (sizeof(*d)+dr->padding) * DRING_SIZE, 
- 	                    dr->desc, dr->desc_dma); 
- }
-@@ -1289,9 +1333,10 @@
- 	spin_lock_bh(&wc->cmd_list_lock);
- 	list_splice_init(&wc->cmd_list, &local_list);
- 	list_splice_init(&wc->waiting_for_response_list, &local_list);
-+	list_splice_init(&wc->rx_list, &local_list);
- 	spin_unlock_bh(&wc->cmd_list_lock);
- 
--	while(!list_empty(&local_list)) {
-+	while (!list_empty(&local_list)) {
- 		cmd = list_entry(local_list.next, struct tcb, node); 
- 		list_del_init(&cmd->node);
- 		free_cmd(cmd);
-@@ -1497,9 +1542,7 @@
- 	u8 wctc4xxp_dstfmt; /* Digium Transcoder Engine Dest Format */
- 	int res;
- 
--	if (down_interruptible(&wc->chansem)) {
--		return -EINTR;
--	}
-+	down(&wc->chansem);
- 
- 	/* Check again to see if the channel was built after grabbing the
- 	 * channel semaphore, in case the previous holder of the semaphore
-@@ -1578,9 +1621,7 @@
- 		return -EIO;
- 	}
- 
--	if (down_interruptible(&wc->chansem)) {
--		return -EINTR;
--	}
-+	down(&wc->chansem);
- 
- 	/* Remove any packets that are waiting on the outbound queue. */
- 	wctc4xxp_cleanup_channel_private(wc, dtc);
-@@ -1887,6 +1928,38 @@
- 	return ((0x02 == hdr->type) || (0x04 == hdr->type)) ? 1 : 0;
- }
- 
-+static void
-+print_command(struct wcdte *wc, const struct tcb *cmd)
-+{
-+	int i, curlength;
-+	const struct csm_encaps_hdr *hdr = cmd->data;
-+	char *buffer;
-+	const int BUFFER_SIZE = 1024;
-+	int parameters = ((hdr->length - 8)/sizeof(__le16));
-+
-+	buffer = kzalloc(BUFFER_SIZE + 1, GFP_ATOMIC);
-+	if (!buffer) {
-+		DTE_PRINTK(DEBUG, "Failed print_command\n");
-+		return;
-+	}
-+	curlength = snprintf(buffer, BUFFER_SIZE, 
-+		"opcode: %04x seq: %02x control: %02x "
-+		"channel: %04x ", be16_to_cpu(hdr->op_code),
-+		hdr->seq_num, hdr->control, be16_to_cpu(hdr->channel));
-+	curlength += snprintf(buffer + curlength, BUFFER_SIZE - curlength,
-+		"length: %02x index: %02x type: %02x "
-+		"class: %02x function: %04x",
-+		hdr->length, hdr->index, hdr->type, hdr->class,
-+		le16_to_cpu(hdr->function));
-+	for (i = 0; i < parameters; ++i) {
-+		curlength += snprintf(buffer + curlength,
-+			BUFFER_SIZE - curlength, " %04x",
-+			le16_to_cpu(hdr->params[i]));
-+	}
-+	DTE_PRINTK(DEBUG, "%s\n", buffer);
-+	kfree(buffer);
-+}
-+
- static void 
- receive_csm_encaps_packet(struct wcdte *wc, struct tcb *cmd)
- {
-@@ -1923,6 +1996,10 @@
- 				wake_up(&wc->waitq);
- 			}
- 			free_cmd(cmd);
-+		} else if (MONITOR_LIVE_INDICATION_TYPE == hdr->type) {
-+			DTE_PRINTK(WARNING, "Received diagnostic message:\n");
-+			print_command(wc, cmd);
-+			free_cmd(cmd);
- 		} else {
- 			DTE_PRINTK(WARNING, "Unknown command type received. %02x\n", hdr->type);
- 			free_cmd(cmd);
-@@ -2026,28 +2103,21 @@
- static inline void service_rx_ring(struct wcdte *wc)
- {
- 	struct tcb *cmd;
--	while ((cmd = wctc4xxp_retrieve(wc->rxd))) {
--		struct tcb *newcmd;
-+	unsigned long flags;
-+	LIST_HEAD(local_list);
- 
--		wctc4xxp_net_capture_cmd(wc, cmd);
-+	spin_lock_irqsave(&wc->rx_list_lock, flags);
-+	list_splice_init(&wc->rx_list, &local_list);
-+	spin_unlock_irqrestore(&wc->rx_list_lock, flags);
- 
--		if(!(newcmd = __alloc_cmd(ALLOC_FLAGS, 0))) {
--			DTE_PRINTK(ERR, "Out of memory in %s.\n", __FUNCTION__);
--		} else {
--			if (newcmd->data_len < MAX_FRAME_SIZE) {
--				newcmd->data = kmalloc(MAX_FRAME_SIZE, ALLOC_FLAGS);
--				if (!newcmd->data) {
--					DTE_PRINTK(ERR, "out of memory in %s " \
--					    "again.\n", __FUNCTION__);
--				}
--				newcmd->data_len = MAX_FRAME_SIZE;
--			}
--			if (wctc4xxp_submit(wc->rxd, newcmd)) {
--				DTE_PRINTK(ERR, "Failed submit in %s\n", __FUNCTION__);
--				free_cmd(newcmd);
--			}
--			wctc4xxp_receive_demand_poll(wc);
--		}
-+	/*
-+	 * Process the received packets
-+	 */
-+	while (!list_empty(&local_list)) {
-+		cmd = container_of(local_list.next, struct tcb, node);
-+		list_del_init(&cmd->node);
-+
-+		wctc4xxp_net_capture_cmd(wc, cmd);
- 		wctc4xxp_receiveprep(wc, cmd);
- 	}
- 	wctc4xxp_receive_demand_poll(wc);
-@@ -2075,6 +2145,7 @@
- DAHDI_IRQ_HANDLER(wctc4xxp_interrupt)
- {
- 	struct wcdte *wc = dev_id;
-+	struct tcb *cmd;
- 	u32 ints;
- 	u32 reg;
- #define TX_COMPLETE_INTERRUPT 0x00000001
-@@ -2091,10 +2162,28 @@
- 
- 	if (likely(ints & NORMAL_INTERRUPTS)) {
- 		reg = 0;
--		if (ints & TX_COMPLETE_INTERRUPT) {
-+		if (ints & TX_COMPLETE_INTERRUPT)
- 			reg |= TX_COMPLETE_INTERRUPT;
--		}
-+
- 		if (ints & RX_COMPLETE_INTERRUPT) {
-+			while ((cmd = wctc4xxp_retrieve(wc->rxd))) {
-+				spin_lock(&wc->rx_list_lock);
-+				list_add_tail(&cmd->node, &wc->rx_list);
-+				spin_unlock(&wc->rx_list_lock);
-+
-+				cmd = __alloc_cmd(GFP_ATOMIC, 0);
-+				if (!cmd) {
-+					DTE_PRINTK(ERR,
-+					  "Out of memory in %s.\n", __func__);
-+				} else {
-+					if (wctc4xxp_submit(wc->rxd, cmd)) {
-+						DTE_PRINTK(ERR,
-+						  "Failed submit in %s\n",
-+						  __func__);
-+						free_cmd(cmd);
-+					}
-+				}
-+			}
- 			reg |= RX_COMPLETE_INTERRUPT;
- 		}
- #if DEFERRED_PROCESSING == WORKQUEUE
-@@ -2205,8 +2294,7 @@
- static void 
- wctc4xxp_enable_interrupts(struct wcdte *wc)
- {
--	wctc4xxp_setintmask(wc, 0x000180c1);
--	// wctc4xxp_setintmask(wc, 0xffffffff);
-+	wctc4xxp_setintmask(wc, 0x000180c0);
- }
- 
- static void 
-@@ -2615,26 +2703,30 @@
- {
- 	struct dahdi_transcoder_channel *dtc1, *dtc2;
- 	struct channel_pvt *cpvt1, *cpvt2;
--	int chan1, chan2;
-+	int chan1, chan2, timeslot1, timeslot2;
- 	int res;
- 
- 	if (cpvt->encoder) {
- 		chan1 = cpvt->chan_in_num;
-+		timeslot1 = cpvt->timeslot_in_num;
- 		chan2 = cpvt->chan_out_num;
-+		timeslot2 = cpvt->timeslot_out_num;
- 	} else {
- 		chan1 = cpvt->chan_out_num;
-+		timeslot1 = cpvt->timeslot_out_num;
- 		chan2 = cpvt->chan_in_num;
-+		timeslot2 = cpvt->timeslot_in_num;
- 	}
- 
--	if (chan1/2 >= wc->numchannels || chan2/2 >= wc->numchannels) {
-+	if (timeslot1/2 >= wc->numchannels || timeslot2/2 >= wc->numchannels) {
- 		DTE_PRINTK(WARNING, 
--		 "Invalid channel numbers in %s. chan1:%d chan2: %d\n", 
--		 __FUNCTION__, chan1/2, chan2/2);
-+		 "Invalid channel numbers in %s. chan1:%d chan2: %d\n",
-+		 __func__, timeslot1/2, timeslot2/2);
- 		return 0;
- 	}
- 
--	dtc1 = &(wc->uencode->channels[chan1/2]);
--	dtc2 = &(wc->udecode->channels[chan2/2]);
-+	dtc1 = &(wc->uencode->channels[timeslot1/2]);
-+	dtc2 = &(wc->udecode->channels[timeslot2/2]);
- 	cpvt1 = dtc1->pvt;
- 	cpvt2 = dtc2->pvt;
- 
-@@ -2740,10 +2832,8 @@
- wctc4xxp_setup_channels(struct wcdte *wc)
- {
- 	int ret;
--	if ((ret=down_interruptible(&wc->chansem))) {
--		WARN_ALWAYS();
--		return ret;
--	}
-+
-+	down(&wc->chansem);
- 	ret = __wctc4xxp_setup_channels(wc);
- 	up(&wc->chansem);
- 
-@@ -2979,8 +3069,10 @@
- 	init_MUTEX(&wc->chansem);
- 	spin_lock_init(&wc->reglock);
- 	spin_lock_init(&wc->cmd_list_lock);
-+	spin_lock_init(&wc->rx_list_lock);
- 	INIT_LIST_HEAD(&wc->cmd_list);
- 	INIT_LIST_HEAD(&wc->waiting_for_response_list);
-+	INIT_LIST_HEAD(&wc->rx_list);
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
- 	INIT_WORK(&wc->deferred_work, deferred_work_func, wc);
- #else
diff --git a/net-misc/dahdi/files/dahdi-2.1.0.4-no-depmod.patch b/net-misc/dahdi/files/dahdi-2.1.0.4-no-depmod.patch
deleted file mode 100644
index 98f2da259cfc..000000000000
--- a/net-misc/dahdi/files/dahdi-2.1.0.4-no-depmod.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr dahdi-linux-2.1.0.4.ORIG/Makefile dahdi-linux-2.1.0.4/Makefile
---- dahdi-linux-2.1.0.4.ORIG/Makefile	2009-03-10 15:53:36.000000000 +0000
-+++ dahdi-linux-2.1.0.4/Makefile	2009-03-10 15:53:59.000000000 +0000
-@@ -191,7 +191,7 @@
- 	build_tools/uninstall-modules dahdi $(KVERS)
- endif
- 	$(KMAKE) INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=dahdi modules_install
--	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
-+#	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
- 
- uninstall-modules:
- ifdef DESTDIR
diff --git a/net-misc/dahdi/files/dahdi-2.2.0.2-driver_data-2.6.32.patch b/net-misc/dahdi/files/dahdi-2.2.0.2-driver_data-2.6.32.patch
deleted file mode 100644
index 3085218c09fa..000000000000
--- a/net-misc/dahdi/files/dahdi-2.2.0.2-driver_data-2.6.32.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -uNr dahdi-linux-2.2.0.2.ORIg/drivers/dahdi/xpp/xbus-sysfs.c dahdi-linux-2.2.0.2/drivers/dahdi/xpp/xbus-sysfs.c
---- dahdi-linux-2.2.0.2.ORIg/drivers/dahdi/xpp/xbus-sysfs.c	2009-10-22 18:04:47.000000000 +0100
-+++ dahdi-linux-2.2.0.2/drivers/dahdi/xpp/xbus-sysfs.c	2009-10-22 18:05:54.000000000 +0100
-@@ -707,7 +707,11 @@
- 	dev->parent = &xbus->astribank;
- 	dev_set_name(dev, "%02d:%1x:%1x", xbus->num, xpd->addr.unit, 
- 			xpd->addr.subunit);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
-+	dev_set_drvdata(dev, xpd);
-+#else
- 	dev->driver_data = xpd;
-+#endif
- 	dev->release = xpd_release;
- 	ret = device_register(dev);
- 	if(ret) {
-@@ -728,11 +732,21 @@
- 	BUG_ON(!xbus);
- 	XPD_DBG(DEVICES, xpd, "SYSFS\n");
- 	dev = &xpd->xpd_dev;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
-+	if(!dev_get_drvdata(dev))
-+		return;
-+	BUG_ON(dev_get_drvdata(dev) != xpd);
-+#else
- 	if(!dev->driver_data)
- 		return;
- 	BUG_ON(dev->driver_data != xpd);
-+#endif
- 	device_unregister(dev);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
-+	dev_set_drvdata(dev, NULL);
-+#else
- 	dev->driver_data = NULL;
-+#endif
- }
- 
- /*--------- Sysfs Device handling ----*/
-@@ -746,9 +760,15 @@
- 	astribank = &xbus->astribank;
- 	BUG_ON(!astribank);
- 	sysfs_remove_link(&astribank->kobj, "transport");
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
-+	if(!dev_get_drvdata(astribank))
-+		return;
-+	BUG_ON(dev_get_drvdata(astribank) != xbus);
-+#else
- 	if(!astribank->driver_data)
- 		return;
- 	BUG_ON(astribank->driver_data != xbus);
-+#endif
- 	device_unregister(&xbus->astribank);
- }
- 
-@@ -764,18 +784,30 @@
- 	astribank->bus = &toplevel_bus_type;
- 	astribank->parent = xbus->transport.transport_device;
- 	dev_set_name(astribank, "xbus-%02d", xbus->num);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
-+	dev_set_drvdata(astribank, xbus);
-+#else
- 	astribank->driver_data = xbus;
-+#endif
- 	astribank->release = astribank_release;
- 	ret = device_register(astribank);
- 	if(ret) {
- 		XBUS_ERR(xbus, "%s: device_register failed: %d\n", __FUNCTION__, ret);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
-+		dev_set_drvdata(astribank, NULL);
-+#else
- 		astribank->driver_data = NULL;
-+#endif
- 		goto out;
- 	}
- 	ret = sysfs_create_link(&astribank->kobj, &astribank->parent->kobj, "transport");
- 	if(ret < 0) {
- 		XBUS_ERR(xbus, "%s: sysfs_create_link failed: %d\n", __FUNCTION__, ret);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
-+		dev_set_drvdata(astribank, NULL);
-+#else
- 		astribank->driver_data = NULL;
-+#endif
- 		goto out;
- 	}
- out:
diff --git a/net-misc/dahdi/files/dahdi-2.2.0.2-gcc44-hack.patch b/net-misc/dahdi/files/dahdi-2.2.0.2-gcc44-hack.patch
deleted file mode 100644
index d647a1f9beeb..000000000000
--- a/net-misc/dahdi/files/dahdi-2.2.0.2-gcc44-hack.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -uNr dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/xpp/xpp_dahdi.c dahdi-linux-2.2.0.2/drivers/dahdi/xpp/xpp_dahdi.c
---- dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/xpp/xpp_dahdi.c	2009-10-22 18:52:23.000000000 +0100
-+++ dahdi-linux-2.2.0.2/drivers/dahdi/xpp/xpp_dahdi.c	2009-10-22 18:52:55.000000000 +0100
-@@ -865,9 +865,11 @@
- #endif
- 	spin_lock_irqsave(&xbus->lock, flags);
- 	atomic_inc(&xpd->open_counter);
-+/*
- 	LINE_DBG(DEVICES, xpd, pos, "%s[%d]: open_counter=%d\n",
- 		current->comm, current->pid,
- 		atomic_read(&xpd->open_counter));
-+*/
- 	spin_unlock_irqrestore(&xbus->lock, flags);
- 	if(xpd->xops->card_open)
- 		xpd->xops->card_open(xpd, pos);
-@@ -885,9 +887,11 @@
- 	spin_unlock_irqrestore(&xbus->lock, flags);
- 	if(xpd->xops->card_close)
- 		xpd->xops->card_close(xpd, pos);
-+/*
- 	LINE_DBG(DEVICES, xpd, pos, "%s[%d]: open_counter=%d\n",
- 		current->comm, current->pid,
- 		atomic_read(&xpd->open_counter));
-+*/
- 	atomic_dec(&xpd->open_counter);		/* from xpp_open() */
- 	put_xpd(__FUNCTION__, xpd);					/* from xpp_open() */
- 	return 0;
diff --git a/net-misc/dahdi/files/dahdi-2.2.0.2-includes.patch b/net-misc/dahdi/files/dahdi-2.2.0.2-includes.patch
deleted file mode 100644
index 5451bc6915dc..000000000000
--- a/net-misc/dahdi/files/dahdi-2.2.0.2-includes.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -uNr dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/dahdi-base.c dahdi-linux-2.2.0.2/drivers/dahdi/dahdi-base.c
---- dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/dahdi-base.c	2009-10-22 17:14:40.000000000 +0100
-+++ dahdi-linux-2.2.0.2/drivers/dahdi/dahdi-base.c	2009-10-22 17:14:49.000000000 +0100
-@@ -46,6 +46,7 @@
- #include <linux/kmod.h>
- #include <linux/moduleparam.h>
- #include <linux/list.h>
-+#include <linux/sched.h>
- 
- #include <linux/ppp_defs.h>
- 
-diff -uNr dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/pciradio.c dahdi-linux-2.2.0.2/drivers/dahdi/pciradio.c
---- dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/pciradio.c	2009-10-22 17:14:40.000000000 +0100
-+++ dahdi-linux-2.2.0.2/drivers/dahdi/pciradio.c	2009-10-22 17:14:49.000000000 +0100
-@@ -51,6 +51,7 @@
- #include <linux/pci.h>
- #include <linux/interrupt.h>
- #include <linux/moduleparam.h>
-+#include <linux/sched.h>
- #include <asm/io.h>
- #include <asm/delay.h> 
- 
-diff -uNr dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/voicebus/voicebus.c dahdi-linux-2.2.0.2/drivers/dahdi/voicebus/voicebus.c
---- dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/voicebus/voicebus.c	2009-10-22 17:14:40.000000000 +0100
-+++ dahdi-linux-2.2.0.2/drivers/dahdi/voicebus/voicebus.c	2009-10-22 17:16:44.000000000 +0100
-@@ -35,6 +35,7 @@
- #include <linux/interrupt.h>
- #include <linux/timer.h>
- #include <linux/module.h>
-+#include <linux/sched.h>
- 
- #include <dahdi/kernel.h>
- #include "voicebus.h"
-diff -uNr dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/wcfxo.c dahdi-linux-2.2.0.2/drivers/dahdi/wcfxo.c
---- dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/wcfxo.c	2009-10-22 17:14:40.000000000 +0100
-+++ dahdi-linux-2.2.0.2/drivers/dahdi/wcfxo.c	2009-10-22 17:14:49.000000000 +0100
-@@ -30,6 +30,7 @@
- #include <linux/usb.h>
- #include <linux/errno.h>
- #include <linux/pci.h>
-+#include <linux/sched.h>
- #include <asm/io.h>
- #include <linux/moduleparam.h>
- 
-diff -uNr dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/wct1xxp.c dahdi-linux-2.2.0.2/drivers/dahdi/wct1xxp.c
---- dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/wct1xxp.c	2009-10-22 17:14:40.000000000 +0100
-+++ dahdi-linux-2.2.0.2/drivers/dahdi/wct1xxp.c	2009-10-22 17:14:49.000000000 +0100
-@@ -33,6 +33,7 @@
- #include <linux/pci.h>
- #include <linux/spinlock.h>
- #include <linux/moduleparam.h>
-+#include <linux/sched.h>
- 
- #include <dahdi/kernel.h>
- 
-diff -uNr dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/wctdm24xxp/base.c dahdi-linux-2.2.0.2/drivers/dahdi/wctdm24xxp/base.c
---- dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/wctdm24xxp/base.c	2009-10-22 17:14:40.000000000 +0100
-+++ dahdi-linux-2.2.0.2/drivers/dahdi/wctdm24xxp/base.c	2009-10-22 17:14:49.000000000 +0100
-@@ -45,6 +45,7 @@
- #include <linux/workqueue.h>
- #include <linux/delay.h>
- #include <linux/moduleparam.h>
-+#include <linux/sched.h>
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
- #include <linux/semaphore.h>
- #else
-diff -uNr dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/wctdm.c dahdi-linux-2.2.0.2/drivers/dahdi/wctdm.c
---- dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/wctdm.c	2009-10-22 17:14:40.000000000 +0100
-+++ dahdi-linux-2.2.0.2/drivers/dahdi/wctdm.c	2009-10-22 17:14:49.000000000 +0100
-@@ -31,6 +31,8 @@
- #include <linux/pci.h>
- #include <linux/interrupt.h>
- #include <linux/moduleparam.h>
-+#include <linux/sched.h>
-+
- #include <asm/io.h>
- #include "proslic.h"
- 
-diff -uNr dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/wcte11xp.c dahdi-linux-2.2.0.2/drivers/dahdi/wcte11xp.c
---- dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/wcte11xp.c	2009-10-22 17:14:40.000000000 +0100
-+++ dahdi-linux-2.2.0.2/drivers/dahdi/wcte11xp.c	2009-10-22 17:14:49.000000000 +0100
-@@ -32,6 +32,7 @@
- #include <linux/pci.h>
- #include <linux/spinlock.h>
- #include <linux/moduleparam.h>
-+#include <linux/sched.h>
- 
- #include <dahdi/kernel.h>
- 
-diff -uNr dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/xpp/xbus-core.c dahdi-linux-2.2.0.2/drivers/dahdi/xpp/xbus-core.c
---- dahdi-linux-2.2.0.2.ORIG/drivers/dahdi/xpp/xbus-core.c	2009-10-22 17:14:40.000000000 +0100
-+++ dahdi-linux-2.2.0.2/drivers/dahdi/xpp/xbus-core.c	2009-10-22 17:16:10.000000000 +0100
-@@ -35,6 +35,7 @@
- #include <linux/workqueue.h>
- #include <linux/device.h>
- #include <linux/delay.h>	/* for msleep() to debug */
-+#include <linux/sched.h>
- #include "xpd.h"
- #include "xpp_dahdi.h"
- #include "xbus-core.h"
diff --git a/net-misc/dahdi/files/dahdi-2.2.0.2-net-device-ops.patch b/net-misc/dahdi/files/dahdi-2.2.0.2-net-device-ops.patch
deleted file mode 100644
index a8f0a1e5e392..000000000000
--- a/net-misc/dahdi/files/dahdi-2.2.0.2-net-device-ops.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- dahdi-linux-2.2.0.2/drivers/dahdi/wctc4xxp/base.c	2009/08/04 16:30:11	6936
-+++ dahdi-linux-2.2.0.2/drivers/dahdi/wctc4xxp/base.c	2009/08/04 16:38:56	6937
-@@ -742,6 +742,17 @@
- 	return 0;
- }
- 
-+#ifdef HAVE_NET_DEVICE_OPS
-+static const struct net_device_ops wctc4xxp_netdev_ops = {
-+	.ndo_set_multicast_list = &wctc4xxp_net_set_multi,
-+	.ndo_open = &wctc4xxp_net_up,
-+	.ndo_stop = &wctc4xxp_net_down,
-+	.ndo_start_xmit = &wctc4xxp_net_hard_start_xmit,
-+	.ndo_get_stats = &wctc4xxp_net_get_stats,
-+	.ndo_do_ioctl = &wctc4xxp_net_ioctl,
-+};
-+#endif
-+
- /**
-  * wctc4xxp_net_register - Register a new network interface.
-  * @wc: transcoder card to register the interface for.
-@@ -773,14 +784,21 @@
- 	netdev->priv = wc;
- #	endif
- 	memcpy(netdev->dev_addr, our_mac, sizeof(our_mac));
-+
-+#	ifdef HAVE_NET_DEVICE_OPS
-+	netdev->netdev_ops = &wctc4xxp_netdev_ops;
-+#	else
- 	netdev->set_multicast_list = &wctc4xxp_net_set_multi;
- 	netdev->open = &wctc4xxp_net_up;
- 	netdev->stop = &wctc4xxp_net_down;
- 	netdev->hard_start_xmit = &wctc4xxp_net_hard_start_xmit;
- 	netdev->get_stats = &wctc4xxp_net_get_stats;
- 	netdev->do_ioctl = &wctc4xxp_net_ioctl;
-+#	endif
-+
- 	netdev->promiscuity = 0;
- 	netdev->flags |= IFF_NOARP;
-+
- #	if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)
- 	netdev->poll = &wctc4xxp_poll;
- 	netdev->weight = 64;
diff --git a/net-misc/dahdi/files/dahdi-2.2.0.2-no-depmod.patch b/net-misc/dahdi/files/dahdi-2.2.0.2-no-depmod.patch
deleted file mode 100644
index a0713199b1bc..000000000000
--- a/net-misc/dahdi/files/dahdi-2.2.0.2-no-depmod.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr dahdi-linux-2.2.0.2.ORIG/Makefile dahdi-linux-2.2.0.2/Makefile
---- dahdi-linux-2.2.0.2.ORIG/Makefile	2009-10-22 16:46:00.000000000 +0100
-+++ dahdi-linux-2.2.0.2/Makefile	2009-10-22 16:46:27.000000000 +0100
-@@ -184,7 +184,7 @@
- 	build_tools/uninstall-modules dahdi $(KVERS)
- endif
- 	$(KMAKE) INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=dahdi modules_install
--	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
-+#	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
- 
- uninstall-modules:
- ifdef DESTDIR