gentoo Easter resync : 12.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
commit: 623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree: 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /sys-boot
parent: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
39 files changed, 186 insertions, 1568 deletions
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index daca49da1e2c..b4a39b0a7f11 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/efibootmgr/Manifest b/sys-boot/efibootmgr/Manifest
index 20b4549832fd..9305d2c1b817 100644
--- a/sys-boot/efibootmgr/Manifest
+++ b/sys-boot/efibootmgr/Manifest
@@ -1,7 +1,7 @@
 DIST efibootmgr-14.tar.bz2 34972 BLAKE2B 78490756c5fd449f4319b79e0818e9d80340bd487f57d0de34f79f48cc24eb7b9c7309b535d00efad4babd40904d4cfb085cca278170625a1e875961e423f5dd SHA512 97935f8752440ce236162e174ea3404e907ebddc5877d597a97813da76ad580689fc2e97044885fc860a12a473af7183242b6120e78e53243d35e569fb002baf
 DIST efibootmgr-15.tar.bz2 35476 BLAKE2B 19b7c9ce51f3b930b2d59fa4a594c7a8bf5f1c7aa3224049e88cdafe82991799b1b719ec68c80131027f70c16bd19e38157f5d0bc7761843959410c667aa4070 SHA512 d9d9eef14d373d5da88141e8105f754fea4c039755ed0a0cb9b3c9c2bb285733ad930fd912df42075fe2cf750585699307b067f594d8e65269b3b8a5a00b1cd1
 DIST efibootmgr-16.tar.bz2 36603 BLAKE2B 3d09a9d3c4ecd48010315fccae60ab408c0d08e9c734e86a944130ea03e038835fa08745819f5353efbbe36f5017be64faded4b625ef0a0b55d4ca0d612ef232 SHA512 936318c7163c07b716f89be3d830957d9db68ba1b059223f7ea3d9eafe0dbf1c91b9aee096f5aed70955c6052c3b8547295c0a47f17cdf43788259d87d1990b9
-EBUILD efibootmgr-14.ebuild 600 BLAKE2B 6c7abd14248f9050e338d83a7f507e27d61c1c55e16777312c23e2e52d33bcfc1e67d5b4efcb97d936e7fb654125088f77188eda8cf153613ba20bfd5e1f52cf SHA512 bf5c805869ca09f72486abf901697298c7dbbd9966dbc8ff559c5486dd2e8631ce107ad36603b0a3c88c29537a891246f98eeaf5352c7c65ee29d93ef204cf85
-EBUILD efibootmgr-15.ebuild 624 BLAKE2B 4d9c2ff8566d909f20f23da76e500a405f5d30f2fc5c397ce89e93b0eb577b8a58c4f0258661ad68aacd9c6306a269588a17df2ed47e9dcbf97cae90396c301c SHA512 7258da126a9462f91506ec3295d2ffb062f78c8dd23875e947145d30dff8c879d98f881637061bc819f4902d4ad5794f214e716664e13f71142aba9c7945f79e
-EBUILD efibootmgr-16.ebuild 686 BLAKE2B 4a81e942abf084395030c089308aa3d80a8b919c79f11d995837ee7b69f88d76a55d237e82aa21f0cd1e6c7ad32ab26fb71fcd555ac44de14af4806aa9cbf1cd SHA512 8f2f1b911ac0cb5c830da09999196c78c32424c8720c91fb10876cb22c0af95f1b36a550f8ebcf02b50bc7067e32e71fa2ceb222e970269325bc86b445deacf7
+EBUILD efibootmgr-14.ebuild 601 BLAKE2B 609e08888d571faa2a73414e05e200d9b9b5931b97493c149fa1343f463aeb17a0eed1312feabceb56e535000ad0b24c8cd2281c24454084d4006323449bf8c1 SHA512 e93d46d6d3e6a2fab2b1652af0a667003381c2d21f56aee3fddeadf79d9f76078531548ddeec9200f210a0d36b8659bbd41a3f20b5eccb32f26e1435162b8144
+EBUILD efibootmgr-15.ebuild 625 BLAKE2B 7c98f668fc581ab2a44a262ff289ef2c22fd47d951d3f2840a647a74db0e6808e5defdb8dc106a60cbfa30592a5b07ffdac2ee2fbb70ce3485123465bc797b95 SHA512 08e0ab714b313a627a8189640d8266a1e97bb4f9186352ef9644edb9c9ab42675b38528fca6d4c7184344d3ac488feee06d6baf81e5ec59bac9bd482eca4fdec
+EBUILD efibootmgr-16.ebuild 687 BLAKE2B 34b54bc225710ca6e0f4015ef88fae5486f01747b041ad2e690e045d16f0bf1783d26ffcec998482b6b86947d36b748122f9ad3ae82b4771d9bc1b710b182e31 SHA512 10119453c6942cabb742cd8990619bad95910862f8aacedaf024f72d57d2747a712a8e23797a8cc8189fe81cb1615b05e17b985d271bbe833360ce237f6002ed
 MISC metadata.xml 626 BLAKE2B d426af2d479b07fa3d8e482b5d1b84bd242f5da9399ab9cd2d2512d2192f815ccb099ca7c8d3ee91c8c87e1715c9649deaa565aa6ec025c26b518e778d84989e SHA512 d52646244bf9c0d10d8c5b986e110944905fc8f898c0330f65cd6c734e6d8cfabf72854cef362f411d3d63fed3f5e22207a7b94d1ea8076e566d8eff228bb33b
diff --git a/sys-boot/efibootmgr/efibootmgr-14.ebuild b/sys-boot/efibootmgr/efibootmgr-14.ebuild
index 3d1b0308a9d6..8266a96d6802 100644
--- a/sys-boot/efibootmgr/efibootmgr-14.ebuild
+++ b/sys-boot/efibootmgr/efibootmgr-14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rhinstaller/efibootmgr/releases/download/${PV}/${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ia64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 x86"
 IUSE=""
 
 RDEPEND="sys-apps/pciutils
diff --git a/sys-boot/efibootmgr/efibootmgr-15.ebuild b/sys-boot/efibootmgr/efibootmgr-15.ebuild
index 001ed04891cf..b51f8d148de9 100644
--- a/sys-boot/efibootmgr/efibootmgr-15.ebuild
+++ b/sys-boot/efibootmgr/efibootmgr-15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rhinstaller/efibootmgr/releases/download/${PV}/${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ia64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 x86"
 IUSE=""
 
 RDEPEND="sys-apps/pciutils
diff --git a/sys-boot/efibootmgr/efibootmgr-16.ebuild b/sys-boot/efibootmgr/efibootmgr-16.ebuild
index b663226c3485..70350fc76a42 100644
--- a/sys-boot/efibootmgr/efibootmgr-16.ebuild
+++ b/sys-boot/efibootmgr/efibootmgr-16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rhinstaller/efibootmgr/releases/download/${PV}/${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ia64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 x86"
 IUSE=""
 
 RDEPEND="sys-apps/pciutils
diff --git a/sys-boot/elilo/Manifest b/sys-boot/elilo/Manifest
index 675d16625ef0..6b751ebd8a3b 100644
--- a/sys-boot/elilo/Manifest
+++ b/sys-boot/elilo/Manifest
@@ -4,6 +4,5 @@ AUX elilo-3.16-strncpy-clash.patch 744 BLAKE2B 421530303406aa819e07883d4b80a27da
 AUX elilo.conf.sample 150 BLAKE2B d823113e1fcdaf08398f09b6fe9b4b2284004be2886799a69fd776bfaab194413c51969c65d1d81607c0a46699e84132b88bdd2a82f6f41a65ae6fbb061d9356 SHA512 3f99527724759f5c03a5f244b957bc6d50ca378f2b66cbcb19f73fa721d2fd76119ae90669e4cce045f5bc66a80d46b21e76e8c4895d23b22df23ec69262b0e0
 DIST elilo-3.16-all.tar.gz 485844 BLAKE2B 813762ffef32a640c074973a07d886e0de137be10ff08e9375cd894b0d83dd8bc96cc33f80da1e698db49cc9f105a905abb2fa04048eaca394d3d70e79cb8534 SHA512 4289b45f2e40b2a12167f2efd9a482cf97baedb13fc24813f360f375296d0d3f107d6c980b4b31262816f664a2536353fa124e689cbd65093da9b16fdddaf842
 DIST elilo_3.14-3.debian.tar.gz 32179 BLAKE2B 84f8055d3e33b99ce91079768da80a8800c3c2f569ce5619641a983efb943055dfd9a8fb2fda8e5e6d60009ffefbcc1573098f022f06635d4d5304bc3bfddf1e SHA512 b2d5927bf84d61cc432fc916301ddb3be74db16d3e5ba4f13039e2925606b8870991fbb17f837005d8f2b655b7dcd2b2311dfacd7f02183762caf7081ede638f
-EBUILD elilo-3.16-r2.ebuild 2072 BLAKE2B 8f3719a94e45a0e7c49304b1ff2c8bfc1727c8256eaf4b11aa4b5e0dacb4caefe9ddb685da60597e4aa1bd2eaf88e18f2c05380e79b72136ee14cacf3a854fdf SHA512 a6be44876a80bd87401bbab2e69edc53b7dd4c1da05c207c8f9a18240cf5c33cb674ee9017658dc17c4b83f4bec26a30088293d084826b813ed187a5a2a61a01
 EBUILD elilo-3.16-r3.ebuild 2116 BLAKE2B 1bd70b5de2b47767160c9296d7b7dc728441860d392a5056f2b6aa183b644b196093f9b43baf0eca5145f5d0552fec672e65f6b113c6614fc01da2c886dc61d8 SHA512 3df96916f9651460544450d280a66c0d78f402f197af5b2b2c39d1364abd295a5f8566d8cd9c00eea2a9b3222415aec512039f2df1c1fcc1f16fbd6f752a6c5b
 MISC metadata.xml 337 BLAKE2B 7c9b3e56e9680252631db0691b3acfc2a2cbfee80c42af709979085124a35bb9d184e58de3ef4f88b2f3e6cc873b4ef2bd285ce3fc2645aaa9ae869c3b729d87 SHA512 13691bef927bf7f8a4a6d0640d38dabb53fdae1d8bd986c5fe73c1643e2bdbaaac50bfe864e2185a584fa6265a3197afc5273b60b70675481cef61706dde8d87
diff --git a/sys-boot/elilo/elilo-3.16-r2.ebuild b/sys-boot/elilo/elilo-3.16-r2.ebuild
deleted file mode 100644
index 6bcb00cc8b75..000000000000
--- a/sys-boot/elilo/elilo-3.16-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs eutils multilib
-
-DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
-HOMEPAGE="https://sourceforge.net/projects/elilo/"
-SRC_URI="mirror://sourceforge/elilo/${P}-all.tar.gz
-	mirror://debian/pool/main/e/elilo/elilo_3.14-3.debian.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ia64 ~x86"
-IUSE=""
-
-# gnu-efi contains only static libs, so there's no run-time dep on it
-DEPEND=">=sys-boot/gnu-efi-3.0g
-	dev-util/patchutils"
-# dosfstools[compat] to enable 'dosfsck' symlink
-RDEPEND="sys-boot/efibootmgr
-	sys-fs/dosfstools[compat]"
-
-S="${WORKDIR}/${P}-source"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.16-elilo-loop.patch #299665
-	"${FILESDIR}"/${PN}-3.16-gnu-efi-3.0.6-ia64.patch
-)
-
-src_unpack() {
-	unpack ${A} ./${P}-source.tar.gz
-	mv debian "${S}"/ || die
-}
-
-src_prepare() {
-	default
-
-	case $(tc-arch) in
-	ia64)  iarch=ia64 ;;
-	x86)   iarch=ia32 ;;
-	amd64) iarch=x86_64 ;;
-	*)     die "unknown architecture: $(tc-arch)" ;;
-	esac
-
-	# Now Gentooize it.
-	sed -i \
-		-e '1s:/bin/sh:/bin/bash:' \
-		-e "s:##VERSION##:${PV}:" \
-		-e 's:Debian GNU/:Gentoo :g' \
-		-e 's:Debian:Gentoo:g' \
-		-e 's:debian:gentoo:g' \
-		-e "s:dpkg --print-architecture:echo ${iarch}:" \
-		debian/elilo.sh || die
-}
-
-src_compile() {
-	# "prefix" on the next line specifies where to find gcc, as, ld,
-	# etc.  It's not the usual meaning of "prefix".  By blanking it we
-	# allow PATH to be searched.
-	local libdir="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
-	emake -j1 \
-		prefix= \
-		AS="$(tc-getAS)" \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		HOSTARCH=${iarch} \
-		ARCH=${iarch} \
-		EFIINC="${SYSROOT}${EPREFIX}/usr/include/efi" \
-		GNUEFILIB="${libdir}" \
-		EFILIB="${libdir}" \
-		EFICRT0="${libdir}"
-}
-
-src_install() {
-	exeinto /usr/lib/elilo
-	doexe elilo.efi
-
-	newsbin debian/elilo.sh elilo
-	dosbin tools/eliloalt
-
-	insinto /etc
-	newins "${FILESDIR}"/elilo.conf.sample elilo.conf
-
-	dodoc docs/* "${FILESDIR}"/elilo.conf.sample
-	doman debian/*.[0-9]
-}
diff --git a/sys-boot/gnu-efi/Manifest b/sys-boot/gnu-efi/Manifest
index cf5a78cec71b..c1945b39b523 100644
--- a/sys-boot/gnu-efi/Manifest
+++ b/sys-boot/gnu-efi/Manifest
@@ -2,11 +2,5 @@ AUX gnu-efi-3.0.6-ia64-gnu-hash.patch 4635 BLAKE2B b7e39832239e2a1be389fd6fa9e41
 AUX gnu-efi-3.0.6-ia64-setjmp.patch 3964 BLAKE2B 1475a5f188e86837303e1b91de3c37e06d95f67e8a67b8ddbc3d542df49791d9433601ca21f23c43fb57be98f68294385b2c2b0db67ce5f2b71eef55eee0adfe SHA512 146002da1ccb3a8d9b7430e52cafbf67c33691e0cbad443ef59ea6b7f604d04c82796c977977f64227c13d40d071eff8e0cb89f1d7d88d498fcc16871757b778
 AUX gnu-efi-3.0.9-fix-clang-build.patch 691 BLAKE2B 5b3f60e27982cd9e2cfb385851af4840d0301c1fb590d34b029e18a239a232ecca6a62431e10138d4e12cb44a5f64b415936935c1bdaf601dcf605ebe892de54 SHA512 1f77f4a5dcd2f1589cd6950da3462f2508d0ac51c2d2268400414c336ddd41fcf430e79fb702fd5aa99cb4be0bf0fc6eabe9362d736a1223b1c53c2c0b319584
 DIST gnu-efi-3.0.11.tar.bz2 154456 BLAKE2B dd8d5100ee65e2f94d6b67f0d2236674c7c2b6f553ac0b2d8fdc83e49c69bec0dce1e2e8730705f70b3b7b0a61e4f065773667945ffc92a6f40eba381fcf6723 SHA512 1a6b06b69eb95e03c00fb1c476bf346ab2cb0ecca9a44e163f52f2aa4b9837d3dd2d3ed8b4ce77aaf32a66e49f826ea5b43a97c8c7c56aaa030bc20b3415122a
-DIST gnu-efi-3.0.3.tar.bz2 142229 BLAKE2B 5230e99358fc2c1a85fd56840a9ddbd4d1cb42d15a8c37dd44e87037e45a1033f1014c953b5a4d2bb565c4be5aa67a3982ca64e575aaae9c1ae64ce27659b642 SHA512 0b0582e22344ea8a544aba540b56dc36364febfeb5bb655e87277e638fd4e549214a0cd2079a852d15ee376cd51c33794f65a7efb23be9a7a929e889cd616c8c
-DIST gnu-efi-3.0.6.tar.bz2 152088 BLAKE2B 2cb1d72f6972a86e913fba28a86e95a1b0baf15251d8fa3d4c335a13e5fd929b61f8f421330acbddbc640efd63594713180b7fc3e623fda2397947538a25b795 SHA512 f1b17766d8ae000c0177ea2126d87883f254ab01ac020e4bfaa9ad2d3d60a66d07b6237d9842e5989c4da3fd23152b5c592ef863fdc9806901f43c43582a2258
-DIST gnu-efi-3.0.9.tar.bz2 154445 BLAKE2B 099af13ff8944d6d362fd4f1dfaf7eff477e7105298651295a63493eb54799459649a977b3b0600e9884b48f8119ecf1faa38d35e0b01086076de40beefbcbcc SHA512 1a775476fcbe354e57c9db258b1c6ad4346b84d1794178ab5d5195b3ffba250066ca4c42a553d5b2866fa1b4e03019d61df0197f269188c73297042990adf316
-EBUILD gnu-efi-3.0.11.ebuild 1883 BLAKE2B 2ca60a96eb76d5618d7421585708021a81926dcd46c66c70032e5164e00760625f064d207d065fd91788dc0945f5ae753f73776cfde43ddfc3ff797407801ebd SHA512 5856a713576cee8afa0ef279f0b876462a2bff1e8eaedd96e5d197b920cea19f686e92327fb8cf7d3db3f2f94c9011e1071fb864dd6903ff33c339e7d453e274
-EBUILD gnu-efi-3.0.3.ebuild 1732 BLAKE2B 9c453d8e28059d16832adaee14ba34baf6e1b6caaa54c279a91c48798ad00cc8da6ee4b6fb2aa02f06c0773d8c8ad17ed93e65168965e637d85a3f5251fbb31c SHA512 2b4cdc3cc522ed6d9c6a716756fec4009d52af85369c2be1c81cf6afd03dc78b7e836adb351427a0cd0656de8f5e19a287e093d985a68e15726721d58c2fb6ef
-EBUILD gnu-efi-3.0.6-r2.ebuild 1959 BLAKE2B 74364ba53da292593203a47af9d4960046a9b79291979b1d92ebbfe83a695a0821ceec67dabb0a53a823a78a34e04bd0680c7e87e44c336891a1a29f808dd38a SHA512 fa013637c4c044381f98f655232860e6eb2e0000a620b8499484fe99a94751cdace1a33182e26f7784c16f365cf21f6ee74ab1dbce7a1cb06f1ca9b8612354bc
-EBUILD gnu-efi-3.0.9.ebuild 1887 BLAKE2B c897a9466dd2884bd33ea1abe740b468d938a0f0844d713e34a8183b682b642c2cc969f5a6a67c3f619b1bc42ad6cf469be44e0407ce43a6f17733b797a5ad7b SHA512 9a2a75d2ee2c72ea190520e1c0e99d3cc7a6fee029b5ae522b64c844bbb1cde69dc0739034b92fedbe8babff4578e83291543e528ec506b9a58eb20e8d1488d3
+EBUILD gnu-efi-3.0.11.ebuild 1883 BLAKE2B 2970066312f081c9ab8ed47c7160516ff81623cddb409a186a7165632a61f58b96d2998caead7dcbdb2f6e0c79ac3a0ee39d2ca940358361841adfbcc990e58b SHA512 d708339e31740c150505ed11c9e1de707177717d14a8acf9c496969642b1a9c091120db3f70dc2baca45d94ae0c58f836966d5a5b30b989f19c6ff8dc03ba511
 MISC metadata.xml 446 BLAKE2B ed77ce0b04fab42aad08921e9365b866a3d64d5192a569ad161e0415a2bbe1e9b374a48e1b2357331cf9743fc082a22c6b68081bddaa6b783e5cc78c4df394c2 SHA512 114721b7dc26234a2bce0ab65f2513f5bdd4749fd8fc5beb9619dc449bde13c82c88716d3e9b94a192d4298019255fff1aa32beaa15b643490fdbc25e75d83f8
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.11.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.11.ebuild
index 64106c2bc4bd..27742adc9b20 100644
--- a/sys-boot/gnu-efi/gnu-efi-3.0.11.ebuild
+++ b/sys-boot/gnu-efi/gnu-efi-3.0.11.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/gnu-efi/${P}.tar.bz2"
 # - GPL-2+ : setjmp_ia32.S
 LICENSE="GPL-2+ BSD BSD-2"
 SLOT="0"
-KEYWORDS="-* amd64 arm ~arm64 ia64 x86"
+KEYWORDS="-* amd64 arm arm64 ~ia64 x86"
 IUSE="abi_x86_32 abi_x86_64 custom-cflags"
 
 # These objects get run early boot (i.e. not inside of Linux),
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.3.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.3.ebuild
deleted file mode 100644
index cb255538dac5..000000000000
--- a/sys-boot/gnu-efi/gnu-efi-3.0.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Library for build EFI Applications"
-HOMEPAGE="http://gnu-efi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gnu-efi/${P}.tar.bz2"
-
-# inc/, lib/ dirs (README.efilib)
-# - BSD-2
-# gnuefi dir:
-# - BSD (3-cluase): crt0-efi-ia32.S
-# - GPL-2+ : setjmp_ia32.S
-LICENSE="GPL-2+ BSD BSD-2"
-SLOT="0"
-# IA64 build is broken in setjmp code:
-# https://sourceforge.net/p/gnu-efi/bugs/9/
-KEYWORDS="-* amd64 ~arm ~arm64 -ia64 x86"
-IUSE="abi_x86_32 abi_x86_64"
-
-DEPEND="sys-apps/pciutils"
-RDEPEND=""
-
-# These objects get run early boot (i.e. not inside of Linux),
-# so doing these QA checks on them doesn't make sense.
-QA_EXECSTACK="usr/*/lib*efi.a:* usr/*/crt*.o"
-RESTRICT="strip"
-
-efimake() {
-	local arch=
-	case ${CHOST} in
-		arm*) arch=arm ;;
-		aarch64*) arch=aarch64 ;;
-		ia64*) arch=ia64 ;;
-		i?86*) arch=ia32 ;;
-		x86_64*) arch=x86_64 ;;
-		*) die "Unknown CHOST" ;;
-	esac
-
-	local args=(
-		ARCH="${arch}"
-		HOSTCC="${BUILD_CC}"
-		CC="${CC}"
-		AS="${AS}"
-		LD="${LD}"
-		AR="${AR}"
-		PREFIX="${EPREFIX}/usr"
-		LIBDIR='$(PREFIX)'/$(get_libdir)
-	)
-	emake -j1 "${args[@]}" "$@"
-}
-
-src_compile() {
-	tc-export BUILD_CC AR AS CC LD
-
-	# https://bugs.gentoo.org/607992
-	filter-mfpmath sse
-
-	if [[ ${CHOST} == x86_64* ]]; then
-		use abi_x86_32 && CHOST=i686 ABI=x86 efimake
-		use abi_x86_64 && efimake
-	else
-		efimake
-	fi
-}
-
-src_install() {
-	if [[ ${CHOST} == x86_64* ]]; then
-		use abi_x86_32 && CHOST=i686 ABI=x86 efimake INSTALLROOT="${D}" install
-		use abi_x86_64 && efimake INSTALLROOT="${D}" install
-	else
-		efimake INSTALLROOT="${D}" install
-	fi
-	dodoc README* ChangeLog
-}
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.6-r2.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.6-r2.ebuild
deleted file mode 100644
index 03f00a2ef8a7..000000000000
--- a/sys-boot/gnu-efi/gnu-efi-3.0.6-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Library for build EFI Applications"
-HOMEPAGE="http://gnu-efi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gnu-efi/${P}.tar.bz2"
-
-# inc/, lib/ dirs (README.efilib)
-# - BSD-2
-# gnuefi dir:
-# - BSD (3-cluase): crt0-efi-ia32.S
-# - GPL-2+ : setjmp_ia32.S
-LICENSE="GPL-2+ BSD BSD-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ia64 ~x86"
-IUSE="abi_x86_32 abi_x86_64 -custom-cflags"
-
-DEPEND="sys-apps/pciutils"
-RDEPEND=""
-
-# These objects get run early boot (i.e. not inside of Linux),
-# so doing these QA checks on them doesn't make sense.
-QA_EXECSTACK="usr/*/lib*efi.a:* usr/*/crt*.o"
-RESTRICT="strip"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ia64-gnu-hash.patch
-	"${FILESDIR}"/${P}-ia64-setjmp.patch
-)
-
-src_prepare() {
-	sed -i -e "s/-Werror//" Make.defaults || die
-	default
-}
-
-efimake() {
-	local arch=
-	case ${CHOST} in
-		arm*) arch=arm ;;
-		aarch64*) arch=aarch64 ;;
-		ia64*) arch=ia64 ;;
-		i?86*) arch=ia32 ;;
-		x86_64*) arch=x86_64 ;;
-		*) die "Unknown CHOST" ;;
-	esac
-
-	local args=(
-		ARCH="${arch}"
-		HOSTCC="${BUILD_CC}"
-		CC="${CC}"
-		AS="${AS}"
-		LD="${LD}"
-		AR="${AR}"
-		PREFIX="${EPREFIX}/usr"
-		LIBDIR='$(PREFIX)'/$(get_libdir)
-	)
-	emake -j1 "${args[@]}" "$@"
-}
-
-src_compile() {
-	tc-export BUILD_CC AR AS CC LD
-
-	if use custom-cflags; then
-		# https://bugs.gentoo.org/607992
-		filter-mfpmath sse
-
-		# https://bugs.gentoo.org/619628
-		append-flags $(test-flags-CC -mno-avx)
-	else
-		unset CFLAGS CPPFLAGS LDFLAGS
-	fi
-
-	if [[ ${CHOST} == x86_64* ]]; then
-		use abi_x86_32 && CHOST=i686 ABI=x86 efimake
-		use abi_x86_64 && efimake
-	else
-		efimake
-	fi
-}
-
-src_install() {
-	if [[ ${CHOST} == x86_64* ]]; then
-		use abi_x86_32 && CHOST=i686 ABI=x86 efimake INSTALLROOT="${D}" install
-		use abi_x86_64 && efimake INSTALLROOT="${D}" install
-	else
-		efimake INSTALLROOT="${D}" install
-	fi
-	einstalldocs
-}
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.9.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.9.ebuild
deleted file mode 100644
index 57a9ed662e5b..000000000000
--- a/sys-boot/gnu-efi/gnu-efi-3.0.9.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 2004-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Library for build EFI Applications"
-HOMEPAGE="http://gnu-efi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gnu-efi/${P}.tar.bz2"
-
-# inc/, lib/ dirs (README.efilib)
-# - BSD-2
-# gnuefi dir:
-# - BSD (3-cluase): crt0-efi-ia32.S
-# - GPL-2+ : setjmp_ia32.S
-LICENSE="GPL-2+ BSD BSD-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~ia64 ~x86"
-IUSE="abi_x86_32 abi_x86_64 custom-cflags"
-
-# These objects get run early boot (i.e. not inside of Linux),
-# so doing these QA checks on them doesn't make sense.
-QA_EXECSTACK="usr/*/lib*efi.a:* usr/*/crt*.o"
-RESTRICT="strip"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.0.9-fix-clang-build.patch )
-
-src_prepare() {
-	default
-	sed -i -e "s/-Werror//" Make.defaults || die
-}
-
-efimake() {
-	local arch=
-	case ${CHOST} in
-		arm*) arch=arm ;;
-		aarch64*) arch=aarch64 ;;
-		ia64*) arch=ia64 ;;
-		i?86*) arch=ia32 ;;
-		x86_64*) arch=x86_64 ;;
-		*) die "Unknown CHOST" ;;
-	esac
-
-	local args=(
-		ARCH="${arch}"
-		HOSTCC="${BUILD_CC}"
-		CC="${CC}"
-		AS="${AS}"
-		LD="${LD}"
-		AR="${AR}"
-		PREFIX="${EPREFIX}/usr"
-		LIBDIR='$(PREFIX)'/$(get_libdir)
-	)
-	emake -j1 "${args[@]}" "$@"
-}
-
-src_compile() {
-	tc-export BUILD_CC AR AS CC LD
-
-	if use custom-cflags; then
-		# https://bugs.gentoo.org/607992
-		filter-mfpmath sse
-
-		# https://bugs.gentoo.org/619628
-		append-flags $(test-flags-CC -mno-avx)
-	else
-		unset CFLAGS CPPFLAGS LDFLAGS
-	fi
-
-	if [[ ${CHOST} == x86_64* ]]; then
-		use abi_x86_32 && CHOST=i686 ABI=x86 efimake
-		use abi_x86_64 && efimake
-	else
-		efimake
-	fi
-}
-
-src_install() {
-	if [[ ${CHOST} == x86_64* ]]; then
-		use abi_x86_32 && CHOST=i686 ABI=x86 efimake INSTALLROOT="${D}" install
-		use abi_x86_64 && efimake INSTALLROOT="${D}" install
-	else
-		efimake INSTALLROOT="${D}" install
-	fi
-	einstalldocs
-}
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 9d34156a3972..6365da2108b7 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,22 +1,12 @@
-AUX 2.02-X86_64_PLT32.patch 2615 BLAKE2B db2c7f22a5232ec903bbad2416879d330a9d7c0e529f1135b07deaab4026ae51e6fd60ee6f29cb7cbc4c4422343ec0c56dcd3bb205855c45481ebcfc0e0c9c10 SHA512 d8d52f2e92291d382cff2c50af79634967eb5decba39f5787e311e771bd18763b68e87d93f44419ecc647c0189b7d4246ad4a4f9e3558200e7febf32cd757f5e
-AUX 2.02-efi-tsc-pmtimer.patch 1389 BLAKE2B 81baa05585f7fcbdc4e23c86442ca4203140821b56796ed39f92b5bf093b8bc162a438c60202ffb840c6f2033e06b690d177373645f78a7167d1e41382813887 SHA512 419a0d0ee41dd86b3fd1e1e1d8250089298ba4e8ab9dfb24ead1576023083b9d634a1c022c24bb5a6ebac8a5fa232f06f348fde2b61654d5caca369b90f9ac29
-AUX 2.02-freetype-capitalise-variables.patch 6454 BLAKE2B 7a05448d42c935b6942f2b9ac98eef2ddc2e7bb7e6584516859cd6586dee57911c83c98402b38cfe9044a3c3a79d41d6a86bb0918d1ca8ccf792d5ef93bad258 SHA512 99c8061453f54af0e95361101f6beb2340baef9b5a66c4c4ba78876b978df4b5686190b642090aae41f2ed2d464e267ba598e94c0926a37df3c36d866911a40c
-AUX 2.02-freetype-pkg-config.patch 7359 BLAKE2B 86ee01b2cb833354377aec3db0dcc05c9950169c9e83b9878018debef925a5238ba19b10ee0ce5124d7884deae8023ee03597e6eb56c244030f2492b5b7f0b1b SHA512 20fd57f8410073db7d6ae5c626266a310be65ca2f5cc4a2a9f2e66cb85a421c883b497e5fc7e3cd5a6ec066531f3ca4b8d837bf64007ade99418958aefd2dcf6
-AUX 2.02-gcc8.patch 2514 BLAKE2B 5eb8210441a41a44c4e0c73120d201c4ec5a8db27d0dbf37f991599ee6c2bb3aaf771a201d02829597f34f9a1af76f70dffcc9e25fa079c3e2eb72702d704692 SHA512 8eae4bfdbe595685961ed8f491b8dc8f30632d5d9e338612346a928318d4e4b811c5ffeb38354f698e40dbaa8449fd540a33ff2ca0e2af604cbe08988fc11238
-AUX 2.02-multiple-early-initrd.patch 6771 BLAKE2B 088d1178c51ea7526bd7620ae0f8160c10d3673afd0ae3407e35673cb438875e24e13f8455245c36792814751995df1235d975eb036e97813e677250af403a9d SHA512 41450b475fb83ade629d165ae2c30682e5beb2edbfd148c6388bb720241f0682b20aa0456bc624d5e9f5605616ea27fab32a829ede6c8c673e1c88e6b774a5a8
-AUX 2.02-xfs-sparse-inodes.patch 2548 BLAKE2B c3333b82b678bc0a2bfc6594719c89982f97b14b7a2f012814ce2f75e004cda46b8b7c2d4e668c5a52aee7814114a763c4d853d9c75b4322535096ba3c22e256 SHA512 4723c5dd9fd6e9b6c8677e32e4906c7995d695c7e85e834b1b29eb1d9a024678f8fa75846c7b929d1db9b5911b604c69c1b0379cb3b9adc98d5bb6d6719eb2c4
 AUX 2.04-sparc64-bios-boot.patch 1600 BLAKE2B be98526db413307f7f704c68c332ce8d76f41baa80e6372d293cbb74acb5fb07c2bf6d34315196ea03e62e18d847b068819a19a97b294e8e29453651df3bd49c SHA512 07a222dcb2c73cd5c2fc10eb154597e751e7b6d73e726ead280b1773ece6b2a3f1698dece876f7ed5cc764cf0bc12c664ea643638c203068fea25778cedffb92
 AUX gfxpayload.patch 1118 BLAKE2B 4104fc696535b1c3feba5876bccc64f9b2e52319ee992c59e7f17b8310cc9addf7545630fff78c73ca3f4b0dcd44e1bf69f4df5264d6f58777f7e5aeae93cbcb SHA512 00324825c369902a0383b792cd21e161853eadccbdc5abe2420f2d443bf6a74f72be6c15243107b936acd38c3547387c3771dc2cb566003c4c754c9260b4aa00
 AUX grub-2.02_beta2-KERNEL_GLOBS.patch 2121 BLAKE2B 398195f59537d40a4f61eadf5be974b8f9eb56a4eb07b798f0dc18e29588b3a9f8daa8d6e64980a835ec1960fab60b8c96d6552ef2920fe6604170abf7d5e7da SHA512 f85bc538ae647c46efbe07d7b87acf49daa7b07e9752af3aa3f77019f48ea24cd1b6a095a6f9c19d50128701753f453c531b9b068e11ee22a259f3fdf8ac205e
 AUX grub.default-3 2528 BLAKE2B c32de43644eca5fae8d8d727ff443600917a93e015f8a83dde555e3bca7506a817b08a2fc926970eeb5b7f40028f4951c6cdcd281f9fc0b6504f26c8e76bf0c5 SHA512 505960e62b44c70af0a90c7ff486bd57101831d7c6e9d80084013e374070ff02b40f77b0790aebb926e1e0854e375867cba1d4977dbb00c2ba54ebaa9f6a1a0b
 DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B c8904f3cd5a49370a7dc10e456684c88aeae998a99090bf4d0a5baa4f36cc8fb8f70586cf6d610a5ffeee97261d28c80f55bbe9dcfc3ed796d5c2d60e79adb58 SHA512 ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae
-DIST grub-2.02.tar.xz 6113260 BLAKE2B 7c5ec61a8dc5a00e9cdc91c489f0d2ee37cd7e673eef8e8e26bbc18c5ec28829f563b9298874fb96d45a5d523ce366e936649c21ebda7462afda0cc328b970ce SHA512 cc6eb0a42b5c8df2f671cc128ff725afb3ff1f8832a196022e433cf0d3b75decfca2316d0aa5fabea75747d55e88f3d021dd93508563f8ca80fd7b9e7fe1f088
 DIST grub-2.04.tar.xz 6393864 BLAKE2B 413ffb9aaeae1ee3128032914ca426a1a5adb3737895dfe563fdde5a7e0386ac2dbc2f7ddfc4e0a67b3ad90494985d6886c20054b038701feb743e67e2eed9d0 SHA512 9c15c42d0cf5d61446b752194e3b628bb04be0fe6ea0240ab62b3d753784712744846e1f7c3651d8e0968d22012e6d713c38c44936d4004ded3ca4d4007babbb
-DIST grub-2.05_alpha20200110.tar.xz 5452588 BLAKE2B ccf95644bc76f6be8e73a25e1b5f05e052ea5bc0c61896454c211fccaec6a714dbae10f7398aa1e9d7bf864efc68655708c102ba20cc1e40fecd3fa7d3d961f7 SHA512 b6e609edc4dcee5d9348d1d6d9ecfec5a759a284a1f82970b38f8aab0c8fa6b5dc69e532a1a264815208df5dae3bf409c2f73846893a8e3cb97187d0e0c7295c
+DIST grub-2.05_alpha20200310.tar.xz 6671372 BLAKE2B 2b9006fe486bb3195f34a3e5d34eaa923e1f295fbb7b815b0adf70ca3000531ff0c250c300f21103cf24144f9e51b96cefc860b7a46c6e31b96d4566db08b027 SHA512 7ddcb7524a4fa60754e3053aae4b033b17ffd740f220d3cbc1e25167ce823c42b1795b4767dabb8920027134769de8cacdafc9a6fe26b4d242590809e3db8725
 DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B 97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14 SHA512 b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
-DIST unifont-9.0.06.pcf.gz 1360354 BLAKE2B 09b96e1711c729ef159d62e3ea7b289ca2d01dc0ea417e35a18b73dc02a23f62ce7821d9761bceee4002d9eeaabd91cfb69bbacc6fbdfdfa00445d18fe8f1d66 SHA512 dd0a1afa72f5204c62055d83f22750c74af38ffafdb8eda8e1f1cf7292e572a14969b8a9a6a2cb336d5bed4ab633f6b5a962c59117a590e4238788959cb82774
-EBUILD grub-2.02-r4.ebuild 7943 BLAKE2B 25a454832c30c953afc62137ae7d3a471569c5bddd9aa7d0be8cdb71895a60d21243d5ce6838454be3f2f455b4bc27828028153222ea500e7e54077619777286 SHA512 2afa9306f24a31d6bd6c5fb61712f24b367a02273dcb7ae273ef784deddfeadb238f9816cf19ae35147081b9498bd112d8d0f9b72db8c74a018737adbc3cc2c9
-EBUILD grub-2.04-r1.ebuild 7619 BLAKE2B 4e988ffbb94da311d11afdf61db58c79dcd0ed60e030d16e6321c99d7e2883417908cbd45543cb9e7ad42d7e7ce626ef72180134e87eec843aee5cef820d71f6 SHA512 ac316e1e28f690f6adf5ea5d1d66e097258a8090db3f6a63ee18387ee6c776a8ff210dd92504d0498510356da5e6eb1f2a21788447409d446c5e9c5e343f2ab0
-EBUILD grub-2.05_alpha20200110.ebuild 7329 BLAKE2B 341c86fd6761d438d22211db64b0b465dd384acdc3bd0535e6b6dd8519a2843750c836c74431a0bc5330bc237cb24f5ddc472fd9c90b87eb0c97931972ee9d4b SHA512 5cd7b9138eb7a8617559f9efeae0f08524232862606c09c5187927477090d29d01bda97a75085a6481528fecd9e71329a1ec658851255090ca2d0911ad467217
-EBUILD grub-9999.ebuild 7580 BLAKE2B d8361276ffdf12131a7593218219593e78f26258a86739d83442f350919795c8f77c9d1e83d620f7e370502e4b3fc517600694057feecb37ec2e03c8ca42b35d SHA512 4c5d33772794f1357a54e2d3ece2d138a57dbcaa43f34b7aa2b5c123a3b85f4d919dac5c0068a83b238ce208abbac468d07e7216a37c3ea0e26153e8ee854bff
-MISC metadata.xml 1149 BLAKE2B c0a364b1d8139f26f7dd09ba49dd68d591c7532e2eec25dae97caea49be8bfc92c8d5c69dcc77d89f58367fa04a73526cc55768f93222effc6c6e47a52b53500 SHA512 45d0425236957395e275bd340aeabfcd03451b037c616c54cf8babdc3bdee6aa3706fa7565f595ba4391773d331353b8920a627094c01289935a1a9aedc1f7bf
+EBUILD grub-2.04-r1.ebuild 7460 BLAKE2B d9683c64e956abdaea345b8f059122224535094e88ff893c2cecb42f094c13387800e451d5533359cf127f630310b554fc478f852e96f9f8d45c89b69e501588 SHA512 b2df1e10270bb498234a96e92716c238da088cbae0b5a956953aab13435deee6dfd27fc4edb14a32fc643125fd74148ff6ce21b0d169a6ad2bcf066a9097ff4b
+EBUILD grub-2.05_alpha20200310.ebuild 7176 BLAKE2B f9dfe31668c919fc919952162c69f909f41e09ae9cf9bba34336aff578b525b57aed857392817ecb82c1f0484ae3537415e53ee0dd1d452fad39225692e30705 SHA512 b4a37d8646c651d7d88e38379eb7892cd0fee6afd642b5a27cfe7c58462eff4155e37428f0498fa81f93424dfef1d15054c97b0a62a97237a2a690cedb84dd2e
+EBUILD grub-9999.ebuild 7427 BLAKE2B 5080a3c845d23c80e104635af4caca1580de57fdfa6b24a4af903963223016b4dfd3cd40c3e5472142867f0fb5929a721bf6e65adf6810f7e04f232f3a683675 SHA512 34aee46a4608e182f71c84b8101f64f69b71d0bc36a1a64746dd71d9e79c9b8dc56eca1c8d7083cbc6011bbdfa4647e9a6aab82bd3cb01fec98cab8d111c07f3
+MISC metadata.xml 984 BLAKE2B 82b1b4b99abc192e31cf22808d5589992babe852ffd191198e2ab847197cad6dbd690d4b56c561bc4b2bb37dfad4317e3c287851e8f1211bdcb1fcb092b468b4 SHA512 8eedc15328286beb4631a330e17e9c0fdc7c7d56f5890e486b94fd036d11eade4eea333eb0be9119ca9e1c1e7197254ff8eb3b10345559c87b2c3bbaa0d7cdc8
diff --git a/sys-boot/grub/files/2.02-X86_64_PLT32.patch b/sys-boot/grub/files/2.02-X86_64_PLT32.patch
deleted file mode 100644
index 2c65cb78a5d5..000000000000
--- a/sys-boot/grub/files/2.02-X86_64_PLT32.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 02702bdfe14d8a04643a45b03715f734ae34dbac Mon Sep 17 00:00:00 2001
-From: "H.J. Lu" <hjl.tools@gmail.com>
-Date: Sat, 17 Feb 2018 06:47:28 -0800
-Subject: x86-64: Treat R_X86_64_PLT32 as R_X86_64_PC32
-
-Starting from binutils commit bd7ab16b4537788ad53521c45469a1bdae84ad4a:
-
-https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=bd7ab16b4537788ad53521c45469a1bdae84ad4a
-
-x86-64 assembler generates R_X86_64_PLT32, instead of R_X86_64_PC32, for
-32-bit PC-relative branches.  Grub2 should treat R_X86_64_PLT32 as
-R_X86_64_PC32.
-
-Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-
-Origin: upstream, https://git.savannah.gnu.org/cgit/grub.git/commit/?id=842c390469e2c2e10b5aa36700324cd3bde25875
-Last-Update: 2018-07-30
-
-Patch-Name: R_X86_64_PLT32.patch
----
- grub-core/efiemu/i386/loadcore64.c | 1 +
- grub-core/kern/x86_64/dl.c         | 1 +
- util/grub-mkimagexx.c              | 1 +
- util/grub-module-verifier.c        | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/grub-core/efiemu/i386/loadcore64.c b/grub-core/efiemu/i386/loadcore64.c
-index e49d0b6ff..18facf47f 100644
---- a/grub-core/efiemu/i386/loadcore64.c
-+++ b/grub-core/efiemu/i386/loadcore64.c
-@@ -98,6 +98,7 @@ grub_arch_efiemu_relocate_symbols64 (grub_efiemu_segment_t segs,
- 		    break;
- 
- 		  case R_X86_64_PC32:
-+		  case R_X86_64_PLT32:
- 		    err = grub_efiemu_write_value (addr,
- 						   *addr32 + rel->r_addend
- 						   + sym.off
-diff --git a/grub-core/kern/x86_64/dl.c b/grub-core/kern/x86_64/dl.c
-index 440690673..3a73e6e6c 100644
---- a/grub-core/kern/x86_64/dl.c
-+++ b/grub-core/kern/x86_64/dl.c
-@@ -70,6 +70,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
- 	  break;
- 
- 	case R_X86_64_PC32:
-+	case R_X86_64_PLT32:
- 	  {
- 	    grub_int64_t value;
- 	    value = ((grub_int32_t) *addr32) + rel->r_addend + sym->st_value -
-diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
-index e63f148e4..f20255a28 100644
---- a/util/grub-mkimagexx.c
-+++ b/util/grub-mkimagexx.c
-@@ -832,6 +832,7 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections,
- 		  break;
- 
- 		case R_X86_64_PC32:
-+		case R_X86_64_PLT32:
- 		  {
- 		    grub_uint32_t *t32 = (grub_uint32_t *) target;
- 		    *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32)
-diff --git a/util/grub-module-verifier.c b/util/grub-module-verifier.c
-index 9179285a5..a79271f66 100644
---- a/util/grub-module-verifier.c
-+++ b/util/grub-module-verifier.c
-@@ -19,6 +19,7 @@ struct grub_module_verifier_arch archs[] = {
-       -1
-     }, (int[]){
-       R_X86_64_PC32,
-+      R_X86_64_PLT32,
-       -1
-     }
-   },
diff --git a/sys-boot/grub/files/2.02-efi-tsc-pmtimer.patch b/sys-boot/grub/files/2.02-efi-tsc-pmtimer.patch
deleted file mode 100644
index f20845d5a34b..000000000000
--- a/sys-boot/grub/files/2.02-efi-tsc-pmtimer.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 446794de8da4329ea532cbee4ca877bcafd0e534 Mon Sep 17 00:00:00 2001
-From: "David E. Box" <david.e.box@linux.intel.com>
-Date: Fri, 15 Sep 2017 15:37:05 -0700
-Subject: [PATCH] tsc: Change default tsc calibration method to pmtimer on EFI
- systems
-
-On efi systems, make pmtimer based tsc calibration the default over the
-pit. This prevents Grub from hanging on Intel SoC systems that power gate
-the pit.
-
-Signed-off-by: David E. Box <david.e.box@linux.intel.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
----
- grub-core/kern/i386/tsc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/grub-core/kern/i386/tsc.c b/grub-core/kern/i386/tsc.c
-index 2e85289d8..f266eb131 100644
---- a/grub-core/kern/i386/tsc.c
-+++ b/grub-core/kern/i386/tsc.c
-@@ -68,7 +68,7 @@ grub_tsc_init (void)
- #ifdef GRUB_MACHINE_XEN
-   (void) (grub_tsc_calibrate_from_xen () || calibrate_tsc_hardcode());
- #elif defined (GRUB_MACHINE_EFI)
--  (void) (grub_tsc_calibrate_from_pit () || grub_tsc_calibrate_from_pmtimer () || grub_tsc_calibrate_from_efi() || calibrate_tsc_hardcode());
-+  (void) (grub_tsc_calibrate_from_pmtimer () || grub_tsc_calibrate_from_pit () || grub_tsc_calibrate_from_efi() || calibrate_tsc_hardcode());
- #elif defined (GRUB_MACHINE_COREBOOT)
-   (void) (grub_tsc_calibrate_from_pmtimer () || grub_tsc_calibrate_from_pit () || calibrate_tsc_hardcode());
- #else
--- 
-2.22.0
-
diff --git a/sys-boot/grub/files/2.02-freetype-capitalise-variables.patch b/sys-boot/grub/files/2.02-freetype-capitalise-variables.patch
deleted file mode 100644
index 9aa7f54f32ab..000000000000
--- a/sys-boot/grub/files/2.02-freetype-capitalise-variables.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From ba84c8d1b4830e9fcb14d9f0e4a36e03ac40a09d Mon Sep 17 00:00:00 2001
-From: Colin Watson <cjwatson@ubuntu.com>
-Date: Tue, 30 Jan 2018 14:08:26 +0000
-Subject: build: Capitalise *freetype_* variables
-
-Using FREETYPE_CFLAGS and FREETYPE_LIBS is more in line with the naming
-scheme used by pkg-config macros.
-
-Bug-Debian: https://bugs.debian.org/887721
-Last-Update: 2018-02-11
-
-Patch-Name: freetype-capitalise-variables.patch
----
- Makefile.am       |  6 +++---
- Makefile.util.def |  4 ++--
- configure.ac      | 24 ++++++++++++------------
- 3 files changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index f0ab1adc3..b47b4b1ac 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -71,7 +71,7 @@ endif
- starfield_theme_files = $(srcdir)/themes/starfield/blob_w.png $(srcdir)/themes/starfield/boot_menu_c.png $(srcdir)/themes/starfield/boot_menu_e.png $(srcdir)/themes/starfield/boot_menu_ne.png $(srcdir)/themes/starfield/boot_menu_n.png $(srcdir)/themes/starfield/boot_menu_nw.png $(srcdir)/themes/starfield/boot_menu_se.png $(srcdir)/themes/starfield/boot_menu_s.png $(srcdir)/themes/starfield/boot_menu_sw.png $(srcdir)/themes/starfield/boot_menu_w.png $(srcdir)/themes/starfield/slider_c.png $(srcdir)/themes/starfield/slider_n.png $(srcdir)/themes/starfield/slider_s.png $(srcdir)/themes/starfield/starfield.png $(srcdir)/themes/starfield/terminal_box_c.png $(srcdir)/themes/starfield/terminal_box_e.png $(srcdir)/themes/starfield/terminal_box_ne.png $(srcdir)/themes/starfield/terminal_box_n.png $(srcdir)/themes/starfield/terminal_box_nw.png $(srcdir)/themes/starfield/terminal_box_se.png $(srcdir)/themes/starfield/terminal_box_s.png $(srcdir)/themes/starfield/terminal_box_sw.png $(srcdir)/themes/starfield/terminal_box_w.png $(srcdir)/themes/starfield/theme.txt $(srcdir)/themes/starfield/README $(srcdir)/themes/starfield/COPYING.CC-BY-SA-3.0
- 
- build-grub-mkfont$(BUILD_EXEEXT): util/grub-mkfont.c grub-core/unidata.c grub-core/kern/emu/misc.c util/misc.c
--	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-mkfont\" $^ $(build_freetype_cflags) $(build_freetype_libs)
-+	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-mkfont\" $^ $(BUILD_FREETYPE_CFLAGS) $(BUILD_FREETYPE_LIBS)
- CLEANFILES += build-grub-mkfont$(BUILD_EXEEXT)
- 
- garbage-gen$(BUILD_EXEEXT): util/garbage-gen.c
-@@ -80,11 +80,11 @@ CLEANFILES += garbage-gen$(BUILD_EXEEXT)
- EXTRA_DIST += util/garbage-gen.c
- 
- build-grub-gen-asciih$(BUILD_EXEEXT): util/grub-gen-asciih.c
--	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(build_freetype_cflags) $(build_freetype_libs) -Wall -Werror
-+	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(BUILD_FREETYPE_CFLAGS) $(BUILD_FREETYPE_LIBS) -Wall -Werror
- CLEANFILES += build-grub-gen-asciih$(BUILD_EXEEXT)
- 
- build-grub-gen-widthspec$(BUILD_EXEEXT): util/grub-gen-widthspec.c
--	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(build_freetype_cflags) $(build_freetype_libs) -Wall -Werror
-+	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(BUILD_FREETYPE_CFLAGS) $(BUILD_FREETYPE_LIBS) -Wall -Werror
- CLEANFILES += build-grub-gen-widthspec$(BUILD_EXEEXT)
- 
- if COND_STARFIELD
-diff --git a/Makefile.util.def b/Makefile.util.def
-index 168acbe59..fa39d8bd1 100644
---- a/Makefile.util.def
-+++ b/Makefile.util.def
-@@ -302,14 +302,14 @@ program = {
-   common = grub-core/kern/emu/argp_common.c;
-   common = grub-core/osdep/init.c;
- 
--  cflags = '$(freetype_cflags)';
-+  cflags = '$(FREETYPE_CFLAGS)';
-   cppflags = '-DGRUB_MKFONT=1';
- 
-   ldadd = libgrubmods.a;
-   ldadd = libgrubgcry.a;
-   ldadd = libgrubkern.a;
-   ldadd = grub-core/gnulib/libgnu.a;
--  ldadd = '$(freetype_libs)';
-+  ldadd = '$(FREETYPE_LIBS)';
-   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
-   condition = COND_GRUB_MKFONT;
- };
-diff --git a/configure.ac b/configure.ac
-index cd1f49837..85c23bd62 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1505,12 +1505,12 @@ unset ac_cv_header_ft2build_h
- 
- if test x"$grub_mkfont_excuse" = x ; then
-   # Check for freetype libraries.
--  freetype_cflags=`$FREETYPE --cflags`
--  freetype_libs=`$FREETYPE --libs`
-+  FREETYPE_CFLAGS=`$FREETYPE --cflags`
-+  FREETYPE_LIBS=`$FREETYPE --libs`
-   SAVED_CPPFLAGS="$CPPFLAGS"
-   SAVED_LIBS="$LIBS"
--  CPPFLAGS="$CPPFLAGS $freetype_cflags"
--  LIBS="$LIBS $freetype_libs"
-+  CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
-+  LIBS="$LIBS $FREETYPE_LIBS"
-   AC_CHECK_HEADERS([ft2build.h], [],
-   	[grub_mkfont_excuse=["need freetype2 headers"]])
-   AC_LINK_IFELSE([AC_LANG_CALL([], [FT_Load_Glyph])], [], [grub_mkfont_excuse=["freetype2 library unusable"]])
-@@ -1527,8 +1527,8 @@ else
- enable_grub_mkfont=no
- fi
- AC_SUBST([enable_grub_mkfont])
--AC_SUBST([freetype_cflags])
--AC_SUBST([freetype_libs])
-+AC_SUBST([FREETYPE_CFLAGS])
-+AC_SUBST([FREETYPE_LIBS])
- 
- SAVED_CC="$CC"
- SAVED_CPP="$CPP"
-@@ -1566,12 +1566,12 @@ fi
- 
- if test x"$grub_build_mkfont_excuse" = x ; then
-   # Check for freetype libraries.
--  build_freetype_cflags=`$BUILD_FREETYPE --cflags`
--  build_freetype_libs=`$BUILD_FREETYPE --libs`
-+  BUILD_FREETYPE_CFLAGS=`$BUILD_FREETYPE --cflags`
-+  BUILD_FREETYPE_LIBS=`$BUILD_FREETYPE --libs`
-   SAVED_CPPFLAGS_2="$CPPFLAGS"
-   SAVED_LIBS="$LIBS"
--  CPPFLAGS="$CPPFLAGS $build_freetype_cflags"
--  LIBS="$LIBS $build_freetype_libs"
-+  CPPFLAGS="$CPPFLAGS $BUILD_FREETYPE_CFLAGS"
-+  LIBS="$LIBS $BUILD_FREETYPE_LIBS"
-   AC_CHECK_HEADERS([ft2build.h], [],
-   	[grub_build_mkfont_excuse=["need freetype2 headers"]])
-   AC_LINK_IFELSE([AC_LANG_CALL([], [FT_Load_Glyph])], [], [grub_build_mkfont_excuse=["freetype2 library unusable"]])
-@@ -1595,8 +1595,8 @@ if test x"$enable_build_grub_mkfont" = xno && ( test "x$platform" = xqemu || tes
-   fi
- fi
- 
--AC_SUBST([build_freetype_cflags])
--AC_SUBST([build_freetype_libs])
-+AC_SUBST([BUILD_FREETYPE_CFLAGS])
-+AC_SUBST([BUILD_FREETYPE_LIBS])
- 
- CC="$SAVED_CC"
- CPP="$SAVED_CPP"
diff --git a/sys-boot/grub/files/2.02-freetype-pkg-config.patch b/sys-boot/grub/files/2.02-freetype-pkg-config.patch
deleted file mode 100644
index 94437f073c4f..000000000000
--- a/sys-boot/grub/files/2.02-freetype-pkg-config.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-From 3eec911197081a63d9dae28f1784ad01a06fb60a Mon Sep 17 00:00:00 2001
-From: Colin Watson <cjwatson@ubuntu.com>
-Date: Tue, 30 Jan 2018 21:54:17 +0000
-Subject: build: Use pkg-config to find FreeType
-
-pkg-config is apparently preferred over freetype-config these days (see
-the BUGS section of freetype-config(1)).  pkg-config support was added
-to FreeType in version 2.1.5, which was released in 2003, so it should
-comfortably be available everywhere by now.
-
-We no longer need to explicitly substitute FREETYPE_CFLAGS and
-FREETYPE_LIBS, since PKG_CHECK_MODULES does that automatically.
-
-Fixes Debian bug #887721.
-
-Reported-by: Hugh McMaster <hugh.mcmaster@outlook.com>
-Signed-off-by: Colin Watson <cjwatson@ubuntu.com>
-
-Bug-Debian: https://bugs.debian.org/887721
-Last-Update: 2018-02-11
-
-Patch-Name: freetype-pkg-config.patch
----
- INSTALL      | 11 +++++----
- configure.ac | 74 +++++++++++++++++++++++++-----------------------------------
- 2 files changed, 37 insertions(+), 48 deletions(-)
-
-diff --git a/INSTALL b/INSTALL
-index f3c20edc8..b370d7753 100644
---- a/INSTALL
-+++ b/INSTALL
-@@ -37,6 +37,7 @@ configuring the GRUB.
- * GNU gettext 0.17 or later
- * GNU binutils 2.9.1.0.23 or later
- * Flex 2.5.35 or later
-+* pkg-config
- * Other standard GNU/Unix tools
- * a libc with large file support (e.g. glibc 2.1 or later)
- 
-@@ -52,7 +53,7 @@ For optional grub-emu features, you need:
- 
- To build GRUB's graphical terminal (gfxterm), you need:
- 
--* FreeType 2 or later
-+* FreeType 2.1.5 or later
- * GNU Unifont
- 
- If you use a development snapshot or want to hack on GRUB you may
-@@ -158,8 +159,8 @@ For this example the configure line might look like (more details below)
- (some options are optional and included here for completeness but some rarely
- used options are omitted):
- 
--./configure BUILD_CC=gcc BUILD_FREETYPE=freetype-config --host=amd64-linux-gnu
--CC=amd64-linux-gnu-gcc CFLAGS="-g -O2" FREETYPE=amd64-linux-gnu-freetype-config
-+./configure BUILD_CC=gcc BUILD_PKG_CONFIG=pkg-config --host=amd64-linux-gnu
-+CC=amd64-linux-gnu-gcc CFLAGS="-g -O2" PKG_CONFIG=amd64-linux-gnu-pkg-config
- --target=arm --with-platform=uboot TARGET_CC=arm-elf-gcc
- TARGET_CFLAGS="-Os -march=armv6" TARGET_CCASFLAGS="-march=armv6"
- TARGET_OBJCOPY="arm-elf-objcopy" TARGET_STRIP="arm-elf-strip"
-@@ -176,7 +177,7 @@ corresponding platform are not needed for the platform in question.
-     2. BUILD_CFLAGS= for C options for build.
-     3. BUILD_CPPFLAGS= for C preprocessor options for build.
-     4. BUILD_LDFLAGS= for linker options for build.
--    5. BUILD_FREETYPE= for freetype-config for build (optional).
-+    5. BUILD_PKG_CONFIG= for pkg-config for build (optional).
- 
-   - For host
-     1. --host= to autoconf name of host.
-@@ -184,7 +185,7 @@ corresponding platform are not needed for the platform in question.
-     3. HOST_CFLAGS= for C options for host.
-     4. HOST_CPPFLAGS= for C preprocessor options for host.
-     5. HOST_LDFLAGS= for linker options for host.
--    6. FREETYPE= for freetype-config for host (optional).
-+    6. PKG_CONFIG= for pkg-config for host (optional).
-     7. Libdevmapper if any must be in standard linker folders (-ldevmapper) (optional).
-     8. Libfuse if any must be in standard linker folders (-lfuse) (optional).
-     9. Libzfs if any must be in standard linker folders (-lzfs) (optional).
-diff --git a/configure.ac b/configure.ac
-index 85c23bd62..f102b7024 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -50,6 +50,10 @@ AC_PREREQ(2.60)
- AC_CONFIG_SRCDIR([include/grub/dl.h])
- AC_CONFIG_HEADER([config-util.h])
- 
-+# Explicitly check for pkg-config early on, since otherwise conditional
-+# calls are problematic.
-+PKG_PROG_PKG_CONFIG
-+
- # Program name transformations
- AC_ARG_PROGRAM
- grub_TRANSFORM([grub-bios-setup])
-@@ -1493,29 +1497,22 @@ if test x"$enable_grub_mkfont" = xno ; then
-   grub_mkfont_excuse="explicitly disabled"
- fi
- 
--if test x"$grub_mkfont_excuse" = x ; then
--  # Check for freetype libraries.
--  AC_CHECK_TOOLS([FREETYPE], [freetype-config])
--  if test "x$FREETYPE" = x ; then
--    grub_mkfont_excuse=["need freetype2 library"]
--  fi
--fi
--
- unset ac_cv_header_ft2build_h
- 
- if test x"$grub_mkfont_excuse" = x ; then
-   # Check for freetype libraries.
--  FREETYPE_CFLAGS=`$FREETYPE --cflags`
--  FREETYPE_LIBS=`$FREETYPE --libs`
--  SAVED_CPPFLAGS="$CPPFLAGS"
--  SAVED_LIBS="$LIBS"
--  CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
--  LIBS="$LIBS $FREETYPE_LIBS"
--  AC_CHECK_HEADERS([ft2build.h], [],
--  	[grub_mkfont_excuse=["need freetype2 headers"]])
--  AC_LINK_IFELSE([AC_LANG_CALL([], [FT_Load_Glyph])], [], [grub_mkfont_excuse=["freetype2 library unusable"]])
--  CPPFLAGS="$SAVED_CPPFLAGS"
--  LIBS="$SAVED_LIBS"
-+  PKG_CHECK_MODULES([FREETYPE], [freetype2], [
-+    SAVED_CPPFLAGS="$CPPFLAGS"
-+    SAVED_LIBS="$LIBS"
-+    CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
-+    LIBS="$LIBS $FREETYPE_LIBS"
-+    AC_CHECK_HEADERS([ft2build.h], [],
-+      [grub_mkfont_excuse=["need freetype2 headers"]])
-+    AC_LINK_IFELSE([AC_LANG_CALL([], [FT_Load_Glyph])], [],
-+      [grub_mkfont_excuse=["freetype2 library unusable"]])
-+    CPPFLAGS="$SAVED_CPPFLAGS"
-+    LIBS="$SAVED_LIBS"
-+  ], [grub_mkfont_excuse=["need freetype2 library"]])
- fi
- 
- if test x"$enable_grub_mkfont" = xyes && test x"$grub_mkfont_excuse" != x ; then
-@@ -1527,8 +1524,6 @@ else
- enable_grub_mkfont=no
- fi
- AC_SUBST([enable_grub_mkfont])
--AC_SUBST([FREETYPE_CFLAGS])
--AC_SUBST([FREETYPE_LIBS])
- 
- SAVED_CC="$CC"
- SAVED_CPP="$CPP"
-@@ -1558,25 +1553,21 @@ AC_SUBST([BUILD_WORDS_BIGENDIAN])
- 
- if test x"$grub_build_mkfont_excuse" = x ; then
-   # Check for freetype libraries.
--  AC_CHECK_PROGS([BUILD_FREETYPE], [freetype-config])
--  if test "x$BUILD_FREETYPE" = x ; then
--    grub_build_mkfont_excuse=["need freetype2 library"]
--  fi
--fi
--
--if test x"$grub_build_mkfont_excuse" = x ; then
--  # Check for freetype libraries.
--  BUILD_FREETYPE_CFLAGS=`$BUILD_FREETYPE --cflags`
--  BUILD_FREETYPE_LIBS=`$BUILD_FREETYPE --libs`
--  SAVED_CPPFLAGS_2="$CPPFLAGS"
--  SAVED_LIBS="$LIBS"
--  CPPFLAGS="$CPPFLAGS $BUILD_FREETYPE_CFLAGS"
--  LIBS="$LIBS $BUILD_FREETYPE_LIBS"
--  AC_CHECK_HEADERS([ft2build.h], [],
--  	[grub_build_mkfont_excuse=["need freetype2 headers"]])
--  AC_LINK_IFELSE([AC_LANG_CALL([], [FT_Load_Glyph])], [], [grub_build_mkfont_excuse=["freetype2 library unusable"]])
--  LIBS="$SAVED_LIBS"
--  CPPFLAGS="$SAVED_CPPFLAGS_2"
-+  SAVED_PKG_CONFIG="$PKG_CONFIG"
-+  test -z "$BUILD_PKG_CONFIG" || PKG_CONFIG="$BUILD_PKG_CONFIG"
-+  PKG_CHECK_MODULES([BUILD_FREETYPE], [freetype2], [
-+    SAVED_CPPFLAGS_2="$CPPFLAGS"
-+    SAVED_LIBS="$LIBS"
-+    CPPFLAGS="$CPPFLAGS $BUILD_FREETYPE_CFLAGS"
-+    LIBS="$LIBS $BUILD_FREETYPE_LIBS"
-+    AC_CHECK_HEADERS([ft2build.h], [],
-+      [grub_build_mkfont_excuse=["need freetype2 headers"]])
-+    AC_LINK_IFELSE([AC_LANG_CALL([], [FT_Load_Glyph])], [],
-+      [grub_build_mkfont_excuse=["freetype2 library unusable"]])
-+    LIBS="$SAVED_LIBS"
-+    CPPFLAGS="$SAVED_CPPFLAGS_2"
-+  ], [grub_build_mkfont_excuse=["need freetype2 library"]])
-+  PKG_CONFIG="$SAVED_PKG_CONFIG"
- fi
- 
- if test x"$enable_build_grub_mkfont" = xyes && test x"$grub_build_mkfont_excuse" != x ; then
-@@ -1595,9 +1586,6 @@ if test x"$enable_build_grub_mkfont" = xno && ( test "x$platform" = xqemu || tes
-   fi
- fi
- 
--AC_SUBST([BUILD_FREETYPE_CFLAGS])
--AC_SUBST([BUILD_FREETYPE_LIBS])
--
- CC="$SAVED_CC"
- CPP="$SAVED_CPP"
- CFLAGS="$SAVED_CFLAGS"
diff --git a/sys-boot/grub/files/2.02-gcc8.patch b/sys-boot/grub/files/2.02-gcc8.patch
deleted file mode 100644
index 51ee7dc86c25..000000000000
--- a/sys-boot/grub/files/2.02-gcc8.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 563b1da6e6ae7af46cc8354cadb5dab416989f0a Mon Sep 17 00:00:00 2001
-From: Michael Chang <mchang@suse.com>
-Date: Mon, 26 Mar 2018 16:52:34 +0800
-Subject: Fix packed-not-aligned error on GCC 8
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When building with GCC 8, there are several errors regarding packed-not-aligned.
-
-./include/grub/gpt_partition.h:79:1: error: alignment 1 of ‘struct grub_gpt_partentry’ is less than 8 [-Werror=packed-not-aligned]
-
-This patch fixes the build error by cleaning up the ambiguity of placing
-aligned structure in a packed one. In "struct grub_btrfs_time" and "struct
-grub_gpt_part_type", the aligned attribute seems to be superfluous, and also
-has to be packed, to ensure the structure is bit-to-bit mapped to the format
-laid on disk. I think we could blame to copy and paste error here for the
-mistake. In "struct efi_variable", we have to use grub_efi_packed_guid_t, as
-the name suggests. :)
-
-Signed-off-by: Michael Chang <mchang@suse.com>
-Tested-by: Michael Chang <mchang@suse.com>
-Tested-by: Paul Menzel <paulepanter@users.sourceforge.net>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
----
- grub-core/fs/btrfs.c          | 2 +-
- include/grub/efiemu/runtime.h | 2 +-
- include/grub/gpt_partition.h  | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 4849c1c..be19544 100644
---- a/grub-core/fs/btrfs.c
-+++ b/grub-core/fs/btrfs.c
-@@ -175,7 +175,7 @@ struct grub_btrfs_time
- {
-   grub_int64_t sec;
-   grub_uint32_t nanosec;
--} __attribute__ ((aligned (4)));
-+} GRUB_PACKED;
- 
- struct grub_btrfs_inode
- {
-diff --git a/include/grub/efiemu/runtime.h b/include/grub/efiemu/runtime.h
-index 9b6b729..36d2ded 100644
---- a/include/grub/efiemu/runtime.h
-+++ b/include/grub/efiemu/runtime.h
-@@ -29,7 +29,7 @@ struct grub_efiemu_ptv_rel
- 
- struct efi_variable
- {
--  grub_efi_guid_t guid;
-+  grub_efi_packed_guid_t guid;
-   grub_uint32_t namelen;
-   grub_uint32_t size;
-   grub_efi_uint32_t attributes;
-diff --git a/include/grub/gpt_partition.h b/include/grub/gpt_partition.h
-index 1b32f67..9668a68 100644
---- a/include/grub/gpt_partition.h
-+++ b/include/grub/gpt_partition.h
-@@ -28,7 +28,7 @@ struct grub_gpt_part_type
-   grub_uint16_t data2;
-   grub_uint16_t data3;
-   grub_uint8_t data4[8];
--} __attribute__ ((aligned(8)));
-+} GRUB_PACKED;
- typedef struct grub_gpt_part_type grub_gpt_part_type_t;
- 
- #define GRUB_GPT_PARTITION_TYPE_EMPTY \
--- 
-cgit v1.0-41-gc330
-
diff --git a/sys-boot/grub/files/2.02-multiple-early-initrd.patch b/sys-boot/grub/files/2.02-multiple-early-initrd.patch
deleted file mode 100644
index 74b576f8b007..000000000000
--- a/sys-boot/grub/files/2.02-multiple-early-initrd.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-From a698240df0c43278b2d1d7259c8e7a6926c63112 Mon Sep 17 00:00:00 2001
-From: "Matthew S. Turnbull" <sparky@bluefang-logic.com>
-Date: Sat, 24 Feb 2018 17:44:58 -0500
-Subject: grub-mkconfig/10_linux: Support multiple early initrd images
-
-Add support for multiple, shared, early initrd images. These early
-images will be loaded in the order declared, and all will be loaded
-before the initrd image.
-
-While many classes of data can be provided by early images, the
-immediate use case would be for distributions to provide CPU
-microcode to mitigate the Meltdown and Spectre vulnerabilities.
-
-There are two environment variables provided for declaring the early
-images.
-
-* GRUB_EARLY_INITRD_LINUX_STOCK is for the distribution declare
-  images that are provided by the distribution or installed packages.
-  If undeclared, this will default to a set of common microcode image
-  names.
-
-* GRUB_EARLY_INITRD_LINUX_CUSTOM is for user created images. User
-  images will be loaded after the stock images.
-
-These separate configurations allow the distribution and user to
-declare different image sets without clobbering each other.
-
-This also makes a minor update to ensure that UUID partition labels
-stay disabled when no initrd image is found, even if early images are
-present.
-
-This is a continuation of a previous patch published by Christian
-Hesse in 2016:
-http://lists.gnu.org/archive/html/grub-devel/2016-02/msg00025.html
-
-Down stream Gentoo bug:
-https://bugs.gentoo.org/645088
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-Signed-off-by: Matthew S. Turnbull <sparky@bluefang-logic.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
----
- docs/grub.texi          | 19 +++++++++++++++++++
- util/grub-mkconfig.in   |  8 ++++++++
- util/grub.d/10_linux.in | 33 +++++++++++++++++++++++++++------
- 3 files changed, 54 insertions(+), 6 deletions(-)
-
-diff --git a/docs/grub.texi b/docs/grub.texi
-index 137b894..65b4bbe 100644
---- a/docs/grub.texi
-+++ b/docs/grub.texi
-@@ -1398,6 +1398,25 @@ for all respectively normal entries.
- The values of these options replace the values of @samp{GRUB_CMDLINE_LINUX}
- and @samp{GRUB_CMDLINE_LINUX_DEFAULT} for Linux and Xen menu entries.
- 
-+@item GRUB_EARLY_INITRD_LINUX_CUSTOM
-+@itemx GRUB_EARLY_INITRD_LINUX_STOCK
-+List of space-separated early initrd images to be loaded from @samp{/boot}.
-+This is for loading things like CPU microcode, firmware, ACPI tables, crypto
-+keys, and so on. These early images will be loaded in the order declared,
-+and all will be loaded before the actual functional initrd image.
-+
-+@samp{GRUB_EARLY_INITRD_LINUX_STOCK} is for your distribution to declare
-+images that are provided by the distribution. It should not be modified
-+without understanding the consequences. They will be loaded first.
-+
-+@samp{GRUB_EARLY_INITRD_LINUX_CUSTOM} is for your custom created images.
-+
-+The default stock images are as follows, though they may be overridden by
-+your distribution:
-+@example
-+intel-uc.img intel-ucode.img amd-uc.img amd-ucode.img early_ucode.cpio microcode.cpio
-+@end example
-+
- @item GRUB_DISABLE_LINUX_UUID
- Normally, @command{grub-mkconfig} will generate menu entries that use
- universally-unique identifiers (UUIDs) to identify the root filesystem to
-diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index f8496d2..35ef583 100644
---- a/util/grub-mkconfig.in
-+++ b/util/grub-mkconfig.in
-@@ -147,6 +147,12 @@ if [ x"$GRUB_FS" = xunknown ]; then
-     GRUB_FS="$(stat -f --printf=%T / || echo unknown)"
- fi
- 
-+# Provide a default set of stock linux early initrd images.
-+# Define here so the list can be modified in the sourced config file.
-+if [ "x${GRUB_EARLY_INITRD_LINUX_STOCK}" = "x" ]; then
-+	GRUB_EARLY_INITRD_LINUX_STOCK="intel-uc.img intel-ucode.img amd-uc.img amd-ucode.img early_ucode.cpio microcode.cpio"
-+fi
-+
- if test -f ${sysconfdir}/default/grub ; then
-   . ${sysconfdir}/default/grub
- fi
-@@ -211,6 +217,8 @@ export GRUB_DEFAULT \
-   GRUB_CMDLINE_NETBSD \
-   GRUB_CMDLINE_NETBSD_DEFAULT \
-   GRUB_CMDLINE_GNUMACH \
-+  GRUB_EARLY_INITRD_LINUX_CUSTOM \
-+  GRUB_EARLY_INITRD_LINUX_STOCK \
-   GRUB_TERMINAL_INPUT \
-   GRUB_TERMINAL_OUTPUT \
-   GRUB_SERIAL_COMMAND \
-diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index de9044c..faedf74 100644
---- a/util/grub.d/10_linux.in
-+++ b/util/grub.d/10_linux.in
-@@ -136,9 +136,13 @@ EOF
-   if test -n "${initrd}" ; then
-     # TRANSLATORS: ramdisk isn't identifier. Should be translated.
-     message="$(gettext_printf "Loading initial ramdisk ...")"
-+    initrd_path=
-+    for i in ${initrd}; do
-+      initrd_path="${initrd_path} ${rel_dirname}/${i}"
-+    done
-     sed "s/^/$submenu_indentation/" << EOF
- 	echo	'$(echo "$message" | grub_quote)'
--	initrd	${rel_dirname}/${initrd}
-+	initrd	$(echo $initrd_path)
- EOF
-   fi
-   sed "s/^/$submenu_indentation/" << EOF
-@@ -188,7 +192,15 @@ while [ "x$list" != "x" ] ; do
-   alt_version=`echo $version | sed -e "s,\.old$,,g"`
-   linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
- 
--  initrd=
-+  initrd_early=
-+  for i in ${GRUB_EARLY_INITRD_LINUX_STOCK} \
-+	   ${GRUB_EARLY_INITRD_LINUX_CUSTOM}; do
-+    if test -e "${dirname}/${i}" ; then
-+      initrd_early="${initrd_early} ${i}"
-+    fi
-+  done
-+
-+  initrd_real=
-   for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
- 	   "initrd-${version}" "initramfs-${version}.img" \
- 	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
-@@ -198,11 +210,22 @@ while [ "x$list" != "x" ] ; do
- 	   "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
- 	   "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
-     if test -e "${dirname}/${i}" ; then
--      initrd="$i"
-+      initrd_real="${i}"
-       break
-     fi
-   done
- 
-+  initrd=
-+  if test -n "${initrd_early}" || test -n "${initrd_real}"; then
-+    initrd="${initrd_early} ${initrd_real}"
-+
-+    initrd_display=
-+    for i in ${initrd}; do
-+      initrd_display="${initrd_display} ${dirname}/${i}"
-+    done
-+    gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&2
-+  fi
-+
-   config=
-   for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
-     if test -e "${i}" ; then
-@@ -216,9 +239,7 @@ while [ "x$list" != "x" ] ; do
-       initramfs=`grep CONFIG_INITRAMFS_SOURCE= "${config}" | cut -f2 -d= | tr -d \"`
-   fi
- 
--  if test -n "${initrd}" ; then
--    gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&2
--  elif test -z "${initramfs}" ; then
-+  if test -z "${initramfs}" && test -z "${initrd_real}" ; then
-     # "UUID=" and "ZFS=" magic is parsed by initrd or initramfs.  Since there's
-     # no initrd or builtin initramfs, it can't work here.
-     linux_root_device_thisversion=${GRUB_DEVICE}
--- 
-cgit v1.0-41-gc330
-
diff --git a/sys-boot/grub/files/2.02-xfs-sparse-inodes.patch b/sys-boot/grub/files/2.02-xfs-sparse-inodes.patch
deleted file mode 100644
index 6c6a750b42f0..000000000000
--- a/sys-boot/grub/files/2.02-xfs-sparse-inodes.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From cda0a857dd7a27cd5d621747464bfe71e8727fff Mon Sep 17 00:00:00 2001
-From: Daniel Kiper <daniel.kiper@oracle.com>
-Date: Tue, 29 May 2018 16:16:02 +0200
-Subject: xfs: Accept filesystem with sparse inodes
-
-The sparse inode metadata format became a mkfs.xfs default in
-xfsprogs-4.16.0, and such filesystems are now rejected by grub as
-containing an incompatible feature.
-
-In essence, this feature allows xfs to allocate inodes into fragmented
-freespace.  (Without this feature, if xfs could not allocate contiguous
-space for 64 new inodes, inode creation would fail.)
-
-In practice, the disk format change is restricted to the inode btree,
-which as far as I can tell is not used by grub.  If all you're doing
-today is parsing a directory, reading an inode number, and converting
-that inode number to a disk location, then ignoring this feature
-should be fine, so I've added it to XFS_SB_FEAT_INCOMPAT_SUPPORTED
-
-I did some brief testing of this patch by hacking up the regression
-tests to completely fragment freespace on the test xfs filesystem, and
-then write a large-ish number of inodes to consume any existing
-contiguous 64-inode chunk.  This way any files the grub tests add and
-traverse would be in such a fragmented inode allocation.  Tests passed,
-but I'm not sure how to cleanly integrate that into the test harness.
-
-Signed-off-by: Eric Sandeen <sandeen@redhat.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-Tested-by: Chris Murphy <lists@colorremedies.com>
----
- grub-core/fs/xfs.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c
-index c6031bd..3b00c74 100644
---- a/grub-core/fs/xfs.c
-+++ b/grub-core/fs/xfs.c
-@@ -79,9 +79,18 @@ GRUB_MOD_LICENSE ("GPLv3+");
- #define XFS_SB_FEAT_INCOMPAT_SPINODES   (1 << 1)        /* sparse inode chunks */
- #define XFS_SB_FEAT_INCOMPAT_META_UUID  (1 << 2)        /* metadata UUID */
- 
--/* We do not currently verify metadata UUID so it is safe to read such filesystem */
-+/*
-+ * Directory entries with ftype are explicitly handled by GRUB code.
-+ *
-+ * We do not currently read the inode btrees, so it is safe to read filesystems
-+ * with the XFS_SB_FEAT_INCOMPAT_SPINODES feature.
-+ *
-+ * We do not currently verify metadata UUID, so it is safe to read filesystems
-+ * with the XFS_SB_FEAT_INCOMPAT_META_UUID feature.
-+ */
- #define XFS_SB_FEAT_INCOMPAT_SUPPORTED \
- 	(XFS_SB_FEAT_INCOMPAT_FTYPE | \
-+	 XFS_SB_FEAT_INCOMPAT_SPINODES | \
- 	 XFS_SB_FEAT_INCOMPAT_META_UUID)
- 
- struct grub_xfs_sblock
--- 
-cgit v1.0-41-gc330
-
diff --git a/sys-boot/grub/grub-2.02-r4.ebuild b/sys-boot/grub/grub-2.02-r4.ebuild
deleted file mode 100644
index 7cbac60a898c..000000000000
--- a/sys-boot/grub/grub-2.02-r4.ebuild
+++ /dev/null
@@ -1,311 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-GRUB_AUTOGEN=1
-GRUB_AUTORECONF=1
-
-if [[ -n ${GRUB_AUTOGEN} ]]; then
-	PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-	inherit python-any-r1
-fi
-
-if [[ -n ${GRUB_AUTORECONF} ]]; then
-	WANT_LIBTOOL=none
-	inherit autotools
-fi
-
-inherit bash-completion-r1 eutils flag-o-matic multibuild pax-utils toolchain-funcs
-
-if [[ ${PV} != 9999 ]]; then
-	if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
-		# The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
-		MY_P=${P/_/'~'}
-		SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
-		S=${WORKDIR}/${MY_P}
-	else
-		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-		S=${WORKDIR}/${P%_*}
-	fi
-	KEYWORDS="amd64 ~arm ~arm64 ia64 ppc ppc64 x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
-		http://git.savannah.gnu.org/r/grub.git"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/gfxpayload.patch
-	"${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
-	"${FILESDIR}"/2.02-multiple-early-initrd.patch
-	"${FILESDIR}"/2.02-freetype-capitalise-variables.patch
-	"${FILESDIR}"/2.02-freetype-pkg-config.patch
-	"${FILESDIR}"/2.02-xfs-sparse-inodes.patch
-	"${FILESDIR}"/2.02-X86_64_PLT32.patch
-	"${FILESDIR}"/2.02-gcc8.patch
-	"${FILESDIR}"/2.02-efi-tsc-pmtimer.patch
-)
-
-DEJAVU=dejavu-sans-ttf-2.37
-UNIFONT=unifont-9.0.06
-SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
-	themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
-
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="https://www.gnu.org/software/grub/"
-
-# Includes licenses for dejavu and unifont
-LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )"
-SLOT="2/${PVR}"
-IUSE="device-mapper doc efiemu +fonts mount multislot nls static sdl test +themes truetype libzfs"
-
-GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 )
-IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
-
-REQUIRED_USE="
-	grub_platforms_coreboot? ( fonts )
-	grub_platforms_qemu? ( fonts )
-	grub_platforms_ieee1275? ( fonts )
-	grub_platforms_loongson? ( fonts )
-"
-
-# os-prober: Used on runtime to detect other OSes
-# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
-COMMON_DEPEND="
-	app-arch/xz-utils
-	>=sys-libs/ncurses-5.2-r5:0=
-	sdl? ( media-libs/libsdl )
-	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
-	libzfs? ( sys-fs/zfs )
-	mount? ( sys-fs/fuse:0 )
-	truetype? ( media-libs/freetype:2= )
-	ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
-	ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	app-misc/pax-utils
-	sys-devel/flex
-	sys-devel/bison
-	sys-apps/help2man
-	sys-apps/texinfo
-	fonts? (
-		media-libs/freetype:2
-		virtual/pkgconfig
-	)
-	grub_platforms_xen? ( app-emulation/xen-tools:= )
-	grub_platforms_xen-32? ( app-emulation/xen-tools:= )
-	static? (
-		app-arch/xz-utils[static-libs(+)]
-		truetype? (
-			app-arch/bzip2[static-libs(+)]
-			media-libs/freetype[static-libs(+)]
-			sys-libs/zlib[static-libs(+)]
-			virtual/pkgconfig
-		)
-	)
-	test? (
-		app-admin/genromfs
-		app-arch/cpio
-		app-arch/lzop
-		app-emulation/qemu
-		dev-libs/libisoburn
-		sys-apps/miscfiles
-		sys-block/parted
-		sys-fs/squashfs-tools
-	)
-	themes? (
-		app-arch/unzip
-		media-libs/freetype:2
-		virtual/pkgconfig
-	)
-	truetype? ( virtual/pkgconfig )
-"
-RDEPEND="${COMMON_DEPEND}
-	kernel_linux? (
-		grub_platforms_efi-32? ( sys-boot/efibootmgr )
-		grub_platforms_efi-64? ( sys-boot/efibootmgr )
-	)
-	!multislot? ( !sys-boot/grub:0 !sys-boot/grub-static )
-	nls? ( sys-devel/gettext )
-"
-
-RESTRICT="strip !test? ( test )"
-
-QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*"
-QA_WX_LOAD="usr/lib/grub/*"
-QA_MULTILIB_PATHS="usr/lib/grub/.*"
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	fi
-	default
-}
-
-src_prepare() {
-	default
-
-	sed -i -e /autoreconf/d autogen.sh || die
-
-	if use multislot; then
-		# fix texinfo file name, bug 416035
-		sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
-	fi
-
-	# Nothing in Gentoo packages 'american-english' in the exact path
-	# wanted for the test, but all that is needed is a compressible text
-	# file, and we do have 'words' from miscfiles in the same path.
-	sed -i \
-		-e '/CFILESSRC.*=/s,american-english,words,' \
-		tests/util/grub-fs-tester.in \
-		|| die
-
-	if [[ -n ${GRUB_AUTOGEN} ]]; then
-		python_setup
-		bash autogen.sh || die
-	fi
-
-	if [[ -n ${GRUB_AUTORECONF} ]]; then
-		autopoint() { :; }
-		eautoreconf
-	fi
-}
-
-grub_do() {
-	multibuild_foreach_variant run_in_build_dir "$@"
-}
-
-grub_do_once() {
-	multibuild_for_best_variant run_in_build_dir "$@"
-}
-
-grub_configure() {
-	local platform
-
-	case ${MULTIBUILD_VARIANT} in
-		efi*) platform=efi ;;
-		xen*) platform=xen ;;
-		guessed) ;;
-		*) platform=${MULTIBUILD_VARIANT} ;;
-	esac
-
-	case ${MULTIBUILD_VARIANT} in
-		*-32)
-			if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
-				local CTARGET=i386
-			fi ;;
-		*-64)
-			if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
-				local CTARGET=x86_64
-				local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
-				local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
-			fi ;;
-	esac
-
-	local myeconfargs=(
-		--disable-werror
-		--program-prefix=
-		--libdir="${EPREFIX}"/usr/lib
-		$(use_enable device-mapper)
-		$(use_enable mount grub-mount)
-		$(use_enable nls)
-		$(use_enable themes grub-themes)
-		$(use_enable truetype grub-mkfont)
-		$(use_enable libzfs)
-		$(use_enable sdl grub-emu-sdl)
-		${platform:+--with-platform=}${platform}
-
-		# Let configure detect this where supported
-		$(usex efiemu '' '--disable-efiemu')
-	)
-
-	if use multislot; then
-		myeconfargs+=( --program-transform-name="s,grub,grub2," )
-	fi
-
-	# Set up font symlinks
-	ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
-	if use themes; then
-		ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
-	fi
-
-	local ECONF_SOURCE="${S}"
-	econf "${myeconfargs[@]}"
-}
-
-src_configure() {
-	# Bug 508758.
-	replace-flags -O3 -O2
-
-	# We don't want to leak flags onto boot code.
-	export HOST_CCASFLAGS=${CCASFLAGS}
-	export HOST_CFLAGS=${CFLAGS}
-	export HOST_CPPFLAGS=${CPPFLAGS}
-	export HOST_LDFLAGS=${LDFLAGS}
-	unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
-
-	use static && HOST_LDFLAGS+=" -static"
-
-	tc-ld-disable-gold #439082 #466536 #526348
-	export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
-	unset LDFLAGS
-
-	tc-export CC NM OBJCOPY RANLIB STRIP
-	tc-export BUILD_CC # Bug 485592
-
-	MULTIBUILD_VARIANTS=()
-	local p
-	for p in "${GRUB_ALL_PLATFORMS[@]}"; do
-		use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
-	done
-	[[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
-	grub_do grub_configure
-}
-
-src_compile() {
-	# Sandbox bug 404013.
-	use libzfs && addpredict /etc/dfs:/dev/zfs
-
-	grub_do emake
-	use doc && grub_do_once emake -C docs html
-}
-
-src_test() {
-	# The qemu dependency is a bit complex.
-	# You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
-	grub_do emake check
-}
-
-src_install() {
-	grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
-	use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
-
-	einstalldocs
-
-	if use multislot; then
-		mv "${ED%/}"/usr/share/info/grub{,2}.info || die
-	fi
-
-	insinto /etc/default
-	newins "${FILESDIR}"/grub.default-3 grub
-}
-
-pkg_postinst() {
-	elog "For information on how to configure GRUB2 please refer to the guide:"
-	elog "    https://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
-
-	if has_version 'sys-boot/grub:0'; then
-		elog "A migration guide for GRUB Legacy users is available:"
-		elog "    https://wiki.gentoo.org/wiki/GRUB2_Migration"
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "You may consider installing the following optional packages:"
-		optfeature "Detect other operating systems (grub-mkconfig)" sys-boot/os-prober
-		optfeature "Create rescue media (grub-mkrescue)" dev-libs/libisoburn
-		optfeature "Enable RAID device detection" sys-fs/mdadm
-	fi
-}
diff --git a/sys-boot/grub/grub-2.04-r1.ebuild b/sys-boot/grub/grub-2.04-r1.ebuild
index 1076dff50729..bb96453cd6ac 100644
--- a/sys-boot/grub/grub-2.04-r1.ebuild
+++ b/sys-boot/grub/grub-2.04-r1.ebuild
@@ -30,7 +30,7 @@ if [[ ${PV} != 9999 ]]; then
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 		S=${WORKDIR}/${P%_*}
 	fi
-	KEYWORDS="amd64 ~arm ~arm64 ia64 ppc ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
@@ -103,9 +103,6 @@ DEPEND="
 	truetype? ( media-libs/freetype:2= )
 	ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
 	ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
-	grub_platforms_xen? ( app-emulation/xen-tools:= )
-	grub_platforms_xen-32? ( app-emulation/xen-tools:= )
-	grub_platforms_xen-pvh? ( app-emulation/xen-tools:= )
 "
 RDEPEND="${DEPEND}
 	kernel_linux? (
diff --git a/sys-boot/grub/grub-2.05_alpha20200110.ebuild b/sys-boot/grub/grub-2.05_alpha20200310.ebuild
index fa6feb071bb8..d11a7ec3e895 100644
--- a/sys-boot/grub/grub-2.05_alpha20200110.ebuild
+++ b/sys-boot/grub/grub-2.05_alpha20200310.ebuild
@@ -22,7 +22,7 @@ inherit bash-completion-r1 eutils flag-o-matic multibuild pax-utils toolchain-fu
 
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
@@ -94,9 +94,6 @@ DEPEND="
 	truetype? ( media-libs/freetype:2= )
 	ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
 	ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
-	grub_platforms_xen? ( app-emulation/xen-tools:= )
-	grub_platforms_xen-32? ( app-emulation/xen-tools:= )
-	grub_platforms_xen-pvh? ( app-emulation/xen-tools:= )
 "
 RDEPEND="${DEPEND}
 	kernel_linux? (
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 11169247dcc1..6de5a47a2cb1 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -30,7 +30,7 @@ if [[ ${PV} != 9999 ]]; then
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 		S=${WORKDIR}/${P%_*}
 	fi
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
@@ -102,9 +102,6 @@ DEPEND="
 	truetype? ( media-libs/freetype:2= )
 	ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
 	ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
-	grub_platforms_xen? ( app-emulation/xen-tools:= )
-	grub_platforms_xen-32? ( app-emulation/xen-tools:= )
-	grub_platforms_xen-pvh? ( app-emulation/xen-tools:= )
 "
 RDEPEND="${DEPEND}
 	kernel_linux? (
diff --git a/sys-boot/grub/metadata.xml b/sys-boot/grub/metadata.xml
index 68e6175af8d5..3e1c75953e44 100644
--- a/sys-boot/grub/metadata.xml
+++ b/sys-boot/grub/metadata.xml
@@ -23,10 +23,6 @@
 	<flag name="libzfs">
 		Enable support for <pkg>sys-fs/zfs</pkg>
 	</flag>
-	<flag name="multislot">
-		Allow concurrent installation of <pkg>sys-boot/grub</pkg> SLOT 0 and
-		<pkg>sys-boot/grub</pkg> SLOT 2 by renaming all programs.
-	</flag>
 	<flag name="themes">Build and install GRUB themes (starfield)</flag>
 	<flag name="truetype">Build and install grub-mkfont conversion utility</flag>
 </use>
diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest
index 24a4a621fc85..c9d5c60834ca 100644
--- a/sys-boot/plymouth/Manifest
+++ b/sys-boot/plymouth/Manifest
@@ -2,7 +2,7 @@ AUX 0.9.3-glibc-sysmacros.patch 1170 BLAKE2B cf3b927b3a53c419bcee9fc652346fc8e58
 DIST gentoo-logo.png 14501 BLAKE2B e7236c16b96a2d35a6f062b89bc0a6c6fc696a803b7da734ff9ae255fcd65e549d9bc3d510c283e235a770f42edcbdffc1d5cc4c2fcdec9cc931eb0acf504859 SHA512 059a555931b6d2a910bcd887f5ea0cc17c6edf2d2d45c03a1fec1bdda0138ba6bca6bdf90a65c6520a3f8f1b51ecf6f7956098f45ed6c1276f29c835e729163c
 DIST plymouth-0.9.3.tar.xz 1102724 BLAKE2B 7ee17cc785e6197cc9488afe6ceae27541992872813a9f937211930f653207d77c1a331cb093156af5ec9502a04cf1f9e4123c42e07931eaf270fefedcc03700 SHA512 d7b9ba97485cdac7ad6bcaf5a7f1a9c84ece54b8d46d5efce4170294c0aa6571656d7d9957b53aed9c1e51d4d525714f54b7dbb08d8ec0b196a1a4419fd186ed
 DIST plymouth-0.9.4.tar.xz 1103496 BLAKE2B abad2cefb89e9d17b77113396d7203090544759b3dd7f73f67153d9f126db28e5366d36aa11e2335566bf4046bebd50d8d9dd47c75634446fb3a0314cd458925 SHA512 83eb2de7e6d0980e9f7fa4e0b0f20c46a8238051d84bc38dbbb5dfa438e41c1a39846dcd652374256d9f1fe79967b154a3576cd9c433ef816b6c962be2d31e93
-EBUILD plymouth-0.9.3-r1.ebuild 2583 BLAKE2B 4aad06c739e0e5af0cf182d9ec1c75519cdf1a3cb22cb1e94db4e651b1eb5febfc92fc7390a043d04ac5586b688661e987157f074f7ede345e189cd10119bf0e SHA512 0c1ce7cd7bcc14157c2da35830ec4617412d53879403266b7b41b71d2d3cda8d0c5599a28b8192081de6a4dd666eb0c004e905761a81e9c39de8f6695d640747
+EBUILD plymouth-0.9.3-r1.ebuild 2584 BLAKE2B 3cb69af929b16a148d9b96e3554419362469ec4626040568f7cb9be53276969bcf6977d0befd5898c42281e058c975dd193779a22c37f9b28e73aaff13524a80 SHA512 d60fb9c37007bd94a209b9e06ce34447807ea7602da19922005628ce362ec9cafe11974ac68cdeab443fc13cd2f0436fdb444f4ba14882727771b95c66cf1c5e
 EBUILD plymouth-0.9.3-r2.ebuild 2686 BLAKE2B 4991ce88676c102ff2bd5062a5d59184e9bb53b5db22dda2f22c5138627663a2f1c107af549de7abcc935be0d19e2b15a56234a15315f3deb1464c6a1ecda9f5 SHA512 8232ace285011d537cd876df0cd343deb42ba1924811ad808cdb39b1ef3d5e8caaac70c0b91859d909e3306ab3a5e6296b84b13413028e136c6eea8f13da4608
 EBUILD plymouth-0.9.4-r1.ebuild 2772 BLAKE2B d390aaa44d5720b80737ae37c9261397b3e00c721c56dd8a0a7a34d8936fa6b8f6283391155eea7158e67f3ac6de74056e40767f65932bfa7b7c3bc920f06616 SHA512 4d51fb929b95f4622598788705421ba9485b5692b3e134338e718bca1a0bceadceaddc90187e7ad4b53bd443372a1a43773d3d4c07df0c8f2d8cf8a655e3b2f8
 EBUILD plymouth-9999.ebuild 2726 BLAKE2B e0c136d41da63a030b7b7ea035b7753f3f193f7bc6eb9a70fa7518b8950f565618fce58d49c3cf405a64981b6a8f881204597ed6cf2e9404c90da1278845b1b8 SHA512 1e3dee3116536e25a6207ac038c8358405de5b4d5d4708e58ad25fcdf7ac3332ae2de96b140e650196a02ed60a664ed1113d80f6623883b480577fe3f2013bbd
diff --git a/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild b/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild
index 8af0d09ef367..a27ceaae5232 100644
--- a/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild
+++ b/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://cgit.freedesktop.org/plymouth/"
 LICENSE="GPL-2"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86"
 IUSE="debug gdm +gtk +libkms +pango static-libs"
 
 CDEPEND="
diff --git a/sys-boot/shlilo-lantank/Manifest b/sys-boot/shlilo-lantank/Manifest
deleted file mode 100644
index 8b7df0221f50..000000000000
--- a/sys-boot/shlilo-lantank/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX lilo.conf 279 BLAKE2B 6ee9990dd47e34c84295997c5386e8e0d1817d8d5820c3ac3832fb8119e2f2c7a526bd5a0cf252c4d8094c5327d4d9156bd798024a3ee21c30d407fce140a0ee SHA512 317f08697ad868b105bd2df9615527b321453cffeff7834e0f2b64d2c012aff25068662ab4e5f9d0cd6ab155b17301cafad4bf982fc4d7c1e52b6dbdf207ef46
-DIST sh-lilo-sel-20040408.tar.gz 85932 BLAKE2B ed6547022d0459a2cd3fdb234ef6f909fe07501662b1ea8808e0f6c2179a4d408e1de85b7efffb9f53712374818681b9c86c8a6302332bfa94ba00c575e05038 SHA512 81d79d3fda076b8e6ae9112e0f93f5bd544cb4613eff1ec7cd21decd9350489c6b3f5bf4d19a77ca8d60658a08fa3a464dfe5d66617c4d61e929641fc1c5ff16
-EBUILD shlilo-lantank-20040408.ebuild 614 BLAKE2B d665bf20de079a9016bc98898f9189fb33d2c2d846c6370e6bb31920615396d27ca18e303426f3fcec17530e58d91c84591b512c176d97408487b4ab21f26ea8 SHA512 78680c7c99bd7190df118fff663cb9561c6359e5b023b704281c81bf366a730f407d35ad28d28b619f35ea3b5776e515e2b1078bcef87f77cde6328beeae50f1
-MISC metadata.xml 257 BLAKE2B fc90bab7767542f2f05339c836064cc76e1f9575c30ce502c60ca0afc2d0b26dbd4185d0829d046ac6251c4ae0d6c234ee6862d9cf3db67871a030223b786b3d SHA512 7af06754c364d6434a6f11c9cf1516a6cceb3a9f376717de2a48ffa1d953bdb304e1041b63cb80d89236a94ecb5c867b7a66ca3bcf6c69d4f54992514cc9415a
diff --git a/sys-boot/shlilo-lantank/files/lilo.conf b/sys-boot/shlilo-lantank/files/lilo.conf
deleted file mode 100644
index cd5bc81d3835..000000000000
--- a/sys-boot/shlilo-lantank/files/lilo.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# Example lilo.conf
-linear
-boot=/dev/hda
-install=/boot/boot.b
-
-# timeout is in 10's of milliseconds; so 100 is 1 second
-prompt
-timeout=800
-default=default
-
-# default kernel settings
-read-only
-append="mem=64M root=/dev/hda1 console=ttySC1,9600"
-
-image=/boot/zImage
-	label=default
diff --git a/sys-boot/shlilo-lantank/metadata.xml b/sys-boot/shlilo-lantank/metadata.xml
deleted file mode 100644
index 1afd1e74d6d4..000000000000
--- a/sys-boot/shlilo-lantank/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>sh@gentoo.org</email>
-	<name>Gentoo Linux SuperH Development</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-boot/shlilo-lantank/shlilo-lantank-20040408.ebuild b/sys-boot/shlilo-lantank/shlilo-lantank-20040408.ebuild
deleted file mode 100644
index 2226078e9a1a..000000000000
--- a/sys-boot/shlilo-lantank/shlilo-lantank-20040408.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit mount-boot
-
-MY_P="sh-lilo-sel-${PV}"
-DESCRIPTION="bootloader for the SuperH Lantank"
-HOMEPAGE="http://oss.renesas.com/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+ BSD"
-SLOT="0"
-KEYWORDS="-* sh"
-IUSE=""
-RESTRICT="strip"
-
-S=${WORKDIR}/${MY_P}
-
-QA_TEXTRELS_sh="sbin/lilo"
-
-src_compile() { :; }
-
-src_install() {
-	into /
-	dosbin precompiled/lilo
-	insinto /boot
-	doins precompiled/boot.b
-	dosym . /boot/boot
-	insinto /etc
-	doins "${FILESDIR}"/lilo.conf
-	dodoc ChangeLog README TODO
-}
diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index 1963f6499f5b..162be9b57138 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -1,10 +1,12 @@
 AUX syslinux-4.05-nopie.patch 519 BLAKE2B 9ffea4b38c2f6de65883b256d83b270a4f3e3642827e4de9b711d396a1f3d386f9d894802cf22fcc7c64e8f3528ebfcb252e5db47f4bea586fcb4e110eb581ef SHA512 75160574c024bd841cd5e098d81f89c8532153cfd98beb17ca1549e0bdd7106d6494e8436e56560d3e501318fd8109b5f5765d244dcdfcbfc5306d35f9cbb4a8
 AUX syslinux-6.03-sysmacros.patch 950 BLAKE2B 60fb26a4bb462409074802b8cf01afe29e8a7f98cb6907f4f2c0902f4cc7342b6053368ddf17331eac888714e795299c155a4078668a3ed0e35d435a8cb241d3 SHA512 8659e82e5a5402633c807c8a8f99b25fd6e3066fd0838a7e984452e2ebeccc0331481c93101f00a698e573cadcd98966ea216e4f2d9873e6893af817998e2549
+AUX syslinux-6.04_pre1-fcommon.patch 2111 BLAKE2B 6b0d047cc729e7e9c9658ccd6ecd1166eb1ff2be569132f94b0d2bdc71eb9412a05bf23aa287626949a6ea376b2a8d02877d72182d4ea50d54e445df9c38ac81 SHA512 50c58bc44c77a5a68910cd40370f4259afd1392fe8e1b5c6ac25f7e610d994ebc8d17434eb8d3f832a14f098e16b5b597c723f98ce8c12a89118f5b8d2c65529
 AUX syslinux-6.04_pre1-singleloadsegment.patch 4744 BLAKE2B a28ff29b9a4bdd2cb65a6700c96ff99ba1a045a401d50587efe59d703f12aca3e47a14a8e7a569c50f11d367545990d09c35f90362efe49d0c9d489802885879 SHA512 9585edfc8ab0e22d4d7757ccdc435c198c5457466fb4fdefc1829cbbe8951f3406b7b51eea56044cc297d29e45772e2154e5746e6d9b92310f17c880c950ff8a
 DIST syslinux-5.10.tar.xz 5315660 BLAKE2B 19d6861bb6220fe57e12d8d6118d37b197c3c771e4d2e7a51ce7db39219e3c837e6d1543d7a3927820f3a34da34ce849f9badbaf9cd83cb5ee24fd5ed7b705f2 SHA512 56422e14b4aa53ca1a5811da0582dbbb349aa52b9e78868bbedc24c67ef2420c4d0ac63fd68c7f0adc2c22606196276265d503b5b6f9d3d796d9ce42845bbdb5
 DIST syslinux-6.03.tar.xz 6855224 BLAKE2B 9caccf8bed4e3c3e87393c9dc8f3b3d267c14469bbf8135a648ea41d8a43a4aedbf2b007c6b9a6853de8866152f5bc33e5ea85fca1db86c5f2fac88d97189b0f SHA512 dd2b2916962b9e93bc1e714182e3ca2a727a229b8afabe913050bcfdd43ee2af51ee3acf79121d8c20caf434583efaa7f3196871e0e07c04d82191323a50fe31
 DIST syslinux-6.04-pre1.tar.xz 5283272 BLAKE2B 800e5977ed13b26a1756c33d8625e850631b642e26a86e3328196ddd998596693c3a26db0ada4c0ba78a4ba692a1cc01886b6eb693d877ddafcfb325ecdeb639 SHA512 7927dd39be8e2dcf4138a6fea33def67d19d938379d694f15b48fdd2f5924c028b7a9e7bd71d0c7c6630c203e9e2a54296628e530632ad5e6f55b1ebefe8fc98
 EBUILD syslinux-5.10.ebuild 2230 BLAKE2B 995ee83ea6a912f0af1ca97e4a960e569c385118e9f234f4f6421d7ab7f409e49c3c4b5fb6bafd6264bfe39c1318f49b142bba809a0dba378ebcef395c2a0809 SHA512 7d61dd6de70b5cd11754b81777bfcdb63c116ad5c772aa9e907bcf6bfe8d918afae8797dae362c888d4d16845fbe1d2077ac7c374f8bbe1f7c5069d2d570c0bb
 EBUILD syslinux-6.03.ebuild 3421 BLAKE2B 253a2b38846a07d3bdda05536c2d570e393b9182352e4e936f3213346fb8b0ee5573e5df2bb67bbc692dc5c52569ad3a667a19c14eb58ca7ec1e79ee46e67298 SHA512 041fa544ef45df4732597993c19448728ae6272a87306ff40cdb72e2dc3de5a7b54feb88f27a2660a2aa6932cb47682b42996bab618586bfdf608a959a1d1330
+EBUILD syslinux-6.04_pre1-r1.ebuild 3157 BLAKE2B ab29ee00207cfe57bc11e7ed28a953f9a3fb1c8d38de1c0590b744d9b72b8faf4b1fcaab0a3f5b8e88cc23410ec02533b47da4d74a70a6df78c2a48e75fc959d SHA512 3a3bee229af67282a2967dbbc64238bc3c747d31e091843b0f67a878a5145aebeb3dbf99c7600496112d2af6c1fa2b8180f037b2facc6be0dedf65296e89000b
 EBUILD syslinux-6.04_pre1.ebuild 3489 BLAKE2B 78481eb4d56f6670a9e3dd6fb8a1b4abfc8cdf67ab3d549c16e88f6cc8a908c4ace33d04e857ea40b7990a1e06d9fa04573077a876634fa77d3f00bd35b3fa12 SHA512 3d628c258a6671c4977d98e575d05d88101451f2d962433eec373777921773658460fba7e7f992d1857ae5a28f64faa02b6bed8bdd5bac8a65311b8e009aaffe
 MISC metadata.xml 411 BLAKE2B d3b00622fd68d6ae1b4ba7aa30c33c790b2fbdc688637d3c573cb4496f3952a62f8ae20384badda70b9cbd4ed036e0884becd212d63ec015decc511f1ee7970e SHA512 e8256115d61eeef51be14bea35df6765b356471d145ad8e43e75e6301a4557d526af5fd99b8957fb02ecd9c4a7a0bd0d3db4790abef935887bff8a102709c518
diff --git a/sys-boot/syslinux/files/syslinux-6.04_pre1-fcommon.patch b/sys-boot/syslinux/files/syslinux-6.04_pre1-fcommon.patch
new file mode 100644
index 000000000000..7d061db26563
--- /dev/null
+++ b/sys-boot/syslinux/files/syslinux-6.04_pre1-fcommon.patch
@@ -0,0 +1,54 @@
+https://bugs.gentoo.org/705730
+
+gcc-10 enabled f-no-common by default. Broke syslinux linking.
+--- a/mk/com32.mk
++++ b/mk/com32.mk
+@@ -47,6 +47,7 @@ GCCOPT += $(call gcc_ok,-falign-functions=0,-malign-functions=0)
+ GCCOPT += $(call gcc_ok,-falign-jumps=0,-malign-jumps=0)
+ GCCOPT += $(call gcc_ok,-falign-labels=0,-malign-labels=0)
+ GCCOPT += $(call gcc_ok,-falign-loops=0,-malign-loops=0)
++GCCOPT += $(call gcc_ok,-fcommon)
+ 
+ ifeq ($(FWCLASS),EFI)
+ GCCOPT += -mno-red-zone
+--- a/mk/elf.mk
++++ b/mk/elf.mk
+@@ -42,6 +42,7 @@ GCCOPT += $(call gcc_ok,-falign-functions=0,-malign-functions=0)
+ GCCOPT += $(call gcc_ok,-falign-jumps=0,-malign-jumps=0)
+ GCCOPT += $(call gcc_ok,-falign-labels=0,-malign-labels=0)
+ GCCOPT += $(call gcc_ok,-falign-loops=0,-malign-loops=0)
++GCCOPT += $(call gcc_ok,-fcommon)
+ 
+ com32 = $(topdir)/com32
+ core = $(topdir)/core
+--- a/mk/embedded.mk
++++ b/mk/embedded.mk
+@@ -51,6 +51,7 @@ GCCOPT    += $(call gcc_ok,-falign-jumps=0,-malign-jumps=0)
+ GCCOPT    += $(call gcc_ok,-falign-labels=0,-malign-labels=0)
+ GCCOPT    += $(call gcc_ok,-falign-loops=0,-malign-loops=0)
+ GCCOPT    += $(call gcc_ok,-fvisibility=hidden)
++GCCOPT    += $(call gcc_ok,-fcommon)
+ 
+ LIBGCC    := $(shell $(CC) $(GCCOPT) --print-libgcc)
+ 
+--- a/mk/lib.mk
++++ b/mk/lib.mk
+@@ -28,6 +28,7 @@ GCCOPT += $(call gcc_ok,-falign-functions=0,-malign-functions=0)
+ GCCOPT += $(call gcc_ok,-falign-jumps=0,-malign-jumps=0)
+ GCCOPT += $(call gcc_ok,-falign-labels=0,-malign-labels=0)
+ GCCOPT += $(call gcc_ok,-falign-loops=0,-malign-loops=0)
++GCCOPT += $(call gcc_ok,-fcommon)
+ 
+ INCLUDE	= -I$(SRC)
+ STRIP	= strip --strip-all -R .comment -R .note
+--- a/mk/efi.mk
++++ b/mk/efi.mk
+@@ -7,7 +7,7 @@ core = $(topdir)/core
+ # Set up architecture specifics; for cross compilation, set ARCH as apt
+ # gnuefi sets up architecture specifics in ia32 or x86_64 sub directories
+ # set up the LIBDIR and EFIINC for building for the appropriate architecture
+-GCCOPT := $(call gcc_ok,-fno-stack-protector,)
++GCCOPT := $(call gcc_ok,-fno-stack-protector,) $(call gcc_ok,-fcommon)
+ EFIINC = $(objdir)/include/efi
+ LIBDIR  = $(objdir)/lib
+ 
diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r1.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r1.ebuild
new file mode 100644
index 000000000000..194db71f6e57
--- /dev/null
+++ b/sys-boot/syslinux/syslinux-6.04_pre1-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
+HOMEPAGE="https://www.syslinux.org/"
+# Final releases in 6.xx/$PV.tar.* (literal "xx")
+# Testing releases in Testing/$PV/$PV.tar.*
+SRC_URI_DIR=${PV:0:1}.xx
+SRC_URI_TESTING=Testing/${PV:0:4}
+[[ ${PV/_alpha} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
+[[ ${PV/_beta} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
+[[ ${PV/_pre} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
+[[ ${PV/_rc} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
+SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/${SRC_URI_DIR}/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="custom-cflags"
+
+RDEPEND="sys-fs/mtools
+	dev-perl/Crypt-PasswdMD5
+	dev-perl/Digest-SHA1"
+DEPEND="${RDEPEND}
+	dev-lang/nasm
+	>=sys-boot/gnu-efi-3.0u
+	virtual/os-headers"
+
+S=${WORKDIR}/${P/_/-}
+
+# This ebuild is a departure from the old way of rebuilding everything in syslinux
+# This departure is necessary since hpa doesn't support the rebuilding of anything other
+# than the installers.
+
+# These are executables which come precompiled and are run by the boot loader
+QA_PREBUILT="usr/share/${PN}/*.c32"
+
+# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.03-sysmacros.patch #579928
+	"${FILESDIR}"/${P}-singleloadsegment.patch #662678
+	"${FILESDIR}"/${P}-fcommon.patch #705730
+)
+
+src_prepare() {
+	default
+
+	rm -f gethostip #bug 137081
+
+	# Don't prestrip or override user LDFLAGS, bug #305783
+	local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \
+		sample/Makefile utils/Makefile"
+	sed -i ${SYSLINUX_MAKEFILES} -e '/^LDFLAGS/d' || die "sed failed"
+
+	if use custom-cflags; then
+		sed -i ${SYSLINUX_MAKEFILES} \
+			-e 's|-g -Os||g' \
+			-e 's|-Os||g' \
+			-e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \
+			|| die "sed custom-cflags failed"
+	else
+		QA_FLAGS_IGNORED="
+			/sbin/extlinux
+			/usr/bin/memdiskfind
+			/usr/bin/gethostip
+			/usr/bin/isohybrid
+			/usr/bin/syslinux
+			"
+	fi
+	case ${ARCH} in
+		amd64)	loaderarch="efi64" ;;
+		x86)	loaderarch="efi32" ;;
+		*)	ewarn "Unsupported architecture, building installers only." ;;
+	esac
+
+	# building with ld.gold causes problems, bug #563364
+	if tc-ld-is-gold; then
+		ewarn "Building syslinux with the gold linker may cause problems, see bug #563364"
+		if [[ -z "${I_KNOW_WHAT_I_AM_DOING}" ]]; then
+			tc-ld-disable-gold
+			ewarn "set I_KNOW_WHAT_I_AM_DOING=1 to override this."
+		else
+			ewarn "Continuing anyway as requested."
+		fi
+	fi
+}
+
+src_compile() {
+	# build system abuses the LDFLAGS variable to pass arguments to ld
+	unset LDFLAGS
+	if [[ ! -z ${loaderarch} ]]; then
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" ${loaderarch}
+	fi
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" ${loaderarch} installer
+}
+
+src_install() {
+	# parallel install fails sometimes
+	einfo "loaderarch=${loaderarch}"
+	emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)" INSTALLROOT="${D}" MANDIR=/usr/share/man bios ${loaderarch} install
+	dodoc README NEWS doc/*.txt
+}
diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index b286775a86e1..b6e9a0e9ad42 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1,6 +1,6 @@
 AUX 237-libshared-static.patch 659 BLAKE2B f97c3c4e9d6ef3da674bc74fce8326d18fe1ebd4008e0929f1362ef0c2e854a67c8786c0b4ce9b29aee2b4409c54c668429f61e3c4ab85844d72c3d060b41925 SHA512 79cd97a176c91c76b512bce5f30605d673fb5480921cc76e221da9e78a8f7caec802efb481f8811c7aefba2901d007e340ba032a07a53e907f77e4bbd52169a7
-DIST systemd-241.tar.gz 7640538 BLAKE2B 69d7196fee0d0ad06ea8d7c78b0299cc17517ecce3ca4c0b1181a3fbb13bc2627629156785051e2ff427dcc21414f7a078724c6409ebaa431618e4799ebcd50a SHA512 a7757574590e8aa37e1291ea0b2c5eb03a8d8062fe9462fa5b0bf50830c933e2b301d106c70d904f94afc0aa8e43a8acfd11926dfa25b1b89174580e491e545e
 DIST systemd-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
-EBUILD systemd-boot-241.ebuild 2352 BLAKE2B bcc51f97daccf09f929ff56947733721a70c87e5a8842a2c3d3e2fba23dc28a9cd46e16f4b39a5b56ae4707dbfcf61ea346d7d313024378fd8c97361d574da99 SHA512 26949284b57ba3ec387984293e6646f9a9eab168659c33c1c24e16e3ffd00603e4bea39f7d8c74fc1cc4da37cf75ce9f27ff1a036ae8612b130a94182ae0017d
+DIST systemd-245.tar.gz 8993479 BLAKE2B be0b1fca5ba8585978f570868bc9135c1fee78ea64dcdf8b1a3419e856a83da90104ed2f86e5f3e5b0b6f29d4b34f603bfe1e4cbc61ccf71bedce547db62ff35 SHA512 1b80d0e02472dfc4197f11dab4f56cf90e8a6e105ce19f837cb11335b6d8577ed49031dad94cdb41aa9bdc06ec8eec62c8e9246272b83935e7bb9dcd3cd8c012
 EBUILD systemd-boot-243.ebuild 2352 BLAKE2B bcc51f97daccf09f929ff56947733721a70c87e5a8842a2c3d3e2fba23dc28a9cd46e16f4b39a5b56ae4707dbfcf61ea346d7d313024378fd8c97361d574da99 SHA512 26949284b57ba3ec387984293e6646f9a9eab168659c33c1c24e16e3ffd00603e4bea39f7d8c74fc1cc4da37cf75ce9f27ff1a036ae8612b130a94182ae0017d
+EBUILD systemd-boot-245.ebuild 2352 BLAKE2B 293a1c6c9a5998eefc5bbef238b1a527113c277598c1e40613c06803a8b0a99b58f7eee0813d9cab219e05a064737aa9fae88a73a29298dc2489c1f099e8d5a6 SHA512 0b18b7845d755ada8142956cc23651099dac2aaf92ec105794d4f84d16bcdfb957fc944b889f1926f2b89157fab21f2e1ed3b329d8232238615ec58d2f372e35
 MISC metadata.xml 326 BLAKE2B f33138d9048d3a13295360f070b8d610a22909f99ee0127d3138bc1e0a066fc4590f580c4cd8fd539d5c86efc005b4662eb0dddeb085469719d0aa951c36af9a SHA512 7d33f5273a066af06b319d04f9a01c2d8f14a6de2102cf77918d7abdf6846fd0b271f5c5adb503354f93402eb341af280853f20dbb673264196c552aa24eb6fe
diff --git a/sys-boot/systemd-boot/systemd-boot-241.ebuild b/sys-boot/systemd-boot/systemd-boot-245.ebuild
index 99dbbaa4668a..df34ee3df7f0 100644
--- a/sys-boot/systemd-boot/systemd-boot-241.ebuild
+++ b/sys-boot/systemd-boot/systemd-boot-245.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2019 Gentoo Authors
+# Copyright 2016-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/sys-boot/woeusb/Manifest b/sys-boot/woeusb/Manifest
index d92d1591a26d..a0c48fbbbafd 100644
--- a/sys-boot/woeusb/Manifest
+++ b/sys-boot/woeusb/Manifest
@@ -1,5 +1,3 @@
-DIST woeusb-3.3.0.tar.gz 386251 BLAKE2B 9767fc3ab3ae438ff126c05a197cb41550704b93f3b508ad88b7a39c74777fdd863794970ebc839f79f8b2f1da9f6041bb355783ec1040e31814fead8185439c SHA512 8cac015df2309e4978f38adae9b9da04d896301f8d9d971d3d21801b24c3287d7d405bc4b2b1e0ff285497b5777462eb8cd6ce7dce079daf49b4d5d313a449a3
 DIST woeusb-3.3.1.tar.gz 386399 BLAKE2B 1423ecca39018c674b0eea36de732f54cfcdd14b8cc465e6d3c0639192cbd8355436b7a39ba453b19fa6f1c5b1f6938ef12f49710bc2a4af0f2eaed967e03ce7 SHA512 e3460efabaee199eb5ffc73ca99fe2d9141ed3a5f72acd2f8910b093b2b3a93928ee4eeb27d634293448f036101d8bf24aef65dc338c80e6e3e1738004594d52
-EBUILD woeusb-3.3.0.ebuild 1036 BLAKE2B 4da72a0ecf963952b371e4b7382e1a84043d13f963e58918b76b3e0febcade04f550d4cd74f87a40df8443607753ecdf0d5510e7499d697175eaa426eb5337a9 SHA512 1e4739778602432b4362626a6c794f2d27ad61f03d6994d4e7ca87beb5efac097f643b3cbdccfa18fd7948b5d8949693b88989754011d38fcd30d355db9f38e2
-EBUILD woeusb-3.3.1.ebuild 1049 BLAKE2B 9b3a60f862fdc2f4ba2036a299516ae595f6ce022597b1a5822eb0d123c59219821de41be42e8868a5f784c66f838a19653ea2e228efead445681ca0e811fc15 SHA512 73f5c8fbc3c3c9c5e93bfc381c57f349a91133cbdde98f581e55445de38d930185783c30d5dfff1abbd7b2d75146c1491aa9aff4e3de1c2e0a5283a1f09cfae4
+EBUILD woeusb-3.3.1.ebuild 1047 BLAKE2B 53560251d0e8cc1a50bd04fc86e4022c7056ec411f7783255198f079d36d4e1c90c3e6980751decaa81ba85327aa22e72834ec0c938770134e811ca7e2e1741a SHA512 a8f12e189cd110e7d8e5f7fb9da13b53b2478f29d07e9aca11cfb5f142fc6ed792285a1b4a73dad47e2197ea265c5983d7ed3da56e96ff11e026a376d63bd037
 MISC metadata.xml 280 BLAKE2B 6e0485a0da47b477f5276aa17735ff1e9b269dbac220b12c615a80a2ad5a7a6f88aa5bcc9bd715355b5687ba50d78bb0cc45d1ef0ba82c52111691b895cffc8e SHA512 af2aa2fda44a73779e31b805313371a2cb6b9ab2846289a73083074fbff99ea1e7da2fefeaccf13b5f11c4c55b6ccb38390f21eab3f4ac1a61e00914ae38fff9
diff --git a/sys-boot/woeusb/woeusb-3.3.0.ebuild b/sys-boot/woeusb/woeusb-3.3.0.ebuild
deleted file mode 100644
index 573d9db62c74..000000000000
--- a/sys-boot/woeusb/woeusb-3.3.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools wxwidgets
-
-DESCRIPTION="Creates windows installer on usb media from an iso image"
-HOMEPAGE="https://github.com/slacka/WoeUSB"
-SRC_URI="https://github.com/slacka/WoeUSB/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="minimal"
-
-RDEPEND="
-	sys-apps/util-linux
-	sys-block/parted
-	sys-fs/dosfstools
-	sys-fs/ntfs3g
-	sys-boot/grub:2[grub_platforms_pc]
-	!minimal? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/WoeUSB-${PV}"
-
-src_prepare() {
-	default
-	find . -type f -print0 | xargs -0 sed -i "s/@@WOEUSB_VERSION@@/${PV}/" || die
-	if ! use minimal; then
-		setup-wxwidgets
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	! use minimal && default
-}
-
-src_compile() {
-	! use minimal && default
-}
-
-src_test() {
-	! use minimal && default
-}
-
-src_install() {
-	if use minimal; then
-		dosbin src/woeusb
-		einstalldocs
-	else
-		default
-	fi
-}
diff --git a/sys-boot/woeusb/woeusb-3.3.1.ebuild b/sys-boot/woeusb/woeusb-3.3.1.ebuild
index 2828715f8b07..a07611f43779 100644
--- a/sys-boot/woeusb/woeusb-3.3.1.ebuild
+++ b/sys-boot/woeusb/woeusb-3.3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/slacka/WoeUSB/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="minimal"
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
commit	623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree	993eb27c93ec7a2d2d19550300d888fc1fed9e69 /sys-boot
parent	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)