gentoo resync : 25.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
commit: d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree: 0625f358789b5e015e49db139cc1dbc9be00428f /sys-boot
parent: 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
47 files changed, 298 insertions, 1298 deletions
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index d0f4c4dd2c3e..8e1570ebdfa9 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/arcload/Manifest b/sys-boot/arcload/Manifest
index 6c7512b7e84c..fb6f317f363a 100644
--- a/sys-boot/arcload/Manifest
+++ b/sys-boot/arcload/Manifest
@@ -1,6 +1,5 @@
 AUX arcload.8 2068 BLAKE2B 3a0f5cb2ad182a37f07ac42fbb0b5ae8d9fd830f68dfe1a27eef5f7f1a4e6d9a00703dfedbde3979bf2a90dfb73085e16bad7c7b4778533772717dbca972f1eb SHA512 1b62e8116174d6909e947d88ef1a0ad0214b988c48f579eb9310984ad4e73b7c686e644be2b09dbab7dc2053fc36b1d80d272765c168dd8a662a6420e5ffcd75
 DIST arcload-0.5.tar.bz2 47690 BLAKE2B c58318f2f1eb71c4ad36c50e2f7e1f3fc2bf12a459336cf2aa27984700f10d135eea97e2e853b37de3e1c8d80b267d3232a3c24439473844acc9bce78b9e1e7f SHA512 b4f7186a6e75baa0cde06451a8011769f200d4cc353495dbfeb9c9ffe3ac09b8bbba357e83441e1fe2344c651068fafda7881864d8bf09f221ddae8170cc7b2e
 DIST arcload-0.50-patches-v1.tar.xz 10320 BLAKE2B 854d82ae850f31ae8585b3c37416380457526de236ce70cc5f7280ecde46e1d8b33bb3f57cf551e7862a17618d71b60073d3df65a7aa97bf6bac07bef639ded9 SHA512 7687b08bc70a96f8db9a620976b466ff4bb70c8ed77b0c241d060feb8dcab6019d753ac3b182a74139331c9d33f27e090897a0c7c41c1663e16575fef6e21bdf
-EBUILD arcload-0.50-r1.ebuild 2777 BLAKE2B 8649b6d0c910427d513cc304d2f05108fa1a8601b8ba7352de666d2d073603c59d73345d23ba883ce933d23547e67ce400f1de837f6a15c1b4146f7e820933ed SHA512 4bdd158dfcbdabfbbc89a94b520ace0599b25d69b96ec5026ee2d21876d385cbbeb3d9b31e56d06a4629acb0c6635d7ca1e7532a185ef482ed8d3aeb848bc05a
-EBUILD arcload-0.50-r3.ebuild 4300 BLAKE2B 719121b6943828c13c4456788fe8e2a9bbc88d7a4f334945c9b6a4724e2adc66d1765ba86209b265c3e50feaa4ec2e5f34df0f25372f79cdc343ceb73313b922 SHA512 e7df8a5eeac49354e73c513aba5a1797df65b9f6f385a14d962f80d367c86f11ffa833eb079c0e8e089b00117b9f1836be8a78196b1bf012c71af2665be42651
+EBUILD arcload-0.50-r3.ebuild 3734 BLAKE2B bebf078bd8e0d624a57cfaddd9dad9fb5e4e39c24056a445630b182638ba8d8217777b199886ebd4be2a3e1800a29d7cdd57c48c76d10afb32801c7505486432 SHA512 9d06a163c51fb4473c7a95b8e9fe9540df9037dd26be453250dd6e834e609706a556765a8b671ddf7686e8b86c1db0efb138e9d74b9a5efa7d22e33ffbcb73d9
 MISC metadata.xml 248 BLAKE2B 2b62c181def237d553cd416c54ba8d59cb958da9c3fd8a46eee570d65f87a7a07afa520142d0a0f5f14a9d2f5da23d9207a907149663697517b1f6ab631a0677 SHA512 f79212ef45535225d23961b9b5293e8c161da77801a04a4c1dcf13430c8a524e732603d51c0b39f5109b4408a54c1f19626c3e52e5922b39e35f17bf0e5e7432
diff --git a/sys-boot/arcload/arcload-0.50-r1.ebuild b/sys-boot/arcload/arcload-0.50-r1.ebuild
deleted file mode 100644
index 4a25aaf3d135..000000000000
--- a/sys-boot/arcload/arcload-0.50-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs versionator
-
-# Hack until upstream renames from 0.5 to 0.50
-MY_PV="${PV/50/5}"
-
-DESCRIPTION="ARCLoad - SGI Multi-bootloader.  Able to bootload many different SGI Systems"
-HOMEPAGE="https://www.linux-mips.org/wiki/ARCLoad"
-SRC_URI="https://www.linux-mips.org/pub/linux/mips/people/skylark/arcload-${MY_PV}.tar.bz2"
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="-* ~mips"
-IUSE=""
-DEPEND="sys-boot/dvhtool"
-RDEPEND=""
-RESTRICT="strip"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	# For gcc-4.x, quiet down some of the warnings
-	$(version_is_at_least "4.0" "$(gcc-version)") && \
-		epatch "${FILESDIR}"/${P}-shut-gcc4x-up.patch
-
-	# Redefine the targets in the primary Makefile to give us
-	# finer control over building the tools.  This is for properly
-	# cross-compiling arcload
-	epatch "${FILESDIR}"/${P}-makefile-targets.patch
-}
-
-src_compile() {
-	# Build the wreckoff tool first.  It converts a 32bit MIPS ELF
-	# into a relocatable ECOFF image.  We call for BUILD_CC
-	# on the offchance that we're cross-compiling.
-	echo -e ""
-	einfo ">>> Building the 'wreckoff' utility with $(tc-getBUILD_CC) ..."
-	emake CC=$(tc-getBUILD_CC) tools_clean tools
-
-	# 32bit copy (sashARCS for IP22/IP32)
-	echo -e ""
-	einfo ">>> Building 32-bit version (sashARCS) for IP22/IP32 ..."
-	cd "${S}"
-	emake MODE=M32 bootloader_clean
-	emake CC=$(tc-getCC) LD=$(tc-getLD) MODE=M32 bootloader
-	cp "${S}"/arcload.ecoff "${WORKDIR}"/sashARCS
-
-	# 64bit copy (sash64 for IP27/IP28/IP30)
-	echo -e ""
-	einfo ">>> Building 64-bit version (sash64) for IP27/IP28/IP30 ..."
-	emake MODE=M64 bootloader_clean
-	emake CC=$(tc-getCC) LD=$(tc-getLD) MODE=M64 bootloader
-	cp "${S}"/arcload "${WORKDIR}"/sash64
-}
-
-src_install() {
-	dodir /usr/lib/arcload
-	cp "${WORKDIR}"/sashARCS "${D}"/usr/lib/arcload
-	cp "${WORKDIR}"/sash64 "${D}"/usr/lib/arcload
-	cp "${S}"/arc.cf-bootcd "${D}"/usr/lib/arcload/arc-bootcd.cf
-	cp "${S}"/arc.cf-octane "${D}"/usr/lib/arcload/arc-octane.cf
-}
-
-pkg_postinst() {
-	echo -e ""
-	einfo "ARCLoad binaries copied to: /usr/lib/arcload"
-	echo -e ""
-	einfo "Use of ARCLoad is relatively easy:"
-	einfo "\t1) Determine which version you need"
-	einfo "\t\tA) sashARCS for IP22/IP32"
-	einfo "\t\tB) sash64 for IP27/IP28/IP30"
-	einfo "\t2) Copy that to the volume header using 'dvhtool'"
-	einfo "\t3) Edit /usr/lib/arcload/arc-*.cf to fit your specific system"
-	einfo "\t   (See ${HOMEPAGE} for"
-	einfo "\t    an explanation of the format of the config file)"
-	einfo "\t4) Copy the config file to the volume header with 'dvhtool' as 'arc.cf'"
-	einfo "\t5) Copy any kernels to the volume header that you want to be bootable"
-	einfo "\t6) Reboot, and enjoy!"
-	echo -e ""
-}
diff --git a/sys-boot/arcload/arcload-0.50-r3.ebuild b/sys-boot/arcload/arcload-0.50-r3.ebuild
index b35a574efcf1..33e6d147541b 100644
--- a/sys-boot/arcload/arcload-0.50-r3.ebuild
+++ b/sys-boot/arcload/arcload-0.50-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs versionator
+inherit toolchain-funcs
 
 # Hack until upstream renames from 0.5 to 0.50
 MY_PV="${PV/50/5}"
@@ -13,9 +13,11 @@ DESCRIPTION="ARCLoad - SGI Multi-bootloader.  Able to bootload many different SG
 HOMEPAGE="https://www.linux-mips.org/wiki/ARCLoad"
 SRC_URI="https://www.linux-mips.org/pub/linux/mips/people/skylark/${PN}-${MY_PV}.tar.bz2
 	 mirror://gentoo/${P}-patches-v${PATCHREV}.tar.xz"
+
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="-* ~mips"
+
 IUSE="abi_mips_o32"
 DEPEND="sys-boot/dvhtool
 	abi_mips_o32? ( sys-devel/kgcc64 )"
@@ -25,41 +27,21 @@ RESTRICT="strip"
 S="${WORKDIR}/${PN}-${MY_PV}"
 PATCHDIR="${WORKDIR}/${P}-patches"
 
+PATCHES=(
+	"${PATCHDIR}/${P}-shut-gcc4x-up.patch"		# For gcc-4.x, quiet down some of the warnings
+	"${PATCHDIR}/${P}-makefile-targets.patch"	# Tweak Makefile to allow for cross-compiling
+#	"${PATCHDIR}/${P}_deb-elf64-on-m32.patch"	# Load ELF64 images on 32-bit systems - XXX: #543978
+	"${PATCHDIR}/${P}_deb-cmdline-config.patch"	# Pass arcload label name on PROM cmdline
+	"${PATCHDIR}/${P}_deb-config-in-etc.patch"	# Look for arc.cf in /etc and fallback to /
+	"${PATCHDIR}/${P}-local-elf_h.patch"		# Use std sysheaders bits to make compiler happy
+	"${PATCHDIR}/${P}-wreckoff-abiflags-fix.patch"	# Patch wreckoff.c to handle the .MIPS.abiflags section
+	"${PATCHDIR}/${P}-disable-ssp.patch"		# Disable SSP for ELF->ECOFF, as wreckoff can't handle
+	"${PATCHDIR}/${P}-silence-warnings.patch"	# Silence various warnings due to the code being old
+)
+
 src_prepare() {
-	# For gcc-4.x, quiet down some of the warnings
-	epatch "${PATCHDIR}"/${P}-shut-gcc4x-up.patch
-
-	# Redefine the targets in the primary Makefile to give us
-	# finer control over building the tools.  This is for properly
-	# cross-compiling arcload
-	epatch "${PATCHDIR}"/${P}-makefile-targets.patch
-
-	# Patches borrowed from Debian:
-	# - Load ELF64 images on 32-bit systems - XXX: #543978
-	# - Pass an arcload label name directly on the PROM cmdline.
-	# - Look for arc.cf in /etc and fallback to /.
-#	epatch "${PATCHDIR}"/${P}_deb-elf64-on-m32.patch
-	epatch "${PATCHDIR}"/${P}_deb-cmdline-config.patch
-	epatch "${PATCHDIR}"/${P}_deb-config-in-etc.patch
-
-	# Building arcload on different MIPS ABIs can be difficult,
-	# so we include specific bits from standard system headers
-	# to make the compiler happy.  These should rarely, if ever,
-	# change...
-	epatch "${PATCHDIR}"/${P}-local-elf_h.patch
-
-	# Patch wreckoff.c to handle the new .MIPS.abiflags section.
-	epatch "${PATCHDIR}"/${P}-wreckoff-abiflags-fix.patch
-
-	# In order to convert from ELF to ECOFF, we need to disable
-	# SSP, as that adds additional program headers that I don't
-	# know how to handle in wreckoff.c.
-	epatch "${PATCHDIR}"/${P}-disable-ssp.patch
-
-	# The code is old and has a lot of issues.  But it's just a
-	# simple bootloader, so silence the various warnings until
-	# it can be re-written.
-	epatch "${PATCHDIR}"/${P}-silence-warnings.patch
+	default
+	eapply_user
 }
 
 src_compile() {
diff --git a/sys-boot/cromwell/Manifest b/sys-boot/cromwell/Manifest
index 7f20208d7fdb..1ff959c93118 100644
--- a/sys-boot/cromwell/Manifest
+++ b/sys-boot/cromwell/Manifest
@@ -1,5 +1,5 @@
 AUX cromwell-2.40-gcc-4.6.patch 838 BLAKE2B dce74b35340b23a457c2206716f4717c1a5fb20457895d00c453c5beb08d7a1c4ac4cb6d02a2cbec1e3950fa0626cd335e75dd604ffbba7e1b1f61e3783bd62e SHA512 a32e4b4a5d0a6cd30106abc6ba5eb04d6e8520082fa673c739e2a7746b22ad0152d5bfdebc67515252eeccfc116e60516eadd67f34b1643a53b2041bcd16fc76
 DIST cromwell-2.40-r3-cvs-fixes.patch.lzma 7075 BLAKE2B 25a499c49822b7b4f8f6ac0a1c531c3545c4dcc76f776c257cf4112ad5f80b7708a80c2d870bcdd30f4a1322267952fe6081d280ef21b6b169cef0f3c7914fa4 SHA512 b5d7c37024562a8a5ee8b1bf560f852ac43e0a0fbae0d3a8aa55aceab9f56cee5e80bcedad12bb64160ceb33a79fbb86f10cd6d5efeede6a5433d825aa853114
 DIST cromwell-2.40.tar.bz2 943015 BLAKE2B 37978a46ddac6acc6881e37a566c669aba8d576f8c3fe703a3bc03d7f977cc7fd8b877694d47ffca967d4d2109104838bf02ae7511184fe0aaae39502c82e8bd SHA512 ed5833281fbe82dfad0a195f57f127cfcfb1d3fb7ff7179dccf59dea3c3a945d874d0d87c21fc2af641de5a39b9cc8a8703fa17edd43973ef526d368e21ddb37
-EBUILD cromwell-2.40-r3.ebuild 890 BLAKE2B af9a2a6235b9f70ad53022b6ba5431891a47355ff5f6c702034c78612bb8cce91c9fcc09f26b377ee98fcf63432acc8d40a5ab50d13857bf680826c57d660508 SHA512 19f35dce21d0b1032adf0162ee1ef8fdc6d9860e08d75c33c17e981324458ce091e4f9389da7cadf82fc76f13dd8cd9f721a11e263fa679c4899c7f49ff7c6d1
+EBUILD cromwell-2.40-r3.ebuild 887 BLAKE2B 6ee98bf34c0a7f5c301c52f9ff717f718860901c4f50fb12216e6e3edfed2fa11e129a2a52164f7bac79acbd5d52f30db062c808b82c9349ac8bc4aa031cc5ab SHA512 5ec25cf03b2b185d0bf04ac8ede2f040cda38262a23d3dc2637f534d99766b59735e8a8ed530541767e964c3b93bf1535bd59a8e4197d1e4934420417aca5761
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/sys-boot/cromwell/cromwell-2.40-r3.ebuild b/sys-boot/cromwell/cromwell-2.40-r3.ebuild
index 7ce7e1fd24b1..e5c32e94d698 100644
--- a/sys-boot/cromwell/cromwell-2.40-r3.ebuild
+++ b/sys-boot/cromwell/cromwell-2.40-r3.ebuild
@@ -1,29 +1,32 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils mount-boot toolchain-funcs flag-o-matic
+inherit mount-boot toolchain-funcs flag-o-matic
 
 DESCRIPTION="Xbox boot loader"
 HOMEPAGE="http://www.xbox-linux.org/wiki/Cromwell"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
+SRC_URI="
+	mirror://gentoo/${P}.tar.bz2
 	mirror://gentoo/${PF}-cvs-fixes.patch.lzma"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* x86"
-IUSE=""
 RESTRICT="strip"
 
 src_prepare() {
-	epatch "${WORKDIR}"/${PF}-cvs-fixes.patch
-	epatch "${FILESDIR}"/${P}-gcc-4.6.patch #363535
+	eapply "${WORKDIR}"/${PF}-cvs-fixes.patch
+	eapply "${FILESDIR}"/${P}-gcc-4.6.patch #363535
+	eapply_user
+
 	sed -i 's:-Werror:-m32:' Makefile Rules.make || die
 	sed -i '/^EXTRA_CFLAGS/s:$: -m32:' Rules.make boot_rom/Makefile || die
 	sed -i \
 		-e '/^bin.imagebld:/,$s:\<gcc\>:${CC}:' \
 		Makefile || die
+
 	append-flags -m32
 }
 
diff --git a/sys-boot/elilo/Manifest b/sys-boot/elilo/Manifest
index d50459770de2..41454b85097c 100644
--- a/sys-boot/elilo/Manifest
+++ b/sys-boot/elilo/Manifest
@@ -5,6 +5,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-r3.ebuild 2147 BLAKE2B 75c075dedc5088c60c0d2866b0ca5ca9c217b55ccc07adaad42449e2de0f09203d263310f6c306462df8de0f347de0f45906f2add2d6ed76549fbf4965b7955c SHA512 620e673baa83e75f762c131f97051a00df4ca85e80139461eca0785eb64d0dbe14106ed20c6b0c66ed7b87ffa57dd85bbb21cd41d8d00187b92ec5304a510ce6
 EBUILD elilo-3.16-r4.ebuild 2247 BLAKE2B 5a82f2db1261e1040f60999dc344a172941fe97ede55fbb295187205446268cc937ab4ecdafa37202fe9c5b8756d1a48d1acb365b83c2b5a578ae2e04c22b214 SHA512 7e9d4cf9c269b3cafd7d46c304f44fd79d45026ff78ac11f952a06316b4bfb51c131786df1e4a375657ab33568971353ff0e250c1236a501a55725196cb860c6
 MISC metadata.xml 326 BLAKE2B cc7b85b290136d54ab8857ad992bef9eca8cbb607949a50ff090ddfbbab704d87d3e028415845fddc57ea984215dfe0048d1a219dcd386dcf1c1062f657f5db8 SHA512 e40b5a31e5e5954c817f994c6215488a34b32191cfc597e5514bef2fa1ae1e36f0aca1b7e80043e452946051885a04081875edd53d285fc557cbe3277ae3d624
diff --git a/sys-boot/elilo/elilo-3.16-r3.ebuild b/sys-boot/elilo/elilo-3.16-r3.ebuild
deleted file mode 100644
index e9dc2ce50c70..000000000000
--- a/sys-boot/elilo/elilo-3.16-r3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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
-	"${FILESDIR}"/${PN}-3.16-strncpy-clash.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)" \
-		OBJCOPY="$(tc-getOBJCOPY)" \
-		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/grub/Manifest b/sys-boot/grub/Manifest
index 02c98fc35f1b..2db4450f892b 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -6,7 +6,7 @@ DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B c8904f3cd5a49370a7dc10e456684c88aea
 DIST grub-2.04.tar.xz 6393864 BLAKE2B 413ffb9aaeae1ee3128032914ca426a1a5adb3737895dfe563fdde5a7e0386ac2dbc2f7ddfc4e0a67b3ad90494985d6886c20054b038701feb743e67e2eed9d0 SHA512 9c15c42d0cf5d61446b752194e3b628bb04be0fe6ea0240ab62b3d753784712744846e1f7c3651d8e0968d22012e6d713c38c44936d4004ded3ca4d4007babbb
 DIST grub-2.05_alpha20200310.tar.xz 6671372 BLAKE2B 2b9006fe486bb3195f34a3e5d34eaa923e1f295fbb7b815b0adf70ca3000531ff0c250c300f21103cf24144f9e51b96cefc860b7a46c6e31b96d4566db08b027 SHA512 7ddcb7524a4fa60754e3053aae4b033b17ffd740f220d3cbc1e25167ce823c42b1795b4767dabb8920027134769de8cacdafc9a6fe26b4d242590809e3db8725
 DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B 97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14 SHA512 b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
-EBUILD grub-2.04-r1.ebuild 7465 BLAKE2B 4e0c66d178ee231689ada51a93cd934f215b420d5f055cc6e7973bbd537a2d87a07fc6140c52c7418d07514bf31e6ac2c427f4c515e3949eedcc3679b1526899 SHA512 0c3971e6962c8978d7852fdadf6209bd8f79ce4c4270d9593c3b85e47f632f44c8794bfc3e1e363fdd3dab65ccc5ce4953f73cecb81bc78d78c73ff76163574d
-EBUILD grub-2.05_alpha20200310.ebuild 7181 BLAKE2B 554ed0febd238613895f1011180b6a21349ce684c16ac9b4d9cbcbd6c24258b1af3184680569c1c772264cf2e64eabc326e9236647530b65a71d7a29aff2f890 SHA512 15325bcb3f7eca0ac6c672b13667e600e6a4d1d57ed6cc644125bb8df528e0d39056a6c7334498b39afa40fec708a2ef9425ab3f01d4127109062a2dd41a71af
-EBUILD grub-9999.ebuild 7433 BLAKE2B d447a5c1c391ba88c98e5403545309fcc0af143db93dd34f0041f7771ca62092b2bc8e57d5c4db4c4080da4f376d297a9b589949895c02a3a37a68dadc1eaade SHA512 ac1004b25e70046e37d24178040a91787bd40b3ccdf3e328dd448649d7cd17ff77de42166bad0d18f29699bfe5b19dd0f473e9e4ba1f493fb657ce8fd90b4365
+EBUILD grub-2.04-r2.ebuild 7494 BLAKE2B dd37527f6b35ef238b2505118e32d38c239aa4b89586e2d3a729fdefa7fb9032a81530dcd0934caf429ca000f7c07912f08691a28d77c8469ae00dbe6d5a60d8 SHA512 eb36c5ce0f4a5d468d246a866fe12fc52c5b8b6c072257751c0f31572eb47aa08d3cb2797ed431c3d864b25bb3848c313e4f8a4468f95ec18fbffa4591ca6411
+EBUILD grub-2.05_alpha20200310-r1.ebuild 7210 BLAKE2B fdca373bc7d51a766370e82f0c8affcc19e9e7e2714891a35bae888c4863ef2069a0d456c24ec173278331e74c617f20f987dea2077bb8fe1485e60806cafeb8 SHA512 c2a4ec85fba69b159ed06c3144ae27f4c7a1cd67967aee8f32e64891a5d14eb5cd093e7bf67abd3ef8960f434afe4cb9d4db74dc05b1ccbd115be74fcc1d9b9e
+EBUILD grub-9999.ebuild 7462 BLAKE2B dfba1d4575990c02afcb37e812c43fec851d5f7ae5d85eabc237373e181260020f4d0e55257d8ef52b2b5219c83f7e3f30b60987e141fb852c8021cda881c03f SHA512 6e29715385e207ea75ef836e6f34cf70b36dbd9dce42025aae0e68a7f85869d36572238387ce4c2354b77481d44860ed92e193fa3e6e622da196612d9b3ad806
 MISC metadata.xml 1035 BLAKE2B 26f1d398985bf80ab12d21e474ba68e8d1cc17e9305e73a8d44d9c271be207751796b356406f92482c784a1bd4b0e07dce8022bce8271ed69eae7e5e696c3cc5 SHA512 24c775f600ff34b8b55d84841852bbc63bfb799fe1320ba55c5f06fd5199b53d8801eadc09f3afebfb86c533b79737831c3af04c0898cce5ef0ddebe4d12ba0b
diff --git a/sys-boot/grub/grub-2.04-r1.ebuild b/sys-boot/grub/grub-2.04-r2.ebuild
index 01e987158d71..e68f15c3a276 100644
--- a/sys-boot/grub/grub-2.04-r1.ebuild
+++ b/sys-boot/grub/grub-2.04-r2.ebuild
@@ -96,9 +96,11 @@ BDEPEND="
 DEPEND="
 	app-arch/xz-utils
 	>=sys-libs/ncurses-5.2-r5:0=
-	sdl? ( media-libs/libsdl )
+	grub_platforms_emu? (
+		sdl? ( media-libs/libsdl )
+	)
 	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
-	libzfs? ( sys-fs/zfs )
+	libzfs? ( sys-fs/zfs:= )
 	mount? ( sys-fs/fuse:0 )
 	truetype? ( media-libs/freetype:2= )
 	ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
diff --git a/sys-boot/grub/grub-2.05_alpha20200310.ebuild b/sys-boot/grub/grub-2.05_alpha20200310-r1.ebuild
index 10b297a9471a..c10aa3ca0327 100644
--- a/sys-boot/grub/grub-2.05_alpha20200310.ebuild
+++ b/sys-boot/grub/grub-2.05_alpha20200310-r1.ebuild
@@ -87,9 +87,11 @@ BDEPEND="
 DEPEND="
 	app-arch/xz-utils
 	>=sys-libs/ncurses-5.2-r5:0=
-	sdl? ( media-libs/libsdl )
+	grub_platforms_emu? (
+		sdl? ( media-libs/libsdl )
+	)
 	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
-	libzfs? ( sys-fs/zfs )
+	libzfs? ( sys-fs/zfs:= )
 	mount? ( sys-fs/fuse:0 )
 	truetype? ( media-libs/freetype:2= )
 	ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 0a411aea7e66..4a29991e9720 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -95,9 +95,11 @@ BDEPEND="
 DEPEND="
 	app-arch/xz-utils
 	>=sys-libs/ncurses-5.2-r5:0=
-	sdl? ( media-libs/libsdl )
+	grub_platforms_emu? (
+		sdl? ( media-libs/libsdl )
+	)
 	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
-	libzfs? ( sys-fs/zfs )
+	libzfs? ( sys-fs/zfs:= )
 	mount? ( sys-fs/fuse:0 )
 	truetype? ( media-libs/freetype:2= )
 	ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest
index 17125fee6965..9eccb3aa77da 100644
--- a/sys-boot/lilo/Manifest
+++ b/sys-boot/lilo/Manifest
@@ -1,12 +1,13 @@
 AUX lilo-24.0-novga.patch 497 BLAKE2B 429d139b87d1dc581533c09ad6562d42323ac46663198836b0c8339cb99ce5e7442560a15abd089e995a55afdb2ea07c83e3583b7968ceb206acf6736e4574d5 SHA512 f09dbca336c6117592ec24e972c393941ae336f01a03449a455b9694e7e7c62fe24cd9fabab96380c91472fc701633a0ca41277180b73525e92cadbb71459d45
 AUX lilo-24.1-novga.patch 500 BLAKE2B a5ba2f06791812fd7dcafe0882218e6d3884db228f5866604f903972e6914cfdab8379e18eb18f399174581eb72775fda05f1a61df699d39f60564b9a2e337a6 SHA512 067a741086b6df6b5f728ffde3cac949dd9b59cdc11ac1b022f240b69c4a8ef883f5623cc610becd4648f02ad3a243a0d6a939aa8d8c63d9b0158426e6b6f300
 AUX lilo-24.2-add-nvme-support.patch 2779 BLAKE2B 0344624148e31dd9cd99e08f33e777e3a30f2bfc8321fe163a43329ae8c78e96fdb9a6a062648f06705919f89fd754a69a8cf6a2254d95bf7c5c6c78b9a3948e SHA512 14263591673f7486438416cb394f361593bd94da35fac643ae7938a241634aed41582532dcc7c3854c314c5bc68614d61c8099e12affe27c77a8a9a7473352bd
+AUX lilo-24.x-fix-gcc-10.patch 1020 BLAKE2B d434248d3f4ed4d591ada4d507e5ab80486228bfb4bd99d7597267355d2dfc70252b9f6a93e34f850f67a27698f94a70e0803310c81ffbc4c9d4f439f8155ae6 SHA512 0ef0ab379e787767bcee2c77eeb7bc5acce908850077dcc14a1d71f3a78761946e8e252089fecb441c26cbbee66c868021d42a300d05579d083e654026cf8682
 AUX lilo.conf 1613 BLAKE2B 746e05ed4a38f553d8534087d3889e3c136531752aa39f5de9404e58dcd520925f369a4300e9d16ba779b9cef0ae0ecfdde9221f064f42e6a5c812ee7effbbaf SHA512 be59f5b97cbf8eda744e8a7a281526b3262c80af7d3c61e5476697e1569e6e419c4055a8e7deaa4f65688769d941466043af81e159367bf893a88b77eb3732d5
 DIST dolilo-0.6.tar.bz2 3817 BLAKE2B 35c41f5eac8e02d4381db517a9b230d037da184f9ae409bc76307e689ad6b82928ea3794db54c3137afe6c770db86ba0cde78c33d89e775ddea464905070bfd6 SHA512 1b59ea5f2e2ac52d62635c9f7d5fb5b2aff6757e6ea6c0950480d8a11832b872115907abe6d8fb3fa5436e2e8971d9a1dda103dc6a15db6fc310c8f4730ab936
 DIST lilo-24.0.tar.gz 768631 BLAKE2B 09f6520e16a90eab5f44af440f1e2c2d05abb56e954dbb0237700d8e99f017bab279fa8a5c535114ec58be7416123ea51e91311255ed3036199f3565eec5a3f7 SHA512 4158a0f7ab085da063938df2bc77356f9536aa78208a902561f9e61ec478fb17f204f68407f6809638aea9d2e0c88ffc701548291c1635ab40f5b18a7be6bae7
 DIST lilo-24.1.tar.gz 773223 BLAKE2B ceaeaf6696b7b15d95cc6c90c6de63ad731f4d0f6d9e42fea4a245219d446cbecdb7d372ef4cb31dce26c7e149723779244f0319939343edf971ac1a19ba5063 SHA512 d1375cac9654fcb3934e7e5e0533e126ff8700a48154eb5019cf62e4b89f14d2ce7a17b6324795d9b60b37ab7656bfb2c9467f6e9d3540095f5c294579e83883
 DIST lilo-24.2.tar.gz 777400 BLAKE2B 71c74235d5df10eed65b67dc1ce2af21163651c752d799da419077025304abf9352535a70f3fb60d086609d8a1c25bf394e29453c338ab022cb2be3cb21af75f SHA512 4437cae21345f483194a5dc95f686f3f3cb2beec78faae3fba959db25eae29fe2c56732e055c05f1d101682c5d442cdc9561fae8074f61f5537dde0413204c54
 EBUILD lilo-24.0-r1.ebuild 3921 BLAKE2B 56587aa63fe2a54d3db921fd752da3763ef1d82fbf83929059a1bc0fae713f47175c9ba08a5397dad82bc7f4dd26e3a9f3fb013ae37a3a6212fda7f254116427 SHA512 a62668152070bc9a3cf8057766ec1c5f258beca54cd8a689f12f51958e803664970864049fa36fb1faef65e57400fd826500217635bdf541277c62013f91e66c
-EBUILD lilo-24.1.ebuild 4074 BLAKE2B 9b07d907188b47766df49dbac63d80ebff53ac28d551a03fd5b3e398fbcb47a45620f8fa2cb4001e04ca9469b808db7958cb1374b61cc0435931749993e92430 SHA512 04f1506462d1b697dcd4ede9a97e5278d1f96016d6dbc0b49f6eca140bee3758214e4eb5fcf9591ef7e37a9e5376d8a205660295a2ab3c922ce2495f425fbecb
-EBUILD lilo-24.2.ebuild 4144 BLAKE2B 67e67f4cd33f533d41d3f96b4fd24c8cf4adb257ac26207b11ae2927f752d1f1705d65885f47366ff69fa6f8b137bb8f91ecf6a2559b372634d938830a8cfc46 SHA512 5c5694bb6cabca07dce75f753e607398ac4dbed9ed966f36a3ee68eb6accee8ec236896a6cb1174ada8cd701ad495a76ca7bb51094c972b052939a16aa401b4f
+EBUILD lilo-24.1.ebuild 4132 BLAKE2B 86754e0375689f0487a0f3d0ce92501d345cc7dbac409835f7d07747a9f6b80fbb940e29d95d593e36e6dd93f36a352092da01a27b6cf4102bb64bbd9e8ff937 SHA512 330ab1a3917c8e69bdf590444dc6c8249d7ee80a16c47bffbcf8f3727d180b2511b1a4c49886360ff78256a3cd5d803d033bf0725690ca54e804450bd1207ea5
+EBUILD lilo-24.2.ebuild 4194 BLAKE2B d48497168288767bddadbe95856f9f822bb52e757d1299b9e44805aabaa209b2c928ed4d53f931d8152a252b5662f0fe19df8d9cc100d7f0871160be90232c78 SHA512 0ef8f8260829e81ad8d9e529d7c6a76ae086f0a4447bc894ca7f77f0efe9fd633a799aa19075969f6ad85fe4d8ec4fa8da5d42d880503b9fcea2e39d51871fbd
 MISC metadata.xml 582 BLAKE2B 3eff61a72e8828178013f444fafad385ca14c91d9a9a989646b5b1a9a1485598b537c2bf7f49b6d7301e45f7266e1dc866c0c3fffe74843a0d44ce94fa982825 SHA512 e9c7e5bcd88fab10e756ab7e22a949d1eaa9552cfad60891ca3f47d92fb3487ec74baee67539fabf9db2c15b225ab40050ff5e3ef1d7f858723bf8ae1b80fa04
diff --git a/sys-boot/lilo/files/lilo-24.x-fix-gcc-10.patch b/sys-boot/lilo/files/lilo-24.x-fix-gcc-10.patch
new file mode 100644
index 000000000000..c46b9eebdea0
--- /dev/null
+++ b/sys-boot/lilo/files/lilo-24.x-fix-gcc-10.patch
@@ -0,0 +1,51 @@
+Description: Fix ftbfs with GCC-10
+
+Author: Ryan Finnie <ryan@finnie.org>
+Bug-Debian: https://bugs.debian.org/957490
+Forwarded: no
+
+---
+
+--- a/src/raid.h
++++ b/src/raid.h
+@@ -8,7 +8,7 @@
+  * in the source directory.
+  */
+ 
+-int do_md_install, ndisk, md_bios;
++extern int ndisk, md_bios;
+ 
+ int raid_setup(void);
+ void raid_final(void);
+--- a/src/bsect.c
++++ b/src/bsect.c
+@@ -54,8 +54,6 @@
+ #endif
+ 
+ 
+-int boot_dev_nr;
+-
+ static BOOT_SECTOR bsect,bsect_orig;
+ static MENUTABLE menuparams;
+ static DESCR_SECTORS descrs;
+--- a/src/identify.c
++++ b/src/identify.c
+@@ -19,7 +19,6 @@
+ #include "common.h"
+ #include "cfg.h"
+ 
+-char *identify;
+ static char *opt;
+ static char *first, *dflt;
+ static int idefault;
+--- a/src/raid.c
++++ b/src/raid.c
+@@ -41,7 +41,7 @@
+ static int raid_bios[MAX_RAID+1];
+ static int device;
+ enum {MD_NULL=0, MD_PARALLEL, MD_MIXED, MD_SKEWED};
+-int do_md_install, ndisk, md_bios;
++int ndisk, md_bios;
+ static char *raid_list[MAX_RAID];
+ static int list_index[MAX_RAID];
+ static int nlist, faulty;
diff --git a/sys-boot/lilo/lilo-24.1.ebuild b/sys-boot/lilo/lilo-24.1.ebuild
index aa4787b06c10..4627ce7347c4 100644
--- a/sys-boot/lilo/lilo-24.1.ebuild
+++ b/sys-boot/lilo/lilo-24.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -25,10 +25,14 @@ DEPEND=">=sys-devel/bin86-0.15.5"
 RDEPEND="device-mapper? ( >=sys-fs/lvm2-2.02.45 )"
 
 src_prepare() {
+	default
+
 	# this patch is needed when booting PXE and the device you're using
 	# emulates vga console via serial console.
 	# IE..  B.B.o.o.o.o.t.t.i.i.n.n.g.g....l.l.i.i.n.n.u.u.x.x and stair stepping.
-	use pxeserial && epatch "${FILESDIR}/${P}-novga.patch"
+	use pxeserial && eapply "${FILESDIR}/${P}-novga.patch"
+
+	eapply "${FILESDIR}/${PN}-24.x-fix-gcc-10.patch"
 
 	# Do not strip and have parallel make
 	# FIXME: images/Makefile does weird stuff
diff --git a/sys-boot/lilo/lilo-24.2.ebuild b/sys-boot/lilo/lilo-24.2.ebuild
index 73f9ea6efbb4..66ac79f03145 100644
--- a/sys-boot/lilo/lilo-24.2.ebuild
+++ b/sys-boot/lilo/lilo-24.2.ebuild
@@ -33,6 +33,7 @@ src_prepare() {
 	use pxeserial && eapply "${FILESDIR}/${PN}-24.1-novga.patch"
 
 	eapply "${FILESDIR}/${PN}-24.2-add-nvme-support.patch"
+	eapply "${FILESDIR}/${PN}-24.x-fix-gcc-10.patch"
 
 	# Do not strip and have parallel make
 	# FIXME: images/Makefile does weird stuff
diff --git a/sys-boot/raspberrypi-firmware/Manifest b/sys-boot/raspberrypi-firmware/Manifest
index 76758d3de417..ca35e124f801 100644
--- a/sys-boot/raspberrypi-firmware/Manifest
+++ b/sys-boot/raspberrypi-firmware/Manifest
@@ -1,11 +1,11 @@
 AUX raspberrypi-firmware-0_p20130711-cmdline.txt 203 BLAKE2B 2435f2d4f1dc4c1283e19459bc07fb3fb569042e13724d10c5ae18490fc9f04e0ed4e910947414761386d32fd678c6031d5e53cfb2804d5f547d77dd47ffb840 SHA512 ea4ddd6005bf8979d4299867a8889d67192c91467833beff8785bc01ac8d33544e712b2956da51b58a7b4ab1a1acaf4f27428d294f0dfae87ec91da8a71e3c9f
 AUX raspberrypi-firmware-0_p20130711-config.txt 1706 BLAKE2B a7086f2f91a3eb26887d6cb2e0edc74282b8c91ae1a6691071cafa29f455b9caff7f597a9a9df88250e6dab3fa74b742bd7733d7de24e150da3c64d1e09bc18e SHA512 2a0a19a84ab871d73e330e870b086b85a7776a1b17dd6054451be735249208a982249ca62f6d2fe51aba74c78f36266143d65ffe0549cdf8afbf20bcf637c78f
 AUX raspberrypi-firmware-0_p20130711-envd 53 BLAKE2B 52aa8814f82f9c8a5e2f4c3b2be80e6e62b2e969d03a96f3162a998a9aa4621ab79df48d573389d92cc963979c8dd7c0e012cd8d996e5e23252eb66f869f0e74 SHA512 032aa497cbde187ed8cfa5ba5adaf96b28f9dd2babb882d934d9009771ca50e9d8c6a8d5535551a8e8cf8e1932865dd0e4806ba56c9694952cbb3d93f9081ca7
-DIST raspberrypi-firmware-1.20190215.tar.gz 123074917 BLAKE2B cefedb5c979db7dfd47938aad37a567d91d3ad78247c7a63f789362768ab7a39a1967ac116b4b0475e3b210ab11f6474706df042af85a622e8e7905c85ec7498 SHA512 082f26caf427222d838881e5f1e9fa0136765b3eaf74a84877fc33616fd07e49085db0889226c40c655039a9d41a10566510c7d752cfc48a67b4683616a51193
-DIST raspberrypi-firmware-1.20190709.tar.gz 158835870 BLAKE2B 4e63b3308adcd75f69f66966f1c927449aa8dc65211e6ca5a27dd2a0ed6ed32cc85ad42221308f4fb3a852d9f278400cfe4f723f306abe102341568408027174 SHA512 6a0610c97db47441ede8e4f8436958899f678bf065a0fbde06de7945a1ac4d5f754a0e10d928d77759ba1cbf82654d85d9cb9c91b970c3fe9590560267033522
+AUX raspberrypi-firmware-1.20201022-cmdline.txt 108 BLAKE2B b7830fdaf1ffb64cb07a27db79dcb30a73194d7c1cf9b0f05529303f1fe2aea5ee26c71d563e029760a06d78f77d0213a6cda0819c08f7014782997f159f716e SHA512 6dbf694f4df9d5d5dfdd62a33be90aa95d655b113760cbbee9575a59e6250b831e73530cb392e8e89056806f298283626c50665b9d4573663e6686bbcc577d6b
+AUX raspberrypi-firmware-1.20201022-config.txt 1784 BLAKE2B 7f37f02c486e6db2767b108e5926dc056f558ef32ae8ac3debea2fe7a210b159a2e4721846be8719520667c9bb86dc5d15c7c815f90dfe2686748f4d474fac61 SHA512 0909fae9bf731417f732486f7823f92a142824f5cab490b1736a16e7f569c9ecd805828c533c238dd3c5d75efcd2679e0d3697d988388000e1475a966fa66f12
 DIST raspberrypi-firmware-1.20190925.tar.gz 185571086 BLAKE2B c3a9b2760fa853fbd1dd09bc4048c9e78594f88da5af608c3a761554d4046a4c869db8981c64140a24e82e0a61b8dc776bb8d895df60c6424e44780f78b18cb0 SHA512 4b7b29cc6c2a33d7a37987c492034d9afbb2220364c50cf265e0adf8e5f393c2275dcffaa77c89b3f43b2e98d199741b67590cb60ff8beae8ef677852f63b4a0
-EBUILD raspberrypi-firmware-1.20190215.ebuild 1634 BLAKE2B 2b9631bc1c22117fd1896a75938713e7b3c3fa796ff291fde38d71d44b40cfefcc32cab2d2158b0a09b2b72ec5c4dc1377ada8666cbda70e3889f6686c70dbec SHA512 122bf1379238e61b1b5fa1324ec3b2e37b14ccc571e6afbc053f44a5adc1466f3d0368467d105ed8ffc7c1c47077776f3513d92246fb182cf5d654a89e1997ce
-EBUILD raspberrypi-firmware-1.20190709.ebuild 1634 BLAKE2B 2b9631bc1c22117fd1896a75938713e7b3c3fa796ff291fde38d71d44b40cfefcc32cab2d2158b0a09b2b72ec5c4dc1377ada8666cbda70e3889f6686c70dbec SHA512 122bf1379238e61b1b5fa1324ec3b2e37b14ccc571e6afbc053f44a5adc1466f3d0368467d105ed8ffc7c1c47077776f3513d92246fb182cf5d654a89e1997ce
+DIST raspberrypi-firmware-1.20201022.tar.gz 189827375 BLAKE2B 94c38f60d688c8e3ebab830912daccbb6c04bdd3d88f6ca0d07d85be0a6b12c53f0266b4c258ed4694f30bad5db30fb6d30feabfd0b7668735a9a806b820d325 SHA512 876758179df27109984b6c3f4849fdcdc6bdcc2769495fcc83c97fc3ff4d07b9f3cd58086be877503f72c9e5417d2be6d6c33bce4cbb3b862055117c9cc26db8
 EBUILD raspberrypi-firmware-1.20190925.ebuild 1911 BLAKE2B 126451fbb0daa5f9d07381fb0e6259cfed1235c2b59773a44c03cbb84eb480a1092138b0e64b2e1e495d9b9ae43fd876ab2a0ef507f976dd36a8847276c28db6 SHA512 3e52692de708837448b18aef8a9df97b065bab94539c43f0c58fc786b8e4aede84a168d402d4dbd118661f433361a817b39cbbfe219caef3966a3d6fbb37e3b4
-EBUILD raspberrypi-firmware-9999.ebuild 1911 BLAKE2B 126451fbb0daa5f9d07381fb0e6259cfed1235c2b59773a44c03cbb84eb480a1092138b0e64b2e1e495d9b9ae43fd876ab2a0ef507f976dd36a8847276c28db6 SHA512 3e52692de708837448b18aef8a9df97b065bab94539c43f0c58fc786b8e4aede84a168d402d4dbd118661f433361a817b39cbbfe219caef3966a3d6fbb37e3b4
+EBUILD raspberrypi-firmware-1.20201022.ebuild 1892 BLAKE2B 7d3b73f730a94a75f61652eb350c12c7d3cd328cd26b03bf3cf4300df1c4fe9bd7c7d8fed90523645d6d692665a0b35d4db9ea50fa423d50c38115ed76bb7401 SHA512 7f88844eba41233565f6ac795dd2f9f390c94b7e153bb2893e4bc24eaeb28c7984523b44212f1c349a93b21aa51c984b21f102425eb9fff757f11e5753ca950a
+EBUILD raspberrypi-firmware-9999.ebuild 1892 BLAKE2B 7d3b73f730a94a75f61652eb350c12c7d3cd328cd26b03bf3cf4300df1c4fe9bd7c7d8fed90523645d6d692665a0b35d4db9ea50fa423d50c38115ed76bb7401 SHA512 7f88844eba41233565f6ac795dd2f9f390c94b7e153bb2893e4bc24eaeb28c7984523b44212f1c349a93b21aa51c984b21f102425eb9fff757f11e5753ca950a
 MISC metadata.xml 324 BLAKE2B 89413ad14dfe3013cc5fe46bdfb743b947f1385e39dd2504b55d4a6c671fc4a006a721f8e810636275c5d5b4f26a259dd57ea0d1dc46a0db7c8c2e6bfb792efa SHA512 d50c8ad607a73dea23813309dcefb33ea5120771a5db38780ca946350a4de2c93d3a61ef7482479f1065de9de0158597683032d0fbdfa18286e0b4f0bffcce2d
diff --git a/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-1.20201022-cmdline.txt b/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-1.20201022-cmdline.txt
new file mode 100644
index 000000000000..b815bd89db1f
--- /dev/null
+++ b/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-1.20201022-cmdline.txt
@@ -0,0 +1 @@
+console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait
diff --git a/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-1.20201022-config.txt b/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-1.20201022-config.txt
new file mode 100644
index 000000000000..548f4accc250
--- /dev/null
+++ b/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-1.20201022-config.txt
@@ -0,0 +1,65 @@
+# For more options and information see
+# http://rpf.io/configtxt
+# Some settings may impact device functionality. See link above for details
+
+# uncomment if you get no picture on HDMI for a default "safe" mode
+#hdmi_safe=1
+
+# uncomment this if your display has a black border of unused pixels visible
+# and your display can output without overscan
+#disable_overscan=1
+
+# uncomment the following to adjust overscan. Use positive numbers if console
+# goes off screen, and negative if there is too much border
+#overscan_left=16
+#overscan_right=16
+#overscan_top=16
+#overscan_bottom=16
+
+# uncomment to force a console size. By default it will be display's size minus
+# overscan.
+#framebuffer_width=1280
+#framebuffer_height=720
+
+# uncomment if hdmi display is not detected and composite is being output
+#hdmi_force_hotplug=1
+
+# uncomment to force a specific HDMI mode (this will force VGA)
+#hdmi_group=1
+#hdmi_mode=1
+
+# uncomment to force a HDMI mode rather than DVI. This can make audio work in
+# DMT (computer monitor) modes
+#hdmi_drive=2
+
+# uncomment to increase signal to HDMI, if you have interference, blanking, or
+# no display
+#config_hdmi_boost=4
+
+# uncomment for composite PAL
+#sdtv_mode=2
+
+#uncomment to overclock the arm. 700 MHz is the default.
+#arm_freq=800
+
+# Uncomment some or all of these to enable the optional hardware interfaces
+#dtparam=i2c_arm=on
+#dtparam=i2s=on
+#dtparam=spi=on
+
+# Uncomment this to enable infrared communication.
+#dtoverlay=gpio-ir,gpio_pin=17
+#dtoverlay=gpio-ir-tx,gpio_pin=18
+
+# Additional overlays and parameters are documented /boot/overlays/README
+
+# Enable audio (loads snd_bcm2835)
+dtparam=audio=on
+
+[pi4]
+# Enable DRM VC4 V3D driver on top of the dispmanx display stack
+dtoverlay=vc4-fkms-v3d
+max_framebuffers=2
+
+[all]
+#dtoverlay=vc4-fkms-v3d
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190709.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190709.ebuild
deleted file mode 100644
index 4b06dfa49939..000000000000
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190709.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit mount-boot readme.gentoo-r1
-
-DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware"
-HOMEPAGE="https://github.com/raspberrypi/firmware"
-LICENSE="GPL-2 raspberrypi-videocore-bin"
-SLOT="0"
-
-if [[ "${PV}" == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
-	EGIT_CLONE_TYPE="shallow"
-else
-	SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="-* ~arm"
-	S="${WORKDIR}/firmware-${PV}"
-fi
-
-RESTRICT="binchecks strip"
-
-pkg_preinst() {
-	if [ -z "${REPLACING_VERSIONS}" ] ; then
-		local msg=""
-		if [ -e "${D}"/boot/cmdline.txt -a -e /boot/cmdline.txt ] ; then
-			msg+="/boot/cmdline.txt "
-		fi
-		if [ -e "${D}"/boot/config.txt -a -e /boot/config.txt ] ; then
-			msg+="/boot/config.txt "
-		fi
-		if [ -n "${msg}" ] ; then
-			msg="This package installs following files: ${msg}."
-			msg="${msg} Please remove(backup) your copies durning install"
-			msg="${msg} and merge settings afterwards."
-			msg="${msg} Further updates will be CONFIG_PROTECTed."
-			die "${msg}"
-		fi
-	fi
-}
-
-src_install() {
-	insinto /boot
-	cd boot || die
-	doins bootcode.bin fixup*.dat start*elf
-	doins *.dtb
-	doins -r overlays
-	newins "${FILESDIR}"/${PN}-0_p20130711-config.txt config.txt
-	newins "${FILESDIR}"/${PN}-0_p20130711-cmdline.txt cmdline.txt
-	newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
-
-DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190215.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201022.ebuild
index 4b06dfa49939..7fe926ad7820 100644
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190215.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201022.ebuild
@@ -1,39 +1,65 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit mount-boot readme.gentoo-r1
 
-DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware"
-HOMEPAGE="https://github.com/raspberrypi/firmware"
-LICENSE="GPL-2 raspberrypi-videocore-bin"
-SLOT="0"
-
 if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
 	EGIT_CLONE_TYPE="shallow"
 else
 	SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="-* ~arm"
+	KEYWORDS="-* ~arm ~arm64"
 	S="${WORKDIR}/firmware-${PV}"
 fi
 
+DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware"
+HOMEPAGE="https://github.com/raspberrypi/firmware"
+
+LICENSE="GPL-2 raspberrypi-videocore-bin"
+SLOT="0"
 RESTRICT="binchecks strip"
 
+DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}"/${PN}-1.20201022-config.txt "${WORKDIR}" || die
+
+	if use arm64; then
+		# Force selection of the 64-bit kernel8.img to match our userland
+		echo "arm_64bit=1" >> "${WORKDIR}"/${PN}-1.20201022-config.txt || die
+	fi
+}
+
+src_install() {
+	insinto /boot
+	cd boot || die
+	doins bootcode.bin fixup*.dat start*elf
+	newins "${WORKDIR}"/${PN}-1.20201022-config.txt config.txt
+	newins "${FILESDIR}"/${PN}-1.20201022-cmdline.txt cmdline.txt
+	newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}
+	readme.gentoo_create_doc
+}
+
 pkg_preinst() {
-	if [ -z "${REPLACING_VERSIONS}" ] ; then
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
 		local msg=""
-		if [ -e "${D}"/boot/cmdline.txt -a -e /boot/cmdline.txt ] ; then
+
+		if [[ -e "${ED}"/boot/cmdline.txt ]] && [[ -e /boot/cmdline.txt ]] ; then
 			msg+="/boot/cmdline.txt "
 		fi
-		if [ -e "${D}"/boot/config.txt -a -e /boot/config.txt ] ; then
+
+		if [[ -e "${ED}"/boot/config.txt ]] && [[ -e /boot/config.txt ]] ; then
 			msg+="/boot/config.txt "
 		fi
-		if [ -n "${msg}" ] ; then
+
+		if [[ -n "${msg}" ]] ; then
 			msg="This package installs following files: ${msg}."
-			msg="${msg} Please remove(backup) your copies durning install"
+			msg="${msg} Please remove (backup) your copies durning install"
 			msg="${msg} and merge settings afterwards."
 			msg="${msg} Further updates will be CONFIG_PROTECTed."
 			die "${msg}"
@@ -41,20 +67,6 @@ pkg_preinst() {
 	fi
 }
 
-src_install() {
-	insinto /boot
-	cd boot || die
-	doins bootcode.bin fixup*.dat start*elf
-	doins *.dtb
-	doins -r overlays
-	newins "${FILESDIR}"/${PN}-0_p20130711-config.txt config.txt
-	newins "${FILESDIR}"/${PN}-0_p20130711-cmdline.txt cmdline.txt
-	newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}
-	readme.gentoo_create_doc
-}
-
 pkg_postinst() {
 	readme.gentoo_print_elog
 }
-
-DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
index 3b499cf2ad55..7fe926ad7820 100644
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
@@ -1,21 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit mount-boot readme.gentoo-r1
 
-DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware"
-HOMEPAGE="https://github.com/raspberrypi/firmware"
-LICENSE="GPL-2 raspberrypi-videocore-bin"
-SLOT="0"
-
-# Temporary safety measure to prevent ending up with a pair of
-# sys-kernel/raspberrypi-image and sys-boot/raspberrypi-firmware
-# none of which installed device tree files.
-# Remove when the mentioned version and all older ones are deleted.
-RDEPEND="!<=sys-kernel/raspberrypi-image-4.19.57_p20190709"
-
 if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
@@ -26,20 +15,51 @@ else
 	S="${WORKDIR}/firmware-${PV}"
 fi
 
+DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware"
+HOMEPAGE="https://github.com/raspberrypi/firmware"
+
+LICENSE="GPL-2 raspberrypi-videocore-bin"
+SLOT="0"
 RESTRICT="binchecks strip"
 
+DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}"/${PN}-1.20201022-config.txt "${WORKDIR}" || die
+
+	if use arm64; then
+		# Force selection of the 64-bit kernel8.img to match our userland
+		echo "arm_64bit=1" >> "${WORKDIR}"/${PN}-1.20201022-config.txt || die
+	fi
+}
+
+src_install() {
+	insinto /boot
+	cd boot || die
+	doins bootcode.bin fixup*.dat start*elf
+	newins "${WORKDIR}"/${PN}-1.20201022-config.txt config.txt
+	newins "${FILESDIR}"/${PN}-1.20201022-cmdline.txt cmdline.txt
+	newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}
+	readme.gentoo_create_doc
+}
+
 pkg_preinst() {
-	if [ -z "${REPLACING_VERSIONS}" ] ; then
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
 		local msg=""
-		if [ -e "${D}"/boot/cmdline.txt -a -e /boot/cmdline.txt ] ; then
+
+		if [[ -e "${ED}"/boot/cmdline.txt ]] && [[ -e /boot/cmdline.txt ]] ; then
 			msg+="/boot/cmdline.txt "
 		fi
-		if [ -e "${D}"/boot/config.txt -a -e /boot/config.txt ] ; then
+
+		if [[ -e "${ED}"/boot/config.txt ]] && [[ -e /boot/config.txt ]] ; then
 			msg+="/boot/config.txt "
 		fi
-		if [ -n "${msg}" ] ; then
+
+		if [[ -n "${msg}" ]] ; then
 			msg="This package installs following files: ${msg}."
-			msg="${msg} Please remove(backup) your copies durning install"
+			msg="${msg} Please remove (backup) your copies durning install"
 			msg="${msg} and merge settings afterwards."
 			msg="${msg} Further updates will be CONFIG_PROTECTed."
 			die "${msg}"
@@ -47,18 +67,6 @@ pkg_preinst() {
 	fi
 }
 
-src_install() {
-	insinto /boot
-	cd boot || die
-	doins bootcode.bin fixup*.dat start*elf
-	newins "${FILESDIR}"/${PN}-0_p20130711-config.txt config.txt
-	newins "${FILESDIR}"/${PN}-0_p20130711-cmdline.txt cmdline.txt
-	newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}
-	readme.gentoo_create_doc
-}
-
 pkg_postinst() {
 	readme.gentoo_print_elog
 }
-
-DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
diff --git a/sys-boot/sgibootcd/Manifest b/sys-boot/sgibootcd/Manifest
index e599ee82d4cf..45f04d161d6c 100644
--- a/sys-boot/sgibootcd/Manifest
+++ b/sys-boot/sgibootcd/Manifest
@@ -1,3 +1,3 @@
 DIST sgibootcd-0.12.tar.bz2 3810 BLAKE2B 973c6e01f1e90b9009b57725e59e295e8cbdcc30595735eab1a4cd3929aa71edde66d352bb04b61670eb7ad464916d0e4b83f6fabbc8f641c150edcf96f4985c SHA512 180e4f5a185b14c0b2c8158b368a50a3a55673fa86760e2a424c9533b1bb8ec37824c715ba02fd264621e2e31906ddd310398e9f24cf19147bce3e49fc62da3e
-EBUILD sgibootcd-0.12.ebuild 677 BLAKE2B f643caa50be76eed1b0a82806eb49abd8f48a412c353c6658ce3215d8f48987cffa674bf382bdd88e343b420ce0e55814153c3c545a3c6f46ef10e833bbe6f6d SHA512 870950229f51eb94bdeae66858903fa5e50f85a9024cf410ea691e8a2ecb6df9553771f800fc146d0f5b08807f5724b8acc9e2b70f2689193c1b0f0445150496
+EBUILD sgibootcd-0.12.ebuild 669 BLAKE2B 33f6f3a38ba889a6ab2ae893add569e985b2d78cbab3c54f6777498f5287c1737029a5f0e3589eda89e0ec38f79dba88c01f5c03b6bf771124446b63357e56fb SHA512 f8ae44145ce075054dc97e974782aea5d3980baff9a93b8c537c4e7eb4ac8044e3baf0787df9d4960c133cdc0386ff61336e9c5bd58bb3b89250bc135494392b
 MISC metadata.xml 241 BLAKE2B 37f8949a3e5fd20a0ef26ef406c6e1e254825f06a44974a46613ea233985c368fe7dca5797d418348d3031b30d93c453a278f537e116525305efb380fec65c88 SHA512 f6f7578f89007c938627fedf07141af9dd35f6f33514a5f103b16cbc4cc8da74d6088eda70f3d9016cf77eba88575833d5431a6c1105f784aa209a3da657c1b1
diff --git a/sys-boot/sgibootcd/sgibootcd-0.12.ebuild b/sys-boot/sgibootcd/sgibootcd-0.12.ebuild
index c2b3c0449c57..c9545e0a82f1 100644
--- a/sys-boot/sgibootcd/sgibootcd-0.12.ebuild
+++ b/sys-boot/sgibootcd/sgibootcd-0.12.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-inherit eutils toolchain-funcs
+EAPI="7"
+inherit toolchain-funcs
 
 DESCRIPTION="Creates burnable CD images for SGI LiveCDs"
 HOMEPAGE="ftp://ftp.linux-mips.org/pub/linux/mips/people/skylark/"
 SRC_URI="ftp://ftp.linux-mips.org/pub/linux/mips/people/skylark/${P}.tar.bz2"
+
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~mips"
+
 IUSE=""
 RDEPEND=""
 DEPEND=""
diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index f65b2ff2b019..33ae3d812d9d 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1,4 +1,4 @@
 AUX 237-libshared-static.patch 659 BLAKE2B f97c3c4e9d6ef3da674bc74fce8326d18fe1ebd4008e0929f1362ef0c2e854a67c8786c0b4ce9b29aee2b4409c54c668429f61e3c4ab85844d72c3d060b41925 SHA512 79cd97a176c91c76b512bce5f30605d673fb5480921cc76e221da9e78a8f7caec802efb481f8811c7aefba2901d007e340ba032a07a53e907f77e4bbd52169a7
 DIST systemd-245.tar.gz 8993479 BLAKE2B be0b1fca5ba8585978f570868bc9135c1fee78ea64dcdf8b1a3419e856a83da90104ed2f86e5f3e5b0b6f29d4b34f603bfe1e4cbc61ccf71bedce547db62ff35 SHA512 1b80d0e02472dfc4197f11dab4f56cf90e8a6e105ce19f837cb11335b6d8577ed49031dad94cdb41aa9bdc06ec8eec62c8e9246272b83935e7bb9dcd3cd8c012
-EBUILD systemd-boot-245.ebuild 2442 BLAKE2B dac3fbe92676a11ee2d51890a6e202d0a5942f48b2ba5f0d293fb3f0af5c3a7a2fb8439cb5393deba9d09ff52336fc112eecc9ef63865cc57f84bed0688ca789 SHA512 b279b89e5b0f8003e7160e38f4dafb1970306778bbcaca3cc1c5aee3a7f799fe49e8281592ff03a9eec80c3abc1830dfaaca54add53ad978a2d26fa2bab2c542
+EBUILD systemd-boot-245.ebuild 2449 BLAKE2B 3d52c54ef40edce2173b4d3a0437f9eea9c3fc5c19ba8684d7ab81c3aa3af1e9542c8600cf635442d3e0d81a1cfed6b120c663ef4b3bfd0831ccdc761833f421 SHA512 85a8c90f30f047f8c62be2def9cc0611eded5be1264eb54eba8e873c6eba53289446a4089acf2c2d08fc1d901355ccf21341a3be721103026052f2343c95e19c
 MISC metadata.xml 326 BLAKE2B f33138d9048d3a13295360f070b8d610a22909f99ee0127d3138bc1e0a066fc4590f580c4cd8fd539d5c86efc005b4662eb0dddeb085469719d0aa951c36af9a SHA512 7d33f5273a066af06b319d04f9a01c2d8f14a6de2102cf77918d7abdf6846fd0b271f5c5adb503354f93402eb341af280853f20dbb673264196c552aa24eb6fe
diff --git a/sys-boot/systemd-boot/systemd-boot-245.ebuild b/sys-boot/systemd-boot/systemd-boot-245.ebuild
index 94fa4ee8aef1..748f866fdec2 100644
--- a/sys-boot/systemd-boot/systemd-boot-245.ebuild
+++ b/sys-boot/systemd-boot/systemd-boot-245.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${P
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE=""
 RESTRICT="test"
 
diff --git a/sys-boot/unetbootin/Manifest b/sys-boot/unetbootin/Manifest
index b599b0eb9b14..2546205bd06c 100644
--- a/sys-boot/unetbootin/Manifest
+++ b/sys-boot/unetbootin/Manifest
@@ -1,13 +1,4 @@
-AUX unetbootin-581-desktop.patch 707 BLAKE2B 9de8d50b00bbe6fe5968cb26f31aca08cf4dc8aa580a00b9af31e921a973ee62c6213b8154867902b61b5882377b8beddfbfa096ee7d4382f6adba05342b26cd SHA512 036f887c7fb4209cd08710be88ef25671e8c1e481e3d82bc78cc1e3b1480224573cbbbf8c290846373937863400ee108b72521c1d6a9a883e01209c1da33cae2
 AUX unetbootin-675-desktop.patch 737 BLAKE2B c449895c150513ca0df22d1648d8d4a01a1c27a0afe9875631b9b19ae6680b39edbfc50a0344adaf434db28bb02bcd34b5756faf07fe1438d471d24902209e61 SHA512 fef904d63a93fc4ddbee82e097645cb090563d2448872462bba9a6a971da47b595bd63fa4fafd0f3c7630b794f2e12591435d1a413f7b8c0bfdd0664963e6335
-DIST unetbootin-661-qt5.patch.tar.xz 8060 BLAKE2B 58cb323166e344ecabf5d372e80ff0367a1344866a6e8dea4b2677a85ea6ae0b5591480a3bcbbfc3a51d391b07adf0d5f370ee77e4c7e1d6f2b727aedf274cf0 SHA512 c1226575484fa63c94ca4da875a26c7bd64bcb27d8e07ea5b67bb3f2546f31d1360d10c363cd7301476811e332c9524c96d6ba482c894b86a5b28ca8a1c8b385
-DIST unetbootin-661.tar.gz 16257579 BLAKE2B 2f92cf286c8010a80d4d4cc48a7ece55e159af9f3729277d97eb99ef2ebe8945023d03c51d6e97d7101d8547240e3c2152004222ec4c825ef4ab954c4018e7b0 SHA512 bbf74a4c4ca9b52f4da672eb54524b7fcb796c65ba80700dc3c6f2677bde37574f42a11c213cc4d4eee38783aed650beee1e2894f60185745e509a2e9571f70a
-DIST unetbootin-675-qt5.patch.xz 7636 BLAKE2B f8c475491e6cf0557a192380726376c1dadba2e52478139d42023e867de86c5c1727719fa123fb412dbb20fca5763a3192889618e75ef6d8bba2d20eb1cf9403 SHA512 da636a3f6cd6a45d6786d92e94741d74f6c5de7d74570af45eac08718a822cdef5baac6c62d7ed68a788e9518e050f3a48a46f8f374c07e0b4c0d90c3613185d
-DIST unetbootin-675.tar.gz 23221792 BLAKE2B fb3a6fce9d2a47b83e2e4c1a579d20594a637215b7c6456d6b0a59a592da660b13bdbea52aa5a4f902e410e9d0e2d447d085f040d321029a96b7ff957a59d11e SHA512 7cb5da4a876125ff010fc6a5aab2b5bb6eeec0f1ac6f2dd86efa2c3eaebaedff8c2167f9dc77053936955703cd2a98dd11a84b8de930dcfc1c2b0f6aeaf7ee61
-DIST unetbootin-677.tar.gz 23479226 BLAKE2B b5a5b111c5f96cc603975f535b55dd8e6191cc92972f54591ae6673394abae15e2652f737b8dc02f8b26a1247a9663cbda3b0d2d7b8b8dfe9eb117711f08d053 SHA512 f86b25dabc27f12bdb65a590c4ffa25aa509a78aa29cecde73918d8bc36dc3e6597b2b7e1803f7fa86a884347506e9c25b361ce89c26e0f6449e0c1ef29355d1
-DIST unetbootin-681.tar.gz 23481527 BLAKE2B b8c75156539a07bdacf1185ed898867b1e3df91a87486b7291e4bffc0c754c1ea3fe8a13a2ade5507a886e05904daa90877d29bd72ae1c353cb20dd64264e391 SHA512 9ac8c51f3b65bd6f051caa0270c239ec8aaabb2d3b92bec7b18803d3dcfdbe2bbca4e25124477f4e7b83ee10ba2aa08cdf055e8c9bb042cbebcd3ff6a96315b9
-EBUILD unetbootin-661.ebuild 2115 BLAKE2B 7cb9a9fd7e7b1616678fc47aeffae70b9f23e34272a33f18ef6c6ed8e31394119dcde11f6b272a259d29242d4827c752b3556d019dda62d3c35f3c909c36c6f9 SHA512 44d057a61b4247ba75f3d81a9358e6923a5fb357a716ee936f2e72d6e71d18996329db45b5036ca0d936a689054c64938685dcf10befbfd044753ffd46fc4ca5
-EBUILD unetbootin-675.ebuild 2150 BLAKE2B 90dee91ff4727db6b1b351f51d35142b49cbfe9659357d955b54457e0d42ca359a85a0c3823f4110d89edf78aa27755c26d06612a0cffd3c9b2706855f3e9d7d SHA512 e3017f62cffb082b4f104f5739c79c0ba8be34eb85099d3325eadb8fe9e04f6e2c269d2541e679d555b04746d751ff9260162182ac36228980fb0d5e6e5cd0e8
-EBUILD unetbootin-677-r1.ebuild 2249 BLAKE2B c433e140f5cf35c440228dfe03b954e3df3849899faae001dd2111ccb1cd7e6286392532d6e264ab9b25bbf76212c580eef9ce0a5d434b487c27721769d0bdcd SHA512 b4bad7d4096f6be5c175f9ce14e39646343b838922964c86b6f95c1649382b167ebc202f6fffdd94388c8b46f7475ae6ccda4e33fa6c546f12b82a6d1cbf917a
-EBUILD unetbootin-681.ebuild 2299 BLAKE2B e135b47068b25f7fb719a7639daecc1e8748e179c97d5fa50ae257835e99961268bbde8bef9b62d65efb92245cd9aa0cfcc1452feef6bf0b3e901c6b89b14e19 SHA512 05884d17bc65831d62520962a966dd6863e390b39dc2ece3445ea690b3f1ab6720a6bbff8655274f71c5bcd95dc8978c90d6f3e20b8a4646bea9736ea996060a
-MISC metadata.xml 385 BLAKE2B 05836339f25bd812b23c8b93a6f05934a4bfa12d9fdd61f73140131c2d7609a5d1e257ed80c2cd983020720645e5444078cc71f2f51be9a2d435715e38ceea3f SHA512 9676e393ac2d18489433f0e658340a3eec0e01e0b35ca786540b07a6466f0b572f5d5bf115e6dc0b5c4898c00f630b9f5023f62f8e8f3a96c105bc74f918eb21
+DIST unetbootin-700.tar.gz 16694955 BLAKE2B d8c00b56c5ae2daac696b62ef207c62dc91f67699c8823e2a751eff536d03fd0a50a931e9a4598b05d99be968b7e895ab521f605b4e0080d591a34c9e67f685e SHA512 0d1b23dddf0e0e3eca81f8ef07fe375f0867ee3fa631c3a3cfe33a846b8d704b36e0efe4c947d7c68e5c1bff370ba87c34aa52c5bf8fc414cd89777f9f1858b7
+EBUILD unetbootin-700.ebuild 2125 BLAKE2B 30803cbc7b7283a6ef70a7586ee20a68a18235207a034919ed59bec6437037f0d67be2de954e828453bbab12fea31a9896751598df7ad004bfe67d27ccefd64b SHA512 f7ad94b5ea04fb75d7973e0dccf40bfdf9bcb557cac6c39e4a1a5bccbe1999edc52f53f1c46c0034fb2d2d6a490c86e48db79abf9cf535cdd6788b83e3a85435
+MISC metadata.xml 308 BLAKE2B ccc7fb8c45bc822e7a4dc2e8d74cb3b8c5769b629cdce50a41bafd05ebbddd6deb51de400cff1278a700459cabf5378822afb30cda30b00d72c96cd505a80c16 SHA512 87522d2f4c879a88a66a7fa842d73863955a506a3f6b63ac718347b52f2a48471730225012dc0b0afc296aa50d4ef26bf116fb6536266b2f0b8de5cdeda38d04
diff --git a/sys-boot/unetbootin/files/unetbootin-581-desktop.patch b/sys-boot/unetbootin/files/unetbootin-581-desktop.patch
deleted file mode 100644
index ab1912b2e8a0..000000000000
--- a/sys-boot/unetbootin/files/unetbootin-581-desktop.patch
+++ /dev/null
@@ -1,24 +0,0 @@
- * unetbootin.desktop: error: key "GenericName[en_US]" in group "Desktop Entry"
-   is a localized key, but there is no non-localized key "GenericName"
- * unetbootin.desktop: warning: value "Application;System;" for key
-   "Categories" in group "Desktop Entry" contains a deprecated value
- * "Application"
-
-
-
---- a/unetbootin.desktop
-+++ b/unetbootin.desktop
-@@ -2,11 +2,11 @@
- Version=1.0
- Name=UNetbootin
- Comment=Tool for creating Live USB drives
--Categories=Application;System;
-+Categories=System;
- Exec=/usr/bin/unetbootin
- Terminal=false
- Type=Application
- Name[en_US]=UNetbootin
--GenericName[en_US]=UNetbootin
-+GenericName=UNetbootin
- Comment[en_US]=Tool for creating Live USB drives
- Icon=unetbootin
diff --git a/sys-boot/unetbootin/metadata.xml b/sys-boot/unetbootin/metadata.xml
index 91ac65507330..191fd609ce6e 100644
--- a/sys-boot/unetbootin/metadata.xml
+++ b/sys-boot/unetbootin/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jer@gentoo.org</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">unetbootin</remote-id>
 		<remote-id type="github">unetbootin/unetbootin</remote-id>
diff --git a/sys-boot/unetbootin/unetbootin-661.ebuild b/sys-boot/unetbootin/unetbootin-661.ebuild
deleted file mode 100644
index e91aabaaf4d8..000000000000
--- a/sys-boot/unetbootin/unetbootin-661.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PATCHSET="${P}-qt5.patch.tar.xz"
-inherit desktop qmake-utils
-
-DESCRIPTION="UNetbootin installs Linux/BSD distributions to a partition or USB drive"
-HOMEPAGE="https://github.com/unetbootin/unetbootin"
-SRC_URI="https://github.com/unetbootin/unetbootin/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-UNBI_LINGUAS="
-	am ar ast be bg bn ca cs da de el eo es et eu fa fi fo fr gl he hr hu id it
-	ja lt lv ml ms nan nb nl nn pl pt_BR pt ro ru si sk sl sr sv sw tr uk ur vi
-	zh_CN zh_TW
-"
-
-for lingua in ${UNBI_LINGUAS}; do
-	IUSE="${IUSE} l10n_${lingua/_/-}"
-done
-
-S=${WORKDIR}/${P}/src/${PN}
-
-COMMON_DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-"
-RDEPEND="${COMMON_DEPEND}
-	app-arch/p7zip
-	sys-boot/syslinux
-	sys-fs/mtools
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-581-desktop.patch"
-	"${WORKDIR}"/${PATCHSET/.tar.xz/}
-)
-
-src_prepare() {
-	default
-
-	# QA check in case linguas are added or removed
-	enum() {
-		echo ${#}
-	}
-	[[ $(enum ${UNBI_LINGUAS}) -eq $(( $(enum $(echo ${PN}_*.ts) ) -1 )) ]] \
-		|| die "Numbers of recorded and actual linguas do not match"
-	unset enum
-
-	# Remove localisations
-	local lingua
-	for lingua in ${UNBI_LINGUAS}; do
-		if ! use l10n_${lingua/_/-}; then
-			sed -i ${PN}.pro -e "/\.*${PN}_${lingua}\.ts.*/d" || die
-			rm ${PN}_${lingua}.ts || die
-		fi
-	done
-}
-
-src_configure() {
-	sed -i -e '/^RESOURCES/d' unetbootin.pro || die
-
-	UNBN_QTPATH="$(qt5_get_bindir)/"
-	"${UNBN_QTPATH}"lrelease ${PN}.pro || die
-
-	eqmake5 ${PN}.pro || die
-}
-
-src_install() {
-	dobin ${PN}
-
-	domenu ${PN}.desktop
-
-	for file in ${PN}*.png; do
-		size="${file/${PN}_}"
-		size="${size/.png}x${size/.png}"
-		insinto /usr/share/icons/hicolor/${size}/apps
-		newins ${file} ${PN}.png
-	done
-
-	local lingua
-	for lingua in ${UNBI_LINGUAS}; do
-		if use l10n_${lingua/_/-}; then
-			insinto /usr/share/${PN}
-			doins ${PN}_${lingua}.qm
-		fi
-	done
-}
diff --git a/sys-boot/unetbootin/unetbootin-675.ebuild b/sys-boot/unetbootin/unetbootin-675.ebuild
deleted file mode 100644
index 627b3c0182a6..000000000000
--- a/sys-boot/unetbootin/unetbootin-675.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop flag-o-matic qmake-utils
-
-DESCRIPTION="UNetbootin installs Linux/BSD distributions to a partition or USB drive"
-HOMEPAGE="https://github.com/unetbootin/unetbootin"
-SRC_URI="
-	https://github.com/unetbootin/unetbootin/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~jer/${P}-qt5.patch.xz
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-UNBI_LINGUAS="
-	am ar ast be bg bn ca cs da de el eo es et eu fa fi fo fr gl he hr hu id it
-	ja lt lv ml ms nan nb nl nn pl pt_BR pt ro ru si sk sl sr sv sw tr uk ur vi
-	zh_CN zh_TW
-"
-
-for lingua in ${UNBI_LINGUAS}; do
-	IUSE="${IUSE} l10n_${lingua/_/-}"
-done
-
-S=${WORKDIR}/${P}/src/${PN}
-
-COMMON_DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-"
-BDEPEND="
-	${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	app-arch/p7zip
-	sys-boot/syslinux
-	sys-fs/mtools
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-675-desktop.patch
-	"${WORKDIR}"/${PN}-675-qt5.patch
-)
-
-src_prepare() {
-	default
-
-	# QA check in case linguas are added or removed
-	enum() {
-		echo ${#}
-	}
-	[[ $(enum ${UNBI_LINGUAS}) -eq $(( $(enum $(echo ${PN}_*.ts) ) -1 )) ]] \
-		|| die "Numbers of recorded and actual linguas do not match"
-	unset enum
-
-	# Remove localisations
-	local lingua
-	for lingua in ${UNBI_LINGUAS}; do
-		if ! use l10n_${lingua/_/-}; then
-			sed -i ${PN}.pro -e "/\.*${PN}_${lingua}\.ts.*/d" || die
-			rm ${PN}_${lingua}.ts || die
-		fi
-	done
-	append-cflags -DNOSTATIC
-	append-cxxflags -DNOSTATIC
-}
-
-src_configure() {
-	sed -i -e '/^RESOURCES/d' unetbootin.pro || die
-
-	UNBN_QTPATH="$(qt5_get_bindir)/"
-	"${UNBN_QTPATH}"lrelease ${PN}.pro || die
-
-	eqmake5 ${PN}.pro || die
-}
-
-src_install() {
-	dobin ${PN}
-
-	domenu ${PN}.desktop
-
-	for file in ${PN}*.png; do
-		size="${file/${PN}_}"
-		size="${size/.png}x${size/.png}"
-		insinto /usr/share/icons/hicolor/${size}/apps
-		newins ${file} ${PN}.png
-	done
-
-	local lingua
-	for lingua in ${UNBI_LINGUAS}; do
-		if use l10n_${lingua/_/-}; then
-			insinto /usr/share/${PN}
-			doins ${PN}_${lingua}.qm
-		fi
-	done
-}
diff --git a/sys-boot/unetbootin/unetbootin-677-r1.ebuild b/sys-boot/unetbootin/unetbootin-677-r1.ebuild
deleted file mode 100644
index 0a9a25ac4678..000000000000
--- a/sys-boot/unetbootin/unetbootin-677-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop flag-o-matic qmake-utils xdg-utils
-
-DESCRIPTION="UNetbootin installs Linux/BSD distributions to a partition or USB drive"
-HOMEPAGE="https://github.com/unetbootin/unetbootin"
-SRC_URI="
-	https://github.com/unetbootin/unetbootin/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~jer/${PN}-675-qt5.patch.xz
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-UNBI_LINGUAS="
-	am ar ast be bg bn ca cs da de el eo es et eu fa fi fo fr gl he hr hu id it
-	ja lt lv ml ms nan nb nl nn pl pt_BR pt ro ru si sk sl sr sv sw tr uk ur vi
-	zh_CN zh_TW
-"
-
-for lingua in ${UNBI_LINGUAS}; do
-	IUSE="${IUSE} l10n_${lingua/_/-}"
-done
-
-S=${WORKDIR}/${P}/src/${PN}
-
-COMMON_DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-"
-BDEPEND="
-	${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	app-arch/p7zip
-	sys-boot/syslinux
-	sys-fs/mtools
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-675-desktop.patch
-	"${WORKDIR}"/${PN}-675-qt5.patch
-)
-
-src_prepare() {
-	default
-
-	# QA check in case linguas are added or removed
-	enum() {
-		echo ${#}
-	}
-	[[ $(enum ${UNBI_LINGUAS}) -eq $(( $(enum $(echo ${PN}_*.ts) ) -1 )) ]] \
-		|| die "Numbers of recorded and actual linguas do not match"
-	unset enum
-
-	# Remove localisations
-	local lingua
-	for lingua in ${UNBI_LINGUAS}; do
-		if ! use l10n_${lingua/_/-}; then
-			sed -i ${PN}.pro -e "/\.*${PN}_${lingua}\.ts.*/d" || die
-			rm ${PN}_${lingua}.ts || die
-		fi
-	done
-	append-cflags -DNOSTATIC
-	append-cxxflags -DNOSTATIC
-}
-
-src_configure() {
-	sed -i -e '/^RESOURCES/d' unetbootin.pro || die
-
-	UNBN_QTPATH="$(qt5_get_bindir)/"
-	"${UNBN_QTPATH}"lrelease ${PN}.pro || die
-
-	eqmake5 ${PN}.pro || die
-}
-
-src_install() {
-	dobin ${PN}
-
-	domenu ${PN}.desktop
-
-	for file in ${PN}*.png; do
-		size="${file/${PN}_}"
-		size="${size/.png}x${size/.png}"
-		insinto /usr/share/icons/hicolor/${size}/apps
-		newins ${file} ${PN}.png
-	done
-
-	local lingua
-	for lingua in ${UNBI_LINGUAS}; do
-		if use l10n_${lingua/_/-}; then
-			insinto /usr/share/${PN}
-			doins ${PN}_${lingua}.qm
-		fi
-	done
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/sys-boot/unetbootin/unetbootin-681.ebuild b/sys-boot/unetbootin/unetbootin-700.ebuild
index 4f0db3c3d742..59c833f0e6d9 100644
--- a/sys-boot/unetbootin/unetbootin-681.ebuild
+++ b/sys-boot/unetbootin/unetbootin-700.ebuild
@@ -2,18 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit desktop flag-o-matic qmake-utils xdg-utils toolchain-funcs
 
 DESCRIPTION="UNetbootin installs Linux/BSD distributions to a partition or USB drive"
 HOMEPAGE="https://github.com/unetbootin/unetbootin"
-SRC_URI="
-	https://github.com/unetbootin/unetbootin/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~jer/${PN}-675-qt5.patch.xz
-"
+SRC_URI="https://github.com/unetbootin/unetbootin/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+SLOT="0"
+KEYWORDS="amd64 x86"
 
 UNBI_LINGUAS="
 	am ar ast be bg bn ca cs da de el eo es et eu fa fi fo fr gl he hr hu id it
@@ -27,27 +25,20 @@ done
 
 S=${WORKDIR}/${P}/src/${PN}
 
-COMMON_DEPEND="
+BDEPEND="dev-qt/linguist-tools:5"
+DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
 "
-BDEPEND="
-	${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-"
-RDEPEND="
-	${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	app-arch/p7zip
 	sys-boot/syslinux
 	sys-fs/mtools
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-675-desktop.patch
-	"${WORKDIR}"/${PN}-675-qt5.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-675-desktop.patch )
 
 src_prepare() {
 	default
@@ -68,19 +59,19 @@ src_prepare() {
 			rm ${PN}_${lingua}.ts || die
 		fi
 	done
+
+	sed -i -e '/^RESOURCES/d' unetbootin.pro || die
+
 	append-cflags -DNOSTATIC
 	append-cxxflags -DNOSTATIC
 }
 
 src_configure() {
-	sed -i -e '/^RESOURCES/d' unetbootin.pro || die
-
 	export QMAKE_CXX="$(tc-getCXX)"
 
-	UNBN_QTPATH="$(qt5_get_bindir)/"
-	"${UNBN_QTPATH}"lrelease ${PN}.pro || die
+	"$(qt5_get_bindir)/"lrelease ${PN}.pro || die
 
-	eqmake5 ${PN}.pro || die
+	eqmake5
 }
 
 src_install() {
diff --git a/sys-boot/yaboot-static/Manifest b/sys-boot/yaboot-static/Manifest
index 05da4ea90179..4e1ab72b2a63 100644
--- a/sys-boot/yaboot-static/Manifest
+++ b/sys-boot/yaboot-static/Manifest
@@ -1,9 +1,4 @@
-AUX new-ofpath-devspec.patch 906 BLAKE2B 8bb4fc02a42393db4cb93cf7811acdc9d8919c5d12c9a2a6ab1e725aeab4541d07790c6c44b9977f63ffd99d81e9e6bf1ab4b0a6c23b984226c267faef17304d SHA512 e609c8bf8efc9a131f9706e2c6d9978b4b2759e25d11705dfde06f01954054c0217620db156cd3547284ffbcae5bb19e1adff5dc9c590ada05d716ff2286d203
-AUX sysfs-ofpath.patch 3440 BLAKE2B 958ec56d48fe1e337a2619c791ae72e0e56f3ba5c35b4a74ce015c7ca28884f521381986fc30b78ebe62316256bb6a30dd6968c6eaae0cd04fb27fe1bc39e2a5 SHA512 a4c9f89fb09e116f5f4bd0dfacd8b1d2e5f88733892f3f5041466380d499a2ade6fa0d96a0e7870c94ad1ef94cd7f4c609f6b6886a93e5e1b125c30f86a6a660
-DIST yaboot-static-1.3.14.tbz2 154587 BLAKE2B 258641b2c12bd7877976d7b22b23a15443327f34c7a07bb60675e040e4b9ba1a9deff56d64c391761d2fafbf830fec7172164e0786beb0cd2971179444d3dcd8 SHA512 e175fd3b31c8e26dd7177ab3c995015ebeb34f2877e1e64eabb3cbb21d0cb0e41e9c60c423e07ebb48f43ccd60ff1ff95a2001d0af220531be1bd25e04cf9bdc
-DIST yaboot-static-1.3.16.tbz2 159798 BLAKE2B 8ca04f7c2a43444898c3b057860ccc295c6aa2739fed5aff430563cdfa7395885176a0b8cd8f0e2e00effbd42bcc1f76c6502cf367594c83ffa71f8682dca120 SHA512 9aaf4432764631db923638d11d87868e9774ea6bec875110af1cd21a818c59781b7beebac4848a6a32aa592816fded214f5c6b159ecbd1654a0c6051c42dd580
+AUX new-ofpath-devspec.patch 910 BLAKE2B ad172839b4612e312fde07b51f3bc06b1c49c30c566f98c8a7bf63cd78ac369386e9f5b02f485be0848b65aad7972f641abb0b25655933e5d6a0dfa34c7c91a0 SHA512 468a8f3618ecadd9a2c4c2c64192df43ffb794cdc9575d6260668844f7048b863ab9680997ae77ff2812cc3130d7d9544fdc25229efbf940d4754789b61592c9
 DIST yaboot-static-1.3.17.tbz2 162142 BLAKE2B ddaa1e01c08b926a0fb295e350ba8a80a0b2c5d0cc7a8346d05e7e6c7441b9748f781a82382afcaad770ed04ebd4e3032bd16e605b8ad984b13ab9564500890a SHA512 23caf8d7308aba7402f13fc558e2182f63317fa7cf502899503247d2d2b8741b8327b447a50edce775eed0ea02fed5b675f4b40c8bafd956cbd25662c9f2ad72
-EBUILD yaboot-static-1.3.14-r1.ebuild 889 BLAKE2B 8853377e1f2ad4dfca18c538285d506b751df4ac366fa873a40bb31b8831c61b5678d111f181a878da8b4c1ed9217714f158f1f48e601cc8b8671d36e0068535 SHA512 0b25fbc7e6393c8133c8fe8237d4111648684644924ce50e42a2df333c11c6761f44ee47adca77a426c1c12ae17f686cad3abc10a8f6647d37bf1035f414bfd7
-EBUILD yaboot-static-1.3.16-r1.ebuild 735 BLAKE2B 34acf91b58f497eefaf6e2ef6d27adb45b3e53da8f11f9590974bcce22f3694573a275047e453adf166b7bc3c3b85123f67395cf0c1eb14d054bcd0d5d76b10b SHA512 711bdede68f4f04aef740089f0cdc648075129edd048f75195b96cb214a846f4e00347920f35f5132e2b9af4e64924ad2575b6bec61c7d145fa608fbbd879aa3
-EBUILD yaboot-static-1.3.17-r1.ebuild 801 BLAKE2B be3a689c48eca1faf3d84162b8c9c49c463335991779798bcdc82153e4e60711edeffb3523127ae4b33017dd1835031ab1aae45e175b1e52dd6a2e76fc5553ca SHA512 836ccaba5e466fe89f791167d03a7f9744c3c7a2d5986ee0798f754715a2b21c3dc45f2ba332929882a7a0371f39dd8a7d5f4ef3caae52e8d880dda244d18b7e
+EBUILD yaboot-static-1.3.17-r2.ebuild 797 BLAKE2B 53342aaa52f4bd7b8e2e935f35507aab5113faa61c5da04952c59f71c4382aea71ef46ff1db9cc4fa001bf86f044e363c0a7df841fd68ed4792cdcaae5ae0c93 SHA512 e6590d3d43faf1835fd381f7b4dd67d744b2c11e2fd743261259aaa628535828a8e92f51617a27245ec8aebb55b4f8b85886c9f2cf08386d8ccfb0e68a8bc24c
 MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
diff --git a/sys-boot/yaboot-static/files/new-ofpath-devspec.patch b/sys-boot/yaboot-static/files/new-ofpath-devspec.patch
index f225e8e1bb4b..822173904ad3 100644
--- a/sys-boot/yaboot-static/files/new-ofpath-devspec.patch
+++ b/sys-boot/yaboot-static/files/new-ofpath-devspec.patch
@@ -1,7 +1,7 @@
 Fix the devspec path on newer kernels
 
---- usr/sbin/ofpath
-+++ usr/sbin/ofpath
+--- a/usr/sbin/ofpath
++++ b/usr/sbin/ofpath
 @@ -85,11 +85,20 @@
  [ "$DEBUG" = 1 ] && echo "Devpath is: $DEVPATH"
  
diff --git a/sys-boot/yaboot-static/files/sysfs-ofpath.patch b/sys-boot/yaboot-static/files/sysfs-ofpath.patch
deleted file mode 100644
index 7a3659100495..000000000000
--- a/sys-boot/yaboot-static/files/sysfs-ofpath.patch
+++ /dev/null
@@ -1,105 +0,0 @@
---- usr/sbin/ofpath	2008-08-03 04:00:35.000000000 -0400
-+++ usr/sbin/ofpath	2009-01-09 13:46:12.000000000 -0500
-@@ -337,15 +337,18 @@
- 
- ide_ofpath()
- {
--    if [ ! -L "/proc/ide/$DEVNODE" ] ; then
-+    if [ ! -L "/proc/ide/$DEVNODE" ] && [ ! -e "/sys/block/$DEVNODE" ] ; then
- 	echo 1>&2 "$PRG: /dev/$DEVNODE: Device not configured"
- 	return 1
-     fi
- 
--    local IDEBUS="$(v=`readlink /proc/ide/$DEVNODE` ; echo ${v%%/*} )"
--    if [ -z "$IDEBUS" ] ; then
--	echo 1>&2 "$PRG: BUG: IDEBUS == NULL"
--	return 1
-+    if [ -L "/proc/ide/$DEVNODE" ] ; then
-+    	    local USE_OLD_PROC=1
-+	    local IDEBUS="$(v=`readlink /proc/ide/$DEVNODE` ; echo ${v%%/*} )"
-+	    if [ -z "$IDEBUS" ] ; then
-+		echo 1>&2 "$PRG: BUG: IDEBUS == NULL"
-+		return 1
-+   	 fi
-     fi
- 
-     case "$(uname -r)" in
-@@ -363,7 +366,8 @@
- 		echo 1>&2 "$PRG: Unable to determine sysfs mountpoint"
- 		return 1
- 	    fi
--	    local OF1275IDE="${SYS}/block/${DEVNODE}/device/../../devspec"
-+	    local OF1275IDE=$(cd -P "${SYS}/block/${DEVNODE}/device" && pwd)
-+	    OF1275IDE="${OF1275IDE}/../../devspec"
- 	    ;;
- 	*)
- 	    local OF1275IDE="/proc/ide/$IDEBUS/devspec"
-@@ -402,34 +406,41 @@
- 	    return 1
- 	fi
- 
--	if [ ! -f "/proc/ide/${IDEBUS}/channel" ] ; then
--	    echo 1>&2 "$PRG: KERNEL BUG: /proc/ide/${IDEBUS}/channel does not exist"
--	    return 1
--	fi
--
--	case "$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)" in
--	    ide|ata)
--		local MASTER="/disk@0"
--		local SLAVE="/disk@1"
--		;;
--	    pci-ide|pci-ata)
--		local MASTER="/@$(cat /proc/ide/${IDEBUS}/channel)/disk@0"
--		local SLAVE="/@$(cat /proc/ide/${IDEBUS}/channel)/disk@1"
--		;;
--	    scsi) ## some lame controllers pretend they are scsi, hopefully all kludges are created equal.
--		local MASTER="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 0))"
--		local SLAVE="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 1))"
--		;;
--	    spi)
--		local MASTER="/disk@$(cat /proc/ide/${IDEBUS}/channel),0"
--		local SLAVE="/disk@$(cat /proc/ide/${IDEBUS}/channel),1"
--		;;
--	    *)
--		echo 1>&2 "$PRG: Unsupported IDE device type: \"$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)\""
--		return 1
--		;;
--	esac
-+	
-+	if [ "${USE_OLD_PROC}" = "1" ] ; then
-+		if [ ! -f "/proc/ide/${IDEBUS}/channel" ] ; then
-+		    echo 1>&2 "$PRG: KERNEL BUG: /proc/ide/${IDEBUS}/channel does not exist"
-+		    return 1
-+		fi
- 
-+		case "$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)" in
-+		    ide|ata)
-+			local MASTER="/disk@0"
-+			local SLAVE="/disk@1"
-+			;;
-+		    pci-ide|pci-ata)
-+			local MASTER="/@$(cat /proc/ide/${IDEBUS}/channel)/disk@0"
-+			local SLAVE="/@$(cat /proc/ide/${IDEBUS}/channel)/disk@1"
-+			;;
-+		    scsi) ## some lame controllers pretend they are scsi, hopefully all kludges are created equal.
-+			local MASTER="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 0))"
-+			local SLAVE="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 1))"
-+			;;
-+		    spi)
-+			local MASTER="/disk@$(cat /proc/ide/${IDEBUS}/channel),0"
-+			local SLAVE="/disk@$(cat /proc/ide/${IDEBUS}/channel),1"
-+			;;
-+		    *)
-+			echo 1>&2 "$PRG: Unsupported IDE device type: \"$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)\""
-+			return 1
-+			;;
-+		esac
-+	else
-+	    ### I don't know what other disks would look like... FIXME
-+	    local MASTER="/disk@0"
-+	    local SLAVE="/disk@1"
-+	fi
-+	
- 	case "$DEVNODE" in
- 	    hda|hdc|hde|hdg|hdi|hdk|hdm|hdo)
- 		echo "${DEVSPEC}${MASTER}:$PARTITION"
diff --git a/sys-boot/yaboot-static/yaboot-static-1.3.14-r1.ebuild b/sys-boot/yaboot-static/yaboot-static-1.3.14-r1.ebuild
deleted file mode 100644
index 72f3850f3c17..000000000000
--- a/sys-boot/yaboot-static/yaboot-static-1.3.14-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Generated by using quickpkg on a ppc32 machine, compiled with -O2 -pipe.
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Static yaboot ppc boot loader for machines with open firmware"
-HOMEPAGE="http://yaboot.ozlabs.org/"
-SRC_URI="mirror://gentoo/yaboot-static-${PV}.tbz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ppc ppc64"
-IUSE="ibm"
-
-DEPEND="sys-apps/powerpc-utils"
-RDEPEND="!sys-boot/yaboot
-	!ibm? (
-		sys-fs/hfsutils
-		sys-fs/hfsplusutils
-		sys-fs/mac-fdisk
-	)"
-
-S=${WORKDIR}
-
-QA_PRESTRIPPED="
-	/usr/lib/yaboot/yaboot
-	/usr/lib/yaboot/yaboot.chrp
-	/usr/lib/yaboot/addnote
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/sysfs-ofpath.patch
-}
-
-src_install() {
-	# don't blow away the user's old conf file
-	mv "${WORKDIR}"/etc/yaboot.conf{,.sample} || die
-	cp -pPR "${WORKDIR}"/* "${D}" || die
-}
diff --git a/sys-boot/yaboot-static/yaboot-static-1.3.16-r1.ebuild b/sys-boot/yaboot-static/yaboot-static-1.3.16-r1.ebuild
deleted file mode 100644
index 4ed2be3006cb..000000000000
--- a/sys-boot/yaboot-static/yaboot-static-1.3.16-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Generated by using quickpkg on a ppc32 machine, compiled with -O2 -pipe.
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Static yaboot ppc boot loader for machines with open firmware"
-HOMEPAGE="http://yaboot.ozlabs.org/"
-SRC_URI="mirror://gentoo/yaboot-static-${PV}.tbz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ppc ppc64"
-IUSE="ibm"
-
-DEPEND="sys-apps/powerpc-utils"
-RDEPEND="!sys-boot/yaboot
-	!ibm? (
-		sys-fs/hfsutils
-		sys-fs/hfsplusutils
-		sys-fs/mac-fdisk
-	)"
-
-S=${WORKDIR}
-
-QA_PRESTRIPPED="
-	/usr/lib/yaboot/yaboot
-	/usr/lib/yaboot/yaboot.chrp
-	/usr/lib/yaboot/addnote
-"
-
-src_install() {
-	cp -pPR "${WORKDIR}"/* "${D}" || die
-}
diff --git a/sys-boot/yaboot-static/yaboot-static-1.3.17-r1.ebuild b/sys-boot/yaboot-static/yaboot-static-1.3.17-r2.ebuild
index 531874033bde..cf88b3abb22c 100644
--- a/sys-boot/yaboot-static/yaboot-static-1.3.17-r1.ebuild
+++ b/sys-boot/yaboot-static/yaboot-static-1.3.17-r2.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Generated by using quickpkg on a ppc32 machine, compiled with -O2 -pipe.
 
-EAPI="5"
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Static yaboot ppc boot loader for machines with open firmware"
 HOMEPAGE="http://yaboot.ozlabs.org/"
@@ -16,8 +14,10 @@ SLOT="0"
 KEYWORDS="-* ppc ppc64"
 IUSE="ibm"
 
-DEPEND="sys-apps/powerpc-utils"
-RDEPEND="!sys-boot/yaboot
+DEPEND=""
+RDEPEND="
+	!sys-boot/yaboot
+	sys-apps/ibm-powerpc-utils
 	!ibm? (
 		sys-fs/hfsutils
 		sys-fs/hfsplusutils
@@ -33,7 +33,8 @@ QA_PRESTRIPPED="
 "
 
 src_prepare() {
-	epatch "${FILESDIR}/new-ofpath-devspec.patch"
+	default
+	eapply "${FILESDIR}/new-ofpath-devspec.patch"
 }
 
 src_install() {
diff --git a/sys-boot/yaboot/Manifest b/sys-boot/yaboot/Manifest
index 20c4a13c2b97..bd701d891253 100644
--- a/sys-boot/yaboot/Manifest
+++ b/sys-boot/yaboot/Manifest
@@ -2,18 +2,10 @@ AUX chrpfix.patch 983 BLAKE2B 8b2ecfaf5af26639abb3ed24e3b0cf5fe46e95d17a23e329ed
 AUX e2fsprogs-1.42.13-sysmacros.h.patch 2166 BLAKE2B 48aa9607e048115124f9321aa574ff9c0fb8d094487a964a6b856325e2d378e40f5bf3dd019731f60167ee157c205c3f139bbaf1b14ec84056c79c8d03fb734e SHA512 ebb3731731fa19b0b2a085b9ad2217dfe7502b050ac027fbd4afd86c240630e09b8ad63d37c476ab58d5c1d1658ab651bd5459c450db2a0b4721e2c2b84c3182
 AUX new-ofpath 4319 BLAKE2B 04866ae6446993febf28fd49fd382e6092724640e74e5dc940777dac21ee3acb12722f1e2c90f793f89de5ce97c8ce743a853ad8968e5c86a2a17c5525e0c6f1 SHA512 8095d1e085a38d3c058e750acabaaf58464117f1af03fcc4604e86c58cd305e138b340420d3f1a5da5e3752dea59cc823599a6cc7a585195011f0030f1b80787
 AUX new-ofpath-devspec.patch 940 BLAKE2B d398bb81e62ce4caecc2431657c2429d8fdb76b56c82ea2975784662f8eef52dd5201e98d78343ed6b9a4a3ce29844e4060edf25b24c232d2e7b0afe4e05b616 SHA512 ff3dfa9bb8d79d48d083b618e39ad98b0e6dc26c13986d0187961fcd323c8979439c0b21dc37655e4749db75ba397597c52a9a66b05a41155257219eaa0e660c
-AUX sysfs-ofpath.patch 3432 BLAKE2B 307f737b869ca0de81e638a48b4a7e0d9d597b0dc86cc3680efa6e40561706a8829b0c3a13c7d0f6153345d75d9394a8975131ec1722b8f18f8eb261753efec7 SHA512 e99946565708581ac0c606b4490f129eb7fd3687ef30350c4fd5a184a296cf8803d9ea4429a8c00011e7a491040ac2369185bd56cc327437755ce533e4749e38
-AUX yaboot-1.3.16-memalign.patch 889 BLAKE2B df80c4bd0ed2291dd465822820874ea913693f22eb916a7707bdfbb6ea36fb5592d0f2bdd2c7643fff93f7be9d78431ac6f2f25ad31d110b7a31fe94cc118fae SHA512 d80c9c9d8592f33d39b900c86dbda3a13ec23f8d6b1a6d9612ba59b6c38218b9e41b9f3a3aa01bd39c8b91ae01d7ea4693ae93b0e7cf9c0912f7243e1364820c
 AUX yaboot-1.3.17-nopiessp-gcc4.patch 1229 BLAKE2B a1d8faa966e7e1daa609d4102e5e9a73a429db3d2a762620ed4251a00b52aec4ae939dfce13bed933de29ae1fc0d23774b5fe7206087a58951ad837a3e4420e4 SHA512 32e41b33a1e7109ec0a7ba9ca97ff0d45144d9499aa7657bc93a8007c6c6fa8206a6b406729cbb27407c84ef004b4cdb85e4664d9a4666cbde7700e7b3e82231
-AUX yaboot-nopiessp-gcc4.patch 1355 BLAKE2B 2728cceadba84f37953ed702d09b69a6b11d9320dc97490f145e30bb8845011f9e26d18d909ac2e330512f2651d26d7d0dfdbc85d3d5c45a28ea29d8bc4de16d SHA512 413b2353735d82a81e2831d1e51a995096eadfb3c17feb51b6b75035057557ed8c9adebd58fa1635fcaae36fd25c1783e491b85b4437dfb73e1569cf48a51359
 AUX yaboot-stubfuncs.patch 4610 BLAKE2B e2c8f77d4a0e12a74d9a52b0a410f671509ff1db205f09569108745eab31719218a0cd9d302d6d8471c50b54b458a5752417f5eff42017fa50476632b78b232c SHA512 1acb5a8a054ce469b7f0d7ee7960067a03fb1df0b43cafc7a1c4e9775b27ed7e982028185ebbc564116d51406b8ee7b12357cfab456ac00a26e9415e1da58fb8
 AUX yabootconfig-1.3.13.patch 1655 BLAKE2B bdd8f618bc30706b04adba1664a5414a233f9c32d793b364158a3f9b665872b9f2da3b5f9ac20e13b713280be2f6fb097055095a4d23f2953bff8630f116abdd SHA512 0efcae987f7cc9b93a86bbcbe1e74b3ee6228b0db3937adea1f6c8b2e48c58cab35db80209ae6e79ff3e9f992c374b65a7786adf46787c0bbe400270ae006e98
 DIST e2fsprogs-1.42.13.tar.gz 6511931 BLAKE2B 2f849e82ad366f86d9d166f1901a99a8ac0ddc94471a29fb0de9132ae2ba8f8dc0f4c143acf889afdaa1daf1c57e7bf545a2b4e15ebb8463667f2768a8bc2ebb SHA512 d341790f55c3bff34425369063757280b9ba6ac08f405e14f94f299345ae76c0dc6e90871b746cc98c73467448d888fe5bc029688b5eed5fd22c3c37bf285cd0
-DIST yaboot-1.3.14.tar.gz 219089 BLAKE2B e9f71476502dd61e1e277980eab486b35675f809249e27d72627f6469c75c7ea43740898cc8dc58196bb70d08dce52ef334fcd035ac92c66a4f77236a0371049 SHA512 7542073159a15787e27fd8246fe4c84c48cec5cc6fe76be06f4591bb9ca459ad0c81f0085f08d944745a186da005a5ace0d3d0b2598711ca3309fad1c5a00e74
-DIST yaboot-1.3.16.tar.gz 220360 BLAKE2B e717b101f14b6178f9fdcd4cf45077c1b9c5db91504f8a000710c02d8b35f6094deb590710c09352fcd18385122a1824b99de5600b176c79da0937fa5b287b0b SHA512 9cd98335c8b32787567253e628549fe88af5ebe4b81fb6b99741fbbcc0ae3b44dc4fdad527ed27da00103bc0482d9a33d3f128f542884387f5aa754546624e14
 DIST yaboot-1.3.17.tar.gz 224325 BLAKE2B 41f96266f2342eebbfdc3c0eb64eeaf59e55a31d7388f86839cf9318d231ef808d3aa16fb3b3fdfe85a6fca743e191d064f0ed633723f135a7ca25483e460566 SHA512 da910c4c6ca2de817342bf4dbcefe2857606043e614782581a86bae206cf6cfe5597ad47aea15369feb60e02d8a4f9f4aa3b12863d715c757584c1f4d7ffb9de
-EBUILD yaboot-1.3.14-r2.ebuild 1090 BLAKE2B c0cec53d18160ba535a5efc3f55f552e5b5f266794201d961f03bc1eadeb25b4d6f667e13c49b9a1b8973c03dc8381190c2b2966ad542fae761c4bcd2bce654d SHA512 e400c540823a82924328d46385fcc5aac8b72aa29e7a0f85daf8d9ba7a87461300cc95acb9c01547c0209b4274e28447772e84aa94df18d53108da303eb9b4e3
-EBUILD yaboot-1.3.16.ebuild 1258 BLAKE2B 5c89562628f998bbe0bc5f4850ea6d802b3d28d1018af02d96f8b1d1d6a551e0ee2f7dfc68a9236e251715feae6ea557928981a8d97f5c70ee90e06175e01fac SHA512 447724cc4ad94e30c9cfa1520f599edce8363b127d244ac98c9680089af9a598f330fc33f954adafd764527e5b4bbfb85fcdcdf9ae192c941ab2b039d907a770
-EBUILD yaboot-1.3.17-r2.ebuild 1422 BLAKE2B e396ceaff0619050e0d7516a9fedd9071968f8506dcccf17c71e6572c00fc15da4ee9cab223a21c43ec473a056d773f53835b5d43026fffc85293b83ba8009e9 SHA512 06714ef51cb0a8597a8fd548a53c0c50390e9e6b89eec2bcc307cbb3d2fe88c1c6af98e07cee325d6b84e30aa6a53c5fd4c4d9a4588c7ce9814ee018d1c09c58
-EBUILD yaboot-1.3.17-r3.ebuild 2949 BLAKE2B 4176f85831e53f9b70328a12b671a196f73251f25fedd59b31e402bb6d88544af65d3139039f9cc33faf5b84b35e8f940f7fb0d4fa036dddfee37c4ddff20a93 SHA512 bce038921c863b3df3c74667182c286506eacea2ff83f8a40cce9ca055ba140c40d06af72febd798ed2468ca503465db49e0d17b6f37781c8e39bd165bfd7594
+EBUILD yaboot-1.3.17-r4.ebuild 2953 BLAKE2B ea47761fe654cf8f54f0f46124e2df3c334b9e40e9dcb463de95ea393792bc44a62ad4a87035c48a9522721efd240afa42a3d01c88ef8c9d7caab6e4119b5776 SHA512 a685ab2cf4286c8641564af9b73d4e4dd430082c5124cbed694edbcc59e7a42c9a6b763ddefa86b1d5f8bb2402586f896e11c6246f0b1ce7aae7a622c8d914d4
 MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
diff --git a/sys-boot/yaboot/files/sysfs-ofpath.patch b/sys-boot/yaboot/files/sysfs-ofpath.patch
deleted file mode 100644
index 7ebc0bfac86f..000000000000
--- a/sys-boot/yaboot/files/sysfs-ofpath.patch
+++ /dev/null
@@ -1,105 +0,0 @@
---- ybin/ofpath	2008-08-03 04:00:35.000000000 -0400
-+++ ybin/ofpath	2009-01-09 13:46:12.000000000 -0500
-@@ -337,15 +337,18 @@
- 
- ide_ofpath()
- {
--    if [ ! -L "/proc/ide/$DEVNODE" ] ; then
-+    if [ ! -L "/proc/ide/$DEVNODE" ] && [ ! -e "/sys/block/$DEVNODE" ] ; then
- 	echo 1>&2 "$PRG: /dev/$DEVNODE: Device not configured"
- 	return 1
-     fi
- 
--    local IDEBUS="$(v=`readlink /proc/ide/$DEVNODE` ; echo ${v%%/*} )"
--    if [ -z "$IDEBUS" ] ; then
--	echo 1>&2 "$PRG: BUG: IDEBUS == NULL"
--	return 1
-+    if [ -L "/proc/ide/$DEVNODE" ] ; then
-+    	    local USE_OLD_PROC=1
-+	    local IDEBUS="$(v=`readlink /proc/ide/$DEVNODE` ; echo ${v%%/*} )"
-+	    if [ -z "$IDEBUS" ] ; then
-+		echo 1>&2 "$PRG: BUG: IDEBUS == NULL"
-+		return 1
-+   	 fi
-     fi
- 
-     case "$(uname -r)" in
-@@ -363,7 +366,8 @@
- 		echo 1>&2 "$PRG: Unable to determine sysfs mountpoint"
- 		return 1
- 	    fi
--	    local OF1275IDE="${SYS}/block/${DEVNODE}/device/../../devspec"
-+	    local OF1275IDE=$(cd -P "${SYS}/block/${DEVNODE}/device" && pwd)
-+	    OF1275IDE="${OF1275IDE}/../../devspec"
- 	    ;;
- 	*)
- 	    local OF1275IDE="/proc/ide/$IDEBUS/devspec"
-@@ -402,34 +406,41 @@
- 	    return 1
- 	fi
- 
--	if [ ! -f "/proc/ide/${IDEBUS}/channel" ] ; then
--	    echo 1>&2 "$PRG: KERNEL BUG: /proc/ide/${IDEBUS}/channel does not exist"
--	    return 1
--	fi
--
--	case "$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)" in
--	    ide|ata)
--		local MASTER="/disk@0"
--		local SLAVE="/disk@1"
--		;;
--	    pci-ide|pci-ata)
--		local MASTER="/@$(cat /proc/ide/${IDEBUS}/channel)/disk@0"
--		local SLAVE="/@$(cat /proc/ide/${IDEBUS}/channel)/disk@1"
--		;;
--	    scsi) ## some lame controllers pretend they are scsi, hopefully all kludges are created equal.
--		local MASTER="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 0))"
--		local SLAVE="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 1))"
--		;;
--	    spi)
--		local MASTER="/disk@$(cat /proc/ide/${IDEBUS}/channel),0"
--		local SLAVE="/disk@$(cat /proc/ide/${IDEBUS}/channel),1"
--		;;
--	    *)
--		echo 1>&2 "$PRG: Unsupported IDE device type: \"$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)\""
--		return 1
--		;;
--	esac
-+	
-+	if [ "${USE_OLD_PROC}" = "1" ] ; then
-+		if [ ! -f "/proc/ide/${IDEBUS}/channel" ] ; then
-+		    echo 1>&2 "$PRG: KERNEL BUG: /proc/ide/${IDEBUS}/channel does not exist"
-+		    return 1
-+		fi
- 
-+		case "$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)" in
-+		    ide|ata)
-+			local MASTER="/disk@0"
-+			local SLAVE="/disk@1"
-+			;;
-+		    pci-ide|pci-ata)
-+			local MASTER="/@$(cat /proc/ide/${IDEBUS}/channel)/disk@0"
-+			local SLAVE="/@$(cat /proc/ide/${IDEBUS}/channel)/disk@1"
-+			;;
-+		    scsi) ## some lame controllers pretend they are scsi, hopefully all kludges are created equal.
-+			local MASTER="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 0))"
-+			local SLAVE="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 1))"
-+			;;
-+		    spi)
-+			local MASTER="/disk@$(cat /proc/ide/${IDEBUS}/channel),0"
-+			local SLAVE="/disk@$(cat /proc/ide/${IDEBUS}/channel),1"
-+			;;
-+		    *)
-+			echo 1>&2 "$PRG: Unsupported IDE device type: \"$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)\""
-+			return 1
-+			;;
-+		esac
-+	else
-+	    ### I don't know what other disks would look like... FIXME
-+	    local MASTER="/disk@0"
-+	    local SLAVE="/disk@1"
-+	fi
-+	
- 	case "$DEVNODE" in
- 	    hda|hdc|hde|hdg|hdi|hdk|hdm|hdo)
- 		echo "${DEVSPEC}${MASTER}:$PARTITION"
diff --git a/sys-boot/yaboot/files/yaboot-1.3.16-memalign.patch b/sys-boot/yaboot/files/yaboot-1.3.16-memalign.patch
deleted file mode 100644
index 0fe4e250f292..000000000000
--- a/sys-boot/yaboot/files/yaboot-1.3.16-memalign.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -uNr yaboot/lib/malloc.c yaboot-1.3.16//lib/malloc.c
---- yaboot/lib/malloc.c	2010-07-09 03:18:17.000000000 +0100
-+++ yaboot-1.3.16//lib/malloc.c	2011-01-23 16:57:13.000000000 +0000
-@@ -42,6 +42,37 @@
- 	last_alloc = 0;
- }
- 
-+static char *align_ptr_to(char *ptr, unsigned long align)
-+{
-+	return (char *)((((unsigned long)ptr) + (align - 1UL)) &
-+			~(align - 1UL));
-+}
-+
-+int posix_memalign(void **memptr, unsigned long alignment, unsigned long size)
-+{
-+	char *caddr;
-+
-+	if (alignment & (alignment - 1UL))
-+		return -1;
-+
-+	if (alignment & (sizeof(void *) - 1UL))
-+		return -1;
-+
-+	if (size == 0)
-+	{
-+		*memptr = (void *)0;
-+		return 0;
-+	}
-+
-+	caddr = align_ptr_to(malloc_ptr, alignment);
-+	malloc_ptr = (caddr + size);
-+	last_alloc = caddr;
-+	malloc_ptr = align_ptr_to(malloc_ptr, 8UL);
-+
-+	*memptr = caddr;
-+	return 0;
-+}
-+
- void *malloc (unsigned int size)
- {
-     char *caddr;
diff --git a/sys-boot/yaboot/files/yaboot-nopiessp-gcc4.patch b/sys-boot/yaboot/files/yaboot-nopiessp-gcc4.patch
deleted file mode 100644
index ed1755b72b33..000000000000
--- a/sys-boot/yaboot/files/yaboot-nopiessp-gcc4.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-disable ssp usage in yaboot itself
-
-unfortunately, since we link against external libs that themselves were built
-with ssp turned on, we have to provide stubs to keep the linking from failing
-
---- yaboot-1.3.13/Config.gentoo
-+++ yaboot-1.3.13/Config.gentoo
-@@ -0,0 +1,6 @@
-+check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
-+	then echo "$(1)"; else echo "$(2)"; fi)
-+
-+CFLAGS     += $(call check_gcc, -fno-stack-protector)
-+CFLAGS     += $(call check_gcc, --nopie)
-+
---- yaboot-1.3.13/Makefile
-+++ yaboot-1.3.13/Makefile
-@@ -1,6 +1,7 @@
- ## Setup
- 
- include Config
-+include Config.gentoo
- 
- VERSION = 1.3.13
- # Debug mode (spam/verbose)
-@@ -79,7 +80,7 @@ HOSTCFLAGS = -O2 $(CFLAGS) -Wall -I/usr/
- OBJS = second/crt0.o second/yaboot.o second/cache.o second/prom.o second/file.o \
- 	second/partition.o second/fs.o second/cfg.o second/setjmp.o second/cmdline.o \
- 	second/fs_of.o second/fs_ext2.o second/fs_iso.o second/iso_util.o \
--	lib/nosys.o lib/string.o lib/strtol.o lib/vsprintf.o lib/ctype.o lib/malloc.o lib/strstr.o
-+	lib/nosys.o lib/string.o lib/strtol.o lib/vsprintf.o lib/ctype.o lib/malloc.o lib/strstr.o lib/ssp.o
- 
- ifeq ($(USE_MD5_PASSWORDS),y)
- OBJS += second/md5.o
---- yaboot-1.3.14/lib/ssp.c
-+++ yaboot-1.3.14/lib/ssp.c
-@@ -0,0 +1,2 @@
-+void __stack_chk_fail(void) {}
-+void __stack_chk_fail_local(void) {}
diff --git a/sys-boot/yaboot/yaboot-1.3.14-r2.ebuild b/sys-boot/yaboot/yaboot-1.3.14-r2.ebuild
deleted file mode 100644
index dae3363bec71..000000000000
--- a/sys-boot/yaboot/yaboot-1.3.14-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="PPC Bootloader"
-HOMEPAGE="http://yaboot.ozlabs.org"
-SRC_URI="http://yaboot.ozlabs.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ppc -ppc64"
-IUSE="ibm"
-
-DEPEND="sys-apps/powerpc-utils
-	sys-fs/e2fsprogs[static-libs]"
-RDEPEND="!sys-boot/yaboot-static
-	!ibm? (
-		sys-fs/hfsutils
-		sys-fs/hfsplusutils
-		sys-fs/mac-fdisk
-	)"
-
-src_prepare() {
-	# No need to hardcode this path -- the compiler already knows to use it.
-	sed -i \
-		-e 's:-I/usr/include::' \
-		Makefile || die
-
-	# dual boot patch
-	epatch "${FILESDIR}/yabootconfig-1.3.13.patch"
-	epatch "${FILESDIR}/chrpfix.patch"
-	epatch "${FILESDIR}/yaboot-nopiessp-gcc4.patch"
-	epatch "${FILESDIR}/sysfs-ofpath.patch"
-}
-
-src_compile() {
-	unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
-	emake PREFIX=/usr MANDIR=share/man CC="$(tc-getCC)" LD="$(tc-getLD)"
-}
-
-src_install() {
-	sed -i -e 's/\/local//' etc/yaboot.conf
-	emake ROOT="${D}" PREFIX=/usr MANDIR=share/man install
-}
diff --git a/sys-boot/yaboot/yaboot-1.3.16.ebuild b/sys-boot/yaboot/yaboot-1.3.16.ebuild
deleted file mode 100644
index d7c35c1ef85b..000000000000
--- a/sys-boot/yaboot/yaboot-1.3.16.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="PPC Bootloader"
-HOMEPAGE="http://yaboot.ozlabs.org"
-SRC_URI="http://yaboot.ozlabs.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ppc -ppc64"
-IUSE="ibm"
-
-DEPEND="sys-apps/powerpc-utils
-	sys-fs/e2fsprogs[static-libs]"
-RDEPEND="!sys-boot/yaboot-static
-	!ibm? (
-		sys-fs/hfsutils
-		sys-fs/hfsplusutils
-		sys-fs/mac-fdisk
-	)"
-
-src_unpack() {
-	default
-	cd "${S}"
-	cp "${FILESDIR}/new-ofpath" "${S}/ybin/ofpath"
-}
-
-src_prepare() {
-	# No need to hardcode this path -- the compiler already knows to use it.
-	sed -i \
-		-e 's:-I/usr/include::' \
-		Makefile || die
-
-	# dual boot patch
-	epatch "${FILESDIR}/yabootconfig-1.3.13.patch"
-	epatch "${FILESDIR}/chrpfix.patch"
-	epatch "${FILESDIR}/yaboot-nopiessp-gcc4.patch"
-
-	# e2fsprogs memalign patch
-	epatch "${FILESDIR}/${P}-memalign.patch"
-}
-
-src_compile() {
-	unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
-	emake PREFIX=/usr MANDIR=share/man CC="$(tc-getCC)" LD="$(tc-getLD)"
-}
-
-src_install() {
-	sed -i -e 's/\/local//' etc/yaboot.conf || die
-	emake ROOT="${D}" PREFIX=/usr MANDIR=share/man install
-	mv "${ED}"/etc/yaboot.conf{,.sample} || die
-}
diff --git a/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild b/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild
deleted file mode 100644
index 388d67bca957..000000000000
--- a/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="PPC Bootloader"
-HOMEPAGE="http://yaboot.ozlabs.org"
-SRC_URI="http://yaboot.ozlabs.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ppc -ppc64"
-IUSE="ibm"
-
-DEPEND="sys-apps/powerpc-utils
-	sys-fs/e2fsprogs[static-libs]"
-RDEPEND="!sys-boot/yaboot-static
-	!ibm? (
-		sys-fs/hfsutils
-		sys-fs/hfsplusutils
-		sys-fs/mac-fdisk
-	)"
-
-src_unpack() {
-	default
-	cd "${S}"
-	cp "${FILESDIR}/new-ofpath" "${S}/ybin/ofpath"
-}
-
-src_prepare() {
-	# No need to hardcode this path -- the compiler already knows to use it.
-	# Error only on real errors, for prom printing format compile failure.
-	sed -i \
-		-e 's:-I/usr/include::' \
-		-e 's:-Werror:-Wno-error:g' \
-		Makefile || die
-
-	# dual boot patch
-	epatch "${FILESDIR}/yabootconfig-1.3.13.patch"
-	epatch "${FILESDIR}/chrpfix.patch"
-	epatch "${FILESDIR}/${P}-nopiessp-gcc4.patch"
-	epatch "${FILESDIR}/${PN}-stubfuncs.patch"
-
-	# Fix the devspec path on newer kernels
-	epatch "${FILESDIR}/new-ofpath-devspec.patch"
-}
-
-src_compile() {
-	unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
-	emake PREFIX=/usr MANDIR=share/man CC="$(tc-getCC)" LD="$(tc-getLD)"
-}
-
-src_install() {
-	sed -i -e 's/\/local//' etc/yaboot.conf || die
-	emake ROOT="${D}" PREFIX=/usr MANDIR=share/man install
-	mv "${ED}"/etc/yaboot.conf{,.sample} || die
-}
diff --git a/sys-boot/yaboot/yaboot-1.3.17-r3.ebuild b/sys-boot/yaboot/yaboot-1.3.17-r4.ebuild
index 832df154e076..91ba5ea6797e 100644
--- a/sys-boot/yaboot/yaboot-1.3.17-r3.ebuild
+++ b/sys-boot/yaboot/yaboot-1.3.17-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,13 +20,13 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~ppc -ppc64"
+KEYWORDS="-* ppc -ppc64"
 IUSE="ibm"
 
-DEPEND="
-	sys-apps/powerpc-utils
-"
-RDEPEND="!sys-boot/yaboot-static
+DEPEND=""
+RDEPEND="
+	!sys-boot/yaboot-static
+	sys-apps/ibm-powerpc-utils
 	!ibm? (
 		sys-fs/hfsutils
 		sys-fs/hfsplusutils
author	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
commit	d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree	0625f358789b5e015e49db139cc1dbc9be00428f /sys-boot
parent	2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)