Version bump and ebuild overhaul. Respect CC, CFLAGS and LDFLAGS. Fix bugs 240005, 243588, 246447.

Package-Manager: portage-2.2_rc60/cvs/Linux x86_64

4 files changed, 285 insertions, 2 deletions

diff --git a/app-emulation/spim/ChangeLog b/app-emulation/spim/ChangeLog
index 182c30bb3f8b..4dd76e821485 100644
--- a/app-emulation/spim/ChangeLog
+++ b/app-emulation/spim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/spim
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/spim/ChangeLog,v 1.48 2009/09/12 03:50:48 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spim/ChangeLog,v 1.49 2009/12/22 19:53:09 spatz Exp $
+
+*spim-7.5 (22 Dec 2009)
+
+  22 Dec 2009; Dror Levin <spatz@gentoo.org> +spim-7.5.ebuild,
+  +files/spim-7.5-respect_env.patch:
+  Version bump and ebuild overhaul. Respect CC, CFLAGS and LDFLAGS. Fix bugs
+  240005, 243588, 246447.
 
   12 Sep 2009; Víctor Ostorga <vostorga@gentoo.org>
   -files/spim-7.2.1-font.patch:
diff --git a/app-emulation/spim/Manifest b/app-emulation/spim/Manifest
index 7d88cfe9df04..b6051c7ebece 100644
--- a/app-emulation/spim/Manifest
+++ b/app-emulation/spim/Manifest
@@ -1,15 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX spim-7.2.1-c99.patch 17070 RMD160 8c1df05fd3788bb0d0787edbbbbfeaf70010f0fe SHA1 4561b508b54e6b0fc22d2c6d99562287fd499edf SHA256 7239c6fbb84308039ee10dc0792a3559a4628cb484081ebc6fb9efb4e31968ae
 AUX spim-7.2.1-envvar-exception.patch 991 RMD160 59e8c4c2e3bbf536e0087b7d144bfea1ce02af7f SHA1 23b5a39aeb54f2b86d8c01e5d6aabac56c6d0453 SHA256 7a43dc97c06bb2cb842ebf01887f9d3c56597002c6d83d1828011383c1f98978
 AUX spim-7.2.1-multiple-exception.patch 2375 RMD160 ffbe4f39c5b3573e1ffd06d6437bd1c7b461ee30 SHA1 fec82ecfbea3764bddbb2baaacecaa2337e33d23 SHA256 ada4a1435a8a366cb5a57538d00554f74ac8148b8c0cc893dfaa369c3ee225d2
 AUX spim-7.2.1-ptrsize.patch 458 RMD160 e33bc1046a1b056f1bba4ce5e6047450b07e7df2 SHA1 1222eb64c18ae9d4991b8f2f10a2ebb8fe3d276d SHA256 d709709e5e375884754b972a690ac256ffdba33af0d96ec453a7ca8f7cb771ad
 AUX spim-7.2.1-string-handling-fix.patch 1304 RMD160 578b8f45542837b532537474f52c900fcfbd542c SHA1 37b641cb0e7a09f3ba2f0ac4cc4e824a57220611 SHA256 9b95c1a477e56caea6a77f7f448454bdcae74b25615bbef736787e5b58b24562
 AUX spim-7.2.1-string-stream.patch 488 RMD160 9a2feddb35766c73cda969cd6311c1e5655dd5f9 SHA1 11f115a5f2a08b58d4d1a011e0bb21a5f1a0a21e SHA256 1d68146570de0ed4aa045b9e134f8f34b558cbaf3d4487ab312b41fd04594e5b
+AUX spim-7.5-respect_env.patch 5091 RMD160 46ee84a49e838051adb8e6193f37b220a2be7d27 SHA1 0fafde0315cff82aef6da6ed041130fe3ecb12a7 SHA256 6ee202f653971a99b89ab6c3f81b54e2588f9ed86c2918f5cda9556718d6777c
 DIST spim-7.2.1.tar.gz 534388 RMD160 fa3f57d80ddfc6870f83f4d90d038c30fa79fb74 SHA1 22bcf17df10bbe28b3ee93256763ac7167523aba SHA256 347771fc7f91ba12092b22374ddb377f13c588e6d0d1a0cdacea8bbb76f347fb
 DIST spim-7.3.tar.gz 347226 RMD160 f87116820755ff76087889bbd0f39eaacbce201a SHA1 630b75ebc9365093e1b3d0c98ca0524f772d8647 SHA256 d7de06135c519108055a90abe77ced4e36dec4f7f27ce1a2fca0059f86cdf35d
 DIST spim-7.4.tar.gz 358993 RMD160 e134bb9271a65e4324375d4aa5b4f81d4d6b9963 SHA1 7c0772389dc7db54854681bceae432ea0e4c1587 SHA256 abb79a708bc5afaa2f02beea18fb8ad1071264ee1fde75d1e0c439c9c60f19af
+DIST spim-7.5.tar.gz 359664 RMD160 40c89e8367ff0068315535a1b43e46dfb2c9bf63 SHA1 91a6ec348e66a6856e7a4d0fb7b7c5f924bd1189 SHA256 28b572a15a402f315a61df3d9f581cb83a90fcbc297c9d095a36fbecbf69ecb7
 EBUILD spim-7.2.1-r2.ebuild 2390 RMD160 f0c036db11423b73e8dae66fec1495fba72d5591 SHA1 1e356a8bd3a920c4be4225c73654a3591c61639d SHA256 d23f2ab16a8012c8d8bd573ac4a58e631c6cb7b99c8116a003a08bd347dca652
 EBUILD spim-7.2.1-r3.ebuild 2501 RMD160 859fbc89fe2dd3696ee2ade74f59f80cf1614ea5 SHA1 9c29c07e5c46234a8e39bf6107a94db55b74964c SHA256 4c93faa4727b748075c2e27c3475962b3486048b784503402cb64e9b57b9f7a5
 EBUILD spim-7.3.ebuild 2048 RMD160 ee1c35621a8a4f841bef1e4f52b2447705108faa SHA1 0a75882949e14974c622c4e8df1665e46714346b SHA256 a018cd7d1cd35db1adc0f8d1a6111be379d97e4b0b7061d8b49dfa30e539f2dd
 EBUILD spim-7.4.ebuild 2045 RMD160 35307049e348a5a4af98099405417f4b2e69fb81 SHA1 075deef4eb27cd91064eb91eede0ee84bbf5cca9 SHA256 9e23d2f7f84a01da84392eb526c16dca25cc1810672454f59e7258906b321e1d
-MISC ChangeLog 6934 RMD160 345fe979cf19ac544371dd9b5d6605367bdc5e14 SHA1 c5c0b8782ca58bb8930c14f9ac9f465e9bd7af7c SHA256 a2a548de969bec9d3e04dea60777cff41677d7d5481b34d6879c99473d235be3
+EBUILD spim-7.5.ebuild 1559 RMD160 e9f288739429ba14739a2fd25b082216baa322b2 SHA1 cd1ec8153bfbef251d924f6e1049d8b43d1ed8b6 SHA256 cd037ee983d3643c5a58aca23d3de53b30ff63c0b18fcda0f62367bc9841876c
+MISC ChangeLog 7160 RMD160 8880207cf6312022d8580e0f10a895a60b857d2f SHA1 5b1af4b216fc0bda8cdfc390d6734a0d2032b72d SHA256 7d994e34176361c77de93593f39a8af43195bf2043c7640bfeb2396a6988735b
 MISC metadata.xml 440 RMD160 2bc90bd8aeacfcb3cb837a01b27313048b940005 SHA1 1afa0dd04f7ebf5735b63e4f48a8ee9364ee408c SHA256 82955b2522d81367ae4ed61542d0a39b4a82fe5a0a7f73fdaefd24299064f153
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iQEcBAEBCgAGBQJLMSOuAAoJEAWF714uGAc6DfMH/2CbQrd8/br58XMwphZZ9pST
+2Wxi757rFhMyQPMYuqcVv34ulok3xPzZTZrthpZVQmLxAHNHTX+tTqHZT6x/NTeA
+v9TG46Uh2PaBA4jOK5t/V1/PSWaLmCCbkZpok+4tcoBRweGXenSLiKVq//+1CCFJ
+IQfP5ShL+VEM4IGiqRPM0HMq/yetxD1mb9d4uhP8Q5rsWJnkVXjBNVmyV46VB95c
+5tYrx9EEGqbn7KwWa4pys4VD7X5zXlppIBJhBNXpch+sNGavpdC/0OkRQBjkeh8Y
+0DA674oGDoc1E5GJKKrSJZ6S0FEzEz0e6ch5HwIXzuk6Rdkosc++RgpAGBqT910=
+=+CnW
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/spim/files/spim-7.5-respect_env.patch b/app-emulation/spim/files/spim-7.5-respect_env.patch
new file mode 100644
index 000000000000..1f1e6633dc5c
--- /dev/null
+++ b/app-emulation/spim/files/spim-7.5-respect_env.patch
@@ -0,0 +1,178 @@
+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/spim-7.5.ebuild b/app-emulation/spim/spim-7.5.ebuild
new file mode 100644
index 000000000000..273b1303d168
--- /dev/null
+++ b/app-emulation/spim/spim-7.5.ebuild
@@ -0,0 +1,81 @@
+# 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.5.ebuild,v 1.1 2009/12/22 19:53:09 spatz 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"
+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!"
+}