Version bump. Removed old

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

3 files changed, 37 insertions, 87 deletions

diff --git a/sys-devel/dev86/ChangeLog b/sys-devel/dev86/ChangeLog
index 2899990ebe21..eb2791f2b656 100644
--- a/sys-devel/dev86/ChangeLog
+++ b/sys-devel/dev86/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/dev86
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/dev86/ChangeLog,v 1.29 2014/05/18 17:26:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/dev86/ChangeLog,v 1.30 2014/06/12 12:36:34 polynomial-c Exp $
+
+*dev86-0.16.21 (12 Jun 2014)
+
+  12 Jun 2014; Lars Wendler <polynomial-c@gentoo.org> -dev86-0.16.17-r6.ebuild,
+  -dev86-0.16.18.ebuild, +dev86-0.16.21.ebuild:
+  Version bump. Removed old.
 
   18 May 2014; Mike Frysinger <vapier@gentoo.org> dev86-0.16.20.ebuild:
   Add ppc/ppc64 keywords as this project can build on any arch (it will still
diff --git a/sys-devel/dev86/dev86-0.16.17-r6.ebuild b/sys-devel/dev86/dev86-0.16.17-r6.ebuild
deleted file mode 100644
index 87b1d729219d..000000000000
--- a/sys-devel/dev86/dev86-0.16.17-r6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/dev86/dev86-0.16.17-r6.ebuild,v 1.7 2011/04/20 20:23:45 jlec Exp $
-
-inherit eutils
-
-DESCRIPTION="Bruce's C compiler - Simple C compiler to generate 8086 code"
-HOMEPAGE="http://www.debath.co.uk/"
-SRC_URI="http://www.debath.co.uk/dev86/Dev86src-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="sys-devel/bin86"
-DEPEND="${RDEPEND}
-	dev-util/gperf"
-
-src_unpack() {
-	unpack ${A}
-	# elksemu doesn't compile under amd64
-	if use amd64; then
-		einfo "Not compiling elksemu on amd64"
-		sed -i.orig \
-			-e 's,alt-libs elksemu,alt-libs,' \
-			-e 's,install-lib install-emu,install-lib,' \
-			"${S}"/makefile.in
-	fi
-	cd "${S}"
-	epatch "${FILESDIR}"/dev86-pic.patch
-	epatch "${FILESDIR}"/${P}-fortify.patch
-	epatch "${FILESDIR}"/${P}-make382.patch
-	sed -i \
-		-e "s:-O2 -g:${CFLAGS}:" \
-		-e '/INEXE=/s:-s::' \
-		makefile.in
-	sed -i -e '/INSTALL_OPTS=/s:-s::' bin86/Makefile
-	sed -i -e '/install -m 755 -s/s:-s::' dis88/Makefile
-}
-
-src_compile() {
-	# Don't mess with CPPFLAGS as they tend to break compilation
-	# (bug #343655).
-	CPPFLAGS=""
-
-	emake -j1 DIST="${D}" CC="$(tc-getCC)" || die
-
-	export PATH=${S}/bin:${PATH}
-	cd bin
-	ln -s ncc bcc
-	cd ..
-	cd bootblocks
-	ln -s ../bcc/version.h .
-	emake DIST="${D}" || die
-}
-
-src_install() {
-	emake -j1 install-all DIST="${D}" || die
-	dobin bootblocks/makeboot || die
-	# remove all the stuff supplied by bin86
-	cd "${D}"
-	rm usr/bin/{as,ld,nm,objdump,size}86 || die
-	rm usr/man/man1/{as,ld}86.1 || die
-	dodir /usr/share/man
-	mv usr/man usr/share/ || die
-}
diff --git a/sys-devel/dev86/dev86-0.16.18.ebuild b/sys-devel/dev86/dev86-0.16.21.ebuild
index 5435f121f83a..5546d3e747b5 100644
--- a/sys-devel/dev86/dev86-0.16.18.ebuild
+++ b/sys-devel/dev86/dev86-0.16.21.ebuild
@@ -1,41 +1,47 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/dev86/dev86-0.16.18.ebuild,v 1.5 2012/08/06 02:28:35 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/dev86/dev86-0.16.21.ebuild,v 1.1 2014/06/12 12:36:34 polynomial-c Exp $
+
+EAPI="5"
 
 inherit eutils multilib
 
 DESCRIPTION="Bruce's C compiler - Simple C compiler to generate 8086 code"
-HOMEPAGE="http://www.debath.co.uk/"
-SRC_URI="http://www.debath.co.uk/dev86/Dev86src-${PV}.tar.gz"
+HOMEPAGE="http://v3.sk/~lkundrak/dev86/"
+SRC_URI="http://v3.sk/~lkundrak/dev86/Dev86src-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="sys-devel/bin86"
 DEPEND="${RDEPEND}
 	dev-util/gperf"
 
-src_unpack() {
-	unpack ${A}
+STRIP_MASK="/usr/*/bcc/lib*.a /usr/*/i386/libc.a"
+
+src_prepare() {
 	# elksemu doesn't compile under amd64
 	if use amd64; then
 		einfo "Not compiling elksemu on amd64"
-		sed -i.orig \
+		sed -i \
 			-e 's,alt-libs elksemu,alt-libs,' \
 			-e 's,install-lib install-emu,install-lib,' \
-			"${S}"/makefile.in
+			makefile.in || die
 	fi
-	cd "${S}"
+
 	epatch "${FILESDIR}"/dev86-pic.patch
-	epatch "${FILESDIR}"/${PN}-0.16.17-fortify.patch
+	epatch "${FILESDIR}"/${PN}-0.16.19-fortify.patch
 	sed -i \
 		-e "s:-O2 -g:${CFLAGS}:" \
 		-e '/INEXE=/s:-s::' \
-		makefile.in
-	sed -i -e '/INSTALL_OPTS=/s:-s::' bin86/Makefile
-	sed -i -e '/install -m 755 -s/s:-s::' dis88/Makefile
+		makefile.in || die
+	sed -i \
+		-e "s:/lib/:/$(get_libdir)/:" \
+		bcc/bcc.c || die
+	sed -i -e '/INSTALL_OPTS=/s:-s::' bin86/Makefile || die
+	sed -i -e '/install -m 755 -s/s:-s::' dis88/Makefile || die
 }
 
 src_compile() {
@@ -43,7 +49,12 @@ src_compile() {
 	# (bug #343655).
 	CPPFLAGS=""
 
-	emake -j1 DIST="${D}" CC="$(tc-getCC)" || die
+	# First `make` is also a config, so set all the path vars here
+	emake -j1 \
+		DIST="${D}" \
+		CC="$(tc-getCC)" \
+		LIBDIR="/usr/$(get_libdir)/bcc" \
+		INCLDIR="/usr/$(get_libdir)/bcc"
 
 	export PATH=${S}/bin:${PATH}
 	cd bin
@@ -51,16 +62,16 @@ src_compile() {
 	cd ..
 	cd bootblocks
 	ln -s ../bcc/version.h .
-	emake DIST="${D}" || die
+	emake DIST="${D}"
 }
 
 src_install() {
-	emake -j1 install-all LIBDIR="/usr/$(get_libdir)/bcc" INCLDIR="/usr/$(get_libdir)/bcc" DIST="${D}" || die
-	dobin bootblocks/makeboot || die
+	emake -j1 install-all DIST="${D}"
+	dobin bootblocks/makeboot
 	# remove all the stuff supplied by bin86
 	cd "${D}"
 	rm usr/bin/{as,ld,nm,objdump,size}86 || die
 	rm usr/man/man1/{as,ld}86.1 || die
 	dodir /usr/share/man
-	mv usr/man usr/share/ || die
+	mv usr/man usr/share/
 }