Version bump. Respect LDFLAGS (bug #335415), CC. Fix some compiler warnings. Fix parallel make.

Package-Manager: portage-2.2_rc83/cvs/Linux i686

6 files changed, 188 insertions, 13 deletions

diff --git a/dev-lang/mmix/ChangeLog b/dev-lang/mmix/ChangeLog
index 36fcd9785ad4..a1c711b94308 100644
--- a/dev-lang/mmix/ChangeLog
+++ b/dev-lang/mmix/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lang/mmix
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mmix/ChangeLog,v 1.16 2008/09/03 09:41:10 opfer Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mmix/ChangeLog,v 1.17 2010/09/18 01:38:42 jer Exp $
+
+*mmix-20100311 (18 Sep 2010)
+*mmix-20060324-r1 (18 Sep 2010)
+
+  18 Sep 2010; Jeroen Roovers <jer@gentoo.org> +mmix-20060324-r1.ebuild,
+  +files/mmix-20060324-includes.patch, +files/mmix-20060324-makefile.patch,
+  +mmix-20100311.ebuild:
+  Version bump. Respect LDFLAGS (bug #335415), CC. Fix some compiler
+  warnings. Fix parallel make.
 
   03 Sep 2008; Christian Faulhammer <opfer@gentoo.org> mmix-20060324.ebuild:
   fix dependency to virtual/tex-base, this fixes bug 185637 and bug 222501
diff --git a/dev-lang/mmix/Manifest b/dev-lang/mmix/Manifest
index 1e025dd6123b..7867a726319e 100644
--- a/dev-lang/mmix/Manifest
+++ b/dev-lang/mmix/Manifest
@@ -1,14 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX mmix-20060324-includes.patch 284 RMD160 9a04301fd4be794ef56efc0eda7e6d54ec635d13 SHA1 8481b743ca83c0a5b3d6b373316159f35ba4175c SHA256 f241f64f244a51e98badda515015644b0daca0e22fb4344343d263fc156a4ae4
+AUX mmix-20060324-makefile.patch 1598 RMD160 eac211c4858d77a72347aa3f53b68d73e52ab33b SHA1 6a2813a0927da99a3b52d428df118785485a472f SHA256 44f2c773155d05d2765d38519c17e2d65595f9bf81bb062d3c9aabe42ab7db2f
 DIST mmix-20060324.tar.gz 305225 RMD160 d3eb802d0761621487dd13deb1ac2fe0e55fd11c SHA1 1a483fa34add7d381affa2bde39ba0af9407a852 SHA256 9d8c94e1f92fa0fae06cd6076c425d8ee5ff15698b6aa184c83bd588b8fb0c15
+DIST mmix-20100311.tar.gz 305567 RMD160 2f8b84a3e783115425c2ffa5ab5948cd0cfbc3af SHA1 9e6c32cd551dfc4270120e5ca1a0d5d24c741067 SHA256 f8278c7d0b537be8b7ef98eb9bf4925b1d2b80b6dfdd600b1bdfe2794dc96627
+EBUILD mmix-20060324-r1.ebuild 994 RMD160 b9024b2cee4df775a4d8d3aa5166081f5ccf7d5a SHA1 e865da9d6846eb19aeab0432f755188839a4cb87 SHA256 41d2cb7ef8ae327923fa32f9cd0acf9b4b329480ec7fe0e76e652f767c911445
 EBUILD mmix-20060324.ebuild 797 RMD160 8fa2cc30680e0c50dbd2d3fbed8b7b4ffd276296 SHA1 964529a6d8ce272ed40539dbd112c4c16808bda9 SHA256 ae73eb264a61566d5bdf69c08e98fe497d587efae9c6abf463d2ba0db3aaffea
-MISC ChangeLog 2497 RMD160 1274275a37d4d45bc9465a58ccc4b621b1b95d16 SHA1 9a55b67b744e86a9a4fc01f7f0a4016c857a2014 SHA256 cf38a65261b048e3679932d05c686bbb6c35996f427ac3636b25eb4e3b2c362b
+EBUILD mmix-20100311.ebuild 963 RMD160 26fccbd3f4ba4bf0dd0467842b3d93234a368dcb SHA1 babe063974573d8e4dd09dcd87108771764797cf SHA256 b8039b6f64fea77dca9ef95a0c48f7a61d6551b68b63ed895e28153576e9ad38
+MISC ChangeLog 2832 RMD160 565286d1477bb3c58d738d8ba1c41a7b428c97eb SHA1 1d47cc981b25aa14b352eb4f417b8517efa10db9 SHA256 27ca8a8b3993cfba8f98cbb7b8a6fd080ec76def3a93028691ab94d333512e55
 MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAki+W+QACgkQNQqtfCuFnePogACgkMB5vMwf+9mMKMQpW108yiUk
-oCcAoJm7F0IAIb+UJX1ty5hdMSYxQ7Xl
-=xxBd
------END PGP SIGNATURE-----
diff --git a/dev-lang/mmix/files/mmix-20060324-includes.patch b/dev-lang/mmix/files/mmix-20060324-includes.patch
new file mode 100644
index 000000000000..a48c56a80198
--- /dev/null
+++ b/dev-lang/mmix/files/mmix-20060324-includes.patch
@@ -0,0 +1,11 @@
+--- a/mmmix.w	2004-07-11 02:39:28.000000000 +0200
++++ b/mmmix.w	2010-09-18 03:16:39.000000000 +0200
+@@ -34,6 +34,8 @@
+ 
+ @c
+ #include <stdio.h>
++#include <stdlib.h> /* exit() */
++#include <string.h> /* strlen() */
+ #include "mmix-pipe.h"
+ @#
+ char *config_file_name, *prog_file_name;
diff --git a/dev-lang/mmix/files/mmix-20060324-makefile.patch b/dev-lang/mmix/files/mmix-20060324-makefile.patch
new file mode 100644
index 000000000000..9dc65ddc37ba
--- /dev/null
+++ b/dev-lang/mmix/files/mmix-20060324-makefile.patch
@@ -0,0 +1,67 @@
+--- Makefile.orig	2005-05-19 04:53:25.000000000 +0200
++++ Makefile	2010-09-18 03:33:21.000000000 +0200
+@@ -27,23 +27,23 @@
+ 	if test -r $*.ch; then cweave $*.w $*.ch; else cweave $*.w; fi
+ 
+ .w.o:
+-	make $*.c
+-	make $*.o
++	$(MAKE) $*.c
++	$(MAKE) $*.o
+ 
+ .w:
+-	make $*.c
+-	make $*
++	$(MAKE) $*.c
++	$(MAKE) $*
+ 
+ .w.dvi:
+-	make $*.tex
+-	make $*.dvi
++	$(MAKE) $*.tex
++	$(MAKE) $*.dvi
+ 
+ .w.ps:
+-	make $*.dvi
+-	make $*.ps
++	$(MAKE) $*.dvi
++	$(MAKE) $*.ps
+ 
+ .w.pdf:
+-	make $*.tex
++	$(MAKE) $*.tex
+ 	case "$(PDFTEX)" in \
+ 	 dvipdfm ) tex "\let\pdf+ \input $*"; dvipdfm $* ;; \
+ 	 pdftex ) pdftex $* ;; \
+@@ -73,24 +73,23 @@
+ clean:
+ 	rm -f *~ *.o *.c *.h *.tex *.log *.dvi *.toc *.idx *.scn *.ps core
+ 
+-mmix-pipe.o: mmix-pipe.c abstime
++abstime.h: abstime
+ 	./abstime > abstime.h
++
++mmix-pipe.o: mmix-pipe.c abstime abstime.h
+ 	$(CC) $(CFLAGS) -c mmix-pipe.c
+-	rm abstime.h
+ 
+ mmix-config.o: mmix-pipe.o
+ 
+ mmmix:  mmix-arith.o mmix-pipe.o mmix-config.o mmix-mem.o mmix-io.o mmmix.c
+-	$(CC) $(CFLAGS) mmmix.c \
++	$(CC) $(CFLAGS) $(LDFLAGS) mmmix.c \
+ 	  mmix-arith.o mmix-pipe.o mmix-config.o mmix-mem.o mmix-io.o -o mmmix
+ 
+ mmixal: mmix-arith.o mmixal.c
+-	$(CC) $(CFLAGS) mmixal.c mmix-arith.o -o mmixal
++	$(CC) $(CFLAGS) $(LDFLAGS) mmixal.c mmix-arith.o -o mmixal
+ 
+-mmix:   mmix-arith.o mmix-io.o mmix-sim.c abstime
+-	./abstime > abstime.h
+-	$(CC) $(CFLAGS) mmix-sim.c mmix-arith.o mmix-io.o -o mmix
+-	rm abstime.h
++mmix:   mmix-arith.o mmix-io.o mmix-sim.c abstime abstime.h
++	$(CC) $(CFLAGS) $(LDFLAGS) mmix-sim.c mmix-arith.o mmix-io.o -o mmix
+ 
+ tarfile: $(ALL)
+ 	tar cvf /tmp/mmix.tar $(ALL)
diff --git a/dev-lang/mmix/mmix-20060324-r1.ebuild b/dev-lang/mmix/mmix-20060324-r1.ebuild
new file mode 100644
index 000000000000..cb0e34da0b0a
--- /dev/null
+++ b/dev-lang/mmix/mmix-20060324-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mmix/mmix-20060324-r1.ebuild,v 1.1 2010/09/18 01:38:42 jer Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Donald Knuth's MMIX Assembler and Simulator."
+HOMEPAGE="http://www-cs-faculty.stanford.edu/~knuth/mmix.html"
+SRC_URI="http://www-cs-faculty.stanford.edu/~knuth/programs/${P}.tar.gz"
+
+DEPEND="|| ( >=dev-util/cweb-3.63 virtual/tex-base )"
+RDEPEND=""
+
+SLOT="0"
+LICENSE="mmix"
+KEYWORDS="~ppc ~x86"
+IUSE="doc"
+
+S="${WORKDIR}"
+
+src_prepare() {
+cp -av Makefile{,.orig}
+	epatch \
+		"${FILESDIR}"/${P}-makefile.patch \
+		"${FILESDIR}"/${P}-includes.patch
+}
+
+src_compile() {
+	emake all \
+		CFLAGS="${CFLAGS}" \
+		CC=$(tc-getCC) \
+		|| die
+	if use doc ; then
+		emake doc || die
+	fi
+}
+
+src_install () {
+	dobin mmix mmixal mmmix mmotype abstime
+	dodoc README mmix.1
+	if use doc ; then
+		insinto /usr/share/doc/${PF}
+		doins *.ps
+	fi
+}
diff --git a/dev-lang/mmix/mmix-20100311.ebuild b/dev-lang/mmix/mmix-20100311.ebuild
new file mode 100644
index 000000000000..f27f8a8dfb5d
--- /dev/null
+++ b/dev-lang/mmix/mmix-20100311.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mmix/mmix-20100311.ebuild,v 1.1 2010/09/18 01:38:41 jer Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Donald Knuth's MMIX Assembler and Simulator."
+HOMEPAGE="http://www-cs-faculty.stanford.edu/~knuth/mmix.html"
+SRC_URI="http://www-cs-faculty.stanford.edu/~knuth/programs/${P}.tar.gz"
+
+DEPEND="|| ( >=dev-util/cweb-3.63 virtual/tex-base )"
+RDEPEND=""
+
+SLOT="0"
+LICENSE="mmix"
+KEYWORDS="~ppc ~x86"
+IUSE="doc"
+
+S="${WORKDIR}"
+
+src_prepare() {
+cp -av Makefile{,.orig}
+	epatch \
+		"${FILESDIR}"/${PN}-20060324-makefile.patch
+}
+
+src_compile() {
+	emake all \
+		CFLAGS="${CFLAGS}" \
+		CC=$(tc-getCC) \
+		|| die
+	if use doc ; then
+		emake doc || die
+	fi
+}
+
+src_install () {
+	dobin mmix mmixal mmmix mmotype abstime
+	dodoc README mmix.1
+	if use doc ; then
+		insinto /usr/share/doc/${PF}
+		doins *.ps
+	fi
+}