diff --git a/pentoo/pentoo-system/Manifest b/pentoo/pentoo-system/Manifest
index dcad0e2cb..f3f278a5c 100644
--- a/pentoo/pentoo-system/Manifest
+++ b/pentoo/pentoo-system/Manifest
@@ -1,4 +1,4 @@
-EBUILD pentoo-system-2013.0-r3.ebuild 1727 SHA256 52b3a5cdd15f8b1e19ea912d71d93c865d62961429d53ccdccfc987a47a8f6d6 SHA512 b7672bfb9b4013800028c5b62161303f1bbf48698f328edff83a12a73f29ef1e478321ffc4b2f440758fb4c706eca9d8b1bf7a32b4bd20cd3886bc2d0c3809cc WHIRLPOOL 35611d9f7c85c29c17d14df5a8c61efe185ec675eb73dc0922ebfc8f5b7227f7fe78a53b24acea14404cf739d14feba67fa350230173a952116d9626ffb5c5a1
-EBUILD pentoo-system-2013.0-r4.ebuild 2001 SHA256 0466c4dd440d9e64798945e504577c57b0c4d77e9d3c745b4f8a3bdc5e34eab4 SHA512 cfbf486077f7854109463875f6a6f4ee4435c2f97a63901ba5f272faddadf43bd51a94783da9a9d6b7c69c8a1fb0d349c911af8cc4dfca6f493c10cecbd224c5 WHIRLPOOL 7359baf8dd11b756529d2eda14878353e66c1ed801d13503adbe0e271bff2887e7a96997d3ec9607b8e602d14848f590120239c21e6d6f5b11891a3fa2844683
-EBUILD pentoo-system-2013.0-r5.ebuild 2106 SHA256 ce0d94bc482a9bf44a3a08d8c8e7d3d016b348230f685f0fe29cb8ac9aded8f6 SHA512 edcd40fbac9d277a55eadbdc7881d5b5fb66b8fcd75e3aabc2cc504327ee4b4d308bf4cfc070cd342b3c41ab37d98f07ff419afe82f426f3234de936b00053da WHIRLPOOL 2ad47d807cffb681a45c8b037dbeef629c726efbc2e207c24aaf7332c8a798cef2e7fb78960cb646a533a3d59b5e4cfba33004db49ff9092628ab1303beae911
-EBUILD pentoo-system-2013.0-r6.ebuild 2017 SHA256 aab66d585c3509fa9ccf737f50d6d3fcde1cb5c058b9ed37210940b0e8487de6 SHA512 f55f8c6c52f04abd59dd69f496eaf5b50a49054499835477cd4b883909a0f06eac395fc7bb242d50cbec9def37cdac9a257b0f7e5c492d561672ea7195255b9b WHIRLPOOL 9f3c9ab45e5bd9713d910fa9b37bfe73f0ff8aebbada4f6ac3612ff5a0ea1cb5b30410bb3f4ac606035c74401f31cf10ec6abb74871c05d3dca0ee157fd8d848
+AUX 00-linux_link.start 519 SHA256 ef3fe1d04b7696d97e1cea221a334c87ce52880c79ef29dfa1beb90437570ff4 SHA512 1560ed67d32a045c5edbf9d45c06c472fd57ef28a408501defe7339bf00346c11941f641bdc7b682f2fe16a90777849d4fee769fdbd6193ca7fbcc95ad160eb3 WHIRLPOOL 782e4ebfe5e0cc814abeb7099067b0883adf5b1b5255473ee1bbfa7e180b70723f32fab35237555051a32db45017d69e18a736d16228721201b1af5f1a10f100
+AUX 00-speed_shutdown.stop 477 SHA256 e9cd6040c1930d331839edf846c45f2bdd0d05bb05ee2ec6181a0ff757c5aab8 SHA512 ae29ce4c513ee33fbef712342a0bc8b5475702cd844eec3a0381da17b0fc59c317a963bf00a65a566098acbb6583635a48f05e91fcae48d21466c44285181a88 WHIRLPOOL f908bfa92b407dab30d8ef46f7f0183132f0ff895a2278e9a686517e7f4fc2670fcfcaab9bc84f4bdeeaf6b5159fc2c9a69cd870c4f1895dc65db927bfa0f854
+AUX 99-power_saving.start 2956 SHA256 44b8e2b911fbe819af85ac11521cde2b0b77c2b3ad3649958453d6bbcbc90ee6 SHA512 d97e824d304b4e002517c652881002f643dda6e056a7c35984bb89c71a78b680d094f7f14406e1f1465849d1e9c6261ee1d136dfdd5bb88e885837028e1345ed WHIRLPOOL e0ffe17fb8502b821b75589c8f54cbc6148c053390286f345b64521db380f665f58e156a8f7386f4d89f75268ba8945e9d2ab9601eb9df053344e4c17e0aef10
+EBUILD pentoo-system-2013.0-r7.ebuild 2186 SHA256 21a4fa9d8501e52725bb1a348387c3ef78037c58d2e655e5161b64fdd70bbe7b SHA512 5a48ce14be9934d45d1dd59a2354563d6fda415f182e45a960f0ea4b10ec319b66a161be28a48dfa3a77e0d242ddd7051862ad758df29c7abb8b267b17ae6655 WHIRLPOOL fce40b3756037d3b02e2e2e833c21a24eccda708c908fe00049a8a6834e365dcc4e09a4cbaf217cb77ea2e25ee1bca618df8c9fe73af825fa79064d37b7c38ed
diff --git a/pentoo/pentoo/files/00-linux_link.start b/pentoo/pentoo-system/files/00-linux_link.start
similarity index 73%
rename from pentoo/pentoo/files/00-linux_link.start
rename to pentoo/pentoo-system/files/00-linux_link.start
index 07ac1b7aa..447a3a073 100755
--- a/pentoo/pentoo/files/00-linux_link.start
+++ b/pentoo/pentoo-system/files/00-linux_link.start
@@ -8,7 +8,6 @@ then
 	then
 		unlink /usr/src/linux
 	fi
-
 	ln -s /usr/src/linux-${KV} /usr/src/linux
 
 	if [ -L /lib/modules/${KV}/build ]
@@ -16,4 +15,10 @@ then
 		unlink /lib/modules/${KV}/build
 	fi
 	ln -s /usr/src/linux-${KV} /lib/modules/${KV}/build
+
+	if [ -L /lib/modules/${KV}/source ]
+	then
+		unlink /lib/modules/${KV}/source
+	fi
+	ln -s /usr/src/linux-${KV} /lib/modules/${KV}/source
 fi
diff --git a/pentoo/pentoo/files/00-speed_shutdown.stop b/pentoo/pentoo-system/files/00-speed_shutdown.stop
similarity index 100%
rename from pentoo/pentoo/files/00-speed_shutdown.stop
rename to pentoo/pentoo-system/files/00-speed_shutdown.stop
diff --git a/pentoo/pentoo/files/99-power_saving.start b/pentoo/pentoo-system/files/99-power_saving.start
similarity index 100%
rename from pentoo/pentoo/files/99-power_saving.start
rename to pentoo/pentoo-system/files/99-power_saving.start
diff --git a/pentoo/pentoo-system/pentoo-system-2013.0-r3.ebuild b/pentoo/pentoo-system/pentoo-system-2013.0-r3.ebuild
deleted file mode 100644
index 2ea9cbf6d..000000000
--- a/pentoo/pentoo-system/pentoo-system-2013.0-r3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-KEYWORDS="amd64 x86"
-DESCRIPTION="Pentoo meta ebuild to install system"
-HOMEPAGE="http://www.pentoo.ch"
-SLOT="0"
-LICENSE="GPL"
-IUSE="+drivers livecd livecd-stage1 +windows-compat video_cards_vmware"
-
-S="${WORKDIR}"
-
-#things needed for a running pentoo system
-PDEPEND="${PDEPEND}
-	!livecd-stage1? ( video_cards_vmware? ( app-emulation/open-vm-tools ) )
-	!livecd? ( app-portage/portage-utils
-		|| ( app-admin/syslog-ng virtual/logger )
-		|| ( sys-process/fcron virtual/cron ) )
-	sys-apps/gptfdisk
-	sys-apps/pcmciautils
-	!arm? ( !livecd-stage1? ( sys-kernel/genkernel
-		|| ( sys-boot/grub:0 sys-boot/grub-static )
-		sys-boot/grub:2 ) )
-	app-arch/unrar
-	app-arch/unzip
-	app-portage/gentoolkit
-	app-portage/eix
-	app-portage/porthole
-	windows-compat? ( app-emulation/wine
-		amd64? ( dev-lang/mono ) )
-	sys-apps/pciutils
-	sys-apps/usbutils
-	sys-apps/mlocate
-	sys-apps/usb_modeswitch
-	!arm? ( sys-apps/microcode-data
-		sys-firmware/amd-ucode
-		sys-boot/syslinux )
-	net-fs/curlftpfs
-	sys-fs/sshfs-fuse
-	sys-kernel/linux-firmware
-	sys-libs/gpm
-	!arm? ( sys-power/acpid[pentoo] )
-	sys-power/cpufrequtils
-	sys-power/hibernate-script
-	sys-power/powertop
-	sys-process/htop
-	sys-process/iotop
-	sys-boot/unetbootin
-	sys-apps/openrc[pentoo]
-	app-arch/sharutils
-	app-crypt/gnupg
-	app-shells/bash-completion
-	sys-apps/hdparm
-	sys-boot/efibootmgr
-	sys-fs/cryptsetup
-	dev-libs/icu
-	sys-process/lsof
-	!arm? ( sys-kernel/pentoo-sources )
-	app-portage/mirrorselect
-	!livecd-stage1? ( amd64? ( sys-fs/zfs ) )
-	|| ( mail-client/thunderbird-bin mail-client/thunderbird )
-"
-	#no buildy
-	#drivers? ( sys-kernel/ax88179_178a )
diff --git a/pentoo/pentoo-system/pentoo-system-2013.0-r4.ebuild b/pentoo/pentoo-system/pentoo-system-2013.0-r4.ebuild
deleted file mode 100644
index 7aac553d0..000000000
--- a/pentoo/pentoo-system/pentoo-system-2013.0-r4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-KEYWORDS="amd64 x86"
-DESCRIPTION="Pentoo meta ebuild to install system"
-HOMEPAGE="http://www.pentoo.ch"
-SLOT="0"
-LICENSE="GPL-3"
-IUSE="+drivers gtk qt4 livecd livecd-stage1 +windows-compat video_cards_virtualbox video_cards_vmware"
-
-S="${WORKDIR}"
-
-#things needed for a running pentoo system
-PDEPEND="${PDEPEND}
-	!livecd-stage1? ( video_cards_vmware? ( || ( app-emulation/open-vm-tools app-emulation/vmware-tools ) )
-			video_cards_virtualbox? ( app-emulation/virtualbox-guest-additions ) )
-	!livecd? ( app-portage/portage-utils
-		|| ( app-admin/syslog-ng virtual/logger )
-		|| ( sys-process/fcron virtual/cron ) )
-	sys-apps/gptfdisk
-	sys-apps/pcmciautils
-	!arm? ( !livecd-stage1? ( sys-kernel/genkernel
-		|| ( sys-boot/grub:0 sys-boot/grub-static )
-		sys-boot/grub:2 ) )
-	app-arch/unrar
-	app-arch/unzip
-	app-portage/gentoolkit
-	app-portage/eix
-	app-portage/porthole
-	net-misc/x11-ssh-askpass
-	windows-compat? ( app-emulation/wine
-		amd64? ( dev-lang/mono ) )
-	sys-apps/pciutils
-	sys-apps/usbutils
-	sys-apps/mlocate
-	sys-apps/usb_modeswitch
-	!arm? ( sys-apps/microcode-data
-		sys-firmware/amd-ucode
-		sys-boot/syslinux )
-	net-fs/curlftpfs
-	sys-fs/sshfs-fuse
-	sys-kernel/linux-firmware
-	sys-libs/gpm
-	!arm? ( sys-power/acpid[pentoo] )
-	sys-power/cpufrequtils
-	sys-power/hibernate-script
-	sys-power/powertop
-	sys-process/htop
-	sys-process/iotop
-	sys-boot/unetbootin
-	sys-apps/openrc[pentoo]
-	app-arch/sharutils
-	app-crypt/gnupg
-	app-shells/bash-completion
-	sys-apps/hdparm
-	sys-boot/efibootmgr
-	sys-fs/cryptsetup
-	dev-libs/icu
-	sys-process/lsof
-	gtk? ( media-video/gtk-recordmydesktop )
-	qt4? ( !gtk? ( media-video/qt-recordmydesktop ) )
-	!arm? ( sys-kernel/pentoo-sources )
-	app-portage/mirrorselect
-	!livecd-stage1? ( amd64? ( sys-fs/zfs ) )
-	|| ( mail-client/thunderbird-bin mail-client/thunderbird )
-	net-misc/iperf
-"
-	#no buildy
-	#drivers? ( sys-kernel/ax88179_178a )
diff --git a/pentoo/pentoo-system/pentoo-system-2013.0-r5.ebuild b/pentoo/pentoo-system/pentoo-system-2013.0-r5.ebuild
deleted file mode 100644
index 5efc9d39e..000000000
--- a/pentoo/pentoo-system/pentoo-system-2013.0-r5.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-KEYWORDS="amd64 x86"
-DESCRIPTION="Pentoo meta ebuild to install system"
-HOMEPAGE="http://www.pentoo.ch"
-SLOT="0"
-LICENSE="GPL-3"
-
-IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_virtualbox video_cards_vmware"
-IUSE="+drivers gtk qt4 livecd livecd-stage1 +windows-compat ${IUSE_VIDEO_CARDS}"
-
-S="${WORKDIR}"
-
-#things needed for a running pentoo system
-PDEPEND="${PDEPEND}
-	!livecd-stage1? ( video_cards_vmware? ( || ( app-emulation/open-vm-tools app-emulation/vmware-tools ) )
-			video_cards_virtualbox? ( app-emulation/virtualbox-guest-additions )
-			video_cards_nvidia? ( x11-misc/bumblebee ) )
-	!livecd? ( app-portage/portage-utils
-		|| ( app-admin/syslog-ng virtual/logger )
-		|| ( sys-process/fcron virtual/cron ) )
-	sys-apps/gptfdisk
-	sys-apps/pcmciautils
-	!arm? ( !livecd-stage1? ( sys-kernel/genkernel
-		|| ( sys-boot/grub:0 sys-boot/grub-static )
-		sys-boot/grub:2 ) )
-	app-arch/unrar
-	app-arch/unzip
-	app-portage/gentoolkit
-	app-portage/eix
-	app-portage/porthole
-	net-misc/x11-ssh-askpass
-	windows-compat? ( app-emulation/wine
-		amd64? ( dev-lang/mono ) )
-	sys-apps/pciutils
-	sys-apps/usbutils
-	sys-apps/mlocate
-	sys-apps/usb_modeswitch
-	!arm? ( sys-apps/microcode-data
-		sys-firmware/amd-ucode
-		sys-boot/syslinux )
-	net-fs/curlftpfs
-	sys-fs/sshfs-fuse
-	sys-kernel/linux-firmware
-	sys-libs/gpm
-	!arm? ( sys-power/acpid[pentoo] )
-	sys-power/cpufrequtils
-	sys-power/hibernate-script
-	sys-power/powertop
-	sys-process/htop
-	sys-process/iotop
-	sys-boot/unetbootin
-	sys-apps/openrc[pentoo]
-	app-arch/sharutils
-	app-crypt/gnupg
-	app-shells/bash-completion
-	sys-apps/hdparm
-	sys-boot/efibootmgr
-	sys-fs/cryptsetup
-	dev-libs/icu
-	sys-process/lsof
-	gtk? ( media-video/gtk-recordmydesktop )
-	qt4? ( !gtk? ( media-video/qt-recordmydesktop ) )
-	!arm? ( sys-kernel/pentoo-sources )
-	app-portage/mirrorselect
-	!livecd-stage1? ( amd64? ( sys-fs/zfs ) )
-	|| ( mail-client/thunderbird-bin mail-client/thunderbird )
-	net-misc/iperf
-"
-	#no buildy
-	#drivers? ( sys-kernel/ax88179_178a )
diff --git a/pentoo/pentoo-system/pentoo-system-2013.0-r6.ebuild b/pentoo/pentoo-system/pentoo-system-2013.0-r7.ebuild
similarity index 92%
rename from pentoo/pentoo-system/pentoo-system-2013.0-r6.ebuild
rename to pentoo/pentoo-system/pentoo-system-2013.0-r7.ebuild
index cff6669fe..99d971bbd 100644
--- a/pentoo/pentoo-system/pentoo-system-2013.0-r6.ebuild
+++ b/pentoo/pentoo-system/pentoo-system-2013.0-r7.ebuild
@@ -71,3 +71,10 @@ PDEPEND="${PDEPEND}
 "
 	#no buildy
 	#drivers? ( sys-kernel/ax88179_178a )
+
+src_install() {
+	exeinto /etc/local.d
+	doexe "${FILESDIR}"/00-linux_link.start
+	doexe "${FILESDIR}"/00-speed_shutdown.stop
+	doexe "${FILESDIR}"/99-power_saving.start
+}
diff --git a/pentoo/pentoo/Manifest b/pentoo/pentoo/Manifest
index 95a05d9ec..d34465c58 100644
--- a/pentoo/pentoo/Manifest
+++ b/pentoo/pentoo/Manifest
@@ -1,8 +1,4 @@
-AUX 00-compat-drivers.start 770 SHA256 d92d7bdcad0042dca0b7b6b34d15f8b935a3fe0e42555b9e4f1ec6b0541b1562 SHA512 0186648f8610b28218cd9f9f1923f02634e25da110672d26bc26f7ee033c071270c7b23108d3e314cf77b52cdcea3599c9584738ac80ed18e8ef4a875e6155ae WHIRLPOOL cc85231fdc0711de169a37e5433b08cdb1c1b3e485f729b21da7e218e261df5db69d57a79983b873fcb37850b6b6a8afd3ed58682ad3e87a56fa6c64508617f0
-AUX 00-linux_link.start 383 SHA256 1022f30ba59b838dd38d717f95e60e9339e7bd3ca621ca728b432ea6997b3142 SHA512 1882828a3efc28aa4c6c1e84e80b2e5d8018684ccaa48a19fbed8202db88d4867b90ebea61f09f69082b5466ac911568e2b546dc681967d84cb34ea29184f12c WHIRLPOOL c41aac6ceba1af599da512ca4e830c2b724d4e709cb381cdc8af27bb66c81be7c56008c952aaa86c93b6bf2e31c62a00335bec948add15cb7254bcc9164b15ec
-AUX 00-speed_shutdown.stop 477 SHA256 e9cd6040c1930d331839edf846c45f2bdd0d05bb05ee2ec6181a0ff757c5aab8 SHA512 ae29ce4c513ee33fbef712342a0bc8b5475702cd844eec3a0381da17b0fc59c317a963bf00a65a566098acbb6583635a48f05e91fcae48d21466c44285181a88 WHIRLPOOL f908bfa92b407dab30d8ef46f7f0183132f0ff895a2278e9a686517e7f4fc2670fcfcaab9bc84f4bdeeaf6b5159fc2c9a69cd870c4f1895dc65db927bfa0f854
 AUX 02locale 19 SHA256 6908ed1fdb7829167265e379e83e5f41c84c8ae34be5d85e2369a7648c9dbd2d SHA512 7284c9d025de14476e64ec5ab5d541466350b08e57735813c2e55b61f0bd362cc58e088d0bb93cb4ac7c3c66dfb3d1ba52b398aeb4f46071bf6e51b8194c643c WHIRLPOOL b576eace82843a84352dbd207aeedda8380833c391b4dee059bc0896e5484a2af912ce3f8b5c9cb6e0a86881be86c9169053d60e19c1d42ef7e8983b209a4274
-AUX 99-power_saving.start 2956 SHA256 44b8e2b911fbe819af85ac11521cde2b0b77c2b3ad3649958453d6bbcbc90ee6 SHA512 d97e824d304b4e002517c652881002f643dda6e056a7c35984bb89c71a78b680d094f7f14406e1f1465849d1e9c6261ee1d136dfdd5bb88e885837028e1345ed WHIRLPOOL e0ffe17fb8502b821b75589c8f54cbc6148c053390286f345b64521db380f665f58e156a8f7386f4d89f75268ba8945e9d2ab9601eb9df053344e4c17e0aef10
 AUX b43-commercial-2012.1 305 SHA256 b9a147fc4a41f4d45e5bd8dd790154293bb3a59fd8e9e560c9db5c5b54857ddc SHA512 821f6a904018a17f5a235c51988b7331a4efe7c2209d1e01f2b10f40c986b3acf4d4c9d4b9bcfc12c4feecd58a160bec8eb720cc9e28d9679e5d24900623fd92 WHIRLPOOL bf61b390ecedc9a29ef31c7f6ecdc35c415244aecedad7dddf1a57e971bed736ecb8047008f7c8f659f67b6d62413c22c743626a0f507e3ebeff641277bf4980
 AUX dokeybindings-2012.1 265 SHA256 ea323401cfaf10a37f04771541390b1c037a255c5583a5030ea6acbce5b5a409 SHA512 0765034bdb44fea5833be31f41bf1791866221c5f4148e639c172cbfb937a8090ada0c4fa62b5e96dded7501285a8a2f758d59397468d339782652ca18770aac WHIRLPOOL b0b272f7a7ece9930241c89bbe1fe7a3999baf853f547ef4f35770e42f0f49c2e12318ca8ab3fb001ddbbbb87b099e9f6545d897205464d245b5d057c287a431
 AUX domo-roolz.jpg 133404 SHA256 f9b2b8b9ced7562e3665cae0b7caaa891befdaf0a1dedb3346bb48f462f64486 SHA512 45ce7cd73f63b8cbab7ccc6a86f14b6dcaf58e885c7ba1ead4b3e7dc30d3bf7718dcca0e3b4c041007c63ffff3259ea304aa7e83a9d15dd29d0975cffc9a75b2 WHIRLPOOL 982afb854d29c6b44fe5aa54b94cc1b63e9b00f180b30434390ea6d8df86d5d65b68ead082ab08a0375b6604adb11ed6e5257a35559eb2563eb8d895140e36fc
@@ -21,6 +17,4 @@ AUX pentoo-release-2012.1-rc2 34 SHA256 31e6bd2df90dca4c5483de8ce197bbf39a658179
 AUX pentoo.xpm.gz 59047 SHA256 4adb6d0d305b599e35bed9a835b6aa3531cce71c0b05e293adb3197cac4c09e0 SHA512 a6a2f152861e63c33afdda9997b9be25bd735f0624c946d61d0088210264743f842f103026eeb7cf63ef94b873131b072b61c55fba1922e9830318bcacd7a074 WHIRLPOOL a3b937b810f02f1fa6ebcdc58cada7a71e778f370b3355a08670a7f524d8e370ba29bdaf408d0bdd14753a129734d80a952937f3e009a69e87bed90995a2aaaf
 AUX tux-winfly-killah.1600x1200.jpg 360183 SHA256 af7c84386a634e573fbd65884c49c716a4f92369b2f228c68672acc96f4a9879 SHA512 ed81ce83997a7ccc4eeb0fc08d09b98bedd6de8f27b9cfce2cb734ca4f4283c3e44154d7cfa73f94742c627ed67fb3ad520019ad8cbd9286cd8e2ceffc8677e7 WHIRLPOOL a8b2d4b51dc261362c4d9fca225ac9c02defc3903b6e9ecc8a7401a2155135efc2c7d62afba8727de37126ec425936ab08727455a68fd922192ec46a428ebd17
 AUX xfce4-desktop.xml 378 SHA256 97b1cb040f9819c0fe904537adf0e51fa3dbb35b8a34050d674a08dfb69c11d0 SHA512 ae84b11c4a5e833ff0b6e36e0619c5dab0e3dcab0e859fdc59dcbfed91e140d165677e2293b0c83bbf8ccaa3fcc5b5262888942a598b3e3de666b0dcdd7b2bc9 WHIRLPOOL b1bf73e6b0e577e411c0043603930fe920bd01326d4f3994661141e77c23983e61084d458ba0dd972330b13c2e0c2cd77ece37c6a3295a732879f0ae88df638b
-EBUILD pentoo-2013.0-r6.ebuild 5716 SHA256 7caeabc866334592328d531571b3a2f9bc2190d728f864c8107d05f5cff59c6f SHA512 43ece2cebcc1dbf538757cda66fa05a70f995362ab19b5cd4912d7a602369fa76aa80931dc68c264b8293edb466a7c4860b430d52f2f45286b9880da833b4eca WHIRLPOOL 1ba0cd5f1428122f91fa002ba000595a1dd04847832fadf1ec9818532ea8c4fe5521053fbb67083bb899891e59e2d2216a07d087a048dee0e2342d39bcf2dbd4
-EBUILD pentoo-2013.0-r7.ebuild 5736 SHA256 16d8963e666d0204fb6da42a08557d49e2d8a91d50acfe1bee6fafb1f94e8d77 SHA512 bbe6b1a9d4d76dd69448665442880cc734d087bf0b342af26ad88a14a376b4d526d338ba018341e888003c377bf25303bdd2e0ecaac39a85ad7137b57318887b WHIRLPOOL 3491d272426263ba217fb710c06095f03f4af55a028d24438636c3b63bc96e85b3bb084c564e5e9c2948b9b834ecc2016b20f046f7e9da0c47c02466fb195fc5
-EBUILD pentoo-2013.0-r8.ebuild 5741 SHA256 52334be9918d55968bc533bd214187363f4eb4f414efc73f12787166992b0f42 SHA512 9bf85b48e366fb00a3553fc76372e4e0b85a2cc926f41ea7e0eca974189806b273f18c0926af2372ab8cbdc062354bdf9957be92843f668b5db8461d9e6f3e11 WHIRLPOOL 83c2b6b9098cb8f101e972fa72b60a99d3d389301b8a42501f78419ab9bc62d013b227b9101d0bc6bafe16d5f8c941c2131f34c5de1cc48c60afd8bc2fadf31c
+EBUILD pentoo-2013.0-r9.ebuild 5507 SHA256 24608fff01e292a6e53d677726d42f755f04e5c0a5f314da9158f8d476d5c223 SHA512 719bac27933eeb7a10782cde55f23c1da91e8737fb3f1ca2d956793d0b1179082dd919d591e9bb200d3e96b20c2c115755781450815a840d861c2f37e4272fd9 WHIRLPOOL 5ae4bd168690a8e2f6cb3688470f68a4ae14a39e6d5a237f842dd4a98c176ab2fb040b2966f579275c5e410f2b1c4ebbb9746b26537170c3a4cff200afe535d2
diff --git a/pentoo/pentoo/pentoo-2013.0-r6.ebuild b/pentoo/pentoo/pentoo-2013.0-r6.ebuild
deleted file mode 100644
index 72ce9ec3d..000000000
--- a/pentoo/pentoo/pentoo-2013.0-r6.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-KEYWORDS="amd64 x86"
-DESCRIPTION="Pentoo meta ebuild to install all apps"
-HOMEPAGE="http://www.pentoo.ch"
-SLOT="0"
-LICENSE="GPL-3"
-IUSE="livecd livecd-stage1 +analyzer bindist +bluetooth cdr +cracking +database +enlightenment +exploit +footprint +forensics +forging +fuzzers -kde +mitm +mobile +proxies qemu -gnome pentoo +radio +rce +scanner +voip +wireless +xfce X"
-
-S="${WORKDIR}"
-
-DEPEND="!pentoo/pentoo-etc-portage"
-
-# Things needed for a running system and not for livecd
-RDEPEND="${RDEPEND}
-	!livecd? ( !pentoo/pentoo-livecd
-		!app-misc/livecd-tools )"
-
-# Window makers
-RDEPEND="${RDEPEND}
-	enlightenment? ( x11-wm/enlightenment:0.17
-		x11-terms/terminology
-		gnome-base/gnome-menus
-		=x11-plugins/extramenu-9999
-	)
-	gnome? ( pentoo/pentoo-gnome )
-	kde? ( kde-base/kdebase-meta
-		kde-base/kate
-		kde-base/kcalc
-		kde-base/kgpg
-		kde-base/kmix
-		kde-base/ksnapshot
-		kde-misc/networkmanagement
-		net-misc/smb4k )
-	xfce? ( xfce-base/xfce4-meta
-		cdr? ( app-cdr/xfburn )
-		app-editors/leafpad
-		media-gfx/geeqie
-		x11-themes/tango-icon-theme
-		xfce-base/thunar
-		xfce-extra/thunar-volman
-		xfce-extra/tumbler
-		xfce-extra/xfce4-power-manager
-		xfce-extra/xfce4-screenshooter
-		x11-terms/xfce4-terminal
-	)"
-
-#X windows stuff
-RDEPEND="${RDEPEND}
-	X? (
-		|| ( x11-base/xorg-server dev-libs/wayland )
-		net-irc/hexchat
-		x11-apps/setxkbmap
-		x11-apps/xbacklight
-		x11-apps/xdm
-		x11-apps/xinit
-		x11-apps/xinput
-		x11-apps/xrandr
-		x11-libs/gksu
-		x11-misc/slim
-		x11-proto/dri2proto
-		x11-terms/rxvt-unicode
-		x11-themes/gtk-theme-switch )
-		app-text/evince
-		www-plugins/adobe-flash
-		www-plugins/firecat
-		media-sound/pavucontrol
-		media-sound/pulseaudio
-		net-misc/rdesktop
-		net-misc/tightvnc
-		bindist? ( www-client/firefox-bin )
-		!bindist? ( || ( www-client/firefox www-client/firefox-bin )
-	)"
-
-# Basic systems
-RDEPEND="${RDEPEND}
-	qemu? ( !livecd-stage1? ( app-emulation/virt-manager sys-apps/usermode-utilities ) )
-	app-admin/genmenu
-	app-admin/localepurge
-	app-crypt/openvpn-blacklist
-	app-editors/gedit
-	app-editors/ghex
-	app-editors/hexedit
-	app-editors/nano
-	app-editors/vim
-	app-misc/dradis
-	app-misc/mc
-	app-misc/screen
-	app-portage/layman
-	app-portage/smart-live-rebuild
-	app-text/dos2unix
-	app-text/wgetpaste
-	dev-libs/libxslt
-	dev-vcs/subversion
-	media-fonts/dejavu
-	media-fonts/font-misc-misc
-	media-gfx/fbgrab
-	media-gfx/scrot
-	media-sound/alsa-utils
-	media-sound/alsamixergui
-	media-sound/audacious
-	media-sound/sox
-	media-video/vlc
-	net-dialup/linux-atm
-	net-dialup/lrzsz
-	net-dialup/minicom
-	net-dialup/ppp
-	net-dialup/wvdial
-	net-dns/bind-tools
-	net-firewall/firehol
-	net-firewall/iptables
-	|| ( net-fs/mount-cifs net-fs/samba )
-	net-fs/nfs-utils
-	net-ftp/tftp-hpa
-	net-ftp/ftp
-	net-ftp/gproftpd
-	net-ftp/oftpd
-	net-im/pidgin
-	net-im/jitsi-bin
-	net-irc/irssi
-	net-misc/axel
-	net-misc/curl
-	net-misc/dhcp
-	net-misc/dhcpcd
-	net-misc/grdesktop
-	net-misc/ifenslave
-	net-misc/iputils
-	net-misc/netkit-fingerd
-	net-misc/netkit-rsh
-	net-misc/netsed
-	net-misc/ntp
-	net-misc/openssh
-	net-misc/openvpn
-	net-misc/stunnel
-	net-misc/tcpick
-	net-misc/telnet-bsd
-	net-misc/vconfig
-	net-misc/vpnc
-	net-misc/whois
-	|| ( net-misc/wicd net-misc/networkmanager )
-	net-misc/wlan2eth
-	sys-apps/ethtool
-	sys-apps/fbset
-	sys-apps/iproute2
-	sys-apps/sysvinit
-	sys-block/gparted
-	sys-devel/crossdev
-	sys-devel/gettext
-	sys-fs/jfsutils
-	sys-fs/reiser4progs
-	sys-fs/reiserfsprogs
-	sys-fs/squashfs-tools
-	www-client/links
-	www-client/lynx
-	www-servers/lighttpd"
-
-# The tools
-RDEPEND="${RDEPEND}
-	analyzer? ( pentoo/pentoo-analyzer )
-	bluetooth? ( pentoo/pentoo-bluetooth )
-	cracking? ( pentoo/pentoo-cracking )
-	database? ( pentoo/pentoo-database )
-	exploit? ( pentoo/pentoo-exploit )
-	footprint? ( pentoo/pentoo-footprint )
-	forensics? ( pentoo/pentoo-forensics )
-	forging? ( pentoo/pentoo-forging )
-	fuzzers? ( pentoo/pentoo-fuzzers )
-	livecd? ( pentoo/pentoo-livecd )
-	mitm? ( pentoo/pentoo-mitm )
-	mobile? ( pentoo/pentoo-mobile )
-	pentoo? ( pentoo/pentoo-system )
-	proxies? ( pentoo/pentoo-proxies )
-	radio? ( pentoo/pentoo-radio )
-	rce? ( pentoo/pentoo-rce )
-	scanner? ( pentoo/pentoo-scanner )
-	voip? ( pentoo/pentoo-voip )
-	wireless? ( pentoo/pentoo-wireless )"
-
-src_install() {
-	##here is where we merge in things from root_overlay which make sense
-	exeinto /root
-	newexe "${FILESDIR}"/b43-commercial-2012.1 b43-commercial
-	insinto /root
-	newins "${FILESDIR}"/motd-2013.0-r2 motd
-
-	#/usr/bin
-	use enlightenment && newbin "${FILESDIR}"/dokeybindings-2012.1 dokeybindings
-
-	#/usr/sbin
-	newsbin "${FILESDIR}"/flushchanges-${PV} flushchanges
-	newsbin "${FILESDIR}"/makemo-${PV} makemo
-
-	#/etc
-	insinto /etc
-	echo "Pentoo Release ${PV}" > pentoo-release
-
-	#/etc/portage/postsync.d
-	exeinto /etc/portage/postsync.d
-	doexe "${FILESDIR}"/layman-sync
-
-	#/etc/local.d/
-	exeinto /etc/local.d
-	doexe "${FILESDIR}"/00-linux_link.start
-	doexe "${FILESDIR}"/00-speed_shutdown.stop
-	doexe "${FILESDIR}"/00-compat-drivers.start
-	doexe "${FILESDIR}"/99-power_saving.start
-
-	dodir /root
-	echo "exec enlightenment_start" > "${ED}"/root/.xinitrc
-
-	insinto /usr/share/${PN}/wallpaper
-	doins "${FILESDIR}"/domo-roolz.jpg
-	doins "${FILESDIR}"/tux-winfly-killah.1600x1200.jpg
-	doins "${FILESDIR}"/xfce4-desktop.xml
-	dosym /usr/share/${PN}/wallpaper/domo-roolz.jpg /usr/share/backgrounds/xfce/domo-roolz.jpg
-	dosym /usr/share/${PN}/wallpaper/tux-winfly-killah.1600x1200.jpg /usr/share/backgrounds/xfce/tux-winfly-killah.1600x1200.jpg
-
-	#We support UTF8 here son...
-	if [ ! -e "${EROOT}/etc/env.d/02locale" ]
-	then
-		doenvd "${FILESDIR}"/02locale
-	fi
-
-	insinto /etc/fonts
-	doins "${FILESDIR}"/local.conf
-}
diff --git a/pentoo/pentoo/pentoo-2013.0-r7.ebuild b/pentoo/pentoo/pentoo-2013.0-r7.ebuild
deleted file mode 100644
index c56312797..000000000
--- a/pentoo/pentoo/pentoo-2013.0-r7.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-KEYWORDS="amd64 x86"
-DESCRIPTION="Pentoo meta ebuild to install all apps"
-HOMEPAGE="http://www.pentoo.ch"
-SLOT="0"
-LICENSE="GPL-3"
-IUSE="livecd livecd-stage1 +analyzer bindist +bluetooth cdr +cracking +database +enlightenment +exploit +footprint +forensics +forging +fuzzers -kde +mitm +mobile +proxies qemu -gnome pentoo +radio +rce +scanner +voip +wireless +xfce X"
-
-S="${WORKDIR}"
-
-DEPEND="!pentoo/pentoo-etc-portage"
-
-# Things needed for a running system and not for livecd
-RDEPEND="${RDEPEND}
-	!livecd? ( !pentoo/pentoo-livecd
-		!app-misc/livecd-tools )"
-
-# Window makers
-RDEPEND="${RDEPEND}
-	enlightenment? ( x11-wm/enlightenment:0.17
-		x11-terms/terminology
-		gnome-base/gnome-menus
-		=x11-plugins/extramenu-9999
-	)
-	gnome? ( pentoo/pentoo-gnome )
-	kde? ( kde-base/kdebase-meta
-		kde-base/kate
-		kde-base/kcalc
-		kde-base/kgpg
-		kde-base/kmix
-		kde-base/ksnapshot
-		kde-misc/networkmanagement
-		net-misc/smb4k )
-	xfce? ( xfce-base/xfce4-meta
-		cdr? ( app-cdr/xfburn )
-		app-editors/leafpad
-		media-gfx/geeqie
-		x11-themes/tango-icon-theme
-		xfce-base/thunar
-		xfce-extra/thunar-volman
-		xfce-extra/tumbler
-		xfce-extra/xfce4-power-manager
-		xfce-extra/xfce4-screenshooter
-		x11-terms/xfce4-terminal
-	)"
-
-#X windows stuff
-RDEPEND="${RDEPEND}
-	X? (
-		!livecd-stage1? ( || ( x11-base/xorg-server dev-libs/wayland ) )
-		net-irc/hexchat
-		x11-apps/setxkbmap
-		x11-apps/xbacklight
-		x11-apps/xdm
-		x11-apps/xinit
-		x11-apps/xinput
-		x11-apps/xrandr
-		x11-libs/gksu
-		x11-misc/slim
-		x11-proto/dri2proto
-		x11-terms/rxvt-unicode
-		x11-themes/gtk-theme-switch )
-		app-text/evince
-		www-plugins/adobe-flash
-		www-plugins/firecat
-		media-sound/pavucontrol
-		media-sound/pulseaudio
-		net-misc/rdesktop
-		net-misc/tightvnc
-		bindist? ( www-client/firefox-bin )
-		!bindist? ( || ( www-client/firefox www-client/firefox-bin )
-	)"
-
-# Basic systems
-RDEPEND="${RDEPEND}
-	qemu? ( !livecd-stage1? ( app-emulation/virt-manager sys-apps/usermode-utilities ) )
-	app-admin/genmenu
-	app-admin/localepurge
-	app-crypt/openvpn-blacklist
-	app-editors/gedit
-	app-editors/ghex
-	app-editors/hexedit
-	app-editors/nano
-	app-editors/vim
-	app-misc/dradis
-	app-misc/mc
-	app-misc/screen
-	app-portage/layman
-	app-portage/smart-live-rebuild
-	app-text/dos2unix
-	app-text/wgetpaste
-	dev-libs/libxslt
-	dev-vcs/subversion
-	media-fonts/dejavu
-	media-fonts/font-misc-misc
-	media-gfx/fbgrab
-	media-gfx/scrot
-	media-sound/alsa-utils
-	media-sound/alsamixergui
-	media-sound/audacious
-	media-sound/sox
-	media-video/vlc
-	net-dialup/linux-atm
-	net-dialup/lrzsz
-	net-dialup/minicom
-	net-dialup/ppp
-	net-dialup/wvdial
-	net-dns/bind-tools
-	net-firewall/firehol
-	net-firewall/iptables
-	|| ( net-fs/mount-cifs net-fs/samba )
-	net-fs/nfs-utils
-	net-ftp/tftp-hpa
-	net-ftp/ftp
-	net-ftp/gproftpd
-	net-ftp/oftpd
-	net-im/pidgin
-	net-im/jitsi-bin
-	net-irc/irssi
-	net-misc/axel
-	net-misc/curl
-	net-misc/dhcp
-	net-misc/dhcpcd
-	net-misc/grdesktop
-	net-misc/ifenslave
-	net-misc/iputils
-	net-misc/netkit-fingerd
-	net-misc/netkit-rsh
-	net-misc/netsed
-	net-misc/ntp
-	net-misc/openssh
-	net-misc/openvpn
-	net-misc/stunnel
-	net-misc/tcpick
-	net-misc/telnet-bsd
-	net-misc/vconfig
-	net-misc/vpnc
-	net-misc/whois
-	|| ( net-misc/wicd net-misc/networkmanager )
-	net-misc/wlan2eth
-	sys-apps/ethtool
-	sys-apps/fbset
-	sys-apps/iproute2
-	sys-apps/sysvinit
-	sys-block/gparted
-	sys-devel/crossdev
-	sys-devel/gettext
-	sys-fs/jfsutils
-	sys-fs/reiser4progs
-	sys-fs/reiserfsprogs
-	sys-fs/squashfs-tools
-	www-client/links
-	www-client/lynx
-	www-servers/lighttpd"
-
-# The tools
-RDEPEND="${RDEPEND}
-	analyzer? ( pentoo/pentoo-analyzer )
-	bluetooth? ( pentoo/pentoo-bluetooth )
-	cracking? ( pentoo/pentoo-cracking )
-	database? ( pentoo/pentoo-database )
-	exploit? ( pentoo/pentoo-exploit )
-	footprint? ( pentoo/pentoo-footprint )
-	forensics? ( pentoo/pentoo-forensics )
-	forging? ( pentoo/pentoo-forging )
-	fuzzers? ( pentoo/pentoo-fuzzers )
-	livecd? ( pentoo/pentoo-livecd )
-	mitm? ( pentoo/pentoo-mitm )
-	mobile? ( pentoo/pentoo-mobile )
-	pentoo? ( pentoo/pentoo-system )
-	proxies? ( pentoo/pentoo-proxies )
-	radio? ( pentoo/pentoo-radio )
-	rce? ( pentoo/pentoo-rce )
-	scanner? ( pentoo/pentoo-scanner )
-	voip? ( pentoo/pentoo-voip )
-	wireless? ( pentoo/pentoo-wireless )"
-
-src_install() {
-	##here is where we merge in things from root_overlay which make sense
-	exeinto /root
-	newexe "${FILESDIR}"/b43-commercial-2012.1 b43-commercial
-	insinto /root
-	newins "${FILESDIR}"/motd-2013.0-r2 motd
-
-	#/usr/bin
-	use enlightenment && newbin "${FILESDIR}"/dokeybindings-2012.1 dokeybindings
-
-	#/usr/sbin
-	newsbin "${FILESDIR}"/flushchanges-${PV} flushchanges
-	newsbin "${FILESDIR}"/makemo-${PV} makemo
-
-	#/etc
-	insinto /etc
-	echo "Pentoo Release ${PV}" > pentoo-release
-
-	#/etc/portage/postsync.d
-	exeinto /etc/portage/postsync.d
-	doexe "${FILESDIR}"/layman-sync
-
-	#/etc/local.d/
-	exeinto /etc/local.d
-	doexe "${FILESDIR}"/00-linux_link.start
-	doexe "${FILESDIR}"/00-speed_shutdown.stop
-	doexe "${FILESDIR}"/00-compat-drivers.start
-	doexe "${FILESDIR}"/99-power_saving.start
-
-	dodir /root
-	echo "exec enlightenment_start" > "${ED}"/root/.xinitrc
-
-	insinto /usr/share/${PN}/wallpaper
-	doins "${FILESDIR}"/domo-roolz.jpg
-	doins "${FILESDIR}"/tux-winfly-killah.1600x1200.jpg
-	doins "${FILESDIR}"/xfce4-desktop.xml
-	dosym /usr/share/${PN}/wallpaper/domo-roolz.jpg /usr/share/backgrounds/xfce/domo-roolz.jpg
-	dosym /usr/share/${PN}/wallpaper/tux-winfly-killah.1600x1200.jpg /usr/share/backgrounds/xfce/tux-winfly-killah.1600x1200.jpg
-
-	#We support UTF8 here son...
-	if [ ! -e "${EROOT}/etc/env.d/02locale" ]
-	then
-		doenvd "${FILESDIR}"/02locale
-	fi
-
-	insinto /etc/fonts
-	doins "${FILESDIR}"/local.conf
-}
diff --git a/pentoo/pentoo/pentoo-2013.0-r8.ebuild b/pentoo/pentoo/pentoo-2013.0-r9.ebuild
similarity index 92%
rename from pentoo/pentoo/pentoo-2013.0-r8.ebuild
rename to pentoo/pentoo/pentoo-2013.0-r9.ebuild
index 3d9ef3a90..4e8b0e0b7 100644
--- a/pentoo/pentoo/pentoo-2013.0-r8.ebuild
+++ b/pentoo/pentoo/pentoo-2013.0-r9.ebuild
@@ -16,12 +16,11 @@ S="${WORKDIR}"
 DEPEND="!pentoo/pentoo-etc-portage"
 
 # Things needed for a running system and not for livecd
-RDEPEND="${RDEPEND}
-	!livecd? ( !pentoo/pentoo-livecd
+PDEPEND="!livecd? ( !pentoo/pentoo-livecd
 		!app-misc/livecd-tools )"
 
 # Window makers
-RDEPEND="${RDEPEND}
+PDEPEND="${PDEPEND}
 	enlightenment? ( x11-wm/enlightenment:0.17
 		x11-terms/terminology
 		gnome-base/gnome-menus
@@ -50,7 +49,7 @@ RDEPEND="${RDEPEND}
 	)"
 
 #X windows stuff
-RDEPEND="${RDEPEND}
+PDEPEND="${PDEPEND}
 	X? (
 		!livecd-stage1? ( || ( x11-base/xorg-server dev-libs/wayland ) )
 		net-irc/hexchat
@@ -64,7 +63,7 @@ RDEPEND="${RDEPEND}
 		x11-misc/slim
 		x11-proto/dri2proto
 		x11-terms/rxvt-unicode
-		x11-themes/gtk-theme-switch )
+		x11-themes/gtk-theme-switch
 		app-text/evince
 		www-plugins/adobe-flash
 		www-plugins/firecat
@@ -77,7 +76,7 @@ RDEPEND="${RDEPEND}
 	)"
 
 # Basic systems
-RDEPEND="${RDEPEND}
+PDEPEND="${PDEPEND}
 	qemu? ( !livecd-stage1? ( app-emulation/virt-manager sys-apps/usermode-utilities ) )
 	app-admin/genmenu
 	app-admin/localepurge
@@ -159,7 +158,7 @@ RDEPEND="${RDEPEND}
 	www-servers/lighttpd"
 
 # The tools
-RDEPEND="${RDEPEND}
+PDEPEND="${PDEPEND}
 	analyzer? ( pentoo/pentoo-analyzer )
 	bluetooth? ( pentoo/pentoo-bluetooth )
 	cracking? ( pentoo/pentoo-cracking )
@@ -197,18 +196,12 @@ src_install() {
 	#/etc
 	insinto /etc
 	echo "Pentoo Release ${PV}" > pentoo-release
+	doins pentoo-release
 
 	#/etc/portage/postsync.d
 	exeinto /etc/portage/postsync.d
 	doexe "${FILESDIR}"/layman-sync
 
-	#/etc/local.d/
-	exeinto /etc/local.d
-	doexe "${FILESDIR}"/00-linux_link.start
-	doexe "${FILESDIR}"/00-speed_shutdown.stop
-	doexe "${FILESDIR}"/00-compat-drivers.start
-	doexe "${FILESDIR}"/99-power_saving.start
-
 	dodir /root
 	echo "exec enlightenment_start" > "${ED}"/root/.xinitrc
 
@@ -219,7 +212,6 @@ src_install() {
 	dosym /usr/share/${PN}/wallpaper/domo-roolz.jpg /usr/share/backgrounds/xfce/domo-roolz.jpg
 	dosym /usr/share/${PN}/wallpaper/tux-winfly-killah.1600x1200.jpg /usr/share/backgrounds/xfce/tux-winfly-killah.1600x1200.jpg
 
-	#We support UTF8 here son...
 	if [ ! -e "${EROOT}/etc/env.d/02locale" ]
 	then
 		doenvd "${FILESDIR}"/02locale
diff --git a/sys-kernel/compat-drivers/Manifest b/sys-kernel/compat-drivers/Manifest
index bcd4268d8..fe705fb6d 100644
--- a/sys-kernel/compat-drivers/Manifest
+++ b/sys-kernel/compat-drivers/Manifest
@@ -1,3 +1,4 @@
+AUX 00-compat-drivers.start 770 SHA256 d92d7bdcad0042dca0b7b6b34d15f8b935a3fe0e42555b9e4f1ec6b0541b1562 SHA512 0186648f8610b28218cd9f9f1923f02634e25da110672d26bc26f7ee033c071270c7b23108d3e314cf77b52cdcea3599c9584738ac80ed18e8ef4a875e6155ae WHIRLPOOL cc85231fdc0711de169a37e5433b08cdb1c1b3e485f729b21da7e218e261df5db69d57a79983b873fcb37850b6b6a8afd3ed58682ad3e87a56fa6c64508617f0
 AUX 3.8-grsec/00-read-only.patch 604 SHA256 1b4109d2cb389e622252738390bd56a665f968c428accd905e6debcdf9c4e679 SHA512 34bd0312909701251317dfbc2b2ebd080f8d5e3dff18e3e0c80a48dbd6697d2877fe7e8a0fa52151f76a97a05368ebb4091166e4432dcaa3ce63469c2b830441 WHIRLPOOL 590b93713ffc2e59ce04b1c7b3a34f502eec32b25f01c45f8adab91cc1621c701a38ed0136ac5d052fe93d9d5738c0facf969189721b332a058db118835908bf
 AUX 3.8-grsec/01-read-only.patch 271 SHA256 f389b6d40b0c5512af8b3c024c69aed69830ca22d53403f19be0a8834ee4573c SHA512 9d2f878aeb6ebe8c3d74aa038e3fec14829ac709c2f65b9c7fe6482dd1c15432cf73a40638059ccee9350d6305989b60883903fcd0c7545ec38c1d22e006c9c2 WHIRLPOOL 111a64490618524af32c56c9631d0ff7f29ae4ebc692422df63cf6eaae0a42c06d4be7186c3049b3f3827de9535e8c0b14f6c5fecf9d956dc1e92236a053e545
 AUX 3.8-grsec/02-read-only-ath.patch 8178 SHA256 2a779d9a72fdf6c26620733f2b7fd12e65cd50969e9689cf1cf48a26f6bbfad9 SHA512 288d359778430d9b84fb9c66afce8473142270646fea3dd53471b16b8b7a2ecf78c28d4dfdc27a914b2c7d2561cb5d2ac267e71f50ec315b2b984ad3b59dfec7 WHIRLPOOL 8e50052ad0dd875e086795fd787c1ab83c434ccb1c6bd2b0ff8eaef4392b9a26681a02a52c343a05fa655198d51d643ed4dd9cdd0f4f1415504219598d0fa95d
@@ -21,13 +22,6 @@ AUX ipw2200-inject.3.4.6.patch 4173 SHA256 0b649bd7b6d2bf22667edc96949b5ab92cc7f
 AUX leds-disable-strict-3.6.6.patch 799 SHA256 e1b5947608d9c53263efd76aed404eb7e4107d81669faeb484f5d680e4cfb570 SHA512 6373efc6697b4589c15c3cd2cfd8f3faa06fe90eeeb4fa9acaf187ecc682fac394444949dd26c2dde71c0f45aedb1198374764b580b824ddc6bc1e937273b5f1 WHIRLPOOL 40bdef714aa0ff4069bb50abf434dff88610d97f570b80f36622d29a43301bf013a90e90cb7f3f8044c2bf53a09154b1033a6f53b1edf186513452fdb681d55f
 AUX leds-disable-strict-3.7_rc1_p6.patch 799 SHA256 e1b5947608d9c53263efd76aed404eb7e4107d81669faeb484f5d680e4cfb570 SHA512 6373efc6697b4589c15c3cd2cfd8f3faa06fe90eeeb4fa9acaf187ecc682fac394444949dd26c2dde71c0f45aedb1198374764b580b824ddc6bc1e937273b5f1 WHIRLPOOL 40bdef714aa0ff4069bb50abf434dff88610d97f570b80f36622d29a43301bf013a90e90cb7f3f8044c2bf53a09154b1033a6f53b1edf186513452fdb681d55f
 AUX leds-disable-strict-3.8.patch 799 SHA256 e1b5947608d9c53263efd76aed404eb7e4107d81669faeb484f5d680e4cfb570 SHA512 6373efc6697b4589c15c3cd2cfd8f3faa06fe90eeeb4fa9acaf187ecc682fac394444949dd26c2dde71c0f45aedb1198374764b580b824ddc6bc1e937273b5f1 WHIRLPOOL 40bdef714aa0ff4069bb50abf434dff88610d97f570b80f36622d29a43301bf013a90e90cb7f3f8044c2bf53a09154b1033a6f53b1edf186513452fdb681d55f
-DIST compat-drivers-3.7-rc1-6.tar.gz 7877572 SHA256 688406f3d9a84246dc0d57b93b5335c9b0f276cc216e3dc7032ad6152bfff873 SHA512 1a6a747a325b19f03cfb28036232ee9186010a0cb78e753d2358d8932d81322516878df97c13e56cec6472515d30c5b99816f44c6331fc58a261cae4ab33ad43 WHIRLPOOL c33025583834726f1f2988d8eaab8c716b117d74b427b035000ae5d5b35310be486ac76fcdb0589effae6036b5a3058ae0859384e4e6c9466b659f9848036ac1
 DIST compat-drivers-3.8-1-u.tar.xz 5301964 SHA256 5208d0606ea0ebfa9ff80c7f690dc7c75d92074553b413a984c56ce51b820176 SHA512 78733504c5acc1f3c00a75e8a651ee558dc63f5ad98d8b12942c7e1b93a4451b1fca7b90cb09108b9445f79b8851e83c5f75d5ca7bbef9e1a041f1c3a6d03b2b WHIRLPOOL b9ae6ae9594a71f44e9ca25ca9036ca7ba82c69115e407e8f907cd41d1b61c4e41f2be4a4f6679be9b6b15c9e4fe4c8e6076561d525e91a25c357fccd0d05cf2
-DIST compat-drivers-3.8-rc5-1-u.tar.xz 5299080 SHA256 0952e211e7352bbb4b236853c751ab4ffffebf4923517316f9579e644e0eabc8 SHA512 bc80b129d709aaf7eb76d6ec388d4b76ce60eb9a61101eae8ad6a43c09097d927651f462810735f56e53b035f3b7ce3c422a2894ca4ccca234bba9c61850877c WHIRLPOOL f31192ad24b81f55d7bcf1b03ddc70b6e9d20acd8f106ab7edcfd8a461d44270d1deb1d87451f540e050c04bef2ec20524d75777357a7ebc56ef76baa7257d21
-DIST compat-drivers-3.8-rc7-1-u.tar.xz 5301132 SHA256 b53ddac5b0423d72d3945235637cbbb4559b5b527bd74d4cc9dd9e098efad4c6 SHA512 ee8f72d2acfb0aa41e90268fc68f1c42d87a7e14597f7866dd9c96a00dd8ea318b92a5b25e499d65e00b617600baa09cfc639379465e306f54f73689c3fc93c1 WHIRLPOOL 98a0b602e67f6f305f4795b8a53ad87bcabd282aa45d5e74c5c1add07084fb97fbac1d651e59e6f6a4838a4084f5d5418d59a7d49441613f91df33172b480582
-EBUILD compat-drivers-3.7_rc1_p6-r1.ebuild 6976 SHA256 82a760ef9a1448e865dd2936ab3a9824da2c2f6195bce0dec091a9c569a36f18 SHA512 dc907bea77600697458d478418fc719b046ec4e3d09443891ab7235ba40e256b5ac57f7a9355ac67ab25eca4c01e4502a4cda0667a961165549cc4c6758b4249 WHIRLPOOL 7d2361bbd4f6417f934fe7763a5d33a49da18d3a17be53d85fe422c6ce0888b889a136407edae05d10e855ac61d711800bf763a7ebe15e92f2871299b1bc51ed
-EBUILD compat-drivers-3.7_rc1_p6.ebuild 7446 SHA256 1b80374769f13fb010ab0d288b5b03ff8a1eb3edde602f09cb8e242debda222d SHA512 0020e15c77d0b3692d3ffb38cd4268b245acb8f9995612f978c41df30b98eecb7d2dc989b7ea82fb5f589eb9abfb7c4b694217fafdad1db818c9b6b521edd9d1 WHIRLPOOL 967238ad9352b14ae10c6c47d71e4fd6aa44a2ec205f161b9c74f8a1112306b2ecad6c0bff2b11c5eec54c526629639e64073204c742555731ab2e94eb047130
-EBUILD compat-drivers-3.8.ebuild 6653 SHA256 4c1be0527b999f3f9af58d603314b4cca513c6d897aea2da878066b6a14f942b SHA512 b2e717baab520f1c2ec6dda8d27ad406508bf90dd1edecb961e711e8973cd4a627f0614ea69a5f05bed53af9735a568949096740d81a802f34cec707f87ada03 WHIRLPOOL 61d7fafaaad23da136b6fb853cab9e5f1b1740b8431edec8d3020b25f9b95cd6f1e39c0fb894fc5fd9675fad6f9f16ee5666424f883bdc32e83872dab356b05b
-EBUILD compat-drivers-3.8_rc5.ebuild 6868 SHA256 5c9d8912bed6a553e855b305e6cc39dc15f983bade5b7763441b05999b241cfa SHA512 0c41ee5aa982194775f1a837cdb168564e9ec094676b2bbfff54465bbe3f296210f79eae2b8330d1c1fcbf7249d002d9a2b20c171e6b89f305768e8bf5dd54e5 WHIRLPOOL 2d38c9bc1491377d1f80d580292548d787c5370af29114e4845016a589649a30fdfee1d10fb7b4d2f1f3d37c7581f7a3ef4bfa51e623b7e784f33e62c41bdda2
-EBUILD compat-drivers-3.8_rc7.ebuild 7159 SHA256 4570a3d28d1787eb7e7ccdba41629ec311430d3c0801f53b643ba438cc19216d SHA512 919925a704f9e25ee59140c2e52b24af889ac85eae7f63b923c68faca90ecea860180e91687b26553aba8b0d5457cc7e506ddb9413fcf0841dcb7838448d53c8 WHIRLPOOL 5ca17d0e915d1c478ca9036e2d87240a43a7dbffa8e4a228305af0a6a36afbbb3b75ba4a931b2981b2035acc8467b365133e7c9c51e6a6ebeacd8f5a6484d32a
+EBUILD compat-drivers-3.8-r1.ebuild 6721 SHA256 f3d19ec1e248b19950af00dc892a1ae9df98c284d65f794e14e8d74842f5171d SHA512 061c278e767d2a798720038494d99e9ab0e139ed2fa11610ba358f3e61045c68d4dc6c75789e571987c11d2688e00920aa1eba3e68042a0d74267c1bd17f0571 WHIRLPOOL 724e91cf4328c7a1a6492581330125fa9f20007a00371e9b7ec05a198032529af6f7a19ee8455f0ddbccee471d1eea9a61e97567f1b86fef8ffe3cb43c865909
 MISC metadata.xml 3542 SHA256 644b2f777a31515bdf4f60dc8a73b1b4f713b6568793095a7cded840385cb356 SHA512 8a6b6a8f13ad183d5dc17991a0b9f4919ec955b009190ef7b2cbfb0d718c4e61e99b23a782b80ee4441516b0bf4025341c578330302c1a1c5486aa4ed1c61078 WHIRLPOOL 911eb253abf84ab62d36afcec8c1c74213d8295a13b71811ae5aed06df48e7efaea4dc2252b967c62cb26e659a9f8209b4e45b41777c52097c4d34a0b1eb25ff
diff --git a/sys-kernel/compat-drivers/compat-drivers-3.7_rc1_p6-r1.ebuild b/sys-kernel/compat-drivers/compat-drivers-3.7_rc1_p6-r1.ebuild
deleted file mode 100644
index 1495c198a..000000000
--- a/sys-kernel/compat-drivers/compat-drivers-3.7_rc1_p6-r1.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-# USE_EXPAND categories
-CPD_USE_EXPAND="wifi ethernet various"
-# These are officially supported
-CPD_USE_EXPAND_wifi="ath5k ath9k ath9k_ap +ath9k_htc ath6kl b43 brcmsmac brcmfmac carl9170 rt2x00 wl1251 wl12xx zd1211rw"
-# This might work (not officially supported)
-CPD_USE_EXPAND_wifi+=" wl18xx"
-# This might work (added by pentoo)
-CPD_USE_EXPAND_wifi+=" b44"
-
-# These are officially supported
-CPD_USE_EXPAND_ethernet="atl1 atl1c atl1e atl2"
-# This might work (not officially supported)
-CPD_USE_EXPAND_ethernet+=" atlxx"
-
-# These are officially supported
-CPD_USE_EXPAND_various="i915"
-# This might work (not officially supported)
-CPD_USE_EXPAND_various+=" bt drm"
-# This might work (added by pentoo)
-CPD_USE_EXPAND_various+=" staging usbnet"
-
-inherit linux-mod linux-info versionator eutils compat-drivers-3.7
-
-# upstream versioning, ex.: 3.7-rc1-6
-UPSTREAM_PVR="${PV//_/-}" && UPSTREAM_PVR="${UPSTREAM_PVR/-p/-}"
-# ex.: 3.7-rc1
-UPSTREAM_PV=${UPSTREAM_PVR%-*}
-
-DESCRIPTION="Stable kernel pre-release wifi subsystem backport"
-HOMEPAGE="http://backports.wiki.kernel.org"
-# SRC_URI="http://www.kernel.org/pub/linux/kernel/projects/backports/stable/v${UPSTREAM_PV}/${PN}-${UPSTREAM_PVR}.tar.gz"
-SRC_URI="mirror://kernel/linux/kernel/projects/backports/stable/v${UPSTREAM_PV}/${PN}-${UPSTREAM_PVR}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE="atheros_obey_crda debugfs debug-driver full-debug injection livecd loadmodules noleds pax_kernel"
-
-DEPEND="!net-wireless/compat-wireless-builder
-	!net-wireless/compat-wireless"
-RDEPEND="${DEPEND}
-	>=sys-kernel/linux-firmware-20110219
-	virtual/udev"
-
-S="${WORKDIR}/${PN}-${UPSTREAM_PVR}"
-
-RESTRICT="strip"
-
-CONFIG_CHECK="!DYNAMIC_FTRACE"
-
-pkg_setup() {
-	CONFIG_CHECK="~NET_SCHED"
-	CONFIG_CHECK="~IPW2200_PROMISCUOUS"
-	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."
-
-	#these things are not optional
-	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_ !"
-	linux_chkconfig_module LIBIPW || ewarn "CONFIG_LIBIPW really should be set or there will be no WEXT compat"
-
-	if use compat_drivers_wifi_b43; then
-		linux_chkconfig_module SSB || die "You need to enable CONFIG_SSB or USE=-b43"
-	fi
-	if use compat_drivers_wifi_b44; then
-		linux_chkconfig_module SSB || die "You need to enable CONFIG_SSB or USE=-b44"
-	fi
-}
-
-src_prepare() {
-	use pax_kernel && epatch "${FILESDIR}"/${P}-grsec.patch
-	use pax_kernel && epatch "${FILESDIR}"/${P}-grsec-warnings.patch
-
-	#mcgrof said prep for inclusion in compat-wireless.git but this causes issues
-	#find "${S}" -name Makefile | xargs sed -i -e 's/export CONFIG_/export CONFIG_COMPAT_/' -e 's/COMPAT_COMPAT_/COMPAT_/' -e 's/CONFIG_COMPAT_CHECK/CONFIG_CHECK/'
-	#sed -i -e 's/export CONFIG_/export CONFIG_COMPAT_/' -e 's/COMPAT_COMPAT_/COMPAT_/' "${S}"/config.mk
-
-	# CONFIG_CFG80211_REG_DEBUG=y
-	sed -i '/CFG80211_REG_DEBUG/s/^# *//' "${S}"/config.mk
-
-	#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."
-		epatch "${FILESDIR}"/ath_regd_optional.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}"/ipw2200-inject.3.4.6.patch
-	fi
-	if use noleds; then
-		sed -ir 's/^\(export CONFIG_.*_LEDS=\)y$/\1n/' config.mk
-		epatch "${FILESDIR}/leds-disable-strict-${PV}.patch"
-	fi
-	use debug-driver && sed -i '/DEBUG=y/s/^# *//' "${S}"/config.mk
-	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
-
-	#avoid annoying ACCESS DENIED sandbox errors
-	sed -i "s/\${MAKE} -C \${KLIB_BUILD} kernelversion/echo ${KV_FULL}/g" compat/scripts/gen-compat-config.sh || die "sed failed"
-	sed -i "s/shell \$(MAKE) -C \$(KLIB_BUILD) kernelversion/echo ${KV_FULL}/g" config.mk || die "sed failed"
-	sed -i "s/make -C \$KLIB_BUILD kernelversion/echo ${KV_FULL}/g" scripts/gen-compat-autoconf.sh || die "sed failed"
-}
-
-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}"
-	done
-	dosbin scripts/athenable scripts/b43load scripts/iwl-enable \
-		scripts/madwifi-unload scripts/athload scripts/iwl-load \
-		scripts/b43enable scripts/unload.sh
-
-	dodir /usr/lib/compat-wireless
-	exeinto /usr/lib/compat-wireless
-	doexe scripts/modlib.sh
-
-	dodoc README.md
-	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
-
-	if use !livecd; then
-		if use loadmodules; then
-			einfo "Attempting to unload modules..."
-			/usr/sbin/unload.sh 2>&1 | grep -E FATAL && ewarn "Unable to remove running modules, system may be unhappy, reboot HIGHLY recommended!"
-			einfo "Triggering automatic reload of needed modules..."
-			/sbin/udevadm trigger
-			einfo "We have attempted to load your new modules for you, this may fail horribly, or may just cause a network hiccup."
-			einfo "If you experience any issues reboot is the simplest course of action."
-		fi
-	fi
-	if use !loadmodules; then
-		einfo "You didn't USE=loadmodules but you can still attempt to switch to the new drivers without reboot."
-		einfo "Run 'unload.sh' then 'udevadm trigger' to cause udev to load the	needed drivers."
-		einfo "If unload.sh fails for some reason you should be able to simply reboot to fix everything and load the new modules."
-	fi
-}
-
-pkg_postrm() {
-	remove_moduledb
-}
diff --git a/sys-kernel/compat-drivers/compat-drivers-3.7_rc1_p6.ebuild b/sys-kernel/compat-drivers/compat-drivers-3.7_rc1_p6.ebuild
deleted file mode 100644
index 1b6937910..000000000
--- a/sys-kernel/compat-drivers/compat-drivers-3.7_rc1_p6.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-inherit linux-mod linux-info versionator eutils
-
-# upstream versioning, ex.: 3.7-rc1-6
-UPSTREAM_PVR="${PV//_/-}" && UPSTREAM_PVR="${UPSTREAM_PVR/-p/-}"
-# ex.: 3.7-rc1
-UPSTREAM_PV=${UPSTREAM_PVR%-*}
-
-DESCRIPTION="Stable kernel pre-release wifi subsystem backport"
-HOMEPAGE="http://backports.wiki.kernel.org"
-# SRC_URI="http://www.kernel.org/pub/linux/kernel/projects/backports/stable/v${UPSTREAM_PV}/${PN}-${UPSTREAM_PVR}.tar.gz"
-SRC_URI="mirror://kernel/linux/kernel/projects/backports/stable/v${UPSTREAM_PV}/${PN}-${UPSTREAM_PVR}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+alx +ath9k_htc atheros_obey_crda bluetooth b43 b44 debugfs debug-driver full-debug injection livecd loadmodules noleds pax_kernel"
-
-DEPEND="!net-wireless/compat-wireless-builder
-	!net-wireless/compat-wireless"
-RDEPEND="${DEPEND}
-	>=sys-kernel/linux-firmware-20110219
-	virtual/udev"
-
-S="${WORKDIR}/${PN}-${UPSTREAM_PVR}"
-
-RESTRICT="strip"
-
-CONFIG_CHECK="!DYNAMIC_FTRACE"
-
-pkg_setup() {
-	CONFIG_CHECK="~NET_SCHED"
-	CONFIG_CHECK="~IPW2200_PROMISCUOUS"
-	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."
-
-	#these things are not optional
-	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_ !"
-	linux_chkconfig_module LIBIPW || ewarn "CONFIG_LIBIPW really should be set or there will be no WEXT compat"
-
-	if use b43; then
-		linux_chkconfig_module SSB || die "You need to enable CONFIG_SSB or USE=-b43"
-	fi
-	if use b44; then
-		linux_chkconfig_module SSB || die "You need to enable CONFIG_SSB or USE=-b44"
-	fi
-}
-
-src_prepare() {
-	use pax_kernel && epatch "${FILESDIR}"/${P}-grsec.patch
-	use pax_kernel && epatch "${FILESDIR}"/${P}-grsec-warnings.patch
-
-	#mcgrof said prep for inclusion in compat-wireless.git but this causes issues
-	#find "${S}" -name Makefile | xargs sed -i -e 's/export CONFIG_/export CONFIG_COMPAT_/' -e 's/COMPAT_COMPAT_/COMPAT_/' -e 's/CONFIG_COMPAT_CHECK/CONFIG_CHECK/'
-	#sed -i -e 's/export CONFIG_/export CONFIG_COMPAT_/' -e 's/COMPAT_COMPAT_/COMPAT_/' "${S}"/config.mk
-
-	# CONFIG_CFG80211_REG_DEBUG=y
-	sed -i '/CFG80211_REG_DEBUG/s/^# *//' "${S}"/config.mk
-
-	#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."
-		epatch "${FILESDIR}"/ath_regd_optional.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}"/ipw2200-inject.3.4.6.patch
-	fi
-	if use noleds; then
-		sed -ir 's/^\(export CONFIG_.*_LEDS=\)y$/\1n/' config.mk
-		epatch "${FILESDIR}/leds-disable-strict-${PV}.patch"
-	fi
-	use debug-driver && sed -i '/DEBUG=y/s/^# *//' "${S}"/config.mk
-	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
-#	Disable B44 ethernet driver
-	if ! use b44; then
-		sed -i '/B44=/s/ */#/' "${S}"/config.mk || die "unable to disable B44 driver"
-		sed -i '/B44_PCI=/s/ */#/' "${S}"/config.mk || die "unable to disable B44 driver"
-	fi
-
-#	Disable B43 driver
-	if ! use b43; then
-		sed -i '/B43=/s/ */#/' "${S}"/config.mk || die "unable to disable B43 driver"
-		sed -i '/B43_PCI_AUTOSELECT=/s/ */#/' "${S}"/config.mk || die "unable to disable B43 driver"
-	#CONFIG_B43LEGACY=
-	fi
-
-#	fixme: there are more bluethooth settings in the config.mk
-	if ! use bluetooth; then
-		sed -i '/COMPAT_BLUETOOTH=/s/ */#/' "${S}"/config.mk || die "unable to disable bluetooth driver"
-		sed -i '/COMPAT_BLUETOOTH_MODULES=/s/ */#/' "${S}"/config.mk || die "unable to bluetooth B44 driver"
-	fi
-
-	#enable alx atheros ethernet driver
-	if use alx; then
-		sed -i 's/ALX=n/ALX=m/' "${S}"/config.mk || die "Failed to enable Atheros ALX driver"
-	else
-		sed -i 's/ALX=m/ALX=n/' "${S}"/config.mk || die "Failed to disable Atheros ALX driver"
-	fi
-
-	if use ath9k_htc; then
-		sed -i 's/ATH9K_HTC=n/ATH9K_HTC=m/' "${S}"/config.mk || die "Failed to enable Atheros 9k htc driver"
-	else
-		sed -i 's/ATH9K_HTC=m/ATH9K_HTC=n/' "${S}"/config.mk || die "Failed to disable Atheros 9k htc driver"
-	fi
-
-	#avoid annoying ACCESS DENIED sandbox errors
-	sed -i "s/\${MAKE} -C \${KLIB_BUILD} kernelversion/echo ${KV_FULL}/g" compat/scripts/gen-compat-config.sh || die "sed failed"
-	sed -i "s/shell \$(MAKE) -C \$(KLIB_BUILD) kernelversion/echo ${KV_FULL}/g" config.mk || die "sed failed"
-	sed -i "s/make -C \$KLIB_BUILD kernelversion/echo ${KV_FULL}/g" scripts/gen-compat-autoconf.sh || die "sed failed"
-}
-
-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}"
-	done
-	dosbin scripts/athenable scripts/b43load scripts/iwl-enable \
-		scripts/madwifi-unload scripts/athload scripts/iwl-load \
-		scripts/b43enable scripts/unload.sh
-
-	dodir /usr/lib/compat-wireless
-	exeinto /usr/lib/compat-wireless
-	doexe scripts/modlib.sh
-
-	dodoc README.md
-	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
-
-	if use !livecd; then
-		if use loadmodules; then
-			einfo "Attempting to unload modules..."
-			/usr/sbin/unload.sh 2>&1 | grep -E FATAL && ewarn "Unable to remove running modules, system may be unhappy, reboot HIGHLY recommended!"
-			einfo "Triggering automatic reload of needed modules..."
-			/sbin/udevadm trigger
-			einfo "We have attempted to load your new modules for you, this may fail horribly, or may just cause a network hiccup."
-			einfo "If you experience any issues reboot is the simplest course of action."
-		fi
-	fi
-	if use !loadmodules; then
-		einfo "You didn't USE=loadmodules but you can still attempt to switch to the new drivers without reboot."
-		einfo "Run 'unload.sh' then 'udevadm trigger' to cause udev to load the	needed drivers."
-		einfo "If unload.sh fails for some reason you should be able to simply reboot to fix everything and load the new modules."
-	fi
-}
-
-pkg_postrm() {
-	remove_moduledb
-}
diff --git a/sys-kernel/compat-drivers/compat-drivers-3.8.ebuild b/sys-kernel/compat-drivers/compat-drivers-3.8-r1.ebuild
similarity index 98%
rename from sys-kernel/compat-drivers/compat-drivers-3.8.ebuild
rename to sys-kernel/compat-drivers/compat-drivers-3.8-r1.ebuild
index ab7c1a96f..6beb14233 100644
--- a/sys-kernel/compat-drivers/compat-drivers-3.8.ebuild
+++ b/sys-kernel/compat-drivers/compat-drivers-3.8-r1.ebuild
@@ -146,6 +146,9 @@ src_install() {
 	doins udev/50-compat_firmware.rules
 	exeinto /$(get_libdir)/udev/
 	doexe udev/compat_firmware.sh
+
+	exeinto /etc/local.d
+	doexe "${FILESDIR}"/00-compat-drivers.start
 }
 
 pkg_postinst() {
diff --git a/sys-kernel/compat-drivers/compat-drivers-3.8_rc5.ebuild b/sys-kernel/compat-drivers/compat-drivers-3.8_rc5.ebuild
deleted file mode 100644
index 710ad2b83..000000000
--- a/sys-kernel/compat-drivers/compat-drivers-3.8_rc5.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-# USE_EXPAND categories
-CPD_USE_EXPAND="wifi ethernet various"
-# These are officially supported
-CPD_USE_EXPAND_wifi="ath5k ath9k ath9k_ap ath9k_htc ath6kl b43 brcmsmac brcmfmac carl9170 rt2x00 wl1251 wl12xx zd1211rw"
-# This might work (not officially supported)
-CPD_USE_EXPAND_wifi+=" wl18xx"
-# This might work (added by pentoo)
-CPD_USE_EXPAND_wifi+=" b44"
-
-# These are officially supported
-CPD_USE_EXPAND_ethernet="atl1 atl1c atl1e atl2"
-# This might work (not officially supported)
-CPD_USE_EXPAND_ethernet+=" atlxx"
-
-# These are officially supported
-CPD_USE_EXPAND_various="i915"
-# This might work (not officially supported)
-CPD_USE_EXPAND_various+=" bt drm"
-# This might work (added by pentoo)
-CPD_USE_EXPAND_various+=" staging usbnet"
-
-inherit linux-mod linux-info versionator eutils compat-drivers-3.7
-
-# upstream versioning, ex.: 3.7-rc1-6
-UPSTREAM_PVR="${PV//_/-}" && UPSTREAM_PVR="${UPSTREAM_PVR/-p/-}"
-# ex.: 3.7-rc1
-UPSTREAM_PV=${UPSTREAM_PVR%-*}
-
-DESCRIPTION="Stable kernel pre-release wifi subsystem backport"
-HOMEPAGE="http://backports.wiki.kernel.org"
-SRC_URI="mirror://kernel/linux/kernel/projects/backports/stable/v${UPSTREAM_PVR}/${PN}-${UPSTREAM_PVR}-1-u.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-
-IUSE="atheros_obey_crda debugfs debug-driver full-debug injection livecd loadmodules noleds pax_kernel"
-
-DEPEND="!net-wireless/compat-wireless-builder
-	!net-wireless/compat-wireless"
-RDEPEND="${DEPEND}
-	>=sys-kernel/linux-firmware-20110219
-	virtual/udev"
-
-S="${WORKDIR}/${PN}-${UPSTREAM_PVR}-1-u"
-
-RESTRICT="strip"
-
-CONFIG_CHECK="!DYNAMIC_FTRACE"
-
-pkg_setup() {
-	CONFIG_CHECK="~NET_SCHED"
-	CONFIG_CHECK="~IPW2200_PROMISCUOUS"
-	linux-mod_pkg_setup
-	kernel_is -lt 2 6 27 && die "kernel 2.6.27 or higher is required for compat drivers 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 drivers you are trying to install contains older modules than your kernel. Failing before downgrading your system."
-
-	#these things are not optional
-	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_ !"
-	linux_chkconfig_module LIBIPW || ewarn "CONFIG_LIBIPW really should be set or there will be no WEXT compat"
-
-	if use compat_drivers_wifi_b43; then
-		linux_chkconfig_module SSB || die "You need to enable CONFIG_SSB or USE=-b43"
-	fi
-	if use compat_drivers_wifi_b44; then
-		linux_chkconfig_module SSB || die "You need to enable CONFIG_SSB or USE=-b44"
-	fi
-}
-
-src_prepare() {
-	use pax_kernel && epatch "${FILESDIR}"/${PN}-3.7_rc1_p6-grsec.patch
-	use pax_kernel && epatch "${FILESDIR}"/${PN}-3.7_rc1_p6-grsec-warnings.patch
-
-	#mcgrof said prep for inclusion in compat-wireless.git but this causes issues
-	#find "${S}" -name Makefile | xargs sed -i -e 's/export CONFIG_/export CONFIG_COMPAT_/' -e 's/COMPAT_COMPAT_/COMPAT_/' -e 's/CONFIG_COMPAT_CHECK/CONFIG_CHECK/'
-	#sed -i -e 's/export CONFIG_/export CONFIG_COMPAT_/' -e 's/COMPAT_COMPAT_/COMPAT_/' "${S}"/config.mk
-
-	# CONFIG_CFG80211_REG_DEBUG=y
-	sed -i '/CFG80211_REG_DEBUG/s/^# *//' "${S}"/config.mk
-
-	#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."
-		epatch "${FILESDIR}"/ath_regd_optional.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}"/ipw2200-inject.3.4.6.patch
-	fi
-	if use noleds; then
-		sed -ir 's/^\(export CONFIG_.*_LEDS=\)y$/\1n/' config.mk
-		epatch "${FILESDIR}/leds-disable-strict-${PV}.patch"
-	fi
-	use debug-driver && sed -i '/DEBUG=y/s/^# *//' "${S}"/config.mk
-	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
-
-	#avoid annoying ACCESS DENIED sandbox errors
-	sed -i "s/\${MAKE} -C \${KLIB_BUILD} kernelversion/echo ${KV_FULL}/g" compat/scripts/gen-compat-config.sh || die "sed failed"
-	sed -i "s/shell \$(MAKE) -C \$(KLIB_BUILD) kernelversion/echo ${KV_FULL}/g" config.mk || die "sed failed"
-	sed -i "s/make -C \$KLIB_BUILD kernelversion/echo ${KV_FULL}/g" scripts/gen-compat-autoconf.sh || die "sed failed"
-}
-
-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}"
-	done
-	dosbin scripts/athenable scripts/b43load scripts/iwl-enable \
-		scripts/madwifi-unload scripts/athload scripts/iwl-load \
-		scripts/b43enable scripts/unload.sh
-
-	dodir /usr/lib/compat-wireless
-	exeinto /usr/lib/compat-wireless
-	doexe scripts/modlib.sh
-
-	dodoc README.md
-	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
-
-	if use !livecd; then
-		if use loadmodules; then
-			einfo "Attempting to unload modules..."
-			/usr/sbin/unload.sh 2>&1 | grep -E FATAL && ewarn "Unable to remove running modules, system may be unhappy, reboot HIGHLY recommended!"
-			einfo "Triggering automatic reload of needed modules..."
-			/sbin/udevadm trigger
-			einfo "We have attempted to load your new modules for you, this may fail horribly, or may just cause a network hiccup."
-			einfo "If you experience any issues reboot is the simplest course of action."
-		fi
-	fi
-	if use !loadmodules; then
-		einfo "You didn't USE=loadmodules but you can still attempt to switch to the new drivers without reboot."
-		einfo "Run 'unload.sh' then 'udevadm trigger' to cause udev to load the	needed drivers."
-		einfo "If unload.sh fails for some reason you should be able to simply reboot to fix everything and load the new modules."
-	fi
-}
-
-pkg_postrm() {
-	remove_moduledb
-}
diff --git a/sys-kernel/compat-drivers/compat-drivers-3.8_rc7.ebuild b/sys-kernel/compat-drivers/compat-drivers-3.8_rc7.ebuild
deleted file mode 100644
index 480599589..000000000
--- a/sys-kernel/compat-drivers/compat-drivers-3.8_rc7.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-# USE_EXPAND categories
-CPD_USE_EXPAND="wifi ethernet various"
-# These are officially supported
-CPD_USE_EXPAND_wifi="ath5k ath9k ath9k_ap ath9k_htc ath6kl b43 brcmsmac brcmfmac carl9170 rt2x00 wil6210 wl1251 wl12xx zd1211rw"
-# This might work (not officially supported)
-CPD_USE_EXPAND_wifi+=" wl18xx"
-# This might work (added by pentoo)
-CPD_USE_EXPAND_wifi+=" b44"
-
-# These are officially supported
-CPD_USE_EXPAND_ethernet="alx atl1 atl1c atl1e atl2"
-# This might work (not officially supported)
-CPD_USE_EXPAND_ethernet+=" atlxx"
-
-# These are officially supported
-CPD_USE_EXPAND_various="i915"
-# This might work (not officially supported)
-CPD_USE_EXPAND_various+=" bt drm"
-# This might work (added by pentoo)
-CPD_USE_EXPAND_various+=" staging usbnet"
-
-inherit linux-mod linux-info versionator eutils compat-drivers-3.8
-
-# upstream versioning, ex.: 3.7-rc1-6
-UPSTREAM_PVR="${PV//_/-}" && UPSTREAM_PVR="${UPSTREAM_PVR/-p/-}"
-# ex.: 3.7-rc1
-UPSTREAM_PV=${UPSTREAM_PVR%-*}
-
-DESCRIPTION="Stable kernel pre-release wifi subsystem backport"
-HOMEPAGE="http://backports.wiki.kernel.org"
-SRC_URI="mirror://kernel/linux/kernel/projects/backports/stable/v${UPSTREAM_PVR}/${PN}-${UPSTREAM_PVR}-1-u.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-
-IUSE="atheros_obey_crda debugfs debug-driver full-debug injection livecd loadmodules noleds pax_kernel"
-
-DEPEND="!net-wireless/compat-wireless-builder
-	!net-wireless/compat-wireless"
-RDEPEND="${DEPEND}
-	>=sys-kernel/linux-firmware-20110219
-	virtual/udev"
-
-S="${WORKDIR}/${PN}-${UPSTREAM_PVR}-1-u"
-
-RESTRICT="strip"
-
-CONFIG_CHECK="!DYNAMIC_FTRACE"
-
-pkg_setup() {
-	CONFIG_CHECK="~NET_SCHED"
-	CONFIG_CHECK="~IPW2200_PROMISCUOUS"
-	linux-mod_pkg_setup
-	kernel_is -lt 2 6 27 && die "kernel 2.6.27 or higher is required for compat drivers 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 drivers you are trying to install contains older modules than your kernel. Failing before downgrading your system."
-
-	#these things are not optional
-	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_ !"
-	linux_chkconfig_module LIBIPW || ewarn "CONFIG_LIBIPW really should be set or there will be no WEXT compat"
-
-	if use compat_drivers_wifi_b43; then
-		linux_chkconfig_module SSB || die "You need to enable CONFIG_SSB or USE=-b43"
-	fi
-	if use compat_drivers_wifi_b44; then
-		linux_chkconfig_module SSB || die "You need to enable CONFIG_SSB or USE=-b44"
-	fi
-}
-
-src_prepare() {
-	# use pax_kernel && epatch "${FILESDIR}"/${PN}-3.7_rc1_p6-grsec.patch
-	# use pax_kernel && epatch "${FILESDIR}"/${PN}-3.8-grsec-readonly.patch
-	if use pax_kernel; then
-		for gpatch in "${FILESDIR}"/3.8-grsec/*; do
-			epatch "${gpatch}"
-		done
-	fi
-	# upstream might want to see this
-	use pax_kernel && epatch "${FILESDIR}"/${PN}-3.8-bt_tty.patch
-	# use pax_kernel && epatch "${FILESDIR}"/${PN}-3.7_rc1_p6-grsec-warnings.patch
-
-	#mcgrof said prep for inclusion in compat-wireless.git but this causes issues
-	#find "${S}" -name Makefile | xargs sed -i -e 's/export CONFIG_/export CONFIG_COMPAT_/' -e 's/COMPAT_COMPAT_/COMPAT_/' -e 's/CONFIG_COMPAT_CHECK/CONFIG_CHECK/'
-	#sed -i -e 's/export CONFIG_/export CONFIG_COMPAT_/' -e 's/COMPAT_COMPAT_/COMPAT_/' "${S}"/config.mk
-
-	# CONFIG_CFG80211_REG_DEBUG=y
-	sed -i '/CFG80211_REG_DEBUG/s/^# *//' "${S}"/config.mk
-
-	#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."
-		epatch "${FILESDIR}"/ath_regd_optional.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}"/ipw2200-inject.3.4.6.patch
-	fi
-	if use noleds; then
-		sed -ir 's/^\(export CONFIG_.*_LEDS=\)y$/\1n/' config.mk
-		epatch "${FILESDIR}/leds-disable-strict-${PV}.patch"
-	fi
-	use debug-driver && sed -i '/DEBUG=y/s/^# *//' "${S}"/config.mk
-	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
-
-	#avoid annoying ACCESS DENIED sandbox errors
-	sed -i "s/\${MAKE} -C \${KLIB_BUILD} kernelversion/echo ${KV_FULL}/g" compat/scripts/gen-compat-config.sh || die "sed failed"
-	sed -i "s/shell \$(MAKE) -C \$(KLIB_BUILD) kernelversion/echo ${KV_FULL}/g" config.mk || die "sed failed"
-	sed -i "s/make -C \$KLIB_BUILD kernelversion/echo ${KV_FULL}/g" scripts/gen-compat-autoconf.sh || die "sed failed"
-}
-
-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}"
-	done
-	dosbin scripts/athenable scripts/b43load scripts/iwl-enable \
-		scripts/madwifi-unload scripts/athload scripts/iwl-load \
-		scripts/b43enable scripts/unload.sh
-
-	dodir /usr/lib/compat-wireless
-	exeinto /usr/lib/compat-wireless
-	doexe scripts/modlib.sh
-
-	dodoc README.md
-	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
-
-	if use !livecd; then
-		if use loadmodules; then
-			einfo "Attempting to unload modules..."
-			/usr/sbin/unload.sh 2>&1 | grep -E FATAL && ewarn "Unable to remove running modules, system may be unhappy, reboot HIGHLY recommended!"
-			einfo "Triggering automatic reload of needed modules..."
-			/sbin/udevadm trigger
-			einfo "We have attempted to load your new modules for you, this may fail horribly, or may just cause a network hiccup."
-			einfo "If you experience any issues reboot is the simplest course of action."
-		fi
-	fi
-	if use !loadmodules; then
-		einfo "You didn't USE=loadmodules but you can still attempt to switch to the new drivers without reboot."
-		einfo "Run 'unload.sh' then 'udevadm trigger' to cause udev to load the	needed drivers."
-		einfo "If unload.sh fails for some reason you should be able to simply reboot to fix everything and load the new modules."
-	fi
-}
-
-pkg_postrm() {
-	remove_moduledb
-}
diff --git a/pentoo/pentoo/files/00-compat-drivers.start b/sys-kernel/compat-drivers/files/00-compat-drivers.start
similarity index 100%
rename from pentoo/pentoo/files/00-compat-drivers.start
rename to sys-kernel/compat-drivers/files/00-compat-drivers.start