gentoo resync : 22.12.2021

26 files changed, 41 insertions, 210 deletions

diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 0b4c3333aaca..d2665f03170b 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/atmel-firmware/Manifest b/sys-firmware/atmel-firmware/Manifest
index b76b842354ea..0e41bc741ed5 100644
--- a/sys-firmware/atmel-firmware/Manifest
+++ b/sys-firmware/atmel-firmware/Manifest
@@ -1,4 +1,3 @@
 DIST atmel-firmware-1.3.tar.gz 470254 BLAKE2B 76b90d6bf34db5540ab8c4034a439e8da6e0590ecbca0962c9e65099143b67337c91f7673a2cc33a2191924f42f69f922176a9b91f8592ce649dbf04a17b36ee SHA512 e87767008d3fe08a7e997b629a11589c00f46ca375639dd0b06c48b2de831a7df666c895888026eff03b7ee81a7594349fd550c4943b088ce26fb57f660ce89b
-EBUILD atmel-firmware-1.3-r1.ebuild 1172 BLAKE2B 5e601ca84288b844b7bb563bcf3a0e06c6523cfbe64356604e9dafa3c70437a8ab5c1c7768b6483116c928523a90c7112b518cddc03af9f03267ec3e3ae59111 SHA512 a1080d92be6c4a1f122222bc705faf74bb5a70a07a4ffcbd3274650cb0c5c3811baae8b3d44ac7c89b947682dc51ae51ddb9d7079d23ba1f49595bb81965bb2a
-EBUILD atmel-firmware-1.3-r2.ebuild 1158 BLAKE2B 08f722272945a23b907422b00124adf8c85f93962c7369ed946d7e24ecc81925f8b20426120f94d23aaf02a78de778dbde581a526ff3f5b606d15cacc9a93249 SHA512 d74d11a5080a8aa68a32de02a35cff91d1664d20bc22d76fa1dce1d32259d214ed1dfc07eb913639ac9ec18a1b64db09dbb7ee410102be6e692e1dd61c3d99a2
+EBUILD atmel-firmware-1.3-r2.ebuild 1156 BLAKE2B e377ff4ba37e71ee23831fba4c3d18c9da436ed1345c6b29823670bee1a4787e21683cf7a562f36fc16bc7c2c93bfd04422097f68688a582d76901aa700a9e29 SHA512 3b4294034d6ae15ccc3cdde87f500557a364fdd947aaa8b16d4d26c8035674aa0754296c7e75db95e3fb40052b2f97a435107a51357a2c2eb27ddc2a6a34c141
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/sys-firmware/atmel-firmware/atmel-firmware-1.3-r1.ebuild b/sys-firmware/atmel-firmware/atmel-firmware-1.3-r1.ebuild
deleted file mode 100644
index bcd244232549..000000000000
--- a/sys-firmware/atmel-firmware/atmel-firmware-1.3-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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/atmel-firmware-1.3-r2.ebuild b/sys-firmware/atmel-firmware/atmel-firmware-1.3-r2.ebuild
index 93b12d7aba22..fecf77bef489 100644
--- a/sys-firmware/atmel-firmware/atmel-firmware-1.3-r2.ebuild
+++ b/sys-firmware/atmel-firmware/atmel-firmware-1.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.thekelleys.org.uk/atmel/${P}.tar.gz"
 
 LICENSE="Atmel"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="pcmcia usb"
 
 RDEPEND=">=net-wireless/wireless-tools-26-r1
diff --git a/sys-firmware/bluez-firmware/Manifest b/sys-firmware/bluez-firmware/Manifest
index 823e7f120eb8..5b1b2d8a9d08 100644
--- a/sys-firmware/bluez-firmware/Manifest
+++ b/sys-firmware/bluez-firmware/Manifest
@@ -1,4 +1,3 @@
 DIST bluez-firmware-1.2.tar.gz 370623 BLAKE2B b7a1c4b8d038db681cb4cc789a51a67148fb53f81a1e23d8d3364cf08f620f717eeff05b6ddf0464e93a8995dd7d5d122c3cff91b40e2a6598777830bbc05b57 SHA512 15db2f9d38a496882e4cc3754af1e58aa99e1b849f2066c541d76c66a8ffdc5532799fe1fd473cfc158bf5ea86a46687716cbcf83c6dcac0ce66d97d679648dd
-EBUILD bluez-firmware-1.2-r1.ebuild 489 BLAKE2B f5affc920c249f8553e284d00e42fcbc9701de14cca4cd2114100a1c9a008efa7c88c02497fe28709f7c02fef57fbf5750dc8f21229da96aada49041b8a795ad SHA512 8d92a42c0803ec2728d235a30ec6e117ff787e65d14e0673d19dcde26541f9e9acaee4d77efd9b7fb745c2e8b0a28ff3a18a334c26cc894336142bb12298238c
-EBUILD bluez-firmware-1.2.ebuild 470 BLAKE2B 152aba2323fbdc7da488f373f5777e182825e578e921913b58ee89269d508c5d851142bd43de4469806976a12ae112fa20bf319a5cadbf03fb5cdd93575f738b SHA512 9ede38d6ecf24fcdf055123ec88bbc9c15e694ce1e2fa2fac467c1847e84724fc7e65da30447b3016845f5042c18558c1a193991bc21e6f1a1200a4cea1be350
+EBUILD bluez-firmware-1.2-r1.ebuild 486 BLAKE2B 5f5f907670ebd2eb208eda58312f11b96bf09576a4a0ecd365d07a64a170cc3a92bc58dbbf2dfe5c837a47ad5d92591beda61648e94f8bd7cc418e63fe14f0a0 SHA512 9a0bd81963ba6bd5c84136d4f7b3b86f89f98512c149f1996209d44f4dc12eaa2cfe14a5eb75cd9bd33579a1087a2a38851aa01daf5a9e47eaacf34e69ca0e5a
 MISC metadata.xml 243 BLAKE2B e1aed0da79bc26158c06a296328043f9147dc507795f1be3277f51f3d02d36aa7e84d3379d8e340985d18f6cc8a4b92dbaf05d3664711801903facf6d098c7bf SHA512 45a92c4a244e010a8ba3e97d88fbb27498c7dd8bdf8da1e3ac34c7c6d4cd719ce2d60ac26ae41bd91f8d2d3284173b54e69b5e08e2a98a310b6684505010c64a
diff --git a/sys-firmware/bluez-firmware/bluez-firmware-1.2-r1.ebuild b/sys-firmware/bluez-firmware/bluez-firmware-1.2-r1.ebuild
index ec1c59572e1e..681ed1de7b39 100644
--- a/sys-firmware/bluez-firmware/bluez-firmware-1.2-r1.ebuild
+++ b/sys-firmware/bluez-firmware/bluez-firmware-1.2-r1.ebuild
@@ -11,7 +11,7 @@ RESTRICT="bindist mirror"
 
 LICENSE="bluez-firmware"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa ppc x86"
 IUSE=""
 
 DOCS=( AUTHORS ChangeLog README )
diff --git a/sys-firmware/bluez-firmware/bluez-firmware-1.2.ebuild b/sys-firmware/bluez-firmware/bluez-firmware-1.2.ebuild
deleted file mode 100644
index 5e373ebd7a77..000000000000
--- a/sys-firmware/bluez-firmware/bluez-firmware-1.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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 ~arm64 ~hppa ppc x86"
-IUSE=""
-
-DOCS="AUTHORS ChangeLog README"
-
-src_configure() {
-	econf --libdir=/lib
-}
diff --git a/sys-firmware/ipw2100-firmware/Manifest b/sys-firmware/ipw2100-firmware/Manifest
index cbbb747d1c56..3c39a6d32e6a 100644
--- a/sys-firmware/ipw2100-firmware/Manifest
+++ b/sys-firmware/ipw2100-firmware/Manifest
@@ -1,4 +1,3 @@
 DIST ipw2100-fw-1.3.tgz 248471 BLAKE2B 97c56f1887cc6f577b99f8b0e9c1f30f424f28209d6d587922c539b8eacc8663960ea7d4e8713e774fa85ad5d8d38e9ce86bdadcab4d64599ef231294e4ba6e8 SHA512 1e1b8406a795a2f7f9d4d5ba533293daf1a3f3583dbe6eac45849176da8fc46d261bf4ca6a0b236c67c48313b6ff0feb5f9f2019cacbef65471dc0d36e1e1114
-EBUILD ipw2100-firmware-1.3-r1.ebuild 449 BLAKE2B 2f011859e78b35eba248c1b5e0c3a259554db7df0aa4bc2d7736339d38d22611d2391061dec9e21ce1202fee45b99bce25179ba2ec99f7808afb7adb1952512f SHA512 c776e7e5d072c23d49cb1d772fbf05328b2341cb33af489afa003aa9b51b31cb070cef6fcff6fca29f9f8cb20b75f0708b55cea9e9c559b967561c42389fb32e
-EBUILD ipw2100-firmware-1.3.ebuild 455 BLAKE2B f0a0139794545964d22aa1f432181ca298db0738534923b2f3eb0699e28db5fe29abde9520184c976f0a21233331acd4a67185741e5d4425722bfb4ca1a343ec SHA512 2b493ad2a4a14450c35c7e25fc9d39da992d355acbd6cf8b871fd90d8e08f23e85b4915fa442a9de56b3c9f89af3337ce3962ba8556f9e1a32db8ec5e846752f
+EBUILD ipw2100-firmware-1.3-r1.ebuild 447 BLAKE2B 12f8b38550b7d7185555836bcd8bfcd2b083d3fd67d3962a6140de5c3b6fda3ddfa714de8e8f6e78d743eebf0ee24dd776ddd287f53dbd0000d41b5f7709fc69 SHA512 5a8d2240866a365f3c597f62e52255f9cf35e1b118aa7c93fc0705d54283d3f1190768c9906a2481208177bb564725fed1211280cf4cf3ef6cb94d4da7293b8e
 MISC metadata.xml 245 BLAKE2B 0e4e0b3f268d663228557d57d6d86ecd89c4dca5e05d5ce6f4b9c212e1a2588b31507eaab431434ca2bca560e8bb2c24da265cdf2337a54718017e5fd5ea3324 SHA512 68a419c88b7a89fa2e24de4cc155ef87453b4c963ace41e10040b4725c539f3d4e71a3d9f5f4f5b292d66450437fc62267fcc5909ecb574d77021b9a3ad6101b
diff --git a/sys-firmware/ipw2100-firmware/ipw2100-firmware-1.3-r1.ebuild b/sys-firmware/ipw2100-firmware/ipw2100-firmware-1.3-r1.ebuild
index 319a34b61d7b..0f526d4dfb2f 100644
--- a/sys-firmware/ipw2100-firmware/ipw2100-firmware-1.3-r1.ebuild
+++ b/sys-firmware/ipw2100-firmware/ipw2100-firmware-1.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tgz"
 
 LICENSE="ipw2100-fw"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 S=${WORKDIR}
 
diff --git a/sys-firmware/ipw2100-firmware/ipw2100-firmware-1.3.ebuild b/sys-firmware/ipw2100-firmware/ipw2100-firmware-1.3.ebuild
deleted file mode 100644
index 81a6a3c86cfa..000000000000
--- a/sys-firmware/ipw2100-firmware/ipw2100-firmware-1.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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 ~arm ~arm64 x86"
-IUSE=""
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /lib/firmware
-	doins ipw2100-${PV}{,-i,-p}.fw
-}
diff --git a/sys-firmware/ipw2200-firmware/Manifest b/sys-firmware/ipw2200-firmware/Manifest
index 7acefd754d66..dd3311c4ce18 100644
--- a/sys-firmware/ipw2200-firmware/Manifest
+++ b/sys-firmware/ipw2200-firmware/Manifest
@@ -1,4 +1,3 @@
 DIST ipw2200-fw-3.1.tgz 270042 BLAKE2B f6ab1abb14a48a027da86d2c1823964abc70f7972da602338bee2cdd0ef351683adf9ffe31a292aea2ad7397e5669b998e2394cf59586f03a3afb436f2cdcbd1 SHA512 b588566d67a31e8e5c464991f2de5420822816528a388829e36ba47080d2edd10794b0b1d05562035c54e9bb9a9999504a2ff099a37157c39b3c71b125748ad8
-EBUILD ipw2200-firmware-3.1-r1.ebuild 472 BLAKE2B df99812c086b32921baada9ae1a4af8dbc37324a2ba9021fb46557e8789eadcbffd35e36de5f108c14e2e2b27037228e14dcbfce704d76024c77bfa8c510a554 SHA512 72c9679ea1d763f83c2d74533389638e1e976ba189df022b19a19affddea7273f5361208c5d5458a38ddf149fa7abfcd9d056d1f356e2a5b263633ed276cb5d0
-EBUILD ipw2200-firmware-3.1.ebuild 494 BLAKE2B 2ff4fd12b8bbacee5d837c37920b275c598535eff033f02ab22c24a82e7c4b84d5c9e61b7b23708359438f3c1d0767754f9e822be9bed1aaa2ced217e76dc68d SHA512 a0a2092c0e8ffbf84d5596157016cdb0f0b665d14869c2d38cdfa46bec75d5b5f8ddb57f91ee2e77f4af47c61ba6c8498f29e80817d24e9d51abe2c07e1f8d1d
+EBUILD ipw2200-firmware-3.1-r1.ebuild 470 BLAKE2B b0b7c7081ad4d8ee704d565ab5f0e62e23c9f5a1ca08f22844c6c58ebe618bf695d610a60b6b4e90e4557e2d96382e0ff00f07202914db3884af39b4bb35b76c SHA512 234619ed31200cd533d0d88a4da14f282ac4865ca292adb07539d7b926617358f80741da2968b576ba31edcb9009cccf12e8dae8c40007ed1f3d7dc705bce031
 MISC metadata.xml 245 BLAKE2B f666a868c69acfcf75dfb107e77fcaf20be792ede63985fe4955eba3df40ba0e0564be6cb0c435152b08575a4834b26d3ee34f86313c92c974a7ca13f8318bd7 SHA512 b968fc05dfd29023b131be7419fd7577506fd8de0f537733dddb87e4432188449e02a33e4f0636e0b441d8d7fc86f759c30a0647041217c84d0b619d2b305237
diff --git a/sys-firmware/ipw2200-firmware/ipw2200-firmware-3.1-r1.ebuild b/sys-firmware/ipw2200-firmware/ipw2200-firmware-3.1-r1.ebuild
index 7d0a29b4c0b7..980d68f32092 100644
--- a/sys-firmware/ipw2200-firmware/ipw2200-firmware-3.1-r1.ebuild
+++ b/sys-firmware/ipw2200-firmware/ipw2200-firmware-3.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tgz"
 
 LICENSE="ipw2200-fw"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/sys-firmware/ipw2200-firmware/ipw2200-firmware-3.1.ebuild b/sys-firmware/ipw2200-firmware/ipw2200-firmware-3.1.ebuild
deleted file mode 100644
index 93ff56de95eb..000000000000
--- a/sys-firmware/ipw2200-firmware/ipw2200-firmware-3.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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 ~arm ~arm64 x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	insinto /lib/firmware
-	doins ipw2200-{bss,ibss,sniffer}.fw
-}
diff --git a/sys-firmware/ivtv-firmware/Manifest b/sys-firmware/ivtv-firmware/Manifest
index 2444bfe4339e..98d400eb539d 100644
--- a/sys-firmware/ivtv-firmware/Manifest
+++ b/sys-firmware/ivtv-firmware/Manifest
@@ -1,4 +1,3 @@
 DIST ivtv-firmware-20080701.tar.gz 125526 BLAKE2B e0f21c3d06723257609aa12d81120fde30cd920c4aa4b4eb407c569c8280a81fe64d15375f6d3f3c38826105a1eb1a8e35c076f0848f54a386d7850d931b6656 SHA512 1ad00fb55721f5161e0b64d04ea004cd0e24f31b3c47cadb181c0a8f24a0064356b56479cd54d834d4575f6cb5d826bca5fd061634b1e10f0e4b5737c1fb192b
-EBUILD ivtv-firmware-20080701-r1.ebuild 468 BLAKE2B 4a1a69c96bf3088f664c9d8cb78c4cccaa3bf0a90fbe162bf5218f49f2237967c278ad32e3f02c5edaeedbff14bf31eb20972d2596ef974c11475bcb963e9646 SHA512 4303f41a966b219c1df046a30603000ac89499176af1c9ad43eef263831f56edb7dc3c6fbee2121dfd7b667736c81e4f21ad7145b8d628ba232379bc4022c11f
-EBUILD ivtv-firmware-20080701-r2.ebuild 456 BLAKE2B 4f979411b20663b40657818feafa710e5736c198fcfe919938063dfdf253c2bbaea0f453db22d7130df1ea1085aba426fa0e70c59e919f37ad56d7ad3e2758cf SHA512 3506b6530bbc8837365352c3d806db371c4d222a2cf126e569b0d2aee09432238475cecf69c0f71a96538dc87678e14c7e0ae08ce5e14b1376ea30e7e1df316e
+EBUILD ivtv-firmware-20080701-r2.ebuild 453 BLAKE2B 187937fbcc24d72dd0e76dd12c8a1cdd829d50140a99a329fa70e9ba2f07d473ca559d3fe9430fbdf9c7d18c95e047f3f85df52bef66c49137b4a9d58fd7a22b SHA512 0c1fbd709a850b5faa16546892ed61b00dc14f837f14172f55738911e756c14aa86fef1b09cc2b07e5060d8d563f6f60e4d3b62f23092e4f162754f4153e710e
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/sys-firmware/ivtv-firmware/ivtv-firmware-20080701-r1.ebuild b/sys-firmware/ivtv-firmware/ivtv-firmware-20080701-r1.ebuild
deleted file mode 100644
index 0ac539665e44..000000000000
--- a/sys-firmware/ivtv-firmware/ivtv-firmware-20080701-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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/ivtv-firmware-20080701-r2.ebuild b/sys-firmware/ivtv-firmware/ivtv-firmware-20080701-r2.ebuild
index 9e8725143de3..112373f1a2be 100644
--- a/sys-firmware/ivtv-firmware/ivtv-firmware-20080701-r2.ebuild
+++ b/sys-firmware/ivtv-firmware/ivtv-firmware-20080701-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="Hauppauge-Firmware"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 S=${WORKDIR}
 
diff --git a/sys-firmware/raspberrypi-wifi-ucode/Manifest b/sys-firmware/raspberrypi-wifi-ucode/Manifest
index 136a94069891..04af9e055d71 100644
--- a/sys-firmware/raspberrypi-wifi-ucode/Manifest
+++ b/sys-firmware/raspberrypi-wifi-ucode/Manifest
@@ -2,6 +2,6 @@ DIST firmware-nonfree_20190114-1+rpt10.debian.tar.xz 2034132 BLAKE2B f6bdfbedc26
 DIST firmware-nonfree_20190114-1+rpt11.debian.tar.xz 2038892 BLAKE2B a2d66e637cd26928c23855f5369c13b83e25b6b4353c82e9a62cb14b010a8c1fda566f6d200e0e7a706c7fb140238082238b7af80fe1f75fe3f07c815fc0eb6a SHA512 5ba6783dc3f3903f20321571a1fb2e11d7781de6d49689c68e6e1f194dad9cdddec90abc94a32a130323b2c8f9839af387c46aee895caf30ffb2f6dfe6d95b7d
 DIST firmware-nonfree_20190114-1+rpt9.debian.tar.xz 2040560 BLAKE2B 923adb08e4033f1f70c8e373464b5a4881f354fb218b163accb957b99ed1adf104f496b2156c772d881e7e01ed393d0f6c1563dbe797e1b1600a1f7f768292c4 SHA512 80df5df213105bfae231dbc81d17941258063971ea82e5d321b31d92a0be7101b9ecfe03aed02d9b7a0263d13bbcdcb862d4892a9e789da781af1430d81a821d
 EBUILD raspberrypi-wifi-ucode-20190114.1_p10.ebuild 2379 BLAKE2B 6f3569abe1d0c0071bcd03e7cbed2b45ce7eafdb59a20b793e6a6cb77e70c49c3acb432f2db4727acba3d8b0a2f00a62d7c80a9fc1d83f96940a153d8e8e7979 SHA512 63e2b279a8ca863d7837e6f2d864f4ad3ebb1a1bdb3555415415fb7b92e7739f8623322a41e479a442512df4d967a4ae9b8c04ead4ab1502d72b97873228b7c0
-EBUILD raspberrypi-wifi-ucode-20190114.1_p11.ebuild 2381 BLAKE2B 02a0d76eb634906bc63c6a0fd9b673a2e509d09ae5989f72737c894ac2fa0f93aee9eb061b1284722ed10d6e3961c3c41d7780979ec39c043b0028acbc3f5bcf SHA512 db66def2c415a89e58fd6c2a28e79abe51ce1589978399aa8874fa1d36ec2869cf466edbcc79de2a07c3f77c9c0e96626015b13fc5f4f2c0befaa1e871a7ddac
+EBUILD raspberrypi-wifi-ucode-20190114.1_p11.ebuild 2379 BLAKE2B 6f3569abe1d0c0071bcd03e7cbed2b45ce7eafdb59a20b793e6a6cb77e70c49c3acb432f2db4727acba3d8b0a2f00a62d7c80a9fc1d83f96940a153d8e8e7979 SHA512 63e2b279a8ca863d7837e6f2d864f4ad3ebb1a1bdb3555415415fb7b92e7739f8623322a41e479a442512df4d967a4ae9b8c04ead4ab1502d72b97873228b7c0
 EBUILD raspberrypi-wifi-ucode-20190114.1_p9.ebuild 2379 BLAKE2B 272d3fabba5110c39f661ad346e9cc9e9b8e174eaa369d4494b90cff6d5e7e5e527ac9f7011108bd35d9659b4a708da87d75240f3146533272c6dc95a1b7d081 SHA512 990db7c7fa97de251b566f8b05aa369c0ae0b9538468870c328c5eb06b1860e94a98b2ffd3a93f462963c75544cf96a7355dbe94514c65ba40d1e1f2d9c8dced
 MISC metadata.xml 601 BLAKE2B cb558331f5bc8c0f398a2734474c8c475925e289b77d00250d53e7683c0a64af1de9185058c72187c727b7accc79c741b688d7ce04d4a50913d6169f0fe0f841 SHA512 7617a620030f5bdbad802806d85f09936097c480106d6beb095d235b347d41dd7a43636ea55e42c11f5c409e2c61c644ee69fe926495a1cd4fe89fd9d1a798c2
diff --git a/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p11.ebuild b/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p11.ebuild
index cb9800e8cd64..ec573949e197 100644
--- a/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p11.ebuild
+++ b/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p11.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="Broadcom"
 SLOT="0"
-KEYWORDS="~arm ~arm64"
+KEYWORDS="arm arm64"
 
 RDEPEND="!sys-kernel/linux-firmware[-savedconfig]"
 
diff --git a/sys-firmware/sof-firmware/Manifest b/sys-firmware/sof-firmware/Manifest
index cfe481132549..905584094a5a 100644
--- a/sys-firmware/sof-firmware/Manifest
+++ b/sys-firmware/sof-firmware/Manifest
@@ -1,5 +1,7 @@
 DIST sof-firmware-1.6.1.tar.gz 3033953 BLAKE2B 0c33bd9a5d17c3b889219bf926d3619e3e448ff6b16e39b4caffe19e87c98d1227b303ebe80d185f93480ead29f37de39093f3e76f275df7836d3250ae47c566 SHA512 71acd34662ffd4d93f6111dfd046ed358184fdf24d0e118da43770aeee45bd15105b688bc5a569f2cb7941724ec822d2cfbab8a08e9caee1a77aa5763ac7b48e
+DIST sof-firmware-1.9.3.tar.gz 3710193 BLAKE2B d52fe0660c73c8e76fb60c492abe19f9e64b3064441880b84488193aa66710e49ef022c7cd1b8ece69d010aa5e416fbf4307a9c92d823525dbdc734194b0a98f SHA512 0c04bf47ecf65d3352b730e79968cb020211c274f64a3cc21e4c5e49c5a9706ab4d541aaea931e72c1bcc67fcde6387bc6bf952a33691aaab06e6b93aa73a024
 DIST sof-firmware-1.9.tar.gz 3470302 BLAKE2B 597467915a658beda5611177c550b51a15720dfde23f1a55ea91217e7e809ff5c6417c6cc449e5d4a1732ffc03f9f817407951410646c9431ec189e8b141f60e SHA512 aee733381edb2150f2132c296e9151b1d6a71246e204b15c2394587c528286f730ceaf02002e1e58ccea0deba5e4ae81cb7a03efb858ac954633b0cfaec81a22
 EBUILD sof-firmware-1.6.1.ebuild 641 BLAKE2B 3ec766a6799d4a6e482522d79c8d985f4927240b31553578b1aa9edd314a8900d11aba8c89cf1a8d2cb49fe01e9c56719768cb6bbfad38e7a865a4f24ee53d7e SHA512 7433f8983f80b1fa8b7af27e50c8036d860ad16149917fd6457521166797e846fcbd2ae54936388bab1d36965dc3ba5570d83f75228e9e9adcc89c7e44b3b642
+EBUILD sof-firmware-1.9.3-r1.ebuild 722 BLAKE2B 725fbcb6fc6baef416e2b063a91575e0cf8272a0f5d92350400557cd9ff918217d80da9e9ba88a323340f038acfcaef175cbfcc3546c19a2105c18c199e098cf SHA512 3433903078bf417d76f0ac05d39d1c9ae1a5cac18d377dfb9112848f918d827146ef28ab645cd51ab7c032250261deaf9326131f6085d2a1267cf80741318188
 EBUILD sof-firmware-1.9.ebuild 657 BLAKE2B 3f95821a60304502fefe03f615462cc7103283019799634db50953d903dce7faea714a5ee5a53cd005880ce54915b42442db35a9adfcbc504183cefcd62af761 SHA512 c97d3b1d28a8581ab60622f1843bf5168a36697744817d8a9a650114e6a7246941c6727489ba2f8e015c3838c7321b9532ccb95410e2c92554800391b1bea58b
 MISC metadata.xml 218 BLAKE2B b13b149202bf20882c38ce2cfd0e1c4ea9a15f584ff819022fd74261c2f73dc52efe21fe1e621fd84406527ab86bd29147ef34c895ccf9de3596ce58cb59d846 SHA512 068fda6c090090d62a719b26812505efa881b855004ed63dea86b1ee9b698d5d6ccd3210366e7cfa886f886c77e31b90cd69ec015e67286ce0611483304e798f
diff --git a/sys-firmware/sof-firmware/sof-firmware-1.9.3-r1.ebuild b/sys-firmware/sof-firmware/sof-firmware-1.9.3-r1.ebuild
new file mode 100644
index 000000000000..d5f3b2775947
--- /dev/null
+++ b/sys-firmware/sof-firmware/sof-firmware-1.9.3-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Sound Open Firmware (SOF) binary files"
+HOMEPAGE="https://www.sofproject.org https://github.com/thesofproject/sof https://github.com/thesofproject/sof-bin"
+SRC_URI="https://github.com/thesofproject/sof-bin/releases/download/v${PV}/sof-bin-v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/sof-bin-v${PV}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="media-libs/alsa-lib"
+
+QA_PREBUILT="usr/bin/sof-logger usr/bin/sof-ctl usr/bin/sof-probes"
+
+src_install() {
+	dodir /lib/firmware/intel
+	dodir /usr/bin
+	FW_DEST="${D}/lib/firmware/intel" TOOLS_DEST="${D}/usr/bin" "${S}/install.sh" v${PV} || die
+}
diff --git a/sys-firmware/zd1201-firmware/Manifest b/sys-firmware/zd1201-firmware/Manifest
index e32331fb4638..eef38f0a4e86 100644
--- a/sys-firmware/zd1201-firmware/Manifest
+++ b/sys-firmware/zd1201-firmware/Manifest
@@ -1,4 +1,3 @@
 DIST zd1201-0.14-fw.tar.gz 86538 BLAKE2B e7ea06cd2da0cf010b86546f3bc24011f4c7731ef439bf490478a59ddf849dff1d53e753e735040cf41bd9f4cacb3def1bae59d78326b14821fe8b2b6c9fea51 SHA512 4143966d386029d50b0cf54bb40f0636daac8f4696782f2cd7ec8924b80ed5d889b373817c662000fbbc8010d4bc81864d2381dd7e2242bf9cee0e0fb9d56fe9
-EBUILD zd1201-firmware-0.14-r1.ebuild 521 BLAKE2B b9f15543df32e1348430ce8d266c6e1d0c97e47b95eb2450c4bc87ab1c9aaee80f1f8fd57ed385fad09df30ae54da84cb8831c68bec3c5bf8747a230a05d634d SHA512 c0cf521b495ce38957427861c924cce6d55ec90940725ad4315ab40ca70908c1e5a3503889e805c90903a9310035ff65df484d28d80ff94e7fe03a1601efa412
-EBUILD zd1201-firmware-0.14.ebuild 525 BLAKE2B d39f7e225a870eb210380ea41e86137816b1e19c54dd756cbd61b510ccd62b7aa6034eb438755f9b71717fb71fdcd48bb9b15c7744e9208846618fdad67cf79b SHA512 d73064984b49cae20436c1df2027c315f9d1bb42ed4860b1e6702c2f04c7c519d565fd4b6fb603b5430416a051134e1cd63d24c496c9d1497ebcbac062cb9be8
+EBUILD zd1201-firmware-0.14-r1.ebuild 518 BLAKE2B 6fa1aecf340291cb0089e45b62edc6a3bc8c6b35d3f87b5febce7cd6e822afb8a66a271423a6de3e603ffd23d90ba778e73713f1161cbe7b53e95cf9caa27e5f SHA512 7f7444211d07e6cd4f73bdfba192a832857c0affce7f91cc29c98ebd792cc90366a601691f03f172a1363c311182a4e4a667762e19f18398525c6c0d5b9829f8
 MISC metadata.xml 252 BLAKE2B 24a0c57fa7aa8373146b8a66e0dd2d0d45e0d0fabf005acf898551e1f382152658b593f6dd3b94f1fdb67f6f3eb700e0a5d021d63ee9d5a439341edd0c8a1188 SHA512 15da7a0d9891abcd50a6cdde547a48cd494970c8869adb57d047f6228b459fdd7afe1df6261d4bf9435040fd8d08f42690954e1eab06617ad06ac94904e63fd7
diff --git a/sys-firmware/zd1201-firmware/zd1201-firmware-0.14-r1.ebuild b/sys-firmware/zd1201-firmware/zd1201-firmware-0.14-r1.ebuild
index 594e41f0a002..87cfa5f04189 100644
--- a/sys-firmware/zd1201-firmware/zd1201-firmware-0.14-r1.ebuild
+++ b/sys-firmware/zd1201-firmware/zd1201-firmware-0.14-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/linux-lc100020/${MY_P}.tar.gz"
 
 LICENSE="|| ( GPL-3 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 S="${WORKDIR}"/${MY_P}
 
diff --git a/sys-firmware/zd1201-firmware/zd1201-firmware-0.14.ebuild b/sys-firmware/zd1201-firmware/zd1201-firmware-0.14.ebuild
deleted file mode 100644
index 9ab402099c49..000000000000
--- a/sys-firmware/zd1201-firmware/zd1201-firmware-0.14.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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
index 660bf07699a9..912b04889f70 100644
--- a/sys-firmware/zd1211-firmware/Manifest
+++ b/sys-firmware/zd1211-firmware/Manifest
@@ -1,4 +1,3 @@
 DIST zd1211-firmware-1.5.tar.bz2 38291 BLAKE2B 46bba5cc569263d6998b7fa40c4f1ab10138ee4acd871c34fb81a63e38649fd595de9b411c9d29bfd50cef3757cea30fc2faeae9099e43ea9ee485ec0b6c9d3d SHA512 6a8d39318a8c136b2a780ebeb485a94bbb05fa12ad7104b707314e0108e49939b4dcd0035b19f07dac0ec7bdd12668ea281b48724e512b45ac5df9dedf035897
-EBUILD zd1211-firmware-1.5-r1.ebuild 523 BLAKE2B 39cb1ca53a24349b09815375779d88ff62c166b5f7d0f8e859296f3d1b448fb67dcc4a3b5dd5ba5db10796285fda6be4596c4cf3d4134fae49d245b7293fce75 SHA512 88d0582613076a5e9306aeab6bbd0322710a9d9a3d0351decd60e507d4c0be0a330bf654d8053a2f945c82babc69806620acc8956d9e2dd33eb7e59aa4e6c1dd
-EBUILD zd1211-firmware-1.5.ebuild 505 BLAKE2B 6f658cf6814eb2a2c26781e6b71e581ea9c086a9c257ec4314305e618ac1dbaad72ed904a9d5339b388ea4cbaf99d053772d6191b37d1b1c3c9aa74b19fdbfb1 SHA512 3e6b9ac8ed200f8c00668536ee01858039f6c6cbb7797fa33b06ed931c4eda70d77e8f9fe57a5ac2a5d6983f7acbe7ddc3df4e5668220802685f6f628ff985c8
+EBUILD zd1211-firmware-1.5-r1.ebuild 519 BLAKE2B a9e23e4fff19de235d7a0020e62b7f76d21fb478cf307bf7837870f84bda8d5ba1e548577693ed487a3c815d2cc7d7ae8a93fa236db5ac2d6d4577d8e12ed9b4 SHA512 f6c633afc0af4e32ec10b7dbd28415f7754183ae14f41511b81c2489d15a4e8cd0247dbce10d4a398198e5ef1c66cbbcbe1b3bfa3cd62f4fb032cd5a89a45acf
 MISC metadata.xml 244 BLAKE2B b5d2ade1cb7f68ada2ede770d652aa6279256032948028ea5645bb98fc8025a1108a9b180e083e4e9cf928f05e5ec77486b62dc2e6fcd8043402c1cf8148dd78 SHA512 f550cdb2159d292f13783b9171c06f9775027c4deb49437ea140369e04a57054670dbddeeb4c67773cfd76d7b2752174665f8458165d9791005d66f87eb08dcb
diff --git a/sys-firmware/zd1211-firmware/zd1211-firmware-1.5-r1.ebuild b/sys-firmware/zd1211-firmware/zd1211-firmware-1.5-r1.ebuild
index bfd917f1e179..f79f3468059a 100644
--- a/sys-firmware/zd1211-firmware/zd1211-firmware-1.5-r1.ebuild
+++ b/sys-firmware/zd1211-firmware/zd1211-firmware-1.5-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/project/zd1211/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 
 S="${WORKDIR}"/${PN}
 
diff --git a/sys-firmware/zd1211-firmware/zd1211-firmware-1.5.ebuild b/sys-firmware/zd1211-firmware/zd1211-firmware-1.5.ebuild
deleted file mode 100644
index 1428a149e12e..000000000000
--- a/sys-firmware/zd1211-firmware/zd1211-firmware-1.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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
-}