Ensure mmc generates .c files before mkinit is run.

Package-Manager: portage-2.1.2_pre2-r9

4 files changed, 30 insertions, 10 deletions

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index e9bd881a97dc..d0cd7d577c39 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,10 @@
 # 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.53 2006/10/12 09:03:28 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.54 2006/10/14 07:17:49 keri Exp $
+
+  14 Oct 2006; keri <keri@gentoo.org> +files/mercury-0.13.0-mkinit.patch,
+  mercury-0.13.0.ebuild:
+  Ensure mmc generates .c files before mkinit is run.
 
   12 Oct 2006; keri <keri@gentoo.org> mercury-0.13.0.ebuild:
   Do not pre-strip binaries.
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 5b53f1915446..ae3577c6c4aa 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -74,6 +74,10 @@ AUX mercury-0.13.0-libgrades.patch 13854 RMD160 508cac88dd9abbde70861665ce4b3098
 MD5 1fdf1180e5bb0171e3dbdfca11ba83c2 files/mercury-0.13.0-libgrades.patch 13854
 RMD160 508cac88dd9abbde70861665ce4b3098b8c2643b files/mercury-0.13.0-libgrades.patch 13854
 SHA256 5e5d2640c4ad2679b54c7d79106f64cdf4f1b47460bcbe8bafe142d3e7c62902 files/mercury-0.13.0-libgrades.patch 13854
+AUX mercury-0.13.0-mkinit.patch 484 RMD160 95a31a2349fa9cec8ee3f14a09c3f606b31ac0e5 SHA1 0870d7a08565fa30dafbd81c279a016e41099092 SHA256 13959bd3c1378bc38e3469a80ecf6a544a30916f7f7e799f2785527edee5596a
+MD5 5040ea06a637c9c160ab6c5542103908 files/mercury-0.13.0-mkinit.patch 484
+RMD160 95a31a2349fa9cec8ee3f14a09c3f606b31ac0e5 files/mercury-0.13.0-mkinit.patch 484
+SHA256 13959bd3c1378bc38e3469a80ecf6a544a30916f7f7e799f2785527edee5596a files/mercury-0.13.0-mkinit.patch 484
 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
@@ -102,14 +106,14 @@ EBUILD mercury-0.12.2.ebuild 1423 RMD160 9e5613b7a510ad5ba00c7ff079dffc3b788fb75
 MD5 6f79d42347ca00bfe02253c965d88574 mercury-0.12.2.ebuild 1423
 RMD160 9e5613b7a510ad5ba00c7ff079dffc3b788fb755 mercury-0.12.2.ebuild 1423
 SHA256 89e50f4a3ca1267ba3b9715b42015c3be397a85068d7588c121473d3de2b78c8 mercury-0.12.2.ebuild 1423
-EBUILD mercury-0.13.0.ebuild 3264 RMD160 1c8973748fa10f2a2bfe3169234bf91aa1df9c6e SHA1 8073219116f12e38339d7f016ff46028a818b259 SHA256 f0f9297cf8d4153350f5c226e6c17d5d6866394f9034f42edbf3e4cecbe0e7d9
-MD5 df08b1541c56c982925e0cc5bf2d3adf mercury-0.13.0.ebuild 3264
-RMD160 1c8973748fa10f2a2bfe3169234bf91aa1df9c6e mercury-0.13.0.ebuild 3264
-SHA256 f0f9297cf8d4153350f5c226e6c17d5d6866394f9034f42edbf3e4cecbe0e7d9 mercury-0.13.0.ebuild 3264
-MISC ChangeLog 9803 RMD160 39cb7ca1cd57c0c02d90c721a11194c7b42550fa SHA1 fc1b92932610094ce70de398d994151e8d138990 SHA256 1cf17ec6c1a6267214d9ca1a74ad96ed16611a4a23875be882c1514ed08b2310
-MD5 b75e142764ea2b7b7911ce532d878de0 ChangeLog 9803
-RMD160 39cb7ca1cd57c0c02d90c721a11194c7b42550fa ChangeLog 9803
-SHA256 1cf17ec6c1a6267214d9ca1a74ad96ed16611a4a23875be882c1514ed08b2310 ChangeLog 9803
+EBUILD mercury-0.13.0.ebuild 3304 RMD160 e4fc494b32ad603fe329295f0726aaa415880c93 SHA1 a6a768c6b29c3e3cb7e67ce31031e41ade214d1f SHA256 402502823635094f5b60fe95cb8a0f9c23c37276c41d7ead2148a24fd24b6ff7
+MD5 2f9c89757339ee849a114ed0670027e4 mercury-0.13.0.ebuild 3304
+RMD160 e4fc494b32ad603fe329295f0726aaa415880c93 mercury-0.13.0.ebuild 3304
+SHA256 402502823635094f5b60fe95cb8a0f9c23c37276c41d7ead2148a24fd24b6ff7 mercury-0.13.0.ebuild 3304
+MISC ChangeLog 9957 RMD160 877d3ae8e516d6700c227ce83491ebff8f542193 SHA1 99b3c635b62395cc4a8a91a54fb5a102ed7e4461 SHA256 dd6f89e84668b466964f0b22f19f13611b6c844ba45848f204042c9b68ed2bac
+MD5 cc019db8626e51c5993be774e2842139 ChangeLog 9957
+RMD160 877d3ae8e516d6700c227ce83491ebff8f542193 ChangeLog 9957
+SHA256 dd6f89e84668b466964f0b22f19f13611b6c844ba45848f204042c9b68ed2bac ChangeLog 9957
 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.0-mkinit.patch b/dev-lang/mercury/files/mercury-0.13.0-mkinit.patch
new file mode 100644
index 000000000000..915dc2d833c0
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.13.0-mkinit.patch
@@ -0,0 +1,11 @@
+--- mercury-compiler-0.13.0.orig/compiler/modules.m	2006-05-23 18:46:52.000000000 +1200
++++ mercury-compiler-0.13.0/compiler/modules.m	2006-10-14 19:09:09.000000000 +1300
+@@ -5242,7 +5242,7 @@
+     module_name_to_file_name(ModuleName, ".dv", no, DvFileName, !IO),
+     
+     io.write_strings(DepStream, [
+-        InitFileName, " : ", DepFileName, "\n",
++        InitFileName, " : ", DepFileName, " $(", MakeVarName, ".cs)\n",
+         "\techo > ", InitFileName, "\n"
+     ], !IO),
+ 
diff --git a/dev-lang/mercury/mercury-0.13.0.ebuild b/dev-lang/mercury/mercury-0.13.0.ebuild
index bf97721adade..f99044909b05 100644
--- a/dev-lang/mercury/mercury-0.13.0.ebuild
+++ b/dev-lang/mercury/mercury-0.13.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.13.0.ebuild,v 1.3 2006/10/12 09:03:28 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.13.0.ebuild,v 1.4 2006/10/14 07:17:49 keri Exp $
 
 inherit eutils
 
@@ -32,6 +32,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-bootstrap.patch
 	epatch "${FILESDIR}"/${P}-LIBDIR.patch
 	epatch "${FILESDIR}"/${P}-libgrades.patch
+	epatch "${FILESDIR}"/${P}-mkinit.patch
 	epatch "${FILESDIR}"/${P}-deep_profiler.patch
 	epatch "${FILESDIR}"/${P}-docs.patch