gentoo resync : 23.06.2018

9 files changed, 220 insertions, 6 deletions

diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 7656cc267bc2..c7b230fc646f 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 87710dc8020c..34838a5a4259 100644
--- a/sys-firmware/intel-microcode/Manifest
+++ b/sys-firmware/intel-microcode/Manifest
@@ -1,6 +1,7 @@
 AUX intel-microcode2ucode.c 3484 BLAKE2B ff203133c00813884e61a7e1c3cfd5ca34cc8b6bbbac2940e0f9161594355d6d2ed9aa96e83c7d5dd64559ad7945e7daf0bb84d64831128a86970e4e1d3a73e1 SHA512 0e29f995dee47707026cfb6224580c2166d000e91af7b1afe12f00158be8606093d07cdbc0d583a0af79370cf1d9c16b5f35a306bae7f545a5c774ea253509b7
 AUX intel-microcode2ucode.c-r1 3533 BLAKE2B 5d6863c069526ae472bc4510b0900017ddd9d7723e86241536eff7b97a225c15bab8d53f14872a7bab7d5599ad0f0492b8df50baa5d3edc01c4d32808b1781ad SHA512 2b234a0080461f27440047d870b3a2769425499c35807f6ccc89a31e4ee87a14bc74ed2ca95a8b9744f07b93f8042a3d6486cda07011585e3e634663834ca49e
 DIST intel-microcode-collection-20180527.tar.xz 4315096 BLAKE2B 2ab4fe3d8469d98bc890e7f1347e4da442d814e945253e2c400a0ba954925f6c622d259711a9ce89a2d013365c65b002e24e182afc5c53ebd4e14828b2f5631e SHA512 45e46905156a0b4d8b272760d84030651a034feaf2afbc564f99fff89303457c0d7d694f174de5abed666d5107f2f7db93c04acd3cc36a77b1cf1a0495584b1c
+DIST intel-microcode-collection-20180616.tar.xz 4413444 BLAKE2B 4ba5371914f64c8a7261720512dff128f83cc25950a4bdf8d41e9eeb724c6d3150212b1a7f2ee966a2b9c835a2622ac885625fada497ec2bc0aa3c435a2968e8 SHA512 5c0cd4e764397f8c2593153256d573db8f57cce1fc062f5e687a108e5a430c7ed506f63d0d324ea2b88cc8bf8762d3fec507252ee9890c55bb9d3b5604151afe
 DIST microcode-20140430.tgz 785594 BLAKE2B e51a187ca99ad496804f117871b50693b03b50759c9dd23002149ff7fa4b74888c83e8e1fcf078a973dea82e6a9439de8415c56c902ed0163e55ceaaff0eaf23 SHA512 12954522629ce15c4b95c158b6288b3877a3d1f87bea838f8138e53987ef1b6c0edc7a8cbb802a981ccca178b70b4323907aafa7479c0c2fed4497f6fb7bbc1c
 DIST microcode-20140624.tgz 787237 BLAKE2B 1c2d8f39bf142570283e80f370f41c502ef04d24b4348ca4b44c881e3b1e54df72a88e09350d45a33d47d9955d84a80ae8a11e44561b1a8944a59f9326d4d81a SHA512 c774006aae639e7fae90bc1f5d8308b407e7cd3b7d0da6e35577560bf6201c2b15f7d7b6b0cd727c50be1e9d508b484b067856631fa2598498982109bff0e44c
 DIST microcode-20140913.tgz 830537 BLAKE2B 665c72fc3a3e1e13d9e58eba0ed202b30856532eee590006c02112df926b879985a97ba9a96b58a6aad0285bff95a3fbb27b22d533f958fe170887f0ab37eef1 SHA512 e179fe0001b1157cc95aee39185f51fd182d53c1bdb30bfc95bc3a70795c32012050f3a4adf06735a77d8ef9c703a330c6a2610b73b70f09f5760e31d39cb89c
@@ -36,4 +37,5 @@ EBUILD intel-microcode-20180108-r1.ebuild 2589 BLAKE2B aa50ed2760d43058427b2f01a
 EBUILD intel-microcode-20180108.ebuild 1328 BLAKE2B 27e9dfb4283a5ed844514b1fc0df0afe793776454fd9748fd00b68947834465a667b86e9b262a4161d142b42fef80651391fcf872857abaeef66de5492528f3c SHA512 d6a0b50abe64c41bac70172e0672442e46458789ee9fac3df39f91c66f16011f4bd639dcb3cbe236429223d4d51c581ed345e2048bfce205c98a3b05a580839b
 EBUILD intel-microcode-20180312.ebuild 2590 BLAKE2B cf489e4899380a5672e78fd5d8f81f5896dda301d1f82478301c1367839285631d0e1d90e67a676b59ff68b65823f7ff5354a7ac227866304457efab1ff98ccd SHA512 325b6917aa5415145ba1193d59b8a57b5667e0fea8fb3dd3d97bc0ad2e1172a5f161f94e660aebfee4057cb5f11dfcb3e3935bc4664b339b8250bc45510d47a3
 EBUILD intel-microcode-20180527-r1.ebuild 7246 BLAKE2B 1f69c9facd89055ee8e49ce7abd69b13278b084f1241b34240aed49fca1e2943ffb3c89a594b0042db71e2eb889b1fbda3dfd290f0b49589b13f72ff7785c43f SHA512 ad5745698925f0561f04521dbec1e18ebdb90c66139b4b86b68754fb9ba8c7f2f0c7b40cec7cc510c31b39a84d6f716cdc91222511425bb14a76ce1c2c2af2d5
+EBUILD intel-microcode-20180616.ebuild 7248 BLAKE2B ababb918b0ae5113ff7b367153fab87478c20b1877c92fe13b22fa6b8c9d0977e5e9833ed16a8c7913ac81d499cb24cf0e6591619879bd7149547106ddd9a11a SHA512 1a591cbc8fce332a8e43dbdae9995f011cb5f0fa592536d76f5ef8b983fb2378393df93be4192fac0b86c579e56428eb8018cb17d550e8c434b9d234087128b9
 MISC metadata.xml 778 BLAKE2B cdbbf186c80a9a7c910912871336c2ee768af5cbe3939399beb94a30b141e499ce1ca4b098e5c12c6632fff57cb6de172c83ebd7a0a6637d228e10b244db0d75 SHA512 030f595dd6b5d50e7b6e5dabc47df75e08506eac59354a6e7d6e51f27c29fc3765bd9213cd7e13d65990226b0e5fe34e090dc35669bd9dfdf5ab7a1d7d581306
diff --git a/sys-firmware/intel-microcode/intel-microcode-20180616.ebuild b/sys-firmware/intel-microcode/intel-microcode-20180616.ebuild
new file mode 100644
index 000000000000..4dbc0b6dd956
--- /dev/null
+++ b/sys-firmware/intel-microcode/intel-microcode-20180616.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info toolchain-funcs mount-boot
+
+# Find updates by searching and clicking the first link (hopefully it's the one):
+# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
+
+COLLECTION_SNAPSHOT="20180616"
+INTEL_SNAPSHOT="20180425"
+NUM="27776"
+DESCRIPTION="Intel IA32/IA64 microcode update data"
+HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
+SRC_URI="https://downloadmirror.intel.com/${NUM}/eng/microcode-${INTEL_SNAPSHOT}.tgz
+	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 )"
+
+DEPEND="sys-apps/iucode_tool"
+
+# !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586
+RDEPEND="!<sys-apps/microcode-ctl-1.17-r2
+	hostonly? ( sys-apps/iucode_tool )"
+
+S=${WORKDIR}
+
+# Blacklist bad microcode here.
+# 0x000406f1 aka 06-4f-01 aka CPUID 406F1 require newer microcode loader
+MICROCODE_BLACKLIST_DEFAULT="-s !0x000406f1"
+MICROCODE_BLACKLIST="${MICROCODE_BLACKLIST:=${MICROCODE_BLACKLIST_DEFAULT}}"
+
+# In case we want to set some defaults ...
+MICROCODE_SIGNATURES_DEFAULT=""
+
+# Advanced users only:
+# merge with:
+# only current CPU: MICROCODE_SIGNATURES="-S"
+# only specific CPU: MICROCODE_SIGNATURES="-s 0x00000f4a -s 0x00010676"
+# exclude specific CPU: MICROCODE_SIGNATURES="-s !0x00000686"
+MICROCODE_SIGNATURES="${MICROCODE_SIGNATURES:=${MICROCODE_SIGNATURES_DEFAULT}}"
+
+pkg_pretend() {
+	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 "The user has opted in for advanced use:"
+		ewarn "MICROCODE_SIGNATURES is set to \"${MICROCODE_SIGNATURES}\" instead of default \"${MICROCODE_SIGNATURES_DEFAULT}\"!"
+	fi
+
+	use initramfs && mount-boot_pkg_pretend
+}
+
+src_prepare() {
+	default
+
+	# 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/
+	)
+
+	# 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
+
+	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 )
+	# split location (we use a temporary location so that we are able
+	# to re-run iucode_tool in pkg_preinst; use keepdir instead of dodir to carry
+	# this folder to pkg_preinst to avoid an error even if no microcode was selected):
+	keepdir /tmp/intel-ucode && opts+=( --write-firmware="${ED%/}"/tmp/intel-ucode )
+
+	iucode_tool \
+		"${opts[@]}" \
+		"${MICROCODE_SRC[@]}" \
+		|| die "iucode_tool ${opts[@]} ${MICROCODE_SRC[@]}"
+
+	dodoc releasenote
+}
+
+pkg_preinst() {
+	use initramfs && mount-boot_pkg_preinst
+
+	if use hostonly; then
+		einfo "Removing ucode(s) not supported by any currently available (=online) processor(s) due to USE=hostonly ..."
+		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="${ED%/}"/boot/intel-uc.img )
+		# split location:
+		use split-ucode && dodir /lib/firmware/intel-ucode && opts+=( --write-firmware="${ED%/}"/lib/firmware/intel-ucode )
+
+		iucode_tool \
+			"${opts[@]}" \
+			"${ED%/}"/tmp/intel-ucode \
+			|| die "iucode_tool ${opts[@]} ${ED%/}/tmp/intel-ucode"
+
+	else
+		if use split-ucode; then
+			# Temporary /tmp/intel-ucode will become final /lib/firmware/intel-ucode ...
+			dodir /lib/firmware
+			mv "${ED%/}/tmp/intel-ucode" "${ED%/}/lib/firmware" || die "Failed to install splitted ucodes!"
+		fi
+	fi
+
+	# Cleanup any temporary leftovers so that we don't merge any
+	# unneeded files on disk
+	rm -r "${ED%/}/tmp" || die "Failed to cleanup '${ED%/}/tmp'"
+}
+
+pkg_prerm() {
+	use initramfs && mount-boot_pkg_prerm
+}
+
+pkg_postrm() {
+	use initramfs && mount-boot_pkg_postrm
+}
+
+pkg_postinst() {
+	use initramfs && mount-boot_pkg_postinst
+
+	local _has_installed_something=
+	if use initramfs && [[ -s "${EROOT%/}/boot/intel-uc.img" ]]; then
+		_has_installed_something="yes"
+	elif use split-ucode; then
+		_has_installed_something=$(find "${EROOT%/}/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:"
+		ewarn "No ucode was installed! You can ignore this warning if there"
+		ewarn "aren't any microcode updates available for your processor(s)."
+		ewarn "But if you use MICROCODE_SIGNATURES variable please double check"
+		ewarn "if you have an invalid select."
+		ewarn ""
+
+		if use hostonly; then
+			ewarn "Unset \"hostonly\" USE flag to install all available ucodes."
+			ewarn ""
+		fi
+	fi
+
+	# 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 d61bea511a49..0784ab80f0a7 100644
--- a/sys-firmware/ipxe/Manifest
+++ b/sys-firmware/ipxe/Manifest
@@ -7,5 +7,5 @@ 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
 EBUILD ipxe-1.0.0_p20130925.ebuild 2532 BLAKE2B 99bd848b672ede6a8d3d3cb4cd55ea5e5c3afd32d8ad56996edceff18ba10f4440640c2c91ec8a99ec3fdbb37f28705c0408733023c4b0aad977642c67850835 SHA512 d58eb5fc8dd50c2822474f07a7060f0bbff77c3ad815a0358503db365ee7c5e1d0b5f45da42a6a6653acd24537872ecfe3060e344681e6e65f3098ef409ad937
 EBUILD ipxe-1.0.0_p20160620.ebuild 2658 BLAKE2B 4757557957cfd0bdaed6dcf76b5c4dc89632881e51912ff824133806610b4e74551524ac0ef99115f381b043870d1f2cf0e38201f81994fdfc3d93195f4be12d SHA512 582abace1b57854b49d326fc88ec9e066d7ca287964f16c2f65f3a4b853ae65fd63aaf8f47d85adab4a71cf39be794eedb8452cc5380850dd4a19808bdf908d8
-EBUILD ipxe-1.0.0_p20180211.ebuild 2806 BLAKE2B eadb782d89ff5bca27ff4df29a18b899b6f97bc6ddf39453b2552ce7599a938d8c7b4570a2155cbdb0ee613d0dbed950ca08ac052b8adb5aeaf1e40b3085bd73 SHA512 87b8ff0e0acaf9673e81302cdda9a570925de66e11ff2272cb7024b8c213a2f66f3e12b1c19427ebd481c5a231e092e9eba7ef53e4e5d010ef855b12ac718f86
+EBUILD ipxe-1.0.0_p20180211.ebuild 2805 BLAKE2B 4a128d0a3326a5599fab8fad4a733d05fd589529dcedbbd803b5ac98afdd3a5d37af34eb29b1fca6984a278252b2a83972d48b0610a9e6ece50359fc51e1eacd SHA512 fee0d201f2ab177293cd236d7a9a4260eadf889fba81b5ec0eab28476cf6f180188fae073c511206ab6c9922a2de6dfd89b1243019db8f53a6be14ef282351be
 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 1794162081a7..0d8859a828e8 100644
--- a/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild
+++ b/sys-firmware/ipxe/ipxe-1.0.0_p20180211.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 93f0618949f3..f57578866f23 100644
--- a/sys-firmware/seabios/Manifest
+++ b/sys-firmware/seabios/Manifest
@@ -13,5 +13,5 @@ DIST seabios-1.10.2.tar.gz 589283 BLAKE2B 08fdbecf7fb06629db472adb05a780249dbf0e
 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
 EBUILD seabios-1.10.2.ebuild 3411 BLAKE2B 60be808fdaa681aad580615c077896eb32cc0138207f56bf474fa93dfef80bdcda875e7757f242d5f01a3796857a036b8f81c2f71ee97fc3b7081101e4a6fcb6 SHA512 c1dd401ea38f1c4479d7c0c7436e13ac83288f0fa21b3ea368389b5b9dbda14d63ce319d92c6ea7a03c6efef9dd0d126691efa4d79f36c9d730f52cba85befb7
-EBUILD seabios-1.11.0.ebuild 3329 BLAKE2B 6ba1dff2ecb43431c85cc7f6a7678e003488ac415174b0de0e1e1a4df8fd4d7aed1b5c8e9800e2f70181f56b6e4665d94ddbaab791c2860f4d8a8b57a4c08813 SHA512 6b9d7c30535eaee2dec02151e132aef07016f272b175b651241b081e1847e049d1428d4c58414ea7da43a916047954dc85ad0ca7193972877facf52589ae064b
+EBUILD seabios-1.11.0.ebuild 3328 BLAKE2B 278077d17c9b7837f6b67b6a06fc53d1d041c2a0afe17765fd900c92440a0df4ce54a341922ceea98708635b4a3fb8fb65a8a4c93dbcd90863d3eac57bb77c6b SHA512 e18b306019efa25f6b231a3f1ca667e6927f7408c7d398b3a87e752f5761a26611bf362647a548fcc9047a541b451049c31caf1e4cde12ac050477b7587c4c21
 MISC metadata.xml 659 BLAKE2B ec90c7e7dec453a99ac7d431f3d431cfbbbdfe4ba5fef5d57b7923ed5a8b1f3511c1a8e260c51080f754aa1f27b4d63e6cfba97fadfa00765fcf14277431c583 SHA512 62dbf23559c5c19e9157fcaab10356fd51f52e98a1c39ac138445b058a45a350c758ecb2e6b36eb2e05a384bf6c5c7413deea3b5db7a3a2468248b677136b246
diff --git a/sys-firmware/seabios/seabios-1.11.0.ebuild b/sys-firmware/seabios/seabios-1.11.0.ebuild
index 699fca3bfa7a..72456e2e53a6 100644
--- a/sys-firmware/seabios/seabios-1.11.0.ebuild
+++ b/sys-firmware/seabios/seabios-1.11.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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 	# 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 6ae5e3b6f77e..0b832bab6c6b 100644
--- a/sys-firmware/sgabios/Manifest
+++ b/sys-firmware/sgabios/Manifest
@@ -2,6 +2,6 @@ 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 1242 BLAKE2B cf372dc80df6f3b0d40c4b8be196a821bd62b1fa961381e8df3d8bfadd80fa43bf6913e53a73fac2b8ae80c0d1c98054b0518878e0808e9d6813e6c9bb354191 SHA512 47c53c3f47d65f0a4694d99b63242cb964b6e5b67fa59f1bd89f47f7ff8ff20e8740284326dc61bab804afc6ddb13756c81bd986f89b4afee601bf0e2a6e53cc
+EBUILD sgabios-0.1_pre8-r1.ebuild 1241 BLAKE2B 0ed62254dd73687607c9a344ee3f2be3eb8a313f4a975cbb67bb048a60eb6e3730044376af2793510738771b251fe5ea445d98668e875c8c32f001eef351cd07 SHA512 524e3657798aa709a67ffd565b464f8b3bf7a9ec477abe3c5bb46745701ac53cd4bf7386d9bf144fd2f6a16e73245e99efd43eac9981bd526929016f4f6abaef
 EBUILD sgabios-0.1_pre8.ebuild 1153 BLAKE2B 157cd06ccd73ea45bee40d23cb5657efcf399f824fb4d6344869f08c575585978445d8c5d7d1c38164bc81604fc6aedeb4fa653a434754e43ca0db3ca2cad01f SHA512 ffbd86b27008e068716712cc605990d1c230d3a347a589cc9595763d798dc991ac1984376dd0813711d2833b99cd0689fa7bb11547248372f5645214d6d8ddcf
 MISC metadata.xml 554 BLAKE2B 675f2ab919854639c14a08d25bd1efd6814cd262563701d285f25f4a345716c97ef603a2b9c2335a45c40950cc9ab98cf14fe5be8061a033b1ee045ef6a323b3 SHA512 147e5f7bb7cf615a83bf78684ffb4ddf794d74364004a028f2be53ff9b8bdba62b0b24dbeeff6bacfbf81925a7084c884d663d5da5c20a7364b125ebfd9485a4
diff --git a/sys-firmware/sgabios/sgabios-0.1_pre8-r1.ebuild b/sys-firmware/sgabios/sgabios-0.1_pre8-r1.ebuild
index bbf4403ff4a8..9176409a528e 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 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="+binary"
 
 REQUIRED_USE="!amd64? ( !x86? ( binary ) )"