clean out older, non-modX ebuilds; backfill modX deps from spim-7.2.1-r3

(Portage version: 2.1.1_rc1)
 (Unsigned Manifest commit)

13 files changed, 8 insertions, 388 deletions

diff --git a/app-emulation/spim/Manifest b/app-emulation/spim/Manifest
index 75904fdbfcc5..08fd14ebdd09 100644
--- a/app-emulation/spim/Manifest
+++ b/app-emulation/spim/Manifest
@@ -1,22 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX 6.5-parser.patch 266 RMD160 cc8731899eb67aff0c4a0230bfb1a52453b28781 SHA1 53bc33187ebedb2a559bfea97a847f8768c4f9ae SHA256 b6987d773c2ef1313c9b3e2093b1353ca100efc2d4ef0512e8e6fc3c3596ead9
-MD5 d71d66b98121e4e42ca59fa94310ed1e files/6.5-parser.patch 266
-RMD160 cc8731899eb67aff0c4a0230bfb1a52453b28781 files/6.5-parser.patch 266
-SHA256 b6987d773c2ef1313c9b3e2093b1353ca100efc2d4ef0512e8e6fc3c3596ead9 files/6.5-parser.patch 266
-AUX spim-6.5-font.patch 362 RMD160 0f9054b0e89162d88aa9fd0c4d0f0d851bf6f514 SHA1 c25d13ef86238222068362a2c354cbf4829487f2 SHA256 06ea341de581ed19ead6ed2008ff0c085bd3f3b287cbddd30e4fcaffbce44055
-MD5 687579cae8dc43834d01a92be664c826 files/spim-6.5-font.patch 362
-RMD160 0f9054b0e89162d88aa9fd0c4d0f0d851bf6f514 files/spim-6.5-font.patch 362
-SHA256 06ea341de581ed19ead6ed2008ff0c085bd3f3b287cbddd30e4fcaffbce44055 files/spim-6.5-font.patch 362
-AUX spim-7.0-font.patch 441 RMD160 bc467c454cc2f5fcda9974071bfc2a3683b3cc28 SHA1 5f994a7f1b9f1f957e530adfdbbeca40bafe159c SHA256 98a807828c7f0add7d0984350a70c9da4f286cdac17b3f80863143f36a344d0f
-MD5 d07cf1bbff97319734f9f85a3395ffa8 files/spim-7.0-font.patch 441
-RMD160 bc467c454cc2f5fcda9974071bfc2a3683b3cc28 files/spim-7.0-font.patch 441
-SHA256 98a807828c7f0add7d0984350a70c9da4f286cdac17b3f80863143f36a344d0f files/spim-7.0-font.patch 441
-AUX spim-7.1-font.patch 436 RMD160 c3ff9a66f0ee2c07625c683376f5e354431f218a SHA1 1e390b19b7a3b81bef4932a820aa95c5c8413762 SHA256 e44090c5799c7230962c0d22e92eb84345ca1687c92f539c7021bea89d7691ec
-MD5 df8dcbb83771ccb4cccb7006b9a9d1ff files/spim-7.1-font.patch 436
-RMD160 c3ff9a66f0ee2c07625c683376f5e354431f218a files/spim-7.1-font.patch 436
-SHA256 e44090c5799c7230962c0d22e92eb84345ca1687c92f539c7021bea89d7691ec files/spim-7.1-font.patch 436
 AUX spim-7.2.1-c99.patch 17070 RMD160 8c1df05fd3788bb0d0787edbbbbfeaf70010f0fe SHA1 4561b508b54e6b0fc22d2c6d99562287fd499edf SHA256 7239c6fbb84308039ee10dc0792a3559a4628cb484081ebc6fb9efb4e31968ae
 MD5 0323f7eab0a1497289beb7246d3b5f9b files/spim-7.2.1-c99.patch 17070
 RMD160 8c1df05fd3788bb0d0787edbbbbfeaf70010f0fe files/spim-7.2.1-c99.patch 17070
@@ -45,64 +26,26 @@ AUX spim-7.2.1-string-stream.patch 488 RMD160 9a2feddb35766c73cda969cd6311c1e565
 MD5 12aa5d2009bfce93f35bc5b5845fe9b0 files/spim-7.2.1-string-stream.patch 488
 RMD160 9a2feddb35766c73cda969cd6311c1e5655dd5f9 files/spim-7.2.1-string-stream.patch 488
 SHA256 1d68146570de0ed4aa045b9e134f8f34b558cbaf3d4487ab312b41fd04594e5b files/spim-7.2.1-string-stream.patch 488
-DIST spim-6.5.tar.gz 444075
-DIST spim-7.0.tar.gz 302395
-DIST spim-7.1.tar.gz 307599
 DIST spim-7.2.1.tar.gz 534388 RMD160 fa3f57d80ddfc6870f83f4d90d038c30fa79fb74 SHA1 22bcf17df10bbe28b3ee93256763ac7167523aba SHA256 347771fc7f91ba12092b22374ddb377f13c588e6d0d1a0cdacea8bbb76f347fb
-EBUILD spim-6.5-r1.ebuild 1445 RMD160 627a0f788ccfcd43f2f63b06bcc09fb34f106be7 SHA1 fcd69a3cc766ff51d2993e5ee936b09cf139f274 SHA256 b5644f9e22fb5f0d436b678b6220fb92bfc7cf5780d1fd8555696419fd2689f2
-MD5 9a055d12390dbbce3523f2f315da72db spim-6.5-r1.ebuild 1445
-RMD160 627a0f788ccfcd43f2f63b06bcc09fb34f106be7 spim-6.5-r1.ebuild 1445
-SHA256 b5644f9e22fb5f0d436b678b6220fb92bfc7cf5780d1fd8555696419fd2689f2 spim-6.5-r1.ebuild 1445
-EBUILD spim-7.0.ebuild 1472 RMD160 a8c73b453d35b07d98f206f9eb6ce05dfb2f7018 SHA1 1936e851d1e7df637c0c377c9436866d392d19d0 SHA256 7794cac3d303e4a577294d398a8134416b503f8633fd3c673a7127f142e8b626
-MD5 50993cc657c27f597fb7b1323d3a7c39 spim-7.0.ebuild 1472
-RMD160 a8c73b453d35b07d98f206f9eb6ce05dfb2f7018 spim-7.0.ebuild 1472
-SHA256 7794cac3d303e4a577294d398a8134416b503f8633fd3c673a7127f142e8b626 spim-7.0.ebuild 1472
-EBUILD spim-7.1.ebuild 1378 RMD160 506c1d7a3499e95be311be4c8098fc93725c32e7 SHA1 3ea7eae324e341869b95e3f9d0e999c2d0e82ab0 SHA256 5d628e42f7a86cbf3889a25d4579f836dba110273acb577040f7a044293a6dd5
-MD5 caa9544ec96304fb9029ed3263660148 spim-7.1.ebuild 1378
-RMD160 506c1d7a3499e95be311be4c8098fc93725c32e7 spim-7.1.ebuild 1378
-SHA256 5d628e42f7a86cbf3889a25d4579f836dba110273acb577040f7a044293a6dd5 spim-7.1.ebuild 1378
-EBUILD spim-7.2.1-r2.ebuild 2301 RMD160 681ea59652d168373c183ceccfaaf4e79747875c SHA1 16d10804cfef78d501ab2a0cf8c611789dab51d4 SHA256 85ae14ab96e2333650c4200e3331c36fd67997d63a0e98fccee010b780d136be
-MD5 72c275207f182803574d6b2642209d9d spim-7.2.1-r2.ebuild 2301
-RMD160 681ea59652d168373c183ceccfaaf4e79747875c spim-7.2.1-r2.ebuild 2301
-SHA256 85ae14ab96e2333650c4200e3331c36fd67997d63a0e98fccee010b780d136be spim-7.2.1-r2.ebuild 2301
+EBUILD spim-7.2.1-r2.ebuild 2411 RMD160 fd439cdd2129efcba68da62a825f202989e90c37 SHA1 bdb54ac09959a9fd71be91c4bc99846f8074d679 SHA256 c4d0a4e1a627eb9cff9b639d52bc83f8cd229ea9d8ad60eac543e4aa57ae22f3
+MD5 74062f6072ad00a0fe0c303f61dc4339 spim-7.2.1-r2.ebuild 2411
+RMD160 fd439cdd2129efcba68da62a825f202989e90c37 spim-7.2.1-r2.ebuild 2411
+SHA256 c4d0a4e1a627eb9cff9b639d52bc83f8cd229ea9d8ad60eac543e4aa57ae22f3 spim-7.2.1-r2.ebuild 2411
 EBUILD spim-7.2.1-r3.ebuild 2519 RMD160 375481d376dd28e6a8ce0818c32f6fee5e8da355 SHA1 f2a25ab2203da53346a78fd2693d3b7783d9d82a SHA256 44575b77cfa918232e3401350cc536857540d7fa71c35b87b51e970ac81c8756
 MD5 ce44010d870ad0ff991ed564ab66f484 spim-7.2.1-r3.ebuild 2519
 RMD160 375481d376dd28e6a8ce0818c32f6fee5e8da355 spim-7.2.1-r3.ebuild 2519
 SHA256 44575b77cfa918232e3401350cc536857540d7fa71c35b87b51e970ac81c8756 spim-7.2.1-r3.ebuild 2519
-EBUILD spim-7.2.1.ebuild 2245 RMD160 9fd6f7712d8e3f37137a3b3466d46c4ea731dbdb SHA1 8df1a944dec852f05f261a62bcb01b62d8ab72f7 SHA256 d39ff4fbd8c0787948de4d0d3197cbd4b3b45c7c8ca1a9dc0c33b4befdf268a0
-MD5 548deb7d9eca69a650ca06890c86669e spim-7.2.1.ebuild 2245
-RMD160 9fd6f7712d8e3f37137a3b3466d46c4ea731dbdb spim-7.2.1.ebuild 2245
-SHA256 d39ff4fbd8c0787948de4d0d3197cbd4b3b45c7c8ca1a9dc0c33b4befdf268a0 spim-7.2.1.ebuild 2245
-MISC ChangeLog 5111 RMD160 f8e31a5569837dd9bd0af9ac69af5925b4b156e1 SHA1 368d8634646dfbf372dea9c5371e02e782129a13 SHA256 14a33736e8471f937bc0ddc50b7f3772efa4ba6ead1ad21239209859b41c75b2
-MD5 d3c6625f8bbc645033fed2057523de20 ChangeLog 5111
-RMD160 f8e31a5569837dd9bd0af9ac69af5925b4b156e1 ChangeLog 5111
-SHA256 14a33736e8471f937bc0ddc50b7f3772efa4ba6ead1ad21239209859b41c75b2 ChangeLog 5111
+MISC ChangeLog 5403 RMD160 fd700b7bf2761087d2c1a1a8230eb1e07b200e31 SHA1 5604aa8d79f56c751bd914f7333c3478f77c4aba SHA256 8e0d448153b31edf3255a193129b8ed5a3ec8b8dc2f45607cd3f6dbcde66ba15
+MD5 5e08ef734d4bb9cddab5fd94795bf765 ChangeLog 5403
+RMD160 fd700b7bf2761087d2c1a1a8230eb1e07b200e31 ChangeLog 5403
+SHA256 8e0d448153b31edf3255a193129b8ed5a3ec8b8dc2f45607cd3f6dbcde66ba15 ChangeLog 5403
 MISC metadata.xml 476 RMD160 67d8855fc914914b4dafc2cb6b251fd8ba01a8ef SHA1 dbd4ee67b81d629afe3c01c81225c060884e92a8 SHA256 fcdb7aa53acb276daa887459aa49573b0417c54d9b7d3510bf84aaa9b90b6578
 MD5 f180f948f41e347de9ebca387391018e metadata.xml 476
 RMD160 67d8855fc914914b4dafc2cb6b251fd8ba01a8ef metadata.xml 476
 SHA256 fcdb7aa53acb276daa887459aa49573b0417c54d9b7d3510bf84aaa9b90b6578 metadata.xml 476
-MD5 3962179c22e4349945b01edbadfac9a5 files/digest-spim-6.5-r1 60
-RMD160 a9dbb0ad4f12e71a87c9593a4a6a4a5e6703fdb3 files/digest-spim-6.5-r1 60
-SHA256 cda2aa92a5393957ba7b634fd9bca83bf9af58a6de6fccfb23e827a8b1a71491 files/digest-spim-6.5-r1 60
-MD5 e2af6a0e5ca4267cfad9f1bf5e954655 files/digest-spim-7.0 60
-RMD160 c9802eaca3a5af66ce4a3a6988e2195fcd2d86b3 files/digest-spim-7.0 60
-SHA256 4570b84b1decf3ea397694626fb0b50ed51759cf95dcbd16def2ae2eb00a770b files/digest-spim-7.0 60
-MD5 1e56da59f31f01ba293a6c05cc257a5a files/digest-spim-7.1 60
-RMD160 c240d8dce0a4e4aab3df208e6e576261ec343376 files/digest-spim-7.1 60
-SHA256 78f84e40f82b02015173c971433732303dbd24c57e907260e2c1bb7c7ec30219 files/digest-spim-7.1 60
-MD5 06afd2711ad62fa76f6c0fcad86d0ae1 files/digest-spim-7.2.1 232
-RMD160 c4db252d92dd46d3b3a529fb8a401b6ca135a078 files/digest-spim-7.2.1 232
-SHA256 ec6d832c5024ffea93e6387294ab17878a52c0bb25ffdfd72185f10db1f29634 files/digest-spim-7.2.1 232
 MD5 06afd2711ad62fa76f6c0fcad86d0ae1 files/digest-spim-7.2.1-r2 232
 RMD160 c4db252d92dd46d3b3a529fb8a401b6ca135a078 files/digest-spim-7.2.1-r2 232
 SHA256 ec6d832c5024ffea93e6387294ab17878a52c0bb25ffdfd72185f10db1f29634 files/digest-spim-7.2.1-r2 232
 MD5 06afd2711ad62fa76f6c0fcad86d0ae1 files/digest-spim-7.2.1-r3 232
 RMD160 c4db252d92dd46d3b3a529fb8a401b6ca135a078 files/digest-spim-7.2.1-r3 232
 SHA256 ec6d832c5024ffea93e6387294ab17878a52c0bb25ffdfd72185f10db1f29634 files/digest-spim-7.2.1-r3 232
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFExBdw2ZWR0Jhg/EsRAmjDAJ9S8ifYP2lINqDyvrQgFOaxXFkFWgCeJl2K
-M6J2VhKWGITCp8320E5knCs=
-=wMBS
------END PGP SIGNATURE-----
diff --git a/app-emulation/spim/files/6.5-parser.patch b/app-emulation/spim/files/6.5-parser.patch
deleted file mode 100644
index 83a7c7b63c05..000000000000
--- a/app-emulation/spim/files/6.5-parser.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/digest-spim-6.5-r1 b/app-emulation/spim/files/digest-spim-6.5-r1
deleted file mode 100644
index 97d43cc2f924..000000000000
--- a/app-emulation/spim/files/digest-spim-6.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 be9cf6ff2798e507736d05eb5c70914f spim-6.5.tar.gz 444075
diff --git a/app-emulation/spim/files/digest-spim-7.0 b/app-emulation/spim/files/digest-spim-7.0
deleted file mode 100644
index b380b59d633b..000000000000
--- a/app-emulation/spim/files/digest-spim-7.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c93d8ef25cee2d8847f4f98d30c20889 spim-7.0.tar.gz 302395
diff --git a/app-emulation/spim/files/digest-spim-7.1 b/app-emulation/spim/files/digest-spim-7.1
deleted file mode 100644
index e6da8f9b86c7..000000000000
--- a/app-emulation/spim/files/digest-spim-7.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 24546da54bca92d96bf2ea284e81d6eb spim-7.1.tar.gz 307599
diff --git a/app-emulation/spim/files/digest-spim-7.2.1 b/app-emulation/spim/files/digest-spim-7.2.1
deleted file mode 100644
index a60fbac9674b..000000000000
--- a/app-emulation/spim/files/digest-spim-7.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0fe5696659364d38660f5610ef380ad0 spim-7.2.1.tar.gz 534388
-RMD160 fa3f57d80ddfc6870f83f4d90d038c30fa79fb74 spim-7.2.1.tar.gz 534388
-SHA256 347771fc7f91ba12092b22374ddb377f13c588e6d0d1a0cdacea8bbb76f347fb spim-7.2.1.tar.gz 534388
diff --git a/app-emulation/spim/files/spim-6.5-font.patch b/app-emulation/spim/files/spim-6.5-font.patch
deleted file mode 100644
index bf398bea53f0..000000000000
--- a/app-emulation/spim/files/spim-6.5-font.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- spim-6.5/xspim.c.orig	2005-02-12 19:27:53.820049968 +0100
-+++ spim-6.5/xspim.c	2005-02-12 19:28:11.949293904 +0100
-@@ -452,7 +452,7 @@
- 
-   toplevel = XtAppInitialize (&app_context, "Xspim", options,
- 			      XtNumber (options), &argc, argv,
--			      fallback_resources, NULL, ZERO);
-+			      NULL, NULL, ZERO);
- 
-   if (argc != 1)
-     syntax (argv[0]);
diff --git a/app-emulation/spim/files/spim-7.0-font.patch b/app-emulation/spim/files/spim-7.0-font.patch
deleted file mode 100644
index f1e0be9459d0..000000000000
--- a/app-emulation/spim/files/spim-7.0-font.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- spim-7.0/xspim.c.orig	2005-02-12 19:02:16.364778696 +0100
-+++ spim-7.0/xspim.c	2005-02-12 19:18:17.924599384 +0100
-@@ -416,7 +416,7 @@
- 
-   toplevel = XtAppInitialize (&app_context, "Xspim", options,
- 			      XtNumber (options), &argc, argv,
--			      fallback_resources, NULL, ZERO);
-+			      NULL, NULL, ZERO);
- 
-   if (argc >= 0 && argv[argc] != NULL && argv[argc][0] == '-')
-     syntax (argv[0]);		/* Bad command line argument */
diff --git a/app-emulation/spim/files/spim-7.1-font.patch b/app-emulation/spim/files/spim-7.1-font.patch
deleted file mode 100644
index bb250000628b..000000000000
--- a/app-emulation/spim/files/spim-7.1-font.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- spim-7.1/xspim.c 2005-07-23 17:27:08.000000000 +0000
-+++ spim-7.1/xspim.c	2005-07-23 17:27:16.000000000 +0000
-@@ -416,7 +416,7 @@
- 
-   toplevel = XtAppInitialize (&app_context, "Xspim", options,
- 			      XtNumber (options), &argc, argv,
--			      fallback_resources, NULL, ZERO);
-+			      NULL, NULL, ZERO);
- 
-   if (argc >= 0 && argv[argc] != NULL && argv[argc][0] == '-')
-     syntax (argv[0]);		/* Bad command line argument */
diff --git a/app-emulation/spim/spim-6.5-r1.ebuild b/app-emulation/spim/spim-6.5-r1.ebuild
deleted file mode 100644
index b1bc2112c9b4..000000000000
--- a/app-emulation/spim/spim-6.5-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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-6.5-r1.ebuild,v 1.7 2005/10/07 09:04:32 eradicator Exp $
-
-inherit eutils
-
-DESCRIPTION="MIPS Simulator"
-HOMEPAGE="http://www.cs.wisc.edu/~larus/spim.html"
-# No version upstream
-#SRC_URI="http://www.cs.wisc.edu/~larus/SPIM/spim.tar.gz"
-SRC_URI="mirror://gentoo//${P}.tar.gz"
-
-KEYWORDS="amd64 ~ppc x86"
-LICENSE="as-is"
-SLOT="0"
-IUSE="X"
-
-RDEPEND="X? ( virtual/x11 )"
-DEPEND="${RDEPEND}
-		>=sys-apps/sed-4
-		x11-base/xorg-x11"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# fix bad code generation (bug #47141)
-	epatch "${FILESDIR}/${PV}-parser.patch"
-	# fix font issue (bug #73510)
-	epatch "${FILESDIR}/${P}-font.patch"
-}
-
-src_compile() {
-	./Configure || die "Configure script failed"
-
-	sed -i \
-		-e 's/@make/@$(MAKE)/' \
-		-e "s:\(BIN_DIR = \).*$:\1/usr/bin:" \
-	    -e "s:\(MAN_DIR = \).*$:\1/usr/share/bin:" \
-	    -e "s:\(TRAP_DIR = \).*$:\1/usr/sbin:" \
-		-e "s:-D__i386__::" Makefile \
-			|| die "sed Makefile failed"
-
-	emake spim || die "make spim failed"
-	if use X ; then
-		emake xspim || die "emake xspim failed"
-	fi
-}
-
-src_install() {
-	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/*
-}
diff --git a/app-emulation/spim/spim-7.0.ebuild b/app-emulation/spim/spim-7.0.ebuild
deleted file mode 100644
index ba443a758027..000000000000
--- a/app-emulation/spim/spim-7.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/spim/spim-7.0.ebuild,v 1.14 2006/01/14 11:23:14 grobian Exp $
-
-inherit eutils
-
-DESCRIPTION="MIPS Simulator"
-HOMEPAGE="http://www.cs.wisc.edu/~larus/spim.html"
-# No version upstream
-#SRC_URI="http://www.cs.wisc.edu/~larus/SPIM/spim.tar.gz"
-SRC_URI="mirror://gentoo//${P}.tar.gz"
-
-KEYWORDS="-amd64 ppc x86"
-LICENSE="as-is"
-SLOT="0"
-IUSE="X"
-
-RDEPEND="X? ( virtual/x11 )"
-DEPEND="${RDEPEND}
-		>=sys-apps/sed-4
-		x11-base/xorg-x11"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# fix bad code generation (bug #47141)
-	#epatch "${FILESDIR}/${PV}-parser.patch"
-	# fix font issue (bug #73510)
-	epatch "${FILESDIR}/${P}-font.patch"
-}
-
-src_compile() {
-	./Configure || die "Configure script failed"
-
-	sed -i \
-		-e 's/@make/@$(MAKE)/' \
-		-e "s:\(BIN_DIR = \).*$:\1/usr/bin:" \
-	    -e "s:\(MAN_DIR = \).*$:\1/usr/share/bin:" \
-		-e "s:\(EXCEPTION_DIR = \).*$:\1/var/lib/spim:" Imakefile \
-		|| die "sed Makefile failed"
-	xmkmf
-	emake spim || die "make spim failed"
-	if use X ; then
-		emake xspim || die "emake xspim failed"
-	fi
-}
-
-src_install() {
-	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
-	dodir /var/lib/spim
-	insinto /var/lib/spim
-	doins exceptions.s || die "dosbin failed"
-	dodoc BLURB README VERSION ChangeLog Documentation/*
-}
diff --git a/app-emulation/spim/spim-7.1.ebuild b/app-emulation/spim/spim-7.1.ebuild
deleted file mode 100644
index d2a618a4b25c..000000000000
--- a/app-emulation/spim/spim-7.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/spim/spim-7.1.ebuild,v 1.5 2006/06/17 05:23:06 mr_bones_ Exp $
-
-inherit eutils
-
-DESCRIPTION="MIPS Simulator"
-HOMEPAGE="http://www.cs.wisc.edu/~larus/spim.html"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="-amd64 ~ppc ~x86"
-IUSE="X"
-
-RDEPEND="X? ( virtual/x11 )"
-DEPEND="${RDEPEND}
-		>=sys-apps/sed-4
-		x11-base/xorg-x11"
-
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# The font issue is still with us (Bug #73510)
-	epatch ${FILESDIR}/${P}-font.patch
-}
-
-src_compile() {
-	./Configure || die "Configure Failed!"
-
-	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:" \
-			Imakefile
-
-		# Tests need these changes, however, they require make install
-		# -e "s:\(CSH = \).*$:\1bash:" \
-		# -e "s:tail -2:tail -n2:" Imakefile
-
-	xmkmf
-	emake spim || die "Unable to compile spim"
-	if [ $(use X) ] ; then
-		emake xspim || die "Unable to compile xspim"
-	fi
-}
-
-src_install() {
-	dodir /var/lib/spim
-	make install DESTDIR=${D} || die "Unable to install spim"
-
-	newman spim.man spim.1
-	use X && newman xspim.man xspim.1
-	dodoc BLURB README VERSION ChangeLog Documentation/*
-}
diff --git a/app-emulation/spim/spim-7.2.1.ebuild b/app-emulation/spim/spim-7.2.1.ebuild
deleted file mode 100644
index 383160aa680e..000000000000
--- a/app-emulation/spim/spim-7.2.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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.2 2005/10/05 20:17:24 eradicator 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 ~ppc-macos ~sparc ~x86"
-IUSE="X"
-
-RDEPEND="X? ( virtual/x11 )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# The font issue is still with us (Bug #73510)
-	epatch ${FILESDIR}/${PN}-7.2.1-font.patch
-
-	# 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
-}
-
-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
-}