Multilib support of libgrades.

(Portage version: 2.1.2_rc4-r2)

6 files changed, 148 insertions, 406 deletions

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 730845804150..485b440e888d 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,397 +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.74 2007/01/11 08:54:43 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.75 2007/01/13 03:27:40 keri Exp $
 
-  11 Jan 2007; keri <keri@gentoo.org>
-  +files/mercury-0.13.1-tests-workspace.patch, mercury-0.13.1-r1.ebuild:
-  Handle workspace flags when running against the Mercury test-suite.
-
-  09 Jan 2007; keri <keri@gentoo.org> mercury-0.13.1-r1.ebuild:
-  Add ~amd64 to KEYWORDS.
-
-  08 Jan 2007; keri <keri@gentoo.org> files/mercury-0.12.2-bootstrap.patch:
-  Merge unboxed_float fix into bootstrap patch.
-
-  08 Jan 2007; keri <keri@gentoo.org> files/mercury-0.12.2-bootstrap.patch,
-  -files/mercury-0.12.2-unboxed_floats.patch,
-  files/mercury-0.13.1-bootstrap.patch,
-  -files/mercury-0.13.1-unboxed_floats.patch, mercury-0.12.2-r4.ebuild,
-  mercury-0.13.1-r1.ebuild:
-  Do not rebuild C files in a stage1 bootstrap without a Mercury compiler handy.
-
-  07 Jan 2007; keri <keri@gentoo.org>
-  +files/mercury-0.12.2-unboxed_floats.patch,
-  +files/mercury-0.13.1-unboxed_floats.patch, mercury-0.12.2-r4.ebuild,
-  mercury-0.13.1-r1.ebuild:
-  Unboxed float fix on stage1 bootstrap.
-
-  07 Jan 2007; keri <keri@gentoo.org>
-  +files/mercury-0.13.1-tests-dir_test.patch,
-  +files/mercury-0.13.1-tests-ho_and_type_spec_bug.patch,
-  +files/mercury-0.13.1-tests-mdbrc.patch,
-  +files/mercury-0.13.1-tests-string_format.patch,
-  +files/mercury-0.13.1-tests-tabling_inf_recursion.patch,
-  mercury-0.13.1-r1.ebuild:
-  Mercury testcase shakeup.
-
-  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)
-
-  30 Dec 2006; keri <keri@gentoo.org>
-  +files/mercury-0.13.1-profdeep-builtin_throw.patch,
-  +mercury-0.13.1-r1.ebuild:
-  Ensure the proc_layout structure for builtin_throw in exception.m is
-  externally visible.
-
-*mercury-0.12.2-r4 (30 Dec 2006)
-
-  30 Dec 2006; keri <keri@gentoo.org>
-  +files/mercury-0.12.2-profdeep-builtin_throw.patch,
-  +mercury-0.12.2-r4.ebuild:
-  Enable the mercury deep-profiler.
-
-*mercury-0.13.1 (04 Dec 2006)
-
-  04 Dec 2006; keri <keri@gentoo.org> +files/mercury-0.13.1-CFLAGS.patch,
-  +files/mercury-0.13.1-LIBDIR.patch, +files/mercury-0.13.1-MAKEOPTS.patch,
-  +files/mercury-0.13.1-bootstrap.patch,
-  +files/mercury-0.13.1-deep_profiler.patch,
-  +files/mercury-0.13.1-docs.patch, +files/mercury-0.13.1-libgrades.patch,
-  +files/mercury-0.13.1-parallel-install_grades.patch,
-  +files/mercury-0.13.1-portage.patch, +files/mercury-0.13.1-tests.patch,
-  +mercury-0.13.1.ebuild:
-  Version bump.
-
-  23 Nov 2006; keri <keri@gentoo.org>
-  +files/mercury-0.12.2-pic_o-dependencies.patch,
-  +files/mercury-0.13.0-pic_o-dependencies.patch, mercury-0.12.2-r3.ebuild,
-  mercury-0.13.0.ebuild:
-  Generate dependencies on .mh files for both .o and .pic_o files. Reported by
-  M. Edward Borasky <znmeb@cesmail.net> in #154523.
-
-  10 Nov 2006; keri <keri@gentoo.org> mercury-0.13.0.ebuild:
-  Generate _init.c files after all C files have been generated.
-
-  06 Nov 2006; keri <keri@gentoo.org> mercury-0.13.0.ebuild:
-  Disable profdeep grades.
-
-  24 Oct 2006; keri <keri@gentoo.org> -files/mercury-0.12.2-portage.patch,
-  -files/mercury-0.12.2-portage-r1.patch,
-  -files/mercury-0.12.2-portage-r2.patch,
-  -files/mercury-0.13.0-mkinit.patch, -mercury-0.12.2.ebuild,
-  -mercury-0.12.2-r1.ebuild, -mercury-0.12.2-r2.ebuild:
-  Remove old revisions that don't support parallel build.
-
-  23 Oct 2006; keri <keri@gentoo.org>
-  +files/mercury-0.12.2-parallel-install_grades.patch,
-  +files/mercury-0.13.0-parallel-install_grades.patch,
-  mercury-0.12.2-r3.ebuild, mercury-0.13.0.ebuild:
-  Parallelize install_grades target in Mmake.rules.
-
-  19 Oct 2006; keri <keri@gentoo.org> mercury-0.12.2.ebuild,
-  mercury-0.12.2-r1.ebuild, mercury-0.12.2-r2.ebuild,
-  mercury-0.12.2-r3.ebuild, mercury-0.13.0.ebuild:
-  Update SRC_URI.
-
-  18 Oct 2006; Joshua Jackson <tsunam@gentoo.org> mercury-0.12.2-r3.ebuild:
-  Stable x86; bug #149924
-
-  15 Oct 2006; keri <keri@gentoo.org> files/mercury-0.13.0-tests.patch:
-  Do not use the set command in mdbrc.
-
-  14 Oct 2006; keri <keri@gentoo.org> mercury-0.13.0.ebuild:
-  Add ~sparc keyword.
-
-  14 Oct 2006; keri <keri@gentoo.org> mercury-0.13.0.ebuild:
-  Add $(MakeVarName.cs) to InitFile target in dep files for stage2 bootstrap.
-
-  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.
-
-  12 Oct 2006; keri <keri@gentoo.org> files/mercury-0.13.0-libgrades.patch:
-  Update libgrades compilation.
-
-  07 Oct 2006; keri <keri@gentoo.org> mercury-0.12.2-r3.ebuild:
-  Do not pre-strip binaries.
-
-  05 Oct 2006; <nixnut@gentoo.org> mercury-0.12.2-r3.ebuild:
-  Stable on ppc wrt bug 149924
-
-  04 Oct 2006; keri <keri@gentoo.org> mercury-0.12.2-r3.ebuild:
-  Add ~sparc keyword.
-
-  03 Oct 2006; keri <keri@gentoo.org> files/mercury-0.12.2-tests.patch:
-  Fix string_format tests for 64bit architectures.
-
-  03 Oct 2006; keri <keri@gentoo.org> mercury-0.12.2-r3.ebuild:
-  Add ~amd64 keyword.
-
-  18 Sep 2006; keri <keri@gentoo.org> mercury-0.12.2-r3.ebuild:
-  Disable deepprof libgrades.
-
-  17 Sep 2006; keri <keri@gentoo.org>
-  +files/mercury-0.12.2-deep_profiler.patch,
-  +files/mercury-0.13.0-deep_profiler.patch, mercury-0.12.2-r3.ebuild,
-  mercury-0.13.0.ebuild:
-  Add support for Mercury deep profiler.
-
-  16 Sep 2006; keri <keri@gentoo.org>
-  -files/mercury-0.13.0_beta-CFLAGS.patch,
-  -files/mercury-0.13.0_beta-LIBDIR.patch,
-  -files/mercury-0.13.0_beta-MAKEOPTS.patch,
-  -files/mercury-0.13.0_beta-bootstrap.patch,
-  -files/mercury-0.13.0_beta-docs.patch,
-  -files/mercury-0.13.0_beta-libgrades.patch,
-  -files/mercury-0.13.0_beta-portage.patch,
-  -files/mercury-0.13.0_beta-tests.patch,
-  -mercury-0.13.0_beta20060907.ebuild:
-  Remove 0.13.0_beta development snapshot.
-
-  16 Sep 2006; keri <keri@gentoo.org> files/mercury-0.12.2-MAKEOPTS.patch,
-  files/mercury-0.12.2-libgrades.patch, files/mercury-0.13.0-MAKEOPTS.patch,
-  files/mercury-0.13.0-libgrades.patch:
-  Run mmake depend in stage 2 bootstrap.
-
-  16 Sep 2006; keri <keri@gentoo.org> files/mercury-0.12.2-libgrades.patch,
-  files/mercury-0.13.0-libgrades.patch:
-  Parallelize compilation of libgrades.
-
-*mercury-0.13.0 (16 Sep 2006)
-
-  16 Sep 2006; keri <keri@gentoo.org> +files/mercury-0.13.0-CFLAGS.patch,
-  +files/mercury-0.13.0-LIBDIR.patch, +files/mercury-0.13.0-MAKEOPTS.patch,
-  +files/mercury-0.13.0-bootstrap.patch, +files/mercury-0.13.0-docs.patch,
-  +files/mercury-0.13.0-libgrades.patch,
-  +files/mercury-0.13.0-portage.patch, +files/mercury-0.13.0-tests.patch,
-  +mercury-0.13.0.ebuild:
-  Version bump. The mercury-0.13.0 BOOTSTRAP_GRADE supports gcc4.
-
-  11 Sep 2006; keri <keri@gentoo.org> +files/mercury-0.12.2-MAKEOPTS.patch,
-  +files/mercury-0.13.0_beta-MAKEOPTS.patch, mercury-0.12.2-r3.ebuild,
-  mercury-0.13.0_beta20060907.ebuild:
-  Parallelize compilation.
-
-  10 Sep 2006; keri <keri@gentoo.org> files/mercury-0.12.2-bootstrap.patch,
-  files/mercury-0.13.0_beta-bootstrap.patch:
-  Ensure PIC and non-PIC code is not mixed on x86.
-
-*mercury-0.13.0_beta20060907 (09 Sep 2006)
-
-  09 Sep 2006; keri <keri@gentoo.org>
-  files/mercury-0.13.0_beta-portage.patch,
-  -mercury-0.13.0_beta20060811.ebuild, +mercury-0.13.0_beta20060907.ebuild:
-  New development snapshot.
-
-  14 Aug 2006; Keri Harris <keri@gentoo.org>
-  files/mercury-0.12.2-tests.patch, mercury-0.12.2-r3.ebuild:
-  Run test-suite with DEFAULT_GRADE.
-
-  12 Aug 2006; Keri Harris <keri@gentoo.org>
-  +files/mercury-0.13.0_beta-LIBDIR.patch,
-  +files/mercury-0.13.0_beta-bootstrap.patch,
-  +files/mercury-0.13.0_beta-libgrades.patch,
-  files/mercury-0.13.0_beta-portage.patch,
-  mercury-0.13.0_beta20060811.ebuild:
-  Add two-stage bootstrap support.
-
-  12 Aug 2006; Keri Harris <keri@gentoo.org>
-  -mercury-0.13.0_beta20060623.ebuild:
-  Remove old development snapshot.
-
-*mercury-0.13.0_beta20060811 (12 Aug 2006)
-
-  12 Aug 2006; Keri Harris <keri@gentoo.org>
-  +mercury-0.13.0_beta20060811.ebuild:
-  New development snapshot.
-
-*mercury-0.12.2-r3 (12 Aug 2006)
-
-  12 Aug 2006; Keri Harris <keri@gentoo.org>
-  +files/mercury-0.12.2-bootstrap.patch,
-  +files/mercury-0.12.2-libgrades.patch,
-  +files/mercury-0.12.2-portage-r3.patch, +mercury-0.12.2-r3.ebuild:
-  Add two-stage bootstrap support.
-
-*mercury-0.13.0_beta20060623 (25 Jun 2006)
-
-  25 Jun 2006; Keri Harris <keri@gentoo.org>
-  -mercury-0.13.0_beta20060615.ebuild, +mercury-0.13.0_beta20060623.ebuild:
-  New development snapshot.
-
-*mercury-0.13.0_beta20060615 (17 Jun 2006)
-
-  17 Jun 2006; Keri Harris <keri@gentoo.org>
-  -files/mercury-0.13.0_beta-LIBDIR.patch,
-  files/mercury-0.13.0_beta-portage.patch,
-  +files/mercury-0.13.0_beta-tests.patch, mercury-0.12.2-r2.ebuild,
-  -mercury-0.13.0_beta20060609.ebuild, +mercury-0.13.0_beta20060615.ebuild:
-  New development snapshot incorporating support for threaded libgrades and
-  src_test.
-
-  17 Jun 2006; Keri Harris <keri@gentoo.org>
-  +files/mercury-0.12.2-portage-r2.patch, mercury-0.12.2-r2.ebuild:
-  Enable hlc.par.gc libgrade on a minimal install if threading is enabled.
-
-*mercury-0.12.2-r2 (16 Jun 2006)
-
-  16 Jun 2006; Keri Harris <keri@gentoo.org> +mercury-0.12.2-r2.ebuild:
-  Add thread-safe libgrade support.
-
-  14 Jun 2006; Keri Harris <keri@gentoo.org>
-  +files/mercury-0.12.2-portage-r1.patch, +files/mercury-0.12.2-tests.patch,
-  mercury-0.12.2-r1.ebuild:
-  Add src_test support for default libgrade.
-
-*mercury-0.13.0_beta20060609 (12 Jun 2006)
-
-  12 Jun 2006; Keri Harris <keri@gentoo.org>
-  -mercury-0.13.0_beta20060601.ebuild, +mercury-0.13.0_beta20060609.ebuild:
-  New development snapshot.
-
-  09 Jun 2006; Keri Harris <keri@gentoo.org>
-  +files/mercury-0.13.0_beta-LIBDIR.patch,
-  mercury-0.13.0_beta20060601.ebuild:
-  Add debug support to libgrades.
-
-*mercury-0.12.2-r1 (09 Jun 2006)
-
-  09 Jun 2006; Keri Harris <keri@gentoo.org>
-  +files/mercury-0.12.2-LIBDIR.patch, files/mercury-0.12.2-portage.patch,
-  +mercury-0.12.2-r1.ebuild:
-  Add debug support to libgrades. Append ${P} to install_libdir so that
-  mercury-extras can be upgraded.
-
-  04 Jun 2006; Keri Harris <keri@gentoo.org>
-  -mercury-0.13.0_beta20060517.ebuild, -mercury-0.13.0_beta20060525.ebuild:
-  Remove old development snapshots.
-
-*mercury-0.13.0_beta20060601 (04 Jun 2006)
-
-  04 Jun 2006; Keri Harris <keri@gentoo.org>
-  +mercury-0.13.0_beta20060601.ebuild:
-  New development snapshot.
-
-*mercury-0.13.0_beta20060525 (27 May 2006)
-
-  27 May 2006; Keri Harris <keri@gentoo.org>
-  +mercury-0.13.0_beta20060525.ebuild:
-  New development snapshot.
-
-  20 May 2006; Keri Harris <keri@gentoo.org>
-  -mercury-0.13.0_beta20060501.ebuild, -mercury-0.13.0_beta20060511.ebuild:
-  Remove old development snapshots from the tree.
-
-*mercury-0.13.0_beta20060517 (20 May 2006)
-
-  20 May 2006; Keri Harris <keri@gentoo.org>
-  +mercury-0.13.0_beta20060517.ebuild:
-  New development snapshot.
-
-*mercury-0.13.0_beta20060511 (13 May 2006)
-
-  13 May 2006; Keri Harris <keri@gentoo.org>
-  +mercury-0.13.0_beta20060511.ebuild:
-  New development snapshot.
-
-  13 May 2006; Keri Harris <keri@gentoo.org>
-  mercury-0.13.0_beta20060501.ebuild:
-  Change upstream SRC_URI.
-
-  13 May 2006; Keri Harris <keri@gentoo.org> -mercury-0.13.0_beta5.ebuild,
-  -mercury-0.13.0_beta6.ebuild, -mercury-0.13.0_beta7.ebuild,
-  -mercury-0.13.0_beta8.ebuild:
-  Remove old development snapshots from the tree.
-
-*mercury-0.13.0_beta20060501 (13 May 2006)
-
-  13 May 2006; Keri Harris <keri@gentoo.org>
-  +mercury-0.13.0_beta20060501.ebuild:
-  New development snapshot.
-
-*mercury-0.13.0_beta8 (02 May 2006)
-
-  02 May 2006; Keri Harris <keri@gentoo.org> +mercury-0.13.0_beta8.ebuild:
-  New development snapshot.
-
-*mercury-0.13.0_beta7 (29 Apr 2006)
-
-  29 Apr 2006; Keri Harris <keri@gentoo.org> +mercury-0.13.0_beta7.ebuild:
-  New development snapshot.
-
-  27 Apr 2006; Marien Zwart <marienz@gentoo.org> Manifest:
-  Fixing SHA256 digest, pass four
-
-*mercury-0.13.0_beta6 (26 Apr 2006)
-
-  26 Apr 2006; Keri Harris <keri@gentoo.org> +mercury-0.13.0_beta6.ebuild:
-  New development snapshot.
-
-  25 Apr 2006; Keri Harris <keri@gentoo.org> -mercury-0.13.0_beta.ebuild,
-  -mercury-0.13.0_beta-r1.ebuild, -mercury-0.13.0_beta2.ebuild,
-  -mercury-0.13.0_beta3.ebuild, -mercury-0.13.0_beta4.ebuild:
-  Remove old development snapshots from the tree.
-
-*mercury-0.13.0_beta5 (25 Apr 2006)
-
-  25 Apr 2006; Keri Harris <keri@gentoo.org> +mercury-0.13.0_beta5.ebuild:
-  New development snapshot.
-
-*mercury-0.13.0_beta4 (22 Apr 2006)
-
-  22 Apr 2006; Keri Harris <keri@gentoo.org> +mercury-0.13.0_beta4.ebuild:
-  New development snapshot.
-
-*mercury-0.13.0_beta3 (20 Apr 2006)
-
-  20 Apr 2006; Keri Harris <keri@gentoo.org> +mercury-0.13.0_beta3.ebuild:
-  New development snapshot.
-
-*mercury-0.13.0_beta2 (19 Apr 2006)
-
-  19 Apr 2006; Keri Harris <keri@gentoo.org> +mercury-0.13.0_beta2.ebuild:
-  New development snapshot.
-
-*mercury-0.13.0_beta-r1 (13 Apr 2006)
-
-  13 Apr 2006; Keri Harris <keri@gentoo.org> +mercury-0.13.0_beta-r1.ebuild:
-  Revbump to new development snapshot.
-
-*mercury-0.13.0_beta (07 Apr 2006)
-
-  07 Apr 2006; Keri Harris <keri@gentoo.org>
-  +files/mercury-0.13.0_beta-CFLAGS.patch,
-  +files/mercury-0.13.0_beta-docs.patch,
-  +files/mercury-0.13.0_beta-portage.patch, +mercury-0.13.0_beta.ebuild:
-  Version bump to development release.
-
-  27 Mar 2006; Keri Harris <keri@gentoo.org> mercury-0.12.2.ebuild:
-  Explicitly disable building dotnet grades. Thanks to Brian Danilko
-  <brian@likeablesoftware.com> in bug #127673
-
-  25 Mar 2006; Keri Harris <keri@gentoo.org> mercury-0.12.2.ebuild:
-  Add ~ppc keyword.
-
-  24 Mar 2006; Keri Harris <keri@gentoo.org> mercury-0.12.2.ebuild:
-  Updated install paths to respect ${PF}.
-
-*mercury-0.12.2 (23 Mar 2006)
-
-  23 Mar 2006; Keri Harris <keri@gentoo.org>
-  +files/mercury-0.12.2-CFLAGS.patch, +files/mercury-0.12.2-docs.patch,
-  +files/mercury-0.12.2-portage.patch, +metadata.xml,
-  +mercury-0.12.2.ebuild:
-  New ebuild. Based on an ebuild submitted by Ryan Kelly in bug #121234
+  13 Jan 2007; keri <keri@gentoo.org> -files/mercury-0.12.2-LIBDIR.patch,
+  +files/mercury-0.12.2-multilib.patch,
+  +files/mercury-0.13.1-multilib.patch, mercury-0.12.2-r3.ebuild,
+  mercury-0.12.2-r4.ebuild, mercury-0.13.1-r1.ebuild:
+  Multilib support of libgrades.
 
diff --git a/dev-lang/mercury/files/mercury-0.12.2-multilib.patch b/dev-lang/mercury/files/mercury-0.12.2-multilib.patch
new file mode 100644
index 000000000000..9b8444d3bb7d
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.12.2-multilib.patch
@@ -0,0 +1,63 @@
+--- mercury-compiler-0.12.2.orig/Mmake.common.in	2006-01-18 18:37:34.000000000 +1300
++++ mercury-compiler-0.12.2/Mmake.common.in	2007-01-13 12:56:45.000000000 +1300
+@@ -118,8 +118,8 @@
+ # Set the installation prefix. This is done here as well as
+ # in scripts/Mmake.vars to avoid accidentally overwriting an
+ # existing installation when using an installed mmake.
+-INSTALL_PREFIX		= @prefix@
+-FINAL_INSTALL_PREFIX	= @prefix@
++INSTALL_PREFIX		=
++FINAL_INSTALL_PREFIX	=
+ 
+ #-----------------------------------------------------------------------------#
+ 
+--- mercury-compiler-0.12.2.orig/configure	2006-01-25 17:24:01.000000000 +1300
++++ mercury-compiler-0.12.2/configure	2006-06-06 20:57:45.000000000 +1200
+@@ -1599,7 +1599,7 @@
+ 
+ 
+ PREFIX="`$CYGPATH $PREFIX`"
+-LIBDIR="`$CYGPATH $PREFIX/lib/mercury`"
++LIBDIR="`$CYGPATH $libdir/mercury-$PACKAGE_VERSION`"
+ NONSHARED_LIB_DIR=${MERCURY_NONSHARED_LIB_DIR=$PREFIX/lib/nonshared}
+ 
+ 
+--- mercury-compiler-0.12.2.orig/scripts/Mmake.vars.in	2005-08-17 03:57:40.000000000 +1200
++++ mercury-compiler-0.12.2/scripts/Mmake.vars.in	2007-01-13 12:58:12.000000000 +1300
+@@ -713,21 +713,21 @@
+ # script (e.g. in the shell scripts mmc, ml, mmake, etc) that will not
+ # be updated simply by overriding INSTALL_PREFIX.
+ 
+-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_JAVA_LIBRARY_DIR= $(INSTALL_PREFIX)/lib/mercury/lib/java
+-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_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_PREFIX		=
++FINAL_INSTALL_PREFIX	=
++INSTALL_BINDIR		= $(INSTALL_PREFIX)/@prefix@/bin
++INSTALL_LIBDIR		= $(INSTALL_PREFIX)/@libdir@/mercury-@PACKAGE_VERSION@
++FINAL_INSTALL_LIBDIR	= $(FINAL_INSTALL_PREFIX)/@libdir@/mercury-@PACKAGE_VERSION@
++INSTALL_JAVA_LIBRARY_DIR= $(INSTALL_LIBDIR)/lib/java
++INSTALL_INFO_DIR	= $(INSTALL_PREFIX)/@prefix@/info
++INSTALL_DVI_DIR		= $(INSTALL_LIBDIR)/doc
++INSTALL_TEXT_DIR	= $(INSTALL_LIBDIR)/doc
++INSTALL_PS_DIR		= $(INSTALL_LIBDIR)/doc
++INSTALL_PDF_DIR		= $(INSTALL_LIBDIR)/doc
++INSTALL_MAN_DIR		= $(INSTALL_PREFIX)/@prefix@/man
++INSTALL_HTML_DIR	= $(INSTALL_LIBDIR)/html
++INSTALL_MDB_DOC_DIR	= $(INSTALL_LIBDIR)/mdb
++INSTALL_ELISP_DIR	= $(INSTALL_LIBDIR)/elisp
+ INSTALL_CGI_DIR		= @CGIDIR@
+ 
+ # You should not need to override anything below here
diff --git a/dev-lang/mercury/files/mercury-0.13.1-multilib.patch b/dev-lang/mercury/files/mercury-0.13.1-multilib.patch
new file mode 100644
index 000000000000..195220801c9a
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.13.1-multilib.patch
@@ -0,0 +1,63 @@
+--- mercury-compiler-0.13.1.orig/Mmake.common.in	2006-08-07 16:47:53.000000000 +1200
++++ mercury-compiler-0.13.1/Mmake.common.in	2007-01-13 12:50:48.000000000 +1300
+@@ -118,8 +118,8 @@
+ # Set the installation prefix. This is done here as well as
+ # in scripts/Mmake.vars to avoid accidentally overwriting an
+ # existing installation when using an installed mmake.
+-INSTALL_PREFIX		= @prefix@
+-FINAL_INSTALL_PREFIX	= @prefix@
++INSTALL_PREFIX		=
++FINAL_INSTALL_PREFIX	=
+ 
+ INSTALLABLE_PREFIX	= @INSTALLABLE_PREFIX@
+ 
+--- mercury-compiler-0.13.1.orig/configure	2007-01-07 16:27:24.000000000 +1300
++++ mercury-compiler-0.13.1/configure	2007-01-13 07:47:11.000000000 +1300
+@@ -1609,7 +1609,7 @@
+ 
+ 
+ PREFIX="`$CYGPATH $PREFIX`"
+-LIBDIR="`$CYGPATH $PREFIX/lib/mercury`"
++LIBDIR="`$CYGPATH $libdir/mercury-$PACKAGE_VERSION`"
+ NONSHARED_LIB_DIR=${MERCURY_NONSHARED_LIB_DIR=$PREFIX/lib/nonshared}
+ 
+ 
+--- mercury-compiler-0.13.1.orig/scripts/Mmake.vars.in	2006-11-03 18:42:28.000000000 +1300
++++ mercury-compiler-0.13.1/scripts/Mmake.vars.in	2007-01-13 12:54:16.000000000 +1300
+@@ -714,21 +714,21 @@
+ # script (e.g. in the shell scripts mmc, ml, mmake, etc) that will not
+ # be updated simply by overriding INSTALL_PREFIX.
+ 
+-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_JAVA_LIBRARY_DIR= $(INSTALL_PREFIX)/lib/mercury/lib/java
+-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_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_PREFIX		=
++FINAL_INSTALL_PREFIX	=
++INSTALL_BINDIR		= $(INSTALL_PREFIX)/@prefix/bin
++INSTALL_LIBDIR		= $(INSTALL_PREFIX)/@libdir@/mercury-@PACKAGE_VERSION@
++FINAL_INSTALL_LIBDIR	= $(FINAL_INSTALL_PREFIX)/@libdir@/mercury-@PACKAGE_VERSION@
++INSTALL_JAVA_LIBRARY_DIR= $(INSTALL_LIBDIR)/lib/java
++INSTALL_INFO_DIR	= $(INSTALL_PREFIX)/@prefix@/info
++INSTALL_DVI_DIR		= $(INSTALL_LIBDIR)/doc
++INSTALL_TEXT_DIR	= $(INSTALL_LIBDIR)/doc
++INSTALL_PS_DIR		= $(INSTALL_LIBDIR)/doc
++INSTALL_PDF_DIR		= $(INSTALL_LIBDIR)/doc
++INSTALL_MAN_DIR		= $(INSTALL_PREFIX)/@prefix@/man
++INSTALL_HTML_DIR	= $(INSTALL_LIBDIR)/html
++INSTALL_MDB_DOC_DIR	= $(INSTALL_LIBDIR)/mdb
++INSTALL_ELISP_DIR	= $(INSTALL_LIBDIR)/elisp
+ INSTALL_CGI_DIR		= @CGIDIR@
+ 
+ # You should not need to override anything below here
diff --git a/dev-lang/mercury/mercury-0.12.2-r3.ebuild b/dev-lang/mercury/mercury-0.12.2-r3.ebuild
index ce69eb388ae9..de5ca615b6c0 100644
--- a/dev-lang/mercury/mercury-0.12.2-r3.ebuild
+++ b/dev-lang/mercury/mercury-0.12.2-r3.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-r3.ebuild,v 1.13 2006/11/23 09:16:40 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.12.2-r3.ebuild,v 1.14 2007/01/13 03:27:40 keri Exp $
 
 inherit eutils
 
@@ -30,7 +30,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-CFLAGS.patch
 	epatch "${FILESDIR}"/${P}-MAKEOPTS.patch
 	epatch "${FILESDIR}"/${P}-bootstrap.patch
-	epatch "${FILESDIR}"/${P}-LIBDIR.patch
+	epatch "${FILESDIR}"/${P}-multilib.patch
 	epatch "${FILESDIR}"/${P}-libgrades.patch
 	epatch "${FILESDIR}"/${P}-parallel-install_grades.patch
 	epatch "${FILESDIR}"/${P}-deep_profiler.patch
@@ -43,7 +43,8 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	myconf="--disable-gcc-back-end \
+	myconf="--libdir=/usr/$(get_libdir) \
+		--disable-gcc-back-end \
 		--enable-aditi-back-end \
 		--disable-deep-profiler \
 		--disable-dotnet-grades \
@@ -108,7 +109,7 @@ src_test() {
 
 src_install() {
 	make \
-		INSTALL_PREFIX="${D}"/usr \
+		INSTALL_PREFIX="${D}" \
 		INSTALL_MAN_DIR="${D}"/usr/share/man \
 		INSTALL_INFO_DIR="${D}"/usr/share/info \
 		INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \
diff --git a/dev-lang/mercury/mercury-0.12.2-r4.ebuild b/dev-lang/mercury/mercury-0.12.2-r4.ebuild
index 9d6daee54bee..dc6ac3077f96 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-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.4 2007/01/08 06:27:34 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.12.2-r4.ebuild,v 1.5 2007/01/13 03:27:40 keri Exp $
 
 inherit eutils
 
@@ -29,7 +29,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-CFLAGS.patch
 	epatch "${FILESDIR}"/${P}-MAKEOPTS.patch
 	epatch "${FILESDIR}"/${P}-bootstrap.patch
-	epatch "${FILESDIR}"/${P}-LIBDIR.patch
+	epatch "${FILESDIR}"/${P}-multilib.patch
 	epatch "${FILESDIR}"/${P}-libgrades.patch
 	epatch "${FILESDIR}"/${P}-parallel-install_grades.patch
 	epatch "${FILESDIR}"/${P}-deep_profiler.patch
@@ -45,7 +45,8 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	myconf="--disable-gcc-back-end \
+	myconf="--libdir=/usr/$(get_libdir) \
+		--disable-gcc-back-end \
 		--enable-aditi-back-end \
 		--enable-deep-profiler \
 		--disable-dotnet-grades \
@@ -111,7 +112,7 @@ src_test() {
 
 src_install() {
 	make \
-		INSTALL_PREFIX="${D}"/usr \
+		INSTALL_PREFIX="${D}" \
 		INSTALL_MAN_DIR="${D}"/usr/share/man \
 		INSTALL_INFO_DIR="${D}"/usr/share/info \
 		INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \
diff --git a/dev-lang/mercury/mercury-0.13.1-r1.ebuild b/dev-lang/mercury/mercury-0.13.1-r1.ebuild
index 8b1c0037fb72..20aa6fc8d86d 100644
--- a/dev-lang/mercury/mercury-0.13.1-r1.ebuild
+++ b/dev-lang/mercury/mercury-0.13.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.13.1-r1.ebuild,v 1.6 2007/01/11 08:54:43 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.13.1-r1.ebuild,v 1.7 2007/01/13 03:27:40 keri Exp $
 
 inherit eutils
 
@@ -29,7 +29,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-CFLAGS.patch
 	epatch "${FILESDIR}"/${P}-MAKEOPTS.patch
 	epatch "${FILESDIR}"/${P}-bootstrap.patch
-	epatch "${FILESDIR}"/${P}-LIBDIR.patch
+	epatch "${FILESDIR}"/${P}-multilib.patch
 	epatch "${FILESDIR}"/${P}-libgrades.patch
 	epatch "${FILESDIR}"/${P}-parallel-install_grades.patch
 	epatch "${FILESDIR}"/${P}-deep_profiler.patch
@@ -45,7 +45,8 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	myconf="--disable-gcc-back-end \
+	myconf="--libdir=/usr/$(get_libdir) \
+		--disable-gcc-back-end \
 		--enable-aditi-back-end \
 		--enable-deep-profiler \
 		--disable-dotnet-grades \
@@ -120,7 +121,7 @@ src_test() {
 
 src_install() {
 	make \
-		INSTALL_PREFIX="${D}"/usr \
+		INSTALL_PREFIX="${D}" \
 		INSTALL_MAN_DIR="${D}"/usr/share/man \
 		INSTALL_INFO_DIR="${D}"/usr/share/info \
 		INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \