From 4b222dbc4ff21d7dc178e6cdca9c062a89f374ee Mon Sep 17 00:00:00 2001
From: Zero_Chaos <zerochaos-@users.noreply.github.com>
Date: Fri, 1 Apr 2011 23:15:32 +0000
Subject: [PATCH] compat-wireless: updates and cleanups

---
 net-wireless/compat-wireless/Manifest         |  16 +-
 .../compat-wireless-2.6.37-r3.ebuild          | 139 -----------------
 .../compat-wireless-2.6.37-r4.ebuild          | 139 -----------------
 .../compat-wireless-2.6.37-r5.ebuild          | 140 ------------------
 .../compat-wireless-2.6.37-r6.ebuild          | 140 ------------------
 .../compat-wireless-2.6.38.ebuild             |   2 +-
 .../compat-wireless-2.6.38_rc3.ebuild         | 137 -----------------
 .../compat-wireless-2.6.38_rc4-r1.ebuild      | 136 -----------------
 .../compat-wireless-2.6.38_rc4.ebuild         | 137 -----------------
 ...uild => compat-wireless-2.6.39_rc1.ebuild} |   4 +-
 10 files changed, 6 insertions(+), 984 deletions(-)
 delete mode 100644 net-wireless/compat-wireless/compat-wireless-2.6.37-r3.ebuild
 delete mode 100644 net-wireless/compat-wireless/compat-wireless-2.6.37-r4.ebuild
 delete mode 100644 net-wireless/compat-wireless/compat-wireless-2.6.37-r5.ebuild
 delete mode 100644 net-wireless/compat-wireless/compat-wireless-2.6.37-r6.ebuild
 delete mode 100644 net-wireless/compat-wireless/compat-wireless-2.6.38_rc3.ebuild
 delete mode 100644 net-wireless/compat-wireless/compat-wireless-2.6.38_rc4-r1.ebuild
 delete mode 100644 net-wireless/compat-wireless/compat-wireless-2.6.38_rc4.ebuild
 rename net-wireless/compat-wireless/{compat-wireless-2.6.38_rc7.ebuild => compat-wireless-2.6.39_rc1.ebuild} (98%)

diff --git a/net-wireless/compat-wireless/Manifest b/net-wireless/compat-wireless/Manifest
index a8bfb4462..9013f8a03 100644
--- a/net-wireless/compat-wireless/Manifest
+++ b/net-wireless/compat-wireless/Manifest
@@ -42,25 +42,15 @@ DIST compat-wireless-2.6.33.tar.bz2 2266149 RMD160 599ab94e51179627407877b4c3c65
 DIST compat-wireless-2.6.34.tar.bz2 2370805 RMD160 a3e4635ccd100f95509783090458ceb646e97cba SHA1 84d99b0008785d91918a6b29575fc6de86552751 SHA256 4e4af0df6c74461571925bea8f315f86a6dee3f4a74bbafed7950fdf30fdddd4
 DIST compat-wireless-2.6.35-1.tar.bz2 2548928 RMD160 646c93e01ddd4dbfde402b005881960dcf8e2a05 SHA1 95a44314284e68ea8902b42bd7a41e0b613efe64 SHA256 579100ac48f459aa1ec71ae183e37ab91475109081a17c7b45fc5af35ed3c3ec
 DIST compat-wireless-2.6.36-5-spn.tar.bz2 2664927 RMD160 f45b6e106c024366b7a064f3571254d515b7ab6c SHA1 e2391cc37d762dab146c2e067534f3f20eb4469f SHA256 da4362445405bf7de55947b79ee72a3a9c56cf4a91e3eef74f7896aad59b02df
-DIST compat-wireless-2.6.37-3-sn.tar.bz2 3897162 RMD160 c0dbbca7860d04b304edd23b4fe6e1ab272fe9a6 SHA1 f244fa2f442a67fc02a52301b9c6d1572cb67ea0 SHA256 c6dec8415d4c0fc6a4297028dfcdd1f8738ea3a295b3089c3d4cd30b9499b708
 DIST compat-wireless-2.6.37-4-sn.tar.bz2 3874734 RMD160 86cce3f4f6e21cb00a2e1c3d18faf0aac345c43b SHA1 54b8d777287fdcc7a716d71cfb21884f1ae07157 SHA256 95bbc94885bfbccb50d42b4d677f1f1442713fc5db08905aaa05e2955b34b133
 DIST compat-wireless-2.6.38-3-ns.tar.bz2 4055637 RMD160 ce9a5bc3d359031c7aa984bcb6162b505c18129b SHA1 305e5c7e24246d082f88ffa1c7ad219db1138058 SHA256 e5cb02cd46e9f070e9ddaa17cd29bf6c9d839fd1b0e5771932753da6b5c73f54
-DIST compat-wireless-2.6.38-rc3-3-s.tar.bz2 4034978 RMD160 b9632ec15169eb957cbb984326c0ae4c4dade27e SHA1 367c5d99a20fbd54561bd1b0b79b41c3a3393fa9 SHA256 2a9446f60819f70dbf54bf373ea32931d9622430f72f2f2eb81b0e456221ccb6
-DIST compat-wireless-2.6.38-rc4-1.tar.bz2 4032335 RMD160 4a3de80038fd64e696d7be6d952e3794c39774ab SHA1 5355ee660ba607ac08c78647765c2ed50ee5560c SHA256 24726b8d635a21f1f462ae0f03f4414ac897f550c0dbf6ac826f3858e2d2c90d
-DIST compat-wireless-2.6.38-rc7-2-s.tar.bz2 4034273 RMD160 37fcc16bc07703f50cf564be3896b7107b91b8d3 SHA1 8e6ba3bcb86ce3c4b20dc9dd7a2b9ca3e99ea48d SHA256 ec5b498417f6b5b7d3f705422d0b34895b43286c32b184cf04f5e2f4bb3ee041
+DIST compat-wireless-2.6.39-rc1-3-s.tar.bz2 4330348 RMD160 cddb9b64bd97979a1550bd0c7ce886013c4abaab SHA1 9f7234f92551c77dc51bf3ec5faa5190265de695 SHA256 302e68f4cd3352eac8f983f022041bc31005883903a1854a6bfb9c819efb91d1
 EBUILD compat-wireless-2.6.32.8.ebuild 2368 RMD160 53d1a1401310d34cd03f2fa6bb41e60d2a16dcfd SHA1 c19445050e394bc0239c61fec11eab69e4f08daa SHA256 705bb5ad89ec2433edd4252488b3e7322c5137c49520203a3cbea44314ab9234
 EBUILD compat-wireless-2.6.33-r1.ebuild 2747 RMD160 c120f1c92a7205097839c5dc42235bfd10cbf555 SHA1 2144302eab89dd5881eecf3725124d6c5b288f3f SHA256 0d425eec9472ed83cd1a29945ead1116612c938248c430653510011d56307a6b
 EBUILD compat-wireless-2.6.34-r2.ebuild 3918 RMD160 48f91620cf68a993e63d3c9dfe565850650e6fc5 SHA1 44e4bec8543c93e456d3a2ac3e4ab1c7b55a8f01 SHA256 a729ecc6955dac802ed9b1585f23a48c54fdd45434d2673930322c792c77e159
 EBUILD compat-wireless-2.6.35-r1.ebuild 5471 RMD160 dcc6f3666823faee305165a846cd37065ac9e2cb SHA1 74c3474682925c35629cffaad6a7ec522e31f5c9 SHA256 25c0b5e0db7fe4d1e9942acbe7f0325e1ef8d7e92488f0f554734bca2d0e86e0
 EBUILD compat-wireless-2.6.36.ebuild 5332 RMD160 c4a19864f8703fce0b9369fc597f165290c56661 SHA1 efb406e9ab4ea21021f0e09edbfdb2e5d2a08f7e SHA256 52f02128f594db9950425aa03cd90cf9d5ff54d6475b25db696c58cd8c0a75d2
-EBUILD compat-wireless-2.6.37-r3.ebuild 5435 RMD160 30788167a2178c7aa938748995d463b94ba93722 SHA1 102a976b067c2adea7e94ddfe09dece88b98e567 SHA256 468114a1339f0b6b5f8af96a74e0d720eea1b205916fc1ef343628f18313b9f5
-EBUILD compat-wireless-2.6.37-r4.ebuild 5435 RMD160 f21a0918f32a430cb99c8b429e2190bdfd657891 SHA1 005db89cf334deb6182d9c1279702fdc210db1f9 SHA256 c8a9a20e11291f6856777fa18047428f87b7597155a646c1187d68c7d0e6cb19
-EBUILD compat-wireless-2.6.37-r5.ebuild 5534 RMD160 fdd01b6a756cb21e0f6408e95b52d75ebeca8a71 SHA1 75689d48d080e8ce8432f3b0e8b5df797d4ce2f6 SHA256 bbdeca31156efb5333f407e66c9b737e42415dfa884b6b0bd167068d1f1d60fd
-EBUILD compat-wireless-2.6.37-r6.ebuild 5542 RMD160 9558974e2d750b6594d903caa227c56b5762f722 SHA1 fa6490334a162883a1f0fb708d8f6576eadd1cdd SHA256 0c24ace6b56c30d905e950b874edd434406b2faf0a454f26157a3db56bc643c5
 EBUILD compat-wireless-2.6.37-r7.ebuild 5443 RMD160 629fefa357220ebbad14d4f42979072a6ced87cc SHA1 7cd2e349de253e0f62abbe6c11bbfdc1558877e7 SHA256 f08fb77d9972331aae217e050e034e3bfd17d933c5eb22a272d05c7022f70462
-EBUILD compat-wireless-2.6.38.ebuild 5352 RMD160 971f20329bdadb5da70f2d2bbbab04741b77829f SHA1 4b69560d62a908cf6f78f410f299606e7428b506 SHA256 21f04515b3fdfa4a447c3b25e2488741d0e7acd5152e2d87e383d2c5ffca0cba
-EBUILD compat-wireless-2.6.38_rc3.ebuild 5450 RMD160 30e78a91d8e3c4776c6cd902946592ab70491505 SHA1 551d0f1472c848449b896501f962831c4c6775bf SHA256 ff87237ddfbe9fa8e63bf6a8246e9571a5a6968188836081187d5f7d4ebeb9f2
-EBUILD compat-wireless-2.6.38_rc4-r1.ebuild 5349 RMD160 2ccaeb99fe47f9b527d9d7b4949a3831caa9b640 SHA1 8fee93c3cf4fdb18349cac78acdfd0136f5ed720 SHA256 b03cac334cf31f3fa18d84f4c56f317e733c8dd18bc2f1cc42ef8410b5b21ccf
-EBUILD compat-wireless-2.6.38_rc4.ebuild 5448 RMD160 d253bc91cba5f4535169d65e602e6ba5d43aa091 SHA1 d2897d3b7e9610087f3df6f3bf681e80073219b6 SHA256 805518c25ea42d3ad8d5111e1d7e9c7b453754eaed453f277bda7580cc92d8b9
-EBUILD compat-wireless-2.6.38_rc7.ebuild 5351 RMD160 ea4a0d2c98d85eab537dd08a1b83e01af9852407 SHA1 12535d582d5d8a676d7e192fc4cf2a193781b6fb SHA256 76184dfc6eb05a77d620e5b0370a3835544190c217e023672bd89048cb7c4114
+EBUILD compat-wireless-2.6.38.ebuild 5349 RMD160 0ee4a4189fdfcf79549f1322149ca562b4ac8f8a SHA1 d2d22dfa0a7d3fc663779a680d7ac489f02740f5 SHA256 6e842396c1d468750be6a91fd94a784168d56b68513a3e9e660fc0e97c556556
+EBUILD compat-wireless-2.6.39_rc1.ebuild 5352 RMD160 843acbacc6d8c1c30c873f4e050a757314ab8707 SHA1 ba8ba48bf7acf5d1287faa287022ecafcdec7732 SHA256 9f24ba20c29c1efe402c51e56ca5f716d680b0ebc5507d66132d74552d3cf6b0
 MISC metadata.xml 228 RMD160 cd3fb26b5d8049ab5dba38f21d7654ec033aa0eb SHA1 3148dfbdced7a623a311d21c6f728ab9c7135dae SHA256 8715828d1bff71d5d96b991ba600bae9376c1c80c96f0f102260fc335ca22487
diff --git a/net-wireless/compat-wireless/compat-wireless-2.6.37-r3.ebuild b/net-wireless/compat-wireless/compat-wireless-2.6.37-r3.ebuild
deleted file mode 100644
index 158942c17..000000000
--- a/net-wireless/compat-wireless/compat-wireless-2.6.37-r3.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-inherit linux-mod linux-info versionator eutils
-
-##Stable
-
-MY_P=${P/_rc/-rc}
-
-MY_PV=v$(get_version_component_range 1-3)
-DESCRIPTION="Stable kernel pre-release wifi subsystem backport"
-HOMEPAGE="http://wireless.kernel.org/en/users/Download/stable"
-CRAZY_VERSIONING="3-sn"
-SRC_URI="http://www.orbit-lab.org/kernel/${PN}-2.6-stable/${MY_PV}/${MY_P}-${CRAZY_VERSIONING}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64 arm"
-IUSE="atheros_obey_crda debugfs debug-driver full-debug injection noleds tinyversionoverride"
-
-DEPEND=""
-RDEPEND="=sys-kernel/linux-firmware-99999999"
-
-S="${WORKDIR}"/"${MY_P}"-${CRAZY_VERSIONING}
-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 for compat wireless to be installed"
-	kernel_is -gt $(get_version_component_range 1) $(get_version_component_range 2) $(get_version_component_range 3) && die "The version of compat-wireless you are trying to install contains older modules than your kernel. Failing before downgrading your system."
-	if kernel_is -eq $(get_version_component_range 1) $(get_version_component_range 2) $(get_version_component_range 3); then
-		if use tinyversionoverride; then
-			ewarn "You have the tinyversionoverride use flag set which means you know for a fact that your"
-			ewarn "kernel is older than the compat-wireless you are installing."
-			ewarn "Most likely you have no clue what you are doing and should hit control-C now"
-			ewarn "before you downgrade your system. Ten seconds to think about it."
-			epause 10
-		else
-			ewarn "Your kernel version is most likely newer than the compat-wireless release you are"
-			ewarn "trying to install. If you are certain that your kernel is older then you can set"
-			ewarn "the tinyversionoverride use flag to override this safety check."
-			epause 5
-			die "Your kernel version is too close to the compat-wireless version to risk installation."
-		fi
-	fi
-	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() {
-	#this patch fixes a trivial typo in the config.mk
-	epatch "${FILESDIR}"/fix-typos-2.6.36_rc5.patch
-
-	#this patch is needed to forcibly enable new ralink chips because the shipped config.mk doesn't enable them
-	epatch "${FILESDIR}"/force-enable-new-ralink-pci-2.6.36-rc5.patch
-
-	#this may or may not HELP the channel -1 issue. this is not a fix
-	epatch "${FILESDIR}"/channel-negative-one-maxim.patch
-
-	#test patch for fixing iwlagn issues
-	#epatch "${FILESDIR}"/reinette-test2.patch
-
-	#this patch ignores the regulatory settings of an atheros card and uses what CRDA thinks is right
-	if use atheros_obey_crda; then
-		ewarn "You have enabled atheros_obey_crda which doesn't do what you think."
-		ewarn "This use flag will cause the eeprom of the card to be ignored and force"
-		ewarn "world roaming on the device until crda provides a valid regdomain."
-		ewarn "Short version, this is not a way to break the law, this will automatically"
-		ewarn "make your card less functional unless you set a proper regdomain with iw/crda."
-		ewarn "Pausing for 10 secs..."
-		epause 10
-		epatch "${FILESDIR}"/ath_ignore_eeprom.patch
-	fi
-
-	if use injection; then
-		epatch "${FILESDIR}"/4002_mac80211-2.6.29-fix-tx-ctl-no-ack-retry-count.patch
-		epatch "${FILESDIR}"/4004_zd1211rw-2.6.28.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
-#		epatch "${FILESDIR}"/super_secret_patch.diff
-		epatch "${FILESDIR}"/ipw2200-inject.2.6.36.patch
-	fi
-	use noleds && epatch "${FILESDIR}"/leds-disable-strict.patch
-	use debug-driver && epatch "${FILESDIR}"/driver-debug.patch
-	use debugfs && sed -i '/DEBUGFS/s/^# *//' "${S}"/config.mk
-	if use full-debug; then
-		if use debug-driver ; then
-			sed -i '/CONFIG=/s/^# *//' "${S}"/config.mk
-		else
-			ewarn "Enabling full-debug includes debug-driver."
-			sed -i '/DEBUG=/s/^# *//' "${S}"/config.mk
-		fi
-	fi
-}
-
-src_compile() {
-	addpredict "${KERNEL_DIR}"
-	set_arch_to_kernel
-	emake KLIB_BUILD="${DESTDIR}"/lib/modules/"${KV_FULL}"/build || 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/b43enable scripts/unload.sh || die "script installation failed"
-
-	dodir /usr/lib/compat-wireless
-	exeinto /usr/lib/compat-wireless
-	doexe scripts/modlib.sh || die
-
-	dodoc README || die
-	dodir /$(get_libdir)/udev/rules.d/
-	insinto /$(get_libdir)/udev/rules.d/
-	doins udev/50-compat_firmware.rules
-	exeinto /$(get_libdir)/udev/
-	doexe udev/compat_firmware.sh 
-}
-
-pkg_postinst() {
-	update_depmod
-	update_moduledb
-	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
-	your needed driver.'
-}
-
-pkg_postrm() {
-	remove_moduledb
-}
diff --git a/net-wireless/compat-wireless/compat-wireless-2.6.37-r4.ebuild b/net-wireless/compat-wireless/compat-wireless-2.6.37-r4.ebuild
deleted file mode 100644
index 459023625..000000000
--- a/net-wireless/compat-wireless/compat-wireless-2.6.37-r4.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-inherit linux-mod linux-info versionator eutils
-
-##Stable
-
-MY_P=${P/_rc/-rc}
-
-MY_PV=v$(get_version_component_range 1-3)
-DESCRIPTION="Stable kernel pre-release wifi subsystem backport"
-HOMEPAGE="http://wireless.kernel.org/en/users/Download/stable"
-CRAZY_VERSIONING="4-sn"
-SRC_URI="http://www.orbit-lab.org/kernel/${PN}-2.6-stable/${MY_PV}/${MY_P}-${CRAZY_VERSIONING}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64 arm"
-IUSE="atheros_obey_crda debugfs debug-driver full-debug injection noleds tinyversionoverride"
-
-DEPEND=""
-RDEPEND="=sys-kernel/linux-firmware-99999999"
-
-S="${WORKDIR}"/"${MY_P}"-${CRAZY_VERSIONING}
-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 for compat wireless to be installed"
-	kernel_is -gt $(get_version_component_range 1) $(get_version_component_range 2) $(get_version_component_range 3) && die "The version of compat-wireless you are trying to install contains older modules than your kernel. Failing before downgrading your system."
-	if kernel_is -eq $(get_version_component_range 1) $(get_version_component_range 2) $(get_version_component_range 3); then
-		if use tinyversionoverride; then
-			ewarn "You have the tinyversionoverride use flag set which means you know for a fact that your"
-			ewarn "kernel is older than the compat-wireless you are installing."
-			ewarn "Most likely you have no clue what you are doing and should hit control-C now"
-			ewarn "before you downgrade your system. Ten seconds to think about it."
-			epause 10
-		else
-			ewarn "Your kernel version is most likely newer than the compat-wireless release you are"
-			ewarn "trying to install. If you are certain that your kernel is older then you can set"
-			ewarn "the tinyversionoverride use flag to override this safety check."
-			epause 5
-			die "Your kernel version is too close to the compat-wireless version to risk installation."
-		fi
-	fi
-	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() {
-	#this patch fixes a trivial typo in the config.mk
-	epatch "${FILESDIR}"/fix-typos-2.6.36_rc5.patch
-
-	#this patch is needed to forcibly enable new ralink chips because the shipped config.mk doesn't enable them
-	epatch "${FILESDIR}"/force-enable-new-ralink-pci-2.6.36-rc5.patch
-
-	#this may or may not HELP the channel -1 issue. this is not a fix
-	epatch "${FILESDIR}"/channel-negative-one-maxim.patch
-
-	#test patch for fixing iwlagn issues
-	#epatch "${FILESDIR}"/reinette-test2.patch
-
-	#this patch ignores the regulatory settings of an atheros card and uses what CRDA thinks is right
-	if use atheros_obey_crda; then
-		ewarn "You have enabled atheros_obey_crda which doesn't do what you think."
-		ewarn "This use flag will cause the eeprom of the card to be ignored and force"
-		ewarn "world roaming on the device until crda provides a valid regdomain."
-		ewarn "Short version, this is not a way to break the law, this will automatically"
-		ewarn "make your card less functional unless you set a proper regdomain with iw/crda."
-		ewarn "Pausing for 10 secs..."
-		epause 10
-		epatch "${FILESDIR}"/ath_ignore_eeprom.patch
-	fi
-
-	if use injection; then
-		epatch "${FILESDIR}"/4002_mac80211-2.6.29-fix-tx-ctl-no-ack-retry-count.patch
-		epatch "${FILESDIR}"/4004_zd1211rw-2.6.28.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
-#		epatch "${FILESDIR}"/super_secret_patch.diff
-		epatch "${FILESDIR}"/ipw2200-inject.2.6.36.patch
-	fi
-	use noleds && epatch "${FILESDIR}"/leds-disable-strict.patch
-	use debug-driver && epatch "${FILESDIR}"/driver-debug.patch
-	use debugfs && sed -i '/DEBUGFS/s/^# *//' "${S}"/config.mk
-	if use full-debug; then
-		if use debug-driver ; then
-			sed -i '/CONFIG=/s/^# *//' "${S}"/config.mk
-		else
-			ewarn "Enabling full-debug includes debug-driver."
-			sed -i '/DEBUG=/s/^# *//' "${S}"/config.mk
-		fi
-	fi
-}
-
-src_compile() {
-	addpredict "${KERNEL_DIR}"
-	set_arch_to_kernel
-	emake KLIB_BUILD="${DESTDIR}"/lib/modules/"${KV_FULL}"/build || 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/b43enable scripts/unload.sh || die "script installation failed"
-
-	dodir /usr/lib/compat-wireless
-	exeinto /usr/lib/compat-wireless
-	doexe scripts/modlib.sh || die
-
-	dodoc README || die
-	dodir /$(get_libdir)/udev/rules.d/
-	insinto /$(get_libdir)/udev/rules.d/
-	doins udev/50-compat_firmware.rules
-	exeinto /$(get_libdir)/udev/
-	doexe udev/compat_firmware.sh 
-}
-
-pkg_postinst() {
-	update_depmod
-	update_moduledb
-	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
-	your needed driver.'
-}
-
-pkg_postrm() {
-	remove_moduledb
-}
diff --git a/net-wireless/compat-wireless/compat-wireless-2.6.37-r5.ebuild b/net-wireless/compat-wireless/compat-wireless-2.6.37-r5.ebuild
deleted file mode 100644
index 5b9d361f6..000000000
--- a/net-wireless/compat-wireless/compat-wireless-2.6.37-r5.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-inherit linux-mod linux-info versionator eutils
-
-##Stable
-
-MY_P=${P/_rc/-rc}
-
-MY_PV=v$(get_version_component_range 1-3)
-DESCRIPTION="Stable kernel pre-release wifi subsystem backport"
-HOMEPAGE="http://wireless.kernel.org/en/users/Download/stable"
-CRAZY_VERSIONING="4-sn"
-SRC_URI="http://www.orbit-lab.org/kernel/${PN}-2.6-stable/${MY_PV}/${MY_P}-${CRAZY_VERSIONING}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64 arm"
-IUSE="atheros_obey_crda debugfs debug-driver full-debug injection intel-exp-firmware noleds tinyversionoverride"
-
-DEPEND=""
-RDEPEND="=sys-kernel/linux-firmware-99999999"
-
-S="${WORKDIR}"/"${MY_P}"-${CRAZY_VERSIONING}
-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 for compat wireless to be installed"
-	kernel_is -gt $(get_version_component_range 1) $(get_version_component_range 2) $(get_version_component_range 3) && die "The version of compat-wireless you are trying to install contains older modules than your kernel. Failing before downgrading your system."
-	if kernel_is -eq $(get_version_component_range 1) $(get_version_component_range 2) $(get_version_component_range 3); then
-		if use tinyversionoverride; then
-			ewarn "You have the tinyversionoverride use flag set which means you know for a fact that your"
-			ewarn "kernel is older than the compat-wireless you are installing."
-			ewarn "Most likely you have no clue what you are doing and should hit control-C now"
-			ewarn "before you downgrade your system. Ten seconds to think about it."
-			epause 10
-		else
-			ewarn "Your kernel version is most likely newer than the compat-wireless release you are"
-			ewarn "trying to install. If you are certain that your kernel is older then you can set"
-			ewarn "the tinyversionoverride use flag to override this safety check."
-			epause 5
-			die "Your kernel version is too close to the compat-wireless version to risk installation."
-		fi
-	fi
-	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() {
-	#this patch fixes a trivial typo in the config.mk
-	epatch "${FILESDIR}"/fix-typos-2.6.36_rc5.patch
-
-	#this patch is needed to forcibly enable new ralink chips because the shipped config.mk doesn't enable them
-	epatch "${FILESDIR}"/force-enable-new-ralink-pci-2.6.36-rc5.patch
-
-	#this may or may not HELP the channel -1 issue. this is not a fix
-	epatch "${FILESDIR}"/channel-negative-one-maxim.patch
-
-	#test patch for fixing iwlagn issues
-	#epatch "${FILESDIR}"/reinette-test2.patch
-
-	#this patch ignores the regulatory settings of an atheros card and uses what CRDA thinks is right
-	if use atheros_obey_crda; then
-		ewarn "You have enabled atheros_obey_crda which doesn't do what you think."
-		ewarn "This use flag will cause the eeprom of the card to be ignored and force"
-		ewarn "world roaming on the device until crda provides a valid regdomain."
-		ewarn "Short version, this is not a way to break the law, this will automatically"
-		ewarn "make your card less functional unless you set a proper regdomain with iw/crda."
-		ewarn "Pausing for 10 secs..."
-		epause 10
-		epatch "${FILESDIR}"/ath_ignore_eeprom.patch
-	fi
-
-	if use injection; then
-		epatch "${FILESDIR}"/4002_mac80211-2.6.29-fix-tx-ctl-no-ack-retry-count.patch
-		epatch "${FILESDIR}"/4004_zd1211rw-2.6.28.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
-#		epatch "${FILESDIR}"/super_secret_patch.diff
-		epatch "${FILESDIR}"/ipw2200-inject.2.6.36.patch
-	fi
-	use noleds && epatch "${FILESDIR}"/leds-disable-strict.patch
-	use debug-driver && epatch "${FILESDIR}"/driver-debug.patch
-	use debugfs && sed -i '/DEBUGFS/s/^# *//' "${S}"/config.mk
-	if use full-debug; then
-		if use debug-driver ; then
-			sed -i '/CONFIG=/s/^# *//' "${S}"/config.mk
-		else
-			ewarn "Enabling full-debug includes debug-driver."
-			sed -i '/DEBUG=/s/^# *//' "${S}"/config.mk
-		fi
-	fi
-	use intel-exp-firmware && epatch "${FILESDIR}"/iwlwifi-5000-exp-firmware.patch
-}
-
-src_compile() {
-	addpredict "${KERNEL_DIR}"
-	set_arch_to_kernel
-	emake KLIB_BUILD="${DESTDIR}"/lib/modules/"${KV_FULL}"/build || 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/b43enable scripts/unload.sh || die "script installation failed"
-
-	dodir /usr/lib/compat-wireless
-	exeinto /usr/lib/compat-wireless
-	doexe scripts/modlib.sh || die
-
-	dodoc README || die
-	dodir /$(get_libdir)/udev/rules.d/
-	insinto /$(get_libdir)/udev/rules.d/
-	doins udev/50-compat_firmware.rules
-	exeinto /$(get_libdir)/udev/
-	doexe udev/compat_firmware.sh 
-}
-
-pkg_postinst() {
-	update_depmod
-	update_moduledb
-	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
-	your needed driver.'
-}
-
-pkg_postrm() {
-	remove_moduledb
-}
diff --git a/net-wireless/compat-wireless/compat-wireless-2.6.37-r6.ebuild b/net-wireless/compat-wireless/compat-wireless-2.6.37-r6.ebuild
deleted file mode 100644
index dc9f53911..000000000
--- a/net-wireless/compat-wireless/compat-wireless-2.6.37-r6.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-inherit linux-mod linux-info versionator eutils
-
-##Stable
-
-MY_P=${P/_rc/-rc}
-
-MY_PV=v$(get_version_component_range 1-3)
-DESCRIPTION="Stable kernel pre-release wifi subsystem backport"
-HOMEPAGE="http://wireless.kernel.org/en/users/Download/stable"
-CRAZY_VERSIONING="4-sn"
-SRC_URI="http://www.orbit-lab.org/kernel/${PN}-2.6-stable/${MY_PV}/${MY_P}-${CRAZY_VERSIONING}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64 arm"
-IUSE="atheros_obey_crda debugfs debug-driver full-debug injection intel-exp-firmware noleds tinyversionoverride"
-
-DEPEND=""
-RDEPEND="=sys-kernel/linux-firmware-99999999"
-
-S="${WORKDIR}"/"${MY_P}"-${CRAZY_VERSIONING}
-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 for compat wireless to be installed"
-	kernel_is -gt $(get_version_component_range 1) $(get_version_component_range 2) $(get_version_component_range 3) && die "The version of compat-wireless you are trying to install contains older modules than your kernel. Failing before downgrading your system."
-	if kernel_is -eq $(get_version_component_range 1) $(get_version_component_range 2) $(get_version_component_range 3); then
-		if use tinyversionoverride; then
-			ewarn "You have the tinyversionoverride use flag set which means you know for a fact that your"
-			ewarn "kernel is older than the compat-wireless you are installing."
-			ewarn "Most likely you have no clue what you are doing and should hit control-C now"
-			ewarn "before you downgrade your system. Ten seconds to think about it."
-			epause 10
-		else
-			ewarn "Your kernel version is most likely newer than the compat-wireless release you are"
-			ewarn "trying to install. If you are certain that your kernel is older then you can set"
-			ewarn "the tinyversionoverride use flag to override this safety check."
-			epause 5
-			die "Your kernel version is too close to the compat-wireless version to risk installation."
-		fi
-	fi
-	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() {
-	#this patch fixes a trivial typo in the config.mk
-	epatch "${FILESDIR}"/fix-typos-2.6.36_rc5.patch
-
-	#this patch is needed to forcibly enable new ralink chips because the shipped config.mk doesn't enable them
-	epatch "${FILESDIR}"/force-enable-new-ralink-pci-2.6.36-rc5.patch
-
-	#this may or may not HELP the channel -1 issue. this is not a fix
-	epatch "${FILESDIR}"/channel-negative-one-maxim.patch
-
-	#add support for ubiquiti toy for Ray
-	epatch "${FILESDIR}"/ubnt-wifi-station-ext2.patch
-
-	#this patch ignores the regulatory settings of an atheros card and uses what CRDA thinks is right
-	if use atheros_obey_crda; then
-		ewarn "You have enabled atheros_obey_crda which doesn't do what you think."
-		ewarn "This use flag will cause the eeprom of the card to be ignored and force"
-		ewarn "world roaming on the device until crda provides a valid regdomain."
-		ewarn "Short version, this is not a way to break the law, this will automatically"
-		ewarn "make your card less functional unless you set a proper regdomain with iw/crda."
-		ewarn "Pausing for 10 secs..."
-		epause 10
-		epatch "${FILESDIR}"/ath_ignore_eeprom.patch
-	fi
-
-	if use injection; then
-		epatch "${FILESDIR}"/4002_mac80211-2.6.29-fix-tx-ctl-no-ack-retry-count.patch
-		epatch "${FILESDIR}"/4004_zd1211rw-2.6.28.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
-#		epatch "${FILESDIR}"/super_secret_patch.diff
-		epatch "${FILESDIR}"/ipw2200-inject.2.6.36.patch
-	fi
-	use noleds && epatch "${FILESDIR}"/leds-disable-strict.patch
-	use debug-driver && epatch "${FILESDIR}"/driver-debug.patch
-	use debugfs && sed -i '/DEBUGFS/s/^# *//' "${S}"/config.mk
-	if use full-debug; then
-		if use debug-driver ; then
-			sed -i '/CONFIG=/s/^# *//' "${S}"/config.mk
-		else
-			ewarn "Enabling full-debug includes debug-driver."
-			sed -i '/DEBUG=/s/^# *//' "${S}"/config.mk
-		fi
-	fi
-	use intel-exp-firmware && epatch "${FILESDIR}"/iwlwifi-5000-exp-firmware.patch
-}
-
-src_compile() {
-	addpredict "${KERNEL_DIR}"
-	set_arch_to_kernel
-	emake KLIB_BUILD="${DESTDIR}"/lib/modules/"${KV_FULL}"/build || 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/b43enable scripts/unload.sh || die "script installation failed"
-
-	dodir /usr/lib/compat-wireless
-	exeinto /usr/lib/compat-wireless
-	doexe scripts/modlib.sh || die
-
-	dodoc README || die
-	dodir /$(get_libdir)/udev/rules.d/
-	insinto /$(get_libdir)/udev/rules.d/
-	doins udev/50-compat_firmware.rules
-	exeinto /$(get_libdir)/udev/
-	doexe udev/compat_firmware.sh 
-}
-
-pkg_postinst() {
-	update_depmod
-	update_moduledb
-	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
-	your needed driver.'
-}
-
-pkg_postrm() {
-	remove_moduledb
-}
diff --git a/net-wireless/compat-wireless/compat-wireless-2.6.38.ebuild b/net-wireless/compat-wireless/compat-wireless-2.6.38.ebuild
index 51e4dfa77..6b42c6b81 100644
--- a/net-wireless/compat-wireless/compat-wireless-2.6.38.ebuild
+++ b/net-wireless/compat-wireless/compat-wireless-2.6.38.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://www.orbit-lab.org/kernel/${PN}-2.6-stable/${MY_PV}/${MY_P}-${CRA
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~arm ~amd64 ~x86"
+KEYWORDS="arm amd64 x86"
 IUSE="atheros_obey_crda debugfs debug-driver full-debug injection noleds tinyversionoverride"
 
 DEPEND=""
diff --git a/net-wireless/compat-wireless/compat-wireless-2.6.38_rc3.ebuild b/net-wireless/compat-wireless/compat-wireless-2.6.38_rc3.ebuild
deleted file mode 100644
index 78882839d..000000000
--- a/net-wireless/compat-wireless/compat-wireless-2.6.38_rc3.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-inherit linux-mod linux-info versionator eutils
-
-##Stable
-
-MY_P=${P/_rc/-rc}
-
-MY_PV=v$(get_version_component_range 1-3)
-DESCRIPTION="Stable kernel pre-release wifi subsystem backport"
-HOMEPAGE="http://wireless.kernel.org/en/users/Download/stable"
-CRAZY_VERSIONING="3-s"
-SRC_URI="http://www.orbit-lab.org/kernel/${PN}-2.6-stable/${MY_PV}/${MY_P}-${CRAZY_VERSIONING}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm ~amd64 ~x86"
-IUSE="atheros_obey_crda debugfs debug-driver full-debug injection intel-exp-firmware noleds tinyversionoverride"
-
-DEPEND=""
-RDEPEND="=sys-kernel/linux-firmware-99999999"
-
-S="${WORKDIR}"/"${MY_P}"-${CRAZY_VERSIONING}
-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 for compat wireless to be installed"
-	kernel_is -gt $(get_version_component_range 1) $(get_version_component_range 2) $(get_version_component_range 3) && die "The version of compat-wireless you are trying to install contains older modules than your kernel. Failing before downgrading your system."
-	if kernel_is -eq $(get_version_component_range 1) $(get_version_component_range 2) $(get_version_component_range 3); then
-		if use tinyversionoverride; then
-			ewarn "You have the tinyversionoverride use flag set which means you know for a fact that your"
-			ewarn "kernel is older than the compat-wireless you are installing."
-			ewarn "Most likely you have no clue what you are doing and should hit control-C now"
-			ewarn "before you downgrade your system. Ten seconds to think about it."
-			epause 10
-		else
-			ewarn "Your kernel version is most likely newer than the compat-wireless release you are"
-			ewarn "trying to install. If you are certain that your kernel is older then you can set"
-			ewarn "the tinyversionoverride use flag to override this safety check."
-			epause 5
-			die "Your kernel version is too close to the compat-wireless version to risk installation."
-		fi
-	fi
-	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() {
-	#this patch fixes a trivial typo in the config.mk
-	epatch "${FILESDIR}"/fix-typos-2.6.36_rc5.patch
-
-	#this patch is needed to forcibly enable new ralink chips because the shipped config.mk doesn't enable them
-	epatch "${FILESDIR}"/force-enable-new-ralink-2.6.38_rc3.patch
-
-	#this may or may not HELP the channel -1 issue. this is not a fix
-	epatch "${FILESDIR}"/channel-negative-one-maxim.patch
-
-	#this patch ignores the regulatory settings of an atheros card and uses what CRDA thinks is right
-	if use atheros_obey_crda; then
-		ewarn "You have enabled atheros_obey_crda which doesn't do what you think."
-		ewarn "This use flag will cause the eeprom of the card to be ignored and force"
-		ewarn "world roaming on the device until crda provides a valid regdomain."
-		ewarn "Short version, this is not a way to break the law, this will automatically"
-		ewarn "make your card less functional unless you set a proper regdomain with iw/crda."
-		ewarn "Pausing for 10 secs..."
-		epause 10
-		epatch "${FILESDIR}"/ath_ignore_eeprom.patch
-	fi
-
-	if use injection; then
-		epatch "${FILESDIR}"/4002_mac80211-2.6.29-fix-tx-ctl-no-ack-retry-count.patch
-		epatch "${FILESDIR}"/4004_zd1211rw-2.6.28.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
-#		epatch "${FILESDIR}"/super_secret_patch.diff
-		epatch "${FILESDIR}"/ipw2200-inject.2.6.36.patch
-	fi
-	use noleds && epatch "${FILESDIR}"/leds-disable-strict.patch
-	use debug-driver && epatch "${FILESDIR}"/driver-debug.patch
-	use debugfs && sed -i '/DEBUGFS/s/^# *//' "${S}"/config.mk
-	if use full-debug; then
-		if use debug-driver ; then
-			sed -i '/CONFIG=/s/^# *//' "${S}"/config.mk
-		else
-			ewarn "Enabling full-debug includes debug-driver."
-			sed -i '/DEBUG=/s/^# *//' "${S}"/config.mk
-		fi
-	fi
-	use intel-exp-firmware && epatch "${FILESDIR}"/iwlwifi-5000-exp-firmware.patch
-}
-
-src_compile() {
-	addpredict "${KERNEL_DIR}"
-	set_arch_to_kernel
-	emake KLIB_BUILD="${DESTDIR}"/lib/modules/"${KV_FULL}"/build || 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/b43enable scripts/unload.sh || die "script installation failed"
-
-	dodir /usr/lib/compat-wireless
-	exeinto /usr/lib/compat-wireless
-	doexe scripts/modlib.sh || die
-
-	dodoc README || die
-	dodir /$(get_libdir)/udev/rules.d/
-	insinto /$(get_libdir)/udev/rules.d/
-	doins udev/50-compat_firmware.rules
-	exeinto /$(get_libdir)/udev/
-	doexe udev/compat_firmware.sh 
-}
-
-pkg_postinst() {
-	update_depmod
-	update_moduledb
-	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
-	your needed driver.'
-}
-
-pkg_postrm() {
-	remove_moduledb
-}
diff --git a/net-wireless/compat-wireless/compat-wireless-2.6.38_rc4-r1.ebuild b/net-wireless/compat-wireless/compat-wireless-2.6.38_rc4-r1.ebuild
deleted file mode 100644
index 059d415d2..000000000
--- a/net-wireless/compat-wireless/compat-wireless-2.6.38_rc4-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-inherit linux-mod linux-info versionator eutils
-
-##Stable
-
-MY_P=${P/_rc/-rc}
-
-MY_PV=v$(get_version_component_range 1-3)
-DESCRIPTION="Stable kernel pre-release wifi subsystem backport"
-HOMEPAGE="http://wireless.kernel.org/en/users/Download/stable"
-CRAZY_VERSIONING="1"
-SRC_URI="http://www.orbit-lab.org/kernel/${PN}-2.6-stable/${MY_PV}/${MY_P}-${CRAZY_VERSIONING}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm ~amd64 ~x86"
-IUSE="atheros_obey_crda debugfs debug-driver full-debug injection noleds tinyversionoverride"
-
-DEPEND=""
-RDEPEND="=sys-kernel/linux-firmware-99999999"
-
-S="${WORKDIR}"/"${MY_P}"-${CRAZY_VERSIONING}
-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 for compat wireless to be installed"
-	kernel_is -gt $(get_version_component_range 1) $(get_version_component_range 2) $(get_version_component_range 3) && die "The version of compat-wireless you are trying to install contains older modules than your kernel. Failing before downgrading your system."
-	if kernel_is -eq $(get_version_component_range 1) $(get_version_component_range 2) $(get_version_component_range 3); then
-		if use tinyversionoverride; then
-			ewarn "You have the tinyversionoverride use flag set which means you know for a fact that your"
-			ewarn "kernel is older than the compat-wireless you are installing."
-			ewarn "Most likely you have no clue what you are doing and should hit control-C now"
-			ewarn "before you downgrade your system. Ten seconds to think about it."
-			epause 10
-		else
-			ewarn "Your kernel version is most likely newer than the compat-wireless release you are"
-			ewarn "trying to install. If you are certain that your kernel is older then you can set"
-			ewarn "the tinyversionoverride use flag to override this safety check."
-			epause 5
-			die "Your kernel version is too close to the compat-wireless version to risk installation."
-		fi
-	fi
-	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() {
-	#this patch fixes a trivial typo in the config.mk
-	epatch "${FILESDIR}"/fix-typos-2.6.36_rc5.patch
-
-	#this patch is needed to forcibly enable new ralink chips because the shipped config.mk doesn't enable them
-	epatch "${FILESDIR}"/force-enable-new-ralink-2.6.38_rc3.patch
-
-	#this may or may not HELP the channel -1 issue. this is not a fix
-	epatch "${FILESDIR}"/channel-negative-one-maxim.patch
-
-	#this patch ignores the regulatory settings of an atheros card and uses what CRDA thinks is right
-	if use atheros_obey_crda; then
-		ewarn "You have enabled atheros_obey_crda which doesn't do what you think."
-		ewarn "This use flag will cause the eeprom of the card to be ignored and force"
-		ewarn "world roaming on the device until crda provides a valid regdomain."
-		ewarn "Short version, this is not a way to break the law, this will automatically"
-		ewarn "make your card less functional unless you set a proper regdomain with iw/crda."
-		ewarn "Pausing for 10 secs..."
-		epause 10
-		epatch "${FILESDIR}"/ath_ignore_eeprom.patch
-	fi
-
-	if use injection; then
-		epatch "${FILESDIR}"/4002_mac80211-2.6.29-fix-tx-ctl-no-ack-retry-count.patch
-		epatch "${FILESDIR}"/4004_zd1211rw-2.6.28.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
-#		epatch "${FILESDIR}"/super_secret_patch.diff
-		epatch "${FILESDIR}"/ipw2200-inject.2.6.36.patch
-	fi
-	use noleds && epatch "${FILESDIR}"/leds-disable-strict.patch
-	use debug-driver && epatch "${FILESDIR}"/driver-debug.patch
-	use debugfs && sed -i '/DEBUGFS/s/^# *//' "${S}"/config.mk
-	if use full-debug; then
-		if use debug-driver ; then
-			sed -i '/CONFIG=/s/^# *//' "${S}"/config.mk
-		else
-			ewarn "Enabling full-debug includes debug-driver."
-			sed -i '/DEBUG=/s/^# *//' "${S}"/config.mk
-		fi
-	fi
-}
-
-src_compile() {
-	addpredict "${KERNEL_DIR}"
-	set_arch_to_kernel
-	emake KLIB_BUILD="${DESTDIR}"/lib/modules/"${KV_FULL}"/build || 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/b43enable scripts/unload.sh || die "script installation failed"
-
-	dodir /usr/lib/compat-wireless
-	exeinto /usr/lib/compat-wireless
-	doexe scripts/modlib.sh || die
-
-	dodoc README || die
-	dodir /$(get_libdir)/udev/rules.d/
-	insinto /$(get_libdir)/udev/rules.d/
-	doins udev/50-compat_firmware.rules
-	exeinto /$(get_libdir)/udev/
-	doexe udev/compat_firmware.sh 
-}
-
-pkg_postinst() {
-	update_depmod
-	update_moduledb
-	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
-	your needed driver.'
-}
-
-pkg_postrm() {
-	remove_moduledb
-}
diff --git a/net-wireless/compat-wireless/compat-wireless-2.6.38_rc4.ebuild b/net-wireless/compat-wireless/compat-wireless-2.6.38_rc4.ebuild
deleted file mode 100644
index 2f739e1d6..000000000
--- a/net-wireless/compat-wireless/compat-wireless-2.6.38_rc4.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-inherit linux-mod linux-info versionator eutils
-
-##Stable
-
-MY_P=${P/_rc/-rc}
-
-MY_PV=v$(get_version_component_range 1-3)
-DESCRIPTION="Stable kernel pre-release wifi subsystem backport"
-HOMEPAGE="http://wireless.kernel.org/en/users/Download/stable"
-CRAZY_VERSIONING="1"
-SRC_URI="http://www.orbit-lab.org/kernel/${PN}-2.6-stable/${MY_PV}/${MY_P}-${CRAZY_VERSIONING}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm ~amd64 ~x86"
-IUSE="atheros_obey_crda debugfs debug-driver full-debug injection intel-exp-firmware noleds tinyversionoverride"
-
-DEPEND=""
-RDEPEND="=sys-kernel/linux-firmware-99999999"
-
-S="${WORKDIR}"/"${MY_P}"-${CRAZY_VERSIONING}
-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 for compat wireless to be installed"
-	kernel_is -gt $(get_version_component_range 1) $(get_version_component_range 2) $(get_version_component_range 3) && die "The version of compat-wireless you are trying to install contains older modules than your kernel. Failing before downgrading your system."
-	if kernel_is -eq $(get_version_component_range 1) $(get_version_component_range 2) $(get_version_component_range 3); then
-		if use tinyversionoverride; then
-			ewarn "You have the tinyversionoverride use flag set which means you know for a fact that your"
-			ewarn "kernel is older than the compat-wireless you are installing."
-			ewarn "Most likely you have no clue what you are doing and should hit control-C now"
-			ewarn "before you downgrade your system. Ten seconds to think about it."
-			epause 10
-		else
-			ewarn "Your kernel version is most likely newer than the compat-wireless release you are"
-			ewarn "trying to install. If you are certain that your kernel is older then you can set"
-			ewarn "the tinyversionoverride use flag to override this safety check."
-			epause 5
-			die "Your kernel version is too close to the compat-wireless version to risk installation."
-		fi
-	fi
-	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() {
-	#this patch fixes a trivial typo in the config.mk
-	epatch "${FILESDIR}"/fix-typos-2.6.36_rc5.patch
-
-	#this patch is needed to forcibly enable new ralink chips because the shipped config.mk doesn't enable them
-	epatch "${FILESDIR}"/force-enable-new-ralink-2.6.38_rc3.patch
-
-	#this may or may not HELP the channel -1 issue. this is not a fix
-	epatch "${FILESDIR}"/channel-negative-one-maxim.patch
-
-	#this patch ignores the regulatory settings of an atheros card and uses what CRDA thinks is right
-	if use atheros_obey_crda; then
-		ewarn "You have enabled atheros_obey_crda which doesn't do what you think."
-		ewarn "This use flag will cause the eeprom of the card to be ignored and force"
-		ewarn "world roaming on the device until crda provides a valid regdomain."
-		ewarn "Short version, this is not a way to break the law, this will automatically"
-		ewarn "make your card less functional unless you set a proper regdomain with iw/crda."
-		ewarn "Pausing for 10 secs..."
-		epause 10
-		epatch "${FILESDIR}"/ath_ignore_eeprom.patch
-	fi
-
-	if use injection; then
-		epatch "${FILESDIR}"/4002_mac80211-2.6.29-fix-tx-ctl-no-ack-retry-count.patch
-		epatch "${FILESDIR}"/4004_zd1211rw-2.6.28.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
-#		epatch "${FILESDIR}"/super_secret_patch.diff
-		epatch "${FILESDIR}"/ipw2200-inject.2.6.36.patch
-	fi
-	use noleds && epatch "${FILESDIR}"/leds-disable-strict.patch
-	use debug-driver && epatch "${FILESDIR}"/driver-debug.patch
-	use debugfs && sed -i '/DEBUGFS/s/^# *//' "${S}"/config.mk
-	if use full-debug; then
-		if use debug-driver ; then
-			sed -i '/CONFIG=/s/^# *//' "${S}"/config.mk
-		else
-			ewarn "Enabling full-debug includes debug-driver."
-			sed -i '/DEBUG=/s/^# *//' "${S}"/config.mk
-		fi
-	fi
-	use intel-exp-firmware && epatch "${FILESDIR}"/iwlwifi-5000-exp-firmware.patch
-}
-
-src_compile() {
-	addpredict "${KERNEL_DIR}"
-	set_arch_to_kernel
-	emake KLIB_BUILD="${DESTDIR}"/lib/modules/"${KV_FULL}"/build || 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/b43enable scripts/unload.sh || die "script installation failed"
-
-	dodir /usr/lib/compat-wireless
-	exeinto /usr/lib/compat-wireless
-	doexe scripts/modlib.sh || die
-
-	dodoc README || die
-	dodir /$(get_libdir)/udev/rules.d/
-	insinto /$(get_libdir)/udev/rules.d/
-	doins udev/50-compat_firmware.rules
-	exeinto /$(get_libdir)/udev/
-	doexe udev/compat_firmware.sh 
-}
-
-pkg_postinst() {
-	update_depmod
-	update_moduledb
-	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
-	your needed driver.'
-}
-
-pkg_postrm() {
-	remove_moduledb
-}
diff --git a/net-wireless/compat-wireless/compat-wireless-2.6.38_rc7.ebuild b/net-wireless/compat-wireless/compat-wireless-2.6.39_rc1.ebuild
similarity index 98%
rename from net-wireless/compat-wireless/compat-wireless-2.6.38_rc7.ebuild
rename to net-wireless/compat-wireless/compat-wireless-2.6.39_rc1.ebuild
index 7400d80a2..0a581a7b7 100644
--- a/net-wireless/compat-wireless/compat-wireless-2.6.38_rc7.ebuild
+++ b/net-wireless/compat-wireless/compat-wireless-2.6.39_rc1.ebuild
@@ -12,7 +12,7 @@ MY_P=${P/_rc/-rc}
 MY_PV=v$(get_version_component_range 1-3)
 DESCRIPTION="Stable kernel pre-release wifi subsystem backport"
 HOMEPAGE="http://wireless.kernel.org/en/users/Download/stable"
-CRAZY_VERSIONING="2-s"
+CRAZY_VERSIONING="3-s"
 SRC_URI="http://www.orbit-lab.org/kernel/${PN}-2.6-stable/${MY_PV}/${MY_P}-${CRAZY_VERSIONING}.tar.bz2"
 
 LICENSE="GPL-2"
@@ -56,7 +56,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/fix-typos-2.6.36_rc5.patch
 
 	#this patch is needed to forcibly enable new ralink chips because the shipped config.mk doesn't enable them
-	epatch "${FILESDIR}"/force-enable-new-ralink-2.6.38_rc3.patch
+	#epatch "${FILESDIR}"/force-enable-new-ralink-2.6.38_rc3.patch
 
 	#this may or may not HELP the channel -1 issue. this is not a fix
 	epatch "${FILESDIR}"/channel-negative-one-maxim.patch