Do not parallelize generation of .dev and .dv files.

Package-Manager: portage-2.1.2_rc4-r2

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index fc53c7e38fb8e460e7592c8560bd9b91783fcec8..8ce9ed3e26062877f9b3804fc551c85847e2e168 100644 (file)
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/mercury
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.76 2007/01/13 03:39:52 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.77 2007/01/13 09:02:46 keri Exp $
+
+  13 Jan 2007; keri <keri@gentoo.org> files/mercury-0.13.1-multilib.patch,
+  mercury-0.12.2-r3.ebuild, mercury-0.12.2-r4.ebuild, mercury-0.13.1.ebuild,
+  mercury-0.13.1-r1.ebuild:
+  Do not parallelize generation of .dev and .dv files.
 
   13 Jan 2007; keri <keri@gentoo.org> -files/mercury-0.13.0-CFLAGS.patch,
   -files/mercury-0.13.0-LIBDIR.patch, -files/mercury-0.13.0-MAKEOPTS.patch,

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 7e8ae49e93a609ca92a378eb656aa0f57f1c5b8a..60ab14aedf0fbccd8c7755f5c2d2710ed0ff1004 100644 (file)
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -98,10 +98,10 @@ AUX mercury-0.13.1-libgrades.patch 13854 RMD160 0f4dd4b97390962524944e3e57ce8d5b
 MD5 6422dc7c8f69ffe64823b94a5cd0ef35 files/mercury-0.13.1-libgrades.patch 13854
 RMD160 0f4dd4b97390962524944e3e57ce8d5b405967ed files/mercury-0.13.1-libgrades.patch 13854
 SHA256 207d9af7c741845c1b0fcc098413952f8b002f4f71803fb38e474c63118d578f files/mercury-0.13.1-libgrades.patch 13854
-AUX mercury-0.13.1-multilib.patch 2752 RMD160 a466b396ef3fa2d7d381547e4896e2a3e3d45b37 SHA1 8212e6a473b3364dee816d186bc5ad5c390d7f80 SHA256 56a732bacd1949af1cf46041df6258183e00cd3d06ea638e10bfc08b2187bccc
-MD5 7e728102a664e0246d24058916145c05 files/mercury-0.13.1-multilib.patch 2752
-RMD160 a466b396ef3fa2d7d381547e4896e2a3e3d45b37 files/mercury-0.13.1-multilib.patch 2752
-SHA256 56a732bacd1949af1cf46041df6258183e00cd3d06ea638e10bfc08b2187bccc files/mercury-0.13.1-multilib.patch 2752
+AUX mercury-0.13.1-multilib.patch 3170 RMD160 fad84c0177d9611c869ad85657fc1fdeafc52942 SHA1 9f14ca95c454f426773aaa06b71a7b2e7e3f421b SHA256 58ebef426a8f7cf0015dfb92d6448e96b8db46070844e9d1e191c153cf79e647
+MD5 3ad72d1dde9716d7c9d6e76b10aa7b9d files/mercury-0.13.1-multilib.patch 3170
+RMD160 fad84c0177d9611c869ad85657fc1fdeafc52942 files/mercury-0.13.1-multilib.patch 3170
+SHA256 58ebef426a8f7cf0015dfb92d6448e96b8db46070844e9d1e191c153cf79e647 files/mercury-0.13.1-multilib.patch 3170
 AUX mercury-0.13.1-parallel-install_grades.patch 633 RMD160 5492e49f5ab7c8f16f52148a2678cc56c9398071 SHA1 fc90c6aebb4501178836d67ccc67a5b997f5314a SHA256 5630e0d82d4d76603817852601a6c0aeffe1f56e73b57f3c562ba29e5e5eeb1f
 MD5 d56589afef9155f41bb3a432d8c55c9e files/mercury-0.13.1-parallel-install_grades.patch 633
 RMD160 5492e49f5ab7c8f16f52148a2678cc56c9398071 files/mercury-0.13.1-parallel-install_grades.patch 633
@@ -146,26 +146,26 @@ DIST mercury-compiler-0.12.2.tar.gz 15074997 RMD160 227a3e1796d96ad77324d9f1d39e
 DIST mercury-compiler-0.13.1.tar.gz 15938824 RMD160 a0a80cd2ac7393cf084b79d40230bd1efe795c5f SHA1 919eb45ba34c503fc2e7391225e52a5cfbb80616 SHA256 b1f4984e00ad917824d3340dcf2a41bede39fe02ef2e516351467f4761985196
 DIST mercury-tests-0.12.2.tar.gz 897454 RMD160 e7cf515b0d56aff5432c5ec3e535faa907ce2955 SHA1 1f80ff38f141b975fe472c2aee48d44b8e187c08 SHA256 6d3fd92d11ce2a9ce99cfa35990027557d1c70f00a3417639523b6e27f746280
 DIST mercury-tests-0.13.1.tar.gz 986644 RMD160 779609ba5c985e562b0962434c9281c07ddaa5cb SHA1 7f08467e6642daa4fce9136e12b4e5ca2ac41b9d SHA256 f6c8250b9996584d3c7cd6cc0609716027b127e54b2aedf5ebfcab98a44159dc
-EBUILD mercury-0.12.2-r3.ebuild 3480 RMD160 76aa125496eea3c83dd164a46f251981c4abcd3d SHA1 69ad4061c397804cd87733c19d2b8287dee54508 SHA256 ab2021cbf4a9c321844c043e1209b12f78860633154ae1e30352d12a34d950c2
-MD5 a23fff3e33f967e55271be97e02cc9e8 mercury-0.12.2-r3.ebuild 3480
-RMD160 76aa125496eea3c83dd164a46f251981c4abcd3d mercury-0.12.2-r3.ebuild 3480
-SHA256 ab2021cbf4a9c321844c043e1209b12f78860633154ae1e30352d12a34d950c2 mercury-0.12.2-r3.ebuild 3480
-EBUILD mercury-0.12.2-r4.ebuild 3812 RMD160 e324a875a6af507727359ed6ab10b7a75f427b72 SHA1 a1b828dcaae57d7c55d96f4fadceabaebe789590 SHA256 1894ee8da875f74594f8c2ad6f1c970b4ee3593499c67555d00a40b6e9af7ce7
-MD5 aabaad45ab2a0e5a17de09ecf8cc5465 mercury-0.12.2-r4.ebuild 3812
-RMD160 e324a875a6af507727359ed6ab10b7a75f427b72 mercury-0.12.2-r4.ebuild 3812
-SHA256 1894ee8da875f74594f8c2ad6f1c970b4ee3593499c67555d00a40b6e9af7ce7 mercury-0.12.2-r4.ebuild 3812
-EBUILD mercury-0.13.1-r1.ebuild 3956 RMD160 947cc36d0888d23e3861794324d6142a485de89e SHA1 a3896bbbaeb92fd448f0c4a62864662b65d81d0b SHA256 c06850243311267c14787cc69c3aae358388306a0d7abcbc9e9aa0444ff280f5
-MD5 a81531e708d8ef0335a7797476605bd1 mercury-0.13.1-r1.ebuild 3956
-RMD160 947cc36d0888d23e3861794324d6142a485de89e mercury-0.13.1-r1.ebuild 3956
-SHA256 c06850243311267c14787cc69c3aae358388306a0d7abcbc9e9aa0444ff280f5 mercury-0.13.1-r1.ebuild 3956
-EBUILD mercury-0.13.1.ebuild 3346 RMD160 dd731ac257203aca48294fa67b9bdee4c636e6ab SHA1 d8a9456db6ba4bfa5ece3334ffcda96c2dc4e5c5 SHA256 a27a34005f45e378df82bbad8409c9c8c30d253362982f9ebdcd5db883f66a7f
-MD5 f34187bbf12011057168c2a7583fff5c mercury-0.13.1.ebuild 3346
-RMD160 dd731ac257203aca48294fa67b9bdee4c636e6ab mercury-0.13.1.ebuild 3346
-SHA256 a27a34005f45e378df82bbad8409c9c8c30d253362982f9ebdcd5db883f66a7f mercury-0.13.1.ebuild 3346
-MISC ChangeLog 1019 RMD160 dc363d5a5c07e9a7a10327b98c4faae6c37352c0 SHA1 89840383d2f6e71d5c95cf9369a67a2fa570775f SHA256 5e00f6ca438fb61712026350c9ae754b40541ff4afb1025c224c9188cab5524a
-MD5 09e2a78b600a97fa0c8d8c53979e62e1 ChangeLog 1019
-RMD160 dc363d5a5c07e9a7a10327b98c4faae6c37352c0 ChangeLog 1019
-SHA256 5e00f6ca438fb61712026350c9ae754b40541ff4afb1025c224c9188cab5524a ChangeLog 1019
+EBUILD mercury-0.12.2-r3.ebuild 3484 RMD160 0d2bbe27478b1525698eecd0e828bff65b6c570a SHA1 6a99470833683ca7cb0c3db06b4fd413ca5d8294 SHA256 99f04c80162a149fada57414bd00647cadd1360d5ca9d70f0ce38732c1651b27
+MD5 8682b78b3e80b06b839c3393b86014b4 mercury-0.12.2-r3.ebuild 3484
+RMD160 0d2bbe27478b1525698eecd0e828bff65b6c570a mercury-0.12.2-r3.ebuild 3484
+SHA256 99f04c80162a149fada57414bd00647cadd1360d5ca9d70f0ce38732c1651b27 mercury-0.12.2-r3.ebuild 3484
+EBUILD mercury-0.12.2-r4.ebuild 3816 RMD160 e8831718d1fdcaab9df417f5e111e480d6163d63 SHA1 3797fe55b66c33aaebf6dbb28e2d730b63c6b0cb SHA256 64d5437c4a8e5cf586694c7fd4fa67151750d0d39ec3264a23ed7eafaf5a0902
+MD5 d09cf38b79f44737e84848ef725382a7 mercury-0.12.2-r4.ebuild 3816
+RMD160 e8831718d1fdcaab9df417f5e111e480d6163d63 mercury-0.12.2-r4.ebuild 3816
+SHA256 64d5437c4a8e5cf586694c7fd4fa67151750d0d39ec3264a23ed7eafaf5a0902 mercury-0.12.2-r4.ebuild 3816
+EBUILD mercury-0.13.1-r1.ebuild 3960 RMD160 3b49134939436214039fd1fb92efd3a17fdf27e0 SHA1 ac15f575c31cf7d3ee5f208b4be708733e908b2a SHA256 3a1b02b16e5d5594a51f6e9f72b9dba14025ed41aed45d1d4d71a03adbb89e20
+MD5 3368fe987fed2bd62704f6bb1363598a mercury-0.13.1-r1.ebuild 3960
+RMD160 3b49134939436214039fd1fb92efd3a17fdf27e0 mercury-0.13.1-r1.ebuild 3960
+SHA256 3a1b02b16e5d5594a51f6e9f72b9dba14025ed41aed45d1d4d71a03adbb89e20 mercury-0.13.1-r1.ebuild 3960
+EBUILD mercury-0.13.1.ebuild 3350 RMD160 c4729d5ef885ba006eae23498baacd444bddf497 SHA1 38c9ec3667cfe856fd2faf849953701fe1f74bdc SHA256 4f9a2d4d6fbf1116e4df53e665fe298aa67c1aff1737de18ed475a04a65b9ba3
+MD5 a32278fd69721ec0357cac8e895495a7 mercury-0.13.1.ebuild 3350
+RMD160 c4729d5ef885ba006eae23498baacd444bddf497 mercury-0.13.1.ebuild 3350
+SHA256 4f9a2d4d6fbf1116e4df53e665fe298aa67c1aff1737de18ed475a04a65b9ba3 mercury-0.13.1.ebuild 3350
+MISC ChangeLog 1255 RMD160 89d8c8a34b1fd7a67f7dd25b17bd645cdce6c6d7 SHA1 96d205d6c9e8baec4d2c5ff43368fb367bed724e SHA256 c44e1ee89ac606b79b4b4ac7ef7a2eb5b3b570bdba6f5e89d465aba0ecdd3832
+MD5 0557096e61c1b8af39958ca747fcb9d8 ChangeLog 1255
+RMD160 89d8c8a34b1fd7a67f7dd25b17bd645cdce6c6d7 ChangeLog 1255
+SHA256 c44e1ee89ac606b79b4b4ac7ef7a2eb5b3b570bdba6f5e89d465aba0ecdd3832 ChangeLog 1255
 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.13.1-multilib.patch b/dev-lang/mercury/files/mercury-0.13.1-multilib.patch
index 195220801c9a98090e84ccd94b84b8eca72acdb2..cb25ceb87365d0515d1ee068eab8233d714022e7 100644 (file)
--- a/dev-lang/mercury/files/mercury-0.13.1-multilib.patch
+++ b/dev-lang/mercury/files/mercury-0.13.1-multilib.patch
@@ -45,7 +45,7 @@
 -INSTALL_ELISP_DIR     = $(INSTALL_PREFIX)/lib/mercury/elisp
 +INSTALL_PREFIX                =
 +FINAL_INSTALL_PREFIX  =
-+INSTALL_BINDIR                = $(INSTALL_PREFIX)/@prefix/bin
++INSTALL_BINDIR                = $(INSTALL_PREFIX)/@prefix@/bin
 +INSTALL_LIBDIR                = $(INSTALL_PREFIX)/@libdir@/mercury-@PACKAGE_VERSION@
 +FINAL_INSTALL_LIBDIR  = $(FINAL_INSTALL_PREFIX)/@libdir@/mercury-@PACKAGE_VERSION@
 +INSTALL_JAVA_LIBRARY_DIR= $(INSTALL_LIBDIR)/lib/java
@@ -61,3 +61,12 @@
  INSTALL_CGI_DIR               = @CGIDIR@
  
  # You should not need to override anything below here
+@@ -741,7 +741,7 @@
+ INSTALL_INC_DIR               = $(INSTALL_LIBDIR)/inc
+ INSTALL_MMAKE_DIR     = $(INSTALL_LIBDIR)/mmake
+ FULLARCH              = @FULLARCH@
+-INSTALL_MERC_BIN_DIR  = $(INSTALL_PREFIX)/bin
++INSTALL_MERC_BIN_DIR  = $(INSTALL_PREFIX)/@prefix@/bin
+ INSTALL_MERC_GRADELESS_LIB_DIR = $(INSTALL_LIBDIR)/lib
+ FINAL_INSTALL_MERC_GRADELESS_LIB_DIR = $(FINAL_INSTALL_LIBDIR)/lib
+ INSTALL_MERC_LIB_DIR  = $(INSTALL_LIBDIR)/lib/$(GRADESTRING)

diff --git a/dev-lang/mercury/mercury-0.12.2-r3.ebuild b/dev-lang/mercury/mercury-0.12.2-r3.ebuild
index de5ca615b6c06df3ab7e109af63aa0330e58d4b3..514d8384721c4fc48aa97bd0717f1eeccd5e5d09 100644 (file)
--- a/dev-lang/mercury/mercury-0.12.2-r3.ebuild
+++ b/dev-lang/mercury/mercury-0.12.2-r3.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/mercury/mercury-0.12.2-r3.ebuild,v 1.14 2007/01/13 03:27:40 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.12.2-r3.ebuild,v 1.15 2007/01/13 09:02:46 keri Exp $
 
 inherit eutils
 
@@ -73,7 +73,7 @@ src_compile() {
                || die "econf stage 2 failed"
        emake \
                MERCURY_COMPILER="${S}"/mercury_compile \
-               depend || die "emake stage 2 depend failed"
+               -j1 depend || die "emake stage 2 depend failed"
        emake \
                MERCURY_COMPILER="${S}"/mercury_compile \
                EXTRA_MLFLAGS=--no-strip \

diff --git a/dev-lang/mercury/mercury-0.12.2-r4.ebuild b/dev-lang/mercury/mercury-0.12.2-r4.ebuild
index dc6ac3077f96258ec6bdd775e037e84859f810df..b031f60a8a3ab138be91650b977ca3d9cb83742c 100644 (file)
--- a/dev-lang/mercury/mercury-0.12.2-r4.ebuild
+++ b/dev-lang/mercury/mercury-0.12.2-r4.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/mercury/mercury-0.12.2-r4.ebuild,v 1.5 2007/01/13 03:27:40 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.12.2-r4.ebuild,v 1.6 2007/01/13 09:02:46 keri Exp $
 
 inherit eutils
 
@@ -76,7 +76,7 @@ src_compile() {
                || die "econf stage 2 failed"
        emake \
                MERCURY_COMPILER="${S}"/mercury_compile \
-               depend || die "emake stage 2 depend failed"
+               -j1 depend || die "emake stage 2 depend failed"
        emake \
                MERCURY_COMPILER="${S}"/mercury_compile \
                EXTRA_MLFLAGS=--no-strip \

diff --git a/dev-lang/mercury/mercury-0.13.1-r1.ebuild b/dev-lang/mercury/mercury-0.13.1-r1.ebuild
index 20aa6fc8d86def7cfc0e5dc354f033bfa627a691..d86b27884e577ef2266908b57790baf00ce31b40 100644 (file)
--- a/dev-lang/mercury/mercury-0.13.1-r1.ebuild
+++ b/dev-lang/mercury/mercury-0.13.1-r1.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/mercury/mercury-0.13.1-r1.ebuild,v 1.7 2007/01/13 03:27:40 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.13.1-r1.ebuild,v 1.8 2007/01/13 09:02:46 keri Exp $
 
 inherit eutils
 
@@ -76,7 +76,7 @@ src_compile() {
                || die "econf stage 2 failed"
        emake \
                MERCURY_COMPILER="${S}"/mercury_compile \
-               depend || die "emake stage 2 depend failed"
+               -j1 depend || die "emake stage 2 depend failed"
        emake \
                MERCURY_COMPILER="${S}"/mercury_compile \
                EXTRA_MLFLAGS=--no-strip \

diff --git a/dev-lang/mercury/mercury-0.13.1.ebuild b/dev-lang/mercury/mercury-0.13.1.ebuild
index ab3764a7cd6d3d47a5035509dc202dbf1f5b1237..5a3f9d213d9f9e55b80d044479894f9d98372891 100644 (file)
--- a/dev-lang/mercury/mercury-0.13.1.ebuild
+++ b/dev-lang/mercury/mercury-0.13.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.13.1.ebuild,v 1.1 2006/12/04 08:43:45 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.13.1.ebuild,v 1.2 2007/01/13 09:02:46 keri Exp $
 
 inherit eutils
 
@@ -71,7 +71,7 @@ src_compile() {
                || die "econf stage 2 failed"
        emake \
                MERCURY_COMPILER="${S}"/mercury_compile \
-               depend || die "emake stage 2 depend failed"
+               -j1 depend || die "emake stage 2 depend failed"
        emake \
                MERCURY_COMPILER="${S}"/mercury_compile \
                EXTRA_MLFLAGS=--no-strip \