syslinux-4.00_pre24 version bump

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

5 files changed, 86 insertions, 6 deletions

diff --git a/sys-boot/syslinux/ChangeLog b/sys-boot/syslinux/ChangeLog
index df04c7dec054..bd7d84ae7830 100644
--- a/sys-boot/syslinux/ChangeLog
+++ b/sys-boot/syslinux/ChangeLog
@@ -1,6 +1,13 @@
 # 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.52 2010/02/18 18:27:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v 1.53 2010/02/18 21:52:04 chithanh Exp $
+
+*syslinux-4.00_pre24 (18 Feb 2010)
+
+  18 Feb 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  syslinux-3.84.ebuild, +syslinux-4.00_pre24.ebuild,
+  +files/syslinux-4.00-nopie.patch:
+  version bump, drop nostrip patches (bug #305783)
 
   18 Feb 2010; Jeroen Roovers <jer@gentoo.org> syslinux-3.84.ebuild:
   Switch to IUSE=custom-cflags (bug #305783).
diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index 4c9a26954031..bc3e1c970f6c 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -8,6 +8,7 @@ AUX syslinux-3.70-nopie.patch 987 RMD160 05e86199cdbec2a0d2804af9f927b9c6112a81d
 AUX syslinux-3.70-nostrip.patch 1437 RMD160 6b58d91622fc09fbd1595a31c16a4c423a9943b0 SHA1 a4ac7fe9c5580d1b7e99fd377d00802dfcce96d5 SHA256 579fadb81f73ba3728195a54bf273bf20351351adb3d4b4af133e7f5b9b17fe9
 AUX syslinux-3.72-nopie.patch 412 RMD160 57ff5acb7ea790bb711d4a4b1bc44ab4a94ce2ae SHA1 659c103a7a6fc9c023d5c236813639e409855d72 SHA256 9902bcf95ae5c2bdf52d1e726a9f76f350bd4b134d16ca43de7bf60201428f32
 AUX syslinux-3.72-nostrip.patch 1230 RMD160 c22a5b7fce9aff1ef235b57133fc3a0831183bb5 SHA1 55e7bcbbfc14dc9f3f9faf48cdb2c49d0072c150 SHA256 9c32ee6f7fa24c2cbf00088963454ee8d761fed9065f5353737a97c2edc2f416
+AUX syslinux-4.00-nopie.patch 527 RMD160 485901ad3c55f50c3e3795efd5d2c5b18a406a5a SHA1 44152e5e2afd2d032e148349898ee78d3d9b1eb1 SHA256 d0d4834043d52f73969ca60eb37729ee44d866ecddf13bceacd7c71147698323
 DIST syslinux-1.76.tar.gz 317136 RMD160 26285829b850a55ab7b0c5b3d0a0c6319c9ab869 SHA1 4d825114b3318566cd032e65f4ff754cca2c73fc SHA256 2ef0c8d03250f780139afe93d0758d5f121b81ae15b01edd625bb8a594e5e7a0
 DIST syslinux-2.13.tar.bz2 421753 RMD160 fa11d68d2758b34b38d670f4866fb39eb4e246c4 SHA1 3c0bf23f35d91c5db7ad8976645ae86ab7320a85 SHA256 44aab24c05570e34a25e5192206098c3f220d7669be9cd9de9117d400a95c65e
 DIST syslinux-3.11.tar.bz2 1253470 RMD160 38e75426f24f76eb85e3091317d2e9c997a774db SHA1 d04e012de1e6fed25083d1ba24d3c096493c2b3a SHA256 3baef57243c2475b46a913afe38bc7228ddc0297dfaa33e2213903eb9f130bd0
@@ -24,6 +25,7 @@ DIST syslinux-3.80.tar.bz2 3082600 RMD160 7f5dfd78e2992b17cd3486b350a3eb3b207e2b
 DIST syslinux-3.82.tar.bz2 3086896 RMD160 67f15d5436be9697065bfd52de6a864d7aed742a SHA1 e949b13e0ef016ec39f7dafacac722936756f41b SHA256 1dbbf8cfd10fc07187fa8bfede23639fc95314976730f3474cb349e8bf6c6f61
 DIST syslinux-3.83.tar.bz2 3184349 RMD160 b4cff023c44a421a5f788f4cf556b537986117f9 SHA1 0dbbdd5a36362ce0e3284d9f4047a355d527d5d0 SHA256 9ec84d6dcc188f082a875b69796b196f98ea8c0102b55b03123616a285c2d9f9
 DIST syslinux-3.84.tar.bz2 3383248 RMD160 fe2b7df29bd46d16ec1cbfa111a5a2a69fbe8c33 SHA1 496acd2af10af121ed919e9c6a8c368b0bb53619 SHA256 aca5a93c02f2d006ff6ca7ec877976c648409574d4ce184e0aa54390d680cf21
+DIST syslinux-4.00-pre24.tar.bz2 4003098 RMD160 a2cbf6d103262b229ed710fe3ce072ea73217853 SHA1 7d5e8f1ae57bf140d5b88784927c38239c908f9a SHA256 0b6e85e1f25c380d9e9289bd6921167496f4846feeb4a7367f3f1d88c12f3b1c
 EBUILD syslinux-1.76.ebuild 764 RMD160 c9ff7b4436f8a4a61a9c5a4515e00b757dc066bf SHA1 bafe376b39bf5ccc128969926f80a6feaf0ca6df SHA256 327e08ac927b558d06398d59840688448202dea1bf0a75b18fc73d5da0b9cef3
 EBUILD syslinux-2.13.ebuild 942 RMD160 01ffe8801e59e5c09bc29f9a8972349a6f2d65b7 SHA1 0509aeb7a50b44e9261a309b0472507918b3a37d SHA256 f7a270ff64d9d079c37ce6c07a782c912c1dd5277d07203eb7501d80de8b8ebc
 EBUILD syslinux-3.11.ebuild 1136 RMD160 ddf786688ea7308b96cb863c6fbd5cd8b9c33568 SHA1 f7cbad8a8719a16648e3d0de43e025d2ff6ca066 SHA256 6005b29651a89218c6e109d667be99e65ddd2880657bc8f9e92eef3a0c045751
@@ -40,6 +42,7 @@ EBUILD syslinux-3.80.ebuild 1215 RMD160 5154d83c31d741ad9d8f0c9b03a3ef5d37bc6b48
 EBUILD syslinux-3.82-r1.ebuild 1239 RMD160 c7cbfbd8b6c31f519cebdd49515a06b8c0d4b1a7 SHA1 212c624d26329e3f1de85b8eb6a76f341ce17a48 SHA256 cb427fa22f571b9d3d4226db5f402e9f968500dd5dc873339a53208e54c19468
 EBUILD syslinux-3.82.ebuild 1219 RMD160 1a51882897c738d3cdf05d680c10e0a63d63f027 SHA1 66d9a6c06a228603ac9bd3d2645fe938ef73cad6 SHA256 7aab0e4315bf628aa52a8eb3810e8af49f147e4f7d19ddb13774a365d1a29b18
 EBUILD syslinux-3.83.ebuild 1233 RMD160 04fdc915014165eb7b530e3be1af9b7bc7f46bfd SHA1 add697daad1ff9c7951611206c09facdb2cff121 SHA256 95450a08415e7a45cc2b880aa34adfc9c264d7b92a8cd86df39d5444bba4ebae
-EBUILD syslinux-3.84.ebuild 1644 RMD160 ca398f921d35c7625c4fa79a07795e3028f502da SHA1 82591080ce9f5b19e547e6d0342de9e3015912fb SHA256 55795cf30c588f1b89dfe8c4211cb8297dc0981806c231ce4e439b79b68f7cb3
-MISC ChangeLog 8844 RMD160 e75f69f671546f007c8cde4b5d4c93f15d859035 SHA1 a981bcb25b8e73d80dc1bfae1d6c4af3a60672f3 SHA256 0e7f388728d7b74ac109c3ac59f84ad487a4f536a5dbf10b6bd2c2ceb8502967
+EBUILD syslinux-3.84.ebuild 1563 RMD160 d40814bff9e5dc3103e6ef7bc71a8e33cd28089c SHA1 bc4541a12001a5249334c646910bc0317dacd237 SHA256 21bde793c21c8dcd6d864eba9e185484a6942f1e7c8305147d0e96a56a7a2547
+EBUILD syslinux-4.00_pre24.ebuild 1710 RMD160 589e0d16aea088c16a5ff4999e6bd1beea4ccd50 SHA1 9c819e2314ab311eb8413d851852ac448313ec84 SHA256 4fc909298baa687ec35347369ce75a1e3664b3d5d431f09db7f4c4a6975fc39e
+MISC ChangeLog 9095 RMD160 3bfec8719f7785d4e050696bd65ad5199ab520eb SHA1 153ce9e5eae62fc53f6858745262862659277ce0 SHA256 f9e505c81bf7985ead4cc0106823e1d89c6878ce4344754b571323202d54d043
 MISC metadata.xml 273 RMD160 1fe6f9528f6f46e20406b962509bf77704a16769 SHA1 820cb70004d78f987a9793acd126c662e28e180a SHA256 ea16e9afcad5ef9e9b29e6959a4632309279e4e0de69c29b40279226c3917b80
diff --git a/sys-boot/syslinux/files/syslinux-4.00-nopie.patch b/sys-boot/syslinux/files/syslinux-4.00-nopie.patch
new file mode 100644
index 000000000000..1db5d1d882fd
--- /dev/null
+++ b/sys-boot/syslinux/files/syslinux-4.00-nopie.patch
@@ -0,0 +1,12 @@
+diff -ur a/com32/MCONFIG b/com32/MCONFIG
+--- a/com32/MCONFIG	2010-02-16 23:53:51.000000000 +0100
++++ b/com32/MCONFIG	2010-02-18 22:28:18.791609195 +0100
+@@ -24,6 +24,8 @@
+ GCCOPT += $(call gcc_ok,-freg-struct-return,)
+ GCCOPT += -mregparm=3 -DREGPARM=3 -march=i386 -Os
+ GCCOPT += $(call gcc_ok,-fPIE,-fPIC)
++GCCOPT += $(call gcc_ok,-nopie,)
++GCCOPT += $(call gcc_ok,-fno-pie,)
+ GCCOPT += $(call gcc_ok,-fno-exceptions,)
+ GCCOPT += $(call gcc_ok,-fno-asynchronous-unwind-tables,)
+ GCCOPT += $(call gcc_ok,-fno-strict-aliasing,)
diff --git a/sys-boot/syslinux/syslinux-3.84.ebuild b/sys-boot/syslinux/syslinux-3.84.ebuild
index 229e601d55d8..3341a47d1346 100644
--- a/sys-boot/syslinux/syslinux-3.84.ebuild
+++ b/sys-boot/syslinux/syslinux-3.84.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-3.84.ebuild,v 1.3 2010/02/18 18:27:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.84.ebuild,v 1.4 2010/02/18 21:52:04 chithanh Exp $
 
 inherit eutils toolchain-funcs
 
@@ -29,8 +29,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-3.72-nopie.patch
-	# Don't prestrip, makes portage angry
-	epatch "${FILESDIR}"/${PN}-3.72-nostrip.patch
 
 	rm -f gethostip #bug 137081
 
diff --git a/sys-boot/syslinux/syslinux-4.00_pre24.ebuild b/sys-boot/syslinux/syslinux-4.00_pre24.ebuild
new file mode 100644
index 000000000000..2f2b67f173d3
--- /dev/null
+++ b/sys-boot/syslinux/syslinux-4.00_pre24.ebuild
@@ -0,0 +1,60 @@
+# 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_pre24.ebuild,v 1.1 2010/02/18 21:52:04 chithanh Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
+HOMEPAGE="http://syslinux.zytor.com/"
+SRC_URI="mirror://kernel/linux/utils/boot/syslinux/Testing/${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"
+
+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.
+
+# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# Fix building on hardened
+	epatch "${FILESDIR}"/${PN}-4.00-nopie.patch
+
+	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"
+	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 doc/* || die
+}