Add two-stage bootstrap support.

(Portage version: 2.1.1_pre4-r4)

4 files changed, 501 insertions, 35 deletions

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
new file mode 100644
index 000000000000..05c06d9a5532
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.13.0_beta-LIBDIR.patch
@@ -0,0 +1,55 @@
+--- 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-bootstrap.patch b/dev-lang/mercury/files/mercury-0.13.0_beta-bootstrap.patch
new file mode 100644
index 000000000000..6a45260c78ff
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.13.0_beta-bootstrap.patch
@@ -0,0 +1,59 @@
+--- 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,34 @@
+ 
+ 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 \*.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-libgrades.patch b/dev-lang/mercury/files/mercury-0.13.0_beta-libgrades.patch
new file mode 100644
index 000000000000..9995dc08f751
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.13.0_beta-libgrades.patch
@@ -0,0 +1,375 @@
+--- 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
index d4b4cdfbd69b..6110bb776f4e 100644
--- a/dev-lang/mercury/files/mercury-0.13.0_beta-portage.patch
+++ b/dev-lang/mercury/files/mercury-0.13.0_beta-portage.patch
@@ -18,38 +18,6 @@
  
  # `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/Mmakefile	2005-08-12 03:56:57.000000000 +1200
-+++ mercury-compiler-0.13.0-beta-2006-06-09/Mmakefile	2006-06-14 22:46:40.000000000 +1200
-@@ -483,28 +483,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
 --- 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 @@
@@ -106,9 +74,18 @@
  	-rm -f $(INSTALL_BINDIR)/mmake.old
  
  .PHONY: install_config
---- mercury-compiler-0.13.0-beta-2006-06-15.orig/configure	2006-06-15 22:36:38.000000000 +1200
-+++ mercury-compiler-0.13.0-beta-2006-06-15/configure	2006-06-17 20:49:30.000000000 +1200
-@@ -9140,7 +9140,6 @@
+--- 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
+@@ -9048,7 +9048,7 @@
+ # Check whether --enable-debug-grades or --disable-debug-grades was given.
+ if test "${enable_debug_grades+set}" = set; then
+   enableval="$enable_debug_grades"
+-  enable_debug_grades="enableval"
++  enable_debug_grades="$enableval"
+ else
+   enable_debug_grades=yes
+ fi;
+@@ -9148,7 +9148,6 @@
  	enable_mm_grades=no
  	enable_dmm_grades=no
  	enable_hlc_prof_grades=no