Rebuild mslice C files when bootstrap grade != best grade for mcc

Package-Manager: portage-2.1.4.4

4 files changed, 21 insertions, 4 deletions

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 53e7af01e424..508de266c645 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/mercury
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.84 2008/08/21 07:01:55 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.85 2008/09/23 06:17:35 keri Exp $
+
+  23 Sep 2008; <keri@gentoo.org> +files/mercury-0.13.1-rebuild-mslice.patch,
+  mercury-0.13.1-r2.ebuild:
+  Rebuild mslice C files when bootstrap grade != best grade for mmc
 
 *mercury-0.13.1-r2 (21 Aug 2008)
 
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 6fde04d0bc73..84037d07a7d9 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -29,6 +29,7 @@ AUX mercury-0.13.1-no-reconf.patch 1872 RMD160 76682430bfd858261068cf3c25eb06d5e
 AUX mercury-0.13.1-parallel-install_grades.patch 633 RMD160 5492e49f5ab7c8f16f52148a2678cc56c9398071 SHA1 fc90c6aebb4501178836d67ccc67a5b997f5314a SHA256 5630e0d82d4d76603817852601a6c0aeffe1f56e73b57f3c562ba29e5e5eeb1f
 AUX mercury-0.13.1-portage.patch 2891 RMD160 18690121ca57a11d9ad77a300eecb753c1eeed12 SHA1 f5cf54bcffe37764b96228e112e95da8b4cb93e5 SHA256 b03e021502c0440ae84587ccb3604f8c0315239c9307b1af87fcc57f81a45c30
 AUX mercury-0.13.1-profdeep-builtin_throw.patch 562 RMD160 0259aff999acd0a77d937bea86d8549409ec119b SHA1 f667b70eafb81967480a0d6f4d6420c33a1da98c SHA256 0582bf4e1cdf3aaf56128540ef7777215efc789d4d0ed6a45e759ce6ec6ff99f
+AUX mercury-0.13.1-rebuild-mslice.patch 460 RMD160 733e4f30235d08209cbc41451db19fbb278513a2 SHA1 93b228151377a27ba604c668309ba045bb9ce79e SHA256 1ffbd45a7db568268962b82eddba2747ba57c93b110a01d071fca39565c54e72
 AUX mercury-0.13.1-tests-declarative-throw.patch 1681 RMD160 884f7acce92cfc53cd071d4919ec1e1e2bffb320 SHA1 2672a4c9d10f22b1fee90a0f6ec699d7ff6387c7 SHA256 630b919c80fa0c8086f48544bdd21de0a9ef6eccb1cfbc2624458c8109ddf746
 AUX mercury-0.13.1-tests-dir_test.patch 2476 RMD160 99c040bc588d0f455b1da42279fedc3f3f357217 SHA1 41e0fda83eacbdb698833216de4251e626adeba3 SHA256 20d7710d93e108eb5440b0d189f6a4f3848b589fb22e2be3e87d08baebd5f535
 AUX mercury-0.13.1-tests-ho_and_type_spec_bug.patch 429 RMD160 4afcbd1b73c51c06187a0af02086e6c0527a8b8c SHA1 efe5458ab76060a37f0110000ee68e07212ff8d6 SHA256 d81c5e0a3cbf07190433cee583f9be8f14624b3f5e982bf04079fdb559b1f88c
@@ -43,7 +44,7 @@ DIST mercury-tests-0.13.1.tar.gz 986644 RMD160 779609ba5c985e562b0962434c9281c07
 EBUILD mercury-0.12.2-r3.ebuild 3473 RMD160 f5fa94389d94de889efa91efa3aecd96aa5c1d02 SHA1 63e17af97901e6625460a92dfa7a3f5dc8336494 SHA256 9468a2a9bfd91144b4586ceed3ee020e510d2475c0ae716ddf747b2267f07ad6
 EBUILD mercury-0.12.2-r4.ebuild 3805 RMD160 18307839b493b1693e290ee09a2f40a9ff9984b1 SHA1 88ca4ad27252d821ac8dee0ec87966c09d542f46 SHA256 9662741a1cf22b630168673ee1b1432b5ade0ce0513e2c5fbd4ee68a65f79317
 EBUILD mercury-0.13.1-r1.ebuild 4139 RMD160 fd3f6fcb6629daf99a84031c54b300f69aaaba04 SHA1 2e1e1b48e2d73c72bd85f96fac5ce116e04d8725 SHA256 473554123b1834380e09233be867fdf1e8b52f9ca539b075c7181ef5d2a16fe6
-EBUILD mercury-0.13.1-r2.ebuild 3288 RMD160 463c4865f2572caeb4e108f40eab4b3d493866f8 SHA1 b9ac3ff89b33d2d4c517cf188008ee083d5217e2 SHA256 4b7c093ca5cb9ef0f717115b0a24c8ebb29798adadf5f811a02aaba4d466fb6f
+EBUILD mercury-0.13.1-r2.ebuild 3336 RMD160 562d5c3671da868773f21b4fa9faeca281e5bceb SHA1 ccf1624198368f310ee24e31888c76193806e751 SHA256 421395e7767ad0bffb6cb6b5fd56105e782be12c306b4e46ce7bbc1b01e7f2d6
 EBUILD mercury-0.13.1.ebuild 3339 RMD160 87d85335493e9fd02903defd6414001dc1864e36 SHA1 43ad234914a774ff90b9b84468cbd2f92ed07a6e SHA256 42290613f10e60643bae1bb53bbf1113df985fe1046e9cffdbfe1956fb4ee226
-MISC ChangeLog 16742 RMD160 7e2d6ed61cc4fca4afd8203a8273332b65b191e4 SHA1 715a5d2d1f9d16bef4d6f7151796975013dc77bd SHA256 c913cadd1965457cc0b12e1d716d698dd60b2a9db9a9731362965eaba0ef11ad
+MISC ChangeLog 16916 RMD160 421d75efb9b8f88ac555875c890a5e480c8c5176 SHA1 b3bdf628e4f962cd743e739b57ac67c2a29153b7 SHA256 efe9a6ff45ea26f143ad9ce538925e5d6273450084fade0ab0752edfb2ade6c5
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
diff --git a/dev-lang/mercury/files/mercury-0.13.1-rebuild-mslice.patch b/dev-lang/mercury/files/mercury-0.13.1-rebuild-mslice.patch
new file mode 100644
index 000000000000..4b4e5253cadd
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.13.1-rebuild-mslice.patch
@@ -0,0 +1,11 @@
+--- mercury-compiler-0.13.1.orig/configure	2006-12-01 22:37:01.000000000 +1300
++++ mercury-compiler-0.13.1/configure	2008-09-23 18:09:53.000000000 +1200
+@@ -9000,7 +9000,7 @@
+ 	compiler and library will be rebuilt with new grade
+ 	installation may take a long time" 1>&6
+ 		find library compiler browser mdbcomp analysis \
+-			profiler deep_profiler \
++			profiler deep_profiler slice \
+ 			-name \*.c -o -name \*.c_date | \
+ 			xargs rm > /dev/null 2>&1
+ 	fi
diff --git a/dev-lang/mercury/mercury-0.13.1-r2.ebuild b/dev-lang/mercury/mercury-0.13.1-r2.ebuild
index a7f9403db0a0..8fd765d0f61f 100644
--- a/dev-lang/mercury/mercury-0.13.1-r2.ebuild
+++ b/dev-lang/mercury/mercury-0.13.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-r2.ebuild,v 1.1 2008/08/21 07:01:55 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.13.1-r2.ebuild,v 1.2 2008/09/23 06:17:35 keri Exp $
 
 inherit eutils flag-o-matic
 
@@ -30,6 +30,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-libgrades.patch
 	epatch "${FILESDIR}"/${P}-docs.patch
 	epatch "${FILESDIR}"/${P}-no-reconf.patch
+	epatch "${FILESDIR}"/${P}-rebuild-mslice.patch
 
 	if use test; then
 		epatch "${FILESDIR}"/${P}-tests-dir_test.patch