Add new prerelease for linux-headers-3.4 compatibility, bug #417133. Drop some old versions.

(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

6 files changed, 31 insertions, 76 deletions

diff --git a/sys-boot/syslinux/ChangeLog b/sys-boot/syslinux/ChangeLog
index e74e649e33b0..ca8c025876f3 100644
--- a/sys-boot/syslinux/ChangeLog
+++ b/sys-boot/syslinux/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-boot/syslinux
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v 1.84 2012/03/26 21:47:07 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v 1.85 2012/05/28 08:47:21 chithanh Exp $
+
+*syslinux-4.06_pre4 (28 May 2012)
+
+  28 May 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +syslinux-4.06_pre4.ebuild, -syslinux-4.03.ebuild, -syslinux-4.04.ebuild,
+  syslinux-2.13.ebuild, syslinux-3.86.ebuild, syslinux-4.05.ebuild:
+  Add new prerelease for linux-headers-3.4 compatibility, bug #417133. Drop some
+  old versions.
 
   26 Mar 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   syslinux-4.05.ebuild:
diff --git a/sys-boot/syslinux/syslinux-2.13.ebuild b/sys-boot/syslinux/syslinux-2.13.ebuild
index 7f3d73e6d1f2..6c796506a689 100644
--- a/sys-boot/syslinux/syslinux-2.13.ebuild
+++ b/sys-boot/syslinux/syslinux-2.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 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.4 2010/04/04 21:51:35 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-2.13.ebuild,v 1.5 2012/05/28 08:47:21 chithanh Exp $
 
 DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader"
 HOMEPAGE="http://syslinux.zytor.com/"
@@ -13,7 +13,8 @@ IUSE=""
 
 RDEPEND="sys-fs/mtools"
 DEPEND="${RDEPEND}
-	dev-lang/nasm"
+	dev-lang/nasm
+	<sys-kernel/linux-headers-3.4"
 
 # 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
diff --git a/sys-boot/syslinux/syslinux-3.86.ebuild b/sys-boot/syslinux/syslinux-3.86.ebuild
index 7aad564241f0..4233e2ccc6c3 100644
--- a/sys-boot/syslinux/syslinux-3.86.ebuild
+++ b/sys-boot/syslinux/syslinux-3.86.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 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.4 2010/06/20 17:47:13 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.86.ebuild,v 1.5 2012/05/28 08:47:21 chithanh Exp $
 
 inherit eutils toolchain-funcs
 
@@ -17,7 +17,8 @@ RDEPEND="sys-fs/mtools
 		dev-perl/Crypt-PasswdMD5
 		dev-perl/Digest-SHA1"
 DEPEND="${RDEPEND}
-	dev-lang/nasm"
+	dev-lang/nasm
+	<sys-kernel/linux-headers-3.4"
 
 # 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
diff --git a/sys-boot/syslinux/syslinux-4.04.ebuild b/sys-boot/syslinux/syslinux-4.04.ebuild
deleted file mode 100644
index 8938c49dc720..000000000000
--- a/sys-boot/syslinux/syslinux-4.04.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-4.04.ebuild,v 1.3 2011/07/13 08:47:59 tomka 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/${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"
-
-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
-}
diff --git a/sys-boot/syslinux/syslinux-4.05.ebuild b/sys-boot/syslinux/syslinux-4.05.ebuild
index a7a5192bd714..902e146ae8bf 100644
--- a/sys-boot/syslinux/syslinux-4.05.ebuild
+++ b/sys-boot/syslinux/syslinux-4.05.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-4.05.ebuild,v 1.4 2012/03/26 21:47:07 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-4.05.ebuild,v 1.5 2012/05/28 08:47:21 chithanh Exp $
 
 inherit eutils toolchain-funcs
 
@@ -17,7 +17,8 @@ RDEPEND="sys-fs/mtools
 		dev-perl/Crypt-PasswdMD5
 		dev-perl/Digest-SHA1"
 DEPEND="${RDEPEND}
-	dev-lang/nasm"
+	dev-lang/nasm
+	<sys-kernel/linux-headers-3.4"
 
 S=${WORKDIR}/${P/_/-}
 
diff --git a/sys-boot/syslinux/syslinux-4.03.ebuild b/sys-boot/syslinux/syslinux-4.06_pre4.ebuild
index 29c6a17af040..024a35c1a7b4 100644
--- a/sys-boot/syslinux/syslinux-4.03.ebuild
+++ b/sys-boot/syslinux/syslinux-4.06_pre4.ebuild
@@ -1,23 +1,24 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-4.03.ebuild,v 1.3 2010/12/09 09:56:19 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-4.06_pre4.ebuild,v 1.1 2012/05/28 08:47:21 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/${PV:0:1}.xx/${P/_/-}.tar.bz2"
+SRC_URI="mirror://kernel/linux/utils/boot/syslinux/Testing/${PV%_pre*}/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="custom-cflags"
 
 RDEPEND="sys-fs/mtools
 		dev-perl/Crypt-PasswdMD5
 		dev-perl/Digest-SHA1"
 DEPEND="${RDEPEND}
-	dev-lang/nasm"
+	dev-lang/nasm
+	virtual/os-headers"
 
 S=${WORKDIR}/${P/_/-}
 
@@ -31,7 +32,10 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	# Fix building on hardened
-	epatch "${FILESDIR}"/${PN}-4.00-nopie.patch
+	epatch "${FILESDIR}"/${PN}-4.05-nopie.patch
+
+	# Fix building with --as-needed
+	epatch "${FILESDIR}"/${PN}-4.05-asneeded-linking-order.patch
 
 	rm -f gethostip #bug 137081
 
@@ -56,5 +60,5 @@ src_compile() {
 
 src_install() {
 	emake INSTALLSUBDIRS=utils INSTALLROOT="${D}" MANDIR=/usr/share/man install || die
-	dodoc README NEWS doc/* || die
+	dodoc README NEWS doc/*.txt || die
 }