Version bump

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

10 files changed, 472 insertions, 3 deletions

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index d0f26fe25d3f..b3bf1f825082 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lang/mercury
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.103 2010/04/25 08:25:46 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.104 2010/07/19 09:25:31 keri Exp $
+
+*mercury-10.04 (19 Jul 2010)
+
+  19 Jul 2010; <keri@gentoo.org> +mercury-10.04.ebuild,
+  +files/mercury-10.04-boehm_gc.patch, +files/mercury-10.04-docs.patch,
+  +files/mercury-10.04-multilib.patch, +files/mercury-10.04-no-reconf.patch,
+  +files/mercury-10.04-tests-sandbox.patch,
+  +files/mercury-10.04-tests-workspace.patch, metadata.xml:
+  Version bump
 
   25 Apr 2010; <keri@gentoo.org> files/mercury-10.04_beta1-ppc-lexer.patch:
   Move MGNUCFLAGS-lexer definition to library/Mmakefile to allow mmc to
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 04fa07ccf980..bc68e0f066a3 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -8,6 +8,12 @@ AUX mercury-0.13.1-tests-dir_test.patch 2476 RMD160 99c040bc588d0f455b1da42279fe
 AUX mercury-0.13.1-tests-ho_and_type_spec_bug.patch 429 RMD160 4afcbd1b73c51c06187a0af02086e6c0527a8b8c SHA1 efe5458ab76060a37f0110000ee68e07212ff8d6 SHA256 d81c5e0a3cbf07190433cee583f9be8f14624b3f5e982bf04079fdb559b1f88c
 AUX mercury-0.13.1-tests-string_format.patch 15357 RMD160 1b3f5538f6c8aa9daa430d918e42c9c3e95122c5 SHA1 fb78eba72aae7de933951941f6db890548e298b0 SHA256 a0a3f1a5d9d75443d9f442925eb15131b7bfbe3c92f737a51f1340111b46a34e
 AUX mercury-0.13.1-tests-workspace.patch 899 RMD160 f866379e0e4f8e4debebb86bfed778e881c9e790 SHA1 6b6cc428a516c082bcd7ac8bdbe05de1b1e75831 SHA256 8ab0c250ccdfdb57ba377335fd61dc980ad87135e388c6ae4ebe0ff3c464e456
+AUX mercury-10.04-boehm_gc.patch 1090 RMD160 7f5dd379f2c642380b2eca4a9162d3a2f542c75e SHA1 fce4696ade9343a541d179ab4b243b64b5cb0638 SHA256 6c022e0534c85544f49aad8a15b3ca15893d9d39be0679eea0392510c5531242
+AUX mercury-10.04-docs.patch 1071 RMD160 7227e1c079b269f332081b956e53b85358d72a70 SHA1 f27b48ecb5ba991261f93c2c8d640b7fd213830b SHA256 a4514f76a7174d16f392e3f9aa55d19a468f114541cf93129908feeaec462c06
+AUX mercury-10.04-multilib.patch 5993 RMD160 70cf37287f8a352eb09f66c402ea0e6690dd26be SHA1 1f0b47f3bfab7ffe54c487bde1c84e0499bca2f0 SHA256 43497f32f110e064bedae7b2aeaef63fc6b394276d7aa7e46864c97781de4db3
+AUX mercury-10.04-no-reconf.patch 2337 RMD160 f39b7e0c777eba144d103078d3e81fb0a4ea21c7 SHA1 a4166eaf922e6423ff8761f486691f5b75fc14f9 SHA256 3b4dc9724fe9baed3222e43d86d3af73692d0f3f7285f6b6dbd4df0407690921
+AUX mercury-10.04-tests-sandbox.patch 2925 RMD160 29c74339e6026f074e9ca82944037180c33ebb1b SHA1 0d3478a594866eeeec377d68acf8e6f4aa85cff0 SHA256 f3e5345ba9f2ef046ac8ce217c53e828a63bb11cd0133462ea54dfdfc06fac52
+AUX mercury-10.04-tests-workspace.patch 1186 RMD160 8d39923a497a78c3f4eba206ace6700e6e8a037a SHA1 8b1088c084cb7a8506746bcf9b19ef234ce11219 SHA256 c0bece10074608f163af26f2b82a6ef623c47ee8c98592fea421c32962bbd8c4
 AUX mercury-10.04_beta1-atomic-ops.patch 568 RMD160 e557798f12ac9325ed6b251c1bc7dc87d36e1225 SHA1 0ea7f1c346b69aa73d387b5bdee12e34e482b129 SHA256 90720443306685422a7c2bf9f3fa2193feef4eda71de38a474cc0303381ce5e1
 AUX mercury-10.04_beta1-boehm_gc.patch 4231 RMD160 a8f7f12d5768156de83d90362e81094084f3fd35 SHA1 8a595992e162f48ccacb63fb6df497e361901f2c SHA256 45eafb8b94538336f0de13085359aa1b9998fd2c99d67c735b71f4e09b8e786e
 AUX mercury-10.04_beta1-docs.patch 804 RMD160 8b04f68882da22485d6db8c1a0184d37870dc2b5 SHA1 efdb8948178b9287664bd8ad6e8896b10affb213 SHA256 55bafac83acd9da404da9b626ab7a6e137a13f1169c9612caa6908f2f7152096
@@ -19,9 +25,12 @@ AUX mercury-10.04_beta1-tests-subdir.patch 504 RMD160 25273c94dd44ed9c461e6cc7dd
 AUX mercury-10.04_beta1-tests-workspace.patch 1093 RMD160 8fb5883e52f2810594172643bbf4af4002396429 SHA1 cd4eaac0580644bc9787277eb63975e5cd85535a SHA256 9091d6dd37ca299163b37a560ae19477d827281d41836b9306c0a5caf7b6b36f
 DIST mercury-compiler-0.13.1.tar.gz 15938824 RMD160 a0a80cd2ac7393cf084b79d40230bd1efe795c5f SHA1 919eb45ba34c503fc2e7391225e52a5cfbb80616 SHA256 b1f4984e00ad917824d3340dcf2a41bede39fe02ef2e516351467f4761985196
 DIST mercury-compiler-10.04-beta.tar.gz 27795148 RMD160 3c3aeca9d96d2294d2dc7bd4c4cc0c5c6c14aee8 SHA1 b88ab410c1337c1f357eca6fdb517faa1496c64b SHA256 5a21e0cfd3998c1529be88ebd40c75835387052d12db8cf5e8a93379cdc955cd
+DIST mercury-compiler-10.04.tar.gz 24586705 RMD160 fe9b131a272ab314618cde59463e5b55686126e3 SHA1 3ae0d596ad079d62bfb6ae41bc0ab0a5d78db6fa SHA256 ecb930c2b26f804648f6432503937a669de4c2c9e85dec9a60ef65f729fbbcda
 DIST mercury-tests-0.13.1.tar.gz 986644 RMD160 779609ba5c985e562b0962434c9281c07ddaa5cb SHA1 7f08467e6642daa4fce9136e12b4e5ca2ac41b9d SHA256 f6c8250b9996584d3c7cd6cc0609716027b127e54b2aedf5ebfcab98a44159dc
 DIST mercury-tests-10.04-beta.tar.gz 5876463 RMD160 b29179ae78b1dcb0619684228abac0d6cd4471a8 SHA1 3fed8b5fbe840e844df725f386a08836825d48da SHA256 4c1bf8eece8f95fdf13eeaef8dc5ea4fee30646d20fed684fe6eb710d5234833
+DIST mercury-tests-10.04.tar.gz 1329423 RMD160 c85e489eea4e36fef6d12fb9bf4e7cd01bb2e7fd SHA1 32ca9267d58d2cbb7d144c1501803f0a7b92f145 SHA256 d56a76b4a2c8c2cc878b7a7cd04fd34b4069cef1316155a942f4372425d45085
 EBUILD mercury-0.13.1-r2.ebuild 3350 RMD160 8a1635d8c301751b2da7260785baaa788b81b620 SHA1 2aae241faf85518b6bb6d162939b2f293eb67649 SHA256 af0a034331b9a7acb0d0a7dea42fc84aafcf9e66de2b6fceddc623f975689c44
+EBUILD mercury-10.04.ebuild 3482 RMD160 cd7272a044f139e7beb2fdc77a597f9a40348824 SHA1 d95f15a806c10bd2d14e0af9c51da761b29a7830 SHA256 352845ae42ce97edd05c1230cd11b7c97690be283f39bd517dd2f45bc65d4f2f
 EBUILD mercury-10.04_beta1.ebuild 3561 RMD160 b608b732acdfccb4a8ccdc4728bdd0b9f3f28283 SHA1 319302199665f6e4ffa9aaff95128fcd8a7d63a0 SHA256 ffbba59515166327f79a698086d516f14fcbcfc8c76f58dbf1116eaa8eb16626
-MISC ChangeLog 20895 RMD160 f39c85ec897643f058a60c9cb8ce419205e06477 SHA1 be13bd53514ecad4d97d642466c261516ee33438 SHA256 5939450aa940e9a3b07cbe3c1e8ef4774b765a4efdd6c6f9e012eac7ff80194a
-MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
+MISC ChangeLog 21250 RMD160 b21fc66c024178c7f34bb5c902cd5ebf4f3bb224 SHA1 f091896fc3aae4765d8b5437dcf63d819af057ce SHA256 fe6ab366388d5926fff4028ee1157b2a6ed8c5f73b6b9ff62549c6eba9ac7c24
+MISC metadata.xml 318 RMD160 b9e62c5b9d04f43a6570cfcadd6a6c9a2b9e3f6f SHA1 67893d667419e727696eb2c386565794fd137418 SHA256 5e64767eb2ff6b10d88b169c87648d62b534356fb94c5407a253aeafc2d16935
diff --git a/dev-lang/mercury/files/mercury-10.04-boehm_gc.patch b/dev-lang/mercury/files/mercury-10.04-boehm_gc.patch
new file mode 100644
index 000000000000..028a8dd22a72
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-10.04-boehm_gc.patch
@@ -0,0 +1,14 @@
+diff -ur mercury-compiler-10.04.orig/boehm_gc/Makefile.direct mercury-compiler-10.04/boehm_gc/Makefile.direct
+--- mercury-compiler-10.04.orig/boehm_gc/Makefile.direct	2010-02-24 20:04:32.000000000 +1300
++++ mercury-compiler-10.04/boehm_gc/Makefile.direct	2010-07-19 21:01:24.000000000 +1200
+@@ -407,6 +407,7 @@
+ 	./if_mach SPARC SOLARIS $(CC) -c -o mach_dep2.o $(srcdir)/sparc_mach_dep.S
+ 	./if_mach SPARC OPENBSD $(AS) -o mach_dep2.o $(srcdir)/sparc_sunos4_mach_dep.s
+ 	./if_mach SPARC NETBSD $(AS) -o mach_dep2.o $(srcdir)/sparc_netbsd_mach_dep.s
++	./if_mach SPARC LINUX $(CC) -o mach_dep2.o $(SPECIALCFLAGS) $(srcdir)/sparc_generic_mach_dep.c
+ 	./if_mach SPARC "" $(CC) -c -o mach_dep1.o $(SPECIALCFLAGS) $(srcdir)/mach_dep.c
+ 	./if_mach SPARC "" ld -r -o mach_dep.o mach_dep1.o mach_dep2.o
+ 	./if_mach IA64 "" as $(AS_ABI_FLAG) -o ia64_save_regs_in_stack.o $(srcdir)/ia64_save_regs_in_stack.s
+Only in mercury-compiler-10.04/boehm_gc: sparc_generic_mach_dep.c
+Only in mercury-compiler-10.04/compiler: make.program_target.c.orig
+Only in mercury-compiler-10.04/scripts: Mmake.vars.in.orig
diff --git a/dev-lang/mercury/files/mercury-10.04-docs.patch b/dev-lang/mercury/files/mercury-10.04-docs.patch
new file mode 100644
index 000000000000..552ae4bc081f
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-10.04-docs.patch
@@ -0,0 +1,24 @@
+Only in mercury-compiler-10.04/boehm_gc: Makefile.direct.orig
+Only in mercury-compiler-10.04/compiler: make.program_target.c.orig
+diff -ur mercury-compiler-10.04.orig/doc/Mmakefile mercury-compiler-10.04/doc/Mmakefile
+--- mercury-compiler-10.04.orig/doc/Mmakefile	2010-07-07 01:42:07.000000000 +1200
++++ mercury-compiler-10.04/doc/Mmakefile	2010-07-19 21:01:50.000000000 +1200
+@@ -120,7 +120,7 @@
+ 	# formatted versions of the man pages.
+ 	# But it might make sense to add them.
+ .PHONY: all
+-all: $(INFOPAGES) $(DVI) $(HTML) manpages $(MDB_DOC) 
++all: $(INFOPAGES) $(HTML) manpages $(MDB_DOC) 
+ #all: ps pdf text formatted_manpages
+ 
+ #-----------------------------------------------------------------------------#
+@@ -351,7 +351,7 @@
+ 	# versions of the documentation.  If they are added they should
+ 	# be installed here.
+ .PHONY: install
+-install: install_info install_html install_dvi install_manpages \
++install: install_info install_html install_manpages \
+ 	install_mdb_doc
+ 	# install_text install_ps
+ 
+Only in mercury-compiler-10.04/scripts: Mmake.vars.in.orig
diff --git a/dev-lang/mercury/files/mercury-10.04-multilib.patch b/dev-lang/mercury/files/mercury-10.04-multilib.patch
new file mode 100644
index 000000000000..649b4e816414
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-10.04-multilib.patch
@@ -0,0 +1,114 @@
+diff -ur mercury-compiler-10.04.orig/compiler/make.program_target.c mercury-compiler-10.04/compiler/make.program_target.c
+--- mercury-compiler-10.04.orig/compiler/make.program_target.c	2010-07-19 02:00:13.000000000 +1200
++++ mercury-compiler-10.04/compiler/make.program_target.c	2010-07-19 21:00:29.000000000 +1200
+@@ -5422,7 +5422,7 @@
+ 		make__program_target__install_grade_init_6_0_i2);
+ MR_def_label(make__program_target__install_grade_init_6_0,2)
+ 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
+-	MR_r2 = (MR_Word) MR_string_const("lib", 3);
++	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
+ 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
+ 		make__program_target__install_grade_init_6_0_i3);
+ MR_def_label(make__program_target__install_grade_init_6_0,3)
+@@ -5873,7 +5873,7 @@
+ 		make__program_target__make_grade_install_dirs_6_0_i2);
+ MR_def_label(make__program_target__make_grade_install_dirs_6_0,2)
+ 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
+-	MR_r2 = (MR_Word) MR_string_const("lib", 3);
++	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
+ 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
+ 		make__program_target__make_grade_install_dirs_6_0_i3);
+ MR_def_label(make__program_target__make_grade_install_dirs_6_0,3)
+@@ -6318,7 +6318,7 @@
+ 		MR_GOTO_LAB(make__program_target__install_library_grade_files_10_0_i11);
+ 	}
+ 	MR_r1 = MR_sv(10);
+-	MR_r2 = (MR_Word) MR_string_const("lib", 3);
++	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
+ 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
+ 		make__program_target__install_library_grade_files_10_0_i14);
+ MR_def_label(make__program_target__install_library_grade_files_10_0,14)
+@@ -6382,7 +6382,7 @@
+ 		MR_GOTO_LAB(make__program_target__install_library_grade_files_10_0_i20);
+ 	}
+ 	MR_r1 = MR_sv(10);
+-	MR_r2 = (MR_Word) MR_string_const("lib", 3);
++	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
+ 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
+ 		make__program_target__install_library_grade_files_10_0_i23);
+ MR_def_label(make__program_target__install_library_grade_files_10_0,23)
+@@ -6448,7 +6448,7 @@
+ MR_def_label(make__program_target__install_library_grade_files_10_0,20)
+ 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
+ 	MR_r1 = MR_sv(10);
+-	MR_r2 = (MR_Word) MR_string_const("lib", 3);
++	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
+ 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
+ 		make__program_target__install_library_grade_files_10_0_i30);
+ MR_def_label(make__program_target__install_library_grade_files_10_0,30)
+@@ -6585,7 +6585,7 @@
+ 		make__program_target__make_install_dirs_5_0_i2);
+ MR_def_label(make__program_target__make_install_dirs_5_0,2)
+ 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
+-	MR_r2 = (MR_Word) MR_string_const("lib", 3);
++	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
+ 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
+ 		make__program_target__make_install_dirs_5_0_i3);
+ MR_def_label(make__program_target__make_install_dirs_5_0,3)
+@@ -6806,7 +6806,7 @@
+ 		make__program_target__install_library_7_0_i11);
+ MR_def_label(make__program_target__install_library_7_0,11)
+ 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
+-	MR_r2 = (MR_Word) MR_string_const("lib", 3);
++	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
+ 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
+ 		make__program_target__install_library_7_0_i12);
+ MR_def_label(make__program_target__install_library_7_0,12)
+@@ -10596,7 +10596,7 @@
+ 		make__program_target__install_ints_and_headers_8_0_i13);
+ MR_def_label(make__program_target__install_ints_and_headers_8_0,13)
+ 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
+-	MR_r2 = (MR_Word) MR_string_const("lib", 3);
++	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
+ 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
+ 		make__program_target__install_ints_and_headers_8_0_i14);
+ MR_def_label(make__program_target__install_ints_and_headers_8_0,14)
+@@ -11222,7 +11222,7 @@
+ 		make__program_target__install_grade_ints_and_headers_9_0_i5);
+ MR_def_label(make__program_target__install_grade_ints_and_headers_9_0,5)
+ 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
+-	MR_r2 = (MR_Word) MR_string_const("lib", 3);
++	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
+ 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
+ 		make__program_target__install_grade_ints_and_headers_9_0_i6);
+ MR_def_label(make__program_target__install_grade_ints_and_headers_9_0,6)
+diff -ur mercury-compiler-10.04.orig/scripts/Mmake.vars.in mercury-compiler-10.04/scripts/Mmake.vars.in
+--- mercury-compiler-10.04.orig/scripts/Mmake.vars.in	2010-05-20 21:29:31.000000000 +1200
++++ mercury-compiler-10.04/scripts/Mmake.vars.in	2010-07-19 21:00:29.000000000 +1200
+@@ -688,17 +688,17 @@
+ INSTALL_PREFIX		= @prefix@
+ FINAL_INSTALL_PREFIX	= @prefix@
+ INSTALL_BINDIR		= $(INSTALL_PREFIX)/bin
+-INSTALL_LIBDIR		= $(INSTALL_PREFIX)/lib/mercury
+-FINAL_INSTALL_LIBDIR	= $(FINAL_INSTALL_PREFIX)/lib/mercury
++INSTALL_LIBDIR		= $(INSTALL_PREFIX)/@libdir@/mercury
++FINAL_INSTALL_LIBDIR	= $(FINAL_INSTALL_PREFIX)/@libdir@/mercury
+ INSTALL_INFO_DIR	= $(INSTALL_PREFIX)/info
+-INSTALL_DVI_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
+-INSTALL_TEXT_DIR	= $(INSTALL_PREFIX)/lib/mercury/doc
+-INSTALL_PS_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
+-INSTALL_PDF_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
++INSTALL_DVI_DIR		= $(INSTALL_PREFIX)/@libdir@/mercury/doc
++INSTALL_TEXT_DIR	= $(INSTALL_PREFIX)/@libdir@/mercury/doc
++INSTALL_PS_DIR		= $(INSTALL_PREFIX)/@libdir@/mercury/doc
++INSTALL_PDF_DIR		= $(INSTALL_PREFIX)/@libdir@/mercury/doc
+ INSTALL_MAN_DIR		= $(INSTALL_PREFIX)/man
+-INSTALL_HTML_DIR	= $(INSTALL_PREFIX)/lib/mercury/html
+-INSTALL_MDB_DOC_DIR	= $(INSTALL_PREFIX)/lib/mercury/mdb
+-INSTALL_ELISP_DIR	= $(INSTALL_PREFIX)/lib/mercury/elisp
++INSTALL_HTML_DIR	= $(INSTALL_PREFIX)/@libdir@/mercury/html
++INSTALL_MDB_DOC_DIR	= $(INSTALL_PREFIX)/@libdir@/mercury/mdb
++INSTALL_ELISP_DIR	= $(INSTALL_PREFIX)/@libdir@/mercury/elisp
+ INSTALL_CGI_DIR		= @CGIDIR@
+ 
+ # You should not need to override anything below here
diff --git a/dev-lang/mercury/files/mercury-10.04-no-reconf.patch b/dev-lang/mercury/files/mercury-10.04-no-reconf.patch
new file mode 100644
index 000000000000..9a264f99509a
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-10.04-no-reconf.patch
@@ -0,0 +1,64 @@
+Only in mercury-compiler-10.04/boehm_gc: Makefile.direct.orig
+Only in mercury-compiler-10.04/compiler: make.program_target.c.orig
+Only in mercury-compiler-10.04/doc: Mmakefile.orig
+diff -ur mercury-compiler-10.04.orig/runtime/Mmakefile mercury-compiler-10.04/runtime/Mmakefile
+--- mercury-compiler-10.04.orig/runtime/Mmakefile	2010-07-16 03:24:52.000000000 +1200
++++ mercury-compiler-10.04/runtime/Mmakefile	2010-07-19 21:02:09.000000000 +1200
+@@ -455,8 +455,6 @@
+ 		mkdir -p $(INSTALL_GRADE_MODULE_DIR)
+ 	-[ -d $(INSTALL_MERC_LIB_DIR) ] || mkdir -p $(INSTALL_MERC_LIB_DIR)
+ 	-[ -d $(INSTALL_CONF_DIR) ] || mkdir -p $(INSTALL_CONF_DIR)
+-	-[ -d $(INSTALL_RECONF_DIR)/runtime ] || \
+-		mkdir -p $(INSTALL_RECONF_DIR)/runtime
+ 
+ ifneq "$(filter java% erlang%,$(GRADE))" ""
+ 
+@@ -502,7 +500,6 @@
+ 	rm -f $(INSTALL_INC_DIR)/mercury_conf.h
+ 	cp `vpath_find mercury_conf.h` $(INSTALL_CONF_DIR)
+ 	-chmod u+w $(INSTALL_CONF_DIR)/mercury_conf.h
+-	cp `vpath_find mercury_conf.h.in` $(INSTALL_RECONF_DIR)/runtime
+ 	cp `vpath_find $(MACHHDRS)` $(INSTALL_INC_DIR)/machdeps
+ 
+ .PHONY: install_init
+Only in mercury-compiler-10.04/runtime: Mmakefile.orig
+Only in mercury-compiler-10.04/scripts: Mmake.vars.in.orig
+diff -ur mercury-compiler-10.04.orig/scripts/Mmakefile mercury-compiler-10.04/scripts/Mmakefile
+--- mercury-compiler-10.04.orig/scripts/Mmakefile	2009-09-02 11:54:38.000000000 +1200
++++ mercury-compiler-10.04/scripts/Mmakefile	2010-07-19 21:02:09.000000000 +1200
+@@ -24,17 +24,13 @@
+ 	canonical_grade \
+ 	mdb \
+ 	mdprof \
+-	mercury.bat \
+-	mercury_config \
+ 	mercury_update_interface \
+ 	mgnuc \
+-	mkfifo_using_mknod \
+ 	ml \
+ 	mmake \
+ 	mmc \
+ 	mprof \
+-	mtags \
+-	prepare_install_dir
++	mtags
+ 
+ SCRIPTS = $(NONCONF_SCRIPTS) $(CONF_SCRIPTS)
+ 
+@@ -113,8 +109,6 @@
+ 	[ -d $(INSTALL_LIBDIR)/mdb ] || mkdir -p $(INSTALL_LIBDIR)/mdb
+ 	[ -d $(INSTALL_CONF_DIR) ] || mkdir -p $(INSTALL_CONF_DIR)
+ 	[ -d $(INSTALL_ELISP_DIR) ] || mkdir -p $(INSTALL_ELISP_DIR)
+-	[ -d $(INSTALL_RECONF_DIR)/scripts ] || \
+-		mkdir -p $(INSTALL_RECONF_DIR)/scripts
+ 
+ .PHONY: install_mmake
+ install_mmake: Mmake.vars Mmake.rules install_dirs
+@@ -132,7 +126,6 @@
+ 	-for file in $(SCRIPTS); do \
+ 		chmod u+w $(INSTALL_BINDIR)/$$file ;\
+ 	done
+-	cp *.in *.sh-subr $(SCRIPTS) $(INSTALL_RECONF_DIR)/scripts
+ 	-rm -f $(INSTALL_BINDIR)/mmake.old
+ 
+ .PHONY: install_config
diff --git a/dev-lang/mercury/files/mercury-10.04-tests-sandbox.patch b/dev-lang/mercury/files/mercury-10.04-tests-sandbox.patch
new file mode 100644
index 000000000000..fb1c4c05b091
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-10.04-tests-sandbox.patch
@@ -0,0 +1,64 @@
+diff -ur mercury-tests-10.04.orig/hard_coded/dir_test.exp mercury-tests-10.04/hard_coded/dir_test.exp
+--- mercury-tests-10.04.orig/hard_coded/dir_test.exp	2007-09-21 15:21:35.000000000 +1200
++++ mercury-tests-10.04/hard_coded/dir_test.exp	2010-07-19 21:03:29.000000000 +1200
+@@ -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
+ current_directory succeeded: hard_coded
+ make_directory succeeded
+ make_directory succeeded
+diff -ur mercury-tests-10.04.orig/hard_coded/dir_test.exp2 mercury-tests-10.04/hard_coded/dir_test.exp2
+--- mercury-tests-10.04.orig/hard_coded/dir_test.exp2	2007-10-01 18:40:43.000000000 +1300
++++ mercury-tests-10.04/hard_coded/dir_test.exp2	2010-07-19 21:03:29.000000000 +1200
+@@ -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
+ current_directory succeeded: hard_coded
+ make_directory succeeded
+ make_directory succeeded
+diff -ur mercury-tests-10.04.orig/hard_coded/dir_test.exp3 mercury-tests-10.04/hard_coded/dir_test.exp3
+--- mercury-tests-10.04.orig/hard_coded/dir_test.exp3	2007-10-01 18:40:43.000000000 +1300
++++ mercury-tests-10.04/hard_coded/dir_test.exp3	2010-07-19 21:03:30.000000000 +1200
+@@ -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
+ current_directory succeeded: hard_coded
+ make_directory succeeded
+ make_directory succeeded
+diff -ur mercury-tests-10.04.orig/hard_coded/dir_test.exp4 mercury-tests-10.04/hard_coded/dir_test.exp4
+--- mercury-tests-10.04.orig/hard_coded/dir_test.exp4	2010-03-04 13:39:48.000000000 +1300
++++ mercury-tests-10.04/hard_coded/dir_test.exp4	2010-07-19 21:03:30.000000000 +1200
+@@ -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
+ current_directory succeeded: hard_coded
+ make_directory succeeded
+ make_directory succeeded
+diff -ur mercury-tests-10.04.orig/hard_coded/dir_test.m mercury-tests-10.04/hard_coded/dir_test.m
+--- mercury-tests-10.04.orig/hard_coded/dir_test.m	2010-02-09 16:39:39.000000000 +1300
++++ mercury-tests-10.04/hard_coded/dir_test.m	2010-07-19 21:03:30.000000000 +1200
+@@ -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")
+-	),
+-
+ 	% Execute permissions are not handled correctly on all platforms so
+ 	% just check that it doesn't crash.
+ 	io__check_file_accessibility("unwritable",
diff --git a/dev-lang/mercury/files/mercury-10.04-tests-workspace.patch b/dev-lang/mercury/files/mercury-10.04-tests-workspace.patch
new file mode 100644
index 000000000000..253dad2bb348
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-10.04-tests-workspace.patch
@@ -0,0 +1,30 @@
+diff -ur mercury-tests-10.04.orig/Mmake.common mercury-tests-10.04/Mmake.common
+--- mercury-tests-10.04.orig/Mmake.common	2010-02-15 19:49:51.000000000 +1300
++++ mercury-tests-10.04/Mmake.common	2010-07-19 21:03:17.000000000 +1200
+@@ -79,8 +79,8 @@
+ -include $(TESTS_DIR)/Mmake.params
+ 
+ MCFLAGS += --flags $(TESTS_DIR)/TESTS_FLAGS
+-ifdef WORKSPACE_FLAGS
+-MCFLAGS += --flags $(TESTS_DIR)/WS_FLAGS
++ifdef WORKSPACE
++MCFLAGS += --flags $(TESTS_DIR)/WS_FLAGS.ws
+ endif
+ 
+ # Avoid trying to make this file with `mmc --make' if it doesn't exist.
+--- mercury-compiler-10.04.orig/configure	2010-07-18 20:40:26.000000000 +1200
++++ mercury-compiler-10.04/configure	2010-07-19 21:07:50.000000000 +1200
+@@ -14778,10 +14778,10 @@
+     test_flags="tests/TESTS_FLAGS"
+     test_mdbrc="tests/mdbrc"
+ else
+-    if test -e ../tests/TESTS_FLAGS.in
++    if test -e ../mercury-tests-10.04-beta-2010-07-12/TESTS_FLAGS.in
+     then
+-        test_flags="../tests/TESTS_FLAGS"
+-        test_mdbrc="../tests/mdbrc"
++        test_flags="../mercury-tests-10.04-beta-2010-07-12/TESTS_FLAGS"
++        test_mdbrc="../mercury-tests-10.04-beta-2010-07-12/mdbrc"
+     else
+         test_flags=""
+         test_mdbrc=""
diff --git a/dev-lang/mercury/mercury-10.04.ebuild b/dev-lang/mercury/mercury-10.04.ebuild
new file mode 100644
index 000000000000..ac174705d705
--- /dev/null
+++ b/dev-lang/mercury/mercury-10.04.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild,v 1.1 2010/07/19 09:25:31 keri Exp $
+
+inherit elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
+
+MY_P=${PN}-compiler-${PV}
+
+DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
+HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
+SRC_URI="http://www.mercury.cs.mu.oz.au/download/files/${MY_P}.tar.gz
+	test? ( http://www.mercury.cs.mu.oz.au/download/files/mercury-tests-${PV}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+IUSE="debug emacs erlang java minimal readline test threads"
+
+DEPEND="!dev-libs/mpatrol
+	!dev-util/mono-debugger
+	readline? ( sys-libs/readline )
+	erlang? ( dev-lang/erlang )
+	java? ( >=virtual/jdk-1.5 )"
+
+RDEPEND="${DEPEND}
+	emacs? ( virtual/emacs )"
+
+S="${WORKDIR}"/${MY_P}
+TESTDIR="${WORKDIR}"/${PN}-tests-${PV}
+
+SITEFILE=50${PN}-gentoo.el
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}"/${P}-multilib.patch
+	epatch "${FILESDIR}"/${P}-boehm_gc.patch
+	epatch "${FILESDIR}"/${P}-docs.patch
+	epatch "${FILESDIR}"/${P}-no-reconf.patch
+
+	sed -i -e "s/@libdir@/$(get_libdir)/" \
+		"${S}"/compiler/make.program_target.c \
+		"${S}"/scripts/Mmake.vars.in
+
+	if use test; then
+		epatch "${FILESDIR}"/${P}-tests-workspace.patch
+		epatch "${FILESDIR}"/${P}-tests-sandbox.patch
+	fi
+}
+
+src_compile() {
+	strip-flags
+
+	local myconf
+	myconf="--libdir=/usr/$(get_libdir) \
+		--disable-gcc-back-end \
+		--disable-aditi-back-end \
+		--disable-deep-profiler \
+		--disable-dotnet-grades \
+		$(use_enable erlang erlang-grade) \
+		$(use_enable java java-grade) \
+		$(use_enable debug debug-grades) \
+		$(use_enable threads par-grades) \
+		$(use_enable !minimal most-grades) \
+		$(use_with readline)"
+
+	econf \
+		${myconf} \
+		|| die "econf failed"
+	emake \
+		PARALLEL=${MAKEOPTS} \
+		EXTRA_MLFLAGS=--no-strip \
+		|| die "emake failed"
+}
+
+src_test() {
+	TEST_GRADE=`scripts/ml --print-grade`
+	TWS="${S}"
+
+	cd "${TESTDIR}"
+	sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws
+
+	PATH="${TWS}"/scripts:"${TWS}"/util:"${TWS}"/slice:"${PATH}" \
+	TERM="" \
+	WORKSPACE="${TWS}" \
+	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
+	MERCURY_CONFIG_DIR="${TWS}" \
+	MMAKE_DIR="${TWS}"/scripts \
+	MERCURY_SUPPRESS_STACK_TRACE=yes \
+	GRADE=${TEST_GRADE} \
+	MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc \
+					-I${TWS}/boehm_gc/include \
+					-I${TWS}/runtime \
+					-I${TWS}/library \
+					-I${TWS}/mdbcomp \
+					-I${TWS}/browser \
+					-I${TWS}/trace" \
+		mmake || die "mmake test failed"
+}
+
+src_install() {
+	emake \
+		PARALLEL=${MAKEOPTS} \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		INSTALL_PREFIX="${D}"/usr \
+		INSTALL_MAN_DIR="${D}"/usr/share/man \
+		INSTALL_INFO_DIR="${D}"/usr/share/info \
+		INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \
+		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
+		install || die "make install failed"
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+			|| die "elisp-site-file-install failed"
+	fi
+
+	dodoc \
+		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
+		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
+		RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS
+
+	if use erlang; then
+		dodoc README.Erlang
+	fi
+
+	if use java; then
+		dodoc README.java
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-lang/mercury/metadata.xml b/dev-lang/mercury/metadata.xml
index 5391604cf31e..a4822683ecca 100644
--- a/dev-lang/mercury/metadata.xml
+++ b/dev-lang/mercury/metadata.xml
@@ -6,4 +6,7 @@
   <email>keri@gentoo.org</email>
   <name>Keri Harris</name>
 </maintainer>
+<use>
+  <flag name='erlang'>Support Mercury Erlang grade</flag>
+</use>
 </pkgmetadata>