gentoo resync : 06.08.2019

13 files changed, 13 insertions, 217 deletions

diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 582bce56a1ed..921d0609564d 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 b4164e082b2a..bfa4d835ace8 100644
--- a/sys-firmware/edk2-ovmf/Manifest
+++ b/sys-firmware/edk2-ovmf/Manifest
@@ -1,10 +1,6 @@
-AUX edk2-ovmf-2017_p20180211-build_system_fixes.patch 11790 BLAKE2B 0df5e575f344867a02b8923b891180b2ba8884301988246bed83cc6090a627871e68a0e2a15738f52ba9e5492d496edfef72eb535638fc10dab5899b26866adf SHA512 8406f65f1c595c0a2057b15302cd87e3be722a9151589163b828cac3109d9b98f7573ffb45436e17362ca1bee44f3158c13c4327bfaebdf6fd856d5a6c4cfc05
-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-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-201905.ebuild 4378 BLAKE2B b69d2b18a5c505b7cc85fbce45f2f8f0b9bebd0f0a0d258da5256d670bd6b754705d4374e3665a334fdd0a4309dfbe667290c79561f82035e4d4149981db49dd SHA512 54da6a1a8420ccba841218aed4cbe35d285947cfb23241e77d3b57b86108985f7fe2a5641a23bd4ab1558d1c301559d923cb0fb6a2231b9cf32706048bfc2af9
 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
deleted file mode 100644
index 380bbdaac45c..000000000000
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_p20180211.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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"
-
-SOURCE_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+="
-		${SOURCE_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? ( ${SOURCE_DEPEND} ) )"
-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\"
-	]"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build_system_fixes.patch
-)
-
-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
index 6e9f4e3babf5..45682bed9bfe 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
@@ -36,7 +36,7 @@ else
 		)
 		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
 		"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
 	IUSE="+binary"
 	REQUIRED_USE+="
 		!amd64? ( binary )
diff --git a/sys-firmware/edk2-ovmf/files/edk2-ovmf-2017_p20180211-build_system_fixes.patch b/sys-firmware/edk2-ovmf/files/edk2-ovmf-2017_p20180211-build_system_fixes.patch
deleted file mode 100644
index cdb465336e14..000000000000
--- a/sys-firmware/edk2-ovmf/files/edk2-ovmf-2017_p20180211-build_system_fixes.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
-index 427ad60..c2b6d83 100755
---- a/BaseTools/Conf/tools_def.template
-+++ b/BaseTools/Conf/tools_def.template
-@@ -4500,7 +4500,7 @@ RELEASE_*_*_OBJCOPY_ADDDEBUGFLAG   =
- NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG     = --add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_NAME).debug

- *_*_*_DTC_FLAGS                    = -H epapr

- 

--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

-@@ -4535,7 +4535,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

-@@ -6139,7 +6139,7 @@ RELEASE_CLANG38_AARCH64_DLINK_FLAGS = DEF(CLANG38_AARCH64_DLINK_FLAGS) -flto -Wl
- *_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

-@@ -6162,7 +6162,7 @@ RELEASE_CLANG38_AARCH64_DLINK_FLAGS = DEF(CLANG38_AARCH64_DLINK_FLAGS) -flto -Wl
- *_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

-@@ -7553,7 +7553,7 @@ NOOPT_MYTOOLS_IPF_DLINK_FLAGS            = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
- ##################

- # ASL definitions

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

--*_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        =

-@@ -7581,9 +7581,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 -Wno-varargs -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 -Wno-varargs -Wno-unused-const-variable -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 -Wno-varargs -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 -Wno-varargs -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 -Wno-varargs -Wno-unused-const-variable -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 -Wno-varargs -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)

- 

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

- # X64 definitions

-@@ -7600,9 +7600,9 @@ RELEASE_XCODE5_X64_ASM_FLAGS  = -arch x86_64
- *_XCODE5_*_PP_FLAGS         = -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h 

- *_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 -Wno-varargs -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS $(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 -Wno-varargs -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS $(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 -Wno-varargs -Wno-unused-const-variable -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS $(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 -Wno-varargs -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS $(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 -Wno-varargs -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS $(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 -Wno-varargs -Wno-unused-const-variable -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS $(PLATFORM_FLAGS)

- 

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

- #

-diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
-index 0976973..d9ee70e 100644
---- a/BaseTools/Source/C/Makefiles/header.makefile
-+++ b/BaseTools/Source/C/Makefiles/header.makefile
-@@ -71,9 +71,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 0bff17e6dbde..bc5a6c5362db 100644
--- a/sys-firmware/intel-microcode/Manifest
+++ b/sys-firmware/intel-microcode/Manifest
@@ -1,4 +1,4 @@
-DIST intel-microcode-collection-20190722.tar.xz 5172324 BLAKE2B 50930467d939b15e1d57619afd035e0ab591854c271dfde0e06c9994ac95200bdf4febb6ba6caedc3bfe92b4464a7b3922b203e7dab3f67ead26e199f9bdcf61 SHA512 f5adf8560adc81288e974d51d516a548534ee61fed599c865cbc095c328a85a9c766d11d852ef3167e10c9b283dff0b6d5fb88725a4c123c2004971cdd22873c
+DIST intel-microcode-collection-20190819.tar.xz 5309072 BLAKE2B b3c6167f0d380795ef1d22f8d0d39e7db54fa37357e4d650ca5948f049c3e9e51872a9c40c70d2a9103a2e53c5ac28510a4300aea025de38d9ef1b7a96dd3ffa SHA512 e9942ef3bced654433e356db58ca1647dc54caaab4511236ffdbec513871ead02838d50f81f298381f6376d2ff5dc33704f50cb0cc4e021bfca4c7681763233f
 DIST microcode-20190618.tar.gz 2446418 BLAKE2B f5e4846c7d6d4251c8a53e7a238ce0be9530827d16a015b91beec9d2ba2186d6632d370342b4b7a898f32d294b3c8c12522d07ea40c13ebc75d40b8b83eb1da3 SHA512 f7717f476465705e14ea26b516cf7b1d04e29842da0924d7da5582346ad5dd5dfd8755041bdca8f3afa7fe64f138e91354498d87006fe4487701242858c24c17
-EBUILD intel-microcode-20190618_p20190722.ebuild 8571 BLAKE2B 47d02586b98c8b78b798b07577e3b2ec609af2cb4e14e3c428acedd4dd673d3a2ccd37a06a2da338c00d2104f7d3f34d60cd3d1d2562d0a36a2a76810309f47f SHA512 933c15406dc5277896ccda6075b0afc02f5a86b70716d7e6ddafd81faeef2daa6970353cafa89a98cd31741fd0dbfefc5c6f388a22d85bd3e82656af8f1561f2
+EBUILD intel-microcode-20190618_p20190819.ebuild 8571 BLAKE2B 47d02586b98c8b78b798b07577e3b2ec609af2cb4e14e3c428acedd4dd673d3a2ccd37a06a2da338c00d2104f7d3f34d60cd3d1d2562d0a36a2a76810309f47f SHA512 933c15406dc5277896ccda6075b0afc02f5a86b70716d7e6ddafd81faeef2daa6970353cafa89a98cd31741fd0dbfefc5c6f388a22d85bd3e82656af8f1561f2
 MISC metadata.xml 667 BLAKE2B f229775df839b3ddf34fcc289803ae113ad4b0ce293e036c24f3025bbd146d51c6e3ac55b4a7eb9b2ff0b6829aa020179ea4603f5e481de1c822a1deb66fd594 SHA512 a2d6bc54901a9eb12732e8fa0720c03b51ab615383f12a52019453b3a13f5c70233ee88a8d81706ce7e86eaec6d85155484cf32da288c3486d4b1a19647d2698
diff --git a/sys-firmware/intel-microcode/intel-microcode-20190618_p20190722.ebuild b/sys-firmware/intel-microcode/intel-microcode-20190618_p20190819.ebuild
index c38383872511..c38383872511 100644
--- a/sys-firmware/intel-microcode/intel-microcode-20190618_p20190722.ebuild
+++ b/sys-firmware/intel-microcode/intel-microcode-20190618_p20190819.ebuild
diff --git a/sys-firmware/ipxe/Manifest b/sys-firmware/ipxe/Manifest
index 55e0ba68fb2c..7da9fc36fdd8 100644
--- a/sys-firmware/ipxe/Manifest
+++ b/sys-firmware/ipxe/Manifest
@@ -3,5 +3,5 @@ DIST ipxe-1.0.0_p20180211-546dd51.tar.bz2 2954305 BLAKE2B 8232b1afe017ff5d038953
 DIST ipxe-1.0.0_p20190728-a4f8c6e-bin.tar.xz 1839688 BLAKE2B b28772b928690646e1b0cb1c27ef56e2cb1c0637a43c6174dea7c8ca401d8c8819938fa358a0bed5d57b8cf992b8c2060b52e32a970ef813f1cf705fb0805beb SHA512 1e5838b8c530257dc544f6e25f80e6e223480917db393ca3ff8c577f07e60180e18f2eed4e71f7b1965157d6e7001f65e224d3c8b56a98f84739e2504ca38985
 DIST ipxe-1.0.0_p20190728-a4f8c6e.tar.bz2 2985776 BLAKE2B 5a85505404978d51f80e30332f6eb0417d6d97eb9b3bc05eec5ad649c446c7d17dc841f8cd34a1b29c31dc6f5cf08baa69191de9c8dd4bcdb098c5d7f13a7824 SHA512 3af0da9058b39966bfd8f9d7dfe518ae7b26e18f58d1a3fa2cba8922ec3c50775b82dd9f23bf51be3ca3f69b705f92bcf80988a1817b30f7ab1826a4b159c5a6
 EBUILD ipxe-1.0.0_p20180211.ebuild 2804 BLAKE2B b1aaf4b606d62fdc12fcacbb5917ef0ba11e82b9e31b9d6b5f4a703e5cbc959a915847aadea45c031974821a2c7a5ab8d500a6f8d41fc438fdef99325afc8d0a SHA512 9bbdabfc8f6809c75080520052b570c996932280c0f41cc913f11e86d600a4e68af5cd61e28db243158887cfe830f6b3fdcf16046cc2307222db12a301be9b30
-EBUILD ipxe-1.0.0_p20190728.ebuild 2803 BLAKE2B ebb5fd6717e9fb5aba382ea0fcf15c1d5b478b5592de2809468496621b3f7abb4f57da72422466ae82a65c81fe9128ffa862f9df6a2c3c2336c5768a06d18a4e SHA512 cd59abef29be47d91af1eedf838cc7f34f1cb8d923cdb85d785a93bc0ffa59b81a482862283a20fcbe8eaa7a5e7bb3353b343f8188e2b0bb3c706a0345a6ed3b
+EBUILD ipxe-1.0.0_p20190728.ebuild 2801 BLAKE2B ea8f403f82eb8a87751e5e12d0e22cb29b7c695a4c1ed493455c93f23df08a8c53cdbea9315b90fa0d60b5662822b19193e9618a759c554bb0f6d2c8a84bc403 SHA512 bbcc96d7d54fe5c4d9259839b3d0cc66de159643f12cb4b8f818532a3667e9ea7a85b2093d79230539dcdf64082e3747eca914853bdcc2f8f936a8b964f8a02a
 MISC metadata.xml 996 BLAKE2B 41f19340003c0213578fb1b3f7ae6aaff718eb150cdb398b463e695dcc931da45251ab5d70fbdff0277f52ad7a231f93f878d9fa4ce9fe5a338cc3d4e2708124 SHA512 123f401010d157b928390599a3125c9c18ba721757a16ac3fcce4fe30e3ff298ad9a3dcda64b779bf2fe0fcb52c9057e382b7ac618a3ae27b92dd94cf0dde0d7
diff --git a/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild b/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild
index 3850249adbd2..cb5cc15b84e7 100644
--- a/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild
+++ b/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86"
 IUSE="+binary efi ipv6 iso lkrn +qemu undi usb vmware"
 
 REQUIRED_USE="!amd64? ( !x86? ( binary ) )"
diff --git a/sys-firmware/nvidia-firmware/Manifest b/sys-firmware/nvidia-firmware/Manifest
index 19121d65634c..1090d38cfb34 100644
--- a/sys-firmware/nvidia-firmware/Manifest
+++ b/sys-firmware/nvidia-firmware/Manifest
@@ -2,6 +2,6 @@ DIST NVIDIA-Linux-x86-325.15.run 27409286 BLAKE2B cb6de2c7a95cdeab18b3c5c61d7b99
 DIST NVIDIA-Linux-x86-340.32.run 38587515 BLAKE2B d7ebf5ece0f01c132c91e1f45cbfe8bd8354cf8a97e64820938c0cd0d3f3091a1ff778950f25b53c863a8e95d31b1656efbd516293c75a0e5395b264d95b8af1 SHA512 a67e57a1bd70a9cd5ae2bed70403920ed94d8eac9d08dcd380f6065cd597d5824e26ae25a0bcd56626190124c07d128f3b0429040794c8e8d3ead85860fcb646
 DIST nvidia_extract_firmware-325.15.py 12715 BLAKE2B 996d6cfcc87cb8d6f1d3f3a93bd2cf6af24df6aba403cccf0f3ca0e04b9bbe43cf069f9a6b4430e52b0d3502c2f8d4210e74e61b0fa1a4786b80575301e0f5e3 SHA512 ede9bed14bdae0684a5091fbaa1edcd5ed57463a19a4aee72633167ade5490f8de1d373ebf541678fa53d952da5cd9251c429329aa487578083d9622e6b926a4
 DIST nvidia_extract_firmware-340.32.py 13097 BLAKE2B 7c50734a8f6a9b94f3c111ca0eef055a5a638e2498b2dcb93a6d47547c202606783bcc3f1fba7cdba88d4f204abb173fc50fd52a3d23198f415588330710607b SHA512 a90a8907288ee841dc063a80afb1fea02e0034becddd75e367cf8fbdc065f321746e0d1bb77f158f7b011cfc03ad517e658ad1cc7a1b596e1452363862528b89
-EBUILD nvidia-firmware-325.15.ebuild 1046 BLAKE2B 09aaebb136bb648866f6fb31cd2b4d85b74a65cade5f0564c64b3a11001f853910c263e38f8b27786f4d0adad83782cf9b470d015db3b6ae9e59739d4d36f1e1 SHA512 407d76e1200073b56bbf76c607a0dadfcf78a130ef7906977921147a15b75efd1ce5974341d1aa72d45916493f46bcb39dad957db1fb75ce1643c4f93ec29a0e
+EBUILD nvidia-firmware-325.15.ebuild 1087 BLAKE2B 380a4200f9ab347f96f810869b097ca983471860f44cf512846a74a0341204b2c32427f76873dfe9491c8938bd2a3394562214069e8584adba7bc95b2def3248 SHA512 bc81df26cabf3f04c0d8ae274b72c6156a57be32a92e3f12ab3621304f2ab8a7565784ce4cd38932ecda76b97fb6092a26cd8290c2bd722f9788b10c9fdb31ee
 EBUILD nvidia-firmware-340.32.ebuild 1092 BLAKE2B 9abfb68d1cbfa44600c7463065c92d79a57375979e8da0b3a3eca8a9993252d67c31ca9ece1c9f57317364c2414f665f3d6bf487f2485465371bb7c8cd2064dc SHA512 70f1c906733ae08b5a2da3afba498787c5504aa2ccf8d4549bdef3d79639b9091ab331130846b6c1fba5ae9e3567141bbacfc4048e11a5bba31fc2e90eba1b4c
 MISC metadata.xml 249 BLAKE2B f870f9dc7bc1a515f782f4c1c544b6473b3ec16235b88a9930783ed8f7aa7f010838c37e225840b61a56c5f01c70ac3b50560fc2f5bc908418c341f51620ffe7 SHA512 1723b9b2663814b898832e18aea1a02520775e545e256fb70a8829e2b0515e59b5abab985c995b9ae2f509d95ea4601ac0085ab0d1653cdda0ebe90f775f6e5b
diff --git a/sys-firmware/nvidia-firmware/nvidia-firmware-325.15.ebuild b/sys-firmware/nvidia-firmware/nvidia-firmware-325.15.ebuild
index 551be618ef34..dd9d399df59c 100644
--- a/sys-firmware/nvidia-firmware/nvidia-firmware-325.15.ebuild
+++ b/sys-firmware/nvidia-firmware/nvidia-firmware-325.15.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=5
 
-inherit unpacker
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 unpacker
 
 NV_URI="http://us.download.nvidia.com/XFree86/"
 X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
@@ -19,7 +20,7 @@ LICENSE="MIT NVIDIA-r2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="=dev-lang/python-2*"
+DEPEND="${PYTHON_DEPS}"
 RDEPEND=""
 
 RESTRICT="bindist mirror"
@@ -33,7 +34,7 @@ src_unpack() {
 }
 
 src_compile() {
-	python2 "${DISTDIR}"/nvidia_extract_firmware-${PV}.py || die "Extracting firmwares failed..."
+	"${PYTHON}" "${DISTDIR}"/nvidia_extract_firmware-${PV}.py || die "Extracting firmwares failed..."
 }
 
 src_install() {
diff --git a/sys-firmware/seabios/Manifest b/sys-firmware/seabios/Manifest
index b1fc4cf2f171..c6a103431e31 100644
--- a/sys-firmware/seabios/Manifest
+++ b/sys-firmware/seabios/Manifest
@@ -16,5 +16,5 @@ DIST seabios-1.12.0.tar.gz 613542 BLAKE2B f145c2db716996bfa9e5c014086ccfaa8ae96e
 EBUILD seabios-1.10.2.ebuild 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
+EBUILD seabios-1.12.0.ebuild 3480 BLAKE2B ee6aac19a6f0f15ccb785cf09d9f98f358cd7cd7694219a14528f31fc677190b332a4e809a5018236608710151dbb1f56d1e6ef4679e217b58d677d6c954bf35 SHA512 ebd724faafc3df91122defba546c29df96af39355a39517d5b5233850a4a291e3e0ece5d9254f912e2465470cba74562d8352822d041a04d29a8410007a9b031
 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
index 1ab0b09fd5c2..39fcf77d8074 100644
--- a/sys-firmware/seabios/seabios-1.12.0.ebuild
+++ b/sys-firmware/seabios/seabios-1.12.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* || -n "${EGIT_COMMIT}" ]] ; then
 	EGIT_REPO_URI="git://git.seabios.org/seabios.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~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/