- worked around BREG compile errors while building. version bumped to current also

(Portage version: 2.0.51.22-r1)

6 files changed, 85 insertions, 9 deletions

diff --git a/sys-boot/syslinux/ChangeLog b/sys-boot/syslinux/ChangeLog
index 3445e5e23306..5f56b42c9655 100644
--- a/sys-boot/syslinux/ChangeLog
+++ b/sys-boot/syslinux/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-boot/syslinux
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v 1.16 2005/06/16 23:00:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v 1.17 2005/06/25 14:35:40 solar Exp $
+
+*syslinux-3.09 (25 Jun 2005)
+
+  25 Jun 2005; <solar@gentoo.org> +files/syslinux-3.09-nopie.patch,
+  syslinux-3.08.ebuild, +syslinux-3.09.ebuild:
+  - worked around BREG compile errors while building. version bumped to current
+  also
 
 *syslinux-3.08 (16 Jun 2005)
 
diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index 3fdf0a9591b7..5831979491cd 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -1,12 +1,15 @@
-MD5 cbcfdc5e154315bd92cfca900dc94379 ChangeLog 3836
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 82ac6bf5f8e4f3d97ddca45f2ad29c9a syslinux-3.09.ebuild 1088
 MD5 87356b71e2805dafa9e2b0ff5bb21059 syslinux-2.13.ebuild 942
-MD5 d295c4546572da85473a7329e18925c0 syslinux-3.08.ebuild 1042
-MD5 3a4f99082ffcdeeee54d16c334378b82 syslinux-3.07.ebuild 1040
+MD5 82ac6bf5f8e4f3d97ddca45f2ad29c9a syslinux-3.08.ebuild 1088
 MD5 fad406869474fc3a7cfde4203eb896fe syslinux-1.76.ebuild 760
+MD5 3a4f99082ffcdeeee54d16c334378b82 syslinux-3.07.ebuild 1040
+MD5 b636d51c670d9cb63151cda1c037873f ChangeLog 4069
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 90200c4b3f861abb39c0e6f7c132aad6 files/syslinux-3.07-nossp.patch 9251
+MD5 e278b0938cce81e1f5dd1c428f9b6275 files/syslinux-3.09-nopie.patch 1201
+MD5 e9158a5fd6994f2109942545e8104e40 files/syslinux-3.08-nossp.patch 7141
 MD5 26489361fe682baf353e4b7cef7bba16 files/digest-syslinux-1.76 65
 MD5 d44d8f9a65b91ec75463ccc8dd60cee3 files/digest-syslinux-2.13 66
-MD5 cc878dcb078a17ba92b06e6dffb1b56f files/digest-syslinux-3.08 67
 MD5 55cac8782710921227939964ce2fc373 files/digest-syslinux-3.07 67
-MD5 90200c4b3f861abb39c0e6f7c132aad6 files/syslinux-3.07-nossp.patch 9251
-MD5 e9158a5fd6994f2109942545e8104e40 files/syslinux-3.08-nossp.patch 7141
+MD5 cc878dcb078a17ba92b06e6dffb1b56f files/digest-syslinux-3.08 67
+MD5 490e31f6c68e021aa2cd0e5f6e2a366d files/digest-syslinux-3.09 67
diff --git a/sys-boot/syslinux/files/digest-syslinux-3.09 b/sys-boot/syslinux/files/digest-syslinux-3.09
new file mode 100644
index 000000000000..ee0c824653b2
--- /dev/null
+++ b/sys-boot/syslinux/files/digest-syslinux-3.09
@@ -0,0 +1 @@
+MD5 dd403b15ef18bb0e5d78d3f552f822a5 syslinux-3.09.tar.bz2 1187431
diff --git a/sys-boot/syslinux/files/syslinux-3.09-nopie.patch b/sys-boot/syslinux/files/syslinux-3.09-nopie.patch
new file mode 100644
index 000000000000..3d654d33cff0
--- /dev/null
+++ b/sys-boot/syslinux/files/syslinux-3.09-nopie.patch
@@ -0,0 +1,24 @@
+diff -u syslinux/com32/libutil/Makefile syslinux/com32/libutil/Makefile
+--- 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 -fno-stack-protector -march=i386 -Os -fomit-frame-pointer -I./include -I../include
++CFLAGS     = $(M32) -mregparm=3 -DREGPARM=3 -D__COM32__ -W -Wall -fno-stack-protector -nopie -march=i386 -Os -fomit-frame-pointer -I./include -I../include
+ SFLAGS     = $(M32) -D__COM32__ -march=i386
+ LDFLAGS    = -T ../lib/com32.ld
+ LNXCFLAGS  = -I./include -W -Wall -fno-stack-protector -O -g
+diff -u syslinux/dos/Makefile syslinux/dos/Makefile
+--- 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/syslinux-3.08.ebuild b/sys-boot/syslinux/syslinux-3.08.ebuild
index 56d569684bdd..c246e6e4a557 100644
--- a/sys-boot/syslinux/syslinux-3.08.ebuild
+++ b/sys-boot/syslinux/syslinux-3.08.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.08.ebuild,v 1.1 2005/06/16 23:00:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.08.ebuild,v 1.2 2005/06/25 14:35:40 solar Exp $
 
 inherit eutils
 
@@ -27,6 +27,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/syslinux-3.08-nossp.patch
+	epatch ${FILESDIR}/syslinux-3.09-nopie.patch
 }
 
 src_compile() {
diff --git a/sys-boot/syslinux/syslinux-3.09.ebuild b/sys-boot/syslinux/syslinux-3.09.ebuild
new file mode 100644
index 000000000000..eb52741d2e15
--- /dev/null
+++ b/sys-boot/syslinux/syslinux-3.09.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.09.ebuild,v 1.1 2005/06/25 14:35:40 solar Exp $
+
+inherit eutils
+
+DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader"
+HOMEPAGE="http://syslinux.zytor.com/"
+SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${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}
+	epatch ${FILESDIR}/syslinux-3.08-nossp.patch
+	epatch ${FILESDIR}/syslinux-3.09-nopie.patch
+}
+
+src_compile() {
+	emake installer || die
+}
+
+src_install() {
+	make INSTALLROOT="${D}" install || die
+	dodoc README NEWS TODO *.doc memdisk/memdisk.doc
+}