We don't need that font patch, and it makes it look ugly when we use it because we end up just using fixed.

Package-Manager: portage-2.0.53_rc4

4 files changed, 106 insertions, 12 deletions

diff --git a/app-emulation/spim/ChangeLog b/app-emulation/spim/ChangeLog
index 899617ec413c..0f63434fa90b 100644
--- a/app-emulation/spim/ChangeLog
+++ b/app-emulation/spim/ChangeLog
@@ -1,6 +1,13 @@
 # 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.28 2005/10/07 09:04:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spim/ChangeLog,v 1.29 2005/10/07 09:06:43 eradicator Exp $
+
+*spim-7.2.1-r1 (07 Oct 2005)
+
+  07 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +spim-7.2.1-r1.ebuild:
+  We don't need that font patch, and it makes it look ugly when we use it
+  because we end up just using fixed.
 
   07 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org> spim-6.5-r1.ebuild,
   spim-7.0.ebuild, spim-7.1.ebuild:
diff --git a/app-emulation/spim/Manifest b/app-emulation/spim/Manifest
index e5d6bfd3d639..3d727e6ce1e1 100644
--- a/app-emulation/spim/Manifest
+++ b/app-emulation/spim/Manifest
@@ -1,12 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 56f67d1b81f192ade7776d46fc4c6b17 ChangeLog 3847
+MD5 45fd014c4b2620587c753d89b30fd706 ChangeLog 4072
 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 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
@@ -19,11 +17,5 @@ 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 b70bbd94f22d79abac5b74db164c8b83 spim-7.2.1-r1.ebuild 2156
 MD5 548deb7d9eca69a650ca06890c86669e spim-7.2.1.ebuild 2245
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDRjpIOpjtAl+gMRURAn6BAKCeLxmqGAbDBK/AxF6ZOqM8OSrzRgCghAKD
-qKownvTYbnuIVQkfW5/P/W8=
-=0Em5
------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-r1
new file mode 100644
index 000000000000..58ae70868914
--- /dev/null
+++ b/app-emulation/spim/files/digest-spim-7.2.1-r1
@@ -0,0 +1 @@
+MD5 0fe5696659364d38660f5610ef380ad0 spim-7.2.1.tar.gz 534388
diff --git a/app-emulation/spim/spim-7.2.1-r1.ebuild b/app-emulation/spim/spim-7.2.1-r1.ebuild
new file mode 100644
index 000000000000..c86e08c02efa
--- /dev/null
+++ b/app-emulation/spim/spim-7.2.1-r1.ebuild
@@ -0,0 +1,94 @@
+# 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.1 2005/10/07 09:06:43 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}
+
+	# 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
+}