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

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

7 files changed, 37 insertions, 84 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/Manifest b/sys-boot/syslinux/Manifest
index 74ad397cbef8..cc5c39d7c88c 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -4,13 +4,11 @@ AUX syslinux-4.05-asneeded-linking-order.patch 380 RMD160 77af89c19745f11ddc4a20
 AUX syslinux-4.05-nopie.patch 519 RMD160 a9b05830bef6413d3dd1a95a465bf8ccf9d5a615 SHA1 95d43f2243ca9fba1559837f2c55d0bfe404204c SHA256 2780aa55dec67a2375e28579392ed9658c4d47d0c47e4c43c22371dc926c47fc
 DIST syslinux-2.13.tar.bz2 421753 RMD160 fa11d68d2758b34b38d670f4866fb39eb4e246c4 SHA1 3c0bf23f35d91c5db7ad8976645ae86ab7320a85 SHA256 44aab24c05570e34a25e5192206098c3f220d7669be9cd9de9117d400a95c65e
 DIST syslinux-3.86.tar.bz2 3735823 RMD160 84a25e275da0d134bce620f1910b04aef9599407 SHA1 2d41043a3083c26e5e6bac3a5e8f17c3c0d963a1 SHA256 82a8d2a242f869cb4c34b3a074871f472762343e1879a4dca23d7ce5c4dcd06d
-DIST syslinux-4.03.tar.bz2 4381187 RMD160 11dcf7d0bf58dd8cb4fc573212f9206bfb81a472 SHA1 24e260facca404f075485a635f0ddffd6f97fd1a SHA256 c65567e324f9d1f7f794ae8f9578a0292bbd47d7b8d895a004d2f0152d0bda38
-DIST syslinux-4.04.tar.bz2 5340791 RMD160 6460ffcc0f4e291a86a4044b497c01b87bf090b7 SHA1 f3b434b6d0133984e0e523d8404a6463c03e6586 SHA256 e186a21cb1b3b1874f253df21546e8d0595d803bd6a60f38cfafbc10bee90e0b
 DIST syslinux-4.05.tar.bz2 5486307 RMD160 e380c5fec300105026a20aa54a22292c4a4e085e SHA1 1be0d53288740794af91433cd5cb27a518fc5302 SHA256 9093f246038a3671a323bd9dd7eb685338578f67f3da949123c6462e0903c0b8
-EBUILD syslinux-2.13.ebuild 953 RMD160 aacd2969a72d699beb9ccbc7591033193542411b SHA1 645c4f515c9f89bc73b48c071ce4b6d5e140176a SHA256 611542db39b3bebeb05afe699cdd761663cb11461af1041e6c5fd12df39d8a0c
-EBUILD syslinux-3.86.ebuild 1572 RMD160 b45975474c2321d43cba0e57b865f7bdeac72888 SHA1 426fe981858dbc144b08360c19e9f132e18c2b39 SHA256 b3a43fd1be11053fb6e5f90b65abf5c00e83f73aa5963f003c47a7ddbd4d218c
-EBUILD syslinux-4.03.ebuild 1709 RMD160 fe4973a7fd1c1ffd696bed9e92a90c1c3692a289 SHA1 8cd8b11ddcbc589b5f381408d78b9359a23d7682 SHA256 fa8db3b31158047b9612b4aa125338670fe3b189d329b40b50f8f4f76dd48f7c
-EBUILD syslinux-4.04.ebuild 1704 RMD160 eed0c71ef6240d4fa4475703c4be60b5f098c005 SHA1 53d1ec064e538498c93cc35d13e8c6f5f323e3c5 SHA256 2c276a0893dbb0a9d289853d2843f54184c8de01836e82655447af02e2781c12
-EBUILD syslinux-4.05.ebuild 1807 RMD160 e5caa0985550c9b47bab0e4409e2a14465f58081 SHA1 70132f8784de59a4d9ee203ac75ed8a2e85228fe SHA256 633c15db48597fc80fe27e16489c6f21d757a1f2f0da0e0f2992ceb0093d3ed5
-MISC ChangeLog 14937 RMD160 91311f122e64b5f627259d1ba3e5a6b5a46be522 SHA1 28aeeb241a2ddcdbe15e5a925ae67fa5be1c3919 SHA256 c9635eac370ea70f092c1c1d1c8f764d762684f3d9d34c2fd4c1f4473306d386
+DIST syslinux-4.06-pre4.tar.bz2 5599802 RMD160 3196e723c78048fa39d34c431e0c9321f74f3f2f SHA1 d388ce6028bdde4bdd7634a379325805be80b020 SHA256 4021a684165c160cfb4c34a19a89ca933c746308e289fe8f26214a93a995cfc2
+EBUILD syslinux-2.13.ebuild 984 RMD160 9b849b9de00a4d40b952ffccb29a56845bf13255 SHA1 869ca2090d125503ef4c36b2adddeea03722d7cd SHA256 ca4b5458f24de7ab61a9b540be0969b6671ddb232ef8f438e7c0589170cef751
+EBUILD syslinux-3.86.ebuild 1605 RMD160 22d60d158b71ed922f9d12749ba51d342fa41206 SHA1 a2eedc27de7772b3a3ee5121d74464922c59f565 SHA256 073d1c1b94fc78b2a03aa7f570828fa867a3546f190c77be76250c8e6aa4bd60
+EBUILD syslinux-4.05.ebuild 1838 RMD160 f20165b75dfa6285a8510759a43767a6bd0585ad SHA1 e08c829f237a5e6a557a3e522d759b072bb9468d SHA256 5ec87f5384f866480aebc4410fb753ad7d3db705bce9640f7db9abac27850887
+EBUILD syslinux-4.06_pre4.ebuild 1841 RMD160 7666e654654d8bb02d944dd1a34223592a2dad0a SHA1 c68d31754edcb31e7a9e7c1407c0fc7434465f2b SHA256 70ac017307a422752af3287f99da6e1542083bbca9eb751dd4aa854266309b32
+MISC ChangeLog 15283 RMD160 c6fbfe2b5ed6b4ef0aeb47399b40af9e504eb08c SHA1 cb5b5a9c419f7d05e5aba2936a419a8a7e39b5e0 SHA256 1674539a9745543edbe8b9dfd642c59592738d0f6975de6a3762c548abc1ac5a
 MISC metadata.xml 273 RMD160 1fe6f9528f6f46e20406b962509bf77704a16769 SHA1 820cb70004d78f987a9793acd126c662e28e180a SHA256 ea16e9afcad5ef9e9b29e6959a4632309279e4e0de69c29b40279226c3917b80
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
 }