From 3c05ebf8aa86db7476f3ed6a053a91f4907ceb71 Mon Sep 17 00:00:00 2001 From: Keri Harris Date: Sat, 17 Feb 2007 20:48:41 +0000 Subject: [PATCH] Parallelize compile. Package-Manager: portage-2.1.2-r9 --- dev-lang/mozart/ChangeLog | 6 +- dev-lang/mozart/Manifest | 32 ++++----- .../mozart/files/mozart-1.3.2-contrib.patch | 67 ++++++++++++++----- .../mozart/files/mozart-1.3.2-portage.patch | 32 ++++++--- dev-lang/mozart/mozart-1.3.2.ebuild | 4 +- 5 files changed, 98 insertions(+), 43 deletions(-) diff --git a/dev-lang/mozart/ChangeLog b/dev-lang/mozart/ChangeLog index 0b2aa9de8555..ce56ed83e78b 100644 --- a/dev-lang/mozart/ChangeLog +++ b/dev-lang/mozart/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/mozart # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/ChangeLog,v 1.6 2007/02/17 04:39:56 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/ChangeLog,v 1.7 2007/02/17 20:48:41 keri Exp $ + + 17 Feb 2007; keri files/mozart-1.3.2-contrib.patch, + files/mozart-1.3.2-portage.patch, mozart-1.3.2.ebuild: + Parallelize compile 17 Feb 2007; keri files/mozart-1.3.2-ozplatform.patch, mozart-1.3.2.ebuild: diff --git a/dev-lang/mozart/Manifest b/dev-lang/mozart/Manifest index f852b44f8bf6..d69775a1af6e 100644 --- a/dev-lang/mozart/Manifest +++ b/dev-lang/mozart/Manifest @@ -1,7 +1,7 @@ -AUX mozart-1.3.2-contrib.patch 11137 RMD160 37d8909f2ab0472b3a7fa395236a9212beabb7f5 SHA1 cb71f43518e30ff7d700f66fe63c170fae1b247a SHA256 2263fe230141bf2396018ec0e0694187b86ac06798dcff69ac840ac72b6cd781 -MD5 677df3a8a0994ec5160f23843589d905 files/mozart-1.3.2-contrib.patch 11137 -RMD160 37d8909f2ab0472b3a7fa395236a9212beabb7f5 files/mozart-1.3.2-contrib.patch 11137 -SHA256 2263fe230141bf2396018ec0e0694187b86ac06798dcff69ac840ac72b6cd781 files/mozart-1.3.2-contrib.patch 11137 +AUX mozart-1.3.2-contrib.patch 12448 RMD160 00201c0d8c7e661136d26d92f6814c62fd3a131b SHA1 cc33953732d9818319d4be27087431e13d153215 SHA256 f4a81774f7335d05d2c708763ee7d21366dc376728ee94f5cd33e1649682bfb7 +MD5 cd217533b3cc0dc5cc08c0cbafa3fe7e files/mozart-1.3.2-contrib.patch 12448 +RMD160 00201c0d8c7e661136d26d92f6814c62fd3a131b files/mozart-1.3.2-contrib.patch 12448 +SHA256 f4a81774f7335d05d2c708763ee7d21366dc376728ee94f5cd33e1649682bfb7 files/mozart-1.3.2-contrib.patch 12448 AUX mozart-1.3.2-emubin.patch 1471 RMD160 2eddbeaf552856097ced86da21a28d849a74efbd SHA1 4470aec9e2b12aca1fadd56e2de12caefa8aa69d SHA256 6911112a3a0cb62bd63f2e6d7b78e18f5c7dc11215061e0febaae65ef93c87cc MD5 46d2e44289992415938c5487a7fa4ec1 files/mozart-1.3.2-emubin.patch 1471 RMD160 2eddbeaf552856097ced86da21a28d849a74efbd files/mozart-1.3.2-emubin.patch 1471 @@ -18,20 +18,20 @@ AUX mozart-1.3.2-ozplatform.patch 1446 RMD160 c6ad2a34716885280e3df45ebb0018f686 MD5 56dee6c050b0562a135967d33d431003 files/mozart-1.3.2-ozplatform.patch 1446 RMD160 c6ad2a34716885280e3df45ebb0018f686b2b33d files/mozart-1.3.2-ozplatform.patch 1446 SHA256 b993248d1f0fc556effb71ddc6d2333bd335a848f0f824f2a45425b1fee7272f files/mozart-1.3.2-ozplatform.patch 1446 -AUX mozart-1.3.2-portage.patch 8987 RMD160 72c457fe7813fcd6f5c5b97294639f51989851aa SHA1 a2cfb80728076f6f72c55df79f09598804f0f9d8 SHA256 64c16e25740b43b6fb7c64496c04c1155dfa98b911e3c132f1e41fae276a5e5f -MD5 b4e24426ddf86ae761a947ec23a71e0b files/mozart-1.3.2-portage.patch 8987 -RMD160 72c457fe7813fcd6f5c5b97294639f51989851aa files/mozart-1.3.2-portage.patch 8987 -SHA256 64c16e25740b43b6fb7c64496c04c1155dfa98b911e3c132f1e41fae276a5e5f files/mozart-1.3.2-portage.patch 8987 +AUX mozart-1.3.2-portage.patch 9327 RMD160 767b30daefb5915fed5d3d8c85f67340115782f9 SHA1 a233888fb92763a44c540f9a28fd0f84a63b9b18 SHA256 16b3be1fd3c49dd799bee440c54e1373a5ae1e5360b7d073e349d9375abd9fdb +MD5 a3842313f6c1dcfcca2e8cb1ebcaf5b4 files/mozart-1.3.2-portage.patch 9327 +RMD160 767b30daefb5915fed5d3d8c85f67340115782f9 files/mozart-1.3.2-portage.patch 9327 +SHA256 16b3be1fd3c49dd799bee440c54e1373a5ae1e5360b7d073e349d9375abd9fdb files/mozart-1.3.2-portage.patch 9327 DIST mozart-1.3.2.20060615-doc.tar.gz 3890265 RMD160 450721bb64cbcc5cefddbaf9c3b0cdfe6261ae5f SHA1 28dfd9f92ba6ee698acb7363146b4a1c0ab4199f SHA256 b169418dd02fb6024d897778908928a6aa800e8ea96b6c76515b064bfac3b84e DIST mozart-1.3.2.20060615-src.tar.gz 10798680 RMD160 22dd1f639b6ea525744564b37be009bd599d60ad SHA1 aa980f4de7dcb2b4c2db511a464a5b6497b98109 SHA256 a09acd3365911348fd7b351d73ae1b2ad76ae96ffd335ee08746f5dcca3a55bf -EBUILD mozart-1.3.2.ebuild 2388 RMD160 96698638e21976713716a914714a1c74e917a405 SHA1 a3ffbcee31456adc87f0b3cb2b68c2c57b5a74d2 SHA256 f66d9cf0e4ae5bbd927c52b34959f8e24dc4a7bb05cb396396b3e04c48bdcda9 -MD5 dd3a3c5894b959719fe7b56cd7b7d9d8 mozart-1.3.2.ebuild 2388 -RMD160 96698638e21976713716a914714a1c74e917a405 mozart-1.3.2.ebuild 2388 -SHA256 f66d9cf0e4ae5bbd927c52b34959f8e24dc4a7bb05cb396396b3e04c48bdcda9 mozart-1.3.2.ebuild 2388 -MISC ChangeLog 1076 RMD160 16492e2b139ffcff2100a9728f708bca51a029bf SHA1 75f11cd36952c9f3c38a3f981b04a8d284d1ad2e SHA256 271dbd080d5460d6de828c8cfcd2733058fbb968b4c6604ca47a882390e6f643 -MD5 2d121d9d2a259a7e8c6726d1216ffa88 ChangeLog 1076 -RMD160 16492e2b139ffcff2100a9728f708bca51a029bf ChangeLog 1076 -SHA256 271dbd080d5460d6de828c8cfcd2733058fbb968b4c6604ca47a882390e6f643 ChangeLog 1076 +EBUILD mozart-1.3.2.ebuild 2384 RMD160 7d01863f3981d7be1c6d2e78d909c84628b93a27 SHA1 065dd8a527f713021e50a6e10a221a7298f2a2f7 SHA256 4cf749d06d18377ba213b4bd0ba22e9611b7788e21ec6150ff3cf295ef57e039 +MD5 93ca571bb24e32772db6fee02a9cff71 mozart-1.3.2.ebuild 2384 +RMD160 7d01863f3981d7be1c6d2e78d909c84628b93a27 mozart-1.3.2.ebuild 2384 +SHA256 4cf749d06d18377ba213b4bd0ba22e9611b7788e21ec6150ff3cf295ef57e039 mozart-1.3.2.ebuild 2384 +MISC ChangeLog 1228 RMD160 645c55967c183c8e4e261739b9f4e6b1b7abf66f SHA1 74d7f1483f3d30016dd1b6061d4e0497d4958e16 SHA256 7f3dcbf20fef696692247cef6305a7d30111a208c523d5212fc087ad19c21b6a +MD5 6e58bbfd5bc4f72b9c21d38d6e8453f0 ChangeLog 1228 +RMD160 645c55967c183c8e4e261739b9f4e6b1b7abf66f ChangeLog 1228 +SHA256 7f3dcbf20fef696692247cef6305a7d30111a208c523d5212fc087ad19c21b6a ChangeLog 1228 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa MD5 6fca20d17d6d55a28537204aa9bb626f metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 metadata.xml 247 diff --git a/dev-lang/mozart/files/mozart-1.3.2-contrib.patch b/dev-lang/mozart/files/mozart-1.3.2-contrib.patch index 0b42c3431479..b09e44b865e9 100644 --- a/dev-lang/mozart/files/mozart-1.3.2-contrib.patch +++ b/dev-lang/mozart/files/mozart-1.3.2-contrib.patch @@ -1,6 +1,6 @@ diff -ur mozart-1.3.2.20060615.orig/contrib/ap/Makefile.in mozart-1.3.2.20060615/contrib/ap/Makefile.in --- mozart-1.3.2.20060615.orig/contrib/ap/Makefile.in 2001-08-05 10:24:30.000000000 +1200 -+++ mozart-1.3.2.20060615/contrib/ap/Makefile.in 2007-02-13 21:02:43.000000000 +1300 ++++ mozart-1.3.2.20060615/contrib/ap/Makefile.in 2007-02-18 09:39:31.000000000 +1300 @@ -21,9 +21,9 @@ install: $(NEWCACHEDIR) $(addprefix $(NEWCACHEDIR)/,$(FUNCTORS)) $(LIB_DIR) $(NEWCACHEDIR): @@ -15,7 +15,7 @@ diff -ur mozart-1.3.2.20060615.orig/contrib/ap/Makefile.in mozart-1.3.2.20060615 clean veryclean: diff -ur mozart-1.3.2.20060615.orig/contrib/compat/Makefile.in mozart-1.3.2.20060615/contrib/compat/Makefile.in --- mozart-1.3.2.20060615.orig/contrib/compat/Makefile.in 2003-11-26 03:53:51.000000000 +1300 -+++ mozart-1.3.2.20060615/contrib/compat/Makefile.in 2007-02-14 19:52:50.000000000 +1300 ++++ mozart-1.3.2.20060615/contrib/compat/Makefile.in 2007-02-18 09:39:31.000000000 +1300 @@ -5,7 +5,7 @@ VPATH = @srcdir@ PREFIX = @prefix@ @@ -60,7 +60,7 @@ diff -ur mozart-1.3.2.20060615.orig/contrib/compat/Makefile.in mozart-1.3.2.2006 TextPickle.so-$(PLATFORM): TextPickle.ozf diff -ur mozart-1.3.2.20060615.orig/contrib/davinci/Makefile.in mozart-1.3.2.20060615/contrib/davinci/Makefile.in --- mozart-1.3.2.20060615.orig/contrib/davinci/Makefile.in 2001-08-05 10:24:30.000000000 +1200 -+++ mozart-1.3.2.20060615/contrib/davinci/Makefile.in 2007-02-13 21:04:12.000000000 +1300 ++++ mozart-1.3.2.20060615/contrib/davinci/Makefile.in 2007-02-18 09:39:31.000000000 +1300 @@ -59,7 +59,7 @@ DaVinci.ozf: $(OZFNCTS) $(OZL) -z 9 DaVinciObject.ozf -o $@ @@ -72,7 +72,7 @@ diff -ur mozart-1.3.2.20060615.orig/contrib/davinci/Makefile.in mozart-1.3.2.200 $(INSTALL_DLL) $$f $(LIB_DIR)/$$f ; \ diff -ur mozart-1.3.2.20060615.orig/contrib/directory/Makefile.in mozart-1.3.2.20060615/contrib/directory/Makefile.in --- mozart-1.3.2.20060615.orig/contrib/directory/Makefile.in 2001-08-05 10:24:31.000000000 +1200 -+++ mozart-1.3.2.20060615/contrib/directory/Makefile.in 2007-02-14 19:58:11.000000000 +1300 ++++ mozart-1.3.2.20060615/contrib/directory/Makefile.in 2007-02-18 09:39:31.000000000 +1300 @@ -59,13 +59,13 @@ $(LIB_DIR) $(NEWCACHEDIR): $(INSTALL_DIR) $@ @@ -92,7 +92,7 @@ diff -ur mozart-1.3.2.20060615.orig/contrib/directory/Makefile.in mozart-1.3.2.2 #---------------------------------------------------------------------- diff -ur mozart-1.3.2.20060615.orig/contrib/doc/code/Makefile.in mozart-1.3.2.20060615/contrib/doc/code/Makefile.in --- mozart-1.3.2.20060615.orig/contrib/doc/code/Makefile.in 2002-04-02 00:28:57.000000000 +1200 -+++ mozart-1.3.2.20060615/contrib/doc/code/Makefile.in 2007-02-13 21:06:46.000000000 +1300 ++++ mozart-1.3.2.20060615/contrib/doc/code/Makefile.in 2007-02-18 09:39:31.000000000 +1300 @@ -57,13 +57,13 @@ $(LIB_DIR) $(ELIB_DIR) $(NEWCACHEDIR): $(INSTALL_DIR) $@ @@ -112,7 +112,7 @@ diff -ur mozart-1.3.2.20060615.orig/contrib/doc/code/Makefile.in mozart-1.3.2.20 %.ozf: %.oz diff -ur mozart-1.3.2.20060615.orig/contrib/doc/sgml/Makefile.in mozart-1.3.2.20060615/contrib/doc/sgml/Makefile.in --- mozart-1.3.2.20060615.orig/contrib/doc/sgml/Makefile.in 2001-08-05 10:24:31.000000000 +1200 -+++ mozart-1.3.2.20060615/contrib/doc/sgml/Makefile.in 2007-02-13 21:05:58.000000000 +1300 ++++ mozart-1.3.2.20060615/contrib/doc/sgml/Makefile.in 2007-02-18 09:39:31.000000000 +1300 @@ -25,10 +25,10 @@ $(LIB_DIR) $(NEWCACHEDIR): $(INSTALL_DIR) $@ @@ -128,7 +128,7 @@ diff -ur mozart-1.3.2.20060615.orig/contrib/doc/sgml/Makefile.in mozart-1.3.2.20 %.ozf: %.oz diff -ur mozart-1.3.2.20060615.orig/contrib/fcp/Makefile.in mozart-1.3.2.20060615/contrib/fcp/Makefile.in --- mozart-1.3.2.20060615.orig/contrib/fcp/Makefile.in 2001-08-05 10:24:32.000000000 +1200 -+++ mozart-1.3.2.20060615/contrib/fcp/Makefile.in 2007-02-13 21:07:28.000000000 +1300 ++++ mozart-1.3.2.20060615/contrib/fcp/Makefile.in 2007-02-18 09:39:31.000000000 +1300 @@ -77,10 +77,10 @@ $(LIB_DIR): $(INSTALL_DIR) $@ @@ -144,7 +144,7 @@ diff -ur mozart-1.3.2.20060615.orig/contrib/fcp/Makefile.in mozart-1.3.2.2006061 #---------------------------------------------------------------------- diff -ur mozart-1.3.2.20060615.orig/contrib/gdbm/Makefile.in mozart-1.3.2.20060615/contrib/gdbm/Makefile.in --- mozart-1.3.2.20060615.orig/contrib/gdbm/Makefile.in 2003-01-08 02:40:09.000000000 +1300 -+++ mozart-1.3.2.20060615/contrib/gdbm/Makefile.in 2007-02-13 21:09:17.000000000 +1300 ++++ mozart-1.3.2.20060615/contrib/gdbm/Makefile.in 2007-02-18 09:39:31.000000000 +1300 @@ -39,16 +39,16 @@ $(LIB_DIR) $(NEWCACHEDIR): $(INSTALL_DIR) $@ @@ -168,7 +168,7 @@ diff -ur mozart-1.3.2.20060615.orig/contrib/gdbm/Makefile.in mozart-1.3.2.200606 gdbm.ozf: gdbm.oz diff -ur mozart-1.3.2.20060615.orig/contrib/investigator/Makefile.in mozart-1.3.2.20060615/contrib/investigator/Makefile.in --- mozart-1.3.2.20060615.orig/contrib/investigator/Makefile.in 2001-08-05 10:24:33.000000000 +1200 -+++ mozart-1.3.2.20060615/contrib/investigator/Makefile.in 2007-02-13 21:09:53.000000000 +1300 ++++ mozart-1.3.2.20060615/contrib/investigator/Makefile.in 2007-02-18 09:39:31.000000000 +1300 @@ -70,7 +70,7 @@ Investigator.ozf: $(OZFNCTS) $(OZL) -z 9 Main.ozf -o $@ @@ -180,7 +180,7 @@ diff -ur mozart-1.3.2.20060615.orig/contrib/investigator/Makefile.in mozart-1.3. #---------------------------------------------------------------------- diff -ur mozart-1.3.2.20060615.orig/contrib/micq/Makefile.in mozart-1.3.2.20060615/contrib/micq/Makefile.in --- mozart-1.3.2.20060615.orig/contrib/micq/Makefile.in 2001-08-05 10:24:34.000000000 +1200 -+++ mozart-1.3.2.20060615/contrib/micq/Makefile.in 2007-02-13 21:10:50.000000000 +1300 ++++ mozart-1.3.2.20060615/contrib/micq/Makefile.in 2007-02-18 09:41:59.000000000 +1300 @@ -28,14 +28,14 @@ install:: $(DEMO_DIR) $(DEMO_DIR)/MIM.oza \ $(NEWCACHEDIR) $(addprefix $(NEWCACHEDIR)/,$(APPLETS)) @@ -199,9 +199,46 @@ diff -ur mozart-1.3.2.20060615.orig/contrib/micq/Makefile.in mozart-1.3.2.200606 $(INSTALL_LIB) $< $@ BMETH = $(BUILDTOP)/contrib/micq/methods.ozf SMETH = $(SRCDIR)/methods.oz +@@ -43,28 +43,28 @@ + + include $(BUILDTOP)/share/Makefile.boot + +-$(GIFCONV): Gif2Functor.oz GifToBase64.ozf ++$(GIFCONV): Gif2Functor.oz GifToBase64.ozf $(GIFCONV) + $(COMPILE) -c $(shell $(CYGPATH) "$<") -o $@ + +-Logo_gif.ozf : $(ICONDIR)/logo.gif ++Logo_gif.ozf : $(ICONDIR)/logo.gif $(GIFCONV) + $(MAKEGIF) $(shell $(CYGPATH) "$<") -o Logo_gif.ozf + +-Letter_gif.ozf : $(ICONDIR)/letter.gif ++Letter_gif.ozf : $(ICONDIR)/letter.gif $(GIFCONV) + $(MAKEGIF) $(shell $(CYGPATH) "$<") -o Letter_gif.ozf + +-Away_gif.ozf : $(ICONDIR)/away_t.gif ++Away_gif.ozf : $(ICONDIR)/away_t.gif $(GIFCONV) + $(MAKEGIF) $(shell $(CYGPATH) "$<") -o Away_gif.ozf + +-Online_gif.ozf : $(ICONDIR)/online_t.gif ++Online_gif.ozf : $(ICONDIR)/online_t.gif $(GIFCONV) + $(MAKEGIF) $(shell $(CYGPATH) "$<") -o Online_gif.ozf + +-Offline_gif.ozf : $(ICONDIR)/offline_t.gif ++Offline_gif.ozf : $(ICONDIR)/offline_t.gif $(GIFCONV) + $(MAKEGIF) $(shell $(CYGPATH) "$<") -o Offline_gif.ozf + +-Eyes_gif.ozf : $(ICONDIR)/eyes_t.gif ++Eyes_gif.ozf : $(ICONDIR)/eyes_t.gif $(GIFCONV) + $(MAKEGIF) $(shell $(CYGPATH) "$<") -o Eyes_gif.ozf + +-Powered_by_oz_gif.ozf : $(ICONDIR)/powered-by-oz-100.gif ++Powered_by_oz_gif.ozf : $(ICONDIR)/powered-by-oz-100.gif $(GIFCONV) + $(MAKEGIF) $(shell $(CYGPATH) "$<") -o Powered_by_oz_gif.ozf + + SERVER_FUNCTORS = \ diff -ur mozart-1.3.2.20060615.orig/contrib/os/Makefile.in mozart-1.3.2.20060615/contrib/os/Makefile.in --- mozart-1.3.2.20060615.orig/contrib/os/Makefile.in 2001-09-29 01:45:43.000000000 +1200 -+++ mozart-1.3.2.20060615/contrib/os/Makefile.in 2007-02-13 21:11:44.000000000 +1300 ++++ mozart-1.3.2.20060615/contrib/os/Makefile.in 2007-02-18 09:39:31.000000000 +1300 @@ -52,16 +52,16 @@ $(LIB_DIR) $(NEWCACHEDIR): $(INSTALL_DIR) $@ @@ -225,7 +262,7 @@ diff -ur mozart-1.3.2.20060615.orig/contrib/os/Makefile.in mozart-1.3.2.20060615 %.ozf: %.oz diff -ur mozart-1.3.2.20060615.orig/contrib/reflect/Makefile.in mozart-1.3.2.20060615/contrib/reflect/Makefile.in --- mozart-1.3.2.20060615.orig/contrib/reflect/Makefile.in 2001-08-05 10:24:34.000000000 +1200 -+++ mozart-1.3.2.20060615/contrib/reflect/Makefile.in 2007-02-13 21:12:13.000000000 +1300 ++++ mozart-1.3.2.20060615/contrib/reflect/Makefile.in 2007-02-18 09:39:31.000000000 +1300 @@ -67,10 +67,10 @@ $(LIB_DIR): $(INSTALL_DIR) $@ @@ -241,7 +278,7 @@ diff -ur mozart-1.3.2.20060615.orig/contrib/reflect/Makefile.in mozart-1.3.2.200 #---------------------------------------------------------------------- diff -ur mozart-1.3.2.20060615.orig/contrib/regex/Makefile.in mozart-1.3.2.20060615/contrib/regex/Makefile.in --- mozart-1.3.2.20060615.orig/contrib/regex/Makefile.in 2003-01-08 02:40:10.000000000 +1300 -+++ mozart-1.3.2.20060615/contrib/regex/Makefile.in 2007-02-13 21:13:05.000000000 +1300 ++++ mozart-1.3.2.20060615/contrib/regex/Makefile.in 2007-02-18 09:39:31.000000000 +1300 @@ -38,16 +38,16 @@ $(LIB_DIR): $(INSTALL_DIR) $@ @@ -265,7 +302,7 @@ diff -ur mozart-1.3.2.20060615.orig/contrib/regex/Makefile.in mozart-1.3.2.20060 regex.ozf: regex.oz diff -ur mozart-1.3.2.20060615.orig/contrib/ri/Makefile.in mozart-1.3.2.20060615/contrib/ri/Makefile.in --- mozart-1.3.2.20060615.orig/contrib/ri/Makefile.in 2002-07-07 01:05:36.000000000 +1200 -+++ mozart-1.3.2.20060615/contrib/ri/Makefile.in 2007-02-13 21:13:39.000000000 +1300 ++++ mozart-1.3.2.20060615/contrib/ri/Makefile.in 2007-02-18 09:39:31.000000000 +1300 @@ -81,10 +81,10 @@ $(LIB_DIR): $(INSTALL_DIR) $@ @@ -281,7 +318,7 @@ diff -ur mozart-1.3.2.20060615.orig/contrib/ri/Makefile.in mozart-1.3.2.20060615 diff -ur mozart-1.3.2.20060615.orig/contrib/tk/Makefile.in mozart-1.3.2.20060615/contrib/tk/Makefile.in --- mozart-1.3.2.20060615.orig/contrib/tk/Makefile.in 2001-08-05 10:24:35.000000000 +1200 -+++ mozart-1.3.2.20060615/contrib/tk/Makefile.in 2007-02-13 21:14:06.000000000 +1300 ++++ mozart-1.3.2.20060615/contrib/tk/Makefile.in 2007-02-18 09:39:31.000000000 +1300 @@ -21,9 +21,9 @@ install: $(NEWCACHEDIR) $(addprefix $(NEWCACHEDIR)/,$(FUNCTORS)) $(LIB_DIR) $(NEWCACHEDIR): diff --git a/dev-lang/mozart/files/mozart-1.3.2-portage.patch b/dev-lang/mozart/files/mozart-1.3.2-portage.patch index 6160dac1e2aa..3b8da2968ab6 100644 --- a/dev-lang/mozart/files/mozart-1.3.2-portage.patch +++ b/dev-lang/mozart/files/mozart-1.3.2-portage.patch @@ -1,6 +1,6 @@ diff -ur mozart-1.3.2.20060615.orig/Makefile.in mozart-1.3.2.20060615/Makefile.in --- mozart-1.3.2.20060615.orig/Makefile.in 2004-05-19 10:56:54.000000000 +1200 -+++ mozart-1.3.2.20060615/Makefile.in 2007-02-13 21:01:54.000000000 +1300 ++++ mozart-1.3.2.20060615/Makefile.in 2007-02-18 09:31:31.000000000 +1300 @@ -111,7 +111,7 @@ ./config.status: ./configure ./config.status --recheck @@ -12,7 +12,7 @@ diff -ur mozart-1.3.2.20060615.orig/Makefile.in mozart-1.3.2.20060615/Makefile.i $(INSTALL_FILE) $< $@ diff -ur mozart-1.3.2.20060615.orig/platform/emulator/Makefile.in mozart-1.3.2.20060615/platform/emulator/Makefile.in --- mozart-1.3.2.20060615.orig/platform/emulator/Makefile.in 2004-01-12 23:03:44.000000000 +1300 -+++ mozart-1.3.2.20060615/platform/emulator/Makefile.in 2007-02-12 22:36:26.000000000 +1300 ++++ mozart-1.3.2.20060615/platform/emulator/Makefile.in 2007-02-18 09:31:31.000000000 +1300 @@ -400,7 +400,7 @@ $(NEWCACHEDIR): $(INSTALL_DIR) $@ @@ -24,7 +24,7 @@ diff -ur mozart-1.3.2.20060615.orig/platform/emulator/Makefile.in mozart-1.3.2.2 install-inc: $(INCDIR) diff -ur mozart-1.3.2.20060615.orig/platform/tools/gump/Makefile.in mozart-1.3.2.20060615/platform/tools/gump/Makefile.in --- mozart-1.3.2.20060615.orig/platform/tools/gump/Makefile.in 2003-01-08 02:40:10.000000000 +1300 -+++ mozart-1.3.2.20060615/platform/tools/gump/Makefile.in 2007-02-13 21:16:13.000000000 +1300 ++++ mozart-1.3.2.20060615/platform/tools/gump/Makefile.in 2007-02-18 09:31:31.000000000 +1300 @@ -66,15 +66,15 @@ $(SHAREDIR) $(PLATFORMDIR) $(INCDIR) $(NEWCACHEDIR): $(MKINSTALLDIRS) $@ @@ -47,7 +47,7 @@ diff -ur mozart-1.3.2.20060615.orig/platform/tools/gump/Makefile.in mozart-1.3.2 clean veryclean: diff -ur mozart-1.3.2.20060615.orig/share/bin/Makefile.in mozart-1.3.2.20060615/share/bin/Makefile.in --- mozart-1.3.2.20060615.orig/share/bin/Makefile.in 2001-08-05 10:24:41.000000000 +1200 -+++ mozart-1.3.2.20060615/share/bin/Makefile.in 2007-02-13 21:20:19.000000000 +1300 ++++ mozart-1.3.2.20060615/share/bin/Makefile.in 2007-02-18 09:31:31.000000000 +1300 @@ -55,13 +55,13 @@ install: $(BINDIR) $(LIB_SCRIPTS) $(LIB_LINKS) $(WRAPPERS) @@ -67,7 +67,7 @@ diff -ur mozart-1.3.2.20060615.orig/share/bin/Makefile.in mozart-1.3.2.20060615/ $(BINDIR): diff -ur mozart-1.3.2.20060615.orig/share/demo/Makefile.in mozart-1.3.2.20060615/share/demo/Makefile.in --- mozart-1.3.2.20060615.orig/share/demo/Makefile.in 2001-10-16 23:10:03.000000000 +1300 -+++ mozart-1.3.2.20060615/share/demo/Makefile.in 2007-02-13 21:23:08.000000000 +1300 ++++ mozart-1.3.2.20060615/share/demo/Makefile.in 2007-02-18 09:31:31.000000000 +1300 @@ -86,13 +86,13 @@ $(OZDEMO) $(SYSTEMDOC) $(SYSTEMOZF): $(INSTALL_DIR) $@ @@ -111,7 +111,7 @@ diff -ur mozart-1.3.2.20060615.orig/share/demo/Makefile.in mozart-1.3.2.20060615 diff -ur mozart-1.3.2.20060615.orig/share/elisp/Makefile.in mozart-1.3.2.20060615/share/elisp/Makefile.in --- mozart-1.3.2.20060615.orig/share/elisp/Makefile.in 2002-04-02 00:31:22.000000000 +1200 -+++ mozart-1.3.2.20060615/share/elisp/Makefile.in 2007-02-13 21:23:50.000000000 +1300 ++++ mozart-1.3.2.20060615/share/elisp/Makefile.in 2007-02-18 09:31:31.000000000 +1300 @@ -75,10 +75,10 @@ $(ELISPDIR): $(INSTALL_DIR) $@ @@ -127,7 +127,7 @@ diff -ur mozart-1.3.2.20060615.orig/share/elisp/Makefile.in mozart-1.3.2.2006061 clean: diff -ur mozart-1.3.2.20060615.orig/share/examples/Makefile.in mozart-1.3.2.20060615/share/examples/Makefile.in --- mozart-1.3.2.20060615.orig/share/examples/Makefile.in 2003-04-23 21:49:55.000000000 +1200 -+++ mozart-1.3.2.20060615/share/examples/Makefile.in 2007-02-13 21:26:07.000000000 +1300 ++++ mozart-1.3.2.20060615/share/examples/Makefile.in 2007-02-18 09:31:31.000000000 +1300 @@ -96,19 +96,19 @@ constraints/scheduling-compiler constraints oz SAMPLER = $(SAMPLER0:%=$(OZEX)/sampler/%.oz) @@ -157,7 +157,7 @@ diff -ur mozart-1.3.2.20060615.orig/share/examples/Makefile.in mozart-1.3.2.2006 diff -ur mozart-1.3.2.20060615.orig/share/lib/Makefile.in mozart-1.3.2.20060615/share/lib/Makefile.in --- mozart-1.3.2.20060615.orig/share/lib/Makefile.in 2003-12-05 10:55:34.000000000 +1300 -+++ mozart-1.3.2.20060615/share/lib/Makefile.in 2007-02-13 22:43:50.000000000 +1300 ++++ mozart-1.3.2.20060615/share/lib/Makefile.in 2007-02-18 09:32:05.000000000 +1300 @@ -11,7 +11,7 @@ PREFIX = @prefix@ OZPREFIX = @prefix@ @@ -218,9 +218,23 @@ diff -ur mozart-1.3.2.20060615.orig/share/lib/Makefile.in mozart-1.3.2.20060615/ $(INSTALL_FILE) $< $@ #--------------------------------------------------------------------- +@@ -426,10 +426,10 @@ + .PHONY: bootstrap check + + # use the boot compiler to create the functors +-bootstrap: +- $(MAKE) boot-unzip boot-init boot-ozc boot-all ++bootstrap: boot-unzip ++ $(MAKE) boot-init boot-ozc boot-all + +-boot-all: ++boot-all: boot-init boot-ozc + $(MAKE) all \ + OZC=$(SRCDIR)/boot-ozc.sh \ + OZENGINE=$(SRCDIR)/oze.sh \ diff -ur mozart-1.3.2.20060615.orig/share/tools/Makefile.in mozart-1.3.2.20060615/share/tools/Makefile.in --- mozart-1.3.2.20060615.orig/share/tools/Makefile.in 2002-01-30 01:39:23.000000000 +1300 -+++ mozart-1.3.2.20060615/share/tools/Makefile.in 2007-02-14 20:17:49.000000000 +1300 ++++ mozart-1.3.2.20060615/share/tools/Makefile.in 2007-02-18 09:31:31.000000000 +1300 @@ -7,7 +7,7 @@ PREFIX = @prefix@ PLATFORM = @PLATFORM@ diff --git a/dev-lang/mozart/mozart-1.3.2.ebuild b/dev-lang/mozart/mozart-1.3.2.ebuild index d4f2b217276f..49fd357da275 100644 --- a/dev-lang/mozart/mozart-1.3.2.ebuild +++ b/dev-lang/mozart/mozart-1.3.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/mozart-1.3.2.ebuild,v 1.4 2007/02/17 04:39:56 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/mozart-1.3.2.ebuild,v 1.5 2007/02/17 20:48:41 keri Exp $ inherit eutils @@ -80,7 +80,7 @@ src_compile() { $(use_enable threads threaded) \ || die "econf failed" - emake -j1 bootstrap || die "emake bootstrap failed" + emake bootstrap || die "emake bootstrap failed" } src_install() { -- 2.26.2