156 files changed, 4951 insertions, 0 deletions
diff --git a/sys-firmware/alsa-firmware/Manifest b/sys-firmware/alsa-firmware/Manifest
new file mode 100644
index 000000000000..668a8f1958c1
--- /dev/null
+++ b/sys-firmware/alsa-firmware/Manifest
@@ -0,0 +1,6 @@
+AUX 52-usx2yaudio.rules 971 SHA256 a25a327b2c491d0d1464bdf282d99cee29d6c687b3bbc60a06bb40219d7d7e71 SHA512 5c3ac0e03a496384ea58f6da479c932cb2d2f91f110703d71d0bea60329ebfba8a1a0e78eb951c9854b7fe0dcc9943d10f436fe9acd04848ea780e90ac274f17 WHIRLPOOL bede72d2effef3296213ab55cdc007b1126f5c2138ab041568524033a3b4ab1b96f55da294cb478d3ba9a8d5c249e42d6f366ee7d6675a9e05a0413d188f1d13
+DIST alsa-firmware-1.0.29.tar.bz2 4996942 SHA256 3c5ef17959e58831504d3a25e76d0a428bd9c52ebd330e06b07232ab8af4cc3d SHA512 f4307c33fb6f401c86e88b82878b8300447ac97bbbe06e83bd69a38cbdd7b4a0ba6faa4f20081f11167805de65c66b7db643483f8669eae3284bc1c4da8d44a4 WHIRLPOOL de590d136646050dd54c3ab35b16b1a87113a71bfc83c55dbc8ddc0f2a5fbbe6530a7ac71e22f4c6cbff7c1a0f0510fdd668aa324aefa3d022cd60fa81c28c44
+EBUILD alsa-firmware-1.0.29.ebuild 2751 SHA256 9231932baa254dbc59168120d43cadf5feb97cad92079ddf28ce4dba293c447d SHA512 006285d0971fea44adea2a31f197459b7ba0f077c8c8b6fcc09a0c83402ed2359d31722d41623187883a620034b7ef06ac517fe972166612d672d352d5e57d89 WHIRLPOOL f34644f0a9c66aa21083e7872fd45a05fb501d554f3f1eeeea3fe7255de03a50d2926a9396add8170c05564fd6350b63e94be85839a9d7abd9d7cfa142d1091a
+MISC ChangeLog 2547 SHA256 45cf25611cc9518171db090772423522d97a16d770a8509ada41cebb782ec586 SHA512 45851678ae260c64fc08adfbf509ae8d8f99784281c16c4d8b59d5f91fa9f4b988a6a8aacdb595f347f2ecfb4775380b370cf6e6a0faf04f3895cbc36efe5d20 WHIRLPOOL 2b94bf298d30e3f8982c9bd95c6677c9ba6807ec6a52837029df2795dc9d8b72c3452f6ce1e52b3302f3f136d2940813854a117e2f69430edb6b5a2814bd56d0
+MISC ChangeLog-2015 17817 SHA256 2e59f7e9c3c7e81602d5b9d43581b5dae5a1b0e7fb29a03a9f2c903a2ef8f6e5 SHA512 29b30c69d8028019442d6402336acdc55f14dbc2a15fd8e694f0a1a2df9098cdb866663c4162de4dded2f34dc736b6e7bdb3e2bc405a3d242091980731f6553e WHIRLPOOL d5035163376df9214201d5c3e7ece9585707e511a287a1dd83bf192eef6768c8247fab88e1221ec8d59bff734a3f124b6157a20b00c463f3eb01f42358bebb9e
+MISC metadata.xml 217 SHA256 06f010159a0979ca1947643ed7d912eab4068b37bf5f940e035ac38cb999faf7 SHA512 783364e33af22e28ba41661e2380968c95f6464ae9ebb300d542ca159a54c4e53cf5e8b1053a72e75902f433e90fa26f6456fa127fca6daa44542bda57779e5a WHIRLPOOL 8e6e624617d6f919569fd0045631be7905c5c755d67188953f376623c5c18246f5db3fbb49f06c08e292bc15dbe08b231c7d9ed20bcd2f382d8f50adc1b7b854
diff --git a/sys-firmware/alsa-firmware/alsa-firmware-1.0.29.ebuild b/sys-firmware/alsa-firmware/alsa-firmware-1.0.29.ebuild
new file mode 100644
index 000000000000..d82497ef0d54
--- /dev/null
+++ b/sys-firmware/alsa-firmware/alsa-firmware-1.0.29.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit udev
+
+DESCRIPTION="Advanced Linux Sound Architecture firmware"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/firmware/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+ECHOAUDIO_CARDS="alsa_cards_darla20 alsa_cards_gina20 alsa_cards_layla20
+alsa_cards_darla24 alsa_cards_gina24 alsa_cards_layla24 alsa_cards_mona
+alsa_cards_mia alsa_cards_indigo alsa_cards_indigoio alsa_cards_echo3g"
+
+EMU_CARDS="alsa_cards_emu1212 alsa_cards_emu1616 alsa_cards_emu1820
+alsa_cards_emu10k1"
+
+IUSE="alsa_cards_cs46xx alsa_cards_pcxhr alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_hdsp
+alsa_cards_hdspm alsa_cards_mixart alsa_cards_asihpi alsa_cards_sb16
+alsa_cards_korg1212 alsa_cards_maestro3 alsa_cards_ymfpci alsa_cards_wavefront
+alsa_cards_msnd-pinnacle alsa_cards_aica alsa_cards_ca0132 ${ECHOAUDIO_CARDS}
+${EMU_CARDS}"
+
+RDEPEND="alsa_cards_usb-usx2y? ( sys-apps/fxload )
+	alsa_cards_hdsp? ( media-sound/alsa-tools )
+	alsa_cards_hdspm? ( media-sound/alsa-tools )"
+
+DOCS="README"
+
+src_configure() {
+	econf --with-hotplug-dir=/lib/firmware
+}
+
+src_install() {
+	default
+
+	use alsa_cards_pcxhr || rm -rf "${ED}"/usr/share/alsa/firmware/pcxhrloader "${ED}"/lib/firmware/pcxhr
+	use alsa_cards_vx222 || rm -rf "${ED}"/usr/share/alsa/firmware/vxloader "${ED}"/lib/firmware/vx
+	use alsa_cards_usb-usx2y || rm -rf "${ED}"/usr/share/alsa/firmware/usx2yloader "${ED}"/lib/firmware/vx
+	use alsa_cards_mixart || rm -rf "${ED}"/usr/share/alsa/firmware/mixartloader "${ED}"/lib/firmware/mixart
+	use alsa_cards_hdsp || use alsa_cards_hdspm || rm -rf "${ED}"/usr/share/alsa/firmware/hdsploader
+	use alsa_cards_asihpi || rm -rf "${ED}"/lib/firmware/asihpi
+	use alsa_cards_sb16 || rm -rf "${ED}"/lib/firmware/sb16
+	use alsa_cards_korg1212 || rm -rf "${ED}"/lib/firmware/korg
+	use alsa_cards_maestro3 || rm -rf "${ED}"/lib/firmware/ess
+	use alsa_cards_ymfpci || rm -rf "${ED}"/lib/firmware/yamaha
+	use alsa_cards_wavefront || rm -rf "${ED}"/lib/firmware/wavefront
+	use alsa_cards_msnd-pinnacle || rm -rf "${ED}"/lib/firmware/turtlebeach
+	use alsa_cards_aica || rm -rf "${ED}"/lib/firmware/aica_firmware.bin
+	use alsa_cards_ca0132 || rm -rf "${ED}"/lib/firmware/c{tefx,tspeq}.bin
+	use alsa_cards_cs46xx || rm -rf "${ED}"/lib/firmware/cs46xx
+
+	local ea="no"
+	for card in ${ECHOAUDIO_CARDS}; do
+		use ${card} && ea="yes" && break
+	done
+
+	local emu="no"
+	for card in ${EMU_CARDS}; do
+		use ${card} && emu="yes" && break
+	done
+
+	[[ ${ea} == "no" ]] && rm -rf "${ED}"/lib/firmware/ea
+	[[ ${emu} == "no" ]] && rm -rf "${ED}"/lib/firmware/emu
+
+	use alsa_cards_usb-usx2y && udev_dorules "${FILESDIR}"/52-usx2yaudio.rules
+}
diff --git a/sys-firmware/alsa-firmware/files/52-usx2yaudio.rules b/sys-firmware/alsa-firmware/files/52-usx2yaudio.rules
new file mode 100644
index 000000000000..988de4d36c4e
--- /dev/null
+++ b/sys-firmware/alsa-firmware/files/52-usx2yaudio.rules
@@ -0,0 +1,7 @@
+# Load firmware via fxload
+
+SUBSYSTEM=="usb_device", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="800[157]", RUN+="/usr/bin/usx2yloader"
+SUBSYSTEM=="usb_device", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="800[15]", RUN+="/sbin/startproc /usr/bin/us428control"
+SUBSYSTEM=="usb_device", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8000", RUN+="/sbin/fxload -s /usr/share/alsa/firmware/usx2yloader/tascam_loader.ihx -I /usr/share/alsa/firmware/usx2yloader/us428fw.ihx -D %N"
+SUBSYSTEM=="usb_device", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8004", RUN+="/sbin/fxload -s /usr/share/alsa/firmware/usx2yloader/tascam_loader.ihx -I /usr/share/alsa/firmware/usx2yloader/us224fw.ihx -D %N"
+SUBSYSTEM=="usb_device", ACTION=="add", ATTRS{idVendor}=="1604", ATTRS{idProduct}=="8006", RUN+="/sbin/fxload -s /usr/share/alsa/firmware/usx2yloader/tascam_loader.ihx -I /usr/share/alsa/firmware/usx2yloader/us122fw.ihx -D %N"
diff --git a/sys-firmware/alsa-firmware/metadata.xml b/sys-firmware/alsa-firmware/metadata.xml
new file mode 100644
index 000000000000..2639ae5448e7
--- /dev/null
+++ b/sys-firmware/alsa-firmware/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>alsa-bugs@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/sys-firmware/atmel-firmware/Manifest b/sys-firmware/atmel-firmware/Manifest
new file mode 100644
index 000000000000..6291a686b191
--- /dev/null
+++ b/sys-firmware/atmel-firmware/Manifest
@@ -0,0 +1,5 @@
+DIST atmel-firmware-1.3.tar.gz 470254 SHA256 f53160b0b4a824754957d8488f1eba68d3c6379d48c563464bd3924e7be19b3d SHA512 e87767008d3fe08a7e997b629a11589c00f46ca375639dd0b06c48b2de831a7df666c895888026eff03b7ee81a7594349fd550c4943b088ce26fb57f660ce89b WHIRLPOOL 7341df8c9b646f29a1689701ba0d4d26c888c51acaa9c5136799e90d6d6e7f88eb13afcc8b2a4ac59f62a8ea5528d14e2d6eaa27df0761b1484f102996293f7c
+EBUILD atmel-firmware-1.3-r1.ebuild 1172 SHA256 81536963c6ed4f4d33246697c49953c17d273d1f23ee37eb16e76f2c6035b319 SHA512 a1080d92be6c4a1f122222bc705faf74bb5a70a07a4ffcbd3274650cb0c5c3811baae8b3d44ac7c89b947682dc51ae51ddb9d7079d23ba1f49595bb81965bb2a WHIRLPOOL e70a53c9afde4b96ddbaa35891c7eb87c7c40bb132eaf162e18942fdb94d81dec243feb333e5b8c941e646351b11768f60b3111526b0df67b1ffd6ba3fbb5bc6
+MISC ChangeLog 2549 SHA256 46728e9656282f4a6d18d6a9b858b975753d1de051091862996579150215a82c SHA512 1bac5140448f06f48ca2c179fd33eaeece0331a9ca35a0da93914b314f0a1ba080139185ce60d200dd3e0ecdb4c2cf71d3aca07b916fe2711ea7408bdc9affbb WHIRLPOOL 79890fe79ec6206ed727400340960c7cfae17b16c59667ecd2ff50e48164e5353475c93ec5098758ce8af5a5e0008f24351b2286cf5c6cae771aac15edf0fdbe
+MISC ChangeLog-2015 2583 SHA256 4e21396dc4866e3a7970861c1fbf076e1445ab3d250a5ae290db176a4debc81d SHA512 38342fee5686e7d1c0f75959f2b926fa5760beb003d559a9baf5b881353cbc34ff4d2f13735a8cb50f3098ebec5b7c639bcdff6ce5a534f0a8b5636557fdea40 WHIRLPOOL a550f312734832c56dec0c6a5830d680c87cd4bbb9973fbd3c983e8b36b8c723e8f52206642e69e14372845321e6069dc4b49754569f164c361398014f497fe9
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/sys-firmware/atmel-firmware/atmel-firmware-1.3-r1.ebuild b/sys-firmware/atmel-firmware/atmel-firmware-1.3-r1.ebuild
new file mode 100644
index 000000000000..bcd244232549
--- /dev/null
+++ b/sys-firmware/atmel-firmware/atmel-firmware-1.3-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="Firmware and config for atmel and atmel_cs wlan drivers included in linux 2.6"
+HOMEPAGE="http://www.thekelleys.org.uk/atmel/"
+SRC_URI="http://www.thekelleys.org.uk/atmel/${P}.tar.gz"
+
+LICENSE="Atmel"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="pcmcia usb"
+
+RDEPEND=">=net-wireless/wireless-tools-26-r1
+	pcmcia? ( sys-apps/pcmciautils )"
+
+src_compile() {
+	tc-export CC
+	emake atmel_fwl
+}
+
+src_install() {
+	# atmel_at76c504c-wpa.bin should be renamed to atmel_at76c504-wpa.bin, bug #398803
+	mv images/atmel_at76c504c-wpa.bin images/atmel_at76c504-wpa.bin || die
+
+	insinto /lib/firmware
+	doins images/*.bin
+
+	if use usb; then
+		doins images.usb/*.bin
+	fi
+
+	if use pcmcia; then
+		insinto /etc/pcmcia
+		doins atmel.conf
+	fi
+
+	dosbin atmel_fwl atmel_fwl.pl
+	doman atmel_fwl.8
+	dodoc README VERSION
+}
+
+pkg_postinst() {
+	if use pcmcia && [ -f /var/run/cardmgr.pid ]; then
+		kill -HUP `cat /var/run/cardmgr.pid`
+	fi
+}
+
+pkg_postrm() {
+	if use pcmcia && [ -f /var/run/cardmgr.pid ]; then
+		kill -HUP `cat /var/run/cardmgr.pid`
+	fi
+}
diff --git a/sys-firmware/atmel-firmware/metadata.xml b/sys-firmware/atmel-firmware/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/sys-firmware/atmel-firmware/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/sys-firmware/b43-firmware/Manifest b/sys-firmware/b43-firmware/Manifest
new file mode 100644
index 000000000000..a81c2afbfb5c
--- /dev/null
+++ b/sys-firmware/b43-firmware/Manifest
@@ -0,0 +1,7 @@
+DIST broadcom-wl-5.100.138.tar.bz2 13514651 SHA256 f1e7067aac5b62b67b8b6e4c517990277804339ac16065eb13c731ff909ae46f SHA512 02487e76e3eca7fe97ce2ad7dc9c5d39fac82b8d5f7786cce047f9c85e2426f5b7ea085d84c7d4aae43e0fe348d603e3229211bab601726794ef633441d37a8b WHIRLPOOL 6c6eaf7500056c5103a4fea04d2cbffcae5cfdd240f2539e2aba0d5208d869916afa64fbec896a2ffe9ffefdd6e6ff455bbc56aca3828c12a1712ff32d0f996b
+DIST broadcom-wl-6.30.163.46.tar.bz2 7684610 SHA256 a07c3b6b277833c7dbe61daa511f908cd66c5e2763eb7a0859abc36cd9335c2d SHA512 0144894fbbb5e8ebab6c423d9bd0f3249be94f2f468a50b8bf721a3b17f1f6e57467c79e87abc8d136bfc92e701ed046885fead892e9a73efa5217d710311ae9 WHIRLPOOL 9db01a2b11efc3ef8a944c79d34b32030ab046e8b5bdea2f69ff0d336cb3d2cd439c5ba947c0ab146da9289fec5945d9d5172f59cbaf549518c9c09316fe05e3
+EBUILD b43-firmware-5.100.138.ebuild 732 SHA256 04ad485f07d17bd8b8717483181f0c1ce36878ba330aeca2576ecb8fa6a4aa5c SHA512 dffab13dc9f5ae202eaefb9db00309f70b704c3a7aef4aefda487e2d84ebb6840895e96fefe597de6635efe1816c45e4af2269efc226e3dda39f2deb6bb609a2 WHIRLPOOL 5da8a2d3a7d552f592e9222d828a1d6f4d09bd890adc042d90b9d781e7a85cebb90af078d836840e68294dc9cdccae3aedbc2c68ad9e1e89e23dcd92fb55f59b
+EBUILD b43-firmware-6.30.163.46.ebuild 725 SHA256 5b5672e149a40e37eb2f78457294cfd540059e90291313b648f8d4b2494d2372 SHA512 2b1e52a97933ce1989f09712e66ed267e9befc89c922d5e0f7418f375e7c12a78e8a4e1d3d035c1eeb46f186cfa586b01eb80c31d6099038bca2892eee92247f WHIRLPOOL 2a5a5014de1a18b00535b4698387cf78b46790a255da3eeff9b65317df473d8ed94d73e306cfd18ee31bc95079365349f15a79984bff4675bd321c8664c1a341
+MISC ChangeLog 2672 SHA256 485105ca0bafd060a807b46257304287c18bf8b734a91e5665407a92d22ddfb3 SHA512 bd767350f251c6cd9643a00c2975714d9932ab6d74a4e320fe69d89295d5188feadad81980a7884aea273bdd67627a631f5a6bb5f7d97e6a37672937707029aa WHIRLPOOL b2a2626793420e86330bc0f6ade02430654705ed5f2f5e27df6d61e6400ee9f25dee165af154a3ef3d2f289570c5e7a0f223d0a6ae5c00d85472acefe3111c33
+MISC ChangeLog-2015 2250 SHA256 767342aa84f2413d3e9141894965e435b0819f729e120dded2bba1502d74e3d7 SHA512 2c1984023a1556c926bf3a8435cdf5682b595245d831e7b8f148b25203918f1e9936958dae9df739c810dacdf2b1d1211e9ec15142a844a2d2106c40cb92aa1b WHIRLPOOL ba2f0e9e713365c1b3d57df63a3fffbc462563ac9c11da4e949bf94a622f5f9d0dad0cb4ba1b3c54b7cf72b1f1c5401c7f8c92f1d67d5936c5eb27fec75edb97
+MISC metadata.xml 241 SHA256 50b9f6c8946f5d421e8feb8ffbf48238d8b8b018e315f322548b47a89d80b32c SHA512 d308ccef737c1776c2d77c0761996ef272a5866f5d9ceeda4dd4ceede851a145f76281a29b4c4b154e5b10f1d57c9344010bfcf75ba52fb3f1b34a58e3c2053f WHIRLPOOL 5436d62e0cda11ff7a49a8bc1b2c7400a58ad347709d48be3f462530bac689e9e9e6340580b5ccec717498a010c4d2f16ecd5f35ab04356858e7c540ac3b1da3
diff --git a/sys-firmware/b43-firmware/b43-firmware-5.100.138.ebuild b/sys-firmware/b43-firmware/b43-firmware-5.100.138.ebuild
new file mode 100644
index 000000000000..44f99be88b92
--- /dev/null
+++ b/sys-firmware/b43-firmware/b43-firmware-5.100.138.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+: ${B43_FIRMWARE_SRC_OBJ:=wl_apsta.o}
+
+MY_P="broadcom-wl-${PV}"
+DESCRIPTION="broadcom firmware for b43 LP PHY and >=linux-3.2"
+HOMEPAGE="http://linuxwireless.org/en/users/Drivers/b43"
+SRC_URI="http://www.lwfinger.com/b43-firmware/${MY_P}.tar.bz2"
+
+LICENSE="Broadcom"
+SLOT="b43"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+RESTRICT="mirror binchecks strip"
+
+DEPEND=">=net-wireless/b43-fwcutter-015"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	mkdir ebuild-output
+	b43-fwcutter -w ebuild-output $(find -name ${B43_FIRMWARE_SRC_OBJ}) || die
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins -r ebuild-output/* || die
+}
diff --git a/sys-firmware/b43-firmware/b43-firmware-6.30.163.46.ebuild b/sys-firmware/b43-firmware/b43-firmware-6.30.163.46.ebuild
new file mode 100644
index 000000000000..914c2d222e75
--- /dev/null
+++ b/sys-firmware/b43-firmware/b43-firmware-6.30.163.46.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+: ${B43_FIRMWARE_SRC_OBJ:=*wl_apsta.o}
+
+MY_P="broadcom-wl-${PV}"
+DESCRIPTION="broadcom firmware for b43 LP PHY and >=linux-3.2"
+HOMEPAGE="http://linuxwireless.org/en/users/Drivers/b43"
+SRC_URI="http://www.lwfinger.com/b43-firmware/${MY_P}.tar.bz2"
+
+LICENSE="Broadcom"
+SLOT="b43"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+RESTRICT="mirror binchecks strip"
+
+DEPEND=">=net-wireless/b43-fwcutter-015"
+RDEPEND=""
+
+S="${WORKDIR}"
+
+src_compile() {
+	mkdir ebuild-output
+	b43-fwcutter -w ebuild-output $(find -name ${B43_FIRMWARE_SRC_OBJ}) || die
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins -r ebuild-output/* || die
+}
diff --git a/sys-firmware/b43-firmware/metadata.xml b/sys-firmware/b43-firmware/metadata.xml
new file mode 100644
index 000000000000..0bd171786a1f
--- /dev/null
+++ b/sys-firmware/b43-firmware/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>zerochaos@gentoo.org</email>
+<name>Rick Farina</name>
+</maintainer>
+</pkgmetadata>
diff --git a/sys-firmware/b43legacy-firmware/Manifest b/sys-firmware/b43legacy-firmware/Manifest
new file mode 100644
index 000000000000..2f1f9f505852
--- /dev/null
+++ b/sys-firmware/b43legacy-firmware/Manifest
@@ -0,0 +1,5 @@
+DIST wl_apsta-3.130.20.0.o 652866 SHA256 7dba610b1d96dd14e901bcbce14cd6ecd1b1ac6f5c0035b0d6b6dc46a7c3ef90 SHA512 d89ed52045307449bbae79a4d1807cc6cd89ae67c4a22e8e8aa51c1396edbb6ed8b157cd0756faf8b660a537b48b62117c57967f2048245b5b102d9d9bca4bbd WHIRLPOOL e91d707ec50d6e32e1d1fca17010c23290f68183d9fa9f4700742569847b2a83e60439c6d1656f7f6780b50c31277e538e659cef6443ad2e6d4b41eaed99c0b5
+EBUILD b43legacy-firmware-3.130.20.0.ebuild 753 SHA256 fdc19b0c54a7f1dfff2aa403d971745d49c031bd9f3bbed70d583fdb5de87858 SHA512 a29e8b8579bae43f4c672f60239007535280a797cd01e19b1c3059f68f6303492d624e32ff18704d231e4b72e68679fbe37d09178385d71dd9a30cf1a221e740 WHIRLPOOL 136fb8e61f584e554557bf9b12c6db02baddb027a57df9aae060842dd757fb4032ba1ee1c21bf98bf46dbac17fac6b8075ca7c5f61ce9cb611b89de51473639a
+MISC ChangeLog 2616 SHA256 e1a236539e97ce7ed201c1fc786f43f4f26a1e0fb3280e01615b528d3ce08f81 SHA512 85cad5cf695d8900c92c7c4d6104c98aaf6d0e9782cc1171904cab6d2baa41543b4422fe5d61fbfce3df547de7c0dae58691e4b631ab2a38a578b30b66b78702 WHIRLPOOL a4960a03a7f80bb9621dcdddd832eb79d3eff320323863b960a10eec0de554ac13fa5eb4022f0da2c7485fbf49e34386f191d7fd84cbf1f2de0cf0023bb9274c
+MISC ChangeLog-2015 925 SHA256 f1cd71a59f4549385c95bf7b68d7dd990705cab15893c76d5799091388f59ab9 SHA512 ed4f5a514e09f1b77a1df32be8ae26f4c005fd9eebbf8e3364991207ba4fd381ca8287fa8c6207c21e750750700d62b1929472bb553f16cdba8b4c12984a801c WHIRLPOOL 795bae416d47179605a68a7bc5989017f1629a1151ba15c16113012c782f6c37e2161b6e4beecd38ed9225cfb00e47379619f8f9fdc42e1b037f96199c010894
+MISC metadata.xml 241 SHA256 50b9f6c8946f5d421e8feb8ffbf48238d8b8b018e315f322548b47a89d80b32c SHA512 d308ccef737c1776c2d77c0761996ef272a5866f5d9ceeda4dd4ceede851a145f76281a29b4c4b154e5b10f1d57c9344010bfcf75ba52fb3f1b34a58e3c2053f WHIRLPOOL 5436d62e0cda11ff7a49a8bc1b2c7400a58ad347709d48be3f462530bac689e9e9e6340580b5ccec717498a010c4d2f16ecd5f35ab04356858e7c540ac3b1da3
diff --git a/sys-firmware/b43legacy-firmware/b43legacy-firmware-3.130.20.0.ebuild b/sys-firmware/b43legacy-firmware/b43legacy-firmware-3.130.20.0.ebuild
new file mode 100644
index 000000000000..6514fcdbef9a
--- /dev/null
+++ b/sys-firmware/b43legacy-firmware/b43legacy-firmware-3.130.20.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+: ${B43_FIRMWARE_SRC_OBJ:=${A}}
+
+MY_P="broadcom-wl-${PV}"
+DESCRIPTION="broadcom firmware for b43legacy/bcm43xx"
+HOMEPAGE="http://linuxwireless.org/en/users/Drivers/b43"
+SRC_URI="http://downloads.openwrt.org/sources/wl_apsta-${PV}.o"
+
+RESTRICT="mirror binchecks strip"
+
+LICENSE="Broadcom"
+SLOT=0
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=">=net-wireless/b43-fwcutter-012"
+
+S=${WORKDIR}
+
+src_unpack() {
+	cp "${DISTDIR}/${A}" "${WORKDIR}" || die
+}
+
+src_compile() {
+	mkdir ebuild-output
+	b43-fwcutter -w ebuild-output $(find -name ${B43_FIRMWARE_SRC_OBJ}) || die
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins -r ebuild-output/*
+}
diff --git a/sys-firmware/b43legacy-firmware/metadata.xml b/sys-firmware/b43legacy-firmware/metadata.xml
new file mode 100644
index 000000000000..0bd171786a1f
--- /dev/null
+++ b/sys-firmware/b43legacy-firmware/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>zerochaos@gentoo.org</email>
+<name>Rick Farina</name>
+</maintainer>
+</pkgmetadata>
diff --git a/sys-firmware/bluez-firmware/Manifest b/sys-firmware/bluez-firmware/Manifest
new file mode 100644
index 000000000000..504f316fd802
--- /dev/null
+++ b/sys-firmware/bluez-firmware/Manifest
@@ -0,0 +1,5 @@
+DIST bluez-firmware-1.2.tar.gz 370623 SHA256 b6119e118fabc6bd34584afcbe6fff00a44caeb64152b02ed57c6fba9fd99eec SHA512 15db2f9d38a496882e4cc3754af1e58aa99e1b849f2066c541d76c66a8ffdc5532799fe1fd473cfc158bf5ea86a46687716cbcf83c6dcac0ce66d97d679648dd WHIRLPOOL 28463f620944693362866d45f29d8f31ebf6f23c75a6da633d106cc32f6ee8252f9bcdf454914d3a94726b9d02169232fb8cf1b59012be8d1e8ace67f32593e8
+EBUILD bluez-firmware-1.2.ebuild 465 SHA256 9c1361dc4a9183209f0c8787128bdd63f37b47651f47df335237007f5e13db4c SHA512 2da3bcf8d9b67ffd7f7e1f80bac5056469e6751db37c35243717cdea13c8089f0b94d96a27e0c82aa98ef2496b3cccf2cff6333e2dabc9f4e9325e4ee19eec9d WHIRLPOOL 4e492e76145ecd9f3d1ceff845912ce780cac70eb377191492005e26d893f6fdbb16c75055783698978a3194e5d3e11be5f595d63e3cbb0c96de938477286cf8
+MISC ChangeLog 3089 SHA256 415be49a023d69a08855b65c9491f76f425f6751387358f3c2aa1a7b793277e8 SHA512 222ecdd16be3aa91a20b0184875a4afe954e89bae8a83afd20892ecdc5bf2676dea299d851fe2e0e9f25c5c7d788f51ff3bde2fc54904884b505ba9669cd1579 WHIRLPOOL e6b3b833d8663ff8855f16d2472857ed1aee8ca68e2d2a0f6f98e4fef22a13e8f4311f1d3d6cf66241c56f309d7d46bfd4034b62ac530e8aa30f33e2e29ca94c
+MISC ChangeLog-2015 2856 SHA256 7053e954146b95a3ed40f112dcf55f458bea14e81406bf18b57e428148f62ee1 SHA512 f179eafec1b62b7eae9d7ddd353cc6296fdb9c24cc23d8e5f202da05bf5c7039df4db507bc1569ba86db6e2464c577f736f6ef5a973b94171c8035ae5b8af113 WHIRLPOOL a8b3b46d48ab7642900c6d66c18d13d5104915fbcb919f0185547dbbd95d7838d50f041cd42de89e62ce8c960590df0f9321f85438ec247ba3a3d6e5c35f50af
+MISC metadata.xml 242 SHA256 74d87ebbe91fa6f9d7638932129532650f6c2bc622fb2d615b717663c9097b84 SHA512 177ec4d2bc092d7b041afde72e44300ad7952d5bf13f267aa811b0f958b6d34c78a7a5951bef746d3e4ad2f1cd8fc8acb73b8fc60aaa1ebb6af6edc903222db7 WHIRLPOOL 019a4dc052c181a26c2ad8e2a84fa517fc2a00e0cfe2c6b6cd2ed5a840f1688f3dba782db8cb0e1fc83ac947249299aace70c85d66f0b50147dff1a2e4066e10
diff --git a/sys-firmware/bluez-firmware/bluez-firmware-1.2.ebuild b/sys-firmware/bluez-firmware/bluez-firmware-1.2.ebuild
new file mode 100644
index 000000000000..1085fb206560
--- /dev/null
+++ b/sys-firmware/bluez-firmware/bluez-firmware-1.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Firmware for Broadcom BCM203x and STLC2300 Bluetooth chips"
+HOMEPAGE="http://bluez.sourceforge.net/"
+SRC_URI="http://bluez.sourceforge.net/download/${P}.tar.gz"
+
+RESTRICT="bindist mirror"
+
+LICENSE="bluez-firmware"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc x86"
+IUSE=""
+
+DOCS="AUTHORS ChangeLog README"
+
+src_configure() {
+	econf --libdir=/lib
+}
diff --git a/sys-firmware/bluez-firmware/metadata.xml b/sys-firmware/bluez-firmware/metadata.xml
new file mode 100644
index 000000000000..20ce4200398a
--- /dev/null
+++ b/sys-firmware/bluez-firmware/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">bluez</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-firmware/edk2-ovmf/Manifest b/sys-firmware/edk2-ovmf/Manifest
new file mode 100644
index 000000000000..6247ae4c9562
--- /dev/null
+++ b/sys-firmware/edk2-ovmf/Manifest
@@ -0,0 +1,5 @@
+AUX edk2-ovmf-2017_pre20170505-build_system_fixes.patch 20014 SHA256 ba19462d2277bc445d4d8c2fa86f2e19d2cb7601226da013956f23125e540e1e SHA512 3db1adcabd1e2446c601a52da7e52b4b89323e329dc852c568320e9fb3e8a4619ad8aeda1b529022cd20c7af77894221cca5c34c7acd73115dcb083991216150 WHIRLPOOL 3d17c192d36163bc9da5a61f17c2bb7d4ab73026b269929de90ce7c5792fac2535057c5e3839acbfb36aeb7f965c908416d220ed46f422ba7b103a57189e8d97
+DIST edk2-ovmf-2017_pre20170505-bin.tar.xz 874904 SHA256 81d3f405c6a3387f93d6a82a1662eaef3b15ce4e486e41020d97b46b95c1499a SHA512 c7a7d83758214b6ab63c6cefe827a601aaa7656b7f01e03413c84d913078a2b0d8037f70de34d42d8e1614aee794e0ffd7d9e62314eb4e04c21256b70338af5c WHIRLPOOL 686e0b190c34c4d349cbd68f8c0451852b3e2fb3de3cdd75f34c30fba3e7d009c69a27761bf9d698d797cc86d7e7c142e4f38f0156cf6bf87bab92feaa81af6f
+DIST edk2-ovmf-2017_pre20170505.tar.xz 22952060 SHA256 5fb227595bde9da7bb4c452be0b3f7867984637b1caa40165c86ed31bf591218 SHA512 6da859360448fd6d04d1492c88a7e935f7108c524f7ccfe6aa4c13bf9af9695dbc4a5b8efa274adc86d3105946aaa1ba80bcd9713facdca153f1a3d873797b63 WHIRLPOOL 9916544a2d8fec2fc489f10e5cfd283d3d448dcf008b9dabc75712469b7a8913b021d9321d670295a040cd382f13927fc5bcc865ca148a0a5a66968eff6ea49a
+EBUILD edk2-ovmf-2017_pre20170505.ebuild 2447 SHA256 8f90dc80970505dad5fd7934e1bd7ad9a7f2c3acc843d8bf49814926f1e3fa49 SHA512 d78c894492931070e55cfd92eec95450ea619ea734da2bc63f3f106aacf437d020359acda9902a7abb83526c87ca7270f11aac48be6c8f142a4a9ba96d473707 WHIRLPOOL b538c8f52ed3dd6445532d479f299f8f1d8973bc3fc77792493a0cc359b04aa576935983c25449ee48bfd5fe959d01bc386b7be3de0a22ff9cc2cca13f89036a
+MISC metadata.xml 435 SHA256 da5a24c57b424daf3b6771e2934d896a2b15c4fa80c6f9ee0b1b8cc9da8912fd SHA512 d1e6233650fc1ea3a25bead14091877b9f507d2bc78cec6436e1b6e17477e40517b74da66e26b6bd39259e4ca308d724324296f1a6c353fed2f8bf112029b90f WHIRLPOOL e59fbfdd7a24378eb3910f4c87f2bd3b816d7fb3c49ceb3fdeac5319d9e9831b40bfed7c3ad4d1a0f0bfc698870178cb1776d597d9371bbf5ce331398f334ae8
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505.ebuild
new file mode 100644
index 000000000000..a8c0062de017
--- /dev/null
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
+HOMEPAGE="https://github.com/tianocore/edk2"
+
+# inherit git-r3
+# EGIT_REPO_URI="https://github.com/tianocore/edk2"
+# EGIT_BRANCH="UDK2017"
+# EGIT_COMMIT="f30c40618b1f3537705b450a91ce00b9e587badb"
+
+SRC_URI="
+	binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
+	!binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}.tar.xz )"
+
+LICENSE="BSD-2 MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
+IUSE="+binary"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	!amd64? ( binary )"
+
+DEPEND="
+	!binary? (
+		amd64? (
+			>=dev-lang/nasm-2.0.7
+			>=sys-power/iasl-20160729
+			${PYTHON_DEPS}
+		)
+	)"
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-build_system_fixes.patch
+)
+
+DISABLE_AUTOFORMATTING=true
+DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
+virtual machines. The firmware is located under
+	/usr/share/edk2-ovmf/OVMF.fd
+	/usr/share/edk2-ovmf/OVMF_CODE.fd
+	/usr/share/edk2-ovmf/OVMF_VARS.fd
+
+The firmware does not support csm (due to no free csm implementation
+available). If you need a firmware with csm support you have to download
+one for yourself. Firmware blobs are commonly labeled
+	OVMF{,_CODE,_VARS}-with-csm.fd
+
+In order to use the firmware you can run qemu the following way
+
+	$ qemu-system-x86_64 \
+		-drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
+		...
+
+You can register the firmware for use in libvirt by adding to /etc/libvirt/qemu.conf:
+	nvram = [
+		\"/usr/share/edk2-ovmf/OVMF_CODE.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
+	]"
+
+pkg_setup() {
+	use binary || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if use binary; then
+		eapply_user
+		return
+	fi
+	default
+}
+
+src_compile() {
+	TARGET_ARCH=X64
+	TARGET_NAME=RELEASE
+	TARGET_TOOLS=GCC49
+
+	use binary && return
+
+	emake ARCH=${TARGET_ARCH} -C BaseTools -j1
+
+	. ./edksetup.sh
+
+	./OvmfPkg/build.sh \
+		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
+		-D FD_SIZE_2MB \
+		|| die "OvmfPkg/build.sh failed"
+}
+
+src_install() {
+	local builddir="Build/OvmfX64/${TARGET_NAME}_${TARGET_TOOLS}/FV"
+
+	insinto /usr/share/${PN}
+	doins "${builddir}"/OVMF{,_CODE,_VARS}.fd
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-firmware/edk2-ovmf/files/edk2-ovmf-2017_pre20170505-build_system_fixes.patch b/sys-firmware/edk2-ovmf/files/edk2-ovmf-2017_pre20170505-build_system_fixes.patch
new file mode 100644
index 000000000000..68b14e36fdca
--- /dev/null
+++ b/sys-firmware/edk2-ovmf/files/edk2-ovmf-2017_pre20170505-build_system_fixes.patch
@@ -0,0 +1,145 @@
+diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
+index 427ef1b..936f79d 100755
+--- a/BaseTools/Conf/tools_def.template
++++ b/BaseTools/Conf/tools_def.template
+@@ -4335,7 +4335,7 @@ DEBUG_*_*_OBJCOPY_ADDDEBUGFLAG     = --add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_N
+ RELEASE_*_*_OBJCOPY_ADDDEBUGFLAG   =
+ NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG     = --add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_NAME).debug
+ 
+-DEFINE GCC_ALL_CC_FLAGS            = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -include AutoGen.h -fno-common
++DEFINE GCC_ALL_CC_FLAGS            = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Wno-array-bounds -include AutoGen.h -fno-common
+ DEFINE GCC_IA32_CC_FLAGS           = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-stack-arg-probe
+ DEFINE GCC_X64_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -mno-red-zone -Wno-address -mno-stack-arg-probe
+ DEFINE GCC_IPF_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -minline-int-divide-min-latency
+@@ -4368,7 +4368,7 @@ DEFINE GCC_IPF_RC_FLAGS            = -I binary -O elf64-ia64-little   -B ia64
+ DEFINE GCC_ARM_RC_FLAGS            = -I binary -O elf32-littlearm     -B arm     --rename-section .data=.hii
+ DEFINE GCC_AARCH64_RC_FLAGS        = -I binary -O elf64-littleaarch64 -B aarch64 --rename-section .data=.hii
+ 
+-DEFINE GCC44_ALL_CC_FLAGS            = -g -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -include AutoGen.h -fno-common -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
++DEFINE GCC44_ALL_CC_FLAGS            = -g -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Wno-array-bounds -ffunction-sections -fdata-sections -include AutoGen.h -fno-common -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
+ DEFINE GCC44_IA32_CC_FLAGS           = DEF(GCC44_ALL_CC_FLAGS) -m32 -march=i586 -malign-double -fno-stack-protector -D EFI32 -fno-asynchronous-unwind-tables
+ DEFINE GCC44_X64_CC_FLAGS            = DEF(GCC44_ALL_CC_FLAGS) -m64 -fno-stack-protector "-DEFIAPI=__attribute__((ms_abi))" -maccumulate-outgoing-args -mno-red-zone -Wno-address -mcmodel=small -fpie -fno-asynchronous-unwind-tables
+ DEFINE GCC44_IA32_X64_DLINK_COMMON   = -nostdlib -Wl,-n,-q,--gc-sections -z common-page-size=0x20
+@@ -5864,7 +5864,7 @@ NOOPT_CLANG38_X64_DLINK2_FLAGS     = DEF(GCC5_X64_DLINK2_FLAGS) -O0
+ *_ELFGCC_X64_VFRPP_PATH            = DEF(ELFGCC_BIN)/gcc
+ *_ELFGCC_X64_RC_PATH               = DEF(ELFGCC_BIN)/objcopy
+ 
+-*_ELFGCC_X64_CC_FLAGS              = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-address -Wno-array-bounds -include AutoGen.h -D_EFI_P64
++*_ELFGCC_X64_CC_FLAGS              = -Os -fshort-wchar -fno-strict-aliasing -Wall -Wno-address -Wno-array-bounds -include AutoGen.h -D_EFI_P64
+ *_ELFGCC_X64_DLINK_FLAGS           = -nostdlib --shared --entry $(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
+ *_ELFGCC_X64_SLINK_FLAGS           =
+ *_ELFGCC_X64_ASM_FLAGS             = -c -x assembler -imacros $(DEST_DIR_DEBUG)/AutoGen.h
+@@ -5887,7 +5887,7 @@ NOOPT_CLANG38_X64_DLINK2_FLAGS     = DEF(GCC5_X64_DLINK2_FLAGS) -O0
+ *_ELFGCC_IPF_VFRPP_PATH           = DEF(ELFGCC_BIN)/gcc
+ *_ELFGCC_IPF_RC_PATH              = DEF(ELFGCC_BIN)/objcopy
+ 
+-*_ELFGCC_IPF_CC_FLAGS             = -Os -fshort-wchar -Wall -Werror -include AutoGen.h -D_EFI_P64
++*_ELFGCC_IPF_CC_FLAGS             = -Os -fshort-wchar -Wall -include AutoGen.h -D_EFI_P64
+ *_ELFGCC_IPF_DLINK_FLAGS          = -nostdlib --shared --entry $(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
+ *_ELFGCC_IPF_SLINK_FLAGS          =
+ *_ELFGCC_IPF_ASM_FLAGS            = -c -x assembler -imacros $(DEST_DIR_DEBUG)/AutoGen.h
+@@ -7296,10 +7296,10 @@ RELEASE_XCODE32_IA32_ASM_FLAGS  = -arch i386
+ *_XCODE32_IA32_NASM_FLAGS       = -f macho32
+ *_XCODE32_IA32_PP_FLAGS         = -arch i386 -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h
+ *_XCODE32_IA32_VFRPP_FLAGS      = -arch i386 -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
+-  DEBUG_XCODE32_IA32_CC_FLAGS   = -arch i386 -save-temps -g -O0 -combine -mms-bitfields  -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces  -c -include AutoGen.h -mdynamic-no-pic -fno-stack-protector
+-RELEASE_XCODE32_IA32_CC_FLAGS   = -arch i386 -Oz -combine -mms-bitfields  -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h -mdynamic-no-pic -fno-stack-protector
++  DEBUG_XCODE32_IA32_CC_FLAGS   = -arch i386 -save-temps -g -O0 -combine -mms-bitfields  -fshort-wchar -fno-strict-aliasing -Wall -Wno-missing-braces  -c -include AutoGen.h -mdynamic-no-pic -fno-stack-protector
++RELEASE_XCODE32_IA32_CC_FLAGS   = -arch i386 -Oz -combine -mms-bitfields  -fshort-wchar -fno-strict-aliasing -Wall -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h -mdynamic-no-pic -fno-stack-protector
+ 
+-*_XCODE32_IA32_ASLCC_FLAGS      = -arch i386 -x c -save-temps -g -O0 -mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h -mdynamic-no-pic
++*_XCODE32_IA32_ASLCC_FLAGS      = -arch i386 -x c -save-temps -g -O0 -mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Wno-missing-braces -c -include AutoGen.h -mdynamic-no-pic
+ *_XCODE32_IA32_ASLDLINK_FLAGS   = -arch i386 -e _main -preload -segalign 0x20  -pie -seg1addr 0x220 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
+ *_XCODE32_IA32_ASLPP_FLAGS      = -arch i386 -x c -E -include AutoGen.h
+ *_XCODE32_IA32_ASL_FLAGS        =
+@@ -7328,8 +7328,8 @@ RELEASE_XCODE32_X64_ASM_FLAGS  = -arch x86_64
+ *_XCODE32_X64_PP_FLAGS         = -arch x86_64 -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h
+ *_XCODE32_X64_VFRPP_FLAGS      = -arch x86_64 -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
+ 
+-  DEBUG_XCODE32_X64_CC_FLAGS   = -arch x86_64 -save-temps -g -O0 -mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -Wno-address  -fomit-frame-pointer -static  -c -include AutoGen.h -fno-stack-protector
+-RELEASE_XCODE32_X64_CC_FLAGS   = -arch x86_64 -Oz -mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -Wno-address  -fomit-frame-pointer -static  -c -include AutoGen.h -fno-stack-protector
++  DEBUG_XCODE32_X64_CC_FLAGS   = -arch x86_64 -save-temps -g -O0 -mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Wno-missing-braces -Wno-address  -fomit-frame-pointer -static  -c -include AutoGen.h -fno-stack-protector
++RELEASE_XCODE32_X64_CC_FLAGS   = -arch x86_64 -Oz -mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Wno-missing-braces -Wno-address  -fomit-frame-pointer -static  -c -include AutoGen.h -fno-stack-protector
+ 
+ ##################
+ # ARM definitions - (Assumes iPhone SDK installed on Snow Leopard)
+@@ -7357,8 +7357,8 @@ RELEASE_XCODE32_ARM_ASM_FLAGS  = $(ARCHASM_FLAGS)
+ *_XCODE32_ARM_PP_FLAGS         = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h
+ *_XCODE32_ARM_VFRPP_FLAGS      = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
+ 
+-  DEBUG_XCODE32_ARM_CC_FLAGS   = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mthumb-interwork -g -Oz -mabi=aapcs -mapcs -fno-short-enums  -save-temps -combine -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h
+-RELEASE_XCODE32_ARM_CC_FLAGS   = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mthumb-interwork -Oz    -mabi=aapcs -mapcs -fno-short-enums  -save-temps -combine -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h
++  DEBUG_XCODE32_ARM_CC_FLAGS   = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mthumb-interwork -g -Oz -mabi=aapcs -mapcs -fno-short-enums  -save-temps -combine -fshort-wchar -fno-strict-aliasing -Wall -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h
++RELEASE_XCODE32_ARM_CC_FLAGS   = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mthumb-interwork -Oz    -mabi=aapcs -mapcs -fno-short-enums  -save-temps -combine -fshort-wchar -fno-strict-aliasing -Wall -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h
+ 
+ 
+ ####################################################################################
+@@ -7403,8 +7403,8 @@ RELEASE_XCLANG_IA32_DLINK_FLAGS      = -arch i386 -u _$(IMAGE_ENTRY_POINT) -e _$
+ RELEASE_XCLANG_IA32_ASM_FLAGS  = -arch i386 
+ *_XCLANG_IA32_NASM_FLAGS       = -f macho32
+ 
+-  DEBUG_XCLANG_IA32_CC_FLAGS   = -arch i386 -c -g -O0  -Wall -Werror -include AutoGen.h -fno-stack-protector -fno-builtin -fshort-wchar -mdynamic-no-pic -mno-sse -mno-mmx -Wno-empty-body -Wno-pointer-sign -Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-tautological-compare -Wreturn-type -Wno-unused-variable  -fasm-blocks  -mms-bitfields -msoft-float -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang
+-RELEASE_XCLANG_IA32_CC_FLAGS   = -arch i386 -c    -Os  -Wall -Werror -include AutoGen.h -fno-stack-protector -fno-builtin -fshort-wchar -mdynamic-no-pic -mno-sse -mno-mmx -Wno-empty-body -Wno-pointer-sign -Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-tautological-compare -Wreturn-type -Wno-unused-variable  -fasm-blocks  -mms-bitfields -msoft-float -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang
++  DEBUG_XCLANG_IA32_CC_FLAGS   = -arch i386 -c -g -O0  -Wall -include AutoGen.h -fno-stack-protector -fno-builtin -fshort-wchar -mdynamic-no-pic -mno-sse -mno-mmx -Wno-empty-body -Wno-pointer-sign -Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-tautological-compare -Wreturn-type -Wno-unused-variable  -fasm-blocks  -mms-bitfields -msoft-float -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang
++RELEASE_XCLANG_IA32_CC_FLAGS   = -arch i386 -c    -Os  -Wall -include AutoGen.h -fno-stack-protector -fno-builtin -fshort-wchar -mdynamic-no-pic -mno-sse -mno-mmx -Wno-empty-body -Wno-pointer-sign -Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-tautological-compare -Wreturn-type -Wno-unused-variable  -fasm-blocks  -mms-bitfields -msoft-float -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang
+ 
+ 
+ ##################
+@@ -7420,9 +7420,9 @@ RELEASE_XCLANG_X64_ASM_FLAGS  = -arch x86_64
+ *_XCLANG_*_VFRPP_FLAGS      = -x c -E -P -DVFRCOMPILE -include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h 
+ 
+ 
+-  DEBUG_XCLANG_X64_CC_FLAGS   = -ccc-host-triple x86_64-pc-win32-macho -c -g -O0  -Wall -Werror -include AutoGen.h -fno-stack-protector -fno-builtin -fshort-wchar -mdynamic-no-pic -Wno-empty-body -Wno-pointer-sign -Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-tautological-compare -Wreturn-type -Wno-unused-variable -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang
+-RELEASE_XCLANG_X64_CC_FLAGS   = -ccc-host-triple x86_64-pc-win32-macho -c    -Os  -Wall -Werror -include AutoGen.h -fno-stack-protector -fno-builtin -fshort-wchar -mdynamic-no-pic -Wno-empty-body -Wno-pointer-sign -Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-tautological-compare -Wreturn-type -Wno-unused-variable -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang
+-*_XCLANG_*_ASLCC_FLAGS      = -x c -save-temps -g -O0 -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h -mdynamic-no-pic
++  DEBUG_XCLANG_X64_CC_FLAGS   = -ccc-host-triple x86_64-pc-win32-macho -c -g -O0  -Wall -include AutoGen.h -fno-stack-protector -fno-builtin -fshort-wchar -mdynamic-no-pic -Wno-empty-body -Wno-pointer-sign -Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-tautological-compare -Wreturn-type -Wno-unused-variable -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang
++RELEASE_XCLANG_X64_CC_FLAGS   = -ccc-host-triple x86_64-pc-win32-macho -c    -Os  -Wall -include AutoGen.h -fno-stack-protector -fno-builtin -fshort-wchar -mdynamic-no-pic -Wno-empty-body -Wno-pointer-sign -Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-tautological-compare -Wreturn-type -Wno-unused-variable -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang
++*_XCLANG_*_ASLCC_FLAGS      = -x c -save-temps -g -O0 -fshort-wchar -fno-strict-aliasing -Wall -Wno-missing-braces -c -include AutoGen.h -mdynamic-no-pic
+ *_XCLANG_*_ASLDLINK_FLAGS   = -e _main -preload -segalign 0x20  -pie -seg1addr 0x240 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
+ *_XCLANG_*_ASLPP_FLAGS      = -x c -E -include AutoGen.h
+ *_XCLANG_*_ASL_FLAGS        =
+@@ -7472,9 +7472,9 @@ RELEASE_XCODE5_IA32_ASM_FLAGS  = -arch i386
+       *_XCODE5_IA32_NASM_FLAGS = -f macho32
+ 
+ 
+-  DEBUG_XCODE5_IA32_CC_FLAGS   = -arch i386 -c -g -Os       -Wall -Werror -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
+-RELEASE_XCODE5_IA32_CC_FLAGS   = -arch i386 -c    -Os       -Wall -Werror -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
+-  NOOPT_XCODE5_IA32_CC_FLAGS   = -arch i386 -c -g -O0       -Wall -Werror -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
++  DEBUG_XCODE5_IA32_CC_FLAGS   = -arch i386 -c -g -Os       -Wall -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
++RELEASE_XCODE5_IA32_CC_FLAGS   = -arch i386 -c    -Os       -Wall -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
++  NOOPT_XCODE5_IA32_CC_FLAGS   = -arch i386 -c -g -O0       -Wall -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
+ 
+ 
+ 
+@@ -7494,11 +7494,11 @@ RELEASE_XCODE5_X64_ASM_FLAGS  = -arch x86_64
+ *_XCODE5_*_VFRPP_FLAGS      = -x c -E -P -DVFRCOMPILE -include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h 
+ 
+ 
+-  DEBUG_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c -g -Os       -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
+-  NOOPT_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c -g -O0       -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
+-RELEASE_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c    -Os       -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
++  DEBUG_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c -g -Os       -Wall -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
++  NOOPT_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c -g -O0       -Wall -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
++RELEASE_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c    -Os       -Wall -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)
+ 
+-*_XCODE5_*_ASLCC_FLAGS      = -x c -save-temps -g -O0 -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h 
++*_XCODE5_*_ASLCC_FLAGS      = -x c -save-temps -g -O0 -fshort-wchar -fno-strict-aliasing -Wall -Wno-missing-braces -c -include AutoGen.h 
+ *_XCODE5_*_ASLDLINK_FLAGS   = -e _ReferenceAcpiTable -preload -segalign 0x20  -pie -seg1addr 0x240 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
+ *_XCODE5_*_ASLPP_FLAGS      = -x c -E -include AutoGen.h
+ *_XCODE5_*_ASL_FLAGS        =
+diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
+index 063982b..0316f56 100644
+--- a/BaseTools/Source/C/Makefiles/header.makefile
++++ b/BaseTools/Source/C/Makefiles/header.makefile
+@@ -47,9 +47,9 @@ INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKE
+ BUILD_CPPFLAGS = $(INCLUDE) -O2
+ ifeq ($(DARWIN),Darwin)
+ # assume clang or clang compatible flags on OS X
+-BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -c -g
++BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -c -g
+ else
+-BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-unused-result -nostdlib -c -g
++BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Wno-deprecated-declarations -Wno-unused-result -nostdlib -c -g
+ endif
+ BUILD_LFLAGS =
+ BUILD_CXXFLAGS = -Wno-unused-result
diff --git a/sys-firmware/edk2-ovmf/metadata.xml b/sys-firmware/edk2-ovmf/metadata.xml
new file mode 100644
index 000000000000..7c5dcd8f83a2
--- /dev/null
+++ b/sys-firmware/edk2-ovmf/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>tamiko@gentoo.org</email>
+	<name>Matthias Maier</name>
+</maintainer>
+<maintainer type="project">
+	<email>virtualization@gentoo.org</email>
+	<name>Gentoo Virtualization Project</name>
+</maintainer>
+<use>
+	<flag name="binary">Use pre-built binaries</flag>
+</use>
+</pkgmetadata>
diff --git a/sys-firmware/intel-microcode/Manifest b/sys-firmware/intel-microcode/Manifest
new file mode 100644
index 000000000000..3357c8f31647
--- /dev/null
+++ b/sys-firmware/intel-microcode/Manifest
@@ -0,0 +1,25 @@
+AUX intel-microcode2ucode.c 3484 SHA256 c51b1b1d8b4b28e7d5d007917c1e444af1a2ff04a9408aa9067c0e57d70164de SHA512 0e29f995dee47707026cfb6224580c2166d000e91af7b1afe12f00158be8606093d07cdbc0d583a0af79370cf1d9c16b5f35a306bae7f545a5c774ea253509b7 WHIRLPOOL 52fb625baf25b9a27d01afaec5be4edf969b94bc6a2100d763a99307d46fe61b3ef4b6f4b0f6679b28da1c89ccd99ba00dc5d7998f13452660de083363e5edcc
+AUX intel-microcode2ucode.c-r1 3533 SHA256 ddcb62237fa4f1bfbfdd3fd357117d85c1483c23601f04c1cd8c64ed70329a8e SHA512 2b234a0080461f27440047d870b3a2769425499c35807f6ccc89a31e4ee87a14bc74ed2ca95a8b9744f07b93f8042a3d6486cda07011585e3e634663834ca49e WHIRLPOOL c909d899cea9331589ad4755cdf26f34a7c2bc61b20868d9ae942218c270b948a2643bc927656cf46dcefa25d6d9081763168425282e9c02ae432cbda7916c24
+DIST microcode-20140430.tgz 785594 SHA256 2e67767fd561164a2b09831020c2d36600ad336a9c0c117f1964edef284e4351 SHA512 12954522629ce15c4b95c158b6288b3877a3d1f87bea838f8138e53987ef1b6c0edc7a8cbb802a981ccca178b70b4323907aafa7479c0c2fed4497f6fb7bbc1c WHIRLPOOL 92bb063bc14308568ef8a872de54ad99946eb9ec42ac890b11b6cf1f8c07667d386f030a7459cd168652044d87686b61e06ff5a2bcd582c704de6b3b621dbaa2
+DIST microcode-20140624.tgz 787237 SHA256 b4662ac780438a7b2d87e6d26a7066feb807f37c6e5b6fa147089f4edb02ea37 SHA512 c774006aae639e7fae90bc1f5d8308b407e7cd3b7d0da6e35577560bf6201c2b15f7d7b6b0cd727c50be1e9d508b484b067856631fa2598498982109bff0e44c WHIRLPOOL 6051d4a7547e6f74c653d332c54a4711838b670d2707408de7dccddb5d1409994417bae26ce5ec2f72d91b613e14a3381ded301027995bca1fb746baf85000c4
+DIST microcode-20140913.tgz 830537 SHA256 ea6c0ee21d1fbf261f093176a78089c21411e5fe0e2c35b258cedf2b39987e15 SHA512 e179fe0001b1157cc95aee39185f51fd182d53c1bdb30bfc95bc3a70795c32012050f3a4adf06735a77d8ef9c703a330c6a2610b73b70f09f5760e31d39cb89c WHIRLPOOL de56d52d184dd2f21e0ca41dca0bb5b539758de614f4e0eb8e7c8281e97ea6dfcc33c50a3fec7262112dc11e8a78b458b3d7ef8c8b5579d500d358393911565d
+DIST microcode-20150121.tgz 850761 SHA256 23353b93bb421971496cea5e9f9d390ce0ed22580a8cc45ae7b3b322dcd8f6b3 SHA512 f62edd1b666cf381605613766d7e123f0c6debee4448c0ff0882d33c144ad2174656d2501a449f24eb3e4708259e7ec0ff42810739b7d1f34a6a1d9950d17bc4 WHIRLPOOL 573368845333aee9ca23a98cc6711cc22da5b5893a3c29df292df281a024ad9b50ab4893cc0a44b65e86f388fc55e2c53cd0f99a619c3315dd4db5e090b91319
+DIST microcode-20151106.tgz 892805 SHA256 096e39489eef67666be652e81fa372a06b74f39ea3d565dc0287242c668717e7 SHA512 606ce97f0fe76f6a34a857923d3432d8e2368e8a5c504ffa0313f9f016d61b0a5dea26e67662ce1283c1f772ace7318e96a34ebeeeff50b25deb3005ccc6978e WHIRLPOOL 0c73429977e31b8f6230b21889480eda79ecc3feb64a8e6e5a1cebc124a98300f887789650e480611a183237461517aba51b3b31a8450bc5a2e01c5955e7b534
+DIST microcode-20160607.tgz 1236385 SHA256 db821eb47af2caa39613caee0eb89a9584b2ebc4a9ab1b9624fe778f9a41fa7d SHA512 17f62ebf3e9f262d21ffa00546da4d711a9a810ad0a9bf4b2805c33090d75e9a07df1f3449baf6009ec5ef1f9af470fd32285b6100f0819e0b9989f5c55dc5bd WHIRLPOOL 08ccd42872998144abd02897dd4738142f7b2d4e2a6d5a84a8baa37a629867f2d829385dffa7aefba9b1d3bdcf2ae0f4b4dca9104d76a81b87d359540d7c261f
+DIST microcode-20160714.tgz 1239344 SHA256 f3a9c6fc93275bf1febc26f7c397ac93ed5f109e47fb52932f6dbd5cfdbc840e SHA512 f9e09b6669a86aafcc77642d6e33acf9326109c3a2bc3e0d62b45a062b9ecbde6605b5a0ae31d4a3ad2b0ed3c6d3aadbd18088431fb72216bfc31fc452b0e342 WHIRLPOOL d62bbce555adc1973465d81463d9ef51cc64f5f0937b555a0b616458afc47823b2512a60eb498d4658e96244430e47bde5f36b2e49d202d41e61914bee6a3a9c
+DIST microcode-20161104.tgz 1290125 SHA256 70154ca62ff9b3da6291dfdecc90daaeb399d7290c0d308d719df16dff5ee3d1 SHA512 73a7310c1da5bec7ce82bce5cf7c2aafa3d0189e7524bdebd20e1ea3568cf8242be39d9041fa055fe06e759f98703c5d0a631e57ff185aae3ba3c91dbe83cf7a WHIRLPOOL e811315facf6b7dc80c4a99555d909e1c26aa7904d1f2608de633f7e49f691f5bf6c47973381cd72e4cb8c3b4355651a4c64564c79539ddfa41a007b8f05b5ca
+DIST microcode-20170511.tgz 2143617 SHA256 2f77fd2d87403b754d01a66c78a36a8b8ffc16dc3c50fb7aa2c4cd4da7f681a3 SHA512 4e2066096d56430c2df73631f15cf16f2317c1d8ff745d7b7cdd784ebccc2b797565eb52703cce9b4238774dbfdcaecacd892d729b7869fdfd7644008ce74a60 WHIRLPOOL 492e5e5962696636bfb2e181964893ba59798873b71cb9f5d11b1dcb9a1b32acb9e11634b71d880e05f9b71eb4f45dbc72e7a48e1ac4f38dfec816dbecf79b0d
+DIST microcode-20170707.tgz 2908882 SHA256 4fd44769bf52a7ac11e90651a307aa6e56ca6e1a814e50d750ba8207973bee93 SHA512 2f0643c332318e9c818b9a23a996b59086e86e80e649589e43dbab19f13083d6d9505b8557f67b45ce56de0da043c753a14bb146e597b6669f24fe543656c65f WHIRLPOOL bafae318d350bae1ebb6aeb5611e9ffab7d52d2ca836c7b65cb6b86bae9da7ee2c41945e0252cbe1797de4737507948b5260bbe3996d1d7e3fd2489e32452456
+EBUILD intel-microcode-20140430.ebuild 1169 SHA256 6e66223b7dc8d447c64b282acd16c36ab0552e3fe4e05b14ad076c3022911c8b SHA512 c0b31a6fcac608c7ba811b4ffc068172fdaed22c58dc29a5526275b0935d7c9210381978f224f419ca4071dd79d04ba3b8e2e788e5d2343bc46bcb3b4a3c570a WHIRLPOOL 5444441912f17dee7b52a66bec2becd7efd4637c50a31f9a4e858cdffd18cb01b953677c79dc25140597e527c532c6d0623075c7e94ce73990b98fbf5cd93011
+EBUILD intel-microcode-20140624.ebuild 1171 SHA256 49b96a4719b28b80f8cbd4568b5bd348c7bdc9588bb633aecfdb4c7786e774d3 SHA512 c8ea78ebe459ff578f11c06c29fa58f87793f1b5ea6f7b93586af36ecc586cc5f03576b71f15b729c0c9bb97886244de4febb2dcd73fa6206ffb312622ff83c9 WHIRLPOOL 5f45b9e45dea44ca67febceac7fa675f88df9dbdc8d22663ceddfbe5fcf2f6e1febd63a4a1c4de0d8c72c69a9da46bca2c7679680c70ca8d59ad7a3ab2be8902
+EBUILD intel-microcode-20140913.ebuild 1171 SHA256 1c69f423bae62e6993935abdf28a6da630a6397a844fc0c9c45f5dba2cf3e6ec SHA512 a52bd7f6e9b2e35d207d6a3f819576e8654435220034631ac26a352159fc34edd6cc49d3545f50dcbb44ea824be59dd775938c86f432226e8334c5bcc12c4f8e WHIRLPOOL 508b5ec8fda12623cbe2c64999fb5363b0124995e9bbdab523cdd61cc6df068a8b70d91fcf083b4764b2651a447898057b1e85f1a0877c3cb58ab5fec1694aae
+EBUILD intel-microcode-20150121-r1.ebuild 1299 SHA256 ef7562eb70e544800d69f7b5f12b0e64f29b636b625a0ebf051939832fc5169f SHA512 fe94bed3e9292c1b6590319eaa825e7757fbe4256081d27027e5478ba883d14985f530588fae4ee091123fead6e007cb1366f139e7f5efae2daec07a228b9657 WHIRLPOOL da5b0480ea13054e3ec8dc5ce93296ff253a6d825ffb1f2c34f52e639ce5638730e392e8ffe52e39ed2a500ba3cba9e73ed1952af53202b17506793c499f3086
+EBUILD intel-microcode-20150121.ebuild 1169 SHA256 c72d3717dd300066ac0e5ecbf77e603a21fcbb0dda4f07e8b3b3e3c951972d0f SHA512 efb958716b0b3ab6bb7b942afb55a19cdb8423f91f178b90abf5bf80df2dbff31d05505fab91d01e31ab453d954d702e5e7724ed3cf30ddefc0d301b450c7008 WHIRLPOOL 7a31da34c91fa5ca34f590516c51fa75fa12effb3934bdfcd57a9793992f0ac997a20e0ebf89786e31748637ab8190ff8b4659eaf503a7d1c56ee867e250f49d
+EBUILD intel-microcode-20151106.ebuild 1297 SHA256 bf3d271b6290d609dd628ca0eee14a5143bc71bfff682489a22b49aa3d31215d SHA512 ff5bf38e0542c0ec15f16eb2f5f336a116df72dde71fe357fa74c3bf374f076bd3ecc41ffaa575964801b7fd9d4f552a24cceddd68fd8a3b0a3d0fa588146733 WHIRLPOOL a73aa84f85f271dae2044606cf93890203dc1ba28d4713b3d9089ee46cdac920b2d9b1002e69cf33086f32ac6350dcfe9e8000e622b8b2ba2261af70831a1870
+EBUILD intel-microcode-20160607.ebuild 1304 SHA256 54be5ffce8593c157f7839ca0af89165581f876ef3a43cfc647bf6c7b1fa3646 SHA512 01337b3c316d59ca6c6a67879ae6f1bd0a933863c4f46a899447a7a5e420c36eb7475656ac97a1d69d58990fc6fe727e0478d31822181a7ed2c15bdac46e23a1 WHIRLPOOL dc2a7291e9bb8ac74f8eef1dc18ee41a1db49adc650a257915e4bc0d750bbdf2be5d6a8dbe8f9b778f425a9a30e5ee6f457838f66d3cf7ad8ccb7e8980194ecd
+EBUILD intel-microcode-20160714.ebuild 1304 SHA256 30f0c2154a75d37ab3455f2ec32bc7ac4c0451a977b6fcbf07532a2202066255 SHA512 a7ec2093ba146442f69c9ba3e0c2427b63b58b43f92676c4be5a4e8c1dca683a4dd94afd1c54ecc97177d7ad998937a525496309ddaf20985ded23398c806a7c WHIRLPOOL d9422e60ee9e675ede1f47d55382c6cae4569210e725402ad632c1c9eff55eb0dfb8ccad3afd7f05fa796b02a93173a29fd046c5c1c52a54c3eb178922f8f7b0
+EBUILD intel-microcode-20161104.ebuild 1302 SHA256 a937096ccd4a1b266bdfe1b7ce555cb45745619c1afde8c43223dce37017f5cc SHA512 fbe032d5a4db41643a416f6c55dadb50b05e6c94eecd56e418f89a130312eb4de8ff655d6c81b90644ce728399ac1315ff0f62c93a17d11ef5d46c22f4102db3 WHIRLPOOL c9d7e19e47c5e10ea72b1625ed511833819c50b5f29124f370453c6439cbab019e496c58f7da8c6f1e12db90bda093ab8a57fbea906d57dd1bf152ed97e846a9
+EBUILD intel-microcode-20170511.ebuild 1302 SHA256 932de7f441865374b79c4e30279fba60aef68a1a424fd5b9b3b5b84a6d2ff81f SHA512 4a1fce5bcc5a1d15e2116ea5b9453edaf90326976e7a3c35caecd2fd515087a32755df178f75790c5629952b14aceb3ffd6dff585605eea3812af58eaeac909b WHIRLPOOL cd60c96311a238d2b2f926e69a46a12a02a1cc80beb875fccbc72df1570a7782716315cf934c6aa5a754a52043a2b0f1d374340be75552bf7c3db668dc55631a
+EBUILD intel-microcode-20170707.ebuild 1328 SHA256 a81aa92ce5165e89aae34891ff232bd802c9d848aaf02219c70d3ad0958f7d01 SHA512 163e4553b7411bc9328fce7649eddaed10d07bf6c1adbdfb583bcf8b3680fa4ea8602f4aeeb43b59424ddad96dc1c320d92817a954f8c77f011906284731b7ab WHIRLPOOL f4a65742afc125afe1f5b61fb5fde872de9bce8053868efd619dbf2aeb069bae4101cfb0c929fd847e8bcfd51d8bf5409f7ae50f6f35c911498a6f10880e0443
+MISC ChangeLog 1510 SHA256 197408f06750723d415def91175b6e4d9a793cfc0b64aeae4cc5424b293c7859 SHA512 f5722e6f904dbe69dd04b6962a5878ca36706f93c906677ee47ded514573a8d753780d983fa2eed195217c5f2bb76c54120c0065224cce7f5b827169dff10310 WHIRLPOOL e4a3505f27b43c3113cc4092ba02ea76ee1ccfae9583fdd4544a62f74148a3fbf871a7cd949be5a101561ea2afbc0869507293459dc5d74f39644f81c28536f7
+MISC metadata.xml 570 SHA256 b9976e27a532a0ebfc31b0eccebc0f7d50cc04bb893f002d1237073a81c7e470 SHA512 f0c8094b68e2cb452975b01fbdb8c32f031fe1ef26971d518245dd886d2da8ab6c058d61cb4b4b9b1cb56a754cd08c3ef3fa30e280042675fa2d8705874a763e WHIRLPOOL a8134ebf49cc1f58c1db9e1cf618e32316e027d773309490e8982e2277c5e49695836eb531f8f72905578b30f41631957f686f2fb6ee045e9f96631404936444
diff --git a/sys-firmware/intel-microcode/files/intel-microcode2ucode.c b/sys-firmware/intel-microcode/files/intel-microcode2ucode.c
new file mode 100644
index 000000000000..caad0323e805
--- /dev/null
+++ b/sys-firmware/intel-microcode/files/intel-microcode2ucode.c
@@ -0,0 +1,163 @@
+/*
+ * Convert Intel microcode.dat into individual ucode files
+ * named: intel-ucode/$family-$model-$stepping
+ *
+ * The subdir intel-ucode/ is created in the current working
+ * directory. We get multiple ucodes in the same file, so they
+ * are appended to an existing file. Make sure the directory
+ * is empty before every run of the converter.
+ *
+ * Kay Sievers <kay.sievers@vrfy.org>
+ */
+
+
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <limits.h>
+#include <stdbool.h>
+#include <inttypes.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <sys/stat.h>
+
+struct microcode_header_intel {
+	unsigned int hdrver;
+	unsigned int rev;
+	unsigned int date;
+	unsigned int sig;
+	unsigned int cksum;
+	unsigned int ldrver;
+	unsigned int pf;
+	unsigned int datasize;
+	unsigned int totalsize;
+	unsigned int reserved[3];
+};
+
+union mcbuf {
+	struct microcode_header_intel hdr;
+	unsigned int i[0];
+	char c[0];
+};
+
+int main(int argc, char *argv[])
+{
+	char *filename = "/lib/firmware/microcode.dat";
+	FILE *f;
+	char line[LINE_MAX];
+	char buf[4000000];
+	union mcbuf *mc;
+	size_t bufsize, count, start;
+	int rc = EXIT_SUCCESS;
+
+	if (argv[1] != NULL)
+		filename = argv[1];
+
+	count = 0;
+	mc = (union mcbuf *) buf;
+	f = fopen(filename, "re");
+	if (f == NULL) {
+		printf("open %s: %m\n", filename);
+		rc = EXIT_FAILURE;
+		goto out;
+	}
+
+	while (fgets(line, sizeof(line), f) != NULL) {
+		if (sscanf(line, "%x, %x, %x, %x",
+		    &mc->i[count],
+		    &mc->i[count + 1],
+		    &mc->i[count + 2],
+		    &mc->i[count + 3]) != 4)
+			continue;
+		count += 4;
+	}
+	fclose(f);
+
+	bufsize = count * sizeof(int);
+	printf("%s: %lu(%luk) bytes, %zu integers\n",
+	       filename,
+	       bufsize,
+	       bufsize / 1024,
+	       count);
+
+	if (bufsize < sizeof(struct microcode_header_intel))
+		goto out;
+
+	mkdir("intel-ucode", 0750);
+
+	start = 0;
+	for (;;) {
+		size_t size;
+		unsigned int family, model, stepping;
+		unsigned int year, month, day;
+
+		mc = (union mcbuf *) &buf[start];
+
+		if (mc->hdr.totalsize)
+			size = mc->hdr.totalsize;
+		else
+			size = 2000 + sizeof(struct microcode_header_intel);
+
+		if (mc->hdr.ldrver != 1 || mc->hdr.hdrver != 1) {
+			printf("unknown version/format:\n");
+			rc = EXIT_FAILURE;
+			break;
+		}
+
+		/*
+		 *  0- 3 stepping
+		 *  4- 7 model
+		 *  8-11 family
+		 * 12-13 type
+		 * 16-19 extended model
+		 * 20-27 extended family
+		 */
+		family = (mc->hdr.sig >> 8) & 0xf;
+		if (family == 0xf)
+			family += (mc->hdr.sig >> 20) & 0xff;
+		model = (mc->hdr.sig >> 4) & 0x0f;
+		if (family == 0x06)
+			model += ((mc->hdr.sig >> 16) & 0x0f) << 4;
+		stepping = mc->hdr.sig & 0x0f;
+
+		year = mc->hdr.date & 0xffff;
+		month = mc->hdr.date >> 24;
+		day = (mc->hdr.date >> 16) & 0xff;
+
+		asprintf(&filename, "intel-ucode/%02x-%02x-%02x", family, model, stepping);
+		printf("\n");
+		printf("%s\n", filename);
+		printf("signature: 0x%02x\n", mc->hdr.sig);
+		printf("flags:     0x%02x\n", mc->hdr.pf);
+		printf("revision:  0x%02x\n", mc->hdr.rev);
+		printf("date:      %04x-%02x-%02x\n", year, month, day);
+		printf("size:      %zu\n", size);
+
+		f = fopen(filename, "ae");
+		if (f == NULL) {
+			printf("open %s: %m\n", filename);
+			rc = EXIT_FAILURE;
+			goto out;
+		}
+		if (fwrite(mc, size, 1, f) != 1) {
+			printf("write %s: %m\n", filename);
+			rc = EXIT_FAILURE;
+			goto out;
+		}
+		fclose(f);
+		free(filename);
+
+		start += size;
+		if (start >= bufsize)
+			break;
+	}
+	printf("\n");
+out:
+	return rc;
+}
diff --git a/sys-firmware/intel-microcode/files/intel-microcode2ucode.c-r1 b/sys-firmware/intel-microcode/files/intel-microcode2ucode.c-r1
new file mode 100644
index 000000000000..4b3ba4b48ed4
--- /dev/null
+++ b/sys-firmware/intel-microcode/files/intel-microcode2ucode.c-r1
@@ -0,0 +1,166 @@
+/*
+ * Convert Intel microcode.dat into individual ucode files
+ * named: intel-ucode/$family-$model-$stepping
+ *
+ * The subdir intel-ucode/ is created in the current working
+ * directory. We get multiple ucodes in the same file, so they
+ * are appended to an existing file. Make sure the directory
+ * is empty before every run of the converter.
+ *
+ * Kay Sievers <kay.sievers@vrfy.org>
+ */
+
+
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <limits.h>
+#include <stdbool.h>
+#include <inttypes.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <sys/stat.h>
+
+struct microcode_header_intel {
+	unsigned int hdrver;
+	unsigned int rev;
+	unsigned int date;
+	unsigned int sig;
+	unsigned int cksum;
+	unsigned int ldrver;
+	unsigned int pf;
+	unsigned int datasize;
+	unsigned int totalsize;
+	unsigned int reserved[3];
+};
+
+union mcbuf {
+	struct microcode_header_intel hdr;
+	unsigned int i[0];
+	char c[0];
+};
+
+int main(int argc, char *argv[])
+{
+	char *filename = "/lib/firmware/microcode.dat";
+	FILE *f;
+	char line[LINE_MAX];
+	char buf[4000000];
+	union mcbuf *mc;
+	size_t bufsize, count, start;
+	int rc = EXIT_SUCCESS;
+
+	if (argv[1] != NULL)
+		filename = argv[1];
+
+	count = 0;
+	mc = (union mcbuf *) buf;
+	f = fopen(filename, "re");
+	if (f == NULL) {
+		printf("open %s: %m\n", filename);
+		rc = EXIT_FAILURE;
+		goto out;
+	}
+
+	while (fgets(line, sizeof(line), f) != NULL) {
+		if (sscanf(line, "%x, %x, %x, %x",
+		    &mc->i[count],
+		    &mc->i[count + 1],
+		    &mc->i[count + 2],
+		    &mc->i[count + 3]) != 4)
+			continue;
+		count += 4;
+	}
+	fclose(f);
+
+	bufsize = count * sizeof(int);
+	printf("%s: %lu(%luk) bytes, %zu integers\n",
+	       filename,
+	       bufsize,
+	       bufsize / 1024,
+	       count);
+
+	if (bufsize < sizeof(struct microcode_header_intel))
+		goto out;
+
+	mkdir("intel-ucode", 0750);
+
+	start = 0;
+	for (;;) {
+		size_t size;
+		unsigned int family, model, stepping;
+		unsigned int year, month, day;
+
+		mc = (union mcbuf *) &buf[start];
+
+		if (mc->hdr.totalsize)
+			size = mc->hdr.totalsize;
+		else
+			size = 2000 + sizeof(struct microcode_header_intel);
+
+		if (mc->hdr.ldrver != 1 || mc->hdr.hdrver != 1) {
+			printf("unknown version/format:\n");
+			rc = EXIT_FAILURE;
+			break;
+		}
+
+		/*
+		 *  0- 3 stepping
+		 *  4- 7 model
+		 *  8-11 family
+		 * 12-13 type
+		 * 16-19 extended model
+		 * 20-27 extended family
+		 */
+		family = (mc->hdr.sig >> 8) & 0xf;
+		if (family == 0xf)
+			family += (mc->hdr.sig >> 20) & 0xff;
+		model = (mc->hdr.sig >> 4) & 0x0f;
+		if (family == 0x06)
+			model += ((mc->hdr.sig >> 16) & 0x0f) << 4;
+		stepping = mc->hdr.sig & 0x0f;
+
+		year = mc->hdr.date & 0xffff;
+		month = mc->hdr.date >> 24;
+		day = (mc->hdr.date >> 16) & 0xff;
+
+		if (asprintf(&filename, "intel-ucode/%02x-%02x-%02x", family, model, stepping) < 0) {
+			rc = EXIT_FAILURE;
+			goto out;
+		}
+		printf("\n");
+		printf("%s\n", filename);
+		printf("signature: 0x%02x\n", mc->hdr.sig);
+		printf("flags:     0x%02x\n", mc->hdr.pf);
+		printf("revision:  0x%02x\n", mc->hdr.rev);
+		printf("date:      %04x-%02x-%02x\n", year, month, day);
+		printf("size:      %zu\n", size);
+
+		f = fopen(filename, "ae");
+		if (f == NULL) {
+			printf("open %s: %m\n", filename);
+			rc = EXIT_FAILURE;
+			goto out;
+		}
+		if (fwrite(mc, size, 1, f) != 1) {
+			printf("write %s: %m\n", filename);
+			rc = EXIT_FAILURE;
+			goto out;
+		}
+		fclose(f);
+		free(filename);
+
+		start += size;
+		if (start >= bufsize)
+			break;
+	}
+	printf("\n");
+out:
+	return rc;
+}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20140430.ebuild b/sys-firmware/intel-microcode/intel-microcode-20140430.ebuild
new file mode 100644
index 000000000000..4cfb5a96974f
--- /dev/null
+++ b/sys-firmware/intel-microcode/intel-microcode-20140430.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+# Find updates by searching and clicking the first link (hopefully it's the one):
+# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
+
+NUM="23829"
+DESCRIPTION="Intel IA32 microcode update data"
+HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
+SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
+
+LICENSE="intel-ucode"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE=""
+
+RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
+
+S=${WORKDIR}
+
+src_unpack() {
+	default
+	cp "${FILESDIR}"/intel-microcode2ucode.c ./ || die
+}
+
+src_compile() {
+	tc-env_build emake intel-microcode2ucode
+	./intel-microcode2ucode microcode.dat || die
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins -r microcode.dat intel-ucode
+}
+
+pkg_postinst() {
+	elog "The microcode available for Intel CPUs has been updated.  You'll need"
+	elog "to reload the code into your processor.  If you're using the init.d:"
+	elog "/etc/init.d/microcode_ctl restart"
+}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20140624.ebuild b/sys-firmware/intel-microcode/intel-microcode-20140624.ebuild
new file mode 100644
index 000000000000..9f69a6c0b6dc
--- /dev/null
+++ b/sys-firmware/intel-microcode/intel-microcode-20140624.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+# Find updates by searching and clicking the first link (hopefully it's the one):
+# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
+
+NUM="23984"
+DESCRIPTION="Intel IA32 microcode update data"
+HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
+SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
+
+LICENSE="intel-ucode"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
+
+S=${WORKDIR}
+
+src_unpack() {
+	default
+	cp "${FILESDIR}"/intel-microcode2ucode.c ./ || die
+}
+
+src_compile() {
+	tc-env_build emake intel-microcode2ucode
+	./intel-microcode2ucode microcode.dat || die
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins -r microcode.dat intel-ucode
+}
+
+pkg_postinst() {
+	elog "The microcode available for Intel CPUs has been updated.  You'll need"
+	elog "to reload the code into your processor.  If you're using the init.d:"
+	elog "/etc/init.d/microcode_ctl restart"
+}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20140913.ebuild b/sys-firmware/intel-microcode/intel-microcode-20140913.ebuild
new file mode 100644
index 000000000000..648c274af8d0
--- /dev/null
+++ b/sys-firmware/intel-microcode/intel-microcode-20140913.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+# Find updates by searching and clicking the first link (hopefully it's the one):
+# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
+
+NUM="24290"
+DESCRIPTION="Intel IA32 microcode update data"
+HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
+SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
+
+LICENSE="intel-ucode"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
+
+S=${WORKDIR}
+
+src_unpack() {
+	default
+	cp "${FILESDIR}"/intel-microcode2ucode.c ./ || die
+}
+
+src_compile() {
+	tc-env_build emake intel-microcode2ucode
+	./intel-microcode2ucode microcode.dat || die
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins -r microcode.dat intel-ucode
+}
+
+pkg_postinst() {
+	elog "The microcode available for Intel CPUs has been updated.  You'll need"
+	elog "to reload the code into your processor.  If you're using the init.d:"
+	elog "/etc/init.d/microcode_ctl restart"
+}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20150121-r1.ebuild b/sys-firmware/intel-microcode/intel-microcode-20150121-r1.ebuild
new file mode 100644
index 000000000000..ea34c1254119
--- /dev/null
+++ b/sys-firmware/intel-microcode/intel-microcode-20150121-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+# Find updates by searching and clicking the first link (hopefully it's the one):
+# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
+
+NUM="24661"
+DESCRIPTION="Intel IA32 microcode update data"
+HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
+SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
+
+LICENSE="intel-ucode"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="initramfs monolithic +split-ucode"
+REQUIRED_USE="|| ( initramfs monolithic split-ucode )"
+
+DEPEND="initramfs? ( sys-apps/iucode_tool )"
+RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
+
+S=${WORKDIR}
+
+src_unpack() {
+	default
+	cp "${FILESDIR}"/intel-microcode2ucode.c ./ || die
+}
+
+src_compile() {
+	if use initramfs ; then
+		iucode_tool --write-earlyfw=microcode.cpio microcode.dat || die
+	fi
+
+	if use split-ucode ; then
+		tc-env_build emake intel-microcode2ucode
+		./intel-microcode2ucode microcode.dat || die
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	use initramfs && doins microcode.cpio
+	use monolithic && doins microcode.dat
+	use split-ucode && doins -r intel-ucode
+}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20150121.ebuild b/sys-firmware/intel-microcode/intel-microcode-20150121.ebuild
new file mode 100644
index 000000000000..46c67d4d05ec
--- /dev/null
+++ b/sys-firmware/intel-microcode/intel-microcode-20150121.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+# Find updates by searching and clicking the first link (hopefully it's the one):
+# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
+
+NUM="24661"
+DESCRIPTION="Intel IA32 microcode update data"
+HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
+SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
+
+LICENSE="intel-ucode"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE=""
+
+RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
+
+S=${WORKDIR}
+
+src_unpack() {
+	default
+	cp "${FILESDIR}"/intel-microcode2ucode.c ./ || die
+}
+
+src_compile() {
+	tc-env_build emake intel-microcode2ucode
+	./intel-microcode2ucode microcode.dat || die
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins -r microcode.dat intel-ucode
+}
+
+pkg_postinst() {
+	elog "The microcode available for Intel CPUs has been updated.  You'll need"
+	elog "to reload the code into your processor.  If you're using the init.d:"
+	elog "/etc/init.d/microcode_ctl restart"
+}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20151106.ebuild b/sys-firmware/intel-microcode/intel-microcode-20151106.ebuild
new file mode 100644
index 000000000000..b852df2c4f0a
--- /dev/null
+++ b/sys-firmware/intel-microcode/intel-microcode-20151106.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+# Find updates by searching and clicking the first link (hopefully it's the one):
+# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
+
+NUM="25512"
+DESCRIPTION="Intel IA32 microcode update data"
+HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
+SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
+
+LICENSE="intel-ucode"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE="initramfs monolithic +split-ucode"
+REQUIRED_USE="|| ( initramfs monolithic split-ucode )"
+
+DEPEND="initramfs? ( sys-apps/iucode_tool )"
+RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
+
+S=${WORKDIR}
+
+src_unpack() {
+	default
+	cp "${FILESDIR}"/intel-microcode2ucode.c ./ || die
+}
+
+src_compile() {
+	if use initramfs ; then
+		iucode_tool --write-earlyfw=microcode.cpio microcode.dat || die
+	fi
+
+	if use split-ucode ; then
+		tc-env_build emake intel-microcode2ucode
+		./intel-microcode2ucode microcode.dat || die
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	use initramfs && doins microcode.cpio
+	use monolithic && doins microcode.dat
+	use split-ucode && doins -r intel-ucode
+}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20160607.ebuild b/sys-firmware/intel-microcode/intel-microcode-20160607.ebuild
new file mode 100644
index 000000000000..98ccc671d016
--- /dev/null
+++ b/sys-firmware/intel-microcode/intel-microcode-20160607.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit toolchain-funcs
+
+# Find updates by searching and clicking the first link (hopefully it's the one):
+# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
+
+NUM="26083"
+DESCRIPTION="Intel IA32/IA64 microcode update data"
+HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
+SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
+
+LICENSE="intel-ucode"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="initramfs monolithic +split-ucode"
+REQUIRED_USE="|| ( initramfs monolithic split-ucode )"
+
+DEPEND="initramfs? ( sys-apps/iucode_tool )"
+RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
+
+S=${WORKDIR}
+
+src_unpack() {
+	default
+	cp "${FILESDIR}"/intel-microcode2ucode.c ./ || die
+}
+
+src_compile() {
+	if use initramfs ; then
+		iucode_tool --write-earlyfw=microcode.cpio microcode.dat || die
+	fi
+
+	if use split-ucode ; then
+		tc-env_build emake intel-microcode2ucode
+		./intel-microcode2ucode microcode.dat || die
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	use initramfs && doins microcode.cpio
+	use monolithic && doins microcode.dat
+	use split-ucode && doins -r intel-ucode
+}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20160714.ebuild b/sys-firmware/intel-microcode/intel-microcode-20160714.ebuild
new file mode 100644
index 000000000000..7630a2dd1d70
--- /dev/null
+++ b/sys-firmware/intel-microcode/intel-microcode-20160714.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+# Find updates by searching and clicking the first link (hopefully it's the one):
+# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
+
+NUM="26156"
+DESCRIPTION="Intel IA32/IA64 microcode update data"
+HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
+SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
+
+LICENSE="intel-ucode"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="initramfs monolithic +split-ucode"
+REQUIRED_USE="|| ( initramfs monolithic split-ucode )"
+
+DEPEND="initramfs? ( sys-apps/iucode_tool )"
+RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
+
+S=${WORKDIR}
+
+src_unpack() {
+	default
+	cp "${FILESDIR}"/intel-microcode2ucode.c ./ || die
+}
+
+src_compile() {
+	if use initramfs ; then
+		iucode_tool --write-earlyfw=microcode.cpio microcode.dat || die
+	fi
+
+	if use split-ucode ; then
+		tc-env_build emake intel-microcode2ucode
+		./intel-microcode2ucode microcode.dat || die
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	use initramfs && doins microcode.cpio
+	use monolithic && doins microcode.dat
+	use split-ucode && doins -r intel-ucode
+}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20161104.ebuild b/sys-firmware/intel-microcode/intel-microcode-20161104.ebuild
new file mode 100644
index 000000000000..6e0c51a6f19a
--- /dev/null
+++ b/sys-firmware/intel-microcode/intel-microcode-20161104.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+# Find updates by searching and clicking the first link (hopefully it's the one):
+# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
+
+NUM="26400"
+DESCRIPTION="Intel IA32/IA64 microcode update data"
+HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
+SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
+
+LICENSE="intel-ucode"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE="initramfs monolithic +split-ucode"
+REQUIRED_USE="|| ( initramfs monolithic split-ucode )"
+
+DEPEND="initramfs? ( sys-apps/iucode_tool )"
+RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
+
+S=${WORKDIR}
+
+src_unpack() {
+	default
+	cp "${FILESDIR}"/intel-microcode2ucode.c ./ || die
+}
+
+src_compile() {
+	if use initramfs ; then
+		iucode_tool --write-earlyfw=microcode.cpio microcode.dat || die
+	fi
+
+	if use split-ucode ; then
+		tc-env_build emake intel-microcode2ucode
+		./intel-microcode2ucode microcode.dat || die
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	use initramfs && doins microcode.cpio
+	use monolithic && doins microcode.dat
+	use split-ucode && doins -r intel-ucode
+}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20170511.ebuild b/sys-firmware/intel-microcode/intel-microcode-20170511.ebuild
new file mode 100644
index 000000000000..20126a02fada
--- /dev/null
+++ b/sys-firmware/intel-microcode/intel-microcode-20170511.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+# Find updates by searching and clicking the first link (hopefully it's the one):
+# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
+
+NUM="26798"
+DESCRIPTION="Intel IA32/IA64 microcode update data"
+HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
+SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
+
+LICENSE="intel-ucode"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE="initramfs monolithic +split-ucode"
+REQUIRED_USE="|| ( initramfs monolithic split-ucode )"
+
+DEPEND="initramfs? ( sys-apps/iucode_tool )"
+RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
+
+S=${WORKDIR}
+
+src_unpack() {
+	default
+	cp "${FILESDIR}"/intel-microcode2ucode.c ./ || die
+}
+
+src_compile() {
+	if use initramfs ; then
+		iucode_tool --write-earlyfw=microcode.cpio microcode.dat || die
+	fi
+
+	if use split-ucode ; then
+		tc-env_build emake intel-microcode2ucode
+		./intel-microcode2ucode microcode.dat || die
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	use initramfs && doins microcode.cpio
+	use monolithic && doins microcode.dat
+	use split-ucode && doins -r intel-ucode
+}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20170707.ebuild b/sys-firmware/intel-microcode/intel-microcode-20170707.ebuild
new file mode 100644
index 000000000000..386a152c3e26
--- /dev/null
+++ b/sys-firmware/intel-microcode/intel-microcode-20170707.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+# Find updates by searching and clicking the first link (hopefully it's the one):
+# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
+
+NUM="26925"
+DESCRIPTION="Intel IA32/IA64 microcode update data"
+HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
+SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
+
+LICENSE="intel-ucode"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE="initramfs monolithic +split-ucode"
+REQUIRED_USE="|| ( initramfs monolithic split-ucode )"
+
+DEPEND="initramfs? ( sys-apps/iucode_tool )"
+RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
+
+S=${WORKDIR}
+
+src_unpack() {
+	default
+	cp "${FILESDIR}"/intel-microcode2ucode.c-r1 ./intel-microcode2ucode.c || die
+}
+
+src_compile() {
+	if use initramfs ; then
+		iucode_tool --write-earlyfw=microcode.cpio microcode.dat || die
+	fi
+
+	if use split-ucode ; then
+		tc-env_build emake intel-microcode2ucode
+		./intel-microcode2ucode microcode.dat || die
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	use initramfs && doins microcode.cpio
+	use monolithic && doins microcode.dat
+	use split-ucode && doins -r intel-ucode
+}
diff --git a/sys-firmware/intel-microcode/metadata.xml b/sys-firmware/intel-microcode/metadata.xml
new file mode 100644
index 000000000000..f8bcf6658dd3
--- /dev/null
+++ b/sys-firmware/intel-microcode/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+<use>
+	<flag name="initramfs">install a small initramfs for use with CONFIG_MICROCODE_EARLY</flag>
+	<flag name="monolithic">install the large text microcode.dat (used by older kernels via microcode_ctl)</flag>
+	<flag name="split-ucode">install the split binary ucode files (used by the kernel directly)</flag>
+</use>
+</pkgmetadata>
diff --git a/sys-firmware/ipw2100-firmware/Manifest b/sys-firmware/ipw2100-firmware/Manifest
new file mode 100644
index 000000000000..70cfd17285fa
--- /dev/null
+++ b/sys-firmware/ipw2100-firmware/Manifest
@@ -0,0 +1,5 @@
+DIST ipw2100-fw-1.3.tgz 248471 SHA256 e1107c455e48d324a616b47a622593bc8413dcce72026f72731c0b03dae3a7a2 SHA512 1e1b8406a795a2f7f9d4d5ba533293daf1a3f3583dbe6eac45849176da8fc46d261bf4ca6a0b236c67c48313b6ff0feb5f9f2019cacbef65471dc0d36e1e1114 WHIRLPOOL 42629321f8d7736c19b38dd26a2db74f7749a2dec1172efacbc85a2db2d19a892bed995ca44ec8aafc64bcb82cea6c1bc85ff8b72c3d472a6414712ecc6eb1e2
+EBUILD ipw2100-firmware-1.3.ebuild 446 SHA256 f301eca66257cd3f5d3d3c326b451a316009fde61c3f68474b04f9373e717327 SHA512 ebd1929844b7a0f49d7d44bd8ffc834d9a291ea0b95120a387343ea0f1f46a1030e632cacd616f585f42b2a2d12a729747e579239071fa9ef2fecc12c64225cd WHIRLPOOL 3ccecb09a4be5898a929bc2eb6f72dc0b22dfa741d65bfe3fc17e90528764f7ed1ab68f9608f48c40491ec2ebbdef1564ad5ad4184e781f95e2f9dc6431646e4
+MISC ChangeLog 3095 SHA256 b2b8c99ef2ad3ea5557307a041d85868db6826341a8d48abd429c4285241d120 SHA512 15004745ff3066b1067f459919b44aae0b6e78ec3a2a8625138eff2e533b47820a8bca82ee5adaf41c95fec2cb553860950ece6a2506d6d6a1c4c8f3c6be908c WHIRLPOOL bb6cb9443154788f8e55df3fe3ff62e7df60dbdec3cdc1c4530b9528a9875416892e9c9f68286ecf8f02dbf5f9a5a4d3628f17007782da2cd47663c56e670e1e
+MISC ChangeLog-2015 1803 SHA256 ffac8e5d1cc8d0fc7459d8061abc33dc53fbd65c1968e426c19aa6029bd0beb6 SHA512 f173aabece7f60824f61bb4ae0980c67eeb9e1e9d536086d73fdb704a72432472be63eeb6dfe73b40461b7e7c290bb7e5ef303d8ced90de501f0cd815c1fff61 WHIRLPOOL 5f927ae1d4ea08a6295d649c413ad69a4c6c0ff0e87c2097d6ba78ade96aaff39535cf10614ea79d8ca4d9dfd0e4e5a1705e5a75c6d3eb19c3fd79126f13d25d
+MISC metadata.xml 244 SHA256 95433a63ffd8fed9f50f35e28fe20817c39b6b07c1d855971b1705396b1347be SHA512 f291f893ed567000a11bad528d120faf64e71163a3b082fa6fd37ae91d39d968603427b8a574b270f62eb4b0dcc2ce9479596a60ac03f31a3a4061b15133adba WHIRLPOOL 1bd11487ba731125d35c7e777387996f8a60d5a6d9958a44c1f554596f3a367723a77899fcd61d016d31911557bccd7ebf3358aba356921c936a690708c9e11e
diff --git a/sys-firmware/ipw2100-firmware/ipw2100-firmware-1.3.ebuild b/sys-firmware/ipw2100-firmware/ipw2100-firmware-1.3.ebuild
new file mode 100644
index 000000000000..8fe1580e831a
--- /dev/null
+++ b/sys-firmware/ipw2100-firmware/ipw2100-firmware-1.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_P=${P/firmware/fw}
+
+DESCRIPTION="Firmware for the Intel PRO/Wireless 2100 3B miniPCI adapter"
+HOMEPAGE="http://ipw2100.sourceforge.net/"
+SRC_URI="mirror://gentoo/${MY_P}.tgz"
+
+LICENSE="ipw2100-fw"
+SLOT="${PV}"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+S=${WORKDIR}
+
+src_install() {
+	insinto /lib/firmware
+	doins ipw2100-${PV}{,-i,-p}.fw
+}
diff --git a/sys-firmware/ipw2100-firmware/metadata.xml b/sys-firmware/ipw2100-firmware/metadata.xml
new file mode 100644
index 000000000000..4554e407ac93
--- /dev/null
+++ b/sys-firmware/ipw2100-firmware/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">ipw2100</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-firmware/ipw2200-firmware/Manifest b/sys-firmware/ipw2200-firmware/Manifest
new file mode 100644
index 000000000000..b76329e9c08b
--- /dev/null
+++ b/sys-firmware/ipw2200-firmware/Manifest
@@ -0,0 +1,5 @@
+DIST ipw2200-fw-3.1.tgz 270042 SHA256 c6818c11c18cc030d55ff83f64b2bad8feef485e7742f84f94a61d811a6258bd SHA512 b588566d67a31e8e5c464991f2de5420822816528a388829e36ba47080d2edd10794b0b1d05562035c54e9bb9a9999504a2ff099a37157c39b3c71b125748ad8 WHIRLPOOL ea2507a1c876aceb9209c7f75223c0ec9eed1a7da8595d6d40ef83c2b9bca05a208c3040d23c581d7293992e1e0643f1df591a59c13399832631a1291bbfabed
+EBUILD ipw2200-firmware-3.1.ebuild 485 SHA256 de6ac5bb6191ff41c711545253cb4aafe75af2aec13ad2fc6a4292dbc1b3293a SHA512 a91b1af23a83ce943de63f9deff034b48357e0b9c354b12f9d31ee88f839759cd955bce42ef4ebb72957061aa9223c07522a040840dd4b3fc60b99168318ac0d WHIRLPOOL d025eac9c6e1b52cc158eb1aa9ad4179b2ff2f9d783d4f988129f31692cb3f2ce545f22c71e3befe5901225bd92f6172420bc010474dac1e942cfa8299e8352f
+MISC ChangeLog 3095 SHA256 49101656b26873354bbea1ede1570c1e0a1927400fcddbe1b739ec788d9ab788 SHA512 04370be9de3fa8cbf639c1bcecaf89db6703ab31e6d7794f76cb93482b8ccdc5422c7baff9559dca82baeec94e0ffca8bdb7399b360139081961103e398a9902 WHIRLPOOL bf1a2584c0c13db3e6dc359ad676a185e768c0779f5054c6f26cf7f7c39becde5474d6d42451ca2e7d457136844fc9c5821d13d0ba082ef96da7ef846ce31913
+MISC ChangeLog-2015 3969 SHA256 852a05bb30ba30c8a8ae32726293fe7d283e2b977994f9647b0d0763e33cddc1 SHA512 ca1859ffe3e4e23871527a702b027b26015fa3b669a72c734135381ff997182db07e1f9dd5e4278b1f1e152658b35b90bc3f7ad4b7705612f277882064aa5d23 WHIRLPOOL a34f03aa7bfc12cd62b6765c7a9cb5b9fd87e75d4486df171fbc5ad0441846a7767a92b389fe3f80ed8b6b52e671bb5633241fb54a153ee8849eadf62cf3c9cf
+MISC metadata.xml 244 SHA256 c812759d29df56a35f7392b4470e1b3defe30d97968c241937df0a399d4d2e1e SHA512 2db8c7e71bb88fb6c396cf9ec62a46ac34029d9abfa98019a7b7bd2a365cb9d1bf8ad39b3c121a6d9aa2eb8d7fcc93252855e129295823a5dbcb87a902959936 WHIRLPOOL 429f3fd1fe32a2f9a68bc354eb6bce35369044a290a459482981ee8c1f3892db3923c474c3079a6057f063bea7af0af10f6185f4315135c1900e1fb2bffabb5b
diff --git a/sys-firmware/ipw2200-firmware/ipw2200-firmware-3.1.ebuild b/sys-firmware/ipw2200-firmware/ipw2200-firmware-3.1.ebuild
new file mode 100644
index 000000000000..ee07ac7f89c9
--- /dev/null
+++ b/sys-firmware/ipw2200-firmware/ipw2200-firmware-3.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_P=${P/firmware/fw}
+
+DESCRIPTION="Firmware for the Intel PRO/Wireless 2200BG/2915ABG miniPCI and 2225BG PCI"
+HOMEPAGE="http://ipw2200.sourceforge.net/"
+SRC_URI="http://www.bughost.org/firmware/${MY_P}.tgz"
+
+LICENSE="ipw2200-fw"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+	insinto /lib/firmware
+	doins ipw2200-{bss,ibss,sniffer}.fw
+}
diff --git a/sys-firmware/ipw2200-firmware/metadata.xml b/sys-firmware/ipw2200-firmware/metadata.xml
new file mode 100644
index 000000000000..e9a946c54252
--- /dev/null
+++ b/sys-firmware/ipw2200-firmware/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">ipw2200</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-firmware/ipxe/Manifest b/sys-firmware/ipxe/Manifest
new file mode 100644
index 000000000000..6b06ad63ca9f
--- /dev/null
+++ b/sys-firmware/ipxe/Manifest
@@ -0,0 +1,10 @@
+AUX ipxe-1.0.0_p20130925-git-version.patch 1344 SHA256 86b3ebaaf502cb27d44ce974d13567dc7ece11f82c9900eeb6e9d54747793c07 SHA512 f52e90d590555678429d28e8d25f4023f2152b314d8d7f7d5c3774993253999d655a1b69f4d0b1320f82497f72bba566185c811e11ceca4e4920d7486b723ddd WHIRLPOOL 45a5eb773f4040ad6b08d121ccfc7b98d788b2c55db31a35838a2f73c21b3197a37e59096ca2db276543eb18b2b46338af378a2f1986d9010504b25998dda308
+AUX ipxe-1.0.0_p20130925-no-pie.patch 1059 SHA256 f0e7608b096ffc26fa2d28e451c8d247f4cf00ad5afb539c8ab2831945c33218 SHA512 98f7fb065068c1bbd6275ae08d826fef307d5541d9d73f0d695068c651cfebf926f9089ad28239235b31adad0a0cbcdb43380ba1fbfc12482985fe9f13acae7d WHIRLPOOL 67d3b41299a1be2d613c54abbfebc968d742e79fa590a30af6424468f61c869a3487a78860778cef5bb85375b48564961e2149e797734204e8e4548962b4f71a
+AUX ipxe-1.0.0_p20160620-no-pie.patch 1053 SHA256 a52709963165bb5ae0685255b48b97467eea24c70e514be29e1ad8c1d8ca602e SHA512 baace4f9b0d3a2b280beacf742c9bbbe8b276c79f13e46c3e6d1d63727da28816bb4bbc19f83306a5939ba7a22c29dca0ba4d80e47ace9b0c151db524076afe9 WHIRLPOOL ce5896f0a3083f59b6ff4c2e5d1e77494debd390fa1caa2763991091d19ca0fa97ec1e1f9b6d0f8975bf3e954e7c33ff6f408bb17734d9fa48e8befa9e15e194
+DIST ipxe-1.0.0_p20130925-cba22d3.tar.bz2 2240189 SHA256 c9c819bac8a925aad30ac88a23a86dd5591a9c31846058e77465d05551fc6189 SHA512 a098d3fc0f68067be281b9c3654bb1b0be1b9d397327b55b36b17e69faf03ce6117d0278552c06990a5020e4ece7acac168d975b3c7bfce3b6865dea1fd1d8dd WHIRLPOOL 11442ea81032b4c9c00d3c1346761163cbcf2db2bc957bfbaba74c7f9109136bf5334e26752f9d10a8ed0f093ae39fd28e4152d522aa4dd86e4d1c05695d7d3a
+DIST ipxe-1.0.0_p20160620-694c18a.tar.bz2 2839663 SHA256 96398c7d80fdcc0e19763b55dc7a38eed8f227546f9bc5db95b7a8c75df9b14e SHA512 67657dabe09f497c270cca16391669c89032112c1496b54009e2f1e8a477904d758476d4e465973aa0b6fc764be48ed6421607189aaea76e23fa0da6e9c8add5 WHIRLPOOL 945f6d366c96c47ef1df3e9732c3a1131dcab0c6290bb52e120f7af22fce546c8592e925bbb91b0903f8e9cb8d1c2f05431a64b68415273377305121e75595c5
+EBUILD ipxe-1.0.0_p20130925.ebuild 2532 SHA256 d65fc7404f40a0bc59a5133f7322c7dadb8d2fcd8dc33b74161fa1d73846779b SHA512 d58eb5fc8dd50c2822474f07a7060f0bbff77c3ad815a0358503db365ee7c5e1d0b5f45da42a6a6653acd24537872ecfe3060e344681e6e65f3098ef409ad937 WHIRLPOOL 2cebc5ad563dfe451911bae02727e06f925f0eac5131bea06b62ca9c414539d1326f0cfd5fecc51c529eac27e45b19f0b2f53866966eb750c11cdd096cbb9c82
+EBUILD ipxe-1.0.0_p20160620.ebuild 2658 SHA256 f172ff783bfebd985d4a1a4e1da4fdeb63d7ae43bca88a07f2276c62630096bd SHA512 582abace1b57854b49d326fc88ec9e066d7ca287964f16c2f65f3a4b853ae65fd63aaf8f47d85adab4a71cf39be794eedb8452cc5380850dd4a19808bdf908d8 WHIRLPOOL 6af1a630f020dd26b7b619e6f784db912c9ae66f0f1d01413964cab29c5a33f0d9c574764263a4853d6fd2e1c16df692bbb95e3b3af23fb75163ab92e9f15203
+MISC ChangeLog 4570 SHA256 a7bee1f4776b357fc621c70bd833a9936979771d63372209d1a923a5d6cdc10d SHA512 d2692aa754881f5f6f359c2a81f923f9cdb25008b2b27bf3882a41944ba255496207fc84386b8576dfef3b7ee73542367192a9466105a150236ff4362f78474d WHIRLPOOL aa00123e453e6c2e1ab4801c6cc773e2450d176d965fb34657971995da0c340373535f66341d89e1b3152b1292ce2afa2af15f4664a46c19d76ca374699cdcc5
+MISC ChangeLog-2015 3563 SHA256 69d00bac24c1094f04a4ef269fb93292790bac191209eaf6123995e1bdd29892 SHA512 189bbcbf7d65dab23c23494d043c105f0cdf2a8c478f409bbe7068a8409c7c7d9de3e9810993690cc6fe7345c93b133d97206783ead623454d19af3ed60e5434 WHIRLPOOL da819b56d2414a29b73db26b349004c97515b8f8d87f09ce07354d93fa2a84b3e8fc3ff1cfd2e91a37f02338ecad318d58ff097751589c9f7a9931ddc3c689c2
+MISC metadata.xml 787 SHA256 3c52d6a850326eceddd112e525d2e1fece94c43ed71ed98d46c30afa3a8c175c SHA512 3fed11d48c302d4800b20f4b7fb6a232bfc388b950b88357f35a33792063f1c143eb7f97e16cfb35ddb893688fc1efeac47a40dd56f97c18ebbd3ad690393b34 WHIRLPOOL 2713273a991bbbe8d2a473a3be5b8f58612282e665ded9dac4c7a5e462a0ce8f991b7935c9704ee95b2b157bf1b5222f6895616b95d1e0b2e2eba36bbc5b2537
diff --git a/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-git-version.patch b/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-git-version.patch
new file mode 100644
index 000000000000..a981abdd892e
--- /dev/null
+++ b/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-git-version.patch
@@ -0,0 +1,38 @@
+From 6153c09c41034250408f3596555fcaae715da46c Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Mon, 28 Jul 2014 16:47:48 +0100
+Subject: [PATCH] [build] Set GITVERSION only if there is a git repository
+
+The $(BIN)/version.%.o target will fail if iPXE is built within a
+non-git repository, e.g. when the user downloaded and extracted an
+archive containing iPXE sources, *and* if any parent directory of the
+iPXE sources is a git repository (or even contains a directory named
+".git").  This is because git will by default ascend the directory
+tree and look for ".git".
+
+The problem typically manifests on source based distributions, see for
+example https://bugs.gentoo.org/show_bug.cgi?id=482804
+
+Modified-by: Michael Brown <mcb30@ipxe.org>
+Signed-off-by: Michael Brown <mcb30@ipxe.org>
+---
+ src/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 22a7335..c6760ee 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -190,8 +190,8 @@ VERSION_PATCH	= 0
+ EXTRAVERSION	= +
+ MM_VERSION	= $(VERSION_MAJOR).$(VERSION_MINOR)
+ VERSION		= $(MM_VERSION).$(VERSION_PATCH)$(EXTRAVERSION)
++ifneq ($(wildcard ../.git),)
+ GITVERSION := $(shell git describe --always --abbrev=1 --match "" 2>/dev/null)
+-ifneq ($(GITVERSION),)
+ VERSION		+= ($(GITVERSION))
+ endif
+ version :
+-- 
+2.3.2
+
diff --git a/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-no-pie.patch b/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-no-pie.patch
new file mode 100644
index 000000000000..3156f3d11700
--- /dev/null
+++ b/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-no-pie.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/585752
+
+From cea213034635e4d765b2f362057b696febbe509f Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 21 Jun 2016 00:47:32 -0400
+Subject: [PATCH] [build] fix PIE disable flag
+
+The flag is "-no-pie", not "-nopie".
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ src/arch/i386/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile
+index fe3adc9ce436..59ad25b6e0af 100644
+--- a/src/Makefile.housekeeping
++++ b/src/Makefile.housekeeping
+@@ -75,8 +75,8 @@ CFLAGS			+= -Ui386
+ # output on stderr instead of checking the exit status.
+ #
+ ifeq ($(CCTYPE),gcc)
+-PIE_TEST = [ -z "`$(CC) -fno-PIE -nopie -x c -c /dev/null -o /dev/null 2>&1`" ]
+-PIE_FLAGS := $(shell $(PIE_TEST) && $(ECHO) '-fno-PIE -nopie')
++PIE_TEST = for f in -nopie -no-pie; do [ -z "`$(CC) -fno-PIE $$f -x c -c /dev/null -o /dev/null 2>&1`" ] && $(ECHO) -fno-PIE $$f; done
++PIE_FLAGS := $(shell $(PIE_TEST))
+ WORKAROUND_CFLAGS += $(PIE_FLAGS)
+ endif
+ 
+-- 
+2.8.2
+
diff --git a/sys-firmware/ipxe/files/ipxe-1.0.0_p20160620-no-pie.patch b/sys-firmware/ipxe/files/ipxe-1.0.0_p20160620-no-pie.patch
new file mode 100644
index 000000000000..a0501d187904
--- /dev/null
+++ b/sys-firmware/ipxe/files/ipxe-1.0.0_p20160620-no-pie.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/585752
+
+From cea213034635e4d765b2f362057b696febbe509f Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 21 Jun 2016 00:47:32 -0400
+Subject: [PATCH] [build] fix PIE disable flag
+
+The flag is "-no-pie", not "-nopie".
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ src/arch/i386/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile
+index fe3adc9ce436..59ad25b6e0af 100644
+--- a/src/arch/i386/Makefile
++++ b/src/arch/i386/Makefile
+@@ -75,8 +75,8 @@ CFLAGS			+= -Ui386
+ # output on stderr instead of checking the exit status.
+ #
+ ifeq ($(CCTYPE),gcc)
+-PIE_TEST = [ -z "`$(CC) -fno-PIE -nopie -x c -c /dev/null -o /dev/null 2>&1`" ]
+-PIE_FLAGS := $(shell $(PIE_TEST) && $(ECHO) '-fno-PIE -nopie')
++PIE_TEST = for f in -nopie -no-pie; do [ -z "`$(CC) -fno-PIE $$f -x c -c /dev/null -o /dev/null 2>&1`" ] && $(ECHO) -fno-PIE $$f; done
++PIE_FLAGS := $(shell $(PIE_TEST))
+ WORKAROUND_CFLAGS += $(PIE_FLAGS)
+ endif
+ 
+-- 
+2.8.2
+
diff --git a/sys-firmware/ipxe/ipxe-1.0.0_p20130925.ebuild b/sys-firmware/ipxe/ipxe-1.0.0_p20130925.ebuild
new file mode 100644
index 000000000000..574ffdf1986b
--- /dev/null
+++ b/sys-firmware/ipxe/ipxe-1.0.0_p20130925.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs eutils savedconfig
+
+GIT_REV="cba22d36b77da53890bd65fdadd0e63925687af0"
+GIT_SHORT="cba22d3"
+
+DESCRIPTION="Open source network boot (PXE) firmware"
+HOMEPAGE="http://ipxe.org"
+SRC_URI="https://git.ipxe.org/ipxe.git/snapshot/${GIT_REV}.tar.bz2 -> ${P}-${GIT_SHORT}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="efi ipv6 iso lkrn +qemu undi usb vmware"
+
+DEPEND="dev-lang/perl
+	sys-libs/zlib
+	iso? (
+		sys-boot/syslinux
+		virtual/cdrtools
+	)"
+RDEPEND=""
+
+S="${WORKDIR}/ipxe-${GIT_SHORT}/src"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-git-version.patch #482804
+	epatch "${FILESDIR}"/${P}-no-pie.patch #585752
+}
+
+src_configure() {
+	cat <<-EOF > "${S}"/config/local/general.h
+#undef BANNER_TIMEOUT
+#define BANNER_TIMEOUT 0
+EOF
+
+	use ipv6 && echo "#define NET_PROTO_IPV6" >> "${S}"/config/local/general.h
+
+	if use vmware; then
+		cat <<-EOF >> "${S}"/config/local/general.h
+#define VMWARE_SETTINGS
+#define CONSOLE_VMWARE
+EOF
+	fi
+
+	restore_config config/local/general.h
+
+	tc-ld-disable-gold
+}
+
+src_compile() {
+	ipxemake() {
+		# Q='' makes the build verbose since that's what everyone loves now
+		emake Q='' \
+			CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" \
+			AR="$(tc-getAR)" \
+			OBJCOPY="$(tc-getOBJCOPY)" \
+			RANLIB="$(tc-getRANLIB)" \
+			OBJDUMP="$(tc-getOBJDUMP)" \
+			HOST_CC="$(tc-getBUILD_CC)" \
+			"$@"
+	}
+
+	export NO_WERROR=1
+	if use qemu; then
+		ipxemake bin/808610de.rom # pxe-e1000.rom (old)
+		ipxemake bin/8086100e.rom # pxe-e1000.rom
+		ipxemake bin/80861209.rom # pxe-eepro100.rom
+		ipxemake bin/10500940.rom # pxe-ne2k_pci.rom
+		ipxemake bin/10222000.rom # pxe-pcnet.rom
+		ipxemake bin/10ec8139.rom # pxe-rtl8139.rom
+		ipxemake bin/1af41000.rom # pxe-virtio.rom
+		fi
+
+	if use vmware; then
+		ipxemake bin/8086100f.mrom # e1000
+		ipxemake bin/808610d3.mrom # e1000e
+		ipxemake bin/10222000.mrom # vlance
+		ipxemake bin/15ad07b0.rom # vmxnet3
+	fi
+
+	use efi && ipxemake PLATFORM=efi BIN=bin-efi bin-efi/ipxe.efi
+	use iso && ipxemake bin/ipxe.iso
+	use undi && ipxemake bin/undionly.kpxe
+	use usb && ipxemake bin/ipxe.usb
+	use lkrn && ipxemake bin/ipxe.lkrn
+}
+
+src_install() {
+	insinto /usr/share/ipxe/
+
+	if use qemu || use vmware; then
+		doins bin/*.rom
+	fi
+	use vmware && doins bin/*.mrom
+	use efi && doins bin-efi/*.efi
+	use iso && doins bin/*.iso
+	use undi && doins bin/*.kpxe
+	use usb && doins bin/*.usb
+	use lkrn && doins bin/*.lkrn
+
+	save_config config/local/general.h
+}
diff --git a/sys-firmware/ipxe/ipxe-1.0.0_p20160620.ebuild b/sys-firmware/ipxe/ipxe-1.0.0_p20160620.ebuild
new file mode 100644
index 000000000000..8e0a5495f087
--- /dev/null
+++ b/sys-firmware/ipxe/ipxe-1.0.0_p20160620.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit toolchain-funcs eutils savedconfig
+
+GIT_REV="694c18addc0dfdf51369f6d598dd0c8ca4bf2861"
+GIT_SHORT=${GIT_REV:0:7}
+
+DESCRIPTION="Open source network boot (PXE) firmware"
+HOMEPAGE="http://ipxe.org/"
+SRC_URI="https://git.ipxe.org/ipxe.git/snapshot/${GIT_REV}.tar.bz2 -> ${P}-${GIT_SHORT}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+# TODO: Add arm/arm64 once figure out how to build w/out including
+# all the x86-specific drivers (that use I/O insns).
+KEYWORDS="-* amd64 x86"
+IUSE="efi ipv6 iso lkrn +qemu undi usb vmware"
+
+DEPEND="app-arch/xz-utils
+	dev-lang/perl
+	sys-libs/zlib
+	iso? (
+		sys-boot/syslinux
+		virtual/cdrtools
+	)"
+RDEPEND=""
+
+S="${WORKDIR}/ipxe-${GIT_SHORT}/src"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-no-pie.patch #585752
+}
+
+src_configure() {
+	cat <<-EOF > "${S}"/config/local/general.h
+#undef BANNER_TIMEOUT
+#define BANNER_TIMEOUT 0
+EOF
+
+	use ipv6 && echo "#define NET_PROTO_IPV6" >> "${S}"/config/local/general.h
+
+	if use vmware; then
+		cat <<-EOF >> "${S}"/config/local/general.h
+#define VMWARE_SETTINGS
+#define CONSOLE_VMWARE
+EOF
+	fi
+
+	restore_config config/local/general.h
+
+	tc-ld-disable-gold
+}
+
+ipxemake() {
+	# Q='' makes the build verbose since that's what everyone loves now
+	emake Q='' \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		AS="$(tc-getAS)" \
+		AR="$(tc-getAR)" \
+		NM="$(tc-getNM)" \
+		OBJCOPY="$(tc-getOBJCOPY)" \
+		RANLIB="$(tc-getRANLIB)" \
+		OBJDUMP="$(tc-getOBJDUMP)" \
+		HOST_CC="$(tc-getBUILD_CC)" \
+		"$@"
+}
+
+src_compile() {
+	export NO_WERROR=1
+	if use qemu; then
+		ipxemake bin/808610de.rom # pxe-e1000.rom (old)
+		ipxemake bin/8086100e.rom # pxe-e1000.rom
+		ipxemake bin/80861209.rom # pxe-eepro100.rom
+		ipxemake bin/10500940.rom # pxe-ne2k_pci.rom
+		ipxemake bin/10222000.rom # pxe-pcnet.rom
+		ipxemake bin/10ec8139.rom # pxe-rtl8139.rom
+		ipxemake bin/1af41000.rom # pxe-virtio.rom
+	fi
+
+	if use vmware; then
+		ipxemake bin/8086100f.mrom # e1000
+		ipxemake bin/808610d3.mrom # e1000e
+		ipxemake bin/10222000.mrom # vlance
+		ipxemake bin/15ad07b0.rom # vmxnet3
+	fi
+
+	use efi && ipxemake PLATFORM=efi BIN=bin-efi bin-efi/ipxe.efi
+	use iso && ipxemake bin/ipxe.iso
+	use undi && ipxemake bin/undionly.kpxe
+	use usb && ipxemake bin/ipxe.usb
+	use lkrn && ipxemake bin/ipxe.lkrn
+}
+
+src_install() {
+	insinto /usr/share/ipxe/
+
+	if use qemu || use vmware; then
+		doins bin/*.rom
+	fi
+	use vmware && doins bin/*.mrom
+	use efi && doins bin-efi/*.efi
+	use iso && doins bin/*.iso
+	use undi && doins bin/*.kpxe
+	use usb && doins bin/*.usb
+	use lkrn && doins bin/*.lkrn
+
+	save_config config/local/general.h
+}
diff --git a/sys-firmware/ipxe/metadata.xml b/sys-firmware/ipxe/metadata.xml
new file mode 100644
index 000000000000..79e3a615e175
--- /dev/null
+++ b/sys-firmware/ipxe/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>qemu@gentoo.org</email>
+</maintainer>
+<use>
+	<flag name="efi">Build an EFI program for using PXE</flag>
+	<flag name="iso">Build a bootable ISO for using PXE</flag>
+	<flag name="lkrn">Build a linux kernel bootable file for using with grub/etc...</flag>
+	<flag name="usb">Build a bootable USB image for using PXE</flag>
+	<flag name="undi">Build a Universal Network Device Interface driver
+		chainloading your existing PXE NIC into iPXE</flag>
+	<flag name="qemu">Build the required PXE ROM images for <pkg>app-emulation/qemu</pkg></flag>
+	<flag name="vmware">Build the PXE ROM images that VMWare uses</flag>
+</use>
+</pkgmetadata>
diff --git a/sys-firmware/ivtv-firmware/Manifest b/sys-firmware/ivtv-firmware/Manifest
new file mode 100644
index 000000000000..c9ffc7768273
--- /dev/null
+++ b/sys-firmware/ivtv-firmware/Manifest
@@ -0,0 +1,5 @@
+DIST ivtv-firmware-20080701.tar.gz 125526 SHA256 f9c4250658b24579b9f726bf44097d1728c4a5db3bce64ee9fd0c5e8ff2a79f1 SHA512 1ad00fb55721f5161e0b64d04ea004cd0e24f31b3c47cadb181c0a8f24a0064356b56479cd54d834d4575f6cb5d826bca5fd061634b1e10f0e4b5737c1fb192b WHIRLPOOL ff4c93d1eced566b3dd6c9e89e8a8f5c90be82ccb344c13e788ae612ba728301895a8f3669f653db6a432476437194527285a7c7bc4cbe4e3abf4824b4784630
+EBUILD ivtv-firmware-20080701-r1.ebuild 468 SHA256 cdc36a7c5753ab096189cb6fcb1af4e147c6da3d24fab066c39839adc3fadade SHA512 4303f41a966b219c1df046a30603000ac89499176af1c9ad43eef263831f56edb7dc3c6fbee2121dfd7b667736c81e4f21ad7145b8d628ba232379bc4022c11f WHIRLPOOL 4f3733c552a10762cb19c4548c626ccd247d2e784445281ca91b5c8069cc5822c1ad9af9a861b8824989973d62306d7b200b41e12fd36239cd7b11f176abb892
+MISC ChangeLog 2461 SHA256 a54fe1b306489dccc814cf745349c7bbffd394f0e93efb21c4754f63b837d585 SHA512 45ceca3471a6de8d3c6e664998dc5e2a58e4712f5e1a07f4ded3459c7a2d4f7840a8ca22d756de6e20cb821b783ed1a2076fcccb212746c68610a6820648bc19 WHIRLPOOL 8c4d87c3f3b1828551e9c0a09e143db8f40b1589abf7d61ccf444b5e593e5258221aae901240a66d93a6dc8f468b9405c7b91bee60350e9cab2a234354b0934a
+MISC ChangeLog-2015 1899 SHA256 8f76cffabe1b3722412348ba0aaae243ab4676b5a5ea522a3340c44ac171a783 SHA512 a7d79c63027ee7700e49d92fe699ca6440712871f02d49dd89b38ee47b869b7b9dc3b58f54f2874cc4e5e69c748fafc15c050d3579ea2a0b08a95fc621a5f2a9 WHIRLPOOL c51a205264ade5fc9111668818fcc02c41bea70aa05ef76a2e033a6332fe2f7bf99378a48d9296a8c69ffed6ead198898bb50bf8668d5d9b07d12d3ce9861053
+MISC metadata.xml 217 SHA256 24bfcb35675966dd5a4d1c54a25c928aab9cda2957dc85d5c6cc4b26cbf2cdd3 SHA512 01e5c8d9f0ade4e0891b4c8f791a08c52ef01010997da3045d3b35bcd7e495ed983b50664c90ba3c8d47c34ebcac45f634ea17c91a57da7674ae93cc23781a1b WHIRLPOOL ec4a70996347a7b1e794810a7300f31b92e0e6f4f63872c4144b7236847536f0760d980f9dbb012b20d99e55c3944abf197f8cd0373eceadd519a3e54094197b
diff --git a/sys-firmware/ivtv-firmware/ivtv-firmware-20080701-r1.ebuild b/sys-firmware/ivtv-firmware/ivtv-firmware-20080701-r1.ebuild
new file mode 100644
index 000000000000..0ac539665e44
--- /dev/null
+++ b/sys-firmware/ivtv-firmware/ivtv-firmware-20080701-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="firmware for Hauppauge PVR-x50 and Conexant 2341x based cards"
+HOMEPAGE="http://www.ivtvdriver.org/index.php/Firmware"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="Hauppauge-Firmware"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+S=${WORKDIR}
+
+src_install() {
+	insinto /lib/firmware
+	doins v4l-cx2341x-*.fw v4l-pvrusb2-*.fw
+	doins *.mpg
+}
diff --git a/sys-firmware/ivtv-firmware/metadata.xml b/sys-firmware/ivtv-firmware/metadata.xml
new file mode 100644
index 000000000000..bd3d94ffd0d7
--- /dev/null
+++ b/sys-firmware/ivtv-firmware/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cardoe@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-firmware/iwl1000-ucode/Manifest b/sys-firmware/iwl1000-ucode/Manifest
new file mode 100644
index 000000000000..1f666485fc0f
--- /dev/null
+++ b/sys-firmware/iwl1000-ucode/Manifest
@@ -0,0 +1,7 @@
+DIST iwlwifi-1000-ucode-128.50.3.1.tgz 175772 SHA256 7e81ddad18acec19364c9df22496e8afae99a2e1490b2b178e420b52d443728d SHA512 b3806c3d80009b35276ac177a26130a1f820437c4ca067f1f83458ba0f4bd43de887fae906d17190b783895d2f111f88117143facf72443ca404a0732029a8d9 WHIRLPOOL fb8864c40a9d8b2d9864cbf64cbded7e6b41ef982aa2b0bd0a2dba07566709b94f8f41e049a488d043b01470286b18a73906c0aac01fb1761f87ba3e28c7a517
+DIST iwlwifi-1000-ucode-39.31.5.1.tgz 180879 SHA256 ed0f1fbc2571c8da9a0cd9410fa8883494a9e1ac469d5000bc2c9dceaf83c970 SHA512 18f01b51f83e133bd6803567afb75606faba8cd96e3ed4faab8350d6f63e43c4c9397fdc17631efda1606fbef9e1a2b3065cbb58779de0f56223c95703474b06 WHIRLPOOL 389031f2bb6b9f36538ea2d4893d75f9eeffb5cd01c37514ca478a2af6db0f600d050101c774d1333fd31d57b9e35d127be10cb441cbeff70e476ad28f880e41
+EBUILD iwl1000-ucode-128.50.3.1.ebuild 502 SHA256 c8bdf3488de371728929e4aafc3a1dffbdbc763f3fa0e8ac75f94484e1bc298c SHA512 6f1522ddce725414461a94ecc5860665ce2326b1d05d3bbd201c7697ae5a17a8345b34492462622a2ad45eb589f2108e824d84aae5139005ffcc60457d496f64 WHIRLPOOL 13408dfb4b7c70021a7c1374a03b246bdb2610b406185e89b141683208c1a84da1bf23aba3c72ea6c95d2484df588156063478174f13341c051b1f7ac270eba9
+EBUILD iwl1000-ucode-39.31.5.1.ebuild 829 SHA256 1c5ca6593aa56f7978b20addc940d1215960475b7e9d5ac99aa8b5f2197f172c SHA512 befbe6fd9cf11acecff8f7719f5437aff6c057ab1cbd415ccdb2058b2f46215d21ffc5ccdead84b17bde5b6ee37474ba8e867bd8f6205e202e70b3a9d326b66c WHIRLPOOL e3fcf6399dc30ffd8395454371d5f8dbd6817959cf4a24679dbee8d978b2f60762a422d0fd8914ecedda4c385a4d7bf52cd6ffa2d6e89940da29e9d6feb652f3
+MISC ChangeLog 2282 SHA256 8bd4027c59f69460464f498c28fbafdd0bc9b4f4ae2f4c6fa8f527c98925f794 SHA512 6c37e6e6abdd8cfe9f0fe541105e8d6488687b2eb114ff7a65e68d52e3d576671bc00a07db299d6ba34e90915817b697930aa6699d0ae47691ab4e5c7aa66722 WHIRLPOOL 6a144c953faea3a1b30d54d8393c146e6b915eaa3fa3d2a0a28d1fb0dcab7a67b05cb333b4843cfbd6511b03ee9e9ab6f660f1f09a973e73e862a3542a03e8bd
+MISC ChangeLog-2015 2142 SHA256 22a140b7d2d458d513d144edaaa1cb7e0a00e12b372400a40f3eec5b95fc0d15 SHA512 e9be3f24c7a5285deef9943e1f5e7b4706eed3a996a08891126ed55bb0d6415e6de99a7e64c6cae8076dcdb4319b20488def7cc7c7db86f98f0be9e8dda5bcf6 WHIRLPOOL 3fb4695e826091786f1ee7a821ebf47151f0dbfc3af6d80190042792365b548ef97f99ed179b5eb07b6fd833eae2cf6bb2a209c5ea3459619df8f111be8a3520
+MISC metadata.xml 352 SHA256 ec13ddd801c3d35e14d9bdfb2e8cb6c34dcd8f5f4fb55ceb2d8779339d6569a3 SHA512 efb6d7cd6b9798880dc106a543f305e87e6340a3a6fd61098c7b2566a9d1579db2af5b117e80c79a0006d9f144a67ac62685c2334433e956104c359d075b97ac WHIRLPOOL f6afd5cbce79a862d74bb3cf3dc5f95a497a5353ed52509a658fb6a2e7d51f3ede190ab1869a2271baa3e0222c3f7c2b7ce208bc68b8fb2492d4c4bf80ac1342
diff --git a/sys-firmware/iwl1000-ucode/iwl1000-ucode-128.50.3.1.ebuild b/sys-firmware/iwl1000-ucode/iwl1000-ucode-128.50.3.1.ebuild
new file mode 100644
index 000000000000..8971c6850031
--- /dev/null
+++ b/sys-firmware/iwl1000-ucode/iwl1000-ucode-128.50.3.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+MY_P="iwlwifi-1000-ucode-${PV}"
+
+DESCRIPTION="Intel (R) Wireless WiFi Link 1000BGN ucode"
+HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi"
+SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="3"
+KEYWORDS=""
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	insinto /lib/firmware
+	doins iwlwifi-1000-3.ucode
+	dodoc README.iwlwifi-1000-ucode
+}
diff --git a/sys-firmware/iwl1000-ucode/iwl1000-ucode-39.31.5.1.ebuild b/sys-firmware/iwl1000-ucode/iwl1000-ucode-39.31.5.1.ebuild
new file mode 100644
index 000000000000..a5f634114de6
--- /dev/null
+++ b/sys-firmware/iwl1000-ucode/iwl1000-ucode-39.31.5.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit linux-info
+
+MY_P="iwlwifi-1000-ucode-${PV}"
+DESCRIPTION="Intel (R) Wireless WiFi Link 1000BGN ucode"
+HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi"
+SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if kernel_is lt 2 6 39; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= 2.6.39."
+		ewarn "For kernel versions < 2.6.39, you may unmask and install"
+		ewarn "${CATEGORY}/${PN}-128.50.3.1 instead."
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins iwlwifi-1000-5.ucode
+	dodoc README.iwlwifi-1000-ucode
+}
diff --git a/sys-firmware/iwl1000-ucode/metadata.xml b/sys-firmware/iwl1000-ucode/metadata.xml
new file mode 100644
index 000000000000..93d0cc1e92f0
--- /dev/null
+++ b/sys-firmware/iwl1000-ucode/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>ulm@gentoo.org</email>
+  <name>Ulrich Mueller</name>
+</maintainer>
+<longdescription lang="en">
+  Firmware image for Intel WiFi Link 1000 series network cards
+</longdescription>
+</pkgmetadata>
diff --git a/sys-firmware/iwl3160-7260-bt-ucode/Manifest b/sys-firmware/iwl3160-7260-bt-ucode/Manifest
new file mode 100644
index 000000000000..5690d31c8033
--- /dev/null
+++ b/sys-firmware/iwl3160-7260-bt-ucode/Manifest
@@ -0,0 +1,9 @@
+DIST iwl3160-7260-bt-ucode-37.8.10.tgz 21750 SHA256 74be75b38f2280aefcbafb8d5fc1cb6732e47bc7d380a30eb063e690ba9dfa59 SHA512 a0f81382cd7ce9077e8efd75566220a3b2ab0077897ce2d292091f6942b12832819335fe53d007a06797d0f79ef18463282b714e8a148dcc57898313e8f627ba WHIRLPOOL 4e9b2a8fd350eec89f6f32fdf47e95b7faeaea62292a6e3b7b7f73e25bcf6832db81b17259409b37d436faf100184d9881dc6f58633a95eb9a112e3fefba5745
+DIST iwl3160-7260-bt-ucode-37.8.10_p1.tgz 51854 SHA256 beff2a842970f987658062cd36b788aca6ebf4c232d8fb38fecb61dba18ecb58 SHA512 84bcaad82db9588d41ab446c2c5ff9c3f323c15b8dc6b627317edafc80c5ac5c0290a8eea9b5cb5ceafa817d398fb957385cddd715787e3abfb598cf3392774c WHIRLPOOL f251925224b67049d4d2bd75f19223dbcaad18ecffd3c903272ba44310789f4c825fdbcd32f3bccbbc0fb0211492c9285cd5a6a4fcb15b7a1d845a223cc933d1
+DIST iwl3160-7260-bt-ucode-37.8.10_p2.tgz 78372 SHA256 2a7ef1afb37e944a7e005f150bb7fc615ff846e189dcf14c0e30217d96158ea3 SHA512 73399fcfd58972b9099cad6014f686f74ed4aedc2278d1389d1e815fb08d2af43f3f6defa70d409ecc0b388fba0710dc8fe26627d3149c79db8e8792576047e5 WHIRLPOOL 18dcb462f3463340c0de7d877dc9b872ba5413dd97fd1e3709a1f0db1d51f6bab526e0a3899464a1d3bc4dd3dcafc485d56555f325eb8e72938808755f7b7bef
+EBUILD iwl3160-7260-bt-ucode-37.8.10.ebuild 1118 SHA256 0c0b47c3563c905717df0facbfb2a49e70e6cc744ef320b78dd7af18a8dd2407 SHA512 00f245f1d4d8521ad956c3012b666ec2acc0c777eae46ecd4f55e24d78fcd13f1c18665eeedc1e9874241192c796502e1aaef70748a011f47a684f9ffa0a8d4c WHIRLPOOL a9da7bd87936f0da29539bebd4ab0582fe45c08582375f222ac07b614878bbb7a3acab2d0d66411db2869bbaf9947613c292e35a067a574931702ca53ec810ba
+EBUILD iwl3160-7260-bt-ucode-37.8.10_p1.ebuild 1215 SHA256 9d7d47897744e29d67b00f01c11bfa3d5cd67e19dfa7fc2298b2cd964a0cd079 SHA512 7755a25451b40d7002741d4af9457a5396ba10cd05d184d060dd7d851492b728110e1e8a9dd82fdb96c3824593832e20b2a963069845a1aa75a47a2836256b5b WHIRLPOOL 1f220aa64e558788b0c389f55ee8c5b3cba4efcf0f002fb4080aae25cc21678a7924ae2e93ce5d2fd9e2b3c898a580baf9211f612e0c03f0cebfab46509fa86c
+EBUILD iwl3160-7260-bt-ucode-37.8.10_p2.ebuild 880 SHA256 95fe8dff2839a90ad39662b4a1a7c84b685aae21bcccaaefea7de83188e1aa7c SHA512 0c39890cae8eec956ed0e5200bfef73ba7841fa517332261668f382ea7752bc6b16af8a86d9cde1824f0808c1dd5ff8a5db7d55366134a1542a98a2de8a6c457 WHIRLPOOL 074dc48c87d27af5c32144c3b504d21ad9d6233b9739bde6eeed76964cba526061b6822744cd2d51010d2540c73962cf0b1c2e859dc9e2138ca006d6bc65c850
+MISC ChangeLog 3130 SHA256 63b7e82e552565335b6342b2170b3d1fedc6300229f3501b8beac200a46186d1 SHA512 e8025dd5ea7c023cb7f9662d0bd0d68145711402a88b7c7606154bd8a7f6308135f16865693b6fdca5b2dce53e041cae4b401d1190988aacef89bf2c54faa5d8 WHIRLPOOL 3cba8a13e4829e278df7879ec36516f3bc8d2b12ce3dc23b8ac8c54c7e2db71b9c56d2662601579ba794d642effbc8bcd185ec6b771575251b4086d35e9d8c99
+MISC ChangeLog-2015 1838 SHA256 06854e51a6d33d5b98c347f15d8b311e8047ed237753b7362050faa8b051913c SHA512 beba9924c535b202cd944de7589113e3e3fd4ec7075055b56df1aa0c97419b38e3b32d5e46c4b2e3ea6cc730de3b3447df9e9ad0c4ac2914fc9efb00c8a88518 WHIRLPOOL 72459b70eafccad223e1bd61715e19b70101230750cb96246a58fbd34c540b14665e36e9e6723bd4f556536579f4c1de7d9fa9cc26befe8f589015d949af6d26
+MISC metadata.xml 518 SHA256 8cc17ba1d8e3e8d1d825e7249b5ec5a16eee21ec3294a2e726ff31db5e6d1f51 SHA512 b9f35a4d73c149e25107d6246061b3b3c2140cda11f794b460f70249d2135a8079c50e8af97a50eccde0a32b5d7727845788ac5b6cd4332f4e4644ee14010e4f WHIRLPOOL 842d769dc26ed773cafbf282468aeb0e282a9167af21b367858109c3d513ec85ce44c4581309a4f8c1634728e69f9585361889c192c444292fea0e50611703e1
diff --git a/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.8.10.ebuild b/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.8.10.ebuild
new file mode 100644
index 000000000000..1f5af2dc2a4c
--- /dev/null
+++ b/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.8.10.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit linux-info
+
+DESCRIPTION="Firmware for Intel (R) Wireless 3160, 7260, 7265 Bluetooth"
+HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="mirror://gentoo/${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the Intel (R) Wireless 3160, 7260, 7265 firmware"
+
+pkg_pretend() {
+	if kernel_is lt 3 10 0; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= 3.10.0."
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware/intel
+	doins "${S}/ibt-hw-37.7.10-fw-1.0.2.3.d.bseq"
+	doins "${S}/ibt-hw-37.7.10-fw-1.80.1.2d.d.bseq"
+	doins "${S}/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq"
+	doins "${S}/ibt-hw-37.7.bseq"
+	doins "${S}/ibt-hw-37.8.10-fw-1.10.2.27.d.bseq"
+	doins "${S}/ibt-hw-37.8.bseq"
+}
diff --git a/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.8.10_p1.ebuild b/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.8.10_p1.ebuild
new file mode 100644
index 000000000000..e5e83ddbeba5
--- /dev/null
+++ b/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.8.10_p1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit linux-info
+
+DESCRIPTION="Firmware for Intel (R) Wireless 3160, 7260, 7265 Bluetooth"
+HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="mirror://gentoo/${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the Intel (R) Wireless 3160, 7260, 7265 firmware"
+
+pkg_pretend() {
+	if kernel_is lt 3 10 0; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= 3.10.0."
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware/intel
+	doins "${S}/ibt-hw-37.7.10-fw-1.0.1.2d.d.bseq"
+	doins "${S}/ibt-hw-37.7.10-fw-1.0.2.3.d.bseq"
+	doins "${S}/ibt-hw-37.7.10-fw-1.80.1.2d.d.bseq"
+	doins "${S}/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq"
+	doins "${S}/ibt-hw-37.7.bseq"
+	doins "${S}/ibt-hw-37.8.10-fw-1.10.2.27.d.bseq"
+	doins "${S}/ibt-hw-37.8.10-fw-1.10.3.11.e.bseq"
+	doins "${S}/ibt-hw-37.8.bseq"
+}
diff --git a/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.8.10_p2.ebuild b/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.8.10_p2.ebuild
new file mode 100644
index 000000000000..65064b2acde0
--- /dev/null
+++ b/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.8.10_p2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit linux-info
+
+DESCRIPTION="Firmware for Intel (R) Wireless 3160, 7260, 7265 Bluetooth"
+HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="mirror://gentoo/${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the Intel (R) Wireless 3160, 7260, 7265 firmware"
+
+pkg_pretend() {
+	if kernel_is lt 3 10 0; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= 3.10.0."
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins -r "${S}/intel"
+}
diff --git a/sys-firmware/iwl3160-7260-bt-ucode/metadata.xml b/sys-firmware/iwl3160-7260-bt-ucode/metadata.xml
new file mode 100644
index 000000000000..b8ba073febeb
--- /dev/null
+++ b/sys-firmware/iwl3160-7260-bt-ucode/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gienah@gentoo.org</email>
+    <description>Feel free to bump and add yourself to the maintainer list,
+    please consider bumping sys-firmware/iwl3160-ucode and 
+    sys-firmware/iwl7260-ucode as well.</description>
+  </maintainer>
+<longdescription lang="en">
+Firmware for Intel (R) Wireless 3160, 7260, 7265 Bluetooth.
+</longdescription>
+</pkgmetadata>
diff --git a/sys-firmware/iwl3160-ucode/Manifest b/sys-firmware/iwl3160-ucode/Manifest
new file mode 100644
index 000000000000..4daddb1e4d12
--- /dev/null
+++ b/sys-firmware/iwl3160-ucode/Manifest
@@ -0,0 +1,27 @@
+DIST iwl3160-ucode-0.10.11.23.tgz 334243 SHA256 b5adfb05dc81fdfa773a34f8d752ce690777f898bb1a3697ce651cf4bf7b5746 SHA512 14aeedd0e7069d5f65d388f36b7d30bb0e3f90c2c721a582e761aa2a27402f6ad8616dd07c44812b8e62bfa0c6eabb57adae71aa2a48053cf85757fbb6548432 WHIRLPOOL 8cefd369781f015bc7763d777b61e8c0e8276027602e6a706a8679627af62113d4e64753f0a01b38809bcf38ab45d34d3cfb623ecce98071651bb260cc199548
+DIST iwl3160-ucode-0.10.15.23.tgz 335313 SHA256 5e9639b1abb809e5507d562dda677140751946f37706119c262307ad80563da4 SHA512 a939cba5dbfb73c3178844e6045d0c6b70e75df4bb1bdfc6a3ce34c82de2521f598fbb402ebd4961fbab8e33878172f156e4641c9e02566f7ab754087d857b9b WHIRLPOOL 12ef58326d170950aa5ed95d57e8fa792b3546a5f1bba3bcdd97bb99e4a95573973dc4835a264a43c023885079e6bbd07c1d1a77bdd2af9b51f595af16dccac5
+DIST iwl3160-ucode-0.12.16.25.tgz 337890 SHA256 84ba0b93efb085ec72e574095f550b7e2e508fad7bb1d725b2938989c407d595 SHA512 247906e813e5fc49889a02532cc5813f204ccdeaa9600f856d66904e3491471e9a881daffed4ed1e08f8cae14238802773c0820785d05a90406bd9f2f8df31dd WHIRLPOOL a23546e44c8e7116fac1885a15b3729600335fc501391df3d4da998ee9ad00e8b7e3c6a2072ba6f91be2395543d88dcba9c6605a2e664d963f2b33f83bea43d6
+DIST iwl3160-ucode-0.12.17.25.tgz 337993 SHA256 45a12aa915ee5f62027bea2600700ad706c58c4da879e69c8eed3a99845ce1e5 SHA512 d3095fccac0273205272906f1762d0e205725234083cc9fbb3d30184135690cdd7b095460becf26bb2355c878caf6e3a92aa2a398c8cb07a8115ae279bec0776 WHIRLPOOL 6ada0aa9f9c0f27eb8c550cc5c3c8f5f030b2593160d1bd452205e55b4aeb2c4b02f88d38de780c25ee07d0c483316a4619a045ebf8c3d7207874901fa8a6058
+DIST iwl3160-ucode-0.13.30.25.tgz 336262 SHA256 ecd00c354a419f28053322f3e510baa3b939f09a6ac84625bd5e8ece99273149 SHA512 209c810252bdbee729ba3f3b314b428d255f254b41dd931368e7a4dd6d027b9bdeb42d80325ecbcd58032300590276bb220a84dec3cbdbbfcd957638a1f71e97 WHIRLPOOL 066f7860a5df5ef2c9dc5bc238754e9cef66aa8efde60433c1cdff904bc48bf892957863c711a1b0422e89c3e2e32db23e99cd114e0c4d1001dcd4a3114307e7
+DIST iwl3160-ucode-0.15.227938.tgz 467773 SHA256 86908a5ff37163f18972205a0fe7633f85f91e0dc0c2e9096314c52610ed7b10 SHA512 88ad510667adf3895b1906e51373cda420cde2165b37cff72ffbe0d159eeb82de60ab3741e16437384e9db4b245d0a927be680fcb9f784af425f0554ee039798 WHIRLPOOL 5a33deaba66b89516a9c07a652ce4dc4e89b49076fae47354b1d366fdb6604dfa2ad9dda247b6dbed829509d1dc43da62771677d362ff90a04b02bc2384cc1e1
+DIST iwl3160-ucode-0.16.242414.tgz 467156 SHA256 ea2f272f40b7a76fde049449813a5d6e323769efd603acd303d1e9a4e0e57820 SHA512 ca0f675ebddb92c936df6bf412fdd1a41a33426636c3c40881251dfdd8b6527bc03d03b73b10dfb6fcc23676d1d51c372ac406f9554baf7f4ac36c9bd302b79d WHIRLPOOL 3f34643582a6252a3278a4df04e7485511be62d08b7191b6bcdf10ddb62967e30338019fde2a810d0946b5f1717af64a0f8b2bba9c5dcee2f1df92f79663794c
+DIST iwl3160-ucode-0.7.1.22.tgz 332285 SHA256 6350d23db66e7f5346a716fb74bb853ae798b70ad56f20f134ac99dd4941d561 SHA512 5f379edc87d0cb743bd91cecd5a1879edfd18033c02d29269ea55e046663fa47c3363a19441d0edb52ea99c58e757c81872545c8ece634459675d927f46a4392 WHIRLPOOL 35d80a4f6901bdce4ec1c34fcc3ad38a0f869f5fddebcd4c29866e5eb0fd65cebbc37fce966400d15eb3053a4f7902cd9c2397a8eaf8a857ad444a0ebc115bd2
+DIST iwl3160-ucode-0.8.15.22.tgz 328351 SHA256 101a0466a4411f5e1492dd8e559f549f1196de045b084718354ece3896c7b370 SHA512 33e8842068c285bd62cd58629855c4be82a5b19129bcaefc4ac622245562085ec4ae155dba719937f71767d3f26e0d309553c9362fe7995943f2e95a9bc5d1fd WHIRLPOOL 5c6be623389b28c585f89e370a3202874d364d7daf9b61b7c95c7824c5b4243280a723b94848c47a1b449545162e8cb6cd073a1a4f748a100310e472ec911e10
+DIST iwl3160-ucode-0.8.24.22.tgz 334306 SHA256 44082d3b70e3101343702d614e4785e498c5596117bb144e167ea8a11b5c63cb SHA512 afa9d1c081f21ec8cb3d427be79475853c9f078fb4f3d60ada154df0c58fe3dec4655dc2f54095dc395cf064563e0de9f69d55478b28ee07b7f19c0b93fb6097 WHIRLPOOL 8a18b409e5211d69d0df80498caa7b572d0d9f462417e6101c159185194db203627019fa6caea9ba3cb3c478c2975e362e3011be21d58f4f572c5c6bee77ca1b
+DIST iwl3160-ucode-0.9.214.23.tgz 335384 SHA256 37e3c7b0ef26ad1d7e3089dc100f0451045caccaab6a503e2bae98ec75befb95 SHA512 93812c6de01ba97da7192f53b33e6c4dca94a5ea2e29b519b47af3bf1f19b41cc1638b6ba92015c4faf840bf4abe8a2abfd6cff1a76557ff93024e095d246f16 WHIRLPOOL b45af6873c74887a6557a43c802e6117db0bd2bc180ba5559c0dd28b62056d0112f398385e252b2ee542623549544469d812974e5680c7ac1aa587bcba8db1c8
+DIST iwl3160-ucode-0.9.228.25.tgz 337276 SHA256 6856a994b8f92785ab220eb2a04233690cf3824a1b51252802a8af206e81b388 SHA512 95f1d3bddbb05d32a66250c6e714d74b17902b8f6d9451a5107cf2d061f1cdf90dfb3cf8b0375f6104dfb2fe1bc201dab8baa1c6bdffda944aa5fe8aad568a16 WHIRLPOOL 15838747dd6e7daa646489be95e8213c4e35fe44caad26ebeb35636796feb74da0c88ec5e1970c4a5a5384770783cad0ba583996fa63e08ae2ea411bac733f85
+EBUILD iwl3160-ucode-0.10.11.23.ebuild 1416 SHA256 4822cb8963f3da77224833299fa33252771f77d02d7e6b26a9ad5df91278252d SHA512 e53c69c405039553ec1bd015ea77c5fac9595dd423030c89eb2daddf969dad9e06e61239c7d2eee3e6b55f75d934a3ab6e926387f1cb27994b0c1c4acb2d18bb WHIRLPOOL d302c212dcf3b7c032c8ae3065cdba79184a92041d85c9400a0196caf6899ea56718add1c16db66bb81428aaf395ce5d0168fce91be1c402556259fde550a847
+EBUILD iwl3160-ucode-0.10.15.23.ebuild 1388 SHA256 adaa9819ad0a9216e5c89d84389416871d030e88421fda557477b85ce2a21134 SHA512 a6a663d14131755f3b0e3c5d4d7a40b255b1eb912ac45017f5e122febf5bac41e4213d0154ea3d22076ff65a58aff17dd4a4c10b3b344e20f16a202c4ef38f11 WHIRLPOOL f9daa296254d6def6813a5dbf9ac6e3bb75459a2447db23fc86cd260b747f8b75c38984ac6ef537d5be611ddeb8211f33cdf0a60efc93f48f59ba985247d0951
+EBUILD iwl3160-ucode-0.12.16.25.ebuild 1388 SHA256 14ad8630e63c3c18fcf477c6d616e618d98570db291d03402cfd5a165ed91108 SHA512 a32ff0461b51d873f4e7c214f4ec0cc6131bc856486068f8741c4a2e023a6faf474db2a66ed074c5f44e4cc0458a4590555c71c26867153891d5a3360ea32ba9 WHIRLPOOL be5305a20313e77660e17ca77f88f9b909db561b14bf17f7b4da6e163a79d9a51a742f431f309b9d4af8a0bb3caf59ea2b672064f979ae64415e94719bfe01d9
+EBUILD iwl3160-ucode-0.12.17.25.ebuild 1388 SHA256 9e5e2544ddf3f0d5ab90c071d47c6f5685af3d2c6fe65bb39265d6b4f7c2d955 SHA512 a4cf54bc50795849cbf4a7e326d70b067681dca07f002a0bd14394b3a4d1804c64557c3ef4ab7aaf02fe2b507710235eb46a77f45751095ee57a36faff43d6da WHIRLPOOL 4d2d74a01083043c21a35642695d047de806e025ff3f1f8e431c186d32ce0c1da4d73ea6f6f88cb2382221411a33fd97d58dbd6f3c6f8ecbb5a0396ffc22dc3c
+EBUILD iwl3160-ucode-0.13.30.25.ebuild 1387 SHA256 fc7807ba52b3eaaf8b094fbce710f0579aa714b004be378e5234a6cd11850af3 SHA512 97b1927b5153b7eb62b074ae2f3ac1b9f77fbb96dbd19d147d6373db808ac82b11d2f3cc2540fe787d9c24e52f62710a47f4ff391ea4129b88f5c3e665060ab6 WHIRLPOOL 04473e418fb79da3f2a120e1d6067c491546e72b681b28262c730edeb1be51b4fb2b3febb76a6b54305b5fa166894b0e855d0932abf85943f6186bf174f15a89
+EBUILD iwl3160-ucode-0.15.227938.ebuild 1378 SHA256 ba05f41e8f45f21e881a79b5f4a48ec3e1445ea758c7366d56f05a335f3354c0 SHA512 8cd5c32adcac6346835952a23d18f08ee4cac7d2eb1d3eff05dd5c03720a4a559857b80847f8f803320e0a65a1591a99cc55cac1a47050adc14c69d850cbd598 WHIRLPOOL 488f630fd20249def283b150e53c5b6d12e487bf41a61b0fd2a41fb02944526784b0b60cd45de3b39c7213f82c4034e2596a58684909f794a333aa53655d8d85
+EBUILD iwl3160-ucode-0.16.242414.ebuild 1378 SHA256 c1e1704ee6b449ffbd194ae41f1dd0af4719a1b9cca2fac13303c67a5e05203f SHA512 2f149bf9cd37e79a7dfcca8388b4874187432e0459a40acd980d71ca1203864e10014c9a279a1fa18425b404be0a1531799198c21157312d256fae2f6112df49 WHIRLPOOL 5ae25df7b73d7e47767b99ade62fc9ad89916d2ad99ecaa55194d64659af286ac891a7b0cb3daee9afed4895aa6478e16eb2a7af4ca047d1885d098789659d54
+EBUILD iwl3160-ucode-0.7.1.22.ebuild 1318 SHA256 7fdcdce6f0bbf507131d8c7ac6bc738d0e2288ea46888c4c0dbf672a18c6edd8 SHA512 2306080d402e972475f95ceb470d8bc0846cb6aa736d695cd3195bff0977e9995252b67b06045c26b2e5e2142f384367279e4e2d7003135fbafaf4125994a007 WHIRLPOOL a670be7fad2bab0ec2d89049f70ac779a1e0e944557f246a888ee577f147207236942d46c6fa889b5660150b070759ee4a5224ad58036556268f4c467443538c
+EBUILD iwl3160-ucode-0.8.15.22.ebuild 1415 SHA256 daf02d398f171ea44b4f085b97da5af7823c6f269e4aaf34c87994776feacc1b SHA512 dcf57cc976da6ee56c7c15dc884fe140f238d4974ea4611301befc41389379182e42681049c777bc22c7bf3c9b6e6f4cd82b0f6997d026a4f30461b3e15d5e05 WHIRLPOOL 77ba0891152f2635403b999058f7434836690c9c3aebb83f8682f3da61ce4b14ace9459af8c7cc009ba9058ba0651d26eccd9104382219502be6bfbc2b1ec600
+EBUILD iwl3160-ucode-0.8.24.22.ebuild 1416 SHA256 c501acda420e7b2e3961a5ddf04d2a88fefa5675599bbf7027e2a63d0fc8a737 SHA512 59a576991e3729a3cafc957c6900c213086f599e8b811942416429510b2d4f736ecdc894c76e90f27894f2d95ffc3b7f120e413da4d3f91980cecd66f9c98f2b WHIRLPOOL 2bd3df0c65db882eb112d8d8808f30366f1a68963423544ed7f89ac247e5680922e8316d48bc3402dbedc2d59903afa9ad808f1894a34d7436f8475aad41440b
+EBUILD iwl3160-ucode-0.9.214.23.ebuild 1415 SHA256 32f10c8eaa13c3540111ce5b1b6652f551cbb1a9f816277334cc8734fa773bcd SHA512 96a3ef296bf1e8c19a34d857efafb95183bb4c08ddef3030a5d0bfe1c8edb48c03279fde07a41e237b681fc0f91e7e4a6e35d5846e5d4047721c901ca0bab855 WHIRLPOOL 527c7a1bcaa418585186cddc8ad39772e5aa25e08573c9b4628a6de90fc9fe01feeda8e1dd03f6994a9b700dbe1478aa6927303998c88a89307b212304a7829c
+EBUILD iwl3160-ucode-0.9.228.25.ebuild 1416 SHA256 9f4f9d19db67876a3ee2c28d5e5b4fe0421bf4bde79358410fac6857a3ef02fd SHA512 31f49222fca10e96c9c4db79030b75a30b6f3418f98a6a3aadd8d6e4d93a3f5fcc0bbfefc2faac51b3c278c2b3700a0ebf2902ff9175e1cd055fca4d99143409 WHIRLPOOL 2ce38063a376ab446df820cbd2daafcc25527c0ef567a97be02d4abfe419fe5007a8e4a5e6a4e1bf9744be4919f201ebf7a4a5a7c4ffd87f2b743fd4d3450f0f
+MISC ChangeLog 3851 SHA256 01009117a8ec969b655e696394279bdb48270ac1dda86eab4dabdee5af95d148 SHA512 7f452e9db87502ebcf067bd145fcfb05ba01f1dc2f5940ccc16f7ec333829e73069041a9d5e53d04fe06acbf8ac9f4d596dc810d9435f059641294044a61f2a6 WHIRLPOOL e9aa5c86c92045afce3d24c9e3cfba31f0458771691c19794fe2e1e649de2ede6d0d6e7b2b0315dc5ba6e7aad444d1a367dbc33fdc684563bad02ef1ea8113c7
+MISC ChangeLog-2015 2530 SHA256 58792771eca5f7288c623381d49f355146faaeca8184520c7c56fda686fe44e0 SHA512 6477b1c67ff074dda5f4ceb19ebd4bce622cdc244edda97004306350d1933cdb1d053255132296f18e42c7e0aa11100dba136404d8e8f2fe4f79c542d297d62b WHIRLPOOL 60d16976ab70a39eb9c0c30006ff51e63580ad9ed92e208a5f89372804e558fbc49d3cfcb4219f66382e0a3a63511f6dd3b28c7661be33df800681b178635825
+MISC metadata.xml 412 SHA256 a4ce06f9648f587b9b72e5f2a76a8d08cbfcbd54a3e6ff510bcd55f6b0615020 SHA512 e4ea06015128a5119d7a836e9f9c40d5a34420b9614d3b12d43fab96de9f1b02a1c5ebf1833da05277b8099142488f062749249a60224f305313e4a1a2e59070 WHIRLPOOL 9480aa64b72e591cf8453f6fa4a17f479e6a8a128420b2db6f5984017fa9c8e1436382ef0c25ba108f32efa070d87b7f51ca85039bb74f1a3adc275db9d3c59c
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.10.11.23.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.10.11.23.ebuild
new file mode 100644
index 000000000000..b7b57b49d435
--- /dev/null
+++ b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.10.11.23.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit linux-info versionator
+
+DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DV_MAJOR="3"
+DV_MINOR="17"
+DV_PATCH="0"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="${vc[2]}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+	!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
+
+pkg_pretend() {
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+	dodoc README*
+}
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.10.15.23.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.10.15.23.ebuild
new file mode 100644
index 000000000000..84397cd3d807
--- /dev/null
+++ b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.10.15.23.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit linux-info versionator
+
+DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DV_MAJOR="3"
+DV_MINOR="17"
+DV_PATCH="0"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="${vc[2]}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+	!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
+
+pkg_pretend() {
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+	dodoc README*
+}
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.12.16.25.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.12.16.25.ebuild
new file mode 100644
index 000000000000..c8229ccdc4d5
--- /dev/null
+++ b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.12.16.25.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit linux-info versionator
+
+DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DV_MAJOR="3"
+DV_MINOR="19"
+DV_PATCH="0"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="${vc[2]}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+	!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
+
+pkg_pretend() {
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+	dodoc README*
+}
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.12.17.25.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.12.17.25.ebuild
new file mode 100644
index 000000000000..4663a5372b54
--- /dev/null
+++ b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.12.17.25.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit linux-info versionator
+
+DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DV_MAJOR="3"
+DV_MINOR="19"
+DV_PATCH="0"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="${vc[2]}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+	!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
+
+pkg_pretend() {
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+	dodoc README*
+}
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.13.30.25.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.13.30.25.ebuild
new file mode 100644
index 000000000000..831ef0a387b1
--- /dev/null
+++ b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.13.30.25.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit linux-info versionator
+
+DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DV_MAJOR="4"
+DV_MINOR="1"
+DV_PATCH="0"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="${vc[2]}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+	!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
+
+pkg_pretend() {
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+	dodoc README*
+}
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.15.227938.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.15.227938.ebuild
new file mode 100644
index 000000000000..15801434dea4
--- /dev/null
+++ b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.15.227938.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit linux-info versionator
+
+DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[2]}.${vc[4]}.${vc[0]}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DV_MAJOR="4"
+DV_MINOR="2"
+DV_PATCH="0"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="${vc[2]}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+	!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
+
+pkg_pretend() {
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+	dodoc README*
+}
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.16.242414.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.16.242414.ebuild
new file mode 100644
index 000000000000..3abce4765618
--- /dev/null
+++ b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.16.242414.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit linux-info versionator
+
+DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[2]}.${vc[4]}.${vc[0]}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DV_MAJOR="4"
+DV_MINOR="3"
+DV_PATCH="0"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="${vc[2]}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+	!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
+
+pkg_pretend() {
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+	dodoc README*
+}
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.7.1.22.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.7.1.22.ebuild
new file mode 100644
index 000000000000..bda121aa6cff
--- /dev/null
+++ b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.7.1.22.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit linux-info versionator
+
+DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DV_MAJOR="3"
+DV_MINOR="10"
+DV_PATH="0"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="${vc[2]}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+	!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
+
+pkg_pretend() {
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+	dodoc README*
+}
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.8.15.22.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.8.15.22.ebuild
new file mode 100644
index 000000000000..e3858dadf676
--- /dev/null
+++ b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.8.15.22.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit linux-info versionator
+
+DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DV_MAJOR="3"
+DV_MINOR="13"
+DV_PATH="0"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="${vc[2]}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+	!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
+
+pkg_pretend() {
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+	dodoc README*
+}
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.8.24.22.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.8.24.22.ebuild
new file mode 100644
index 000000000000..4b7654a4243b
--- /dev/null
+++ b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.8.24.22.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit linux-info versionator
+
+DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DV_MAJOR="3"
+DV_MINOR="13"
+DV_PATCH="0"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="${vc[2]}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+	!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
+
+pkg_pretend() {
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+	dodoc README*
+}
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.9.214.23.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.9.214.23.ebuild
new file mode 100644
index 000000000000..a36858a66a93
--- /dev/null
+++ b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.9.214.23.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit linux-info versionator
+
+DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DV_MAJOR="3"
+DV_MINOR="14"
+DV_PATH="7"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="${vc[2]}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+	!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
+
+pkg_pretend() {
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+	dodoc README*
+}
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.9.228.25.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.9.228.25.ebuild
new file mode 100644
index 000000000000..16e8b7de50d8
--- /dev/null
+++ b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.9.228.25.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit linux-info versionator
+
+DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DV_MAJOR="3"
+DV_MINOR="14"
+DV_PATCH="9"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="${vc[2]}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+	!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
+
+pkg_pretend() {
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+	dodoc README*
+}
diff --git a/sys-firmware/iwl3160-ucode/metadata.xml b/sys-firmware/iwl3160-ucode/metadata.xml
new file mode 100644
index 000000000000..aa05b0beef63
--- /dev/null
+++ b/sys-firmware/iwl3160-ucode/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gienah@gentoo.org</email>
+    <description>Feel free to bump and add yourself to the maintainer list,
+    please bump sys-firmware/iwl7260-ucode and maybe
+    sys-firmware/iwl3160-7260-bt-ucode as well.</description>
+  </maintainer>
+</pkgmetadata>
diff --git a/sys-firmware/iwl6005-ucode/Manifest b/sys-firmware/iwl6005-ucode/Manifest
new file mode 100644
index 000000000000..87ea879781c8
--- /dev/null
+++ b/sys-firmware/iwl6005-ucode/Manifest
@@ -0,0 +1,7 @@
+DIST iwlwifi-6000g2a-ucode-17.168.5.3.tgz 210543 SHA256 febbbc0851db17296d35e5ca1d9266c1a14e9a9ae6ce41a36578c44971ae79f9 SHA512 9fcee47c294777f30d40933942db171d45e4bfd6c6adc8f80e759f296d1df8ee91419379bddd738654c04d73974d03dc6a9a809e10a16e58b8a3f76f8df10636 WHIRLPOOL 242d1c2b4b7e74f3bea1a48137e6dcb4871f063454c79406180369ac8fe385a493083f9b7b13d5854b0e74a955bc124889c68a9067ff4550c684833c4eec4336
+DIST iwlwifi-6000g2a-ucode-18.168.6.1.tgz 326978 SHA256 a7f2615756addafbf3e6912cb0265f9650b2807d1ccdf54b620735772725bbe9 SHA512 6e30662005e49957323addf62b73ac98f15122f451674038c8154cb544a36b1d004ad38818bf7530b1135eb40ed73d4aa4b28fd77f807ecb7a779e2067d52adb WHIRLPOOL e7f7245887d1d7c384e1afd3adfe8609970a3541059966ba625b54371c713385115cda9989ac382bb2e07ac0c74069daaffc8ca623ca58ea01c8ea0c90084bb0
+EBUILD iwl6005-ucode-17.168.5.3.ebuild 565 SHA256 49d514732af723d04367e316dd8eed228c243bd8f451813c9429083201940811 SHA512 f37536d8da9fa0523fc84018b7974a91cb1a725ec5c1df43303f01791a75b726ba78a016f4ef1535aa8630dd0b92aef8edc9297ca8c6affc9ca6d948922e8d45 WHIRLPOOL d42e4ad5c8b994dfba0488ba08ba56a8218d5dd630a8bf34d67cb790ed0d4b99f9941a72ad7cb3c281e1b75b157e28b8963f7a117efe418d7092a724467666be
+EBUILD iwl6005-ucode-18.168.6.1.ebuild 565 SHA256 a07ad4f76cb94732210c32529df62beda638fa060becccc8d65c4178c62415b0 SHA512 4bf4d97bb4e9308929e2fcb476f3ec6399a24ba2585e4fe00ca48925ed38be85186472eefcc859b5bb0b54be7880e5374cd65a92df3e412d90439557ee5e4381 WHIRLPOOL 3fb1bba423debe3348931aafede54d074b8f68667af1b817e0210f0594e2ddd0b38aa534fd593856c9172d057d87453a7a87d595bb6a24bb4493d27bbe4d3933
+MISC ChangeLog 2284 SHA256 3dc8524f2fe89fc85a7e0cffba2714c00f912ca15a85f4a8773bfb2acc39021e SHA512 dcc5051dfecc24c2c013b72de4be9e341aed2ea15c6e9c36780e3564afc1e092131e49a5b0572ff10d05b8abbebb7a8ce04eb482f00646dda01f63a31c973ea8 WHIRLPOOL 7793a753e34092e7930c2d47562b794b313fec4a412af24bafcc5239f6f72da00d1dd6ceb9c7d2d84d84bec19af7ab4b5d134fb9b4659eb36171797fcc89d014
+MISC ChangeLog-2015 1136 SHA256 d4b0f69538a37d7614277154805332d891f1e895b888f0e053fd2ae651d7d92b SHA512 4f14594dfb991bdf5dfbb3e7a9039899d84a395503cd22d8fdfffceb9cf3ddc72bcbc71c3a75b403a1c122f4003e964f8562f4336df2643255acc30410392df9 WHIRLPOOL ae37dd71b271b29051e385ccdac50f567e16f908ec826ffa1fca593e91463098067a0db70591c82aa8147f0e58c14ca1d9fe1cabf7605de044fbc4de2ebfd534
+MISC metadata.xml 320 SHA256 4aba2410e23d50bf7680af4ed803eb9a283193e1771d46370f4f253e5dfda206 SHA512 92ebb7bdc4e5c77df056311af1c8e592abee40584c9053d19e1f68acbe7569a5da2a2be2469509e4b8d9534bd5db801960bfccbba0d332e9f974b367c3f1e65b WHIRLPOOL 911db8b23b1412da7cd538a4ebc8f80d097c74805618e8fe8e73ac0a77f99992e2497f162df1e512cf399fe302ef2e5d48781baade85098248d290e8a2b15a49
diff --git a/sys-firmware/iwl6005-ucode/iwl6005-ucode-17.168.5.3.ebuild b/sys-firmware/iwl6005-ucode/iwl6005-ucode-17.168.5.3.ebuild
new file mode 100644
index 000000000000..385bf5375e9c
--- /dev/null
+++ b/sys-firmware/iwl6005-ucode/iwl6005-ucode-17.168.5.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+MY_PN="iwlwifi-6000g2a-ucode"
+
+DESCRIPTION="Intel (R) Wireless WiFi Advanced N 6005 ucode"
+HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi"
+SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz"
+
+LICENSE="ipw3945"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() { :; }
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-6000g2a-5.ucode" || die
+
+	dodoc README* || die "dodoc failed"
+}
diff --git a/sys-firmware/iwl6005-ucode/iwl6005-ucode-18.168.6.1.ebuild b/sys-firmware/iwl6005-ucode/iwl6005-ucode-18.168.6.1.ebuild
new file mode 100644
index 000000000000..f38d277516f6
--- /dev/null
+++ b/sys-firmware/iwl6005-ucode/iwl6005-ucode-18.168.6.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+MY_PN="iwlwifi-6000g2a-ucode"
+
+DESCRIPTION="Intel (R) Wireless WiFi Advanced N 6005 ucode"
+HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi"
+SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz"
+
+LICENSE="ipw3945"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() { :; }
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-6000g2a-6.ucode" || die
+
+	dodoc README* || die "dodoc failed"
+}
diff --git a/sys-firmware/iwl6005-ucode/metadata.xml b/sys-firmware/iwl6005-ucode/metadata.xml
new file mode 100644
index 000000000000..cc348764b82a
--- /dev/null
+++ b/sys-firmware/iwl6005-ucode/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chainsaw@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		Firmware image for Intel Centrino Advanced-N 6205
+	</longdescription>
+</pkgmetadata>
diff --git a/sys-firmware/iwl6030-ucode/Manifest b/sys-firmware/iwl6030-ucode/Manifest
new file mode 100644
index 000000000000..d1c1af44f2ce
--- /dev/null
+++ b/sys-firmware/iwl6030-ucode/Manifest
@@ -0,0 +1,7 @@
+DIST iwlwifi-6000g2b-ucode-17.168.5.2.tgz 221694 SHA256 5e4afdf070bfef549e50e62187f22dc2e40f5d9fe8b9a77561f8f3efb0d1d052 SHA512 124c061db09de3d042e1a93c0b45b4433245a4d0ab7990f4d19ff646ef496a3a988b078efe52bc4c2aad2c0a1eaa7c25e78e78c3f9a194b8b885397cdcfdf57f WHIRLPOOL 19ac704768522ed710b52d106a3e0a0e19ba223c28a1778b22f855473349d47c8ab8df1a368cf171643aa7ab2bc4605c599e1d02a2b403203aee5b52d192baa5
+DIST iwlwifi-6000g2b-ucode-18.168.6.1.tgz 330313 SHA256 1683c76b52c3505205447c338603ad08611fcc2da024f476e56e1298b4f10bea SHA512 6bc37e75c7286cac49b84160c33b6f5218284fa460bb3e874a9bef2f0b669ebb5998dbed1e45815cd91d6eedad681dd5a4a75358ec4066c6db629e2b3e44ba16 WHIRLPOOL 75cd46af33869a4c6678dba8264e7936ac73e6d292d26d9ea519dcb93ac506bf849c0eb4cda83a3ecdeed65719f8f1eaf48b474b2767f2ee015c1d710a465845
+EBUILD iwl6030-ucode-17.168.5.2.ebuild 565 SHA256 b6767b2678dbe0a4e71eaba5e90a4d3e1163655d47a24498f4248f2fa994619a SHA512 3f753629f39a0c9fdbcf131251eca68420ea7d64de0a237d543c68a118a8672b7058f5f85b62c31462b65c0a4bc1ec734ad7c859038ae2d6102d9847b39c4f1b WHIRLPOOL 251c2f15ee91313667db10c9a4293973c0cbf3d249b3cae2494a5c436ce61ee8fdbdc00b0e1e809e72f43d56198201f500df1d52a21a80c758821e1301a7ad91
+EBUILD iwl6030-ucode-18.168.6.1.ebuild 565 SHA256 8a0f11f54d348c797bac97225ef04a254f6d784f0a78af3acf6513a4e857d677 SHA512 dddcfe091cd11e9a05c4991f9fb5b5597dd4b34ccc70c940dc923d96615d15c2673e15e954fad38b8ff2cfb61e838ea6bfd3ac70f2db6e839d7b0ec2a0231f36 WHIRLPOOL 1f01f49497e0ba27bdafb512f7c96077abdfaf21196ebb73ee71d95514dad8c0cf2581ccda8d904293e841ba5f6d5b4dfab24aa4503d929849e7869186592d14
+MISC ChangeLog 2284 SHA256 6138290bff1dfdf42dbc5c653c49e53f354f7e88bc7993424f3a01187e5145ea SHA512 aaec4860a1c69270069056dc2114721d034d3f8f7d6532e11b74830eb5621a2a92da5c015e14e5be8d71d09b2a87148087131323faaba32f7f2146780b5f7235 WHIRLPOOL 9558f79d9cf536da5e0026e056ea87ec2dac05cf1df65a5a73097b308252356d4b9412dc6bb4ef416f1fdd689ff2b8f45f415e8dd4bedf30f125eef531d26804
+MISC ChangeLog-2015 1351 SHA256 4fa258f2da6ea9d79a4f0b65adaa0e2c4d346dff141c66e09f4ff6f6c9a3ab6e SHA512 6ec83ce787d607a8732027d075815f71ff5178873107b07768124b9990b49cc18aac5490ca5f2de421f50eae575f25197fcf3e0c6d16c56ffb79359c06e0b804 WHIRLPOOL b69bb953cb93781b4db5a94eb82bc112666762bb06fe6e22a3514e3b0eff30c42a75b8d51b00e15ca17146905286284960f9af6ad5f0ccadde00b57e81189702
+MISC metadata.xml 320 SHA256 4aba2410e23d50bf7680af4ed803eb9a283193e1771d46370f4f253e5dfda206 SHA512 92ebb7bdc4e5c77df056311af1c8e592abee40584c9053d19e1f68acbe7569a5da2a2be2469509e4b8d9534bd5db801960bfccbba0d332e9f974b367c3f1e65b WHIRLPOOL 911db8b23b1412da7cd538a4ebc8f80d097c74805618e8fe8e73ac0a77f99992e2497f162df1e512cf399fe302ef2e5d48781baade85098248d290e8a2b15a49
diff --git a/sys-firmware/iwl6030-ucode/iwl6030-ucode-17.168.5.2.ebuild b/sys-firmware/iwl6030-ucode/iwl6030-ucode-17.168.5.2.ebuild
new file mode 100644
index 000000000000..4fb3777c3998
--- /dev/null
+++ b/sys-firmware/iwl6030-ucode/iwl6030-ucode-17.168.5.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+MY_PN="iwlwifi-6000g2b-ucode"
+
+DESCRIPTION="Intel (R) Wireless WiFi Advanced N 6030 ucode"
+HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi"
+SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz"
+
+LICENSE="ipw3945"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() { :; }
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-6000g2b-5.ucode" || die
+
+	dodoc README* || die "dodoc failed"
+}
diff --git a/sys-firmware/iwl6030-ucode/iwl6030-ucode-18.168.6.1.ebuild b/sys-firmware/iwl6030-ucode/iwl6030-ucode-18.168.6.1.ebuild
new file mode 100644
index 000000000000..b69d520daca1
--- /dev/null
+++ b/sys-firmware/iwl6030-ucode/iwl6030-ucode-18.168.6.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+MY_PN="iwlwifi-6000g2b-ucode"
+
+DESCRIPTION="Intel (R) Wireless WiFi Advanced N 6030 ucode"
+HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi"
+SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz"
+
+LICENSE="ipw3945"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() { :; }
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-6000g2b-6.ucode" || die
+
+	dodoc README* || die "dodoc failed"
+}
diff --git a/sys-firmware/iwl6030-ucode/metadata.xml b/sys-firmware/iwl6030-ucode/metadata.xml
new file mode 100644
index 000000000000..cc348764b82a
--- /dev/null
+++ b/sys-firmware/iwl6030-ucode/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chainsaw@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		Firmware image for Intel Centrino Advanced-N 6205
+	</longdescription>
+</pkgmetadata>
diff --git a/sys-firmware/iwl6050-ucode/Manifest b/sys-firmware/iwl6050-ucode/Manifest
new file mode 100644
index 000000000000..02417ec4568d
--- /dev/null
+++ b/sys-firmware/iwl6050-ucode/Manifest
@@ -0,0 +1,7 @@
+DIST iwlwifi-6050-ucode-41.28.5.1.tgz 223378 SHA256 597d9a3ddb4b69f4590b436cf33d30a342bab2de3c9d8fa3d007b039accb20c4 SHA512 16b618ef6b6c4e68d4a27d36e6f56e334528c00db62e6acbeb243257dc25ea373dd5be15a7f12acf06dd780ab706a08841419b2273bdab9cddd62601646afeb8 WHIRLPOOL 35fb7a7609697af9e40893577e788862f5304492c5c7d72f07d5ce00d32aaa727550f873f5f234d26670e693b5a48010ffb30bf6c361c85b5e28d1d646d73223
+DIST iwlwifi-6050-ucode-9.201.4.1.tgz 217685 SHA256 1cbca537d7c9af2c8d1f40b00cb430055b6f06de4b6d29e2a318bb0eae3352ff SHA512 66aa8df5eec92ca29cd92a944b26c164f393784edea99e1b855aaf372e404794e47cd5fe763a47e445e776b324d7a87c221e439d9fe4a9366635f36d93c1272a WHIRLPOOL 8bc049e4fa40713b2ffb8f3a8e91e3d7438224b930ecbf3f76b775e3925efea9c8452ba121037e66179a2ca16c97bbd9c1594c2c94a6716900b4e16a0f7e64d8
+EBUILD iwl6050-ucode-41.28.5.1.ebuild 882 SHA256 b1bc6fb8c2263647b77637bff9dc15449eb41493158245b2c847e6902e097913 SHA512 566d3e10e2b74a9fbd8aa392dc2f8e0ef540b8edd3d0d00210e234b7f594c4bda612e110ed8f512161a46d7af3d6311a98e106ceef629b5330b8505cea082177 WHIRLPOOL ad6a66c04be06981de0287e78b2f67c4609310f91bb30477ab2c01ffaf0fa3f8c5cca9d37ea9e7ab48c89a16117fc10ff0399af456d8836113f5099b7ab77b2b
+EBUILD iwl6050-ucode-9.201.4.1.ebuild 550 SHA256 a4d76b41b834c86e3eeeafea824ad915e22b0c01f416e288856ffadf4796d6f4 SHA512 4e8460106f4ff2772108add1cbfa8088f7827684fb676517df23b46b396ebaf740f878d22ebe441b85e5b39be31965441a3e759bfd39e1e2eda33b7daa103b04 WHIRLPOOL 6b48d196fcbe60b44c821bb39bbb4292afcf053889a0ec681fcb497fc7bdb336aac90f8551f22614cf6064b736c0ce9ef1f850ab2436ee6b06b5fd26d5119f51
+MISC ChangeLog 2280 SHA256 c25ca8ad90450a239b18b26d6877d8cfb8598d02cce8411b491785d48a9be3ad SHA512 40cfd990b0edd3db8fafcaacf58aee0c0ae3d276089fa6f1e0d44975c657b73c0459d1342d9b490b89bd55ba1c3359ad55851fafebabac3780efb284c7b40a9b WHIRLPOOL a50c00a77a0865b5aa89baa6e2a9b8b6dd4e169095b697c29ad2e2a29b6761cce310c043f6514ae9cf300012f120da781f91fe4dc7d7e74b9bdb35778b9cdfc6
+MISC ChangeLog-2015 1337 SHA256 6fa0614c8f03233481efdf410ca19e75ddb784cb488b14e8359bdd19c4e4184d SHA512 51361f0bdcc2bcdc33775fb662e8fab96709ca052ce08f6365a18f32ae3cf7398b5728f1278652793a45ee5b75551ae574b919ddb7c7ebd5f3552778970fe767 WHIRLPOOL a5463ec9d27918d2d7249762a2e0bf581e3ebb666661fafdb2157efd68af53fe1b90150a00233b4ef4b99f15a9923c9b3957486a7b6487192edc97669cf2192e
+MISC metadata.xml 222 SHA256 efc75c99c2e9a0faf92d38715e27f5f41737e41d09151cdfc6c2705acf9e0181 SHA512 3d793038a1abf5bb86eeb23fee623f27db1d8e529372adc51eb4ffd1d0c2deb6df1c4d637954cc68e07d590c25e3d74a8437d02c1864a21c96f63597192cfef9 WHIRLPOOL bfbd07ff189028e3d1f64d5a77675072490de02c469f821434f53dac8538c45a1e446401cacde68bc626febe7bcafd3b6a526f569873fa49c7f018cdca9f6963
diff --git a/sys-firmware/iwl6050-ucode/iwl6050-ucode-41.28.5.1.ebuild b/sys-firmware/iwl6050-ucode/iwl6050-ucode-41.28.5.1.ebuild
new file mode 100644
index 000000000000..1dbd1e7d1f03
--- /dev/null
+++ b/sys-firmware/iwl6050-ucode/iwl6050-ucode-41.28.5.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit linux-info
+
+MY_PN="iwlwifi-6050-ucode"
+
+DESCRIPTION="Intel (R) Wireless WiFi Link 6250-AGN ucode"
+HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi"
+SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz"
+
+LICENSE="ipw3945"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() { :; }
+
+src_install() {
+	insinto /lib/firmware
+	doins iwlwifi-6050-5.ucode || die
+
+	dodoc README* || die "dodoc failed"
+
+	if kernel_is lt 2 6 37; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
+		ewarn "This microcode image requires a kernel >= 2.6.37 or a 2.6.36 "
+		ewarn "kernel using >= genpatches-2.6.36-8 which is included"
+		ewarn "in gentoo-sources >= 2.6.36-r6 or any kernel version >= 2.6.37."
+	fi
+}
diff --git a/sys-firmware/iwl6050-ucode/iwl6050-ucode-9.201.4.1.ebuild b/sys-firmware/iwl6050-ucode/iwl6050-ucode-9.201.4.1.ebuild
new file mode 100644
index 000000000000..d7a9cd826bb4
--- /dev/null
+++ b/sys-firmware/iwl6050-ucode/iwl6050-ucode-9.201.4.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+MY_PN="iwlwifi-6050-ucode"
+
+DESCRIPTION="Intel (R) Wireless WiFi Link 6250-AGN ucode"
+HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi"
+SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz"
+
+LICENSE="ipw3945"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() { :; }
+
+src_install() {
+	insinto /lib/firmware
+	doins iwlwifi-6050-4.ucode || die
+
+	dodoc README* || die "dodoc failed"
+}
diff --git a/sys-firmware/iwl6050-ucode/metadata.xml b/sys-firmware/iwl6050-ucode/metadata.xml
new file mode 100644
index 000000000000..542792de7f1b
--- /dev/null
+++ b/sys-firmware/iwl6050-ucode/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mpagano@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/sys-firmware/iwl7260-ucode/Manifest b/sys-firmware/iwl7260-ucode/Manifest
new file mode 100644
index 000000000000..e44e04cccc3b
--- /dev/null
+++ b/sys-firmware/iwl7260-ucode/Manifest
@@ -0,0 +1,27 @@
+DIST iwl7260-ucode-0.10.11.23.tgz 347295 SHA256 4a1feba4436bc48c77e3494114e3b0d2a9d6e9208990c52b16c30c38da3c3cb5 SHA512 8e8e14be7e2f3f97a40bcfa16065d55418e42c10d7e4987b956a55775a8b0dfe75127296b97e6bcb9becf53133cd3f052e2691c05421804b6d3e11fc951d1a6f WHIRLPOOL cf55616de4653029bc3b178d24720d9ddfea3fa08342d0d80ac6602e3fd328cbb3540e4dffa22df243f600e214e0c6f206d5d63569ecafc48028a33ab4587319
+DIST iwl7260-ucode-0.10.15.23.tgz 348549 SHA256 8ad0c1457b694a6a84754619a40d826e6755de65efed8b8d1b273eb6560777e5 SHA512 a40efc2610a981b1e0de2a88d16afa760f5bcb116987034769a1a9adcc716b1ea84103e9a7c372172e98690e729c4d6e34b5857e2c9097439184b3b473f168a8 WHIRLPOOL 3836fb407fcec2b9e9ce64a83d18ccb40f1c031f166820f8921b06df7828bb94aad3e02eef11d159a41bc236c1d0f0f63829759a5671744acab5967fe5056e2b
+DIST iwl7260-ucode-0.12.16.25.tgz 353537 SHA256 d747e20bf4127357b162b583dbbf2067d2c034fadba1a2063de7aa94885b4f3e SHA512 efedee8f6d4078865b45962a8297c6c1022504653360ee6a23cc7f1eb4cfb1a34c5ee6685cf9819a61f439d445579e1eb14da84f3e28bcf45f89a5a66fbdfa07 WHIRLPOOL b4f913e9a4e92f61bb557da2254de8dc5c7c0d293c0d1948c2f84760a34dec56243e179e90aed74380bd8cdaed031994d193b8f62cb38d8e7c286831a99dcbd6
+DIST iwl7260-ucode-0.12.17.25.tgz 353588 SHA256 fe6fd0378708c72b7ba03f5d9164ab40c8eb4f34d185bba75bd95abb56a86557 SHA512 d43a278aa6f96599649991c6dd4b5cda1833d2eabecd00e4b894a4edeffa9dbd15e2e85ad656d4083dc20e314a2b473e40379a3ac88ad9d72a5ed1f7e1df6bfe WHIRLPOOL 1adb44d0b7854c5254de979b7873982f7e57c93aef9403f3458ecd3c9df6fe18022b93ac0d27e65db067872532c6c6a68b2d32baf74ae22b0024cf7a3be9b2fe
+DIST iwl7260-ucode-0.13.30.25.tgz 352035 SHA256 c4ea399520e93d0c7c4d28aaafe8bbb663f9ff9879d94188149fbbc579647463 SHA512 11fa74f97d658f0396aed081c9d2eb13580ce6dd5278876411ed7c972b9aa1304552924e70cc5dd4768c0605cf3359b8678837052ce0a7d21e722a2198c44223 WHIRLPOOL fb6fc22093ab275df34bfcccc5e2150451f8d69b4d57cce4f76a8e037ff9b224908cc2e207e7e4790232bbfea8bda2284a41b48565be8467270ef07e793c8321
+DIST iwl7260-ucode-0.15.227938.tgz 493590 SHA256 e9308d39fed1a9dc01237bd725640c8a45e013dcdc29ef3d5579de714502a202 SHA512 44e17c425be6c354983e80d6681c459c36b278c18ad12325675abbd8f94d1f1f3b4ea9961d26a7396e1e8a42ebc36ecfba80d20fd75fab9ba1669d0c8ecc0c8d WHIRLPOOL 9b1923751f59a8314b2a404b1ce42d57267807f145bf4bc089d7ba2737b8f684e3be6aaab6c9adb51d214b96d164dc081bdcb7c102bb3bbd96e90bef8596eb13
+DIST iwl7260-ucode-0.16.242414.tgz 494594 SHA256 3bf102cd3ea8a720bef89dca120c94aa5ff34bcc756413fc5982a39613641d84 SHA512 8abfa4141a390a733ea6a43fe7d8d8874752b84a42a5be0a93ed7935f2f76241af41d48f2911393837a32aaf0230f1b1ee9984488e60f447c29794c0e60cd0bb WHIRLPOOL 948e785c52686174e6be5869bf13823e356d03944eddabbd11c8ac5fb5379585fdfb84edeca1b097d801065722d7703c8524d6f4ae82405acac67443583dc62e
+DIST iwl7260-ucode-0.7.1.22.tgz 341956 SHA256 1ecc335e2a81a4f6d19422a5e707a93ef56351030a4e95d698e064fe51ba6154 SHA512 c6ae43ec84e5d0df85b6fc1962c5d6052be9352e453b53807a3c45eebc334892dae51c84a053fd197afa66a77bac5b5c349de8d566c071f15f2e76c370a36880 WHIRLPOOL 91ed3469604377462701ac921f06bd0269e032f04a1523ecc9e550d94cfd0fc1fee5caa484f0d46cd5d41ad25bc041fe953a7cd6c2dc0b8e3cbd39705b08119d
+DIST iwl7260-ucode-0.8.15.22.tgz 342953 SHA256 7ef7010705b26ab182c45f3810243cc814c0bec7a0c3dad21f0cdd22019ee7ec SHA512 7f6105c547dde559280444e1d729928c33d55ca4f5df1036d40ced735d7863277f2291a27c36ac544bb0c4278883b345be087268124d22af85155b0b4a57bb96 WHIRLPOOL 2ceea1c21749af78748652c8ce12df520621e0f54eff3c80307f0e038b23f730c9eccbadd1a4152276b8e99a447e7f1e38641d161334c197a5e86c5ce9e9e37e
+DIST iwl7260-ucode-0.8.24.22.tgz 346691 SHA256 11ef671652ade65fc6c7c843f56d19873b5a91b2e65676bd6df9ec39642b7cff SHA512 a8a81030bdec074b6370a6bb7f3b22fd8389b76c00b9b27902acfb34be2263662adf5b7eee6e8817c22dead54528607ccb93194073bd509191561a15ce88a3e8 WHIRLPOOL 205af365e22f9f28a95a5e3bef0cff59d301d03f60a21daac79a0f039c35fadfcbaca97b68082ecebead3396576d93bd372655c730cef87524a1dc382331a8d5
+DIST iwl7260-ucode-0.9.214.23.tgz 347695 SHA256 a3124e3c03405dacae6782ce7bc5b71c38c20e3528413a9ab571a0ce4e2418ad SHA512 d3ffaacc2827d088cbc1086b4d736e158dafde981e10a01442ede3003f8ccc66bb7ca6ca62c4f3c03fce4cc3cba56141c9144024ecfdaaf52ea3c7cdfbdbf074 WHIRLPOOL 81af9b1967a7f30da7bb60d068fe0c0242bffaf6ff80b00f6c7691f2c9e27243cde0f70b10581d3fbacd814ed369b9c39ca3ba30c677fed552496cc51f56dd6d
+DIST iwl7260-ucode-0.9.228.25.tgz 348138 SHA256 66781ba55a121889c3a2f0433d99c7bffc7699f08437d5de53890a362f4dfd5e SHA512 f2d6d5fa859e0f7680f695e6ae4fe2c2a56eb7dd26430b61520f7ab95322601bceafff33038945bbf07c8e6691b9a19cd5a5e7ae3e349bd89b72d11d09a9bfdc WHIRLPOOL 261edbed0edffaa78fb64515d1ae0f7fdf43a9f859e57e1a35120c8bda2f273b1be60f8ac4b4fc41b242cf1fa8771ae9e63f35c0be2049b506ae7da491c2a0d4
+EBUILD iwl7260-ucode-0.10.11.23.ebuild 1416 SHA256 4822cb8963f3da77224833299fa33252771f77d02d7e6b26a9ad5df91278252d SHA512 e53c69c405039553ec1bd015ea77c5fac9595dd423030c89eb2daddf969dad9e06e61239c7d2eee3e6b55f75d934a3ab6e926387f1cb27994b0c1c4acb2d18bb WHIRLPOOL d302c212dcf3b7c032c8ae3065cdba79184a92041d85c9400a0196caf6899ea56718add1c16db66bb81428aaf395ce5d0168fce91be1c402556259fde550a847
+EBUILD iwl7260-ucode-0.10.15.23.ebuild 1388 SHA256 adaa9819ad0a9216e5c89d84389416871d030e88421fda557477b85ce2a21134 SHA512 a6a663d14131755f3b0e3c5d4d7a40b255b1eb912ac45017f5e122febf5bac41e4213d0154ea3d22076ff65a58aff17dd4a4c10b3b344e20f16a202c4ef38f11 WHIRLPOOL f9daa296254d6def6813a5dbf9ac6e3bb75459a2447db23fc86cd260b747f8b75c38984ac6ef537d5be611ddeb8211f33cdf0a60efc93f48f59ba985247d0951
+EBUILD iwl7260-ucode-0.12.16.25.ebuild 1388 SHA256 14ad8630e63c3c18fcf477c6d616e618d98570db291d03402cfd5a165ed91108 SHA512 a32ff0461b51d873f4e7c214f4ec0cc6131bc856486068f8741c4a2e023a6faf474db2a66ed074c5f44e4cc0458a4590555c71c26867153891d5a3360ea32ba9 WHIRLPOOL be5305a20313e77660e17ca77f88f9b909db561b14bf17f7b4da6e163a79d9a51a742f431f309b9d4af8a0bb3caf59ea2b672064f979ae64415e94719bfe01d9
+EBUILD iwl7260-ucode-0.12.17.25.ebuild 1388 SHA256 9e5e2544ddf3f0d5ab90c071d47c6f5685af3d2c6fe65bb39265d6b4f7c2d955 SHA512 a4cf54bc50795849cbf4a7e326d70b067681dca07f002a0bd14394b3a4d1804c64557c3ef4ab7aaf02fe2b507710235eb46a77f45751095ee57a36faff43d6da WHIRLPOOL 4d2d74a01083043c21a35642695d047de806e025ff3f1f8e431c186d32ce0c1da4d73ea6f6f88cb2382221411a33fd97d58dbd6f3c6f8ecbb5a0396ffc22dc3c
+EBUILD iwl7260-ucode-0.13.30.25.ebuild 1387 SHA256 fc7807ba52b3eaaf8b094fbce710f0579aa714b004be378e5234a6cd11850af3 SHA512 97b1927b5153b7eb62b074ae2f3ac1b9f77fbb96dbd19d147d6373db808ac82b11d2f3cc2540fe787d9c24e52f62710a47f4ff391ea4129b88f5c3e665060ab6 WHIRLPOOL 04473e418fb79da3f2a120e1d6067c491546e72b681b28262c730edeb1be51b4fb2b3febb76a6b54305b5fa166894b0e855d0932abf85943f6186bf174f15a89
+EBUILD iwl7260-ucode-0.15.227938.ebuild 1378 SHA256 ba05f41e8f45f21e881a79b5f4a48ec3e1445ea758c7366d56f05a335f3354c0 SHA512 8cd5c32adcac6346835952a23d18f08ee4cac7d2eb1d3eff05dd5c03720a4a559857b80847f8f803320e0a65a1591a99cc55cac1a47050adc14c69d850cbd598 WHIRLPOOL 488f630fd20249def283b150e53c5b6d12e487bf41a61b0fd2a41fb02944526784b0b60cd45de3b39c7213f82c4034e2596a58684909f794a333aa53655d8d85
+EBUILD iwl7260-ucode-0.16.242414.ebuild 1378 SHA256 c1e1704ee6b449ffbd194ae41f1dd0af4719a1b9cca2fac13303c67a5e05203f SHA512 2f149bf9cd37e79a7dfcca8388b4874187432e0459a40acd980d71ca1203864e10014c9a279a1fa18425b404be0a1531799198c21157312d256fae2f6112df49 WHIRLPOOL 5ae25df7b73d7e47767b99ade62fc9ad89916d2ad99ecaa55194d64659af286ac891a7b0cb3daee9afed4895aa6478e16eb2a7af4ca047d1885d098789659d54
+EBUILD iwl7260-ucode-0.7.1.22.ebuild 1319 SHA256 6c277ab0385f8817798f9bded5b540d3c9acb84861748f7ba65afd2bbb02ac78 SHA512 1a9f5ef2f11d861b8252684012b5f7752c9f37453454562bc06cdec5251ca5d661aae5945191a0ac1b42ef09e16da1cdea59d763c598db167732c84f23079627 WHIRLPOOL b6bec778d81a83adbbede7b277575f204db1d6784e83c3abe74afea59a36601c91052b7aa25543acb230cb60f5226637e5c6ca393e089427a01db2e7e55575da
+EBUILD iwl7260-ucode-0.8.15.22.ebuild 1416 SHA256 c501acda420e7b2e3961a5ddf04d2a88fefa5675599bbf7027e2a63d0fc8a737 SHA512 59a576991e3729a3cafc957c6900c213086f599e8b811942416429510b2d4f736ecdc894c76e90f27894f2d95ffc3b7f120e413da4d3f91980cecd66f9c98f2b WHIRLPOOL 2bd3df0c65db882eb112d8d8808f30366f1a68963423544ed7f89ac247e5680922e8316d48bc3402dbedc2d59903afa9ad808f1894a34d7436f8475aad41440b
+EBUILD iwl7260-ucode-0.8.24.22.ebuild 1416 SHA256 c501acda420e7b2e3961a5ddf04d2a88fefa5675599bbf7027e2a63d0fc8a737 SHA512 59a576991e3729a3cafc957c6900c213086f599e8b811942416429510b2d4f736ecdc894c76e90f27894f2d95ffc3b7f120e413da4d3f91980cecd66f9c98f2b WHIRLPOOL 2bd3df0c65db882eb112d8d8808f30366f1a68963423544ed7f89ac247e5680922e8316d48bc3402dbedc2d59903afa9ad808f1894a34d7436f8475aad41440b
+EBUILD iwl7260-ucode-0.9.214.23.ebuild 1416 SHA256 fd41f5cae2cf080e1574e4bcdad861631b2bda6a8cebed0c8b02cdd61a14615c SHA512 245d095fd3bcff3abd58d021e58f03fe5aa31c4c01413e07f28002def29a47d6d820221e5a0355b9a99f66e48296f662813a747b6e4e5fc29761dfd4bd579d7d WHIRLPOOL 011285b5b392009ef39d129b6e73f8e4535c8486d672eabb765835b86ae2684929d46109546b86fe60408f9e38f006518bd89e05d1107935b284cf08f53cb046
+EBUILD iwl7260-ucode-0.9.228.25.ebuild 1375 SHA256 1cd59455266bb06de1a23412acee4253c132b920918eb0d13da23bdeee12baa2 SHA512 69a7dd51f6aac8815136d8ffef8c2442297eb880a8ea766cc48f9079982cc9304e7db1f08bc7ecd1165cc2a7e2e14f6fd09fc742421092d27792f60e7ad34162 WHIRLPOOL 1a3bf4a0c30792ea212d95b3941fbc422938f29968c43be9369d7401ddd82480df79df0a7d1f4541574cf586ce7e03706c8a3aaed17cf85b0f76bbb7b27b6cc7
+MISC ChangeLog 3851 SHA256 94982692ef5ccf34c2d1361b00056f487d3d98c8e46e7d6520e08c0d88bc15a9 SHA512 1ddb8f17f5394336c61a6cb8ffe847c602e93bf628445b18607a3afb7130735cbb7a5476a12e7c9f0fc3d7dbf252728230126307bae91a90d25af6f0a20fb641 WHIRLPOOL 6a7a878fd24d5ffcc1900b9f7e0b7fa9ad58bdadc53e527811c285a6c6b7a55defe86fa0c409fceb8575a984fb89aa6c9a994417494e259616e59f208a7d01d7
+MISC ChangeLog-2015 3780 SHA256 1d37edbe7875ff07fbf0da5991a2044ee2ce5e3f9e8d74dc0c9532e470bc9752 SHA512 0e50381848c86e15cb0ffc02864e9719b26b0684cb87e366545155e81b1dd7310b3ac9ba67f713eb7f725cbb1b7f4f7a86b5e0a4e81da3e190179d4a7427d669 WHIRLPOOL c6e6b2f21e5f10f11092c51de050d325e345ca08123b4bf28ab13ac5a6774eb0e0dc065632be58d60758b95dc01071b631251972587e4ebcf39430519d153ba6
+MISC metadata.xml 412 SHA256 77295a1dd228dd07b6afdb833f4e315c0eca4d126cbe3d44c8508516c83b0087 SHA512 87df5e498b2fbc9e6dd2826285935bd440733e7efb2fbd627593a8f15a02b7ea4456fffb2d4a39ed37ab3125ffe25ed59208b9d3621f0afb908aefee567e9c46 WHIRLPOOL 788d4f45a64e28e51f5ec1eafd21169a54f5a3a350b94590824ad676349c0a5f76351643edb2000fa2235ca1f9b64bf3dcff7f9cb52bb052a0e58407d7d4c12b
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.10.11.23.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.10.11.23.ebuild
new file mode 100644
index 000000000000..b7b57b49d435
--- /dev/null
+++ b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.10.11.23.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit linux-info versionator
+
+DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DV_MAJOR="3"
+DV_MINOR="17"
+DV_PATCH="0"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="${vc[2]}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+	!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
+
+pkg_pretend() {
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+	dodoc README*
+}
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.10.15.23.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.10.15.23.ebuild
new file mode 100644
index 000000000000..84397cd3d807
--- /dev/null
+++ b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.10.15.23.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit linux-info versionator
+
+DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DV_MAJOR="3"
+DV_MINOR="17"
+DV_PATCH="0"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="${vc[2]}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+	!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
+
+pkg_pretend() {
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+	dodoc README*
+}
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.12.16.25.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.12.16.25.ebuild
new file mode 100644
index 000000000000..c8229ccdc4d5
--- /dev/null
+++ b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.12.16.25.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit linux-info versionator
+
+DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DV_MAJOR="3"
+DV_MINOR="19"
+DV_PATCH="0"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="${vc[2]}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+	!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
+
+pkg_pretend() {
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+	dodoc README*
+}
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.12.17.25.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.12.17.25.ebuild
new file mode 100644
index 000000000000..4663a5372b54
--- /dev/null
+++ b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.12.17.25.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit linux-info versionator
+
+DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DV_MAJOR="3"
+DV_MINOR="19"
+DV_PATCH="0"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="${vc[2]}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+	!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
+
+pkg_pretend() {
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+	dodoc README*
+}
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.13.30.25.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.13.30.25.ebuild
new file mode 100644
index 000000000000..831ef0a387b1
--- /dev/null
+++ b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.13.30.25.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit linux-info versionator
+
+DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DV_MAJOR="4"
+DV_MINOR="1"
+DV_PATCH="0"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="${vc[2]}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+	!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
+
+pkg_pretend() {
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+	dodoc README*
+}
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.15.227938.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.15.227938.ebuild
new file mode 100644
index 000000000000..15801434dea4
--- /dev/null
+++ b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.15.227938.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit linux-info versionator
+
+DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[2]}.${vc[4]}.${vc[0]}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DV_MAJOR="4"
+DV_MINOR="2"
+DV_PATCH="0"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="${vc[2]}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+	!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
+
+pkg_pretend() {
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+	dodoc README*
+}
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.16.242414.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.16.242414.ebuild
new file mode 100644
index 000000000000..3abce4765618
--- /dev/null
+++ b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.16.242414.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit linux-info versionator
+
+DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[2]}.${vc[4]}.${vc[0]}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DV_MAJOR="4"
+DV_MINOR="3"
+DV_PATCH="0"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="${vc[2]}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+	!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
+
+pkg_pretend() {
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+	dodoc README*
+}
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.7.1.22.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.7.1.22.ebuild
new file mode 100644
index 000000000000..ac3f78071b7a
--- /dev/null
+++ b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.7.1.22.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit linux-info versionator
+
+DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DV_MAJOR="3"
+DV_MINOR="10"
+DV_PATCH="0"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="${vc[2]}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+	!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
+
+pkg_pretend() {
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+	dodoc README*
+}
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.8.15.22.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.8.15.22.ebuild
new file mode 100644
index 000000000000..4b7654a4243b
--- /dev/null
+++ b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.8.15.22.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit linux-info versionator
+
+DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DV_MAJOR="3"
+DV_MINOR="13"
+DV_PATCH="0"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="${vc[2]}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+	!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
+
+pkg_pretend() {
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+	dodoc README*
+}
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.8.24.22.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.8.24.22.ebuild
new file mode 100644
index 000000000000..4b7654a4243b
--- /dev/null
+++ b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.8.24.22.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit linux-info versionator
+
+DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DV_MAJOR="3"
+DV_MINOR="13"
+DV_PATCH="0"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="${vc[2]}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+	!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
+
+pkg_pretend() {
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+	dodoc README*
+}
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.9.214.23.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.9.214.23.ebuild
new file mode 100644
index 000000000000..a0785dfd7a48
--- /dev/null
+++ b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.9.214.23.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit linux-info versionator
+
+DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DV_MAJOR="3"
+DV_MINOR="14"
+DV_PATCH="7"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="${vc[2]}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+	!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
+
+pkg_pretend() {
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+	dodoc README*
+}
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.9.228.25.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.9.228.25.ebuild
new file mode 100644
index 000000000000..e7db28d8ba4d
--- /dev/null
+++ b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.9.228.25.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit linux-info versionator
+
+DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="${vc[2]}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+	!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
+
+pkg_pretend() {
+	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+	dodoc README*
+}
diff --git a/sys-firmware/iwl7260-ucode/metadata.xml b/sys-firmware/iwl7260-ucode/metadata.xml
new file mode 100644
index 000000000000..1519086156bb
--- /dev/null
+++ b/sys-firmware/iwl7260-ucode/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gienah@gentoo.org</email>
+    <description>Feel free to bump and add yourself to the maintainer list,
+    please bump sys-firmware/iwl3160-ucode and maybe
+    sys-firmware/iwl3160-7260-bt-ucode as well.</description>
+  </maintainer>
+</pkgmetadata>
diff --git a/sys-firmware/iwl8000-ucode/Manifest b/sys-firmware/iwl8000-ucode/Manifest
new file mode 100644
index 000000000000..1d0435d34091
--- /dev/null
+++ b/sys-firmware/iwl8000-ucode/Manifest
@@ -0,0 +1,4 @@
+DIST iwlwifi-8000-ucode-16.242414.0.tgz 931690 SHA256 802d7406354016b98d1b485f0446b5a16c4ac795278315a55a7b901b223cb871 SHA512 2d471f57f8fcc4dabd249a80a16cb81388eafddbe13b53a78572c6f9661ce3b6399dc43599d978b0319a14a14b29d5a9e39746e8096c985ea8f3d48e8c01fa47 WHIRLPOOL 04ef6d606817a95172ff6c6c54da08a1c679cbbf0f5dd8a2b92ea0bfd9e6201f6acfd52df94e982316f662664c0e8184238ed2c55ac046407542a28df0d1f5bc
+EBUILD iwl8000-ucode-16.242414.0.ebuild 935 SHA256 98497bf2877f11ac15adb45f3f6f3d6b4cf9e8ce187f7a533839fd382271e1bc SHA512 cf9ce28601520b9c653f6e9d37eaf2e5b207650fff705943d617706ea3d051b47a4e2171b06b8064a1f10f5a4cb4016219253160e06254257631f7f8d8ee81e8 WHIRLPOOL e2f676f772e5259bed4a14a010eddcfaa37787bc9f8f23193a2b372c9b9c49b4e2345e01f56c259288cd4ba36e3aa72860bd0aeb901406aab5e5e2cd6b3c55da
+MISC ChangeLog 343 SHA256 8322c921009a737dd56f861cd7ca8fa7214d755143c436ca2d7707fa45765cc1 SHA512 98a84eecd1d184fe6eb47a838da3dd1c6fa895f6ca66c799d0676b86034904ae7aee207159c4ce20c55551dd183a09943a93831cad697550b8ad6ba4f2f3d9a1 WHIRLPOOL 5dea7c1043b7e9d02ea4696939cbeb0ecf85ffecee3be258b11d277a2c10991c190f606ddb3f9ef2bb9e1057abe4bfba8ec36f9c2789e3becc36fa2357e537a9
+MISC metadata.xml 318 SHA256 6e4348892fcfa71af39a77d1874565819fed2a2d016122e287db5005136768db SHA512 b81ac398715ec44592f59e02bfb3e92a9e0a618b108597a47890fa54743b0d36abd09bda946717a620265ba87d0d5ae0ae5d6c448c3b03f0bfb0f4924a384c40 WHIRLPOOL 6ece3aa50308c70575c837a8db4c3434a2828fd19ef57f0322b6fb8d0fd5b2941714aaede61711a65796e93680078ee2f6079e14fc1d588b79bcc4fed67aade8
diff --git a/sys-firmware/iwl8000-ucode/iwl8000-ucode-16.242414.0.ebuild b/sys-firmware/iwl8000-ucode/iwl8000-ucode-16.242414.0.ebuild
new file mode 100644
index 000000000000..1d1c33d0803e
--- /dev/null
+++ b/sys-firmware/iwl8000-ucode/iwl8000-ucode-16.242414.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info
+
+MY_P="iwlwifi-${P#iwl}"
+
+DESCRIPTION="Firmware for Intel (R) Wireless 8260 and 4165"
+HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND="
+	!sys-kernel/linux-firmware[-savedconfig]
+"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if kernel_is lt 4 3 0; then
+		eerror "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		eerror "This microcode image requires a kernel >= 4.3.0."
+	fi
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins iwlwifi-8000C-16.ucode
+	dodoc README*
+}
diff --git a/sys-firmware/iwl8000-ucode/metadata.xml b/sys-firmware/iwl8000-ucode/metadata.xml
new file mode 100644
index 000000000000..9a572fd1c358
--- /dev/null
+++ b/sys-firmware/iwl8000-ucode/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>nicolasbock@gentoo.org</email>
+	<description>
+		Feel free to bump and add yourself to the maintainer list.
+	</description>
+  </maintainer>
+</pkgmetadata>
diff --git a/sys-firmware/metadata.xml b/sys-firmware/metadata.xml
new file mode 100644
index 000000000000..a489acee81d5
--- /dev/null
+++ b/sys-firmware/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The sys-firmware category contains misc. firmware and microcode.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría sys-firmware contiene firmware y microcódigo para
+		diversos dispositivos.
+	</longdescription>
+</catmetadata>
diff --git a/sys-firmware/midisport-firmware/Manifest b/sys-firmware/midisport-firmware/Manifest
new file mode 100644
index 000000000000..1e0e3a9fe261
--- /dev/null
+++ b/sys-firmware/midisport-firmware/Manifest
@@ -0,0 +1,6 @@
+AUX midisport-firmware-1.2-configure.patch 1196 SHA256 a8db6c329538322da058853db02f3336fb1a142d748594cd6d54fcb5c03a4cd5 SHA512 611f6e605372542790a81320ab9e5f58440079a914bd3fd41c449ebd5935631d54503c03fa308b829ace7116dfa113cabc65e502c3193f8d755c4b27b55677cc WHIRLPOOL d2816366705f5b768963b55275ceb695ddcfad07cf359a8afe93a5e4b3fcec3a342578df886350ee884c3e1f046e3fcd56dde4b49c6d58108c0cec4517e578d9
+AUX midisport-firmware-1.2-rules.patch 2580 SHA256 54e43298cda021094af472a2220ed83323aee3c0e8be8e7a45711acf8280b70a SHA512 31bedabf37eabb1c1c6e1fa4b7c0e9881f1c6bfa86758c060438a2c952f310093545c4e043646fbdc08ab4e3595411668ff2d21c308cc8e0685c6ae7c38b7315 WHIRLPOOL 0132d963ff14fc87f6c5599e4f013eb1986fa07002913cb9e20222a83dc023d4f63ea096391f57ca0b34937a1602bc15a32ff4bec29894ecec8d0e13b91b074f
+DIST midisport-firmware-1.2.tar.gz 62948 SHA256 2aa82ef0bf26647fbdda4c2e9ed0033b41bd0f1b4020b87fa073e4462a048b2d SHA512 ac46b1e16dbee628d41e0c5b39730a4ee51e1f62187e5e56ed393f136937fdffa86ca84882d2627397f074ca2eb12be3a8701a5027999a0d00b84b706e227a0b WHIRLPOOL d8cfdf90d17eda43ee80727be7c32f63cfe7c755a85e28ab7085aae9ef892ecf7da2ad6b45bf7047d420dfc17c1ee91b537eb08f1f5ef8c5b167753ab6ab122e
+EBUILD midisport-firmware-1.2.ebuild 669 SHA256 936824fd23514ad2790c1062b5a546cfcbd229e02563949551c1edaaedddaa26 SHA512 7a210770edcfd03a6b20ca62c7c3f1db61cec243d7ca6fd3d7ece7f847703972bd378eb0f043f65e385626913204de6d74f2849368cec8d1eb627c572a7419e8 WHIRLPOOL 43d0bcc60db5fc4180354560f2ba933b916dce939294312561905b46712378f44abdd1b699d531197ad0586969b29ceee2b3bcde6a8464faee742fc9e1cd5f23
+MISC ChangeLog 485 SHA256 b6a8929e78a304728e15a63bc3daa3646289efb2eb63803c3de615ab0d09076a SHA512 e7774e57f092c8d0873254aac08bd1a9f6a9cee7bca1db98fbe7db2a49917f48a23240137858d2fe219f268f8ea2f20b03fe4d669edd582a28d04dc2237e0dc2 WHIRLPOOL bb163e0d101ccb9d3ce418a9727801d1655adeb2da4ad1cc0cb0154b676eb071f0f8f13468cd84294f117c4b3d104a7484a07ace1c9a004ff043097cfcacc7d0
+MISC metadata.xml 494 SHA256 290ba42f2c6cf08fa642215addaac12c1cdc41579b7753e64c4517d208b61dea SHA512 8f22e42060b91377a7b789a10890e2636690c3286c79a283fedbef9e52c41b1ed218b034ae67a8c0c4668265532c309b7ac8a71131913e55ec3ed9aa31230df3 WHIRLPOOL 581b7be873d78236c81fd773c7f3f5b9b6d4cf783317eba1e0f68bd915b1d81e2c8e13ce87dcb105f9dd46f1d444ef200adde899a654f99522c481f896c6c599
diff --git a/sys-firmware/midisport-firmware/files/midisport-firmware-1.2-configure.patch b/sys-firmware/midisport-firmware/files/midisport-firmware-1.2-configure.patch
new file mode 100644
index 000000000000..bb4338809a92
--- /dev/null
+++ b/sys-firmware/midisport-firmware/files/midisport-firmware-1.2-configure.patch
@@ -0,0 +1,36 @@
+--- midisport-firmware-1.2.orig/configure.ac	2006-03-05 22:01:45.000000000 +0100
++++ midisport-firmware-1.2/configure.ac	2013-01-06 22:08:40.479938650 +0100
+@@ -1,9 +1,12 @@
+ # Process this file with autoconf to produce a configure script
+ AC_PREREQ(2.0)
+ AC_INIT(midisport-firmware, 1.2, [usb-midi-fw-user@lists.sourceforge.net])
+-AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)
++AM_INIT_AUTOMAKE
+ AC_REVISION($Revision$)
+ AC_CONFIG_SRCDIR(MidiSportLoader.ihx)
++m4_ifndef([PKG_PROG_PKG_CONFIG],
++    [m4_fatal([pkg-config is required])])
++PKG_PROG_PKG_CONFIG
+ 
+ AC_ARG_WITH([fxload],
+ 	    AS_HELP_STRING([--with-fxload=name],
+@@ -22,17 +25,8 @@
+   AC_MSG_ERROR([$FXLOAD not found; please install the fxload package first])
+ fi
+ 
+-AC_MSG_CHECKING([for udev version])
+-udev_ver=`udevinfo -V | awk '{ print $3 }'`
+-if test -n "$udev_ver"; then
+-  AC_MSG_RESULT([$udev_ver])
+-else
+-  AC_MSG_RESULT([none])
+-  udev_ver="0"
+-fi
+-if test "$udev_ver" -lt 057; then
+-  AC_MSG_ERROR([udev version 057 or later is required])
+-fi
++PKG_CHECK_MODULES([udev], [udev >= 057], [], [
++	AC_MSG_ERROR(["udev of at least version 057 is required"])])
+ 
+ AC_ARG_WITH([udev],
+ 	    AS_HELP_STRING([--with-udev=dir],
diff --git a/sys-firmware/midisport-firmware/files/midisport-firmware-1.2-rules.patch b/sys-firmware/midisport-firmware/files/midisport-firmware-1.2-rules.patch
new file mode 100644
index 000000000000..b0ee858276d1
--- /dev/null
+++ b/sys-firmware/midisport-firmware/files/midisport-firmware-1.2-rules.patch
@@ -0,0 +1,27 @@
+--- midisport-firmware-1.2.orig/42-midisport-firmware.rules.in	2006-03-05 22:01:45.000000000 +0100
++++ midisport-firmware-1.2/42-midisport-firmware.rules.in	2013-01-06 22:07:03.385941852 +0100
+@@ -1,18 +1,13 @@
+ # midisport-firmware.rules - udev rules for loading firmware into MidiSport devices
+ 
+-# DEVPATH=="/*.0" selects interface 0 only
+-# (some udev versions don't work with SYSFS{bInterfaceNumber})
+-
+ # MidiSport 2x2
+-ACTION=="add", SUBSYSTEM=="usb", DEVPATH=="/*.0", ENV{PRODUCT}=="763/1001/*", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSport2x2.ihx"
++ACTION=="add", SUBSYSTEM=="usb*", ATTRS{idVendor}=="0763", ATTRS{idProduct}=="1001", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSport2x2.ihx -D %N"
+ # MidiSport 1x1
+-ACTION=="add", SUBSYSTEM=="usb", DEVPATH=="/*.0", ENV{PRODUCT}=="763/1010/*", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSport1x1.ihx"
++ACTION=="add", SUBSYSTEM=="usb*", ATTRS{idVendor}=="0763", ATTRS{idProduct}=="1010", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSport1x1.ihx -D %N"
+ # KeyStation
+-ACTION=="add", SUBSYSTEM=="usb", DEVPATH=="/*.0", ENV{PRODUCT}=="763/1014/*", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSportKS.ihx"
++ACTION=="add", SUBSYSTEM=="usb*", ATTRS{idVendor}=="0763", ATTRS{idProduct}=="1014", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSportKS.ihx -D %N"
+ # MidiSport 4x4
+-ACTION=="add", SUBSYSTEM=="usb", DEVPATH=="/*.0", ENV{PRODUCT}=="763/1020/*", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSport4x4.ihx"
++ACTION=="add", SUBSYSTEM=="usb*", ATTRS{idVendor}=="0763", ATTRS{idProduct}=="1020", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSport4x4.ihx -D %N"
+ # MidiSport 8x8
+-ACTION=="add", SUBSYSTEM=="usb", DEVPATH=="/*.0", ENV{PRODUCT}=="763/1031/110", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSport8x8-2.10.ihx"
+-ACTION=="add", SUBSYSTEM=="usb", DEVPATH=="/*.0", ENV{PRODUCT}=="763/1031/121", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSport8x8-2.21.ihx"
+-
+-# vim: ft=conf
++#ACTION=="add", SUBSYSTEM=="usb", DEVPATH=="/*.0", ENV{PRODUCT}=="763/1031/110", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSport8x8-2.10.ihx"
++#ACTION=="add", SUBSYSTEM=="usb", DEVPATH=="/*.0", ENV{PRODUCT}=="763/1031/121", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSport8x8-2.21.ihx"
diff --git a/sys-firmware/midisport-firmware/metadata.xml b/sys-firmware/midisport-firmware/metadata.xml
new file mode 100644
index 000000000000..3f2112ac4a5a
--- /dev/null
+++ b/sys-firmware/midisport-firmware/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>karl.j.linden@gmail.com</email>
+        <name>Karl Linden</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="sourceforge">downloads</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/sys-firmware/midisport-firmware/midisport-firmware-1.2.ebuild b/sys-firmware/midisport-firmware/midisport-firmware-1.2.ebuild
new file mode 100644
index 000000000000..bd23b90d4771
--- /dev/null
+++ b/sys-firmware/midisport-firmware/midisport-firmware-1.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools linux-info udev
+
+DESCRIPTION="Firmware for M-Audio/Midiman USB MIDI devices"
+HOMEPAGE="http://usb-midi-fw.sourceforge.net"
+SRC_URI="http://downloads.sourceforge.net/usb-midi-fw/${P}.tar.gz"
+
+LICENSE="Midisport"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-apps/fxload
+	virtual/udev"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+CONFIG_CHECK="~SND_USB_AUDIO"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-configure.patch
+	"${FILESDIR}"/${P}-rules.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-udev="$(get_udevdir)"
+}
diff --git a/sys-firmware/nvidia-firmware/Manifest b/sys-firmware/nvidia-firmware/Manifest
new file mode 100644
index 000000000000..adbd006b4ac4
--- /dev/null
+++ b/sys-firmware/nvidia-firmware/Manifest
@@ -0,0 +1,9 @@
+DIST NVIDIA-Linux-x86-325.15.run 27409286 SHA256 3d790e4bfed24641f7cc76879144ab5d52b12271012ba381b0d33aa1a2e08775 SHA512 48052c3daa8748a7c43de1c24e00fdd3f94cebbe7f5efbb185a0472a1d0bbab8adfe377359ccdc6cd8e437a80506fdd551408237b0842c194a3497c43cf3487e WHIRLPOOL 387fb8af1a31cc295abe7b15fee7d5bc01c515603b178abe7f50864dbbf0685ca50f88e67359adc4af8e90caaeb1fba95aa6af9f54e6fced46c82c5cfc094390
+DIST NVIDIA-Linux-x86-340.32.run 38587515 SHA256 1d0489c35c5b332c9b949d9de3c3cbab4ac3a94385aa41e7a7b62ef23f4395f5 SHA512 a67e57a1bd70a9cd5ae2bed70403920ed94d8eac9d08dcd380f6065cd597d5824e26ae25a0bcd56626190124c07d128f3b0429040794c8e8d3ead85860fcb646 WHIRLPOOL 66bf6db27edddae845606e82cf9397dbf483bbde23e97899575c8ac3f6ce86c84d88f8e60c60b1aad1360fe9bea4f43de030a849f88f43d482508de23cd24d8e
+DIST nvidia_extract_firmware-325.15.py 12715 SHA256 e04030b4843367626a98c2afd92fe54d8f72d4904ffa1b42ad00554156614fd6 SHA512 ede9bed14bdae0684a5091fbaa1edcd5ed57463a19a4aee72633167ade5490f8de1d373ebf541678fa53d952da5cd9251c429329aa487578083d9622e6b926a4 WHIRLPOOL 2d549ee458787170e6192891a0e22f046a8a0424b4dc06ca77a163aad9ebb8c4973021f11b3a08cdf1c687796f1a2c9428e9f6a70138259a6d9f2a2b6b34e6bb
+DIST nvidia_extract_firmware-340.32.py 13097 SHA256 2a08c4e581c283b01496e593dfb87e78338d555ff8afa0cc0010dc6a59c7bd02 SHA512 a90a8907288ee841dc063a80afb1fea02e0034becddd75e367cf8fbdc065f321746e0d1bb77f158f7b011cfc03ad517e658ad1cc7a1b596e1452363862528b89 WHIRLPOOL 0181057aac5be8bf759df65a3af120fe77921ecc53442b8e7daf96c185a3ed4046f1df462d413abeb9dea78e41052ab008847fa4fdff0e44f6d13eb392139167
+EBUILD nvidia-firmware-325.15.ebuild 1049 SHA256 0f5fe4c11d66a3596b294fefe01bd756bca74dde803d2283c8e0de12606ae70b SHA512 5131a1518e395b57d4db9799dbdcf8ef985f3784d00ef51f48de860b5173f556aa29a6e92e98e883b87e7098b5953210d0e3afb94d3924e85658fc819f519e47 WHIRLPOOL e2519e3705fcb20f9f94c6ebdfb257534561ac6e20f6c80083060d498d300e1a0b7aa58032a63ac29e6ce9632cec1f7c2bb21352093f8ff471519677474100e0
+EBUILD nvidia-firmware-340.32.ebuild 1090 SHA256 4baac69ace5a251bd70d6fc170699d0398d6cc3e5561a316432a741c47b40ade SHA512 ccbdaca6c4933c5403e6ad9dbfee3c20ee9a79e19397b259d3a4802cd4ff814b5f19de4b3cd065f09642b50dde900b89da447043d5c30fe6363f78b90ff86f0e WHIRLPOOL 2b646074d0ff630dd1dd4cbd7d944294801ed8a621ea0cd22e9b9dd1ba0b014c0c4e6816a0d3668c5485005034d554d242ae140e2c5897eee9378aea25c806ea
+MISC ChangeLog 3107 SHA256 a4fb67a6e9809e5bcf166c395accc6c31b655ada5fd9953fffe66584c5496058 SHA512 6f5308f280bdf84ca3fac22bd1717d80efe19c9a9c940f40ca22e842b7e310c8996c8046cc30ce0a152c028dc3b8f13fbbdf8c02a45b81e3be9b285f7375fc0e WHIRLPOOL e3c6ee6fbea03e22137edecde6d6cd29983e19d06918e692eab01b65c17d26b5682bf8c839a1c551286cd34af1fd14a660fc35b731ac7138a7852c8bee57473f
+MISC ChangeLog-2015 689 SHA256 cbbc91767817c1e56989f700e3b64ba41ba71888584bd2bd6476916ba483edc0 SHA512 370b71aa726a70eac22c42fe02b0caaedc2d6c5a5f4b20b29225183a44dfafb1875b2d79e0b66536fb97cb96891eb2b4069bc2a2509e0651ae6a1aba6f15e603 WHIRLPOOL b103cc1ee657ab658070ab11d42c39a4e9179b3029c0c6ad361158bd95edcef7daa4b942df8b3cd441e5ba695021af14982eb8a2464ed962cc4c4d71ca699ff6
+MISC metadata.xml 249 SHA256 15c3b8c41a629764f3ac3005ca017fa7df49f48f540211a22549d7d2900ef03b SHA512 1723b9b2663814b898832e18aea1a02520775e545e256fb70a8829e2b0515e59b5abab985c995b9ae2f509d95ea4601ac0085ab0d1653cdda0ebe90f775f6e5b WHIRLPOOL 4fd539d6cb011d39a83d0c854c61363f15b2ae0fee1e9036056f384222307fc5910ab87429ace43bbe330b6a5156dbd41c32f80776ea56f3b35892a7ed84107d
diff --git a/sys-firmware/nvidia-firmware/metadata.xml b/sys-firmware/nvidia-firmware/metadata.xml
new file mode 100644
index 000000000000..5840601f180f
--- /dev/null
+++ b/sys-firmware/nvidia-firmware/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>idl0r@gentoo.org</email>
+		<name>Christian Ruppert</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-firmware/nvidia-firmware/nvidia-firmware-325.15.ebuild b/sys-firmware/nvidia-firmware/nvidia-firmware-325.15.ebuild
new file mode 100644
index 000000000000..6017051bfe8a
--- /dev/null
+++ b/sys-firmware/nvidia-firmware/nvidia-firmware-325.15.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit unpacker
+
+NV_URI="http://us.download.nvidia.com/XFree86/"
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+
+EXTRACT_FIRMWARE_REV="845a51ab607df85fc0ed01f0b5b6d57850e37662"
+
+DESCRIPTION="Kernel and mesa firmware for nouveau (video accel and pgraph)"
+HOMEPAGE="https://nouveau.freedesktop.org/wiki/VideoAcceleration/"
+SRC_URI="${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run
+	https://raw.github.com/imirkin/re-vp2/${EXTRACT_FIRMWARE_REV}/extract_firmware.py -> nvidia_extract_firmware-${PV}.py"
+
+LICENSE="MIT NVIDIA-r2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+DEPEND="=dev-lang/python-2*"
+RDEPEND=""
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	mkdir "${S}/${X86_NV_PACKAGE}"
+	cd "${S}/${X86_NV_PACKAGE}"
+	unpack_makeself "${X86_NV_PACKAGE}.run"
+}
+
+src_compile() {
+	python2 "${DISTDIR}"/nvidia_extract_firmware-${PV}.py || die "Extracting firmwares failed..."
+}
+
+src_install() {
+	insinto /lib/firmware/nouveau
+	doins nv* vuc-*
+}
diff --git a/sys-firmware/nvidia-firmware/nvidia-firmware-340.32.ebuild b/sys-firmware/nvidia-firmware/nvidia-firmware-340.32.ebuild
new file mode 100644
index 000000000000..1bfeb1f2fdf7
--- /dev/null
+++ b/sys-firmware/nvidia-firmware/nvidia-firmware-340.32.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 unpacker
+
+NV_URI="http://us.download.nvidia.com/XFree86/"
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+
+EXTRACT_FIRMWARE_REV="96641bfebb2547402b2145fcf0e3116410f0da87"
+
+DESCRIPTION="Kernel and mesa firmware for nouveau (video accel and pgraph)"
+HOMEPAGE="https://nouveau.freedesktop.org/wiki/VideoAcceleration/"
+SRC_URI="${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run
+	https://raw.github.com/imirkin/re-vp2/${EXTRACT_FIRMWARE_REV}/extract_firmware.py -> nvidia_extract_firmware-${PV}.py"
+
+LICENSE="MIT NVIDIA-r2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND=""
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	mkdir "${S}/${X86_NV_PACKAGE}"
+	cd "${S}/${X86_NV_PACKAGE}"
+	unpack_makeself "${X86_NV_PACKAGE}.run"
+}
+
+src_compile() {
+	"${PYTHON}" "${DISTDIR}"/nvidia_extract_firmware-${PV}.py || die "Extracting firmwares failed..."
+}
+
+src_install() {
+	insinto /lib/firmware/nouveau
+	doins nv* vuc-*
+}
diff --git a/sys-firmware/seabios/Manifest b/sys-firmware/seabios/Manifest
new file mode 100644
index 000000000000..509bb42eae0f
--- /dev/null
+++ b/sys-firmware/seabios/Manifest
@@ -0,0 +1,20 @@
+AUX seabios/README 56 SHA256 d4e1b5815b0166c52f5fdfd7ac8db2fd1398cf530394bf5937dfbda55135db21 SHA512 910bc29b89fd0821c9be7d60742ce80fd62194d78fd50902e1ba93a7322c897518ee606c76e39c71489f48c890e50d07aedd3ec059a9e3632eafdd7ebcea8074 WHIRLPOOL 6e928e7dbe1afbfd1a5ccb1009c0d98081cd099cf79b8eea067011e942ed7f6f5f3bca65e5a8cd38f0b786d7fca11aa8b51f7f1c1b11bc3879914a3facbf48ba
+AUX seabios/config.seabios-128k 272 SHA256 1d1bb7722077ac7e2d85dd190392638ce7c4d08b74f1d0cd3530e563d0d6b789 SHA512 8fe1496de0410b0f0c1a9d5af7d28c667eb31a0f8bc5374e73ebac9e136494056add96b1f0cceee681a4b6635d8ca9b36d941b04af78f43b558dfb53ff0479ae WHIRLPOOL 4231e2420b45531cc413b6f658554e803aacf2829eeee6f3ff572cd80b3b983d52ec5a1cb26495a1827e4a3749b7fedf087ad527982f81094a972249b4864361
+AUX seabios/config.seabios-256k 71 SHA256 8b14f70d5cf5e9fbe3b81a051149bb6d89e1786bae7fb6e6ed78bbe699a30834 SHA512 3d41739944da088edafb3ea298c0d3db59ed638b614c258209a30635caccf86a284f03492612694e3a56f40357743a0a36053e8ec11b7d93853b91ba9e5a502f WHIRLPOOL b994adf83032690fc6a4a32e080ba4a49c9f78cc44d4f25a45ffed936709d98ec6c8105f762c6be4d29cbbeee7f346420d879c6efe817eacbee54de6fd01321a
+AUX seavgabios/README 56 SHA256 d4e1b5815b0166c52f5fdfd7ac8db2fd1398cf530394bf5937dfbda55135db21 SHA512 910bc29b89fd0821c9be7d60742ce80fd62194d78fd50902e1ba93a7322c897518ee606c76e39c71489f48c890e50d07aedd3ec059a9e3632eafdd7ebcea8074 WHIRLPOOL 6e928e7dbe1afbfd1a5ccb1009c0d98081cd099cf79b8eea067011e942ed7f6f5f3bca65e5a8cd38f0b786d7fca11aa8b51f7f1c1b11bc3879914a3facbf48ba
+AUX seavgabios/config.vga-cirrus 60 SHA256 888ad874052d301981a8cc6fa4bc72b1edd14ba937e7de113f71ce3fd2f8c253 SHA512 e9ef2d6bec9419e69bc90adf1a4bb7c174284cd722e53903deea0411f88074cc247069116e03e124715072ec82f153cf6014168febba41369a2569983d3265b6 WHIRLPOOL 6bc9abab432867d2d229f489e1f65471133c2bb6960d1d7e8523f6257f9abf1fbf43dd00054308235ae0a3162b359739ba4e903dba5758fed9b65d8ae482fc0a
+AUX seavgabios/config.vga-isavga 59 SHA256 5826ec704d4e4bb57089e0cbb72e7e5ccd31b7192d81084665cd4faeecb60b04 SHA512 aada61232f4834c1e9bec921b1e1365ce5ecb4adf42c659f34cdf051efb56f0ec2e62f0ccf66bb25d9bb0b8601e2df49b712265f19185068d45353c3aacf1cd9 WHIRLPOOL 41c5c36a610f04ffe56213e330d6a84be5c76811d25edbf2e4d1d33a74e75cc3aacb9c59bf0e78fc094876c6a436145efd97929a8bdb660677fd4d5caf1cfff9
+AUX seavgabios/config.vga-qxl 128 SHA256 26e43ea5e98615d11573b2619f3fb3c1933d5f810e6a2c44218d99465cc3ae77 SHA512 9ebcb6702cf28685daf1821be26bab8ddc791ef2c118217c984c03c5fb77c8b9691c0fa6931367a63b8d97d67c973cd4b620fe9ca9c76da51a9b2ab3b4b5653b WHIRLPOOL 6e38c9e5f91279694de4204abd1de16b2ef1c5f239df110151caa876cbdb6fb48148912e4c4f7952bea18e56c09a875e7062e8f27eabeb7e500480f6d2183000
+AUX seavgabios/config.vga-stdvga 59 SHA256 ca7367ae57665fa01e0ebb741ba5823d646f4b65a9a87657ea163cc9f362a8a8 SHA512 4a1b7fcc729d78dc8fd4e73d1cb6258ed9d49f8a91e6e00cc184e07c89a304f8d38ef5446d1c4ba5e8e929c82693d82c21526e42992ad6e1a008f39bb7c90448 WHIRLPOOL 51413383c35f77abd179050b86b6e84edf0a14e3b6ecb9d60521f9ff0cad0cd5059e10d8fbfed7084b628957e2871d9ae6addc6e5e24d8ff16bc9ab5b32c809d
+AUX seavgabios/config.vga-virtio 128 SHA256 afa7d59e1c18ed770cf0e83e3d5dc70866f75fdde83064fbea6e115f79504066 SHA512 4d627be11d79f0b8bd814a49e608826375aba6b59a0189dcba9afe24a181347b92e6ab18e0d9199e2f7a78f8fb02f03dad84c63fbbc2ffe9af76777ef28c5f8a WHIRLPOOL 5ba65918c8034bbece5a8d2ac166a446ba0b608ef393f4d85654a56fb1b95e0d92604cadf75a4eeaa20b93b22be51d10b0e6aadc56ce77e40fd19eddc245d324
+AUX seavgabios/config.vga-vmware 128 SHA256 1bd31f16dd43fb25aa92f9816cbfaae4a19a8faf29ff52bd02429fbaafb78f57 SHA512 2a82f75ca6dbf48546ffa5a756136dd7085855d9411c3b37a74cc53281027b4916cf628dba784bcad915682d94705b5f8116f7a1b7ec6a99d9b2fb3fffba01c0 WHIRLPOOL 9b6b82f0b27d41a6cb5ef66c13f4c45559471f894a93be60f67d560f3adc8fe2fae062a5d41b7d437eafaaf0bba12488d33db6b7192ab73a1901ab4618a887d6
+DIST bios.bin-1.10.1.xz 63668 SHA256 39d39cfa8166d947439081dedebb8c79a159de9b8b5447afb4876416fcf17d9d SHA512 9e3ba9c7dac3f03f9c57898a993eab34f8f3fecb0ac4718f6d4d6b1a825651a255e48fb7dc29a339249f42668469946f238674cb1f8308cf9b4a3e1e82c346d3 WHIRLPOOL 1208730ef4ee8455fe1e051b3350463d458ccf734c0fdd12d06b91dd0edbb96b2e6ec7bcc5b37902a98465c73bbf327fc3c42b7f1587bae1871d4ab9a70f5e50
+DIST seabios-1.10.1.tar.gz 588092 SHA256 5063ddbac61ec4e61a12daa83931c37e5629b1c18502f7c00ed4e696c2a1d2cb SHA512 b2f1c2b15853b1cc949f741ae13f32fd133efb0d0917e1cdfb253f9cd0bc9bb0b42c592cdd87bc74ccbb12a4301c102ae723ccdb490ea4716e0c9dca3dd3fead WHIRLPOOL 723d4835288566bbb6a3c3b7df2486c0a7f949590404230667a4e4490317591bcdb99dd9b0933770d8c1416c25f6a8d20b153d7410787e19d8ecbd92a7312af9
+DIST seabios-1.10.2-bin.tar.xz 121172 SHA256 d32e349fcd865d447856be7d7034f47f1e1d11b413d4158f747d68d03175792b SHA512 a46ce389b8b0fe7182a3dc2954fab7e0ef27ac65823e3785c247ccf77c37eaa746d94f74a4a29a221aa16ab508cf07ec8d399aa612d5c0184b48bce24c663b69 WHIRLPOOL 17eaa7ecd4a126e4b021728ab5136d4a918e1ba413a8c56416eeb7202c9d5b1c3439ef2c528e8be3f863b3a218bcb2ffded0b1a037eee0eaf1fc52cb04f228c8
+DIST seabios-1.10.2.tar.gz 589283 SHA256 89c70b70fa7ab179694efb95c2c89d4f50a39381321cbed5d8302cb9b25e953d SHA512 ea8396fe247a3bd16b43ab775cf8e23f139673b94e83f450cadb094cc8117ca7e9ef518162d965209d5ab091c96f70ec5cc8ec8d15b638e06c4c8f7a0e1609dc WHIRLPOOL 1df63d9b5940d8e1b099f75ff090505088104dc0d599ba9403c5ceb2caabf0f92023ae5bebe06ee5ad95d44e22ae540b0c9d9000fa7859801044ccd999d6efce
+DIST seavgabios-bin-1.10.1.tar.xz 20408 SHA256 88c310f2f1ddbbca3e00f8895706b3df718046bd729ab719c4e4bd01f502bd6d SHA512 7fe97efaf61c2d1e72c8df27b5108c80f6a51f5a7370de68720b0f71abe05ae5765dd867d127df2fa6182b5d4702a9ef7549e7170fec5071b31a6066db20c219 WHIRLPOOL 484c2f0302bf232e8065ec8cc1566731a962a2f76e01df2b7b21611b3c3ab47b04f1de192a3675130942a42c97f78e210d14ac2e36a7c36d8c28eff4e1618abc
+EBUILD seabios-1.10.1.ebuild 3444 SHA256 6e7a454cbb307700e190cd0e4506460ee9e4d075d4a231d91828ef2f9bc9b9fc SHA512 6344ad74bebcb1752221d26fd22905a37ed3e4e70836f2916677088dc3add02546a423f4e97b49d9a837de9882d888dfb3dd5b49f249c2e0e0f9bff62fda7b69 WHIRLPOOL 1b62a53a58d627eba7e38bf9b1e889ebbcfc17a54c51812453e2162cc2dfa0e8fd790475115a198d4e14c3ed224fbd378672c2a09b3a4d043ebd008d6a73b08c
+EBUILD seabios-1.10.2.ebuild 3409 SHA256 304de4704c3fc62fc3214ff5c3d5822e86131fca2426256a7d3b95582cb29b8f SHA512 256ea6d7a2ebd861affe1f9dc5f8e02b7e0fd90cfb82433bcf24e419e2644a540d9b51d8ecc1db3e659b7bbe0170f58f6c878436214c32c04710fd055dd8dbfe WHIRLPOOL f60d8de718cfb38fd38f62a937655c50d11cf24bb7d043d19323d342243f967353e29577fc764f78ae95ce7fbb881990c2f3a9b78df0bcbece7b6cab34db0241
+MISC ChangeLog 5067 SHA256 6288193e8f1466e9c49191c07c159d70c1dd4fe6618a402632460e7b75aa6e2f SHA512 9a5f148a05d9c2e921c2b63380458e56459d7f4253efd93040e6c75181244004813a77a8baa6bca96a5d51f64bdffec4f73ff8ec2acab42af81eb7a431ef50ea WHIRLPOOL cf85fac3fe221f6b074c2f0bbac2fe0952302f2e1607297e53f8291e71520835df14c4bc4f72f8e133755185c5687d2588e446125b5f3b4eb1129e16eb3db9f5
+MISC ChangeLog-2015 8390 SHA256 530d9871189cee67fdaddbd80e05173b54c461296a692bcc51d87a46d54ab1f8 SHA512 c04a589afbf87445abe1935c9a9bbad8b759d68c1b3d38ee9ccaac2625c0520072b3e12277fa43562d0b7f95957500a784c8126dde4440fa5fee8922ccec8429 WHIRLPOOL 5adf523f244a96c2bee80bc1f13102584e3a928108e929fe76b2212504a6dcefeac7c5872c4e9d2eae4a9fabeb37519fa7182c2c5b4c6516b15822748e6f40d2
+MISC metadata.xml 663 SHA256 602c6f6301147529642acfd8e289b411cb64ebe0e38d0b5c4d0a8207817a5720 SHA512 a3b306f0cfc8d0c2f31757b3b141c532dc5ee1fea7c01b7d23e6643977e63aee90a007875f1e34fb3f212c2dc1e23e4400f092b1d288f325abead33a9cfa66fa WHIRLPOOL abbd51716806d0fe649100b7abfbc5c237983cea5f73f28fa98d190527b6e5293171e6e0efb5304a3cbf8febbe470f4de943574959820604e4ab4f1b87ce9fba
diff --git a/sys-firmware/seabios/files/seabios/README b/sys-firmware/seabios/files/seabios/README
new file mode 100644
index 000000000000..7030949c1810
--- /dev/null
+++ b/sys-firmware/seabios/files/seabios/README
@@ -0,0 +1 @@
+The config.vga-xxx files come from the qemu/roms/ tree.
diff --git a/sys-firmware/seabios/files/seabios/config.seabios-128k b/sys-firmware/seabios/files/seabios/config.seabios-128k
new file mode 100644
index 000000000000..93203af0ded7
--- /dev/null
+++ b/sys-firmware/seabios/files/seabios/config.seabios-128k
@@ -0,0 +1,12 @@
+# for qemu machine types 1.7 + older
+# need to turn off features (xhci,uas) to make it fit into 128k
+CONFIG_QEMU=y
+CONFIG_ROM_SIZE=128
+CONFIG_BOOTSPLASH=n
+CONFIG_XEN=n
+CONFIG_USB_OHCI=n
+CONFIG_USB_XHCI=n
+CONFIG_USB_UAS=n
+CONFIG_SDCARD=n
+CONFIG_TCGBIOS=n
+CONFIG_MPT_SCSI=n
diff --git a/sys-firmware/seabios/files/seabios/config.seabios-256k b/sys-firmware/seabios/files/seabios/config.seabios-256k
new file mode 100644
index 000000000000..65e5015c2f14
--- /dev/null
+++ b/sys-firmware/seabios/files/seabios/config.seabios-256k
@@ -0,0 +1,3 @@
+# for qemu machine types 2.0 + newer
+CONFIG_QEMU=y
+CONFIG_ROM_SIZE=256
diff --git a/sys-firmware/seabios/files/seavgabios/README b/sys-firmware/seabios/files/seavgabios/README
new file mode 100644
index 000000000000..7030949c1810
--- /dev/null
+++ b/sys-firmware/seabios/files/seavgabios/README
@@ -0,0 +1 @@
+The config.vga-xxx files come from the qemu/roms/ tree.
diff --git a/sys-firmware/seabios/files/seavgabios/config.vga-cirrus b/sys-firmware/seabios/files/seavgabios/config.vga-cirrus
new file mode 100644
index 000000000000..c8fe58239f84
--- /dev/null
+++ b/sys-firmware/seabios/files/seavgabios/config.vga-cirrus
@@ -0,0 +1,3 @@
+CONFIG_BUILD_VGABIOS=y
+CONFIG_VGA_CIRRUS=y
+CONFIG_VGA_PCI=y
diff --git a/sys-firmware/seabios/files/seavgabios/config.vga-isavga b/sys-firmware/seabios/files/seavgabios/config.vga-isavga
new file mode 100644
index 000000000000..e55e294a0c0a
--- /dev/null
+++ b/sys-firmware/seabios/files/seavgabios/config.vga-isavga
@@ -0,0 +1,3 @@
+CONFIG_BUILD_VGABIOS=y
+CONFIG_VGA_BOCHS=y
+CONFIG_VGA_PCI=n
diff --git a/sys-firmware/seabios/files/seavgabios/config.vga-qxl b/sys-firmware/seabios/files/seavgabios/config.vga-qxl
new file mode 100644
index 000000000000..d393f0c34fd2
--- /dev/null
+++ b/sys-firmware/seabios/files/seavgabios/config.vga-qxl
@@ -0,0 +1,6 @@
+CONFIG_BUILD_VGABIOS=y
+CONFIG_VGA_BOCHS=y
+CONFIG_VGA_PCI=y
+CONFIG_OVERRIDE_PCI_ID=y
+CONFIG_VGA_VID=0x1b36
+CONFIG_VGA_DID=0x0100
diff --git a/sys-firmware/seabios/files/seavgabios/config.vga-stdvga b/sys-firmware/seabios/files/seavgabios/config.vga-stdvga
new file mode 100644
index 000000000000..7d063b787cd9
--- /dev/null
+++ b/sys-firmware/seabios/files/seavgabios/config.vga-stdvga
@@ -0,0 +1,3 @@
+CONFIG_BUILD_VGABIOS=y
+CONFIG_VGA_BOCHS=y
+CONFIG_VGA_PCI=y
diff --git a/sys-firmware/seabios/files/seavgabios/config.vga-virtio b/sys-firmware/seabios/files/seavgabios/config.vga-virtio
new file mode 100644
index 000000000000..aa7a15ba1172
--- /dev/null
+++ b/sys-firmware/seabios/files/seavgabios/config.vga-virtio
@@ -0,0 +1,6 @@
+CONFIG_BUILD_VGABIOS=y
+CONFIG_VGA_BOCHS=y
+CONFIG_VGA_PCI=y
+CONFIG_OVERRIDE_PCI_ID=y
+CONFIG_VGA_VID=0x1af4
+CONFIG_VGA_DID=0x1050
diff --git a/sys-firmware/seabios/files/seavgabios/config.vga-vmware b/sys-firmware/seabios/files/seavgabios/config.vga-vmware
new file mode 100644
index 000000000000..eb10427afdd3
--- /dev/null
+++ b/sys-firmware/seabios/files/seavgabios/config.vga-vmware
@@ -0,0 +1,6 @@
+CONFIG_BUILD_VGABIOS=y
+CONFIG_VGA_BOCHS=y
+CONFIG_VGA_PCI=y
+CONFIG_OVERRIDE_PCI_ID=y
+CONFIG_VGA_VID=0x15ad
+CONFIG_VGA_DID=0x0405
diff --git a/sys-firmware/seabios/metadata.xml b/sys-firmware/seabios/metadata.xml
new file mode 100644
index 000000000000..584d4b560568
--- /dev/null
+++ b/sys-firmware/seabios/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cardoe@gentoo.org</email>
+		<name>Doug Goldstein</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>qemu@gentoo.org</email>
+		<name>Gentoo QEMU Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>virtualization@gentoo.org</email>
+		<name>Gentoo Virtualization Project</name>
+	</maintainer>
+	<use>
+		<flag name="binary">Use official upstream pre-built binaries</flag>
+		<flag name="seavgabios">Include SeaVGABIOS binaries (replacement for vgabios)</flag>
+	</use>
+</pkgmetadata>
diff --git a/sys-firmware/seabios/seabios-1.10.1.ebuild b/sys-firmware/seabios/seabios-1.10.1.ebuild
new file mode 100644
index 000000000000..c430395a16f8
--- /dev/null
+++ b/sys-firmware/seabios/seabios-1.10.1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit eutils toolchain-funcs python-any-r1
+
+# SeaBIOS maintainers sometimes don't release stable tarballs or stable
+# binaries to generate the stable tarball the following is necessary:
+# git clone git://git.seabios.org/seabios.git && cd seabios
+# git archive --output seabios-${PV}.tar.gz --prefix seabios-${PV}/ rel-${PV}
+
+if [[ ${PV} == *9999* || -n "${EGIT_COMMIT}" ]] ; then
+	EGIT_REPO_URI="git://git.seabios.org/seabios.git"
+	inherit git-2
+else
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+	# Upstream hasn't released a new binary.  We snipe ours from Fedora for now.
+	# https://code.coreboot.org/p/seabios/downloads/get/bios.bin-${PV}.gz
+	# http://fedora.mirror.lstn.net/
+	# http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/
+	#   seabios-bin-1.10.1-1.fc26.noarch.rpm
+	#   seavgabios-bin-1.10.1-1.fc26.noarch.rpm
+	SRC_URI="!binary? ( https://code.coreboot.org/p/seabios/downloads/get/${P}.tar.gz )
+		binary? (
+			mirror://gentoo/bios.bin-${PV}.xz
+			seavgabios? ( mirror://gentoo/seavgabios-bin-${PV}.tar.xz )
+		)"
+fi
+
+DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS"
+HOMEPAGE="https://www.seabios.org/"
+
+LICENSE="LGPL-3 GPL-3"
+SLOT="0"
+IUSE="+binary debug +seavgabios"
+
+REQUIRED_USE="debug? ( !binary )
+	!amd64? ( !x86? ( binary ) )"
+
+# The amd64/x86 check is needed to workaround #570892.
+SOURCE_DEPEND="
+	>=sys-power/iasl-20060912
+	${PYTHON_DEPS}"
+DEPEND="
+	!binary? (
+		amd64? ( ${SOURCE_DEPEND} )
+		x86? ( ${SOURCE_DEPEND} )
+	)"
+RDEPEND=""
+
+pkg_pretend() {
+	if ! use binary; then
+		ewarn "You have decided to compile your own SeaBIOS. This is not"
+		ewarn "supported by upstream unless you use their recommended"
+		ewarn "toolchain (which you are not)."
+		elog
+		ewarn "If you are intending to use this build with QEMU, realize"
+		ewarn "you will not receive any support if you have compiled your"
+		ewarn "own SeaBIOS. Virtual machines subtly fail based on changes"
+		ewarn "in SeaBIOS."
+	fi
+}
+
+pkg_setup() {
+	use binary || python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	# This simplifies the logic between binary & source builds.
+	mkdir -p "${S}"
+}
+
+src_prepare() {
+	use binary && return
+
+	epatch_user
+}
+
+src_configure() {
+	use binary && return
+
+	tc-ld-disable-gold #438058
+
+	if use debug ; then
+		echo "CONFIG_DEBUG_LEVEL=8" >.config
+	fi
+	_emake config
+}
+
+_emake() {
+	LANG=C \
+	emake V=1 \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		AR="$(tc-getAR)" \
+		OBJCOPY="$(tc-getOBJCOPY)" \
+		RANLIB="$(tc-getRANLIB)" \
+		OBJDUMP="$(tc-getOBJDUMP)" \
+		HOST_CC="$(tc-getBUILD_CC)" \
+		VERSION="Gentoo/${EGIT_COMMIT:-${PVR}}" \
+		"$@"
+}
+
+src_compile() {
+	use binary && return
+
+	_emake out/bios.bin
+	mv out/bios.bin ../bios.bin
+
+	if use seavgabios ; then
+		local config t targets=(
+			cirrus
+			isavga
+			qxl
+			stdvga
+			virtio
+			vmware
+		)
+		for t in "${targets[@]}" ; do
+			emake clean distclean
+			cp "${FILESDIR}/seavgabios/config.vga-${t}" .config || die
+			_emake oldnoconfig
+			_emake out/vgabios.bin
+			cp out/vgabios.bin ../vgabios-${t}.bin || die
+		done
+	fi
+}
+
+src_install() {
+	insinto /usr/share/seabios
+	newins ../bios.bin* bios.bin
+
+	if use seavgabios ; then
+		insinto /usr/share/seavgabios
+		doins ../vgabios*.bin
+	fi
+}
diff --git a/sys-firmware/seabios/seabios-1.10.2.ebuild b/sys-firmware/seabios/seabios-1.10.2.ebuild
new file mode 100644
index 000000000000..d1513a29956f
--- /dev/null
+++ b/sys-firmware/seabios/seabios-1.10.2.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit eutils toolchain-funcs python-any-r1
+
+# SeaBIOS maintainers sometimes don't release stable tarballs or stable
+# binaries to generate the stable tarball the following is necessary:
+# git clone git://git.seabios.org/seabios.git && cd seabios
+# git archive --output seabios-${PV}.tar.gz --prefix seabios-${PV}/ rel-${PV}
+
+if [[ ${PV} == *9999* || -n "${EGIT_COMMIT}" ]] ; then
+	EGIT_REPO_URI="git://git.seabios.org/seabios.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+
+	# Binary versions taken from fedora:
+	# http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/
+	#   seabios-bin-1.10.2-1.fc27.noarch.rpm
+	#   seavgabios-bin-1.10.2-1.fc27.noarch.rpm
+	SRC_URI="
+		!binary? ( https://code.coreboot.org/p/seabios/downloads/get/${P}.tar.gz )
+		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )"
+fi
+
+DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS"
+HOMEPAGE="https://www.seabios.org/"
+
+LICENSE="LGPL-3 GPL-3"
+SLOT="0"
+IUSE="+binary debug +seavgabios"
+
+REQUIRED_USE="debug? ( !binary )
+	!amd64? ( !x86? ( binary ) )"
+
+# The amd64/x86 check is needed to workaround #570892.
+SOURCE_DEPEND="
+	>=sys-power/iasl-20060912
+	${PYTHON_DEPS}"
+DEPEND="
+	!binary? (
+		amd64? ( ${SOURCE_DEPEND} )
+		x86? ( ${SOURCE_DEPEND} )
+	)"
+RDEPEND=""
+
+pkg_pretend() {
+	if ! use binary; then
+		ewarn "You have decided to compile your own SeaBIOS. This is not"
+		ewarn "supported by upstream unless you use their recommended"
+		ewarn "toolchain (which you are not)."
+		elog
+		ewarn "If you are intending to use this build with QEMU, realize"
+		ewarn "you will not receive any support if you have compiled your"
+		ewarn "own SeaBIOS. Virtual machines subtly fail based on changes"
+		ewarn "in SeaBIOS."
+	fi
+}
+
+pkg_setup() {
+	use binary || python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	# This simplifies the logic between binary & source builds.
+	mkdir -p "${S}"
+}
+
+src_configure() {
+	use binary && return
+
+	tc-ld-disable-gold #438058
+
+	if use debug ; then
+		echo "CONFIG_DEBUG_LEVEL=8" >.config
+	fi
+	_emake config
+}
+
+_emake() {
+	LANG=C \
+	emake V=1 \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		AR="$(tc-getAR)" \
+		OBJCOPY="$(tc-getOBJCOPY)" \
+		RANLIB="$(tc-getRANLIB)" \
+		OBJDUMP="$(tc-getOBJDUMP)" \
+		HOST_CC="$(tc-getBUILD_CC)" \
+		VERSION="Gentoo/${EGIT_COMMIT:-${PVR}}" \
+		"$@"
+}
+
+src_compile() {
+	use binary && return
+
+	for t in 128k 256k ; do
+		cp "${FILESDIR}/seabios/config.seabios-${t}" .config || die
+		_emake oldnoconfig
+		_emake out/bios.bin
+		mv out/bios.bin ../bios-${t}.bin || die
+	done
+
+	if use seavgabios ; then
+		local config t targets=(
+			cirrus
+			isavga
+			qxl
+			stdvga
+			virtio
+			vmware
+		)
+		for t in "${targets[@]}" ; do
+			emake clean distclean
+			cp "${FILESDIR}/seavgabios/config.vga-${t}" .config || die
+			_emake oldnoconfig
+			_emake out/vgabios.bin
+			cp out/vgabios.bin ../vgabios-${t}.bin || die
+		done
+	fi
+}
+
+src_install() {
+
+	insinto /usr/share/seabios
+	use binary && doins ../bios.bin
+	use !binary && newins ../bios-128k.bin bios.bin
+	doins ../bios-256k.bin
+
+	if use seavgabios ; then
+		insinto /usr/share/seavgabios
+		doins ../vgabios*.bin
+	fi
+}
diff --git a/sys-firmware/sgabios/Manifest b/sys-firmware/sgabios/Manifest
new file mode 100644
index 000000000000..0d5368ea9bf6
--- /dev/null
+++ b/sys-firmware/sgabios/Manifest
@@ -0,0 +1,8 @@
+AUX sgabios-0.1_pre8-build-cc.patch 467 SHA256 2f4365cf78f11dc902ef137358cd1ac09c9fc9698fd28e023d4703f01819a198 SHA512 2d160bc5be76c2abdd7a53dc1555f0d40ea2ddedbcc4a0138b547b9391ac2f99c002906f68851549b4fb3103406f4643c35bc2278b4dcda7e4c7054f095c65e3 WHIRLPOOL 903b30af6ecb15e72404e7dd1395b2ffdd4aa625c7863630cbdca84645f2ddf269b90df97f8378f55aad94842616b0db79f4ca3a2b19aac711acc02aa18866ae
+AUX sgabios-0.1_pre8-makefile.patch 395 SHA256 d618fc84175cd31c8f8dc7887ad448455e4a404af272b242fac4013235b657cc SHA512 7c111af2fff59b0ca6d4b39d04715d404bffa0f71a337b43f7dd091af6e40e85b790ed8b560039d5702d07e1ae47f2c204e891373f11d2ee4aa1541cb471c566 WHIRLPOOL 056f71911a94e90781bf677b8a06903a45a94cf708d743169b2974ba4472220c9875685faa387c20831a9827984b188287de812ca032ff395c33373de9736786
+DIST sgabios-0.1_pre8-bins.tar.xz 2704 SHA256 f982ec467790432f6be662bd58b51e78f80184229ecab5f23d4c0ea2419c1b9d SHA512 46fc02200b3fa2e45c954a2b6e4cd40f10d6969fd05ef4d441402c7390b4e83390250972ef0ea891635400cad22a4d8fd2b66b56afa91d03e1e0b99132e09c0d WHIRLPOOL 7b30b6a40f7b8d5b03482179f48c23910283e45f8eaac538533b5d24289d1ada6d0e6e5ecac3260e46dedc2a1e325fa096b3ae505b96fd1716e98f80be0d209e
+DIST sgabios-0.1_pre8.tar.xz 27200 SHA256 d6f01fe343828c3323c45c000b5a2f906f1c3aa6f788ca8b31669b4a05a3d31d SHA512 68e2a894eb5b99cda2b0e96ade891e24397ac962a777a97dbb526f4570e5734d36a88fde1ef64ed7a887cd8bfc500c91c48849d2c26aca6ce7e36dd80aaf361e WHIRLPOOL de12b91a0304d6465186b9959d873061205bb055823408c84370a7563b46acd7cc955eab6e8b78a54d928bbb65281a9236e4c434fc5df707c5fffc160e311bd2
+EBUILD sgabios-0.1_pre8.ebuild 1153 SHA256 d8868b70c450805fd0277c007f70b1298d8b2b4cd5314f742121432144bce73f SHA512 ffbd86b27008e068716712cc605990d1c230d3a347a589cc9595763d798dc991ac1984376dd0813711d2833b99cd0689fa7bb11547248372f5645214d6d8ddcf WHIRLPOOL e937994baf28b6deb9ae25c012c659577885c04c91b79afc0f761ef5dfe0d98a786f2bc13500161aa847515d899d78273806db1cc51aa843db972b82e330f1a3
+MISC ChangeLog 3336 SHA256 99ab8b4fbec20ec3f3ecbc677162073276022cb41a8c122e0d95b10663ee0c31 SHA512 284ea5d9745aaa1b0a5266efe66b8afaa1b5e6590f8dde2f56fdb27a9476c68c548328c04fd7f1e9b4768be6fd75847761c3f28f86318fc4b753baf1b045bbac WHIRLPOOL f6323f408933fbceea197002c4e1ca82cfb20bbf47a70cfe2d217e6f1539c19ff8e49f27e28591558f3813606fad679a3cae3fc90e2b1c360d5b1270b34672de
+MISC ChangeLog-2015 1458 SHA256 b44b770e1ce03217b30da55e2b953cb5daef009cc887e978d377bdb6de8c9818 SHA512 e504a8224d19e8b7d5219826342406d4e75fb2e81d34dd5993d1676094fd2c934ba041e79d3be2924b124a36f55e3bdc84f1425e35a8e41e0771b5bd8ae8e825 WHIRLPOOL a9bdabd55ac9f159a1405c0358b223b5aa72aab86cd50254119f757f10a120be5b70d48d99b7e1b9925744f8c5a21b82be46e66a4d5feada77871d5636e14fbc
+MISC metadata.xml 360 SHA256 46241d96e312a8974c5a1679c04e37583739d96e05333972973306109449d190 SHA512 e11d9866b6743687df4e32cd3079b6c086b77fe8544a342a16152ad9a2f6ce42b79aadd47aa9a3270b17a09f4137fa6eb1fa3990518231b7f546b3557f9ed067 WHIRLPOOL e3ca915af59f4d2fe6154382801c73b7091aa4e3ebdcdb2f8140927bb835586abbf936a6312a3eca8f08786de7b819ad9a1f67c8fe2c8ddac996b97384b4f1b0
diff --git a/sys-firmware/sgabios/files/sgabios-0.1_pre8-build-cc.patch b/sys-firmware/sgabios/files/sgabios-0.1_pre8-build-cc.patch
new file mode 100644
index 000000000000..6cdac84c6acb
--- /dev/null
+++ b/sys-firmware/sgabios/files/sgabios-0.1_pre8-build-cc.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/552280
+
+--- a/Makefile
++++ b/Makefile
+@@ -20,6 +20,9 @@
+ BUILD_USER = \"$(shell whoami)\"
+ 
+ CFLAGS := -Wall -Os -m32 -nostdlib
++BUILD_CFLAGS := -Wall -O2
++BUILD_CC ?= $(CC)
++BUILD_LD ?= $(BUILD_CC)
+ 
+ ASFLAGS := $(CFLAGS)
+ ASFLAGS += -DBUILD_DATE="$(BUILD_DATE)"
+@@ -55,7 +56,7 @@
+ 	$(LD) $(LDFLAGS) $(OBJS) -o $@
+ 
+ csum8: csum8.c
+-	$(CC) -Wall -O2 -o $@ $<
++	$(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -o $@ $<
+ 
+ sgabios.o: buildinfo
+ 
diff --git a/sys-firmware/sgabios/files/sgabios-0.1_pre8-makefile.patch b/sys-firmware/sgabios/files/sgabios-0.1_pre8-makefile.patch
new file mode 100644
index 000000000000..18e636f4e88e
--- /dev/null
+++ b/sys-firmware/sgabios/files/sgabios-0.1_pre8-makefile.patch
@@ -0,0 +1,12 @@
+diff -u sgabios-0.1_pre8/Makefile sgabios-0.1_pre8-fix//Makefile
+--- sgabios-0.1_pre8/Makefile	2012-07-21 17:16:41.903363117 -0500
++++ sgabios-0.1_pre8-fix//Makefile	2012-07-23 11:11:08.438162997 -0500
+@@ -71,8 +71,4 @@
+ 
+ ifeq (.depend, $(wildcard .depend))
+ include .depend
+-else
+-# if no .depend file existed, add a make clean to the end of building .depend
+-.depend::
+-	$(MAKE) clean
+ endif
diff --git a/sys-firmware/sgabios/metadata.xml b/sys-firmware/sgabios/metadata.xml
new file mode 100644
index 000000000000..0d341c6a91bb
--- /dev/null
+++ b/sys-firmware/sgabios/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cardoe@gentoo.org</email>
+		<name>Doug Goldstein</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>qemu@gentoo.org</email>
+		<name>Gentoo QEMU Project</name>
+	</maintainer>
+	</pkgmetadata>
diff --git a/sys-firmware/sgabios/sgabios-0.1_pre8.ebuild b/sys-firmware/sgabios/sgabios-0.1_pre8.ebuild
new file mode 100644
index 000000000000..b062b9588e3c
--- /dev/null
+++ b/sys-firmware/sgabios/sgabios-0.1_pre8.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="serial graphics adapter bios option rom for x86"
+HOMEPAGE="https://code.google.com/p/sgabios/"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~cardoe/distfiles/${P}.tar.xz
+	https://dev.gentoo.org/~cardoe/distfiles/${P}-bins.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch "${FILESDIR}"/${P}-build-cc.patch #552280
+	epatch_user
+}
+
+src_compile() {
+	if use amd64 || use x86 ; then
+		tc-ld-disable-gold
+		tc-export_build_env BUILD_CC
+		emake \
+			BUILD_CC="${BUILD_CC}" \
+			BUILD_CFLAGS="${BUILD_CFLAGS}" \
+			BUILD_LDFLAGS="${BUILD_LDFLAGS}" \
+			BUILD_CPPFLAGS="${BUILD_CPPFLAGS}" \
+			CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" \
+			AR="$(tc-getAR)" \
+			OBJCOPY="$(tc-getOBJCOPY)"
+	fi
+}
+
+src_install() {
+	insinto /usr/share/sgabios
+
+	if use amd64 || use x86 ; then
+		doins sgabios.bin
+	else
+		doins bins/sgabios.bin
+	fi
+}
diff --git a/sys-firmware/sigrok-firmware-fx2lafw/Manifest b/sys-firmware/sigrok-firmware-fx2lafw/Manifest
new file mode 100644
index 000000000000..d1291b76bc40
--- /dev/null
+++ b/sys-firmware/sigrok-firmware-fx2lafw/Manifest
@@ -0,0 +1,16 @@
+DIST sigrok-firmware-fx2lafw-0.1.2.tar.gz 148798 SHA256 85c658f851fd90089382756b4c5f0326f96d630a0ad5637455a84a4a058b3572 SHA512 b1f90e06227dcd3832bb61267ef8d20a7b4df702228b884c13725e472ed56bd971a46e2b4104bde666abc599edbe20cdbb51e30ee423b07c27ab1093de5953df WHIRLPOOL bbe4705b39424c86f92ecef4d4b13e1fbf21c27e306edc8674358fc6c62a665c35753d58c53dc8177fb939443029f83ac33f1c97db66829be304919b2ffd83f1
+DIST sigrok-firmware-fx2lafw-0.1.3.tar.gz 128057 SHA256 f75102c4008f89c50fef7f5f5fc144d7a4b3a2cccfcbf181d9dc7015708e7c09 SHA512 60ed3bc41ec29217436f0aeff6058ad565f0e04ff00fac61f7be5c9f3dbfcfe1b0f09ef4168e67a58b2e93ff575f895afe79110e70245db020281f8efa25e0b4 WHIRLPOOL ea2352223c90d1bab22b0d631ed1cf043a3c5ce00f4f6a5f97d42dfae48716748b63bd6a87b232c47660d0de17be227eb9dc7d3af9e721f7208aa8eaee4b2b1e
+DIST sigrok-firmware-fx2lafw-0.1.4.tar.gz 140696 SHA256 ce6bb503703bab1ea846fc5acd6b8b43e0fe8521eda632292fd9f83b24c70d8c SHA512 19b2b75d2e08804b15ba8f5cae5eca854f1b56a7b1c30b01b0c6611ff6b1fd5a80c2b90d686fd37a1d0c677974070ef61b2fb131b8094d36c38578a4a4ddbcfd WHIRLPOOL 115a9324b9e6165b12f82175ed87908c58a53e20047dcb2b8bdb4e5dbe9d0095b7ed8093b8681ee9115bcf827dcc516c3788aac3ce401f47557624184c056691
+DIST sigrok-firmware-fx2lafw-0.1.5.tar.gz 142353 SHA256 ca74096b93baed48ef3e59ce0c97111153b9a2a8841c40019500b09b897f6d2d SHA512 56db016987fd05131762b958e8dea705315aa44604ba63c2dffafdee0df33fbfa5a167c3a8ee7568ffd0fb0cd90df01c72627203ea8427f5e849c55a00e54478 WHIRLPOOL 228bdb8240f20e5a813ea0659e5d7d1f6f98e81067cacb0f6ee3a26c401283ff676373bcd871cc8298f109caef4301f92dc8c8e20722300178d09c517a5cf905
+DIST sigrok-firmware-fx2lafw-bin-0.1.2.tar.gz 36486 SHA256 f28d411240a2f460d334e89ad18f5a632fa2a0f4afa25e030a26b41200351c70 SHA512 74d52e5200886ba3328f411e46419ed6d6892fe2ba6c0f66a94b19be82f7d04837d8a41093d1c14ce73609f84f6277956c9c44febab8a7f150c32ba7f7ab28b1 WHIRLPOOL 039a803d8e8177e731435276b03816910fba35ed51d0ac744bdff1df1ef603a728bb2046a5f057fa135ac648eb9f2c838ec16d345b1961e1fc28f411836f378e
+DIST sigrok-firmware-fx2lafw-bin-0.1.3.tar.gz 38531 SHA256 741d84ccd40b506957629b4a541380c67d7f845001775372c75bd993bc1520e3 SHA512 b7df7d55fba2e9e3a823f80a1f1df2232631875a4f3fe57e4ef52fa9bf8d307524baf9cb7602d61b89698f12d9bcc9d6f93bd9be30fb8027f320229b089730f4 WHIRLPOOL 5191f179899461460e3b6137242d43a37621ea3a56ec43f00f25b9da72b7e6cf2642b4215019ecb9e84c680deafe5c595ab701c8653db840aa546197a8c2abac
+DIST sigrok-firmware-fx2lafw-bin-0.1.4.tar.gz 48760 SHA256 e48ae384fdcf3f552b91fb35d1a49fd211cfdadebbdbbb5b31befb8eb0f8a35a SHA512 06d2fa53408666360629eaf738bda676da0616da90530e3fd6c529c2b54e9432ab3893d7bfe6e185e43fc8166ac6733fd573778e55d529a8d84dcd44d7f8a4ca WHIRLPOOL 44ed927a4884e83029584f848803e6266677e76f1888b1b71c7e98520e2fb07eff1d61aa2dc77419745c4e963bbecad4254c701a3ec5daf4042804df1f80f355
+DIST sigrok-firmware-fx2lafw-bin-0.1.5.tar.gz 51438 SHA256 a81b358a042595b95af239db6cada32734ce14dfb784d4c6b95ee09985cd66b8 SHA512 39a5a49d51f92ce256503d0e682ae565249642d8479964327777e3795a20762ecd0fdeaee96c172e72143f5deb52d2cabb7cad4b5bf081c7576c2dfaa62b7b9e WHIRLPOOL c439a0e0d6fab48b9c5b4c0f38b770014a59092f0d41cac3ce883990237d955ff5f8d3ea9a64c57ea879f3d53a3e38a1bc5ff769ba64bcc971f029c23138dd34
+EBUILD sigrok-firmware-fx2lafw-0.1.2.ebuild 1075 SHA256 5564c2c07d35f3beb7f04d51f57e9d7d37e802b34bda9784243784c2157aff94 SHA512 e64648eb29fefc35d7261de107be27d61e76dcc4f0c985075efdeb424e36ba703e1ba14b1172324dd738a2a855d9aeb3d7c94684471ac2a9349048977b3aca0c WHIRLPOOL 58b46a31a2d3e09651af2938b68caf6572fd8b992576d38568a9e4860800fe226db61ab44ddb77485c94d4af15744897090d089c747af3da0586536e6282e7bd
+EBUILD sigrok-firmware-fx2lafw-0.1.3.ebuild 1186 SHA256 8c1c42ac21a8c5b013728a201672181f3840d14e5ec3fba8e9f3636f27c15bff SHA512 020ef4e6e3ca01b0a59f771e595b8acb74a3dea2e818e00751ad7b8bf6e53dfb6b7ebd98b4d1565e4bf9c3b57dc4a12aa57bf2b31d371c434afb79494592e8ff WHIRLPOOL 38766b00cf27999e8b85195800288df86b528cd99014cd6ddba49e05b3099649bb4597d319df643ebab44eb2fc69fe2754d6be2e4e6d79554c09df26dd048dc2
+EBUILD sigrok-firmware-fx2lafw-0.1.4.ebuild 1186 SHA256 8c1c42ac21a8c5b013728a201672181f3840d14e5ec3fba8e9f3636f27c15bff SHA512 020ef4e6e3ca01b0a59f771e595b8acb74a3dea2e818e00751ad7b8bf6e53dfb6b7ebd98b4d1565e4bf9c3b57dc4a12aa57bf2b31d371c434afb79494592e8ff WHIRLPOOL 38766b00cf27999e8b85195800288df86b528cd99014cd6ddba49e05b3099649bb4597d319df643ebab44eb2fc69fe2754d6be2e4e6d79554c09df26dd048dc2
+EBUILD sigrok-firmware-fx2lafw-0.1.5.ebuild 1186 SHA256 147cbb96fa5e163644df6cf0bc060160aa73c2b46643bbb6552f845839bd7a57 SHA512 bab65ec7b08e989c1401829902460f3a00730e25f40fd2c105e9dc2dfc50d8b1f91e7f13919f1da632a2690a4a5074be977068a30daa4b2a287c7b2b264a276e WHIRLPOOL 54b7c667922bf0690d9ae0df89b8ed2e60e7315ce810046afeb1e552f00af25608cfdf01af63f73e2589270de62dd826bb030a4a7fbde7f02fe9459df9d425ef
+EBUILD sigrok-firmware-fx2lafw-9999.ebuild 1186 SHA256 8c1c42ac21a8c5b013728a201672181f3840d14e5ec3fba8e9f3636f27c15bff SHA512 020ef4e6e3ca01b0a59f771e595b8acb74a3dea2e818e00751ad7b8bf6e53dfb6b7ebd98b4d1565e4bf9c3b57dc4a12aa57bf2b31d371c434afb79494592e8ff WHIRLPOOL 38766b00cf27999e8b85195800288df86b528cd99014cd6ddba49e05b3099649bb4597d319df643ebab44eb2fc69fe2754d6be2e4e6d79554c09df26dd048dc2
+MISC ChangeLog 4087 SHA256 fb722250ac71d54cd247a3d37fc9f80678b5b799f34078b5b76b795ff121b371 SHA512 ff891b2bc00677071b479b4e2fd0210e5e51de3b29d98912cf55a9de3b23e2626203bc72a8137582807ea80f08507fe901c5359af1838e21f9114afe0d32174d WHIRLPOOL d34d00a4be1bb7a0a680f4afba95a0694b0cbbd13a020a856158a208a0f64e373dbf2da29a9f077029cdf777e76681dbb6a12a2ee1776454a0cdc1d46942621d
+MISC ChangeLog-2015 722 SHA256 088679b5a27eaf432c6b30bda72416ad4599914e4d482f0664e65ef1eca013c8 SHA512 ab91b6c6a4db8f1fe5ab76711adb84b5576870c4e469bfa216a0607d9f9ae9a65e9131daf33fb6ef3ea4c8f1e1411ac74388458b8a6ab05cc25d94ff6bb97e1d WHIRLPOOL 7779724747458bd43bef383b6c6041fc4ab4f4015ebba76ff148ab877f81ef868f6431a7828fffb67456e2b1511552094fa82cd01ae3fbbb11d82a224b15f52f
+MISC metadata.xml 329 SHA256 f04f9e26ec90d87fbb50664843b40dd35eeb5ea23ef6c49e54a0c56de59e8968 SHA512 56ca5a2c5d91cbb7ac9b3578fdc6eae211a8474649cf418464bfe7b96ea303b2fec80bcc24a0c490ba79b46d0d0cf44832ce3ef9febe1ee533cde57ccf12ddf5 WHIRLPOOL ec7abb4aac130325dd8bd606910f203eafb557a74de800d6f3d04d5d748b20307f351c9bfc90d76b46aa7b8ffa16f468462422e1af5781a6c4d92707a2100f31
diff --git a/sys-firmware/sigrok-firmware-fx2lafw/metadata.xml b/sys-firmware/sigrok-firmware-fx2lafw/metadata.xml
new file mode 100644
index 000000000000..375a52013951
--- /dev/null
+++ b/sys-firmware/sigrok-firmware-fx2lafw/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>embedded@gentoo.org</email>
+ <name>Embedded Gentoo</name>
+</maintainer>
+<use>
+ <flag name="binary">Use official upstream pre-built binaries</flag>
+</use>
+</pkgmetadata>
diff --git a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.2.ebuild b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.2.ebuild
new file mode 100644
index 000000000000..667a214a872f
--- /dev/null
+++ b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://sigrok.org/${PN}"
+	inherit git-r3 autotools
+else
+	SRC_URI="binary? ( http://sigrok.org/download/binary/${PN}/${PN}-bin-${PV}.tar.gz )
+		!binary? ( http://sigrok.org/download/source/${PN}/${P}.tar.gz )"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="open-source firmware for Cypress FX2 chips which makes them usable as simple logic analyzer hardware"
+HOMEPAGE="http://sigrok.org/wiki/Fx2lafw"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="binary"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	!binary? ( >=dev-embedded/sdcc-2.9.0[device-lib(+),mcs51(+)] )"
+
+src_unpack() {
+	[[ ${PV} == "9999" ]] && git-r3_src_unpack || default
+	# The binary & source dirs are slightly diff.
+	use binary && S="${WORKDIR}/${PN}-bin-${PV}"
+}
+
+src_prepare() {
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_install() {
+	if use binary ; then
+		insinto /usr/share/sigrok-firmware
+		doins *.fw
+		dodoc ChangeLog NEWS README
+	else
+		default
+	fi
+}
diff --git a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.3.ebuild b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.3.ebuild
new file mode 100644
index 000000000000..b0eecf836950
--- /dev/null
+++ b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+SDCC_DEPEND=">=dev-embedded/sdcc-2.9.0[device-lib(+),mcs51(+)]"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://sigrok.org/${PN}"
+	IUSE=""
+	inherit git-r3 autotools
+else
+	SRC_URI="binary? ( http://sigrok.org/download/binary/${PN}/${PN}-bin-${PV}.tar.gz )
+		!binary? ( http://sigrok.org/download/source/${PN}/${P}.tar.gz )"
+	KEYWORDS="~amd64 ~x86"
+	IUSE="binary"
+	SDCC_DEPEND="!binary? ( ${SDCC_DEPEND} )"
+fi
+
+DESCRIPTION="open-source firmware for Cypress FX2 chips which makes them usable as simple logic analyzer hardware"
+HOMEPAGE="http://sigrok.org/wiki/Fx2lafw"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	${SDCC_DEPEND}"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_src_unpack
+	else
+		default
+		# The binary & source dirs are slightly diff.
+		use binary && S="${WORKDIR}/${PN}-bin-${PV}"
+	fi
+}
+
+src_prepare() {
+	[[ ${PV} == "9999" ]] && eautoreconf
+	eapply_user
+}
+
+src_install() {
+	if [[ ${PV} != "9999" ]] && use binary ; then
+		insinto /usr/share/sigrok-firmware
+		doins *.fw
+		dodoc ChangeLog NEWS README
+	else
+		default
+	fi
+}
diff --git a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.4.ebuild b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.4.ebuild
new file mode 100644
index 000000000000..b0eecf836950
--- /dev/null
+++ b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+SDCC_DEPEND=">=dev-embedded/sdcc-2.9.0[device-lib(+),mcs51(+)]"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://sigrok.org/${PN}"
+	IUSE=""
+	inherit git-r3 autotools
+else
+	SRC_URI="binary? ( http://sigrok.org/download/binary/${PN}/${PN}-bin-${PV}.tar.gz )
+		!binary? ( http://sigrok.org/download/source/${PN}/${P}.tar.gz )"
+	KEYWORDS="~amd64 ~x86"
+	IUSE="binary"
+	SDCC_DEPEND="!binary? ( ${SDCC_DEPEND} )"
+fi
+
+DESCRIPTION="open-source firmware for Cypress FX2 chips which makes them usable as simple logic analyzer hardware"
+HOMEPAGE="http://sigrok.org/wiki/Fx2lafw"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	${SDCC_DEPEND}"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_src_unpack
+	else
+		default
+		# The binary & source dirs are slightly diff.
+		use binary && S="${WORKDIR}/${PN}-bin-${PV}"
+	fi
+}
+
+src_prepare() {
+	[[ ${PV} == "9999" ]] && eautoreconf
+	eapply_user
+}
+
+src_install() {
+	if [[ ${PV} != "9999" ]] && use binary ; then
+		insinto /usr/share/sigrok-firmware
+		doins *.fw
+		dodoc ChangeLog NEWS README
+	else
+		default
+	fi
+}
diff --git a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.5.ebuild b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.5.ebuild
new file mode 100644
index 000000000000..6589c0b0b0ee
--- /dev/null
+++ b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+SDCC_DEPEND=">=dev-embedded/sdcc-2.9.0[device-lib(+),mcs51(+)]"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://sigrok.org/${PN}"
+	IUSE=""
+	inherit git-r3 autotools
+else
+	SRC_URI="binary? ( http://sigrok.org/download/binary/${PN}/${PN}-bin-${PV}.tar.gz )
+		!binary? ( http://sigrok.org/download/source/${PN}/${P}.tar.gz )"
+	KEYWORDS="~amd64 ~x86"
+	IUSE="binary"
+	SDCC_DEPEND="!binary? ( ${SDCC_DEPEND} )"
+fi
+
+DESCRIPTION="open-source firmware for Cypress FX2 chips which makes them usable as simple logic analyzer hardware"
+HOMEPAGE="http://sigrok.org/wiki/Fx2lafw"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	${SDCC_DEPEND}"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_src_unpack
+	else
+		default
+		# The binary & source dirs are slightly diff.
+		use binary && S="${WORKDIR}/${PN}-bin-${PV}"
+	fi
+}
+
+src_prepare() {
+	[[ ${PV} == "9999" ]] && eautoreconf
+	eapply_user
+}
+
+src_install() {
+	if [[ ${PV} != "9999" ]] && use binary ; then
+		insinto /usr/share/sigrok-firmware
+		doins *.fw
+		dodoc ChangeLog NEWS README
+	else
+		default
+	fi
+}
diff --git a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-9999.ebuild b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-9999.ebuild
new file mode 100644
index 000000000000..b0eecf836950
--- /dev/null
+++ b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-9999.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+SDCC_DEPEND=">=dev-embedded/sdcc-2.9.0[device-lib(+),mcs51(+)]"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://sigrok.org/${PN}"
+	IUSE=""
+	inherit git-r3 autotools
+else
+	SRC_URI="binary? ( http://sigrok.org/download/binary/${PN}/${PN}-bin-${PV}.tar.gz )
+		!binary? ( http://sigrok.org/download/source/${PN}/${P}.tar.gz )"
+	KEYWORDS="~amd64 ~x86"
+	IUSE="binary"
+	SDCC_DEPEND="!binary? ( ${SDCC_DEPEND} )"
+fi
+
+DESCRIPTION="open-source firmware for Cypress FX2 chips which makes them usable as simple logic analyzer hardware"
+HOMEPAGE="http://sigrok.org/wiki/Fx2lafw"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	${SDCC_DEPEND}"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_src_unpack
+	else
+		default
+		# The binary & source dirs are slightly diff.
+		use binary && S="${WORKDIR}/${PN}-bin-${PV}"
+	fi
+}
+
+src_prepare() {
+	[[ ${PV} == "9999" ]] && eautoreconf
+	eapply_user
+}
+
+src_install() {
+	if [[ ${PV} != "9999" ]] && use binary ; then
+		insinto /usr/share/sigrok-firmware
+		doins *.fw
+		dodoc ChangeLog NEWS README
+	else
+		default
+	fi
+}
diff --git a/sys-firmware/tt-s2-6400-firmware/Manifest b/sys-firmware/tt-s2-6400-firmware/Manifest
new file mode 100644
index 000000000000..fe8b6701ddb2
--- /dev/null
+++ b/sys-firmware/tt-s2-6400-firmware/Manifest
@@ -0,0 +1,9 @@
+DIST dvb-ttpremium-fpga-01_v1_10.zip 90791 SHA256 d5f0ecd1c687549d71a21269c25791554895d8c03ff580a9694ef24041952f69 SHA512 7083a14a25945c7b310830cb3508e9c1e3922944fa3e778588ecf6dc6faa02aca2c8e6bf4c40db632a268324a936dce20ae26563fd195a5c8e1b29446f21c97c WHIRLPOOL f6175f6b443b551d3df545b0a54951eb5d9059256354a06e71463dede754140da9f48cc2bb3498d455da6340b36aab03c801b7eabb503254d355101e23041fb6
+DIST dvb-ttpremium-loader-01_v1_03.zip 9841 SHA256 99969d4740ca26332439590e6b6e86711c89be69cf94c3732267b8278c0da763 SHA512 d0fddfeadbf1f5bc06538033ea4b69ecc6a34e1b3a8239df93c347f7882ac6b7ee8b44eaef3eaff15c81bb084e3f985f8504d68edb83479e149d904fb97e2ce3 WHIRLPOOL 2632a19a542e3feb2d6b5446873147af49ccdccf7a202b7516aa7f07aab6fae68b2c6dea3a1da4a9dbede86b5aa0e865e1dc91db28322807aade727b8edd6214
+DIST dvb-ttpremium-st7109-01_v0_5_0.zip 2074807 SHA256 914242a9781d67f9c8ec9afde7a193080979e63e14e9d395210f78574c25fb66 SHA512 c8aeb5a61deb1f66d65ca69512edaa78d0222765d60f780b7c6f9240823def66bd326a21bb1c3bf0a4206dc0b1766522fc8d7ead800a6b49682bcc75be109d59 WHIRLPOOL fbd9ba0bfc0259d7604cd07d966954c58033ab45c5815b4c871caacf215ab94abb0e183503c6d808d0979d7fc05c201204203beb2e9399baf23d736ad17587c3
+DIST dvb-ttpremium-st7109-01_v0_5_1.zip 2075442 SHA256 cf336310fdd0c6998e6efa59d17b39d1fdb682daea51b60faee66444545986d4 SHA512 8d209793201065914f4314dd4f3978ab100d93ce6abe589411b6e9bd3dc064702d3835696834e192c2aa432213d4d4be6ccbde9140faa10d7e8a16ca4909feb9 WHIRLPOOL adbe0bc84bd46afdd466bd2d133e7908c8954b3a7208dc78cc24199652b1f1a609f19319bc8af60085b09aa00ee6953b482d6339cdd11033dfca6f66061b8d14
+EBUILD tt-s2-6400-firmware-0.5.0.ebuild 709 SHA256 716213e0379939c3e2dbe1b05946a8bed2528bf221e5c14cb86298caaae0f365 SHA512 67fbcd29ffa7ef05a2385c8d06e3806c336346daee27c3dd79a6c13374e3b8d97ff9baab2ad4de1409ac5eb0c1c964fd7233159cf09b3a91d75d585899b58b0a WHIRLPOOL eb12d9e76e56b96f8351509aa463c74903728b1d8704eacec009181fe0fa7b080eaff824af5366f8bec04e6a5d38d030a453db9e9917c6ed05d9c9ea8d39f08c
+EBUILD tt-s2-6400-firmware-0.5.1.ebuild 711 SHA256 2862443423188841b5e8ae333b66cefe006cba9185f76f98a88d0e0240b4daa9 SHA512 47d81db91ed87dfc050fcb72df5f04ffb8209abb61c8924e56d4c5288ab33d605c1728f2424ffc54dd96e3bb6d0e6758d575084a52fb87d2d5ed62e0e5271d8e WHIRLPOOL 99d91ee57e67bc2f487078820e37f5138ed07f7abab83f05ab7a92f331642e3326ce6b721757cfbf876fe7244b7e8112db469d8ef0728cab3113523e40958f44
+MISC ChangeLog 2543 SHA256 1d268bc2e6903d8329c7ec22eef418f9bbb1f047c5a7f3733cddcb032a2572a1 SHA512 02be22b35ae4cbfc1979c65b22a02105a1b8661c415172f01ce00a7500b6ef576f99e8f9cbce85220bbbdf941edc7ddb6312b4215d4afa608356196a319ed46d WHIRLPOOL fea5ed242893b2f8b9786bf9cc4aa5071fccc8413019ce149ccb46d7ddb673d70a7bb86dd1feaa04aaab8161d7301690ba9da7995bbc8769bd92ccf8150c754a
+MISC ChangeLog-2015 1576 SHA256 1fb339c0d4dbb9a9330cf6369951e7a3eda1a18f76fc069c70da94a217a78220 SHA512 a35fd53bdff4fee0b6d67ddd6f334ff5a00118cf60cb10f5e49b0f75cd1684eb3c0e6552760df1b41a4fb47219f2d2e43f0326e1222df98244cc712c793bb9ff WHIRLPOOL a45e00eae4d0f59a9d857ccd55c7bdc63d636d79254decd07709fb924efac103e98e44d3935fa6a5668029265a5fb5c86780a31fe7c0b4ae815b0d2c206ce317
+MISC metadata.xml 251 SHA256 2bba3f7da31b444c864663556a5a0ee846b9a80236fa4d34f1ce2094abd75a35 SHA512 5bc0d0646e1dc625e70cc77e6d0ce57a3183dc017eea0f6c406a0849a3f38923ac49de73846196bf2bc378043fb13c79d7cbb754ce328cc079e0223289d402db WHIRLPOOL 971501122d5a5c7a872380068baabdd2943896181349212fcd52eafa337542a371800d32c4c183db82e95759988ff74ad9249e74a21569fad02b6cbab3377d8d
diff --git a/sys-firmware/tt-s2-6400-firmware/metadata.xml b/sys-firmware/tt-s2-6400-firmware/metadata.xml
new file mode 100644
index 000000000000..18b2e396af49
--- /dev/null
+++ b/sys-firmware/tt-s2-6400-firmware/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+    </maintainer>
+</pkgmetadata>
diff --git a/sys-firmware/tt-s2-6400-firmware/tt-s2-6400-firmware-0.5.0.ebuild b/sys-firmware/tt-s2-6400-firmware/tt-s2-6400-firmware-0.5.0.ebuild
new file mode 100644
index 000000000000..fcbe5edb1f36
--- /dev/null
+++ b/sys-firmware/tt-s2-6400-firmware/tt-s2-6400-firmware-0.5.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+RESTRICT="mirror bindist"
+
+DESCRIPTION="Firmware for the Technotrend S2-6400 DVB Card"
+HOMEPAGE="http://www.aregel.de/"
+SRC_URI="http://www.aregel.de/file_download/27/dvb-ttpremium-st7109-01_v0_5_0.zip
+	http://www.aregel.de/file_download/26/dvb-ttpremium-fpga-01_v1_10.zip
+	http://www.aregel.de/file_download/7/dvb-ttpremium-loader-01_v1_03.zip"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S=${WORKDIR}
+
+src_install() {
+	insinto /lib/firmware
+	doins dvb-ttpremium-fpga-01.fw dvb-ttpremium-loader-01.fw dvb-ttpremium-st7109-01.fw
+}
diff --git a/sys-firmware/tt-s2-6400-firmware/tt-s2-6400-firmware-0.5.1.ebuild b/sys-firmware/tt-s2-6400-firmware/tt-s2-6400-firmware-0.5.1.ebuild
new file mode 100644
index 000000000000..4d6e042f6fc2
--- /dev/null
+++ b/sys-firmware/tt-s2-6400-firmware/tt-s2-6400-firmware-0.5.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+RESTRICT="mirror bindist"
+
+DESCRIPTION="Firmware for the Technotrend S2-6400 DVB Card"
+HOMEPAGE="http://www.aregel.de/"
+SRC_URI="http://www.aregel.de/file_download/28/dvb-ttpremium-st7109-01_v0_5_1.zip
+	http://www.aregel.de/file_download/26/dvb-ttpremium-fpga-01_v1_10.zip
+	http://www.aregel.de/file_download/7/dvb-ttpremium-loader-01_v1_03.zip"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S=${WORKDIR}
+
+src_install() {
+	insinto /lib/firmware
+	doins dvb-ttpremium-fpga-01.fw dvb-ttpremium-loader-01.fw dvb-ttpremium-st7109-01.fw
+}
diff --git a/sys-firmware/vgabios/Manifest b/sys-firmware/vgabios/Manifest
new file mode 100644
index 000000000000..e17dbd51fdb6
--- /dev/null
+++ b/sys-firmware/vgabios/Manifest
@@ -0,0 +1,11 @@
+DIST vgabios-0.6c-bins.tar.xz 17876 SHA256 804fbe3e4712fcf0381e06d17a912d5b991e6abecdcc2265efb41f07783d80d9 SHA512 7c3790d6e9feb12697558d690dd23a6ca35a9037987f516bcd84f750c177cb26ddfdbdacb68730e01f6d9ba118c5d092ad00c0cfa9f8c40b2c0218641dc8a53e WHIRLPOOL 99c8dbce88ebae05b58e39d49218027447274aa9130e62dfc637b2ac13242fd8405aa48c70bb61fe8f27eddb988dc95ea48b500528aa0d8e1df92729ba3958b1
+DIST vgabios-0.6c-fixes-2.tar.bz2 4174 SHA256 9afd6b26dea4833b1d58079982e7eec650d2dd1eb2379871e35ca5b3d10352b5 SHA512 bf85dfa52c078517c77b219361b0c569ad79ef9a8234dfdb14f39902198f0e7bfab99f826e084bda5c8321e69591deeda8242e4f52134bac654046db7fe20584 WHIRLPOOL fffd94fd20de91fe577d44c3dbd107546e81712454b0167aab708646b181b7b7976be07f38f052adccb5d0cf6734a8b42e10ca40d7cf33ec278f5f126d0dc041
+DIST vgabios-0.6c.tgz 1470496 SHA256 eff20b9cb333fc5efb1fc07430b108084977d95fee349615f7c078511e66aea1 SHA512 b0392358abf691f0a3b8292cf14dc56897d5cbf004336af4b4a3378002c4b47eb28c9da182cddf2c89d162a6e166b7a5c07cb098303a9f9918ea484922d3770e WHIRLPOOL 4e32c0af3dcf28bac3cb8c34f020cdda52b7ee2bf08adfaf52719a386ad5d5382aa389261ac5e9ceb3d2269d54b8c86e7a99b5df1170592049af6bded5daa319
+DIST vgabios-0.7a-fixes-1.tar.bz2 2602 SHA256 912bbe475a723760047c181ebec9cd5b1e99b3e528c43bbccb82b7c738656ae3 SHA512 30992efac011d4b99301960df08cdc69d9503aa6b61feed01fca2c5a910460269d9500650cb394a0737318e977a282c5e0ab613a8b2bc28b9f0c6528a9a77d73 WHIRLPOOL 304d135de9d7ddb5e9141cf90ef2e94d632a52c43e0ef156a477af1db5b2fa4dde79957b6c2cee3070e760c36670be20df34e2a9da4e5edb1fb4f1d42f6ad21e
+DIST vgabios-0.7a.tgz 1506655 SHA256 9d24c33d4bfb7831e2069cf3644936a53ef3de21d467872b54ce2ea30881b865 SHA512 35d789b1b39f8f05b757b6c3379a1b2c33dc27b244720471530325f3e215b5f4fa97cfbfc131f813013f4640fe85be912e7b4cb924fa87ed35e68b6966424874 WHIRLPOOL c03ffdcdb85cc3f20cad7d8962763e2cadf3b46c0dca559b0a9a509283101be4a8939bbde2f4b9a03c88dc2e52ce896d520d2e726a1db63adbc00d4b697e77ff
+EBUILD vgabios-0.6c-r1.ebuild 1785 SHA256 d4b7a04bdeede2c9d908ad5d09da45765b0a892e81d1219c78b90fb2d58f1125 SHA512 75a81633410c8c6c82b641a252fb2ef20bcbf6a635a6b0ced72bdb5b4aed98d377c9e4fb6c50b6258ddfb1912d10056c5fc3153ce417061f0a355cc8bf6016f6 WHIRLPOOL 43abfadae76842523d9a11674cfa72b707331b3a2ff4ac3596dd3868c2a66d85f374f9a8f582049a205cc86db23739b709cc8b0670d8065b12a22aae469da19e
+EBUILD vgabios-0.7a-r1.ebuild 1746 SHA256 ee8ec89f65cbdfd0e85d7d763e80d1d0555eea822233bb5221396156d1e7e34c SHA512 d238b9766304222b5f99b79d87443e59409fbdb6ac3cc39faa711a17a8f72c78c601965f4cf3cb2f2bee47760662343a8dba5f3f49c3ad25738d1b0cd2ed6cf5 WHIRLPOOL b7960360c85de38d42ace79cbe44ee0d1c5f62e6071677578bbe8adeb0c37a24082a5a46af6332b95c1c49ee61d418437ce4da38e892c3e20e36a71566774f60
+EBUILD vgabios-0.7a.ebuild 1716 SHA256 d0c791b3b8ec3f3649e9d84db1ffc803b90af9ff4748ee3040b595325344c68c SHA512 1822165f80f0d45437825044e9675edfe515a35004e3b3fddc069b60208bbd1f4fc97120bd1c8a3f7d226f2ee6c4459e4017321c48d402f9a44c272b346ceff5 WHIRLPOOL 26af839842fdbf8111bd8833eaae8906290f18d77bd66c1b9f3c04dbb5bb33b6294f090850b1b790da02443c23d1683b01fdeda0ac4936bbd356faf3ecfdda7f
+MISC ChangeLog 3160 SHA256 c4f9bee4ae8d9f5fe3d3e858e9fb422879d2c1f7d5b38948795d549012adba68 SHA512 f8f3e9c8c1dd72c953033c5e383db62bce1677f5acbfbc432a861acdc66b60f6d6c4f22717fa69efecfe73d1e31b79f44d7a57a387862bd97a367d91ef96c43d WHIRLPOOL 0f6e60436a0aa176fbf109c5a89648fbd4f1c1c427d53b75f926b719c6a8aaf39f58471d0f05c33fdc37b579cb875d988d5dff703c3f5dbb6c44c5aa33135dd0
+MISC ChangeLog-2015 3065 SHA256 2ce882f8ad9d66367e56e1e2981ecc1b8fba7673fcc64734d330bfbf00c52b4b SHA512 f373f83716606fe042204b4a6f684e46fa77c2fb1a5acf141af0410d09b3bc53b15d4ffc2bef1124cbe7f08aa983cf98bc56aaac6914534b0a657bee5b1ca95a WHIRLPOOL 4938454178cade639910ba4dc3f119424c3836e87caca1c7e70954034ed1845d52c53762c7aa214ac9339db4c102034ac05ddd0504a290724a3de8257ae10ab1
+MISC metadata.xml 477 SHA256 3fcae2eee93c3928a18aad680bf1dba96733c14f97c03039963c8f0b4e6f4c50 SHA512 51a96b9d6b439af4b18172aad5b8380eaa471fea5e281fffb159804bd107a944c44665a491a49370e3ade3860bceb5615d5c9679c4da08a5d2f230d3826a1244 WHIRLPOOL 277f47ed31bdd80dc868576c587efa26f4cf956baed0efb1fe46d856e06023a109934df09df04e021c6c0a65ae7025dd147b68227275ba7e577f0a27dcf41f51
diff --git a/sys-firmware/vgabios/metadata.xml b/sys-firmware/vgabios/metadata.xml
new file mode 100644
index 000000000000..528625303c9d
--- /dev/null
+++ b/sys-firmware/vgabios/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cardoe@gentoo.org</email>
+		<name>Doug Goldstein</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>qemu@gentoo.org</email>
+		<name>Gentoo QEMU Project</name>
+	</maintainer>
+	<use>
+		<flag name="binary">Use official upstream pre-built binaries (only default and cirrus images)</flag>
+	</use>
+</pkgmetadata>
diff --git a/sys-firmware/vgabios/vgabios-0.6c-r1.ebuild b/sys-firmware/vgabios/vgabios-0.6c-r1.ebuild
new file mode 100644
index 000000000000..c5f314bac74e
--- /dev/null
+++ b/sys-firmware/vgabios/vgabios-0.6c-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+# Can't really call them backports when they're fixes that upstream
+# won't carry
+FIXES=2
+
+inherit eutils
+
+DESCRIPTION="VGA BIOS implementation"
+HOMEPAGE="http://www.nongnu.org/vgabios/"
+SRC_URI="https://savannah.gnu.org/download/${PN}/${P}.tgz
+	https://dev.gentoo.org/~cardoe/distfiles/${P}-bins.tar.xz
+	https://dev.gentoo.org/~cardoe/distfiles/${P}-fixes-${FIXES}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-fbsd"
+IUSE="debug"
+
+DEPEND="amd64? ( sys-devel/dev86 )
+	x86? ( sys-devel/dev86 )"
+RDEPEND=""
+
+src_prepare() {
+	[[ -n ${FIXES} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+}
+
+src_compile() {
+	if use amd64 || use x86 ; then
+		emake clean # Necessary to clean up the pre-built pieces
+		emake biossums
+		emake
+	fi
+}
+
+src_install() {
+	insinto /usr/share/vgabios
+
+	if use amd64 || use x86 ; then
+		# Stock VGABIOS
+		newins VGABIOS-lgpl-latest.bin vgabios.bin
+		use debug && newins VGABIOS-lgpl-latest.debug.bin vgabios.debug.bin
+
+		# Cirrus
+		newins VGABIOS-lgpl-latest.cirrus.bin vgabios-cirrus.bin
+		use debug && newins VGABIOS-lgpl-latest.cirrus.debug.bin \
+			vgabios-cirrus.debug.bin
+
+		# QXL
+		newins VGABIOS-lgpl-latest.qxl.bin vgabios-qxl.bin
+		use debug && newins VGABIOS-lgpl-latest.qxl.debug.bin \
+			vgabios-qxl.debug.bin
+
+		# Standard VGA
+		newins VGABIOS-lgpl-latest.stdvga.bin vgabios-stdvga.bin
+		use debug && newins VGABIOS-lgpl-latest.stdvga.debug.bin \
+			vgabios-stdvga.debug.bin
+
+		# VMWare
+		newins VGABIOS-lgpl-latest.vmware.bin vgabios-vmware.bin
+		use debug && newins VGABIOS-lgpl-latest.vmware.debug.bin \
+			vgabios-vmware.debug.bin
+	else
+		doins bins/*
+	fi
+}
diff --git a/sys-firmware/vgabios/vgabios-0.7a-r1.ebuild b/sys-firmware/vgabios/vgabios-0.7a-r1.ebuild
new file mode 100644
index 000000000000..081c30ad69c8
--- /dev/null
+++ b/sys-firmware/vgabios/vgabios-0.7a-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+# Can't really call them backports when they're fixes that upstream
+# won't carry
+FIXES=1
+
+inherit eutils
+
+DESCRIPTION="VGA BIOS implementation"
+HOMEPAGE="http://www.nongnu.org/vgabios/"
+SRC_URI="https://savannah.gnu.org/download/${PN}/${P}.tgz
+	https://dev.gentoo.org/~cardoe/distfiles/${P}-fixes-${FIXES}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="binary debug"
+
+DEPEND="!binary? ( sys-devel/dev86 )"
+RDEPEND=""
+
+src_prepare() {
+	[[ -n ${FIXES} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	epatch_user
+}
+
+src_compile() {
+	if ! use binary ; then
+		emake clean # Necessary to clean up the pre-built pieces
+		emake biossums
+		emake
+	fi
+}
+
+src_install() {
+	insinto /usr/share/vgabios
+
+	# Stock VGABIOS
+	newins VGABIOS-lgpl-latest.bin vgabios.bin
+	use debug && newins VGABIOS-lgpl-latest.debug.bin vgabios.debug.bin
+
+	# Cirrus
+	newins VGABIOS-lgpl-latest.cirrus.bin vgabios-cirrus.bin
+	use debug && newins VGABIOS-lgpl-latest.cirrus.debug.bin \
+		vgabios-cirrus.debug.bin
+
+	if ! use binary ; then
+		# QXL
+		newins VGABIOS-lgpl-latest.qxl.bin vgabios-qxl.bin
+		use debug && newins VGABIOS-lgpl-latest.qxl.debug.bin \
+			vgabios-qxl.debug.bin
+
+		# Standard VGA
+		newins VGABIOS-lgpl-latest.stdvga.bin vgabios-stdvga.bin
+		use debug && newins VGABIOS-lgpl-latest.stdvga.debug.bin \
+			vgabios-stdvga.debug.bin
+
+		# VMWare
+		newins VGABIOS-lgpl-latest.vmware.bin vgabios-vmware.bin
+		use debug && newins VGABIOS-lgpl-latest.vmware.debug.bin \
+			vgabios-vmware.debug.bin
+	else
+		ewarn "USE=binary only includes default & cirrus bios builds"
+	fi
+}
diff --git a/sys-firmware/vgabios/vgabios-0.7a.ebuild b/sys-firmware/vgabios/vgabios-0.7a.ebuild
new file mode 100644
index 000000000000..0e794a42af95
--- /dev/null
+++ b/sys-firmware/vgabios/vgabios-0.7a.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+# Can't really call them backports when they're fixes that upstream
+# won't carry
+FIXES=1
+
+inherit eutils
+
+DESCRIPTION="VGA BIOS implementation"
+HOMEPAGE="http://www.nongnu.org/vgabios/"
+SRC_URI="https://savannah.gnu.org/download/${PN}/${P}.tgz
+	https://dev.gentoo.org/~cardoe/distfiles/${P}-fixes-${FIXES}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+DEPEND="amd64? ( sys-devel/dev86 )
+	x86? ( sys-devel/dev86 )"
+RDEPEND=""
+
+src_prepare() {
+	[[ -n ${FIXES} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	epatch_user
+}
+
+src_compile() {
+	if use amd64 || use x86 ; then
+		emake clean # Necessary to clean up the pre-built pieces
+		emake biossums
+		emake
+	fi
+}
+
+src_install() {
+	insinto /usr/share/vgabios
+
+	if use amd64 || use x86 ; then
+		# Stock VGABIOS
+		newins VGABIOS-lgpl-latest.bin vgabios.bin
+		use debug && newins VGABIOS-lgpl-latest.debug.bin vgabios.debug.bin
+
+		# Cirrus
+		newins VGABIOS-lgpl-latest.cirrus.bin vgabios-cirrus.bin
+		use debug && newins VGABIOS-lgpl-latest.cirrus.debug.bin \
+			vgabios-cirrus.debug.bin
+
+		# QXL
+		newins VGABIOS-lgpl-latest.qxl.bin vgabios-qxl.bin
+		use debug && newins VGABIOS-lgpl-latest.qxl.debug.bin \
+			vgabios-qxl.debug.bin
+
+		# Standard VGA
+		newins VGABIOS-lgpl-latest.stdvga.bin vgabios-stdvga.bin
+		use debug && newins VGABIOS-lgpl-latest.stdvga.debug.bin \
+			vgabios-stdvga.debug.bin
+
+		# VMWare
+		newins VGABIOS-lgpl-latest.vmware.bin vgabios-vmware.bin
+		use debug && newins VGABIOS-lgpl-latest.vmware.debug.bin \
+			vgabios-vmware.debug.bin
+	else
+		doins bins/*
+	fi
+}
diff --git a/sys-firmware/zd1201-firmware/Manifest b/sys-firmware/zd1201-firmware/Manifest
new file mode 100644
index 000000000000..84349399b487
--- /dev/null
+++ b/sys-firmware/zd1201-firmware/Manifest
@@ -0,0 +1,5 @@
+DIST zd1201-0.14-fw.tar.gz 86538 SHA256 56fd11578b0fc13947786fca0e1b4227f04b0f00cf190fd3d3bc4dd005ba4267 SHA512 4143966d386029d50b0cf54bb40f0636daac8f4696782f2cd7ec8924b80ed5d889b373817c662000fbbc8010d4bc81864d2381dd7e2242bf9cee0e0fb9d56fe9 WHIRLPOOL 14107b3469e7f84f934032e333351c17122e575a22fb0f131696a9dcbdb356f2cda04d143645e7a5f73f606491147350829d1938680ffdd90bf42af9b6ea31e6
+EBUILD zd1201-firmware-0.14.ebuild 525 SHA256 b513e46303d535181295a9e04975d8664099f6aad30b7e2c820b2a53e8ef4c35 SHA512 d73064984b49cae20436c1df2027c315f9d1bb42ed4860b1e6702c2f04c7c519d565fd4b6fb603b5430416a051134e1cd63d24c496c9d1497ebcbac062cb9be8 WHIRLPOOL 88dfa02537148cd1f6431083b448a7744bedf8919d64cc9df1dd424982162b810b78278cf6bb69cb0bee18798bad0c00a802a1b4579e2d1cfce21ed956156f5a
+MISC ChangeLog 2548 SHA256 5a1e0612f3a81501cbf246fe7e8d39173b1172b0fae1a6da4989455eadf4ee7f SHA512 c347acea5df7913d6c83b7802dc20c38e0dd865bae9b114faec4c6f790c9f2a6d49db0df4c6209c628aa77aec619aef2ef5574c4edd361dd52ebb1a4e4a2beb1 WHIRLPOOL 74601877b160d695b582abe905b64c1747524ca8e971c5aeed5af46fc3d1edf5a36d4ef72d4ca7b6077713676cf3856dc90d6c9dd7c9f679baa1cf768e7dcf85
+MISC ChangeLog-2015 2025 SHA256 3fbfc33f9af267aab938c60498443432cb88ccc99829d0380232d74726a89797 SHA512 e36c5b2e0225ec76b56b6b4a9211ce6709f7bfbea302b26a3859f319700a68babc50f006129f6237d44ab635549201e5df8402bb23aa5f6cfa51343d7a8bf60d WHIRLPOOL 5d5f4cfc847eef4d0b105891916a2f19227b6eb80d628bbff660aeaa935143d8881b713773f2c713313c100e550f2ffb28b2d0f9fa54d361ce0c0e9c21645658
+MISC metadata.xml 251 SHA256 26ac8d7e5de1aa0f96c400c890a1acad7820deafe93767b206b7c1dbb358599f SHA512 82313213a705d2066a3d48b68e6fcf7ac992c1238e8100977cd64963e87e8fb59a3fffe5238c00cca3c97ae459619a5a3558ad845bad17a185a69ca481584128 WHIRLPOOL a768fc01ce412739fc21c225f2d4c9bde2c190b4fbfed8449305b246674017fa6dcf4bee885b8bcc11a5437d01432b5e8655a50a9d940c85cc233e7f167d803f
diff --git a/sys-firmware/zd1201-firmware/metadata.xml b/sys-firmware/zd1201-firmware/metadata.xml
new file mode 100644
index 000000000000..e4a3f5ac9b0b
--- /dev/null
+++ b/sys-firmware/zd1201-firmware/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">linux-lc100020</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-firmware/zd1201-firmware/zd1201-firmware-0.14.ebuild b/sys-firmware/zd1201-firmware/zd1201-firmware-0.14.ebuild
new file mode 100644
index 000000000000..9ab402099c49
--- /dev/null
+++ b/sys-firmware/zd1201-firmware/zd1201-firmware-0.14.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_P=zd1201-${PV}-fw
+
+DESCRIPTION="Firmware for ZyDAS 1201 based USB 802.11b Network WiFi devices"
+HOMEPAGE="http://linux-lc100020.sourceforge.net/"
+SRC_URI="mirror://sourceforge/linux-lc100020/${MY_P}.tar.gz"
+
+LICENSE="|| ( GPL-3 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() { :; }
+
+src_install() {
+	insinto /lib/firmware
+	doins zd1201{,-ap}.fw
+	dodoc README
+}
diff --git a/sys-firmware/zd1211-firmware/Manifest b/sys-firmware/zd1211-firmware/Manifest
new file mode 100644
index 000000000000..4ebf8b76a2ee
--- /dev/null
+++ b/sys-firmware/zd1211-firmware/Manifest
@@ -0,0 +1,7 @@
+DIST zd1211-firmware-1.4.tar.bz2 39061 SHA256 866308f6f59f7075f075d4959dff2ede47735c751251fecd1496df1ba4d338e1 SHA512 210cf3438f2e3498cec06068020af7069d5c67469dbfc4c984c995cfc69192067184af2b04ee1f5642af25ab784c6b9a2e49f4fee3e2c144a5f88722e0462890 WHIRLPOOL 8621293f75346a57824ebb6b4265fe52cdcd06a3da5c8537c2553ca4a2b0322746a1b680aead15296efd4bd7cad96b5f22f3189d2ea14a0602bebfbe285974e1
+DIST zd1211-firmware-1.5.tar.bz2 38291 SHA256 f11d3810d7f72833997f634584a586dcced71a353f965abf81062ec431d02b12 SHA512 6a8d39318a8c136b2a780ebeb485a94bbb05fa12ad7104b707314e0108e49939b4dcd0035b19f07dac0ec7bdd12668ea281b48724e512b45ac5df9dedf035897 WHIRLPOOL 092665ecb88e2f0e7722cd2f8603d9de2ab75ca14361ce37515ea63804c0696ce36bc0ded24b18f31a6f74487d85cdabbe60c27186b0b31411aca13b3e6b8e6e
+EBUILD zd1211-firmware-1.4.ebuild 507 SHA256 ac9f181ce40dd056c1cc2352cff022eb2a6d69b322625a7c9270132ce95613fc SHA512 28b1df434c48622edea2755a4b5e1b893e2bea8c7b2141a4bb8d99fcff7dec93535839c2177f4890449053550854d18d8349048eed4bbfa7ea2f44f83ad396d7 WHIRLPOOL d7668e209a9661ed3e9bfa51fe86518ac0c20c4cd61b7594c31ff81da89fbe497ffb19c6024969f4a4c535e5eb45971a3463c912d87feb5a711d90a5c57c5e7f
+EBUILD zd1211-firmware-1.5.ebuild 512 SHA256 544f141c61de013b23d67dcf69d1995ce16ba95ec777c47397e1ba9bdd556b1c SHA512 66c775904ec965991775d06db18970ef07c1be0ca30eb3214679906045175559a31c447a01ea33b5beaf276da2047a234769e4e5462ee723f110ef28cdd6fb75 WHIRLPOOL 25daba6b9be77b92106600bc02978efea9fbc281299ad83b77c0e7db3a4375706b87eee3578677ba8538108f81e31373f52402bafa4aed4b19596e0c25c9804f
+MISC ChangeLog 2728 SHA256 eab6c890cd3515b687309353f2eebad6fb8cb8e6b02397b0c939f508fb7267b0 SHA512 68f42700f0aa9a96666ce137b62e4f36b505f8c338211c27024e3cb91dd00599abc726d517788acf6ad3472a48c50d3b641acb885eff123a64523804d4939451 WHIRLPOOL a6e3a7276e4380c94ce0ab76cf3c5201c0fb40d8a051624f1d96d940e1ea2a0968d877e6bbdd18b50b9eed032b11f189e61e1a29a78db83f1aa2b6dbe484450e
+MISC ChangeLog-2015 2897 SHA256 ec1d1763556c9059319d36d866e0781999bf20bef6caeca5a455ef2ec78a3d69 SHA512 99f4a2e8ff93159629669ec435ed89fc4d352b2a9e04a44cfd1f87b724d97a02bfd3b9ae1af670eb671d6cc31cea56760ae1e074c246890e4b9153614bc028ce WHIRLPOOL 1273fca217a46f4fde416b32bfbdeaa0455bcc5e668df7dd1a05865297fac97be5e43a6ec2e34b5385405c10cd4677aec8b191ffe2f3db5633f8974d51e40462
+MISC metadata.xml 243 SHA256 e8ab84e3a6c70b12bcc87da91793c4219a884af8a5323ec4ab498e09dcc45ae3 SHA512 52111ad6928aee42b8487e3cc31fef47928589755f6265d333d6fe925cf5d66e9a55f0ae8274d436ee7c965ba041381383d2005c093e39d9934872b46d2d827b WHIRLPOOL 0942f91cf3b9d872ca2c6f4ffaa43a31985fb9fa025366ed4bb3a2c0e00d854460d61cab3e06d0ba34f28ed7839079d4f804d9c4a2cc9a3e21799d728c591dfa
diff --git a/sys-firmware/zd1211-firmware/metadata.xml b/sys-firmware/zd1211-firmware/metadata.xml
new file mode 100644
index 000000000000..07af016b89c8
--- /dev/null
+++ b/sys-firmware/zd1211-firmware/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">zd1211</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-firmware/zd1211-firmware/zd1211-firmware-1.4.ebuild b/sys-firmware/zd1211-firmware/zd1211-firmware-1.4.ebuild
new file mode 100644
index 000000000000..00f0d3bc462c
--- /dev/null
+++ b/sys-firmware/zd1211-firmware/zd1211-firmware-1.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Firmware for ZyDAS ZD1211 USB-WLAN devices supported by the zd1211rw driver"
+HOMEPAGE="http://zd1211.ath.cx/wiki/DriverRewrite"
+SRC_URI="mirror://sourceforge/zd1211/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+src_install() {
+	insinto /lib/firmware/zd1211
+	doins zd1211_u{b,r,phr} zd1211b_u{b,r,phr}
+	dodoc README
+}
diff --git a/sys-firmware/zd1211-firmware/zd1211-firmware-1.5.ebuild b/sys-firmware/zd1211-firmware/zd1211-firmware-1.5.ebuild
new file mode 100644
index 000000000000..fd8ff1925c21
--- /dev/null
+++ b/sys-firmware/zd1211-firmware/zd1211-firmware-1.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Firmware for ZyDAS ZD1211 USB-WLAN devices supported by the zd1211rw driver"
+HOMEPAGE="https://sourceforge.net/projects/zd1211/"
+SRC_URI="mirror://sourceforge/zd1211/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+src_install() {
+	insinto /lib/firmware/zd1211
+	doins zd1211_u{b,r,phr} zd1211b_u{b,r,phr}
+	dodoc README
+}