gentoo resync : 02.08.2019

20 files changed, 499 insertions, 694 deletions

diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 5745d57c0574..3c4f6cc50a0c 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/edk2-ovmf/Manifest b/sys-firmware/edk2-ovmf/Manifest
index 6d5414d632e0..b4164e082b2a 100644
--- a/sys-firmware/edk2-ovmf/Manifest
+++ b/sys-firmware/edk2-ovmf/Manifest
@@ -1,10 +1,10 @@
 AUX edk2-ovmf-2017_p20180211-build_system_fixes.patch 11790 BLAKE2B 0df5e575f344867a02b8923b891180b2ba8884301988246bed83cc6090a627871e68a0e2a15738f52ba9e5492d496edfef72eb535638fc10dab5899b26866adf SHA512 8406f65f1c595c0a2057b15302cd87e3be722a9151589163b828cac3109d9b98f7573ffb45436e17362ca1bee44f3158c13c4327bfaebdf6fd856d5a6c4cfc05
-AUX edk2-ovmf-2017_pre20170505-build_system_fixes.patch 20014 BLAKE2B e2dc20057ef58698e88a9b971eea921f0e5833fb24605f99bb109527283762893bb0271eaa16200c1d26c58024d72dfe1bd1636b55522c8147a69796ba1fa0d4 SHA512 3db1adcabd1e2446c601a52da7e52b4b89323e329dc852c568320e9fb3e8a4619ad8aeda1b529022cd20c7af77894221cca5c34c7acd73115dcb083991216150
 DIST edk2-ovmf-2017_p20180211-bin.tar.xz 910896 BLAKE2B 2d2ead282cebc1254cae2b10042f809e887a17a83fe67998ddcadf86cdf07e615594b243ab35d3fa8a6d6ce218f8f0bad758ee1db2ab4ff6c08d65419f4078b0 SHA512 88c3c4d7cecc2af1cc4dfa06686f34cc3a5facfb24750c766b47f53dec7267b95b58b391d23038e6a589d1687d2c117f1912d10118e26f99c0906c3d8e90deed
 DIST edk2-ovmf-2017_p20180211.tar.xz 22977736 BLAKE2B 4d95eaf3017668197632ab7e035ad6c9f1490bde3d27e575170541fd64773fef8676406c88451b8dc996d9d7dd625fa389279105951f02e08f6de025075bd172 SHA512 ee3d70da562ed7dc4647576da8605d25fd9f991b4a96c2ed106e0d1b697af9e0624ad161750ccba7ab3db553ab1c6177780dd9c29a70073eb17729e9ae24c5a7
-DIST edk2-ovmf-2017_pre20170505-bin.tar.xz 874904 BLAKE2B a381d3ca20cf0e1f3aff74335c1d783bb80f0b5c7a8716d8154f2e0a19255780e5b08fae37cab9fa484fc1cbe3bc3b5d40339634ee3b0808bd2b3a8b2849730a SHA512 c7a7d83758214b6ab63c6cefe827a601aaa7656b7f01e03413c84d913078a2b0d8037f70de34d42d8e1614aee794e0ffd7d9e62314eb4e04c21256b70338af5c
-DIST edk2-ovmf-2017_pre20170505.tar.xz 22952060 BLAKE2B 7d4da1fed8e76f643e2856be2485f6c398896d61b7ad8fb013e891fd73f69c4acfd9980e7f95aec002cee647719a622711100f8cb6829edecae35ed31b3ef563 SHA512 6da859360448fd6d04d1492c88a7e935f7108c524f7ccfe6aa4c13bf9af9695dbc4a5b8efa274adc86d3105946aaa1ba80bcd9713facdca153f1a3d873797b63
-EBUILD edk2-ovmf-2017_p20180211.ebuild 2598 BLAKE2B ce016a989f1ad6b5a043a1aac351310d9bf4420eba4e50b0bb1a8eb8a9631e539edb83687b9e862dc4a2d0e2e5eb466a11c8908af7563495c795d44c91739768 SHA512 a903ee846dfed8bc89d1aa4711f3f4a366743dc9218b112119914e24352335507b63155b9c408c42e8dea86a67c79515ba51be028bc45f074cd9f9df914702f2
-EBUILD edk2-ovmf-2017_pre20170505-r1.ebuild 2625 BLAKE2B cdddc73cba36ab73eaf251dadfff03984d2d8b5b25ee621dc58be70440581d1e6c534736fe0baba4b242673d3ea95d0694b44b91095772255a534f0de64798f2 SHA512 c10da9241e09c6b2594ba90764849f52f0c8cf12b4d150634a9a587d1f5088af5302209a4304e3be5bf39eb2616ed4e0ee4b27b37341c8afad023e7813f3486e
-EBUILD edk2-ovmf-9999.ebuild 2623 BLAKE2B d45f009e190c4b3509f0e964b0b543b7b1cd151f16d36c15521c20f4eae706222817feaa938d9f6f09bbb53273f3eb4c08a63626c5b1e388a9c081ca7de7b9c9 SHA512 ea78ca3f82f628372886736f596b768982a192dd78397ab085ac0b985a00c3452b2b33c5aa17b0e162e2f470d968ff2714ec12f8a7572a10e4857a095da2b9b3
+DIST edk2-ovmf-201905-bin.tar.xz 3017256 BLAKE2B 6a106f111a363f1c2de33c4e7eba48183da6047654512939c286c6d0369e3b4c7705c271e61fa95299ba2b629022be7b5ef665ff096d41373583f5409b5c32fb SHA512 4a174dc1d64769a93de3bf5f9d787e278bfab57e2317699d722aa772e64e8867b3998b7feee58d5e4c66adc79ba9c5023dae2ce786159db7a740b86cf35d923d
+DIST edk2-ovmf-201905-bundled.tar.xz 3538508 BLAKE2B a1766180c84ee83987f50fdb6a6c9891dfb983ff78c98f7bc38635ffe484ebf29d4286ff97d7747080e28a655ff14b5939d4505d75ebe6655ecacc7f9d405469 SHA512 be3d8ef1ffb1ddce64883d9ef8dc598c7026d23d2e33c33949d28de81513b6a7f04f840ccb3d42664e918c6603487fbe594261c327921f3250c3998218572774
+DIST edk2-ovmf-201905.tar.gz 14551747 BLAKE2B 6fb3385445fd01c0dea26295a68de2691524e55c96d8a0e85aab1385a9abddc47c13ce3236b952c1299514e542ad0fa4bc9550cc4527945c05109d227a698293 SHA512 91188923f7d1ab83c0d6abf7ec6d59f357d0341a617ad6a3ae05f3d0e041dff43f62b014b0c5fc5d15e16d8f1c279c581a5cd64b31e3d52b340d7ef90adb50f1
+EBUILD edk2-ovmf-2017_p20180211.ebuild 2554 BLAKE2B 5b7e7fafcf7ff3ca0e84e2cb39ec5d92ae6b11aaf178c0c7d1376db05ed461b70ab6e0be89f39afb05ad6c5e90e675b95d13ca960ecdd8359ffe4b1dcab1ed5f SHA512 bd6b178fc3e05f5e8e9a0a31ad167ca387e446eaec6ad9c84c96a347dc4856257e80240919ff370313fec4a4f6251f29c7246888fab59efe43a541adef9917b7
+EBUILD edk2-ovmf-201905.ebuild 4380 BLAKE2B 4dc30ad743baf55404c67f22d3b4dac02b0988814f77b9e2d830fb8d2cecdad021a3c32c73320cb1d5a283210e96694ffe598a9640d48c7b68e2d1918a9d50f4 SHA512 5f84ff1d3c640bb7b228fd5ae95e73ffb557381e62ee722c15163f3181ba46eb632d455891f8750e8244fcd3031c141bcdc1a37bbd9f5f036a891a80c5600ae7
+EBUILD edk2-ovmf-999999.ebuild 3910 BLAKE2B a88f3514db3f34b15baba6f27a53e15f807af8d1fbc40448ae2dc1e325e2f91d12a22db6af0af55452c46bacfcb75f02a54d6411bcabff6218b51dc7c37263c2 SHA512 5fb77d51219ab605e57ccf804e634aca3900ddd90c0c3ea3798ae35e29612ce244a2cace0d904e36aa0b06719e98fc6f8c023a983bf6c1316258c91683d5ecb0
 MISC metadata.xml 435 BLAKE2B b33371654b280e097ad5d112081f115446cb01a0efcf3e712bcad7e5a51d95b77f55d0e218c4767803675b71d24b405616849f57051fda492acf5d3c0e8fd1dc SHA512 d1e6233650fc1ea3a25bead14091877b9f507d2bc78cec6436e1b6e17477e40517b74da66e26b6bd39259e4ca308d724324296f1a6c353fed2f8bf112029b90f
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_p20180211.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_p20180211.ebuild
index ba74bacb77cd..380bbdaac45c 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_p20180211.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_p20180211.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,9 +11,6 @@ inherit eutils python-any-r1 readme.gentoo-r1
 DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
 HOMEPAGE="https://github.com/tianocore/edk2"
 
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
 SOURCE_DEPEND="
 	>=dev-lang/nasm-2.0.7
 	>=sys-power/iasl-20160729
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505-r1.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505-r1.ebuild
deleted file mode 100644
index 502a513b8bd2..000000000000
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
-HOMEPAGE="https://github.com/tianocore/edk2"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-NON_BINARY_DEPEND="
-	>=dev-lang/nasm-2.0.7
-	>=sys-power/iasl-20160729
-	${PYTHON_DEPS}
-"
-DEPEND=""
-RDEPEND=""
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/tianocore/edk2"
-	DEPEND+="
-		${NON_BINARY_DEPEND}
-	"
-else
-	SRC_URI="
-		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
-		!binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}.tar.xz )"
-	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
-	IUSE="+binary"
-	REQUIRED_USE+="
-		!amd64? ( binary )
-	"
-	DEPEND+="
-		!binary? (
-			amd64? (
-				${NON_BINARY_DEPEND}
-			)
-		)"
-	PATCHES=(
-		"${FILESDIR}"/${P}-build_system_fixes.patch
-	)
-fi
-
-LICENSE="BSD-2 MIT"
-SLOT="0"
-
-DISABLE_AUTOFORMATTING=true
-DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
-virtual machines. The firmware is located under
-	/usr/share/edk2-ovmf/OVMF.fd
-	/usr/share/edk2-ovmf/OVMF_CODE.fd
-	/usr/share/edk2-ovmf/OVMF_VARS.fd
-
-The firmware does not support csm (due to no free csm implementation
-available). If you need a firmware with csm support you have to download
-one for yourself. Firmware blobs are commonly labeled
-	OVMF{,_CODE,_VARS}-with-csm.fd
-
-In order to use the firmware you can run qemu the following way
-
-	$ qemu-system-x86_64 \
-		-drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
-		...
-
-You can register the firmware for use in libvirt by adding to /etc/libvirt/qemu.conf:
-	nvram = [
-		\"/usr/share/edk2-ovmf/OVMF_CODE.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
-	]"
-
-pkg_setup() {
-	 [[ ${PV} != "9999" ]] && use binary || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if  [[ ${PV} != "9999" ]] && use binary; then
-		eapply_user
-		return
-	fi
-	default
-}
-
-src_compile() {
-	TARGET_ARCH=X64
-	TARGET_NAME=RELEASE
-	TARGET_TOOLS=GCC49
-
-	[[ ${PV} != "9999" ]] && use binary && return
-
-	emake ARCH=${TARGET_ARCH} -C BaseTools -j1
-
-	. ./edksetup.sh
-
-	./OvmfPkg/build.sh \
-		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
-		-D FD_SIZE_2MB \
-		|| die "OvmfPkg/build.sh failed"
-}
-
-src_install() {
-	local builddir="Build/OvmfX64/${TARGET_NAME}_${TARGET_TOOLS}/FV"
-
-	insinto /usr/share/${PN}
-	doins "${builddir}"/OVMF{,_CODE,_VARS}.fd
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
new file mode 100644
index 000000000000..6e9f4e3babf5
--- /dev/null
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit eutils python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
+HOMEPAGE="https://github.com/tianocore/edk2"
+
+NON_BINARY_DEPEND="
+	app-emulation/qemu
+	>=dev-lang/nasm-2.0.7
+	>=sys-power/iasl-20160729
+	${PYTHON_DEPS}
+"
+DEPEND=""
+RDEPEND=""
+if [[ ${PV} == "999999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/tianocore/edk2"
+	DEPEND+="
+		${NON_BINARY_DEPEND}
+	"
+else
+	# Binary versions taken from fedora:
+	# http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/
+	#   edk2-ovmf-20190501stable-2.fc31.noarch.rpm
+	SRC_URI="
+		!binary? (
+			https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${P}.tar.gz
+			https://dev.gentoo.org/~tamiko/distfiles/${P}-bundled.tar.xz
+		)
+		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
+		"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	IUSE="+binary"
+	REQUIRED_USE+="
+		!amd64? ( binary )
+	"
+	DEPEND+="
+		!binary? (
+			amd64? (
+				${NON_BINARY_DEPEND}
+			)
+		)"
+	PATCHES=(
+	)
+fi
+
+LICENSE="BSD-2 MIT"
+SLOT="0"
+
+S="${WORKDIR}/edk2-edk2-stable${PV}"
+
+DISABLE_AUTOFORMATTING=true
+DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
+virtual machines. The firmware is located under
+	/usr/share/edk2-ovmf/OVMF_CODE.fd
+	/usr/share/edk2-ovmf/OVMF_VARS.fd
+	/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd
+
+If USE=binary is enabled, we also install an OVMF variables file (coming from
+fedora) that contains secureboot default keys
+
+	/usr/share/edk2-ovmf/OVMF_VARS.secboot.fd
+
+If you have compiled this package by hand, you need to either populate all
+necessary EFI variables by hand by booting
+	/usr/share/edk2-ovmf/UefiShell.(iso|img)
+or creating OVMF_VARS.secboot.fd by hand:
+	https://github.com/puiterwijk/qemu-ovmf-secureboot
+
+The firmware does not support csm (due to no free csm implementation
+available). If you need a firmware with csm support you have to download
+one for yourself. Firmware blobs are commonly labeled
+	OVMF{,_CODE,_VARS}-with-csm.fd
+
+In order to use the firmware you can run qemu the following way
+
+	$ qemu-system-x86_64 \
+		-drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
+		...
+
+You can register the firmware for use in libvirt by adding to /etc/libvirt/qemu.conf:
+	nvram = [
+		\"/usr/share/edk2-ovmf/OVMF_CODE.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
+		\"/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
+	]"
+
+pkg_setup() {
+	[[ ${PV} != "999999" ]] && use binary || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if  [[ ${PV} != "999999" ]] && use binary; then
+		eapply_user
+		return
+	fi
+	default
+}
+
+src_compile() {
+	TARGET_ARCH=X64
+	TARGET_NAME=RELEASE
+	TARGET_TOOLS=GCC49
+
+	BUILD_FLAGS="-D TLS_ENABLE \
+		-D HTTP_BOOT_ENABLE \
+		-D NETWORK_IP6_ENABLE \
+		-D FD_SIZE_2MB"
+
+	SECUREBOOT_BUILD_FLAGS="${BUILD_FLAGS} \
+		-D SECURE_BOOT_ENABLE \
+		-D SMM_REQUIRE \
+		-D EXCLUDE_SHELL_FROM_FD"
+
+	[[ ${PV} != "999999" ]] && use binary && return
+
+	emake ARCH=${TARGET_ARCH} -C BaseTools
+
+	. ./edksetup.sh
+
+	# Build all EFI firmware blobs:
+
+	mkdir -p ovmf
+
+	./OvmfPkg/build.sh \
+		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
+		${BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
+
+	cp Build/OvmfX64/*/FV/OVMF_*.fd ovmf/
+	rm -rf Build/OvmfX64
+
+	./OvmfPkg/build.sh \
+		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
+		${SECUREBOOT_BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
+
+	cp Build/OvmfX64/*/FV/OVMF_CODE.fd ovmf/OVMF_CODE.secboot.fd || die "cp failed"
+	cp Build/OvmfX64/*/X64/Shell.efi ovmf/ || die "cp failed"
+	cp Build/OvmfX64/*/X64/EnrollDefaultKeys.efi ovmf || die "cp failed"
+
+	# Build a convenience UefiShell.img:
+
+	mkdir -p iso_image/efi/boot || die "mkdir failed"
+	cp ovmf/Shell.efi iso_image/efi/boot/bootx64.efi || die "cp failed"
+	cp ovmf/EnrollDefaultKeys.efi iso_image || die "cp failed"
+	qemu-img convert --image-opts \
+		driver=vvfat,floppy=on,fat-type=12,label=UEFI_SHELL,dir=iso_image \
+		ovmf/UefiShell.img || die "qemu-img failed"
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins ovmf/*
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-9999.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-9999.ebuild
deleted file mode 100644
index 9fc2de7937d9..000000000000
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-9999.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
-HOMEPAGE="https://github.com/tianocore/edk2"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-NON_BINARY_DEPEND="
-	>=dev-lang/nasm-2.0.7
-	>=sys-power/iasl-20160729
-	${PYTHON_DEPS}
-"
-DEPEND=""
-RDEPEND=""
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/tianocore/edk2"
-	DEPEND+="
-		${NON_BINARY_DEPEND}
-	"
-else
-	SRC_URI="
-		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
-		!binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}.tar.xz )"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-	IUSE="+binary"
-	REQUIRED_USE+="
-		!amd64? ( binary )
-	"
-	DEPEND+="
-		!binary? (
-			amd64? (
-				${NON_BINARY_DEPEND}
-			)
-		)"
-	PATCHES=(
-		"${FILESDIR}"/${P}-build_system_fixes.patch
-	)
-fi
-
-LICENSE="BSD-2 MIT"
-SLOT="0"
-
-DISABLE_AUTOFORMATTING=true
-DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
-virtual machines. The firmware is located under
-	/usr/share/edk2-ovmf/OVMF.fd
-	/usr/share/edk2-ovmf/OVMF_CODE.fd
-	/usr/share/edk2-ovmf/OVMF_VARS.fd
-
-The firmware does not support csm (due to no free csm implementation
-available). If you need a firmware with csm support you have to download
-one for yourself. Firmware blobs are commonly labeled
-	OVMF{,_CODE,_VARS}-with-csm.fd
-
-In order to use the firmware you can run qemu the following way
-
-	$ qemu-system-x86_64 \
-		-drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
-		...
-
-You can register the firmware for use in libvirt by adding to /etc/libvirt/qemu.conf:
-	nvram = [
-		\"/usr/share/edk2-ovmf/OVMF_CODE.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
-	]"
-
-pkg_setup() {
-	 [[ ${PV} != "9999" ]] && use binary || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if  [[ ${PV} != "9999" ]] && use binary; then
-		eapply_user
-		return
-	fi
-	default
-}
-
-src_compile() {
-	TARGET_ARCH=X64
-	TARGET_NAME=RELEASE
-	TARGET_TOOLS=GCC49
-
-	[[ ${PV} != "9999" ]] && use binary && return
-
-	emake ARCH=${TARGET_ARCH} -C BaseTools
-
-	. ./edksetup.sh
-
-	./OvmfPkg/build.sh \
-		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
-		-D FD_SIZE_2MB \
-		|| die "OvmfPkg/build.sh failed"
-}
-
-src_install() {
-	local builddir="Build/OvmfX64/${TARGET_NAME}_${TARGET_TOOLS}/FV"
-
-	insinto /usr/share/${PN}
-	doins "${builddir}"/OVMF{,_CODE,_VARS}.fd
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-999999.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-999999.ebuild
new file mode 100644
index 000000000000..8bd303ef2cbd
--- /dev/null
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-999999.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit eutils python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
+HOMEPAGE="https://github.com/tianocore/edk2"
+
+NON_BINARY_DEPEND="
+	app-emulation/qemu
+	>=dev-lang/nasm-2.0.7
+	>=sys-power/iasl-20160729
+	${PYTHON_DEPS}
+"
+DEPEND=""
+RDEPEND=""
+if [[ ${PV} == "999999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/tianocore/edk2"
+	DEPEND+="
+		${NON_BINARY_DEPEND}
+	"
+else
+	SRC_URI=""
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	IUSE="+binary"
+	REQUIRED_USE+="
+		!amd64? ( binary )
+	"
+	DEPEND+="
+		!binary? (
+			amd64? (
+				${NON_BINARY_DEPEND}
+			)
+		)"
+	PATCHES=(
+	)
+fi
+
+LICENSE="BSD-2 MIT"
+SLOT="0"
+
+DISABLE_AUTOFORMATTING=true
+DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
+virtual machines. The firmware is located under
+	/usr/share/edk2-ovmf/OVMF_CODE.fd
+	/usr/share/edk2-ovmf/OVMF_VARS.fd
+	/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd
+
+If USE=binary is enabled, we also install an OVMF variables file (coming from
+fedora) that contains secureboot default keys
+
+	/usr/share/edk2-ovmf/OVMF_VARS.secboot.fd
+
+If you have compiled this package by hand, you need to either populate all
+necessary EFI variables by hand by booting
+	/usr/share/edk2-ovmf/UefiShell.(iso|img)
+or creating OVMF_VARS.secboot.fd by hand:
+	https://github.com/puiterwijk/qemu-ovmf-secureboot
+
+The firmware does not support csm (due to no free csm implementation
+available). If you need a firmware with csm support you have to download
+one for yourself. Firmware blobs are commonly labeled
+	OVMF{,_CODE,_VARS}-with-csm.fd
+
+In order to use the firmware you can run qemu the following way
+
+	$ qemu-system-x86_64 \
+		-drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
+		...
+
+You can register the firmware for use in libvirt by adding to /etc/libvirt/qemu.conf:
+	nvram = [
+		\"/usr/share/edk2-ovmf/OVMF_CODE.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
+		\"/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
+	]"
+
+pkg_setup() {
+	[[ ${PV} != "999999" ]] && use binary || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if  [[ ${PV} != "999999" ]] && use binary; then
+		eapply_user
+		return
+	fi
+	default
+}
+
+src_compile() {
+	TARGET_ARCH=X64
+	TARGET_NAME=RELEASE
+	TARGET_TOOLS=GCC49
+
+	BUILD_FLAGS="-D TLS_ENABLE \
+		-D HTTP_BOOT_ENABLE \
+		-D NETWORK_IP6_ENABLE \
+		-D FD_SIZE_2MB"
+
+	SECUREBOOT_BUILD_FLAGS="${BUILD_FLAGS} \
+		-D SECURE_BOOT_ENABLE \
+		-D SMM_REQUIRE \
+		-D EXCLUDE_SHELL_FROM_FD"
+
+	[[ ${PV} != "999999" ]] && use binary && return
+
+	emake ARCH=${TARGET_ARCH} -C BaseTools
+
+	. ./edksetup.sh
+
+	# Build all EFI firmware blobs:
+
+	mkdir -p ovmf
+
+	./OvmfPkg/build.sh \
+		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
+		${BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
+
+	cp Build/OvmfX64/*/FV/OVMF_*.fd ovmf/
+	rm -rf Build/OvmfX64
+
+	./OvmfPkg/build.sh \
+		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
+		${SECUREBOOT_BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
+
+	cp Build/OvmfX64/*/FV/OVMF_CODE.fd ovmf/OVMF_CODE.secboot.fd || die "cp failed"
+	cp Build/OvmfX64/*/X64/Shell.efi ovmf/ || die "cp failed"
+	cp Build/OvmfX64/*/X64/EnrollDefaultKeys.efi ovmf || die "cp failed"
+
+	# Build a convenience UefiShell.img:
+
+	mkdir -p iso_image/efi/boot || die "mkdir failed"
+	cp ovmf/Shell.efi iso_image/efi/boot/bootx64.efi || die "cp failed"
+	cp ovmf/EnrollDefaultKeys.efi iso_image || die "cp failed"
+	qemu-img convert --image-opts \
+		driver=vvfat,floppy=on,fat-type=12,label=UEFI_SHELL,dir=iso_image \
+		ovmf/UefiShell.img || die "qemu-img failed"
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins ovmf/*
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-firmware/edk2-ovmf/files/edk2-ovmf-2017_pre20170505-build_system_fixes.patch b/sys-firmware/edk2-ovmf/files/edk2-ovmf-2017_pre20170505-build_system_fixes.patch
deleted file mode 100644
index 68b14e36fdca..000000000000
--- a/sys-firmware/edk2-ovmf/files/edk2-ovmf-2017_pre20170505-build_system_fixes.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
-index 427ef1b..936f79d 100755
---- a/BaseTools/Conf/tools_def.template
-+++ b/BaseTools/Conf/tools_def.template
-@@ -4335,7 +4335,7 @@ DEBUG_*_*_OBJCOPY_ADDDEBUGFLAG     = --add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_N
- RELEASE_*_*_OBJCOPY_ADDDEBUGFLAG   =

- NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG     = --add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_NAME).debug

- 

--DEFINE GCC_ALL_CC_FLAGS            = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -include AutoGen.h -fno-common

-+DEFINE GCC_ALL_CC_FLAGS            = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Wno-array-bounds -include AutoGen.h -fno-common

- DEFINE GCC_IA32_CC_FLAGS           = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-stack-arg-probe

- DEFINE GCC_X64_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -mno-red-zone -Wno-address -mno-stack-arg-probe

- DEFINE GCC_IPF_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -minline-int-divide-min-latency

-@@ -4368,7 +4368,7 @@ DEFINE GCC_IPF_RC_FLAGS            = -I binary -O elf64-ia64-little   -B ia64
- DEFINE GCC_ARM_RC_FLAGS            = -I binary -O elf32-littlearm     -B arm     --rename-section .data=.hii

- DEFINE GCC_AARCH64_RC_FLAGS        = -I binary -O elf64-littleaarch64 -B aarch64 --rename-section .data=.hii

- 

--DEFINE GCC44_ALL_CC_FLAGS            = -g -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -include AutoGen.h -fno-common -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings

-+DEFINE GCC44_ALL_CC_FLAGS            = -g -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Wno-array-bounds -ffunction-sections -fdata-sections -include AutoGen.h -fno-common -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings

- DEFINE GCC44_IA32_CC_FLAGS           = DEF(GCC44_ALL_CC_FLAGS) -m32 -march=i586 -malign-double -fno-stack-protector -D EFI32 -fno-asynchronous-unwind-tables

- DEFINE GCC44_X64_CC_FLAGS            = DEF(GCC44_ALL_CC_FLAGS) -m64 -fno-stack-protector "-DEFIAPI=__attribute__((ms_abi))" -maccumulate-outgoing-args -mno-red-zone -Wno-address -mcmodel=small -fpie -fno-asynchronous-unwind-tables

- DEFINE GCC44_IA32_X64_DLINK_COMMON   = -nostdlib -Wl,-n,-q,--gc-sections -z common-page-size=0x20

-@@ -5864,7 +5864,7 @@ NOOPT_CLANG38_X64_DLINK2_FLAGS     = DEF(GCC5_X64_DLINK2_FLAGS) -O0
- *_ELFGCC_X64_VFRPP_PATH            = DEF(ELFGCC_BIN)/gcc

- *_ELFGCC_X64_RC_PATH               = DEF(ELFGCC_BIN)/objcopy

- 

--*_ELFGCC_X64_CC_FLAGS              = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-address -Wno-array-bounds -include AutoGen.h -D_EFI_P64

-+*_ELFGCC_X64_CC_FLAGS              = -Os -fshort-wchar -fno-strict-aliasing -Wall -Wno-address -Wno-array-bounds -include AutoGen.h -D_EFI_P64

- *_ELFGCC_X64_DLINK_FLAGS           = -nostdlib --shared --entry $(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map

- *_ELFGCC_X64_SLINK_FLAGS           =

- *_ELFGCC_X64_ASM_FLAGS             = -c -x assembler -imacros $(DEST_DIR_DEBUG)/AutoGen.h

-@@ -5887,7 +5887,7 @@ NOOPT_CLANG38_X64_DLINK2_FLAGS     = DEF(GCC5_X64_DLINK2_FLAGS) -O0
- *_ELFGCC_IPF_VFRPP_PATH           = DEF(ELFGCC_BIN)/gcc

- *_ELFGCC_IPF_RC_PATH              = DEF(ELFGCC_BIN)/objcopy

- 

--*_ELFGCC_IPF_CC_FLAGS             = -Os -fshort-wchar -Wall -Werror -include AutoGen.h -D_EFI_P64

-+*_ELFGCC_IPF_CC_FLAGS             = -Os -fshort-wchar -Wall -include AutoGen.h -D_EFI_P64

- *_ELFGCC_IPF_DLINK_FLAGS          = -nostdlib --shared --entry $(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map

- *_ELFGCC_IPF_SLINK_FLAGS          =

- *_ELFGCC_IPF_ASM_FLAGS            = -c -x assembler -imacros $(DEST_DIR_DEBUG)/AutoGen.h

-@@ -7296,10 +7296,10 @@ RELEASE_XCODE32_IA32_ASM_FLAGS  = -arch i386
- *_XCODE32_IA32_NASM_FLAGS       = -f macho32

- *_XCODE32_IA32_PP_FLAGS         = -arch i386 -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h

- *_XCODE32_IA32_VFRPP_FLAGS      = -arch i386 -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h

--  DEBUG_XCODE32_IA32_CC_FLAGS   = -arch i386 -save-temps -g -O0 -combine -mms-bitfields  -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces  -c -include AutoGen.h -mdynamic-no-pic -fno-stack-protector

--RELEASE_XCODE32_IA32_CC_FLAGS   = -arch i386 -Oz -combine -mms-bitfields  -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h -mdynamic-no-pic -fno-stack-protector

-+  DEBUG_XCODE32_IA32_CC_FLAGS   = -arch i386 -save-temps -g -O0 -combine -mms-bitfields  -fshort-wchar -fno-strict-aliasing -Wall -Wno-missing-braces  -c -include AutoGen.h -mdynamic-no-pic -fno-stack-protector

-+RELEASE_XCODE32_IA32_CC_FLAGS   = -arch i386 -Oz -combine -mms-bitfields  -fshort-wchar -fno-strict-aliasing -Wall -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h -mdynamic-no-pic -fno-stack-protector

- 

--*_XCODE32_IA32_ASLCC_FLAGS      = -arch i386 -x c -save-temps -g -O0 -mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h -mdynamic-no-pic

-+*_XCODE32_IA32_ASLCC_FLAGS      = -arch i386 -x c -save-temps -g -O0 -mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Wno-missing-braces -c -include AutoGen.h -mdynamic-no-pic

- *_XCODE32_IA32_ASLDLINK_FLAGS   = -arch i386 -e _main -preload -segalign 0x20  -pie -seg1addr 0x220 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map

- *_XCODE32_IA32_ASLPP_FLAGS      = -arch i386 -x c -E -include AutoGen.h

- *_XCODE32_IA32_ASL_FLAGS        =

-@@ -7328,8 +7328,8 @@ RELEASE_XCODE32_X64_ASM_FLAGS  = -arch x86_64
- *_XCODE32_X64_PP_FLAGS         = -arch x86_64 -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h

- *_XCODE32_X64_VFRPP_FLAGS      = -arch x86_64 -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h

- 

--  DEBUG_XCODE32_X64_CC_FLAGS   = -arch x86_64 -save-temps -g -O0 -mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -Wno-address  -fomit-frame-pointer -static  -c -include AutoGen.h -fno-stack-protector

--RELEASE_XCODE32_X64_CC_FLAGS   = -arch x86_64 -Oz -mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -Wno-address  -fomit-frame-pointer -static  -c -include AutoGen.h -fno-stack-protector

-+  DEBUG_XCODE32_X64_CC_FLAGS   = -arch x86_64 -save-temps -g -O0 -mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Wno-missing-braces -Wno-address  -fomit-frame-pointer -static  -c -include AutoGen.h -fno-stack-protector

-+RELEASE_XCODE32_X64_CC_FLAGS   = -arch x86_64 -Oz -mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Wno-missing-braces -Wno-address  -fomit-frame-pointer -static  -c -include AutoGen.h -fno-stack-protector

- 

- ##################

- # ARM definitions - (Assumes iPhone SDK installed on Snow Leopard)

-@@ -7357,8 +7357,8 @@ RELEASE_XCODE32_ARM_ASM_FLAGS  = $(ARCHASM_FLAGS)
- *_XCODE32_ARM_PP_FLAGS         = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h

- *_XCODE32_ARM_VFRPP_FLAGS      = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h

- 

--  DEBUG_XCODE32_ARM_CC_FLAGS   = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mthumb-interwork -g -Oz -mabi=aapcs -mapcs -fno-short-enums  -save-temps -combine -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h

--RELEASE_XCODE32_ARM_CC_FLAGS   = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mthumb-interwork -Oz    -mabi=aapcs -mapcs -fno-short-enums  -save-temps -combine -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h

-+  DEBUG_XCODE32_ARM_CC_FLAGS   = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mthumb-interwork -g -Oz -mabi=aapcs -mapcs -fno-short-enums  -save-temps -combine -fshort-wchar -fno-strict-aliasing -Wall -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h

-+RELEASE_XCODE32_ARM_CC_FLAGS   = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mthumb-interwork -Oz    -mabi=aapcs -mapcs -fno-short-enums  -save-temps -combine -fshort-wchar -fno-strict-aliasing -Wall -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h

- 

- 

- ####################################################################################

-@@ -7403,8 +7403,8 @@ RELEASE_XCLANG_IA32_DLINK_FLAGS      = -arch i386 -u _$(IMAGE_ENTRY_POINT) -e _$
- RELEASE_XCLANG_IA32_ASM_FLAGS  = -arch i386 

- *_XCLANG_IA32_NASM_FLAGS       = -f macho32

- 

--  DEBUG_XCLANG_IA32_CC_FLAGS   = -arch i386 -c -g -O0  -Wall -Werror -include AutoGen.h -fno-stack-protector -fno-builtin -fshort-wchar -mdynamic-no-pic -mno-sse -mno-mmx -Wno-empty-body -Wno-pointer-sign -Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-tautological-compare -Wreturn-type -Wno-unused-variable  -fasm-blocks  -mms-bitfields -msoft-float -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang

--RELEASE_XCLANG_IA32_CC_FLAGS   = -arch i386 -c    -Os  -Wall -Werror -include AutoGen.h -fno-stack-protector -fno-builtin -fshort-wchar -mdynamic-no-pic -mno-sse -mno-mmx -Wno-empty-body -Wno-pointer-sign -Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-tautological-compare -Wreturn-type -Wno-unused-variable  -fasm-blocks  -mms-bitfields -msoft-float -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang

-+  DEBUG_XCLANG_IA32_CC_FLAGS   = -arch i386 -c -g -O0  -Wall -include AutoGen.h -fno-stack-protector -fno-builtin -fshort-wchar -mdynamic-no-pic -mno-sse -mno-mmx -Wno-empty-body -Wno-pointer-sign -Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-tautological-compare -Wreturn-type -Wno-unused-variable  -fasm-blocks  -mms-bitfields -msoft-float -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang

-+RELEASE_XCLANG_IA32_CC_FLAGS   = -arch i386 -c    -Os  -Wall -include AutoGen.h -fno-stack-protector -fno-builtin -fshort-wchar -mdynamic-no-pic -mno-sse -mno-mmx -Wno-empty-body -Wno-pointer-sign -Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-tautological-compare -Wreturn-type -Wno-unused-variable  -fasm-blocks  -mms-bitfields -msoft-float -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang

- 

- 

- ##################

-@@ -7420,9 +7420,9 @@ RELEASE_XCLANG_X64_ASM_FLAGS  = -arch x86_64
- *_XCLANG_*_VFRPP_FLAGS      = -x c -E -P -DVFRCOMPILE -include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h 

- 

- 

--  DEBUG_XCLANG_X64_CC_FLAGS   = -ccc-host-triple x86_64-pc-win32-macho -c -g -O0  -Wall -Werror -include AutoGen.h -fno-stack-protector -fno-builtin -fshort-wchar -mdynamic-no-pic -Wno-empty-body -Wno-pointer-sign -Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-tautological-compare -Wreturn-type -Wno-unused-variable -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang

--RELEASE_XCLANG_X64_CC_FLAGS   = -ccc-host-triple x86_64-pc-win32-macho -c    -Os  -Wall -Werror -include AutoGen.h -fno-stack-protector -fno-builtin -fshort-wchar -mdynamic-no-pic -Wno-empty-body -Wno-pointer-sign -Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-tautological-compare -Wreturn-type -Wno-unused-variable -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang

--*_XCLANG_*_ASLCC_FLAGS      = -x c -save-temps -g -O0 -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h -mdynamic-no-pic

-+  DEBUG_XCLANG_X64_CC_FLAGS   = -ccc-host-triple x86_64-pc-win32-macho -c -g -O0  -Wall -include AutoGen.h -fno-stack-protector -fno-builtin -fshort-wchar -mdynamic-no-pic -Wno-empty-body -Wno-pointer-sign -Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-tautological-compare -Wreturn-type -Wno-unused-variable -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang

-+RELEASE_XCLANG_X64_CC_FLAGS   = -ccc-host-triple x86_64-pc-win32-macho -c    -Os  -Wall -include AutoGen.h -fno-stack-protector -fno-builtin -fshort-wchar -mdynamic-no-pic -Wno-empty-body -Wno-pointer-sign -Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-tautological-compare -Wreturn-type -Wno-unused-variable -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang

-+*_XCLANG_*_ASLCC_FLAGS      = -x c -save-temps -g -O0 -fshort-wchar -fno-strict-aliasing -Wall -Wno-missing-braces -c -include AutoGen.h -mdynamic-no-pic

- *_XCLANG_*_ASLDLINK_FLAGS   = -e _main -preload -segalign 0x20  -pie -seg1addr 0x240 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map

- *_XCLANG_*_ASLPP_FLAGS      = -x c -E -include AutoGen.h

- *_XCLANG_*_ASL_FLAGS        =

-@@ -7472,9 +7472,9 @@ RELEASE_XCODE5_IA32_ASM_FLAGS  = -arch i386
-       *_XCODE5_IA32_NASM_FLAGS = -f macho32

- 

- 

--  DEBUG_XCODE5_IA32_CC_FLAGS   = -arch i386 -c -g -Os       -Wall -Werror -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)

--RELEASE_XCODE5_IA32_CC_FLAGS   = -arch i386 -c    -Os       -Wall -Werror -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)

--  NOOPT_XCODE5_IA32_CC_FLAGS   = -arch i386 -c -g -O0       -Wall -Werror -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)

-+  DEBUG_XCODE5_IA32_CC_FLAGS   = -arch i386 -c -g -Os       -Wall -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)

-+RELEASE_XCODE5_IA32_CC_FLAGS   = -arch i386 -c    -Os       -Wall -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)

-+  NOOPT_XCODE5_IA32_CC_FLAGS   = -arch i386 -c -g -O0       -Wall -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)

- 

- 

- 

-@@ -7494,11 +7494,11 @@ RELEASE_XCODE5_X64_ASM_FLAGS  = -arch x86_64
- *_XCODE5_*_VFRPP_FLAGS      = -x c -E -P -DVFRCOMPILE -include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h 

- 

- 

--  DEBUG_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c -g -Os       -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)

--  NOOPT_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c -g -O0       -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)

--RELEASE_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c    -Os       -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)

-+  DEBUG_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c -g -Os       -Wall -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)

-+  NOOPT_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c -g -O0       -Wall -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)

-+RELEASE_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c    -Os       -Wall -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)

- 

--*_XCODE5_*_ASLCC_FLAGS      = -x c -save-temps -g -O0 -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h 

-+*_XCODE5_*_ASLCC_FLAGS      = -x c -save-temps -g -O0 -fshort-wchar -fno-strict-aliasing -Wall -Wno-missing-braces -c -include AutoGen.h 

- *_XCODE5_*_ASLDLINK_FLAGS   = -e _ReferenceAcpiTable -preload -segalign 0x20  -pie -seg1addr 0x240 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map

- *_XCODE5_*_ASLPP_FLAGS      = -x c -E -include AutoGen.h

- *_XCODE5_*_ASL_FLAGS        =

-diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
-index 063982b..0316f56 100644
---- a/BaseTools/Source/C/Makefiles/header.makefile
-+++ b/BaseTools/Source/C/Makefiles/header.makefile
-@@ -47,9 +47,9 @@ INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKE
- BUILD_CPPFLAGS = $(INCLUDE) -O2

- ifeq ($(DARWIN),Darwin)

- # assume clang or clang compatible flags on OS X

--BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -c -g

-+BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -c -g

- else

--BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-unused-result -nostdlib -c -g

-+BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Wno-deprecated-declarations -Wno-unused-result -nostdlib -c -g

- endif

- BUILD_LFLAGS =

- BUILD_CXXFLAGS = -Wno-unused-result

diff --git a/sys-firmware/intel-microcode/Manifest b/sys-firmware/intel-microcode/Manifest
index 54a5d4ab2266..0bff17e6dbde 100644
--- a/sys-firmware/intel-microcode/Manifest
+++ b/sys-firmware/intel-microcode/Manifest
@@ -1,4 +1,4 @@
-DIST intel-microcode-collection-20190623.tar.xz 5085652 BLAKE2B 717e60682060db9e9eb602b2bfb2ed9e1e192c8388a9defcff48b086b0040cb17723f6eeeede55da8a7776f270acbc1a2c0ea6c89f094404689174fc46fb830d SHA512 bac96d527255594861eafa82d01d065ea02190677ef9d9a74a37914175df455a8d9b722d49ec537d5cec2edf73925210f44f57bac8bf64ae19c04ff09a9173fc
+DIST intel-microcode-collection-20190722.tar.xz 5172324 BLAKE2B 50930467d939b15e1d57619afd035e0ab591854c271dfde0e06c9994ac95200bdf4febb6ba6caedc3bfe92b4464a7b3922b203e7dab3f67ead26e199f9bdcf61 SHA512 f5adf8560adc81288e974d51d516a548534ee61fed599c865cbc095c328a85a9c766d11d852ef3167e10c9b283dff0b6d5fb88725a4c123c2004971cdd22873c
 DIST microcode-20190618.tar.gz 2446418 BLAKE2B f5e4846c7d6d4251c8a53e7a238ce0be9530827d16a015b91beec9d2ba2186d6632d370342b4b7a898f32d294b3c8c12522d07ea40c13ebc75d40b8b83eb1da3 SHA512 f7717f476465705e14ea26b516cf7b1d04e29842da0924d7da5582346ad5dd5dfd8755041bdca8f3afa7fe64f138e91354498d87006fe4487701242858c24c17
-EBUILD intel-microcode-20190618_p20190623.ebuild 8571 BLAKE2B 47d02586b98c8b78b798b07577e3b2ec609af2cb4e14e3c428acedd4dd673d3a2ccd37a06a2da338c00d2104f7d3f34d60cd3d1d2562d0a36a2a76810309f47f SHA512 933c15406dc5277896ccda6075b0afc02f5a86b70716d7e6ddafd81faeef2daa6970353cafa89a98cd31741fd0dbfefc5c6f388a22d85bd3e82656af8f1561f2
+EBUILD intel-microcode-20190618_p20190722.ebuild 8571 BLAKE2B 47d02586b98c8b78b798b07577e3b2ec609af2cb4e14e3c428acedd4dd673d3a2ccd37a06a2da338c00d2104f7d3f34d60cd3d1d2562d0a36a2a76810309f47f SHA512 933c15406dc5277896ccda6075b0afc02f5a86b70716d7e6ddafd81faeef2daa6970353cafa89a98cd31741fd0dbfefc5c6f388a22d85bd3e82656af8f1561f2
 MISC metadata.xml 667 BLAKE2B f229775df839b3ddf34fcc289803ae113ad4b0ce293e036c24f3025bbd146d51c6e3ac55b4a7eb9b2ff0b6829aa020179ea4603f5e481de1c822a1deb66fd594 SHA512 a2d6bc54901a9eb12732e8fa0720c03b51ab615383f12a52019453b3a13f5c70233ee88a8d81706ce7e86eaec6d85155484cf32da288c3486d4b1a19647d2698
diff --git a/sys-firmware/intel-microcode/intel-microcode-20190618_p20190623.ebuild b/sys-firmware/intel-microcode/intel-microcode-20190618_p20190722.ebuild
index c38383872511..c38383872511 100644
--- a/sys-firmware/intel-microcode/intel-microcode-20190618_p20190623.ebuild
+++ b/sys-firmware/intel-microcode/intel-microcode-20190618_p20190722.ebuild
diff --git a/sys-firmware/ipxe/Manifest b/sys-firmware/ipxe/Manifest
index 036a69d718e5..55e0ba68fb2c 100644
--- a/sys-firmware/ipxe/Manifest
+++ b/sys-firmware/ipxe/Manifest
@@ -1,11 +1,7 @@
-AUX ipxe-1.0.0_p20130925-git-version.patch 1344 BLAKE2B b720d1a0f12a1b13e3b05406229c12426ac710be6bb42abfceb720415ea4b8b6a71d22155c908f7fa1b664aaafd3f90610d0724e5f52c625b37c8853e6a34703 SHA512 f52e90d590555678429d28e8d25f4023f2152b314d8d7f7d5c3774993253999d655a1b69f4d0b1320f82497f72bba566185c811e11ceca4e4920d7486b723ddd
-AUX ipxe-1.0.0_p20130925-no-pie.patch 1059 BLAKE2B a7c28d556db0fae9acb8c3ba83dc0f9b003cfcba3ec06f7207e8bfd155e608916cdb24849bfa65552b16a5a1e3a9f20981d2cfbfaec6527663ca38d6f8e2645a SHA512 98f7fb065068c1bbd6275ae08d826fef307d5541d9d73f0d695068c651cfebf926f9089ad28239235b31adad0a0cbcdb43380ba1fbfc12482985fe9f13acae7d
-AUX ipxe-1.0.0_p20160620-no-pie.patch 1053 BLAKE2B 20c091982e0e2d4bb8838df56c89d1eb2e6bafd6336a2f1d84b5b19568a7e97f0d038336184f873249957faa36c53e5f6a3dacafd45456885b4b0284d8ba51f1 SHA512 baace4f9b0d3a2b280beacf742c9bbbe8b276c79f13e46c3e6d1d63727da28816bb4bbc19f83306a5939ba7a22c29dca0ba4d80e47ace9b0c151db524076afe9
-DIST ipxe-1.0.0_p20130925-cba22d3.tar.bz2 2240189 BLAKE2B 58717ca43ece4ffbe8f68cae2f409c4cd8f1d3c2149521c28db017d4fcd31b6122fa35b9a476d3dc865baba0d2768744f4977420fb6410f1b09dad9170c32497 SHA512 a098d3fc0f68067be281b9c3654bb1b0be1b9d397327b55b36b17e69faf03ce6117d0278552c06990a5020e4ece7acac168d975b3c7bfce3b6865dea1fd1d8dd
-DIST ipxe-1.0.0_p20160620-694c18a.tar.bz2 2839663 BLAKE2B ec6999f3bcaf198f4b73464ee34456b923d0be26f11980e3020dd66012ddbf1b721aebb1c74c4289a0012e2ffae96a54a25821a4c7c621f727e090d13de58213 SHA512 67657dabe09f497c270cca16391669c89032112c1496b54009e2f1e8a477904d758476d4e465973aa0b6fc764be48ed6421607189aaea76e23fa0da6e9c8add5
 DIST ipxe-1.0.0_p20180211-546dd51-bin.tar.xz 1748228 BLAKE2B 5ed2ce71c7dbc41d5cbef6e263abd230b9831c945a8edb33a29d408bd4262e370a2f73c8d2eb3cb20e08c61ece83af1fb1bb4c5694098cb29c44628dbd18def8 SHA512 af2778c925a6e4c374ddae85f3db983c83e7a4e5bb2cf35e356d277b87d4c89bf63cc2c061ec31d608ff2160c13297232fa131da2b9dd0b580d93e1b0efd6532
 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
+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 2804 BLAKE2B b1aaf4b606d62fdc12fcacbb5917ef0ba11e82b9e31b9d6b5f4a703e5cbc959a915847aadea45c031974821a2c7a5ab8d500a6f8d41fc438fdef99325afc8d0a SHA512 9bbdabfc8f6809c75080520052b570c996932280c0f41cc913f11e86d600a4e68af5cd61e28db243158887cfe830f6b3fdcf16046cc2307222db12a301be9b30
+EBUILD ipxe-1.0.0_p20190728.ebuild 2803 BLAKE2B ebb5fd6717e9fb5aba382ea0fcf15c1d5b478b5592de2809468496621b3f7abb4f57da72422466ae82a65c81fe9128ffa862f9df6a2c3c2336c5768a06d18a4e SHA512 cd59abef29be47d91af1eedf838cc7f34f1cb8d923cdb85d785a93bc0ffa59b81a482862283a20fcbe8eaa7a5e7bb3353b343f8188e2b0bb3c706a0345a6ed3b
 MISC metadata.xml 996 BLAKE2B 41f19340003c0213578fb1b3f7ae6aaff718eb150cdb398b463e695dcc931da45251ab5d70fbdff0277f52ad7a231f93f878d9fa4ce9fe5a338cc3d4e2708124 SHA512 123f401010d157b928390599a3125c9c18ba721757a16ac3fcce4fe30e3ff298ad9a3dcda64b779bf2fe0fcb52c9057e382b7ac618a3ae27b92dd94cf0dde0d7
diff --git a/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-git-version.patch b/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-git-version.patch
deleted file mode 100644
index a981abdd892e..000000000000
--- a/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-git-version.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 6153c09c41034250408f3596555fcaae715da46c Mon Sep 17 00:00:00 2001
-From: Florian Schmaus <flo@geekplace.eu>
-Date: Mon, 28 Jul 2014 16:47:48 +0100
-Subject: [PATCH] [build] Set GITVERSION only if there is a git repository
-
-The $(BIN)/version.%.o target will fail if iPXE is built within a
-non-git repository, e.g. when the user downloaded and extracted an
-archive containing iPXE sources, *and* if any parent directory of the
-iPXE sources is a git repository (or even contains a directory named
-".git").  This is because git will by default ascend the directory
-tree and look for ".git".
-
-The problem typically manifests on source based distributions, see for
-example https://bugs.gentoo.org/show_bug.cgi?id=482804
-
-Modified-by: Michael Brown <mcb30@ipxe.org>
-Signed-off-by: Michael Brown <mcb30@ipxe.org>
----
- src/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index 22a7335..c6760ee 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -190,8 +190,8 @@ VERSION_PATCH	= 0
- EXTRAVERSION	= +
- MM_VERSION	= $(VERSION_MAJOR).$(VERSION_MINOR)
- VERSION		= $(MM_VERSION).$(VERSION_PATCH)$(EXTRAVERSION)
-+ifneq ($(wildcard ../.git),)
- GITVERSION := $(shell git describe --always --abbrev=1 --match "" 2>/dev/null)
--ifneq ($(GITVERSION),)
- VERSION		+= ($(GITVERSION))
- endif
- version :
--- 
-2.3.2
-
diff --git a/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-no-pie.patch b/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-no-pie.patch
deleted file mode 100644
index 3156f3d11700..000000000000
--- a/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-no-pie.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://bugs.gentoo.org/585752
-
-From cea213034635e4d765b2f362057b696febbe509f Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 21 Jun 2016 00:47:32 -0400
-Subject: [PATCH] [build] fix PIE disable flag
-
-The flag is "-no-pie", not "-nopie".
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- src/arch/i386/Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile
-index fe3adc9ce436..59ad25b6e0af 100644
---- a/src/Makefile.housekeeping
-+++ b/src/Makefile.housekeeping
-@@ -75,8 +75,8 @@ CFLAGS			+= -Ui386
- # output on stderr instead of checking the exit status.
- #
- ifeq ($(CCTYPE),gcc)
--PIE_TEST = [ -z "`$(CC) -fno-PIE -nopie -x c -c /dev/null -o /dev/null 2>&1`" ]
--PIE_FLAGS := $(shell $(PIE_TEST) && $(ECHO) '-fno-PIE -nopie')
-+PIE_TEST = for f in -nopie -no-pie; do [ -z "`$(CC) -fno-PIE $$f -x c -c /dev/null -o /dev/null 2>&1`" ] && $(ECHO) -fno-PIE $$f; done
-+PIE_FLAGS := $(shell $(PIE_TEST))
- WORKAROUND_CFLAGS += $(PIE_FLAGS)
- endif
- 
--- 
-2.8.2
-
diff --git a/sys-firmware/ipxe/files/ipxe-1.0.0_p20160620-no-pie.patch b/sys-firmware/ipxe/files/ipxe-1.0.0_p20160620-no-pie.patch
deleted file mode 100644
index a0501d187904..000000000000
--- a/sys-firmware/ipxe/files/ipxe-1.0.0_p20160620-no-pie.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://bugs.gentoo.org/585752
-
-From cea213034635e4d765b2f362057b696febbe509f Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 21 Jun 2016 00:47:32 -0400
-Subject: [PATCH] [build] fix PIE disable flag
-
-The flag is "-no-pie", not "-nopie".
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- src/arch/i386/Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile
-index fe3adc9ce436..59ad25b6e0af 100644
---- a/src/arch/i386/Makefile
-+++ b/src/arch/i386/Makefile
-@@ -75,8 +75,8 @@ CFLAGS			+= -Ui386
- # output on stderr instead of checking the exit status.
- #
- ifeq ($(CCTYPE),gcc)
--PIE_TEST = [ -z "`$(CC) -fno-PIE -nopie -x c -c /dev/null -o /dev/null 2>&1`" ]
--PIE_FLAGS := $(shell $(PIE_TEST) && $(ECHO) '-fno-PIE -nopie')
-+PIE_TEST = for f in -nopie -no-pie; do [ -z "`$(CC) -fno-PIE $$f -x c -c /dev/null -o /dev/null 2>&1`" ] && $(ECHO) -fno-PIE $$f; done
-+PIE_FLAGS := $(shell $(PIE_TEST))
- WORKAROUND_CFLAGS += $(PIE_FLAGS)
- endif
- 
--- 
-2.8.2
-
diff --git a/sys-firmware/ipxe/ipxe-1.0.0_p20130925.ebuild b/sys-firmware/ipxe/ipxe-1.0.0_p20130925.ebuild
deleted file mode 100644
index 574ffdf1986b..000000000000
--- a/sys-firmware/ipxe/ipxe-1.0.0_p20130925.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs eutils savedconfig
-
-GIT_REV="cba22d36b77da53890bd65fdadd0e63925687af0"
-GIT_SHORT="cba22d3"
-
-DESCRIPTION="Open source network boot (PXE) firmware"
-HOMEPAGE="http://ipxe.org"
-SRC_URI="https://git.ipxe.org/ipxe.git/snapshot/${GIT_REV}.tar.bz2 -> ${P}-${GIT_SHORT}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="efi ipv6 iso lkrn +qemu undi usb vmware"
-
-DEPEND="dev-lang/perl
-	sys-libs/zlib
-	iso? (
-		sys-boot/syslinux
-		virtual/cdrtools
-	)"
-RDEPEND=""
-
-S="${WORKDIR}/ipxe-${GIT_SHORT}/src"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-git-version.patch #482804
-	epatch "${FILESDIR}"/${P}-no-pie.patch #585752
-}
-
-src_configure() {
-	cat <<-EOF > "${S}"/config/local/general.h
-#undef BANNER_TIMEOUT
-#define BANNER_TIMEOUT 0
-EOF
-
-	use ipv6 && echo "#define NET_PROTO_IPV6" >> "${S}"/config/local/general.h
-
-	if use vmware; then
-		cat <<-EOF >> "${S}"/config/local/general.h
-#define VMWARE_SETTINGS
-#define CONSOLE_VMWARE
-EOF
-	fi
-
-	restore_config config/local/general.h
-
-	tc-ld-disable-gold
-}
-
-src_compile() {
-	ipxemake() {
-		# Q='' makes the build verbose since that's what everyone loves now
-		emake Q='' \
-			CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" \
-			AR="$(tc-getAR)" \
-			OBJCOPY="$(tc-getOBJCOPY)" \
-			RANLIB="$(tc-getRANLIB)" \
-			OBJDUMP="$(tc-getOBJDUMP)" \
-			HOST_CC="$(tc-getBUILD_CC)" \
-			"$@"
-	}
-
-	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/ipxe/ipxe-1.0.0_p20160620.ebuild b/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild
index 8e0a5495f087..3850249adbd2 100644
--- a/sys-firmware/ipxe/ipxe-1.0.0_p20160620.ebuild
+++ b/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild
@@ -1,40 +1,45 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 inherit toolchain-funcs eutils savedconfig
 
-GIT_REV="694c18addc0dfdf51369f6d598dd0c8ca4bf2861"
+GIT_REV="a4f8c6e31f6c62522cfc633bbbffa81b22f9d6f3"
 GIT_SHORT=${GIT_REV:0:7}
 
 DESCRIPTION="Open source network boot (PXE) firmware"
 HOMEPAGE="http://ipxe.org/"
-SRC_URI="https://git.ipxe.org/ipxe.git/snapshot/${GIT_REV}.tar.bz2 -> ${P}-${GIT_SHORT}.tar.bz2"
+SRC_URI="
+	!binary? ( https://git.ipxe.org/ipxe.git/snapshot/${GIT_REV}.tar.bz2 -> ${P}-${GIT_SHORT}.tar.bz2 )
+	binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-${GIT_SHORT}-bin.tar.xz )"
 
 LICENSE="GPL-2"
 SLOT="0"
-# TODO: Add arm/arm64 once figure out how to build w/out including
-# all the x86-specific drivers (that use I/O insns).
-KEYWORDS="-* amd64 x86"
-IUSE="efi ipv6 iso lkrn +qemu undi usb vmware"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="+binary efi ipv6 iso lkrn +qemu undi usb vmware"
 
-DEPEND="app-arch/xz-utils
+REQUIRED_USE="!amd64? ( !x86? ( binary ) )"
+
+SOURCE_DEPEND="app-arch/xz-utils
 	dev-lang/perl
 	sys-libs/zlib
 	iso? (
 		sys-boot/syslinux
 		virtual/cdrtools
 	)"
+DEPEND="
+	!binary? (
+		amd64? ( ${SOURCE_DEPEND} )
+		x86? ( ${SOURCE_DEPEND} )
+	)"
 RDEPEND=""
 
 S="${WORKDIR}/ipxe-${GIT_SHORT}/src"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-pie.patch #585752
-}
-
 src_configure() {
+	use binary && return
+
 	cat <<-EOF > "${S}"/config/local/general.h
 #undef BANNER_TIMEOUT
 #define BANNER_TIMEOUT 0
@@ -70,6 +75,8 @@ ipxemake() {
 }
 
 src_compile() {
+	use binary && return
+
 	export NO_WERROR=1
 	if use qemu; then
 		ipxemake bin/808610de.rom # pxe-e1000.rom (old)
diff --git a/sys-firmware/seabios/Manifest b/sys-firmware/seabios/Manifest
index fa1894abe694..cc5c40f98c0e 100644
--- a/sys-firmware/seabios/Manifest
+++ b/sys-firmware/seabios/Manifest
@@ -12,7 +12,10 @@ DIST seabios-1.10.2-bin.tar.xz 121172 BLAKE2B 9d4ff624b638773e59bbf6674fb8630bd8
 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 3409 BLAKE2B b39299fbca9c8641333882be197c181fc780e440f5f05309ffe1155afaddd2c73a4d9114fd060b6cf6c8fea364ad2094d89b17ba50cf17038d6114038eb7ee7d SHA512 27c2b5482787cd9e52d7784059971cf3eaaaf89d9930edafda3346b13462c9fd093afc02d648f10f4295922b1425f75b9cdd1c17521f36f99aef6235ec27efa7
 EBUILD seabios-1.11.0-r1.ebuild 3485 BLAKE2B 06b5cd36ca5abf255c5f76785ac457c0017bca5755ace55a4065a4ba0237471f1728233ea7fe12f68f86abf136a18fe5ea12e070169f93aff1857923ba944fbb SHA512 1415659b8dded4f3bb0b7bf311641d7fef5920ee8f3aac7bfd4dbacb48e427259fa234535fb1a2049f6b419bb4ad47b4c684e4dfe2902ca1717d5abb5e8e943e
 EBUILD seabios-1.11.0.ebuild 3325 BLAKE2B f90f4e73373ca40ecc98e0f11e16f9b2f9e527cc83c1f5a7e12052626ea3d6a5b2596475a122c2effe899f120d629c56026c829dbabd5a16af8da6bbf8748424 SHA512 aa8a8292ae43057165c7cbf40949d15b4472e279196315459c3a795f5552902da9cf77375dfd5e7f4c74a7af3d5b12106e3f5bb9393ed79457863199081d445f
+EBUILD seabios-1.12.0.ebuild 3482 BLAKE2B 0740d90d7b99f4c19e16184c283632d888c9da0c9e7d8ca6bd3d6fbb0da18288319bacef472bca4e333151d90093664c40f6b1900daee1ec902ccffd8c76f58f SHA512 627c41557300a3982e4ecce60afabf816759e09479e717d8ac044c02e5d81c627c67e0021c4c6a05e7ef1d4a36917a8d6ce0a3477e002bd49c1c5656cfa44eb1
 MISC metadata.xml 659 BLAKE2B ec90c7e7dec453a99ac7d431f3d431cfbbbdfe4ba5fef5d57b7923ed5a8b1f3511c1a8e260c51080f754aa1f27b4d63e6cfba97fadfa00765fcf14277431c583 SHA512 62dbf23559c5c19e9157fcaab10356fd51f52e98a1c39ac138445b058a45a350c758ecb2e6b36eb2e05a384bf6c5c7413deea3b5db7a3a2468248b677136b246
diff --git a/sys-firmware/seabios/seabios-1.12.0.ebuild b/sys-firmware/seabios/seabios-1.12.0.ebuild
new file mode 100644
index 000000000000..1ab0b09fd5c2
--- /dev/null
+++ b/sys-firmware/seabios/seabios-1.12.0.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+
+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 ~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/
+	#   seabios-bin-1.12.1-2.fc31.noarch.rpm
+	#   seavgabios-bin-1.12.1-2.fc31.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_prepare() {
+	default
+
+	# Ensure precompiled iasl files are never used
+	find "${WORKDIR}" -name '*.hex' -delete || die
+}
+
+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)" \
+		AS="$(tc-getAS)" \
+		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 iasl
+	_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/vgabios/Manifest b/sys-firmware/vgabios/Manifest
index f99d3ad9a628..a3ad865bd446 100644
--- a/sys-firmware/vgabios/Manifest
+++ b/sys-firmware/vgabios/Manifest
@@ -1,9 +1,5 @@
-DIST vgabios-0.6c-bins.tar.xz 17876 BLAKE2B db343ed998701a061a77d49a2a931493bf7ed82f68cd7e83e22465ab8ef3a0f01e176f84a39e458e4e4a2f290c7bc4bd7ae68a246edd93dc3f0e3063e73afb90 SHA512 7c3790d6e9feb12697558d690dd23a6ca35a9037987f516bcd84f750c177cb26ddfdbdacb68730e01f6d9ba118c5d092ad00c0cfa9f8c40b2c0218641dc8a53e
-DIST vgabios-0.6c-fixes-2.tar.bz2 4174 BLAKE2B d3bb95b57939be85e4f24411f1590c6d75b7c701c3cd848f5b07d875a45ec1159a624ab37158f393b384c6d4db6db38b36e0a4c0b1300cc6abafcef4c03549b1 SHA512 bf85dfa52c078517c77b219361b0c569ad79ef9a8234dfdb14f39902198f0e7bfab99f826e084bda5c8321e69591deeda8242e4f52134bac654046db7fe20584
-DIST vgabios-0.6c.tgz 1470496 BLAKE2B 1e2416aa09bf572551f12b963170999de88b3842d834a0b27332c5667975f807ac19d0fd602538bea9421fb58911fee824f1a7f3c49ecae34811fd8679e53ba7 SHA512 b0392358abf691f0a3b8292cf14dc56897d5cbf004336af4b4a3378002c4b47eb28c9da182cddf2c89d162a6e166b7a5c07cb098303a9f9918ea484922d3770e
 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.6c-r1.ebuild 1785 BLAKE2B 64130286104e21eb7c9976c10eff62758fb31698ade26936e72d13aed59ea600c2a8ff46662867059a0d719cb4f2c17a4e769ddea2d0035c0de9ce74aea8ada8 SHA512 75a81633410c8c6c82b641a252fb2ef20bcbf6a635a6b0ced72bdb5b4aed98d377c9e4fb6c50b6258ddfb1912d10056c5fc3153ce417061f0a355cc8bf6016f6
 EBUILD vgabios-0.7a-r1.ebuild 1746 BLAKE2B 483e821ec557c40a5d28e38b4a6eec13b57d14171524a5f8c44f48ca37ac8ed30df7470a2f9d9396d31e7054a15d32a6f2e5081d84f4669b49fedde2b9349b84 SHA512 d238b9766304222b5f99b79d87443e59409fbdb6ac3cc39faa711a17a8f72c78c601965f4cf3cb2f2bee47760662343a8dba5f3f49c3ad25738d1b0cd2ed6cf5
 EBUILD vgabios-0.7a.ebuild 1716 BLAKE2B 839c1706b973275439ca2bd257020bd93f53ed71d493e5b60bd429918bbb48f1dc6d889c6d6351c840e6483f3750fece19b209df6a0403c80a99cc0c0ee6e50f SHA512 1822165f80f0d45437825044e9675edfe515a35004e3b3fddc069b60208bbd1f4fc97120bd1c8a3f7d226f2ee6c4459e4017321c48d402f9a44c272b346ceff5
 MISC metadata.xml 605 BLAKE2B 176d2f1f0874e3afeb5300f6df01c25d19cf26a714230e0c9bc98a44b695d55411e16cbe56573dc9a3fe3aa07f7968bff0f116b16a9c980779c32095c97b1932 SHA512 a6214ebae56804c8e138eeb4d4e3ebff3656a7a0236ba89c6a44e773d744f83861e9d52af5799e19c935969b888248d77f10d018bc653144682d058b229c2cd3
diff --git a/sys-firmware/vgabios/vgabios-0.6c-r1.ebuild b/sys-firmware/vgabios/vgabios-0.6c-r1.ebuild
deleted file mode 100644
index c5f314bac74e..000000000000
--- a/sys-firmware/vgabios/vgabios-0.6c-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-# Can't really call them backports when they're fixes that upstream
-# won't carry
-FIXES=2
-
-inherit eutils
-
-DESCRIPTION="VGA BIOS implementation"
-HOMEPAGE="http://www.nongnu.org/vgabios/"
-SRC_URI="https://savannah.gnu.org/download/${PN}/${P}.tgz
-	https://dev.gentoo.org/~cardoe/distfiles/${P}-bins.tar.xz
-	https://dev.gentoo.org/~cardoe/distfiles/${P}-fixes-${FIXES}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-fbsd"
-IUSE="debug"
-
-DEPEND="amd64? ( sys-devel/dev86 )
-	x86? ( sys-devel/dev86 )"
-RDEPEND=""
-
-src_prepare() {
-	[[ -n ${FIXES} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-}
-
-src_compile() {
-	if use amd64 || use x86 ; then
-		emake clean # Necessary to clean up the pre-built pieces
-		emake biossums
-		emake
-	fi
-}
-
-src_install() {
-	insinto /usr/share/vgabios
-
-	if use amd64 || use x86 ; then
-		# Stock VGABIOS
-		newins VGABIOS-lgpl-latest.bin vgabios.bin
-		use debug && newins VGABIOS-lgpl-latest.debug.bin vgabios.debug.bin
-
-		# Cirrus
-		newins VGABIOS-lgpl-latest.cirrus.bin vgabios-cirrus.bin
-		use debug && newins VGABIOS-lgpl-latest.cirrus.debug.bin \
-			vgabios-cirrus.debug.bin
-
-		# QXL
-		newins VGABIOS-lgpl-latest.qxl.bin vgabios-qxl.bin
-		use debug && newins VGABIOS-lgpl-latest.qxl.debug.bin \
-			vgabios-qxl.debug.bin
-
-		# Standard VGA
-		newins VGABIOS-lgpl-latest.stdvga.bin vgabios-stdvga.bin
-		use debug && newins VGABIOS-lgpl-latest.stdvga.debug.bin \
-			vgabios-stdvga.debug.bin
-
-		# VMWare
-		newins VGABIOS-lgpl-latest.vmware.bin vgabios-vmware.bin
-		use debug && newins VGABIOS-lgpl-latest.vmware.debug.bin \
-			vgabios-vmware.debug.bin
-	else
-		doins bins/*
-	fi
-}