Fix bug #167790 and bug #20131

(Portage version: 2.1.4.4, RepoMan options: --force)

3 files changed, 17 insertions, 59 deletions

diff --git a/sys-devel/dev86/ChangeLog b/sys-devel/dev86/ChangeLog
index 2cdf46d0a454..c1de90ca9130 100644
--- a/sys-devel/dev86/ChangeLog
+++ b/sys-devel/dev86/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/dev86
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/dev86/ChangeLog,v 1.9 2007/11/04 14:10:11 masterdriverz Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/dev86/ChangeLog,v 1.10 2008/02/26 18:21:05 armin76 Exp $
+
+*dev86-0.16.17-r5 (26 Feb 2008)
+
+  26 Feb 2008; Raúl Porcel <armin76@gentoo.org> -dev86-0.16.17-r3.ebuild,
+  -dev86-0.16.17-r4.ebuild, +dev86-0.16.17-r5.ebuild:
+  Fix bug #167790 and bug #20131
 
 *dev86-0.16.17-r4 (04 Nov 2007)
 
diff --git a/sys-devel/dev86/dev86-0.16.17-r3.ebuild b/sys-devel/dev86/dev86-0.16.17-r3.ebuild
deleted file mode 100644
index e72bf9ece121..000000000000
--- a/sys-devel/dev86/dev86-0.16.17-r3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2006 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-r3.ebuild,v 1.3 2006/12/11 08:07:53 beu Exp $
-
-inherit eutils
-
-DESCRIPTION="Bruce's C compiler - Simple C compiler to generate 8086 code"
-HOMEPAGE="http://www.cix.co.uk/~mayday"
-SRC_URI="http://www.cix.co.uk/~mayday/dev86/Dev86src-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~amd64"
-IUSE=""
-
-DEPEND="dev-util/gperf
-		sys-devel/bin86"
-
-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"
-	sed -i -e "s/-O2 -g/${CFLAGS}/" makefile.in
-}
-
-src_compile() {
-	emake -j1 DIST="${D}" || 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() {
-	make install-all DIST="${D}" || die
-	install -m 755 bootblocks/makeboot "${D}/usr/bin"
-	# remove all the stuff supplied by bin86
-	rm ${D}/usr/bin/{as,ld,nm,objdump,size}86
-	rm ${D}/usr/man/man1/{as,ld}86.1
-}
diff --git a/sys-devel/dev86/dev86-0.16.17-r4.ebuild b/sys-devel/dev86/dev86-0.16.17-r5.ebuild
index 8eaf0cca245a..ed4c74c1a962 100644
--- a/sys-devel/dev86/dev86-0.16.17-r4.ebuild
+++ b/sys-devel/dev86/dev86-0.16.17-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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-r4.ebuild,v 1.1 2007/11/04 14:10:11 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/dev86/dev86-0.16.17-r5.ebuild,v 1.1 2008/02/26 18:21:05 armin76 Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.cix.co.uk/~mayday/dev86/Dev86src-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND="dev-util/gperf
@@ -28,7 +28,10 @@ src_unpack() {
 	fi
 	cd ${S}
 	epatch "${FILESDIR}/dev86-pic.patch"
-	sed -i -e "s/-O2 -g/${CFLAGS}/" makefile.in
+	sed -i -e "s/-O2 -g/${CFLAGS}/" \
+		-e "s/INEXE=-m 755 -s/INEXE=-m 755/g" makefile.in
+	sed -i -e "s/INSTALL_OPTS=-m 755 -s/INSTALL_OPTS=-m 755/g" bin86/Makefile
+	sed -i -e "s/install -m 755 -s/install -m 755/g" dis88/Makefile
 }
 
 src_compile() {
@@ -50,5 +53,6 @@ src_install() {
 	cd "${D}"
 	rm usr/bin/{as,ld,nm,objdump,size}86
 	rm usr/man/man1/{as,ld}86.1
-	mv usr/man usr/share
+	mkdir -p usr/share/man
+	mv usr/man usr/share/
 }