gentoo resync : 08.06.2019

15 files changed, 6 insertions, 340 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 50f679ef9db1..44f1e85f0aaa 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/efibootmgr/Manifest b/sys-boot/efibootmgr/Manifest
index 0d9c5c036fae..20b4549832fd 100644
--- a/sys-boot/efibootmgr/Manifest
+++ b/sys-boot/efibootmgr/Manifest
@@ -3,5 +3,5 @@ DIST efibootmgr-15.tar.bz2 35476 BLAKE2B 19b7c9ce51f3b930b2d59fa4a594c7a8bf5f1c7
 DIST efibootmgr-16.tar.bz2 36603 BLAKE2B 3d09a9d3c4ecd48010315fccae60ab408c0d08e9c734e86a944130ea03e038835fa08745819f5353efbbe36f5017be64faded4b625ef0a0b55d4ca0d612ef232 SHA512 936318c7163c07b716f89be3d830957d9db68ba1b059223f7ea3d9eafe0dbf1c91b9aee096f5aed70955c6052c3b8547295c0a47f17cdf43788259d87d1990b9
 EBUILD efibootmgr-14.ebuild 600 BLAKE2B 6c7abd14248f9050e338d83a7f507e27d61c1c55e16777312c23e2e52d33bcfc1e67d5b4efcb97d936e7fb654125088f77188eda8cf153613ba20bfd5e1f52cf SHA512 bf5c805869ca09f72486abf901697298c7dbbd9966dbc8ff559c5486dd2e8631ce107ad36603b0a3c88c29537a891246f98eeaf5352c7c65ee29d93ef204cf85
 EBUILD efibootmgr-15.ebuild 624 BLAKE2B 4d9c2ff8566d909f20f23da76e500a405f5d30f2fc5c397ce89e93b0eb577b8a58c4f0258661ad68aacd9c6306a269588a17df2ed47e9dcbf97cae90396c301c SHA512 7258da126a9462f91506ec3295d2ffb062f78c8dd23875e947145d30dff8c879d98f881637061bc819f4902d4ad5794f214e716664e13f71142aba9c7945f79e
-EBUILD efibootmgr-16.ebuild 687 BLAKE2B 34b54bc225710ca6e0f4015ef88fae5486f01747b041ad2e690e045d16f0bf1783d26ffcec998482b6b86947d36b748122f9ad3ae82b4771d9bc1b710b182e31 SHA512 10119453c6942cabb742cd8990619bad95910862f8aacedaf024f72d57d2747a712a8e23797a8cc8189fe81cb1615b05e17b985d271bbe833360ce237f6002ed
+EBUILD efibootmgr-16.ebuild 686 BLAKE2B 4a81e942abf084395030c089308aa3d80a8b919c79f11d995837ee7b69f88d76a55d237e82aa21f0cd1e6c7ad32ab26fb71fcd555ac44de14af4806aa9cbf1cd SHA512 8f2f1b911ac0cb5c830da09999196c78c32424c8720c91fb10876cb22c0af95f1b36a550f8ebcf02b50bc7067e32e71fa2ceb222e970269325bc86b445deacf7
 MISC metadata.xml 626 BLAKE2B d426af2d479b07fa3d8e482b5d1b84bd242f5da9399ab9cd2d2512d2192f815ccb099ca7c8d3ee91c8c87e1715c9649deaa565aa6ec025c26b518e778d84989e SHA512 d52646244bf9c0d10d8c5b986e110944905fc8f898c0330f65cd6c734e6d8cfabf72854cef362f411d3d63fed3f5e22207a7b94d1ea8076e566d8eff228bb33b
diff --git a/sys-boot/efibootmgr/efibootmgr-16.ebuild b/sys-boot/efibootmgr/efibootmgr-16.ebuild
index 70350fc76a42..b663226c3485 100644
--- a/sys-boot/efibootmgr/efibootmgr-16.ebuild
+++ b/sys-boot/efibootmgr/efibootmgr-16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rhinstaller/efibootmgr/releases/download/${PV}/${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ia64 x86"
 IUSE=""
 
 RDEPEND="sys-apps/pciutils
diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest
index bcbfbc000203..ddca2680c3b3 100644
--- a/sys-boot/lilo/Manifest
+++ b/sys-boot/lilo/Manifest
@@ -1,17 +1,10 @@
-AUX lilo-22.8-correct-usage-info.patch 464 BLAKE2B 2cb5d719a80d7748edd03d7958c24a4eb55815a7957de6d0d538e78d50e11b4d616ed684bf3e9f0b5ae3027739741f15c6621f57bfbd5a8bc7e94ec0fa007fce SHA512 a4dcaac22e66a6480e7a7783bf93d509a1b288d9d9f7e7674b8c3aaf43b9168a766c135f3f05f3ae3f22bc3c1689100cf429ffc9ddc8b825abbc514b9cb857fe
-AUX lilo-22.8-makefile.patch 1273 BLAKE2B 780d10135efe986f77021551356209a0cf50649daef8eda9e58ec71314d0f413b58363d2698329634dddb436a26ff8941e47bdf011300a05252a6a734e192648 SHA512 d8a0c8017f895f52a2b06ebcccca99bbd1a6020d8dad7f158d99196c98d1781620485c6c9fd980c55d2b28c4acc4581be38db86620d211c5a2ecf82a328111cc
-AUX lilo-22.8-nodevmapper.patch 437 BLAKE2B aa18cb2476122c5c5e2757c7a1a143617eecff41b79f48e499084ebe39f64ef2eb186b3159ee03476bceca6c9e49d7bc40df873aafe5b4a6bd0180cbd2202c12 SHA512 401132c02ccfd554b247c62eea778e025591f94b79a82e41b061b7aae5e52f3c3cbebaef96cf56fdc8b4858f1af6202b7ed75881e8a633668bb53bdb26e3e702
-AUX lilo-22.8-novga.patch 295 BLAKE2B fa6fe92f607cbf0d36057059feb199715e922ef7865269d9da420c2e3584d81e77892207e729ca3596f22eececc40121864c1e1f64e3293139a463a9d61e6618 SHA512 ee619280265191f80f07429ed0abe9434219cc00b31d204b613138de449ae9de83f8eb80110c3af36ac52156f3a2b52b8d0795abc8dd8a4ad3df15b654cf71e6
 AUX lilo-24.0-novga.patch 497 BLAKE2B 429d139b87d1dc581533c09ad6562d42323ac46663198836b0c8339cb99ce5e7442560a15abd089e995a55afdb2ea07c83e3583b7968ceb206acf6736e4574d5 SHA512 f09dbca336c6117592ec24e972c393941ae336f01a03449a455b9694e7e7c62fe24cd9fabab96380c91472fc701633a0ca41277180b73525e92cadbb71459d45
 AUX lilo-24.1-novga.patch 500 BLAKE2B a5ba2f06791812fd7dcafe0882218e6d3884db228f5866604f903972e6914cfdab8379e18eb18f399174581eb72775fda05f1a61df699d39f60564b9a2e337a6 SHA512 067a741086b6df6b5f728ffde3cac949dd9b59cdc11ac1b022f240b69c4a8ef883f5623cc610becd4648f02ad3a243a0d6a939aa8d8c63d9b0158426e6b6f300
 AUX lilo.conf 1613 BLAKE2B 746e05ed4a38f553d8534087d3889e3c136531752aa39f5de9404e58dcd520925f369a4300e9d16ba779b9cef0ae0ecfdde9221f064f42e6a5c812ee7effbbaf SHA512 be59f5b97cbf8eda744e8a7a281526b3262c80af7d3c61e5476697e1569e6e419c4055a8e7deaa4f65688769d941466043af81e159367bf893a88b77eb3732d5
-DIST dolilo-0.5.tar.bz2 3777 BLAKE2B 4f168e678c771ba964f141a0af04d6dcb13e0e98f37283c799b5d127547fd511826f941fdba12857b8629e8e6324f2117c618f2c15ed3e49e9aa220be77f79ac SHA512 6bfd0181d922f01903c8c0cdc67fc087c74091d7ffec0ddfb263c18b3a2247fcfbd201995f1724f26f4eb21b91147f209fd7ed485a05c6b9e9f583ea2456baa9
 DIST dolilo-0.6.tar.bz2 3817 BLAKE2B 35c41f5eac8e02d4381db517a9b230d037da184f9ae409bc76307e689ad6b82928ea3794db54c3137afe6c770db86ba0cde78c33d89e775ddea464905070bfd6 SHA512 1b59ea5f2e2ac52d62635c9f7d5fb5b2aff6757e6ea6c0950480d8a11832b872115907abe6d8fb3fa5436e2e8971d9a1dda103dc6a15db6fc310c8f4730ab936
-DIST lilo-22.8.src.tar.gz 437555 BLAKE2B 319890a7760d8528192c9ba553295f9ba12b204a1512e8b8f62da146bc41ad2b453a853661d184dd31fc8d65f33523db63b9e1d3cf3f2391a64b05efa06c3bcb SHA512 b8a22c73b5f6a0c7ddde7c7af6511f9e85d43bae98603bfa0656dfa0685018b3ed713cfd9932bfac33017b83f807c66a3e25d78a16ea9a15bbfddd0e806714cc
 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-22.8-r2.ebuild 4287 BLAKE2B a115714e4f8aeb776a54de02c9dadc0161f5237a295bdec598bfb6c6bbb371e6f6a1e8e3155f5ef7cef9800a9d2a02af8fe97376b2fa4cfe9a391cf8b8e511a7 SHA512 87834bac950afeffc2ee51866506cec276a842defd1ff58eb7b5b2dc71451e77d2e94072541132304fda45432173ae204783019261f79f04da35adcbddabdd7a
 EBUILD lilo-24.0-r1.ebuild 3963 BLAKE2B dd05b92cb8c8bf905fd0ed55690b643b457698d3da97a5c4d74f4474613b1dd137abeceb1857bc8d0062a00942aeaac0edc797c3825da909129b01ec3e671eb1 SHA512 238e9fa8b4efbed6c0c79603719956e06d5b010480932c2c22b0be806fd1385a238fa9d1b124dbe860aac0f814dd33dd0022f26c756b780635b6906b1d102391
 EBUILD lilo-24.1.ebuild 4116 BLAKE2B 8f1203eb8461890847a0a5a9c490d9ef4e48b802fd4b2d9b2f33360243667378d102a0123a4853144f63e86985139a8c72549a58668d679a533c42cc49665ca6 SHA512 219fd641770b01170d0ff7bec6d8d6df60b7a9c1e5671368ea44aa80fb5c54f7a77d4ca1db4ba8787d02d4885f37ac8899cafa82e91f98ce6fb09f6f32cf47cf
 EBUILD lilo-24.2.ebuild 4122 BLAKE2B 6d364333c69550b1a5742f7d7fd00e5bbee1e2599f68bced4ea6e87bdd52b4aef3a366fadb9f90d94c063a3dbfc1b9bcd1f728c2188de94d4895e4e93ae87a03 SHA512 8f4e182e938628780799206ec30474d70e421d1479f377d8a6977f8e5aa4a6280b6b078808af5a68b28457a4dd5e62e27cc85cd121cbdfc35ac0cf30c2dd98cd
diff --git a/sys-boot/lilo/files/lilo-22.8-correct-usage-info.patch b/sys-boot/lilo/files/lilo-22.8-correct-usage-info.patch
deleted file mode 100644
index 87ea4b20ce9e..000000000000
--- a/sys-boot/lilo/files/lilo-22.8-correct-usage-info.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/lilo.c
-+++ b/lilo.c
-@@ -548,7 +548,8 @@
-     fprintf(errstd,"%7s%s -T help \t\t\tlist additional options\n", "", name);
-     fprintf(errstd,"%7s%s -X\t\t\t\tinternal compile-time options\n", "", name);
- #endif /* !__MSDOS__ */
--    fprintf(errstd,"%7s%s -V [ -v ]\t\t\tversion information\n\n","",name);
-+    fprintf(errstd,"%7s%s -V\t\t\t\tversion information\n","",name);
-+    fprintf(errstd,"%7s%s -v\t\t\t\tverbose mode\n\n","",name);
-     exit(1);
- }
- 
diff --git a/sys-boot/lilo/files/lilo-22.8-makefile.patch b/sys-boot/lilo/files/lilo-22.8-makefile.patch
deleted file mode 100644
index d2a34bbded1d..000000000000
--- a/sys-boot/lilo/files/lilo-22.8-makefile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -69,18 +69,7 @@
-    -DMDPRAID -DDEVMAPPER
-    
- 
--# set the following if you wish LILO.COM to be installed
--DOS_DIR=/dosC/boot
--#
--# select one of the following to place the man pages in the right place
--#MAN_DIR=`if [ -z "$(whereis lilo | grep 'lilo.8')" ]; then \
--#	whereis lilo | sed -e "sX.* /usrX/usrX" -e "sX/man8/lilo.8.*XX" ; \
--#	elif [ -f /usr/bin/manpath ]; then \
--#  manpath | sed "s/:.*//"; else echo /usr/man; fi`
--#
--MAN_DIR=`if [ -f /usr/bin/manpath ]; then \
--	manpath | sed "s/:.*//"; else echo /usr/share/man; fi`
--#MAN_DIR=/usr/share/man
-+MAN_DIR=/usr/share/man
- 
- # set the compiler optimization level
- 
-@@ -165,10 +154,7 @@
- #
- # everything needed to run, just short of installation
- #
--all:	lilo bootsect.b diag1.img # OBSOLETE:  $(BOOTS) edit dparam.com activate
--	if [ -x /usr/bin/bcc -o -x /usr/local/bin/bcc ]; then \
--		make diagnostic; \
--		make dosexe; fi
-+all:	lilo
- 
- #
- # everything above plus the statically linked version
-@@ -452,7 +438,6 @@
- 	  rm -f $$ROOT$(BOOT_DIR)/boot.b; fi
- 	cp mkrescue $$ROOT$(SBIN_DIR)
- 	cp lilo $$ROOT$(SBIN_DIR)
--	strip $$ROOT$(SBIN_DIR)/lilo
- 	cp keytab-lilo.pl $$ROOT$(USRSBIN_DIR)
- 	cp manPages/lilo.8 $$ROOT$(MAN_DIR)/man8
- 	cp manPages/mkrescue.8 $$ROOT$(MAN_DIR)/man8
diff --git a/sys-boot/lilo/files/lilo-22.8-nodevmapper.patch b/sys-boot/lilo/files/lilo-22.8-nodevmapper.patch
deleted file mode 100644
index f81cbfe92ef5..000000000000
--- a/sys-boot/lilo/files/lilo-22.8-nodevmapper.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile~	2007-04-28 22:04:23.000000000 +0200
-+++ Makefile	2007-04-28 22:21:46.000000000 +0200
-@@ -91,8 +91,8 @@
-   sed 's/-D/-DLCF_/g'`
- LILO=-DLILO=0xbb920890
- KVER=`if [ -f /usr/include/linux/version.h ]; then echo -DHAS_VERSION_H; fi`
--HDM=`if [ -f /usr/include/libdevmapper.h ]; then echo -DHAS_LIBDEVMAPPER_H; fi`
--DEVMAPPER=`if [ -f /usr/include/libdevmapper.h ]; then echo "-ldevmapper"; fi`
-+HDM=
-+DEVMAPPER=
- 
- TMP=_TmP_
- 
diff --git a/sys-boot/lilo/files/lilo-22.8-novga.patch b/sys-boot/lilo/files/lilo-22.8-novga.patch
deleted file mode 100644
index 939998fe9d4e..000000000000
--- a/sys-boot/lilo/files/lilo-22.8-novga.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -66,7 +66,7 @@
- 
- CONFIG=-DBDATA -DDSECS=3 -DEVMS -DIGNORECASE -DLVM -DNOKEYBOARD -DONE_SHOT \
-    -DPASS160 -DREISERFS -DREWRITE_TABLE -DSOLO_CHAIN -DVERSION -DVIRTUAL \
--   -DMDPRAID -DDEVMAPPER
-+   -DMDPRAID -DDEVMAPPER -DNOVGA
-    
- 
- MAN_DIR=/usr/share/man
diff --git a/sys-boot/lilo/lilo-22.8-r2.ebuild b/sys-boot/lilo/lilo-22.8-r2.ebuild
deleted file mode 100644
index 0878e7783f5f..000000000000
--- a/sys-boot/lilo/lilo-22.8-r2.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DOLILO_V="0.5"
-IUSE="static minimal pxeserial device-mapper"
-
-DESCRIPTION="Standard Linux boot loader"
-HOMEPAGE="http://lilo.go.dyndns.org/pub/linux/lilo/"
-DOLILO_TAR="dolilo-${DOLILO_V}.tar.bz2"
-MY_P=${P}.src
-
-SRC_URI="http://home.san.rr.com/johninsd/pub/linux/lilo/${MY_P}.tar.gz
-	ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/${MY_P}.tar.gz
-	ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/obsolete/${MY_P}.tar.gz
-	mirror://gentoo/${DOLILO_TAR}"
-
-SLOT="0"
-LICENSE="BSD GPL-2"
-KEYWORDS="-* amd64 x86"
-
-DEPEND=">=sys-devel/bin86-0.15.5"
-RDEPEND="device-mapper? ( >=sys-fs/lvm2-2.02.45 )"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-
-	cd "${S}"
-
-	# Correctly document commandline options -v and -V, bug #43554
-	epatch "${FILESDIR}/${P}-correct-usage-info.patch"
-	# Install manpages to correct location, do not rely on incorrect manpath output, bug #117135
-	# Do not strip the main binary, it upsets portage, bug #140210
-	# Do not install diag1.img, bug #149887
-	epatch "${FILESDIR}/${P}-makefile.patch"
-
-	# 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 device-mapper || epatch "${FILESDIR}/${P}-nodevmapper.patch"
-
-	unpack ${DOLILO_TAR}
-}
-
-src_compile() {
-	# lilo needs this. bug #140209
-	export LC_ALL=C
-
-	# we explicitly prevent the custom CFLAGS for stability reasons
-	if use static; then
-		emake CC="$(tc-getCC)" lilo.static || die
-		mv lilo.static lilo || die
-	else
-		emake CC="$(tc-getCC)" lilo || die
-	fi
-}
-
-src_install() {
-	keepdir /boot
-	make ROOT="${D}" install || die
-
-	if use !minimal; then
-		into /
-		dosbin "${S}"/dolilo/dolilo
-
-		into /usr
-		dosbin keytab-lilo.pl
-
-		insinto /etc
-		newins "${FILESDIR}"/lilo.conf lilo.conf.example
-
-		newconfd "${S}"/dolilo/dolilo.conf.d dolilo.example
-
-		doman manPages/*.[5-8]
-		dodoc CHANGES INCOMPAT README*
-		docinto samples ; dodoc sample/*
-	fi
-}
-
-# Check whether LILO is installed
-# This function is from /usr/sbin/mkboot from debianutils, with copyright:
-#
-#   Debian GNU/Linux
-#   Copyright 1996-1997 Guy Maor <maor@debian.org>
-#
-# Modified for Gentoo for use with the lilo ebuild by:
-#   Martin Schlemmer <azarah@gentoo.org> (16 Mar 2003)
-#
-lilocheck () {
-	local bootpart=
-	local rootpart="$(mount | grep -v "tmpfs" | grep -v "rootfs" | grep "on / " | cut -f1 -d " ")"
-
-	echo
-	einfon "Checking for LILO ..."
-
-	if [ "$(whoami)" != "root" ]
-	then
-		echo; echo
-		eerror "Only root can check for LILO!"
-		return 1
-	fi
-
-	if [ -z "${rootpart}" ]
-	then
-		echo; echo
-		eerror "Could not determine root partition!"
-		return 1
-	fi
-
-	if [ ! -f /etc/lilo.conf -o ! -x /sbin/lilo ]
-	then
-		echo " No"
-		return 1
-	fi
-
-	bootpart="$(sed -n "s:^boot[ ]*=[ ]*\(.*\)[ ]*:\1:p" /etc/lilo.conf)"
-
-	if [ -z "${bootpart}" ]
-	then
-		# lilo defaults to current root when 'boot=' is not present
-		bootpart="${rootpart}"
-	fi
-
-	if ! dd if=${bootpart} ibs=16 count=1 2>&- | grep -q 'LILO'
-	then
-		echo; echo
-		ewarn "Yes, but I couldn't find a LILO signature on ${bootpart}"
-		ewarn "Check your /etc/lilo.conf, or run /sbin/lilo by hand."
-		return 1
-	fi
-
-	echo " Yes, on ${bootpart}"
-
-	return 0
-}
-
-pkg_postinst() {
-	if [ ! -e "${ROOT}/boot/boot.b" -a ! -L "${ROOT}/boot/boot.b" ]
-	then
-		[ -f "${ROOT}/boot/boot-menu.b" ] && \
-			ln -snf boot-menu.b "${ROOT}/boot/boot.b"
-	fi
-
-	if [ "${ROOT}" = "/" ] && use !minimal;
-	then
-		if lilocheck
-		then
-			einfo "Running DOLILO to complete the install ..."
-			# do not redirect to /dev/null because it may display some input
-			# prompt
-			/sbin/dolilo
-			if [ "$?" -ne 0 ]
-			then
-				echo
-				ewarn "Running /sbin/dolilo failed!  Please check what the problem is"
-				ewarn "before your next reboot."
-
-				ebeep 5
-				epause 5
-			fi
-		fi
-		echo
-	fi
-	if use !minimal; then
-		echo
-		einfo "Issue 'dolilo' instead of 'lilo' to have a friendly wrapper that"
-		einfo "handles mounting and unmounting /boot for you. It can do more then"
-		einfo "that when asked, edit /etc/conf.d/dolilo to harness it's full potential."
-		ebeep 5
-		epause 3
-		echo
-	fi
-}
diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index 1219da9b2806..f9831406a951 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -1,14 +1,11 @@
-AUX syslinux-3.86-nopie.patch 551 BLAKE2B a9084a7d4898e8f3fc9d152adcab15b0b294df0c79c26dc166fe942d48086f59ef806502e317ee82a47b2e1dd24b1b545ba3e241c1ad7e87d601b11f6d23ba71 SHA512 340a458817f45ac6a81721745e470c30e2ac02aa10ed174e77ea224fba4f1919cb9faf9c5fac2233d5b081a43339bb3dc0c35420afb3a9c134c754835ff89582
 AUX syslinux-4.05-nopie.patch 519 BLAKE2B 9ffea4b38c2f6de65883b256d83b270a4f3e3642827e4de9b711d396a1f3d386f9d894802cf22fcc7c64e8f3528ebfcb252e5db47f4bea586fcb4e110eb581ef SHA512 75160574c024bd841cd5e098d81f89c8532153cfd98beb17ca1549e0bdd7106d6494e8436e56560d3e501318fd8109b5f5765d244dcdfcbfc5306d35f9cbb4a8
 AUX syslinux-6.03-sysmacros.patch 950 BLAKE2B 60fb26a4bb462409074802b8cf01afe29e8a7f98cb6907f4f2c0902f4cc7342b6053368ddf17331eac888714e795299c155a4078668a3ed0e35d435a8cb241d3 SHA512 8659e82e5a5402633c807c8a8f99b25fd6e3066fd0838a7e984452e2ebeccc0331481c93101f00a698e573cadcd98966ea216e4f2d9873e6893af817998e2549
 AUX syslinux-6.04_pre1-singleloadsegment.patch 4744 BLAKE2B a28ff29b9a4bdd2cb65a6700c96ff99ba1a045a401d50587efe59d703f12aca3e47a14a8e7a569c50f11d367545990d09c35f90362efe49d0c9d489802885879 SHA512 9585edfc8ab0e22d4d7757ccdc435c198c5457466fb4fdefc1829cbbe8951f3406b7b51eea56044cc297d29e45772e2154e5746e6d9b92310f17c880c950ff8a
-DIST syslinux-3.86.tar.bz2 3735823 BLAKE2B b5c03462183bc1be37d82c4995da2911e5c70d08eefb9f01c731e1d77e2df9c1ac29fcea6f58a94bc67094af8e415993783929979209a74826e773e9c35ba803 SHA512 6231f233e5f5ac26aa7e4bfd2704e2a4081350a3f3f21b5ec88a13cf992528c2796dbdfdf6cc2cc7a9543828650ae46de3685e5e55fac3a6ad520430220d1073
 DIST syslinux-4.07.tar.bz2 5761877 BLAKE2B 2fe28f268f896601a045564b1e3dde618d57ebf4098d007f7e45119ad019fa88221658608f88e55d4d09cd297140427cdeaf03a40a2341d732064a0630fe92b5 SHA512 8efbd14803ec74c5ee699a754b4727e4b975c08afd4dbb39f4b7ccdb90743e4459cd4609c6f1065c7b7efaa26c9d465806254891795d363758f35a2fe5704ae5
 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-3.86.ebuild 1470 BLAKE2B caa769b29ff3b1eec3cbe6dfaa592a7e13d497b51c4d750f0608d7fe6819c1f2e3f3922d6ec04898dfb0ba3464816f744cc57f76af3dce706ab3e15527149d7c SHA512 1c3c0472ed3aee5e8220ffe60379557c575237fd23e5961674d2b427f00d64713ba6044b2ffa961735c1251d136a049eed0649166b3be50793fcc9761f0ac39e
-EBUILD syslinux-4.07.ebuild 1766 BLAKE2B 7deb22867d34e77ddfe38fd91a483bd219a9ca642ecd1b505f451928f8a9eb0f5fbe07b0e4548e814fccf8b871ecba519c7c2df79b8635dd6541f17269692b05 SHA512 34cd4118736926d0254a7bf0d7e18b12c3b151549057cb2559ff9517fec5aee7e02889c934a8bcb2f0801fd9ab5121eec3a86b8d116e0421d09263e6c70d3363
+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
diff --git a/sys-boot/syslinux/files/syslinux-3.86-nopie.patch b/sys-boot/syslinux/files/syslinux-3.86-nopie.patch
deleted file mode 100644
index efe939e43d34..000000000000
--- a/sys-boot/syslinux/files/syslinux-3.86-nopie.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/com32/MCONFIG b/com32/MCONFIG
---- a/com32/MCONFIG	2010-03-31 18:24:25.000000000 +0200
-+++ b/com32/MCONFIG	2010-04-05 00:03:55.612973516 +0200
-@@ -20,6 +20,8 @@
- GCCOPT	  := $(call gcc_ok,-std=gnu99,)					\
- 	     $(call gcc_ok,-m32,)					\
- 	     $(call gcc_ok,-fno-stack-protector,)			\
-+	     $(call gcc_ok,-nopie,)					\
-+	     $(call gcc_ok,-fno-pie,)					\
- 	     $(call gcc_ok,-falign-functions=0,-malign-functions=0)	\
- 	     $(call gcc_ok,-falign-jumps=0,-malign-jumps=0)		\
- 	     $(call gcc_ok,-falign-loops=0,-malign-loops=0)		\
diff --git a/sys-boot/syslinux/syslinux-3.86.ebuild b/sys-boot/syslinux/syslinux-3.86.ebuild
deleted file mode 100644
index a6f387689acf..000000000000
--- a/sys-boot/syslinux/syslinux-3.86.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader"
-HOMEPAGE="https://syslinux.zytor.com/"
-SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="custom-cflags"
-
-RDEPEND="sys-fs/mtools
-		dev-perl/Crypt-PasswdMD5
-		dev-perl/Digest-SHA1"
-DEPEND="${RDEPEND}
-	dev-lang/nasm"
-
-# This ebuild is a departure from the old way of rebuilding everything in syslinux
-# This departure is necessary since hpa doesn't support the rebuilding of anything other
-# than the installers.
-
-# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-3.86-nopie.patch
-
-	rm -f gethostip #bug 137081
-
-	local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \
-		sample/Makefile utils/Makefile"
-	sed -i ${SYSLINUX_MAKEFILES} -e '/^LDFLAGS/d' || die "sed failed"
-
-	if use custom-cflags; then
-		sed -i ${SYSLINUX_MAKEFILES} \
-			-e 's|-g -Os||g' \
-			-e 's|-Os||g' \
-			-e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \
-			|| die "sed custom-cflags failed"
-	fi
-
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" installer || die
-}
-
-src_install() {
-	emake INSTALLSUBDIRS=utils INSTALLROOT="${D}" MANDIR=/usr/share/man install || die
-	dodoc README NEWS TODO doc/*
-}
diff --git a/sys-boot/syslinux/syslinux-4.07.ebuild b/sys-boot/syslinux/syslinux-4.07.ebuild
index 6d6dee9d9c93..92eeeea5c9d2 100644
--- a/sys-boot/syslinux/syslinux-4.07.ebuild
+++ b/sys-boot/syslinux/syslinux-4.07.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
diff --git a/sys-boot/woeusb/Manifest b/sys-boot/woeusb/Manifest
index 6535b856b69a..1ca3a13e15c8 100644
--- a/sys-boot/woeusb/Manifest
+++ b/sys-boot/woeusb/Manifest
@@ -2,6 +2,6 @@ DIST woeusb-3.1.5.tar.gz 399712 BLAKE2B d52b29249af680577299a02cb9a2c1436aef73a0
 DIST woeusb-3.2.12.tar.gz 386189 BLAKE2B 53629a185d0b8ff55cb2e60eaa6cb8f9e106d3f5b24f57cf8f777dbf5b9a1e43ed423e53e4710acf9ac5ce3171da7dbfcd40b5b3f297b0db240e7c0f9a687fc0 SHA512 9a4e20003970a3313b080bde9a534fb1724382555281aa510092a3698622dae46f22483ff8968903b5685e00ebfb454718de6db7f3c61c4a2e122c961bfc270f
 DIST woeusb-3.3.0.tar.gz 386251 BLAKE2B 9767fc3ab3ae438ff126c05a197cb41550704b93f3b508ad88b7a39c74777fdd863794970ebc839f79f8b2f1da9f6041bb355783ec1040e31814fead8185439c SHA512 8cac015df2309e4978f38adae9b9da04d896301f8d9d971d3d21801b24c3287d7d405bc4b2b1e0ff285497b5777462eb8cd6ce7dce079daf49b4d5d313a449a3
 EBUILD woeusb-3.1.5.ebuild 1036 BLAKE2B 05f973a5a8fd401e9555b5d87cb961a78d0383c8944eabdd35387bb4edb0897eeb184d379647496b6765bcce1d1016cf7d5baa6abba89b6ba1483a91b090b4b8 SHA512 1c8b86ec2a14ff16ad6e82616ff2430b1a364a68ef00b03a330240800ded5e55e1ca0f518523a7c792955846a35b372b396c804c29e1b68c479ec8a49d600671
-EBUILD woeusb-3.2.12.ebuild 1037 BLAKE2B a313a501084e00528b88ff067b7e38d21b2e11709c99cf06770b2cb92ea45b8a6a46b81eb29bdf50b0c0a5a0407b98ac5f0d90d0d754a354717cf6b86a38e2e4 SHA512 23f50d37d9df5da7cba8760cc39a5c1197024616f546c5de37d8f99741d3e06420a0ebec21f96bc788c572cab8badc09b149775740d1efe8cfa7b2efb3adf3e1
+EBUILD woeusb-3.2.12.ebuild 1036 BLAKE2B 4da72a0ecf963952b371e4b7382e1a84043d13f963e58918b76b3e0febcade04f550d4cd74f87a40df8443607753ecdf0d5510e7499d697175eaa426eb5337a9 SHA512 1e4739778602432b4362626a6c794f2d27ad61f03d6994d4e7ca87beb5efac097f643b3cbdccfa18fd7948b5d8949693b88989754011d38fcd30d355db9f38e2
 EBUILD woeusb-3.3.0.ebuild 1038 BLAKE2B 372b8f269cd8e8e65df8ecce53d8a7838a7baae4da64147e900afe5aeaa7bdc19968aeef120bd17269d48cfdb602b521bbbd4da5dcdc2a503070d270d8c60d85 SHA512 89f65e4f0ef0e5deb11c2aae51d4d4dc55cba9db3751aa34046dd7c6a48691316e1be4a7f3e5644e5202ff4b1bdfd318e44c6ab87700fe4ea07575decd994a7a
 MISC metadata.xml 280 BLAKE2B 6e0485a0da47b477f5276aa17735ff1e9b269dbac220b12c615a80a2ad5a7a6f88aa5bcc9bd715355b5687ba50d78bb0cc45d1ef0ba82c52111691b895cffc8e SHA512 af2aa2fda44a73779e31b805313371a2cb6b9ab2846289a73083074fbff99ea1e7da2fefeaccf13b5f11c4c55b6ccb38390f21eab3f4ac1a61e00914ae38fff9
diff --git a/sys-boot/woeusb/woeusb-3.2.12.ebuild b/sys-boot/woeusb/woeusb-3.2.12.ebuild
index cad25750e3c4..573d9db62c74 100644
--- a/sys-boot/woeusb/woeusb-3.2.12.ebuild
+++ b/sys-boot/woeusb/woeusb-3.2.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/slacka/WoeUSB/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="minimal"
 
 RDEPEND="