syslinux-3.85 version bump

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

3 files changed, 66 insertions, 2 deletions

diff --git a/sys-boot/syslinux/ChangeLog b/sys-boot/syslinux/ChangeLog
index bd7d84ae7830..5cd056d20a28 100644
--- a/sys-boot/syslinux/ChangeLog
+++ b/sys-boot/syslinux/ChangeLog
@@ -1,6 +1,12 @@
 # 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.53 2010/02/18 21:52:04 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v 1.54 2010/02/22 19:16:45 chithanh Exp $
+
+*syslinux-3.85 (22 Feb 2010)
+
+  22 Feb 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +syslinux-3.85.ebuild:
+  version bump
 
 *syslinux-4.00_pre24 (18 Feb 2010)
 
diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index bc3e1c970f6c..545c41dd9a93 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -25,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-3.85.tar.bz2 3734701 RMD160 6bc9d3eaaa18ddb51fc52186673a8d7f04e31bf7 SHA1 298f8f00856fa2420efa545a4a8e249453e6c86d SHA256 406e914ff1f115777bbc80d40fef1066613e347829dd13e44f6186d52744e0ea
 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
@@ -43,6 +44,7 @@ EBUILD syslinux-3.82-r1.ebuild 1239 RMD160 c7cbfbd8b6c31f519cebdd49515a06b8c0d4b
 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 1563 RMD160 d40814bff9e5dc3103e6ef7bc71a8e33cd28089c SHA1 bc4541a12001a5249334c646910bc0317dacd237 SHA256 21bde793c21c8dcd6d864eba9e185484a6942f1e7c8305147d0e96a56a7a2547
+EBUILD syslinux-3.85.ebuild 1563 RMD160 f7096a3ce165f1953622663bbfc9ec6d5fa80c77 SHA1 b536bd07a0bdbdfce901e7c6b571523562d41a9a SHA256 15cae04bfd4f8899b0e1ca99172d7df574aa2aa48c0a92f3854a3870fb0349e0
 EBUILD syslinux-4.00_pre24.ebuild 1710 RMD160 589e0d16aea088c16a5ff4999e6bd1beea4ccd50 SHA1 9c819e2314ab311eb8413d851852ac448313ec84 SHA256 4fc909298baa687ec35347369ce75a1e3664b3d5d431f09db7f4c4a6975fc39e
-MISC ChangeLog 9095 RMD160 3bfec8719f7785d4e050696bd65ad5199ab520eb SHA1 153ce9e5eae62fc53f6858745262862659277ce0 SHA256 f9e505c81bf7985ead4cc0106823e1d89c6878ce4344754b571323202d54d043
+MISC ChangeLog 9235 RMD160 d53579985e7fc0c584df69f7aec261f298c5e9bd SHA1 5eaaafd50dbc0a69aa577be7b53146aa2807e137 SHA256 f0cceacebcf443df0091ec470a5c67bff377eb97726f9a4ca02d3a444e68f3fe
 MISC metadata.xml 273 RMD160 1fe6f9528f6f46e20406b962509bf77704a16769 SHA1 820cb70004d78f987a9793acd126c662e28e180a SHA256 ea16e9afcad5ef9e9b29e6959a4632309279e4e0de69c29b40279226c3917b80
diff --git a/sys-boot/syslinux/syslinux-3.85.ebuild b/sys-boot/syslinux/syslinux-3.85.ebuild
new file mode 100644
index 000000000000..0db6c93aeb70
--- /dev/null
+++ b/sys-boot/syslinux/syslinux-3.85.ebuild
@@ -0,0 +1,56 @@
+# 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.1 2010/02/22 19:16:45 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/${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/*
+}