Remove 0.13.0_beta development snapshot.

Package-Manager: portage-2.1.1

11 files changed, 4 insertions, 864 deletions

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 94d54370027a..c29558469b9e 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -74,43 +74,9 @@ AUX mercury-0.13.0-tests.patch 5622 RMD160 12476b3fe37640b965e44e1cc3b3b586a2d60
 MD5 0e25ada5c94c4b208c7608e3f59e3f5f files/mercury-0.13.0-tests.patch 5622
 RMD160 12476b3fe37640b965e44e1cc3b3b586a2d60cc4 files/mercury-0.13.0-tests.patch 5622
 SHA256 151095a7a4b2c3f46960ae6a129733533fee7d04958660eac51dadc0eaace1a4 files/mercury-0.13.0-tests.patch 5622
-AUX mercury-0.13.0_beta-CFLAGS.patch 1387 RMD160 50beda679059cfa2f1c4c0868c34d7fcad147336 SHA1 ccde9305e9ee1b1705ffc96de36fbb766dc1f12e SHA256 aa3e882f2590d2962b2421495f92d1ae24030799e829f72caf5a55b17fcdea58
-MD5 978c7b688fa22fbf08bbd85f052cc603 files/mercury-0.13.0_beta-CFLAGS.patch 1387
-RMD160 50beda679059cfa2f1c4c0868c34d7fcad147336 files/mercury-0.13.0_beta-CFLAGS.patch 1387
-SHA256 aa3e882f2590d2962b2421495f92d1ae24030799e829f72caf5a55b17fcdea58 files/mercury-0.13.0_beta-CFLAGS.patch 1387
-AUX mercury-0.13.0_beta-LIBDIR.patch 2532 RMD160 81f976dc646a1cc8f2917388ca788f6aa6965df5 SHA1 194eb109e0ace3fde4e294cebdf1ac0530215902 SHA256 2ee03ae0663265ffefc765431939a0debafc32f9ea5aa1e0ab3a83f5b896ae6f
-MD5 163d4559496e9293a1db517ad609a285 files/mercury-0.13.0_beta-LIBDIR.patch 2532
-RMD160 81f976dc646a1cc8f2917388ca788f6aa6965df5 files/mercury-0.13.0_beta-LIBDIR.patch 2532
-SHA256 2ee03ae0663265ffefc765431939a0debafc32f9ea5aa1e0ab3a83f5b896ae6f files/mercury-0.13.0_beta-LIBDIR.patch 2532
-AUX mercury-0.13.0_beta-MAKEOPTS.patch 448 RMD160 763af01d20a4af34c7611f4c39bf7e1af9b8025f SHA1 78f5dbbe4ab150889ea5bf5bfc940331150c8526 SHA256 517f60c870df7b2519219a1b43f3c7cf497227eb6573ac750e876ea67ef60bf0
-MD5 de94caee5d69783a86cb94f615a1c385 files/mercury-0.13.0_beta-MAKEOPTS.patch 448
-RMD160 763af01d20a4af34c7611f4c39bf7e1af9b8025f files/mercury-0.13.0_beta-MAKEOPTS.patch 448
-SHA256 517f60c870df7b2519219a1b43f3c7cf497227eb6573ac750e876ea67ef60bf0 files/mercury-0.13.0_beta-MAKEOPTS.patch 448
-AUX mercury-0.13.0_beta-bootstrap.patch 2308 RMD160 c54c251d85b58bd62de130e696c8660ecbde55db SHA1 ef5353782993f17fcbf6952ef22d325dd55e8860 SHA256 0534f04039986d9bccc38dd3d6ba6e2f3c9b2e7d6e38042c1bc7eea1942b109e
-MD5 86302eb3e5b9a8513d0eb61e4ec333de files/mercury-0.13.0_beta-bootstrap.patch 2308
-RMD160 c54c251d85b58bd62de130e696c8660ecbde55db files/mercury-0.13.0_beta-bootstrap.patch 2308
-SHA256 0534f04039986d9bccc38dd3d6ba6e2f3c9b2e7d6e38042c1bc7eea1942b109e files/mercury-0.13.0_beta-bootstrap.patch 2308
-AUX mercury-0.13.0_beta-docs.patch 828 RMD160 451ce70dc6f2121f6585d3633693c289b584db47 SHA1 29556a9a7aa2d568c37f0a9df33f16c10bfee906 SHA256 0dd010fa6acdef885b2bca5d79c4bb7b2b3aba2b2569e17035de1fbd0d32cbf7
-MD5 825e199f587b2ceb1521e68ac78ec58a files/mercury-0.13.0_beta-docs.patch 828
-RMD160 451ce70dc6f2121f6585d3633693c289b584db47 files/mercury-0.13.0_beta-docs.patch 828
-SHA256 0dd010fa6acdef885b2bca5d79c4bb7b2b3aba2b2569e17035de1fbd0d32cbf7 files/mercury-0.13.0_beta-docs.patch 828
-AUX mercury-0.13.0_beta-libgrades.patch 14159 RMD160 17809af8c3d9d63bf3f3262bc17d46b0c38ec22e SHA1 97ee4f3d2a18b939ebcfb1930fbd30f83942c059 SHA256 49c706cdcdb3520bd0def117a00c287dda078d7c42aa91e977494b5db5d31df2
-MD5 26763e08a1559f216988e104d508722c files/mercury-0.13.0_beta-libgrades.patch 14159
-RMD160 17809af8c3d9d63bf3f3262bc17d46b0c38ec22e files/mercury-0.13.0_beta-libgrades.patch 14159
-SHA256 49c706cdcdb3520bd0def117a00c287dda078d7c42aa91e977494b5db5d31df2 files/mercury-0.13.0_beta-libgrades.patch 14159
-AUX mercury-0.13.0_beta-portage.patch 2927 RMD160 65703a76b9518c94601ddd0990b7f01ac1e50b76 SHA1 27becd12a50838821f28f56c8ed7c4f779bb4a98 SHA256 4f69c979ea2675840b47242a36c0e16834d67b17d42c10d3016c8a8e93f495c5
-MD5 dcc8baca5095fd65744a043a8db8b3fc files/mercury-0.13.0_beta-portage.patch 2927
-RMD160 65703a76b9518c94601ddd0990b7f01ac1e50b76 files/mercury-0.13.0_beta-portage.patch 2927
-SHA256 4f69c979ea2675840b47242a36c0e16834d67b17d42c10d3016c8a8e93f495c5 files/mercury-0.13.0_beta-portage.patch 2927
-AUX mercury-0.13.0_beta-tests.patch 3337 RMD160 de647925736743ba92a53406a08755bc730dc1ce SHA1 fa239fb6411688d467a11221893d537393fa67e6 SHA256 f8f18efe6c92d23859c11f6944fcbead3b72b7967c019705f7be2d8d9d616f99
-MD5 9a7bd847f572b23244f6ee930a6f7f35 files/mercury-0.13.0_beta-tests.patch 3337
-RMD160 de647925736743ba92a53406a08755bc730dc1ce files/mercury-0.13.0_beta-tests.patch 3337
-SHA256 f8f18efe6c92d23859c11f6944fcbead3b72b7967c019705f7be2d8d9d616f99 files/mercury-0.13.0_beta-tests.patch 3337
 DIST mercury-compiler-0.12.2.tar.gz 15074997 RMD160 227a3e1796d96ad77324d9f1d39efd6be7fce80e SHA1 96b7a878370bb256da28c8ffa1c4b0a4bc3711d6 SHA256 7fa1df8030cdc3d4dc848d102ba64bf23c12004461c985290622b81753b89572
-DIST mercury-compiler-0.13.0-beta-2006-09-07-unstable.tar.gz 15857850 RMD160 9a2670470a44b72c3211441432db76668b3257b7 SHA1 2dbd9605b48f740d1d9d6221907442d8c5049734 SHA256 8d15feb50d65f4f36d90b2302c39a3b0586ddcc54a7e8f323596769cc1608bf2
 DIST mercury-compiler-0.13.0.tar.gz 15861463 RMD160 4fa5f45d6c7496679bc1e957bb45541020244d5b SHA1 7a9362225e1b51d7d1b342c39203ad0ef1b9f952 SHA256 0edf3855dab94f4562d972a3a401dff2f722a2b20b1617b6c4ce9ba68e576342
 DIST mercury-tests-0.12.2.tar.gz 897454 RMD160 e7cf515b0d56aff5432c5ec3e535faa907ce2955 SHA1 1f80ff38f141b975fe472c2aee48d44b8e187c08 SHA256 6d3fd92d11ce2a9ce99cfa35990027557d1c70f00a3417639523b6e27f746280
-DIST mercury-tests-0.13.0-beta-2006-09-07-unstable.tar.gz 984222 RMD160 2de938d2935f84dd803d61d43dcd67e55d61c6c2 SHA1 b2d0a22c08265626831a1e562095a7000701a866 SHA256 cfc6efc9006e6be6e2355b477c81d91b47fea961396bdb5cf9342dd8a32be2b6
 DIST mercury-tests-0.13.0.tar.gz 984910 RMD160 1b90b941488b9da57ff27ab1506b902b5fa5e170 SHA1 df5fa6725bb37fdba8085a441687bf056111e4e7 SHA256 227561407d63d177e6bfdf08d58481a9dcf6228d225ca2b67643c1af16cedc08
 EBUILD mercury-0.12.2-r1.ebuild 2004 RMD160 df7e09f85f3748560f9282b667c76b87b05948d1 SHA1 394830e247c97b6893bff8da65346d041298193d SHA256 9aae052739461b696b10863110da7eab47406c6a629ce36d8792f258af0d2eeb
 MD5 8ac12895463559881728628ff9ce81cf mercury-0.12.2-r1.ebuild 2004
@@ -132,14 +98,10 @@ EBUILD mercury-0.13.0.ebuild 2948 RMD160 a1e8284e5631df2601845ee8966cb228fc1dc4f
 MD5 752631c0a497b9097f1090fbaf57c0c8 mercury-0.13.0.ebuild 2948
 RMD160 a1e8284e5631df2601845ee8966cb228fc1dc4fe mercury-0.13.0.ebuild 2948
 SHA256 dac4b76556b373e6d9beb3f8e20f678e972503f1f9bc606e136d523022da849f mercury-0.13.0.ebuild 2948
-EBUILD mercury-0.13.0_beta20060907.ebuild 3048 RMD160 5a8c72dcd30837ad978bb1d1257be7bcd90f9a88 SHA1 c45c5edea4beac76027c153bafcd774f6242291d SHA256 86208f1dc63b95bb8959ca1ead8a07c92360e7bf6a4e4202f781e351b01c8273
-MD5 76e04ddc308370c24262486d9f62c71e mercury-0.13.0_beta20060907.ebuild 3048
-RMD160 5a8c72dcd30837ad978bb1d1257be7bcd90f9a88 mercury-0.13.0_beta20060907.ebuild 3048
-SHA256 86208f1dc63b95bb8959ca1ead8a07c92360e7bf6a4e4202f781e351b01c8273 mercury-0.13.0_beta20060907.ebuild 3048
-MISC ChangeLog 8331 RMD160 bcea59383c8478ff60f85b5a6c4dc5d8214216f8 SHA1 269db62fcb824783ee4ef5f0c587be3af9520cf6 SHA256 cdb432452159e4077148dd43efd045794ecdb3e5c93078f8a7cc208f93d0e534
-MD5 4eed54301903e2866d1714fecb26c399 ChangeLog 8331
-RMD160 bcea59383c8478ff60f85b5a6c4dc5d8214216f8 ChangeLog 8331
-SHA256 cdb432452159e4077148dd43efd045794ecdb3e5c93078f8a7cc208f93d0e534 ChangeLog 8331
+MISC ChangeLog 8802 RMD160 c02b2cf35b05f476d0b58ba885b43ec5c4e5ef2b SHA1 69bebdea88f29fbf4b3e2133c49648431e2d3f48 SHA256 5a7873184685b5223103d4a009a8db87e5d000fd66613d2d8de3f31dcabe1ae5
+MD5 497cd62472582123e913a00532795d4b ChangeLog 8802
+RMD160 c02b2cf35b05f476d0b58ba885b43ec5c4e5ef2b ChangeLog 8802
+SHA256 5a7873184685b5223103d4a009a8db87e5d000fd66613d2d8de3f31dcabe1ae5 ChangeLog 8802
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
 MD5 6fca20d17d6d55a28537204aa9bb626f metadata.xml 247
 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 metadata.xml 247
@@ -159,6 +121,3 @@ SHA256 76206eb085f179635a04f8ad1b2b53b1e4a2b4e1dccab1d25bac557e609f7df2 files/di
 MD5 abd1c2293e5003b768dcb1eb1887b169 files/digest-mercury-0.13.0 539
 RMD160 236f26377c7b9be80a71be194ffc81a5e17e951c files/digest-mercury-0.13.0 539
 SHA256 d1aea703e42770341422638e334bea55c6ec6e502d4bd15ef3667d675a903a06 files/digest-mercury-0.13.0 539
-MD5 56f68238cf771fbdcd3cfa656814b0c0 files/digest-mercury-0.13.0_beta20060907 689
-RMD160 e85686f4d8e772bcd5cc995bdaed42e2f8d5a58c files/digest-mercury-0.13.0_beta20060907 689
-SHA256 78656c61b0503c95f38812a5a1a0e39ad70e53ca600bc751f2d8caf402b9cc54 files/digest-mercury-0.13.0_beta20060907 689
diff --git a/dev-lang/mercury/files/digest-mercury-0.13.0_beta20060907 b/dev-lang/mercury/files/digest-mercury-0.13.0_beta20060907
deleted file mode 100644
index 97de7a41662a..000000000000
--- a/dev-lang/mercury/files/digest-mercury-0.13.0_beta20060907
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 3a719d8147092ac7a2e072b1e0b913e4 mercury-compiler-0.13.0-beta-2006-09-07-unstable.tar.gz 15857850
-RMD160 9a2670470a44b72c3211441432db76668b3257b7 mercury-compiler-0.13.0-beta-2006-09-07-unstable.tar.gz 15857850
-SHA256 8d15feb50d65f4f36d90b2302c39a3b0586ddcc54a7e8f323596769cc1608bf2 mercury-compiler-0.13.0-beta-2006-09-07-unstable.tar.gz 15857850
-MD5 b7ea755fb3043173857c158332695097 mercury-tests-0.13.0-beta-2006-09-07-unstable.tar.gz 984222
-RMD160 2de938d2935f84dd803d61d43dcd67e55d61c6c2 mercury-tests-0.13.0-beta-2006-09-07-unstable.tar.gz 984222
-SHA256 cfc6efc9006e6be6e2355b477c81d91b47fea961396bdb5cf9342dd8a32be2b6 mercury-tests-0.13.0-beta-2006-09-07-unstable.tar.gz 984222
diff --git a/dev-lang/mercury/files/mercury-0.13.0_beta-CFLAGS.patch b/dev-lang/mercury/files/mercury-0.13.0_beta-CFLAGS.patch
deleted file mode 100644
index cac785ea102f..000000000000
--- a/dev-lang/mercury/files/mercury-0.13.0_beta-CFLAGS.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- mercury-compiler-0.13.0-beta-2006-04-03.orig/scripts/mgnuc.in	2006-01-25 17:57:48.000000000 +1300
-+++ mercury-compiler-0.13.0-beta-2006-04-03/scripts/mgnuc.in	2006-04-04 22:39:40.000000000 +1200
-@@ -53,7 +53,7 @@
- # -Wenum-clash          is for C++ only
- # -Wunused              causes various spurious warnings
- 
--        OPT_OPTS="-O2 $CFLAGS_FOR_NO_STRICT_ALIASING -fomit-frame-pointer"
-+        OPT_OPTS="@CFLAGS_FOR_OPT@"
-         DEBUG_OPT="-g"
-         COMPILER=gcc
-         ;;
---- mercury-compiler-0.13.0-beta-2006-04-03.orig/configure	2006-04-03 22:37:02.000000000 +1200
-+++ mercury-compiler-0.13.0-beta-2006-04-03/configure	2006-04-04 22:42:25.000000000 +1200
-@@ -3739,7 +3739,7 @@
- # the `-lc' and `-lg' libraries have different contents; specifically,
- # only the latter contains memalign().  We need to make sure that the
- # test for memalign() doesn't use `-g', since `ml' doesn't use `-g'.
--CFLAGS="-O"
-+# CFLAGS="-O"
- 
- # we also need to add the appropriate `-I' options so that the test programs
- # can #include various Mercury runtime headers.
-@@ -10005,7 +10005,7 @@
- 		# enable, and why, see scripts/mgnuc.in.
- 		CFLAGS_FOR_WARNINGS="-Wall -Wwrite-strings -Wshadow -Wmissing-prototypes -Wno-unused -Wno-uninitialized -Wstrict-prototypes"
- 
--		CFLAGS_FOR_OPT="-O2 -fomit-frame-pointer"
-+		CFLAGS_FOR_OPT="$CFLAGS"
- 		CFLAGS_FOR_DEBUG="-g"
- 		MCFLAGS_FOR_CC=
- 		;;
diff --git a/dev-lang/mercury/files/mercury-0.13.0_beta-LIBDIR.patch b/dev-lang/mercury/files/mercury-0.13.0_beta-LIBDIR.patch
deleted file mode 100644
index 05c06d9a5532..000000000000
--- a/dev-lang/mercury/files/mercury-0.13.0_beta-LIBDIR.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- mercury-compiler-0.13.0-beta-2006-06-01.orig/configure	2006-06-01 22:35:57.000000000 +1200
-+++ mercury-compiler-0.13.0-beta-2006-06-01/configure	2006-06-09 19:14:47.000000000 +1200
-@@ -1609,7 +1609,7 @@
- 
- 
- PREFIX="`$CYGPATH $PREFIX`"
--LIBDIR="`$CYGPATH $PREFIX/lib/mercury`"
-+LIBDIR="`$CYGPATH $PREFIX/lib/mercury-$PACKAGE_VERSION`"
- NONSHARED_LIB_DIR=${MERCURY_NONSHARED_LIB_DIR=$PREFIX/lib/nonshared}
- 
- 
---- mercury-compiler-0.13.0-beta-2006-06-01.orig/scripts/Mmake.vars.in	2006-05-23 18:46:54.000000000 +1200
-+++ mercury-compiler-0.13.0-beta-2006-06-01/scripts/Mmake.vars.in	2006-06-09 19:14:47.000000000 +1200
-@@ -717,18 +717,18 @@
- 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_LIBDIR		= $(INSTALL_PREFIX)/lib/mercury-@PACKAGE_VERSION@
-+FINAL_INSTALL_LIBDIR	= $(FINAL_INSTALL_PREFIX)/lib/mercury-@PACKAGE_VERSION@
-+INSTALL_JAVA_LIBRARY_DIR= $(INSTALL_LIBDIR)/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_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)/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_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
---- mercury-compiler-0.13.0-beta-2006-06-01.orig/scripts/mercury_config.in	2005-10-27 14:48:24.000000000 +1300
-+++ mercury-compiler-0.13.0-beta-2006-06-01/scripts/mercury_config.in	2006-06-09 19:14:47.000000000 +1200
-@@ -90,8 +90,8 @@
- 	shift
- done
- 
--input_libdir="$input_prefix/lib/mercury"
--output_libdir="$output_prefix/lib/mercury"
-+input_libdir="$input_prefix/lib/mercury-@PACKAGE_VERSION@"
-+output_libdir="$output_prefix/lib/mercury-@PACKAGE_VERSION@"
- 
- # mercury_config regenerates itself, so we can't just execute it in place.
- case $recursive in
diff --git a/dev-lang/mercury/files/mercury-0.13.0_beta-MAKEOPTS.patch b/dev-lang/mercury/files/mercury-0.13.0_beta-MAKEOPTS.patch
deleted file mode 100644
index ea1a60c9f618..000000000000
--- a/dev-lang/mercury/files/mercury-0.13.0_beta-MAKEOPTS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mercury-compiler-0.13.0-beta-2006-09-07.orig/Makefile	2005-08-22 15:38:34.000000000 +1200
-+++ mercury-compiler-0.13.0-beta-2006-09-07/Makefile	2006-09-11 21:20:49.000000000 +1200
-@@ -15,7 +15,7 @@
- #
- #-----------------------------------------------------------------------------#
- 
--
-+PARALLEL=	$(MAKEOPTS)
- SHELL=		/bin/sh
- MMAKE=		MMAKE_DIR=`pwd`/scripts scripts/mmake 
- MMAKE_SUBDIR=	MMAKE_DIR=`pwd`/../scripts ../scripts/mmake $(PARALLEL)
diff --git a/dev-lang/mercury/files/mercury-0.13.0_beta-bootstrap.patch b/dev-lang/mercury/files/mercury-0.13.0_beta-bootstrap.patch
deleted file mode 100644
index 8a1c89946d2e..000000000000
--- a/dev-lang/mercury/files/mercury-0.13.0_beta-bootstrap.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- mercury-compiler-0.13.0-beta-2006-08-11.orig/configure	2006-08-11 22:37:07.000000000 +1200
-+++ mercury-compiler-0.13.0-beta-2006-08-11/configure	2006-08-12 16:22:17.000000000 +1200
-@@ -8977,34 +8977,35 @@
- 
- if test "$BEST_GRADE_FOR_COMPILER" != "$BOOTSTRAP_GRADE"; then
- 	if test "$BOOTSTRAP_MC" = ""; then
--		GRADE="$BOOTSTRAP_GRADE"
--		{ echo "$as_me:$LINENO: WARNING: Mercury compiler not yet installed
--****	cannot use grade \`$BEST_GRADE_FOR_COMPILER'
--****	using grade \`$GRADE' to compile the compiler
--****	after installation is complete you should reinstall
--****	from scratch so you can use the more efficient
--****	grade \`$BEST_GRADE_FOR_COMPILER'." >&5
--echo "$as_me: WARNING: Mercury compiler not yet installed
--****	cannot use grade \`$BEST_GRADE_FOR_COMPILER'
--****	using grade \`$GRADE' to compile the compiler
--****	after installation is complete you should reinstall
--****	from scratch so you can use the more efficient
--****	grade \`$BEST_GRADE_FOR_COMPILER'." >&2;}
-+		if test "$BOOTSTRAP_STAGE" = "1"; then
-+			GRADE="$BOOTSTRAP_GRADE"
-+		else
-+			GRADE=$BEST_GRADE_FOR_COMPILER
-+			find library compiler browser mdbcomp analysis \
-+				profiler deep_profiler \
-+				-name \*.c -o -name \*.c_date | \
-+				xargs rm > /dev/null 2>&1
-+			find -name \*.o -o -name \*.pic_o -o \
-+				-name \*.a -o -name \*.so | \
-+				xargs rm > /dev/null 2>&1
-+			rm -f compiler/mercury_compile profiler/mercury_profile
-+		fi
- 
- 	else
--		GRADE=$BEST_GRADE_FOR_COMPILER
--		echo "using grade \`$GRADE' to compile the compiler
--	compiler and library will be rebuilt with new grade
--	installation may take a long time" 1>&6
--		find library compiler browser mdbcomp analysis \
--			profiler deep_profiler \
--			-name \*.c -o -name \*.c_date | \
--			xargs rm > /dev/null 2>&1
-+		if test "$BOOTSTRAP_STAGE" = "1"; then
-+			GRADE=$BEST_GRADE_FOR_COMPILER
-+			find library compiler browser mdbcomp analysis \
-+				profiler deep_profiler \
-+				-name \*.c -o -name \*.c_date | \
-+				xargs rm > /dev/null 2>&1
-+		else
-+			GRADE=$BEST_GRADE_FOR_COMPILER
-+		fi
- 	fi
- else
- 	GRADE=$BEST_GRADE_FOR_COMPILER
--	echo "using grade \`$GRADE' to compile the compiler" 1>&6
- fi
-+echo "using grade \`$GRADE' to compile the compiler" 1>&6
- 
- 
- #-----------------------------------------------------------------------------#
diff --git a/dev-lang/mercury/files/mercury-0.13.0_beta-docs.patch b/dev-lang/mercury/files/mercury-0.13.0_beta-docs.patch
deleted file mode 100644
index 7f998b6a9159..000000000000
--- a/dev-lang/mercury/files/mercury-0.13.0_beta-docs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- mercury-compiler-0.13.0-beta-2006-04-03.orig/doc/Mmakefile	2006-03-29 13:35:18.000000000 +1200
-+++ mercury-compiler-0.13.0-beta-2006-04-03/doc/Mmakefile	2006-04-04 22:45:41.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
- 
- #-----------------------------------------------------------------------------#
-@@ -331,7 +331,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
- 
diff --git a/dev-lang/mercury/files/mercury-0.13.0_beta-libgrades.patch b/dev-lang/mercury/files/mercury-0.13.0_beta-libgrades.patch
deleted file mode 100644
index 9995dc08f751..000000000000
--- a/dev-lang/mercury/files/mercury-0.13.0_beta-libgrades.patch
+++ /dev/null
@@ -1,375 +0,0 @@
---- mercury-compiler-0.13.0-beta-2006-08-11.orig/Mmakefile	2005-08-12 03:56:57.000000000 +1200
-+++ mercury-compiler-0.13.0-beta-2006-08-11/Mmakefile	2006-08-12 17:37:24.000000000 +1200
-@@ -281,6 +281,54 @@
- 		mdbcomp browser trace
- 	+cd deep_profiler && $(SUBDIR_MMAKE)
- 
-+libgrades:
-+	+for grade in x $(LIBGRADES); do				\
-+	    if [ "$$grade" != "x" -a "$$grade" != "$(GRADE)" ]; then	\
-+		gc_grade=`scripts/ml --grade $$grade --print-gc-grade`;	\
-+		TWS=`/bin/pwd`/libgrades/$$grade;			\
-+		/bin/rm -fr libgrades/$$grade;				\
-+		mkdir -p libgrades/$$grade;				\
-+		( scripts/prepare_tmp_dir_fixed_part $$grade &&		\
-+		  scripts/prepare_tmp_dir_grade_part $$grade ) &&	\
-+	        ( cd libgrades/$$grade/boehm_gc &&			\
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade			\
-+			WORKSPACE=$$TWS GC_GRADE=$$gc_grade		\
-+			MERCURY_COMPILER=$$TWS/compiler/mercury_compile	\
-+			libgrade ) &&					\
-+		( cd libgrades/$$grade/runtime &&			\
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
-+			MERCURY_COMPILER=$$TWS/compiler/mercury_compile	\
-+			libgrade ) &&					\
-+		( cd libgrades/$$grade/library &&			\
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
-+			MERCURY_COMPILER=$$TWS/compiler/mercury_compile	\
-+			depend &&					\
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
-+			MERCURY_COMPILER=$$TWS/compiler/mercury_compile	\
-+			libgrade ) &&					\
-+		( cd libgrades/$$grade/mdbcomp &&			\
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
-+			MERCURY_COMPILER=$$TWS/compiler/mercury_compile	\
-+			depend &&					\
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
-+			MERCURY_COMPILER=$$TWS/compiler/mercury_compile	\
-+			libgrade ) &&					\
-+		( cd libgrades/$$grade/browser &&			\
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
-+			MERCURY_COMPILER=$$TWS/compiler/mercury_compile	\
-+			depend &&					\
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
-+			MERCURY_COMPILER=$$TWS/compiler/mercury_compile	\
-+			libgrade ) &&					\
-+		( cd libgrades/$$grade/trace &&				\
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
-+			MERCURY_COMPILER=$$TWS/compiler/mercury_compile	\
-+			libgrade ) &&					\
-+		true ||							\
-+		  exit 1;						\
-+	    fi;								\
-+	done
-+
- #-----------------------------------------------------------------------------#
- 
- .PHONY: tags
-@@ -483,28 +531,13 @@
- 	@echo
- 	@echo "-- Installation complete."
- 	@echo
--	@echo "-- Don't forget to add $(INSTALL_BINDIR) to your PATH,"
--	@echo "-- $(INSTALL_MAN_DIR) to your MANPATH,"
--	@echo "-- and $(INSTALL_INFO_DIR) to your INFOPATH,"
--	@if test $(ENABLE_DEEP_PROFILER) != yes || \
--		cmp -s deep_profiler/mdprof_cgi \
--			$(INSTALL_CGI_DIR)/mdprof_cgi; \
--	then true ; else \
--		echo "-- to copy deep_profiler/mdprof_cgi" \
--			"to $(INSTALL_CGI_DIR),"; \
--	fi
--	@echo "-- and to add the following lines to the \`.emacs' file"
--	@echo "-- in your home directory:"
--	@echo "	(setq load-path (cons (expand-file-name "
--	@echo "		\"$(INSTALL_ELISP_DIR)\") load-path))"
--	@echo "	(autoload 'mdb \"gud\" \"Invoke the Mercury debugger\" t)"
- 
- .PHONY: install_main
- install_main: all \
- 		install_scripts install_util install_runtime install_boehm_gc \
- 		install_library install_mdbcomp install_browser install_trace \
- 		install_compiler install_slice install_profiler \
--		install_deep_profiler install_doc install_config
-+		install_deep_profiler install_doc
- 
- .PHONY: install_scripts
- install_scripts: scripts
-@@ -569,7 +602,7 @@
- #	.trans_opt .trans_opt_date .d .mh .mih .c_date  .c .o .pic_o
- 
- .PHONY: install_grades
--install_grades: all
-+install_grades: all libgrades
- 	#
- 	# Use the newly installed compiler to build the libraries
- 	# in various different grades.  We need to override MC=mmc
-@@ -577,44 +610,33 @@
- 	# runs the newly installed compiler, rather than using the
- 	# bootstrap compiler.
- 	#
--	/bin/rm -fr tmp_dir
--	scripts/prepare_tmp_dir_fixed_part
- 	+for grade in x $(LIBGRADES); do				\
- 	    if [ "$$grade" != "x" -a "$$grade" != "$(GRADE)" ]; then	\
- 		gc_grade=`scripts/ml --grade $$grade --print-gc-grade`;	\
--		TWS=`/bin/pwd`/tmp_dir;					\
--		scripts/prepare_tmp_dir_grade_part;			\
--	        ( cd tmp_dir/boehm_gc &&				\
-+		TWS=`/bin/pwd`/libgrades/$$grade;			\
-+	        ( cd libgrades/$$grade/boehm_gc &&			\
- 		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade			\
- 			WORKSPACE=$$TWS GC_GRADE=$$gc_grade		\
- 			install_lib ) &&				\
--		( cd tmp_dir/runtime &&					\
-+		( cd libgrades/$$grade/runtime &&			\
- 		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
- 			install_lib ) &&				\
--		( cd tmp_dir/library &&					\
--		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
--			depend &&					\
-+		( cd libgrades/$$grade/library &&			\
- 		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
- 			install_library ) &&				\
--		( cd tmp_dir/mdbcomp &&					\
--		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
--			depend &&					\
-+		( cd libgrades/$$grade/mdbcomp &&			\
- 		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
- 			install_library ) &&				\
--		( cd tmp_dir/browser &&					\
--		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
--			depend &&					\
-+		( cd libgrades/$$grade/browser &&			\
- 		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
- 			install_library ) &&				\
--		( cd tmp_dir/trace &&					\
-+		( cd libgrades/$$grade/trace &&				\
- 		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
- 			install_lib ) &&				\
- 		true ||							\
--		{ echo "To clean up from failed install, remove tmp_dir"; \
--		  exit 1; };						\
-+		  exit 1;						\
- 	    fi;								\
- 	done
--	if test ! -f .leave_tmp_dir; then rm -fr tmp_dir; fi
- 
- .PHONY: install_split_library
- install_split_library: scripts dep_library
---- mercury-compiler-0.13.0-beta-2006-08-11.orig/boehm_gc/Mmakefile	2004-10-19 19:01:36.000000000 +1300
-+++ mercury-compiler-0.13.0-beta-2006-08-11/boehm_gc/Mmakefile	2006-08-12 17:28:05.000000000 +1200
-@@ -90,6 +90,9 @@
- .PHONY: force
- force:
- 
-+.PHONY: libgrade
-+libgrade: lib$(GC_GRADE).$A lib$(GC_GRADE).$(EXT_FOR_SHARED_LIB)
-+
- #-----------------------------------------------------------------------------#
- 
- # installation rules
---- mercury-compiler-0.13.0-beta-2006-08-11.orig/browser/Mmakefile	2005-12-16 18:49:31.000000000 +1300
-+++ mercury-compiler-0.13.0-beta-2006-08-11/browser/Mmakefile	2006-08-12 17:28:05.000000000 +1200
-@@ -186,6 +186,11 @@
- .PHONY: int3s 
- int3s:	$(INT3S_TARGETS)
- 
-+.PHONY: libgrade
-+libgrade: \
-+		lib$(BROWSER_LIB_NAME).$A \
-+		lib$(BROWSER_LIB_NAME).$(EXT_FOR_SHARED_LIB)
-+
- #-----------------------------------------------------------------------------#
- 
- tags:	$(MTAGS) $($(BROWSER_LIB_NAME).ms)
---- mercury-compiler-0.13.0-beta-2006-08-11.orig/library/Mmakefile	2006-01-10 18:30:36.000000000 +1300
-+++ mercury-compiler-0.13.0-beta-2006-08-11/library/Mmakefile	2006-08-12 17:28:05.000000000 +1200
-@@ -196,6 +196,9 @@
- trans_opts: $(STD_LIB_NAME).trans_opts
- $(STD_LIB_NAME).trans_opts: $($(STD_LIB_NAME).trans_opts)
- 
-+.PHONY: libgrade
-+libgrade: lib$(STD_LIB_NAME)
-+
- #-----------------------------------------------------------------------------#
- 
- tags:	$(MTAGS) $($(STD_LIB_NAME).ms)
---- mercury-compiler-0.13.0-beta-2006-08-11.orig/mdbcomp/Mmakefile	2005-12-16 18:49:40.000000000 +1300
-+++ mercury-compiler-0.13.0-beta-2006-08-11/mdbcomp/Mmakefile	2006-08-12 17:28:05.000000000 +1200
-@@ -150,6 +150,12 @@
- .PHONY: int3s 
- int3s:	$(INT3S_TARGETS)
- 
-+.PHONY: libgrade
-+libgrade: \
-+		lib$(MDBCOMP_LIB_NAME).$A \
-+		lib$(MDBCOMP_LIB_NAME).$(EXT_FOR_SHARED_LIB) \
-+		all-ints
-+
- #-----------------------------------------------------------------------------#
- 
- tags:	$(MTAGS) $($(MDBCOMP_LIB_NAME).ms)
---- mercury-compiler-0.13.0-beta-2006-08-11.orig/runtime/Mmakefile	2006-03-30 18:13:48.000000000 +1200
-+++ mercury-compiler-0.13.0-beta-2006-08-11/runtime/Mmakefile	2006-08-12 17:28:05.000000000 +1200
-@@ -420,6 +420,9 @@
- 	@if test ! -f tags; then echo making tags; \
- 	ctags $(CFILES) $(HDRS) $(BODY_HDRS) $(LIB_DLL_H); fi
- 
-+.PHONY: libgrade
-+libgrade: lib$(RT_LIB_NAME).$A lib$(RT_LIB_NAME).$(EXT_FOR_SHARED_LIB)
-+
- #-----------------------------------------------------------------------------#
- 
- # installation rules
---- mercury-compiler-0.13.0-beta-2006-08-11.orig/scripts/prepare_tmp_dir_fixed_part.in	2005-01-28 20:11:59.000000000 +1300
-+++ mercury-compiler-0.13.0-beta-2006-08-11/scripts/prepare_tmp_dir_fixed_part.in	2006-08-12 17:28:05.000000000 +1200
-@@ -12,18 +12,20 @@
- fi
- wd=`/bin/pwd`
- 
--mkdir tmp_dir
--cp Mmake* tmp_dir
--cp Mercury.* tmp_dir
--cp VERSION tmp_dir
--cp config* tmp_dir
--cp aclocal.m4 tmp_dir
--mkdir tmp_dir/scripts
--cp scripts/* tmp_dir/scripts
--mkdir tmp_dir/tools
--cp tools/* tmp_dir/tools
--$ln_s $wd/compiler tmp_dir
--$ln_s $wd/analysis tmp_dir
--$ln_s $wd/robdd tmp_dir
--$ln_s $wd/util tmp_dir
-+libgrade_dir=libgrades/$1
-+
-+mkdir -p $libgrade_dir
-+cp Mmake* $libgrade_dir
-+cp Mercury.* $libgrade_dir
-+cp VERSION $libgrade_dir
-+cp config* $libgrade_dir
-+cp aclocal.m4 $libgrade_dir
-+mkdir $libgrade_dir/scripts
-+cp scripts/* $libgrade_dir/scripts
-+mkdir $libgrade_dir/tools
-+cp tools/* $libgrade_dir/tools
-+$ln_s $wd/compiler $libgrade_dir
-+$ln_s $wd/analysis $libgrade_dir
-+$ln_s $wd/robdd $libgrade_dir
-+$ln_s $wd/util $libgrade_dir
- exit 0
---- mercury-compiler-0.13.0-beta-2006-08-11.orig/scripts/prepare_tmp_dir_grade_part	2005-05-20 18:15:20.000000000 +1200
-+++ mercury-compiler-0.13.0-beta-2006-08-11/scripts/prepare_tmp_dir_grade_part	2006-08-12 17:34:05.000000000 +1200
-@@ -5,55 +5,57 @@
- # Public License - see the file COPYING in the Mercury distribution.
- #---------------------------------------------------------------------------#
- 
--rm -fr tmp_dir/boehm_gc
--rm -fr tmp_dir/runtime
--rm -fr tmp_dir/trace
--rm -fr tmp_dir/library
--rm -fr tmp_dir/mdbcomp
--rm -fr tmp_dir/browser
--mkdir tmp_dir/boehm_gc
--mkdir tmp_dir/boehm_gc/Mac_files
--mkdir tmp_dir/boehm_gc/cord
--mkdir tmp_dir/boehm_gc/include
--mkdir tmp_dir/boehm_gc/include/private
--cp boehm_gc/Makefile* tmp_dir/boehm_gc
--cp boehm_gc/Mmake* tmp_dir/boehm_gc
--cp boehm_gc/ac* tmp_dir/boehm_gc
--cp boehm_gc/*.[chsS] tmp_dir/boehm_gc
--cp boehm_gc/Mac_files/*.[ch] tmp_dir/boehm_gc/Mac_files
--cp boehm_gc/cord/*.[ch] tmp_dir/boehm_gc/cord
--cp boehm_gc/include/*.[ch] tmp_dir/boehm_gc/include
--cp boehm_gc/include/private/*.[ch] tmp_dir/boehm_gc/include/private
--mkdir tmp_dir/runtime
--mkdir tmp_dir/runtime/machdeps
--cp runtime/Mmake* tmp_dir/runtime
--cp runtime/.mgnuc* tmp_dir/runtime
--cp runtime/*.in tmp_dir/runtime
--cp runtime/*.[ch] tmp_dir/runtime
--cp runtime/*.il tmp_dir/runtime
--cp runtime/machdeps/*.h tmp_dir/runtime/machdeps
--mkdir tmp_dir/trace
--cp trace/Mmake* tmp_dir/trace
--cp trace/.mgnuc* tmp_dir/trace
--cp trace/*.[ch] tmp_dir/trace
--mkdir tmp_dir/library
--cp library/Mmake* tmp_dir/library
--cp library/Mercury.* tmp_dir/library
--cp library/.mgnuc* tmp_dir/library
--cp library/*FLAGS* tmp_dir/library
--cp library/print_extra_inits tmp_dir/library
--cp library/library_strong_name.sn tmp_dir/library
--cp library/*.m tmp_dir/library
--mkdir tmp_dir/mdbcomp
--cp mdbcomp/Mmake* tmp_dir/mdbcomp
--cp mdbcomp/Mercury.* tmp_dir/mdbcomp
--cp mdbcomp/.mgnuc* tmp_dir/mdbcomp
--cp mdbcomp/*FLAGS* tmp_dir/mdbcomp
--cp mdbcomp/*.m tmp_dir/mdbcomp
--mkdir tmp_dir/browser
--cp browser/Mmake* tmp_dir/browser
--cp browser/Mercury.* tmp_dir/browser
--cp browser/.mgnuc* tmp_dir/browser
--cp browser/*FLAGS* tmp_dir/browser
--cp browser/*.m tmp_dir/browser
-+libgrade_dir=libgrades/$1
-+
-+rm -fr $libgrade_dir/boehm_gc
-+rm -fr $libgrade_dir/runtime
-+rm -fr $libgrade_dir/trace
-+rm -fr $libgrade_dir/library
-+rm -fr $libgrade_dir/mdbcomp
-+rm -fr $libgrade_dir/browser
-+mkdir $libgrade_dir/boehm_gc
-+mkdir $libgrade_dir/boehm_gc/Mac_files
-+mkdir $libgrade_dir/boehm_gc/cord
-+mkdir $libgrade_dir/boehm_gc/include
-+mkdir $libgrade_dir/boehm_gc/include/private
-+cp boehm_gc/Makefile* $libgrade_dir/boehm_gc
-+cp boehm_gc/Mmake* $libgrade_dir/boehm_gc
-+cp boehm_gc/ac* $libgrade_dir/boehm_gc
-+cp boehm_gc/*.[chsS] $libgrade_dir/boehm_gc
-+cp boehm_gc/Mac_files/*.[ch] $libgrade_dir/boehm_gc/Mac_files
-+cp boehm_gc/cord/*.[ch] $libgrade_dir/boehm_gc/cord
-+cp boehm_gc/include/*.[ch] $libgrade_dir/boehm_gc/include
-+cp boehm_gc/include/private/*.[ch] $libgrade_dir/boehm_gc/include/private
-+mkdir $libgrade_dir/runtime
-+mkdir $libgrade_dir/runtime/machdeps
-+cp runtime/Mmake* $libgrade_dir/runtime
-+cp runtime/.mgnuc* $libgrade_dir/runtime
-+cp runtime/*.in $libgrade_dir/runtime
-+cp runtime/*.[ch] $libgrade_dir/runtime
-+cp runtime/*.il $libgrade_dir/runtime
-+cp runtime/machdeps/*.h $libgrade_dir/runtime/machdeps
-+mkdir $libgrade_dir/trace
-+cp trace/Mmake* $libgrade_dir/trace
-+cp trace/.mgnuc* $libgrade_dir/trace
-+cp trace/*.[ch] $libgrade_dir/trace
-+mkdir $libgrade_dir/library
-+cp library/Mmake* $libgrade_dir/library
-+cp library/Mercury.* $libgrade_dir/library
-+cp library/.mgnuc* $libgrade_dir/library
-+cp library/*FLAGS* $libgrade_dir/library
-+cp library/print_extra_inits $libgrade_dir/library
-+cp library/library_strong_name.sn $libgrade_dir/library
-+cp library/*.m $libgrade_dir/library
-+mkdir $libgrade_dir/mdbcomp
-+cp mdbcomp/Mmake* $libgrade_dir/mdbcomp
-+cp mdbcomp/Mercury.* $libgrade_dir/mdbcomp
-+cp mdbcomp/.mgnuc* $libgrade_dir/mdbcomp
-+cp mdbcomp/*FLAGS* $libgrade_dir/mdbcomp
-+cp mdbcomp/*.m $libgrade_dir/mdbcomp
-+mkdir $libgrade_dir/browser
-+cp browser/Mmake* $libgrade_dir/browser
-+cp browser/Mercury.* $libgrade_dir/browser
-+cp browser/.mgnuc* $libgrade_dir/browser
-+cp browser/*FLAGS* $libgrade_dir/browser
-+cp browser/*.m $libgrade_dir/browser
- exit 0
---- mercury-compiler-0.13.0-beta-2006-08-11.orig/trace/Mmakefile	2006-04-04 19:42:03.000000000 +1200
-+++ mercury-compiler-0.13.0-beta-2006-08-11/trace/Mmakefile	2006-08-12 17:28:05.000000000 +1200
-@@ -204,6 +204,9 @@
- 	@if test ! -f tags; then echo making tags; \
- 	ctags $(CFILES) $(HDRS) $(RUNTIME_DIR)/*.c $(RUNTIME_DIR)/*.h ; fi
- 
-+.PHONY: libgrade
-+libgrade: lib$(TRACE_LIB_NAME).$A lib$(TRACE_LIB_NAME).$(EXT_FOR_SHARED_LIB)
-+
- #-----------------------------------------------------------------------------#
- 
- # installation rules
-Only in mercury-compiler-0.13.0-beta-2006-08-11/trace: Mmakefile.orig
diff --git a/dev-lang/mercury/files/mercury-0.13.0_beta-portage.patch b/dev-lang/mercury/files/mercury-0.13.0_beta-portage.patch
deleted file mode 100644
index a88e8962d4ff..000000000000
--- a/dev-lang/mercury/files/mercury-0.13.0_beta-portage.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- mercury-compiler-0.13.0-beta-2006-04-03.orig/Makefile	2005-08-22 15:38:34.000000000 +1200
-+++ mercury-compiler-0.13.0-beta-2006-04-03/Makefile	2006-04-04 22:34:14.000000000 +1200
-@@ -26,7 +26,7 @@
- 
- .PHONY: all
- all:
--	$(MMAKE) MMAKEFLAGS=$(PARALLEL) all
-+	$(MMAKE) MMAKEFLAGS=$(PARALLEL) all || exit 1
- 
- .PHONY: libmmc
- libmmc:
-@@ -34,7 +34,7 @@
- 
- .PHONY: install
- install:
--	$(MMAKE) MMAKEFLAGS=$(PARALLEL) install
-+	$(MMAKE) MMAKEFLAGS=$(PARALLEL) install || exit 1
- 
- # `mmake clean' has a different meaning to the usual GNU standard `make clean':
- # it removes the .c files, which makes bootstrapping impossible unless you
---- mercury-compiler-0.13.0-beta-2006-06-09.orig/runtime/Mmakefile	2006-03-30 18:13:48.000000000 +1200
-+++ mercury-compiler-0.13.0-beta-2006-06-09/runtime/Mmakefile	2006-06-14 22:49:57.000000000 +1200
-@@ -434,8 +434,6 @@
- 	-[ -d $(INSTALL_MODULE_DIR) ] || mkdir -p $(INSTALL_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
- 
- ifeq ($(findstring java,$(GRADE)),java)
- 
-@@ -481,7 +479,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
---- mercury-compiler-0.13.0-beta-2006-06-09.orig/scripts/Mmakefile	2006-04-04 19:41:49.000000000 +1200
-+++ mercury-compiler-0.13.0-beta-2006-06-09/scripts/Mmakefile	2006-06-14 22:53:13.000000000 +1200
-@@ -26,16 +26,12 @@
- 	canonical_grade \
- 	mdb \
- 	mdprof \
--	mercury.bat \
--	mercury_config \
- 	mercury_update_interface \
- 	mgnuc \
--	mkfifo_using_mknod \
- 	ml \
- 	mmake \
- 	mmc \
--	mprof \
--	prepare_tmp_dir_fixed_part
-+	mprof
- 
- SCRIPTS = $(NONCONF_SCRIPTS) $(CONF_SCRIPTS)
- 
-@@ -103,8 +99,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
-@@ -122,7 +116,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
---- mercury-compiler-0.13.0-beta-2006-08-11.orig/configure	2006-08-11 22:37:07.000000000 +1200
-+++ mercury-compiler-0.13.0-beta-2006-08-11/configure	2006-08-12 16:14:59.000000000 +1200
-@@ -9148,7 +9148,6 @@
- 	enable_mm_grades=no
- 	enable_dmm_grades=no
- 	enable_hlc_prof_grades=no
--	enable_par_grades=no
- 	enable_dotnet_grades=no
- 	enable_java_grade=no
- fi
diff --git a/dev-lang/mercury/files/mercury-0.13.0_beta-tests.patch b/dev-lang/mercury/files/mercury-0.13.0_beta-tests.patch
deleted file mode 100644
index 6fcb8daf9a9f..000000000000
--- a/dev-lang/mercury/files/mercury-0.13.0_beta-tests.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -urN mercury-tests-0.13.0-beta-2006-06-09.orig/hard_coded/dir_test.exp mercury-tests-0.13.0-beta-2006-06-09/hard_coded/dir_test.exp
---- mercury-tests-0.13.0-beta-2006-06-09.orig/hard_coded/dir_test.exp	2003-07-29 03:50:45.000000000 +1200
-+++ mercury-tests-0.13.0-beta-2006-06-09/hard_coded/dir_test.exp	2006-06-14 23:21:55.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

- make_directory succeeded

- make_directory succeeded

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

-diff -urN mercury-tests-0.13.0-beta-2006-06-09.orig/hard_coded/dir_test.exp2 mercury-tests-0.13.0-beta-2006-06-09/hard_coded/dir_test.exp2
---- mercury-tests-0.13.0-beta-2006-06-09.orig/hard_coded/dir_test.exp2	2003-07-29 03:50:45.000000000 +1200
-+++ mercury-tests-0.13.0-beta-2006-06-09/hard_coded/dir_test.exp2	2006-06-14 23:22:25.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
- make_directory succeeded
- make_directory succeeded
- dir.make_single_directory with non-existent parent failed as expected.
-diff -urN mercury-tests-0.13.0-beta-2006-06-09.orig/hard_coded/dir_test.exp3 mercury-tests-0.13.0-beta-2006-06-09/hard_coded/dir_test.exp3
---- mercury-tests-0.13.0-beta-2006-06-09.orig/hard_coded/dir_test.exp3	2003-07-29 03:50:45.000000000 +1200
-+++ mercury-tests-0.13.0-beta-2006-06-09/hard_coded/dir_test.exp3	2006-06-14 23:22:52.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
- make_directory succeeded
- make_directory succeeded
- dir.make_single_directory with non-existent parent failed as expected.
-diff -urN mercury-tests-0.13.0-beta-2006-06-09.orig/hard_coded/dir_test.m mercury-tests-0.13.0-beta-2006-06-09/hard_coded/dir_test.m
---- mercury-tests-0.13.0-beta-2006-06-09.orig/hard_coded/dir_test.m	2006-03-29 20:08:00.000000000 +1200
-+++ mercury-tests-0.13.0-beta-2006-06-09/hard_coded/dir_test.m	2006-06-14 23:21:10.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")
--	),
--
- 	{ Dir1 = "test_dir"/"d1" },
- 	test0("make_directory", dir__make_directory(Dir1)),
- 	% Test making a directory that already exists.
-diff -urN mercury-tests-0.13.0-beta-2006-06-09.orig/mdbrc mercury-tests-0.13.0-beta-2006-06-09/mdbrc
---- mercury-tests-0.13.0-beta-2006-06-09.orig/mdbrc	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.13.0-beta-2006-06-09/mdbrc	2006-06-14 22:59:49.000000000 +1200
-@@ -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
-+xml_browser_cmd ''
-+xml_tmp_filename ''
diff --git a/dev-lang/mercury/mercury-0.13.0_beta20060907.ebuild b/dev-lang/mercury/mercury-0.13.0_beta20060907.ebuild
deleted file mode 100644
index e9bfeb04a2b6..000000000000
--- a/dev-lang/mercury/mercury-0.13.0_beta20060907.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.13.0_beta20060907.ebuild,v 1.2 2006/09/11 09:51:58 keri Exp $
-
-inherit eutils versionator
-
-BETA_V=$(get_version_component_range 4 $PV)
-BETA_V_YYYY=${BETA_V:4:4}
-BETA_V_MM=${BETA_V:8:2}
-BETA_V_DD=${BETA_V:10:2}
-MY_PV=$(get_version_component_range 1-3 $PV)-beta-${BETA_V_YYYY}-${BETA_V_MM}-${BETA_V_DD}
-MY_P=${PN}-compiler-${MY_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="ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/beta-releases/0.13.0-beta/${MY_P}-unstable.tar.gz
-	ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/beta-releases/0.13.0-beta/mercury-tests-${MY_PV}-unstable.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-
-IUSE="debug minimal readline threads"
-
-DEPEND="readline? ( sys-libs/readline )"
-
-S="${WORKDIR}"/${MY_P}
-TESTDIR="${WORKDIR}"/${PN}-tests-${MY_PV}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-portage.patch
-	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-CFLAGS.patch
-	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-MAKEOPTS.patch
-	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-bootstrap.patch
-	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-LIBDIR.patch
-	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-libgrades.patch
-	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-docs.patch
-
-	cd "${TESTDIR}"
-	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-tests.patch
-	sed -i -e "s:MDB_DOC:${S}/doc/mdb_doc:" mdbrc
-}
-
-src_compile() {
-	local myconf
-	myconf="--disable-dotnet-grades \
-		$(use_enable debug debug-grades) \
-		$(use_enable threads par-grades) \
-		$(use_enable !minimal most-grades) \
-		$(use_with readline) \
-		PACKAGE_VERSION=${PV}"
-
-	einfo "Performing stage 1 bootstrap"
-	econf \
-		${myconf} \
-		BOOTSTRAP_STAGE="1" \
-		|| die "econf stage 1 failed"
-	emake || die "emake stage 1 failed"
-
-	einfo "Performing stage 2 bootstrap"
-	cp "${S}"/compiler/mercury_compile "${S}"/mercury_compile
-	econf \
-		${myconf} \
-		BOOTSTRAP_STAGE="2" \
-		|| die "econf stage 2 failed"
-	emake \
-		MERCURY_COMPILER="${S}"/mercury_compile \
-		|| die "emake stage 2 failed"
-
-	einfo "Compiling libgrades"
-	emake \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		libgrades || die "emake libgrades failed"
-}
-
-src_test() {
-	cd "${TESTDIR}"
-
-	PATH="${S}"/scripts:"${S}"/util:"${PATH}" \
-	WORKSPACE="${S}" \
-	MERCURY_COMPILER="${S}"/compiler/${PN}_compile \
-	MMAKE_DIR="${S}"/scripts \
-	MERCURY_DEBUGGER_INIT="${TESTDIR}"/mdbrc \
-	mmake || die "mmake test failed"
-}
-
-src_install() {
-	make \
-		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 || die "make install failed"
-
-	dodoc BUGS HISTORY LIMITATIONS NEWS README README.Java README.Linux README.Linux-Alpha README.Linux-m68k README.Linux-PPC RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS
-}