stabilize

8 files changed, 10 insertions, 123 deletions

diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index 53421ffb09f9..13e05a10e29b 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -3,23 +3,17 @@ Hash: SHA1
 
 MD5 0bf1a1696767cc23af51074e00a02601 ChangeLog 3140
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 acd4a9b003a0cb31ddec5cdf5be4fded syslinux-2.05.ebuild 757
-MD5 e14d65c5fcef44ee2b26312ddc0ec57f syslinux-2.06.ebuild 963
-MD5 a65afb807734fe361ce6a622edb00b0a syslinux-2.09.ebuild 953
-MD5 cc5a4c080f75efdb5c400415b494726e syslinux-2.11.ebuild 937
+MD5 be91e91e8fbb5560f3cbd9adc6a38677 syslinux-2.11.ebuild 959
 MD5 fad406869474fc3a7cfde4203eb896fe syslinux-1.76.ebuild 760
 MD5 5c685d9bd473e15d95fd52707ff69cfa files/2.06-nasm.patch 1159
 MD5 26489361fe682baf353e4b7cef7bba16 files/digest-syslinux-1.76 65
-MD5 cec0b5961400b850b9a5e42fac2e8a73 files/digest-syslinux-2.05 66
-MD5 12b2f15ac9a150bd439145bca82fd320 files/digest-syslinux-2.06 66
-MD5 c1fedca0dc3d60aae3efd8edfe2f4e8c files/digest-syslinux-2.09 66
 MD5 cef56845517154743833aa8ced0d52a6 files/syslinux-2.06-nossp.patch 1535
 MD5 f38ec993dba486ddbaf4a50773db388e files/syslinux-2.09-nossp.patch 2257
 MD5 437dcea1ca8e2c9469874b045a9e76cb files/digest-syslinux-2.11 66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.14 (GNU/Linux)
 
-iD8DBQFB4cvjroRuSHgZdywRAtJNAJ9+oBWxj1RilyZhYuZUrJfkBJkFtQCcD0v1
-B8ajrQqbFgSrESKR+5VzEYo=
-=rnQe
+iD8DBQFB4cxdroRuSHgZdywRAlaHAJ9K/igNYZzLOMt3ILukCM3Cn+VwjQCfROEr
+d3H0aKGCrl8lUQyXjSJ7UNE=
+=ZOGF
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/syslinux/files/digest-syslinux-2.05 b/sys-boot/syslinux/files/digest-syslinux-2.05
deleted file mode 100644
index acccde5f9687..000000000000
--- a/sys-boot/syslinux/files/digest-syslinux-2.05
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dc68729fa6a39e6f630cf8643b19eab4 syslinux-2.05.tar.bz2 328340
diff --git a/sys-boot/syslinux/files/digest-syslinux-2.06 b/sys-boot/syslinux/files/digest-syslinux-2.06
deleted file mode 100644
index 143e2e558ade..000000000000
--- a/sys-boot/syslinux/files/digest-syslinux-2.06
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c3be5acc14742ad7b23cb6cdf63725c6 syslinux-2.06.tar.bz2 329623
diff --git a/sys-boot/syslinux/files/digest-syslinux-2.09 b/sys-boot/syslinux/files/digest-syslinux-2.09
deleted file mode 100644
index 3dccffd4dce8..000000000000
--- a/sys-boot/syslinux/files/digest-syslinux-2.09
+++ /dev/null
@@ -1 +0,0 @@
-MD5 703f11a01acf67a9f83ec082ca395565 syslinux-2.09.tar.bz2 379684
diff --git a/sys-boot/syslinux/syslinux-2.05.ebuild b/sys-boot/syslinux/syslinux-2.05.ebuild
deleted file mode 100644
index 14421ed05ef6..000000000000
--- a/sys-boot/syslinux/syslinux-2.05.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-2.05.ebuild,v 1.5 2005/01/10 00:26:54 vapier 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"
-
-KEYWORDS="x86 -ppc -sparc"
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="dev-lang/nasm
-	sys-fs/mtools"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/2.06-nasm.patch
-	sed -i 's:$(MAKE) -C win32 all::' Makefile
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	make INSTALLROOT=${D} install || die
-	dodoc README NEWS TODO *.doc memdisk/memdisk.doc
-}
diff --git a/sys-boot/syslinux/syslinux-2.06.ebuild b/sys-boot/syslinux/syslinux-2.06.ebuild
deleted file mode 100644
index bc55a42225aa..000000000000
--- a/sys-boot/syslinux/syslinux-2.06.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-2.06.ebuild,v 1.8 2005/01/10 00:26:54 vapier Exp $
-
-inherit eutils gcc
-
-DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader"
-HOMEPAGE="http://syslinux.zytor.com/"
-SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${P}.tar.bz2"
-
-KEYWORDS="x86 -ppc -sparc"
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="dev-lang/nasm
-	sys-fs/mtools"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-nasm.patch
-	# -fstack-protector really does not play along well with any boot loader
-	$(gcc-getCC) -fstack-protector -S -o /dev/null -xc /dev/null >/dev/null 2>&1 && \
-		epatch ${FILESDIR}/${PN}-2.06-nossp.patch
-	sed -i 's:$(MAKE) -C win32 all::' Makefile
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	make INSTALLROOT=${D} install || die
-	dodoc README NEWS TODO *.doc memdisk/memdisk.doc
-}
diff --git a/sys-boot/syslinux/syslinux-2.09.ebuild b/sys-boot/syslinux/syslinux-2.09.ebuild
deleted file mode 100644
index b587e0064e6f..000000000000
--- a/sys-boot/syslinux/syslinux-2.09.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-2.09.ebuild,v 1.6 2005/01/10 00:26:54 vapier Exp $
-
-inherit eutils gcc
-
-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="-* x86"
-IUSE=""
-
-DEPEND="dev-lang/nasm
-	sys-fs/mtools"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/2.06-nasm.patch
-	# -fstack-protector really does not play along well with any boot loader
-	$(gcc-getCC) -fstack-protector -S -o /dev/null -xc /dev/null >/dev/null 2>&1 && \
-		epatch ${FILESDIR}/${PN}-2.09-nossp.patch
-	sed -i 's:$(MAKE) -C win32 all::' Makefile
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	make INSTALLROOT=${D} install || die
-	dodoc README NEWS TODO *.doc memdisk/memdisk.doc
-}
diff --git a/sys-boot/syslinux/syslinux-2.11.ebuild b/sys-boot/syslinux/syslinux-2.11.ebuild
index 21da26f396e1..13cdee173e0a 100644
--- a/sys-boot/syslinux/syslinux-2.11.ebuild
+++ b/sys-boot/syslinux/syslinux-2.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-2.11.ebuild,v 1.3 2005/01/10 00:26:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-2.11.ebuild,v 1.4 2005/01/10 00:28:56 vapier Exp $
 
 inherit eutils gcc
 
@@ -10,11 +10,12 @@ SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
+KEYWORDS="-* ~amd64 x86"
 IUSE=""
 
-DEPEND="dev-lang/nasm
-	sys-fs/mtools"
+RDEPEND="sys-fs/mtools"
+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
@@ -27,6 +28,6 @@ src_compile() {
 }
 
 src_install() {
-	make INSTALLROOT=${D} install || die
+	make INSTALLROOT="${D}" install || die
 	dodoc README NEWS TODO *.doc memdisk/memdisk.doc
 }