Run mmake depend in stage 2 bootstrap.

Package-Manager: portage-2.1.1

6 files changed, 42 insertions, 47 deletions

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 049262f39c4e..1aacdf2abad0 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/mercury
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.42 2006/09/16 10:20:51 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.43 2006/09/16 20:12:06 keri Exp $
+
+  16 Sep 2006; keri <keri@gentoo.org> files/mercury-0.12.2-MAKEOPTS.patch,
+  files/mercury-0.12.2-libgrades.patch, files/mercury-0.13.0-MAKEOPTS.patch,
+  files/mercury-0.13.0-libgrades.patch:
+  Run mmake depend in stage 2 bootstrap.
 
   16 Sep 2006; keri <keri@gentoo.org> files/mercury-0.12.2-libgrades.patch,
   files/mercury-0.13.0-libgrades.patch:
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index ec591dbbd43f..94d54370027a 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -6,10 +6,10 @@ AUX mercury-0.12.2-LIBDIR.patch 2436 RMD160 05a57fe17f770a1dbfb862aea6669db1f7a2
 MD5 cace61ef145e50a3d4ddeb284cc0bcd3 files/mercury-0.12.2-LIBDIR.patch 2436
 RMD160 05a57fe17f770a1dbfb862aea6669db1f7a2463f files/mercury-0.12.2-LIBDIR.patch 2436
 SHA256 e470e2a3a693a6d0294f6940a64fda3aa423322bf7620745474a76aeb1c83793 files/mercury-0.12.2-LIBDIR.patch 2436
-AUX mercury-0.12.2-MAKEOPTS.patch 416 RMD160 f06fdbd4dacf3ed249ccfbdf265742c837c4ce9c SHA1 8146679ec1b8d3eebd8e5f866ce513131e74a7d1 SHA256 d6c8881bc15415dff01db6c49955d3eb1504c1ab337c099408c6a8c028ead836
-MD5 5a6cf00aaa2ae8de96dab30872eabf19 files/mercury-0.12.2-MAKEOPTS.patch 416
-RMD160 f06fdbd4dacf3ed249ccfbdf265742c837c4ce9c files/mercury-0.12.2-MAKEOPTS.patch 416
-SHA256 d6c8881bc15415dff01db6c49955d3eb1504c1ab337c099408c6a8c028ead836 files/mercury-0.12.2-MAKEOPTS.patch 416
+AUX mercury-0.12.2-MAKEOPTS.patch 602 RMD160 866e63a6e48b4844f8dbe19d167030f6e22400e4 SHA1 56bcae5786f165e2367fad61e3d4247f5e089f38 SHA256 42850d29291fd6d77074706e21eaebce1de74a050c73f7e7eb1785e1c46e7398
+MD5 4930c851f3d1719419e107f92aa99873 files/mercury-0.12.2-MAKEOPTS.patch 602
+RMD160 866e63a6e48b4844f8dbe19d167030f6e22400e4 files/mercury-0.12.2-MAKEOPTS.patch 602
+SHA256 42850d29291fd6d77074706e21eaebce1de74a050c73f7e7eb1785e1c46e7398 files/mercury-0.12.2-MAKEOPTS.patch 602
 AUX mercury-0.12.2-bootstrap.patch 2276 RMD160 60275fe011c88e4dd98d91094b3f7f1407a34a65 SHA1 0743019a5ed83b43743bbe04dbfbdde881941ffb SHA256 2caccbf233da0eaec5eaf0c7a797f3d8b04169b956bfc40dc4248b3142bd2f67
 MD5 d6fa0d146d1fda99b9d5e35590c6f92b files/mercury-0.12.2-bootstrap.patch 2276
 RMD160 60275fe011c88e4dd98d91094b3f7f1407a34a65 files/mercury-0.12.2-bootstrap.patch 2276
@@ -18,10 +18,10 @@ AUX mercury-0.12.2-docs.patch 796 RMD160 27543c5201dfcc3112878026c06f193e126288b
 MD5 5e8e5942a015e9832289c90913fa2bca files/mercury-0.12.2-docs.patch 796
 RMD160 27543c5201dfcc3112878026c06f193e126288be files/mercury-0.12.2-docs.patch 796
 SHA256 78be9f8ef2960ce9ea99b33734d9143a998d87056efa84bafb618cab74fcd514 files/mercury-0.12.2-docs.patch 796
-AUX mercury-0.12.2-libgrades.patch 13584 RMD160 b846ed8b3b7476d13ec14d40d38413785179ba51 SHA1 562d2719743778c4aa6753ba13162290b11094c0 SHA256 a2f5eb9f4ad0f89326221bdc46d3957fc52c8c4496e1b3dea5934b7f30baaa7c
-MD5 72715a273ef4fd0f3e962051a79b0d7d files/mercury-0.12.2-libgrades.patch 13584
-RMD160 b846ed8b3b7476d13ec14d40d38413785179ba51 files/mercury-0.12.2-libgrades.patch 13584
-SHA256 a2f5eb9f4ad0f89326221bdc46d3957fc52c8c4496e1b3dea5934b7f30baaa7c files/mercury-0.12.2-libgrades.patch 13584
+AUX mercury-0.12.2-libgrades.patch 13195 RMD160 f31ba8ff5366b6b2bd0ff7bc26d3ae5ba5e54cae SHA1 cff5a32e41d8d82aa43b0c3bdd840bd588acea8c SHA256 ae6610ef3f61616601f03a8d6703595c2aaee7ca06fcbfaf15dbeb10cb358f6a
+MD5 64362ae02fa273afc3abba66681420c8 files/mercury-0.12.2-libgrades.patch 13195
+RMD160 f31ba8ff5366b6b2bd0ff7bc26d3ae5ba5e54cae files/mercury-0.12.2-libgrades.patch 13195
+SHA256 ae6610ef3f61616601f03a8d6703595c2aaee7ca06fcbfaf15dbeb10cb358f6a files/mercury-0.12.2-libgrades.patch 13195
 AUX mercury-0.12.2-portage-r1.patch 4311 RMD160 e7b08a1914620410ebe216fd7677cd0e3a36a462 SHA1 5cd9b30bfffbef94e1f0b182ad262bdf8c9b5ccd SHA256 0c3e24245829c21b1661c927cb155dba262f8d671ade173de796968c249e1e80
 MD5 4d8eab7ca5541308733940a58a5d6ecf files/mercury-0.12.2-portage-r1.patch 4311
 RMD160 e7b08a1914620410ebe216fd7677cd0e3a36a462 files/mercury-0.12.2-portage-r1.patch 4311
@@ -50,10 +50,10 @@ AUX mercury-0.13.0-LIBDIR.patch 2436 RMD160 f195f31663239ef050890f2405ced4e92038
 MD5 520754764f22b8c6e2d79d5688663047 files/mercury-0.13.0-LIBDIR.patch 2436
 RMD160 f195f31663239ef050890f2405ced4e920384f67 files/mercury-0.13.0-LIBDIR.patch 2436
 SHA256 fcd7d5065ca6fbf2ce8e566c44c48c13941c6c0c3f196d6d9d92f21ff06e53d4 files/mercury-0.13.0-LIBDIR.patch 2436
-AUX mercury-0.13.0-MAKEOPTS.patch 416 RMD160 7174fdab5ef7693d410f91a6ec61e83eb1ce1fa5 SHA1 c2c4fe6c7cfc5966917013d3826344973a2396e9 SHA256 d3a5ff781690ebdc803551c9a111c1c9afd6284db37972e413198abd3678fbba
-MD5 d4c4edd8bfddc0a098db9412a5b0b640 files/mercury-0.13.0-MAKEOPTS.patch 416
-RMD160 7174fdab5ef7693d410f91a6ec61e83eb1ce1fa5 files/mercury-0.13.0-MAKEOPTS.patch 416
-SHA256 d3a5ff781690ebdc803551c9a111c1c9afd6284db37972e413198abd3678fbba files/mercury-0.13.0-MAKEOPTS.patch 416
+AUX mercury-0.13.0-MAKEOPTS.patch 602 RMD160 c643bc8e7bd7d0702daa28399ecd0832eba67052 SHA1 233cef75ae8fb4929c817a567b62069cd6afa539 SHA256 b574a179667a77f66e125a8532c3241f144fd76c15c9a6d2d337be715451db08
+MD5 258fdfa846053588ee0ee46b498bf231 files/mercury-0.13.0-MAKEOPTS.patch 602
+RMD160 c643bc8e7bd7d0702daa28399ecd0832eba67052 files/mercury-0.13.0-MAKEOPTS.patch 602
+SHA256 b574a179667a77f66e125a8532c3241f144fd76c15c9a6d2d337be715451db08 files/mercury-0.13.0-MAKEOPTS.patch 602
 AUX mercury-0.13.0-bootstrap.patch 2277 RMD160 2983cbd69ef84a8a6a12e88755971b8c5616fe09 SHA1 e6562b9dc32ec661be48c9b78d48133568a3a864 SHA256 464ec654c11f95f80bd5afda0a3272240ff65b75aaebc220e108a701c6aba5e4
 MD5 304a52a90c4dada7ab8956edfeca06db files/mercury-0.13.0-bootstrap.patch 2277
 RMD160 2983cbd69ef84a8a6a12e88755971b8c5616fe09 files/mercury-0.13.0-bootstrap.patch 2277
@@ -62,10 +62,10 @@ AUX mercury-0.13.0-docs.patch 796 RMD160 f65bd4098e1a3c501f6adaf0da93377f6a8361f
 MD5 07927ea891d5688ff041bc2c2bc82d2e files/mercury-0.13.0-docs.patch 796
 RMD160 f65bd4098e1a3c501f6adaf0da93377f6a8361f4 files/mercury-0.13.0-docs.patch 796
 SHA256 5ec2c671e14a07f087ae2c997b2ca5a7c2b176ee46685d86f8e995535f76625c files/mercury-0.13.0-docs.patch 796
-AUX mercury-0.13.0-libgrades.patch 9773 RMD160 8b1d92ab865aadd5de7ca08ba9c01c04a275c13d SHA1 bc84d955a7cd85821a2eb17415e66d0b07440d55 SHA256 98cf8bbdb6c98043a04a765cf14c361883459010b5408ccabc9c2275f56a6f70
-MD5 17152407609afdc427a2319c99c604c1 files/mercury-0.13.0-libgrades.patch 9773
-RMD160 8b1d92ab865aadd5de7ca08ba9c01c04a275c13d files/mercury-0.13.0-libgrades.patch 9773
-SHA256 98cf8bbdb6c98043a04a765cf14c361883459010b5408ccabc9c2275f56a6f70 files/mercury-0.13.0-libgrades.patch 9773
+AUX mercury-0.13.0-libgrades.patch 9414 RMD160 aab042c7eb177d4d4c923db79bbff4fb520a2d3a SHA1 fc52cb8de79d7eb32efd1c0c119374d2e617cc7f SHA256 89d40980a5ca8373e210472bd06b3bbfefc926b3cb4b5643e32a7125f7daea66
+MD5 ddf843b0624b07d2c618f3b7c428c8f4 files/mercury-0.13.0-libgrades.patch 9414
+RMD160 aab042c7eb177d4d4c923db79bbff4fb520a2d3a files/mercury-0.13.0-libgrades.patch 9414
+SHA256 89d40980a5ca8373e210472bd06b3bbfefc926b3cb4b5643e32a7125f7daea66 files/mercury-0.13.0-libgrades.patch 9414
 AUX mercury-0.13.0-portage.patch 2891 RMD160 3a52b5c9d5940eee39be0a0254969aac39675d41 SHA1 7ea86360ddfdd869640980fcfae78f933becc02e SHA256 5c33ae312869cf0fb8f0bc7c846bcf2abff5f5a1c574bc0b42cd050578daca0c
 MD5 c50f24a88e741f61d40a29cfa974607f files/mercury-0.13.0-portage.patch 2891
 RMD160 3a52b5c9d5940eee39be0a0254969aac39675d41 files/mercury-0.13.0-portage.patch 2891
@@ -136,10 +136,10 @@ EBUILD mercury-0.13.0_beta20060907.ebuild 3048 RMD160 5a8c72dcd30837ad978bb1d125
 MD5 76e04ddc308370c24262486d9f62c71e mercury-0.13.0_beta20060907.ebuild 3048
 RMD160 5a8c72dcd30837ad978bb1d1257be7bcd90f9a88 mercury-0.13.0_beta20060907.ebuild 3048
 SHA256 86208f1dc63b95bb8959ca1ead8a07c92360e7bf6a4e4202f781e351b01c8273 mercury-0.13.0_beta20060907.ebuild 3048
-MISC ChangeLog 8097 RMD160 da8cdfe83b1d6f3b5a27da80bb28ea3804b144c7 SHA1 87782bd75bc17241f04a75003f9c0b617cac9c9d SHA256 bf16c33f71010b7c76c707f779960da326d9cb9d02696b7511f25e5a053c7c1f
-MD5 efbd49541462fb5b9eac875defe83fae ChangeLog 8097
-RMD160 da8cdfe83b1d6f3b5a27da80bb28ea3804b144c7 ChangeLog 8097
-SHA256 bf16c33f71010b7c76c707f779960da326d9cb9d02696b7511f25e5a053c7c1f ChangeLog 8097
+MISC ChangeLog 8331 RMD160 bcea59383c8478ff60f85b5a6c4dc5d8214216f8 SHA1 269db62fcb824783ee4ef5f0c587be3af9520cf6 SHA256 cdb432452159e4077148dd43efd045794ecdb3e5c93078f8a7cc208f93d0e534
+MD5 4eed54301903e2866d1714fecb26c399 ChangeLog 8331
+RMD160 bcea59383c8478ff60f85b5a6c4dc5d8214216f8 ChangeLog 8331
+SHA256 cdb432452159e4077148dd43efd045794ecdb3e5c93078f8a7cc208f93d0e534 ChangeLog 8331
 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/mercury/files/mercury-0.12.2-MAKEOPTS.patch b/dev-lang/mercury/files/mercury-0.12.2-MAKEOPTS.patch
index c6905e8dc166..3ae10194664b 100644
--- a/dev-lang/mercury/files/mercury-0.12.2-MAKEOPTS.patch
+++ b/dev-lang/mercury/files/mercury-0.12.2-MAKEOPTS.patch
@@ -9,3 +9,11 @@
  SHELL=		/bin/sh
  MMAKE=		MMAKE_DIR=`pwd`/scripts scripts/mmake 
  MMAKE_SUBDIR=	MMAKE_DIR=`pwd`/../scripts ../scripts/mmake $(PARALLEL)
+@@ -69,6 +69,6 @@
+ 	$(MMAKE) uninstall
+ 
+ .DEFAULT:
+-	$(MMAKE) $@
++	$(MMAKE) MMAKEFLAGS=$(PARALLEL) $@
+ 
+ #-----------------------------------------------------------------------------#
diff --git a/dev-lang/mercury/files/mercury-0.12.2-libgrades.patch b/dev-lang/mercury/files/mercury-0.12.2-libgrades.patch
index 39fca8329e9d..e9cc8caa3ace 100644
--- a/dev-lang/mercury/files/mercury-0.12.2-libgrades.patch
+++ b/dev-lang/mercury/files/mercury-0.12.2-libgrades.patch
@@ -1,16 +1,3 @@
---- mercury-compiler-0.12.2.orig/Makefile	2006-09-16 21:58:43.000000000 +1200
-+++ mercury-compiler-0.12.2/Makefile	2006-09-16 21:59:37.000000000 +1200
-@@ -28,6 +28,10 @@
- all:
- 	$(MMAKE) MMAKEFLAGS=$(PARALLEL) all 2>&1 || exit 1
- 
-+.PHONY: libgrades
-+libgrades:
-+	$(MMAKE) MMAKEFLAGS=$(PARALLEL) libgrades 2>&1 || exit 1
-+
- .PHONY: libmmc
- libmmc:
- 	$(MMAKE) MMAKEFLAGS=$(PARALLEL) libmmc
 --- mercury-compiler-0.12.2.orig/Mmakefile	2005-01-28 20:11:29.000000000 +1300
 +++ mercury-compiler-0.12.2/Mmakefile	2006-08-12 09:45:55.000000000 +1200
 @@ -233,6 +233,54 @@
diff --git a/dev-lang/mercury/files/mercury-0.13.0-MAKEOPTS.patch b/dev-lang/mercury/files/mercury-0.13.0-MAKEOPTS.patch
index ac3c8b79d949..30892a68c74a 100644
--- a/dev-lang/mercury/files/mercury-0.13.0-MAKEOPTS.patch
+++ b/dev-lang/mercury/files/mercury-0.13.0-MAKEOPTS.patch
@@ -9,3 +9,11 @@
  SHELL=		/bin/sh
  MMAKE=		MMAKE_DIR=`pwd`/scripts scripts/mmake 
  MMAKE_SUBDIR=	MMAKE_DIR=`pwd`/../scripts ../scripts/mmake $(PARALLEL)
+@@ -69,6 +69,6 @@
+ 	$(MMAKE) uninstall
+ 
+ .DEFAULT:
+-	$(MMAKE) $@
++	$(MMAKE) MMAKEFLAGS=$(PARALLEL) $@
+ 
+ #-----------------------------------------------------------------------------#
diff --git a/dev-lang/mercury/files/mercury-0.13.0-libgrades.patch b/dev-lang/mercury/files/mercury-0.13.0-libgrades.patch
index 50a2a4266c92..fe027c4d083d 100644
--- a/dev-lang/mercury/files/mercury-0.13.0-libgrades.patch
+++ b/dev-lang/mercury/files/mercury-0.13.0-libgrades.patch
@@ -1,16 +1,3 @@
---- mercury-compiler-0.13.0.orig/Makefile	2005-08-22 15:38:34.000000000 +1200
-+++ mercury-compiler-0.13.0/Makefile	2006-09-16 22:10:24.000000000 +1200
-@@ -28,6 +28,10 @@
- all:
- 	$(MMAKE) MMAKEFLAGS=$(PARALLEL) all
- 
-+.PHONY: libgrades
-+libgrades:
-+	$(MMAKE) MMAKEFLAGS=$(PARALLEL) libgrades
-+
- .PHONY: libmmc
- libmmc:
- 	$(MMAKE) MMAKEFLAGS=$(PARALLEL) libmmc
 --- mercury-compiler-0.13.0.orig/Mmakefile	2005-08-12 03:56:57.000000000 +1200
 +++ mercury-compiler-0.13.0/Mmakefile	2006-09-16 11:58:30.000000000 +1200
 @@ -281,6 +281,54 @@