diff --git a/net-wireless/compat-wireless/Manifest b/net-wireless/compat-wireless/Manifest
index 6dc00583b..78c67cf1a 100644
--- a/net-wireless/compat-wireless/Manifest
+++ b/net-wireless/compat-wireless/Manifest
@@ -19,26 +19,13 @@ AUX rtl8187-mac80211-injection-speed-2.6.30-rc3.patch 1179 RMD160 e06fc37c08ce45
 AUX whynot-2.6.31.patch 4272 RMD160 74ec1c66cfb376cf2c83401aa3edcdbfdd019438 SHA1 18f5680625ad68ebba773c8f39a04edf6456e2f2 SHA256 a1839efde553fb6c78b7121f94a3dc5401c146f9ff3e017e61de1b0298f4b371
 AUX whynot-2.6.32.patch 666 RMD160 fcca9ac8d2152bebe51643a4250dffed383aae68 SHA1 5d7261437f5c98758f13c6c3f8a5676769b05013 SHA256 07cfc03d0ad5c47bec08d320afa63c79c0e6be9109dcf42b9811aad10bdc9c63
 AUX whynot.patch 4106 RMD160 ac38e8dbbe1a59607fe16b36f327a9ba73a001e7 SHA1 2208598c9f9811d368db099c863be2a2af11681e SHA256 956cf3a0a8b8e1f0f0e3df985e351799f325a44e4cddf042d677a9e8109b7c9e
-DIST compat-wireless-2.6.30-rc6.tar.bz2 1678784 RMD160 f0d69b99d37732a39ba01fdd869d150db8a55037 SHA1 1e91215069ba8cd46654836279dacc964d9dc854 SHA256 6b2beba044860624d44a0a8cc5a701b1243d9dd89f7d028daca12b4ca41d6512
-DIST compat-wireless-2.6.30.tar.bz2 1677694 RMD160 814840138db96509a1e2bf35c6168227eb3a81f3 SHA1 bb2e23ce12afce2f76fdab56374f5f23ed2f0082 SHA256 318ebfc345923d8f99137923296384f1eaa6c496faf3bccbaa4dbd64155b0613
-DIST compat-wireless-2.6.31-rc4.tar.bz2 1837069 RMD160 1f54bc55f06db5052dfa7a012f26066a787e4ec5 SHA1 8aef7bacf403b7eff313e7992ec07d20f9d37ac5 SHA256 9f0f58775872a950be6a0e11e6687f4a31e1566a2da568e0534de1589bbdd0ff
-DIST compat-wireless-2.6.31-rc7.tar.bz2 1949339 RMD160 ad1b6f63260d1e58734a5a3f5a59b79879104d61 SHA1 c1ee9ce2fcb4dd7ec663be75bb438db7c5d09415 SHA256 0f57477ec4120ef8459b2ab909410e5b286fcbb842362d03d4286977528a5e11
-DIST compat-wireless-2.6.32-rc1.tar.bz2 1993678 RMD160 656c85798cb4e469aee56fe3df0bd26a0da23504 SHA1 a1efb7d59ba34a4486f351faa0d06a0b4be3cc81 SHA256 f388042660fa3f06050c63010dcdac444f9f8c5e225c212b8c5f86ce96740bfa
 DIST compat-wireless-2.6.32-rc5.tar.bz2 1977799 RMD160 ed714ccd80612fc2b53c4734dcbbb341397e2aee SHA1 341ae3b74e0ba0c7a1197c993578b0b4b3a78aaa SHA256 75602c5de60c416992fbea91cce11d5278733348ac5c25ef2c864865b0335897
 DIST compat-wireless-2.6.32-rc6.tar.bz2 1978113 RMD160 f207cef7710ce759dcbf770e0151aae2e2d04032 SHA1 4695c13cba0583f455cf34a8bb2fe5441522e1d6 SHA256 f4b6f9582e5fd049625e9c04637a969c749c19f323384abbcfefffd80cf49bd2
 DIST compat-wireless-2.6.32-rc7.tar.bz2 1978524 RMD160 90ebf4b83fd9fe2202cd0513f5c7749e0fe313d0 SHA1 fa189ccc635a27d7e281020116675d1473bed3c3 SHA256 78855ee4157f2f2dad6df5f7b679270c1928683440f788a1cab5035661bcb90a
-DIST compat-wireless-2.6.32.tar.bz2 1998209 RMD160 78fe8cb8c18d938cf452175ccf2e0c02233eef5e SHA1 379a4649a16a8e018afda22d6920b247ed27d9c4 SHA256 4c4dfc2f07997b0aa80878ec59397939377ec3dbb931c1e7934392e1ce4c8599
 DIST compat-wireless-2.6.33-rc1.tar.bz2 2282973 RMD160 9b23e6913f3091b7b36c8612e9fc08a7b9d5de42 SHA1 94fdebc288dacdbe7c26e098b2cee359188351bd SHA256 28fffd47b81f2aa1a729d638b12ccaefdad9379a09b6da066356467dbe17613e
 DIST compat-wireless-2.6.33-rc4.tar.bz2 2263510 RMD160 2da001c1ded0ad0e5038fd4a32621d5abbfbf212 SHA1 c007d7c8649d6149f415ea87dc7a34d4ee808766 SHA256 0cff5381c84528ae3e11f7228d2497aba0a9dd2f63f59be5bf9d74901d312041
 DIST compat-wireless-2.6.33-rc5.tar.bz2 2263853 RMD160 86e7ef39f50aee65ea594244e302dccb1d8dc7d3 SHA1 a9e26778dea6349a902c8acab54fcabfe6612b69 SHA256 990867758c5e0aa2df5ce06db177cbb74019572be59160c08320a5c659c06c6f
-EBUILD compat-wireless-2.6.30.ebuild 3389 RMD160 1eea3ef67a627df083f65bc84d62439bd0c12b12 SHA1 8f143cc406d583fafad08332e02a9552f290d75c SHA256 0a08cd49f0c4a4d1fef41dcaf7906c179cbb23a7193a6708e0f3f3901b71c115
-EBUILD compat-wireless-2.6.30_rc6.ebuild 3324 RMD160 d6372701d7ae635497eefb0b7ead25ea8c71fd4a SHA1 82565ba3f3a61ab7c1a17f2b159e24e5e71b708e SHA256 d3ab1be0727d5566ae1d2769874418119bf3884a217ccf03e03fa26c6786b6ce
-EBUILD compat-wireless-2.6.31_rc4.ebuild 1871 RMD160 a507e9841a00e03eb03d9e2da238012eee2617b2 SHA1 dbea89068f3c707fdc4fb34a7245b5eab706f48c SHA256 d84a8a1148366d10f874f54c4365666fad24b5f89b1955d97a4a71dae688de50
-EBUILD compat-wireless-2.6.31_rc7.ebuild 1913 RMD160 4b919364152b8e4363f37bf226e85398b7214ecf SHA1 669b1d7533f6d74dfbff9859296a0593c635d605 SHA256 b4576695300917db98f4bc5c87a6244495458e2c1e83110dcbdbfe73d386e700
-EBUILD compat-wireless-2.6.32.ebuild 2088 RMD160 b0ee259da917c8909fdad7859ca0db731abd6dea SHA1 65a9d6a5a967a5bb900b81395efd90819d8b2427 SHA256 786516250f5c8b0131ceba511d6caf70af6ebcbfe070b5d4bbaee527ea3fbe01
-EBUILD compat-wireless-2.6.32_rc1.ebuild 1742 RMD160 dc0e574a6fa4d34fad5dc08a308ba4e88a28d8f8 SHA1 d7e130851c8578aa17fb74c5c3b3234d62121a04 SHA256 6a313e003762690538692f1022e75858a630c9c01bfc399697a28f8ab3e3230a
 EBUILD compat-wireless-2.6.32_rc5-r1.ebuild 1779 RMD160 c943d857694cddcb21c92ace853a5a06116b7a1e SHA1 8636e437ad0edd666a8b919e0da0443f998b7b64 SHA256 2c2668bf82abc183816662e80068d3e37a788c70b4fd0ff7eb450fcc239f240e
-EBUILD compat-wireless-2.6.32_rc5.ebuild 1742 RMD160 dc0e574a6fa4d34fad5dc08a308ba4e88a28d8f8 SHA1 d7e130851c8578aa17fb74c5c3b3234d62121a04 SHA256 6a313e003762690538692f1022e75858a630c9c01bfc399697a28f8ab3e3230a
 EBUILD compat-wireless-2.6.32_rc6.ebuild 1779 RMD160 c943d857694cddcb21c92ace853a5a06116b7a1e SHA1 8636e437ad0edd666a8b919e0da0443f998b7b64 SHA256 2c2668bf82abc183816662e80068d3e37a788c70b4fd0ff7eb450fcc239f240e
 EBUILD compat-wireless-2.6.32_rc7-r1.ebuild 1929 RMD160 42b7a5c62813aa6f1f0681b9246efd34f217717a SHA1 81882c26de50066c171d5d0b521d2669bb127504 SHA256 8baad26721e3033629e64afd144f5f430d4ad3d6db6bee810d4c68775ea275c3
 EBUILD compat-wireless-2.6.32_rc7-r2.ebuild 2015 RMD160 c402f6c8b17d3d457a7c5db669315b9bcc94679a SHA1 7d4febe08a8e131aa47b40c7640d9d5b607f3acf SHA256 3b0584cd529a950654dc625184b0822f4d7d10088c8901956d2bad05f3cb2ffc
diff --git a/net-wireless/compat-wireless/compat-wireless-2.6.30.ebuild b/net-wireless/compat-wireless/compat-wireless-2.6.30.ebuild
deleted file mode 100644
index f6fe03b2f..000000000
--- a/net-wireless/compat-wireless/compat-wireless-2.6.30.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-DESCRIPTION="Stable kernel pre-release wifi subsystem backport"
-HOMEPAGE="http://wireless.kernel.org/en/users/Download/stable"
-
-##Stable
-MY_P=${P/_rc/-rc}
-SRC_URI="http://www.orbit-lab.org/kernel/compat-wireless-2.6-stable/v2.6.30/${MY_P}.tar.bz2"
-
-##Dailies
-#MY_P=${P//./-}
-#SRC_URI="http://wireless.kernel.org/download/compat-wireless-2.6/${MY_P}.tar.bz2"
-
-inherit linux-mod linux-info
-
-DEPEND=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="kernel_linux +injection"
-
-S=${WORKDIR}/${MY_P}
-CONFIG_CHECK="!DYNAMIC_FTRACE"
-RESTRICT="strip"
-
-#BUILD_TARGETS="all"
-#MODULE_NAMES="ImaModule(updates/blah:srctreelocation:srctreelocationofko)"
-
-##Adding the following for reference only while writing, remove after it works (the right way)
-# The structure of each MODULE_NAMES entry is as follows:
-#
-#   modulename(libdir:srcdir:objdir)
-#
-# where:
-#
-#   modulename = name of the module file excluding the .ko
-#   libdir     = place in system modules directory where module is installed (by default it's misc)
-#   srcdir     = place for ebuild to cd to before running make (by default it's ${S})
-#   objdir     = place the .ko and objects are located after make runs (by default it's set to srcdir)
-#
-# To get an idea of how these variables are used, here's a few lines
-# of code from around line 540 in this eclass:
-#
-#       einfo "Installing ${modulename} module"
-#       cd ${objdir} || die "${objdir} does not exist"
-#       insinto /lib/modules/${KV_FULL}/${libdir}
-#       doins ${modulename}.${KV_OBJ} || die "doins ${modulename}.${KV_OBJ} failed"
-#
-# For example:
-#   MODULE_NAMES="module_pci(pci:${S}/pci:${S}) module_usb(usb:${S}/usb:${S})"
-#
-# what this would do is
-#
-#   cd "${S}"/pci
-#   make ${BUILD_PARAMS} ${BUILD_TARGETS}
-#   cd "${S}"
-#   insinto /lib/modules/${KV_FULL}/pci
-#   doins module_pci.${KV_OBJ}
-
-##remove the proceeding after this works "the gentoo way"
-
-##the following line is garbage
-#MODULESD_COMPAT-WIRELESS_DOCS="README"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	linux_chkconfig_module MAC80211 || die "CONFIG_MAC80211 must be built as a _module_ !"
-	linux_chkconfig_module CFG80211 || die "CONFIG_CFG80211 must be built as a _module_ !"
-}
-
-src_compile() {
-	if use injection; then epatch "${FILESDIR}"/400[024]_*.patch; fi
-	if use injection; then epatch "${FILESDIR}"/4012_*.patch; fi
-	epatch "${FILESDIR}"/whynot.patch
-	epatch "${FILESDIR}"/rtl8187-led-blink_possibly-final.patch
-	addpredict "${KERNEL_DIR}"
-#    addpredict /lib/modules/"${KV_FULL}"
-#    die "build your patch"
-#	sed -e 's/(MAKE)/(MAKE) ARCH=$(ARCH)/g' -i Makefile
-	use amd64 && export ARCH="x86_64"
-	use x86 && export ARCH="x86"
-	emake KVER="${KV_FULL}" || die "emake failed"
-#    linux-mod_src_compile
-}
-
-src_install() {
-        for file in `find ./ -name \*.ko`
-        do
-		MY_DIR="/lib/modules/${KV_FULL}/updates/$(dirname ${file})"
-		dodir "${MY_DIR}"
-		insinto "${MY_DIR}"
-                doins "${file}"
-        done
-
-#	dodir /lib/modules/${KV_FULL}/updates
-#	emake KVER="${KV_FULL}" DESTDIR="${D}" KMODDIR_ARG="INSTALL_MOD_DIR=updates" KMODPATH_ARG="INSTALL_MOD_PATH=${D}" install || die "install failed"
-	dodoc README || die
-}
-
-pkg_postinst() {
-#        local moddir="${ROOT}/lib/modules/${KV_FULL}/updates/"
-
-#        linux-mod_pkg_postinst
-	update_depmod
-}
diff --git a/net-wireless/compat-wireless/compat-wireless-2.6.30_rc6.ebuild b/net-wireless/compat-wireless/compat-wireless-2.6.30_rc6.ebuild
deleted file mode 100644
index dae0ff23f..000000000
--- a/net-wireless/compat-wireless/compat-wireless-2.6.30_rc6.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-DESCRIPTION="Stable kernel pre-release wifi subsystem backport"
-HOMEPAGE="http://wireless.kernel.org/en/users/Download/stable"
-
-##Stable
-MY_P=${P/_rc/-rc}
-SRC_URI="http://www.orbit-lab.org/kernel/compat-wireless-2.6-stable/v2.6.30/${MY_P}.tar.bz2"
-
-##Dailies
-#MY_P=${P//./-}
-#SRC_URI="http://wireless.kernel.org/download/compat-wireless-2.6/${MY_P}.tar.bz2"
-
-inherit linux-mod linux-info
-
-DEPEND=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="kernel_linux +injection"
-
-S=${WORKDIR}/${MY_P}
-CONFIG_CHECK="!DYNAMIC_FTRACE"
-RESTRICT="strip"
-
-#BUILD_TARGETS="all"
-#MODULE_NAMES="ImaModule(updates/blah:srctreelocation:srctreelocationofko)"
-
-##Adding the following for reference only while writing, remove after it works (the right way)
-# The structure of each MODULE_NAMES entry is as follows:
-#
-#   modulename(libdir:srcdir:objdir)
-#
-# where:
-#
-#   modulename = name of the module file excluding the .ko
-#   libdir     = place in system modules directory where module is installed (by default it's misc)
-#   srcdir     = place for ebuild to cd to before running make (by default it's ${S})
-#   objdir     = place the .ko and objects are located after make runs (by default it's set to srcdir)
-#
-# To get an idea of how these variables are used, here's a few lines
-# of code from around line 540 in this eclass:
-#
-#       einfo "Installing ${modulename} module"
-#       cd ${objdir} || die "${objdir} does not exist"
-#       insinto /lib/modules/${KV_FULL}/${libdir}
-#       doins ${modulename}.${KV_OBJ} || die "doins ${modulename}.${KV_OBJ} failed"
-#
-# For example:
-#   MODULE_NAMES="module_pci(pci:${S}/pci:${S}) module_usb(usb:${S}/usb:${S})"
-#
-# what this would do is
-#
-#   cd "${S}"/pci
-#   make ${BUILD_PARAMS} ${BUILD_TARGETS}
-#   cd "${S}"
-#   insinto /lib/modules/${KV_FULL}/pci
-#   doins module_pci.${KV_OBJ}
-
-##remove the proceeding after this works "the gentoo way"
-
-##the following line is garbage
-#MODULESD_COMPAT-WIRELESS_DOCS="README"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	linux_chkconfig_module MAC80211 || die "CONFIG_MAC80211 must be built as a _module_ !"
-	linux_chkconfig_module CFG80211 || die "CONFIG_CFG80211 must be built as a _module_ !"
-}
-
-src_compile() {
-	if use injection; then epatch "${FILESDIR}"/40??_*.patch; fi
-	epatch "${FILESDIR}"/whynot.patch
-#	epatch "${FILESDIR}"/rtl8187-led-blink_possibly-final.patch
-	addpredict "${KERNEL_DIR}"
-#    addpredict /lib/modules/"${KV_FULL}"
-#    die "build your patch"
-#	sed -e 's/(MAKE)/(MAKE) ARCH=$(ARCH)/g' -i Makefile
-	use amd64 && export ARCH="x86_64"
-	use x86 && export ARCH="x86"
-	emake KVER="${KV_FULL}" || die "emake failed"
-#    linux-mod_src_compile
-}
-
-src_install() {
-        for file in `find ./ -name \*.ko`
-        do
-		MY_DIR="/lib/modules/${KV_FULL}/updates/$(dirname ${file})"
-		dodir "${MY_DIR}"
-		insinto "${MY_DIR}"
-                doins "${file}"
-        done
-
-#	dodir /lib/modules/${KV_FULL}/updates
-#	emake KVER="${KV_FULL}" DESTDIR="${D}" KMODDIR_ARG="INSTALL_MOD_DIR=updates" KMODPATH_ARG="INSTALL_MOD_PATH=${D}" install || die "install failed"
-	dodoc README || die
-}
-
-pkg_postinst() {
-#        local moddir="${ROOT}/lib/modules/${KV_FULL}/updates/"
-
-#        linux-mod_pkg_postinst
-	update_depmod
-}
diff --git a/net-wireless/compat-wireless/compat-wireless-2.6.31_rc4.ebuild b/net-wireless/compat-wireless/compat-wireless-2.6.31_rc4.ebuild
deleted file mode 100644
index ced03d08a..000000000
--- a/net-wireless/compat-wireless/compat-wireless-2.6.31_rc4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-DESCRIPTION="Stable kernel pre-release wifi subsystem backport"
-HOMEPAGE="http://wireless.kernel.org/en/users/Download/stable"
-
-##Stable
-MY_P=${P/_rc/-rc}
-SRC_URI="http://www.orbit-lab.org/kernel/compat-wireless-2.6-stable/v2.6.31/${MY_P}.tar.bz2"
-
-##Dailies
-#MY_P=${P//./-}
-#SRC_URI="http://wireless.kernel.org/download/compat-wireless-2.6/${MY_P}.tar.bz2"
-
-inherit linux-mod linux-info
-
-DEPEND="=sys-kernel/linux-firmware-99999999"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="kernel_linux +injection"
-
-S=${WORKDIR}/${MY_P}
-CONFIG_CHECK="!DYNAMIC_FTRACE"
-RESTRICT="strip"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	linux_chkconfig_module MAC80211 || die "CONFIG_MAC80211 must be built as a _module_ !"
-	linux_chkconfig_module CFG80211 || die "CONFIG_CFG80211 must be built as a _module_ !"
-}
-
-src_compile() {
-	if use injection; then epatch "${FILESDIR}"/400[024]_*.patch; fi
-#	if use injection; then epatch "${FILESDIR}"/4012_*.patch; fi
-	epatch "${FILESDIR}"/whynot-2.6.31.patch
-#	epatch "${FILESDIR}"/rtl8187-led-blink_possibly-final.patch
-	addpredict "${KERNEL_DIR}"
-#    addpredict /lib/modules/"${KV_FULL}"
-#	sed -e 's/(MAKE)/(MAKE) ARCH=$(ARCH)/g' -i Makefile
-	use amd64 && export ARCH="x86_64"
-	use x86 && export ARCH="x86"
-	emake KVER="${KV_FULL}" || die "emake failed"
-}
-
-src_install() {
-        for file in `find ./ -name \*.ko`
-        do
-		MY_DIR="/lib/modules/${KV_FULL}/updates/$(dirname ${file})"
-		dodir "${MY_DIR}"
-		insinto "${MY_DIR}"
-                doins "${file}"
-        done
-
-#	dodir /lib/modules/${KV_FULL}/updates
-#	emake KVER="${KV_FULL}" DESTDIR="${D}" KMODDIR_ARG="INSTALL_MOD_DIR=updates" KMODPATH_ARG="INSTALL_MOD_PATH=${D}" install || die "install failed"
-	dodoc README || die
-}
-
-pkg_postinst() {
-	update_depmod
-}
diff --git a/net-wireless/compat-wireless/compat-wireless-2.6.31_rc7.ebuild b/net-wireless/compat-wireless/compat-wireless-2.6.31_rc7.ebuild
deleted file mode 100644
index ded889f81..000000000
--- a/net-wireless/compat-wireless/compat-wireless-2.6.31_rc7.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-DESCRIPTION="Stable kernel pre-release wifi subsystem backport"
-HOMEPAGE="http://wireless.kernel.org/en/users/Download/stable"
-
-##Stable
-MY_P=${P/_rc/-rc}
-SRC_URI="http://www.orbit-lab.org/kernel/compat-wireless-2.6-stable/v2.6.31/${MY_P}.tar.bz2"
-
-##Dailies
-#MY_P=${P//./-}
-#SRC_URI="http://wireless.kernel.org/download/compat-wireless-2.6/${MY_P}.tar.bz2"
-
-inherit linux-mod linux-info
-
-DEPEND="=sys-kernel/linux-firmware-99999999"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="kernel_linux +injection"
-
-S=${WORKDIR}/${MY_P}
-CONFIG_CHECK="!DYNAMIC_FTRACE"
-RESTRICT="strip"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	linux_chkconfig_module MAC80211 || die "CONFIG_MAC80211 must be built as a _module_ !"
-	linux_chkconfig_module CFG80211 || die "CONFIG_CFG80211 must be built as a _module_ !"
-}
-
-src_compile() {
-	if use injection; then epatch "${FILESDIR}"/400[0245]_*.patch; fi
-#	if use injection; then epatch "${FILESDIR}"/4012_*.patch; fi
-	epatch "${FILESDIR}"/whynot-2.6.31.patch
-	epatch "${FILESDIR}"/blinky.patch
-#	epatch "${FILESDIR}"/rtl8187-led-blink_possibly-final.patch
-	addpredict "${KERNEL_DIR}"
-#    addpredict /lib/modules/"${KV_FULL}"
-#	sed -e 's/(MAKE)/(MAKE) ARCH=$(ARCH)/g' -i Makefile
-	use amd64 && export ARCH="x86_64"
-	use x86 && export ARCH="x86"
-	emake KVER="${KV_FULL}" || die "emake failed"
-}
-
-src_install() {
-        for file in `find ./ -name \*.ko`
-        do
-		MY_DIR="/lib/modules/${KV_FULL}/updates/$(dirname ${file})"
-		dodir "${MY_DIR}"
-		insinto "${MY_DIR}"
-                doins "${file}"
-        done
-	dosbin scripts/athenable scripts/b43load scripts/iwl-enable scripts/madwifi-unload scripts/athload
-	dosbin scripts/iwl-load scripts/modlib.sh scripts/b43enable scripts/load.sh scripts/unload.sh
-	dodoc README || die
-}
-
-pkg_postinst() {
-	update_depmod
-}
diff --git a/net-wireless/compat-wireless/compat-wireless-2.6.32.ebuild b/net-wireless/compat-wireless/compat-wireless-2.6.32.ebuild
deleted file mode 100644
index 939460864..000000000
--- a/net-wireless/compat-wireless/compat-wireless-2.6.32.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-inherit linux-mod linux-info
-
-##Stable
-MY_P=${P/_rc/-rc}
-DESCRIPTION="Stable kernel pre-release wifi subsystem backport"
-HOMEPAGE="http://wireless.kernel.org/en/users/Download/stable"
-SRC_URI="http://www.orbit-lab.org/kernel/${PN}-2.6-stable/v2.6.32/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="injection"
-
-DEPEND=""
-RDEPEND="=sys-kernel/linux-firmware-99999999"
-
-S=${WORKDIR}/${MY_P}
-RESTRICT="strip"
-
-CONFIG_CHECK="!DYNAMIC_FTRACE"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	kernel_is -lt 2 6 27 && die "kernel 2.6.27 or higher is required"
-	linux_chkconfig_module MAC80211 || die "CONFIG_MAC80211 must be built as a _module_ !"
-	linux_chkconfig_module CFG80211 || die "CONFIG_CFG80211 must be built as a _module_ !"
-}
-
-src_prepare() {
-	#whynot patch is against the makefile to fix general brokeness
-	epatch "${FILESDIR}"/whynot-2.6.32.patch
-
-	if use injection; then
-		epatch "${FILESDIR}"/400[24]_*.patch
-		epatch "${FILESDIR}"/mac80211.compat08082009.wl_frag+ack_v1.patch
-		epatch "${FILESDIR}"/4013-runtime-enable-disable-of-mac80211-packet-injection.patch
-		epatch "${FILESDIR}"/compat-chaos.patch;
-		epatch "${FILESDIR}"/rtl8187-mac80211-injection-speed-2.6.30-rc3.patch
-	fi
-}
-
-src_compile() {
-	addpredict "${KERNEL_DIR}"
-	set_arch_to_kernel
-	emake KVER="${KV_FULL}" || die "emake failed"
-}
-
-src_install() {
-	for file in $(find -name \*.ko); do
-		insinto "/lib/modules/${KV_FULL}/updates/$(dirname ${file})"
-		doins "${file}" || die "failed to install module ${file}"
-	done
-	dosbin scripts/athenable scripts/b43load scripts/iwl-enable \
-		scripts/madwifi-unload scripts/athload scripts/iwl-load \
-		scripts/modlib.sh scripts/b43enable scripts/load.sh \
-		scripts/unload.sh || die "script installation failed"
-	dodoc README || die
-}
-
-pkg_postinst() {
-	update_depmod
-	einfo 'You may have problem if you do not run "depmod -ae" after this installation'
-	einfo 'To switch to the new drivers without reboot run unload.sh then load.sh'
-}
diff --git a/net-wireless/compat-wireless/compat-wireless-2.6.32_rc1.ebuild b/net-wireless/compat-wireless/compat-wireless-2.6.32_rc1.ebuild
deleted file mode 100644
index 96c08b6da..000000000
--- a/net-wireless/compat-wireless/compat-wireless-2.6.32_rc1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-DESCRIPTION="Stable kernel pre-release wifi subsystem backport"
-HOMEPAGE="http://wireless.kernel.org/en/users/Download/stable"
-
-##Stable
-MY_P=${P/_rc/-rc}
-SRC_URI="http://www.orbit-lab.org/kernel/compat-wireless-2.6-stable/v2.6.32/${MY_P}.tar.bz2"
-
-inherit linux-mod linux-info
-
-DEPEND="=sys-kernel/linux-firmware-99999999"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="kernel_linux +injection"
-
-S=${WORKDIR}/${MY_P}
-CONFIG_CHECK="!DYNAMIC_FTRACE"
-RESTRICT="strip"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	linux_chkconfig_module MAC80211 || die "CONFIG_MAC80211 must be built as a _module_ !"
-	linux_chkconfig_module CFG80211 || die "CONFIG_CFG80211 must be built as a _module_ !"
-}
-
-src_compile() {
-	if use injection; then epatch "${FILESDIR}"/400[24]_*.patch; fi
-	if use injection; then epatch "${FILESDIR}"/mac80211.compat08082009.wl_frag+ack_v1.patch; fi
-	if use injection; then epatch "${FILESDIR}"/compat-chaos.patch; fi
-	epatch "${FILESDIR}"/whynot-2.6.32.patch
-	epatch "${FILESDIR}"/blinky.patch
-	addpredict "${KERNEL_DIR}"
-	use amd64 && export ARCH="x86_64"
-	use x86 && export ARCH="x86"
-	emake KVER="${KV_FULL}" || die "emake failed"
-}
-
-src_install() {
-        for file in `find ./ -name \*.ko`
-        do
-		MY_DIR="/lib/modules/${KV_FULL}/updates/$(dirname ${file})"
-		dodir "${MY_DIR}"
-		insinto "${MY_DIR}"
-                doins "${file}"
-        done
-	dosbin scripts/athenable scripts/b43load scripts/iwl-enable scripts/madwifi-unload scripts/athload
-	dosbin scripts/iwl-load scripts/modlib.sh scripts/b43enable scripts/load.sh scripts/unload.sh
-	dodoc README || die
-}
-
-pkg_postinst() {
-	update_depmod
-}
diff --git a/net-wireless/compat-wireless/compat-wireless-2.6.32_rc5.ebuild b/net-wireless/compat-wireless/compat-wireless-2.6.32_rc5.ebuild
deleted file mode 100644
index 96c08b6da..000000000
--- a/net-wireless/compat-wireless/compat-wireless-2.6.32_rc5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-DESCRIPTION="Stable kernel pre-release wifi subsystem backport"
-HOMEPAGE="http://wireless.kernel.org/en/users/Download/stable"
-
-##Stable
-MY_P=${P/_rc/-rc}
-SRC_URI="http://www.orbit-lab.org/kernel/compat-wireless-2.6-stable/v2.6.32/${MY_P}.tar.bz2"
-
-inherit linux-mod linux-info
-
-DEPEND="=sys-kernel/linux-firmware-99999999"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="kernel_linux +injection"
-
-S=${WORKDIR}/${MY_P}
-CONFIG_CHECK="!DYNAMIC_FTRACE"
-RESTRICT="strip"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	linux_chkconfig_module MAC80211 || die "CONFIG_MAC80211 must be built as a _module_ !"
-	linux_chkconfig_module CFG80211 || die "CONFIG_CFG80211 must be built as a _module_ !"
-}
-
-src_compile() {
-	if use injection; then epatch "${FILESDIR}"/400[24]_*.patch; fi
-	if use injection; then epatch "${FILESDIR}"/mac80211.compat08082009.wl_frag+ack_v1.patch; fi
-	if use injection; then epatch "${FILESDIR}"/compat-chaos.patch; fi
-	epatch "${FILESDIR}"/whynot-2.6.32.patch
-	epatch "${FILESDIR}"/blinky.patch
-	addpredict "${KERNEL_DIR}"
-	use amd64 && export ARCH="x86_64"
-	use x86 && export ARCH="x86"
-	emake KVER="${KV_FULL}" || die "emake failed"
-}
-
-src_install() {
-        for file in `find ./ -name \*.ko`
-        do
-		MY_DIR="/lib/modules/${KV_FULL}/updates/$(dirname ${file})"
-		dodir "${MY_DIR}"
-		insinto "${MY_DIR}"
-                doins "${file}"
-        done
-	dosbin scripts/athenable scripts/b43load scripts/iwl-enable scripts/madwifi-unload scripts/athload
-	dosbin scripts/iwl-load scripts/modlib.sh scripts/b43enable scripts/load.sh scripts/unload.sh
-	dodoc README || die
-}
-
-pkg_postinst() {
-	update_depmod
-}
diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest
index 55d8fc763..d4f8fa212 100644
--- a/net-wireless/crda/Manifest
+++ b/net-wireless/crda/Manifest
@@ -1,10 +1,4 @@
-DIST crda-1.0.1.tar.bz2 21013 RMD160 9fd99a0cac4e09926b9a97ded4f3f6e3f27298b2 SHA1 5574374fed2de53a0bee49702d6e7448c0c1bf5c SHA256 6b0cfb4d0340b6e239488a46ce92c8d26cec84fe0da06d4c7b7327bf0e932f1f
-DIST crda-1.0.2.tar.bz2 21270 RMD160 1724426caa3903fedd6727ccfd624d87290f391b SHA1 77d403d97fd7e7647778f8c121a1cb46dc47bb77 SHA256 b26f7af080925bc03a5782578291b614fbcb47563bc2f9d9363cf12825772459
 DIST crda-1.1.0.tar.bz2 21418 RMD160 56107c11c898d94db3b7d39e17ea9f53afc64ffb SHA1 1ab73f7df83aab511d484b6f8b959a96bd6ab1da SHA256 82695b11263e6b329b4789fbc6b43b7a2d91de667904767bd5d3e4a49556bfc1
 DIST crda-1.1.1.tar.bz2 21666 RMD160 035e381f6276dacd06afc05fbfefdbbf7e768091 SHA1 73643b3f49b34c4150df4abb793a36792cc68fb7 SHA256 59b4760da44a8f803caeaaa7fb97e0c6bd3f35f40445b28258e7f14c2fbe13b5
-EBUILD crda-1.0.1-r2.ebuild 1168 RMD160 839a0549917a7333e24f3260371d81bda07fabf4 SHA1 fa3216094eaae2bec2af7cc10881c6e303d3d818 SHA256 bcb101d55f09a76e807a466a5c3fe6f59736f2293e516e9ce92be2856fc6f865
-EBUILD crda-1.0.1-r3.ebuild 1162 RMD160 59da5210dcf2847d4136b98bd43f6abec6875c97 SHA1 e136a248a21af9521311ac0e4b3140c32b982013 SHA256 7a504d7fe9f74e25ec75f432222743adcfbfb556a1f6192adf1b86ce9298ef90
-EBUILD crda-1.0.2.ebuild 1162 RMD160 59da5210dcf2847d4136b98bd43f6abec6875c97 SHA1 e136a248a21af9521311ac0e4b3140c32b982013 SHA256 7a504d7fe9f74e25ec75f432222743adcfbfb556a1f6192adf1b86ce9298ef90
 EBUILD crda-1.1.0-r1.ebuild 1235 RMD160 3292753d2eb93f8b5c58be3a72ec7912c86c03b1 SHA1 c11d2f635823cc311e6981eb628606b242a80674 SHA256 889a8722ad807f3d4f053093c8b78334d9c15c647f5437933528190ae35612b7
-EBUILD crda-1.1.0.ebuild 1162 RMD160 59da5210dcf2847d4136b98bd43f6abec6875c97 SHA1 e136a248a21af9521311ac0e4b3140c32b982013 SHA256 7a504d7fe9f74e25ec75f432222743adcfbfb556a1f6192adf1b86ce9298ef90
 EBUILD crda-1.1.1.ebuild 905 RMD160 a908790ac379adffae983c25c23b6b0662d3b130 SHA1 91a578ecd725b06fa1dbf12a14dea3f7d319a478 SHA256 f0d2c90b8a747d45deff02fce2c8980326a0260d1206ea55f40242ce72ce9620
diff --git a/net-wireless/crda/crda-1.0.1-r2.ebuild b/net-wireless/crda/crda-1.0.1-r2.ebuild
deleted file mode 100644
index 35b4b9e98..000000000
--- a/net-wireless/crda/crda-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/crda-1.0.1-r1.ebuild,v 1.2 2009/01/29 18:37:01 gentoofan23 Exp $
-
-inherit toolchain-funcs multilib
-
-DESCRIPTION="Central Regulatory Domain Agent for wireless networks."
-HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory"
-SRC_URI="http://wireless.kernel.org/download/crda/${P}.tar.bz2"
-LICENSE="as-is"
-SLOT="0"
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-DEPEND="dev-libs/libgcrypt
-	dev-libs/libnl
-	dev-python/m2crypto
-	=net-wireless/wireless-regdb-20090130-r1"
-RDEPEND="dev-libs/libnl
-	=net-wireless/wireless-regdb-20090130-r1"
-# I am "pretty sure" about the rdepends
-
-src_unpack() {
-	unpack ${A}
-
-	##Make sure we install the rules where udev rules go...
-	sed -i -e "/^UDEV_RULE_DIR/s:lib:$(get_libdir):" "${S}"/Makefile || die \
-	"Makefile sed failed"
-	cp /usr/lib/crda/key.pub.pem ${S}/pubkeys/ || die "please 'emerge -1 wireless-regdb', sorry"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "Compilation failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/net-wireless/crda/crda-1.0.1-r3.ebuild b/net-wireless/crda/crda-1.0.1-r3.ebuild
deleted file mode 100644
index 58c0658b9..000000000
--- a/net-wireless/crda/crda-1.0.1-r3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/crda-1.0.1-r1.ebuild,v 1.2 2009/01/29 18:37:01 gentoofan23 Exp $
-
-inherit toolchain-funcs multilib
-
-DESCRIPTION="Central Regulatory Domain Agent for wireless networks."
-HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory"
-SRC_URI="http://wireless.kernel.org/download/crda/${P}.tar.bz2"
-LICENSE="as-is"
-SLOT="0"
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-DEPEND="dev-libs/libgcrypt
-	dev-libs/libnl
-	dev-python/m2crypto
-	=net-wireless/wireless-regdb-20090309"
-RDEPEND="dev-libs/libnl
-	=net-wireless/wireless-regdb-20090309"
-# I am "pretty sure" about the rdepends
-
-src_unpack() {
-	unpack ${A}
-
-	##Make sure we install the rules where udev rules go...
-	sed -i -e "/^UDEV_RULE_DIR/s:lib:$(get_libdir):" "${S}"/Makefile || die \
-	"Makefile sed failed"
-	cp /usr/lib/crda/key.pub.pem ${S}/pubkeys/ || die "please 'emerge -1 wireless-regdb', sorry"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "Compilation failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/net-wireless/crda/crda-1.0.2.ebuild b/net-wireless/crda/crda-1.0.2.ebuild
deleted file mode 100644
index 58c0658b9..000000000
--- a/net-wireless/crda/crda-1.0.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/crda-1.0.1-r1.ebuild,v 1.2 2009/01/29 18:37:01 gentoofan23 Exp $
-
-inherit toolchain-funcs multilib
-
-DESCRIPTION="Central Regulatory Domain Agent for wireless networks."
-HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory"
-SRC_URI="http://wireless.kernel.org/download/crda/${P}.tar.bz2"
-LICENSE="as-is"
-SLOT="0"
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-DEPEND="dev-libs/libgcrypt
-	dev-libs/libnl
-	dev-python/m2crypto
-	=net-wireless/wireless-regdb-20090309"
-RDEPEND="dev-libs/libnl
-	=net-wireless/wireless-regdb-20090309"
-# I am "pretty sure" about the rdepends
-
-src_unpack() {
-	unpack ${A}
-
-	##Make sure we install the rules where udev rules go...
-	sed -i -e "/^UDEV_RULE_DIR/s:lib:$(get_libdir):" "${S}"/Makefile || die \
-	"Makefile sed failed"
-	cp /usr/lib/crda/key.pub.pem ${S}/pubkeys/ || die "please 'emerge -1 wireless-regdb', sorry"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "Compilation failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/net-wireless/crda/crda-1.1.0.ebuild b/net-wireless/crda/crda-1.1.0.ebuild
deleted file mode 100644
index 58c0658b9..000000000
--- a/net-wireless/crda/crda-1.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/crda-1.0.1-r1.ebuild,v 1.2 2009/01/29 18:37:01 gentoofan23 Exp $
-
-inherit toolchain-funcs multilib
-
-DESCRIPTION="Central Regulatory Domain Agent for wireless networks."
-HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory"
-SRC_URI="http://wireless.kernel.org/download/crda/${P}.tar.bz2"
-LICENSE="as-is"
-SLOT="0"
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-DEPEND="dev-libs/libgcrypt
-	dev-libs/libnl
-	dev-python/m2crypto
-	=net-wireless/wireless-regdb-20090309"
-RDEPEND="dev-libs/libnl
-	=net-wireless/wireless-regdb-20090309"
-# I am "pretty sure" about the rdepends
-
-src_unpack() {
-	unpack ${A}
-
-	##Make sure we install the rules where udev rules go...
-	sed -i -e "/^UDEV_RULE_DIR/s:lib:$(get_libdir):" "${S}"/Makefile || die \
-	"Makefile sed failed"
-	cp /usr/lib/crda/key.pub.pem ${S}/pubkeys/ || die "please 'emerge -1 wireless-regdb', sorry"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "Compilation failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 0bba22149..89c01a57b 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,9 +1,6 @@
 AUX kismet-pentoo.patch 490 RMD160 374c3be715e6b5741f3232d50ed1194783f9ca11 SHA1 3ae5ae1c6e392a710ee85dfec801c098c4a4129d SHA256 a38b0124e6d07bac442cf7fc62feba2fbd540f2d0cb93daba82238bf124bf63c
 AUX kismet.confd 403 RMD160 cf6cad4dc844ccf9c807edfb5adec2351c0cd249 SHA1 50ce39c8989ddf214f72b3ac14f2a989d6121d15 SHA256 d2f5bb606e4dac45c8de27843ab460b9dac02e83979e52e1b8b3ca3af841adeb
 AUX kismet.initd 742 RMD160 f91c46a9a3d1cac2610659e65a1a3538af4f2772 SHA1 54aa3d489e2fade47cca11a036cb1237dab7786a SHA256 b4420c22264ff3604bf956b65bca5b564cbb70676c3f48d5e444f3aa6687a624
-DIST kismet-2009-11-R1.tar.gz 859854 RMD160 0488171b6e9267cd5c7d6e56dd5b141e57dbb6ad SHA1 460af864dca7743124f8165f8e7b813ff8a3df38 SHA256 323714ac23e242993c3ed269a2ac3ea0e9a36a33c94920c34418a988026a7d84
 DIST kismet-2010-01-R1.tar.gz 887325 RMD160 fb77368ccf702971bb877d83d5c7e819daeecbb3 SHA1 4ac00edd8607196dffc450535487104edef76c1d SHA256 9d1d1eae686d546e2fb8d6b4b3dcc106b7de5bd2bf4cf36d123b74625a8ed880
-EBUILD kismet-2009.11.1-r1.ebuild 2660 RMD160 231045fe17d8a3e9bb51a7077f3feda308d4b550 SHA1 8298668424783a39e76242374dbae28f43666699 SHA256 74bcdb7374ef2b9377e92f41d34aa41d98e7f6396ce9fcebefad9daf5353c0e4
-EBUILD kismet-2009.11.1.ebuild 2746 RMD160 cadc9391d6936a3193dc6358c92a815899001e35 SHA1 f52f791687eecdde7cc881808ba3260309be95d3 SHA256 c0d6e8452ca4f8ee582652bd7fb91ed7d276c49378c5d798d066fe7e66a39de0
 EBUILD kismet-2010.01.1.ebuild 2883 RMD160 f467e46de8e49788a7b44dc22f97ce3840ff0507 SHA1 e9a6b30c151c0a0f49edf483d85a37ecf5e7042f SHA256 29d12405f8c942d05cbeca9a0d72d5330969ce7331239747d5d90ce418ac0735
 EBUILD kismet-9999.ebuild 3218 RMD160 3c60daf507fde0a131d0761c5c3078c4ae32f022 SHA1 345d32497d1db60acf15db2947f8f6360c43da53 SHA256 049b76d32000f31492ba792b7263524b0cdcc15fb6078cb1252701943c811cae
diff --git a/net-wireless/kismet/kismet-2009.11.1-r1.ebuild b/net-wireless/kismet/kismet-2009.11.1-r1.ebuild
deleted file mode 100644
index e97a22120..000000000
--- a/net-wireless/kismet/kismet-2009.11.1-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit toolchain-funcs linux-info eutils
-
-MY_P=${P/\./-}
-MY_P=${MY_P/./-R}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
-HOMEPAGE="http://www.kismetwireless.net/"
-SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="+ncurses +pcre speech +plugin-autowep +plugin-ptw +plugin-spectools"
-
-DEPEND="${RDEPEND}"
-RDEPEND="net-wireless/wireless-tools
-	net-libs/libpcap
-	>=dev-libs/libnl-1.1
-	ncurses? ( sys-libs/ncurses )
-	speech? ( app-accessibility/flite )
-	plugin-spectools? ( net-wireless/spectools )"
-
-src_compile() {
-	cd "${S}"
-	epatch "${FILESDIR}"/kismet-pentoo.patch
-
-	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
-		conf/kismet.conf.in
-
-	# Don't strip and set correct mangrp
-	sed -i -e 's| -s||g' \
-		-e 's|@mangrp@|root|g' Makefile.in
-
-	# the configure script only honors '--disable-foo'
-#	local myconf="--disable-gpsmap"
-
-	if ! use ncurses; then
-		myconf="${myconf} --disable-curses --disable-panel"
-	fi
-
-	if ! use pcre; then
-		myconf="${myconf} --disable-pcre"
-	fi
-
-	econf ${myconf} \
-		--with-linuxheaders="${KV_DIR}" || die "econf failed"
-
-	emake dep || die "emake dep failed"
-	emake || die "emake failed"
-
-	if use plugin-autowep; then
-		cd "${S}"/plugin-autowep
-		KIS_SRC_DIR="${S}" emake || die "emake failed"
-	fi
-	if use plugin-ptw; then
-		cd "${S}"/plugin-ptw
-		KIS_SRC_DIR="${S}" emake || die "emake failed"
-	fi
-	if use plugin-spectools; then
-		cd "${S}"/plugin-spectools
-		KIS_SRC_DIR="${S}" emake || die "emake failed"
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	if use plugin-autowep; then
-		cd "${S}"/plugin-autowep
-		KIS_SRC_DIR="${S}" emake DESTDIR="${D}" install || die "emake install failed"
-	fi
-	if use plugin-ptw; then
-		cd "${S}"/plugin-ptw
-		KIS_SRC_DIR="${S}" emake DESTDIR="${D}" install || die "emake install failed"
-	fi
-	if use plugin-spectools; then
-		cd "${S}"/plugin-spectools
-		KIS_SRC_DIR="${S}" emake DESTDIR="${D}" install || die "emake install failed"
-	fi
-	cd "${S}"
-	# install headers
-	insinto /usr/include/kismet
-	doins *.h || die "Header installation failed"
-	dodoc CHANGELOG README* docs/* || die "Doc installation failed"
-	dosym /etc/kismet.conf /usr/local/etc/kismet.conf || die "Symlinking failed"
-	dosym /etc/kismet_drone.conf /usr/local/etc/kismet_drone.conf || die "Symlinking failed"
-	dosym /etc/kismet_ui.conf /usr/local/etc/kismet_ui.conf || die "Symlinking failed"
-	newinitd "${FILESDIR}"/${PN}.initd kismet
-	newconfd "${FILESDIR}"/${PN}.confd kismet
-}
diff --git a/net-wireless/kismet/kismet-2009.11.1.ebuild b/net-wireless/kismet/kismet-2009.11.1.ebuild
deleted file mode 100644
index 13a48b4a7..000000000
--- a/net-wireless/kismet/kismet-2009.11.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit toolchain-funcs linux-info eutils
-
-MY_P=${P/\./-}
-MY_P=${MY_P/./-R}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
-HOMEPAGE="http://www.kismetwireless.net/"
-SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="+ncurses +pcre speech +plugin-autowep +plugin-dot15d4 +plugin-ptw +plugin-spectools"
-
-DEPEND="${RDEPEND}"
-RDEPEND="net-wireless/wireless-tools
-	net-libs/libpcap
-	>=dev-libs/libnl-1.1
-	ncurses? ( sys-libs/ncurses )
-	speech? ( app-accessibility/flite )
-	plugin-dot15d4? ( <dev-libs/libusb-1 )
-	plugin-spectools? ( net-wireless/spectools )"
-
-src_compile() {
-	cd "${S}"
-	epatch "${FILESDIR}"/kismet-pentoo.patch
-
-	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
-		conf/kismet.conf.in
-
-	# Don't strip and set correct mangrp
-	sed -i -e 's| -s||g' \
-		-e 's|@mangrp@|root|g' Makefile.in
-
-	# the configure script only honors '--disable-foo'
-#	local myconf="--disable-gpsmap"
-
-	if ! use ncurses; then
-		myconf="${myconf} --disable-curses --disable-panel"
-	fi
-
-	if ! use pcre; then
-		myconf="${myconf} --disable-pcre"
-	fi
-
-	econf ${myconf} \
-		--with-linuxheaders="${KV_DIR}" || die "econf failed"
-
-	emake dep || die "emake dep failed"
-	emake || die "emake failed"
-
-	if use plugin-autowep; then
-		cd "${S}"/plugin-autowep
-		KIS_SRC_DIR="${S}" emake || die "emake failed"
-	fi
-	if use plugin-dot15d4; then
-		cd "${S}"/plugin-dot15d4
-		KIS_SRC_DIR="${S}" emake || die "emake failed"
-	fi
-	if use plugin-ptw; then
-		cd "${S}"/plugin-ptw
-		KIS_SRC_DIR="${S}" emake || die "emake failed"
-	fi
-	if use plugin-spectools; then
-		cd "${S}"/plugin-spectools
-		KIS_SRC_DIR="${S}" emake || die "emake failed"
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	if use plugin-autowep; then
-		cd "${S}"/plugin-autowep
-		KIS_SRC_DIR="${S}" emake DESTDIR="${D}" install || die "emake install failed"
-	fi
-	if use plugin-dot15d4; then
-		cd "${S}"/plugin-dot15d4
-		KIS_SRC_DIR="${S}" emake DESTDIR="${D}" install || die "emake install failed"
-	fi
-	if use plugin-ptw; then
-		cd "${S}"/plugin-ptw
-		KIS_SRC_DIR="${S}" emake DESTDIR="${D}" install || die "emake install failed"
-	fi
-	if use plugin-spectools; then
-		cd "${S}"/plugin-spectools
-		KIS_SRC_DIR="${S}" emake DESTDIR="${D}" install || die "emake install failed"
-	fi
-
-	dodoc CHANGELOG README* docs/*
-	dosym /etc/kismet.conf /usr/local/etc/kismet.conf
-	dosym /etc/kismet_drone.conf /usr/local/etc/kismet_drone.conf
-	dosym /etc/kismet_ui.conf /usr/local/etc/kismet_ui.conf
-	newinitd "${FILESDIR}"/${PN}.initd kismet
-	newconfd "${FILESDIR}"/${PN}.confd kismet
-}