gentoo resync : 22.05.2021

9 files changed, 270 insertions, 6 deletions

diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 7aa8764b089c..71ffea21f581 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/intel-microcode/Manifest b/sys-firmware/intel-microcode/Manifest
index c682da01e95a..68cc2287a6e3 100644
--- a/sys-firmware/intel-microcode/Manifest
+++ b/sys-firmware/intel-microcode/Manifest
@@ -1,8 +1,10 @@
 DIST intel-microcode-collection-20201116.tar.xz 6506624 BLAKE2B b74ec0ddafe9681ae94d6a0df1de51655004eecae83c413fa824c9ad25cf68a25059627e2809a3b8cd5b3cb18647455385de0be2b2a7fcc6bc6c30e2ccabd1af SHA512 3a1aab0af9ff6dc95778276964b457a4429aa12f13499f6f89fa48285cf8aef9a0990099a80e360b76b2d4b6a836f2528f984aab17f12d905cf237dbab2a8b33
 DIST intel-microcode-collection-20210221.tar.xz 6690716 BLAKE2B 09758341d20d60b739c4859442457fcc4ce563327dd7f14e8a626f49198d3beb59ef580530500a2dacb5ab9832119e8d489f553ccffc56613b31df027eb93e98 SHA512 e3bb3644c46ee41752bbd21c56e69144d23dab9162ebfe9906a07ff646b7ba57d14b0280b044bf7ceab771fe80e75d7aed3808b68b823ae19bc0c7c4a94589dd
+DIST intel-microcode-collection-20210514.tar.xz 7907672 BLAKE2B d5226008e50e804c0acfa648393032b08a317572be1e38743721613000dede886d3885b36f7fa4a9c061e72855fc0ad409ce3299f679afc866abda7d29c9512a SHA512 fc4fcd3e2c4f1abdf5c0d23c1c0ac2f8c572531dadbc9a070c38150ec939cd4e2b13226b86df2371eb0679cef96307262d0356f2e617773c51c53f3e440894d2
 DIST intel-ucode-sig_0x406e3-rev_0xd6.bin 101376 BLAKE2B 66d55867954d69dda1425febd93bb8c89f7aa836d504f8b5fee127f8505bcf2246f4fcc55cc245bc5e532528d60cca2eee278de7ab5174dc2862db7982a2b36f SHA512 248066b521bf512b5d8e4a8c7e921464ce52169c954d6e4ca580d8c172cd789519e22b4cf56c212e452b4191741f0202019f7061d322c9433b5af9ce5413b567
 DIST microcode-20201112.tar.gz 3610834 BLAKE2B 4212924f1673afded961266a25fe6063ec6cdafaa26c8bee1c42372eb8ab5f278dc2501615b23e09e2f9809bf2792a8db317c98c170bf0c5e1dd62b7dc80a084 SHA512 0875675d065a83ee14fa34a31022ee34e46aee579d1ff192414e79861af157ae269ca7c2c462f03b3accbd45590c76e5cbf4f53d7a6ed237e410213a96459211
 DIST microcode-20210216.tar.gz 3506111 BLAKE2B e09ab59dcccc77c15545b119dcf5309e626d53649a601c49fc7d6a65d774b8016d9ad44783f75ceb4bf384a03b909bc28693ed2be9f047029342dca9beae9cae SHA512 211ed90a248c891224bb8c569e24c04410d3f67ecc6daee41dc025042bd51c257baaba0da1ac5327df76352d2b53d812e81f06cc8726e43b95ea2f8898bc00bf
 EBUILD intel-microcode-20201112_p20201116-r1.ebuild 9298 BLAKE2B ff4ab91d73e431201865fc9c01df0d859abfa45ffec44942625c46e572f4283cdf79da2f8e2bcfb3d56d820e558630ce1d7404d2875be852fea1cb01e8b6ed2d SHA512 8f49e0fb4c4f1b1c5a43bfe428c1964d5d014c94d4c15b0ffda8b625395aabae4412488a70e82e855999db1b762f87c815ccd57b88c334e6e5215278520db476
 EBUILD intel-microcode-20210216_p20210221.ebuild 9298 BLAKE2B b61bac5b36aa2e1e72db6f4708dff56c2d5f62902cb44d975fd47b6089571e8f265a09fca46f4eb53993a30f855dea7154256f881af35382fe91774474e1ec56 SHA512 599e41379bedfe4afb9e4fb8ed386bb2c04427dfd2b31954c598457f96d976decd1a6ba420bd504ba6c3969e1ef6f6e7f98aaacb58e3bf6bb68963453e1ee41e
+EBUILD intel-microcode-20210216_p20210514.ebuild 9298 BLAKE2B b61bac5b36aa2e1e72db6f4708dff56c2d5f62902cb44d975fd47b6089571e8f265a09fca46f4eb53993a30f855dea7154256f881af35382fe91774474e1ec56 SHA512 599e41379bedfe4afb9e4fb8ed386bb2c04427dfd2b31954c598457f96d976decd1a6ba420bd504ba6c3969e1ef6f6e7f98aaacb58e3bf6bb68963453e1ee41e
 MISC metadata.xml 667 BLAKE2B f229775df839b3ddf34fcc289803ae113ad4b0ce293e036c24f3025bbd146d51c6e3ac55b4a7eb9b2ff0b6829aa020179ea4603f5e481de1c822a1deb66fd594 SHA512 a2d6bc54901a9eb12732e8fa0720c03b51ab615383f12a52019453b3a13f5c70233ee88a8d81706ce7e86eaec6d85155484cf32da288c3486d4b1a19647d2698
diff --git a/sys-firmware/intel-microcode/intel-microcode-20210216_p20210514.ebuild b/sys-firmware/intel-microcode/intel-microcode-20210216_p20210514.ebuild
new file mode 100644
index 000000000000..0a8e3fc79f0d
--- /dev/null
+++ b/sys-firmware/intel-microcode/intel-microcode-20210216_p20210514.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2021 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"
+
+# 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=""
+
+# 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.md
+}
+
+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/ipxe/Manifest b/sys-firmware/ipxe/Manifest
index 693c8e77845d..bd522085f8d3 100644
--- a/sys-firmware/ipxe/Manifest
+++ b/sys-firmware/ipxe/Manifest
@@ -6,5 +6,5 @@ DIST ipxe-1.21.1-bin.tar.xz 1860424 BLAKE2B 9d621c92be1058389758f885a02b601169d6
 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
+EBUILD ipxe-1.21.1.ebuild 2692 BLAKE2B 97adfc47ca8921f66c953d814d5c6c7f774f001127312ed3f9d8948127fd4746422d6428157345b5773f7e9750a5afe76259469e051d4dc8592dca5185fc20ca SHA512 dc2dd10f1f191703b031b19f8607fae2c4f67af7d9c0d98276587d2a847fb70c5e749e5598920cc4945b86b259573c27a8a07f24a662eed5db59dcdc4696a65c
 MISC metadata.xml 996 BLAKE2B 41f19340003c0213578fb1b3f7ae6aaff718eb150cdb398b463e695dcc931da45251ab5d70fbdff0277f52ad7a231f93f878d9fa4ce9fe5a338cc3d4e2708124 SHA512 123f401010d157b928390599a3125c9c18ba721757a16ac3fcce4fe30e3ff298ad9a3dcda64b779bf2fe0fcb52c9057e382b7ac618a3ae27b92dd94cf0dde0d7
diff --git a/sys-firmware/ipxe/ipxe-1.21.1.ebuild b/sys-firmware/ipxe/ipxe-1.21.1.ebuild
index bfa23b68a2e7..32f157da7b8d 100644
--- a/sys-firmware/ipxe/ipxe-1.21.1.ebuild
+++ b/sys-firmware/ipxe/ipxe-1.21.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}/src"
 
 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 bc05141818c2..bf474d02c8d0 100644
--- a/sys-firmware/seabios/Manifest
+++ b/sys-firmware/seabios/Manifest
@@ -17,5 +17,5 @@ EBUILD seabios-1.12.0-r1.ebuild 4058 BLAKE2B 960efadabb9000c6aecde46e41760d414f9
 EBUILD seabios-1.12.0.ebuild 3439 BLAKE2B 4e88e25af3df5c52d44259b8078f2c6a7baf5d88dfd572ab7e25c1d0a35737eca941002fb2e111a70143d95af61b012bbeb1da7e33a1b900471a4c3720cd6f70 SHA512 7e9a0e45766736bfc4aa71736aeee1e5301a044cb84f0ea7060be4cfc2e6f7da97ca789d136b85911d05a25aa1abcc6f644ebdf2da3c5e7a4371171d18614423
 EBUILD seabios-1.14.0-r1.ebuild 3921 BLAKE2B a09d2c72a1403fd258a62e6b7af04efa19316ba3a9c042467ad1afba80176391c27b8e5f10d45ba7fa5894b541c3c7af1d4e4878d076a93ea530b96e14f26535 SHA512 8b9793cd7d7dada46e7b6e25c314e5227950e7eeed7608ecc2768b9f640c7d10a91db2b6e6d8b54e36c2c196ac907db781023b440ec360caf7dbeae6c6a9cff3
 EBUILD seabios-1.14.0-r2.ebuild 4305 BLAKE2B c7076b9093cbe51872db6bd06ae19b8cfd54375c975467594c78e2679a89f554cf0c905d5c1e3329be5d1d2952c0fa0f4066a0b263d39b62fbcf413095792c21 SHA512 48c4513833991f4ed1b3c40c4c1be88d668c8d19298bf5a6b6ba22868e85d120e4fa46ae798f3efb0fe91d8fbe3e97a79a0aabb62663e58f931671e7db3c2339
-EBUILD seabios-1.14.0.ebuild 3777 BLAKE2B 8899319dd58141da3779c871730448e60ddbb459c8a6f3701a81eac4323795ed5e075bef3cd6f4ab805d4e7e5018934e6faee984b0c9ac5d315f62ea23b16cc4 SHA512 fd9383ca5a7bd2697e7ff81d17071771492a657d244b529ee580cba9ae02d978b38a3c71ece056b7003f7db549ea6980ef254f3f8f4aa96e45ff6644c6afe6ce
+EBUILD seabios-1.14.0.ebuild 3772 BLAKE2B d85c7bcbf55536018caf679e2d611eedf5536557aa6e6f7a76e664b9db3922fcb40b4d19c8dd2f29b711f9afbea824537dc7029dfd3595ef388c8fa04e6d482d SHA512 7b67858c146b4e7a515269d32363fc2cdbee0f4a36b094ddf60b9f2c8fc34f74d82d9364d19c6dffe3d1d56f158b2c232b4b3b114e37c13d0f84907cd87dd033
 MISC metadata.xml 551 BLAKE2B 1bc4f5bcc0dd85ff4e14ededc83e631c942995a8f0ba9534d72b6d5b671ad471eeb0c43a02ce4cf7c0b79d7f0d5583d419c46aaa8c297f1544353b8f42cdefa4 SHA512 5a580198036d96152d46c79b19317e35e5ba15f998ccaeade825189ee640a6ca50552a46f56f783ebba288df3953d461695039539c47baa27e3c9da1f8b1ccc0
diff --git a/sys-firmware/seabios/seabios-1.14.0.ebuild b/sys-firmware/seabios/seabios-1.14.0.ebuild
index d17a8f42f976..0c4005c94f06 100644
--- a/sys-firmware/seabios/seabios-1.14.0.ebuild
+++ b/sys-firmware/seabios/seabios-1.14.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"
 
 	SRC_URI="
 		!binary? ( https://www.seabios.org/downloads/${P}.tar.gz )
diff --git a/sys-firmware/sgabios/Manifest b/sys-firmware/sgabios/Manifest
index 560ad9defa64..2435f4fa49b4 100644
--- a/sys-firmware/sgabios/Manifest
+++ b/sys-firmware/sgabios/Manifest
@@ -4,6 +4,6 @@ DIST sgabios-0.1_pre10-bin.tar.xz 2652 BLAKE2B 6dff0152f8553c245796badfd291e0e79
 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_pre10.ebuild 1184 BLAKE2B eb05f0b72ebb07bf2ce1d42f02f9f758c480d9bae57e52ec5e84420cae7888840410bb56bd1f82df3f3eddaacd6e3aa1564a92c519f7d3aa2431a486de0b8025 SHA512 02326c8cd521b52d0bc94f124df92d85e5bd1ea8923b948e6863ddf21f1402eff8f7c5d529b574e1475a0a1624ae62f11da1d6735267324423cc5b1155e16cdd
+EBUILD sgabios-0.1_pre10.ebuild 1180 BLAKE2B 6450b8c4b28ae75e3aa9e769af8deaf5dd2a852985161caf879638b433b1a9d68640f94166feca97f4dfd860214dfd3ae65b212f46bfd4b256a6d57fc08ce1c4 SHA512 99e1d01f5a168f51bc19c273d0fb50e0c6b16b1cc906d11d820308df5d21df85ebf1c9ab405919b37b1646bd04517e10d7d24ff3e24163fd87c681ae09c47a26
 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
index 150fd1ef8bec..829c335c7724 100644
--- a/sys-firmware/sgabios/sgabios-0.1_pre10.ebuild
+++ b/sys-firmware/sgabios/sgabios-0.1_pre10.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/sgabios-a85446a"
 
 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 ) )"