gentoo resync : 30.06.2018

14 files changed, 109 insertions, 124 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 89931fb38313..101681417f3c 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 306795ee0e84..821cbef6ef87 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,6 +1,7 @@
 AUX 2.02-freetype-capitalise-variables.patch 6454 BLAKE2B 7a05448d42c935b6942f2b9ac98eef2ddc2e7bb7e6584516859cd6586dee57911c83c98402b38cfe9044a3c3a79d41d6a86bb0918d1ca8ccf792d5ef93bad258 SHA512 99c8061453f54af0e95361101f6beb2340baef9b5a66c4c4ba78876b978df4b5686190b642090aae41f2ed2d464e267ba598e94c0926a37df3c36d866911a40c
 AUX 2.02-freetype-pkg-config.patch 7359 BLAKE2B 86ee01b2cb833354377aec3db0dcc05c9950169c9e83b9878018debef925a5238ba19b10ee0ce5124d7884deae8023ee03597e6eb56c244030f2492b5b7f0b1b SHA512 20fd57f8410073db7d6ae5c626266a310be65ca2f5cc4a2a9f2e66cb85a421c883b497e5fc7e3cd5a6ec066531f3ca4b8d837bf64007ade99418958aefd2dcf6
 AUX 2.02-multiple-early-initrd.patch 6771 BLAKE2B 088d1178c51ea7526bd7620ae0f8160c10d3673afd0ae3407e35673cb438875e24e13f8455245c36792814751995df1235d975eb036e97813e677250af403a9d SHA512 41450b475fb83ade629d165ae2c30682e5beb2edbfd148c6388bb720241f0682b20aa0456bc624d5e9f5605616ea27fab32a829ede6c8c673e1c88e6b774a5a8
+AUX 2.02-xfs-sparse-inodes.patch 2548 BLAKE2B c3333b82b678bc0a2bfc6594719c89982f97b14b7a2f012814ce2f75e004cda46b8b7c2d4e668c5a52aee7814114a763c4d853d9c75b4322535096ba3c22e256 SHA512 4723c5dd9fd6e9b6c8677e32e4906c7995d695c7e85e834b1b29eb1d9a024678f8fa75846c7b929d1db9b5911b604c69c1b0379cb3b9adc98d5bb6d6719eb2c4
 AUX gfxpayload.patch 1118 BLAKE2B 4104fc696535b1c3feba5876bccc64f9b2e52319ee992c59e7f17b8310cc9addf7545630fff78c73ca3f4b0dcd44e1bf69f4df5264d6f58777f7e5aeae93cbcb SHA512 00324825c369902a0383b792cd21e161853eadccbdc5abe2420f2d443bf6a74f72be6c15243107b936acd38c3547387c3771dc2cb566003c4c754c9260b4aa00
 AUX grub-0.97-Add-esp-to-list-of-clobbered-registers.patch 1612 BLAKE2B a8169fc73299a2a0bf59d66f0226da436bef249d543d3509d1c45bd355b0beceab66369ea1c5c4b8e78cb8a8084fbabd6fc09da8efdc0ffac427dc67142a5773 SHA512 85241fc4f939cbf6dc9e18b0b68034835bcb4ac7162fa1dc497e169422b66f0320d59d8270bc13c827a325f45d260028276641cff3f12b4d6096e2d33a12261b
 AUX grub-0.97-ncurses-pkgconfig.patch 799 BLAKE2B da34dca4e6009b6386d66e0b05264293e4095007239558712a0fa7a0b18a8f05112840f1f25355298a67cffe441621e4dbf14a4373d1fe6d91144fad4b799173 SHA512 9456c422e05e75e4221101d66bf1c1ba3efa195ef67872a75790362da825bffe1bcd74c5ff6e3f5a9ccda6b364f02c631c0d513c0de5aa19a78be9bea525c13f
@@ -16,7 +17,7 @@ DIST splash.xpm.gz 33856 BLAKE2B e8d0ee91a87ed45f47fa58b07a6476b19ddb3f98ffee41a
 DIST unifont-9.0.06.pcf.gz 1360354 BLAKE2B 09b96e1711c729ef159d62e3ea7b289ca2d01dc0ea417e35a18b73dc02a23f62ce7821d9761bceee4002d9eeaabd91cfb69bbacc6fbdfdfa00445d18fe8f1d66 SHA512 dd0a1afa72f5204c62055d83f22750c74af38ffafdb8eda8e1f1cf7292e572a14969b8a9a6a2cb336d5bed4ab633f6b5a962c59117a590e4238788959cb82774
 EBUILD grub-0.97-r16.ebuild 9596 BLAKE2B ff6e369d331c18300a8a5b73232d5381ffecac3364ce2c789e3db2f510f1d0ebc929994eaafa41cec4193676c39022f4bda868afd95d5ee15dfa61fadba29bf8 SHA512 26aa6178cc463e79cf3416773517e35606aca9d8721da2f6aee0d5b7db223b32e4ca812188a488734784a5725646daceff24b3ae9d8e14452becad1ce25ebff1
 EBUILD grub-0.97-r18.ebuild 10141 BLAKE2B 7af15e1634c7e96930a7ddaa72d9ab7adae72a0b62729d65d52fd86262d7a7c2a27e2a59c412733463bccc83e9b30d62408d5bebb30f90c99135c05fabc140e7 SHA512 d9c481f77fa1d2f750b64de8cfa02f52be9a0d563607ca50117e4792add79b21e3fb34dc448beebbbb7a99153b9dc5cad01d447209fae154a8205864593c89d6
-EBUILD grub-2.02-r1.ebuild 7897 BLAKE2B 5d469ccd66ffcbbaa38bcb2e9d6334ed50c8d01b7e4952d0861475b908971560d28908c3a20f7d5b698b31ad368215f910bc6638edd358253b1338448a20f80f SHA512 12a8d9663ba37568da21f974f684e84e8d278ef33de8fd34e92e8d3b4c4fbec81adf69a96143f4c86ea0ad36aa5a6334235ee4e6d33d5b65dc40b836bcec55ac
-EBUILD grub-2.02.ebuild 7597 BLAKE2B 31631da1a5c9c871ecfff60f9508bc81b557ed25226b70f31b0157611db6ea237e269f44fc0789215c19c32f4633cb9e0ca1293c3af2dc86b6e6b4ffb78538ed SHA512 d3aa7a602989d0eee9c48ddd527253099cfb81887171c69add1f83fea36bac295147fc11cd9cdd2c06410670c435cf1c3f20303660675aa936668b04178cb8ba
-EBUILD grub-9999.ebuild 7755 BLAKE2B b5db9a0dc7b0fddf4320a31bd69450b26acc5e24540ddcc80e9172a0ec70b4141705a20185a2327d5c4edf5a214bbe979c10175d2cb105b45e4c7a94bed57d7e SHA512 19072f01a8e2f7f5f6ed65dd48a6e6120adb2004f49cba33b02e04ee4131cea7f077490f76d484e458f62fd3f719d488ed1d08bad793fc8c4bc4ea5bd31c7792
+EBUILD grub-2.02-r1.ebuild 7887 BLAKE2B 699241391c6c0d6b3a6f29ac8f969e001209fbda1b7f9a0ac7b52a4445356387c4e28341cf13e506cd8fb1e8c1790085f72e64f7e4074ec530dedf3d4b331fef SHA512 b592aee07225d6d4f8631f5196831b902b7d6483cc646146345339bb73c1c68697a25d4581dc2fdb3bf5764deab777cf252e541572c86accaf941d2fc7abc671
+EBUILD grub-2.02-r2.ebuild 7933 BLAKE2B 74ccf88e5255046c454e756cff3f1700e1b2f17ec5f93b98ea4a224b983141dc652f821bed59f45bf54605e1e5adb59b0c5ef64bbcb03ed9b75225b741688300 SHA512 51087b78d4463b8eeffa5ca93ba74114a113398334b4f21d746f347f175cfdb863e19a87d35c23db784062f1440704049235183adad844f451df90f08762d776
+EBUILD grub-9999.ebuild 7745 BLAKE2B 6056b651f5bda56bd64486248d86151635b63a9f2898e55958ce5e1410b6a2df14b39cd7e804cd510c7c2b961daea89a8ad77b85c060925beb8129ab208e39d2 SHA512 3f3fb69a63fb57c476a40c3f2a8c0b86b0739743d52c3da09309de27e6842c0f53c3a6062cb577db32b1d24ab2e41a3baecd89fabc861721af7ac580aa05d7ab
 MISC metadata.xml 1488 BLAKE2B 3aa41f3c6c45258892bcf2800bfe09b506d11aa69a3071977e58736e496b72b71df579cfcaf1d14a3b81db695aca0bf7dbcc7a18faf1c62dd05f033bdafb00c8 SHA512 71f3e48b73c3d20f213ae928b16499131417562d98b83f2d82a5fb026c8cc06ecddf9db32565d9e1602d4258f7a2cc1796eb523c4cb98fb6b7753328a29e93ba
diff --git a/sys-boot/grub/files/2.02-xfs-sparse-inodes.patch b/sys-boot/grub/files/2.02-xfs-sparse-inodes.patch
new file mode 100644
index 000000000000..6c6a750b42f0
--- /dev/null
+++ b/sys-boot/grub/files/2.02-xfs-sparse-inodes.patch
@@ -0,0 +1,60 @@
+From cda0a857dd7a27cd5d621747464bfe71e8727fff Mon Sep 17 00:00:00 2001
+From: Daniel Kiper <daniel.kiper@oracle.com>
+Date: Tue, 29 May 2018 16:16:02 +0200
+Subject: xfs: Accept filesystem with sparse inodes
+
+The sparse inode metadata format became a mkfs.xfs default in
+xfsprogs-4.16.0, and such filesystems are now rejected by grub as
+containing an incompatible feature.
+
+In essence, this feature allows xfs to allocate inodes into fragmented
+freespace.  (Without this feature, if xfs could not allocate contiguous
+space for 64 new inodes, inode creation would fail.)
+
+In practice, the disk format change is restricted to the inode btree,
+which as far as I can tell is not used by grub.  If all you're doing
+today is parsing a directory, reading an inode number, and converting
+that inode number to a disk location, then ignoring this feature
+should be fine, so I've added it to XFS_SB_FEAT_INCOMPAT_SUPPORTED
+
+I did some brief testing of this patch by hacking up the regression
+tests to completely fragment freespace on the test xfs filesystem, and
+then write a large-ish number of inodes to consume any existing
+contiguous 64-inode chunk.  This way any files the grub tests add and
+traverse would be in such a fragmented inode allocation.  Tests passed,
+but I'm not sure how to cleanly integrate that into the test harness.
+
+Signed-off-by: Eric Sandeen <sandeen@redhat.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+Tested-by: Chris Murphy <lists@colorremedies.com>
+---
+ grub-core/fs/xfs.c | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c
+index c6031bd..3b00c74 100644
+--- a/grub-core/fs/xfs.c
++++ b/grub-core/fs/xfs.c
+@@ -79,9 +79,18 @@ GRUB_MOD_LICENSE ("GPLv3+");
+ #define XFS_SB_FEAT_INCOMPAT_SPINODES   (1 << 1)        /* sparse inode chunks */
+ #define XFS_SB_FEAT_INCOMPAT_META_UUID  (1 << 2)        /* metadata UUID */
+ 
+-/* We do not currently verify metadata UUID so it is safe to read such filesystem */
++/*
++ * Directory entries with ftype are explicitly handled by GRUB code.
++ *
++ * We do not currently read the inode btrees, so it is safe to read filesystems
++ * with the XFS_SB_FEAT_INCOMPAT_SPINODES feature.
++ *
++ * We do not currently verify metadata UUID, so it is safe to read filesystems
++ * with the XFS_SB_FEAT_INCOMPAT_META_UUID feature.
++ */
+ #define XFS_SB_FEAT_INCOMPAT_SUPPORTED \
+ 	(XFS_SB_FEAT_INCOMPAT_FTYPE | \
++	 XFS_SB_FEAT_INCOMPAT_SPINODES | \
+ 	 XFS_SB_FEAT_INCOMPAT_META_UUID)
+ 
+ struct grub_xfs_sblock
+-- 
+cgit v1.0-41-gc330
+
diff --git a/sys-boot/grub/grub-2.02-r1.ebuild b/sys-boot/grub/grub-2.02-r1.ebuild
index c8bd4fb84d95..01ea55f70e52 100644
--- a/sys-boot/grub/grub-2.02-r1.ebuild
+++ b/sys-boot/grub/grub-2.02-r1.ebuild
@@ -16,7 +16,7 @@ if [[ -n ${GRUB_AUTORECONF} ]]; then
 	inherit autotools
 fi
 
-inherit bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs versionator
+inherit bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs
 
 if [[ ${PV} != 9999 ]]; then
 	if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
@@ -76,7 +76,7 @@ COMMON_DEPEND="
 	)
 	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
 	libzfs? ( sys-fs/zfs )
-	mount? ( sys-fs/fuse )
+	mount? ( sys-fs/fuse:0 )
 	truetype? ( media-libs/freetype:2= )
 	ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
 	ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
diff --git a/sys-boot/grub/grub-2.02.ebuild b/sys-boot/grub/grub-2.02-r2.ebuild
index 44db1517a9f3..bc92a886e21c 100644
--- a/sys-boot/grub/grub-2.02.ebuild
+++ b/sys-boot/grub/grub-2.02-r2.ebuild
@@ -1,19 +1,22 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-if [[ ${PV} == 9999  ]]; then
-	GRUB_AUTOGEN=1
-fi
+GRUB_AUTOGEN=1
+GRUB_AUTORECONF=1
 
 if [[ -n ${GRUB_AUTOGEN} ]]; then
 	PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+	inherit python-any-r1
+fi
+
+if [[ -n ${GRUB_AUTORECONF} ]]; then
 	WANT_LIBTOOL=none
-	inherit autotools python-any-r1
+	inherit autotools
 fi
 
-inherit autotools bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs versionator
+inherit bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs
 
 if [[ ${PV} != 9999 ]]; then
 	if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
@@ -25,7 +28,7 @@ if [[ ${PV} != 9999 ]]; then
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 		S=${WORKDIR}/${P%_*}
 	fi
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
@@ -35,6 +38,10 @@ fi
 PATCHES=(
 	"${FILESDIR}"/gfxpayload.patch
 	"${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
+	"${FILESDIR}"/2.02-multiple-early-initrd.patch
+	"${FILESDIR}"/2.02-freetype-capitalise-variables.patch
+	"${FILESDIR}"/2.02-freetype-pkg-config.patch
+	"${FILESDIR}"/2.02-xfs-sparse-inodes.patch
 )
 
 DEJAVU=dejavu-sans-ttf-2.37
@@ -62,7 +69,7 @@ REQUIRED_USE="
 
 # os-prober: Used on runtime to detect other OSes
 # xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
-RDEPEND="
+COMMON_DEPEND="
 	app-arch/xz-utils
 	>=sys-libs/ncurses-5.2-r5:0=
 	debug? (
@@ -70,19 +77,22 @@ RDEPEND="
 	)
 	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
 	libzfs? ( sys-fs/zfs )
-	mount? ( sys-fs/fuse )
+	mount? ( sys-fs/fuse:0 )
 	truetype? ( media-libs/freetype:2= )
 	ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
 	ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	${PYTHON_DEPS}
 	app-misc/pax-utils
 	sys-devel/flex
 	sys-devel/bison
 	sys-apps/help2man
 	sys-apps/texinfo
-	fonts? ( media-libs/freetype:2 )
+	fonts? (
+		media-libs/freetype:2
+		virtual/pkgconfig
+	)
 	grub_platforms_xen? ( app-emulation/xen-tools:= )
 	grub_platforms_xen-32? ( app-emulation/xen-tools:= )
 	static? (
@@ -91,6 +101,7 @@ DEPEND="${RDEPEND}
 			app-arch/bzip2[static-libs(+)]
 			media-libs/freetype[static-libs(+)]
 			sys-libs/zlib[static-libs(+)]
+			virtual/pkgconfig
 		)
 	)
 	test? (
@@ -106,9 +117,11 @@ DEPEND="${RDEPEND}
 	themes? (
 		app-arch/unzip
 		media-libs/freetype:2
+		virtual/pkgconfig
 	)
+	truetype? ( virtual/pkgconfig )
 "
-RDEPEND+="
+RDEPEND="${COMMON_DEPEND}
 	kernel_linux? (
 		grub_platforms_efi-32? ( sys-boot/efibootmgr )
 		grub_platforms_efi-64? ( sys-boot/efibootmgr )
@@ -117,8 +130,6 @@ RDEPEND+="
 	nls? ( sys-devel/gettext )
 "
 
-DEPEND+=" !!=media-libs/freetype-2.5.4"
-
 RESTRICT="strip !test? ( test )"
 
 QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*"
@@ -153,6 +164,9 @@ src_prepare() {
 	if [[ -n ${GRUB_AUTOGEN} ]]; then
 		python_setup
 		bash autogen.sh || die
+	fi
+
+	if [[ -n ${GRUB_AUTORECONF} ]]; then
 		autopoint() { :; }
 		eautoreconf
 	fi
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 8c33dc3f4bbc..e540b36db349 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -18,7 +18,7 @@ if [[ -n ${GRUB_AUTORECONF} ]]; then
 	inherit autotools
 fi
 
-inherit bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs versionator
+inherit bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs
 
 if [[ ${PV} != 9999 ]]; then
 	if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
@@ -74,7 +74,7 @@ COMMON_DEPEND="
 	)
 	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
 	libzfs? ( sys-fs/zfs )
-	mount? ( sys-fs/fuse )
+	mount? ( sys-fs/fuse:0 )
 	truetype? ( media-libs/freetype:2= )
 	ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
 	ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index f9b7adddb893..967fc46509c2 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -6,9 +6,9 @@ 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-3.86.ebuild 1469 BLAKE2B 4445578daec0d3ad61eefdcba6c2b5a465d0e007cd62afa306ef5149d2ae273c412e35d64d8f357665b1c436fa955d89f5d7c448d54e2bcdc09f6dc97e8dc05c SHA512 bed09418a0ca454086504a0dbad999a5d138ca68b06c6171f0df613b5db50e0533733c24ce17b97090d9f245010d3607bc0f74bc7a2b3f7a51c43b34b56c316d
-EBUILD syslinux-4.07.ebuild 1765 BLAKE2B 52fe1df4b88e80d18d7844c7b2d990b252d5b5ce7d0ff06511a160fe0a1e745a2a6275ed90d07a88b44fadc5b48820918779ebbe281440a085e65a71869255da SHA512 f20150c9c04579e4de9197f7a663a738e0ff34f17251e207640c1b0f43c9d78e2c2bae5c8298eb65b964ad05edbef09fdde6fff36cf45745185af9b014c536a8
-EBUILD syslinux-5.10.ebuild 2218 BLAKE2B 1dcfff544dd060928f791b62b006673115d0d4732d7bd2de519a3a53f972fc90199e361e60c4379fc4a15fef63655f77fc18fb3c05a1c5cbed2d15d4c7dbfc7c SHA512 2bb2224850aed70306f29d475f5297fc466a4d04e5a70cf749ab1edefe56fe94b0c30eddf0ed226e07338a8e5ecc37ada691b6b4f0edbe62438a8e7e3b359a4b
-EBUILD syslinux-6.03.ebuild 3409 BLAKE2B 66eba084cb5ead2c873f7fe802f5a9bffe19d19496aa63f4cc4dce6639d89d406468e271f2e96cdff8dcd4b9b751587d3ae9b087037c83bcab2e555b302da5f8 SHA512 55f895a2b6bbdf0e1e7fa321b700138db1dc2dcd073acec722d222adccb55c092057fa90d4421f5b428aec9b66c746f30ae7ec4c62c84bdf04974c7a4a5e1cef
-EBUILD syslinux-6.04_pre1.ebuild 3407 BLAKE2B 2dbd5397fcf93f97bd1a879bcd9a9da8e1e34b8c8941e29786925251d42e02442df2d242421736a3a06bafbf3d7a7c1054e4950552b5283be95fb19cccc337f0 SHA512 859e1f935acd80d60de3690206d44f19ca59d0036983ed83c5ed2096117cdc40790699989227e1788b650761665ff9ff1884284287eff8412b36625ef83acde4
+EBUILD syslinux-3.86.ebuild 1470 BLAKE2B caa769b29ff3b1eec3cbe6dfaa592a7e13d497b51c4d750f0608d7fe6819c1f2e3f3922d6ec04898dfb0ba3464816f744cc57f76af3dce706ab3e15527149d7c SHA512 1c3c0472ed3aee5e8220ffe60379557c575237fd23e5961674d2b427f00d64713ba6044b2ffa961735c1251d136a049eed0649166b3be50793fcc9761f0ac39e
+EBUILD syslinux-4.07.ebuild 1766 BLAKE2B 7deb22867d34e77ddfe38fd91a483bd219a9ca642ecd1b505f451928f8a9eb0f5fbe07b0e4548e814fccf8b871ecba519c7c2df79b8635dd6541f17269692b05 SHA512 34cd4118736926d0254a7bf0d7e18b12c3b151549057cb2559ff9517fec5aee7e02889c934a8bcb2f0801fd9ab5121eec3a86b8d116e0421d09263e6c70d3363
+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 3408 BLAKE2B 263c1ef5120c41fbfcafff27946f3ed426a08e5c53485b522c79b393906ecaa38fc57eb3d44aa87bae55cf6166b48dc9492de5c979796614714b61c972eb1302 SHA512 b135489d30fadaec58f9c9c4cdab0405dca715cf7b7fcc3207cb6d34918a86993d5519bc4b0dc368e0d1e1344604ca2e8c3f134ec85300c79397dd2895f5db5b
 MISC metadata.xml 330 BLAKE2B bfb2aae9b13d232ca01f0ed74b99385c056ecbf59dba80999ff840c7885450158b44d32bdb9ec51f078e1d3c3f839cf6f9bf6432b0998aa62538d39dfc0a3850 SHA512 89e1dde9592f2cc3ed391f6f3ad29b877751b95b0c1bbb4416cd0c38f136c4a293f4687ebb5758adab540d6f3ff63f20f43847e294644c9e68ee84f3223657ac
diff --git a/sys-boot/syslinux/syslinux-3.86.ebuild b/sys-boot/syslinux/syslinux-3.86.ebuild
index 5a228651d5ea..a6f387689acf 100644
--- a/sys-boot/syslinux/syslinux-3.86.ebuild
+++ b/sys-boot/syslinux/syslinux-3.86.ebuild
@@ -6,7 +6,7 @@ EAPI=0
 inherit eutils toolchain-funcs
 
 DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader"
-HOMEPAGE="http://syslinux.zytor.com/"
+HOMEPAGE="https://syslinux.zytor.com/"
 SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/sys-boot/syslinux/syslinux-4.07.ebuild b/sys-boot/syslinux/syslinux-4.07.ebuild
index 958da21c5cf8..6d6dee9d9c93 100644
--- a/sys-boot/syslinux/syslinux-4.07.ebuild
+++ b/sys-boot/syslinux/syslinux-4.07.ebuild
@@ -6,7 +6,7 @@ EAPI=0
 inherit eutils toolchain-funcs
 
 DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
-HOMEPAGE="http://syslinux.zytor.com/"
+HOMEPAGE="https://syslinux.zytor.com/"
 SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/sys-boot/syslinux/syslinux-5.10.ebuild b/sys-boot/syslinux/syslinux-5.10.ebuild
index 978e1f047d96..dbe728fd1497 100644
--- a/sys-boot/syslinux/syslinux-5.10.ebuild
+++ b/sys-boot/syslinux/syslinux-5.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -6,7 +6,7 @@ EAPI=4
 inherit eutils toolchain-funcs
 
 DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
-HOMEPAGE="http://www.syslinux.org/"
+HOMEPAGE="https://www.syslinux.org/"
 SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P/_/-}.tar.xz"
 
 LICENSE="GPL-2"
diff --git a/sys-boot/syslinux/syslinux-6.03.ebuild b/sys-boot/syslinux/syslinux-6.03.ebuild
index 3dcc890decaf..c1f72d04354d 100644
--- a/sys-boot/syslinux/syslinux-6.03.ebuild
+++ b/sys-boot/syslinux/syslinux-6.03.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
-HOMEPAGE="http://www.syslinux.org/"
+HOMEPAGE="https://www.syslinux.org/"
 # Final releases in 6.xx/$PV.tar.* (literal "xx")
 # Testing releases in Testing/$PV/$PV.tar.*
 SRC_URI_DIR=${PV:0:1}.xx
diff --git a/sys-boot/syslinux/syslinux-6.04_pre1.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
index 2a96ac4acdf0..649460108cd5 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
-HOMEPAGE="http://www.syslinux.org/"
+HOMEPAGE="https://www.syslinux.org/"
 # Final releases in 6.xx/$PV.tar.* (literal "xx")
 # Testing releases in Testing/$PV/$PV.tar.*
 SRC_URI_DIR=${PV:0:1}.xx
diff --git a/sys-boot/unetbootin/Manifest b/sys-boot/unetbootin/Manifest
index fc19c8940584..6afaf6649e9b 100644
--- a/sys-boot/unetbootin/Manifest
+++ b/sys-boot/unetbootin/Manifest
@@ -1,7 +1,5 @@
 AUX unetbootin-581-desktop.patch 707 BLAKE2B 9de8d50b00bbe6fe5968cb26f31aca08cf4dc8aa580a00b9af31e921a973ee62c6213b8154867902b61b5882377b8beddfbfa096ee7d4382f6adba05342b26cd SHA512 036f887c7fb4209cd08710be88ef25671e8c1e481e3d82bc78cc1e3b1480224573cbbbf8c290846373937863400ee108b72521c1d6a9a883e01209c1da33cae2
-DIST unetbootin-657.tar.gz 16258176 BLAKE2B 7124e3a4cace41b1ca61ca468e37adc90ae7d3099f54dc5da200cc7b7d94567afa5b4a597ba7d7e3a1327951fd7e61f320bc676b72ba68c7255e9145e5791adc SHA512 69ffdbc23f372c795e84267dfbed2221783a7efc9b1d5f589e7c308384cdfd0d9cf0950058f665e2c10bf6f17e0efd3eff81a1bedb98da316583f2462dfed2d9
 DIST unetbootin-661-qt5.patch.tar.xz 8060 BLAKE2B 58cb323166e344ecabf5d372e80ff0367a1344866a6e8dea4b2677a85ea6ae0b5591480a3bcbbfc3a51d391b07adf0d5f370ee77e4c7e1d6f2b727aedf274cf0 SHA512 c1226575484fa63c94ca4da875a26c7bd64bcb27d8e07ea5b67bb3f2546f31d1360d10c363cd7301476811e332c9524c96d6ba482c894b86a5b28ca8a1c8b385
 DIST unetbootin-661.tar.gz 16257579 BLAKE2B 2f92cf286c8010a80d4d4cc48a7ece55e159af9f3729277d97eb99ef2ebe8945023d03c51d6e97d7101d8547240e3c2152004222ec4c825ef4ab954c4018e7b0 SHA512 bbf74a4c4ca9b52f4da672eb54524b7fcb796c65ba80700dc3c6f2677bde37574f42a11c213cc4d4eee38783aed650beee1e2894f60185745e509a2e9571f70a
-EBUILD unetbootin-657.ebuild 1841 BLAKE2B 16d81eecfdff3af01e3825a8d6fa81074a541a9326de6437af784f7999319a640d0a4099f4f3bd8d17321724f75671daf171739be7def326e3f95044967955b9 SHA512 f7e972624c154460f6caaadd06ba1a3fdd28e9917008c63ee160edffd289ef082139f6f146336327e7bff3a2cbc2e903fc069dfc2f3c95d3898305f012de6b12
 EBUILD unetbootin-661.ebuild 2025 BLAKE2B f6609a960da447974e485981fabb6f9151c8328184a3702a2b96e664fa42ccf028be3a5e942037465a3e0ef3858ea43686331cc1db54ddde6c3e8c59057bba4c SHA512 f74ee3ebf4e3e4145e60d16d1fca73f1a61a82274c86cd568f03acee99b94b366f2adb2e518e04229eea395ac95f21712c40b9ae5aa7764aa9ff1a03880756d3
 MISC metadata.xml 385 BLAKE2B 05836339f25bd812b23c8b93a6f05934a4bfa12d9fdd61f73140131c2d7609a5d1e257ed80c2cd983020720645e5444078cc71f2f51be9a2d435715e38ceea3f SHA512 9676e393ac2d18489433f0e658340a3eec0e01e0b35ca786540b07a6466f0b572f5d5bf115e6dc0b5c4898c00f630b9f5023f62f8e8f3a96c105bc74f918eb21
diff --git a/sys-boot/unetbootin/unetbootin-657.ebuild b/sys-boot/unetbootin/unetbootin-657.ebuild
deleted file mode 100644
index f675b358ca6b..000000000000
--- a/sys-boot/unetbootin/unetbootin-657.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils 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"
-
-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}
-
-DEPEND="dev-qt/qtgui:4"
-RDEPEND="
-	${DEPEND}
-	app-arch/p7zip
-	sys-boot/syslinux
-	sys-fs/mtools
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-581-desktop.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
-}
-
-src_configure() {
-	sed -i -e '/^RESOURCES/d' unetbootin.pro || die
-
-	UNBN_QTPATH="$(qt4_get_bindir)/"
-	"${UNBN_QTPATH}"lrelease ${PN}.pro || die
-
-	eqmake4 ${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
-}