Update HOMEPAGE and add upstream metadata. Remove old.

(Portage version: 2.1.11.22/cvs/Linux x86_64)

14 files changed, 16 insertions, 1254 deletions

diff --git a/app-emulation/spim/ChangeLog b/app-emulation/spim/ChangeLog
index 340db90d946b..7d83267a0430 100644
--- a/app-emulation/spim/ChangeLog
+++ b/app-emulation/spim/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emulation/spim
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/spim/ChangeLog,v 1.60 2012/05/10 14:58:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spim/ChangeLog,v 1.61 2012/09/26 19:11:25 kensington Exp $
+
+  26 Sep 2012; Michael Palimaka <kensington@gentoo.org>
+  -files/spim-7.2.1-c99.patch, -files/spim-7.2.1-envvar-exception.patch,
+  -files/spim-7.2.1-multiple-exception.patch, -files/spim-7.2.1-ptrsize.patch,
+  -files/spim-7.2.1-string-handling-fix.patch,
+  -files/spim-7.2.1-string-stream.patch, -files/spim-7.5-respect_env.patch,
+  -files/spim-8.0-respect_env.patch, -spim-7.2.1-r3.ebuild, -spim-7.3.ebuild,
+  -spim-7.5.ebuild, metadata.xml, spim-8.0-r1.ebuild:
+  Update HOMEPAGE and add upstream metadata. Remove old.
 
   10 May 2012; Agostino Sarubbo <ago@gentoo.org> -spim-7.2.1-r2.ebuild,
   -spim-7.4.ebuild, -spim-8.0.ebuild:
diff --git a/app-emulation/spim/files/spim-7.2.1-c99.patch b/app-emulation/spim/files/spim-7.2.1-c99.patch
deleted file mode 100644
index fc73e60ce1b9..000000000000
--- a/app-emulation/spim/files/spim-7.2.1-c99.patch
+++ /dev/null
@@ -1,492 +0,0 @@
-diff -Naurp spim-7.2.1.orig/CPU/display-utils.c spim-7.2.1.ucb/CPU/display-utils.c
---- spim-7.2.1.orig/CPU/display-utils.c	2005-08-28 13:58:11.000000000 -0700
-+++ spim-7.2.1.ucb/CPU/display-utils.c	2005-10-04 20:51:29.881936000 -0700
-@@ -220,9 +220,9 @@ format_mem (str_stream *ss, mem_addr fro
-   for ( ; i < to; )
-     {
-       /* Count consecutive zero words */
--      for (j = 0; (i + (uint32) j * BYTES_PER_WORD) < to; j += 1)
-+      for (j = 0; (i + (uint32_t) j * BYTES_PER_WORD) < to; j += 1)
- 	{
--	  val = read_mem_word (i + (uint32) j * BYTES_PER_WORD);
-+	  val = read_mem_word (i + (uint32_t) j * BYTES_PER_WORD);
- 	  if (val != 0)
- 	    {
- 	      break;
-@@ -234,9 +234,9 @@ format_mem (str_stream *ss, mem_addr fro
- 	  /* Block of 4 or more zero memory words: */
- 	  ss_printf (ss, "[0x%08x]...[0x%08x]	0x00000000\n",
- 		     i,
--		     i + (uint32) j * BYTES_PER_WORD);
-+		     i + (uint32_t) j * BYTES_PER_WORD);
- 
--	  i = i + (uint32) j * BYTES_PER_WORD;
-+	  i = i + (uint32_t) j * BYTES_PER_WORD;
- 	  i = format_partial_line (ss, i);
- 	}
-       else
-diff -Naurp spim-7.2.1.orig/CPU/inst.c spim-7.2.1.ucb/CPU/inst.c
---- spim-7.2.1.orig/CPU/inst.c	2005-08-28 13:58:12.000000000 -0700
-+++ spim-7.2.1.ucb/CPU/inst.c	2005-10-04 20:51:30.213951000 -0700
-@@ -44,13 +44,13 @@
- static int compare_pair_value (name_val_val *p1, name_val_val *p2);
- static void format_imm_expr (str_stream *ss, imm_expr *expr, int base_reg);
- static void i_type_inst_full_word (int opcode, int rt, int rs, imm_expr *expr,
--				   int value_known, int32 value);
-+				   int value_known, int32_t value);
- static void inst_cmp (instruction *inst1, instruction *inst2);
- static instruction *make_r_type_inst (int opcode, int rd, int rs, int rt);
--static instruction *mk_i_inst (int32 value, int opcode, int rs, int rt, int offset);
--static instruction *mk_j_inst (int32, int opcode, int target);
--static instruction *mk_r_inst (int32, int opcode, int rs, int rt, int rd, int shamt);
--static void produce_immediate (imm_expr *expr, int rt, int value_known, int32 value);
-+static instruction *mk_i_inst (int32_t value, int opcode, int rs, int rt, int offset);
-+static instruction *mk_j_inst (int32_t, int opcode, int target);
-+static instruction *mk_r_inst (int32_t, int opcode, int rs, int rt, int rd, int shamt);
-+static void produce_immediate (imm_expr *expr, int rt, int value_known, int32_t value);
- static void sort_a_opcode_table ();
- static void sort_i_opcode_table ();
- static void sort_name_table ();
-@@ -192,7 +192,7 @@ i_type_inst (int opcode, int rt, int rs,
-   if (expr->symbol == NULL || SYMBOL_IS_DEFINED (expr->symbol))
-     {
-       /* Evaluate the instruction's expression. */
--      int32 value = eval_imm_expr (expr);
-+      int32_t value = eval_imm_expr (expr);
- 
-       if (!bare_machine
- 	  && (((opcode == Y_ADDI_OP
-@@ -234,7 +234,7 @@ i_type_inst (int opcode, int rt, int rs,
- 
- static void
- i_type_inst_full_word (int opcode, int rt, int rs, imm_expr *expr,
--		       int value_known, int32 value)
-+		       int value_known, int32_t value)
- {
-   if (opcode_is_load_store (opcode))
-     {
-@@ -330,7 +330,7 @@ i_type_inst_full_word (int opcode, int r
- 
- 
- static void
--produce_immediate (imm_expr *expr, int rt, int value_known, int32 value)
-+produce_immediate (imm_expr *expr, int rt, int value_known, int32_t value)
- {
-   if (value_known && (value & 0xffff) == 0)
-     {
-@@ -682,7 +682,7 @@ format_an_inst (str_stream *ss, instruct
-       return;
-     }
- 
--  ss_printf (ss, "0x%08x  %s", (uint32)ENCODING (inst), entry->name);
-+  ss_printf (ss, "0x%08x  %s", (uint32_t)ENCODING (inst), entry->name);
-   switch (entry->value2)
-     {
-     case BC_TYPE_INST:
-@@ -1069,7 +1069,7 @@ lower_bits_of_expr (imm_expr *old_expr)
- /* Return an instruction expression for a constant VALUE. */
- 
- imm_expr *
--const_imm_expr (int32 value)
-+const_imm_expr (int32_t value)
- {
-   return (make_imm_expr (value, NULL, 0));
- }
-@@ -1079,7 +1079,7 @@ const_imm_expr (int32 value)
-    incremented by the given amount. */
- 
- imm_expr *
--incr_expr_offset (imm_expr *expr, int32 value)
-+incr_expr_offset (imm_expr *expr, int32_t value)
- {
-   imm_expr *new_expr = copy_imm_expr (expr);
- 
-@@ -1090,10 +1090,10 @@ incr_expr_offset (imm_expr *expr, int32 
- 
- /* Return the value of the EXPRESSION. */
- 
--int32
-+int32_t
- eval_imm_expr (imm_expr *expr)
- {
--  int32 value;
-+  int32_t value;
- 
-   if (expr->symbol == NULL)
-     value = expr->offset;
-@@ -1227,10 +1227,10 @@ sort_i_opcode_table ()
- #define REGS(R,O) (((R) & 0x1f) << O)
- 
- 
--int32
-+int32_t
- inst_encode (instruction *inst)
- {
--  int32 a_opcode = 0;
-+  int32_t a_opcode = 0;
-   name_val_val *entry;
- 
-   if (inst == NULL)
-@@ -1400,11 +1400,11 @@ sort_a_opcode_table ()
- 
- 
- instruction *
--inst_decode (int32 val)
-+inst_decode (int32_t val)
- {
--  int32 a_opcode = val & 0xfc000000;
-+  int32_t a_opcode = val & 0xfc000000;
-   name_val_val *entry;
--  int32 i_opcode;
-+  int32_t i_opcode;
- 
-   if (a_opcode == 0)		/* SPECIAL */
-     a_opcode |= (val & 0x3f);
-@@ -1520,7 +1520,7 @@ inst_decode (int32 val)
- 
- 
- static instruction *
--mk_r_inst (int32 val, int opcode, int rs, int rt, int rd, int shamt)
-+mk_r_inst (int32_t val, int opcode, int rs, int rt, int rd, int shamt)
- {
-   instruction *inst = (instruction *) zmalloc (sizeof (instruction));
- 
-@@ -1536,7 +1536,7 @@ mk_r_inst (int32 val, int opcode, int rs
- 
- 
- static instruction *
--mk_i_inst (int32 val, int opcode, int rs, int rt, int offset)
-+mk_i_inst (int32_t val, int opcode, int rs, int rt, int offset)
- {
-   instruction *inst = (instruction *) zmalloc (sizeof (instruction));
- 
-@@ -1550,7 +1550,7 @@ mk_i_inst (int32 val, int opcode, int rs
- }
- 
- static instruction *
--mk_j_inst (int32 val, int opcode, int target)
-+mk_j_inst (int32_t val, int opcode, int target)
- {
-   instruction *inst = (instruction *) zmalloc (sizeof (instruction));
- 
-diff -Naurp spim-7.2.1.orig/CPU/inst.h spim-7.2.1.ucb/CPU/inst.h
---- spim-7.2.1.orig/CPU/inst.h	2005-08-28 13:58:12.000000000 -0700
-+++ spim-7.2.1.ucb/CPU/inst.h	2005-10-04 20:51:30.281954000 -0700
-@@ -79,7 +79,7 @@ typedef struct inst_s
-       mem_addr target;
-     } r_t;
- 
--  int32 encoding;
-+  int32_t encoding;
-   imm_expr *expr;
-   char *source_line;
- } instruction;
-@@ -136,7 +136,7 @@ typedef struct inst_s
- #define SET_TARGET(INST, VAL)	(INST)->r_t.target = (mem_addr)(VAL)
- 
- #define ENCODING(INST)		(INST)->encoding
--#define SET_ENCODING(INST, VAL)	(INST)->encoding = (int32)(VAL)
-+#define SET_ENCODING(INST, VAL)	(INST)->encoding = (int32_t)(VAL)
- 
- #define EXPR(INST)		(INST)->expr
- #define SET_EXPR(INST, VAL)	(INST)->expr = (imm_expr*)(VAL)
-@@ -226,20 +226,20 @@ extern int exception_occurred;
- 
- imm_expr *addr_expr_imm (addr_expr *expr);
- int addr_expr_reg (addr_expr *expr);
--imm_expr *const_imm_expr (int32 value);
-+imm_expr *const_imm_expr (int32_t value);
- imm_expr *copy_imm_expr (imm_expr *old_expr);
- instruction *copy_inst (instruction *inst);
- mem_addr current_text_pc ();
--int32 eval_imm_expr (imm_expr *expr);
-+int32_t eval_imm_expr (imm_expr *expr);
- void format_an_inst (str_stream *ss, instruction *inst, mem_addr addr);
- void free_inst (instruction *inst);
- void i_type_inst (int opcode, int rt, int rs, imm_expr *expr);
- void i_type_inst_free (int opcode, int rt, int rs, imm_expr *expr);
- void increment_text_pc (int delta);
--imm_expr *incr_expr_offset (imm_expr *expr, int32 value);
-+imm_expr *incr_expr_offset (imm_expr *expr, int32_t value);
- void initialize_inst_tables ();
--instruction *inst_decode (int32 value);
--int32 inst_encode (instruction *inst);
-+instruction *inst_decode (int32_t value);
-+int32_t inst_encode (instruction *inst);
- int inst_is_breakpoint (mem_addr addr);
- void j_type_inst (int opcode, imm_expr *target);
- void k_text_begins_at_point (mem_addr addr);
-diff -Naurp spim-7.2.1.orig/CPU/mem.c spim-7.2.1.ucb/CPU/mem.c
---- spim-7.2.1.orig/CPU/mem.c	2005-08-28 13:58:12.000000000 -0700
-+++ spim-7.2.1.ucb/CPU/mem.c	2005-10-04 20:51:30.393960000 -0700
-@@ -76,7 +76,7 @@ static void write_memory_mapped_IO (mem_
- 
- /* Local variables: */
- 
--static int32 data_size_limit, stack_size_limit, k_data_size_limit;
-+static int32_t data_size_limit, stack_size_limit, k_data_size_limit;
- 
- 
- 
-diff -Naurp spim-7.2.1.orig/CPU/mem.h spim-7.2.1.ucb/CPU/mem.h
---- spim-7.2.1.orig/CPU/mem.h	2005-08-28 13:58:12.000000000 -0700
-+++ spim-7.2.1.ucb/CPU/mem.h	2005-10-04 20:51:30.489964000 -0700
-@@ -30,7 +30,7 @@
- 
- /* Type of contents of a memory word. */
- 
--typedef int32 /*@alt unsigned int @*/ mem_word;
-+typedef int32_t /*@alt unsigned int @*/ mem_word;
- 
- 
- /* The text segment and boundaries. */
-diff -Naurp spim-7.2.1.orig/CPU/parser.y spim-7.2.1.ucb/CPU/parser.y
---- spim-7.2.1.orig/CPU/parser.y	2005-08-28 13:58:12.000000000 -0700
-+++ spim-7.2.1.ucb/CPU/parser.y	2005-10-04 20:51:30.945984000 -0700
-@@ -470,8 +470,8 @@ int parse_error_occurred; /* Non-zero =>
- 
- static imm_expr *branch_offset (int n_inst);
- static int cc_to_rt (int cc, int nd, int tf);
--static void check_imm_range (imm_expr*, int32, int32);
--static void check_uimm_range (imm_expr*, uint32, uint32);
-+static void check_imm_range (imm_expr*, int32_t, int32_t);
-+static void check_uimm_range (imm_expr*, uint32_t, uint32_t);
- static void clear_labels ();
- static label_list *cons_label (label *head, label_list *tail);
- static void div_inst (int op, int rd, int rs, int rt, int const_divisor);
-@@ -2853,13 +2853,13 @@ initialize_parser (char *file_name)
- 
- 
- static void
--check_imm_range (imm_expr* expr, int32 min, int32 max)
-+check_imm_range (imm_expr* expr, int32_t min, int32_t max)
- {
-   if (expr->symbol == NULL || SYMBOL_IS_DEFINED (expr->symbol))
-     {
-       /* If expression can be evaluated, compare its value against the limits
- 	 and complain if the value is out of bounds. */
--      int32 value = eval_imm_expr (expr);
-+      int32_t value = eval_imm_expr (expr);
- 
-       if (value < min || max < value)
- 	{
-@@ -2873,19 +2873,19 @@ check_imm_range (imm_expr* expr, int32 m
- 
- 
- static void
--check_uimm_range (imm_expr* expr, uint32 min, uint32 max)
-+check_uimm_range (imm_expr* expr, uint32_t min, uint32_t max)
- {
-   if (expr->symbol == NULL || SYMBOL_IS_DEFINED (expr->symbol))
-     {
-       /* If expression can be evaluated, compare its value against the limits
- 	     and complain if the value is out of bounds. */
--      uint32 value = (uint32)eval_imm_expr (expr);
-+      uint32_t value = (uint32_t)eval_imm_expr (expr);
- 
-       if (value < min || max < value)
- 	{
- 	  char str[200];
- 	  sprintf (str, "immediate value (%d) out of range (%d .. %d)",
--		   (int32)value, (int32)min, (int32)max);
-+		   (int32_t)value, (int32_t)min, (int32_t)max);
- 	  yywarn (str);
- 	}
-     }
-diff -Naurp spim-7.2.1.orig/CPU/reg.h spim-7.2.1.ucb/CPU/reg.h
---- spim-7.2.1.orig/CPU/reg.h	2005-08-28 13:58:12.000000000 -0700
-+++ spim-7.2.1.ucb/CPU/reg.h	2005-10-04 20:51:31.109992000 -0700
-@@ -24,8 +24,8 @@
- */
- 
- 
--typedef int32 /*@alt unsigned int @*/ reg_word;
--typedef uint32 u_reg_word;
-+typedef int32_t /*@alt unsigned int @*/ reg_word;
-+typedef uint32_t u_reg_word;
- 
- 
- /* General purpose registers: */
-@@ -180,7 +180,7 @@ extern int *FWR;		/* is possible */
- 				 run_error ("Odd FP double register number\n"); \
- 				 else FPR[(REGNO) / 2] = (double) (VALUE);}
- 
--#define SET_FPR_W(REGNO, VALUE) {FWR[REGNO] = (int32) (VALUE);}
-+#define SET_FPR_W(REGNO, VALUE) {FWR[REGNO] = (int32_t) (VALUE);}
- 
- 
- /* Floating point control registers: */
-diff -Naurp spim-7.2.1.orig/CPU/run.c spim-7.2.1.ucb/CPU/run.c
---- spim-7.2.1.orig/CPU/run.c	2005-08-28 13:58:12.000000000 -0700
-+++ spim-7.2.1.ucb/CPU/run.c	2005-10-04 20:51:31.225997000 -0700
-@@ -1343,7 +1343,7 @@ run_spim (mem_addr initial_PC, int steps
- 	      {
- 		double val = FPR_D (FS (inst));
- 
--		SET_FPR_W (FD (inst), (int32)ceil (val));
-+		SET_FPR_W (FD (inst), (int32_t)ceil (val));
- 		break;
- 	      }
- 
-@@ -1351,7 +1351,7 @@ run_spim (mem_addr initial_PC, int steps
- 	      {
- 		double val = (double)FPR_S (FS (inst));
- 
--		SET_FPR_W (FD (inst), (int32)ceil (val));
-+		SET_FPR_W (FD (inst), (int32_t)ceil (val));
- 		break;
- 	      }
- 
-@@ -1389,7 +1389,7 @@ run_spim (mem_addr initial_PC, int steps
- 
- 	    case Y_CVT_W_D_OP:
- 	      {
--		int val = (int32)FPR_D (FS (inst));
-+		int val = (int32_t)FPR_D (FS (inst));
- 
- 		SET_FPR_W (FD (inst), val);
- 		break;
-@@ -1397,7 +1397,7 @@ run_spim (mem_addr initial_PC, int steps
- 
- 	    case Y_CVT_W_S_OP:
- 	      {
--		int val = (int32)FPR_S (FS (inst));
-+		int val = (int32_t)FPR_S (FS (inst));
- 
- 		SET_FPR_W (FD (inst), val);
- 		break;
-@@ -1415,7 +1415,7 @@ run_spim (mem_addr initial_PC, int steps
- 	      {
- 		double val = FPR_D (FS (inst));
- 
--		SET_FPR_W (FD (inst), (int32)floor (val));
-+		SET_FPR_W (FD (inst), (int32_t)floor (val));
- 		break;
- 	      }
- 
-@@ -1423,7 +1423,7 @@ run_spim (mem_addr initial_PC, int steps
- 	      {
- 		double val = (double)FPR_S (FS (inst));
- 
--		SET_FPR_W (FD (inst), (int32)floor (val));
-+		SET_FPR_W (FD (inst), (int32_t)floor (val));
- 		break;
- 	      }
- 
-@@ -1573,7 +1573,7 @@ run_spim (mem_addr initial_PC, int steps
- 	      {
- 		double val = FPR_D (FS (inst));
- 
--		SET_FPR_W (FD (inst), (int32)(val + 0.5)); /* Casting truncates */
-+		SET_FPR_W (FD (inst), (int32_t)(val + 0.5)); /* Casting truncates */
- 		break;
- 	      }
- 
-@@ -1581,7 +1581,7 @@ run_spim (mem_addr initial_PC, int steps
- 	      {
- 		double val = (double)FPR_S (FS (inst));
- 
--		SET_FPR_W (FD (inst), (int32)(val + 0.5)); /* Casting truncates */
-+		SET_FPR_W (FD (inst), (int32_t)(val + 0.5)); /* Casting truncates */
- 		break;
- 	      }
- 
-@@ -1627,7 +1627,7 @@ run_spim (mem_addr initial_PC, int steps
- 	      {
- 		double val = FPR_D (FS (inst));
- 
--		SET_FPR_W (FD (inst), (int32)val); /* Casting truncates */
-+		SET_FPR_W (FD (inst), (int32_t)val); /* Casting truncates */
- 		break;
- 	      }
- 
-@@ -1635,7 +1635,7 @@ run_spim (mem_addr initial_PC, int steps
- 	      {
- 		double val = (double)FPR_S (FS (inst));
- 
--		SET_FPR_W (FD (inst), (int32)val); /* Casting truncates */
-+		SET_FPR_W (FD (inst), (int32_t)val); /* Casting truncates */
- 		break;
- 	      }
- 
-@@ -1709,7 +1709,7 @@ start_CP0_timer ()
-      since signals interrupt I/O calls, such as read, and make user
-      interaction with SPIM work very poorly. Since speed isn't an important
-      aspect of SPIM, polling isn't a big deal. */
--  if (-1 == (int)signal (SIGALRM, SIG_IGN))
-+  if (-1 == (long)signal (SIGALRM, SIG_IGN))
-     {
-       perror ("signal failed");
-     }
-diff -Naurp spim-7.2.1.orig/CPU/spim.h spim-7.2.1.ucb/CPU/spim.h
---- spim-7.2.1.orig/CPU/spim.h	2005-08-28 13:58:13.000000000 -0700
-+++ spim-7.2.1.ucb/CPU/spim.h	2005-10-04 20:57:41.038675000 -0700
-@@ -29,12 +29,10 @@
- #define NULL 0
- #endif
- 
-+/* Use C99 types for guranteed size */
-+#include <stdint.h>
-+#include <sys/types.h>
- 
--/* Type declarations for portability.  They work for DEC's Alpha (64 bits)
--   and 32 bit machines */
--
--typedef int int32;
--typedef unsigned int  uint32;
- typedef union {int i; void* p;} intptr_union;
- 
- 
-@@ -45,7 +43,7 @@ typedef union {int i; void* p;} intptr_u
- #define ROUND_UP(V, B) (((int) V + (B-1)) & ~(B-1))
- #define ROUND_DOWN(V, B) (((int) V) & ~(B-1))
- 
--/* Sign-extend an int16 to an int32 */
-+/* Sign-extend an int16 to an int32_t */
- #define SIGN_EX(X) (((X) & 0x8000) ? ((X) | 0xffff0000) : (X))
- 
- 
-@@ -81,7 +79,7 @@ typedef union {int i; void* p;} intptr_u
- 
- /* Type of a memory address.  Must be a 32-bit quantity to match MIPS.  */
- 
--typedef uint32 /*@alt int @*/ mem_addr;
-+typedef uint32_t /*@alt int @*/ mem_addr;
- 
- 
- #define BYTES_PER_WORD 4	/* On the MIPS processor */
-diff -Naurp spim-7.2.1.orig/CPU/sym-tbl.c spim-7.2.1.ucb/CPU/sym-tbl.c
---- spim-7.2.1.orig/CPU/sym-tbl.c	2005-08-28 13:58:13.000000000 -0700
-+++ spim-7.2.1.ucb/CPU/sym-tbl.c	2005-10-04 20:51:32.034034000 -0700
-@@ -303,8 +303,8 @@ resolve_a_label_sub (label *sym, instruc
-       if (EXPR (inst)->symbol == NULL
- 	  || SYMBOL_IS_DEFINED (EXPR (inst)->symbol))
- 	{
--	  int32 value;
--	  int32 field_mask;
-+	  int32_t value;
-+	  int32_t field_mask;
- 
- 	  if (opcode_is_branch (OPCODE (inst)))
- 	    {
-diff -Naurp spim-7.2.1.orig/spim/configuration spim-7.2.1.ucb/spim/configuration
---- spim-7.2.1.orig/spim/configuration	1969-12-31 16:00:00.000000000 -0800
-+++ spim-7.2.1.ucb/spim/configuration	2005-10-04 20:51:36.750246000 -0700
-@@ -0,0 +1,2 @@
-+-DLITTLEENDIAN
-+-DUSE_TERMIOS
-diff -Naurp spim-7.2.1.orig/spim/spim.c spim-7.2.1.ucb/spim/spim.c
---- spim-7.2.1.orig/spim/spim.c	2005-08-28 13:58:14.000000000 -0700
-+++ spim-7.2.1.ucb/spim/spim.c	2005-10-04 22:20:43.110438437 -0700
-@@ -677,9 +677,9 @@ parse_spim_command (FILE *file, int redo
- 
-         for (i = dump_start; i < dump_limit; i++)
-           {
--            int32 code = inst_encode (text_seg[i]);
-+            int32_t code = inst_encode (text_seg[i]);
-             if (cmd == DUMP_TEXT_CMD)
--	      code = (int32)htonl ((unsigned long)code);    /* dump in network byte order */
-+	      code = (int32_t)htonl ((unsigned long)code);    /* dump in network byte order */
-             (void)fwrite (&code, 1, sizeof(code), fp);
-             words++;
-           }
diff --git a/app-emulation/spim/files/spim-7.2.1-envvar-exception.patch b/app-emulation/spim/files/spim-7.2.1-envvar-exception.patch
deleted file mode 100644
index c4e111e40ac0..000000000000
--- a/app-emulation/spim/files/spim-7.2.1-envvar-exception.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naurp spim-7.2.1.orig/spim/spim.c spim-7.2.1.ucb/spim/spim.c
---- spim-7.2.1.orig/spim/spim.c	2005-08-28 13:58:14.000000000 -0700
-+++ spim-7.2.1.ucb/spim/spim.c	2005-10-04 19:39:49.559513464 -0700
-@@ -146,6 +146,9 @@ main (int argc, char **argv)
- 
-   write_startup_message ();
- 
-+  if(getenv("SPIM_EXCEPTION_HANDLER") != NULL)
-+    exception_file_name=getenv("SPIM_EXCEPTION_HANDLER");
-+
-   for (i = 1; i < argc; i++)
-     {
- #ifdef WIN32
-diff -Naurp spim-7.2.1.orig/xspim/xspim.c spim-7.2.1.ucb/xspim/xspim.c
---- spim-7.2.1.orig/xspim/xspim.c	2005-08-28 13:58:15.000000000 -0700
-+++ spim-7.2.1.ucb/xspim/xspim.c	2005-10-04 19:39:58.163902605 -0700
-@@ -414,6 +414,9 @@ main (int argc, char **argv)
- 
-   spim_return_value = 0;
- 
-+  if(getenv("SPIM_EXCEPTION_HANDLER") != NULL)
-+    exception_file_name=getenv("SPIM_EXCEPTION_HANDLER");
-+
-   toplevel = XtAppInitialize (&app_context, "Xspim", options,
- 			      XtNumber (options), &argc, argv,
- 			      fallback_resources, NULL, ZERO);
diff --git a/app-emulation/spim/files/spim-7.2.1-multiple-exception.patch b/app-emulation/spim/files/spim-7.2.1-multiple-exception.patch
deleted file mode 100644
index d05cc7dff7af..000000000000
--- a/app-emulation/spim/files/spim-7.2.1-multiple-exception.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Naurp spim-7.2.1-r1/CPU/spim-utils.c spim-7.2.1-r1.mult_except/CPU/spim-utils.c
---- spim-7.2.1-r1/CPU/spim-utils.c	2005-08-28 13:58:13.000000000 -0700
-+++ spim-7.2.1-r1.mult_except/CPU/spim-utils.c	2005-10-26 14:22:15.000000000 -0700
-@@ -76,7 +76,7 @@ mem_addr initial_k_data_limit = K_DATA_L
- /* Initialize or reinitialize the state of the machine. */
- 
- void
--initialize_world (char* exception_file_name)
-+initialize_world (char* exception_file_names)
- {
-   /* Allocate the floating point registers */
-   if (FGR == NULL)
-@@ -96,18 +96,26 @@ initialize_world (char* exception_file_n
-   data_begins_at_point (DATA_BOT);
-   text_begins_at_point (TEXT_BOT);
- 
--  if (exception_file_name != NULL)
-+  if (exception_file_names != NULL)
-     {
-       int old_bare = bare_machine;
-       int old_accept = accept_pseudo_insts;
-+      char *state, *filename;
- 
-       bare_machine = 0;		/* Exception handler uses extended machine */
-       accept_pseudo_insts = 1;
--      if (read_assembly_file (exception_file_name))
--	fatal_error ("Cannot read exception handler: %s\n", exception_file_name);
-+
-+      for(filename = strtok_r(exception_file_names, ":", &state);
-+          filename;
-+          filename = strtok_r(NULL,  ":", &state)) {
-+
-+        if (read_assembly_file (filename))
-+          fatal_error ("Cannot read exception handler: %s\n", filename);
-+        write_output (message_out, "Loaded: %s\n", filename);
-+      }
-+
-       bare_machine = old_bare;
-       accept_pseudo_insts = old_accept;
--      write_output (message_out, "Loaded: %s\n", exception_file_name);
- 
-       if (!bare_machine)
-       {
-diff -Naurp spim-7.2.1-r1/CPU/spim-utils.h spim-7.2.1-r1.mult_except/CPU/spim-utils.h
---- spim-7.2.1-r1/CPU/spim-utils.h	2005-08-28 13:58:13.000000000 -0700
-+++ spim-7.2.1-r1.mult_except/CPU/spim-utils.h	2005-10-26 14:23:08.000000000 -0700
-@@ -46,7 +46,7 @@ void format_mem (str_stream *ss, mem_add
- void format_registers (str_stream *ss, int print_gpr_hex, int print_fpr_hex);
- void initialize_registers ();
- void initialize_run_stack (int argc, char **argv);
--void initialize_world (char *exception_file_name);
-+void initialize_world (char *exception_file_names);
- void list_breakpoints ();
- name_val_val *map_int_to_name_val_val (name_val_val tbl[], int tbl_len, int num);
- name_val_val *map_string_to_name_val_val (name_val_val tbl[], int tbl_len, char *id);
diff --git a/app-emulation/spim/files/spim-7.2.1-ptrsize.patch b/app-emulation/spim/files/spim-7.2.1-ptrsize.patch
deleted file mode 100644
index 7d106ee96e20..000000000000
--- a/app-emulation/spim/files/spim-7.2.1-ptrsize.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naurp spim-7.2.1.ucb.orig/xspim/buttons.c spim-7.2.1.ucb/xspim/buttons.c
---- spim-7.2.1.ucb.orig/xspim/buttons.c	2005-08-28 13:58:15.000000000 -0700
-+++ spim-7.2.1.ucb/xspim/buttons.c	2005-10-04 22:37:40.632652040 -0700
-@@ -583,7 +583,7 @@ static void
- clear_program_state_action (Widget w, XtPointer client_data,
- 			    XtPointer call_data)
- {
--  int clear_op = (int) client_data;
-+  long clear_op = (long) client_data;
- 
-   switch (clear_op)
-     {
diff --git a/app-emulation/spim/files/spim-7.2.1-string-handling-fix.patch b/app-emulation/spim/files/spim-7.2.1-string-handling-fix.patch
deleted file mode 100644
index 660ab78c65b9..000000000000
--- a/app-emulation/spim/files/spim-7.2.1-string-handling-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- CPU/spim-utils.c	2006-01-22 01:15:11.000000000 -0600
-+++ CPU/spim-utils.c	2006-01-22 01:35:59.000000000 -0600
-@@ -105,14 +105,25 @@
-       bare_machine = 0;		/* Exception handler uses extended machine */
-       accept_pseudo_insts = 1;
- 
--      for(filename = strtok_r(exception_file_names, ":", &state);
--          filename;
--          filename = strtok_r(NULL,  ":", &state)) {
--
--        if (read_assembly_file (filename))
--          fatal_error ("Cannot read exception handler: %s\n", filename);
--        write_output (message_out, "Loaded: %s\n", filename);
--      }
-+      /*
-+       * strtok_r does not guarantee to keep the string usable, so we must back
-+       * up the string prior to use
-+       */
-+      char *files;
-+      if ((files = strdup(exception_file_names)) == NULL)
-+         fatal_error("Insufficient memory to complete.\n");
-+
-+      for (filename = strtok_r (files, ":", &state);
-+           filename;
-+           filename = strtok_r (NULL, ":", &state))
-+         {
-+            if (read_assembly_file (filename))
-+               fatal_error ("Cannot read exception handler: %s\n", filename);
-+
-+            write_output (message_out, "Loaded: %s\n", filename);
-+         }
-+
-+      free (files);
- 
-       bare_machine = old_bare;
-       accept_pseudo_insts = old_accept;
diff --git a/app-emulation/spim/files/spim-7.2.1-string-stream.patch b/app-emulation/spim/files/spim-7.2.1-string-stream.patch
deleted file mode 100644
index 8b831e3b8dda..000000000000
--- a/app-emulation/spim/files/spim-7.2.1-string-stream.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naurp spim-7.2.1.ucb.orig/CPU/string-stream.c spim-7.2.1.ucb/CPU/string-stream.c
---- spim-7.2.1.ucb.orig/CPU/string-stream.c	2005-08-28 13:58:13.000000000 -0700
-+++ spim-7.2.1.ucb/CPU/string-stream.c	2005-10-04 22:32:37.338885592 -0700
-@@ -119,6 +119,9 @@ ss_printf (str_stream* ss, char* fmt, ..
- 	free_space = ss->max_length - ss->empty_pos;
- 	if (NULL == ss->buf)
- 	  fatal_error ("realloc failed\n");
-+
-+	va_end (args);
-+	va_start (args, fmt);
-       }
-   ss->empty_pos += n;
- 
diff --git a/app-emulation/spim/files/spim-7.5-respect_env.patch b/app-emulation/spim/files/spim-7.5-respect_env.patch
deleted file mode 100644
index 1f1e6633dc5c..000000000000
--- a/app-emulation/spim/files/spim-7.5-respect_env.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-diff -ur spim-7.5-orig/spim/Makefile spim-7.5/spim/Makefile
---- spim-7.5-orig/spim/Makefile	2009-08-15 06:16:36.000000000 +0300
-+++ spim-7.5/spim/Makefile	2009-12-22 21:35:38.679967575 +0200
-@@ -54,13 +54,13 @@
- 
- 
- # Full path for the directory that will hold the executable files:
--BIN_DIR = /usr/bin
-+BIN_DIR = $(DESTDIR)/usr/bin
- 
- # Full path for the directory that will hold the exception handler:
--EXCEPTION_DIR = /usr/lib/spim
-+EXCEPTION_DIR = $(DESTDIR)/var/lib/spim
- 
- # Full path for the directory that will hold the man files:
--MAN_DIR = /usr/share/man/en
-+MAN_DIR = $(DESTDIR)/usr/share/man
- 
- 
- # If you have flex, use it instead of lex.  If you use flex, define this
-@@ -92,11 +92,9 @@
- 
- DEFINES = $(ENDIAN) $(MEM_SIZES) -DDEFAULT_EXCEPTION_HANDLER="\"$(EXCEPTION_DIR)/exceptions.s\"" -DSPIM_VERSION="\"`cat ../VERSION`\""
- 
--CC = gcc
--CFLAGS = -I. -I$(CPU_DIR) $(DEFINES) -g -Wall
-+CFLAGS += -I. -I$(CPU_DIR) $(DEFINES) -Wall
- YFLAGS = -d --file-prefix=y
- YCFLAGS =
--LDFLAGS = -lm
- CSH = bash
- 
- # lex.yy.c is usually compiled with -O to speed it up.
-@@ -110,10 +108,10 @@
- 
- 
- spim:   force
--	make -f Makefile spim2
-+	$(MAKE) -f Makefile spim2
- 
- spim2:	$(OBJS) spim.o
--	$(CC) -g $(OBJS) spim.o $(LDFLAGS) -o spim -lm
-+	$(CC) $(OBJS) spim.o $(LDFLAGS) -o spim -lm
- 
- 
- force:	configuration
-@@ -131,19 +129,19 @@
- 	@echo
- 	@echo "Testing tt.bare.s:"
- 	$(CSH) -c "./spim -delayed_branches -delayed_loads -noexception -file $(TEST_DIR)/tt.bare.s >& test.out"
--	@tail -2 test.out
-+	@tail -n2 test.out
- 	@echo
- 
- 	@echo
- 	@echo "Testing tt.core.s:"
- 	$(CSH) -c "./spim -ef $(CPU_DIR)/exceptions.s -file $(TEST_DIR)/tt.core.s < $(TEST_DIR)/tt.in >& test.out"
--	@tail -2 test.out
-+	@tail -n2 test.out
- 	@echo
- 
- 	@echo
- 	@echo "Testing tt.endian.s:"
- 	$(CSH) -c "./spim -ef $(CPU_DIR)/exceptions.s -file $(TEST_DIR)/tt.endian.s  >& test.out"
--	@tail -2 test.out
-+	@tail -n2 test.out
- 	@echo
- 	@echo
- 
-@@ -154,13 +152,13 @@
- 	@echo
- 	@echo "Testing tt.alu.bare.s:"
- 	$(CSH) -c "./spim -bare -noexception -file $(TEST_DIR)/tt.alu.bare.s >& test.out"
--	@tail -2 test.out
-+	@tail -n2 test.out
- 	@echo
- 
- 	@echo
- 	@echo "Testing tt.fpt.bare.s:"
- 	$(CSH) -c "./spim -bare -noexception -file $(TEST_DIR)/tt.fpu.bare.s >& test.out"
--	@tail -2 test.out
-+	@tail -n2 test.out
- 	@echo
- 	@echo
- 
-@@ -178,7 +176,6 @@
- 	install -D -m 0444 $(CPU_DIR)/exceptions.s $(EXCEPTION_DIR)/exceptions.s
- 
- install-man:
--	install -D -m 0444 $(DOC_DIR)/spim.man $(MAN_DIR)
- 
- very-clean: clean
- 	rm -f configuration
-diff -ur spim-7.5-orig/xspim/Makefile spim-7.5/xspim/Makefile
---- spim-7.5-orig/xspim/Makefile	2009-08-15 06:16:37.000000000 +0300
-+++ spim-7.5/xspim/Makefile	2009-12-22 21:36:52.583871429 +0200
-@@ -175,8 +175,7 @@
- # from  top Makefile
-   BOOTSTRAPCFLAGS =
- 
--               CC = gcc -m32
--               AS = gcc -m32 -c -x assembler
-+               AS = $(CC) -m32 -c -x assembler
- 
- .SUFFIXES: .cc
- 
-@@ -201,12 +200,12 @@
- 
-               CPP = cpp $(STD_CPP_DEFINES)
-            RAWCPP = cpp -undef $(STD_CPP_OPTIONS)
--    PREPROCESSCMD = gcc -m32 -E $(STD_CPP_DEFINES)
-+    PREPROCESSCMD = $(CC) -m32 -E $(STD_CPP_DEFINES)
- 
-           INSTALL = install
-      INSTALLFLAGS = -c
- 
--               LD = gcc -m32 -nostdlib
-+               LD = $(CC) -m32 -nostdlib
- 
-               LEX = flex -l
-                M4 = m4
-@@ -220,7 +219,6 @@
-       LINTLIBFLAG = -C
-          LINTOPTS = -axz
-                LN = ln -s
--             MAKE = make
-                MV = mv -f
-                CP = cp
- 
-@@ -270,14 +268,14 @@
-               COL = col
-          COLFLAGS = -b
- 
--            MODCC = gcc -m32
-+            MODCC = $(CC) -m32
- 
-            MODCPP = cpp
-         MODCFLAGS = $(CFLAGS)
--            MODAS = gcc -m32 -c -x assembler
-+            MODAS = $(CC) -m32 -c -x assembler
-        MODASFLAGS =
- 
--            MODLD = gcc -m32 -nostdlib
-+            MODLD = $(CC) -m32 -nostdlib
- 
-        MODLDFLAGS =
- MODLDCOMBINEFLAGS = -r
-@@ -330,7 +328,7 @@
- 
-       ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
-        ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
--           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
-+           CFLAGS += $(MODULE_CFLAGS) $(ALLDEFINES)
-         LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
-          LDPRELIB =  $(INSTALLED_LIBS)
-         LDPOSTLIB =
-@@ -339,7 +337,7 @@
- 
-            LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
- 
--           CCLINK = $(CC)
-+           CCLINK = $(CC) $(LDFLAGS)
- 
-           CXXLINK = $(CXX)
- 
-@@ -1079,10 +1077,10 @@
- BIN_DIR = /usr/bin
- 
- # Full path for the directory that will hold the exception handler:
--EXCEPTION_DIR = /usr/lib/spim
-+EXCEPTION_DIR = /var/lib/spim
- 
- # Full path for the directory that will hold the man files:
--MAN_DIR = /usr/share/man/en
-+MAN_DIR = /usr/share/man
- 
- # If you have flex, use it instead of lex.  If you use flex, define this
- # variable and set LEXFLAGS.
diff --git a/app-emulation/spim/files/spim-8.0-respect_env.patch b/app-emulation/spim/files/spim-8.0-respect_env.patch
deleted file mode 100644
index 3df337848049..000000000000
--- a/app-emulation/spim/files/spim-8.0-respect_env.patch
+++ /dev/null
@@ -1,155 +0,0 @@
---- spim-8.0-orig/spim/Makefile	2010-01-09 05:22:57.000000000 +0000
-+++ spim-8.0/spim/Makefile	2010-04-08 18:49:55.000000000 +0100
-@@ -66,13 +66,13 @@
- 
- 
- # Full path for the directory that will hold the executable files:
--BIN_DIR = /usr/local/bin
-+BIN_DIR = $(DESTDIR)/usr/bin
- 
- # Full path for the directory that will hold the exception handler:
--EXCEPTION_DIR = /usr/local/lib/spim
-+EXCEPTION_DIR = $(DESTDIR)/var/lib/spim
- 
- # Full path for the directory that will hold the man files:
--MAN_DIR = /usr/local/man/en
-+MAN_DIR = $(DESTDIR)/usr/share/man
- 
- 
- # If you have flex, use it instead of lex.  If you use flex, define this
-@@ -105,10 +105,9 @@
- DEFINES = $(ENDIAN) $(MEM_SIZES) -DDEFAULT_EXCEPTION_HANDLER="\"$(EXCEPTION_DIR)/exceptions.s\"" -DSPIM_VERSION="\"`cat ../VERSION`\""
- 
- CC = gcc
--CFLAGS = -I. -I$(CPU_DIR) $(DEFINES) -g -Wall
-+CFLAGS = -I. -I$(CPU_DIR) $(DEFINES) -Wall
- YFLAGS = -d --file-prefix=y
- YCFLAGS =
--LDFLAGS = -lm
- CSH = bash
- 
- # lex.yy.c is usually compiled with -O to speed it up.
-@@ -122,10 +121,10 @@
- 
- 
- spim:   force
--	make -f Makefile spim2
-+	$(MAKE) -f Makefile spim2
- 
- spim2:	$(OBJS) spim.o
--	$(CC) -g $(OBJS) spim.o $(LDFLAGS) -o spim -lm
-+	$(CC) $(OBJS) spim.o $(LDFLAGS) -o spim -lm
- 
- 
- force:	configuration
-@@ -143,19 +142,19 @@
- 	@echo
- 	@echo "Testing tt.bare.s:"
- 	$(CSH) -c "./spim -delayed_branches -delayed_loads -noexception -file $(TEST_DIR)/tt.bare.s >& test.out"
--	@tail -2 test.out
-+	@tail -n2 test.out
- 	@echo
- 
- 	@echo
- 	@echo "Testing tt.core.s:"
- 	$(CSH) -c "./spim -ef $(CPU_DIR)/exceptions.s -file $(TEST_DIR)/tt.core.s < $(TEST_DIR)/tt.in >& test.out"
--	@tail -2 test.out
-+	@tail -n2 test.out
- 	@echo
- 
- 	@echo
- 	@echo "Testing tt.endian.s:"
- 	$(CSH) -c "./spim -ef $(CPU_DIR)/exceptions.s -file $(TEST_DIR)/tt.endian.s  >& test.out"
--	@tail -2 test.out
-+	@tail -n2 test.out
- 	@echo
- 	@echo
- 
-@@ -166,13 +165,13 @@
- 	@echo
- 	@echo "Testing tt.alu.bare.s:"
- 	$(CSH) -c "./spim -bare -noexception -file $(TEST_DIR)/tt.alu.bare.s >& test.out"
--	@tail -2 test.out
-+	@tail -n2 test.out
- 	@echo
- 
- 	@echo
- 	@echo "Testing tt.fpt.bare.s:"
- 	$(CSH) -c "./spim -bare -noexception -file $(TEST_DIR)/tt.fpu.bare.s >& test.out"
--	@tail -2 test.out
-+	@tail -n2 test.out
- 	@echo
- 	@echo
- 
-@@ -192,8 +191,6 @@
- 	install -m 0444 $(CPU_DIR)/exceptions.s $(EXCEPTION_DIR)/exceptions.s
- 
- install-man:
--	install -d $(MAN_DIR)
--	install -m 0444 $(DOC_DIR)/spim.man $(MAN_DIR)
- 
- very-clean: clean
- 	rm -f configuration
---- spim-8.0-orig/xspim/Makefile	2010-01-09 05:22:58.000000000 +0000
-+++ spim-8.0/xspim/Makefile	2010-04-08 18:52:21.000000000 +0100
-@@ -175,8 +175,7 @@
- # from  top Makefile
-   BOOTSTRAPCFLAGS =
- 
--               CC = gcc -m32
--               AS = gcc -m32 -c -x assembler
-+               AS = $(CC) -m32 -c -x assembler
- 
- .SUFFIXES: .cc
- 
-@@ -201,12 +200,12 @@
- 
-               CPP = cpp $(STD_CPP_DEFINES)
-            RAWCPP = cpp -undef $(STD_CPP_OPTIONS)
--    PREPROCESSCMD = gcc -m32 -E $(STD_CPP_DEFINES)
-+    PREPROCESSCMD = $(CC) -m32 -E $(STD_CPP_DEFINES)
- 
-           INSTALL = install
-      INSTALLFLAGS = -c
- 
--               LD = gcc -m32 -nostdlib
-+               LD = $(CC) -m32 -nostdlib
- 
-               LEX = flex -l
-                M4 = m4
-@@ -270,14 +269,14 @@
-               COL = col
-          COLFLAGS = -b
- 
--            MODCC = gcc -m32
-+            MODCC = $(CC) -m32
- 
-            MODCPP = cpp
-         MODCFLAGS = $(CFLAGS)
--            MODAS = gcc -m32 -c -x assembler
-+            MODAS = $(CC) -m32 -c -x assembler
-        MODASFLAGS =
- 
--            MODLD = gcc -m32 -nostdlib
-+            MODLD = $(CC) -m32 -nostdlib
- 
-        MODLDFLAGS =
- MODLDCOMBINEFLAGS = -r
-@@ -330,7 +329,7 @@
- 
-       ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
-        ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
--           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
-+           CFLAGS = $(MODULE_CFLAGS) $(ALLDEFINES)
-         LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
-          LDPRELIB =  $(INSTALLED_LIBS)
-         LDPOSTLIB =
-@@ -339,7 +338,7 @@
- 
-            LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
- 
--           CCLINK = $(CC)
-+           CCLINK = $(CC) $(LDFLAGS)
- 
-           CXXLINK = $(CXX)
- 
diff --git a/app-emulation/spim/metadata.xml b/app-emulation/spim/metadata.xml
index 872a4a1b5ca0..8260022a7fa1 100644
--- a/app-emulation/spim/metadata.xml
+++ b/app-emulation/spim/metadata.xml
@@ -9,4 +9,7 @@
 		programs.  It also provides a simple debugger and a minimal set of
 		operating system services.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">spimsimulator</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-emulation/spim/spim-7.2.1-r3.ebuild b/app-emulation/spim/spim-7.2.1-r3.ebuild
deleted file mode 100644
index a21fb01b3b67..000000000000
--- a/app-emulation/spim/spim-7.2.1-r3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2009 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-r3.ebuild,v 1.7 2009/03/20 03:25:56 jmbsvicetto Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="MIPS Simulator"
-HOMEPAGE="http://www.cs.wisc.edu/~larus/spim.html"
-SRC_URI="http://www.cs.wisc.edu/~larus/SPIM/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="X"
-
-RDEPEND="X? ( x11-libs/libXaw
-		x11-libs/libXp )"
-DEPEND="${RDEPEND}
-	X? ( x11-misc/imake
-		x11-proto/xproto )
-	>=sys-apps/sed-4
-	sys-devel/bison"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Patches from eradicator submitted upstream.  Fixes amd64 and others...
-	epatch "${FILESDIR}/${PN}-7.2.1-envvar-exception.patch"
-	epatch "${FILESDIR}/${PN}-7.2.1-c99.patch"
-	epatch "${FILESDIR}/${PN}-7.2.1-ptrsize.patch"
-	epatch "${FILESDIR}/${PN}-7.2.1-string-stream.patch"
-	epatch "${FILESDIR}/${PN}-7.2.1-multiple-exception.patch"
-
-	# Fix string handling on multiple exceptions patch
-	epatch "${FILESDIR}/${PN}-7.2.1-string-handling-fix.patch"
-
-	# Fix documentation files
-	cd "${S}/Documentation"
-	mv spim.man spim.1
-	mv xspim.man xspim.1
-}
-
-src_compile() {
-	cd "${S}/spim"
-
-	./Configure || die "Configure Failed!"
-
-	sed -i \
-		-e 's:@make:@$(MAKE):' \
-		-e 's:\(BIN_DIR = \).*$:\1\$(DESTDIR)/usr/bin:' \
-		-e 's:\(MAN_DIR = \).*$:\1\$(DESTDIR)/usr/share/man:' \
-		-e 's:\(EXCEPTION_DIR = \).*$:\1$(DESTDIR)/var/lib/spim:' \
-		-e 's:\(^\W*install.*\) exceptions.s \(.*$\):\1 \$(CPU_DIR)/exceptions.s \2:' \
-		-e "s:^\W*install.* spim.man .*$::" \
-		-e "s:tail -2:tail -n2:" \
-		Makefile
-
-	emake CC="$(tc-getCC)" || die
-
-	if use X ; then
-		cd "${S}/xspim"
-
-		./Configure || die "Configure Failed!"
-
-		xmkmf || die
-
-		sed -i \
-			-e 's:@make:@$(MAKE):' \
-			-e "s:\(BIN_DIR = \).*$:\1/usr/bin:" \
-			-e "s:\(MAN_DIR = \).*$:\1/usr/share/man:" \
-			-e "s:\(EXCEPTION_PATH = \).*$:\1/var/lib/spim/exceptions.s:" \
-			Makefile
-
-		emake CC="$(tc-getCC)" -j1 xspim || die
-	fi
-}
-
-src_test() {
-	cd "${S}/spim"
-	make test || die "Failed to pass tests!"
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/man
-	dodir /var/lib/spim
-
-	cd "${S}/spim"
-	make install DESTDIR="${D}" || die "Unable to install spim"
-
-	if use X ; then
-		cd "${S}/xspim"
-		make DESTDIR="${D}" install || die "Unable to install xspim"
-	fi
-
-	cd "${S}/Documentation"
-	doman spim.1
-	use X && doman xspim.1
-
-	dohtml SPIM.html
-	dodoc BLURB
-
-	cd "${S}"
-	dodoc README VERSION ChangeLog
-}
diff --git a/app-emulation/spim/spim-7.3.ebuild b/app-emulation/spim/spim-7.3.ebuild
deleted file mode 100644
index 13400b573f19..000000000000
--- a/app-emulation/spim/spim-7.3.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/spim/spim-7.3.ebuild,v 1.8 2009/03/20 03:25:56 jmbsvicetto Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="MIPS Simulator"
-HOMEPAGE="http://www.cs.wisc.edu/~larus/spim.html"
-SRC_URI="http://www.cs.wisc.edu/~larus/SPIM/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="X"
-RESTRICT="strip"
-RDEPEND="X? ( x11-libs/libXaw
-		x11-libs/libXp )"
-DEPEND="${RDEPEND}
-	X? ( x11-misc/imake
-		x11-proto/xproto )
-	>=sys-apps/sed-4
-	sys-devel/bison"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix documentation files
-	cd "${S}/Documentation"
-	mv spim.man spim.1
-	mv xspim.man xspim.1
-}
-
-src_compile() {
-	cd "${S}/spim"
-
-	./Configure || die "Configure Failed!"
-
-	sed -i \
-		-e 's:@make:@$(MAKE):' \
-		-e 's:\(BIN_DIR = \).*$:\1\$(DESTDIR)/usr/bin:' \
-		-e 's:\(MAN_DIR = \).*$:\1\$(DESTDIR)/usr/share/man:' \
-		-e 's:\(EXCEPTION_DIR = \).*$:\1$(DESTDIR)/var/lib/spim:' \
-		-e 's:\(^\W*install.*\) exceptions.s \(.*$\):\1 \$(CPU_DIR)/exceptions.s \2:' \
-		-e "s:^\W*install.* spim.man .*$::" \
-		-e "s:tail -2:tail -n2:" \
-		Makefile
-
-	emake CC="$(tc-getCC)" || die
-
-	if use X ; then
-		cd "${S}/xspim"
-
-		./Configure || die "Configure Failed!"
-
-		xmkmf || die
-
-		sed -i \
-			-e 's:@make:@$(MAKE):' \
-			-e "s:\(BIN_DIR = \).*$:\1/usr/bin:" \
-			-e "s:\(MAN_DIR = \).*$:\1/usr/share/man:" \
-			-e "s:\(EXCEPTION_DIR = \).*$:\1/var/lib/spim:" \
-			Makefile
-
-		emake CC="$(tc-getCC)" -j1 xspim || die
-	fi
-}
-
-src_test() {
-	cd "${S}/spim"
-	make test || die "Failed to pass tests!"
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/man
-	dodir /var/lib/spim
-
-	cd "${S}/spim"
-	make install DESTDIR="${D}" || die "Unable to install spim"
-
-	if use X ; then
-		cd "${S}/xspim"
-		make DESTDIR="${D}" install || die "Unable to install xspim"
-	fi
-
-	cd "${S}/Documentation"
-	doman spim.1
-	use X && doman xspim.1
-
-	dohtml SPIM.html
-	dodoc BLURB
-
-	cd "${S}"
-	dodoc README VERSION ChangeLog
-}
diff --git a/app-emulation/spim/spim-7.5.ebuild b/app-emulation/spim/spim-7.5.ebuild
deleted file mode 100644
index fc36d9eab3e2..000000000000
--- a/app-emulation/spim/spim-7.5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/spim/spim-7.5.ebuild,v 1.2 2010/01/15 02:27:54 abcd Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="MIPS Simulator"
-HOMEPAGE="http://www.cs.wisc.edu/~larus/spim.html"
-SRC_URI="http://www.cs.wisc.edu/~larus/SPIM/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="X"
-
-RDEPEND="X? ( x11-libs/libXaw
-		x11-libs/libXp )"
-DEPEND="${RDEPEND}
-	X? ( x11-misc/imake
-		x11-proto/xproto )
-	>=sys-apps/sed-4
-	sys-devel/bison"
-
-src_prepare() {
-	# fix bugs 240005 and 243588
-	epatch "${FILESDIR}/${P}-respect_env.patch"
-	tc-export CC
-
-	# Fix documentation files
-	cd "${S}/Documentation"
-	mv spim.man spim.1
-	mv xspim.man xspim.1
-}
-
-src_configure() {
-	cd "${S}/spim"
-	./Configure || die "Configure Failed!"
-
-	if use X; then
-		cd "${S}/xspim"
-		./Configure || die "Configure Failed!"
-	fi
-}
-
-src_compile() {
-	cd "${S}/spim"
-	emake || die
-
-	if use X; then
-		cd "${S}/xspim"
-		emake -j1 xspim || die
-	fi
-}
-
-src_install() {
-	dodir /var/lib/spim || die
-	dodoc README VERSION ChangeLog || die
-
-	cd "${S}/spim"
-	emake DESTDIR="${D}" install || die "Unable to install spim"
-
-	if use X; then
-		cd "${S}/xspim"
-		emake DESTDIR="${D}" install || die "Unable to install xspim"
-
-		doman "${S}/Documentation/xspim.1"
-	fi
-
-	cd "${S}/Documentation"
-	doman spim.1 || die
-
-	dohtml SPIM.html || die
-	dodoc BLURB || die
-}
-
-src_test() {
-	cd "${S}/spim"
-	make test || die "Failed to pass tests!"
-}
diff --git a/app-emulation/spim/spim-8.0-r1.ebuild b/app-emulation/spim/spim-8.0-r1.ebuild
index b7b9d3f029a7..6c65d3a972ab 100644
--- a/app-emulation/spim/spim-8.0-r1.ebuild
+++ b/app-emulation/spim/spim-8.0-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/spim/spim-8.0-r1.ebuild,v 1.4 2010/11/08 19:45:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spim/spim-8.0-r1.ebuild,v 1.5 2012/09/26 19:11:25 kensington Exp $
 
 EAPI=3
 
 inherit eutils toolchain-funcs
 
 DESCRIPTION="MIPS Simulator"
-HOMEPAGE="http://www.cs.wisc.edu/~larus/spim.html"
+HOMEPAGE="http://spimsimulator.sourceforge.net/"
 SRC_URI="http://www.cs.wisc.edu/~larus/SPIM/${P}.tar.gz"
 
 LICENSE="as-is"