gentoo resync : 14.12.2020

10 files changed, 99 insertions, 178 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 8e1570ebdfa9..5f5f63f0a163 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/raspberrypi-firmware/Manifest b/sys-boot/raspberrypi-firmware/Manifest
index ca35e124f801..32159b630ae0 100644
--- a/sys-boot/raspberrypi-firmware/Manifest
+++ b/sys-boot/raspberrypi-firmware/Manifest
@@ -5,7 +5,9 @@ AUX raspberrypi-firmware-1.20201022-cmdline.txt 108 BLAKE2B b7830fdaf1ffb64cb07a
 AUX raspberrypi-firmware-1.20201022-config.txt 1784 BLAKE2B 7f37f02c486e6db2767b108e5926dc056f558ef32ae8ac3debea2fe7a210b159a2e4721846be8719520667c9bb86dc5d15c7c815f90dfe2686748f4d474fac61 SHA512 0909fae9bf731417f732486f7823f92a142824f5cab490b1736a16e7f569c9ecd805828c533c238dd3c5d75efcd2679e0d3697d988388000e1475a966fa66f12
 DIST raspberrypi-firmware-1.20190925.tar.gz 185571086 BLAKE2B c3a9b2760fa853fbd1dd09bc4048c9e78594f88da5af608c3a761554d4046a4c869db8981c64140a24e82e0a61b8dc776bb8d895df60c6424e44780f78b18cb0 SHA512 4b7b29cc6c2a33d7a37987c492034d9afbb2220364c50cf265e0adf8e5f393c2275dcffaa77c89b3f43b2e98d199741b67590cb60ff8beae8ef677852f63b4a0
 DIST raspberrypi-firmware-1.20201022.tar.gz 189827375 BLAKE2B 94c38f60d688c8e3ebab830912daccbb6c04bdd3d88f6ca0d07d85be0a6b12c53f0266b4c258ed4694f30bad5db30fb6d30feabfd0b7668735a9a806b820d325 SHA512 876758179df27109984b6c3f4849fdcdc6bdcc2769495fcc83c97fc3ff4d07b9f3cd58086be877503f72c9e5417d2be6d6c33bce4cbb3b862055117c9cc26db8
+DIST raspberrypi-firmware-1.20201201.tar.gz 189332299 BLAKE2B b3ec91f07b4713d26c29be5412d018a220129eef7ddf7c5c09d85e645c2c5754a95f13be7e690ab40648a982e3974cc760aa5b33c76612da836227d38c4ee3a5 SHA512 a7f4591552718956bd7f2d0d377234277e2e6f18cc9714ea30fe13f26d5ae1164b982f39dcf72ae4a18663369ef06d0187d8182713763262371c13107aac4c65
 EBUILD raspberrypi-firmware-1.20190925.ebuild 1911 BLAKE2B 126451fbb0daa5f9d07381fb0e6259cfed1235c2b59773a44c03cbb84eb480a1092138b0e64b2e1e495d9b9ae43fd876ab2a0ef507f976dd36a8847276c28db6 SHA512 3e52692de708837448b18aef8a9df97b065bab94539c43f0c58fc786b8e4aede84a168d402d4dbd118661f433361a817b39cbbfe219caef3966a3d6fbb37e3b4
-EBUILD raspberrypi-firmware-1.20201022.ebuild 1892 BLAKE2B 7d3b73f730a94a75f61652eb350c12c7d3cd328cd26b03bf3cf4300df1c4fe9bd7c7d8fed90523645d6d692665a0b35d4db9ea50fa423d50c38115ed76bb7401 SHA512 7f88844eba41233565f6ac795dd2f9f390c94b7e153bb2893e4bc24eaeb28c7984523b44212f1c349a93b21aa51c984b21f102425eb9fff757f11e5753ca950a
+EBUILD raspberrypi-firmware-1.20201022.ebuild 1890 BLAKE2B 9753b9646bbc6fde102e179c085a640d655a9c1032fb92a5637fe54327e89d8f898071038c99cf7f013926f06f73795b2b5cab652838665b4a1c368459121cb3 SHA512 2bb448d45c08f68d284eb54ad2bf15e6f5b77dda2b75dbe45ae1a75476177f723336774fbe6e0956419b2822661a33db80692dcd8656b2efbb3c64e535065043
+EBUILD raspberrypi-firmware-1.20201201.ebuild 1891 BLAKE2B b4da4a56d2a17da1c9fcc4303cf15e5bf39afe0f1b770816c46abb770afd2030a30b080f994223c0e6663eb2b46a19e20cfa2fa84d2efe97408f6db4d5099760 SHA512 a780cd790e8eae658989968fd868e69983e933862253147f32eb9510d81715b3f26850ee88c46311edf1b4d619fae87afb974944b0461a9840c8066333cfb00a
 EBUILD raspberrypi-firmware-9999.ebuild 1892 BLAKE2B 7d3b73f730a94a75f61652eb350c12c7d3cd328cd26b03bf3cf4300df1c4fe9bd7c7d8fed90523645d6d692665a0b35d4db9ea50fa423d50c38115ed76bb7401 SHA512 7f88844eba41233565f6ac795dd2f9f390c94b7e153bb2893e4bc24eaeb28c7984523b44212f1c349a93b21aa51c984b21f102425eb9fff757f11e5753ca950a
 MISC metadata.xml 324 BLAKE2B 89413ad14dfe3013cc5fe46bdfb743b947f1385e39dd2504b55d4a6c671fc4a006a721f8e810636275c5d5b4f26a259dd57ea0d1dc46a0db7c8c2e6bfb792efa SHA512 d50c8ad607a73dea23813309dcefb33ea5120771a5db38780ca946350a4de2c93d3a61ef7482479f1065de9de0158597683032d0fbdfa18286e0b4f0bffcce2d
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201022.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201022.ebuild
index 7fe926ad7820..9ed770d2e9df 100644
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201022.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201022.ebuild
@@ -11,7 +11,7 @@ if [[ "${PV}" == 9999 ]]; then
 	EGIT_CLONE_TYPE="shallow"
 else
 	SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="-* ~arm ~arm64"
+	KEYWORDS="-* arm arm64"
 	S="${WORKDIR}/firmware-${PV}"
 fi
 
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201201.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201201.ebuild
new file mode 100644
index 000000000000..55d6595f60bf
--- /dev/null
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201201.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mount-boot readme.gentoo-r1
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
+	EGIT_CLONE_TYPE="shallow"
+else
+	SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="-* ~arm ~arm64"
+	S="${WORKDIR}/firmware-${PV}"
+fi
+
+DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware"
+HOMEPAGE="https://github.com/raspberrypi/firmware"
+
+LICENSE="GPL-2 raspberrypi-videocore-bin"
+SLOT="0"
+RESTRICT="binchecks strip"
+
+DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}"/${PN}-1.20201022-config.txt "${WORKDIR}" || die
+
+	if use arm64; then
+		# Force selection of the 64-bit kernel8.img to match our userland
+		echo "arm_64bit=1" >> "${WORKDIR}"/${PN}-1.20201022-config.txt || die
+	fi
+}
+
+src_install() {
+	insinto /boot
+	cd boot || die
+	doins bootcode.bin fixup*.dat start*elf
+	newins "${WORKDIR}"/${PN}-1.20201022-config.txt config.txt
+	newins "${FILESDIR}"/${PN}-1.20201022-cmdline.txt cmdline.txt
+	newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		local msg=""
+
+		if [[ -e "${ED}"/boot/cmdline.txt ]] && [[ -e /boot/cmdline.txt ]] ; then
+			msg+="/boot/cmdline.txt "
+		fi
+
+		if [[ -e "${ED}"/boot/config.txt ]] && [[ -e /boot/config.txt ]] ; then
+			msg+="/boot/config.txt "
+		fi
+
+		if [[ -n "${msg}" ]] ; then
+			msg="This package installs following files: ${msg}."
+			msg="${msg} Please remove (backup) your copies during install"
+			msg="${msg} and merge settings afterwards."
+			msg="${msg} Further updates will be CONFIG_PROTECTed."
+			die "${msg}"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index 375213d9846d..e4bcff65f8c1 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -1,7 +1,7 @@
 AUX makefile.patch 856 BLAKE2B d4de5c95330577bf2a25b8c50aa3193c3b57ce740abe12bc3996af18eda54c1514e2129a1e28f0bca7384b1f4b78e19e8b35e07e816a23cc04a93ba2804214d0 SHA512 51c0552984791190fc44159de1797094dffc01cf6ef90a3219b069ae2417c0ff5020a19b34d26b0c3f7d1a1bc9184078948f669a4186893561833ff88afdb316
+AUX refind-0.12.0-gcc10.patch 321 BLAKE2B 35cb0676fa14218eb90753481cb3f76718b71b8311b4df1a9bbf1ebe591d8a9bb06d68210c422266640771a84d80805274a2008fd454f417bbb4137b96003205 SHA512 38f679759698c23927d9c3934ffbb1ef26ca590b5b6103927ec9816f9f4b5f9745703ced94f1b357d9b47b84b3b8b8072ead507acedb576e7f4eed0c1834dee6
 DIST refind-src-0.11.4.tar.gz 3812192 BLAKE2B 7219eeffffb63961a7ba8f7617546a12021cfe80df80a83c4dbd47cd40b0d8afbdc510abb44de3029ff15ed49372bd59e0b156f4c27eab3ef7bd6ccc3c7e02db SHA512 529962ae432edaf1895ba98deb00a23c66bd742578e1a367f70f7ed22dd7be7daf1960df8af410fba79ca775169120499a4c10119331b2b12b55a002d4354de1
 DIST refind-src-0.12.0.tar.gz 3898337 BLAKE2B 1197049fb7d91db64135dafda7488bdb1da4997ce6a6d49dfe635526240e3193d8c7c22597aee0f2d6754ce6061b4127d8aa21d43c9f061501de98e25de609d3 SHA512 3ade9642d7acf31097daa5308acb96a9fa3371314073b5a09601a886fc30444752efa08ed9fb35e421efb0b4eb9efbccd7b5c9bd6b3b9ed4af74c58f22a74729
 EBUILD refind-0.11.4.ebuild 4746 BLAKE2B 9870720301e1697a91d1380832e1b0205de95e8aa1ad56de1022f17dd1b88e8c9d064f4344abc7b518d0dd0a5c662dfe4ea21cfca6f6cf4e941f6d5fee21ce85 SHA512 137a9af7e7727b2bbc40649ce7d2223f5db62e2b5c8817cb7982ca1dd0e67aa98edb250565cef65bd6bebcf79885b1d66d8a6931e6536f9561dc621b3b4c8f59
-EBUILD refind-0.12.0-r1.ebuild 3643 BLAKE2B 570720144d6ca0432ea5ae74d63dd86a5e88c7c2b39f84329f673ddf82b611333dae41c97cbf1339d3bd21db9afea3e1817ce9d7848d516db24b561da2681d1e SHA512 8ac04cfda4a7b000d059546ed6fa20432c86b0a168c5783eb4ad30b3b1994d91a35cc59550edc38922916e794de31bfde0546938de2408820f9633731dd8a785
-EBUILD refind-0.12.0.ebuild 4732 BLAKE2B 501398cee52099f0a727f30866c6d890a848b8bb5f83df9db637b3b90ce40deb141b803fefaca176cb1bb731cfd00b8eeaf5bbc8a2f24c0e7e1b14244e894393 SHA512 d9339513227603715ea47ad4521722b10411c2b0243003410cf018093c222be4cf347b82c1b4a963429eb05485a444e37852f6dc52647d7277174d6be08ed8cb
+EBUILD refind-0.12.0-r1.ebuild 3721 BLAKE2B c379bdc444feae85e4d2c3d2078932027ed2faa23155d9d04319600dc2648fbff425d3a7c459092fb737d3ee66adff9b59cfcf3324584f9014d086d827ef887d SHA512 d3e92db3107e38f3ce0e1524ef2b5257a609b726ab5a74f7685d4345b0d8c32c0c84e60296d268167a4949d983272d34d5dcbd47043ee27d543daf8e0a5ac199
 MISC metadata.xml 3821 BLAKE2B dd2985fd4728180562a6c11969c27e1d1af70e80e3c68aa4fe7ce7665b752c6aa4adb6fce27487dd97563821b13f2e97e746b6b6e0c346a212380b9c1b231de4 SHA512 e0a5ebc2757e7584afb0628b5f451458974f8ffc1c94774b0ba0eda67ba582fabe08cf8d17fce2df934bba5bded40605f665da0a236d08a53f19b422afae9336
diff --git a/sys-boot/refind/files/refind-0.12.0-gcc10.patch b/sys-boot/refind/files/refind-0.12.0-gcc10.patch
new file mode 100644
index 000000000000..1f2e2bc0a5de
--- /dev/null
+++ b/sys-boot/refind/files/refind-0.12.0-gcc10.patch
@@ -0,0 +1,11 @@
+--- a/Make.common
++++ b/Make.common
+@@ -60,7 +60,7 @@
+ #
+ 
+ # ...for both GNU-EFI and TianoCore....
+-OPTIMFLAGS      = -Os -fno-strict-aliasing
++OPTIMFLAGS      = -Os -fno-strict-aliasing -fno-tree-loop-distribute-patterns
+ CFLAGS          = $(OPTIMFLAGS) -fno-stack-protector -fshort-wchar -Wall
+ 
+ # ...for GNU-EFI....
diff --git a/sys-boot/refind/refind-0.12.0-r1.ebuild b/sys-boot/refind/refind-0.12.0-r1.ebuild
index b595a111e7e0..f63a0cbd3243 100644
--- a/sys-boot/refind/refind-0.12.0-r1.ebuild
+++ b/sys-boot/refind/refind-0.12.0-r1.ebuild
@@ -15,10 +15,14 @@ KEYWORDS="~amd64 ~x86"
 FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
 IUSE="${FS_USE} custom-cflags doc"
 
-DEPEND=">=sys-boot/gnu-efi-3.0.2"
+DEPEND="sys-boot/gnu-efi"
 
-DOCS=(README.txt)
-PATCHES=("${FILESDIR}/makefile.patch")
+PATCHES=(
+	"${FILESDIR}/makefile.patch"
+	"${FILESDIR}/${P}-gcc10.patch" # Bug 723244
+)
+
+DOCS=( README.txt )
 
 pkg_pretend() {
 	if use custom-cflags; then
@@ -78,7 +82,7 @@ src_compile() {
 		FILESYSTEMS_GNUEFI="${fs_names[@]}"
 	)
 	if use custom-cflags; then
-		make_flags=(CFLAGS="${CFLAGS}" "${make_flags[@]}")
+		make_flags=(CFLAGS="${CFLAGS} -fno-tree-loop-distribute-patterns" "${make_flags[@]}")
 	fi
 
 	emake "${make_flags[@]}" all_gnuefi
diff --git a/sys-boot/refind/refind-0.12.0.ebuild b/sys-boot/refind/refind-0.12.0.ebuild
deleted file mode 100644
index 9091a88cfcb1..000000000000
--- a/sys-boot/refind/refind-0.12.0.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multiprocessing toolchain-funcs
-
-DESCRIPTION="The UEFI Boot Manager by Rod Smith"
-HOMEPAGE="https://www.rodsbooks.com/refind/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
-
-LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
-IUSE="${FS_USE} custom-cflags doc gnuefi"
-
-DEPEND="gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-	!gnuefi? ( >=sys-boot/udk-2018-r1 )"
-
-DOCS=(README.txt)
-PATCHES=("${FILESDIR}/makefile.patch")
-UDK_WORKSPACE="${T}/udk"
-
-pkg_pretend() {
-	if use custom-cflags; then
-		ewarn
-		ewarn "You have enabled building with USE=custom-cflags. Be aware that"
-		ewarn "using this can result in EFI binaries that fail to run and may"
-		ewarn "fail to build at all. This is strongly advised against by upstream."
-		ewarn
-		ewarn "See https://bugs.gentoo.org/598587#c3 for more information"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if use x86; then
-		export EFIARCH=ia32
-		export BUILDARCH=ia32
-	elif use amd64; then
-		export EFIARCH=x64
-		export BUILDARCH=x86_64
-	fi
-}
-
-src_prepare() {
-	default
-
-	# bug 598647 - PIE not supported
-	sed -e '/^CFLAGS/s:$: -fno-PIE:' -i Make.common || die
-
-	# Prepare UDK workspace
-	if ! use gnuefi; then
-		mkdir "${UDK_WORKSPACE}" || die
-		ln -s "${EPREFIX}/usr/lib/udk/"{Mde,IntelFramework}{,Module}Pkg \
-			"${UDK_WORKSPACE}" || die "Could not link UDK files"
-	fi
-}
-
-src_configure() {
-	if ! use gnuefi; then
-		# Use the side effect of the script which will create configuration files
-		(. udk-workspace "${UDK_WORKSPACE}" || die)
-		sed -e "s:^#\?\s*\(MAX_CONCURRENT_THREAD_NUMBER\s*=\).*$:\1 $(makeopts_jobs):" \
-			-i "${UDK_WORKSPACE}/Conf/target.txt" || die "Failed to configure target file"
-		sed -e "s:\(_\(CC\|ASM\|PP\|VFRPP\|ASLCC\|ASLPP\|DLINK\)_PATH\s*=\).*$:\1 $(tc-getCC):" \
-			-e "s:\(_ASLDLINK_PATH\s*=\).*$:\1 $(tc-getLD):" \
-			-e "s:\(_OBJCOPY_PATH\s*=\).*$:\1 $(tc-getOBJCOPY):" \
-			-e "s:\(_RC_PATH\s*=\).*$:\1 $(tc-getOBJCOPY):" \
-			-e "s:\(_SLINK_PATH\s*=\).*$:\1 $(tc-getAR):" \
-			-e "s:-Werror::" \
-			-i "${UDK_WORKSPACE}/Conf/tools_def.txt" \
-			|| die "Failed to prepare tools definition file"
-	fi
-}
-
-src_compile() {
-	# Update fs targets depending on uses
-	local fs fs_names=()
-	for fs in ${FS_USE}; do
-		fs=${fs#+}
-		if use "${fs}"; then
-			fs_names+=(${fs})
-		fi
-	done
-	use gnuefi && fs_names=("${fs_names[@]/%/_gnuefi}")
-
-	# Prepare flags
-	local make_flags=(
-		ARCH="${BUILDARCH}"
-		CC="$(tc-getCC)"
-		AS="$(tc-getAS)"
-		LD="$(tc-getLD)"
-		AR="$(tc-getAR)"
-		RANLIB="$(tc-getRANLIB)"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		GNUEFILIB="/usr/$(get_libdir)"
-		EFILIB="/usr/$(get_libdir)"
-		EFICRT0="/usr/$(get_libdir)"
-		EDK2BASE="${UDK_WORKSPACE}"
-		EDK2_DRIVER_BASENAMES="${fs_names[@]}"
-		FILESYSTEMS="${fs_names[@]}"
-		FILESYSTEMS_GNUEFI="${fs_names[@]}"
-	)
-	if use custom-cflags; then
-		make_flags=(CFLAGS="${CFLAGS}" "${make_flags[@]}")
-	fi
-
-	emake "${make_flags[@]}" all_$(usex gnuefi gnuefi edk2)
-}
-
-src_install() {
-	exeinto "/usr/lib/${PN}"
-	doexe refind-install
-	dosym "../lib/${PN}/refind-install" "/usr/sbin/refind-install"
-
-	if use doc; then
-		doman "docs/man/"*
-		DOCS+=(NEWS.txt docs/refind docs/Styles)
-	fi
-	einstalldocs
-
-	insinto "/usr/lib/${PN}/refind"
-	doins "refind/refind_${EFIARCH}.efi"
-	doins "refind.conf-sample"
-	doins -r images icons fonts banners
-
-	if [[ -d "drivers_${EFIARCH}" ]]; then
-		doins -r "drivers_${EFIARCH}"
-	fi
-
-	insinto "/usr/lib/${PN}/refind/tools_${EFIARCH}"
-	doins "gptsync/gptsync_${EFIARCH}.efi"
-
-	insinto "/etc/refind.d"
-	doins -r "keys"
-
-	dosbin "mkrlconf"
-	dosbin "mvrefind"
-	dosbin "refind-mkdefault"
-}
-
-pkg_postinst() {
-	elog "rEFInd has been built and installed into ${EROOT}/usr/lib/${PN}"
-	elog "You will need to use the command 'refind-install' to install"
-	elog "the binaries into your EFI System Partition"
-	elog ""
-	elog "refind-install requires additional packages to be fully functional:"
-	elog " app-crypt/sbsigntools for binary signing for use with SecureBoot"
-	elog " sys-boot/efibootmgr for writing to NVRAM"
-	elog " sys-apps/gptfdisk for ESP management"
-	elog ""
-	elog "refind-mkdefault requires >=dev-lang/python-3"
-	elog ""
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "A sample configuration can be found at"
-		elog "${EROOT}/usr/lib/${PN}/refind/refind.conf-sample"
-	else
-		if ver_test "${REPLACING_VERSIONS}" -lt "0.12.0"; then
-			ewarn "This new version uses sys-apps/gptfdisk instead of sys-block/parted"
-			ewarn "to manage ESP"
-			ewarn ""
-		fi
-		ewarn "Note that this installation will not update any EFI binaries"
-		ewarn "on your EFI System Partition - this needs to be done manually"
-	fi
-}
diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index bb49b83155cd..d496f6b18df2 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -2,6 +2,6 @@ AUX syslinux-6.03-sysmacros.patch 950 BLAKE2B 60fb26a4bb462409074802b8cf01afe29e
 AUX syslinux-6.04_pre1-fcommon.patch 2111 BLAKE2B 6b0d047cc729e7e9c9658ccd6ecd1166eb1ff2be569132f94b0d2bdc71eb9412a05bf23aa287626949a6ea376b2a8d02877d72182d4ea50d54e445df9c38ac81 SHA512 50c58bc44c77a5a68910cd40370f4259afd1392fe8e1b5c6ac25f7e610d994ebc8d17434eb8d3f832a14f098e16b5b597c723f98ce8c12a89118f5b8d2c65529
 AUX syslinux-6.04_pre1-singleloadsegment.patch 4744 BLAKE2B a28ff29b9a4bdd2cb65a6700c96ff99ba1a045a401d50587efe59d703f12aca3e47a14a8e7a569c50f11d367545990d09c35f90362efe49d0c9d489802885879 SHA512 9585edfc8ab0e22d4d7757ccdc435c198c5457466fb4fdefc1829cbbe8951f3406b7b51eea56044cc297d29e45772e2154e5746e6d9b92310f17c880c950ff8a
 DIST syslinux-6.04-pre1.tar.xz 5283272 BLAKE2B 800e5977ed13b26a1756c33d8625e850631b642e26a86e3328196ddd998596693c3a26db0ada4c0ba78a4ba692a1cc01886b6eb693d877ddafcfb325ecdeb639 SHA512 7927dd39be8e2dcf4138a6fea33def67d19d938379d694f15b48fdd2f5924c028b7a9e7bd71d0c7c6630c203e9e2a54296628e530632ad5e6f55b1ebefe8fc98
-EBUILD syslinux-6.04_pre1-r2.ebuild 3217 BLAKE2B 15b770ce608e6644033d014970a92f693502cd6d9567fa719b05f47ae7deb7e245f69059c5217639b7eae807ab904d69f9a0c6dc9412b9f8c3ec535f966c638b SHA512 330fc00b75f935146c0b34756c22dbab07dfbe8eaf5a85c2df98a9611141baf8d4bf6ef0fa6084c21568cd2ece750fc94afd56e2d00e0388a0150049aa3e540a
+EBUILD syslinux-6.04_pre1-r2.ebuild 3216 BLAKE2B d35aa6293cd5c84f411dc88ffedd7116e02ec8a93186f7995bf998dd067fcfa943b8eac48d1c2ad13c6a18dd9712fef3b762bb7cf2b93da4cbe29a9a712c790e SHA512 146b77e98e4fdce99f2e53368af97d5dcedce55077dd42cffb60c45d7c2bd5a13f3422f7481e0a8a5b7464d386b62bfb39a61b036eb25fc44664827548d877c7
 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-6.04_pre1-r2.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
index 415672bbf778..52aaa1653ef6 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/${SRC_URI_DIR}/${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 x86"
 IUSE="custom-cflags"
 
 RDEPEND="sys-fs/mtools