Add bin86 as a depend and fix collisions, bug #139188

Package-Manager: portage-2.1.1_pre4-r2

4 files changed, 82 insertions, 21 deletions

diff --git a/sys-devel/dev86/ChangeLog b/sys-devel/dev86/ChangeLog
index 782d8a57c986..80e204ca11c4 100644
--- a/sys-devel/dev86/ChangeLog
+++ b/sys-devel/dev86/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/dev86
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/dev86/ChangeLog,v 1.3 2005/11/11 00:14:37 chrb Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/dev86/ChangeLog,v 1.4 2006/08/04 15:06:48 chrb Exp $
+
+*dev86-0.16.17-r3 (04 Aug 2006)
+
+  04 Aug 2006; Chris Bainbridge <chrb@gentoo.org> +dev86-0.16.17-r3.ebuild:
+  Add bin86 as a depend and fix collisions, bug #139188
 
 *dev86-0.16.17-r2 (11 Nov 2005)
 
diff --git a/sys-devel/dev86/Manifest b/sys-devel/dev86/Manifest
index 3a0cd7d4e057..1785ec747112 100644
--- a/sys-devel/dev86/Manifest
+++ b/sys-devel/dev86/Manifest
@@ -1,25 +1,27 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0ef0cfe0db29b56f6af5ce5de710fe5a ChangeLog 690
-RMD160 72640c95967a0ee42eadf8a5727bf1e315348f96 ChangeLog 690
-SHA256 5796e11cdefc170ce9437d0e7b06fd9a0129d21f62b4c9eef9a83637c083c0f0 ChangeLog 690
-MD5 860a3508215014dbf073c0099bffa9f3 dev86-0.16.17-r2.ebuild 1152
-RMD160 0334bfe2d60d65dd9b54e84111a0e9b2e318d3ec dev86-0.16.17-r2.ebuild 1152
-SHA256 cb3e6aca564aea8773f3a871fdafedcf3640cae8eea11d8f86b1cdabc724e602 dev86-0.16.17-r2.ebuild 1152
+AUX dev86-pic.patch 546 RMD160 0e2fb431bf1175f8194ea7c26eeb60ffc84fd619 SHA1 ea618f125232cbcf0762a2e21cb39a73d136f890 SHA256 d1859e3409a70a6b78bdf7ef6664421b1ce272b068836b8fb93b5fce1b20d440
 MD5 1b750c5561a4bde5f83f65e5827feb73 files/dev86-pic.patch 546
 RMD160 0e2fb431bf1175f8194ea7c26eeb60ffc84fd619 files/dev86-pic.patch 546
 SHA256 d1859e3409a70a6b78bdf7ef6664421b1ce272b068836b8fb93b5fce1b20d440 files/dev86-pic.patch 546
-MD5 e6dfe026aef9d20d51b843727b089db6 files/digest-dev86-0.16.17-r2 68
-RMD160 2df5b08a4c391e76ce1dd821e88d881285a88cb4 files/digest-dev86-0.16.17-r2 68
-SHA256 7b8cbc1c269dded2ad4f1177d5985bf524d0e5652a196b7a6fafaddc1f218e47 files/digest-dev86-0.16.17-r2 68
+DIST Dev86src-0.16.17.tar.gz 703028
+EBUILD dev86-0.16.17-r2.ebuild 1152 RMD160 0334bfe2d60d65dd9b54e84111a0e9b2e318d3ec SHA1 7abb0d919bd246576f6e46444bf055abea6a6108 SHA256 cb3e6aca564aea8773f3a871fdafedcf3640cae8eea11d8f86b1cdabc724e602
+MD5 860a3508215014dbf073c0099bffa9f3 dev86-0.16.17-r2.ebuild 1152
+RMD160 0334bfe2d60d65dd9b54e84111a0e9b2e318d3ec dev86-0.16.17-r2.ebuild 1152
+SHA256 cb3e6aca564aea8773f3a871fdafedcf3640cae8eea11d8f86b1cdabc724e602 dev86-0.16.17-r2.ebuild 1152
+EBUILD dev86-0.16.17-r3.ebuild 1289 RMD160 7f1c8b7959289aa4fcdb1d500712b1d0046eefeb SHA1 3dfd026849c981ceffb9cc1d35f8c8935250de6d SHA256 39ef0a41a8b7c02209f48332dde8ed5d0070581454b9797812b65d8fff7a8a29
+MD5 303311020244abe7a36cdffd8ab3b4cc dev86-0.16.17-r3.ebuild 1289
+RMD160 7f1c8b7959289aa4fcdb1d500712b1d0046eefeb dev86-0.16.17-r3.ebuild 1289
+SHA256 39ef0a41a8b7c02209f48332dde8ed5d0070581454b9797812b65d8fff7a8a29 dev86-0.16.17-r3.ebuild 1289
+MISC ChangeLog 856 RMD160 bbbe13d18f8a77e6adca7b6f69d31f818e7a678c SHA1 640b7826aa80cb2558db7a1e39929c1e4982c048 SHA256 b75a692368ff9cfd372f184811d5b0028fc07dafd58cc6579cbeaea7e17ce766
+MD5 1671c728820c4125c9a8b117bee87b19 ChangeLog 856
+RMD160 bbbe13d18f8a77e6adca7b6f69d31f818e7a678c ChangeLog 856
+SHA256 b75a692368ff9cfd372f184811d5b0028fc07dafd58cc6579cbeaea7e17ce766 ChangeLog 856
+MISC metadata.xml 349 RMD160 b0b109f741baddced3c6a4f40c205ecdfafb61d9 SHA1 9df30b76c0c66b2267ee9d4612af6a2756c73c47 SHA256 95619fcf9ce17975dfe628af196fdb5598edad8f603890509d7cb184709dedff
 MD5 87678bbfc18f05318fd76826a8e579d8 metadata.xml 349
 RMD160 b0b109f741baddced3c6a4f40c205ecdfafb61d9 metadata.xml 349
 SHA256 95619fcf9ce17975dfe628af196fdb5598edad8f603890509d7cb184709dedff metadata.xml 349
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEGKtn2+ySkm8kpY0RApVzAKCwaZAZ5wM16LV5eGYE2j2cctDwQACeIHCM
-QZn9uAujs4zyZNNYPmQWs0w=
-=gdED
------END PGP SIGNATURE-----
+MD5 e6dfe026aef9d20d51b843727b089db6 files/digest-dev86-0.16.17-r2 68
+RMD160 2df5b08a4c391e76ce1dd821e88d881285a88cb4 files/digest-dev86-0.16.17-r2 68
+SHA256 7b8cbc1c269dded2ad4f1177d5985bf524d0e5652a196b7a6fafaddc1f218e47 files/digest-dev86-0.16.17-r2 68
+MD5 e6dfe026aef9d20d51b843727b089db6 files/digest-dev86-0.16.17-r3 68
+RMD160 2df5b08a4c391e76ce1dd821e88d881285a88cb4 files/digest-dev86-0.16.17-r3 68
+SHA256 7b8cbc1c269dded2ad4f1177d5985bf524d0e5652a196b7a6fafaddc1f218e47 files/digest-dev86-0.16.17-r3 68
diff --git a/sys-devel/dev86/dev86-0.16.17-r3.ebuild b/sys-devel/dev86/dev86-0.16.17-r3.ebuild
new file mode 100644
index 000000000000..c1c9b04124ac
--- /dev/null
+++ b/sys-devel/dev86/dev86-0.16.17-r3.ebuild
@@ -0,0 +1,53 @@
+# 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.1 2006/08/04 15:06:48 chrb 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="virtual/libc
+		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/files/digest-dev86-0.16.17-r3 b/sys-devel/dev86/files/digest-dev86-0.16.17-r3
new file mode 100644
index 000000000000..2b1e793206ba
--- /dev/null
+++ b/sys-devel/dev86/files/digest-dev86-0.16.17-r3
@@ -0,0 +1 @@
+MD5 e7bbfdbe61c2fb964994a087e29b0087 Dev86src-0.16.17.tar.gz 703028