gentoo resync : 28.04.2021

27 files changed, 226 insertions, 473 deletions

diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 55a8d9eabb43..f73ae5e0e064 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/b43-firmware/Manifest b/sys-firmware/b43-firmware/Manifest
index 9d5106346708..ab27e6189d20 100644
--- a/sys-firmware/b43-firmware/Manifest
+++ b/sys-firmware/b43-firmware/Manifest
@@ -1,5 +1,5 @@
 DIST broadcom-wl-5.100.138.tar.bz2 13514651 BLAKE2B 3f29c09f8c58290c1fadd1ab4ceb9c8606e27b828363056d21e48adcdd6e28d3a7326f4ef6ac3fa13353da138f6af5fe7bde88308e21f0fd6754106189cf12da SHA512 02487e76e3eca7fe97ce2ad7dc9c5d39fac82b8d5f7786cce047f9c85e2426f5b7ea085d84c7d4aae43e0fe348d603e3229211bab601726794ef633441d37a8b
 DIST broadcom-wl-6.30.163.46.tar.bz2 7684610 BLAKE2B 53b1c8a4737b6fa524c09e4cec14ac92260961f61c67a37013580e4998b001c9ee68f2f998a798743bb5e77cb3e444d5c1b27f72fd8efbbc25913e7da111d733 SHA512 0144894fbbb5e8ebab6c423d9bd0f3249be94f2f468a50b8bf721a3b17f1f6e57467c79e87abc8d136bfc92e701ed046885fead892e9a73efa5217d710311ae9
-EBUILD b43-firmware-5.100.138.ebuild 727 BLAKE2B 47642b73102ab150ceda47a4f72ef7310e6ccbff44201e914fdf621a42cd1fd1b95603f903ca1b54ad6782ce6348f94cb7ed08a5ee0dab754ee75532f3909164 SHA512 badfdeceaee2fb2c5bf42f441fc4c58b32f17d6213657432201f3151d80df4ea0320a373c2c02b7724751991baca910be9197f06d6d8293340a0c8c6a591b02d
-EBUILD b43-firmware-6.30.163.46.ebuild 716 BLAKE2B a31fc06af73813b8468d93ab94b6d2b81be270f230de908df4c90e9ec3fb212f3bfaec180b0ef9783e226e3060ed41cec6fed42abefb165f262228b42b7f7b4c SHA512 ae43f5e4725d7f12335d1537f73bf472d43ef485d3bfe67714cfa7adfa078b6331df1c6111a1ae7224b51a9bbd3efa79543c072693a74ab228c166c59cdafb18
+EBUILD b43-firmware-5.100.138.ebuild 656 BLAKE2B 800418b6e99d48f0167eb9c4f209a467fe09c8944d522326fb3b2c684378f8991f66cffdf9ac38503985faa2e16c193153aa45314b941c0898e2659df4bb94d9 SHA512 79212202f1ba69eb31fbef245be05b381d8d54d2da449d30e9208b9bbcd58d38fbc82880bfc2bc93ab131753cf52e6a4390e8064e3e275a089b6c2d74f39cab5
+EBUILD b43-firmware-6.30.163.46.ebuild 646 BLAKE2B 2cc41b203d8284af1a8933e9f2db668f66bc8ee12538affc281959ea1874fcfe4ebb40cb86476067bc8e7f13b30652923473063874f161bcffadb6026385853d SHA512 43253e5670975e5a896d73b1e978a9a9e769892f6df81180498fe59ff23535624399482a0eb7d52a64f5f7a6602ba5de01d53c6e20d365962d0e227b1e92a487
 MISC metadata.xml 241 BLAKE2B 31d2e88c810d3facda6587f93bdc429e66b6ed90dc2c019dac1ece6da620b74dc4db8907a25d6559ff7a027f6b267774016686a56c5a5e67da4fbfa3cae7be6e SHA512 d308ccef737c1776c2d77c0761996ef272a5866f5d9ceeda4dd4ceede851a145f76281a29b4c4b154e5b10f1d57c9344010bfcf75ba52fb3f1b34a58e3c2053f
diff --git a/sys-firmware/b43-firmware/b43-firmware-5.100.138.ebuild b/sys-firmware/b43-firmware/b43-firmware-5.100.138.ebuild
index e7c4514e2b30..47c6005c7dbf 100644
--- a/sys-firmware/b43-firmware/b43-firmware-5.100.138.ebuild
+++ b/sys-firmware/b43-firmware/b43-firmware-5.100.138.ebuild
@@ -1,32 +1,28 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-: ${B43_FIRMWARE_SRC_OBJ:=wl_apsta.o}
+EAPI=7
 
 MY_P="broadcom-wl-${PV}"
+
 DESCRIPTION="broadcom firmware for b43 LP PHY and >=linux-3.2"
 HOMEPAGE="http://linuxwireless.org/en/users/Drivers/b43"
 SRC_URI="http://www.lwfinger.com/b43-firmware/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="Broadcom"
 SLOT="b43"
 KEYWORDS="amd64 ~arm64 ppc x86"
-IUSE=""
-RESTRICT="binchecks strip bindist"
+RESTRICT="binchecks bindist strip"
 
-DEPEND=">=net-wireless/b43-fwcutter-015"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
+BDEPEND=">=net-wireless/b43-fwcutter-015"
 
 src_compile() {
-	mkdir ebuild-output
-	b43-fwcutter -w ebuild-output $(find -name ${B43_FIRMWARE_SRC_OBJ}) || die
+	mkdir ebuild-output || die
+	b43-fwcutter -w ebuild-output linux/wl_apsta.o || die
 }
 
 src_install() {
 	insinto /lib/firmware
-	doins -r ebuild-output/*
+	doins -r ebuild-output/.
 }
diff --git a/sys-firmware/b43-firmware/b43-firmware-6.30.163.46.ebuild b/sys-firmware/b43-firmware/b43-firmware-6.30.163.46.ebuild
index 5dc8e46d721e..87020a585016 100644
--- a/sys-firmware/b43-firmware/b43-firmware-6.30.163.46.ebuild
+++ b/sys-firmware/b43-firmware/b43-firmware-6.30.163.46.ebuild
@@ -1,32 +1,28 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-: ${B43_FIRMWARE_SRC_OBJ:=*wl_apsta.o}
+EAPI=7
 
 MY_P="broadcom-wl-${PV}"
+
 DESCRIPTION="broadcom firmware for b43 LP PHY and >=linux-3.2"
 HOMEPAGE="http://linuxwireless.org/en/users/Drivers/b43"
 SRC_URI="http://www.lwfinger.com/b43-firmware/${MY_P}.tar.bz2"
+S="${WORKDIR}"
 
 LICENSE="Broadcom"
 SLOT="b43"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-RESTRICT="binchecks strip bindist"
+RESTRICT="binchecks bindist strip"
 
-DEPEND=">=net-wireless/b43-fwcutter-015"
-RDEPEND=""
-
-S="${WORKDIR}"
+BDEPEND=">=net-wireless/b43-fwcutter-015"
 
 src_compile() {
-	mkdir ebuild-output
-	b43-fwcutter -w ebuild-output $(find -name ${B43_FIRMWARE_SRC_OBJ}) || die
+	mkdir ebuild-output || die
+	b43-fwcutter -w ebuild-output ${MY_P}.wl_apsta.o || die
 }
 
 src_install() {
 	insinto /lib/firmware
-	doins -r ebuild-output/*
+	doins -r ebuild-output/.
 }
diff --git a/sys-firmware/b43legacy-firmware/Manifest b/sys-firmware/b43legacy-firmware/Manifest
index a0de9a5ae397..88e3adbc5dcc 100644
--- a/sys-firmware/b43legacy-firmware/Manifest
+++ b/sys-firmware/b43legacy-firmware/Manifest
@@ -1,3 +1,3 @@
 DIST wl_apsta-3.130.20.0.o 652866 BLAKE2B bfe92320ffe506e7ed1fda889ae5bdf2a760dedde152bf97e0434a8577c85df31a5a940fa9c032375c4f7520b254eedc9433b90073402d40cd807a9b1b0b1cfa SHA512 d89ed52045307449bbae79a4d1807cc6cd89ae67c4a22e8e8aa51c1396edbb6ed8b157cd0756faf8b660a537b48b62117c57967f2048245b5b102d9d9bca4bbd
-EBUILD b43legacy-firmware-3.130.20.0.ebuild 753 BLAKE2B 7be5d26dddbd370ba5b37c2059ee61f68c05a9f85a25a04cbd0e7e93125dd87aa024944117a10aff0c1330af3d1e337aba30ccb431012b8a4fcaeb26ef00cd18 SHA512 7e5af5d66140da074c37f9231860ed0644ed28bfbd65eb8c531e3b35326f7610647a69a478b0bec8ce63827f999d9ba6d307cbde70330cb8396fde9dea362413
+EBUILD b43legacy-firmware-3.130.20.0.ebuild 670 BLAKE2B afc80fba9255261d5547cbf06fae4b59652fc5cd2cecc59f82aa283eec861f3851a647bb7a2e689f4d64bdcf647d7100271c6f4d3ba8afc5dae74b9ef703144f SHA512 37c34c2d75da38aa57e3d6f1d8c057f0c230378d0ffd85dc54023ea5aa00523fe8299363fb8f280bccb1ce54208e369b904fa6f697366b143427b6c1657ee698
 MISC metadata.xml 241 BLAKE2B 31d2e88c810d3facda6587f93bdc429e66b6ed90dc2c019dac1ece6da620b74dc4db8907a25d6559ff7a027f6b267774016686a56c5a5e67da4fbfa3cae7be6e SHA512 d308ccef737c1776c2d77c0761996ef272a5866f5d9ceeda4dd4ceede851a145f76281a29b4c4b154e5b10f1d57c9344010bfcf75ba52fb3f1b34a58e3c2053f
diff --git a/sys-firmware/b43legacy-firmware/b43legacy-firmware-3.130.20.0.ebuild b/sys-firmware/b43legacy-firmware/b43legacy-firmware-3.130.20.0.ebuild
index 3223244208f6..bd6e809ba086 100644
--- a/sys-firmware/b43legacy-firmware/b43legacy-firmware-3.130.20.0.ebuild
+++ b/sys-firmware/b43legacy-firmware/b43legacy-firmware-3.130.20.0.ebuild
@@ -1,37 +1,30 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-: ${B43_FIRMWARE_SRC_OBJ:=${A}}
-
-MY_P="broadcom-wl-${PV}"
 DESCRIPTION="broadcom firmware for b43legacy/bcm43xx"
 HOMEPAGE="http://linuxwireless.org/en/users/Drivers/b43"
 SRC_URI="http://downloads.openwrt.org/sources/wl_apsta-${PV}.o"
-
-RESTRICT="binchecks bindist strip"
+S="${WORKDIR}"
 
 LICENSE="Broadcom"
-SLOT=0
+SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=">=net-wireless/b43-fwcutter-012"
+RESTRICT="binchecks bindist strip"
 
-S=${WORKDIR}
+BDEPEND=">=net-wireless/b43-fwcutter-012"
 
 src_unpack() {
-	cp "${DISTDIR}/${A}" "${WORKDIR}" || die
+	cp "${DISTDIR}/${A}" "${WORKDIR}/wl_apsta.o" || die
 }
 
 src_compile() {
-	mkdir ebuild-output
-	b43-fwcutter -w ebuild-output $(find -name ${B43_FIRMWARE_SRC_OBJ}) || die
+	mkdir ebuild-output || die
+	b43-fwcutter -w ebuild-output wl_apsta.o || die
 }
 
 src_install() {
 	insinto /lib/firmware
-	doins -r ebuild-output/*
+	doins -r ebuild-output/.
 }
diff --git a/sys-firmware/edk2-ovmf/Manifest b/sys-firmware/edk2-ovmf/Manifest
index 38006b411ce4..bc6bec087cad 100644
--- a/sys-firmware/edk2-ovmf/Manifest
+++ b/sys-firmware/edk2-ovmf/Manifest
@@ -6,6 +6,6 @@ DIST edk2-ovmf-202008-bin.tar.xz 3486024 BLAKE2B 8283db554ad7024e3a55b62ed0a560e
 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 4545 BLAKE2B 9e7b61a5e18ded217580d46f3bc93abee294f7f71d9f3a3d0efcc8309dda9b152f3ad43c4110cf7af1a4ae969cb36dc9b5c0d8546023ba9ea9396c41d86a3c2a SHA512 97537d15be65bf0c0c1f3afb285f5da1c6394e78563df6d2931ebadad91b3362200b15f064f63f649517ea54b0f95a24949ad06c7ae2011a7f152e14c8f1336d
-EBUILD edk2-ovmf-202008.ebuild 5439 BLAKE2B 7c86a4b1d6d17dececdd830578f94e0661d82ce165c2169f944e1710c5d30cc6fa0f26d60dbb5631f4069a56afaf3de94cf5796a348ee3a38c2bad822f71908c SHA512 7aaea0a45221a778cd143d83fd6dee7e0938468aae3975c4a6cb6577f6974f4c89f8ac26a4c5a32636afd9e82451af69db7f8a4eba05749713b483b834b0c62e
+EBUILD edk2-ovmf-201905.ebuild 4538 BLAKE2B 4a2eab9d9cdb3fc603ade385ceff6aa40ce9a79fbc74136b73a7768ed17a1f6a89a0a7c831c1aa0c490803b62081d9696b466d260510d2d16fd3f8924ced1960 SHA512 42bb4faa277897ef5b6d1a4a942516f58849711a6b5078acc10bb118de94b82a8e2ebbec05595253c185f18c1a18583ffb54d617fa562b6c0024f3c9aaffc2cd
+EBUILD edk2-ovmf-202008.ebuild 5432 BLAKE2B 4485d8de42a251a5f16ce3da0e0e444cb58925c09d25293b703bbd6c4faee1029275913c8b21391c5704f5502ec45f094f5b9640dee0bf4a9a6789ffb2e1de9f SHA512 dee36cb84ecc34fc7bd43df2dc5648c0bd09ed91a942f459bdecd7ba8806f76ae22a8240089dead5340e7dc676abb29f571bfb3f254f607967bdea0da9a966d7
 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 19f495668465..afd014e80a1c 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_7 )
 
-inherit eutils python-any-r1 readme.gentoo-r1
+inherit python-any-r1 readme.gentoo-r1
 
 DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
 HOMEPAGE="https://github.com/tianocore/edk2"
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
index b1cecf1d45fb..b2b8400ddaa3 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python{3_7,3_8} )
 
-inherit eutils python-any-r1 readme.gentoo-r1
+inherit python-any-r1 readme.gentoo-r1
 
 DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
 HOMEPAGE="https://github.com/tianocore/edk2"
diff --git a/sys-firmware/ipxe/Manifest b/sys-firmware/ipxe/Manifest
index 57fa7e93c2fb..693c8e77845d 100644
--- a/sys-firmware/ipxe/Manifest
+++ b/sys-firmware/ipxe/Manifest
@@ -2,6 +2,9 @@ DIST ipxe-1.0.0_p20180211-546dd51-bin.tar.xz 1748228 BLAKE2B 5ed2ce71c7dbc41d5cb
 DIST ipxe-1.0.0_p20180211-546dd51.tar.bz2 2954305 BLAKE2B 8232b1afe017ff5d0389534e4efea3209ea0330d66e4d3d429abf81da66639b19488911d85bf2da200ff8cb0d49c5dda438074c4538303335419ea080ef80a16 SHA512 45d7f80f15a1c5ff1daa31b132065d38013a51127795ad81308b468940a455edcb40cde7601475039a7c977d732817203bbc627c642d3d10146a480da603f1dd
 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 62f4cfbb97b7e249af31f93eece95d2bc792a2d07d9cb6ef28ca37369a82efb0712d3f347ac1cfe1d68efa4ff8ef620671eab07c7a108afaeae0da1870e21c70 SHA512 2f52f6270ab11e2cabcba498956a4713beadf2ddc1a0fa79713872ba848dccca25eb96280226c5e0ac49e9020d37a2ac5e9e016c37f67231aca7bd2f19b28936
-EBUILD ipxe-1.0.0_p20190728.ebuild 2800 BLAKE2B 0013c8b512cc2419e8b53279245ff1f83130d4d737ec7e422591103e88130f6c320f146c24c5528713f4dddd346abf129e66373cc2d5ecf50130ffad8f760c80 SHA512 971c1c69d3aee0f0b6996ec355e42db3e7dd9eb52a2ce2221a09acbb41cc542ae9ca08e4bf187323f245d9ad632cb041d7b7f10ed975543592a71fb7602ea193
+DIST ipxe-1.21.1-bin.tar.xz 1860424 BLAKE2B 9d621c92be1058389758f885a02b601169d645335bba366a18d16326a7616345e44eb0cd5007d32ac034e7e3c8f8eecd90ade3346e34ca0df899622321f38017 SHA512 85afacfb70e562a935380b7d14ab7328e418478a6f6124eaec7cd0fefb9ba13b8a3f04833fab7b724ceb4c94897a7be2c67faa8be59373719a972ad51e6a5ab3
+DIST ipxe-1.21.1.tar.gz 3934045 BLAKE2B 03871b5f89c6228a9082bb89c7b102d85e5f3afcd5fe0d93762e220fe162c9c3037a9918f30251fd103835d949335f99109a12559f560a5b686e65a7c24c6501 SHA512 47400975110ed4ab95835aa1b7c8d5a6917c19c5713c6ab88bc0741a3adcd62245a9c4251d1f46fffc45289c6b18bf893f86dbc3b67d3189c41b7f198367ecaa
+EBUILD ipxe-1.0.0_p20180211.ebuild 2795 BLAKE2B d62790ea29d2389770e89f9a66f2359989ec724e34bccdf42082ed7c067f7cc996afa3e6d8ee0da2d4b02c4db6311cbe9ba6f1581c2f69b8a7e8e7c980e6d3eb SHA512 7dcbd22ae01b888b4b858bd8393d262c268b345f45914e0bb7667851891de2bc1933acdc10a48e63174caa4073ccb70449073e55832cf8a7e0fbbc6ef9060c2e
+EBUILD ipxe-1.0.0_p20190728.ebuild 2793 BLAKE2B 065d724967cf6348b321ac8015cef08779fc05d4c0303c5161606786bb35c25c3ebb8a7d84b7692b5ca3327b798a9254a88178c1a61cf66535d6df2122ec403f SHA512 68f034643fd6b61d46172f79b3a565c7ebc84e3717528b51c0da3b006d5124ab8bdaec12adfa8a73594d837dc5f112a3301eca6ca6edee5195ac568f4efde9dd
+EBUILD ipxe-1.21.1.ebuild 2696 BLAKE2B 8a291b6ff4e9388414e3311dfcfbcfe0211e400685dcbb0d29ece7d434c9ae84d23fb4b34c6448824b2f29ca20e25061f2092e588283d5c6ad609a3e4cbc9c72 SHA512 20e70533fa6beaa2ac3a0e95171f1f9851fd96ac26cf78cda687b1a2a5da9dae0caa0a35249890af2423f159dfd6ace4fd40cc026eca1067e8d11babd5155551
 MISC metadata.xml 996 BLAKE2B 41f19340003c0213578fb1b3f7ae6aaff718eb150cdb398b463e695dcc931da45251ab5d70fbdff0277f52ad7a231f93f878d9fa4ce9fe5a338cc3d4e2708124 SHA512 123f401010d157b928390599a3125c9c18ba721757a16ac3fcce4fe30e3ff298ad9a3dcda64b779bf2fe0fcb52c9057e382b7ac618a3ae27b92dd94cf0dde0d7
diff --git a/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild b/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild
index e896449d6c5e..b13500031e9b 100644
--- a/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild
+++ b/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit toolchain-funcs eutils savedconfig
+inherit toolchain-funcs savedconfig
 
 GIT_REV="546dd51de8459d4d09958891f426fa2c73ff090d"
 GIT_SHORT=${GIT_REV:0:7}
diff --git a/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild b/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild
index a173db1969e0..dc6b098f4149 100644
--- a/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild
+++ b/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit toolchain-funcs eutils savedconfig
+inherit toolchain-funcs savedconfig
 
 GIT_REV="a4f8c6e31f6c62522cfc633bbbffa81b22f9d6f3"
 GIT_SHORT=${GIT_REV:0:7}
diff --git a/sys-firmware/ipxe/ipxe-1.21.1.ebuild b/sys-firmware/ipxe/ipxe-1.21.1.ebuild
new file mode 100644
index 000000000000..bfa23b68a2e7
--- /dev/null
+++ b/sys-firmware/ipxe/ipxe-1.21.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit savedconfig toolchain-funcs
+
+DESCRIPTION="Open source network boot (PXE) firmware"
+HOMEPAGE="https://ipxe.org/"
+SRC_URI="
+	!binary? ( https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz )
+	binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )"
+S="${WORKDIR}/${P}/src"
+
+LICENSE="GPL-2"
+SLOT="0"
+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 ) )"
+
+SOURCE_DEPEND="
+	app-arch/xz-utils
+	dev-lang/perl
+	iso? (
+		app-cdr/cdrtools
+		sys-boot/syslinux
+	)"
+BDEPEND="
+	!binary? (
+		amd64? ( ${SOURCE_DEPEND} )
+		x86? ( ${SOURCE_DEPEND} )
+	)"
+
+src_configure() {
+	use binary && return
+
+	cat > config/local/general.h <<-EOF || die
+		#undef BANNER_TIMEOUT
+		#define BANNER_TIMEOUT 0
+	EOF
+
+	if use ipv6; then
+		cat >> config/local/general.h <<-EOF || die
+			#define NET_PROTO_IPV6
+		EOF
+	fi
+
+	if use vmware; then
+		cat >> config/local/general.h <<-EOF || die
+			#define VMWARE_SETTINGS
+			#define CONSOLE_VMWARE
+		EOF
+	fi
+
+	restore_config config/local/general.h
+
+	tc-ld-disable-gold
+}
+
+ipxemake() {
+	# Q='' makes the build verbose since that's what everyone loves now
+	emake Q='' \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		AS="$(tc-getAS)" \
+		AR="$(tc-getAR)" \
+		NM="$(tc-getNM)" \
+		OBJCOPY="$(tc-getOBJCOPY)" \
+		RANLIB="$(tc-getRANLIB)" \
+		OBJDUMP="$(tc-getOBJDUMP)" \
+		HOST_CC="$(tc-getBUILD_CC)" \
+		"$@"
+}
+
+src_compile() {
+	use binary && return
+
+	export NO_WERROR=1
+	if use qemu; then
+		ipxemake bin/808610de.rom # pxe-e1000.rom (old)
+		ipxemake bin/8086100e.rom # pxe-e1000.rom
+		ipxemake bin/80861209.rom # pxe-eepro100.rom
+		ipxemake bin/10500940.rom # pxe-ne2k_pci.rom
+		ipxemake bin/10222000.rom # pxe-pcnet.rom
+		ipxemake bin/10ec8139.rom # pxe-rtl8139.rom
+		ipxemake bin/1af41000.rom # pxe-virtio.rom
+	fi
+
+	if use vmware; then
+		ipxemake bin/8086100f.mrom # e1000
+		ipxemake bin/808610d3.mrom # e1000e
+		ipxemake bin/10222000.mrom # vlance
+		ipxemake bin/15ad07b0.rom # vmxnet3
+	fi
+
+	use efi && ipxemake PLATFORM=efi BIN=bin-efi bin-efi/ipxe.efi
+	use iso && ipxemake bin/ipxe.iso
+	use undi && ipxemake bin/undionly.kpxe
+	use usb && ipxemake bin/ipxe.usb
+	use lkrn && ipxemake bin/ipxe.lkrn
+}
+
+src_install() {
+	insinto /usr/share/ipxe/
+
+	if use qemu || use vmware; then
+		doins bin/*.rom
+	fi
+	use vmware && doins bin/*.mrom
+	use efi && doins bin-efi/*.efi
+	use iso && doins bin/*.iso
+	use undi && doins bin/*.kpxe
+	use usb && doins bin/*.usb
+	use lkrn && doins bin/*.lkrn
+
+	save_config config/local/general.h
+}
diff --git a/sys-firmware/seabios/Manifest b/sys-firmware/seabios/Manifest
index 56b9fd855af2..792af1c5dd45 100644
--- a/sys-firmware/seabios/Manifest
+++ b/sys-firmware/seabios/Manifest
@@ -7,15 +7,11 @@ AUX seavgabios/config.vga-qxl 128 BLAKE2B f627711caa7dfbb236b4e9e83104d3d5c7d07a
 AUX seavgabios/config.vga-stdvga 59 BLAKE2B 7c10706c7d261f64e181d85c268375aa3b6b362bf3e5f1f391c52a6a3644a498a44c9627f60b6c47893c4fad24cc4667e816ab98e6bdcdb97b7d8f7463a8bf10 SHA512 4a1b7fcc729d78dc8fd4e73d1cb6258ed9d49f8a91e6e00cc184e07c89a304f8d38ef5446d1c4ba5e8e929c82693d82c21526e42992ad6e1a008f39bb7c90448
 AUX seavgabios/config.vga-virtio 128 BLAKE2B 98237322784b56cdff2c7d7298a419b18ab77031dfad9da743af73c3073a5b766be3940694a320c82ffda65c8a48e028eccd974d37ccd44f9ba0720b5787b53e SHA512 4d627be11d79f0b8bd814a49e608826375aba6b59a0189dcba9afe24a181347b92e6ab18e0d9199e2f7a78f8fb02f03dad84c63fbbc2ffe9af76777ef28c5f8a
 AUX seavgabios/config.vga-vmware 128 BLAKE2B 8ab374ee7b0ad5cd8f732ccc4983f2251a8ba4843bab358cb3e84e12a572e4e348094e762ecfaa94f704ad05d718bfebd34048b1db3076dae2309d7963794437 SHA512 2a82f75ca6dbf48546ffa5a756136dd7085855d9411c3b37a74cc53281027b4916cf628dba784bcad915682d94705b5f8116f7a1b7ec6a99d9b2fb3fffba01c0
-DIST seabios-1.10.2-bin.tar.xz 121172 BLAKE2B 9d4ff624b638773e59bbf6674fb8630bd815d75af1a81db4de7f9740c37485330e6d054448f2301a97455ff0d3190d988ce0348eac78bd978982b6ce5146e4f6 SHA512 a46ce389b8b0fe7182a3dc2954fab7e0ef27ac65823e3785c247ccf77c37eaa746d94f74a4a29a221aa16ab508cf07ec8d399aa612d5c0184b48bce24c663b69
-DIST seabios-1.10.2.tar.gz 589283 BLAKE2B 08fdbecf7fb06629db472adb05a780249dbf0e0a44d04dcced5480d631c133f74ecd04b04486db3bb817b8e119e783c4b09c3ade15b9a6cc956537e9f7204514 SHA512 ea8396fe247a3bd16b43ab775cf8e23f139673b94e83f450cadb094cc8117ca7e9ef518162d965209d5ab091c96f70ec5cc8ec8d15b638e06c4c8f7a0e1609dc
-DIST seabios-1.11.0-bin.tar.xz 158552 BLAKE2B 44c42b9eea70a090ad51296949fe79e5360b569bae791fe84f447061f8dbcdb6b601501e2cc1607b62308f3118087386d15ba32c8495202f62f9f9a1e3cf27c3 SHA512 03a1523dc99dbf6e353e7844a4f12020d88bf8d5cbfd187007663ab1b02447b02694f27ee93aa46a18a5ab161f13b1ffe62f2d0f678cd86975a3d53295a6eb1e
-DIST seabios-1.11.0.tar.gz 607746 BLAKE2B 9f688be6b8f7c0fcbd72b59ac649a9c763fdd9e2971a4d85636c9972efc0ad42082a1622a8c41156ad1e2063907349c2e02cff9aeb444844dc445b5f7d6062bb SHA512 cae79c720bfbba3321777bbc6d5bde432fe56e2ba8f1be8acfebbde0bd453a58e889f5fa24db6055dca0a3a56d35b907761723ea35ef248c5f812129d0a27b77
 DIST seabios-1.12.0-bin.tar.xz 162492 BLAKE2B 9a5a349226ed7efbed328493dc057e232203b251677a23f1f09c133743ff0ca6b05270c9d27460be1d8897888fe23ff7bdfa122023fa8ddb23af03d5b9b6f8dd SHA512 f7a0395d621245093bb9a278d95ecc3d4e8d23f620058cd4fddaf885c8b86256f6258f3fd8173c1d24c03306f44d180e768bf8005ee123bc4b699b9f0ca371be
 DIST seabios-1.12.0.tar.gz 613542 BLAKE2B f145c2db716996bfa9e5c014086ccfaa8ae96ebc158f34303b122b7bf209408c567665d8691364df8d8e886f63e0e72a3f3cd319dfa86ef581023201b5d94e53 SHA512 e52c5363e5bb37b5286e55545aa06bd126218f9d0e3a06ac2e189de68fe3de3256c11ca1bb13357a9c384d7e3af6284083ff3aa587688b5de04ef11b97bdfa27
-EBUILD seabios-1.10.2.ebuild 3375 BLAKE2B 318faa385a33ced2f9cb2243c14975e50f3d2ec358db7d1ea27bdd182422caac39fddcaab0a04f01feef18335d59369778a882eae157b69298c669d9bfd9ad91 SHA512 8406e91931ec65a4bd6a036624800da84611310bea87a3856fd0e3da04c4e5e9476b76a94d710601e7eec8dd2cbdb57afd4c6eef53f1a8a4c8c0081a7c09628e
-EBUILD seabios-1.11.0-r1.ebuild 4065 BLAKE2B 911d987097b600fc2b86f95291aa2f5ef5bc6ccdbbd1b5956977e540d4a3869a0f6ed782f1cc9c3e076a2a13ec84abb68df851cd533a7cd5ce51c85055ee8dbb SHA512 5411f225fd208df14e599ceff04275a9871e247fe066d9e88d4105df90741e661d92b1d9e82f456927642543085790b4e466cf608c8240d857039085d1e8d105
-EBUILD seabios-1.11.0.ebuild 3291 BLAKE2B 968ee3c835bc28999bf2f1c2493a033047d5236b8c1b118480be99b547e81e6d23befb90475bf21083d708f5765b52f62d8742be25e40ba88e94cabcb61ea4ec SHA512 146b157b051a9643e4a4011105a38daff85cdf92ef996a5043e53b152a9987d408b377ab7091e21d2345b830a531cc48ea6d0a79a75f2b189fed0be28fafd509
-EBUILD seabios-1.12.0-r1.ebuild 4065 BLAKE2B e4295136331e5bebb91ca096250b1c65c662c855cb0d9cf49c92fb90d7299b3647b34505072a42bca2b2aaa908bcdec7e1d14494683954dc5cb13e8bd5021c65 SHA512 e794a9806a6008f86590aa86e64f9ab345481f9821e83456dd3711a58504318a12adc5c6edbef3634b303fc8baf7f925858ad9d6d7b2bacb6f23e7839b0f3969
-EBUILD seabios-1.12.0.ebuild 3446 BLAKE2B 2d9188b6d1b88344e229bbdf74131c6e9b1d17ec4cc5e0a848799d64c44c29d9510d1a4652842fb29e572e293b27844cb1cf16b846987ba1b6b1b1d0e3ce7e58 SHA512 684cfa6bb2e26c2fa9324401473b22d910d6f67a23947ec1f33ab2aaa3ee1da0c93dc60ff9851ba2a9d42f6dad19b86d08ba882e66a65f3a70825a0a62af2963
+DIST seabios-1.14.0-bin.tar.xz 170160 BLAKE2B 1ab471ce0c6e27633ec42a66e3069496be84de713baab5de4f297821bd0da26404f7f70abc82e223ec5aa317a878889ae92b019988c72d24f77e7dcc5865f916 SHA512 7964e9bb7dff4fd6593f5d6d64efc4b1460750461b86635dbe5255d2086d619f51711d7a35e4dc20e556f705091c0950afabeddcd2e8876f05ce14f9ca73ed71
+DIST seabios-1.14.0.tar.gz 628985 BLAKE2B cc1126925dab1551a655680d20d06ebf28c12c386500d1ee4df9e1a99403b4c5bc6a66c2cc5ef58b4c3d6d7226f35007506a6a1855c2cf2742469dcb7aba05bb SHA512 215c42f59425f8abd062be7b11fc0e39c977cee5001a2381551b0f851ac337d0dd53c065267e6dee0e710ffd700fa635f9007b89da8dfce0f47122c984ee8146
+EBUILD seabios-1.12.0-r1.ebuild 4058 BLAKE2B 960efadabb9000c6aecde46e41760d414f92f7b915ae546faf831cd52954b8f78e98419faeb54200189d0210c2d72057fa05997fa848fc10a42cbdff3d665a47 SHA512 9a9fe25e5766f9fc88fc22ac3fe796a3229a36bdba5c08a7648df8dcea0e8502fa9ada2ab3ab1aee2466f67bbb678e3e500ee99e2fe24b3e8b77c4bdded33a32
+EBUILD seabios-1.12.0.ebuild 3439 BLAKE2B 4e88e25af3df5c52d44259b8078f2c6a7baf5d88dfd572ab7e25c1d0a35737eca941002fb2e111a70143d95af61b012bbeb1da7e33a1b900471a4c3720cd6f70 SHA512 7e9a0e45766736bfc4aa71736aeee1e5301a044cb84f0ea7060be4cfc2e6f7da97ca789d136b85911d05a25aa1abcc6f644ebdf2da3c5e7a4371171d18614423
+EBUILD seabios-1.14.0.ebuild 3777 BLAKE2B 8899319dd58141da3779c871730448e60ddbb459c8a6f3701a81eac4323795ed5e075bef3cd6f4ab805d4e7e5018934e6faee984b0c9ac5d315f62ea23b16cc4 SHA512 fd9383ca5a7bd2697e7ff81d17071771492a657d244b529ee580cba9ae02d978b38a3c71ece056b7003f7db549ea6980ef254f3f8f4aa96e45ff6644c6afe6ce
 MISC metadata.xml 551 BLAKE2B 1bc4f5bcc0dd85ff4e14ededc83e631c942995a8f0ba9534d72b6d5b671ad471eeb0c43a02ce4cf7c0b79d7f0d5583d419c46aaa8c297f1544353b8f42cdefa4 SHA512 5a580198036d96152d46c79b19317e35e5ba15f998ccaeade825189ee640a6ca50552a46f56f783ebba288df3953d461695039539c47baa27e3c9da1f8b1ccc0
diff --git a/sys-firmware/seabios/seabios-1.10.2.ebuild b/sys-firmware/seabios/seabios-1.10.2.ebuild
deleted file mode 100644
index 0175c19a646a..000000000000
--- a/sys-firmware/seabios/seabios-1.10.2.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit eutils toolchain-funcs python-any-r1
-
-# SeaBIOS maintainers sometimes don't release stable tarballs or stable
-# binaries to generate the stable tarball the following is necessary:
-# git clone git://git.seabios.org/seabios.git && cd seabios
-# git archive --output seabios-${PV}.tar.gz --prefix seabios-${PV}/ rel-${PV}
-
-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"
-
-	# Binary versions taken from fedora:
-	# http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/
-	#   seabios-bin-1.10.2-1.fc27.noarch.rpm
-	#   seavgabios-bin-1.10.2-1.fc27.noarch.rpm
-	SRC_URI="
-		!binary? ( https://code.coreboot.org/p/seabios/downloads/get/${P}.tar.gz )
-		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )"
-fi
-
-DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS"
-HOMEPAGE="https://www.seabios.org/"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-IUSE="+binary debug +seavgabios"
-
-REQUIRED_USE="debug? ( !binary )
-	!amd64? ( !x86? ( binary ) )"
-
-# The amd64/x86 check is needed to workaround #570892.
-SOURCE_DEPEND="
-	>=sys-power/iasl-20060912
-	${PYTHON_DEPS}"
-DEPEND="
-	!binary? (
-		amd64? ( ${SOURCE_DEPEND} )
-		x86? ( ${SOURCE_DEPEND} )
-	)"
-RDEPEND=""
-
-pkg_pretend() {
-	if ! use binary; then
-		ewarn "You have decided to compile your own SeaBIOS. This is not"
-		ewarn "supported by upstream unless you use their recommended"
-		ewarn "toolchain (which you are not)."
-		elog
-		ewarn "If you are intending to use this build with QEMU, realize"
-		ewarn "you will not receive any support if you have compiled your"
-		ewarn "own SeaBIOS. Virtual machines subtly fail based on changes"
-		ewarn "in SeaBIOS."
-	fi
-}
-
-pkg_setup() {
-	use binary || python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	# This simplifies the logic between binary & source builds.
-	mkdir -p "${S}"
-}
-
-src_configure() {
-	use binary && return
-
-	tc-ld-disable-gold #438058
-
-	if use debug ; then
-		echo "CONFIG_DEBUG_LEVEL=8" >.config
-	fi
-	_emake config
-}
-
-_emake() {
-	LANG=C \
-	emake V=1 \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		AR="$(tc-getAR)" \
-		OBJCOPY="$(tc-getOBJCOPY)" \
-		RANLIB="$(tc-getRANLIB)" \
-		OBJDUMP="$(tc-getOBJDUMP)" \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		VERSION="Gentoo/${EGIT_COMMIT:-${PVR}}" \
-		"$@"
-}
-
-src_compile() {
-	use binary && return
-
-	for t in 128k 256k ; do
-		cp "${FILESDIR}/seabios/config.seabios-${t}" .config || die
-		_emake oldnoconfig
-		_emake out/bios.bin
-		mv out/bios.bin ../bios-${t}.bin || die
-	done
-
-	if use seavgabios ; then
-		local config t targets=(
-			cirrus
-			isavga
-			qxl
-			stdvga
-			virtio
-			vmware
-		)
-		for t in "${targets[@]}" ; do
-			emake clean distclean
-			cp "${FILESDIR}/seavgabios/config.vga-${t}" .config || die
-			_emake oldnoconfig
-			_emake out/vgabios.bin
-			cp out/vgabios.bin ../vgabios-${t}.bin || die
-		done
-	fi
-}
-
-src_install() {
-
-	insinto /usr/share/seabios
-	use binary && doins ../bios.bin
-	use !binary && newins ../bios-128k.bin bios.bin
-	doins ../bios-256k.bin
-
-	if use seavgabios ; then
-		insinto /usr/share/seavgabios
-		doins ../vgabios*.bin
-	fi
-}
diff --git a/sys-firmware/seabios/seabios-1.11.0.ebuild b/sys-firmware/seabios/seabios-1.11.0.ebuild
deleted file mode 100644
index a7aacee36b44..000000000000
--- a/sys-firmware/seabios/seabios-1.11.0.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit eutils toolchain-funcs python-any-r1
-
-# SeaBIOS maintainers sometimes don't release stable tarballs or stable
-# binaries to generate the stable tarball the following is necessary:
-# git clone git://git.seabios.org/seabios.git && cd seabios
-# git archive --output seabios-${PV}.tar.gz --prefix seabios-${PV}/ rel-${PV}
-
-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"
-
-	# Binary versions taken from fedora:
-	# http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/
-	#   seabios-bin-1.10.2-1.fc27.noarch.rpm
-	#   seavgabios-bin-1.10.2-1.fc27.noarch.rpm
-	SRC_URI="
-		!binary? ( https://code.coreboot.org/p/seabios/downloads/get/${P}.tar.gz )
-		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )"
-fi
-
-DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS"
-HOMEPAGE="https://www.seabios.org/"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-IUSE="+binary debug +seavgabios"
-
-REQUIRED_USE="debug? ( !binary )
-	!amd64? ( !x86? ( binary ) )"
-
-# The amd64/x86 check is needed to workaround #570892.
-SOURCE_DEPEND="
-	>=sys-power/iasl-20060912
-	${PYTHON_DEPS}"
-DEPEND="
-	!binary? (
-		amd64? ( ${SOURCE_DEPEND} )
-		x86? ( ${SOURCE_DEPEND} )
-	)"
-RDEPEND=""
-
-pkg_pretend() {
-	if ! use binary; then
-		ewarn "You have decided to compile your own SeaBIOS. This is not"
-		ewarn "supported by upstream unless you use their recommended"
-		ewarn "toolchain (which you are not)."
-		elog
-		ewarn "If you are intending to use this build with QEMU, realize"
-		ewarn "you will not receive any support if you have compiled your"
-		ewarn "own SeaBIOS. Virtual machines subtly fail based on changes"
-		ewarn "in SeaBIOS."
-	fi
-}
-
-pkg_setup() {
-	use binary || python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	# This simplifies the logic between binary & source builds.
-	mkdir -p "${S}"
-}
-
-src_configure() {
-	use binary && return
-
-	tc-ld-disable-gold #438058
-
-	if use debug ; then
-		echo "CONFIG_DEBUG_LEVEL=8" >.config
-	fi
-	_emake config
-}
-
-_emake() {
-	LANG=C \
-	emake V=1 \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		AR="$(tc-getAR)" \
-		OBJCOPY="$(tc-getOBJCOPY)" \
-		RANLIB="$(tc-getRANLIB)" \
-		OBJDUMP="$(tc-getOBJDUMP)" \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		VERSION="Gentoo/${EGIT_COMMIT:-${PVR}}" \
-		"$@"
-}
-
-src_compile() {
-	use binary && return
-
-	cp "${FILESDIR}/seabios/config.seabios-256k" .config || die
-	_emake oldnoconfig
-	_emake out/bios.bin
-	mv out/bios.bin ../bios-256k.bin || die
-
-	if use seavgabios ; then
-		local config t targets=(
-			cirrus
-			isavga
-			qxl
-			stdvga
-			virtio
-			vmware
-		)
-		for t in "${targets[@]}" ; do
-			emake clean distclean
-			cp "${FILESDIR}/seavgabios/config.vga-${t}" .config || die
-			_emake oldnoconfig
-			_emake out/vgabios.bin
-			cp out/vgabios.bin ../vgabios-${t}.bin || die
-		done
-	fi
-}
-
-src_install() {
-
-	insinto /usr/share/seabios
-	use binary && doins ../bios.bin
-	doins ../bios-256k.bin
-
-	if use seavgabios ; then
-		insinto /usr/share/seavgabios
-		doins ../vgabios*.bin
-	fi
-}
diff --git a/sys-firmware/seabios/seabios-1.12.0-r1.ebuild b/sys-firmware/seabios/seabios-1.12.0-r1.ebuild
index 23b9137e9fc8..03b9cd8cd76c 100644
--- a/sys-firmware/seabios/seabios-1.12.0-r1.ebuild
+++ b/sys-firmware/seabios/seabios-1.12.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit eutils toolchain-funcs python-any-r1
+inherit toolchain-funcs python-any-r1
 
 # SeaBIOS maintainers sometimes don't release stable tarballs or stable
 # binaries to generate the stable tarball the following is necessary:
diff --git a/sys-firmware/seabios/seabios-1.12.0.ebuild b/sys-firmware/seabios/seabios-1.12.0.ebuild
index aa4de81c45aa..375070e32da8 100644
--- a/sys-firmware/seabios/seabios-1.12.0.ebuild
+++ b/sys-firmware/seabios/seabios-1.12.0.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit eutils toolchain-funcs python-any-r1
+inherit toolchain-funcs python-any-r1
 
 # SeaBIOS maintainers sometimes don't release stable tarballs or stable
 # binaries to generate the stable tarball the following is necessary:
diff --git a/sys-firmware/seabios/seabios-1.11.0-r1.ebuild b/sys-firmware/seabios/seabios-1.14.0.ebuild
index 4cdaf7f38094..d17a8f42f976 100644
--- a/sys-firmware/seabios/seabios-1.11.0-r1.ebuild
+++ b/sys-firmware/seabios/seabios-1.14.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit eutils toolchain-funcs python-any-r1
+inherit toolchain-funcs python-any-r1
 
 # SeaBIOS maintainers sometimes don't release stable tarballs or stable
 # binaries to generate the stable tarball the following is necessary:
@@ -18,12 +18,8 @@ if [[ ${PV} == *9999* || -n "${EGIT_COMMIT}" ]] ; then
 else
 	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/
-	#   seabios-bin-1.10.2-1.fc27.noarch.rpm
-	#   seavgabios-bin-1.10.2-1.fc27.noarch.rpm
 	SRC_URI="
-		!binary? ( https://code.coreboot.org/p/seabios/downloads/get/${P}.tar.gz )
+		!binary? ( https://www.seabios.org/downloads/${P}.tar.gz )
 		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )"
 fi
 
@@ -161,7 +157,6 @@ src_compile() {
 
 src_install() {
 	insinto /usr/share/seabios
-	use binary && doins ../bios.bin
 	doins ../bios-256k.bin
 
 	if use seavgabios ; then
diff --git a/sys-firmware/sgabios/Manifest b/sys-firmware/sgabios/Manifest
index 7e90a55bbf60..560ad9defa64 100644
--- a/sys-firmware/sgabios/Manifest
+++ b/sys-firmware/sgabios/Manifest
@@ -1,6 +1,9 @@
 AUX sgabios-0.1_pre8-build-cc.patch 467 BLAKE2B 5d1963f2f9c74fa1503b81ebfce8ae9cd0506c31f4ee89c7515bb22a44aba6fd39223587603994b2954b31cd69a93afe0f3bbce5cfc41ae7bb3337c29846dfaa SHA512 2d160bc5be76c2abdd7a53dc1555f0d40ea2ddedbcc4a0138b547b9391ac2f99c002906f68851549b4fb3103406f4643c35bc2278b4dcda7e4c7054f095c65e3
 AUX sgabios-0.1_pre8-makefile.patch 395 BLAKE2B 0d6a9eff239e3881bb6dc674e62b98eb48b7b9c422dd77ee6c0e0f807f213fbc38a4e7a730d329123d947540c9f4bcb60019c85c3b1b1041be353028d77c4ab4 SHA512 7c111af2fff59b0ca6d4b39d04715d404bffa0f71a337b43f7dd091af6e40e85b790ed8b560039d5702d07e1ae47f2c204e891373f11d2ee4aa1541cb471c566
+DIST sgabios-0.1_pre10-bin.tar.xz 2652 BLAKE2B 6dff0152f8553c245796badfd291e0e79f2a6a935a9908d9825dbac760746c05265b7f12a29a2d1fa1b95d16291ca5723fbf2f53b5bb04ff416e64b9c66b0c7d SHA512 6dd43858e91bee57bc0bc6d721eb26abb30bbe8b9c30733b39f3612cdf0dddd9ad8876518a4457a68a48d8a4b911225635c0e8eef1a7e78cfe65c8fcf0af2bab
+DIST sgabios-0.1_pre10.tar.gz 31086 BLAKE2B f9577d0009d90c46aa5963e6dea50be4b7ec4b5c597194b33256748adbc4d60b3ac50646ce80befbd6d810ba80e93048fd6234b4d320d15f3506087435ec346c SHA512 cf12a8b8579658c99a3ad8c325637dba1569d364fc5440caf33c85a4f0403d83cf755df61d068151191c75588d568da629329a93d731f49b0b9131c983141fe6
 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 1231 BLAKE2B ab8610e4b39e593ea3aece48368394f239c2c2ee7e80992bcd7527242b7bbbc394d8bb807e341eebccfdf2bad5664c0116fdcbb18fe96775d41fa3a56c65bebd SHA512 043be393e2ae2f049e099eef54f8d9ba741afd1ae6f674cd23c276c8acb664902afc025325ff75d46515ebc33a0598c912d706fd48508be453a5c11376aedb07
+EBUILD sgabios-0.1_pre10.ebuild 1184 BLAKE2B eb05f0b72ebb07bf2ce1d42f02f9f758c480d9bae57e52ec5e84420cae7888840410bb56bd1f82df3f3eddaacd6e3aa1564a92c519f7d3aa2431a486de0b8025 SHA512 02326c8cd521b52d0bc94f124df92d85e5bd1ea8923b948e6863ddf21f1402eff8f7c5d529b574e1475a0a1624ae62f11da1d6735267324423cc5b1155e16cdd
+EBUILD sgabios-0.1_pre8-r1.ebuild 1224 BLAKE2B 28ad041bc2643cdeecb9d802c48a81277842b7c1f43fa4ac1fc9f56ce50c0cf2ef2b6abf851bd7371fb328b65d94105c0cfac8eaf26a96e7a32a85c579e794d3 SHA512 e37233d4d5137c9893df70f1ea0e64a28acdf9b28256d022d1a37ae7a10f9c9a4683417a1a379150ac3f310ba6558221faa5eca3c55b4c50b19ea00fb55a23d0
 MISC metadata.xml 446 BLAKE2B 4ae7416e96ab45a156d697bbb5bd35307040114250950a9b695ab19ec9ce75ee9f2e89845ffce820b693518df6ba525b722461f82b306b5798d71e806106baf9 SHA512 3dff66a2d4412a527c648ceb070d7f23765e6b0b74271cf1ecef27c8c05c9282c880ea8f5e3192ea612b07eaed6a0596b00ecf4bbdee22b77d1ce176592b9f0d
diff --git a/sys-firmware/sgabios/sgabios-0.1_pre10.ebuild b/sys-firmware/sgabios/sgabios-0.1_pre10.ebuild
new file mode 100644
index 000000000000..150fd1ef8bec
--- /dev/null
+++ b/sys-firmware/sgabios/sgabios-0.1_pre10.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="serial graphics adapter bios option rom for x86"
+HOMEPAGE="https://code.google.com/p/sgabios/"
+# downloaded from
+# https://git.qemu.org/?p=sgabios.git;a=tree;h=a85446adb0e07ccd5211619a6f215bcfc3c5ab29;hb=23d474943dcd55d0550a3d20b3d30e9040a4f15b
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	!binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}.tar.gz )
+	binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )"
+S="${WORKDIR}/sgabios-a85446a"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+binary"
+REQUIRED_USE="!amd64? ( !x86? ( binary ) )"
+
+src_compile() {
+	use binary && return
+
+	tc-ld-disable-gold
+	tc-export_build_env BUILD_CC
+	emake -j1 \
+		BUILD_CC="${BUILD_CC}" \
+		BUILD_CFLAGS="${BUILD_CFLAGS}" \
+		BUILD_LDFLAGS="${BUILD_LDFLAGS}" \
+		BUILD_CPPFLAGS="${BUILD_CPPFLAGS}" \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		AR="$(tc-getAR)" \
+		OBJCOPY="$(tc-getOBJCOPY)"
+}
+
+src_install() {
+	insinto /usr/share/sgabios
+	doins sgabios.bin
+}
diff --git a/sys-firmware/sgabios/sgabios-0.1_pre8-r1.ebuild b/sys-firmware/sgabios/sgabios-0.1_pre8-r1.ebuild
index 1dedeca043a8..8a87d1c68a90 100644
--- a/sys-firmware/sgabios/sgabios-0.1_pre8-r1.ebuild
+++ b/sys-firmware/sgabios/sgabios-0.1_pre8-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="serial graphics adapter bios option rom for x86"
 HOMEPAGE="https://code.google.com/p/sgabios/"
diff --git a/sys-firmware/sigrok-firmware-fx2lafw/Manifest b/sys-firmware/sigrok-firmware-fx2lafw/Manifest
index c29a9c63fb03..06276ea2e051 100644
--- a/sys-firmware/sigrok-firmware-fx2lafw/Manifest
+++ b/sys-firmware/sigrok-firmware-fx2lafw/Manifest
@@ -1,9 +1,5 @@
-DIST sigrok-firmware-fx2lafw-0.1.6.tar.gz 143755 BLAKE2B 017222f5cedf8cda16e08af75761fc27cf04335557490e03f6fcd4a875d2e67f64a6d01fa7e8ff43aaa5d2633d176a0d756f693819f839c87d7fcd43f829e378 SHA512 d636e9a86009a4581630e38beaee144330bd3ea2e2f69487b09c3d8e372e722877f76dab05c8c5098c6fabd041eab04c3169a0d2f8fbed8a6f5de8c3e6f5841d
 DIST sigrok-firmware-fx2lafw-0.1.7.tar.gz 145443 BLAKE2B 6e19fde87caf942ca8f95a67f5ba5553e2044e9ba43ca81f6b7be69f4a75ca25e946edf80d0f4ddf7d361f98aff68e9a0d950070fbca24423c908fbc70155ae9 SHA512 e9973980b07cef395637476c6294473e349770be24afe6b03d284bf3057f6b32fe686e25f3baa180b96455397db43e16f191a9feb07bf46e097170fb4d326f8e
-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-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.6.ebuild b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.6.ebuild
deleted file mode 100644
index 1f85fa931259..000000000000
--- a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-SDCC_DEPEND=">=dev-embedded/sdcc-2.9.0[device-lib(+),mcs51(+),sdcpp(+)]
-	<dev-embedded/sdcc-3.8.6"
-
-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
deleted file mode 100644
index 10d98c962474..000000000000
--- a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.7.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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/vgabios/Manifest b/sys-firmware/vgabios/Manifest
index f735607f4665..ea8da3038688 100644
--- a/sys-firmware/vgabios/Manifest
+++ b/sys-firmware/vgabios/Manifest
@@ -1,5 +1,5 @@
 DIST vgabios-0.7a-fixes-1.tar.bz2 2602 BLAKE2B 68fbd29e6c660dc69ea110e00ff75fc9d14f10bd11b9be89bd373281852a3133c73ee0f2a7ecdf026b29979e4c20bcdbad0baf9f80d013ffeb24dda892725778 SHA512 30992efac011d4b99301960df08cdc69d9503aa6b61feed01fca2c5a910460269d9500650cb394a0737318e977a282c5e0ab613a8b2bc28b9f0c6528a9a77d73
 DIST vgabios-0.7a.tgz 1506655 BLAKE2B fb9b99ab385423b4ef103a56de140591556d2f49fffebfdd508a462551b1a9def9d8dc50c947a88ef6d47c43ff62dbe3d97fef969d985c49b9e78671eaefd34e SHA512 35d789b1b39f8f05b757b6c3379a1b2c33dc27b244720471530325f3e215b5f4fa97cfbfc131f813013f4640fe85be912e7b4cb924fa87ed35e68b6966424874
-EBUILD vgabios-0.7a-r1.ebuild 1664 BLAKE2B 931f6cb332fe70867152414d1f896d20c9cc3e34fffd4809d50ccc61782ad2a8c1d716734a8b4aec863be4ef51d8acfe9576ae0ce09375514d5131e358cb3177 SHA512 c15cf3f55ec224e78ec5cdddf07f3481084c19fad02f62c2bae1294e3c466a926895f9fbe8d50a72dd85e4b16c33e7d37e1807a2392123f4da7edde7d591b6c9
+EBUILD vgabios-0.7a-r1.ebuild 1669 BLAKE2B c6f596bbf7b9ef22634de6c2d44e16b479ab8cf0284572ff5e493647f62696e52e8345b6d1c87b38a0e71515e879ecfb1591a457b9ccaa2f91f2494c39ddd8a9 SHA512 b24e3472a46c86ac510628a3266eebb61ca34792d8bf55450796919300ac75b13e8cb4735234fcedac50aa982ec8fb015e7c721e8633819886ded3c6ea39be84
 EBUILD vgabios-0.7a.ebuild 1635 BLAKE2B 9ced20787c35a6c9b73508d274e17e1869e7b27456b5c82a377d117f210c933dc42250bdd5ef142f43a48c0a98420d4c502ce8ea56c232272fe83b71428e4ea5 SHA512 7577d3a41ea5acaf929c9095c50ff9143e91c449414fc1c315358b2d77e67b8ccb43727892d44498b1eb32272093d42e4e7650ee674e65438cdfd1c0f0153f6b
 MISC metadata.xml 497 BLAKE2B 486ae4d9758667855e7920cc589aa1a284c0be89387f78c2c226701fa2f32bc20a6769b909d63f9c04483aa900d0d0858fec2db4e49fe6e710cf9dd6df458263 SHA512 c7f5fb5b3c08c0cd3d7460d4ada18ce829dadd3c286782cc064ce18af5b427e20c5be8925b8ed179ceb2ee2405aa0a85593b268c1d98dfae5d55f06587d6de47
diff --git a/sys-firmware/vgabios/vgabios-0.7a-r1.ebuild b/sys-firmware/vgabios/vgabios-0.7a-r1.ebuild
index aa925da50189..2c564d82757b 100644
--- a/sys-firmware/vgabios/vgabios-0.7a-r1.ebuild
+++ b/sys-firmware/vgabios/vgabios-0.7a-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://savannah.gnu.org/download/${PN}/${P}.tgz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="binary debug"
 BDEPEND="!binary? ( sys-devel/dev86 )"