gentoo resync : 25.11.2020

21 files changed, 281 insertions, 290 deletions

diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 3668460d06c4..502aeed0ba6f 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/alsa-firmware/Manifest b/sys-firmware/alsa-firmware/Manifest
index 25e93ce19859..cb430e2ef5f1 100644
--- a/sys-firmware/alsa-firmware/Manifest
+++ b/sys-firmware/alsa-firmware/Manifest
@@ -1,6 +1,6 @@
 AUX 52-usx2yaudio.rules 971 BLAKE2B 1a8b0bf26b61694c95cbfd50e20096255dc0cf8c77b4f5bcf155ae6d163aaa1b6e8a658c864fc2391f5743b8f3a2702e7c03f1fcd7cab12877c5a5d607a42d56 SHA512 5c3ac0e03a496384ea58f6da479c932cb2d2f91f110703d71d0bea60329ebfba8a1a0e78eb951c9854b7fe0dcc9943d10f436fe9acd04848ea780e90ac274f17
-DIST alsa-firmware-1.0.29.tar.bz2 4996942 BLAKE2B cee20bda58653548c8f88ec83657d30a19cad93df25db2f5f982b673d02da28dd9f623d6981b70da97e8f882fdd20b37f2d4c401c36ad977a67503f548e36186 SHA512 f4307c33fb6f401c86e88b82878b8300447ac97bbbe06e83bd69a38cbdd7b4a0ba6faa4f20081f11167805de65c66b7db643483f8669eae3284bc1c4da8d44a4
 DIST alsa-firmware-1.2.1.tar.bz2 5146513 BLAKE2B c3d6047f484e78b3ddcfb23c30aaeb583088e025e4fae47e1a94cf987414524c1324b327f6679a0a8abc24e5c90b0c9454520714045bdaef11c5a01522803c81 SHA512 573bb13d47309253afa7d4d04ef13a7a5e4d18d8f89b1339630266f0ef6638cbb9381b3efce2604ea63fc9cf90a55ecaecf8eb2cccd58da04d0d283a245618b1
-EBUILD alsa-firmware-1.0.29.ebuild 2766 BLAKE2B 89233d9c3afc7f7f1a2b47ad8c47961da63175c3d185c89f7ad1ab9f8a05c9f7f53be565a65ae0a52f1c236554a1a0a4724345e67fb1f527320343e9cd431aa6 SHA512 875a31c3859bcb8f3e08b418b61a8283a2e0caae6fc1669b81620c586cbd1b20a8a85cf18a393c88976b1b4d7b27c5e32eb5a5a32a7aca3374a061376d4cb226
+DIST alsa-firmware-1.2.4.tar.bz2 5154366 BLAKE2B 0f844f6cc4859b72635f24d347b4c790469aee39aa60d9addb2c168dcf06b48e7e3cbba26ff21c7e1f5aa355641eec7ab934cb09bfac8ca116a6ac6a7db9d548 SHA512 041f54744fe30fa94781968c89c77ab9073fc9a828014d07a0f7e0f11c4185ace6846d5d2a313fcca6e9cda6e4837fd6f62e883b0fdb0a4e30a8c18ba7b2e05d
 EBUILD alsa-firmware-1.2.1.ebuild 2763 BLAKE2B 3a3f65021efb777a56e217b324009869fd2bf50ccc6bffcc0e21ffec10987ddd193660ec992795fcaa64279c4866e04b1b3c7087da1df04a87363327a6a913f4 SHA512 42d608060b00e034f0a9bd1579a807ae63c2c4fade2be9c88b1ef5a5b68a4bac9290b8b9b6154e3c9e8dc08ab21f5c4a679e95a5a5278a4c5bf6ec3e98a7e430
+EBUILD alsa-firmware-1.2.4.ebuild 2767 BLAKE2B ce9418e9a43da4b35319cb6d35e71451405176a200529537c6deb25c9386d246500f5592f3f1863aab8ddb62659f102d8a5da11427ee24317e7cc762c0c14ff1 SHA512 28f0ce8e980305f892768fbef6923ede5007ba11a9dbe9e05d182e27d69391cce25ed577d451582b2739336c8f4078fb09882e6dccf5f43b841c5f435d834f3f
 MISC metadata.xml 217 BLAKE2B ee5131ede673a41d69ab787db1d05f6d64afc4d625294c8314d0db362124dddca5b31ff6d29cc41ebb3f464f4665e2bc9bccfac84f69231ebe819d262e8ed7c7 SHA512 783364e33af22e28ba41661e2380968c95f6464ae9ebb300d542ca159a54c4e53cf5e8b1053a72e75902f433e90fa26f6456fa127fca6daa44542bda57779e5a
diff --git a/sys-firmware/alsa-firmware/alsa-firmware-1.0.29.ebuild b/sys-firmware/alsa-firmware/alsa-firmware-1.2.4.ebuild
index 9e10ef96150b..3a01f161cdb6 100644
--- a/sys-firmware/alsa-firmware/alsa-firmware-1.0.29.ebuild
+++ b/sys-firmware/alsa-firmware/alsa-firmware-1.2.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 inherit udev
 
 DESCRIPTION="Advanced Linux Sound Architecture firmware"
@@ -10,7 +10,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/firmware/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 ECHOAUDIO_CARDS="alsa_cards_darla20 alsa_cards_gina20 alsa_cards_layla20
 alsa_cards_darla24 alsa_cards_gina24 alsa_cards_layla24 alsa_cards_mona
diff --git a/sys-firmware/edk2-ovmf/Manifest b/sys-firmware/edk2-ovmf/Manifest
index 4a62bbb4a6d4..7b7095dd62b7 100644
--- a/sys-firmware/edk2-ovmf/Manifest
+++ b/sys-firmware/edk2-ovmf/Manifest
@@ -1,6 +1,12 @@
+DIST brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz 23855739 BLAKE2B 7406ec5b29ac66afbcd7c1376bb3208f298d19b6592b2869c52173aa64947d58bd443f9a61c67deaf046be910a0e31c0b843e5508e97e0e1f5e7bce100d86904 SHA512 df8e90562c4fd7f0e787949df6bc4f5a165b39bd333f442d27874fe65640fbba268f9350d7113e6761a5acceb66d78e75f1a296e5a89b94574edf28109cdc812
 DIST edk2-ovmf-201905-bin.tar.xz 3017256 BLAKE2B 6a106f111a363f1c2de33c4e7eba48183da6047654512939c286c6d0369e3b4c7705c271e61fa95299ba2b629022be7b5ef665ff096d41373583f5409b5c32fb SHA512 4a174dc1d64769a93de3bf5f9d787e278bfab57e2317699d722aa772e64e8867b3998b7feee58d5e4c66adc79ba9c5023dae2ce786159db7a740b86cf35d923d
 DIST edk2-ovmf-201905-bundled.tar.xz 3538508 BLAKE2B a1766180c84ee83987f50fdb6a6c9891dfb983ff78c98f7bc38635ffe484ebf29d4286ff97d7747080e28a655ff14b5939d4505d75ebe6655ecacc7f9d405469 SHA512 be3d8ef1ffb1ddce64883d9ef8dc598c7026d23d2e33c33949d28de81513b6a7f04f840ccb3d42664e918c6603487fbe594261c327921f3250c3998218572774
 DIST edk2-ovmf-201905.tar.gz 14551747 BLAKE2B 6fb3385445fd01c0dea26295a68de2691524e55c96d8a0e85aab1385a9abddc47c13ce3236b952c1299514e542ad0fa4bc9550cc4527945c05109d227a698293 SHA512 91188923f7d1ab83c0d6abf7ec6d59f357d0341a617ad6a3ae05f3d0e041dff43f62b014b0c5fc5d15e16d8f1c279c581a5cd64b31e3d52b340d7ef90adb50f1
-EBUILD edk2-ovmf-201905.ebuild 4359 BLAKE2B 1c4b6e6ae407b79c675a3f2a52cc0295a6778dea3e4709ef3b35294d2a54eba379a51a6de0c6926dd3319275f0df8223fef86b93e2920d574ff29a5c68831bc7 SHA512 364e1731e111d997464c156cf9f7e63a854c741f6685b5356624a2e79fee5b3e9b90b9c2fc99cce59d1c42a76e37ac58b95b397372d3589205fda2559d52636c
+DIST edk2-ovmf-202008-bin.tar.xz 3486024 BLAKE2B 8283db554ad7024e3a55b62ed0a560ed9f729d728f1dee3806814b1eb8d89dabc4fd70433f7f77656b65d9af7919d036074a53a95190a1aa8b65ab7d73495ffc SHA512 d0c8b249a7a2124e8bb63a4358466e86a3a837e76586565dd4762351998d8561374eabb8a1303dbf71ac269c15552d9e8cff71d65bc6fe8a3a81fb4fb032e0d8
+DIST edk2-ovmf-202008-qemu-firmware.tar.xz 680 BLAKE2B 176f8e94a3f605acc72850634cbf155619490f5998125521a392a8e9c7d2b78841b841f0cb5ea860f14645b124cf1921256bbe46960efbe3401805d89bbfbed6 SHA512 b72f248ab4d49503c3e8e686e22beb77f0e48d2c6c9523f389f20504e0c30fa11fa0fcb5607d7d5bb1ba2433894fa458864c5761335e39de4b2a40b01203f043
+DIST edk2-ovmf-202008.tar.gz 13172590 BLAKE2B 10acf77d0e70e21ca425ea41c0062f8cebe2cc607b93a2a253bcd87cea1546e791776a34d43fbf4f1040f4fc32e3ee413d44873d0f00b9e523816519cfed634e SHA512 c32340104f27b9b85f79e934cc9eeb739d47b01e13975c88f39b053e9bc5a1ecfe579ab3b63fc7747cc328e104b337b53d41deb4470c3f20dbbd5552173a4666
+DIST openssl-e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72.tar.gz 9981169 BLAKE2B 33aac7364cdd45fec5654ab6caef84e1a829464380419c8a6bb311055c5a01c0aaff6e046a7c541a87e908fa9d26bae652f5be901461d03df36f2522f9c34b0c SHA512 db2087c04f0b428b3f4e1c8b3ac53cce69e0fd331ed2b86ba00facafd1685864d73f71c13eee48f4fe0af2bddad848f84a2b8ed2a17fabdf7fa2ed7d9eb39371
+EBUILD edk2-ovmf-201905.ebuild 4551 BLAKE2B d8a4d49209fbbef5758ae21a97407aa3c9fae95ab39b6dd70c110767c838ee670effeefc645e42193a9715b610373c854c92c1fb5a0551bc11261a7a1a761d98 SHA512 8b64ad649b3c38a0256341fd15d8b9ea5cce18edc4d6e588043dcb64ebf36d7cb8f1b46a79fb1673cad3ce563d1ee22af28568694d40b48c39f8b6754417ca71
+EBUILD edk2-ovmf-202008.ebuild 5443 BLAKE2B 90c132bbcd6d0b2409186ee5d05c7a6464f3a9e7add6d9f707fa0323150129e5b6ef46bb28c3c438d08652a6349b38f8b03113a5b0143c034eb37c17c7f7286b SHA512 a51369cfeae583f11eca52a38c2a78ba4f55422ced0f375284394a90f95c3f2ef89991faf685473417fa63c77fff8702269107c46af027fc8dec20a7b0410247
 EBUILD edk2-ovmf-999999.ebuild 3892 BLAKE2B db584887a75633b6ee59c6cac80a08471b05122ba03a505e457f418266464ad946e83c5a3324fbed0bf133ddcb6f6f964627923838e8b7f1bc0ab3760b60fcca SHA512 ceeaae071df011ac577e8e8ffd2430f877c0a778c6858868b2cbb89fadabb0390c9ffe8099da9a2d534212171078c34682eca54b62829453619a001a95beb718
 MISC metadata.xml 435 BLAKE2B b33371654b280e097ad5d112081f115446cb01a0efcf3e712bcad7e5a51d95b77f55d0e218c4767803675b71d24b405616849f57051fda492acf5d3c0e8fd1dc SHA512 d1e6233650fc1ea3a25bead14091877b9f507d2bc78cec6436e1b6e17477e40517b74da66e26b6bd39259e4ca308d724324296f1a6c353fed2f8bf112029b90f
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
index 4a71ef4068c3..8b1c10b16ffa 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
@@ -36,7 +36,7 @@ else
 		)
 		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
 		"
-	KEYWORDS="amd64 arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
 	IUSE="+binary"
 	REQUIRED_USE+="
 		!amd64? ( binary )
@@ -96,6 +96,11 @@ pkg_setup() {
 }
 
 src_prepare() {
+	if ! use binary; then
+		sed -i -r \
+			-e "/function SetupPython3/,/\}/{s,\\\$\(whereis python3\),${EPYTHON},g}" \
+			"${S}"/edksetup.sh || die "Fixing for correct Python3 support failed"
+	fi
 	if  [[ ${PV} != "999999" ]] && use binary; then
 		eapply_user
 		return
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
new file mode 100644
index 000000000000..8d1425ab22a3
--- /dev/null
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit eutils python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
+HOMEPAGE="https://github.com/tianocore/edk2"
+
+NON_BINARY_DEPEND="
+	app-emulation/qemu
+	>=dev-lang/nasm-2.0.7
+	>=sys-power/iasl-20160729
+	${PYTHON_DEPS}
+"
+DEPEND=""
+RDEPEND=""
+if [[ ${PV} == "999999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/tianocore/edk2"
+	DEPEND+="
+		${NON_BINARY_DEPEND}
+	"
+else
+	BUNDLED_OPENSSL_SUBMODULE_SHA="e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72"
+	BUNDLED_BROTLI_SUBMODULE_SHA="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
+	# Binary versions taken from fedora:
+	# http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/e/
+	#   edk2-ovmf-20200801stable-1.fc34.noarch.rpm
+
+	# TODO: talk with tamiko about unbundling
+	SRC_URI="
+		!binary? (
+			https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${P}.tar.gz
+			https://github.com/openssl/openssl/archive/${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz -> openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz
+			https://github.com/google/brotli/archive/${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz -> brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz
+		)
+		binary? ( https://dev.gentoo.org/~mva/distfiles/${P}-bin.tar.xz )
+		https://dev.gentoo.org/~mva/distfiles/${P}-qemu-firmware.tar.xz
+	"
+	KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
+	IUSE="+binary"
+	REQUIRED_USE+="
+		!amd64? ( binary )
+	"
+	DEPEND+="
+		!binary? (
+			amd64? (
+				${NON_BINARY_DEPEND}
+			)
+		)"
+	PATCHES=(
+	)
+fi
+
+LICENSE="BSD-2 MIT"
+SLOT="0"
+
+S="${WORKDIR}/edk2-edk2-stable${PV}"
+
+DISABLE_AUTOFORMATTING=true
+DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
+virtual machines. The firmware is located under
+	/usr/share/edk2-ovmf/OVMF_CODE.fd
+	/usr/share/edk2-ovmf/OVMF_VARS.fd
+	/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd
+
+If USE=binary is enabled, we also install an OVMF variables file (coming from
+fedora) that contains secureboot default keys
+
+	/usr/share/edk2-ovmf/OVMF_VARS.secboot.fd
+
+If you have compiled this package by hand, you need to either populate all
+necessary EFI variables by hand by booting
+	/usr/share/edk2-ovmf/UefiShell.(iso|img)
+or creating OVMF_VARS.secboot.fd by hand:
+	https://github.com/puiterwijk/qemu-ovmf-secureboot
+
+The firmware does not support csm (due to no free csm implementation
+available). If you need a firmware with csm support you have to download
+one for yourself. Firmware blobs are commonly labeled
+	OVMF{,_CODE,_VARS}-with-csm.fd
+
+In order to use the firmware you can run qemu the following way
+
+	$ qemu-system-x86_64 \
+		-drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
+		...
+
+You can register the firmware for use in libvirt by adding to /etc/libvirt/qemu.conf:
+	nvram = [
+		\"/usr/share/edk2-ovmf/OVMF_CODE.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
+		\"/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
+	]"
+
+pkg_setup() {
+	[[ ${PV} != "999999" ]] && use binary || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if ! use binary; then
+		sed -i -r \
+			-e "/function SetupPython3/,/\}/{s,\\\$\(whereis python3\),${EPYTHON},g}" \
+			"${S}"/edksetup.sh || die "Fixing for correct Python3 support failed"
+	fi
+	if  [[ ${PV} != "999999" ]]; then
+		if use binary; then
+			eapply_user
+			return
+		else
+			# Bundled submodules
+			cp -rl "${WORKDIR}/openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}"/* "CryptoPkg/Library/OpensslLib/openssl/"
+			cp -rl "${WORKDIR}/brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}"/* "BaseTools/Source/C/BrotliCompress/brotli/"
+			cp -rl "${WORKDIR}/brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}"/* "MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/"
+		fi
+	fi
+	default
+}
+
+src_compile() {
+	TARGET_ARCH=X64
+	TARGET_NAME=RELEASE
+	TARGET_TOOLS=GCC49
+
+	BUILD_FLAGS="-D TLS_ENABLE \
+		-D HTTP_BOOT_ENABLE \
+		-D NETWORK_IP6_ENABLE \
+		-D FD_SIZE_2MB"
+
+	SECUREBOOT_BUILD_FLAGS="${BUILD_FLAGS} \
+		-D SECURE_BOOT_ENABLE \
+		-D SMM_REQUIRE \
+		-D EXCLUDE_SHELL_FROM_FD"
+
+	[[ ${PV} != "999999" ]] && use binary && return
+
+	emake ARCH=${TARGET_ARCH} -C BaseTools
+
+	. ./edksetup.sh
+
+	# Build all EFI firmware blobs:
+
+	mkdir -p ovmf
+
+	./OvmfPkg/build.sh \
+		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
+		${BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
+
+	cp Build/OvmfX64/*/FV/OVMF_*.fd ovmf/
+	rm -rf Build/OvmfX64
+
+	./OvmfPkg/build.sh \
+		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
+		${SECUREBOOT_BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
+
+	cp Build/OvmfX64/*/FV/OVMF_CODE.fd ovmf/OVMF_CODE.secboot.fd || die "cp failed"
+	cp Build/OvmfX64/*/X64/Shell.efi ovmf/ || die "cp failed"
+	cp Build/OvmfX64/*/X64/EnrollDefaultKeys.efi ovmf || die "cp failed"
+
+	# Build a convenience UefiShell.img:
+
+	mkdir -p iso_image/efi/boot || die "mkdir failed"
+	cp ovmf/Shell.efi iso_image/efi/boot/bootx64.efi || die "cp failed"
+	cp ovmf/EnrollDefaultKeys.efi iso_image || die "cp failed"
+	qemu-img convert --image-opts \
+		driver=vvfat,floppy=on,fat-type=12,label=UEFI_SHELL,dir=iso_image \
+		ovmf/UefiShell.img || die "qemu-img failed"
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins ovmf/*
+
+	insinto /usr/share/qemu/firmware
+	doins qemu/*
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-firmware/intel-microcode/Manifest b/sys-firmware/intel-microcode/Manifest
index adf2e04c4f85..98128c970334 100644
--- a/sys-firmware/intel-microcode/Manifest
+++ b/sys-firmware/intel-microcode/Manifest
@@ -1,7 +1,5 @@
-DIST intel-microcode-collection-20200617.tar.xz 6097076 BLAKE2B cbd323fb98569c58c3d89f0f7ae3bb4b215c518d90a83086e19fba9f61cfc591908e24a3d8620f93fbd6b6aa418ceb4e8899684dab3bc9450d4af08314d7a243 SHA512 0e99a75c1632da1e80b6d888b313d280e97e2902b51a21d2551444a5b6a332f85e8a008f69553b7154c50e68f90bfe7f86e152e2babd7a2d0b839ff27d18f8c0
-DIST intel-microcode-collection-20200921.tar.xz 6482440 BLAKE2B d8cc478bf61c750fc73f1fd55ce8d8dd6655abc79bea77d2dfa21241ee0ff44c10931e28c6343494433d8dc1784b5bbf6ab47e5c8d5fa7c230749e057e21e33a SHA512 7c34a851b7047640557a2708bf0af9adcb40cffae73aa0c6d4a64dec33ba3df00854b056bb042d9886a9726eccb6053b418a2c515f07faa06d1ed0dfa984db05
+DIST intel-microcode-collection-20201116.tar.xz 6506624 BLAKE2B b74ec0ddafe9681ae94d6a0df1de51655004eecae83c413fa824c9ad25cf68a25059627e2809a3b8cd5b3cb18647455385de0be2b2a7fcc6bc6c30e2ccabd1af SHA512 3a1aab0af9ff6dc95778276964b457a4429aa12f13499f6f89fa48285cf8aef9a0990099a80e360b76b2d4b6a836f2528f984aab17f12d905cf237dbab2a8b33
 DIST intel-ucode-sig_0x406e3-rev_0xd6.bin 101376 BLAKE2B 66d55867954d69dda1425febd93bb8c89f7aa836d504f8b5fee127f8505bcf2246f4fcc55cc245bc5e532528d60cca2eee278de7ab5174dc2862db7982a2b36f SHA512 248066b521bf512b5d8e4a8c7e921464ce52169c954d6e4ca580d8c172cd789519e22b4cf56c212e452b4191741f0202019f7061d322c9433b5af9ce5413b567
-DIST microcode-20200616.tar.gz 3036726 BLAKE2B c4db887743c916804624683b51306ba1fdb2281c3583a35706edfd5d6fbd7027793bf6fa952ba96dacd0e9b399a8e632d4997e46e13eba89d55f49328e0b5367 SHA512 39c4de3a292da0aeef4f35624d22ca6116dc8baa7f0683b1c16f5e153ba6d9d52f0879263313ef67922eda551d998521d3721af880c22c63083d8ebce81f413f
-EBUILD intel-microcode-20200616_p20200617.ebuild 9114 BLAKE2B 8fd1b0f3d145294e5c51f57ab72cef950b71ca740e134bd8938753c50854bf77decae95d7892ced1eb228ea172e171670e04fad01c9f9f1f659db28f7dcce40d SHA512 a83264735b36af1a71a9c16cc7d78d6bb59314b9ccf24755178d382dc547d37246396b503c44e3a35ec8385d1ef6d667803da388de5b7ac58d8476ec3add7179
-EBUILD intel-microcode-20200616_p20200921.ebuild 9114 BLAKE2B 8fd1b0f3d145294e5c51f57ab72cef950b71ca740e134bd8938753c50854bf77decae95d7892ced1eb228ea172e171670e04fad01c9f9f1f659db28f7dcce40d SHA512 a83264735b36af1a71a9c16cc7d78d6bb59314b9ccf24755178d382dc547d37246396b503c44e3a35ec8385d1ef6d667803da388de5b7ac58d8476ec3add7179
+DIST microcode-20201112.tar.gz 3610834 BLAKE2B 4212924f1673afded961266a25fe6063ec6cdafaa26c8bee1c42372eb8ab5f278dc2501615b23e09e2f9809bf2792a8db317c98c170bf0c5e1dd62b7dc80a084 SHA512 0875675d065a83ee14fa34a31022ee34e46aee579d1ff192414e79861af157ae269ca7c2c462f03b3accbd45590c76e5cbf4f53d7a6ed237e410213a96459211
+EBUILD intel-microcode-20201112_p20201116-r1.ebuild 9298 BLAKE2B ff4ab91d73e431201865fc9c01df0d859abfa45ffec44942625c46e572f4283cdf79da2f8e2bcfb3d56d820e558630ce1d7404d2875be852fea1cb01e8b6ed2d SHA512 8f49e0fb4c4f1b1c5a43bfe428c1964d5d014c94d4c15b0ffda8b625395aabae4412488a70e82e855999db1b762f87c815ccd57b88c334e6e5215278520db476
 MISC metadata.xml 667 BLAKE2B f229775df839b3ddf34fcc289803ae113ad4b0ce293e036c24f3025bbd146d51c6e3ac55b4a7eb9b2ff0b6829aa020179ea4603f5e481de1c822a1deb66fd594 SHA512 a2d6bc54901a9eb12732e8fa0720c03b51ab615383f12a52019453b3a13f5c70233ee88a8d81706ce7e86eaec6d85155484cf32da288c3486d4b1a19647d2698
diff --git a/sys-firmware/intel-microcode/intel-microcode-20200616_p20200921.ebuild b/sys-firmware/intel-microcode/intel-microcode-20200616_p20200921.ebuild
deleted file mode 100644
index d20d0f472faa..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20200616_p20200921.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit linux-info toolchain-funcs mount-boot
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# https://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-COLLECTION_SNAPSHOT="${PV##*_p}"
-INTEL_SNAPSHOT="${PV/_p*}"
-#NUM="28087"
-#https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}
-#https://downloadmirror.intel.com/${NUM}/eng/microcode-${INTEL_SNAPSHOT}.tgz
-DESCRIPTION="Intel IA32/IA64 microcode update data"
-HOMEPAGE="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/"
-SRC_URI="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-${INTEL_SNAPSHOT}.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-${COLLECTION_SNAPSHOT}.tar.xz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="hostonly initramfs +split-ucode vanilla"
-REQUIRED_USE="|| ( initramfs split-ucode )"
-
-BDEPEND=">=sys-apps/iucode_tool-2.3"
-
-# !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586
-RDEPEND="hostonly? ( sys-apps/iucode_tool )"
-
-RESTRICT="binchecks bindist mirror strip"
-
-S=${WORKDIR}
-
-# Blacklist bad microcode here.
-# 0x000406f1 aka 06-4f-01 aka CPUID 406F1 require newer microcode loader
-MICROCODE_BLACKLIST_DEFAULT="-s !0x000406f1"
-
-# https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/issues/31
-MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000406e3,0xc0,eq:0x00dc"
-
-# https://bugs.gentoo.org/722768
-MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000406e3,0xc0,eq:0x00da"
-
-# In case we want to set some defaults ...
-MICROCODE_SIGNATURES_DEFAULT=""
-
-# Advanced users only!
-# Set MIRCOCODE_SIGNATURES to merge with:
-# only current CPU: MICROCODE_SIGNATURES="-S"
-# only specific CPU: MICROCODE_SIGNATURES="-s 0x00000f4a -s 0x00010676"
-# exclude specific CPU: MICROCODE_SIGNATURES="-s !0x00000686"
-
-pkg_pretend() {
-	use initramfs && mount-boot_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	if cd Intel-Linux-Processor-Microcode-Data* &>/dev/null; then
-		# new tarball format from GitHub
-		mv * ../ || die "Failed to move Intel-Linux-Processor-Microcode-Data*"
-		cd .. || die
-		rm -r Intel-Linux-Processor-Microcode-Data* || die
-	fi
-
-	mkdir intel-ucode-old || die
-	cp "${DISTDIR}"/intel-ucode-sig_0x406e3-rev_0xd6.bin "${S}"/intel-ucode-old/ || die
-
-	# Prevent "invalid file format" errors from iucode_tool
-	rm -f "${S}"/intel-ucod*/list || die
-}
-
-src_install() {
-	# This will take ALL of the upstream microcode sources:
-	# - microcode.dat
-	# - intel-ucode/
-	# In some cases, they have not contained the same content (eg the directory has newer stuff).
-	MICROCODE_SRC=(
-		"${S}"/intel-ucode/
-		"${S}"/intel-ucode-with-caveats/
-		"${S}"/intel-ucode-old/
-	)
-
-	# Allow users who are scared about microcode updates not included in Intel's official
-	# microcode tarball to opt-out and comply with Intel marketing
-	if ! use vanilla; then
-		MICROCODE_SRC+=( "${S}"/intel-microcode-collection-${COLLECTION_SNAPSHOT} )
-	fi
-
-	# These will carry into pkg_preinst via env saving.
-	: ${MICROCODE_BLACKLIST=${MICROCODE_BLACKLIST_DEFAULT}}
-	: ${MICROCODE_SIGNATURES=${MICROCODE_SIGNATUES_DEFAULT}}
-
-	opts=(
-		${MICROCODE_BLACKLIST}
-		${MICROCODE_SIGNATURES}
-		# be strict about what we are doing
-		--overwrite
-		--strict-checks
-		--no-ignore-broken
-		# we want to install latest version
-		--no-downgrade
-		# show everything we find
-		--list-all
-		# show what we selected
-		--list
-	)
-
-	# The earlyfw cpio needs to be in /boot because it must be loaded before
-	# rootfs is mounted.
-	use initramfs && dodir /boot && opts+=( --write-earlyfw="${ED}/boot/intel-uc.img" )
-
-	keepdir /lib/firmware/intel-ucode
-	opts+=( --write-firmware="${ED}/lib/firmware/intel-ucode" )
-
-	iucode_tool \
-		"${opts[@]}" \
-		"${MICROCODE_SRC[@]}" \
-		|| die "iucode_tool ${opts[@]} ${MICROCODE_SRC[@]}"
-
-	dodoc releasenote
-}
-
-pkg_preinst() {
-	if [[ ${MICROCODE_BLACKLIST} != ${MICROCODE_BLACKLIST_DEFAULT} ]]; then
-		ewarn "MICROCODE_BLACKLIST is set to \"${MICROCODE_BLACKLIST}\" instead of default \"${MICROCODE_BLACKLIST_DEFAULT}\". You are on your own!"
-	fi
-
-	if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
-		ewarn "Package was created using advanced options:"
-		ewarn "MICROCODE_SIGNATURES is set to \"${MICROCODE_SIGNATURES}\" instead of default \"${MICROCODE_SIGNATURES_DEFAULT}\"!"
-	fi
-
-	# Make sure /boot is available if needed.
-	use initramfs && mount-boot_pkg_preinst
-
-	local _initramfs_file="${ED}/boot/intel-uc.img"
-
-	if use hostonly; then
-		# While this output looks redundant we do this check to detect
-		# rare cases where iucode_tool was unable to detect system's processor(s).
-		local _detected_processors=$(iucode_tool --scan-system 2>&1)
-		if [[ -z "${_detected_processors}" ]]; then
-			ewarn "Looks like iucode_tool was unable to detect any processor!"
-		else
-			einfo "Only installing ucode(s) for ${_detected_processors#iucode_tool: system has } due to USE=hostonly ..."
-		fi
-
-		opts=(
-			--scan-system
-			# be strict about what we are doing
-			--overwrite
-			--strict-checks
-			--no-ignore-broken
-			# we want to install latest version
-			--no-downgrade
-			# show everything we find
-			--list-all
-			# show what we selected
-			--list
-		)
-
-		# The earlyfw cpio needs to be in /boot because it must be loaded before
-		# rootfs is mounted.
-		use initramfs && opts+=( --write-earlyfw=${_initramfs_file} )
-
-		if use split-ucode; then
-			opts+=( --write-firmware="${ED}/lib/firmware/intel-ucode" )
-		fi
-
-		opts+=( "${ED}/lib/firmware/intel-ucode-temp" )
-
-		mv "${ED}"/lib/firmware/intel-ucode{,-temp} || die
-		keepdir /lib/firmware/intel-ucode
-
-		iucode_tool "${opts[@]}" || die "iucode_tool ${opts[@]}"
-
-		rm -r "${ED}"/lib/firmware/intel-ucode-temp || die
-
-	elif ! use split-ucode; then # hostonly disabled
-		rm -r "${ED}"/lib/firmware/intel-ucode || die
-	fi
-
-	# Because it is possible that this package will install not one single file
-	# due to user selection which is still somehow unexpected we add the following
-	# check to inform user so that the user has at least a chance to detect
-	# a problem/invalid select.
-	local _has_installed_something=
-	if use initramfs && [[ -s "${_initramfs_file}" ]]; then
-		_has_installed_something="yes"
-	elif use split-ucode; then
-		_has_installed_something=$(find "${ED}/lib/firmware/intel-ucode" -maxdepth 0 -not -empty -exec echo yes \;)
-	fi
-
-	if use hostonly && [[ -n "${_has_installed_something}" ]]; then
-		elog "You only installed ucode(s) for all currently available (=online)"
-		elog "processor(s). Remember to re-emerge this package whenever you"
-		elog "change the system's processor model."
-		elog ""
-	elif [[ -z "${_has_installed_something}" ]]; then
-		ewarn "WARNING:"
-		if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
-			ewarn "No ucode was installed! Because you have created this package"
-			ewarn "using MICROCODE_SIGNATURES variable please double check if you"
-			ewarn "have an invalid select."
-			ewarn "It's rare but it is also possible that just no ucode update"
-			ewarn "is available for your processor(s). In this case it is safe"
-			ewarn "to ignore this warning."
-		else
-			ewarn "No ucode was installed! It's rare but it is also possible"
-			ewarn "that just no ucode update is available for your processor(s)."
-			ewarn "In this case it is safe to ignore this warning."
-		fi
-
-		ewarn ""
-
-		if use hostonly; then
-			ewarn "Unset \"hostonly\" USE flag to install all available ucodes."
-			ewarn ""
-		fi
-	fi
-}
-
-pkg_prerm() {
-	# Make sure /boot is mounted so that we can remove /boot/intel-uc.img!
-	use initramfs && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postrm
-}
-
-pkg_postinst() {
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postinst
-
-	# We cannot give detailed information if user is affected or not:
-	# If MICROCODE_BLACKLIST wasn't modified, user can still use MICROCODE_SIGNATURES
-	# to to force a specific, otherwise blacklisted, microcode. So we
-	# only show a generic warning based on running kernel version:
-	if kernel_is -lt 4 14 34; then
-		ewarn "${P} contains microcode updates which require"
-		ewarn "additional kernel patches which aren't yet included in kernel <4.14.34."
-		ewarn "Loading such a microcode through kernel interface from an unpatched kernel"
-		ewarn "can crash your system!"
-		ewarn ""
-		ewarn "Those microcodes are blacklisted per default. However, if you have altered"
-		ewarn "MICROCODE_BLACKLIST or MICROCODE_SIGNATURES, you maybe have unintentionally"
-		ewarn "re-enabled those microcodes...!"
-		ewarn ""
-		ewarn "Check \"${EROOT}/usr/share/doc/${PN}-*/releasenot*\" if your microcode update"
-		ewarn "requires additional kernel patches or not."
-	fi
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20200616_p20200617.ebuild b/sys-firmware/intel-microcode/intel-microcode-20201112_p20201116-r1.ebuild
index d20d0f472faa..a162e73196e8 100644
--- a/sys-firmware/intel-microcode/intel-microcode-20200616_p20200617.ebuild
+++ b/sys-firmware/intel-microcode/intel-microcode-20201112_p20201116-r1.ebuild
@@ -44,6 +44,9 @@ MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000406e3,0xc0,eq:0x00dc"
 # https://bugs.gentoo.org/722768
 MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000406e3,0xc0,eq:0x00da"
 
+# https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/commit/49bb67f32a2e3e631ba1a9a73da1c52e1cac7fd9
+MICROCODE_BLACKLIST_DEFAULT+=" -s !0x000806c1,0x80,eq:0x0068"
+
 # In case we want to set some defaults ...
 MICROCODE_SIGNATURES_DEFAULT=""
 
@@ -122,7 +125,7 @@ src_install() {
 		"${MICROCODE_SRC[@]}" \
 		|| die "iucode_tool ${opts[@]} ${MICROCODE_SRC[@]}"
 
-	dodoc releasenote
+	dodoc releasenote.md
 }
 
 pkg_preinst() {
diff --git a/sys-firmware/ipxe/Manifest b/sys-firmware/ipxe/Manifest
index c0c7d321f7e7..73e56c6ed0d8 100644
--- a/sys-firmware/ipxe/Manifest
+++ b/sys-firmware/ipxe/Manifest
@@ -3,5 +3,5 @@ DIST ipxe-1.0.0_p20180211-546dd51.tar.bz2 2954305 BLAKE2B 8232b1afe017ff5d038953
 DIST ipxe-1.0.0_p20190728-a4f8c6e-bin.tar.xz 1839688 BLAKE2B b28772b928690646e1b0cb1c27ef56e2cb1c0637a43c6174dea7c8ca401d8c8819938fa358a0bed5d57b8cf992b8c2060b52e32a970ef813f1cf705fb0805beb SHA512 1e5838b8c530257dc544f6e25f80e6e223480917db393ca3ff8c577f07e60180e18f2eed4e71f7b1965157d6e7001f65e224d3c8b56a98f84739e2504ca38985
 DIST ipxe-1.0.0_p20190728-a4f8c6e.tar.bz2 2985776 BLAKE2B 5a85505404978d51f80e30332f6eb0417d6d97eb9b3bc05eec5ad649c446c7d17dc841f8cd34a1b29c31dc6f5cf08baa69191de9c8dd4bcdb098c5d7f13a7824 SHA512 3af0da9058b39966bfd8f9d7dfe518ae7b26e18f58d1a3fa2cba8922ec3c50775b82dd9f23bf51be3ca3f69b705f92bcf80988a1817b30f7ab1826a4b159c5a6
 EBUILD ipxe-1.0.0_p20180211.ebuild 2802 BLAKE2B 9fca4b57d57ff02da7b47ab6d69126ee9ab3a02eb3cb3d4c0dca407916436a797dd730cdfef64d14fa255fa6b6021dad4e1d3547be1e433f41d1535118cb99a8 SHA512 999f589e9a37315a7e785ad6bd7b64ff321da46d153a8cfc7704fb2a017e34c3748d0fe778ad59c276c5662f40bba3e577fcedcfb9ada2bcd3b2b736d98358fc
-EBUILD ipxe-1.0.0_p20190728.ebuild 2801 BLAKE2B 8af6a9930d9229c464400d72e594aa6ec0d2ec9856c2573d3e9be3aa84c1eb2212bbcd25c98d4254a47a61d12c463f3277fb61e40bfba98590cdca5d7851f143 SHA512 e5e3d354330f5052cf434cde0de2928f0f2841a04c689b7b78cb44f23c33c7cd32a19f4bb171f185b0e255dc9d7ef966378f3d4a3833fca8ed1ba97d00a1d899
+EBUILD ipxe-1.0.0_p20190728.ebuild 2800 BLAKE2B fcdfd31fab4641dc67950c0ad5ea4c6f68c0af1baa0269ed4c4b211d0ca38a197f973e93d87e89dcab0227c2809ffb4e0f05912118c8f4a164190a48937ca718 SHA512 99b9c365abc41edc9735fb26a91835f0265a3ec94e16906c76a0ba591208557d860c8f237c49016c47ad05e8c5cc530ddffc7883cb878856913940282a82de57
 MISC metadata.xml 996 BLAKE2B 41f19340003c0213578fb1b3f7ae6aaff718eb150cdb398b463e695dcc931da45251ab5d70fbdff0277f52ad7a231f93f878d9fa4ce9fe5a338cc3d4e2708124 SHA512 123f401010d157b928390599a3125c9c18ba721757a16ac3fcce4fe30e3ff298ad9a3dcda64b779bf2fe0fcb52c9057e382b7ac618a3ae27b92dd94cf0dde0d7
diff --git a/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild b/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild
index 787013fee791..7216cd520792 100644
--- a/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild
+++ b/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86"
 IUSE="+binary efi ipv6 iso lkrn +qemu undi usb vmware"
 
 REQUIRED_USE="!amd64? ( !x86? ( binary ) )"
diff --git a/sys-firmware/seabios/Manifest b/sys-firmware/seabios/Manifest
index 3126ea6d24c5..3786983e791a 100644
--- a/sys-firmware/seabios/Manifest
+++ b/sys-firmware/seabios/Manifest
@@ -16,5 +16,5 @@ DIST seabios-1.12.0.tar.gz 613542 BLAKE2B f145c2db716996bfa9e5c014086ccfaa8ae96e
 EBUILD seabios-1.10.2.ebuild 3370 BLAKE2B 51edbc125117a266fee7be925e5bdb65745dbf3ed498715f3574618e75cc1950eb076c90ab4d8ef4288a2196fc4289dc420a9cd4eee267ba09672ff3c53e3010 SHA512 4b096c42b5d2374b382f9c5ce2ef1f283473f54f1aed3e5eb32d05dd95dadb87ff263bbf5782ec94aa4b3d701d859a5fa279051bb50ea70602004be663032813
 EBUILD seabios-1.11.0-r1.ebuild 4060 BLAKE2B 610a51e27c981affac61d3491b621c3d26bf9f1715a24a4efb42049565024bdd6c516397e9314297ca07aced48ab0e326e95300e84fe0bf18edee98b5799fe13 SHA512 1b33d902e58bba4ab3c44bd19f0281b2b0399779fef715ebf4985d6665b945560bd0dce0897682980124d9469c66e373867d0341366e1a821077e37594bf83db
 EBUILD seabios-1.11.0.ebuild 3286 BLAKE2B ccb5c4074d330418b7db3b511492fc6ca7b7483998b712e7d6527006d6298337a95811f38c0975b3febf5f49140ece617c29be585762c90eb6a4a5fbb7e939e2 SHA512 5a3a70c8fc4e9b09cb87a8fe83304732467dd8673a341bda5abc004f8998f9ccc300a48e455b7e0377715c5ad717002b1b4c5fdebeb8edbc29afa86b8badfead
-EBUILD seabios-1.12.0.ebuild 3443 BLAKE2B e324e4dfedba66df1af67e6c92a75f494a7922d5d2931c6a9f3d9035517e4f88ac5274e081cc82aba23f476b0f40cc75d922fab402e39002a98df6a5731aee1e SHA512 62362a4f7453eb4a4711b0e6f6b5e7d3a7c7bac56b53d43f5ee61b2369cd8e7006d6b698cacfbb709ce2be7193a3465ddff21311c84619ab22b8955df984cc24
+EBUILD seabios-1.12.0.ebuild 3442 BLAKE2B 611385323fcf06fbcdd50d1cdf0606d599e80c5f17890b43853dc329f1059cf53de9cd02faf04f6fb089bae33f6b524843393e9d883c554296e2a10592f07d1a SHA512 52fe60e3969f85a6bb1afe0b7c52cdfde36e406e324acc3a4273dd7ba9a469024d8564c427d12b204390d337750c8949235eca8e6536e5101fbfc6e860c13dbb
 MISC metadata.xml 551 BLAKE2B 1bc4f5bcc0dd85ff4e14ededc83e631c942995a8f0ba9534d72b6d5b671ad471eeb0c43a02ce4cf7c0b79d7f0d5583d419c46aaa8c297f1544353b8f42cdefa4 SHA512 5a580198036d96152d46c79b19317e35e5ba15f998ccaeade825189ee640a6ca50552a46f56f783ebba288df3953d461695039539c47baa27e3c9da1f8b1ccc0
diff --git a/sys-firmware/seabios/seabios-1.12.0.ebuild b/sys-firmware/seabios/seabios-1.12.0.ebuild
index c9b5d726d588..53616e2943bf 100644
--- a/sys-firmware/seabios/seabios-1.12.0.ebuild
+++ b/sys-firmware/seabios/seabios-1.12.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* || -n "${EGIT_COMMIT}" ]] ; then
 	EGIT_REPO_URI="git://git.seabios.org/seabios.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sparc x86"
 
 	# Binary versions taken from fedora:
 	# http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/
diff --git a/sys-firmware/sgabios/Manifest b/sys-firmware/sgabios/Manifest
index 9f3bcf6ec64a..7e90a55bbf60 100644
--- a/sys-firmware/sgabios/Manifest
+++ b/sys-firmware/sgabios/Manifest
@@ -2,5 +2,5 @@ AUX sgabios-0.1_pre8-build-cc.patch 467 BLAKE2B 5d1963f2f9c74fa1503b81ebfce8ae9c
 AUX sgabios-0.1_pre8-makefile.patch 395 BLAKE2B 0d6a9eff239e3881bb6dc674e62b98eb48b7b9c422dd77ee6c0e0f807f213fbc38a4e7a730d329123d947540c9f4bcb60019c85c3b1b1041be353028d77c4ab4 SHA512 7c111af2fff59b0ca6d4b39d04715d404bffa0f71a337b43f7dd091af6e40e85b790ed8b560039d5702d07e1ae47f2c204e891373f11d2ee4aa1541cb471c566
 DIST sgabios-0.1_pre8-bins.tar.xz 2704 BLAKE2B 8efcf613a4857467cc3cfbc3f6402bca091892f0b2137ff65caf2b444610c86c1db0e61505bfe48ed8d6ccc9e8928190c2a38693aeddd523e27d22a29e777044 SHA512 46fc02200b3fa2e45c954a2b6e4cd40f10d6969fd05ef4d441402c7390b4e83390250972ef0ea891635400cad22a4d8fd2b66b56afa91d03e1e0b99132e09c0d
 DIST sgabios-0.1_pre8.tar.xz 27200 BLAKE2B 8ea535f2fcc8f7105a278202648e06722e7463e66ff3ccf824cd3a672a7908e7223f27678ebd4ca73eb19abaff75e082ea7b9bc222332436f31a8840443d7b44 SHA512 68e2a894eb5b99cda2b0e96ade891e24397ac962a777a97dbb526f4570e5734d36a88fde1ef64ed7a887cd8bfc500c91c48849d2c26aca6ce7e36dd80aaf361e
-EBUILD sgabios-0.1_pre8-r1.ebuild 1232 BLAKE2B 23b62aae261a0f12641544598ef291b3ceba7ed0b90cc942bcdb752ea75bb4fc537e232685aca002260651f629a3eb2ecc94d50726ff0803492076bc7d119345 SHA512 0972ffee0328d3204a5d9072e9ab9443ed567abd4b9ff61e99f87d7120c37d0ac0f20690289fa4ce220a7e3e94e39a4bf44fa0acaee4bdb862af4da09d42404f
+EBUILD sgabios-0.1_pre8-r1.ebuild 1231 BLAKE2B ab8610e4b39e593ea3aece48368394f239c2c2ee7e80992bcd7527242b7bbbc394d8bb807e341eebccfdf2bad5664c0116fdcbb18fe96775d41fa3a56c65bebd SHA512 043be393e2ae2f049e099eef54f8d9ba741afd1ae6f674cd23c276c8acb664902afc025325ff75d46515ebc33a0598c912d706fd48508be453a5c11376aedb07
 MISC metadata.xml 446 BLAKE2B 4ae7416e96ab45a156d697bbb5bd35307040114250950a9b695ab19ec9ce75ee9f2e89845ffce820b693518df6ba525b722461f82b306b5798d71e806106baf9 SHA512 3dff66a2d4412a527c648ceb070d7f23765e6b0b74271cf1ecef27c8c05c9282c880ea8f5e3192ea612b07eaed6a0596b00ecf4bbdee22b77d1ce176592b9f0d
diff --git a/sys-firmware/sgabios/sgabios-0.1_pre8-r1.ebuild b/sys-firmware/sgabios/sgabios-0.1_pre8-r1.ebuild
index cfa1211864d8..1dedeca043a8 100644
--- a/sys-firmware/sgabios/sgabios-0.1_pre8-r1.ebuild
+++ b/sys-firmware/sgabios/sgabios-0.1_pre8-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sparc x86"
 IUSE="+binary"
 
 REQUIRED_USE="!amd64? ( !x86? ( binary ) )"
diff --git a/sys-firmware/sigrok-firmware-fx2lafw/Manifest b/sys-firmware/sigrok-firmware-fx2lafw/Manifest
index f1f61607ccc9..c29a9c63fb03 100644
--- a/sys-firmware/sigrok-firmware-fx2lafw/Manifest
+++ b/sys-firmware/sigrok-firmware-fx2lafw/Manifest
@@ -3,6 +3,7 @@ DIST sigrok-firmware-fx2lafw-0.1.7.tar.gz 145443 BLAKE2B 6e19fde87caf942ca8f95a6
 DIST sigrok-firmware-fx2lafw-bin-0.1.6.tar.gz 52195 BLAKE2B 8e20720efeb5c4bc2ed91698db625439594669920fecce785e3ea4213f32a06da3186489c78b27bb35f1574b6ebac82bfe01352806c39ecc671568c73b93e5af SHA512 0dd4eb5327fbf5a8ee413b5ad460e2febe7da6aba13cfe4c7467966e4d4a0033b796ce7634647c0bbfa335034180272e7f8167b7a8181fb73ed3839891a44e46
 DIST sigrok-firmware-fx2lafw-bin-0.1.7.tar.gz 54529 BLAKE2B b8659ba77f6976a927bd60c903abbc7bf7128d4dfff8a58dfe1f6522c6f7d5e5c0f8c8bc170fef7499461426ab1059093c4cc1553a39f4a059786cfc144f787f SHA512 60faac29198532bd5e03e44ed7f89c1502c83c6cf60ec5cc0f3ae9891c45b5de55eba5304c47d3231c8222ff61f1425aed88a44e7ff89d30b75d6e5faf7a623c
 EBUILD sigrok-firmware-fx2lafw-0.1.6.ebuild 1193 BLAKE2B 7808567d5817da53b0c898b6cf6c2d988328dae9935ff4a72a957a5f79b8d591db63e585c40f968988bb10a1fd9b73324801df61d50ceec8202f21b5cbe2fd98 SHA512 56af199012cfccaa20274191047a3d1dcabbcea57872e3723b3a4457fd18564036df1fd79a2a6467f3d2051ca51ed3b9c7535b357b7b56cf16babc85949ddf10
-EBUILD sigrok-firmware-fx2lafw-0.1.7.ebuild 1193 BLAKE2B 7808567d5817da53b0c898b6cf6c2d988328dae9935ff4a72a957a5f79b8d591db63e585c40f968988bb10a1fd9b73324801df61d50ceec8202f21b5cbe2fd98 SHA512 56af199012cfccaa20274191047a3d1dcabbcea57872e3723b3a4457fd18564036df1fd79a2a6467f3d2051ca51ed3b9c7535b357b7b56cf16babc85949ddf10
-EBUILD sigrok-firmware-fx2lafw-9999.ebuild 1193 BLAKE2B e3104369313d00d1cd925ee29522b8b5b8bb16d813249844acff10701ccc0ec10420762fd3f297c1b3acc90904501168f393169de285538a319133cc80368d6c SHA512 5db1141f7230e3a01f7e7beeafeaf9dcb7aa8aa2a34f2cb6b532d04c16aef0f880072646ca063c95da3388bc82a9306e79121ebe64027fb25e58a435c4403cf6
+EBUILD sigrok-firmware-fx2lafw-0.1.7-r1.ebuild 1167 BLAKE2B e2ec0f15c27c2ad5d428ce255d3dc5b97e9aad124b561593d97b1eed94191e90e2374a77a1e7e7592d55e2a1b4fd0bf101820020f08a6c5e74a7366887e762f0 SHA512 2209b649af0e788050213102214bc71e0984475b96591f268f6f3b257c71e8ca60611cc911b482aaf74348eb649a5bad46c1d84af0a74709beaf8b305d3e5861
+EBUILD sigrok-firmware-fx2lafw-0.1.7.ebuild 1167 BLAKE2B e2ec0f15c27c2ad5d428ce255d3dc5b97e9aad124b561593d97b1eed94191e90e2374a77a1e7e7592d55e2a1b4fd0bf101820020f08a6c5e74a7366887e762f0 SHA512 2209b649af0e788050213102214bc71e0984475b96591f268f6f3b257c71e8ca60611cc911b482aaf74348eb649a5bad46c1d84af0a74709beaf8b305d3e5861
+EBUILD sigrok-firmware-fx2lafw-9999.ebuild 1167 BLAKE2B e2ec0f15c27c2ad5d428ce255d3dc5b97e9aad124b561593d97b1eed94191e90e2374a77a1e7e7592d55e2a1b4fd0bf101820020f08a6c5e74a7366887e762f0 SHA512 2209b649af0e788050213102214bc71e0984475b96591f268f6f3b257c71e8ca60611cc911b482aaf74348eb649a5bad46c1d84af0a74709beaf8b305d3e5861
 MISC metadata.xml 329 BLAKE2B 60a84f5e60d450cb97c53317f470cd599c61b39d3bbffc579db58da460bd84d4b0bdf28a1f9b4d90cbc01bea3e36b0832df78561984eff849256ce50387bc9ae SHA512 56ca5a2c5d91cbb7ac9b3578fdc6eae211a8474649cf418464bfe7b96ea303b2fec80bcc24a0c490ba79b46d0d0cf44832ce3ef9febe1ee533cde57ccf12ddf5
diff --git a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.7-r1.ebuild b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.7-r1.ebuild
new file mode 100644
index 000000000000..10d98c962474
--- /dev/null
+++ b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.7-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+SDCC_DEPEND=">=dev-embedded/sdcc-3.4.0[device-lib(+),mcs51(+),sdcpp(+)]"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://sigrok.org/${PN}"
+	IUSE=""
+	inherit git-r3 autotools
+else
+	SRC_URI="binary? ( https://sigrok.org/download/binary/${PN}/${PN}-bin-${PV}.tar.gz )
+		!binary? ( https://sigrok.org/download/source/${PN}/${P}.tar.gz )"
+	KEYWORDS="~amd64 ~x86"
+	IUSE="binary"
+	SDCC_DEPEND="!binary? ( ${SDCC_DEPEND} )"
+fi
+
+DESCRIPTION="Firmware for Cypress FX2 chips for use as simple logic analyzer hardware"
+HOMEPAGE="https://sigrok.org/wiki/Fx2lafw"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	${SDCC_DEPEND}"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_src_unpack
+	else
+		default
+		# The binary & source dirs are slightly diff.
+		use binary && S="${WORKDIR}/${PN}-bin-${PV}"
+	fi
+}
+
+src_prepare() {
+	[[ ${PV} == "9999" ]] && eautoreconf
+	eapply_user
+}
+
+src_install() {
+	if [[ ${PV} != "9999" ]] && use binary ; then
+		insinto /usr/share/sigrok-firmware
+		doins *.fw
+		dodoc ChangeLog NEWS README
+	else
+		default
+	fi
+}
diff --git a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.7.ebuild b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.7.ebuild
index 1f85fa931259..10d98c962474 100644
--- a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.7.ebuild
+++ b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.7.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-SDCC_DEPEND=">=dev-embedded/sdcc-2.9.0[device-lib(+),mcs51(+),sdcpp(+)]
-	<dev-embedded/sdcc-3.8.6"
+SDCC_DEPEND=">=dev-embedded/sdcc-3.4.0[device-lib(+),mcs51(+),sdcpp(+)]"
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="git://sigrok.org/${PN}"
diff --git a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-9999.ebuild b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-9999.ebuild
index ae4f13753a19..10d98c962474 100644
--- a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-9999.ebuild
+++ b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-SDCC_DEPEND=">=dev-embedded/sdcc-3.4.0[device-lib(+),mcs51(+),sdcpp(+)]
-	<dev-embedded/sdcc-3.8.6"
+SDCC_DEPEND=">=dev-embedded/sdcc-3.4.0[device-lib(+),mcs51(+),sdcpp(+)]"
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="git://sigrok.org/${PN}"
diff --git a/sys-firmware/sof-firmware/Manifest b/sys-firmware/sof-firmware/Manifest
index af4fc470d979..669cf296f849 100644
--- a/sys-firmware/sof-firmware/Manifest
+++ b/sys-firmware/sof-firmware/Manifest
@@ -14,5 +14,5 @@ DIST sof-firmware-1.4.2-sof-imx8.ldc 60848 BLAKE2B a17be83147fa58eb71698e9d7306d
 DIST sof-firmware-1.4.2-sof-imx8.ri 115472 BLAKE2B ffb9fabdb388354b409881489594c411cc3c0fcbabb05688585696ad7b15f4a54a3f2786df811217b81cff210088e7e67ef1ae5e54c3e4e7827c69aa32ca5f87 SHA512 86e267cdd8fe835bdab7e082f0e9c527e8283757759c70069af52d4e23440439565380b10011fb746afed13a3fb2f1aadcaf54e45740b08b40a1f5455b57e05b
 DIST sof-firmware-1.5.1.tar.gz 1611811 BLAKE2B 7408ba12f1375cb3d6c20e1654be225e8ab11e8b1471c54bd0a498ed1fad11954c57f68a7e483223117c5469278507b1d05e077420a1f58efb2eb0d2b4e95078 SHA512 0e3273f681dc3c0ee075bfb10e689e7ae8d8c0604f9d849f5bd991793d272e06ce7664a0b5829a9b93993d0576683824ee0ac5f8d1efe0b94a705a3e7ae34903
 EBUILD sof-firmware-1.4.2.ebuild 841 BLAKE2B b172de0cd4c5e24416eb66eab28376d6cbdf27fbcb23aae9df844203f3be7247faf5e3adb77f3b7cc9f66cd8da7f0ba4f040d92335f41350224692676ae2f86d SHA512 53b90e002111c5f0359ac55e505810a06f57a660138a4f5dec3c57e10c6c77415b91779e6de36f60b4e6f9a3307241c671ab13d7ca6b420483e447bf328497c7
-EBUILD sof-firmware-1.5.1.ebuild 679 BLAKE2B 2d17218568b1f8746a673e1611fae50c6aa2a9376c32fb82f22cc35178a5dfaf348ba965251275b052ac39dfbcdbd4effbfb44cd2c26f4e7be372f5d4a9788fa SHA512 ed3b2e7c430364a0fb2a9bd9b759d2f663a4132866800cbf644dcca2863ea8d79ba2dd958656f2841eb152cd7bbecfcfbf309d7759e3ca90af91997cfc0aa93e
+EBUILD sof-firmware-1.5.1.ebuild 678 BLAKE2B fb603fefd24e027b76b47430abb2c84dd25a108447ac3cad7b24cd6ecfd6bddb49a5dd83e33abd73ebf74591a4c1647ede7d2f321c8cff201c190dcbce56058b SHA512 04215ec02969c0f3a7ae84faa8f06a6567b999ca91761720c02d4cb981f0cfd76d338e8e83ae5b3d5988d48e06d92fde8eb33c078af05c72644b0f2a9105d2ba
 MISC metadata.xml 294 BLAKE2B 0e947037daad04b7a7d18ed04481724431241915f597c071dee3bf2ea01fa971b1eb996ce7f885bf2783b321f95baaac7a20cb431d381d0a2c4f2885d13db951 SHA512 1096b94b1d3871f8fa8bf312f91325395f31bff006a27f6b65b9da8d19fa75a5685f0fc3e21e49ed43e7e7a4d12251ca6ab2054abc203faace06b1704fa9c72e
diff --git a/sys-firmware/sof-firmware/sof-firmware-1.5.1.ebuild b/sys-firmware/sof-firmware/sof-firmware-1.5.1.ebuild
index cfd84283ad7a..b3ae03432846 100644
--- a/sys-firmware/sof-firmware/sof-firmware-1.5.1.ebuild
+++ b/sys-firmware/sof-firmware/sof-firmware-1.5.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/thesofproject/sof-bin/archive/stable-v${PV}.tar.gz -
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 S=${WORKDIR}/sof-bin-stable-v${PV}