gentoo resync : 22.12.2021

42 files changed, 52 insertions, 109 deletions

diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 318d7dff2552..7ae65c6996f0 100644
--- a/metadata/md5-cache/sys-firmware/Manifest.gz
+++ b/metadata/md5-cache/sys-firmware/Manifest.gz
diff --git a/metadata/md5-cache/sys-firmware/alsa-firmware-1.2.4 b/metadata/md5-cache/sys-firmware/alsa-firmware-1.2.4
index 60daef4ab006..72ed1abaded2 100644
--- a/metadata/md5-cache/sys-firmware/alsa-firmware-1.2.4
+++ b/metadata/md5-cache/sys-firmware/alsa-firmware-1.2.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=alsa_cards_usb-usx2y? ( sys-apps/fxload ) alsa_cards_hdsp? ( media-sound/alsa-tools ) alsa_cards_hdspm? ( media-sound/alsa-tools )
 SLOT=0
 SRC_URI=https://www.alsa-project.org/files/pub/firmware/alsa-firmware-1.2.4.tar.bz2
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=b298f85443f844e98d73b2c74c799e8e
diff --git a/metadata/md5-cache/sys-firmware/atmel-firmware-1.3-r1 b/metadata/md5-cache/sys-firmware/atmel-firmware-1.3-r1
deleted file mode 100644
index a399ccc66835..000000000000
--- a/metadata/md5-cache/sys-firmware/atmel-firmware-1.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm
-DESCRIPTION=Firmware and config for atmel and atmel_cs wlan drivers included in linux 2.6
-EAPI=5
-HOMEPAGE=http://www.thekelleys.org.uk/atmel/
-IUSE=pcmcia usb
-KEYWORDS=amd64 ~ppc x86
-LICENSE=Atmel
-RDEPEND=>=net-wireless/wireless-tools-26-r1 pcmcia? ( sys-apps/pcmciautils )
-SLOT=0
-SRC_URI=http://www.thekelleys.org.uk/atmel/atmel-firmware-1.3.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9368d0f39795ffeb9878e27015efca34
diff --git a/metadata/md5-cache/sys-firmware/atmel-firmware-1.3-r2 b/metadata/md5-cache/sys-firmware/atmel-firmware-1.3-r2
index 7c564b8ad0a0..579527709809 100644
--- a/metadata/md5-cache/sys-firmware/atmel-firmware-1.3-r2
+++ b/metadata/md5-cache/sys-firmware/atmel-firmware-1.3-r2
@@ -3,10 +3,10 @@ DESCRIPTION=Firmware and config for atmel and atmel_cs wlan drivers included in
 EAPI=8
 HOMEPAGE=https://www.thekelleys.org.uk/atmel/
 IUSE=pcmcia usb
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=Atmel
 RDEPEND=>=net-wireless/wireless-tools-26-r1 pcmcia? ( sys-apps/pcmciautils )
 SLOT=0
 SRC_URI=https://www.thekelleys.org.uk/atmel/atmel-firmware-1.3.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2164d40df2f8905365fa33255b75955d
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=0b477f619cbc94a1287bd15288712a77
diff --git a/metadata/md5-cache/sys-firmware/bluez-firmware-1.2 b/metadata/md5-cache/sys-firmware/bluez-firmware-1.2
deleted file mode 100644
index 4fde7cffa422..000000000000
--- a/metadata/md5-cache/sys-firmware/bluez-firmware-1.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=Firmware for Broadcom BCM203x and STLC2300 Bluetooth chips
-EAPI=5
-HOMEPAGE=http://bluez.sourceforge.net/
-KEYWORDS=amd64 ~arm64 ~hppa ppc x86
-LICENSE=bluez-firmware
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=http://bluez.sourceforge.net/download/bluez-firmware-1.2.tar.gz
-_md5_=b43ae9d201d0e2cb7523e6583476c718
diff --git a/metadata/md5-cache/sys-firmware/bluez-firmware-1.2-r1 b/metadata/md5-cache/sys-firmware/bluez-firmware-1.2-r1
index 82d278626cfb..0a880d722b48 100644
--- a/metadata/md5-cache/sys-firmware/bluez-firmware-1.2-r1
+++ b/metadata/md5-cache/sys-firmware/bluez-firmware-1.2-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure
 DESCRIPTION=Firmware for Broadcom BCM203x and STLC2300 Bluetooth chips
 EAPI=8
 HOMEPAGE=http://www.bluez.org/
-KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~x86
+KEYWORDS=amd64 ~arm64 ~hppa ppc x86
 LICENSE=bluez-firmware
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=http://bluez.sourceforge.net/download/bluez-firmware-1.2.tar.gz
-_md5_=11633e5c36574196fcc7411d4368be3d
+_md5_=1bb2c26e8399e5f1a683d23989d9ce4b
diff --git a/metadata/md5-cache/sys-firmware/edk2-ovmf-202008 b/metadata/md5-cache/sys-firmware/edk2-ovmf-202008
index 356240b5c916..bdd14ec6b213 100644
--- a/metadata/md5-cache/sys-firmware/edk2-ovmf-202008
+++ b/metadata/md5-cache/sys-firmware/edk2-ovmf-202008
@@ -9,5 +9,5 @@ LICENSE=BSD-2 MIT
 REQUIRED_USE=!amd64? ( binary )
 SLOT=0
 SRC_URI=!binary? ( https://github.com/tianocore/edk2/archive/edk2-stable202008.tar.gz -> edk2-ovmf-202008.tar.gz https://github.com/openssl/openssl/archive/e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72.tar.gz -> openssl-e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72.tar.gz https://github.com/google/brotli/archive/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz -> brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz ) binary? ( https://dev.gentoo.org/~mva/distfiles/edk2-ovmf-202008-bin.tar.xz ) https://dev.gentoo.org/~mva/distfiles/edk2-ovmf-202008-qemu-firmware.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=fa76da8a9f9b7261fbab1de0b775bc54
diff --git a/metadata/md5-cache/sys-firmware/edk2-ovmf-202105-r1 b/metadata/md5-cache/sys-firmware/edk2-ovmf-202105-r1
index 11ce87d6e1ac..8d345aed7fed 100644
--- a/metadata/md5-cache/sys-firmware/edk2-ovmf-202105-r1
+++ b/metadata/md5-cache/sys-firmware/edk2-ovmf-202105-r1
@@ -9,5 +9,5 @@ LICENSE=BSD-2 MIT
 REQUIRED_USE=!amd64? ( binary )
 SLOT=0
 SRC_URI=!binary? ( https://github.com/tianocore/edk2/archive/edk2-stable202105.tar.gz -> edk2-ovmf-202105.tar.gz https://github.com/openssl/openssl/archive/e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72.tar.gz -> openssl-e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72.tar.gz https://github.com/google/brotli/archive/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz -> brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-202105-r1-bin.tar.xz ) https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-202105-qemu-firmware.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=d53ff1488e8b87099cbc0058590bc677
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20201112_p20201116-r1 b/metadata/md5-cache/sys-firmware/intel-microcode-20201112_p20201116-r1
index 8e94f35c4f9f..b69df158008b 100644
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20201112_p20201116-r1
+++ b/metadata/md5-cache/sys-firmware/intel-microcode-20201112_p20201116-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( initramfs split-ucode )
 RESTRICT=binchecks bindist mirror strip
 SLOT=0
 SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20201112.tar.gz https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20201116.tar.xz
-_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=5d4c59c2ca809d0a52c3d675c2ba165e
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20210216_p20210221 b/metadata/md5-cache/sys-firmware/intel-microcode-20210216_p20210221
index 1ec5855a5827..e4ae23506327 100644
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20210216_p20210221
+++ b/metadata/md5-cache/sys-firmware/intel-microcode-20210216_p20210221
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( initramfs split-ucode )
 RESTRICT=binchecks bindist mirror strip
 SLOT=0
 SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20210216.tar.gz https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20210221.tar.xz
-_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=58ad5fc2332b379a591fb60b044db65e
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20210216_p20210514 b/metadata/md5-cache/sys-firmware/intel-microcode-20210216_p20210514
index d81d16f064e2..55be73107da2 100644
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20210216_p20210514
+++ b/metadata/md5-cache/sys-firmware/intel-microcode-20210216_p20210514
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( initramfs split-ucode )
 RESTRICT=binchecks bindist mirror strip
 SLOT=0
 SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20210216.tar.gz https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20210514.tar.xz
-_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=58ad5fc2332b379a591fb60b044db65e
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20210608_p20210608 b/metadata/md5-cache/sys-firmware/intel-microcode-20210608_p20210608
index 33c7a75b8aca..679622f58f79 100644
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20210608_p20210608
+++ b/metadata/md5-cache/sys-firmware/intel-microcode-20210608_p20210608
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( initramfs split-ucode )
 RESTRICT=binchecks bindist mirror strip
 SLOT=0
 SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20210608.tar.gz https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20210608.tar.xz
-_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=58ad5fc2332b379a591fb60b044db65e
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20210608_p20210830 b/metadata/md5-cache/sys-firmware/intel-microcode-20210608_p20210830
index ef4955def02e..6263ee79c15b 100644
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20210608_p20210830
+++ b/metadata/md5-cache/sys-firmware/intel-microcode-20210608_p20210830
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( initramfs split-ucode )
 RESTRICT=binchecks bindist mirror strip
 SLOT=0
 SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20210608.tar.gz https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20210830.tar.xz
-_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=58ad5fc2332b379a591fb60b044db65e
diff --git a/metadata/md5-cache/sys-firmware/ipw2100-firmware-1.3 b/metadata/md5-cache/sys-firmware/ipw2100-firmware-1.3
deleted file mode 100644
index 6fc1a17a4618..000000000000
--- a/metadata/md5-cache/sys-firmware/ipw2100-firmware-1.3
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Firmware for the Intel PRO/Wireless 2100 3B miniPCI adapter
-EAPI=5
-HOMEPAGE=http://ipw2100.sourceforge.net/
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=ipw2100-fw
-SLOT=1.3
-SRC_URI=mirror://gentoo/ipw2100-fw-1.3.tgz
-_md5_=498aec967139aa192d7485ba39ba09ec
diff --git a/metadata/md5-cache/sys-firmware/ipw2100-firmware-1.3-r1 b/metadata/md5-cache/sys-firmware/ipw2100-firmware-1.3-r1
index ff814ed2ef97..ec356e1d3673 100644
--- a/metadata/md5-cache/sys-firmware/ipw2100-firmware-1.3-r1
+++ b/metadata/md5-cache/sys-firmware/ipw2100-firmware-1.3-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Firmware for the Intel PRO/Wireless 2100 3B miniPCI adapter
 EAPI=8
 HOMEPAGE=http://ipw2100.sourceforge.net/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=ipw2100-fw
 SLOT=1.3
 SRC_URI=mirror://gentoo/ipw2100-fw-1.3.tgz
-_md5_=152fba4965db7e3506960ff6ffcb5566
+_md5_=de557b1c54383a02341042bf8f797fb6
diff --git a/metadata/md5-cache/sys-firmware/ipw2200-firmware-3.1 b/metadata/md5-cache/sys-firmware/ipw2200-firmware-3.1
deleted file mode 100644
index b1e070660c07..000000000000
--- a/metadata/md5-cache/sys-firmware/ipw2200-firmware-3.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Firmware for the Intel PRO/Wireless 2200BG/2915ABG miniPCI and 2225BG PCI
-EAPI=5
-HOMEPAGE=http://ipw2200.sourceforge.net/
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=ipw2200-fw
-SLOT=0
-SRC_URI=http://www.bughost.org/firmware/ipw2200-fw-3.1.tgz
-_md5_=ed682637226366137c9b46733144152f
diff --git a/metadata/md5-cache/sys-firmware/ipw2200-firmware-3.1-r1 b/metadata/md5-cache/sys-firmware/ipw2200-firmware-3.1-r1
index a9b7b07a5eee..7bd56d692741 100644
--- a/metadata/md5-cache/sys-firmware/ipw2200-firmware-3.1-r1
+++ b/metadata/md5-cache/sys-firmware/ipw2200-firmware-3.1-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Firmware for the Intel PRO/Wireless 2200BG/2915ABG miniPCI and 2225BG PCI
 EAPI=8
 HOMEPAGE=http://ipw2200.sourceforge.net/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=ipw2200-fw
 SLOT=0
 SRC_URI=mirror://gentoo/ipw2200-fw-3.1.tgz
-_md5_=ebb2defbf4ac9e1918c12463431d8d71
+_md5_=3dde0ef5d5cd542df210f50cd40d4e1c
diff --git a/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211 b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211
index a6832e93ac3b..b50a18c027f4 100644
--- a/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211
+++ b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 REQUIRED_USE=!amd64? ( !x86? ( binary ) )
 SLOT=0
 SRC_URI=!binary? ( https://git.ipxe.org/ipxe.git/snapshot/546dd51de8459d4d09958891f426fa2c73ff090d.tar.bz2 -> ipxe-1.0.0_p20180211-546dd51.tar.bz2 ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/ipxe-1.0.0_p20180211-546dd51-bin.tar.xz )
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=29963ebe5065538d2d33c2d4e2c8f8aa
diff --git a/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20190728 b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20190728
index e44f9785fd37..4c8f4ab17ffe 100644
--- a/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20190728
+++ b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20190728
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 REQUIRED_USE=!amd64? ( !x86? ( binary ) )
 SLOT=0
 SRC_URI=!binary? ( https://git.ipxe.org/ipxe.git/snapshot/a4f8c6e31f6c62522cfc633bbbffa81b22f9d6f3.tar.bz2 -> ipxe-1.0.0_p20190728-a4f8c6e.tar.bz2 ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/ipxe-1.0.0_p20190728-a4f8c6e-bin.tar.xz )
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=571f202510b0ed2a6beaa62eba755f94
diff --git a/metadata/md5-cache/sys-firmware/ipxe-1.21.1 b/metadata/md5-cache/sys-firmware/ipxe-1.21.1
index c5ff83d8f99e..01351caebf46 100644
--- a/metadata/md5-cache/sys-firmware/ipxe-1.21.1
+++ b/metadata/md5-cache/sys-firmware/ipxe-1.21.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 REQUIRED_USE=!amd64? ( !x86? ( binary ) )
 SLOT=0
 SRC_URI=!binary? ( https://github.com/ipxe/ipxe/archive/refs/tags/v1.21.1.tar.gz -> ipxe-1.21.1.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/ipxe-1.21.1-bin.tar.xz )
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=332d436052c41289e22b438d59fc23df
diff --git a/metadata/md5-cache/sys-firmware/ivtv-firmware-20080701-r1 b/metadata/md5-cache/sys-firmware/ivtv-firmware-20080701-r1
deleted file mode 100644
index f4d4a523a821..000000000000
--- a/metadata/md5-cache/sys-firmware/ivtv-firmware-20080701-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=firmware for Hauppauge PVR-x50 and Conexant 2341x based cards
-EAPI=5
-HOMEPAGE=http://www.ivtvdriver.org/index.php/Firmware
-KEYWORDS=amd64 ppc x86
-LICENSE=Hauppauge-Firmware
-SLOT=0
-SRC_URI=mirror://gentoo/ivtv-firmware-20080701.tar.gz
-_md5_=d294deb96dc0cf2dfaa36bade480741a
diff --git a/metadata/md5-cache/sys-firmware/ivtv-firmware-20080701-r2 b/metadata/md5-cache/sys-firmware/ivtv-firmware-20080701-r2
index 918bbaa6c79b..7a64f77f4553 100644
--- a/metadata/md5-cache/sys-firmware/ivtv-firmware-20080701-r2
+++ b/metadata/md5-cache/sys-firmware/ivtv-firmware-20080701-r2
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=firmware for Hauppauge PVR-x50 and Conexant 2341x based cards
 EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=Hauppauge-Firmware
 SLOT=0
 SRC_URI=mirror://gentoo/ivtv-firmware-20080701.tar.gz
-_md5_=22bc2019777841d965ca66e0401b10f0
+_md5_=a46b84a3abb0fe29b9c27be5ffaf6751
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p2 b/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p2
index 953718d1ea34..09e271631de9 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p2
+++ b/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p2
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
 SLOT=0
 SRC_URI=mirror://gentoo/iwl3160-7260-bt-ucode-37.8.10_p2.tgz
-_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=14e409b05f15220d21efad1741828f0a
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.16.242414 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.16.242414
index bee32a694fee..aa5512f9c36e 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.16.242414
+++ b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.16.242414
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=16
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-3160-ucode-16.242414.0.tgz -> iwl3160-ucode-0.16.242414.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=80eaf1d50670511dab8ab70bd5b663e8
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.16.242414 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.16.242414
index aa6b56a0de9d..010e4a64c294 100644
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.16.242414
+++ b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.16.242414
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=16
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-7260-ucode-16.242414.0.tgz -> iwl7260-ucode-0.16.242414.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=80eaf1d50670511dab8ab70bd5b663e8
diff --git a/metadata/md5-cache/sys-firmware/iwl8000-ucode-16.242414.0 b/metadata/md5-cache/sys-firmware/iwl8000-ucode-16.242414.0
index aa0a417b5961..5bd85d4ae604 100644
--- a/metadata/md5-cache/sys-firmware/iwl8000-ucode-16.242414.0
+++ b/metadata/md5-cache/sys-firmware/iwl8000-ucode-16.242414.0
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
 SLOT=0
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-8000-ucode-16.242414.0.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=a148adbff178027a90f38e51621a9fec
diff --git a/metadata/md5-cache/sys-firmware/midisport-firmware-1.2-r1 b/metadata/md5-cache/sys-firmware/midisport-firmware-1.2-r1
index 1f968cb9a6ca..29cc911d3508 100644
--- a/metadata/md5-cache/sys-firmware/midisport-firmware-1.2-r1
+++ b/metadata/md5-cache/sys-firmware/midisport-firmware-1.2-r1
@@ -9,5 +9,5 @@ LICENSE=Midisport
 RDEPEND=sys-apps/fxload virtual/udev
 SLOT=0
 SRC_URI=http://downloads.sourceforge.net/usb-midi-fw/midisport-firmware-1.2.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=21562b9b4c2355d319700848b81297c8
diff --git a/metadata/md5-cache/sys-firmware/nvidia-firmware-340.32-r1 b/metadata/md5-cache/sys-firmware/nvidia-firmware-340.32-r1
index 514bec9a985d..4b4bd618856e 100644
--- a/metadata/md5-cache/sys-firmware/nvidia-firmware-340.32-r1
+++ b/metadata/md5-cache/sys-firmware/nvidia-firmware-340.32-r1
@@ -8,5 +8,5 @@ LICENSE=MIT NVIDIA-r2
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=http://us.download.nvidia.com/XFree86/Linux-x86/340.32/NVIDIA-Linux-x86-340.32.run https://raw.githubusercontent.com/envytools/firmware/a0b9f9be0efad90cc84b8b2eaf587c3d7d350ea9/extract_firmware.py -> nvidia_extract_firmware-a0b9f9be0efad90cc84b8b2eaf587c3d7d350ea9.py
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
 _md5_=2716098c12e7d6b01f844dbe52fb0e3c
diff --git a/metadata/md5-cache/sys-firmware/raspberrypi-wifi-ucode-20190114.1_p11 b/metadata/md5-cache/sys-firmware/raspberrypi-wifi-ucode-20190114.1_p11
index d953d53955c2..4b461acab2f1 100644
--- a/metadata/md5-cache/sys-firmware/raspberrypi-wifi-ucode-20190114.1_p11
+++ b/metadata/md5-cache/sys-firmware/raspberrypi-wifi-ucode-20190114.1_p11
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare pretend
 DESCRIPTION=Most up-to-date uCode for the Broadcom wifi chips on Raspberry Pi SBCs
 EAPI=7
 HOMEPAGE=https://github.com/RPi-Distro/firmware-nonfree https://archive.raspberrypi.org/debian/pool/main/f/firmware-nonfree
-KEYWORDS=~arm ~arm64
+KEYWORDS=arm arm64
 LICENSE=Broadcom
 RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
 SLOT=0
 SRC_URI=https://archive.raspberrypi.org/debian/pool/main/f/firmware-nonfree/firmware-nonfree_20190114-1+rpt11.debian.tar.xz
-_md5_=75388c51227af6115e476b362c87e23a
+_md5_=59215fed204c3e7eccf0f0298a8a7c95
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.12.0 b/metadata/md5-cache/sys-firmware/seabios-1.12.0
index c165e1bb668f..8c77b97f317e 100644
--- a/metadata/md5-cache/sys-firmware/seabios-1.12.0
+++ b/metadata/md5-cache/sys-firmware/seabios-1.12.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3 GPL-3
 REQUIRED_USE=debug? ( !binary ) !amd64? ( !x86? ( binary ) )
 SLOT=0
 SRC_URI=!binary? ( https://code.coreboot.org/p/seabios/downloads/get/seabios-1.12.0.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/seabios-1.12.0-bin.tar.xz )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=84da5fa9566738985e3bf56bcfee4596
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.12.0-r1 b/metadata/md5-cache/sys-firmware/seabios-1.12.0-r1
index 9a830928c380..900c0f3f2ee5 100644
--- a/metadata/md5-cache/sys-firmware/seabios-1.12.0-r1
+++ b/metadata/md5-cache/sys-firmware/seabios-1.12.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3 GPL-3
 REQUIRED_USE=debug? ( !binary )
 SLOT=0
 SRC_URI=!binary? ( https://code.coreboot.org/p/seabios/downloads/get/seabios-1.12.0.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/seabios-1.12.0-bin.tar.xz )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=b7454a08f42bc5b1a52951c023db4981
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.14.0 b/metadata/md5-cache/sys-firmware/seabios-1.14.0
index 8aedc61c103c..30ea1b7f0d06 100644
--- a/metadata/md5-cache/sys-firmware/seabios-1.14.0
+++ b/metadata/md5-cache/sys-firmware/seabios-1.14.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3 GPL-3
 REQUIRED_USE=debug? ( !binary )
 SLOT=0
 SRC_URI=!binary? ( https://www.seabios.org/downloads/seabios-1.14.0.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/seabios-1.14.0-bin.tar.xz )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=cd9c2fe728570145c9e2466d744b8ac5
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.14.0-r1 b/metadata/md5-cache/sys-firmware/seabios-1.14.0-r1
index 54c677e7510d..d90302ead56c 100644
--- a/metadata/md5-cache/sys-firmware/seabios-1.14.0-r1
+++ b/metadata/md5-cache/sys-firmware/seabios-1.14.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3 GPL-3
 REQUIRED_USE=debug? ( !binary )
 SLOT=0
 SRC_URI=!binary? ( https://www.seabios.org/downloads/seabios-1.14.0.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/seabios-1.14.0-bin.tar.xz )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=e9d74c24f51c4438e67e85d22cde1f0a
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.14.0-r2 b/metadata/md5-cache/sys-firmware/seabios-1.14.0-r2
index c99f0bf224ae..4f577d871cc3 100644
--- a/metadata/md5-cache/sys-firmware/seabios-1.14.0-r2
+++ b/metadata/md5-cache/sys-firmware/seabios-1.14.0-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-3 GPL-3
 REQUIRED_USE=debug? ( !binary )
 SLOT=0
 SRC_URI=!binary? ( https://www.seabios.org/downloads/seabios-1.14.0.tar.gz ) binary? ( https://dev.gentoo.org/~sam/distfiles/seabios-1.14.0-r2-bin.tar.xz )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=7090ade5b63a97a4fd051201338fba47
diff --git a/metadata/md5-cache/sys-firmware/sgabios-0.1_pre10 b/metadata/md5-cache/sys-firmware/sgabios-0.1_pre10
index eaeb6538f438..4cf4f6f51aa5 100644
--- a/metadata/md5-cache/sys-firmware/sgabios-0.1_pre10
+++ b/metadata/md5-cache/sys-firmware/sgabios-0.1_pre10
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 REQUIRED_USE=!amd64? ( !x86? ( binary ) )
 SLOT=0
 SRC_URI=mirror://gentoo/sgabios-0.1_pre10.tar.gz !binary? ( https://dev.gentoo.org/~tamiko/distfiles/sgabios-0.1_pre10.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/sgabios-0.1_pre10-bin.tar.xz )
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=85cf599118140bec6d2131979ddb0103
diff --git a/metadata/md5-cache/sys-firmware/sgabios-0.1_pre8-r1 b/metadata/md5-cache/sys-firmware/sgabios-0.1_pre8-r1
index ae702843e876..be02069d372b 100644
--- a/metadata/md5-cache/sys-firmware/sgabios-0.1_pre8-r1
+++ b/metadata/md5-cache/sys-firmware/sgabios-0.1_pre8-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 REQUIRED_USE=!amd64? ( !x86? ( binary ) )
 SLOT=0
 SRC_URI=mirror://gentoo/sgabios-0.1_pre8.tar.xz !binary? ( https://dev.gentoo.org/~cardoe/distfiles/sgabios-0.1_pre8.tar.xz ) binary? ( https://dev.gentoo.org/~cardoe/distfiles/sgabios-0.1_pre8-bins.tar.xz )
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=98661b7ef0abd376121c24fe11b7fc0c
diff --git a/metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-9999 b/metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-9999
index 6c40d248f9ac..49469a0d2c39 100644
--- a/metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-9999
+++ b/metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-9999
@@ -7,5 +7,5 @@ HOMEPAGE=https://sigrok.org/wiki/Fx2lafw
 LICENSE=GPL-2+
 PROPERTIES=live
 SLOT=0
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=841adf2779564d37ddb9bf356544a654
diff --git a/metadata/md5-cache/sys-firmware/sof-firmware-1.9.3-r1 b/metadata/md5-cache/sys-firmware/sof-firmware-1.9.3-r1
new file mode 100644
index 000000000000..effe35f51943
--- /dev/null
+++ b/metadata/md5-cache/sys-firmware/sof-firmware-1.9.3-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Sound Open Firmware (SOF) binary files
+EAPI=8
+HOMEPAGE=https://www.sofproject.org https://github.com/thesofproject/sof https://github.com/thesofproject/sof-bin
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=media-libs/alsa-lib
+SLOT=0
+SRC_URI=https://github.com/thesofproject/sof-bin/releases/download/v1.9.3/sof-bin-v1.9.3.tar.gz -> sof-firmware-1.9.3.tar.gz
+_md5_=06d973cd03d9d04f1e30e83390b73c8d
diff --git a/metadata/md5-cache/sys-firmware/zd1201-firmware-0.14 b/metadata/md5-cache/sys-firmware/zd1201-firmware-0.14
deleted file mode 100644
index b9395d517ef1..000000000000
--- a/metadata/md5-cache/sys-firmware/zd1201-firmware-0.14
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Firmware for ZyDAS 1201 based USB 802.11b Network WiFi devices
-EAPI=5
-HOMEPAGE=http://linux-lc100020.sourceforge.net/
-KEYWORDS=amd64 ppc64 x86
-LICENSE=|| ( GPL-3 MPL-1.1 )
-SLOT=0
-SRC_URI=mirror://sourceforge/linux-lc100020/zd1201-0.14-fw.tar.gz
-_md5_=dede965140d27d719f9d1e83b77598f2
diff --git a/metadata/md5-cache/sys-firmware/zd1201-firmware-0.14-r1 b/metadata/md5-cache/sys-firmware/zd1201-firmware-0.14-r1
index 95b00f6c1b00..0018c243df11 100644
--- a/metadata/md5-cache/sys-firmware/zd1201-firmware-0.14-r1
+++ b/metadata/md5-cache/sys-firmware/zd1201-firmware-0.14-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Firmware for ZyDAS 1201 based USB 802.11b Network WiFi devices
 EAPI=8
 HOMEPAGE=http://linux-lc100020.sourceforge.net/
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ppc64 x86
 LICENSE=|| ( GPL-3 MPL-1.1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-lc100020/zd1201-0.14-fw.tar.gz
-_md5_=5aa825d2a92d64fe3acbc739cab47440
+_md5_=9f52a0670fa960353ea6068567b941e7
diff --git a/metadata/md5-cache/sys-firmware/zd1211-firmware-1.5 b/metadata/md5-cache/sys-firmware/zd1211-firmware-1.5
deleted file mode 100644
index 9ca4f5776f42..000000000000
--- a/metadata/md5-cache/sys-firmware/zd1211-firmware-1.5
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Firmware for ZyDAS ZD1211 USB-WLAN devices supported by the zd1211rw driver
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/zd1211/
-KEYWORDS=amd64 ppc ppc64 ~sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/zd1211/zd1211-firmware-1.5.tar.bz2
-_md5_=206e229c42571f904c785217f55332f5
diff --git a/metadata/md5-cache/sys-firmware/zd1211-firmware-1.5-r1 b/metadata/md5-cache/sys-firmware/zd1211-firmware-1.5-r1
index 0a4c9f257079..94d128e6a3b9 100644
--- a/metadata/md5-cache/sys-firmware/zd1211-firmware-1.5-r1
+++ b/metadata/md5-cache/sys-firmware/zd1211-firmware-1.5-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Firmware for ZyDAS ZD1211 USB-WLAN devices supported by the zd1211rw driver
 EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/zd1211/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/project/zd1211/zd1211-firmware/1.5/zd1211-firmware-1.5.tar.bz2
-_md5_=14b029e8c14fd234babdf82d6f10a5bf
+_md5_=c31ec12d32b21fe5a7b314923ff611b6