gentoo auto-resync : 26:12:2022 - 02:06:21

6 files changed, 4 insertions, 488 deletions

diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index a3523292fec6..6a8f694a8b20 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -4,11 +4,8 @@ AUX 6.04_pre1/0003-GCC-10-compatibility-patch.patch 3356 BLAKE2B 1ceb5ce12ae9e1f
 AUX 6.04_pre1/0004-Inherit-toolchain-vars-from-environment.patch 1446 BLAKE2B fbc9c08173f82a6d07cbe11673a61f97efc5e0a284ce029f1092776fd79dcbf0023f8157d94313fef81703350498cb85e2a97da4338be3b7ddaf33fe6a20fc4f SHA512 0e2d9a7ade52135c4d53c18aa2b674314784cb6ea74e3a55013686b8c4b70304f2400a1f9b8f6c7ddc17556a0982ace67e4e6f4f0cc76c97fe09e0f19e9a3c0b
 AUX 6.04_pre3/0005-Include-efisetjmp.h-from-efi.h.patch 500 BLAKE2B ed3e0a623c18ecc6880d074397fd6509223e8da1954d09b12f1a6642ca096bcc8a4b9688fbcf239d024a5fe6228aca23dc2069124f3b47c629f67ae8f23e720f SHA512 6dde7d306684174dc68bf952c50f2991d0cbcef545fbc91e220bec620a3e4e2895ac64412b777538d302e2215f1f11e45b29d87918025e98c7e14cf13205eed4
 AUX syslinux-6.03-sysmacros.patch 950 BLAKE2B 60fb26a4bb462409074802b8cf01afe29e8a7f98cb6907f4f2c0902f4cc7342b6053368ddf17331eac888714e795299c155a4078668a3ed0e35d435a8cb241d3 SHA512 8659e82e5a5402633c807c8a8f99b25fd6e3066fd0838a7e984452e2ebeccc0331481c93101f00a698e573cadcd98966ea216e4f2d9873e6893af817998e2549
-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
 DIST syslinux-6.04-pre3.tar.gz 10760898 BLAKE2B 708bb7f3ecbe1888471f3be0102270c056bf8c5be22013f36b56c90f13f5358ce1853722b14b962d8156cd1f045b9687166b98a1d7ad2853acbe6303fa40fae9 SHA512 0619a25347f3964e0c7c6ff629b2f59f01bd9e0afd822f46b67f26b8c84cbc55534cf7b22ff1bf83eec4986fd2d8f1646a3d750190a7c6c50251affc0b62594d
-EBUILD syslinux-6.04_pre1-r4.ebuild 3335 BLAKE2B 2cdeedfdf3c83f673902351f1758dcb59744476501143a41cc2a66f1bb9eab5f7ee2a8607e8dd399a5873b69c3661f7cee9d58d0e30632e00751998fb71d8ba2 SHA512 fd0b9f331adc535944f335bcb1871cbfaf09b1f115a797f03ba4c033ee27dd0859950b7a6459dae52ace28e5276017865edea37f4fa4240ff01b026e01e5dcc8
-EBUILD syslinux-6.04_pre1-r5.ebuild 1790 BLAKE2B 95a2db266a736f41f3371302ccbb25a01aae9277ca84f12c75c65863b0392e5d25c6f8fb0fd887115ecd5af07846ae892a5857791f09fab6a1450d086ee1ade1 SHA512 18c7c7da968905fe0eff17a295f25a0416eae2f7b9c7e35c7539ace1dc43d4d2e383fce80aa8a0435626c3f8cadfa6fefa8e921d931aa64462637dfba662baaa
-EBUILD syslinux-6.04_pre3-r1.ebuild 2092 BLAKE2B d5c949d8963b448f8e5636976058b81e3a536b50e0ade632a94459a913b6a6080ea2ff7625276e761f13d2698623aebb8a0d053e1827c4be4eb7732911d3bd40 SHA512 fd965c9648853c0abe2fdeeb3b6d4016673ec376cc29f167e19835aa840aa21663c2c9b5e9155638863ccf2874c520c213b0cd7c9d04df7b60019653fa79650b
+EBUILD syslinux-6.04_pre1-r5.ebuild 1797 BLAKE2B 3884272efa9306c0ac6a16cbf0d1f936010b51e160c814d0c9ee5cbea4128904dbacfcc096d4e1e82d2f696dedc278f57df199da78c249365c66185d8ba863c4 SHA512 e4c87b969e3a14899eb53a340a33194ccb1a486b2ae8e933768e6974557a705465c9548f40557cd7236e48fedad336f617a3b6b3b740bf44da6dcbc262b9a1e8
+EBUILD syslinux-6.04_pre3-r1.ebuild 2099 BLAKE2B 1a3490d39afcddf675fd7f21c564629d589e39e743890c212cb1723658c45c47f6aea06ffcdb738c94457f33bc4aa5a77dfaad0d2b97d6dd14cd850a3236a4b6 SHA512 b4abedca303afeaf29f1da1ec2923bf8784cefb6a5da074603e81a178deb1ad01fba1596ff4bef3793c676728610225d8b6381fa9e7aa19f978ab229733e85e7
 MISC metadata.xml 529 BLAKE2B 8d1614f7254b20836e2bc0f650ae2e3795fd665119bc2d1427e236a417c5c82699929c0291f4b12c04ba2ac387f9d6650682d0d95802fdf333b1267367b4e75c SHA512 e80e9ba96972111b3c5cdea98fb032c50bb7f94a445785ed54d236933768ae2734d248c71ecf54f36d6b3641a7e15abdb4ef4c0b968d59d20ee9259019d32e38
diff --git a/sys-boot/syslinux/files/syslinux-6.04_pre1-fcommon.patch b/sys-boot/syslinux/files/syslinux-6.04_pre1-fcommon.patch
deleted file mode 100644
index 7d061db26563..000000000000
--- a/sys-boot/syslinux/files/syslinux-6.04_pre1-fcommon.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://bugs.gentoo.org/705730
-
-gcc-10 enabled f-no-common by default. Broke syslinux linking.
---- a/mk/com32.mk
-+++ b/mk/com32.mk
-@@ -47,6 +47,7 @@ GCCOPT += $(call gcc_ok,-falign-functions=0,-malign-functions=0)
- GCCOPT += $(call gcc_ok,-falign-jumps=0,-malign-jumps=0)
- GCCOPT += $(call gcc_ok,-falign-labels=0,-malign-labels=0)
- GCCOPT += $(call gcc_ok,-falign-loops=0,-malign-loops=0)
-+GCCOPT += $(call gcc_ok,-fcommon)
- 
- ifeq ($(FWCLASS),EFI)
- GCCOPT += -mno-red-zone
---- a/mk/elf.mk
-+++ b/mk/elf.mk
-@@ -42,6 +42,7 @@ GCCOPT += $(call gcc_ok,-falign-functions=0,-malign-functions=0)
- GCCOPT += $(call gcc_ok,-falign-jumps=0,-malign-jumps=0)
- GCCOPT += $(call gcc_ok,-falign-labels=0,-malign-labels=0)
- GCCOPT += $(call gcc_ok,-falign-loops=0,-malign-loops=0)
-+GCCOPT += $(call gcc_ok,-fcommon)
- 
- com32 = $(topdir)/com32
- core = $(topdir)/core
---- a/mk/embedded.mk
-+++ b/mk/embedded.mk
-@@ -51,6 +51,7 @@ GCCOPT    += $(call gcc_ok,-falign-jumps=0,-malign-jumps=0)
- GCCOPT    += $(call gcc_ok,-falign-labels=0,-malign-labels=0)
- GCCOPT    += $(call gcc_ok,-falign-loops=0,-malign-loops=0)
- GCCOPT    += $(call gcc_ok,-fvisibility=hidden)
-+GCCOPT    += $(call gcc_ok,-fcommon)
- 
- LIBGCC    := $(shell $(CC) $(GCCOPT) --print-libgcc)
- 
---- a/mk/lib.mk
-+++ b/mk/lib.mk
-@@ -28,6 +28,7 @@ GCCOPT += $(call gcc_ok,-falign-functions=0,-malign-functions=0)
- GCCOPT += $(call gcc_ok,-falign-jumps=0,-malign-jumps=0)
- GCCOPT += $(call gcc_ok,-falign-labels=0,-malign-labels=0)
- GCCOPT += $(call gcc_ok,-falign-loops=0,-malign-loops=0)
-+GCCOPT += $(call gcc_ok,-fcommon)
- 
- INCLUDE	= -I$(SRC)
- STRIP	= strip --strip-all -R .comment -R .note
---- a/mk/efi.mk
-+++ b/mk/efi.mk
-@@ -7,7 +7,7 @@ core = $(topdir)/core
- # Set up architecture specifics; for cross compilation, set ARCH as apt
- # gnuefi sets up architecture specifics in ia32 or x86_64 sub directories
- # set up the LIBDIR and EFIINC for building for the appropriate architecture
--GCCOPT := $(call gcc_ok,-fno-stack-protector,)
-+GCCOPT := $(call gcc_ok,-fno-stack-protector,) $(call gcc_ok,-fcommon)
- EFIINC = $(objdir)/include/efi
- LIBDIR  = $(objdir)/lib
- 
diff --git a/sys-boot/syslinux/files/syslinux-6.04_pre1-singleloadsegment.patch b/sys-boot/syslinux/files/syslinux-6.04_pre1-singleloadsegment.patch
deleted file mode 100644
index db9b7d0a137b..000000000000
--- a/sys-boot/syslinux/files/syslinux-6.04_pre1-singleloadsegment.patch
+++ /dev/null
@@ -1,304 +0,0 @@
-Author: Lukas Schwaighofer <lukas@schwaighofer.name>
-Description: Force the linker to put all sections into a single PT_LOAD
- segment. This is required when using binutils >= 2.31 which writes two PT_LOAD
- segments by default. This is not supported by the wrapper.c script used to
- convert the shared object into an elf binary.
-Forwarded: https://www.syslinux.org/archives/2018-August/026167.html
-
----
- efi/i386/syslinux.ld   | 37 +++++++++++++++++++++----------------
- efi/x86_64/syslinux.ld | 37 +++++++++++++++++++++----------------
- 2 files changed, 42 insertions(+), 32 deletions(-)
-
-diff --git a/efi/i386/syslinux.ld b/efi/i386/syslinux.ld
-index bab3fc7..5b4589d 100644
---- a/efi/i386/syslinux.ld
-+++ b/efi/i386/syslinux.ld
-@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
- OUTPUT_ARCH(i386)
- ENTRY(_start)
- 
-+PHDRS
-+{
-+	all PT_LOAD ;
-+}
-+
- SECTIONS
- {
- 	. = 0;
-@@ -31,7 +36,7 @@ SECTIONS
- 		*(.text)
- 		*(.text.*)
- 		__text_end = .;
--	}
-+	} :all
- 
- 	. = ALIGN(16);
- 
-@@ -40,7 +45,7 @@ SECTIONS
- 		*(.rodata)
- 		*(.rodata.*)
- 		__rodata_end = .;
--	}
-+	} :all
- 
- 	. = ALIGN(4);
- 
-@@ -49,14 +54,14 @@ SECTIONS
- 		KEEP (*(SORT(.ctors.*)))
- 		KEEP (*(.ctors))
- 		__ctors_end = .;
--	}
-+	} :all
- 
- 	.dtors : {
- 		__dtors_start = .;
- 		KEEP (*(SORT(.dtors.*)))
- 		KEEP (*(.dtors))
- 		__dtors_end = .;
--	}
-+	} :all
- 
- 	. = ALIGN(4096);
- 	.rel : {
-@@ -64,7 +69,7 @@ SECTIONS
- 		*(.rel.data)
- 		*(.rel.data.*)
- 		*(.rel.ctors)
--	}
-+	} :all
- 
- 	. = ALIGN(4);
- 
-@@ -72,14 +77,14 @@ SECTIONS
- 		__gnu_hash_start = .;
- 		*(.gnu.hash)
- 		__gnu_hash_end = .;
--	}
-+	} :all
- 
- 
- 	.dynsym : {
- 		__dynsym_start = .;
- 		*(.dynsym)
- 		__dynsym_end = .;
--	}
-+	} :all
- 
- 	. = ALIGN(4);
- 
-@@ -87,7 +92,7 @@ SECTIONS
- 		__dynstr_start = .;
- 		*(.dynstr)
- 		__dynstr_end = .;
--	}
-+	} :all
- 
- 	. = ALIGN(4);
- 
-@@ -104,7 +109,7 @@ SECTIONS
- 		KEEP (*(.got.plt))
- 		KEEP (*(.got))
- 		__got_end = .;
--	}
-+	} :all
- 
- 	. = ALIGN(4);
- 
-@@ -112,7 +117,7 @@ SECTIONS
- 		__dynamic_start = .;
- 		*(.dynamic)
- 		__dynamic_end = .;
--	}
-+	} :all
- 
- 	. = ALIGN(16);
- 
-@@ -122,19 +127,19 @@ SECTIONS
- 		*(.data.*)
- 		*(.lowmem)
- 		__data_end = .;
--	}
-+	} :all
- 
- 	.reloc : {
- 		*(.reloc)
--	}
-+	} :all
- 
- 	.symtab : {
- 		*(.symtab)
--	}
-+	} :all
- 
- 	.strtab : {
- 		*(.strtab)
--	}
-+	} :all
- 
- 	.bss (NOLOAD) : {
- 		/* the EFI loader doesn't seem to like a .bss section,
-@@ -148,7 +153,7 @@ SECTIONS
- 		__bss_end = .;
- 		*(.sbss)
- 		*(.scommon)
--	}
-+	} :all
- 	__bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start);
- 	__bss_dwords = (__bss_len + 3) >> 2;
- 
-@@ -161,7 +166,7 @@ SECTIONS
- 		*(.hugebss)
- 		*(.hugebss.*)
- 		__hugebss_end = .;
--	}
-+	} :all
- 
- 	_end = .;
- 
-diff --git a/efi/x86_64/syslinux.ld b/efi/x86_64/syslinux.ld
-index 450641c..cad28a8 100644
---- a/efi/x86_64/syslinux.ld
-+++ b/efi/x86_64/syslinux.ld
-@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64")
- OUTPUT_ARCH(i386:x86-64)
- ENTRY(_start)
- 
-+PHDRS
-+{
-+	all PT_LOAD ;
-+}
-+
- SECTIONS
- {
- 	. = 0;
-@@ -31,7 +36,7 @@ SECTIONS
- 		*(.text)
- 		*(.text.*)
- 		__text_end = .;
--	}
-+	} :all
- 
- 	. = ALIGN(16);
- 
-@@ -40,7 +45,7 @@ SECTIONS
- 		*(.rodata)
- 		*(.rodata.*)
- 		__rodata_end = .;
--	}
-+	} :all
- 
- 	. = ALIGN(4);
- 
-@@ -49,14 +54,14 @@ SECTIONS
- 		KEEP (*(SORT(.ctors.*)))
- 		KEEP (*(.ctors))
- 		__ctors_end = .;
--	}
-+	} :all
- 
- 	.dtors : {
- 		__dtors_start = .;
- 		KEEP (*(SORT(.dtors.*)))
- 		KEEP (*(.dtors))
- 		__dtors_end = .;
--	}
-+	} :all
- 
- 	. = ALIGN(4096);
- 	.rel : {
-@@ -64,7 +69,7 @@ SECTIONS
- 		*(.rel.data)
- 		*(.rel.data.*)
- 		*(.rel.ctors)
--	}
-+	} :all
- 
- 	. = ALIGN(4);
- 
-@@ -72,14 +77,14 @@ SECTIONS
- 		__gnu_hash_start = .;
- 		*(.gnu.hash)
- 		__gnu_hash_end = .;
--	}
-+	} :all
- 
- 
- 	.dynsym : {
- 		__dynsym_start = .;
- 		*(.dynsym)
- 		__dynsym_end = .;
--	}
-+	} :all
- 
- 	. = ALIGN(4);
- 
-@@ -87,7 +92,7 @@ SECTIONS
- 		__dynstr_start = .;
- 		*(.dynstr)
- 		__dynstr_end = .;
--	}
-+	} :all
- 
- 	. = ALIGN(4);
- 
-@@ -104,7 +109,7 @@ SECTIONS
- 		KEEP (*(.got.plt))
- 		KEEP (*(.got))
- 		__got_end = .;
--	}
-+	} :all
- 
- 	. = ALIGN(4);
- 
-@@ -112,7 +117,7 @@ SECTIONS
- 		__dynamic_start = .;
- 		*(.dynamic)
- 		__dynamic_end = .;
--	}
-+	} :all
- 
- 	. = ALIGN(16);
- 
-@@ -122,19 +127,19 @@ SECTIONS
- 		*(.data.*)
- 		*(.lowmem)
- 		__data_end = .;
--	}
-+	} :all
- 
- 	.reloc : {
- 		*(.reloc)
--	}
-+	} :all
- 
- 	.symtab : {
- 		*(.symtab)
--	}
-+	} :all
- 
- 	.strtab : {
- 		*(.strtab)
--	}
-+	} :all
- 
- 	.bss (NOLOAD) : {
- 		/* the EFI loader doesn't seem to like a .bss section,
-@@ -148,7 +153,7 @@ SECTIONS
- 		__bss_end = .;
- 		*(.sbss)
- 		*(.scommon)
--	}
-+	} :all
- 	__bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start);
- 	__bss_dwords = (__bss_len + 3) >> 2;
- 
-@@ -161,7 +166,7 @@ SECTIONS
- 		*(.hugebss)
- 		*(.hugebss.*)
- 		__hugebss_end = .;
--	}
-+	} :all
- 
- 	_end = .;
- 
diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r4.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r4.ebuild
deleted file mode 100644
index 0c721bfd018e..000000000000
--- a/sys-boot/syslinux/syslinux-6.04_pre1-r4.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
-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
-SRC_URI_TESTING=Testing/${PV:0:4}
-[[ ${PV/_alpha} != ${PV} ]] && SRC_URI_DIR=${SRC_URI_TESTING}
-[[ ${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="https://www.kernel.org/pub/linux/utils/boot/syslinux/${SRC_URI_DIR}/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="custom-cflags"
-
-RDEPEND="sys-apps/util-linux
-	sys-fs/mtools
-	dev-perl/Crypt-PasswdMD5
-	dev-perl/Digest-SHA1"
-DEPEND="${RDEPEND}
-	dev-lang/nasm
-	>=sys-boot/gnu-efi-3.0u
-	virtual/os-headers"
-
-S=${WORKDIR}/${P/_/-}
-
-# 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.
-
-# These are executables which come precompiled and are run by the boot loader
-QA_PREBUILT="usr/share/${PN}/*.c32"
-
-# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.03-sysmacros.patch #579928
-	"${FILESDIR}"/${P}-singleloadsegment.patch #662678
-	"${FILESDIR}"/${P}-fcommon.patch #705730
-)
-
-src_prepare() {
-	default
-
-	rm -f gethostip #bug 137081
-
-	# Don't prestrip or override user LDFLAGS, bug #305783
-	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"
-	else
-		QA_FLAGS_IGNORED="
-			/sbin/extlinux
-			/usr/bin/memdiskfind
-			/usr/bin/gethostip
-			/usr/bin/isohybrid
-			/usr/bin/syslinux
-			"
-	fi
-	case ${ARCH} in
-		amd64)	loaderarch="efi64" ;;
-		x86)	loaderarch="efi32" ;;
-		*)	ewarn "Unsupported architecture, building installers only." ;;
-	esac
-
-	# building with ld.gold causes problems, bug #563364
-	if tc-ld-is-gold; then
-		ewarn "Building syslinux with the gold linker may cause problems, see bug #563364"
-		if [[ -z "${I_KNOW_WHAT_I_AM_DOING}" ]]; then
-			tc-ld-disable-gold
-			ewarn "set I_KNOW_WHAT_I_AM_DOING=1 to override this."
-		else
-			ewarn "Continuing anyway as requested."
-		fi
-	fi
-
-	tc-export AR CC LD OBJCOPY RANLIB
-}
-
-_emake() {
-	emake \
-		AR="${AR}" \
-		CC="${CC}" \
-		LD="${LD}" \
-		OBJCOPY="${OBJCOPY}" \
-		RANLIB="${RANLIB}" \
-		"$@"
-}
-
-src_compile() {
-	filter-lto #863722
-
-	# build system abuses the LDFLAGS variable to pass arguments to ld
-	unset LDFLAGS
-	if [[ ! -z ${loaderarch} ]]; then
-		_emake ${loaderarch}
-	fi
-	_emake ${loaderarch} installer
-}
-
-src_install() {
-	# parallel install fails sometimes
-	einfo "loaderarch=${loaderarch}"
-	_emake -j1 INSTALLROOT="${D}" MANDIR=/usr/share/man bios ${loaderarch} install
-	mv "${ED}"/usr/bin/keytab-{lilo,syslinux} || die
-	dodoc README NEWS doc/*.txt
-}
diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
index b363d64c3d32..df1dd06bfa03 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
@@ -52,7 +52,7 @@ src_compile() {
 	local HEXDATE=$(printf '0x%08x' "${DATE}")
 
 	tc-export AR CC LD OBJCOPY RANLIB
-	unset LDFLAGS
+	unset CFLAGS LDFLAGS
 
 	if use bios; then
 		emake bios DATE="${DATE}" HEXDATE="${HEXDATE}"
diff --git a/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild b/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
index d1f4f1c97f13..a942b7d05b86 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
@@ -69,7 +69,7 @@ src_compile() {
 	local HEXDATE=$(printf '0x%08x' "${DATE}")
 
 	tc-export AR CC LD OBJCOPY RANLIB
-	unset LDFLAGS
+	unset CFLAGS LDFLAGS
 
 	if use bios; then
 		emake bios DATE="${DATE}" HEXDATE="${HEXDATE}"