gentoo resync : 13.10.2019

35 files changed, 166 insertions, 831 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 61a318a245c7..fdcb60db1190 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/elilo/Manifest b/sys-boot/elilo/Manifest
index 7c5e799b7f44..91cdeb525edf 100644
--- a/sys-boot/elilo/Manifest
+++ b/sys-boot/elilo/Manifest
@@ -4,19 +4,8 @@ AUX elilo-3.16-strncpy-clash.patch 744 BLAKE2B 421530303406aa819e07883d4b80a27da
 AUX elilo.conf.sample 150 BLAKE2B d823113e1fcdaf08398f09b6fe9b4b2284004be2886799a69fd776bfaab194413c51969c65d1d81607c0a46699e84132b88bdd2a82f6f41a65ae6fbb061d9356 SHA512 3f99527724759f5c03a5f244b957bc6d50ca378f2b66cbcb19f73fa721d2fd76119ae90669e4cce045f5bc66a80d46b21e76e8c4895d23b22df23ec69262b0e0
 AUX elilo.sh-chkspace.patch 833 BLAKE2B 72d99e45c6deff5262ea02bc8417e77e9e1158e5ef921d142f6ea941fc2c2da1b9f3624bd1e9ca6f9debe63f174d0ee55536bd295706c59dc197227739c03316 SHA512 063131fd53866e717d87a4ca23e5f4143cb166480d89312bbf9f5be9540e29930794657f1eb2709559435abceb415b7775e049a1f8d410ae5007dc967fbf9224
 AUX elilo.sh-vmm.patch 2099 BLAKE2B 8bfca9c76e9dc5232e3602013103dc3e26bc29f880287f1204d429878b0e13cc95ff005934bbf06c9f848cd8c7d7a0162e52c827e1ceaa8809d28864e16712ca SHA512 2bbeca88b38790b3821e4ba54c46d194fbb776cf56788634e91da91e028fedb81a38928d0dbbb503cdf1a047c281800aea1d56a2eae47953dbc2203d795862cc
-DIST elilo-3.10.tar.gz 210896 BLAKE2B 843b9b1c3c3ad44406225245663c4ad3febfeb5e890940e25f4a397072cc8e357d1ab57717669095ed3bc296ec9fe9ef7423b52121be385b649e845ec60c792d SHA512 4ec104f2d6a36745689619976e9811b5f5cd0d25be0f613d649ca2ff379e0514ab77c03bb474b32da87d73bd687d3d9faa9f2d07859e4c208b5d5a5a50d47e24
-DIST elilo-3.12-source.tar.gz 215125 BLAKE2B 5dc3c1f48252ac8cba625ff81608e01dfd59a9572ab4e33d0785380beb759bafd38cc20412033443427a0ae0865ec66bb669c5b99b04bbc1fde8e364a19c80b2 SHA512 a9dceb1e03ec1cabcaef696e4d1b8fe8683b0feeef2171781536bc469f8bcd0b3ab9b4460b149bb1bf68c651bce8c7abec5ef4f47e78113a611594a69e91239c
 DIST elilo-3.16-all.tar.gz 485844 BLAKE2B 813762ffef32a640c074973a07d886e0de137be10ff08e9375cd894b0d83dd8bc96cc33f80da1e698db49cc9f105a905abb2fa04048eaca394d3d70e79cb8534 SHA512 4289b45f2e40b2a12167f2efd9a482cf97baedb13fc24813f360f375296d0d3f107d6c980b4b31262816f664a2536353fa124e689cbd65093da9b16fdddaf842
-DIST elilo-nightly_2006-03-14.tgz 168991 BLAKE2B a339e3c39bb3c4068606f66aeafea0be42c4cc9fa6652a06fbcd33b088cac38bc61c35de2240a2bebff2b15f4cbc7f221a90392995ff40099275702d5e6cf8c0 SHA512 8f4bab99c9e823e1755a299e04a5d89b09d74e06a986b9732b2f48bd96c389c54d5af1fb59c4e06fe55dbe80340cfcdf63a9b0c1de1a1ed5cd0a3dd2df5f5fc2
-DIST elilo_3.10-1.diff.gz 26456 BLAKE2B a9fb76241296ce944ab5286a34cbda7e3521f5989541e5f6538423d0fda402020a96d49e927d6a600a757aa32cc656ea6f8bf496ab19db78bfa47e9381aa9b32 SHA512 87e5bea09e66c65f048fab99ca9dfc5f0e61dd48b4ee012b7139d66af92291a79b33e2577139bfa529fd3c303b247a344384614927dfc3c2cff894bb032a3bc6
-DIST elilo_3.12-1.diff.gz 28806 BLAKE2B 0b998f4ed5d5f15d661b65baaf7292b1d4f970b1327ba2fd60b1ec3464d8cb6d74d0d1f255e07bc61cd48cb1a3360cddace8804f7ee89e9035db915a6ca72b6e SHA512 ed3394880ae0dae63a3e6b92ccb2a8251b6fa6bbfda7e45a53fa45a06a899a89b9a760dafd44425b424b0455b7d37d6e8738da2477fae42ebf67a3b038a7e944
 DIST elilo_3.14-3.debian.tar.gz 32179 BLAKE2B 84f8055d3e33b99ce91079768da80a8800c3c2f569ce5619641a983efb943055dfd9a8fb2fda8e5e6d60009ffefbcc1573098f022f06635d4d5304bc3bfddf1e SHA512 b2d5927bf84d61cc432fc916301ddb3be74db16d3e5ba4f13039e2925606b8870991fbb17f837005d8f2b655b7dcd2b2311dfacd7f02183762caf7081ede638f
-DIST elilo_3.6-1.diff.gz 14944 BLAKE2B c982bce4610168408c57beaeca70f7c2be130a75e29b662f5d21ab22097374cc2c8152f24a6eef73039fd6eb365d66c3d4d63f52fe021bb5b126f1932efdaec3 SHA512 962672f516de48f88bd453248d6469a4962fb7551214de9f73125deb64121ab08d123746b2cf8c1c202177f7272aad4cb63e6970f1860c772930bae580817bee
-EBUILD elilo-3.10.ebuild 1889 BLAKE2B a244e16b853675851ebca1ec3610cf42ee7a5b1661038dbd8d0154ef5c3a2322cf111aac206fd468d1239d2450df0cb247444cf6321dcf0b02c450e31a8f5aee SHA512 75ec769c273f6e82aa2309c9417bf696ccd235041a97c8aa3d7d134066628262b49912147fcea2d92a73688290155da988e423d6b1ce876d897612c560224397
-EBUILD elilo-3.12.ebuild 1883 BLAKE2B 929411191803ac913ce5eb3fe343c830ad9532713c484d1d589f2b1a6c549d9de817087dce01b89333ee364861719312b8d0d4dc8e7f0e3ddd96207b947d917a SHA512 5a2f73187dc2c70d5742b2a9e0d18d4d17af029c2621f0171945a5466b47f13b1c07b1dc61f357fecce46e5fce8341c2aeb597e15a2e24cbacaf534f39a68c9b
-EBUILD elilo-3.16-r1.ebuild 2022 BLAKE2B 2b7e34a158bbb348c1468d1e79bfccf885f8479f0d209a36e1f9fff334d52fb5eadbb98082ad75b44e5cae50bc2909fb710aab42fee9f54a7c9e73be7e7faa9f SHA512 428ff3638702d11ff93a19c6b3aeca9c9dab556773a6b6a6b3632ed240ae64a3c6269e48f1466dbaf58ebc23c2eb340cbd98c50b0f7a5b45c3224a17b7ed4110
 EBUILD elilo-3.16-r2.ebuild 2072 BLAKE2B 8f3719a94e45a0e7c49304b1ff2c8bfc1727c8256eaf4b11aa4b5e0dacb4caefe9ddb685da60597e4aa1bd2eaf88e18f2c05380e79b72136ee14cacf3a854fdf SHA512 a6be44876a80bd87401bbab2e69edc53b7dd4c1da05c207c8f9a18240cf5c33cb674ee9017658dc17c4b83f4bec26a30088293d084826b813ed187a5a2a61a01
 EBUILD elilo-3.16-r3.ebuild 2116 BLAKE2B 1bd70b5de2b47767160c9296d7b7dc728441860d392a5056f2b6aa183b644b196093f9b43baf0eca5145f5d0552fec672e65f6b113c6614fc01da2c886dc61d8 SHA512 3df96916f9651460544450d280a66c0d78f402f197af5b2b2c39d1364abd295a5f8566d8cd9c00eea2a9b3222415aec512039f2df1c1fcc1f16fbd6f752a6c5b
-EBUILD elilo-3.16.ebuild 2032 BLAKE2B 12c7a08970bcb568944607fb6f9066d6b4bd19dda8a956f0f98480ddae577dab1cba0566b39c4214fd50b618c6df6d797957cafa7f40ccc1d70540dd7d642f3b SHA512 3eefb2956ce6cd1f5322c7ef537fb04fb9518ffb294361c0a449154adf11729ec7999167754cd034cfcbadb16616324c6866f8356e72e73e4aaf52a4e4f77398
-EBUILD elilo-3.6_p20060314.ebuild 2298 BLAKE2B 6ecc279508387df95baf7f32f155a1c33f7307ed58be58616450c4c936a50c42d1510c1801a5e2573c2a0d7570bbe3b4ee608beee4a3242f4e4c31fd2f70d6cd SHA512 0c7d728b8bdf326f9a1597e73d024f1f3069c301bfe09bedddc02cd4ef395d01ccedcf999ae3327065869c84e482b7f0f028284f48a0af70ea76622c73e2225e
 MISC metadata.xml 337 BLAKE2B 7c9b3e56e9680252631db0691b3acfc2a2cbfee80c42af709979085124a35bb9d184e58de3ef4f88b2f3e6cc873b4ef2bd285ce3fc2645aaa9ae869c3b729d87 SHA512 13691bef927bf7f8a4a6d0640d38dabb53fdae1d8bd986c5fe73c1643e2bdbaaac50bfe864e2185a584fa6265a3197afc5273b60b70675481cef61706dde8d87
diff --git a/sys-boot/elilo/elilo-3.10.ebuild b/sys-boot/elilo/elilo-3.10.ebuild
deleted file mode 100644
index 9ce45ff9f51a..000000000000
--- a/sys-boot/elilo/elilo-3.10.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
-HOMEPAGE="https://sourceforge.net/projects/elilo/"
-SRC_URI="mirror://sourceforge/elilo/${P}.tar.gz"
-SRC_URI="${SRC_URI} mirror://debian/pool/main/e/elilo/elilo_3.10-1.diff.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
-	sys-devel/patch
-	dev-util/patchutils"
-RDEPEND="sys-boot/efibootmgr
-	sys-fs/dosfstools"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	ebegin Applying ../*.diff
-	# Using epatch on this is annoying because it wants to create the elilo-3.6/
-	# directory.  Since all the files are new, it doesn't know better.
-	filterdiff -p1 -i debian/\* ../*.diff | patch -s -p1
-	eend $? || return
-
-	# Now Gentooize it
-	sed -i "
-		1s:/bin/sh:/bin/bash:;
-		s/##VERSION##/$PV/;
-		s/Debian GNU\//Gentoo /g;
-		s/Debian/Gentoo/g;
-		s/debian/gentoo/g;
-		s/dpkg --print-installation-architecture/uname -m/" debian/elilo.sh
-}
-
-src_compile() {
-	local iarch
-	case $(tc-arch) in
-		ia64) iarch=ia64 ;;
-		x86)  iarch=ia32 ;;
-		amd64) iarch=x86_64 ;;
-		*)    die "unknown architecture: $(tc-arch)" ;;
-	esac
-
-	# "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.
-	emake -j1 prefix= CC="$(tc-getCC)" ARCH=${iarch} || die "emake failed"
-}
-
-src_install() {
-	exeinto /usr/lib/elilo
-	doexe elilo.efi || die "elilo.efi failed"
-
-	newsbin debian/elilo.sh elilo || die "elilo failed"
-	dosbin tools/eliloalt || die "eliloalt failed"
-
-	insinto /etc
-	newins "${FILESDIR}"/elilo.conf.sample elilo.conf
-
-	dodoc docs/* "${FILESDIR}"/elilo.conf.sample
-	doman debian/*.[0-9]
-}
diff --git a/sys-boot/elilo/elilo-3.12.ebuild b/sys-boot/elilo/elilo-3.12.ebuild
deleted file mode 100644
index 4a47ac7a1915..000000000000
--- a/sys-boot/elilo/elilo-3.12.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
-HOMEPAGE="https://sourceforge.net/projects/elilo/"
-SRC_URI="mirror://sourceforge/elilo/${P}-source.tar.gz"
-SRC_URI="${SRC_URI} mirror://debian/pool/main/e/elilo/elilo_3.12-1.diff.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
-	sys-devel/patch
-	dev-util/patchutils"
-RDEPEND="sys-boot/efibootmgr
-	sys-fs/dosfstools"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	ebegin Applying ../*.diff
-	# Using epatch on this is annoying because it wants to create the elilo-3.6/
-	# directory.  Since all the files are new, it doesn't know better.
-	filterdiff -p1 -i debian/\* ../*.diff | patch -s -p1
-	eend $? || return
-
-	# Now Gentooize it
-	sed -i "
-		1s:/bin/sh:/bin/bash:;
-		s/##VERSION##/$PV/;
-		s/Debian GNU\//Gentoo /g;
-		s/Debian/Gentoo/g;
-		s/debian/gentoo/g;
-		s/dpkg --print-architecture/uname -m/" debian/elilo.sh
-}
-
-src_compile() {
-	local iarch
-	case $(tc-arch) in
-		ia64) iarch=ia64 ;;
-		x86)  iarch=ia32 ;;
-		amd64) iarch=x86_64 ;;
-		*)    die "unknown architecture: $(tc-arch)" ;;
-	esac
-
-	# "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.
-	emake -j1 prefix= CC="$(tc-getCC)" ARCH=${iarch} || die "emake failed"
-}
-
-src_install() {
-	exeinto /usr/lib/elilo
-	doexe elilo.efi || die "elilo.efi failed"
-
-	newsbin debian/elilo.sh elilo || die "elilo failed"
-	dosbin tools/eliloalt || die "eliloalt failed"
-
-	insinto /etc
-	newins "${FILESDIR}"/elilo.conf.sample elilo.conf
-
-	dodoc docs/* "${FILESDIR}"/elilo.conf.sample
-	doman debian/*.[0-9]
-}
diff --git a/sys-boot/elilo/elilo-3.16-r1.ebuild b/sys-boot/elilo/elilo-3.16-r1.ebuild
deleted file mode 100644
index 96b2860daf60..000000000000
--- a/sys-boot/elilo/elilo-3.16-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs eutils multilib
-
-DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
-HOMEPAGE="https://sourceforge.net/projects/elilo/"
-SRC_URI="mirror://sourceforge/elilo/${P}-all.tar.gz
-	mirror://debian/pool/main/e/elilo/elilo_3.14-3.debian.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
-IUSE=""
-
-# gnu-efi contains only static libs, so there's no run-time dep on it
-DEPEND=">=sys-boot/gnu-efi-3.0g
-	dev-util/patchutils"
-# dosfstools[compat] to enable 'dosfsck' symlink
-RDEPEND="sys-boot/efibootmgr
-	sys-fs/dosfstools[compat]"
-
-S="${WORKDIR}/${P}-source"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.16-elilo-loop.patch #299665
-)
-
-src_unpack() {
-	unpack ${A} ./${P}-source.tar.gz
-	mv debian "${S}"/ || die
-}
-
-src_prepare() {
-	default
-
-	case $(tc-arch) in
-	ia64)  iarch=ia64 ;;
-	x86)   iarch=ia32 ;;
-	amd64) iarch=x86_64 ;;
-	*)     die "unknown architecture: $(tc-arch)" ;;
-	esac
-
-	# Now Gentooize it.
-	sed -i \
-		-e '1s:/bin/sh:/bin/bash:' \
-		-e "s:##VERSION##:${PV}:" \
-		-e 's:Debian GNU/:Gentoo :g' \
-		-e 's:Debian:Gentoo:g' \
-		-e 's:debian:gentoo:g' \
-		-e "s:dpkg --print-architecture:echo ${iarch}:" \
-		debian/elilo.sh || die
-}
-
-src_compile() {
-	# "prefix" on the next line specifies where to find gcc, as, ld,
-	# etc.  It's not the usual meaning of "prefix".  By blanking it we
-	# allow PATH to be searched.
-	local libdir="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
-	emake -j1 \
-		prefix= \
-		AS="$(tc-getAS)" \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		HOSTARCH=${iarch} \
-		ARCH=${iarch} \
-		EFIINC="${SYSROOT}${EPREFIX}/usr/include/efi" \
-		GNUEFILIB="${libdir}" \
-		EFILIB="${libdir}" \
-		EFICRT0="${libdir}"
-}
-
-src_install() {
-	exeinto /usr/lib/elilo
-	doexe elilo.efi
-
-	newsbin debian/elilo.sh elilo
-	dosbin tools/eliloalt
-
-	insinto /etc
-	newins "${FILESDIR}"/elilo.conf.sample elilo.conf
-
-	dodoc docs/* "${FILESDIR}"/elilo.conf.sample
-	doman debian/*.[0-9]
-}
diff --git a/sys-boot/elilo/elilo-3.16.ebuild b/sys-boot/elilo/elilo-3.16.ebuild
deleted file mode 100644
index 7f215a841415..000000000000
--- a/sys-boot/elilo/elilo-3.16.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-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"
-RDEPEND="sys-boot/efibootmgr
-	sys-fs/dosfstools"
-
-S="${WORKDIR}/${P}-source"
-
-src_unpack() {
-	unpack ${A} ./${P}-source.tar.gz
-	mv debian "${S}"/ || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.16-elilo-loop.patch #299665
-
-	# The patches Debian had were merged upstream.
-	#epatch debian/patches/*.diff
-
-	case $(tc-arch) in
-	ia64)  iarch=ia64 ;;
-	x86)   iarch=ia32 ;;
-	amd64) iarch=x86_64 ;;
-	*)     die "unknown architecture: $(tc-arch)" ;;
-	esac
-
-	# Now Gentooize it.
-	sed -i \
-		-e '1s:/bin/sh:/bin/bash:' \
-		-e "s:##VERSION##:${PV}:" \
-		-e 's:Debian GNU/:Gentoo :g' \
-		-e 's:Debian:Gentoo:g' \
-		-e 's:debian:gentoo:g' \
-		-e "s:dpkg --print-architecture:echo ${iarch}:" \
-		debian/elilo.sh || die
-}
-
-src_compile() {
-	# "prefix" on the next line specifies where to find gcc, as, ld,
-	# etc.  It's not the usual meaning of "prefix".  By blanking it we
-	# allow PATH to be searched.
-	local libdir="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
-	emake -j1 \
-		prefix= \
-		AS="$(tc-getAS)" \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		HOSTARCH=${iarch} \
-		ARCH=${iarch} \
-		EFIINC="${SYSROOT}${EPREFIX}/usr/include/efi" \
-		GNUEFILIB="${libdir}" \
-		EFILIB="${libdir}" \
-		EFICRT0="${libdir}"
-}
-
-src_install() {
-	exeinto /usr/lib/elilo
-	doexe elilo.efi
-
-	newsbin debian/elilo.sh elilo
-	dosbin tools/eliloalt
-
-	insinto /etc
-	newins "${FILESDIR}"/elilo.conf.sample elilo.conf
-
-	dodoc docs/* "${FILESDIR}"/elilo.conf.sample
-	doman debian/*.[0-9]
-}
diff --git a/sys-boot/elilo/elilo-3.6_p20060314.ebuild b/sys-boot/elilo/elilo-3.6_p20060314.ebuild
deleted file mode 100644
index b9c3295daa68..000000000000
--- a/sys-boot/elilo/elilo-3.6_p20060314.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
-HOMEPAGE="https://sourceforge.net/projects/elilo/"
-if [[ $PV == *_p* ]] ; then
-	MY_P=${PV#*_p}
-	MY_P=${PN}-nightly_${MY_P:0:4}-${MY_P:4:2}-${MY_P:6:2}
-	SRC_URI="http://elilo.sourceforge.net/nightlies/${MY_P}.tgz"
-	S=${WORKDIR}/elilo
-else
-	MY_P=${P}
-	SRC_URI="mirror://sourceforge/elilo/${P}.src.tgz"
-fi
-SRC_URI="${SRC_URI} mirror://debian/pool/main/e/elilo/elilo_3.6-1.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ia64"
-IUSE=""
-
-# gnu-efi contains only static libs, so there's no run-time dep on it
-DEPEND=">=sys-boot/gnu-efi-3.0
-	sys-devel/patch
-	dev-util/patchutils"
-RDEPEND="sys-boot/efibootmgr
-	sys-fs/dosfstools"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	ebegin Applying ../*.diff
-	# Using epatch on this is annoying because it wants to create the elilo-3.6/
-	# directory.  Since all the files are new, it doesn't know better.
-	filterdiff -p1 -i debian/\* ../*.diff | patch -s -p1
-	eend $? || return
-
-	# Add patch for vmm support, from
-	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=350185
-	epatch "${FILESDIR}"/elilo.sh-vmm.patch
-
-	# Don't count files twice when summing bytesneeded
-	epatch "${FILESDIR}"/elilo.sh-chkspace.patch
-
-	# Now Gentooize it
-	sed -i "
-		1s/sh/bash/;
-		s/##VERSION##/$PV/;
-		s/Debian GNU\//Gentoo /g;
-		s/Debian/Gentoo/g;
-		s/debian/gentoo/g;
-		s/dpkg --print-installation-architecture/uname -m/" debian/elilo.sh
-}
-
-src_compile() {
-	local iarch
-	case $(tc-arch) in
-		ia64) iarch=ia64 ;;
-		x86)  iarch=ia32 ;;
-		*)    die "unknown architecture: $(tc-arch)" ;;
-	esac
-
-	# "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.
-	emake -j1 prefix= CC="$(tc-getCC)" ARCH=${iarch} || die "emake failed"
-}
-
-src_install() {
-	exeinto /usr/lib/elilo
-	doexe elilo.efi || die "elilo.efi failed"
-
-	newsbin debian/elilo.sh elilo || die "elilo failed"
-	dosbin tools/eliloalt || die "eliloalt failed"
-
-	insinto /etc
-	newins "${FILESDIR}"/elilo.conf.sample elilo.conf
-
-	dodoc docs/* "${FILESDIR}"/elilo.conf.sample
-	doman debian/*.[0-9]
-}
diff --git a/sys-boot/gnu-efi/Manifest b/sys-boot/gnu-efi/Manifest
index f27690ff14cb..045695dbffc7 100644
--- a/sys-boot/gnu-efi/Manifest
+++ b/sys-boot/gnu-efi/Manifest
@@ -1,5 +1,6 @@
 AUX gnu-efi-3.0.6-ia64-gnu-hash.patch 4635 BLAKE2B b7e39832239e2a1be389fd6fa9e412804779d0a82a78ca50a21b139757f71973c418e7086cd89c2bbc457f1cbadf15e801152f85f27ec15164558f1bd6550cd1 SHA512 5cd62b5b114956fa37a3998fa79d9ddd4495a3621078d2d6972b2a784dfc69893fd42bbb096e253388baf49c84b0c16ae461c7eee61dd4b172207f48ca1ceb89
 AUX gnu-efi-3.0.6-ia64-setjmp.patch 3964 BLAKE2B 1475a5f188e86837303e1b91de3c37e06d95f67e8a67b8ddbc3d542df49791d9433601ca21f23c43fb57be98f68294385b2c2b0db67ce5f2b71eef55eee0adfe SHA512 146002da1ccb3a8d9b7430e52cafbf67c33691e0cbad443ef59ea6b7f604d04c82796c977977f64227c13d40d071eff8e0cb89f1d7d88d498fcc16871757b778
+AUX gnu-efi-3.0.9-fix-clang-build.patch 691 BLAKE2B 5b3f60e27982cd9e2cfb385851af4840d0301c1fb590d34b029e18a239a232ecca6a62431e10138d4e12cb44a5f64b415936935c1bdaf601dcf605ebe892de54 SHA512 1f77f4a5dcd2f1589cd6950da3462f2508d0ac51c2d2268400414c336ddd41fcf430e79fb702fd5aa99cb4be0bf0fc6eabe9362d736a1223b1c53c2c0b319584
 DIST gnu-efi-3.0.2.tar.bz2 136134 BLAKE2B ccdbd1f14c938a89fcf6d43f139ce644b562fd882a6f3ce2ce7ce703fd95c02870016da252a3f75c7117838c23a8ac8527d4ca919c125b639f86734a0ee2c8f6 SHA512 960dc0374dd63dea5eb25e2bf6670d3f7474ebeca2090514c2895b28ff6e058a852958d028eadbe156df4645bd04d1a93ffaae1153861fce6e7da72f8f9dbeec
 DIST gnu-efi-3.0.3.tar.bz2 142229 BLAKE2B 5230e99358fc2c1a85fd56840a9ddbd4d1cb42d15a8c37dd44e87037e45a1033f1014c953b5a4d2bb565c4be5aa67a3982ca64e575aaae9c1ae64ce27659b642 SHA512 0b0582e22344ea8a544aba540b56dc36364febfeb5bb655e87277e638fd4e549214a0cd2079a852d15ee376cd51c33794f65a7efb23be9a7a929e889cd616c8c
 DIST gnu-efi-3.0.6.tar.bz2 152088 BLAKE2B 2cb1d72f6972a86e913fba28a86e95a1b0baf15251d8fa3d4c335a13e5fd929b61f8f421330acbddbc640efd63594713180b7fc3e623fda2397947538a25b795 SHA512 f1b17766d8ae000c0177ea2126d87883f254ab01ac020e4bfaa9ad2d3d60a66d07b6237d9842e5989c4da3fd23152b5c592ef863fdc9806901f43c43582a2258
@@ -10,5 +11,5 @@ EBUILD gnu-efi-3.0.3.ebuild 1732 BLAKE2B 9c453d8e28059d16832adaee14ba34baf6e1b6c
 EBUILD gnu-efi-3.0.6-r1.ebuild 1952 BLAKE2B 4a3d25ffb976a44fcec62c4a3aa5e80930d3abd9e486f81e74be27fbc92ad77fe27f24af4851747a80bccf586aa4353b857dba765394b7c7ca53e061b499ed54 SHA512 6e85f076b29bb3ae7a528a3d0a406ea9c26d87a481bcf9285bab0db11ffa24922d04eaec23ddaaeec577492794e7b8c01a55a4aaa406996f309809540150140f
 EBUILD gnu-efi-3.0.6-r2.ebuild 1959 BLAKE2B 74364ba53da292593203a47af9d4960046a9b79291979b1d92ebbfe83a695a0821ceec67dabb0a53a823a78a34e04bd0680c7e87e44c336891a1a29f808dd38a SHA512 fa013637c4c044381f98f655232860e6eb2e0000a620b8499484fe99a94751cdace1a33182e26f7784c16f365cf21f6ee74ab1dbce7a1cb06f1ca9b8612354bc
 EBUILD gnu-efi-3.0.8.ebuild 1869 BLAKE2B d4b29aff719601e1b2135b12aac2e630a06b9d02ede87cbb84611c7708a7dced61092e52eea0197a9938bad8dcbbc8b053418dd928a3852a2115dbf93ee92ffd SHA512 e00b182cdf37f15a0a90062a99b750a06eae0999559bdedc63b5ac0ca4954211ebc760ece24596e52c533621d1d9502d3999db902653bbf134babfdc0ab7b571
-EBUILD gnu-efi-3.0.9.ebuild 1826 BLAKE2B 18f6f08ada5dcc3d456af86a14feb343da66fd29edd8aa64024be7f74135ff9d3834276f00237e0d04a1c6cc00d718b6bc2a704d70dccfc782087ed0e7f08d95 SHA512 dded0d63819b84689c34472e3b9e11f2add2c5c20a72be27474893d6a68534db831a60d5d5ffe183a63c7d9846bc53fd1b892dec318dbeff7ca495224c4f2812
+EBUILD gnu-efi-3.0.9.ebuild 1887 BLAKE2B c897a9466dd2884bd33ea1abe740b468d938a0f0844d713e34a8183b682b642c2cc969f5a6a67c3f619b1bc42ad6cf469be44e0407ce43a6f17733b797a5ad7b SHA512 9a2a75d2ee2c72ea190520e1c0e99d3cc7a6fee029b5ae522b64c844bbb1cde69dc0739034b92fedbe8babff4578e83291543e528ec506b9a58eb20e8d1488d3
 MISC metadata.xml 446 BLAKE2B ed77ce0b04fab42aad08921e9365b866a3d64d5192a569ad161e0415a2bbe1e9b374a48e1b2357331cf9743fc082a22c6b68081bddaa6b783e5cc78c4df394c2 SHA512 114721b7dc26234a2bce0ab65f2513f5bdd4749fd8fc5beb9619dc449bde13c82c88716d3e9b94a192d4298019255fff1aa32beaa15b643490fdbc25e75d83f8
diff --git a/sys-boot/gnu-efi/files/gnu-efi-3.0.9-fix-clang-build.patch b/sys-boot/gnu-efi/files/gnu-efi-3.0.9-fix-clang-build.patch
new file mode 100644
index 000000000000..0e4ec7d77b0c
--- /dev/null
+++ b/sys-boot/gnu-efi/files/gnu-efi-3.0.9-fix-clang-build.patch
@@ -0,0 +1,19 @@
+Bug: https://bugs.gentoo.org/695612
+Upstream: https://sourceforge.net/p/gnu-efi/patches/70/
+
+--- a/Make.defaults
++++ b/Make.defaults
+@@ -110,10 +110,10 @@
+                             || ( [ $(GCCVERSION) -eq "4" ]      \
+                                  && [ $(GCCMINOR) -ge "7" ] ) ) \
+                           && echo 1)
+-  ifeq ($(GCCNEWENOUGH),1)
+-    CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11
+-  else ifeq ($(USING_CLANG),clang)
++  ifeq ($(USING_CLANG),clang)
+     CPPFLAGS += -DGNU_EFI_USE_MS_ABI --std=c11
++  else ifeq ($(GCCNEWENOUGH),1)
++    CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11
+   endif
+ 
+   CFLAGS += -mno-red-zone
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.9.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.9.ebuild
index fa23e18d91de..57a9ed662e5b 100644
--- a/sys-boot/gnu-efi/gnu-efi-3.0.9.ebuild
+++ b/sys-boot/gnu-efi/gnu-efi-3.0.9.ebuild
@@ -24,9 +24,11 @@ IUSE="abi_x86_32 abi_x86_64 custom-cflags"
 QA_EXECSTACK="usr/*/lib*efi.a:* usr/*/crt*.o"
 RESTRICT="strip"
 
+PATCHES=( "${FILESDIR}"/${PN}-3.0.9-fix-clang-build.patch )
+
 src_prepare() {
-	sed -i -e "s/-Werror//" Make.defaults || die
 	default
+	sed -i -e "s/-Werror//" Make.defaults || die
 }
 
 efimake() {
diff --git a/sys-boot/milo/Manifest b/sys-boot/milo/Manifest
index 964eaab8f0c0..aed727eeec74 100644
--- a/sys-boot/milo/Manifest
+++ b/sys-boot/milo/Manifest
@@ -9,5 +9,5 @@ DIST linload.exe 7168 BLAKE2B 393696c987b771a75c5c0a04a6f82999189ecb60067464e807
 DIST linux-2.2.20-reiserfs-3.5.35.diff.bz2 154943 BLAKE2B 6226321438bed88bc31fb151a28157dda811a2c7ce6c543564f2ef183489b20f2b7f6df903f63aadaa8196ba10bd54df4c7069e448bb456474bccf64770a666e SHA512 b63d03d605d65cb7a15020ad38b80d77b810963edbdc0b5ccaf1706347de5026e390d8c2a5315f1d2734b793903c1a407b4db4129d11b7d5ff2ad9dc8f2137aa
 DIST linux-2.2.25.tar.bz2 15791211 BLAKE2B 5b4b416c41b2277c4e509e7c0003d1ba0bd26e1bbb03a30bdb9d44f9211f6edb593bbca158379ea565e2f35d01e128590971ea85220baec06c23ae15e3942f1b SHA512 63e83f4f184cdd09f39c24e2023fce3562ea550db7182ae94e36ce30c6b2415bac970306cd60c1d1a89a1a3b54ad957094629557a5782f181939efb219ad41bb
 DIST milo-2.2-18.tar.bz2 1074725 BLAKE2B 7e7cac8ec2ee8246f21f5ea0f1d497dd6234ed67dad0a340e0183abec2f7a4f694b48eb87ba65ef97e967918c55c9fbfdd56e502f21fc47f8d053d0353758f1c SHA512 1ccc86c83d520d07040ba44d14e7e9353cf364bf5b83ba4df14b0560769643ce07f89feeab468144fe17b7bf482beb7480f5dad1a0e9b574e6e6150bb72aae93
-EBUILD milo-2.4.18.ebuild 7757 BLAKE2B a5fb1c86cd61c8b675e335bf3237a883b477dc21c43df70f1276f07d571a4585a4f7567d8b0d478387a4e93f4867e6ff8c6f8d4fb6305b2044606844672b50a7 SHA512 f567bdee9db02399da4a37f417eb7c300c0c37762a0d2bd968db50a7acdd196dceb0dcfcc1ec1e648f08a79941972481f6a513dcade12a695bd524093d5c28c6
+EBUILD milo-2.4.18.ebuild 7768 BLAKE2B bcc70d17eebc89c939ee01e4f9c8218eea907b84fbf3ac2ff5fcfc27834e777b16e879c4f2711c8e58c28db23529432bcdbdc0a832fdb43c26152fb7fc93e6a3 SHA512 6c89552725710f5d6950d41e372d864a0e5b7d917f6371dd6872cadf5208ac3500a7e53b6a9017951d357ca8641ffd19a0100ea29d375663a502bcfa9b6e4dc1
 MISC metadata.xml 790 BLAKE2B 42f47c69e6f217979fae90801776a4c649167a2033aa378e3abfdc41a379c445324a469e0546ae6b43f19ccf6f1f910da030c32fbce81f9eba9cf2d3b9c0f20f SHA512 513614f6b5be1bdca2676a618b1f1c6b70506ced43da83fe92b75876f88b7439e1a13b83e3a0252cffc1b1de09914f67276ea0cc239ee3c2efca108fb2a1b700
diff --git a/sys-boot/milo/milo-2.4.18.ebuild b/sys-boot/milo/milo-2.4.18.ebuild
index e34f2de4ec80..3902314970fb 100644
--- a/sys-boot/milo/milo-2.4.18.ebuild
+++ b/sys-boot/milo/milo-2.4.18.ebuild
@@ -27,7 +27,7 @@ ldmilo_patch="20010430"
 # linload.exe :- linload utility (ldmilo equivalent for non-ruffians).
 
 SRC_URI="http://www.suse.de/~stepan/source/milo-${milo_version}.tar.bz2
-	mirror://kernel/linux/kernel/v2.2/linux-${kernel_version}.tar.bz2
+	https://www.kernel.org/pub/linux/kernel/v2.2/linux-${kernel_version}.tar.bz2
 	https://dev.gentoo.org/~taviso/milo/ldmilo-patched-${ldmilo_patch}
 	http://ftp.namesys.com/pub/reiserfs-for-2.2/linux-2.2.20-reiserfs-3.5.35.diff.bz2
 	https://dev.gentoo.org/~taviso/milo/linload.exe
diff --git a/sys-boot/palo/Manifest b/sys-boot/palo/Manifest
index 95763ba1b6d9..4227da4b8fc0 100644
--- a/sys-boot/palo/Manifest
+++ b/sys-boot/palo/Manifest
@@ -1,11 +1,7 @@
 AUX 99palo 19 BLAKE2B 6c0aef7b3b54456a283f112c2046ae8d4d99633c8a7ac943d1a8f826275d6521ed1d4ca2c3fa166a50cb4fbdbf06c9f948907b967012d8d886a123752ffc7c71 SHA512 1ca106eff8f34386b5fa6bd9f0bfb656567040a2d3bc18de8f6913c3b533369f7c267932904556517f599674226feec8a09df6965bc8f844cb7ca873f5f5d174
 AUX palo-2.00-toolchain.patch 532 BLAKE2B ef8df5bd7874ac88aa27b2864ee0baeb57e470e65bf39f9d33f19f42961f928f6a6e3ec69665750a0d1d90c66a4ab8479beb0d653a9e6a930d03b2bfadb8d65b SHA512 1c92b555f1456623e8657b33067693e4e13bbbbbebd55b13f2f6c86615133a39789cf323601993ffbcfac6c7f9e322ea4a1422f5663083d0b07f7efcdab34ab4
 AUX palo.conf 260 BLAKE2B 1e81466dcecedc4ca1894863491f4c91e88becc9a5c5815e69028eeadc98ca61e99951fb754a8261a6cdb763aaa22201ae77f65fd4de07bbbd3f3c801322e277 SHA512 4147e480362161cd61ad9af8fb7048b87f9126c213661ab26f77ba98fe7f1acd03791b154667137e4a265e3c31e54e703d32daa86ff0805f47bc7c1b8b03cfe6
-DIST palo-2.00.tar.gz 124484 BLAKE2B b46b616acf51534382f6a775b456cdcbd4771d6bc9d7a8339ad788a5c5a4a333e98a6e4815c40a6750408b1e8168a19800da11ddf7125621f77d478a651d9c75 SHA512 b6dab81e6c2641a64a40561a65b5412ee702136ac79dab94619e0094faf011e158c67e681f45d5aa51423f5f162da7c1fd07b391b58e8a2100e1306eb7148056
-DIST palo-2.11.tar.gz 129144 BLAKE2B 25ea9462e7a87da333ace52be624aab65cc1fa4d20848bdec4ba1cea468b3ecd850dd7ceb936e9f2bd5761add766df65d054dc1b5d3f9cee991e9b3e4ddf864a SHA512 26e989ce0c652d6fafdc98d3ab3564d4adc5c943e3d44b0275beb8c385ad52cad0a29ad360e4992fb35c0f2036e29d3eee9b8f6594a53eaea9c3b973a60d9029
 DIST palo-2.12.tar.gz 124911 BLAKE2B 79fa572e118e77114dcb3b888abc65163bd56cb44cf69cd25bcaa33a7c6151b8254bf00c459ad17ca1d948f9b440378133f048e2add123a757908c108b802703 SHA512 6ea20490b84bf18a1d1e8037de453f5f480cba8403b267d4d63fceceffb39e18545c6d20c8dd7b07044ff5567eedd2c58b2a626971b53d1d35c5b3a4e8fefbf0
-EBUILD palo-2.00.ebuild 882 BLAKE2B 1dd41909eccd63f451b5e244d5cb6aef7ea70b51a2a59c70f2fda1e260ce103d43326c551efc703efccebd2fd7507d913ecbed06a18a0924fb4a9db003f7a449 SHA512 d58a792304194d3d8a5ff652292f3a4d990ea058c9f1b9b50063620fe1b686e8abc23a4e30c378f6db87622ed4b31e7c04b21837a562c68d3f832ccd9b7edd93
-EBUILD palo-2.11.ebuild 860 BLAKE2B e3f78d1c29436f352f5b82ee77ab8df66e62090e737a4aac8448529de724788b316877028c032c8dfb5cab0a844a6759c28f7042889891a296fbaefbf77f9975 SHA512 9b9b7d6a95b32375387f199cc4b92bed2ffc5a01053a06d33b2d2dd774795c325a634a4fd3ef9fffe008f5e8269a639d2b31be41a335e572588b8089a40cd0b4
-EBUILD palo-2.12.ebuild 860 BLAKE2B e3f78d1c29436f352f5b82ee77ab8df66e62090e737a4aac8448529de724788b316877028c032c8dfb5cab0a844a6759c28f7042889891a296fbaefbf77f9975 SHA512 9b9b7d6a95b32375387f199cc4b92bed2ffc5a01053a06d33b2d2dd774795c325a634a4fd3ef9fffe008f5e8269a639d2b31be41a335e572588b8089a40cd0b4
+EBUILD palo-2.12.ebuild 859 BLAKE2B 44ac9f154f4af661a6746fb892f9fc2870fe997534a9a9ecb382a4b4acf5cb9ade541f137f2da6e576d1243b7453bf85e988769eaea85cdabc38d5fcd0949f1c SHA512 17ed21c31aea4b5849d201c7fc587d027a8f64a725de72ba6eedaaa65a190b7c1ad3b0c093504bfb09b4ab46a03084f28e4ecd22b43828f68fffd017515ddc5e
 EBUILD palo-9999.ebuild 947 BLAKE2B 16b35ad0d3a63090cafe43747ccdefb093dade8a9c645bd7d8b1da7c3e9a211694983cc98692926ec08db7abd1cc1f851f87d58445b82baeddbd4458ae91bfc5 SHA512 640752c59c52830fe9b7ec464cc07fbcd7642eeb21aeb923f93d16df241ff0aa9ffc5d6de5719ca0c21ef263dc927036bfc728cd72832fe5900ba99a0350c88c
 MISC metadata.xml 318 BLAKE2B 0d17e33c45886d0c0e03044b5b2513d44c1bb4a28d758a8575929536e866419328c68971ba3f324a5677ff68bf37b38a22645e4b02810a118b5f18026d0476c4 SHA512 7ff12a5eb42ac39840f8c9eb78b24aeecd9cbfe780d11eccd75fd6f02b11f4abafd514bc32f47f727047b069e446e9252914dcaf5c33d6f1054981a3c175fdef
diff --git a/sys-boot/palo/palo-2.00.ebuild b/sys-boot/palo/palo-2.00.ebuild
deleted file mode 100644
index 8dde2461a2b7..000000000000
--- a/sys-boot/palo/palo-2.00.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="PALO : PArisc Linux Loader"
-HOMEPAGE="http://parisc-linux.org/ https://parisc.wiki.kernel.org/"
-SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/deller/${PN}.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* hppa"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.00-toolchain.patch
-)
-
-src_compile() {
-	local target
-	for target in '-C palo' '-C ipl' 'iplboot'; do
-		emake AR=$(tc-getAR) CC=$(tc-getCC) LD=$(tc-getLD) ${target}
-	done
-}
-
-src_install() {
-	into /
-	dosbin palo/palo
-
-	doman palo.8
-	dodoc TODO debian/changelog README.html
-
-	insinto /etc
-	doins "${FILESDIR}"/palo.conf
-
-	insinto /usr/share/palo
-	doins iplboot
-
-	insinto /etc/kernel/postinst.d/
-	insopts -m 0744
-	doins "${FILESDIR}"/99palo
-}
diff --git a/sys-boot/palo/palo-2.11.ebuild b/sys-boot/palo/palo-2.11.ebuild
deleted file mode 100644
index cf05c9a92a79..000000000000
--- a/sys-boot/palo/palo-2.11.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="PALO : PArisc Linux Loader"
-HOMEPAGE="http://parisc-linux.org/ https://parisc.wiki.kernel.org/"
-SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/deller/${PN}.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~hppa"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.00-toolchain.patch
-)
-
-src_compile() {
-	local target
-	for target in '-C palo' '-C ipl' 'iplboot'; do
-		emake AR=$(tc-getAR) CC=$(tc-getCC) LD=$(tc-getLD) ${target}
-	done
-}
-
-src_install() {
-	into /
-	dosbin palo/palo
-
-	insinto /usr/share/palo
-	doins iplboot
-
-	insinto /etc
-	doins "${FILESDIR}"/palo.conf
-
-	insinto /etc/kernel/postinst.d
-	insopts -m 0744
-	doins "${FILESDIR}"/99palo
-
-	doman palo.8
-
-	dodoc TODO debian/changelog README.html
-}
diff --git a/sys-boot/palo/palo-2.12.ebuild b/sys-boot/palo/palo-2.12.ebuild
index cf05c9a92a79..2ca5818b800f 100644
--- a/sys-boot/palo/palo-2.12.ebuild
+++ b/sys-boot/palo/palo-2.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/deller/${PN}.git/snapsh
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~hppa"
+KEYWORDS="-* hppa"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.00-toolchain.patch
diff --git a/sys-boot/psoload/Manifest b/sys-boot/psoload/Manifest
deleted file mode 100644
index 580bfb28ebc8..000000000000
--- a/sys-boot/psoload/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST PSOloadV2.0_Linux.zip 384266 BLAKE2B 9db89cfe88fb664679e43abd80dbb24209cf2f179137c3e7589bf9d2083b68e7dc1c743727a52c472e2dce1a12f4d3dcfd920c8f92caf8cb1d2ab4358d4bc297 SHA512 21daf5f3889666980eed9f712cacd9544bb0c6380ea7059b14f7df793ab8cd2db4ba6f6cfc6b555a33372b79d82ff4ce34d50b359d899c1546219df763938784
-EBUILD psoload-2.0.ebuild 574 BLAKE2B 7f6ee53e4905d48e6e8a735c756db3c5c59adcdbbf419cb1f2341a547a5e210c3ed648f3f2fb15adc3e74e67e1fb7a90ee6e0822b74778d830824e6f1cb2f384 SHA512 3c90101e95c40272184e2c86dec7b9d169882e5b86f46947e9347c443ff4c1de7f64aef02791bb5de05919e57a12413960531a895e5f8ecb0f63fdb5ba98b0e6
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-boot/psoload/metadata.xml b/sys-boot/psoload/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/sys-boot/psoload/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/sys-boot/psoload/psoload-2.0.ebuild b/sys-boot/psoload/psoload-2.0.ebuild
deleted file mode 100644
index ad33b760ae82..000000000000
--- a/sys-boot/psoload/psoload-2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-QA_PRESTRIPPED="/opt/bin/psoload2
-	/opt/bin/psoload2_static"
-
-DESCRIPTION="Load home brewed code onto the GameCube with Phantasy Star Online"
-HOMEPAGE="http://www.gc-linux.org/"
-SRC_URI="http://www.gcdev.com/download/PSOloadV${PV}_Linux.zip"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_install() {
-	into /opt
-	dobin psoload2 psoload2_static || die "dobin"
-	dodoc *.txt testdemo4.dol crt0.s
-}
diff --git a/sys-boot/raincoat/Manifest b/sys-boot/raincoat/Manifest
deleted file mode 100644
index d8c1fa10189b..000000000000
--- a/sys-boot/raincoat/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX raincoat-0.11-build.patch 420 BLAKE2B cc503181d06d8fd5369f2e51520a0cc7f702b0e948d6020131280008d0669b008fa85242a45d0e10daf855f8c02e91ba3a83eab4d5855744cbd22aa36a90755a SHA512 fb1d0735e9f29ce5173fd2eb7467527d025146f235b3930973e9a0b91d3a8015909bac506fb17c16da447ebf08d6ca366622c845cce08d40e8743398773255b8
-DIST raincoat-0.11.tbz2 240759 BLAKE2B 00601d7eb4596f790746bbab356b3ee28a11634d37dc2d2cb0e85b34ee9309484957c96d33c2d8478a849b834d8d9197cae717ee0ce4263a24e792bc57139349 SHA512 acd56386f8b0de2b2e268b62304e5b1323a96865394993fb76004c92c09992185b6fe6c7bf2d001ff5e5f2cc7e067d9962229aceb17838f7661890f5b4c4b2f1
-EBUILD raincoat-0.11.ebuild 538 BLAKE2B b593b2f077960e51a08dbf57929ebfffdd3dc36fb5c382dd883a2a8e42cf204a401541dde76f78ec63c8af54e36c1e4e8f81af252b31499c2351cdbff28e880c SHA512 2a279ee6b0fd70e0e412d26f52fa0fe6feda7d09c370952192b68536b80782f25e9c05c3e994a95b675995be7b0d41fe3a24de1e892a52c576a51099126043bf
-MISC metadata.xml 314 BLAKE2B 8b0c07d92c87c8f193aaee67afa4dcf69982d4a48271a56b3e31f0984a7d76ff639db092ab19ef14af66a4c0ba234f648b6099b746be2a924575b71b39cbdd98 SHA512 f158eec39ec9e76752afff57f4b80c39e6459d53871140c982754e2bdfcb432a3ee866087ec8c95f53a8822d89a25792009ad1c4256202682d461fd7ce3ff2c9
diff --git a/sys-boot/raincoat/files/raincoat-0.11-build.patch b/sys-boot/raincoat/files/raincoat-0.11-build.patch
deleted file mode 100644
index a83e73dd523f..000000000000
--- a/sys-boot/raincoat/files/raincoat-0.11-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 96f8662..db2b78c 100755
---- a/Makefile
-+++ b/Makefile
-@@ -2,7 +2,7 @@ all: raincoat
- 
- raincoat: src/raincoat.c src/BootFlash.c src/boot.h src/BootFlash.h
- 	mkdir -p bin
--	gcc -static -O2 -Wall -Werror -o ./bin/raincoat src/raincoat.c src/BootFlash.c
-+	$(CC) -static $(CFLAGS) $(CPPFLAGS) -Wall -o ./bin/raincoat src/raincoat.c src/BootFlash.c $(LDFLAGS)
- 
- clean:
- 	rm -f src/*.o
diff --git a/sys-boot/raincoat/metadata.xml b/sys-boot/raincoat/metadata.xml
deleted file mode 100644
index 237bbf315957..000000000000
--- a/sys-boot/raincoat/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>Flash the Xbox boot chip</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">xbox-linux</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sys-boot/raincoat/raincoat-0.11.ebuild b/sys-boot/raincoat/raincoat-0.11.ebuild
deleted file mode 100644
index c9649f784769..000000000000
--- a/sys-boot/raincoat/raincoat-0.11.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Flash the Xbox boot chip"
-HOMEPAGE="https://sourceforge.net/projects/xbox-linux/"
-SRC_URI="https://sourceforge.net/projects/xbox-linux/files/Other/Raincoat/${P}.tbz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-build.patch
-}
-
-src_install() {
-	dodir /etc /usr/bin
-	emake install DESTDIR="${D}" || die
-	dodoc docs/README
-}
diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index 74d9499be0a1..de4dac10cb1d 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -5,8 +5,8 @@ DIST syslinux-4.07.tar.bz2 5761877 BLAKE2B 2fe28f268f896601a045564b1e3dde618d57e
 DIST syslinux-5.10.tar.xz 5315660 BLAKE2B 19d6861bb6220fe57e12d8d6118d37b197c3c771e4d2e7a51ce7db39219e3c837e6d1543d7a3927820f3a34da34ce849f9badbaf9cd83cb5ee24fd5ed7b705f2 SHA512 56422e14b4aa53ca1a5811da0582dbbb349aa52b9e78868bbedc24c67ef2420c4d0ac63fd68c7f0adc2c22606196276265d503b5b6f9d3d796d9ce42845bbdb5
 DIST syslinux-6.03.tar.xz 6855224 BLAKE2B 9caccf8bed4e3c3e87393c9dc8f3b3d267c14469bbf8135a648ea41d8a43a4aedbf2b007c6b9a6853de8866152f5bc33e5ea85fca1db86c5f2fac88d97189b0f SHA512 dd2b2916962b9e93bc1e714182e3ca2a727a229b8afabe913050bcfdd43ee2af51ee3acf79121d8c20caf434583efaa7f3196871e0e07c04d82191323a50fe31
 DIST syslinux-6.04-pre1.tar.xz 5283272 BLAKE2B 800e5977ed13b26a1756c33d8625e850631b642e26a86e3328196ddd998596693c3a26db0ada4c0ba78a4ba692a1cc01886b6eb693d877ddafcfb325ecdeb639 SHA512 7927dd39be8e2dcf4138a6fea33def67d19d938379d694f15b48fdd2f5924c028b7a9e7bd71d0c7c6630c203e9e2a54296628e530632ad5e6f55b1ebefe8fc98
-EBUILD syslinux-4.07.ebuild 1763 BLAKE2B 3d191d3bc66a6f7f45172f3aa677088f95f04d8602a697eadf321ea88c0ddfa062447cfe225c5e7894d6b5befa007f73d6c70b7605fee1742e19ed889e339ad6 SHA512 5d281b806b0438d9a9efbfcd077f662412a31ea3a19881f7266ef8a8a4966ee55c2372d8b50fcfa674282c42fc376d287fc76133330e15adad74fa8ec10ad2e8
-EBUILD syslinux-5.10.ebuild 2219 BLAKE2B f0ac630efca67b5600c267e3aa7f17c4c227437bc0e9afac60cefaf46aaa30d78c57582e716060bd9b3a6e57e2bf2a84f002804d94be484be11d019fc98a163c SHA512 2c04378b5d5d89e2d92ed1bb8d9cd8752ef8aa5abf77098110f6df39c79e420c66dc6ab1fbababd36c60d84fba3ad442d3bf04d053bd8333d18f16b464839939
-EBUILD syslinux-6.03.ebuild 3410 BLAKE2B fdfef0f6d7e65af38cce92bb82cc75a582e97a753b7fbe1dd3b42c2ff31408b8c43c8c4502145d2684cdd33526a7b33ae9c2475c8e011a5a25fd4e041af68109 SHA512 f6a265acbf4e53c4bb142db3a36cef199edfface74fcf2d9755ffa5289c7716c5604055ae822e19f5d6ac4d9d5d94edb6398a0beb2640c61375b8e41a4944cbe
-EBUILD syslinux-6.04_pre1.ebuild 3478 BLAKE2B 1ac8784af49e9c7d4aa1ddad6b839421b91b561e3137e3f999bd61e77187b129b6717397df8ed734245cd9de1c7df2cde38ad0d40cc046a970074af1ca1781d2 SHA512 5247a0696b81fa4d78df0e50753456086d88fdc15b5bcdd7ef33a54dc67a1a941abdd1dea1c9de35d487c39981642665963489ce5741da18a6eee2fb28ac992e
+EBUILD syslinux-4.07.ebuild 1774 BLAKE2B 19ca9b3432e8e9a6d2640ed2579c59dfe635e19a8d64433f22a2a14ae31c8b5e7900481ebf72056a718e8d854c9f2e8f6ee6c5e9419448de48b45c45695002fb SHA512 b7d584bfdf681719f93c1e3f3fb892c39f61092dcc9149619c04af0179d5665f8317f045d6314f782b30e27a925d16d85d2c6a269779f844c3fcdbe2b400387c
+EBUILD syslinux-5.10.ebuild 2230 BLAKE2B 995ee83ea6a912f0af1ca97e4a960e569c385118e9f234f4f6421d7ab7f409e49c3c4b5fb6bafd6264bfe39c1318f49b142bba809a0dba378ebcef395c2a0809 SHA512 7d61dd6de70b5cd11754b81777bfcdb63c116ad5c772aa9e907bcf6bfe8d918afae8797dae362c888d4d16845fbe1d2077ac7c374f8bbe1f7c5069d2d570c0bb
+EBUILD syslinux-6.03.ebuild 3421 BLAKE2B 253a2b38846a07d3bdda05536c2d570e393b9182352e4e936f3213346fb8b0ee5573e5df2bb67bbc692dc5c52569ad3a667a19c14eb58ca7ec1e79ee46e67298 SHA512 041fa544ef45df4732597993c19448728ae6272a87306ff40cdb72e2dc3de5a7b54feb88f27a2660a2aa6932cb47682b42996bab618586bfdf608a959a1d1330
+EBUILD syslinux-6.04_pre1.ebuild 3489 BLAKE2B 78481eb4d56f6670a9e3dd6fb8a1b4abfc8cdf67ab3d549c16e88f6cc8a908c4ace33d04e857ea40b7990a1e06d9fa04573077a876634fa77d3f00bd35b3fa12 SHA512 3d628c258a6671c4977d98e575d05d88101451f2d962433eec373777921773658460fba7e7f992d1857ae5a28f64faa02b6bed8bdd5bac8a65311b8e009aaffe
 MISC metadata.xml 411 BLAKE2B d3b00622fd68d6ae1b4ba7aa30c33c790b2fbdc688637d3c573cb4496f3952a62f8ae20384badda70b9cbd4ed036e0884becd212d63ec015decc511f1ee7970e SHA512 e8256115d61eeef51be14bea35df6765b356471d145ad8e43e75e6301a4557d526af5fd99b8957fb02ecd9c4a7a0bd0d3db4790abef935887bff8a102709c518
diff --git a/sys-boot/syslinux/syslinux-4.07.ebuild b/sys-boot/syslinux/syslinux-4.07.ebuild
index 92eeeea5c9d2..021f559c7eb9 100644
--- a/sys-boot/syslinux/syslinux-4.07.ebuild
+++ b/sys-boot/syslinux/syslinux-4.07.ebuild
@@ -7,7 +7,7 @@ inherit eutils toolchain-funcs
 
 DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
 HOMEPAGE="https://syslinux.zytor.com/"
-SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P/_/-}.tar.bz2"
+SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/${PV:0:1}.xx/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-boot/syslinux/syslinux-5.10.ebuild b/sys-boot/syslinux/syslinux-5.10.ebuild
index dbe728fd1497..bc99bbf6c4e2 100644
--- a/sys-boot/syslinux/syslinux-5.10.ebuild
+++ b/sys-boot/syslinux/syslinux-5.10.ebuild
@@ -7,7 +7,7 @@ inherit eutils toolchain-funcs
 
 DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
 HOMEPAGE="https://www.syslinux.org/"
-SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P/_/-}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/${PV:0:1}.xx/${P/_/-}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-boot/syslinux/syslinux-6.03.ebuild b/sys-boot/syslinux/syslinux-6.03.ebuild
index c1f72d04354d..c82f18d21b88 100644
--- a/sys-boot/syslinux/syslinux-6.03.ebuild
+++ b/sys-boot/syslinux/syslinux-6.03.ebuild
@@ -15,7 +15,7 @@ SRC_URI_TESTING=Testing/${PV:0:4}
 [[ ${PV/_beta} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
 [[ ${PV/_pre} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
 [[ ${PV/_rc} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
-SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${SRC_URI_DIR}/${P/_/-}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/${SRC_URI_DIR}/${P/_/-}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-boot/syslinux/syslinux-6.04_pre1.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
index 5ad853d33dbf..3fb6b3a94cc3 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
@@ -15,7 +15,7 @@ SRC_URI_TESTING=Testing/${PV:0:4}
 [[ ${PV/_beta} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
 [[ ${PV/_pre} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
 [[ ${PV/_rc} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
-SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${SRC_URI_DIR}/${P/_/-}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/${SRC_URI_DIR}/${P/_/-}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index b230514f6ac5..b286775a86e1 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1,7 +1,4 @@
 AUX 237-libshared-static.patch 659 BLAKE2B f97c3c4e9d6ef3da674bc74fce8326d18fe1ebd4008e0929f1362ef0c2e854a67c8786c0b4ce9b29aee2b4409c54c668429f61e3c4ab85844d72c3d060b41925 SHA512 79cd97a176c91c76b512bce5f30605d673fb5480921cc76e221da9e78a8f7caec802efb481f8811c7aefba2901d007e340ba032a07a53e907f77e4bbd52169a7
-AUX 239-debug-extra.patch 1641 BLAKE2B 37dae0aa6fb95be3f6b7ad5647ddc7e6e7cf6654e0119c5a41280a0db630d13746d5aaa0d1de8e66f49525a0b5a25f4f1136e0b8edc27e628cc82b386f5c0759 SHA512 091f4a0a6d8f4f5963002f33ebafa36f00f7635caafa14ac618ed7c5e08538cffbe655930802e14a0f744851ed7acacc217d2ad7e625627eeb82e14cc3fabd4a
-AUX 239-stat-0.patch 3553 BLAKE2B 225dd5e8e001a10a33c7ecb5c1378589b3eeecbea4fc746f27cc72d8eb8787c6966b8787c5922f0d0cefa28ac966c7c4f65ed341335d4105bc109df14110604c SHA512 a982c6384fcad2a1ad709564e932231e837ef799b764bbfa73eff5c42635a4bdc0dcf36e72300482ed188b492da723d3cd7ae04dda9b2c16c70fd1871c556a46
-AUX 239-stat-1.patch 2553 BLAKE2B 123a9488f7e2c9c2b70cb87ecc45be54b19b18660a2b238d028227e19cb7ba4933a115e2e82652b3179462ed0d2115058bff5d8d0212f439a919857f083c318d SHA512 6aee279728d0e609956c825ced6d2c00d8f4905327492c0348ad6ee8e862287b101ec4e2f1daa19533cf51f2ba1a15f0ea2dd6ccde44a4ff1b0fb151ffc7381e
 DIST systemd-241.tar.gz 7640538 BLAKE2B 69d7196fee0d0ad06ea8d7c78b0299cc17517ecce3ca4c0b1181a3fbb13bc2627629156785051e2ff427dcc21414f7a078724c6409ebaa431618e4799ebcd50a SHA512 a7757574590e8aa37e1291ea0b2c5eb03a8d8062fe9462fa5b0bf50830c933e2b301d106c70d904f94afc0aa8e43a8acfd11926dfa25b1b89174580e491e545e
 DIST systemd-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
 EBUILD systemd-boot-241.ebuild 2352 BLAKE2B bcc51f97daccf09f929ff56947733721a70c87e5a8842a2c3d3e2fba23dc28a9cd46e16f4b39a5b56ae4707dbfcf61ea346d7d313024378fd8c97361d574da99 SHA512 26949284b57ba3ec387984293e6646f9a9eab168659c33c1c24e16e3ffd00603e4bea39f7d8c74fc1cc4da37cf75ce9f27ff1a036ae8612b130a94182ae0017d
diff --git a/sys-boot/systemd-boot/files/239-debug-extra.patch b/sys-boot/systemd-boot/files/239-debug-extra.patch
deleted file mode 100644
index 19db590257cf..000000000000
--- a/sys-boot/systemd-boot/files/239-debug-extra.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 8f6b442a78d0b485f044742ad90b2e8271b4e68e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Sun, 19 Aug 2018 19:11:30 +0200
-Subject: [PATCH] meson: rename -Ddebug to -Ddebug-extra
-
-Meson added -Doptimization and -Ddebug options, which obviously causes
-a conflict with our -Ddebug options. Let's rename it.
-
-Fixes #9883.
----
- meson.build       | 2 +-
- meson_options.txt | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index f79ac4b12e7..2209c935ad6 100644
---- a/meson.build
-+++ b/meson.build
-@@ -763,7 +763,7 @@ substs.set('DEBUGTTY', get_option('debug-tty'))
- 
- enable_debug_hashmap = false
- enable_debug_mmap_cache = false
--foreach name : get_option('debug')
-+foreach name : get_option('debug-extra')
-         if name == 'hashmap'
-                 enable_debug_hashmap = true
-         elif name == 'mmap-cache'
-diff --git a/meson_options.txt b/meson_options.txt
-index e3140c8c110..7b1f61bf464 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -45,7 +45,7 @@ option('debug-shell', type : 'string', value : '/bin/sh',
-        description : 'path to debug shell binary')
- option('debug-tty', type : 'string', value : '/dev/tty9',
-        description : 'specify the tty device for debug shell')
--option('debug', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [],
-+option('debug-extra', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [],
-        description : 'enable extra debugging')
- option('memory-accounting-default', type : 'boolean',
-        description : 'enable MemoryAccounting= by default')
diff --git a/sys-boot/systemd-boot/files/239-stat-0.patch b/sys-boot/systemd-boot/files/239-stat-0.patch
deleted file mode 100644
index e136b703a2f5..000000000000
--- a/sys-boot/systemd-boot/files/239-stat-0.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 75720bff62a84896e9a0654afc7cf9408cf89a38 Mon Sep 17 00:00:00 2001
-From: Filipe Brandenburger <filbranden@google.com>
-Date: Sun, 15 Jul 2018 22:43:35 -0700
-Subject: [PATCH] build-sys: Detect whether struct statx is defined in
- sys/stat.h
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Starting with glibc 2.27.9000-36.fc29, include file sys/stat.h will have a
-definition for struct statx, in which case include file linux/stat.h should be
-avoided, in order to prevent a duplicate definition.
-
-    In file included from ../src/basic/missing.h:18,
-		     from ../src/basic/util.h:28,
-		     from ../src/basic/hashmap.h:10,
-		     from ../src/shared/bus-util.h:12,
-		     from ../src/libsystemd/sd-bus/bus-creds.c:11:
-    /usr/include/linux/stat.h:99:8: error: redefinition of ‘struct statx’
-     struct statx {
-	    ^~~~~
-    In file included from /usr/include/sys/stat.h:446,
-		     from ../src/basic/util.h:19,
-		     from ../src/basic/hashmap.h:10,
-		     from ../src/shared/bus-util.h:12,
-		     from ../src/libsystemd/sd-bus/bus-creds.c:11:
-    /usr/include/bits/statx.h:36:8: note: originally defined here
-     struct statx
-	    ^~~~~
-
-Extend our meson.build to look for struct statx when only sys/stat.h is
-included and, in that case, do not include linux/stat.h anymore.
-
-Tested that systemd builds correctly when using a glibc version that includes a
-definition for struct statx.
-
-glibc Fedora RPM update:
-https://src.fedoraproject.org/rpms/glibc/c/28cb5d31fc1e5887912283c889689c47076278ae
-
-glibc upstream commit:
-https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=fd70af45528d59a00eb3190ef6706cb299488fcd
----
- meson.build            | 5 +++++
- src/basic/missing.h    | 5 ++++-
- src/basic/xattr-util.c | 1 -
- 3 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index dd904c7148..68423bdfa5 100644
---- a/meson.build
-+++ b/meson.build
-@@ -425,6 +425,7 @@ decl_headers = '''
- #include <sys/stat.h>
- '''
- # FIXME: key_serial_t is only defined in keyutils.h, this is bound to fail
-+# FIXME: these should use -D_GNU_SOURCE, since that is defined at build time
- 
- foreach decl : ['char16_t',
-                 'char32_t',
-@@ -439,6 +440,10 @@ foreach decl : ['char16_t',
-         conf.set10('HAVE_' + decl.underscorify().to_upper(), have)
- endforeach
- 
-+conf.set10('HAVE_STRUCT_STATX_IN_SYS_STAT_H', cc.sizeof('struct statx', prefix : '''
-+#include <sys/stat.h>
-+''', args : '-D_GNU_SOURCE') > 0)
-+
- foreach decl : [['IFLA_INET6_ADDR_GEN_MODE',         'linux/if_link.h'],
-                 ['IN6_ADDR_GEN_MODE_STABLE_PRIVACY', 'linux/if_link.h'],
-                 ['IFLA_VRF_TABLE',                   'linux/if_link.h'],
-diff --git a/src/basic/missing.h b/src/basic/missing.h
-index 71a07d0574..14ad3d4914 100644
---- a/src/basic/missing.h
-+++ b/src/basic/missing.h
-@@ -15,7 +15,6 @@
- #include <linux/neighbour.h>
- #include <linux/oom.h>
- #include <linux/rtnetlink.h>
--#include <linux/stat.h>
- #include <net/ethernet.h>
- #include <stdlib.h>
- #include <sys/resource.h>
-@@ -25,6 +24,10 @@
- #include <uchar.h>
- #include <unistd.h>
- 
-+#if !HAVE_STRUCT_STATX_IN_SYS_STAT_H
-+#include <linux/stat.h>
-+#endif
-+
- #if HAVE_AUDIT
- #include <libaudit.h>
- #endif
-diff --git a/src/basic/xattr-util.c b/src/basic/xattr-util.c
-index c5c55ea846..0ee0979837 100644
---- a/src/basic/xattr-util.c
-+++ b/src/basic/xattr-util.c
-@@ -2,7 +2,6 @@
- 
- #include <errno.h>
- #include <fcntl.h>
--#include <linux/stat.h>
- #include <stdint.h>
- #include <stdlib.h>
- #include <string.h>
--- 
-2.19.1
-
diff --git a/sys-boot/systemd-boot/files/239-stat-1.patch b/sys-boot/systemd-boot/files/239-stat-1.patch
deleted file mode 100644
index 1104de3c9c1a..000000000000
--- a/sys-boot/systemd-boot/files/239-stat-1.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 9c869d08d82c73f62ab3527567858ce4b0cf1257 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Wed, 18 Jul 2018 17:26:17 +0200
-Subject: [PATCH] meson: unify linux/stat.h check with other checks and use
- _GNU_SOURCE
-
-Using _GNU_SOURCE is better because that's how we include the headers in the
-actual build, and some headers define different stuff when it is defined.
-sys/stat.h for example defines 'struct statx' conditionally.
----
- meson.build         | 20 ++++++++++++++------
- src/basic/missing.h |  2 +-
- 2 files changed, 15 insertions(+), 7 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 68423bdfa5..99035d2306 100644
---- a/meson.build
-+++ b/meson.build
-@@ -421,11 +421,9 @@ decl_headers = '''
- #include <uchar.h>
- #include <linux/ethtool.h>
- #include <linux/fib_rules.h>
--#include <linux/stat.h>
- #include <sys/stat.h>
- '''
- # FIXME: key_serial_t is only defined in keyutils.h, this is bound to fail
--# FIXME: these should use -D_GNU_SOURCE, since that is defined at build time
- 
- foreach decl : ['char16_t',
-                 'char32_t',
-@@ -436,13 +434,23 @@ foreach decl : ['char16_t',
-                ]
- 
-         # We get -1 if the size cannot be determined
--        have = cc.sizeof(decl, prefix : decl_headers) > 0
-+        have = cc.sizeof(decl, prefix : decl_headers, args : '-D_GNU_SOURCE') > 0
-+
-+        if decl == 'struct statx'
-+                if have
-+                        want_linux_stat_h = false
-+                else
-+                        have = cc.sizeof(decl,
-+                                         prefix : decl_headers + '#include <linux/stat.h>',
-+                                         args : '-D_GNU_SOURCE') > 0
-+                        want_linux_stat_h = have
-+                endif
-+        endif
-+
-         conf.set10('HAVE_' + decl.underscorify().to_upper(), have)
- endforeach
- 
--conf.set10('HAVE_STRUCT_STATX_IN_SYS_STAT_H', cc.sizeof('struct statx', prefix : '''
--#include <sys/stat.h>
--''', args : '-D_GNU_SOURCE') > 0)
-+conf.set10('WANT_LINUX_STAT_H', want_linux_stat_h)
- 
- foreach decl : [['IFLA_INET6_ADDR_GEN_MODE',         'linux/if_link.h'],
-                 ['IN6_ADDR_GEN_MODE_STABLE_PRIVACY', 'linux/if_link.h'],
-diff --git a/src/basic/missing.h b/src/basic/missing.h
-index 14ad3d4914..9044683b15 100644
---- a/src/basic/missing.h
-+++ b/src/basic/missing.h
-@@ -24,7 +24,7 @@
- #include <uchar.h>
- #include <unistd.h>
- 
--#if !HAVE_STRUCT_STATX_IN_SYS_STAT_H
-+#if WANT_LINUX_STAT_H
- #include <linux/stat.h>
- #endif
- 
--- 
-2.19.1
-
diff --git a/sys-boot/unetbootin/Manifest b/sys-boot/unetbootin/Manifest
index 0b63083cecf9..585554343c88 100644
--- a/sys-boot/unetbootin/Manifest
+++ b/sys-boot/unetbootin/Manifest
@@ -1,6 +1,10 @@
 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
 EBUILD unetbootin-661-r1.ebuild 2156 BLAKE2B f137242cd77cbe6d0befedbf8760bc02b3f6682b5ecaae2ecbbdce8f9cc4a92711cd01fe58c182f4c8dbf1d64ecab211722b43bfade2c1d186296d20fb6a2fa8 SHA512 43c1e45b25e042df1c48d7cf504021c21e16342550cf4ba83ff1de5c0c0466828b5d53deecf8eca4ba4ea22437b7fe057d98b9dcc3efab736cac7aa95c33338d
 EBUILD unetbootin-661.ebuild 2089 BLAKE2B c1ecb3674dd00cb7359f33313c6886c24c38f0e84849cc6d04584f9a3b0e7a8954901f25bf7cb39148e9826cd77133a294610ba8b3d9f2a92eed7ff77c215040 SHA512 7c4c6c7d44bf0bd0c94b42c46d7c0660aabda97c8716f8035babc682b40acf001c5cebe47de8b9dbddde83fdf94fe5f86cf5479a3138ac75ab809f6ba11d610b
+EBUILD unetbootin-675.ebuild 2121 BLAKE2B 9d8de6dcf515e5f144337b8efbb555892bca7cad46a7036132e1777105a51ae7fc96a48fd11f090578a92eb4ae978531acb2ce62d6e29970cc10b510ff99bc91 SHA512 bcc1243f414b2ba8346427080291f5f5e73adb72e1558f750f99580396e2f5d352471ca4375b478b0435634e128dbd43d919deb08e6c30134ed9f5b0d01d8055
 MISC metadata.xml 385 BLAKE2B 05836339f25bd812b23c8b93a6f05934a4bfa12d9fdd61f73140131c2d7609a5d1e257ed80c2cd983020720645e5444078cc71f2f51be9a2d435715e38ceea3f SHA512 9676e393ac2d18489433f0e658340a3eec0e01e0b35ca786540b07a6466f0b572f5d5bf115e6dc0b5c4898c00f630b9f5023f62f8e8f3a96c105bc74f918eb21
diff --git a/sys-boot/unetbootin/files/unetbootin-675-desktop.patch b/sys-boot/unetbootin/files/unetbootin-675-desktop.patch
new file mode 100644
index 000000000000..b71907db38d8
--- /dev/null
+++ b/sys-boot/unetbootin/files/unetbootin-675-desktop.patch
@@ -0,0 +1,23 @@
+ * 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,9 @@
+ Version=1.0
+ Name=UNetbootin
+ Comment=Tool for creating Live USB drives
+-Categories=Application;System;
+-Exec=/usr/bin/unetbootin_asroot
++Categories=System;
++Exec=/usr/bin/unetbootin
+ Terminal=false
+ Type=Application
+-Name[en_US]=UNetbootin
+-GenericName[en_US]=UNetbootin
+-Comment[en_US]=Tool for creating Live USB drives
++GenericName=UNetbootin
+ Icon=unetbootin
diff --git a/sys-boot/unetbootin/unetbootin-675.ebuild b/sys-boot/unetbootin/unetbootin-675.ebuild
new file mode 100644
index 000000000000..cfc39c26a046
--- /dev/null
+++ b/sys-boot/unetbootin/unetbootin-675.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2019 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="
+	${HOMEPAGE}/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
+}