New prerelease. Remove old.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

14 files changed, 13 insertions, 610 deletions

diff --git a/sys-boot/syslinux/ChangeLog b/sys-boot/syslinux/ChangeLog
index f065ca2554aa..34f80bb150fb 100644
--- a/sys-boot/syslinux/ChangeLog
+++ b/sys-boot/syslinux/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-boot/syslinux
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v 1.67 2010/06/20 17:47:13 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v 1.68 2010/06/22 13:11:19 chithanh Exp $
+
+*syslinux-4.00_pre55 (22 Jun 2010)
+
+  22 Jun 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -syslinux-1.76.ebuild, -syslinux-3.11.ebuild,
+  -files/syslinux-3.11-nopie.patch, -files/syslinux-3.11-nossp.patch,
+  -syslinux-3.20.ebuild, -syslinux-3.31.ebuild, -syslinux-3.52.ebuild,
+  -files/syslinux-3.70-nopie.patch, -files/syslinux-3.70-nostrip.patch,
+  -syslinux-3.71.ebuild, -syslinux-3.84.ebuild, -syslinux-3.85.ebuild,
+  -syslinux-4.00_pre50.ebuild, +syslinux-4.00_pre55.ebuild:
+  New prerelease. Remove old.
 
   20 Jun 2010; Markus Meier <maekke@gentoo.org> syslinux-3.86.ebuild:
   x86 stable, bug #305435
diff --git a/sys-boot/syslinux/files/syslinux-3.11-nopie.patch b/sys-boot/syslinux/files/syslinux-3.11-nopie.patch
deleted file mode 100644
index f23957ddc921..000000000000
--- a/sys-boot/syslinux/files/syslinux-3.11-nopie.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- syslinux/com32/libutil/Makefile
-+++ syslinux/com32/libutil/Makefile
-@@ -40,7 +40,7 @@
- AR	   = ar
- NASM	   = nasm
- RANLIB	   = ranlib
--CFLAGS     = $(M32) -mregparm=3 -DREGPARM=3 -D__COM32__ -W -Wall -march=i386 -Os -fomit-frame-pointer -I./include -I../include $(call gcc_ok,-fno-stack-protector,)
-+CFLAGS     = $(M32) -mregparm=3 -DREGPARM=3 -D__COM32__ -W -Wall -march=i386 -Os -fomit-frame-pointer -I./include -I../include $(call gcc_ok,-fno-stack-protector,) $(call gcc_ok,-nopie,)
- SFLAGS     = $(M32) -D__COM32__ -march=i386
- LDFLAGS    = -T ../lib/com32.ld
- LNXCFLAGS  = -I./include -W -Wall -fno-stack-protector -O -g
---- syslinux/dos/Makefile
-+++ syslinux/dos/Makefile
-@@ -3,7 +3,7 @@
- OBJCOPY  = objcopy
- OPTFLAGS = -g -Os -march=i386 -falign-functions=0 -falign-jumps=0 -falign-loops=0 -fomit-frame-pointer
- INCLUDES = -include code16.h -I. -I.. -I../libfat
--CFLAGS	 = -W -Wall -fno-stack-protector -ffreestanding -msoft-float $(OPTFLAGS) $(INCLUDES)
-+CFLAGS	 = -W -Wall -nopie -fno-stack-protector -ffreestanding -msoft-float $(OPTFLAGS) $(INCLUDES)
- LDFLAGS	 = -T com16.ld
- AR       = ar
- RANLIB   = ranlib
diff --git a/sys-boot/syslinux/files/syslinux-3.11-nossp.patch b/sys-boot/syslinux/files/syslinux-3.11-nossp.patch
deleted file mode 100644
index 33b2867fcfda..000000000000
--- a/sys-boot/syslinux/files/syslinux-3.11-nossp.patch
+++ /dev/null
@@ -1,172 +0,0 @@
---- syslinux/Makefile
-+++ syslinux/Makefile
-@@ -18,7 +18,7 @@
- OSTYPE   = $(shell uname -msr)
- CC	 = gcc
- INCLUDE  =
--CFLAGS   = -W -Wall -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
-+CFLAGS   = -W -Wall -fno-stack-protector -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
- PIC      = -fPIC
- LDFLAGS  = -O2 -s
- AR	 = ar
-@@ -194,9 +194,8 @@ libsyslinux.a: bootsect_bin.o ldlinux_bi
- $(LIB_SO): bootsect_bin.o ldlinux_bin.o syslxmod.o
- 	$(CC) $(LDFLAGS) -shared -Wl,-soname,$(LIB_SONAME) -o $@ $^
- 
--gethostip.o: gethostip.c
--
--gethostip: gethostip.o
-+gethostip: gethostip.c
-+	$(CC) $(LDFLAGS) gethostip.c -o gethostip -fno-stack-protector
- 
- mkdiskimage: mkdiskimage.in mbr.bin bin2hex.pl
- 	$(PERL) bin2hex.pl < mbr.bin | cat mkdiskimage.in - > $@
---- syslinux/com32/lib/MCONFIG
-+++ syslinux/com32/lib/MCONFIG
-@@ -18,7 +18,7 @@ LIBFLAGS = -DDYNAMIC_CRC_TABLE -DPNG_NO_
- 
- REQFLAGS  = -g -m32 -mregparm=3 -DREGPARM=3 -D__COM32__ -I. -I./sys -I../include
- OPTFLAGS  = -Os -march=i386 -falign-functions=0 -falign-jumps=0 \
--	    -falign-labels=0
-+	    -falign-labels=0 -fno-stack-protector
- WARNFLAGS = -W -Wall -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Winline
- 
- CFLAGS  = -Wp,-MT,$@,-MD,$(dir $@).$(notdir $@).d $(OPTFLAGS) \
---- syslinux/com32/libutil/Makefile
-+++ syslinux/com32/libutil/Makefile
-@@ -40,10 +40,10 @@ LD         = ld -m elf_i386
- AR	   = ar
- NASM	   = nasm
- RANLIB	   = ranlib
--CFLAGS     = $(M32) -mregparm=3 -DREGPARM=3 -D__COM32__ -W -Wall -march=i386 -Os -fomit-frame-pointer -I./include -I../include
-+CFLAGS     = $(M32) -mregparm=3 -DREGPARM=3 -D__COM32__ -W -Wall -march=i386 -Os -fomit-frame-pointer -I./include -I../include $(call gcc_ok,-fno-stack-protector,)
- SFLAGS     = $(M32) -D__COM32__ -march=i386
- LDFLAGS    = -T ../lib/com32.ld
--LNXCFLAGS  = -I./include -W -Wall -O -g
-+LNXCFLAGS  = -I./include -W -Wall -O -g $(call gcc_ok,-fno-stack-protector,)
- LNXSFLAGS  = -g
- LNXLDFLAGS = -g
- OBJCOPY    = objcopy
---- syslinux/com32/modules/Makefile
-+++ syslinux/com32/modules/Makefile
-@@ -25,8 +25,8 @@ LD         = ld -m elf_i386
- AR	   = ar
- NASM	   = nasm
- RANLIB	   = ranlib
--CFLAGS     = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer -I../libutil/include -I../include  -D__COM32__
--LNXCFLAGS  = -W -Wall -O -g -I../libutil/include
-+CFLAGS     = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer -I../libutil/include -I../include  -D__COM32__ $(call gcc_ok,-fno-stack-protector,)
-+LNXCFLAGS  = -W -Wall -O -g -I../libutil/include $(call gcc_ok,-fno-stack-protector,)
- LNXSFLAGS  = -g
- LNXLDFLAGS = -g
- SFLAGS     = -D__COM32__ -march=i386
---- syslinux/com32/samples/Makefile
-+++ syslinux/com32/samples/Makefile
-@@ -25,8 +25,8 @@ LD         = ld -m elf_i386
- AR	   = ar
- NASM	   = nasm
- RANLIB	   = ranlib
--CFLAGS     = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer -I../libutil/include -I../include  -D__COM32__
--LNXCFLAGS  = -W -Wall -O -g -I../libutil/include
-+CFLAGS     = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer -I../libutil/include -I../include  -D__COM32__ $(call gcc_ok,-fno-stack-protector,)
-+LNXCFLAGS  = -W -Wall -O -g -I../libutil/include $(call gcc_ok,-fno-stack-protector,)
- LNXSFLAGS  = -g
- LNXLDFLAGS = -g
- SFLAGS     = -D__COM32__ -march=i386
---- syslinux/dos/Makefile
-+++ syslinux/dos/Makefile
-@@ -3,7 +3,7 @@ LD       = ld -m elf_i386
- OBJCOPY  = objcopy
- OPTFLAGS = -g -Os -march=i386 -falign-functions=0 -falign-jumps=0 -falign-loops=0 -fomit-frame-pointer
- INCLUDES = -include code16.h -I. -I.. -I../libfat
--CFLAGS	 = -W -Wall -ffreestanding -msoft-float $(OPTFLAGS) $(INCLUDES)
-+CFLAGS	 = -W -Wall -fno-stack-protector -ffreestanding -msoft-float $(OPTFLAGS) $(INCLUDES)
- LDFLAGS	 = -T com16.ld
- AR       = ar
- RANLIB   = ranlib
---- syslinux/extlinux/Makefile
-+++ syslinux/extlinux/Makefile
-@@ -1,7 +1,7 @@
- CC	 = gcc
- OPTFLAGS = -g -Os
- INCLUDES = -I. -I.. -I../libfat
--CFLAGS	 = -W -Wall -Wno-sign-compare -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
-+CFLAGS	 = -W -Wall -fno-stack-protector -Wno-sign-compare -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
- LDFLAGS	 = -s
- 
- SRCS     = extlinux.c ../extlinux_bss_bin.c ../extlinux_sys_bin.c
---- syslinux/memdisk/Makefile
-+++ syslinux/memdisk/Makefile
-@@ -20,7 +20,7 @@ M32     := $(call gcc_ok,-m32,)
- FREE    := $(call gcc_ok,-ffreestanding,)
- 
- CC       = gcc $(M32) $(FREE)
--CFLAGS   = -g -W -Wall -Wno-sign-compare \
-+CFLAGS   = -g -W -Wall -Wno-sign-compare $(call gcc_ok,-fno-stack-protector,) \
- 	   -Os -fomit-frame-pointer -march=i386 $(ALIGN) \
- 	   -DVERSION='"$(VERSION)"' -DDATE='"$(DATE)"'
- LDFLAGS  = -g
---- syslinux/menu/Makefile
-+++ syslinux/menu/Makefile
-@@ -5,7 +5,7 @@ M32     := $(call gcc_ok,-m32,)
- COM32DIR   = ../com32
- LUDIR      = $(COM32DIR)/libutil
- LDIR       = $(COM32DIR)/lib
--CFLAGS     = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer -I$(LUDIR)/include -I$(COM32DIR)/include  -Ilibmenu -D__COM32__
-+CFLAGS     = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer -I$(LUDIR)/include -I$(COM32DIR)/include  -Ilibmenu -D__COM32__ $(call gcc_ok,-fno-stack-protector,)
- SFLAGS     = -D__COM32__ -march=i386
- LDFLAGS    = -T $(LDIR)/com32.ld
- OBJCOPY    = objcopy
---- syslinux/mtools/Makefile
-+++ syslinux/mtools/Makefile
-@@ -1,7 +1,7 @@
- CC	 = gcc
- OPTFLAGS = -g -Os
- INCLUDES = -I. -I.. -I../libfat
--CFLAGS	 = -W -Wall -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
-+CFLAGS	 = -W -Wall -fno-stack-protector -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
- LDFLAGS	 = -s
- 
- SRCS     = syslinux.c ../syslxmod.c ../bootsect_bin.c ../ldlinux_bin.c $(wildcard ../libfat/*.c)
---- syslinux/sample/Makefile
-+++ syslinux/sample/Makefile
-@@ -25,7 +25,7 @@ LD         = ld -m elf_i386
- AR	   = ar
- NASM	   = nasm
- RANLIB	   = ranlib
--CFLAGS     = -W -Wall -march=i386 -Os -fomit-frame-pointer -I../com32/include
-+CFLAGS     = -W -Wall -march=i386 -Os -fomit-frame-pointer -I../com32/include $(call gcc_ok,-fno-stack-protector,)
- SFLAGS     = -march=i386
- LDFLAGS    = -s
- OBJCOPY    = objcopy
---- syslinux/unix/Makefile
-+++ syslinux/unix/Makefile
-@@ -1,7 +1,7 @@
- CC	 = gcc
- OPTFLAGS = -g -Os
- INCLUDES = -I. -I.. -I../libfat
--CFLAGS	 = -W -Wall -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
-+CFLAGS	 = -W -Wall -fno-stack-protector -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
- LDFLAGS	 = -s
- 
- SRCS     = syslinux.c ../syslxmod.c ../bootsect_bin.c ../ldlinux_bin.c $(wildcard ../libfat/*.c)
---- syslinux/win32/Makefile
-+++ syslinux/win32/Makefile
-@@ -23,7 +23,7 @@ ifeq ($(findstring CYGWIN,$(OSTYPE)),CYG
- CC       = gcc
- AR	 = ar
- RANLIB   = ranlib
--CFLAGS   = -mno-cygwin -W -Wall -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
-+CFLAGS   = -mno-cygwin -W -Wall -fno-stack-protector -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
- PIC	 =
- LDFLAGS  = -mno-cygwin -Os -s
- else
-@@ -37,7 +37,7 @@ AR	 = mingw-ar
- RANLIB   = mingw-ranlib
- endif
- 
--CFLAGS   = -W -Wall -Wno-sign-compare -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
-+CFLAGS   = -W -Wall -fno-stack-protector -Wno-sign-compare -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
- PIC      =
- LDFLAGS  = -Os -s
- endif
diff --git a/sys-boot/syslinux/files/syslinux-3.70-nopie.patch b/sys-boot/syslinux/files/syslinux-3.70-nopie.patch
deleted file mode 100644
index 4e9c264574c4..000000000000
--- a/sys-boot/syslinux/files/syslinux-3.70-nopie.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-add no PIE flags if the toolchain supports it
-
---- com32/libutil/Makefile
-+++ com32/libutil/Makefile
-@@ -34,7 +34,8 @@
- gcc_ok   = $(shell tmpf=$(TMPFILE); if gcc $(1) -c -x c /dev/null -o $$tmpf 2>/dev/null; \
- 	           then echo $(1); else echo $(2); fi; rm -f $$tmpf)
- 
--M32     := $(call gcc_ok,-m32,) $(call gcc_ok,-fno-stack-protector,)
-+M32     := $(call gcc_ok,-m32,) $(call gcc_ok,-fno-stack-protector,) \
-+	$(call gcc_ok,-nopie,) $(call gcc_ok,-fno-pie,)
- 
- CC         = gcc
- LD         = ld -m elf_i386
---- com32/modules/Makefile
-+++ com32/modules/Makefile
-@@ -19,7 +19,8 @@
- gcc_ok   = $(shell tmpf=$(TMPFILE); if gcc $(1) -c -x c /dev/null -o $$tmpf 2>/dev/null; \
- 	           then echo $(1); else echo $(2); fi; rm -f $$tmpf)
- 
--M32     := $(call gcc_ok,-m32,) $(call gcc_ok,-fno-stack-protector,)
-+M32     := $(call gcc_ok,-m32,) $(call gcc_ok,-fno-stack-protector,) \
-+	$(call gcc_ok,-nopie,) $(call gcc_ok,-fno-pie,)
- 
- CC         = gcc
- LD         = ld -m elf_i386
diff --git a/sys-boot/syslinux/files/syslinux-3.70-nostrip.patch b/sys-boot/syslinux/files/syslinux-3.70-nostrip.patch
deleted file mode 100644
index 22ff22057955..000000000000
--- a/sys-boot/syslinux/files/syslinux-3.70-nostrip.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -uNr syslinux-3.70.ORIG/utils/Makefile syslinux-3.70/utils/Makefile
---- syslinux-3.70.ORIG/utils/Makefile	2008-07-22 00:01:51.000000000 +0100
-+++ syslinux-3.70/utils/Makefile	2008-07-22 00:04:33.000000000 +0100
-@@ -18,7 +18,7 @@
- include $(topdir)/MCONFIG
- 
- CFLAGS   = -W -Wall -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
--LDFLAGS  = -O2 -s
-+LDFLAGS  = -O2
- 
- TARGETS	 = mkdiskimage gethostip
- ASIS     = keytab-lilo lss16toppm md5pass ppmtolss16 sha1pass syslinux2ansi
-diff -uNr syslinux-3.70.ORIG/linux/Makefile syslinux-3.70/linux/Makefile
---- syslinux-3.70.ORIG/linux/Makefile	2008-07-22 00:07:51.000000000 +0100
-+++ syslinux-3.70/linux/Makefile	2008-07-22 00:10:33.000000000 +0100
-@@ -10,7 +10,7 @@
- OPTFLAGS = -g -Os
- INCLUDES = -I. -I.. -I../libinstaller
- CFLAGS	 = -W -Wall -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
--LDFLAGS	 = $(LDHASH) -s
-+LDFLAGS	 = $(LDHASH)
- 
- SRCS     = syslinux.c \
-            ../libinstaller/syslxmod.c \
-diff -uNr syslinux-3.70.ORIG/mtools/Makefile syslinux-3.70/mtools/Makefile
---- syslinux-3.70.ORIG/mtools/Makefile	2008-07-22 00:12:48.000000000 +0100
-+++ syslinux-3.70/mtools/Makefile	2008-07-22 00:13:56.000000000 +0100
-@@ -10,7 +10,7 @@
- OPTFLAGS = -g -Os
- INCLUDES = -I. -I.. -I../libfat -I../libinstaller
- CFLAGS	 = -W -Wall -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
--LDFLAGS	 = $(LDHASH) -s
-+LDFLAGS	 = $(LDHASH)
- 
- SRCS     = syslinux.c \
- 	   ../libinstaller/syslxmod.c \
diff --git a/sys-boot/syslinux/syslinux-1.76.ebuild b/sys-boot/syslinux/syslinux-1.76.ebuild
deleted file mode 100644
index 10b77f18deee..000000000000
--- a/sys-boot/syslinux/syslinux-1.76.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-1.76.ebuild,v 1.3 2010/04/04 21:51:35 chithanh Exp $
-
-DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader"
-HOMEPAGE="http://syslinux.zytor.com/"
-SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE=""
-
-DEPEND="dev-lang/nasm"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i '/^#/s:^#: #:' memdisk/init.S16 || die "fixing # comments"
-}
-
-src_compile() {
-	emake -j1 depend || die "make depend failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	make INSTALLROOT="${D}" install || die
-	dodoc README NEWS TODO *.doc
-}
diff --git a/sys-boot/syslinux/syslinux-3.11.ebuild b/sys-boot/syslinux/syslinux-3.11.ebuild
deleted file mode 100644
index 1aeb5db8ff77..000000000000
--- a/sys-boot/syslinux/syslinux-3.11.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.11.ebuild,v 1.6 2010/04/04 21:51:35 chithanh Exp $
-
-inherit eutils
-
-DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader"
-HOMEPAGE="http://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=""
-
-RDEPEND="sys-fs/mtools"
-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}"
-	# force binary recompile.
-	rm -f gethostip
-	epatch "${FILESDIR}"/syslinux-3.11-nossp.patch
-	epatch "${FILESDIR}"/syslinux-3.11-nopie.patch
-}
-
-src_compile() {
-	emake installer || die
-}
-
-src_install() {
-	make INSTALLROOT="${D}" install || die
-	dodoc README* NEWS TODO *.doc memdisk/memdisk.doc
-}
diff --git a/sys-boot/syslinux/syslinux-3.20.ebuild b/sys-boot/syslinux/syslinux-3.20.ebuild
deleted file mode 100644
index 634c4f559d90..000000000000
--- a/sys-boot/syslinux/syslinux-3.20.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.20.ebuild,v 1.4 2010/04/04 21:51:35 chithanh Exp $
-
-inherit eutils
-
-DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader"
-HOMEPAGE="http://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=""
-
-RDEPEND="sys-fs/mtools"
-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}"
-	# force binary recompile.
-	rm -f gethostip
-	epatch "${FILESDIR}"/syslinux-3.11-nossp.patch
-	epatch "${FILESDIR}"/syslinux-3.11-nopie.patch
-}
-
-src_compile() {
-	emake installer || die
-}
-
-src_install() {
-	make INSTALLROOT="${D}" install || die
-	dodoc README* NEWS TODO *.doc memdisk/memdisk.doc
-}
diff --git a/sys-boot/syslinux/syslinux-3.31.ebuild b/sys-boot/syslinux/syslinux-3.31.ebuild
deleted file mode 100644
index 08c8cfda60b3..000000000000
--- a/sys-boot/syslinux/syslinux-3.31.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.31.ebuild,v 1.5 2010/04/04 21:51:35 chithanh Exp $
-
-inherit eutils
-
-DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader"
-HOMEPAGE="http://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=""
-
-RDEPEND="sys-fs/mtools"
-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}"
-	rm -f gethostip #137081
-	epatch "${FILESDIR}"/syslinux-3.31-nossp.patch
-	epatch "${FILESDIR}"/syslinux-3.11-nopie.patch
-	rm -f com32/lib/sys/vesa/.*.d #155644
-}
-
-src_compile() {
-	emake installer || die
-}
-
-src_install() {
-	make INSTALLROOT="${D}" install || die
-	dodoc README* NEWS TODO *.doc memdisk/memdisk.doc
-}
diff --git a/sys-boot/syslinux/syslinux-3.52.ebuild b/sys-boot/syslinux/syslinux-3.52.ebuild
deleted file mode 100644
index 036c27201794..000000000000
--- a/sys-boot/syslinux/syslinux-3.52.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.52.ebuild,v 1.4 2010/04/04 21:51:35 chithanh Exp $
-
-DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader"
-HOMEPAGE="http://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=""
-
-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}"
-	rm -f gethostip #137081
-}
-
-src_compile() {
-	emake installer || die
-}
-
-src_install() {
-	emake INSTALLROOT="${D}" install || die
-	dodoc README* NEWS TODO *.doc memdisk/memdisk.doc
-}
diff --git a/sys-boot/syslinux/syslinux-3.71.ebuild b/sys-boot/syslinux/syslinux-3.71.ebuild
deleted file mode 100644
index 10e44d991218..000000000000
--- a/sys-boot/syslinux/syslinux-3.71.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.71.ebuild,v 1.5 2010/04/04 21:51:35 chithanh Exp $
-
-inherit eutils
-
-DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader"
-HOMEPAGE="http://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=""
-
-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.70-nopie.patch
-	# Don't prestrip, makes portage angry
-	epatch "${FILESDIR}/${PN}-3.70-nostrip.patch"
-	rm -f gethostip #137081
-}
-
-src_compile() {
-	emake installer || die
-}
-
-src_install() {
-	emake INSTALLROOT="${D}" MANDIR=/usr/share/man install || die
-	dodoc README NEWS TODO doc/*
-}
diff --git a/sys-boot/syslinux/syslinux-3.84.ebuild b/sys-boot/syslinux/syslinux-3.84.ebuild
deleted file mode 100644
index ff56bc07c184..000000000000
--- a/sys-boot/syslinux/syslinux-3.84.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.84.ebuild,v 1.5 2010/04/04 21:51:35 chithanh Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader"
-HOMEPAGE="http://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.72-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-3.85.ebuild b/sys-boot/syslinux/syslinux-3.85.ebuild
deleted file mode 100644
index b946f8081bd2..000000000000
--- a/sys-boot/syslinux/syslinux-3.85.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.85.ebuild,v 1.2 2010/04/04 21:51:35 chithanh Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader"
-HOMEPAGE="http://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.72-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.00_pre50.ebuild b/sys-boot/syslinux/syslinux-4.00_pre55.ebuild
index 2ef6b4226640..eb2ab9416056 100644
--- a/sys-boot/syslinux/syslinux-4.00_pre50.ebuild
+++ b/sys-boot/syslinux/syslinux-4.00_pre55.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-4.00_pre50.ebuild,v 1.1 2010/06/19 19:16:40 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-4.00_pre55.ebuild,v 1.1 2010/06/22 13:11:19 chithanh Exp $
 
 inherit eutils toolchain-funcs