Enable default bootstrap MCFLAGS in Mercury testsuite.

Package-Manager: portage-2.1.2_rc4-r2

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 8ce9ed3e26062877f9b3804fc551c85847e2e168..49253569da10b4af1bde82f12708453ebfd1c392 100644 (file)
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,10 @@
 # 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.77 2007/01/13 09:02:46 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.78 2007/01/16 09:11:49 keri Exp $
+
+  16 Jan 2007; keri <keri@gentoo.org>
+  files/mercury-0.13.1-tests-workspace.patch:
+  Enable default bootstrap MCFLAGS in Mercury testsuite.
 
   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,

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 60ab14aedf0fbccd8c7755f5c2d2710ed0ff1004..a81c32002630ac3ac968ebd599599e8ca6b8650d 100644 (file)
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -134,10 +134,10 @@ AUX mercury-0.13.1-tests-tabling_inf_recursion.patch 2168 RMD160 1919748108d18fa
 MD5 0e1da35da5f7b4dcb87918610ec1d20a files/mercury-0.13.1-tests-tabling_inf_recursion.patch 2168
 RMD160 1919748108d18fad44397b89cfc4ff907f107e4a files/mercury-0.13.1-tests-tabling_inf_recursion.patch 2168
 SHA256 0108744a7161f03e2c00d923876b93f38bf45cfe8e94b7a2a53ead5b425a32cb files/mercury-0.13.1-tests-tabling_inf_recursion.patch 2168
-AUX mercury-0.13.1-tests-workspace.patch 463 RMD160 0181cdde5db4d42cd7c0be8ba3a17759eeba0c2b SHA1 e508f11c9359588113753759edb2f98771206800 SHA256 aa0225463e4b1c2ac4336c1d1daad049251396ed8a6430fb7016e0ee9000f8f0
-MD5 76c49d305c7152d7c746e0054215e90a files/mercury-0.13.1-tests-workspace.patch 463
-RMD160 0181cdde5db4d42cd7c0be8ba3a17759eeba0c2b files/mercury-0.13.1-tests-workspace.patch 463
-SHA256 aa0225463e4b1c2ac4336c1d1daad049251396ed8a6430fb7016e0ee9000f8f0 files/mercury-0.13.1-tests-workspace.patch 463
+AUX mercury-0.13.1-tests-workspace.patch 511 RMD160 a301c0849acc241a4a8ca329e6095559d74cbfc8 SHA1 692fa396652554f29fbee1a6f52ed445ac7f5c33 SHA256 47de84c65ff66fa6b028891f76b9d2831855cbd23924fee8f3ac504c3a5aeb12
+MD5 a84ddbd8d1d3d06e2ebdc47db6c26f9a files/mercury-0.13.1-tests-workspace.patch 511
+RMD160 a301c0849acc241a4a8ca329e6095559d74cbfc8 files/mercury-0.13.1-tests-workspace.patch 511
+SHA256 47de84c65ff66fa6b028891f76b9d2831855cbd23924fee8f3ac504c3a5aeb12 files/mercury-0.13.1-tests-workspace.patch 511
 AUX mercury-0.13.1-tests.patch 15074 RMD160 26594fb4404d3620ea454ec24ed3e6bb34ed501a SHA1 526488bac46ee66e0e446690054f20d44cd207af SHA256 64892634aad5abc0df4fb0be940b9956b8e85ce713818a75b9176b9e9feff647
 MD5 8f12e666c9f377c1af363f9af1d1a0c8 files/mercury-0.13.1-tests.patch 15074
 RMD160 26594fb4404d3620ea454ec24ed3e6bb34ed501a files/mercury-0.13.1-tests.patch 15074
@@ -162,10 +162,10 @@ EBUILD mercury-0.13.1.ebuild 3350 RMD160 c4729d5ef885ba006eae23498baacd444bddf49
 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 ChangeLog 1397 RMD160 fe26ec960c3596d4bd651c72188fff7707cc9c19 SHA1 dbd6b23399990d8d6695a64cc49a1bcda74df329 SHA256 37588c4eef9fb413dd39fd4e9c9e5a3bbd67eb6fd347f2acf279d4f591210d5e
+MD5 687f793f7c3286c76c45ec6fb4c15974 ChangeLog 1397
+RMD160 fe26ec960c3596d4bd651c72188fff7707cc9c19 ChangeLog 1397
+SHA256 37588c4eef9fb413dd39fd4e9c9e5a3bbd67eb6fd347f2acf279d4f591210d5e ChangeLog 1397
 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-tests-workspace.patch b/dev-lang/mercury/files/mercury-0.13.1-tests-workspace.patch
index 7897d3f0ec7c832f8891dafaec853539278c3da0..fb38c5312c729202bb78f8c346c3f19334e80519 100644 (file)
--- a/dev-lang/mercury/files/mercury-0.13.1-tests-workspace.patch
+++ b/dev-lang/mercury/files/mercury-0.13.1-tests-workspace.patch
@@ -1,11 +1,13 @@
 --- mercury-tests-0.13.1.orig/Mmake.common     2006-01-25 20:03:44.000000000 +1300
-+++ mercury-tests-0.13.1/Mmake.common  2007-01-11 21:36:31.000000000 +1300
-@@ -73,8 +73,8 @@
++++ mercury-tests-0.13.1/Mmake.common  2007-01-16 22:04:32.000000000 +1300
+@@ -72,9 +72,9 @@
+ 
  -include $(TESTS_DIR)/Mmake.params
  
- MCFLAGS += --flags $(TESTS_DIR)/TESTS_FLAGS
+-MCFLAGS += --flags $(TESTS_DIR)/TESTS_FLAGS
 -ifdef WORKSPACE_FLAGS
 -MCFLAGS += --flags $(TESTS_DIR)/WS_FLAGS
++#MCFLAGS += --flags $(TESTS_DIR)/TESTS_FLAGS
 +ifdef WORKSPACE
 +MCFLAGS += --flags $(TESTS_DIR)/WS_FLAGS.ws
  endif