gentoo resync : 30.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-30 17:27:54 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-30 17:27:54 +0100
commit: f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 (patch)
tree: e907cb121b30e3c1df1710719c0ddf4029597a47 /sys-firmware
parent: db063b515939ab15261136b24e4bc44386335c0c (diff)
31 files changed, 16 insertions, 1157 deletions
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 968da183cf47..3668460d06c4 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/iwl3160-7260-bt-ucode/Manifest b/sys-firmware/iwl3160-7260-bt-ucode/Manifest
index b46c275f32d3..44199165574a 100644
--- a/sys-firmware/iwl3160-7260-bt-ucode/Manifest
+++ b/sys-firmware/iwl3160-7260-bt-ucode/Manifest
@@ -1,7 +1,3 @@
-DIST iwl3160-7260-bt-ucode-37.8.10.tgz 21750 BLAKE2B 8f4f845f56cb5b6dd6df8f913e4f01fcbbea5b281020bb14200b4e18e6fce03a88dcaa1e716ae43340d945879215a9e8884edcad57d15039240a215c60280096 SHA512 a0f81382cd7ce9077e8efd75566220a3b2ab0077897ce2d292091f6942b12832819335fe53d007a06797d0f79ef18463282b714e8a148dcc57898313e8f627ba
-DIST iwl3160-7260-bt-ucode-37.8.10_p1.tgz 51854 BLAKE2B 31da77a41e68c1866695393b90fa98a585f3422a99380bba6a4fa8b3d19b513962309e3e2b6547e673a8012ac5d29180799a9740b78a20aec3e46dd8be388717 SHA512 84bcaad82db9588d41ab446c2c5ff9c3f323c15b8dc6b627317edafc80c5ac5c0290a8eea9b5cb5ceafa817d398fb957385cddd715787e3abfb598cf3392774c
 DIST iwl3160-7260-bt-ucode-37.8.10_p2.tgz 78372 BLAKE2B 5abb7abc130ebe93527b4d3d364488bfebe4c9ad005c5173e4a27db5bf880c3af97b451825b5ac972ec89bbab25f127e2e8f15501fcfd96b679868a21154f888 SHA512 73399fcfd58972b9099cad6014f686f74ed4aedc2278d1389d1e815fb08d2af43f3f6defa70d409ecc0b388fba0710dc8fe26627d3149c79db8e8792576047e5
-EBUILD iwl3160-7260-bt-ucode-37.8.10.ebuild 1118 BLAKE2B 8ade3a5e4b83576f439189342aa227a58286fdcc714758e8498b313e76686f1d6674ddca11d3c69dd8446433bce4a3fe1751effec011804e42021962f4bdac43 SHA512 00f245f1d4d8521ad956c3012b666ec2acc0c777eae46ecd4f55e24d78fcd13f1c18665eeedc1e9874241192c796502e1aaef70748a011f47a684f9ffa0a8d4c
-EBUILD iwl3160-7260-bt-ucode-37.8.10_p1.ebuild 1215 BLAKE2B acd623428e8704fc78bd171ca864528f141556d553735d2805df2d530093a1ea197358f0dbd8e2d57cfa6f32ebe584fc8c6acbb300d4e77344059f2bd4592647 SHA512 7755a25451b40d7002741d4af9457a5396ba10cd05d184d060dd7d851492b728110e1e8a9dd82fdb96c3824593832e20b2a963069845a1aa75a47a2836256b5b
 EBUILD iwl3160-7260-bt-ucode-37.8.10_p2.ebuild 880 BLAKE2B d6fc678bb8003adbd64f4cadb02eb2f0a35b8d1690d4bc2232169040eaf2880a27a16c4c59ceb2c2556e35f8619e32279b9be8a6b4fa381ab1e533d6e75b5275 SHA512 0c39890cae8eec956ed0e5200bfef73ba7841fa517332261668f382ea7752bc6b16af8a86d9cde1824f0808c1dd5ff8a5db7d55366134a1542a98a2de8a6c457
 MISC metadata.xml 411 BLAKE2B 8d226427ccf5f4c90c44b4dd781eb13755d21fdc6b3c62de20866f0837d1c89b64ec0ce20b597a431ed0a9113fade7901c3595c2fb7e33b54faa490be2f750b8 SHA512 76b5dccc04fe0168ac05439b3733e5cdc3b43447f62ad3685aea9ea0d038bd1fa5b93503e96b9c01cebe9f1ad2d2cb473d917c91dbccc216dec072524e86bcbd
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
deleted file mode 100644
index 1f5af2dc2a4c..000000000000
--- a/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.8.10.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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
deleted file mode 100644
index e5e83ddbeba5..000000000000
--- a/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.8.10_p1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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-ucode/Manifest b/sys-firmware/iwl3160-ucode/Manifest
index 35525a22cb36..e91e7ca540c0 100644
--- a/sys-firmware/iwl3160-ucode/Manifest
+++ b/sys-firmware/iwl3160-ucode/Manifest
@@ -1,25 +1,3 @@
-DIST iwl3160-ucode-0.10.11.23.tgz 334243 BLAKE2B 943ffa85e7c2d88042030d777f3cbc4865d72a8f3da3d1c0ac0f93b51f1ef1d89f0c2d4438841057145b219313ddd0d272badca0951b5ad77ab4ff2ea23c6271 SHA512 14aeedd0e7069d5f65d388f36b7d30bb0e3f90c2c721a582e761aa2a27402f6ad8616dd07c44812b8e62bfa0c6eabb57adae71aa2a48053cf85757fbb6548432
-DIST iwl3160-ucode-0.10.15.23.tgz 335313 BLAKE2B 45d1ae3c5ec7ec1b1654e166b671f540aca32ec9aafecbef57ad72af354ceb9e36f1e2109370964f0faa5a8c7ab409522f807097c58fc2ebc20de0c5263a5875 SHA512 a939cba5dbfb73c3178844e6045d0c6b70e75df4bb1bdfc6a3ce34c82de2521f598fbb402ebd4961fbab8e33878172f156e4641c9e02566f7ab754087d857b9b
-DIST iwl3160-ucode-0.12.16.25.tgz 337890 BLAKE2B 934b827128fe7dd0b259c273b92d4ff9cbf9ff6742cf7c21510cef17503394c507fac84719dd7ee17db77be69f4ac8bcb1a0d01a51ce76e65d1b777385b8bbec SHA512 247906e813e5fc49889a02532cc5813f204ccdeaa9600f856d66904e3491471e9a881daffed4ed1e08f8cae14238802773c0820785d05a90406bd9f2f8df31dd
-DIST iwl3160-ucode-0.12.17.25.tgz 337993 BLAKE2B 50805d72af71efa8ba08ffc21d9ad4637aae16402ffdf66511a5251adb83b11cdff5d463f729ea09b2b5febbed2fe944995dbe98cbdfb655fd54ec43adc1576b SHA512 d3095fccac0273205272906f1762d0e205725234083cc9fbb3d30184135690cdd7b095460becf26bb2355c878caf6e3a92aa2a398c8cb07a8115ae279bec0776
-DIST iwl3160-ucode-0.13.30.25.tgz 336262 BLAKE2B 5d888bf9068db868c235b2ef52a8dd309e4c74eb64f0d33c0d75a679fcd349223e4b3060372fbf3e50fe5b72cbe3113902c45d601de36e0ef9e89155e4916006 SHA512 209c810252bdbee729ba3f3b314b428d255f254b41dd931368e7a4dd6d027b9bdeb42d80325ecbcd58032300590276bb220a84dec3cbdbbfcd957638a1f71e97
-DIST iwl3160-ucode-0.15.227938.tgz 467773 BLAKE2B cb7ace7b987970708bd35ee06cfc6d3317ef16e5aa700458235f7123cb0af7d63935247750890b671077a09975dd742d49e73e58454b97f49539a8de8fbe4c00 SHA512 88ad510667adf3895b1906e51373cda420cde2165b37cff72ffbe0d159eeb82de60ab3741e16437384e9db4b245d0a927be680fcb9f784af425f0554ee039798
 DIST iwl3160-ucode-0.16.242414.tgz 467156 BLAKE2B 47a94667cfdc5a9409073e866f750b7c3edefe42539ab1b4f7ac432e2dc74a8a5c0cf45bad5febb1ed165b74dc2af1319b088c751bde69cd5c64812ffd5f43f7 SHA512 ca0f675ebddb92c936df6bf412fdd1a41a33426636c3c40881251dfdd8b6527bc03d03b73b10dfb6fcc23676d1d51c372ac406f9554baf7f4ac36c9bd302b79d
-DIST iwl3160-ucode-0.7.1.22.tgz 332285 BLAKE2B 1da1fed388bf95cfe11874920b59d8ea30d7cc46b0908e87a1ca9bdc325d091c50579a943d0b1fab10f552d191c5900e6b0a3ddf5353aaf7f9d74815a9c68275 SHA512 5f379edc87d0cb743bd91cecd5a1879edfd18033c02d29269ea55e046663fa47c3363a19441d0edb52ea99c58e757c81872545c8ece634459675d927f46a4392
-DIST iwl3160-ucode-0.8.15.22.tgz 328351 BLAKE2B 77d380a7c53ca56999dc3bd387e69c948dc308cba1fa53eae1155ed56806de5b2c10cc89cc6db69057c6e36e0e6321061bbd36503ef0937043d55625c1229cd7 SHA512 33e8842068c285bd62cd58629855c4be82a5b19129bcaefc4ac622245562085ec4ae155dba719937f71767d3f26e0d309553c9362fe7995943f2e95a9bc5d1fd
-DIST iwl3160-ucode-0.8.24.22.tgz 334306 BLAKE2B 5bc48bd0465fb5a024afb223f396f5d2dd0268faabec82653dd0ada982ff32cf7401cc526d7587fb092483379bbc9613347be34db318c4ba072b6ac942dca6b7 SHA512 afa9d1c081f21ec8cb3d427be79475853c9f078fb4f3d60ada154df0c58fe3dec4655dc2f54095dc395cf064563e0de9f69d55478b28ee07b7f19c0b93fb6097
-DIST iwl3160-ucode-0.9.214.23.tgz 335384 BLAKE2B 300f167a528c80f52b22cd163d8a70344dab3db58798d439424ad6a2e629c1859b47c0c6f55b0437f4f566b6ad48f1bd4f37d84e1bb250d36ac1a6dd8d4d82c8 SHA512 93812c6de01ba97da7192f53b33e6c4dca94a5ea2e29b519b47af3bf1f19b41cc1638b6ba92015c4faf840bf4abe8a2abfd6cff1a76557ff93024e095d246f16
-DIST iwl3160-ucode-0.9.228.25.tgz 337276 BLAKE2B d2f8dd3d6b9d5a93c589c5432d2cb4b6185ec9891fc88e3244c01c933a5e713bca9c9f7b5ef3ac360b4a8277d759758d0985c8532c4c450e3f65f2686bccf090 SHA512 95f1d3bddbb05d32a66250c6e714d74b17902b8f6d9451a5107cf2d061f1cdf90dfb3cf8b0375f6104dfb2fe1bc201dab8baa1c6bdffda944aa5fe8aad568a16
-EBUILD iwl3160-ucode-0.10.11.23.ebuild 1416 BLAKE2B f73deb8ab38d5a56ca173f017fe5cc1cafa8f1130068b65a885e5907825bc483e7b7f43787642f489a4751799d84bf2a08039f67f854f57a665814a599bbd7ee SHA512 e53c69c405039553ec1bd015ea77c5fac9595dd423030c89eb2daddf969dad9e06e61239c7d2eee3e6b55f75d934a3ab6e926387f1cb27994b0c1c4acb2d18bb
-EBUILD iwl3160-ucode-0.10.15.23.ebuild 1388 BLAKE2B 6b170d54ed0755266d20f9c0e3289c5af27269789d322704819acc4a8c701d6e7dc6965f6dd06c585ac0fc0c243c4d4f48b602e1ac07b4f34692941dafa86dcc SHA512 a6a663d14131755f3b0e3c5d4d7a40b255b1eb912ac45017f5e122febf5bac41e4213d0154ea3d22076ff65a58aff17dd4a4c10b3b344e20f16a202c4ef38f11
-EBUILD iwl3160-ucode-0.12.16.25.ebuild 1388 BLAKE2B a549c0fce33d3feab03446a7c86fa2d9901d5624243869317337be01f36889d0c09153cfe9023982f7894f79f56304c84d368e2e7e0d319c14d35364b81fc62f SHA512 a32ff0461b51d873f4e7c214f4ec0cc6131bc856486068f8741c4a2e023a6faf474db2a66ed074c5f44e4cc0458a4590555c71c26867153891d5a3360ea32ba9
-EBUILD iwl3160-ucode-0.12.17.25.ebuild 1388 BLAKE2B c64a8af09f36d5b421461d74c7fb2df3f8fcfd9036edf737eb9505150318ffcce55924d43c4ff7cff942cc92f8c8f13c4bcfae05ca96eebbd26f521def683de5 SHA512 a4cf54bc50795849cbf4a7e326d70b067681dca07f002a0bd14394b3a4d1804c64557c3ef4ab7aaf02fe2b507710235eb46a77f45751095ee57a36faff43d6da
-EBUILD iwl3160-ucode-0.13.30.25.ebuild 1387 BLAKE2B 781cc6359708df7f8519cabec036c1f0171469259781b150ed7324027bb3baeffc8243012ab957895d1756dc38c1064e1dc586973584206a2fc19a5402f50b43 SHA512 97b1927b5153b7eb62b074ae2f3ac1b9f77fbb96dbd19d147d6373db808ac82b11d2f3cc2540fe787d9c24e52f62710a47f4ff391ea4129b88f5c3e665060ab6
-EBUILD iwl3160-ucode-0.15.227938.ebuild 1378 BLAKE2B 8af147d4b521d8046fa4695b9b32e3b7b931060f92317645316efb5227d3d8fca7ed80f9ce4dd527cc162898f8b871d7fd76e52ca2d1b44489b36f43e2ec0e2b SHA512 8cd5c32adcac6346835952a23d18f08ee4cac7d2eb1d3eff05dd5c03720a4a559857b80847f8f803320e0a65a1591a99cc55cac1a47050adc14c69d850cbd598
 EBUILD iwl3160-ucode-0.16.242414.ebuild 1378 BLAKE2B a1d43fb4c278ad25674cb5adad899c6dccb7ef4c410ee1537dddbd4a2e139ea754d88e55df8bc7fcdd561ac790bb683200161f06bd7fa9f951050d0fd7ca6c87 SHA512 2f149bf9cd37e79a7dfcca8388b4874187432e0459a40acd980d71ca1203864e10014c9a279a1fa18425b404be0a1531799198c21157312d256fae2f6112df49
-EBUILD iwl3160-ucode-0.7.1.22.ebuild 1318 BLAKE2B 5982ca2b3f6a67561e88d309bb71a04b6714333835d704a90a64fe7904c167e9e88c7532d69db56532de3d67fc5437b38f4497849e69487c769f377fe083d0ff SHA512 2306080d402e972475f95ceb470d8bc0846cb6aa736d695cd3195bff0977e9995252b67b06045c26b2e5e2142f384367279e4e2d7003135fbafaf4125994a007
-EBUILD iwl3160-ucode-0.8.15.22.ebuild 1415 BLAKE2B 8666dac12d3f59c71eb8f864bbeae90266b3fe4e1166aac5cca999dd4320a7e78da5f6650730d850d63ef0f8f29e50e2006d700056419877a5f3b78a469047eb SHA512 dcf57cc976da6ee56c7c15dc884fe140f238d4974ea4611301befc41389379182e42681049c777bc22c7bf3c9b6e6f4cd82b0f6997d026a4f30461b3e15d5e05
-EBUILD iwl3160-ucode-0.8.24.22.ebuild 1416 BLAKE2B 3296571ef002995edfe93bc14275ea033732a839021bfb9d54a6dc8a9f3be2fc630406b53af8a7d401b74dd9b9a0e7c815ec4664384b523ceead114b37d8ae33 SHA512 59a576991e3729a3cafc957c6900c213086f599e8b811942416429510b2d4f736ecdc894c76e90f27894f2d95ffc3b7f120e413da4d3f91980cecd66f9c98f2b
-EBUILD iwl3160-ucode-0.9.214.23.ebuild 1415 BLAKE2B 7ff07b3ff1179664d2c529e80e8ddb830f303c313373bccc032f9887d4eb06443bdc6b2a076fb974111e6c10a32f9014391a7ddfb93d995bc49eddd7f8ba6d71 SHA512 96a3ef296bf1e8c19a34d857efafb95183bb4c08ddef3030a5d0bfe1c8edb48c03279fde07a41e237b681fc0f91e7e4a6e35d5846e5d4047721c901ca0bab855
-EBUILD iwl3160-ucode-0.9.228.25.ebuild 1416 BLAKE2B 9bfa96af6c5e0024f7a4b607c44af2538bb9bc9b12e9b25c06fb2bd4364186528f0cf68f7bc4ccc66171b78c2df7a46363b96c89c0c4938ee64a7eed4c1b2ac0 SHA512 31f49222fca10e96c9c4db79030b75a30b6f3418f98a6a3aadd8d6e4d93a3f5fcc0bbfefc2faac51b3c278c2b3700a0ebf2902ff9175e1cd055fca4d99143409
 MISC metadata.xml 412 BLAKE2B 4c048426b26056e52471f5e3abce5180fd0c892446b257f27cdf361742b30a17cbd0a8ec968550317f3c0ea17510c8debaf7e8233677b7cb8755253680cac857 SHA512 e4ea06015128a5119d7a836e9f9c40d5a34420b9614d3b12d43fab96de9f1b02a1c5ebf1833da05277b8099142488f062749249a60224f305313e4a1a2e59070
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
deleted file mode 100644
index b7b57b49d435..000000000000
--- a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.10.11.23.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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
deleted file mode 100644
index 84397cd3d807..000000000000
--- a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.10.15.23.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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
deleted file mode 100644
index c8229ccdc4d5..000000000000
--- a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.12.16.25.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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
deleted file mode 100644
index 4663a5372b54..000000000000
--- a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.12.17.25.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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
deleted file mode 100644
index 831ef0a387b1..000000000000
--- a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.13.30.25.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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
deleted file mode 100644
index 15801434dea4..000000000000
--- a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.15.227938.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.7.1.22.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.7.1.22.ebuild
deleted file mode 100644
index bda121aa6cff..000000000000
--- a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.7.1.22.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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
deleted file mode 100644
index e3858dadf676..000000000000
--- a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.8.15.22.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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
deleted file mode 100644
index 4b7654a4243b..000000000000
--- a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.8.24.22.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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
deleted file mode 100644
index a36858a66a93..000000000000
--- a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.9.214.23.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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
deleted file mode 100644
index 16e8b7de50d8..000000000000
--- a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.9.228.25.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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/iwl7260-ucode/Manifest b/sys-firmware/iwl7260-ucode/Manifest
index c749e1c53eaf..c1faea58fd21 100644
--- a/sys-firmware/iwl7260-ucode/Manifest
+++ b/sys-firmware/iwl7260-ucode/Manifest
@@ -1,25 +1,3 @@
-DIST iwl7260-ucode-0.10.11.23.tgz 347295 BLAKE2B 27c4d991c14e29d33d856571daed7c7dafb07e9e8bb62facaad071c5fdcd93005399685913592b37f1d32815b5634bffa3630876868d7c5cab1cbb72ccc48428 SHA512 8e8e14be7e2f3f97a40bcfa16065d55418e42c10d7e4987b956a55775a8b0dfe75127296b97e6bcb9becf53133cd3f052e2691c05421804b6d3e11fc951d1a6f
-DIST iwl7260-ucode-0.10.15.23.tgz 348549 BLAKE2B 5cf945f980f43d850f7af7287b3e564735770c7491d4b2438ea57e5e28889c2de8c0c4f57390df7a7a58956f14f9cc6a5bd1464d73aa3cdc01ffd1ed43690904 SHA512 a40efc2610a981b1e0de2a88d16afa760f5bcb116987034769a1a9adcc716b1ea84103e9a7c372172e98690e729c4d6e34b5857e2c9097439184b3b473f168a8
-DIST iwl7260-ucode-0.12.16.25.tgz 353537 BLAKE2B 716c3e7a54e301ba840d48445823599c10107ea0cd7eea7ebb4f6df364a483572f1fd7fa939f5c4577c277d8c40de2e88afce84dd1568b367118933e9efd80ea SHA512 efedee8f6d4078865b45962a8297c6c1022504653360ee6a23cc7f1eb4cfb1a34c5ee6685cf9819a61f439d445579e1eb14da84f3e28bcf45f89a5a66fbdfa07
-DIST iwl7260-ucode-0.12.17.25.tgz 353588 BLAKE2B cb3bb173e2ae68e1d8974b6399d66964940a3d247f6c32a400a0915df0e2ffe0bbfea7944e09bf5db52a43a7e7e4674b56ce6cce516c064c6e8b66ca8ea67474 SHA512 d43a278aa6f96599649991c6dd4b5cda1833d2eabecd00e4b894a4edeffa9dbd15e2e85ad656d4083dc20e314a2b473e40379a3ac88ad9d72a5ed1f7e1df6bfe
-DIST iwl7260-ucode-0.13.30.25.tgz 352035 BLAKE2B c4f91dc495528108313d678f9143389f2c87c245669d4d8b710c678805f27c639601c196c7e19b4e30759c0bc89a7a0024e75eb504a9c1999ddf4ae16381dcf7 SHA512 11fa74f97d658f0396aed081c9d2eb13580ce6dd5278876411ed7c972b9aa1304552924e70cc5dd4768c0605cf3359b8678837052ce0a7d21e722a2198c44223
-DIST iwl7260-ucode-0.15.227938.tgz 493590 BLAKE2B 2a02c2623301e930130235c0526bec8f26d8d5405705ba7a7bb810ecb7d25b07cae126da966385969785d9f2255b6f6159670d6bdd2097f4425300fb4bdc254d SHA512 44e17c425be6c354983e80d6681c459c36b278c18ad12325675abbd8f94d1f1f3b4ea9961d26a7396e1e8a42ebc36ecfba80d20fd75fab9ba1669d0c8ecc0c8d
 DIST iwl7260-ucode-0.16.242414.tgz 494594 BLAKE2B b1dc80d923eca6046750d0858f19598473ac7c0d0155e98ecc0080fa61825366d17a2e4985031908548667ce17c8ee3f4b6683d10d53e532385c86c6f9dc84fc SHA512 8abfa4141a390a733ea6a43fe7d8d8874752b84a42a5be0a93ed7935f2f76241af41d48f2911393837a32aaf0230f1b1ee9984488e60f447c29794c0e60cd0bb
-DIST iwl7260-ucode-0.7.1.22.tgz 341956 BLAKE2B 3d33d7c4708a78299d1f3aeaaeba1517d76c14d82e626cde511ba297430b16168e14d4da511d885bc89cd316b04a2219bf24c3cf64a293eeacc839f31e1538ec SHA512 c6ae43ec84e5d0df85b6fc1962c5d6052be9352e453b53807a3c45eebc334892dae51c84a053fd197afa66a77bac5b5c349de8d566c071f15f2e76c370a36880
-DIST iwl7260-ucode-0.8.15.22.tgz 342953 BLAKE2B 622e44866d5b8634176eacefe2f59ffed190dbe6dd8d54b1a87b1d6aea7284bf1ff5f25de5aab57b719c32540de8324544bc3b82381ad4204ce634de3549fe7c SHA512 7f6105c547dde559280444e1d729928c33d55ca4f5df1036d40ced735d7863277f2291a27c36ac544bb0c4278883b345be087268124d22af85155b0b4a57bb96
-DIST iwl7260-ucode-0.8.24.22.tgz 346691 BLAKE2B 6993d1942a4dd6f242c9f9c8a921dc1e715bc75924561c0e1123f51e4c983529cd865507096bcc8373d565aebc51002051ef9ae47c9006bf4109728f98f93f33 SHA512 a8a81030bdec074b6370a6bb7f3b22fd8389b76c00b9b27902acfb34be2263662adf5b7eee6e8817c22dead54528607ccb93194073bd509191561a15ce88a3e8
-DIST iwl7260-ucode-0.9.214.23.tgz 347695 BLAKE2B 63a019ab33082c933044192c9787986acb0005c98d6a240d45364dd58b8f4dc4abd779757a2d010fe7044d512db9f9c00e1091b6ae131151a78caa2e91c9c8b8 SHA512 d3ffaacc2827d088cbc1086b4d736e158dafde981e10a01442ede3003f8ccc66bb7ca6ca62c4f3c03fce4cc3cba56141c9144024ecfdaaf52ea3c7cdfbdbf074
-DIST iwl7260-ucode-0.9.228.25.tgz 348138 BLAKE2B 3955688a5309e3ff00083592f6dcc76c0c1a331edd04c974548f2a5717846f144d6abd82be87cd9112e4ee90e4480e9ec8a9e1e1be2d5257b68eebcda34a7ed7 SHA512 f2d6d5fa859e0f7680f695e6ae4fe2c2a56eb7dd26430b61520f7ab95322601bceafff33038945bbf07c8e6691b9a19cd5a5e7ae3e349bd89b72d11d09a9bfdc
-EBUILD iwl7260-ucode-0.10.11.23.ebuild 1416 BLAKE2B f73deb8ab38d5a56ca173f017fe5cc1cafa8f1130068b65a885e5907825bc483e7b7f43787642f489a4751799d84bf2a08039f67f854f57a665814a599bbd7ee SHA512 e53c69c405039553ec1bd015ea77c5fac9595dd423030c89eb2daddf969dad9e06e61239c7d2eee3e6b55f75d934a3ab6e926387f1cb27994b0c1c4acb2d18bb
-EBUILD iwl7260-ucode-0.10.15.23.ebuild 1388 BLAKE2B 6b170d54ed0755266d20f9c0e3289c5af27269789d322704819acc4a8c701d6e7dc6965f6dd06c585ac0fc0c243c4d4f48b602e1ac07b4f34692941dafa86dcc SHA512 a6a663d14131755f3b0e3c5d4d7a40b255b1eb912ac45017f5e122febf5bac41e4213d0154ea3d22076ff65a58aff17dd4a4c10b3b344e20f16a202c4ef38f11
-EBUILD iwl7260-ucode-0.12.16.25.ebuild 1388 BLAKE2B a549c0fce33d3feab03446a7c86fa2d9901d5624243869317337be01f36889d0c09153cfe9023982f7894f79f56304c84d368e2e7e0d319c14d35364b81fc62f SHA512 a32ff0461b51d873f4e7c214f4ec0cc6131bc856486068f8741c4a2e023a6faf474db2a66ed074c5f44e4cc0458a4590555c71c26867153891d5a3360ea32ba9
-EBUILD iwl7260-ucode-0.12.17.25.ebuild 1388 BLAKE2B c64a8af09f36d5b421461d74c7fb2df3f8fcfd9036edf737eb9505150318ffcce55924d43c4ff7cff942cc92f8c8f13c4bcfae05ca96eebbd26f521def683de5 SHA512 a4cf54bc50795849cbf4a7e326d70b067681dca07f002a0bd14394b3a4d1804c64557c3ef4ab7aaf02fe2b507710235eb46a77f45751095ee57a36faff43d6da
-EBUILD iwl7260-ucode-0.13.30.25.ebuild 1387 BLAKE2B 781cc6359708df7f8519cabec036c1f0171469259781b150ed7324027bb3baeffc8243012ab957895d1756dc38c1064e1dc586973584206a2fc19a5402f50b43 SHA512 97b1927b5153b7eb62b074ae2f3ac1b9f77fbb96dbd19d147d6373db808ac82b11d2f3cc2540fe787d9c24e52f62710a47f4ff391ea4129b88f5c3e665060ab6
-EBUILD iwl7260-ucode-0.15.227938.ebuild 1378 BLAKE2B 8af147d4b521d8046fa4695b9b32e3b7b931060f92317645316efb5227d3d8fca7ed80f9ce4dd527cc162898f8b871d7fd76e52ca2d1b44489b36f43e2ec0e2b SHA512 8cd5c32adcac6346835952a23d18f08ee4cac7d2eb1d3eff05dd5c03720a4a559857b80847f8f803320e0a65a1591a99cc55cac1a47050adc14c69d850cbd598
 EBUILD iwl7260-ucode-0.16.242414.ebuild 1378 BLAKE2B a1d43fb4c278ad25674cb5adad899c6dccb7ef4c410ee1537dddbd4a2e139ea754d88e55df8bc7fcdd561ac790bb683200161f06bd7fa9f951050d0fd7ca6c87 SHA512 2f149bf9cd37e79a7dfcca8388b4874187432e0459a40acd980d71ca1203864e10014c9a279a1fa18425b404be0a1531799198c21157312d256fae2f6112df49
-EBUILD iwl7260-ucode-0.7.1.22.ebuild 1319 BLAKE2B 6a50e35b3d7fb7079244bda8c69ea6e2c848eb397edcb1ad0b6589e8ded1c9b17e67270cd9faf476b10ed8de222500b0246b136befbcf2fee4f339080cd9bfb1 SHA512 1a9f5ef2f11d861b8252684012b5f7752c9f37453454562bc06cdec5251ca5d661aae5945191a0ac1b42ef09e16da1cdea59d763c598db167732c84f23079627
-EBUILD iwl7260-ucode-0.8.15.22.ebuild 1416 BLAKE2B 3296571ef002995edfe93bc14275ea033732a839021bfb9d54a6dc8a9f3be2fc630406b53af8a7d401b74dd9b9a0e7c815ec4664384b523ceead114b37d8ae33 SHA512 59a576991e3729a3cafc957c6900c213086f599e8b811942416429510b2d4f736ecdc894c76e90f27894f2d95ffc3b7f120e413da4d3f91980cecd66f9c98f2b
-EBUILD iwl7260-ucode-0.8.24.22.ebuild 1416 BLAKE2B 3296571ef002995edfe93bc14275ea033732a839021bfb9d54a6dc8a9f3be2fc630406b53af8a7d401b74dd9b9a0e7c815ec4664384b523ceead114b37d8ae33 SHA512 59a576991e3729a3cafc957c6900c213086f599e8b811942416429510b2d4f736ecdc894c76e90f27894f2d95ffc3b7f120e413da4d3f91980cecd66f9c98f2b
-EBUILD iwl7260-ucode-0.9.214.23.ebuild 1416 BLAKE2B 33e69632e2331ea8381eb9c297cd993c70fee852ff3016c9c6603c8b299ba4ad065c2a3f084e3155fd186b1845353910ca4ac97b5dbf17319e3e9245907c7434 SHA512 245d095fd3bcff3abd58d021e58f03fe5aa31c4c01413e07f28002def29a47d6d820221e5a0355b9a99f66e48296f662813a747b6e4e5fc29761dfd4bd579d7d
-EBUILD iwl7260-ucode-0.9.228.25.ebuild 1375 BLAKE2B 81d9e2371189821832676d8dbbe7a47bdb58b35e614eedf23662953cd5e401f4db0325e7d4855cfaf7df51b3ec945c569d910d09aaacfb891d90c7639f936f1e SHA512 69a7dd51f6aac8815136d8ffef8c2442297eb880a8ea766cc48f9079982cc9304e7db1f08bc7ecd1165cc2a7e2e14f6fd09fc742421092d27792f60e7ad34162
 MISC metadata.xml 412 BLAKE2B ca9792310edbc641b6e6aa083bd83e117fe6f276d72ee9cd1fea3b4c2917c97466f69361c3b7783e6b0348d6a73809414998001edb125f6beb5aef8d4687e859 SHA512 87df5e498b2fbc9e6dd2826285935bd440733e7efb2fbd627593a8f15a02b7ea4456fffb2d4a39ed37ab3125ffe25ed59208b9d3621f0afb908aefee567e9c46
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
deleted file mode 100644
index b7b57b49d435..000000000000
--- a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.10.11.23.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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
deleted file mode 100644
index 84397cd3d807..000000000000
--- a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.10.15.23.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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
deleted file mode 100644
index c8229ccdc4d5..000000000000
--- a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.12.16.25.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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
deleted file mode 100644
index 4663a5372b54..000000000000
--- a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.12.17.25.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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
deleted file mode 100644
index 831ef0a387b1..000000000000
--- a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.13.30.25.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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
deleted file mode 100644
index 15801434dea4..000000000000
--- a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.15.227938.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.7.1.22.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.7.1.22.ebuild
deleted file mode 100644
index ac3f78071b7a..000000000000
--- a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.7.1.22.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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
deleted file mode 100644
index 4b7654a4243b..000000000000
--- a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.8.15.22.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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
deleted file mode 100644
index 4b7654a4243b..000000000000
--- a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.8.24.22.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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
deleted file mode 100644
index a0785dfd7a48..000000000000
--- a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.9.214.23.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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
deleted file mode 100644
index e7db28d8ba4d..000000000000
--- a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.9.228.25.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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/vgabios/Manifest b/sys-firmware/vgabios/Manifest
index c3c346915cc3..f735607f4665 100644
--- a/sys-firmware/vgabios/Manifest
+++ b/sys-firmware/vgabios/Manifest
@@ -1,5 +1,5 @@
 DIST vgabios-0.7a-fixes-1.tar.bz2 2602 BLAKE2B 68fbd29e6c660dc69ea110e00ff75fc9d14f10bd11b9be89bd373281852a3133c73ee0f2a7ecdf026b29979e4c20bcdbad0baf9f80d013ffeb24dda892725778 SHA512 30992efac011d4b99301960df08cdc69d9503aa6b61feed01fca2c5a910460269d9500650cb394a0737318e977a282c5e0ab613a8b2bc28b9f0c6528a9a77d73
 DIST vgabios-0.7a.tgz 1506655 BLAKE2B fb9b99ab385423b4ef103a56de140591556d2f49fffebfdd508a462551b1a9def9d8dc50c947a88ef6d47c43ff62dbe3d97fef969d985c49b9e78671eaefd34e SHA512 35d789b1b39f8f05b757b6c3379a1b2c33dc27b244720471530325f3e215b5f4fa97cfbfc131f813013f4640fe85be912e7b4cb924fa87ed35e68b6966424874
-EBUILD vgabios-0.7a-r1.ebuild 1746 BLAKE2B 483e821ec557c40a5d28e38b4a6eec13b57d14171524a5f8c44f48ca37ac8ed30df7470a2f9d9396d31e7054a15d32a6f2e5081d84f4669b49fedde2b9349b84 SHA512 d238b9766304222b5f99b79d87443e59409fbdb6ac3cc39faa711a17a8f72c78c601965f4cf3cb2f2bee47760662343a8dba5f3f49c3ad25738d1b0cd2ed6cf5
-EBUILD vgabios-0.7a.ebuild 1716 BLAKE2B 839c1706b973275439ca2bd257020bd93f53ed71d493e5b60bd429918bbb48f1dc6d889c6d6351c840e6483f3750fece19b209df6a0403c80a99cc0c0ee6e50f SHA512 1822165f80f0d45437825044e9675edfe515a35004e3b3fddc069b60208bbd1f4fc97120bd1c8a3f7d226f2ee6c4459e4017321c48d402f9a44c272b346ceff5
+EBUILD vgabios-0.7a-r1.ebuild 1664 BLAKE2B 931f6cb332fe70867152414d1f896d20c9cc3e34fffd4809d50ccc61782ad2a8c1d716734a8b4aec863be4ef51d8acfe9576ae0ce09375514d5131e358cb3177 SHA512 c15cf3f55ec224e78ec5cdddf07f3481084c19fad02f62c2bae1294e3c466a926895f9fbe8d50a72dd85e4b16c33e7d37e1807a2392123f4da7edde7d591b6c9
+EBUILD vgabios-0.7a.ebuild 1635 BLAKE2B 9ced20787c35a6c9b73508d274e17e1869e7b27456b5c82a377d117f210c933dc42250bdd5ef142f43a48c0a98420d4c502ce8ea56c232272fe83b71428e4ea5 SHA512 7577d3a41ea5acaf929c9095c50ff9143e91c449414fc1c315358b2d77e67b8ccb43727892d44498b1eb32272093d42e4e7650ee674e65438cdfd1c0f0153f6b
 MISC metadata.xml 497 BLAKE2B 486ae4d9758667855e7920cc589aa1a284c0be89387f78c2c226701fa2f32bc20a6769b909d63f9c04483aa900d0d0858fec2db4e49fe6e710cf9dd6df458263 SHA512 c7f5fb5b3c08c0cd3d7460d4ada18ce829dadd3c286782cc064ce18af5b427e20c5be8925b8ed179ceb2ee2405aa0a85593b268c1d98dfae5d55f06587d6de47
diff --git a/sys-firmware/vgabios/vgabios-0.7a-r1.ebuild b/sys-firmware/vgabios/vgabios-0.7a-r1.ebuild
index 081c30ad69c8..aa925da50189 100644
--- a/sys-firmware/vgabios/vgabios-0.7a-r1.ebuild
+++ b/sys-firmware/vgabios/vgabios-0.7a-r1.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 # 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
@@ -18,16 +16,14 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="binary debug"
-
-DEPEND="!binary? ( sys-devel/dev86 )"
-RDEPEND=""
+BDEPEND="!binary? ( sys-devel/dev86 )"
 
 src_prepare() {
-	[[ -n ${FIXES} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
+	if [[ -n ${FIXES} ]] ; then
+		eapply patches/*.patch
+	fi
 
-	epatch_user
+	default
 }
 
 src_compile() {
diff --git a/sys-firmware/vgabios/vgabios-0.7a.ebuild b/sys-firmware/vgabios/vgabios-0.7a.ebuild
index 0e794a42af95..85d6d4c72bce 100644
--- a/sys-firmware/vgabios/vgabios-0.7a.ebuild
+++ b/sys-firmware/vgabios/vgabios-0.7a.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 # 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
@@ -19,16 +17,15 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="debug"
 
-DEPEND="amd64? ( sys-devel/dev86 )
+BDEPEND="amd64? ( sys-devel/dev86 )
 	x86? ( sys-devel/dev86 )"
-RDEPEND=""
 
 src_prepare() {
-	[[ -n ${FIXES} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
+	if [[ -n ${FIXES} ]] ; then
+		eapply patches/*.patch
+	fi
 
-	epatch_user
+	default
 }
 
 src_compile() {
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-30 17:27:54 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-30 17:27:54 +0100
commit	f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 (patch)
tree	e907cb121b30e3c1df1710719c0ddf4029597a47 /sys-firmware
parent	db063b515939ab15261136b24e4bc44386335c0c (diff)