From 1696b87da810674fec88459ef3bdac8c001d7528 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <eradicator@gentoo.org>
Date: Wed, 5 Oct 2005 20:17:24 +0000
Subject: [PATCH] Added dies where needed.  -j2 fails sometimes, to using -j1. 
 Using correct toolchain compiler.  Fixed missing depend on bison.  Added to
 ~sparc. Package-Manager: portage-2.0.53_rc3

---
 app-emulation/spim/ChangeLog         |  6 +++++-
 app-emulation/spim/Manifest          | 24 ++++++++++++------------
 app-emulation/spim/spim-7.2.1.ebuild | 14 +++++++-------
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/app-emulation/spim/ChangeLog b/app-emulation/spim/ChangeLog
index 1e6feb9ee904..bcbce4cf02d6 100644
--- a/app-emulation/spim/ChangeLog
+++ b/app-emulation/spim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/spim
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/spim/ChangeLog,v 1.26 2005/10/05 06:02:33 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spim/ChangeLog,v 1.27 2005/10/05 20:17:24 eradicator Exp $
+
+  05 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org> spim-7.2.1.ebuild:
+  Added dies where needed. -j2 fails sometimes, to using -j1. Using correct
+  toolchain compiler. Fixed missing depend on bison. Added to ~sparc.
 
 *spim-7.2.1 (05 Oct 2005)
 
diff --git a/app-emulation/spim/Manifest b/app-emulation/spim/Manifest
index 2838eded5a72..55388ff8a531 100644
--- a/app-emulation/spim/Manifest
+++ b/app-emulation/spim/Manifest
@@ -1,29 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0a95d8001ea354287a34f5a1baded57e ChangeLog 3488
-MD5 ee5e79f45e895aacb34203fba4fc09f1 spim-6.5-r1.ebuild 1443
-MD5 56d5b124929236c4d6a74eb7b58ebfec spim-7.0.ebuild 1483
-MD5 f180f948f41e347de9ebca387391018e metadata.xml 476
-MD5 c518e955515d2b620e2777781b97eb0b spim-7.1.ebuild 1392
-MD5 617b3f569ab7ba2d84893da1dd6bb5c7 spim-7.2.1.ebuild 2154
+MD5 5c7a54aacad400f4d8c773763bbddd53 ChangeLog 3711
 MD5 d71d66b98121e4e42ca59fa94310ed1e files/6.5-parser.patch 266
 MD5 3962179c22e4349945b01edbadfac9a5 files/digest-spim-6.5-r1 60
 MD5 e2af6a0e5ca4267cfad9f1bf5e954655 files/digest-spim-7.0 60
+MD5 1e56da59f31f01ba293a6c05cc257a5a files/digest-spim-7.1 60
+MD5 54351d3e666c30c161818777d2cb5746 files/digest-spim-7.2.1 62
 MD5 687579cae8dc43834d01a92be664c826 files/spim-6.5-font.patch 362
 MD5 d07cf1bbff97319734f9f85a3395ffa8 files/spim-7.0-font.patch 441
-MD5 1e56da59f31f01ba293a6c05cc257a5a files/digest-spim-7.1 60
 MD5 df8dcbb83771ccb4cccb7006b9a9d1ff files/spim-7.1-font.patch 436
 MD5 0323f7eab0a1497289beb7246d3b5f9b files/spim-7.2.1-c99.patch 17070
 MD5 8943ac49b31f6df6c679b4ce740514fc files/spim-7.2.1-envvar-exception.patch 991
+MD5 a1da7be88dc0cab1e55ec1862aa3f338 files/spim-7.2.1-font.patch 430
 MD5 7fdc53102c71df807c81f19ce98f2e08 files/spim-7.2.1-ptrsize.patch 458
 MD5 12aa5d2009bfce93f35bc5b5845fe9b0 files/spim-7.2.1-string-stream.patch 488
-MD5 54351d3e666c30c161818777d2cb5746 files/digest-spim-7.2.1 62
-MD5 a1da7be88dc0cab1e55ec1862aa3f338 files/spim-7.2.1-font.patch 430
+MD5 f180f948f41e347de9ebca387391018e metadata.xml 476
+MD5 ee5e79f45e895aacb34203fba4fc09f1 spim-6.5-r1.ebuild 1443
+MD5 56d5b124929236c4d6a74eb7b58ebfec spim-7.0.ebuild 1483
+MD5 c518e955515d2b620e2777781b97eb0b spim-7.1.ebuild 1392
+MD5 548deb7d9eca69a650ca06890c86669e spim-7.2.1.ebuild 2245
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDQ2yOOpjtAl+gMRURAj8LAJ401XVV6nPGDuCgFGTxzI5GltG/cACfU2qs
-qwYZJgR1i4DqmkKx8fjAVUk=
-=ouVO
+iD8DBQFDRDUTOpjtAl+gMRURAgxtAKCcVf7RNZn1hXQWZ3Fzv62ipENHMQCgnXpX
+j6ZAWH7XsKNDmPqsTFNSAqY=
+=y/f2
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/spim/spim-7.2.1.ebuild b/app-emulation/spim/spim-7.2.1.ebuild
index 60bb26eb231a..383160aa680e 100644
--- a/app-emulation/spim/spim-7.2.1.ebuild
+++ b/app-emulation/spim/spim-7.2.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/spim/spim-7.2.1.ebuild,v 1.1 2005/10/05 06:02:33 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spim/spim-7.2.1.ebuild,v 1.2 2005/10/05 20:17:24 eradicator Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="MIPS Simulator"
 HOMEPAGE="http://www.cs.wisc.edu/~larus/spim.html"
@@ -10,12 +10,12 @@ SRC_URI="http://www.cs.wisc.edu/~larus/SPIM/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc-macos ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~x86"
 IUSE="X"
 
 RDEPEND="X? ( virtual/x11 )"
-
 DEPEND="${RDEPEND}
+	sys-devel/bison
 	>=sys-apps/sed-4"
 
 src_unpack() {
@@ -47,14 +47,14 @@ src_compile() {
 		-e "s:tail -2:tail -n2:" \
 		Makefile
 
-	emake || die
+	emake CC="$(tc-getCC)" || die
 
 	if use X ; then
 		cd ${S}/xspim
 
 		./Configure || die "Configure Failed!"
 
-		xmkmf
+		xmkmf || die
 
 		sed -i \
 			-e 's:@make:@$(MAKE):' \
@@ -63,7 +63,7 @@ src_compile() {
 			-e "s:\(EXCEPTION_PATH = \).*$:\1/var/lib/spim/exceptions.s:" \
 			Makefile
 
-		emake xspim
+		emake CC="$(tc-getCC)" -j1 xspim || die
 	fi
 }
 
-- 
2.26.2