Fix 64bit string_format_o tests.

Package-Manager: portage-2.1.2_rc4-r2

9 files changed, 933 insertions, 17 deletions

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 09f38303f45a..41498cd99dad 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,16 @@
 # 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.67 2006/12/30 01:47:37 keri Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.68 2007/01/07 02:48:35 keri Exp $
+
+  07 Jan 2007; keri <keri@gentoo.org>
+  +files/mercury-0.12.2-tests-dir_test.patch,
+  +files/mercury-0.12.2-tests-foreign_decl_line_number.patch,
+  +files/mercury-0.12.2-tests-ho_and_type_spec_bug.patch,
+  +files/mercury-0.12.2-tests-mdbrc.patch,
+  +files/mercury-0.12.2-tests-string_format.patch,
+  +files/mercury-0.12.2-tests-tabling_inf_recursion.patch,
+  mercury-0.12.2-r4.ebuild:
+  Fix 64bit string_format_o test.
 
 *mercury-0.13.1-r1 (30 Dec 2006)
 
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 048905ce13a6..e227a5ee10f5 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -42,6 +42,30 @@ AUX mercury-0.12.2-profdeep-builtin_throw.patch 559 RMD160 026d3cd80847f0aa8bbf5
 MD5 6881f16895d02508cc05cbf0ba92881f files/mercury-0.12.2-profdeep-builtin_throw.patch 559
 RMD160 026d3cd80847f0aa8bbf5d717513f4e59f2abed7 files/mercury-0.12.2-profdeep-builtin_throw.patch 559
 SHA256 2280f2eceba9aba706987e2475415df0724da633cf69f7484995162527b81909 files/mercury-0.12.2-profdeep-builtin_throw.patch 559
+AUX mercury-0.12.2-tests-dir_test.patch 2476 RMD160 fed297db46452c557f1d1575de0aacad38a18e73 SHA1 4f9e2bc3addcc82e10c03164a6de797410d9db09 SHA256 77d0078cdcfaff41e5e7504c183478c068474479a8a17be32d325533bc82cce0
+MD5 19bdc763ab3e6592c909f1fdba4359e3 files/mercury-0.12.2-tests-dir_test.patch 2476
+RMD160 fed297db46452c557f1d1575de0aacad38a18e73 files/mercury-0.12.2-tests-dir_test.patch 2476
+SHA256 77d0078cdcfaff41e5e7504c183478c068474479a8a17be32d325533bc82cce0 files/mercury-0.12.2-tests-dir_test.patch 2476
+AUX mercury-0.12.2-tests-foreign_decl_line_number.patch 578 RMD160 bc31bd62541388f37f88345efa1fdf9de9c2d6c2 SHA1 520dd2ee808b4d496d7c622fe04b1e40f181ba6a SHA256 5150bc0737f30d4f26518ad3ca4e5ee33de5f6e252c504d638e3609fa99f9b7d
+MD5 b04e8e367abbf730839456579884cfce files/mercury-0.12.2-tests-foreign_decl_line_number.patch 578
+RMD160 bc31bd62541388f37f88345efa1fdf9de9c2d6c2 files/mercury-0.12.2-tests-foreign_decl_line_number.patch 578
+SHA256 5150bc0737f30d4f26518ad3ca4e5ee33de5f6e252c504d638e3609fa99f9b7d files/mercury-0.12.2-tests-foreign_decl_line_number.patch 578
+AUX mercury-0.12.2-tests-ho_and_type_spec_bug.patch 429 RMD160 1bde150f45c1bccb5a3677f90395b9b0fb0b5080 SHA1 2cca1e74d382494326a4dbdd704dedc924e27419 SHA256 3322b5b9a36462114ded4a7caceaa16c87eb141149b36416e7c1f2cc36b8ca03
+MD5 9ab4a3a8ba02c76bb41de04ced620144 files/mercury-0.12.2-tests-ho_and_type_spec_bug.patch 429
+RMD160 1bde150f45c1bccb5a3677f90395b9b0fb0b5080 files/mercury-0.12.2-tests-ho_and_type_spec_bug.patch 429
+SHA256 3322b5b9a36462114ded4a7caceaa16c87eb141149b36416e7c1f2cc36b8ca03 files/mercury-0.12.2-tests-ho_and_type_spec_bug.patch 429
+AUX mercury-0.12.2-tests-mdbrc.patch 549 RMD160 01d7c247abd12274d3cc5def379ee5bc6fe879f2 SHA1 3f8c654b9ec330d5030ffa46e2175e9822d2f749 SHA256 a34f781c1d183c9608a9f1e4702efce0cf5ca2bfed45ec3bc7799b38487f6391
+MD5 e79fa63c61683685c11074b563a656e9 files/mercury-0.12.2-tests-mdbrc.patch 549
+RMD160 01d7c247abd12274d3cc5def379ee5bc6fe879f2 files/mercury-0.12.2-tests-mdbrc.patch 549
+SHA256 a34f781c1d183c9608a9f1e4702efce0cf5ca2bfed45ec3bc7799b38487f6391 files/mercury-0.12.2-tests-mdbrc.patch 549
+AUX mercury-0.12.2-tests-string_format.patch 16659 RMD160 0859cec14bc5f1261494032ea8f669f2883ff6e7 SHA1 7ba69ec2c0457b560aaec92870a9ace2e031e4f0 SHA256 fc49c86dab465295a4731391c1d65394f17b20f178f800e5e8451770c52d66b0
+MD5 0b609418c40cf8b27c237f926de3c499 files/mercury-0.12.2-tests-string_format.patch 16659
+RMD160 0859cec14bc5f1261494032ea8f669f2883ff6e7 files/mercury-0.12.2-tests-string_format.patch 16659
+SHA256 fc49c86dab465295a4731391c1d65394f17b20f178f800e5e8451770c52d66b0 files/mercury-0.12.2-tests-string_format.patch 16659
+AUX mercury-0.12.2-tests-tabling_inf_recursion.patch 2168 RMD160 22dea7744ad7eed608add741f5e5576fa132b702 SHA1 a9562f7fc81012942db6dbe6a29c0d4d69b8ec01 SHA256 e5869a6351f7dedf828de7a7f2c8e15cead5e4be3eb66f28365986a95f93c8cb
+MD5 0b52e2446a22ef46f4686892c3fa4738 files/mercury-0.12.2-tests-tabling_inf_recursion.patch 2168
+RMD160 22dea7744ad7eed608add741f5e5576fa132b702 files/mercury-0.12.2-tests-tabling_inf_recursion.patch 2168
+SHA256 e5869a6351f7dedf828de7a7f2c8e15cead5e4be3eb66f28365986a95f93c8cb files/mercury-0.12.2-tests-tabling_inf_recursion.patch 2168
 AUX mercury-0.12.2-tests.patch 7502 RMD160 88e9a509c696bb32d7982708261685a602322070 SHA1 bf4bda5139ee91bac25a0b77bb228320abaedab3 SHA256 8895bb246d111c3c09b309f3332a42f6bc3b6ea1f96f56537c2ccd2f82ac362f
 MD5 cdfafee8cc55f364644e65a4fc841b1c files/mercury-0.12.2-tests.patch 7502
 RMD160 88e9a509c696bb32d7982708261685a602322070 files/mercury-0.12.2-tests.patch 7502
@@ -144,10 +168,10 @@ EBUILD mercury-0.12.2-r3.ebuild 3450 RMD160 99593c2d1e4112caa5f880a3fa28931a7ec7
 MD5 181fbbca5d6184eafcf27c498245e199 mercury-0.12.2-r3.ebuild 3450
 RMD160 99593c2d1e4112caa5f880a3fa28931a7ec700d3 mercury-0.12.2-r3.ebuild 3450
 SHA256 3ab81255629af07fd28f594e335ac868cab5cf0e1c5ec668048da405aa82b5ac mercury-0.12.2-r3.ebuild 3450
-EBUILD mercury-0.12.2-r4.ebuild 3506 RMD160 5948e2baaf2fb637e7adf082747bd8b71a5fb0e4 SHA1 45edf63b132d92c0703721160e3104c9bacf394f SHA256 f36ef7a6777894c782604bae7b08b80bc17149d4b020b4f5965b62592174ba19
-MD5 3794c54267d1926b9a12f925e27f3cc9 mercury-0.12.2-r4.ebuild 3506
-RMD160 5948e2baaf2fb637e7adf082747bd8b71a5fb0e4 mercury-0.12.2-r4.ebuild 3506
-SHA256 f36ef7a6777894c782604bae7b08b80bc17149d4b020b4f5965b62592174ba19 mercury-0.12.2-r4.ebuild 3506
+EBUILD mercury-0.12.2-r4.ebuild 3782 RMD160 de9c6c324bf93f4e55a8e8e28ef95faf2171afd5 SHA1 7e1f7b8851d8eb51ba04b6405a130c599d37b416 SHA256 a2748c24dc81467a406281a6457b1699b9049f5bf598559f421a89b7b940e3fb
+MD5 b2434fdf596c3f9de26d2a97ac2078d3 mercury-0.12.2-r4.ebuild 3782
+RMD160 de9c6c324bf93f4e55a8e8e28ef95faf2171afd5 mercury-0.12.2-r4.ebuild 3782
+SHA256 a2748c24dc81467a406281a6457b1699b9049f5bf598559f421a89b7b940e3fb mercury-0.12.2-r4.ebuild 3782
 EBUILD mercury-0.13.0.ebuild 3399 RMD160 24b4653ef73193e0de4d95d85a0aa7f589510f47 SHA1 01af1c835211afcdaedc253f718f5602d162ae28 SHA256 edf43ee4d3ca5cc66da22b7eac76f153017f8c1f453bdc8459067d7ab8b64f5a
 MD5 b1c1a96d2f9339b78e135b1a8a06d5a3 mercury-0.13.0.ebuild 3399
 RMD160 24b4653ef73193e0de4d95d85a0aa7f589510f47 mercury-0.13.0.ebuild 3399
@@ -160,10 +184,10 @@ EBUILD mercury-0.13.1.ebuild 3346 RMD160 dd731ac257203aca48294fa67b9bdee4c636e6a
 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 12660 RMD160 2e51995d89bd16740c6192799a069ac91226aa34 SHA1 0183fe9aeef4750eb9ddebcb6ce4432486824b62 SHA256 c4fa0dc1dac8c229f381b82e12c27d66d3f67e2b41ee59c5b51eea0593d2e022
-MD5 cd21f52903ca978245e5c08f2166c892 ChangeLog 12660
-RMD160 2e51995d89bd16740c6192799a069ac91226aa34 ChangeLog 12660
-SHA256 c4fa0dc1dac8c229f381b82e12c27d66d3f67e2b41ee59c5b51eea0593d2e022 ChangeLog 12660
+MISC ChangeLog 13080 RMD160 87de30ad8af3fd113c091b67142753d4c070f57b SHA1 7c67543c9bf7726de6bd17b7125f6163bac37ee5 SHA256 fa0a671ecec9fd4d288497e58f626e5296de8460f6e27f77ae4e5b2a5ebd80cd
+MD5 810149eef9d12554c1a1bc6a5c528267 ChangeLog 13080
+RMD160 87de30ad8af3fd113c091b67142753d4c070f57b ChangeLog 13080
+SHA256 fa0a671ecec9fd4d288497e58f626e5296de8460f6e27f77ae4e5b2a5ebd80cd ChangeLog 13080
 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-tests-dir_test.patch b/dev-lang/mercury/files/mercury-0.12.2-tests-dir_test.patch
new file mode 100644
index 000000000000..203968d8d99b
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.12.2-tests-dir_test.patch
@@ -0,0 +1,53 @@
+diff -urN mercury-tests-0.12.2.orig/hard_coded/dir_test.exp mercury-tests-0.12.2/hard_coded/dir_test.exp
+--- mercury-tests-0.12.2.orig/hard_coded/dir_test.exp	2003-07-29 03:50:45.000000000 +1200
++++ mercury-tests-0.12.2/hard_coded/dir_test.exp	2007-01-07 15:12:25.000000000 +1300
+@@ -130,7 +130,6 @@
+ "foo"/"bar/baz" = "foo\bar\baz".

+ "foo/"/"bar/baz" = "foo\bar\baz".

+ checking whether `unwritable' is readable...ok

+-unwritable file found to be unwritable

+ make_directory succeeded

+ make_directory succeeded

+ dir.make_single_directory with non-existent parent failed as expected.

+diff -urN mercury-tests-0.12.2.orig/hard_coded/dir_test.exp2 mercury-tests-0.12.2/hard_coded/dir_test.exp2
+--- mercury-tests-0.12.2.orig/hard_coded/dir_test.exp2	2003-07-29 03:50:45.000000000 +1200
++++ mercury-tests-0.12.2/hard_coded/dir_test.exp2	2007-01-07 15:12:25.000000000 +1300
+@@ -127,7 +127,6 @@
+ "foo"/"bar/baz" = "foo/bar/baz".
+ "foo/"/"bar/baz" = "foo/bar/baz".
+ checking whether `unwritable' is readable...ok
+-unwritable file found to be unwritable
+ make_directory succeeded
+ make_directory succeeded
+ dir.make_single_directory with non-existent parent failed as expected.
+diff -urN mercury-tests-0.12.2.orig/hard_coded/dir_test.exp3 mercury-tests-0.12.2/hard_coded/dir_test.exp3
+--- mercury-tests-0.12.2.orig/hard_coded/dir_test.exp3	2003-07-29 03:50:45.000000000 +1200
++++ mercury-tests-0.12.2/hard_coded/dir_test.exp3	2007-01-07 15:12:25.000000000 +1300
+@@ -130,7 +130,6 @@
+ "foo"/"bar/baz" = "foo/bar/baz".
+ "foo/"/"bar/baz" = "foo/bar/baz".
+ checking whether `unwritable' is readable...ok
+-unwritable file found to be unwritable
+ make_directory succeeded
+ make_directory succeeded
+ dir.make_single_directory with non-existent parent failed as expected.
+diff -urN mercury-tests-0.12.2.orig/hard_coded/dir_test.m mercury-tests-0.12.2/hard_coded/dir_test.m
+--- mercury-tests-0.12.2.orig/hard_coded/dir_test.m	2003-08-05 22:50:33.000000000 +1200
++++ mercury-tests-0.12.2/hard_coded/dir_test.m	2007-01-07 15:12:25.000000000 +1300
+@@ -50,16 +50,6 @@
+ 	io__write(ReadResult),
+ 	io__nl,
+ 
+-	io__check_file_accessibility("unwritable",
+-		[read, write], WriteResult),
+-	( { WriteResult = ok } ->
+-		io__write_string(
+-		"Error: unwritable file found to be writable\n")
+-	;
+-		io__write_string(
+-		"unwritable file found to be unwritable\n")
+-	),
+-
+ 	{ Dir1 = "test_dir"/"d1" },
+ 	test0("make_directory", dir__make_directory(Dir1)),
+ 	% Test making a directory that already exists.
diff --git a/dev-lang/mercury/files/mercury-0.12.2-tests-foreign_decl_line_number.patch b/dev-lang/mercury/files/mercury-0.12.2-tests-foreign_decl_line_number.patch
new file mode 100644
index 000000000000..c35a5764472f
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.12.2-tests-foreign_decl_line_number.patch
@@ -0,0 +1,7 @@
+diff -urN mercury-tests-0.12.2.orig/invalid/foreign_decl_line_number.err_exp3 mercury-tests-0.12.2/invalid/foreign_decl_line_number.err_exp3
+--- mercury-tests-0.12.2.orig/invalid/foreign_decl_line_number.err_exp3	1970-01-01 12:00:00.000000000 +1200
++++ mercury-tests-0.12.2/invalid/foreign_decl_line_number.err_exp3	2007-01-07 15:12:25.000000000 +1300
+@@ -0,0 +1,3 @@
++foreign_decl_line_number.m:19:2: error: #error Error in foreign decl
++foreign_decl_line_number.m:23:2: error: #error Error in foreign code
++foreign_decl_line_number.m:37:2: error: #error Error in foreign proc
diff --git a/dev-lang/mercury/files/mercury-0.12.2-tests-ho_and_type_spec_bug.patch b/dev-lang/mercury/files/mercury-0.12.2-tests-ho_and_type_spec_bug.patch
new file mode 100644
index 000000000000..7aab4522df81
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.12.2-tests-ho_and_type_spec_bug.patch
@@ -0,0 +1,9 @@
+diff -urN mercury-tests-0.12.2.orig/valid/Mmakefile mercury-tests-0.12.2/valid/Mmakefile
+--- mercury-tests-0.12.2.orig/valid/Mmakefile	2005-08-17 16:44:17.000000000 +1200
++++ mercury-tests-0.12.2/valid/Mmakefile	2007-01-07 15:12:25.000000000 +1300
+@@ -376,3 +376,5 @@
+ 	rm -f *.err *.h
+ 
+ #-----------------------------------------------------------------------------#
++
++MCFLAGS-ho_and_type_spec_bug+=--no-optimize-higher-order
diff --git a/dev-lang/mercury/files/mercury-0.12.2-tests-mdbrc.patch b/dev-lang/mercury/files/mercury-0.12.2-tests-mdbrc.patch
new file mode 100644
index 000000000000..2b9754449446
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.12.2-tests-mdbrc.patch
@@ -0,0 +1,23 @@
+diff -urN mercury-tests-0.12.2.orig/mdbrc mercury-tests-0.12.2/mdbrc
+--- mercury-tests-0.12.2.orig/mdbrc	1970-01-01 12:00:00.000000000 +1200
++++ mercury-tests-0.12.2/mdbrc	2007-01-07 15:12:25.000000000 +1300
+@@ -0,0 +1,19 @@
++source MDB_DOC
++alias	s	step
++alias	g	goto
++alias	f	finish
++alias	r	retry
++alias	v	vars
++alias	p	print
++alias	P	print *
++alias	d	stack
++alias	c	continue
++alias	b	break
++alias	h	help
++alias	?	help
++alias	excp	exception
++alias	e	exception
++alias	EMPTY	step
++alias	NUMBER	step
++set xml_browser_cmd ''
++set xml_tmp_filename ''
diff --git a/dev-lang/mercury/files/mercury-0.12.2-tests-string_format.patch b/dev-lang/mercury/files/mercury-0.12.2-tests-string_format.patch
new file mode 100644
index 000000000000..e5ef3794274b
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.12.2-tests-string_format.patch
@@ -0,0 +1,753 @@
+diff -urN mercury-tests-0.12.2.orig/general/string_format/Mmakefile mercury-tests-0.12.2/general/string_format/Mmakefile
+--- mercury-tests-0.12.2.orig/general/string_format/Mmakefile	2004-12-11 05:23:46.000000000 +1300
++++ mercury-tests-0.12.2/general/string_format/Mmakefile	2007-01-07 15:12:25.000000000 +1300
+@@ -89,22 +89,22 @@
+ 		echo "Matched $*.sorted_exp" && \
+ 		cp $*.res1 $@; } || \
+ 	{ test -f $*.exp2 && \
+-		@sort $*.exp2 > $*.sorted_exp2 \
++		sort $*.exp2 > $*.sorted_exp2 && \
+ 		diff $(DIFF_OPTS) $*.sorted_exp2 $*.sorted_out > $*.res2 && \
+ 		echo "Matched $*.sorted_exp2" && \
+ 		cp $*.res2 $@; } || \
+ 	{ test -f $*.exp3 && \
+-		@sort $*.exp3 > $*.sorted_exp3 \
++		sort $*.exp3 > $*.sorted_exp3 && \
+ 		diff $(DIFF_OPTS) $*.sorted_exp3 $*.sorted_out > $*.res3 && \
+ 		echo "Matched $*.sorted_exp3" && \
+ 		cp $*.res3 $@; } || \
+ 	{ test -f $*.exp4 && \
+-		@sort $*.exp4 > $*.sorted_exp4 \
++		sort $*.exp4 > $*.sorted_exp4 && \
+ 		diff $(DIFF_OPTS) $*.sorted_exp4 $*.sorted_out > $*.res4 && \
+ 		echo "Matched $*.sorted_exp4" && \
+ 		cp $*.res4 $@; } || \
+ 	{ test -f $*.exp5 && \
+-		@sort $*.exp5 > $*.sorted_exp5 \
++		sort $*.exp5 > $*.sorted_exp5 && \
+ 		diff $(DIFF_OPTS) $*.sorted_exp5 $*.sorted_out > $*.res5 && \
+ 		echo "Matched $*.sorted_exp5" && \
+ 		cp $*.res5 $@; } || \
+diff -urN mercury-tests-0.12.2.orig/general/string_format/string_format_o.exp2 mercury-tests-0.12.2/general/string_format/string_format_o.exp2
+--- mercury-tests-0.12.2.orig/general/string_format/string_format_o.exp2	2002-11-23 03:09:31.000000000 +1300
++++ mercury-tests-0.12.2/general/string_format/string_format_o.exp2	2007-01-07 15:38:58.000000000 +1300
+@@ -308,7 +308,7 @@
+      %#-5o:'012  '
+      %#-5o:'0144 '
+      %#-5o:'0777777777777777777777'
+-     %#.0o:''
++     %#.0o:'0'
+      %#.0o:'01'
+      %#.0o:'012'
+      %#.0o:'0144'
+@@ -703,7 +703,7 @@
+     % 5.5o:'00012'
+     % 5.5o:'00144'
+     % 5.5o:'777777777777777777777'
+-    %# .0o:''
++    %# .0o:'0'
+     %# .0o:'01'
+     %# .0o:'012'
+     %# .0o:'0144'
+@@ -743,7 +743,7 @@
+     %#+ 5o:'  012'
+     %#+ 5o:' 0144'
+     %#+ 5o:'0777777777777777777777'
+-    %#+.0o:''
++    %#+.0o:'0'
+     %#+.0o:'01'
+     %#+.0o:'012'
+     %#+.0o:'0144'
+@@ -808,7 +808,7 @@
+     %#-+5o:'012  '
+     %#-+5o:'0144 '
+     %#-+5o:'0777777777777777777777'
+-    %#-.0o:''
++    %#-.0o:'0'
+     %#-.0o:'01'
+     %#-.0o:'012'
+     %#-.0o:'0144'
+@@ -828,7 +828,7 @@
+     %#-.5o:'00012'
+     %#-.5o:'00144'
+     %#-.5o:'0777777777777777777777'
+-    %#0.0o:''
++    %#0.0o:'0'
+     %#0.0o:'01'
+     %#0.0o:'012'
+     %#0.0o:'0144'
+@@ -848,7 +848,7 @@
+     %#0.5o:'00012'
+     %#0.5o:'00144'
+     %#0.5o:'0777777777777777777777'
+-    %#1.0o:' '
++    %#1.0o:'0'
+     %#1.0o:'01'
+     %#1.0o:'012'
+     %#1.0o:'0144'
+@@ -868,7 +868,7 @@
+     %#1.5o:'00012'
+     %#1.5o:'00144'
+     %#1.5o:'0777777777777777777777'
+-    %#2.0o:'  '
++    %#2.0o:' 0'
+     %#2.0o:'01'
+     %#2.0o:'012'
+     %#2.0o:'0144'
+@@ -888,7 +888,7 @@
+     %#2.5o:'00012'
+     %#2.5o:'00144'
+     %#2.5o:'0777777777777777777777'
+-    %#5.0o:'     '
++    %#5.0o:'    0'
+     %#5.0o:'   01'
+     %#5.0o:'  012'
+     %#5.0o:' 0144'
+@@ -1243,7 +1243,7 @@
+     %0#-5o:'012  '
+     %0#-5o:'0144 '
+     %0#-5o:'0777777777777777777777'
+-    %0#.0o:''
++    %0#.0o:'0'
+     %0#.0o:'01'
+     %0#.0o:'012'
+     %0#.0o:'0144'
+@@ -1448,7 +1448,7 @@
+     %05.5o:'00012'
+     %05.5o:'00144'
+     %05.5o:'777777777777777777777'
+-   %# 0.0o:''
++   %# 0.0o:'0'
+    %# 0.0o:'01'
+    %# 0.0o:'012'
+    %# 0.0o:'0144'
+@@ -1468,7 +1468,7 @@
+    %# 0.5o:'00012'
+    %# 0.5o:'00144'
+    %# 0.5o:'0777777777777777777777'
+-   %# 1.0o:' '
++   %# 1.0o:'0'
+    %# 1.0o:'01'
+    %# 1.0o:'012'
+    %# 1.0o:'0144'
+@@ -1488,7 +1488,7 @@
+    %# 1.5o:'00012'
+    %# 1.5o:'00144'
+    %# 1.5o:'0777777777777777777777'
+-   %# 2.0o:'  '
++   %# 2.0o:' 0'
+    %# 2.0o:'01'
+    %# 2.0o:'012'
+    %# 2.0o:'0144'
+@@ -1508,7 +1508,7 @@
+    %# 2.5o:'00012'
+    %# 2.5o:'00144'
+    %# 2.5o:'0777777777777777777777'
+-   %# 5.0o:'     '
++   %# 5.0o:'    0'
+    %# 5.0o:'   01'
+    %# 5.0o:'  012'
+    %# 5.0o:' 0144'
+@@ -1528,7 +1528,7 @@
+    %# 5.5o:'00012'
+    %# 5.5o:'00144'
+    %# 5.5o:'0777777777777777777777'
+-   %#+ .0o:''
++   %#+ .0o:'0'
+    %#+ .0o:'01'
+    %#+ .0o:'012'
+    %#+ .0o:'0144'
+@@ -1548,7 +1548,7 @@
+    %#+ .5o:'00012'
+    %#+ .5o:'00144'
+    %#+ .5o:'0777777777777777777777'
+-   %#+0.0o:''
++   %#+0.0o:'0'
+    %#+0.0o:'01'
+    %#+0.0o:'012'
+    %#+0.0o:'0144'
+@@ -1568,7 +1568,7 @@
+    %#+0.5o:'00012'
+    %#+0.5o:'00144'
+    %#+0.5o:'0777777777777777777777'
+-   %#+1.0o:' '
++   %#+1.0o:'0'
+    %#+1.0o:'01'
+    %#+1.0o:'012'
+    %#+1.0o:'0144'
+@@ -1588,7 +1588,7 @@
+    %#+1.5o:'00012'
+    %#+1.5o:'00144'
+    %#+1.5o:'0777777777777777777777'
+-   %#+2.0o:'  '
++   %#+2.0o:' 0'
+    %#+2.0o:'01'
+    %#+2.0o:'012'
+    %#+2.0o:'0144'
+@@ -1608,7 +1608,7 @@
+    %#+2.5o:'00012'
+    %#+2.5o:'00144'
+    %#+2.5o:'0777777777777777777777'
+-   %#+5.0o:'     '
++   %#+5.0o:'    0'
+    %#+5.0o:'   01'
+    %#+5.0o:'  012'
+    %#+5.0o:' 0144'
+@@ -1628,7 +1628,7 @@
+    %#+5.5o:'00012'
+    %#+5.5o:'00144'
+    %#+5.5o:'0777777777777777777777'
+-   %#- .0o:''
++   %#- .0o:'0'
+    %#- .0o:'01'
+    %#- .0o:'012'
+    %#- .0o:'0144'
+@@ -1668,7 +1668,7 @@
+    %#-+ 5o:'012  '
+    %#-+ 5o:'0144 '
+    %#-+ 5o:'0777777777777777777777'
+-   %#-+.0o:''
++   %#-+.0o:'0'
+    %#-+.0o:'01'
+    %#-+.0o:'012'
+    %#-+.0o:'0144'
+@@ -1688,7 +1688,7 @@
+    %#-+.5o:'00012'
+    %#-+.5o:'00144'
+    %#-+.5o:'0777777777777777777777'
+-   %#-0.0o:''
++   %#-0.0o:'0'
+    %#-0.0o:'01'
+    %#-0.0o:'012'
+    %#-0.0o:'0144'
+@@ -1708,7 +1708,7 @@
+    %#-0.5o:'00012'
+    %#-0.5o:'00144'
+    %#-0.5o:'0777777777777777777777'
+-   %#-1.0o:' '
++   %#-1.0o:'0'
+    %#-1.0o:'01'
+    %#-1.0o:'012'
+    %#-1.0o:'0144'
+@@ -1728,7 +1728,7 @@
+    %#-1.5o:'00012'
+    %#-1.5o:'00144'
+    %#-1.5o:'0777777777777777777777'
+-   %#-2.0o:'  '
++   %#-2.0o:'0 '
+    %#-2.0o:'01'
+    %#-2.0o:'012'
+    %#-2.0o:'0144'
+@@ -1748,7 +1748,7 @@
+    %#-2.5o:'00012'
+    %#-2.5o:'00144'
+    %#-2.5o:'0777777777777777777777'
+-   %#-5.0o:'     '
++   %#-5.0o:'0    '
+    %#-5.0o:'01   '
+    %#-5.0o:'012  '
+    %#-5.0o:'0144 '
+@@ -2108,7 +2108,7 @@
+    %0 5.5o:'00012'
+    %0 5.5o:'00144'
+    %0 5.5o:'777777777777777777777'
+-   %0# .0o:''
++   %0# .0o:'0'
+    %0# .0o:'01'
+    %0# .0o:'012'
+    %0# .0o:'0144'
+@@ -2148,7 +2148,7 @@
+    %0#+ 5o:'00012'
+    %0#+ 5o:'00144'
+    %0#+ 5o:'0777777777777777777777'
+-   %0#+.0o:''
++   %0#+.0o:'0'
+    %0#+.0o:'01'
+    %0#+.0o:'012'
+    %0#+.0o:'0144'
+@@ -2213,7 +2213,7 @@
+    %0#-+5o:'012  '
+    %0#-+5o:'0144 '
+    %0#-+5o:'0777777777777777777777'
+-   %0#-.0o:''
++   %0#-.0o:'0'
+    %0#-.0o:'01'
+    %0#-.0o:'012'
+    %0#-.0o:'0144'
+@@ -2233,7 +2233,7 @@
+    %0#-.5o:'00012'
+    %0#-.5o:'00144'
+    %0#-.5o:'0777777777777777777777'
+-   %0#0.0o:''
++   %0#0.0o:'0'
+    %0#0.0o:'01'
+    %0#0.0o:'012'
+    %0#0.0o:'0144'
+@@ -2253,7 +2253,7 @@
+    %0#0.5o:'00012'
+    %0#0.5o:'00144'
+    %0#0.5o:'0777777777777777777777'
+-   %0#1.0o:' '
++   %0#1.0o:'0'
+    %0#1.0o:'01'
+    %0#1.0o:'012'
+    %0#1.0o:'0144'
+@@ -2273,7 +2273,7 @@
+    %0#1.5o:'00012'
+    %0#1.5o:'00144'
+    %0#1.5o:'0777777777777777777777'
+-   %0#2.0o:'  '
++   %0#2.0o:' 0'
+    %0#2.0o:'01'
+    %0#2.0o:'012'
+    %0#2.0o:'0144'
+@@ -2293,7 +2293,7 @@
+    %0#2.5o:'00012'
+    %0#2.5o:'00144'
+    %0#2.5o:'0777777777777777777777'
+-   %0#5.0o:'     '
++   %0#5.0o:'    0'
+    %0#5.0o:'   01'
+    %0#5.0o:'  012'
+    %0#5.0o:' 0144'
+@@ -2553,7 +2553,7 @@
+    %0-5.5o:'00012'
+    %0-5.5o:'00144'
+    %0-5.5o:'777777777777777777777'
+-  %#+ 0.0o:''
++  %#+ 0.0o:'0'
+   %#+ 0.0o:'01'
+   %#+ 0.0o:'012'
+   %#+ 0.0o:'0144'
+@@ -2573,7 +2573,7 @@
+   %#+ 0.5o:'00012'
+   %#+ 0.5o:'00144'
+   %#+ 0.5o:'0777777777777777777777'
+-  %#+ 1.0o:' '
++  %#+ 1.0o:'0'
+   %#+ 1.0o:'01'
+   %#+ 1.0o:'012'
+   %#+ 1.0o:'0144'
+@@ -2593,7 +2593,7 @@
+   %#+ 1.5o:'00012'
+   %#+ 1.5o:'00144'
+   %#+ 1.5o:'0777777777777777777777'
+-  %#+ 2.0o:'  '
++  %#+ 2.0o:' 0'
+   %#+ 2.0o:'01'
+   %#+ 2.0o:'012'
+   %#+ 2.0o:'0144'
+@@ -2613,7 +2613,7 @@
+   %#+ 2.5o:'00012'
+   %#+ 2.5o:'00144'
+   %#+ 2.5o:'0777777777777777777777'
+-  %#+ 5.0o:'     '
++  %#+ 5.0o:'    0'
+   %#+ 5.0o:'   01'
+   %#+ 5.0o:'  012'
+   %#+ 5.0o:' 0144'
+@@ -2633,7 +2633,7 @@
+   %#+ 5.5o:'00012'
+   %#+ 5.5o:'00144'
+   %#+ 5.5o:'0777777777777777777777'
+-  %#- 0.0o:''
++  %#- 0.0o:'0'
+   %#- 0.0o:'01'
+   %#- 0.0o:'012'
+   %#- 0.0o:'0144'
+@@ -2653,7 +2653,7 @@
+   %#- 0.5o:'00012'
+   %#- 0.5o:'00144'
+   %#- 0.5o:'0777777777777777777777'
+-  %#- 1.0o:' '
++  %#- 1.0o:'0'
+   %#- 1.0o:'01'
+   %#- 1.0o:'012'
+   %#- 1.0o:'0144'
+@@ -2673,7 +2673,7 @@
+   %#- 1.5o:'00012'
+   %#- 1.5o:'00144'
+   %#- 1.5o:'0777777777777777777777'
+-  %#- 2.0o:'  '
++  %#- 2.0o:'0 '
+   %#- 2.0o:'01'
+   %#- 2.0o:'012'
+   %#- 2.0o:'0144'
+@@ -2693,7 +2693,7 @@
+   %#- 2.5o:'00012'
+   %#- 2.5o:'00144'
+   %#- 2.5o:'0777777777777777777777'
+-  %#- 5.0o:'     '
++  %#- 5.0o:'0    '
+   %#- 5.0o:'01   '
+   %#- 5.0o:'012  '
+   %#- 5.0o:'0144 '
+@@ -2713,7 +2713,7 @@
+   %#- 5.5o:'00012'
+   %#- 5.5o:'00144'
+   %#- 5.5o:'0777777777777777777777'
+-  %#-+ .0o:''
++  %#-+ .0o:'0'
+   %#-+ .0o:'01'
+   %#-+ .0o:'012'
+   %#-+ .0o:'0144'
+@@ -2733,7 +2733,7 @@
+   %#-+ .5o:'00012'
+   %#-+ .5o:'00144'
+   %#-+ .5o:'0777777777777777777777'
+-  %#-+0.0o:''
++  %#-+0.0o:'0'
+   %#-+0.0o:'01'
+   %#-+0.0o:'012'
+   %#-+0.0o:'0144'
+@@ -2753,7 +2753,7 @@
+   %#-+0.5o:'00012'
+   %#-+0.5o:'00144'
+   %#-+0.5o:'0777777777777777777777'
+-  %#-+1.0o:' '
++  %#-+1.0o:'0'
+   %#-+1.0o:'01'
+   %#-+1.0o:'012'
+   %#-+1.0o:'0144'
+@@ -2773,7 +2773,7 @@
+   %#-+1.5o:'00012'
+   %#-+1.5o:'00144'
+   %#-+1.5o:'0777777777777777777777'
+-  %#-+2.0o:'  '
++  %#-+2.0o:'0 '
+   %#-+2.0o:'01'
+   %#-+2.0o:'012'
+   %#-+2.0o:'0144'
+@@ -2793,7 +2793,7 @@
+   %#-+2.5o:'00012'
+   %#-+2.5o:'00144'
+   %#-+2.5o:'0777777777777777777777'
+-  %#-+5.0o:'     '
++  %#-+5.0o:'0    '
+   %#-+5.0o:'01   '
+   %#-+5.0o:'012  '
+   %#-+5.0o:'0144 '
+@@ -2893,7 +2893,7 @@
+   %-+ 5.5o:'00012'
+   %-+ 5.5o:'00144'
+   %-+ 5.5o:'777777777777777777777'
+-  %0# 0.0o:''
++  %0# 0.0o:'0'
+   %0# 0.0o:'01'
+   %0# 0.0o:'012'
+   %0# 0.0o:'0144'
+@@ -2913,7 +2913,7 @@
+   %0# 0.5o:'00012'
+   %0# 0.5o:'00144'
+   %0# 0.5o:'0777777777777777777777'
+-  %0# 1.0o:' '
++  %0# 1.0o:'0'
+   %0# 1.0o:'01'
+   %0# 1.0o:'012'
+   %0# 1.0o:'0144'
+@@ -2933,7 +2933,7 @@
+   %0# 1.5o:'00012'
+   %0# 1.5o:'00144'
+   %0# 1.5o:'0777777777777777777777'
+-  %0# 2.0o:'  '
++  %0# 2.0o:' 0'
+   %0# 2.0o:'01'
+   %0# 2.0o:'012'
+   %0# 2.0o:'0144'
+@@ -2953,7 +2953,7 @@
+   %0# 2.5o:'00012'
+   %0# 2.5o:'00144'
+   %0# 2.5o:'0777777777777777777777'
+-  %0# 5.0o:'     '
++  %0# 5.0o:'    0'
+   %0# 5.0o:'   01'
+   %0# 5.0o:'  012'
+   %0# 5.0o:' 0144'
+@@ -2973,7 +2973,7 @@
+   %0# 5.5o:'00012'
+   %0# 5.5o:'00144'
+   %0# 5.5o:'0777777777777777777777'
+-  %0#+ .0o:''
++  %0#+ .0o:'0'
+   %0#+ .0o:'01'
+   %0#+ .0o:'012'
+   %0#+ .0o:'0144'
+@@ -2993,7 +2993,7 @@
+   %0#+ .5o:'00012'
+   %0#+ .5o:'00144'
+   %0#+ .5o:'0777777777777777777777'
+-  %0#+0.0o:''
++  %0#+0.0o:'0'
+   %0#+0.0o:'01'
+   %0#+0.0o:'012'
+   %0#+0.0o:'0144'
+@@ -3013,7 +3013,7 @@
+   %0#+0.5o:'00012'
+   %0#+0.5o:'00144'
+   %0#+0.5o:'0777777777777777777777'
+-  %0#+1.0o:' '
++  %0#+1.0o:'0'
+   %0#+1.0o:'01'
+   %0#+1.0o:'012'
+   %0#+1.0o:'0144'
+@@ -3033,7 +3033,7 @@
+   %0#+1.5o:'00012'
+   %0#+1.5o:'00144'
+   %0#+1.5o:'0777777777777777777777'
+-  %0#+2.0o:'  '
++  %0#+2.0o:' 0'
+   %0#+2.0o:'01'
+   %0#+2.0o:'012'
+   %0#+2.0o:'0144'
+@@ -3053,7 +3053,7 @@
+   %0#+2.5o:'00012'
+   %0#+2.5o:'00144'
+   %0#+2.5o:'0777777777777777777777'
+-  %0#+5.0o:'     '
++  %0#+5.0o:'    0'
+   %0#+5.0o:'   01'
+   %0#+5.0o:'  012'
+   %0#+5.0o:' 0144'
+@@ -3073,7 +3073,7 @@
+   %0#+5.5o:'00012'
+   %0#+5.5o:'00144'
+   %0#+5.5o:'0777777777777777777777'
+-  %0#- .0o:''
++  %0#- .0o:'0'
+   %0#- .0o:'01'
+   %0#- .0o:'012'
+   %0#- .0o:'0144'
+@@ -3113,7 +3113,7 @@
+   %0#-+ 5o:'012  '
+   %0#-+ 5o:'0144 '
+   %0#-+ 5o:'0777777777777777777777'
+-  %0#-+.0o:''
++  %0#-+.0o:'0'
+   %0#-+.0o:'01'
+   %0#-+.0o:'012'
+   %0#-+.0o:'0144'
+@@ -3133,7 +3133,7 @@
+   %0#-+.5o:'00012'
+   %0#-+.5o:'00144'
+   %0#-+.5o:'0777777777777777777777'
+-  %0#-0.0o:''
++  %0#-0.0o:'0'
+   %0#-0.0o:'01'
+   %0#-0.0o:'012'
+   %0#-0.0o:'0144'
+@@ -3153,7 +3153,7 @@
+   %0#-0.5o:'00012'
+   %0#-0.5o:'00144'
+   %0#-0.5o:'0777777777777777777777'
+-  %0#-1.0o:' '
++  %0#-1.0o:'0'
+   %0#-1.0o:'01'
+   %0#-1.0o:'012'
+   %0#-1.0o:'0144'
+@@ -3173,7 +3173,7 @@
+   %0#-1.5o:'00012'
+   %0#-1.5o:'00144'
+   %0#-1.5o:'0777777777777777777777'
+-  %0#-2.0o:'  '
++  %0#-2.0o:'0 '
+   %0#-2.0o:'01'
+   %0#-2.0o:'012'
+   %0#-2.0o:'0144'
+@@ -3193,7 +3193,7 @@
+   %0#-2.5o:'00012'
+   %0#-2.5o:'00144'
+   %0#-2.5o:'0777777777777777777777'
+-  %0#-5.0o:'     '
++  %0#-5.0o:'0    '
+   %0#-5.0o:'01   '
+   %0#-5.0o:'012  '
+   %0#-5.0o:'0144 '
+@@ -3473,7 +3473,7 @@
+   %0-+5.5o:'00012'
+   %0-+5.5o:'00144'
+   %0-+5.5o:'777777777777777777777'
+- %#-+ 0.0o:''
++ %#-+ 0.0o:'0'
+  %#-+ 0.0o:'01'
+  %#-+ 0.0o:'012'
+  %#-+ 0.0o:'0144'
+@@ -3493,7 +3493,7 @@
+  %#-+ 0.5o:'00012'
+  %#-+ 0.5o:'00144'
+  %#-+ 0.5o:'0777777777777777777777'
+- %#-+ 1.0o:' '
++ %#-+ 1.0o:'0'
+  %#-+ 1.0o:'01'
+  %#-+ 1.0o:'012'
+  %#-+ 1.0o:'0144'
+@@ -3513,7 +3513,7 @@
+  %#-+ 1.5o:'00012'
+  %#-+ 1.5o:'00144'
+  %#-+ 1.5o:'0777777777777777777777'
+- %#-+ 2.0o:'  '
++ %#-+ 2.0o:'0 '
+  %#-+ 2.0o:'01'
+  %#-+ 2.0o:'012'
+  %#-+ 2.0o:'0144'
+@@ -3533,7 +3533,7 @@
+  %#-+ 2.5o:'00012'
+  %#-+ 2.5o:'00144'
+  %#-+ 2.5o:'0777777777777777777777'
+- %#-+ 5.0o:'     '
++ %#-+ 5.0o:'0    '
+  %#-+ 5.0o:'01   '
+  %#-+ 5.0o:'012  '
+  %#-+ 5.0o:'0144 '
+@@ -3553,7 +3553,7 @@
+  %#-+ 5.5o:'00012'
+  %#-+ 5.5o:'00144'
+  %#-+ 5.5o:'0777777777777777777777'
+- %0#+ 0.0o:''
++ %0#+ 0.0o:'0'
+  %0#+ 0.0o:'01'
+  %0#+ 0.0o:'012'
+  %0#+ 0.0o:'0144'
+@@ -3573,7 +3573,7 @@
+  %0#+ 0.5o:'00012'
+  %0#+ 0.5o:'00144'
+  %0#+ 0.5o:'0777777777777777777777'
+- %0#+ 1.0o:' '
++ %0#+ 1.0o:'0'
+  %0#+ 1.0o:'01'
+  %0#+ 1.0o:'012'
+  %0#+ 1.0o:'0144'
+@@ -3593,7 +3593,7 @@
+  %0#+ 1.5o:'00012'
+  %0#+ 1.5o:'00144'
+  %0#+ 1.5o:'0777777777777777777777'
+- %0#+ 2.0o:'  '
++ %0#+ 2.0o:' 0'
+  %0#+ 2.0o:'01'
+  %0#+ 2.0o:'012'
+  %0#+ 2.0o:'0144'
+@@ -3613,7 +3613,7 @@
+  %0#+ 2.5o:'00012'
+  %0#+ 2.5o:'00144'
+  %0#+ 2.5o:'0777777777777777777777'
+- %0#+ 5.0o:'     '
++ %0#+ 5.0o:'    0'
+  %0#+ 5.0o:'   01'
+  %0#+ 5.0o:'  012'
+  %0#+ 5.0o:' 0144'
+@@ -3633,7 +3633,7 @@
+  %0#+ 5.5o:'00012'
+  %0#+ 5.5o:'00144'
+  %0#+ 5.5o:'0777777777777777777777'
+- %0#- 0.0o:''
++ %0#- 0.0o:'0'
+  %0#- 0.0o:'01'
+  %0#- 0.0o:'012'
+  %0#- 0.0o:'0144'
+@@ -3653,7 +3653,7 @@
+  %0#- 0.5o:'00012'
+  %0#- 0.5o:'00144'
+  %0#- 0.5o:'0777777777777777777777'
+- %0#- 1.0o:' '
++ %0#- 1.0o:'0'
+  %0#- 1.0o:'01'
+  %0#- 1.0o:'012'
+  %0#- 1.0o:'0144'
+@@ -3673,7 +3673,7 @@
+  %0#- 1.5o:'00012'
+  %0#- 1.5o:'00144'
+  %0#- 1.5o:'0777777777777777777777'
+- %0#- 2.0o:'  '
++ %0#- 2.0o:'0 '
+  %0#- 2.0o:'01'
+  %0#- 2.0o:'012'
+  %0#- 2.0o:'0144'
+@@ -3693,7 +3693,7 @@
+  %0#- 2.5o:'00012'
+  %0#- 2.5o:'00144'
+  %0#- 2.5o:'0777777777777777777777'
+- %0#- 5.0o:'     '
++ %0#- 5.0o:'0    '
+  %0#- 5.0o:'01   '
+  %0#- 5.0o:'012  '
+  %0#- 5.0o:'0144 '
+@@ -3713,7 +3713,7 @@
+  %0#- 5.5o:'00012'
+  %0#- 5.5o:'00144'
+  %0#- 5.5o:'0777777777777777777777'
+- %0#-+ .0o:''
++ %0#-+ .0o:'0'
+  %0#-+ .0o:'01'
+  %0#-+ .0o:'012'
+  %0#-+ .0o:'0144'
+@@ -3733,7 +3733,7 @@
+  %0#-+ .5o:'00012'
+  %0#-+ .5o:'00144'
+  %0#-+ .5o:'0777777777777777777777'
+- %0#-+0.0o:''
++ %0#-+0.0o:'0'
+  %0#-+0.0o:'01'
+  %0#-+0.0o:'012'
+  %0#-+0.0o:'0144'
+@@ -3753,7 +3753,7 @@
+  %0#-+0.5o:'00012'
+  %0#-+0.5o:'00144'
+  %0#-+0.5o:'0777777777777777777777'
+- %0#-+1.0o:' '
++ %0#-+1.0o:'0'
+  %0#-+1.0o:'01'
+  %0#-+1.0o:'012'
+  %0#-+1.0o:'0144'
+@@ -3773,7 +3773,7 @@
+  %0#-+1.5o:'00012'
+  %0#-+1.5o:'00144'
+  %0#-+1.5o:'0777777777777777777777'
+- %0#-+2.0o:'  '
++ %0#-+2.0o:'0 '
+  %0#-+2.0o:'01'
+  %0#-+2.0o:'012'
+  %0#-+2.0o:'0144'
+@@ -3793,7 +3793,7 @@
+  %0#-+2.5o:'00012'
+  %0#-+2.5o:'00144'
+  %0#-+2.5o:'0777777777777777777777'
+- %0#-+5.0o:'     '
++ %0#-+5.0o:'0    '
+  %0#-+5.0o:'01   '
+  %0#-+5.0o:'012  '
+  %0#-+5.0o:'0144 '
+@@ -3893,7 +3893,7 @@
+  %0-+ 5.5o:'00012'
+  %0-+ 5.5o:'00144'
+  %0-+ 5.5o:'777777777777777777777'
+-%0#-+ 0.0o:''
++%0#-+ 0.0o:'0'
+ %0#-+ 0.0o:'01'
+ %0#-+ 0.0o:'012'
+ %0#-+ 0.0o:'0144'
+@@ -3913,7 +3913,7 @@
+ %0#-+ 0.5o:'00012'
+ %0#-+ 0.5o:'00144'
+ %0#-+ 0.5o:'0777777777777777777777'
+-%0#-+ 1.0o:' '
++%0#-+ 1.0o:'0'
+ %0#-+ 1.0o:'01'
+ %0#-+ 1.0o:'012'
+ %0#-+ 1.0o:'0144'
+@@ -3933,7 +3933,7 @@
+ %0#-+ 1.5o:'00012'
+ %0#-+ 1.5o:'00144'
+ %0#-+ 1.5o:'0777777777777777777777'
+-%0#-+ 2.0o:'  '
++%0#-+ 2.0o:'0 '
+ %0#-+ 2.0o:'01'
+ %0#-+ 2.0o:'012'
+ %0#-+ 2.0o:'0144'
+@@ -3953,7 +3953,7 @@
+ %0#-+ 2.5o:'00012'
+ %0#-+ 2.5o:'00144'
+ %0#-+ 2.5o:'0777777777777777777777'
+-%0#-+ 5.0o:'     '
++%0#-+ 5.0o:'0    '
+ %0#-+ 5.0o:'01   '
+ %0#-+ 5.0o:'012  '
+ %0#-+ 5.0o:'0144 '
diff --git a/dev-lang/mercury/files/mercury-0.12.2-tests-tabling_inf_recursion.patch b/dev-lang/mercury/files/mercury-0.12.2-tests-tabling_inf_recursion.patch
new file mode 100644
index 000000000000..4d3917ad9ffc
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.12.2-tests-tabling_inf_recursion.patch
@@ -0,0 +1,35 @@
+diff -urN mercury-tests-0.12.2.orig/tabling/loopcheck.exp5 mercury-tests-0.12.2/tabling/loopcheck.exp5
+--- mercury-tests-0.12.2.orig/tabling/loopcheck.exp5	1970-01-01 12:00:00.000000000 +1200
++++ mercury-tests-0.12.2/tabling/loopcheck.exp5	2007-01-07 15:12:25.000000000 +1300
+@@ -0,0 +1,3 @@
++Uncaught Mercury exception:
++Software Error: detected infinite recursion in pred loopcheck.loop/1
++Stack dump not available in this grade.
+diff -urN mercury-tests-0.12.2.orig/tabling/loopcheck_nondet.exp2 mercury-tests-0.12.2/tabling/loopcheck_nondet.exp2
+--- mercury-tests-0.12.2.orig/tabling/loopcheck_nondet.exp2	1970-01-01 12:00:00.000000000 +1200
++++ mercury-tests-0.12.2/tabling/loopcheck_nondet.exp2	2007-01-07 15:12:25.000000000 +1300
+@@ -0,0 +1,3 @@
++Uncaught Mercury exception:
++Software Error: detected infinite recursion in pred loopcheck_nondet.loop/2
++Stack dump not available in this grade.
+diff -urN mercury-tests-0.12.2.orig/tabling/tc_loop.exp3 mercury-tests-0.12.2/tabling/tc_loop.exp3
+--- mercury-tests-0.12.2.orig/tabling/tc_loop.exp3	1970-01-01 12:00:00.000000000 +1200
++++ mercury-tests-0.12.2/tabling/tc_loop.exp3	2007-01-07 15:12:25.000000000 +1300
+@@ -0,0 +1,3 @@
++Uncaught Mercury exception:
++Software Error: detected infinite recursion in pred tc_loop.tc/2
++Stack dump not available in this grade.
+diff -urN mercury-tests-0.12.2.orig/tabling/tc_memo.exp2 mercury-tests-0.12.2/tabling/tc_memo.exp2
+--- mercury-tests-0.12.2.orig/tabling/tc_memo.exp2	1970-01-01 12:00:00.000000000 +1200
++++ mercury-tests-0.12.2/tabling/tc_memo.exp2	2007-01-07 15:12:25.000000000 +1300
+@@ -0,0 +1,3 @@
++Uncaught Mercury exception:
++Software Error: detected infinite recursion in pred tc_memo.tc/2
++Stack dump not available in this grade.
+diff -urN mercury-tests-0.12.2.orig/tabling/tc_memo2.exp2 mercury-tests-0.12.2/tabling/tc_memo2.exp2
+--- mercury-tests-0.12.2.orig/tabling/tc_memo2.exp2	1970-01-01 12:00:00.000000000 +1200
++++ mercury-tests-0.12.2/tabling/tc_memo2.exp2	2007-01-07 15:12:25.000000000 +1300
+@@ -0,0 +1,3 @@
++Uncaught Mercury exception:
++Software Error: detected need for minimal model in pred tc_memo2.tc/2
++Stack dump not available in this grade.
diff --git a/dev-lang/mercury/mercury-0.12.2-r4.ebuild b/dev-lang/mercury/mercury-0.12.2-r4.ebuild
index 15be89e4effd..ab876197f70d 100644
--- 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-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.12.2-r4.ebuild,v 1.1 2006/12/30 01:32:43 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.12.2-r4.ebuild,v 1.2 2007/01/07 02:48:35 keri Exp $
 
 inherit eutils
 
@@ -25,7 +25,6 @@ TESTDIR="${WORKDIR}"/${PN}-tests-${PV}
 src_unpack() {
 	unpack ${A}
 
-	cd "${S}"
 	epatch "${FILESDIR}"/${P}-portage-r3.patch
 	epatch "${FILESDIR}"/${P}-CFLAGS.patch
 	epatch "${FILESDIR}"/${P}-MAKEOPTS.patch
@@ -35,10 +34,13 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-parallel-install_grades.patch
 	epatch "${FILESDIR}"/${P}-deep_profiler.patch
 	epatch "${FILESDIR}"/${P}-docs.patch
-
-	cd "${TESTDIR}"
-	epatch "${FILESDIR}"/${P}-tests.patch
-	sed -i -e "s:MDB_DOC:${S}/doc/mdb_doc:" mdbrc
+	epatch "${FILESDIR}"/${P}-tests-dir_test.patch
+	epatch "${FILESDIR}"/${P}-tests-foreign_decl_line_number.patch
+	epatch "${FILESDIR}"/${P}-tests-ho_and_type_spec_bug.patch
+	epatch "${FILESDIR}"/${P}-tests-mdbrc.patch
+	epatch "${FILESDIR}"/${P}-tests-string_format.patch
+	epatch "${FILESDIR}"/${P}-tests-tabling_inf_recursion.patch
+	sed -i -e "s:MDB_DOC:${S}/doc/mdb_doc:" "${TESTDIR}"/mdbrc
 }
 
 src_compile() {