Added another patch (sent/accepted upstream) which allows the user to list multiple...

Package-Manager: portage-2.0.53_rc6

diff --git a/app-emulation/spim/ChangeLog b/app-emulation/spim/ChangeLog
index bf186546715145dd7490be659e3299d765642015..c3340d284400f9a2fa7789816686d04bda0db71e 100644 (file)
--- a/app-emulation/spim/ChangeLog
+++ b/app-emulation/spim/ChangeLog
@@ -1,6 +1,15 @@
 # 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.30 2005/10/10 03:05:52 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spim/ChangeLog,v 1.31 2005/10/27 08:14:33 eradicator Exp $
+
+*spim-7.2.1-r2 (27 Oct 2005)
+
+  27 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/spim-7.2.1-multiple-exception.patch, -spim-7.2.1-r1.ebuild,
+  +spim-7.2.1-r2.ebuild:
+  Added another patch (sent/accepted upstream) which allows the user to list
+  multiple exception handler/libraries rather than require it to be in just
+  one file.
 
   11 Oct 2005; Saleem Abdulrasool <compnerd@gentoo.org>
   spim-7.2.1-r1.ebuild:

diff --git a/app-emulation/spim/Manifest b/app-emulation/spim/Manifest
index 27a66b33b13609d32a7d72874dcc7df3f7e94232..4aa0bfad18e8de9f731218747def636b1e15c1fe 100644 (file)
--- a/app-emulation/spim/Manifest
+++ b/app-emulation/spim/Manifest
@@ -1,21 +1,32 @@
-MD5 8878c5bae72edf52a01dd78ab3c26c86 ChangeLog 4193
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 75bdc6248304c533f24d2fee322d5301 ChangeLog 4542
 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 54351d3e666c30c161818777d2cb5746 files/digest-spim-7.2.1-r1 62
+MD5 54351d3e666c30c161818777d2cb5746 files/digest-spim-7.2.1-r2 62
 MD5 687579cae8dc43834d01a92be664c826 files/spim-6.5-font.patch 362
 MD5 d07cf1bbff97319734f9f85a3395ffa8 files/spim-7.0-font.patch 441
 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 b93adb065232f3d9579481eb66c7a47f files/spim-7.2.1-multiple-exception.patch 2375
 MD5 7fdc53102c71df807c81f19ce98f2e08 files/spim-7.2.1-ptrsize.patch 458
 MD5 12aa5d2009bfce93f35bc5b5845fe9b0 files/spim-7.2.1-string-stream.patch 488
 MD5 f180f948f41e347de9ebca387391018e metadata.xml 476
 MD5 9a055d12390dbbce3523f2f315da72db spim-6.5-r1.ebuild 1445
 MD5 4b7b9ffd8181a2ca02d4dafe0867c21b spim-7.0.ebuild 1485
 MD5 5d648b6c9e3dbd5e00da4716ccef6436 spim-7.1.ebuild 1394
-MD5 8312eff4ccec272a3e01d3138e2b8d78 spim-7.2.1-r1.ebuild 2247
+MD5 4409c3910a63bce3eff8b1f524d55b0e spim-7.2.1-r2.ebuild 2305
 MD5 548deb7d9eca69a650ca06890c86669e spim-7.2.1.ebuild 2245
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDYIx6OpjtAl+gMRURAqQ6AKDLcZCugCadtV9KWilWnKxX401QzwCgvHLo
+TvJvOe5/LiPUQDMLsw4L5YE=
+=ML7K
+-----END PGP SIGNATURE-----

diff --git a/app-emulation/spim/files/digest-spim-7.2.1-r1 b/app-emulation/spim/files/digest-spim-7.2.1-r2
similarity index 100%
rename from app-emulation/spim/files/digest-spim-7.2.1-r1
rename to app-emulation/spim/files/digest-spim-7.2.1-r2

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
new file mode 100644 (file)
index 0000000..d05cc7d
--- /dev/null
+++ b/app-emulation/spim/files/spim-7.2.1-multiple-exception.patch
@@ -0,0 +1,55 @@
+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/spim-7.2.1-r1.ebuild b/app-emulation/spim/spim-7.2.1-r2.ebuild
similarity index 93%
rename from app-emulation/spim/spim-7.2.1-r1.ebuild
rename to app-emulation/spim/spim-7.2.1-r2.ebuild
index 2c075326ba3b5e32213eed1e56ee262c5201f8d8..89cd8ff6568eb4a032d4451959eba3bf9a0c2dc2 100644 (file)
--- a/app-emulation/spim/spim-7.2.1-r1.ebuild
+++ b/app-emulation/spim/spim-7.2.1-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.2 2005/10/10 03:05:52 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spim/spim-7.2.1-r2.ebuild,v 1.1 2005/10/27 08:14:33 eradicator Exp $
 
 inherit eutils toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.cs.wisc.edu/~larus/SPIM/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc-macos ~sparc ~x86"
 IUSE="X"
 
 RDEPEND="X? ( virtual/x11 )"
@@ -27,6 +27,7 @@ src_unpack() {
        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 documentation files
        cd ${S}/Documentation