Fix old versions too wrt. bug 73510.

(Portage version: 2.0.51-r15)

6 files changed, 21 insertions, 70 deletions

diff --git a/app-emulation/spim/ChangeLog b/app-emulation/spim/ChangeLog
index 1020e9cefd84..975d683faf75 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.17 2005/02/12 18:25:31 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spim/ChangeLog,v 1.18 2005/02/12 18:35:42 kloeri Exp $
+
+  12 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  +files/spim-6.5-font.patch, spim-6.5-r1.ebuild, -spim-6.5.ebuild:
+  Fix old versions too wrt. bug 73510.
 
   12 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
   +files/spim-7.0-font.patch, spim-7.0.ebuild:
diff --git a/app-emulation/spim/Manifest b/app-emulation/spim/Manifest
index e69e9de55432..6d997bea658b 100644
--- a/app-emulation/spim/Manifest
+++ b/app-emulation/spim/Manifest
@@ -1,19 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 d65b70c6fb0fb48180cfa40a91b992d2 spim-7.0.ebuild 1461
 MD5 e8f39f4bf6d57a3a0b4e60db62558cf2 ChangeLog 2049
-MD5 78dabd2ee8e26a7b7aff6c3313d69751 spim-6.5.ebuild 1329
-MD5 5bce967b291189eb41d909bceba08ade spim-6.5-r1.ebuild 1331
-MD5 3962179c22e4349945b01edbadfac9a5 files/digest-spim-6.5 60
+MD5 b22d273d0cb6ce5a1f1209a7166d1fca spim-6.5-r1.ebuild 1400
+MD5 687579cae8dc43834d01a92be664c826 files/spim-6.5-font.patch 362
 MD5 e2af6a0e5ca4267cfad9f1bf5e954655 files/digest-spim-7.0 60
 MD5 d07cf1bbff97319734f9f85a3395ffa8 files/spim-7.0-font.patch 441
 MD5 3962179c22e4349945b01edbadfac9a5 files/digest-spim-6.5-r1 60
 MD5 d71d66b98121e4e42ca59fa94310ed1e files/6.5-parser.patch 266
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCDkonugEuf3OQ0akRArhnAJ0Tjb80nhUJt6RLGAgBCJLL9VeLUgCePDCH
-Um7ohd7iPFi2zyUHfbwBVXo=
-=OBt/
------END PGP SIGNATURE-----
diff --git a/app-emulation/spim/files/digest-spim-6.5 b/app-emulation/spim/files/digest-spim-6.5
deleted file mode 100644
index 97d43cc2f924..000000000000
--- a/app-emulation/spim/files/digest-spim-6.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 be9cf6ff2798e507736d05eb5c70914f spim-6.5.tar.gz 444075
diff --git a/app-emulation/spim/files/spim-6.5-font.patch b/app-emulation/spim/files/spim-6.5-font.patch
new file mode 100644
index 000000000000..bf398bea53f0
--- /dev/null
+++ b/app-emulation/spim/files/spim-6.5-font.patch
@@ -0,0 +1,11 @@
+--- 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/spim-6.5-r1.ebuild b/app-emulation/spim/spim-6.5-r1.ebuild
index 4483c4c7eeea..61c29e1d7337 100644
--- a/app-emulation/spim/spim-6.5-r1.ebuild
+++ b/app-emulation/spim/spim-6.5-r1.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-6.5-r1.ebuild,v 1.3 2005/01/01 14:17:14 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spim/spim-6.5-r1.ebuild,v 1.4 2005/02/12 18:35:42 kloeri Exp $
 
 inherit eutils
 
@@ -24,6 +24,8 @@ src_unpack() {
 	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() {
diff --git a/app-emulation/spim/spim-6.5.ebuild b/app-emulation/spim/spim-6.5.ebuild
deleted file mode 100644
index 4ec2c524fbdb..000000000000
--- a/app-emulation/spim/spim-6.5.ebuild
+++ /dev/null
@@ -1,54 +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.ebuild,v 1.11 2005/01/01 14:17:14 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="x86 amd64 ~ppc"
-LICENSE="as-is"
-SLOT="0"
-IUSE="X"
-
-RDEPEND="X? ( virtual/x11 )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# fix bad code generation (bug #47141)
-	epatch "${FILESDIR}/${PV}-parser.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:" 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/*
-}