Update HOMEPAGE/SRC_URI #259106 by Mr. Anderson, and clean up some of the build code in the process.

Package-Manager: portage-2.2_rc42/cvs/Linux x86_64

3 files changed, 27 insertions, 21 deletions

diff --git a/sys-devel/dev86/ChangeLog b/sys-devel/dev86/ChangeLog
index 28c0e5e03c94..5d24685b38bd 100644
--- a/sys-devel/dev86/ChangeLog
+++ b/sys-devel/dev86/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/dev86
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/dev86/ChangeLog,v 1.13 2009/02/02 19:02:27 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/dev86/ChangeLog,v 1.14 2009/10/05 23:43:07 vapier Exp $
+
+  05 Oct 2009; Mike Frysinger <vapier@gentoo.org> dev86-0.16.17-r6.ebuild:
+  Update HOMEPAGE/SRC_URI #259106 by Mr. Anderson, and clean up some of the
+  build code in the process.
 
 *dev86-0.16.17-r6 (02 Feb 2009)
 
diff --git a/sys-devel/dev86/Manifest b/sys-devel/dev86/Manifest
index 3393f08cd814..a32f88e569b8 100644
--- a/sys-devel/dev86/Manifest
+++ b/sys-devel/dev86/Manifest
@@ -5,13 +5,13 @@ AUX dev86-0.16.17-fortify.patch 658 RMD160 6f5e67311af5b9dee3603d31dee8efe01e654
 AUX dev86-pic.patch 546 RMD160 0e2fb431bf1175f8194ea7c26eeb60ffc84fd619 SHA1 ea618f125232cbcf0762a2e21cb39a73d136f890 SHA256 d1859e3409a70a6b78bdf7ef6664421b1ce272b068836b8fb93b5fce1b20d440
 DIST Dev86src-0.16.17.tar.gz 703028 RMD160 b603d2cce807cd20b09695d14538cae8ab8cc371 SHA1 0bfe55c7a5e11d72f19f26cb0383178605951c72 SHA256 52ed4980c0e4b68d2624aadb0ceb0339cb3fd8dd7c2175419d4f77a451846cbe
 EBUILD dev86-0.16.17-r5.ebuild 1481 RMD160 f048b2b6e748ffb4555845bcf466eab9c4de7e37 SHA1 9a7780fcd5800f03ec6993d1590c07317865c3ff SHA256 fb8205b0183312f3805a21c11fc0a360a68e60ff281e76814875567a68fbb314
-EBUILD dev86-0.16.17-r6.ebuild 1546 RMD160 ac5542eb128ad1b00f5d41e9d91c3a361071f423 SHA1 762844f47ddc8aeb65b54741789418c005124756 SHA256 92cc784c002c38fdbb90c537bb6ba1ae5b69fee45e7bb23a3c262ebfdb2f07f9
-MISC ChangeLog 2031 RMD160 62b1d2b13d6cb1e9e1c8ac0d185c842a769ffac0 SHA1 028f8f9e83a610abd646647a9dd357ea5a0fabaa SHA256 bff91621bbb310502afb24e7c6df6b2c0d3f3e5f7ef432f3c5a2a30fdb087857
+EBUILD dev86-0.16.17-r6.ebuild 1533 RMD160 09f3b6369d3654368b3b8e7b3966204b1c8009d2 SHA1 ae05469b2b68920978bc630e387aa4cd888eddbd SHA256 af5347ed011bf89a8e41d4c3156cc99edb339dc951b0788584a719e1f11129e1
+MISC ChangeLog 2211 RMD160 d28011f8fd991d57ddcafd74a72fa7a88ab77359 SHA1 53c8df1a34dbe6e59552466ed5a04129580d4173 SHA256 e7b12050bb77185fc1b737922eabebfea9504f886497faad6dd90935a8824092
 MISC metadata.xml 492 RMD160 cf3ca6965da9055d5cab4e80d7e1249c95165796 SHA1 4bd48b41bc202c122d95c9a44e7f188cdf49ed36 SHA256 d736354234494f7bca63e408d396b0890963f2cb066613499ffcc1b06a920b68
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkmHQ7UACgkQwnQyISwouHwWRwCfWNm69euIXntlK+eY1GHnGvUq
-mq8An07luSKgJuTW/3Zzs5BGawI/CX2y
-=2mF0
+iEYEARECAAYFAkrKhJEACgkQlPl3HsVfCDqN4QCggZxS4ZggrlLoVKv5iiaQWpR3
+UnEAninGZhD03e9iWmJn4soT7OuSxz/k
+=We2r
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/dev86/dev86-0.16.17-r6.ebuild b/sys-devel/dev86/dev86-0.16.17-r6.ebuild
index 19a1d6edf0ca..0ca5257e6d3a 100644
--- a/sys-devel/dev86/dev86-0.16.17-r6.ebuild
+++ b/sys-devel/dev86/dev86-0.16.17-r6.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2009 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.1 2009/02/02 19:02:27 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/dev86/dev86-0.16.17-r6.ebuild,v 1.2 2009/10/05 23:43:07 vapier 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"
+HOMEPAGE="http://www.debath.co.uk/"
+SRC_URI="http://www.debath.co.uk/dev86/Dev86src-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -28,12 +28,14 @@ src_unpack() {
 			"${S}"/makefile.in
 	fi
 	cd "${S}"
-	epatch "${FILESDIR}/dev86-pic.patch"
+	epatch "${FILESDIR}"/dev86-pic.patch
 	epatch "${FILESDIR}"/${P}-fortify.patch
-	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
+	sed -i \
+		-e "s:-O2 -g:${CFLAGS} ${CPPFLAGS}:" \
+		-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() {
@@ -49,12 +51,12 @@ src_compile() {
 }
 
 src_install() {
-	make install-all DIST="${D}" || die
-	dobin bootblocks/makeboot
+	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
-	rm usr/man/man1/{as,ld}86.1
-	mkdir -p usr/share/man
-	mv usr/man usr/share/
+	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
 }