add patch from Luke Macken to fix bad code generation (bug #47141)

4 files changed, 38 insertions, 15 deletions

diff --git a/app-emulation/spim/ChangeLog b/app-emulation/spim/ChangeLog
index 6183a6cdbf69..f3e0c619d787 100644
--- a/app-emulation/spim/ChangeLog
+++ b/app-emulation/spim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/spim
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/spim/ChangeLog,v 1.7 2004/03/02 21:16:03 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spim/ChangeLog,v 1.8 2004/04/11 02:03:39 mr_bones_ Exp $
+
+  10 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> spim-6.5.ebuild,
+  files/6.5-parser.patch:
+  add patch from Luke Macken to fix bad code generation (bug #47141)
 
   02 Mar 2004; David Holm <dholm@gentoo.org> spim-6.5.ebuild:
   Added to ~ppc.
diff --git a/app-emulation/spim/Manifest b/app-emulation/spim/Manifest
index be8a60c5ae41..a732c63290b0 100644
--- a/app-emulation/spim/Manifest
+++ b/app-emulation/spim/Manifest
@@ -1,3 +1,4 @@
 MD5 13f0ffd431ec835b0a3bdde8db9d41f2 ChangeLog 1121
-MD5 e149a60f1edb8f2d1c951b7387457ba8 spim-6.5.ebuild 1366
+MD5 d15b293c7ca626543fc095850435b284 spim-6.5.ebuild 1276
+MD5 75e0dfca91ac2ff49fcaa8728ec198cc files/6.5-parser.patch 270
 MD5 3962179c22e4349945b01edbadfac9a5 files/digest-spim-6.5 60
diff --git a/app-emulation/spim/files/6.5-parser.patch b/app-emulation/spim/files/6.5-parser.patch
new file mode 100644
index 000000000000..83a7c7b63c05
--- /dev/null
+++ b/app-emulation/spim/files/6.5-parser.patch
@@ -0,0 +1,11 @@
+--- parser.y.orig	2004-04-07 09:44:36.000000000 -0400
++++ parser.y	2003-01-04 19:08:59.000000000 -0500
+@@ -1964,7 +1964,7 @@
+ 		  /* Y_INT '-' Y_INT */
+ 		  if ($2.i >= 0)
+ 		    yyerror ("Syntax error");
+-		  $$.i = $1.i - $2.i;
++		  $$.i = $1.i + $2.i;
+ 		}
+ 	;
+ 
diff --git a/app-emulation/spim/spim-6.5.ebuild b/app-emulation/spim/spim-6.5.ebuild
index ec97cb2d383d..cbdb98a178a4 100644
--- a/app-emulation/spim/spim-6.5.ebuild
+++ b/app-emulation/spim/spim-6.5.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/spim/spim-6.5.ebuild,v 1.8 2004/03/02 21:16:03 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spim/spim-6.5.ebuild,v 1.9 2004/04/11 02:03:39 mr_bones_ Exp $
+
+inherit eutils
 
 DESCRIPTION="MIPS Simulator"
 HOMEPAGE="http://www.cs.wisc.edu/~larus/spim.html"
@@ -11,11 +13,18 @@ SRC_URI="mirror://gentoo//${P}.tar.gz"
 KEYWORDS="x86 amd64 ~ppc"
 LICENSE="as-is"
 SLOT="0"
+IUSE="X"
 
-DEPEND="X? ( virtual/x11 )
+RDEPEND="X? ( virtual/x11 )"
+DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
-IUSE="X"
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# fix bad code generation (bug #47141)
+	epatch "${FILESDIR}/${PV}-parser.patch"
+}
 
 src_compile() {
 	./Configure || die "Configure script failed"
@@ -27,21 +36,19 @@ src_compile() {
 	    -e "s:\(TRAP_DIR = \).*$:\1/usr/sbin:" Makefile \
 			|| die "sed Makefile failed"
 
-	einfo "Making console spim"
 	emake spim || die "make spim failed"
-	if [ `use X` ]; then
-		einfo "Making xspim"
+	if use X ; then
 		emake xspim || die "emake xspim failed"
 	fi
 }
 
 src_install() {
-	dobin spim                   || die "dobin failed"
-	newman spim.man spim.1       || die "newman failed (spim)"
-	if [ `use X` ]; then
-		dobin xspim              || die "dobin failed"
-		newman xspim.man xspim.1 || die "newman failed (xspim)"
+	dobin spim || die "dobin failed"
+	newman spim.man spim.1
+	if use X ; then
+		dobin xspim || die "dobin failed"
+		newman xspim.man xspim.1
 	fi
-	dosbin trap.handler          || die "dosbin failed"
-	dodoc BLURB README VERSION ChangeLog Documentation/* || die "dodoc failed"
+	dosbin trap.handler || die "dosbin failed"
+	dodoc BLURB README VERSION ChangeLog Documentation/*
 }