sys-boot/syslinux: version bump, fix SRC_URI

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

13 files changed, 96 insertions, 29 deletions

diff --git a/sys-boot/syslinux/ChangeLog b/sys-boot/syslinux/ChangeLog
index ee4ebafbe0e2..4da15340b630 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.57 2010/03/31 15:45:12 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v 1.58 2010/04/04 21:51:35 chithanh Exp $
+
+*syslinux-4.00_pre38 (04 Apr 2010)
+*syslinux-3.86 (04 Apr 2010)
+
+  04 Apr 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  syslinux-1.76.ebuild, syslinux-2.13.ebuild, syslinux-3.11.ebuild,
+  syslinux-3.20.ebuild, syslinux-3.31.ebuild, syslinux-3.52.ebuild,
+  syslinux-3.71.ebuild, syslinux-3.83.ebuild, syslinux-3.84.ebuild,
+  syslinux-3.85.ebuild, +syslinux-3.86.ebuild, -syslinux-4.00_pre37.ebuild,
+  +syslinux-4.00_pre38.ebuild:
+  Version bump. Fix SRC_URI, bug #313119
 
 *syslinux-4.00_pre37 (31 Mar 2010)
 
diff --git a/sys-boot/syslinux/syslinux-1.76.ebuild b/sys-boot/syslinux/syslinux-1.76.ebuild
index 556ce4a9c3ac..10b77f18deee 100644
--- a/sys-boot/syslinux/syslinux-1.76.ebuild
+++ b/sys-boot/syslinux/syslinux-1.76.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.2 2008/07/21 23:21:18 chainsaw Exp $
+# $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/Old/${P}.tar.gz"
+SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-boot/syslinux/syslinux-2.13.ebuild b/sys-boot/syslinux/syslinux-2.13.ebuild
index f7df71acb104..7f3d73e6d1f2 100644
--- a/sys-boot/syslinux/syslinux-2.13.ebuild
+++ b/sys-boot/syslinux/syslinux-2.13.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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-2.13.ebuild,v 1.3 2005/06/16 22:50:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-2.13.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/Old/${P}.tar.bz2"
+SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-boot/syslinux/syslinux-3.11.ebuild b/sys-boot/syslinux/syslinux-3.11.ebuild
index 2e6fefb1e513..1aeb5db8ff77 100644
--- a/sys-boot/syslinux/syslinux-3.11.ebuild
+++ b/sys-boot/syslinux/syslinux-3.11.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.5 2006/07/30 13:35:55 solar Exp $
+# $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/${P}.tar.bz2"
+SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-boot/syslinux/syslinux-3.20.ebuild b/sys-boot/syslinux/syslinux-3.20.ebuild
index 5127a21869f2..634c4f559d90 100644
--- a/sys-boot/syslinux/syslinux-3.20.ebuild
+++ b/sys-boot/syslinux/syslinux-3.20.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.3 2006/10/31 13:30:32 opfer Exp $
+# $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/${P}.tar.bz2"
+SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-boot/syslinux/syslinux-3.31.ebuild b/sys-boot/syslinux/syslinux-3.31.ebuild
index 84ac35347fa8..08c8cfda60b3 100644
--- a/sys-boot/syslinux/syslinux-3.31.ebuild
+++ b/sys-boot/syslinux/syslinux-3.31.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.4 2007/02/13 19:29:26 wolf31o2 Exp $
+# $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/${P}.tar.bz2"
+SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-boot/syslinux/syslinux-3.52.ebuild b/sys-boot/syslinux/syslinux-3.52.ebuild
index ff8f90a10313..036c27201794 100644
--- a/sys-boot/syslinux/syslinux-3.52.ebuild
+++ b/sys-boot/syslinux/syslinux-3.52.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.3 2008/08/19 12:13:05 cla Exp $
+# $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/${P}.tar.bz2"
+SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-boot/syslinux/syslinux-3.71.ebuild b/sys-boot/syslinux/syslinux-3.71.ebuild
index f66a9054d1e0..10e44d991218 100644
--- a/sys-boot/syslinux/syslinux-3.71.ebuild
+++ b/sys-boot/syslinux/syslinux-3.71.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.4 2008/12/21 13:48:39 maekke Exp $
+# $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/${P}.tar.bz2"
+SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-boot/syslinux/syslinux-3.83.ebuild b/sys-boot/syslinux/syslinux-3.83.ebuild
index 450cbbfe9517..554d30e28bcf 100644
--- a/sys-boot/syslinux/syslinux-3.83.ebuild
+++ b/sys-boot/syslinux/syslinux-3.83.ebuild
@@ -1,12 +1,12 @@
 # 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.83.ebuild,v 1.3 2010/02/26 12:10:54 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.83.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/${P}.tar.bz2"
+SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-boot/syslinux/syslinux-3.84.ebuild b/sys-boot/syslinux/syslinux-3.84.ebuild
index 3341a47d1346..ff56bc07c184 100644
--- a/sys-boot/syslinux/syslinux-3.84.ebuild
+++ b/sys-boot/syslinux/syslinux-3.84.ebuild
@@ -1,12 +1,12 @@
 # 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.4 2010/02/18 21:52:04 chithanh Exp $
+# $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/${P}.tar.bz2"
+SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-boot/syslinux/syslinux-3.85.ebuild b/sys-boot/syslinux/syslinux-3.85.ebuild
index 0db6c93aeb70..b946f8081bd2 100644
--- a/sys-boot/syslinux/syslinux-3.85.ebuild
+++ b/sys-boot/syslinux/syslinux-3.85.ebuild
@@ -1,12 +1,12 @@
 # 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 $
+# $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/${P}.tar.bz2"
+SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-boot/syslinux/syslinux-3.86.ebuild b/sys-boot/syslinux/syslinux-3.86.ebuild
new file mode 100644
index 000000000000..4a5b35ecbaa1
--- /dev/null
+++ b/sys-boot/syslinux/syslinux-3.86.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.86.ebuild,v 1.1 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_pre37.ebuild b/sys-boot/syslinux/syslinux-4.00_pre38.ebuild
index 2446a5b53fc6..576b126c0fae 100644
--- a/sys-boot/syslinux/syslinux-4.00_pre37.ebuild
+++ b/sys-boot/syslinux/syslinux-4.00_pre38.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_pre37.ebuild,v 1.1 2010/03/31 15:45:12 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-4.00_pre38.ebuild,v 1.1 2010/04/04 21:51:35 chithanh Exp $
 
 inherit eutils toolchain-funcs