gentoo resync : 05.12.2021

20 files changed, 208 insertions, 47 deletions

diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index f2a2fe6e768f..0b4c3333aaca 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 a4e87626179c..b76b842354ea 100644
--- a/sys-firmware/atmel-firmware/Manifest
+++ b/sys-firmware/atmel-firmware/Manifest
@@ -1,3 +1,4 @@
 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
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/sys-firmware/atmel-firmware/atmel-firmware-1.3-r2.ebuild b/sys-firmware/atmel-firmware/atmel-firmware-1.3-r2.ebuild
new file mode 100644
index 000000000000..93b12d7aba22
--- /dev/null
+++ b/sys-firmware/atmel-firmware/atmel-firmware-1.3-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Firmware and config for atmel and atmel_cs wlan drivers included in linux 2.6"
+HOMEPAGE="https://www.thekelleys.org.uk/atmel/"
+SRC_URI="https://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 /run/cardmgr.pid ]; then
+		kill -HUP `cat /run/cardmgr.pid`
+	fi
+}
+
+pkg_postrm() {
+	if use pcmcia && [ -f /run/cardmgr.pid ]; then
+		kill -HUP `cat /run/cardmgr.pid`
+	fi
+}
diff --git a/sys-firmware/bluez-firmware/Manifest b/sys-firmware/bluez-firmware/Manifest
index 529c7f1f9bf8..823e7f120eb8 100644
--- a/sys-firmware/bluez-firmware/Manifest
+++ b/sys-firmware/bluez-firmware/Manifest
@@ -1,3 +1,4 @@
 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
 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
new file mode 100644
index 000000000000..ec1c59572e1e
--- /dev/null
+++ b/sys-firmware/bluez-firmware/bluez-firmware-1.2-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Firmware for Broadcom BCM203x and STLC2300 Bluetooth chips"
+HOMEPAGE="http://www.bluez.org/"
+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
+}
+
+src_compile() {
+	:
+}
diff --git a/sys-firmware/ipw2100-firmware/Manifest b/sys-firmware/ipw2100-firmware/Manifest
index 48abd1ef50d2..cbbb747d1c56 100644
--- a/sys-firmware/ipw2100-firmware/Manifest
+++ b/sys-firmware/ipw2100-firmware/Manifest
@@ -1,3 +1,4 @@
 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
 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
new file mode 100644
index 000000000000..319a34b61d7b
--- /dev/null
+++ b/sys-firmware/ipw2100-firmware/ipw2100-firmware-1.3-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+
+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 8100e4f983fa..7acefd754d66 100644
--- a/sys-firmware/ipw2200-firmware/Manifest
+++ b/sys-firmware/ipw2200-firmware/Manifest
@@ -1,3 +1,4 @@
 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
 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
new file mode 100644
index 000000000000..7d0a29b4c0b7
--- /dev/null
+++ b/sys-firmware/ipw2200-firmware/ipw2200-firmware-3.1-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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="mirror://gentoo/${MY_P}.tgz"
+
+LICENSE="ipw2200-fw"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+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 ceee97880faa..2444bfe4339e 100644
--- a/sys-firmware/ivtv-firmware/Manifest
+++ b/sys-firmware/ivtv-firmware/Manifest
@@ -1,3 +1,4 @@
 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
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/sys-firmware/ivtv-firmware/ivtv-firmware-20080701-r2.ebuild b/sys-firmware/ivtv-firmware/ivtv-firmware-20080701-r2.ebuild
new file mode 100644
index 000000000000..9e8725143de3
--- /dev/null
+++ b/sys-firmware/ivtv-firmware/ivtv-firmware-20080701-r2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="firmware for Hauppauge PVR-x50 and Conexant 2341x based cards"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="Hauppauge-Firmware"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto /lib/firmware
+	doins v4l-cx2341x-*.fw v4l-pvrusb2-*.fw
+	doins *.mpg
+}
diff --git a/sys-firmware/iwl3160-7260-bt-ucode/Manifest b/sys-firmware/iwl3160-7260-bt-ucode/Manifest
index e491fd31d578..012ad3be997b 100644
--- a/sys-firmware/iwl3160-7260-bt-ucode/Manifest
+++ b/sys-firmware/iwl3160-7260-bt-ucode/Manifest
@@ -1,3 +1,3 @@
 DIST iwl3160-7260-bt-ucode-37.8.10_p2.tgz 78372 BLAKE2B 5abb7abc130ebe93527b4d3d364488bfebe4c9ad005c5173e4a27db5bf880c3af97b451825b5ac972ec89bbab25f127e2e8f15501fcfd96b679868a21154f888 SHA512 73399fcfd58972b9099cad6014f686f74ed4aedc2278d1389d1e815fb08d2af43f3f6defa70d409ecc0b388fba0710dc8fe26627d3149c79db8e8792576047e5
-EBUILD iwl3160-7260-bt-ucode-37.8.10_p2.ebuild 880 BLAKE2B d6fc678bb8003adbd64f4cadb02eb2f0a35b8d1690d4bc2232169040eaf2880a27a16c4c59ceb2c2556e35f8619e32279b9be8a6b4fa381ab1e533d6e75b5275 SHA512 0c39890cae8eec956ed0e5200bfef73ba7841fa517332261668f382ea7752bc6b16af8a86d9cde1824f0808c1dd5ff8a5db7d55366134a1542a98a2de8a6c457
+EBUILD iwl3160-7260-bt-ucode-37.8.10_p2.ebuild 852 BLAKE2B d3f5f5f40bc00de90abec11d83b7533f61794511ed9a0f3231bdf37f02700d1e9e8a7cb9a258b0851db59cba359202eb76085959436091c1396637ee7ab426a6 SHA512 11249b7f2fab0cd832667657b1a3b44d4b3a778740a1d7adeabc9b2268b1b59277b691f034ec3700fa41b552843d797d159704601a8df84792ea65370c684170
 MISC metadata.xml 412 BLAKE2B b72ca6ef1ba63ef9bb9ec0aa38bfd61f7d94a8bc765bcff704d1c3aa695f13feb9ebb3400e46420e50f03f339cb9bb786dd0aa978a78273cc8fc7b8a66167f06 SHA512 b2a17784bb384acfea77d15f4443b80ab01c2249e7dda48eca47ce04b58a1a896716282498bc346543fdf865d7cb74379ebe2d27ca33bb2c1ab159600eb7c04b
diff --git a/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.8.10_p2.ebuild b/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.8.10_p2.ebuild
index 65064b2acde0..7678f40b14c5 100644
--- a/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.8.10_p2.ebuild
+++ b/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.8.10_p2.ebuild
@@ -1,23 +1,21 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
+
 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"
+S="${WORKDIR}"
 
 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"
 
@@ -30,5 +28,5 @@ pkg_pretend() {
 
 src_install() {
 	insinto /lib/firmware
-	doins -r "${S}/intel"
+	doins -r intel
 }
diff --git a/sys-firmware/tt-s2-6400-firmware/Manifest b/sys-firmware/tt-s2-6400-firmware/Manifest
index e83f8da6929e..b0a2ee92894b 100644
--- a/sys-firmware/tt-s2-6400-firmware/Manifest
+++ b/sys-firmware/tt-s2-6400-firmware/Manifest
@@ -1,7 +1,5 @@
 DIST dvb-ttpremium-fpga-01_v1_10.zip 90791 BLAKE2B 2b7815138ab795eea9c29fc9d80a34d7a7ffecec8dc7788a584bfbcc439ba9efabb33b7dcfe3228ba9dc04233c26a1bdcb82bdf70bed1fc74046fcf3b2bcc839 SHA512 7083a14a25945c7b310830cb3508e9c1e3922944fa3e778588ecf6dc6faa02aca2c8e6bf4c40db632a268324a936dce20ae26563fd195a5c8e1b29446f21c97c
 DIST dvb-ttpremium-loader-01_v1_03.zip 9841 BLAKE2B 2b1f1b52953f02668b15bcd6d330edbf955d96c9296af4af7a49d862c813dc703efd4d2534a2f96435cdc02c87ae6ed2b31d8258cb79bdde3f86915f0f59f979 SHA512 d0fddfeadbf1f5bc06538033ea4b69ecc6a34e1b3a8239df93c347f7882ac6b7ee8b44eaef3eaff15c81bb084e3f985f8504d68edb83479e149d904fb97e2ce3
-DIST dvb-ttpremium-st7109-01_v0_5_0.zip 2074807 BLAKE2B 39a4565450a4377c43cad0a8d7bf4610d2aea0f3eb0e4e939dfc1c61016e496cb56d593c3e0ebdc7e0ffcf799b66a31fb7f937e3ca090b18258d7f4f5da0e9ae SHA512 c8aeb5a61deb1f66d65ca69512edaa78d0222765d60f780b7c6f9240823def66bd326a21bb1c3bf0a4206dc0b1766522fc8d7ead800a6b49682bcc75be109d59
 DIST dvb-ttpremium-st7109-01_v0_5_1.zip 2075442 BLAKE2B e5695e1550b94ee89023a72b1fbb43c7a0c01e0705fa86129886e4bf8cd658f2094b5c5b890d25cae46c8a71ba9c93b0c5dd83352dae555317b8fd5e003d1d94 SHA512 8d209793201065914f4314dd4f3978ab100d93ce6abe589411b6e9bd3dc064702d3835696834e192c2aa432213d4d4be6ccbde9140faa10d7e8a16ca4909feb9
-EBUILD tt-s2-6400-firmware-0.5.0.ebuild 709 BLAKE2B 0137bd3dab08ab3d7d16c8aa071194dc6032e485016e13372bf45b6f42928e1d29c43352bf0cb01e1697a005f251c027fbb3dd6b0f8a053952237b309cc181b0 SHA512 67fbcd29ffa7ef05a2385c8d06e3806c336346daee27c3dd79a6c13374e3b8d97ff9baab2ad4de1409ac5eb0c1c964fd7233159cf09b3a91d75d585899b58b0a
-EBUILD tt-s2-6400-firmware-0.5.1.ebuild 706 BLAKE2B 08003cddeb8ceea8025c892b9ba33f6e230d32ff9118ba7566a6750a1c9fad9f3a51d088a94ff7be556ce16fd86a8626413d47cc5f3ae274f360f6c30aa8a94e SHA512 075620eb243762afdd3e3161294a7d90e3676320b8464ac0f86522351e7732b04cf67f808f061074b3343ce9d0e3b874e6503a19abc66aadc24a4de8dd4cb39e
+EBUILD tt-s2-6400-firmware-0.5.1.ebuild 688 BLAKE2B 5eea784b7fb28d47d4a7f2f5e172105985b3b2b78a5c0a8c9ba7640cde6e57640917ed0fd1dbe1dac05159e95cfa8b72ed6bc450ed9036ce0101717a151b5f73 SHA512 9c9f5030321c0114a78e80313be45fb19763cc1d0e696ac8f073ed15f6c8b12088853402b886e5b3d1fb96c99076cd6d95911df7e56cb713296925935992a1ec
 MISC metadata.xml 250 BLAKE2B 85787781bee26099abdc6b9035c66df92026cff1b418979513ea9e220d33698b803a452c9bf551802f4b2cfa1fb4f8cc978e7222f1cc3f469c9612f25ce6adea SHA512 e4b8dc67ce23a9e4ff2ef8dd02e7dec6409c2c3aab0ac4a59792438bbe546f694dd3ab6610467daf98c9968d03299674232ea130f472869d63c0b1dc2b82bc9e
diff --git a/sys-firmware/tt-s2-6400-firmware/tt-s2-6400-firmware-0.5.0.ebuild b/sys-firmware/tt-s2-6400-firmware/tt-s2-6400-firmware-0.5.0.ebuild
deleted file mode 100644
index fcbe5edb1f36..000000000000
--- a/sys-firmware/tt-s2-6400-firmware/tt-s2-6400-firmware-0.5.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-RESTRICT="mirror bindist"
-
-DESCRIPTION="Firmware for the Technotrend S2-6400 DVB Card"
-HOMEPAGE="http://www.aregel.de/"
-SRC_URI="http://www.aregel.de/file_download/27/dvb-ttpremium-st7109-01_v0_5_0.zip
-	http://www.aregel.de/file_download/26/dvb-ttpremium-fpga-01_v1_10.zip
-	http://www.aregel.de/file_download/7/dvb-ttpremium-loader-01_v1_03.zip"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /lib/firmware
-	doins dvb-ttpremium-fpga-01.fw dvb-ttpremium-loader-01.fw dvb-ttpremium-st7109-01.fw
-}
diff --git a/sys-firmware/tt-s2-6400-firmware/tt-s2-6400-firmware-0.5.1.ebuild b/sys-firmware/tt-s2-6400-firmware/tt-s2-6400-firmware-0.5.1.ebuild
index 3f114357cafe..4bc0c801db6d 100644
--- a/sys-firmware/tt-s2-6400-firmware/tt-s2-6400-firmware-0.5.1.ebuild
+++ b/sys-firmware/tt-s2-6400-firmware/tt-s2-6400-firmware-0.5.1.ebuild
@@ -1,25 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-RESTRICT="mirror bindist"
+EAPI=8
 
 DESCRIPTION="Firmware for the Technotrend S2-6400 DVB Card"
 HOMEPAGE="http://www.aregel.de/"
 SRC_URI="http://www.aregel.de/file_download/28/dvb-ttpremium-st7109-01_v0_5_1.zip
 	http://www.aregel.de/file_download/26/dvb-ttpremium-fpga-01_v1_10.zip
 	http://www.aregel.de/file_download/7/dvb-ttpremium-loader-01_v1_03.zip"
+S="${WORKDIR}"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
+RESTRICT="mirror bindist"
 
-S=${WORKDIR}
+BDEPEND="app-arch/unzip"
 
 src_install() {
 	insinto /lib/firmware
diff --git a/sys-firmware/zd1201-firmware/Manifest b/sys-firmware/zd1201-firmware/Manifest
index b0dbf9825172..e32331fb4638 100644
--- a/sys-firmware/zd1201-firmware/Manifest
+++ b/sys-firmware/zd1201-firmware/Manifest
@@ -1,3 +1,4 @@
 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
 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
new file mode 100644
index 000000000000..594e41f0a002
--- /dev/null
+++ b/sys-firmware/zd1201-firmware/zd1201-firmware-0.14-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+
+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 2519308e4665..660bf07699a9 100644
--- a/sys-firmware/zd1211-firmware/Manifest
+++ b/sys-firmware/zd1211-firmware/Manifest
@@ -1,3 +1,4 @@
 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
 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
new file mode 100644
index 000000000000..bfd917f1e179
--- /dev/null
+++ b/sys-firmware/zd1211-firmware/zd1211-firmware-1.5-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Firmware for ZyDAS ZD1211 USB-WLAN devices supported by the zd1211rw driver"
+HOMEPAGE="https://sourceforge.net/projects/zd1211/"
+SRC_URI="mirror://sourceforge/project/zd1211/${PN}/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+S="${WORKDIR}"/${PN}
+
+src_install() {
+	insinto /lib/firmware/zd1211
+	doins zd1211_u{b,r,phr} zd1211b_u{b,r,phr}
+	dodoc README
+}