diff options
18 files changed, 14 insertions, 2577 deletions
diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog index d6c71fdb38b1..a7b404c55c13 100644 --- a/dev-lang/mercury/ChangeLog +++ b/dev-lang/mercury/ChangeLog @@ -1,6 +1,19 @@ # ChangeLog for dev-lang/mercury # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.142 2011/08/12 21:38:37 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.143 2011/08/12 23:28:17 keri Exp $ + + 12 Aug 2011; <keri@gentoo.org> -mercury-0.13.1-r2.ebuild, + -files/mercury-0.13.1-docs.patch, -files/mercury-0.13.1-libgrades.patch, + -files/mercury-0.13.1-mmake-params.patch, + -files/mercury-0.13.1-multilib.patch, -files/mercury-0.13.1-no-reconf.patch, + -files/mercury-0.13.1-rebuild-mslice.patch, + -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-string_format.patch, + -files/mercury-0.13.1-tests-workspace.patch, -mercury-10.04.ebuild, + -mercury-10.04-r1.ebuild, -mercury-10.04.1.ebuild, -mercury-10.04.2.ebuild, + -mercury-10.04.2-r1.ebuild, -mercury-11.01_beta1.ebuild: + Remove old versions 12 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> mercury-0.13.1-r2.ebuild, mercury-10.04.ebuild, mercury-10.04-r1.ebuild, mercury-10.04.1.ebuild, diff --git a/dev-lang/mercury/files/mercury-0.13.1-docs.patch b/dev-lang/mercury/files/mercury-0.13.1-docs.patch deleted file mode 100644 index 82c2ba918eb4..000000000000 --- a/dev-lang/mercury/files/mercury-0.13.1-docs.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- mercury-compiler-0.13.1.orig/doc/Mmakefile 2006-03-29 13:35:18.000000000 +1200 -+++ mercury-compiler-0.13.1/doc/Mmakefile 2006-12-04 21:10:35.000000000 +1300 -@@ -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.1-libgrades.patch b/dev-lang/mercury/files/mercury-0.13.1-libgrades.patch deleted file mode 100644 index 96c4fc8442db..000000000000 --- a/dev-lang/mercury/files/mercury-0.13.1-libgrades.patch +++ /dev/null @@ -1,375 +0,0 @@ ---- mercury-compiler-0.13.1.orig/Mmakefile 2005-08-12 03:56:57.000000000 +1200 -+++ mercury-compiler-0.13.1/Mmakefile 2006-12-04 21:19:06.000000000 +1300 -@@ -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.1.orig/boehm_gc/Mmakefile 2006-11-15 03:09:19.000000000 +1300 -+++ mercury-compiler-0.13.1/boehm_gc/Mmakefile 2006-12-04 21:19:06.000000000 +1300 -@@ -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.1.orig/browser/Mmakefile 2005-12-16 18:49:31.000000000 +1300 -+++ mercury-compiler-0.13.1/browser/Mmakefile 2006-12-04 21:19:06.000000000 +1300 -@@ -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.1.orig/library/Mmakefile 2006-01-10 18:30:36.000000000 +1300 -+++ mercury-compiler-0.13.1/library/Mmakefile 2006-12-04 21:19:06.000000000 +1300 -@@ -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.1.orig/mdbcomp/Mmakefile 2005-12-16 18:49:40.000000000 +1300 -+++ mercury-compiler-0.13.1/mdbcomp/Mmakefile 2006-12-04 21:19:06.000000000 +1300 -@@ -150,6 +150,13 @@ - .PHONY: int3s - int3s: $(INT3S_TARGETS) - -+.PHONY: libgrade -+libgrade: \ -+ $(mer_mdbcomp.int3s) $(mer_mdbcomp.ints) \ -+ 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.1.orig/runtime/Mmakefile 2006-11-15 03:09:20.000000000 +1300 -+++ mercury-compiler-0.13.1/runtime/Mmakefile 2006-12-04 21:19:06.000000000 +1300 -@@ -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.1.orig/scripts/prepare_tmp_dir_fixed_part.in 2005-01-28 20:11:59.000000000 +1300 -+++ mercury-compiler-0.13.1/scripts/prepare_tmp_dir_fixed_part.in 2006-12-04 21:19:06.000000000 +1300 -@@ -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.1.orig/scripts/prepare_tmp_dir_grade_part 2005-05-20 18:15:20.000000000 +1200 -+++ mercury-compiler-0.13.1/scripts/prepare_tmp_dir_grade_part 2006-12-04 21:19:06.000000000 +1300 -@@ -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.1.orig/trace/Mmakefile 2006-11-15 03:09:20.000000000 +1300 -+++ mercury-compiler-0.13.1/trace/Mmakefile 2006-12-04 21:19:06.000000000 +1300 -@@ -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 diff --git a/dev-lang/mercury/files/mercury-0.13.1-mmake-params.patch b/dev-lang/mercury/files/mercury-0.13.1-mmake-params.patch deleted file mode 100644 index f763fcb39e6e..000000000000 --- a/dev-lang/mercury/files/mercury-0.13.1-mmake-params.patch +++ /dev/null @@ -1,4 +0,0 @@ ---- mercury-compiler-0.13.1.orig/Mmake.params 2006-12-01 15:35:18.000000000 +0000 -+++ mercury-compiler-0.13.1/Mmake.params 2008-08-20 04:15:41.000000000 +0000 -@@ -0,0 +1 @@ -+GRADE=none.gc diff --git a/dev-lang/mercury/files/mercury-0.13.1-multilib.patch b/dev-lang/mercury/files/mercury-0.13.1-multilib.patch deleted file mode 100644 index cb25ceb87365..000000000000 --- a/dev-lang/mercury/files/mercury-0.13.1-multilib.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- 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 -@@ -741,7 +741,7 @@ - INSTALL_INC_DIR = $(INSTALL_LIBDIR)/inc - INSTALL_MMAKE_DIR = $(INSTALL_LIBDIR)/mmake - FULLARCH = @FULLARCH@ --INSTALL_MERC_BIN_DIR = $(INSTALL_PREFIX)/bin -+INSTALL_MERC_BIN_DIR = $(INSTALL_PREFIX)/@prefix@/bin - INSTALL_MERC_GRADELESS_LIB_DIR = $(INSTALL_LIBDIR)/lib - FINAL_INSTALL_MERC_GRADELESS_LIB_DIR = $(FINAL_INSTALL_LIBDIR)/lib - INSTALL_MERC_LIB_DIR = $(INSTALL_LIBDIR)/lib/$(GRADESTRING) diff --git a/dev-lang/mercury/files/mercury-0.13.1-no-reconf.patch b/dev-lang/mercury/files/mercury-0.13.1-no-reconf.patch deleted file mode 100644 index 5db2cab234e9..000000000000 --- a/dev-lang/mercury/files/mercury-0.13.1-no-reconf.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -ur mercury-compiler-0.13.1.orig/runtime/Mmakefile mercury-compiler-0.13.1/runtime/Mmakefile ---- mercury-compiler-0.13.1.orig/runtime/Mmakefile 2006-11-15 03:09:20.000000000 +1300 -+++ mercury-compiler-0.13.1/runtime/Mmakefile 2008-11-30 18:05:17.000000000 +1300 -@@ -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 -diff -ur mercury-compiler-0.13.1.orig/scripts/Mmakefile mercury-compiler-0.13.1/scripts/Mmakefile ---- mercury-compiler-0.13.1.orig/scripts/Mmakefile 2006-04-04 19:41:49.000000000 +1200 -+++ mercury-compiler-0.13.1/scripts/Mmakefile 2008-11-30 18:05:32.000000000 +1300 -@@ -15,7 +15,6 @@ - #-----------------------------------------------------------------------------# - - NONCONF_SCRIPTS = \ -- mercury_cleanup_install \ - mprof_merge_runs \ - mtags \ - mtc \ -@@ -26,16 +25,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 +98,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 +115,6 @@ - -for file in $(SCRIPTS); do \ - chmod u+w $(INSTALL_BINDIR)/$$file ;\ - done -- cp *.in *.sh-subr $(SCRIPTS) $(INSTALL_RECONF_DIR)/scripts - -rm -f $(INSTALL_BINDIR)/mmake.old - - .PHONY: install_config diff --git a/dev-lang/mercury/files/mercury-0.13.1-rebuild-mslice.patch b/dev-lang/mercury/files/mercury-0.13.1-rebuild-mslice.patch deleted file mode 100644 index 4b4e5253cadd..000000000000 --- a/dev-lang/mercury/files/mercury-0.13.1-rebuild-mslice.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mercury-compiler-0.13.1.orig/configure 2006-12-01 22:37:01.000000000 +1300 -+++ mercury-compiler-0.13.1/configure 2008-09-23 18:09:53.000000000 +1200 -@@ -9000,7 +9000,7 @@ - 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 \ -+ profiler deep_profiler slice \ - -name \*.c -o -name \*.c_date | \ - xargs rm > /dev/null 2>&1 - fi diff --git a/dev-lang/mercury/files/mercury-0.13.1-tests-dir_test.patch b/dev-lang/mercury/files/mercury-0.13.1-tests-dir_test.patch deleted file mode 100644 index ce4cebd39587..000000000000 --- a/dev-lang/mercury/files/mercury-0.13.1-tests-dir_test.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -urN mercury-tests-0.13.1.orig/hard_coded/dir_test.exp mercury-tests-0.13.1/hard_coded/dir_test.exp ---- mercury-tests-0.13.1.orig/hard_coded/dir_test.exp 2003-07-29 03:50:45.000000000 +1200 -+++ mercury-tests-0.13.1/hard_coded/dir_test.exp 2007-01-07 15:51:35.000000000 +1300 -@@ -130,7 +130,6 @@ - "foo"/"bar/baz" = "foo\bar\baz".
- "foo/"/"bar/baz" = "foo\bar\baz".
- checking whether `unwritable' is readable...ok
--unwritable file found to be unwritable
- make_directory succeeded
- make_directory succeeded
- dir.make_single_directory with non-existent parent failed as expected.
-diff -urN mercury-tests-0.13.1.orig/hard_coded/dir_test.exp2 mercury-tests-0.13.1/hard_coded/dir_test.exp2 ---- mercury-tests-0.13.1.orig/hard_coded/dir_test.exp2 2003-07-29 03:50:45.000000000 +1200 -+++ mercury-tests-0.13.1/hard_coded/dir_test.exp2 2007-01-07 15:51:35.000000000 +1300 -@@ -127,7 +127,6 @@ - "foo"/"bar/baz" = "foo/bar/baz". - "foo/"/"bar/baz" = "foo/bar/baz". - checking whether `unwritable' is readable...ok --unwritable file found to be unwritable - make_directory succeeded - make_directory succeeded - dir.make_single_directory with non-existent parent failed as expected. -diff -urN mercury-tests-0.13.1.orig/hard_coded/dir_test.exp3 mercury-tests-0.13.1/hard_coded/dir_test.exp3 ---- mercury-tests-0.13.1.orig/hard_coded/dir_test.exp3 2003-07-29 03:50:45.000000000 +1200 -+++ mercury-tests-0.13.1/hard_coded/dir_test.exp3 2007-01-07 15:51:35.000000000 +1300 -@@ -130,7 +130,6 @@ - "foo"/"bar/baz" = "foo/bar/baz". - "foo/"/"bar/baz" = "foo/bar/baz". - checking whether `unwritable' is readable...ok --unwritable file found to be unwritable - make_directory succeeded - make_directory succeeded - dir.make_single_directory with non-existent parent failed as expected. -diff -urN mercury-tests-0.13.1.orig/hard_coded/dir_test.m mercury-tests-0.13.1/hard_coded/dir_test.m ---- mercury-tests-0.13.1.orig/hard_coded/dir_test.m 2006-03-29 20:08:00.000000000 +1200 -+++ mercury-tests-0.13.1/hard_coded/dir_test.m 2007-01-07 15:51:35.000000000 +1300 -@@ -50,16 +50,6 @@ - io__write(ReadResult), - io__nl, - -- io__check_file_accessibility("unwritable", -- [read, write], WriteResult), -- ( { WriteResult = ok } -> -- io__write_string( -- "Error: unwritable file found to be writable\n") -- ; -- io__write_string( -- "unwritable file found to be unwritable\n") -- ), -- - { Dir1 = "test_dir"/"d1" }, - test0("make_directory", dir__make_directory(Dir1)), - % Test making a directory that already exists. diff --git a/dev-lang/mercury/files/mercury-0.13.1-tests-ho_and_type_spec_bug.patch b/dev-lang/mercury/files/mercury-0.13.1-tests-ho_and_type_spec_bug.patch deleted file mode 100644 index e3e1c594de08..000000000000 --- a/dev-lang/mercury/files/mercury-0.13.1-tests-ho_and_type_spec_bug.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -urN mercury-tests-0.13.1.orig/valid/Mmakefile mercury-tests-0.13.1/valid/Mmakefile ---- mercury-tests-0.13.1.orig/valid/Mmakefile 2006-11-08 14:36:30.000000000 +1300 -+++ mercury-tests-0.13.1/valid/Mmakefile 2007-01-07 15:51:35.000000000 +1300 -@@ -400,3 +400,5 @@ - rm -f *.err *.h - - #-----------------------------------------------------------------------------# -+ -+MCFLAGS-ho_and_type_spec_bug+=--no-optimize-higher-order diff --git a/dev-lang/mercury/files/mercury-0.13.1-tests-string_format.patch b/dev-lang/mercury/files/mercury-0.13.1-tests-string_format.patch deleted file mode 100644 index 5c9a088542fa..000000000000 --- a/dev-lang/mercury/files/mercury-0.13.1-tests-string_format.patch +++ /dev/null @@ -1,723 +0,0 @@ -diff -urN mercury-tests-0.13.1.orig/general/string_format/string_format_o.exp2 mercury-tests-0.13.1/general/string_format/string_format_o.exp2 ---- mercury-tests-0.13.1.orig/general/string_format/string_format_o.exp2 2002-11-23 03:09:31.000000000 +1300 -+++ mercury-tests-0.13.1/general/string_format/string_format_o.exp2 2007-01-07 15:52:06.000000000 +1300 -@@ -308,7 +308,7 @@ - %#-5o:'012 ' - %#-5o:'0144 ' - %#-5o:'0777777777777777777777' -- %#.0o:'' -+ %#.0o:'0' - %#.0o:'01' - %#.0o:'012' - %#.0o:'0144' -@@ -703,7 +703,7 @@ - % 5.5o:'00012' - % 5.5o:'00144' - % 5.5o:'777777777777777777777' -- %# .0o:'' -+ %# .0o:'0' - %# .0o:'01' - %# .0o:'012' - %# .0o:'0144' -@@ -743,7 +743,7 @@ - %#+ 5o:' 012' - %#+ 5o:' 0144' - %#+ 5o:'0777777777777777777777' -- %#+.0o:'' -+ %#+.0o:'0' - %#+.0o:'01' - %#+.0o:'012' - %#+.0o:'0144' -@@ -808,7 +808,7 @@ - %#-+5o:'012 ' - %#-+5o:'0144 ' - %#-+5o:'0777777777777777777777' -- %#-.0o:'' -+ %#-.0o:'0' - %#-.0o:'01' - %#-.0o:'012' - %#-.0o:'0144' -@@ -828,7 +828,7 @@ - %#-.5o:'00012' - %#-.5o:'00144' - %#-.5o:'0777777777777777777777' -- %#0.0o:'' -+ %#0.0o:'0' - %#0.0o:'01' - %#0.0o:'012' - %#0.0o:'0144' -@@ -848,7 +848,7 @@ - %#0.5o:'00012' - %#0.5o:'00144' - %#0.5o:'0777777777777777777777' -- %#1.0o:' ' -+ %#1.0o:'0' - %#1.0o:'01' - %#1.0o:'012' - %#1.0o:'0144' -@@ -868,7 +868,7 @@ - %#1.5o:'00012' - %#1.5o:'00144' - %#1.5o:'0777777777777777777777' -- %#2.0o:' ' -+ %#2.0o:' 0' - %#2.0o:'01' - %#2.0o:'012' - %#2.0o:'0144' -@@ -888,7 +888,7 @@ - %#2.5o:'00012' - %#2.5o:'00144' - %#2.5o:'0777777777777777777777' -- %#5.0o:' ' -+ %#5.0o:' 0' - %#5.0o:' 01' - %#5.0o:' 012' - %#5.0o:' 0144' -@@ -1243,7 +1243,7 @@ - %0#-5o:'012 ' - %0#-5o:'0144 ' - %0#-5o:'0777777777777777777777' -- %0#.0o:'' -+ %0#.0o:'0' - %0#.0o:'01' - %0#.0o:'012' - %0#.0o:'0144' -@@ -1448,7 +1448,7 @@ - %05.5o:'00012' - %05.5o:'00144' - %05.5o:'777777777777777777777' -- %# 0.0o:'' -+ %# 0.0o:'0' - %# 0.0o:'01' - %# 0.0o:'012' - %# 0.0o:'0144' -@@ -1468,7 +1468,7 @@ - %# 0.5o:'00012' - %# 0.5o:'00144' - %# 0.5o:'0777777777777777777777' -- %# 1.0o:' ' -+ %# 1.0o:'0' - %# 1.0o:'01' - %# 1.0o:'012' - %# 1.0o:'0144' -@@ -1488,7 +1488,7 @@ - %# 1.5o:'00012' - %# 1.5o:'00144' - %# 1.5o:'0777777777777777777777' -- %# 2.0o:' ' -+ %# 2.0o:' 0' - %# 2.0o:'01' - %# 2.0o:'012' - %# 2.0o:'0144' -@@ -1508,7 +1508,7 @@ - %# 2.5o:'00012' - %# 2.5o:'00144' - %# 2.5o:'0777777777777777777777' -- %# 5.0o:' ' -+ %# 5.0o:' 0' - %# 5.0o:' 01' - %# 5.0o:' 012' - %# 5.0o:' 0144' -@@ -1528,7 +1528,7 @@ - %# 5.5o:'00012' - %# 5.5o:'00144' - %# 5.5o:'0777777777777777777777' -- %#+ .0o:'' -+ %#+ .0o:'0' - %#+ .0o:'01' - %#+ .0o:'012' - %#+ .0o:'0144' -@@ -1548,7 +1548,7 @@ - %#+ .5o:'00012' - %#+ .5o:'00144' - %#+ .5o:'0777777777777777777777' -- %#+0.0o:'' -+ %#+0.0o:'0' - %#+0.0o:'01' - %#+0.0o:'012' - %#+0.0o:'0144' -@@ -1568,7 +1568,7 @@ - %#+0.5o:'00012' - %#+0.5o:'00144' - %#+0.5o:'0777777777777777777777' -- %#+1.0o:' ' -+ %#+1.0o:'0' - %#+1.0o:'01' - %#+1.0o:'012' - %#+1.0o:'0144' -@@ -1588,7 +1588,7 @@ - %#+1.5o:'00012' - %#+1.5o:'00144' - %#+1.5o:'0777777777777777777777' -- %#+2.0o:' ' -+ %#+2.0o:' 0' - %#+2.0o:'01' - %#+2.0o:'012' - %#+2.0o:'0144' -@@ -1608,7 +1608,7 @@ - %#+2.5o:'00012' - %#+2.5o:'00144' - %#+2.5o:'0777777777777777777777' -- %#+5.0o:' ' -+ %#+5.0o:' 0' - %#+5.0o:' 01' - %#+5.0o:' 012' - %#+5.0o:' 0144' -@@ -1628,7 +1628,7 @@ - %#+5.5o:'00012' - %#+5.5o:'00144' - %#+5.5o:'0777777777777777777777' -- %#- .0o:'' -+ %#- .0o:'0' - %#- .0o:'01' - %#- .0o:'012' - %#- .0o:'0144' -@@ -1668,7 +1668,7 @@ - %#-+ 5o:'012 ' - %#-+ 5o:'0144 ' - %#-+ 5o:'0777777777777777777777' -- %#-+.0o:'' -+ %#-+.0o:'0' - %#-+.0o:'01' - %#-+.0o:'012' - %#-+.0o:'0144' -@@ -1688,7 +1688,7 @@ - %#-+.5o:'00012' - %#-+.5o:'00144' - %#-+.5o:'0777777777777777777777' -- %#-0.0o:'' -+ %#-0.0o:'0' - %#-0.0o:'01' - %#-0.0o:'012' - %#-0.0o:'0144' -@@ -1708,7 +1708,7 @@ - %#-0.5o:'00012' - %#-0.5o:'00144' - %#-0.5o:'0777777777777777777777' -- %#-1.0o:' ' -+ %#-1.0o:'0' - %#-1.0o:'01' - %#-1.0o:'012' - %#-1.0o:'0144' -@@ -1728,7 +1728,7 @@ - %#-1.5o:'00012' - %#-1.5o:'00144' - %#-1.5o:'0777777777777777777777' -- %#-2.0o:' ' -+ %#-2.0o:'0 ' - %#-2.0o:'01' - %#-2.0o:'012' - %#-2.0o:'0144' -@@ -1748,7 +1748,7 @@ - %#-2.5o:'00012' - %#-2.5o:'00144' - %#-2.5o:'0777777777777777777777' -- %#-5.0o:' ' -+ %#-5.0o:'0 ' - %#-5.0o:'01 ' - %#-5.0o:'012 ' - %#-5.0o:'0144 ' -@@ -2108,7 +2108,7 @@ - %0 5.5o:'00012' - %0 5.5o:'00144' - %0 5.5o:'777777777777777777777' -- %0# .0o:'' -+ %0# .0o:'0' - %0# .0o:'01' - %0# .0o:'012' - %0# .0o:'0144' -@@ -2148,7 +2148,7 @@ - %0#+ 5o:'00012' - %0#+ 5o:'00144' - %0#+ 5o:'0777777777777777777777' -- %0#+.0o:'' -+ %0#+.0o:'0' - %0#+.0o:'01' - %0#+.0o:'012' - %0#+.0o:'0144' -@@ -2213,7 +2213,7 @@ - %0#-+5o:'012 ' - %0#-+5o:'0144 ' - %0#-+5o:'0777777777777777777777' -- %0#-.0o:'' -+ %0#-.0o:'0' - %0#-.0o:'01' - %0#-.0o:'012' - %0#-.0o:'0144' -@@ -2233,7 +2233,7 @@ - %0#-.5o:'00012' - %0#-.5o:'00144' - %0#-.5o:'0777777777777777777777' -- %0#0.0o:'' -+ %0#0.0o:'0' - %0#0.0o:'01' - %0#0.0o:'012' - %0#0.0o:'0144' -@@ -2253,7 +2253,7 @@ - %0#0.5o:'00012' - %0#0.5o:'00144' - %0#0.5o:'0777777777777777777777' -- %0#1.0o:' ' -+ %0#1.0o:'0' - %0#1.0o:'01' - %0#1.0o:'012' - %0#1.0o:'0144' -@@ -2273,7 +2273,7 @@ - %0#1.5o:'00012' - %0#1.5o:'00144' - %0#1.5o:'0777777777777777777777' -- %0#2.0o:' ' -+ %0#2.0o:' 0' - %0#2.0o:'01' - %0#2.0o:'012' - %0#2.0o:'0144' -@@ -2293,7 +2293,7 @@ - %0#2.5o:'00012' - %0#2.5o:'00144' - %0#2.5o:'0777777777777777777777' -- %0#5.0o:' ' -+ %0#5.0o:' 0' - %0#5.0o:' 01' - %0#5.0o:' 012' - %0#5.0o:' 0144' -@@ -2553,7 +2553,7 @@ - %0-5.5o:'00012' - %0-5.5o:'00144' - %0-5.5o:'777777777777777777777' -- %#+ 0.0o:'' -+ %#+ 0.0o:'0' - %#+ 0.0o:'01' - %#+ 0.0o:'012' - %#+ 0.0o:'0144' -@@ -2573,7 +2573,7 @@ - %#+ 0.5o:'00012' - %#+ 0.5o:'00144' - %#+ 0.5o:'0777777777777777777777' -- %#+ 1.0o:' ' -+ %#+ 1.0o:'0' - %#+ 1.0o:'01' - %#+ 1.0o:'012' - %#+ 1.0o:'0144' -@@ -2593,7 +2593,7 @@ - %#+ 1.5o:'00012' - %#+ 1.5o:'00144' - %#+ 1.5o:'0777777777777777777777' -- %#+ 2.0o:' ' -+ %#+ 2.0o:' 0' - %#+ 2.0o:'01' - %#+ 2.0o:'012' - %#+ 2.0o:'0144' -@@ -2613,7 +2613,7 @@ - %#+ 2.5o:'00012' - %#+ 2.5o:'00144' - %#+ 2.5o:'0777777777777777777777' -- %#+ 5.0o:' ' -+ %#+ 5.0o:' 0' - %#+ 5.0o:' 01' - %#+ 5.0o:' 012' - %#+ 5.0o:' 0144' -@@ -2633,7 +2633,7 @@ - %#+ 5.5o:'00012' - %#+ 5.5o:'00144' - %#+ 5.5o:'0777777777777777777777' -- %#- 0.0o:'' -+ %#- 0.0o:'0' - %#- 0.0o:'01' - %#- 0.0o:'012' - %#- 0.0o:'0144' -@@ -2653,7 +2653,7 @@ - %#- 0.5o:'00012' - %#- 0.5o:'00144' - %#- 0.5o:'0777777777777777777777' -- %#- 1.0o:' ' -+ %#- 1.0o:'0' - %#- 1.0o:'01' - %#- 1.0o:'012' - %#- 1.0o:'0144' -@@ -2673,7 +2673,7 @@ - %#- 1.5o:'00012' - %#- 1.5o:'00144' - %#- 1.5o:'0777777777777777777777' -- %#- 2.0o:' ' -+ %#- 2.0o:'0 ' - %#- 2.0o:'01' - %#- 2.0o:'012' - %#- 2.0o:'0144' -@@ -2693,7 +2693,7 @@ - %#- 2.5o:'00012' - %#- 2.5o:'00144' - %#- 2.5o:'0777777777777777777777' -- %#- 5.0o:' ' -+ %#- 5.0o:'0 ' - %#- 5.0o:'01 ' - %#- 5.0o:'012 ' - %#- 5.0o:'0144 ' -@@ -2713,7 +2713,7 @@ - %#- 5.5o:'00012' - %#- 5.5o:'00144' - %#- 5.5o:'0777777777777777777777' -- %#-+ .0o:'' -+ %#-+ .0o:'0' - %#-+ .0o:'01' - %#-+ .0o:'012' - %#-+ .0o:'0144' -@@ -2733,7 +2733,7 @@ - %#-+ .5o:'00012' - %#-+ .5o:'00144' - %#-+ .5o:'0777777777777777777777' -- %#-+0.0o:'' -+ %#-+0.0o:'0' - %#-+0.0o:'01' - %#-+0.0o:'012' - %#-+0.0o:'0144' -@@ -2753,7 +2753,7 @@ - %#-+0.5o:'00012' - %#-+0.5o:'00144' - %#-+0.5o:'0777777777777777777777' -- %#-+1.0o:' ' -+ %#-+1.0o:'0' - %#-+1.0o:'01' - %#-+1.0o:'012' - %#-+1.0o:'0144' -@@ -2773,7 +2773,7 @@ - %#-+1.5o:'00012' - %#-+1.5o:'00144' - %#-+1.5o:'0777777777777777777777' -- %#-+2.0o:' ' -+ %#-+2.0o:'0 ' - %#-+2.0o:'01' - %#-+2.0o:'012' - %#-+2.0o:'0144' -@@ -2793,7 +2793,7 @@ - %#-+2.5o:'00012' - %#-+2.5o:'00144' - %#-+2.5o:'0777777777777777777777' -- %#-+5.0o:' ' -+ %#-+5.0o:'0 ' - %#-+5.0o:'01 ' - %#-+5.0o:'012 ' - %#-+5.0o:'0144 ' -@@ -2893,7 +2893,7 @@ - %-+ 5.5o:'00012' - %-+ 5.5o:'00144' - %-+ 5.5o:'777777777777777777777' -- %0# 0.0o:'' -+ %0# 0.0o:'0' - %0# 0.0o:'01' - %0# 0.0o:'012' - %0# 0.0o:'0144' -@@ -2913,7 +2913,7 @@ - %0# 0.5o:'00012' - %0# 0.5o:'00144' - %0# 0.5o:'0777777777777777777777' -- %0# 1.0o:' ' -+ %0# 1.0o:'0' - %0# 1.0o:'01' - %0# 1.0o:'012' - %0# 1.0o:'0144' -@@ -2933,7 +2933,7 @@ - %0# 1.5o:'00012' - %0# 1.5o:'00144' - %0# 1.5o:'0777777777777777777777' -- %0# 2.0o:' ' -+ %0# 2.0o:' 0' - %0# 2.0o:'01' - %0# 2.0o:'012' - %0# 2.0o:'0144' -@@ -2953,7 +2953,7 @@ - %0# 2.5o:'00012' - %0# 2.5o:'00144' - %0# 2.5o:'0777777777777777777777' -- %0# 5.0o:' ' -+ %0# 5.0o:' 0' - %0# 5.0o:' 01' - %0# 5.0o:' 012' - %0# 5.0o:' 0144' -@@ -2973,7 +2973,7 @@ - %0# 5.5o:'00012' - %0# 5.5o:'00144' - %0# 5.5o:'0777777777777777777777' -- %0#+ .0o:'' -+ %0#+ .0o:'0' - %0#+ .0o:'01' - %0#+ .0o:'012' - %0#+ .0o:'0144' -@@ -2993,7 +2993,7 @@ - %0#+ .5o:'00012' - %0#+ .5o:'00144' - %0#+ .5o:'0777777777777777777777' -- %0#+0.0o:'' -+ %0#+0.0o:'0' - %0#+0.0o:'01' - %0#+0.0o:'012' - %0#+0.0o:'0144' -@@ -3013,7 +3013,7 @@ - %0#+0.5o:'00012' - %0#+0.5o:'00144' - %0#+0.5o:'0777777777777777777777' -- %0#+1.0o:' ' -+ %0#+1.0o:'0' - %0#+1.0o:'01' - %0#+1.0o:'012' - %0#+1.0o:'0144' -@@ -3033,7 +3033,7 @@ - %0#+1.5o:'00012' - %0#+1.5o:'00144' - %0#+1.5o:'0777777777777777777777' -- %0#+2.0o:' ' -+ %0#+2.0o:' 0' - %0#+2.0o:'01' - %0#+2.0o:'012' - %0#+2.0o:'0144' -@@ -3053,7 +3053,7 @@ - %0#+2.5o:'00012' - %0#+2.5o:'00144' - %0#+2.5o:'0777777777777777777777' -- %0#+5.0o:' ' -+ %0#+5.0o:' 0' - %0#+5.0o:' 01' - %0#+5.0o:' 012' - %0#+5.0o:' 0144' -@@ -3073,7 +3073,7 @@ - %0#+5.5o:'00012' - %0#+5.5o:'00144' - %0#+5.5o:'0777777777777777777777' -- %0#- .0o:'' -+ %0#- .0o:'0' - %0#- .0o:'01' - %0#- .0o:'012' - %0#- .0o:'0144' -@@ -3113,7 +3113,7 @@ - %0#-+ 5o:'012 ' - %0#-+ 5o:'0144 ' - %0#-+ 5o:'0777777777777777777777' -- %0#-+.0o:'' -+ %0#-+.0o:'0' - %0#-+.0o:'01' - %0#-+.0o:'012' - %0#-+.0o:'0144' -@@ -3133,7 +3133,7 @@ - %0#-+.5o:'00012' - %0#-+.5o:'00144' - %0#-+.5o:'0777777777777777777777' -- %0#-0.0o:'' -+ %0#-0.0o:'0' - %0#-0.0o:'01' - %0#-0.0o:'012' - %0#-0.0o:'0144' -@@ -3153,7 +3153,7 @@ - %0#-0.5o:'00012' - %0#-0.5o:'00144' - %0#-0.5o:'0777777777777777777777' -- %0#-1.0o:' ' -+ %0#-1.0o:'0' - %0#-1.0o:'01' - %0#-1.0o:'012' - %0#-1.0o:'0144' -@@ -3173,7 +3173,7 @@ - %0#-1.5o:'00012' - %0#-1.5o:'00144' - %0#-1.5o:'0777777777777777777777' -- %0#-2.0o:' ' -+ %0#-2.0o:'0 ' - %0#-2.0o:'01' - %0#-2.0o:'012' - %0#-2.0o:'0144' -@@ -3193,7 +3193,7 @@ - %0#-2.5o:'00012' - %0#-2.5o:'00144' - %0#-2.5o:'0777777777777777777777' -- %0#-5.0o:' ' -+ %0#-5.0o:'0 ' - %0#-5.0o:'01 ' - %0#-5.0o:'012 ' - %0#-5.0o:'0144 ' -@@ -3473,7 +3473,7 @@ - %0-+5.5o:'00012' - %0-+5.5o:'00144' - %0-+5.5o:'777777777777777777777' -- %#-+ 0.0o:'' -+ %#-+ 0.0o:'0' - %#-+ 0.0o:'01' - %#-+ 0.0o:'012' - %#-+ 0.0o:'0144' -@@ -3493,7 +3493,7 @@ - %#-+ 0.5o:'00012' - %#-+ 0.5o:'00144' - %#-+ 0.5o:'0777777777777777777777' -- %#-+ 1.0o:' ' -+ %#-+ 1.0o:'0' - %#-+ 1.0o:'01' - %#-+ 1.0o:'012' - %#-+ 1.0o:'0144' -@@ -3513,7 +3513,7 @@ - %#-+ 1.5o:'00012' - %#-+ 1.5o:'00144' - %#-+ 1.5o:'0777777777777777777777' -- %#-+ 2.0o:' ' -+ %#-+ 2.0o:'0 ' - %#-+ 2.0o:'01' - %#-+ 2.0o:'012' - %#-+ 2.0o:'0144' -@@ -3533,7 +3533,7 @@ - %#-+ 2.5o:'00012' - %#-+ 2.5o:'00144' - %#-+ 2.5o:'0777777777777777777777' -- %#-+ 5.0o:' ' -+ %#-+ 5.0o:'0 ' - %#-+ 5.0o:'01 ' - %#-+ 5.0o:'012 ' - %#-+ 5.0o:'0144 ' -@@ -3553,7 +3553,7 @@ - %#-+ 5.5o:'00012' - %#-+ 5.5o:'00144' - %#-+ 5.5o:'0777777777777777777777' -- %0#+ 0.0o:'' -+ %0#+ 0.0o:'0' - %0#+ 0.0o:'01' - %0#+ 0.0o:'012' - %0#+ 0.0o:'0144' -@@ -3573,7 +3573,7 @@ - %0#+ 0.5o:'00012' - %0#+ 0.5o:'00144' - %0#+ 0.5o:'0777777777777777777777' -- %0#+ 1.0o:' ' -+ %0#+ 1.0o:'0' - %0#+ 1.0o:'01' - %0#+ 1.0o:'012' - %0#+ 1.0o:'0144' -@@ -3593,7 +3593,7 @@ - %0#+ 1.5o:'00012' - %0#+ 1.5o:'00144' - %0#+ 1.5o:'0777777777777777777777' -- %0#+ 2.0o:' ' -+ %0#+ 2.0o:' 0' - %0#+ 2.0o:'01' - %0#+ 2.0o:'012' - %0#+ 2.0o:'0144' -@@ -3613,7 +3613,7 @@ - %0#+ 2.5o:'00012' - %0#+ 2.5o:'00144' - %0#+ 2.5o:'0777777777777777777777' -- %0#+ 5.0o:' ' -+ %0#+ 5.0o:' 0' - %0#+ 5.0o:' 01' - %0#+ 5.0o:' 012' - %0#+ 5.0o:' 0144' -@@ -3633,7 +3633,7 @@ - %0#+ 5.5o:'00012' - %0#+ 5.5o:'00144' - %0#+ 5.5o:'0777777777777777777777' -- %0#- 0.0o:'' -+ %0#- 0.0o:'0' - %0#- 0.0o:'01' - %0#- 0.0o:'012' - %0#- 0.0o:'0144' -@@ -3653,7 +3653,7 @@ - %0#- 0.5o:'00012' - %0#- 0.5o:'00144' - %0#- 0.5o:'0777777777777777777777' -- %0#- 1.0o:' ' -+ %0#- 1.0o:'0' - %0#- 1.0o:'01' - %0#- 1.0o:'012' - %0#- 1.0o:'0144' -@@ -3673,7 +3673,7 @@ - %0#- 1.5o:'00012' - %0#- 1.5o:'00144' - %0#- 1.5o:'0777777777777777777777' -- %0#- 2.0o:' ' -+ %0#- 2.0o:'0 ' - %0#- 2.0o:'01' - %0#- 2.0o:'012' - %0#- 2.0o:'0144' -@@ -3693,7 +3693,7 @@ - %0#- 2.5o:'00012' - %0#- 2.5o:'00144' - %0#- 2.5o:'0777777777777777777777' -- %0#- 5.0o:' ' -+ %0#- 5.0o:'0 ' - %0#- 5.0o:'01 ' - %0#- 5.0o:'012 ' - %0#- 5.0o:'0144 ' -@@ -3713,7 +3713,7 @@ - %0#- 5.5o:'00012' - %0#- 5.5o:'00144' - %0#- 5.5o:'0777777777777777777777' -- %0#-+ .0o:'' -+ %0#-+ .0o:'0' - %0#-+ .0o:'01' - %0#-+ .0o:'012' - %0#-+ .0o:'0144' -@@ -3733,7 +3733,7 @@ - %0#-+ .5o:'00012' - %0#-+ .5o:'00144' - %0#-+ .5o:'0777777777777777777777' -- %0#-+0.0o:'' -+ %0#-+0.0o:'0' - %0#-+0.0o:'01' - %0#-+0.0o:'012' - %0#-+0.0o:'0144' -@@ -3753,7 +3753,7 @@ - %0#-+0.5o:'00012' - %0#-+0.5o:'00144' - %0#-+0.5o:'0777777777777777777777' -- %0#-+1.0o:' ' -+ %0#-+1.0o:'0' - %0#-+1.0o:'01' - %0#-+1.0o:'012' - %0#-+1.0o:'0144' -@@ -3773,7 +3773,7 @@ - %0#-+1.5o:'00012' - %0#-+1.5o:'00144' - %0#-+1.5o:'0777777777777777777777' -- %0#-+2.0o:' ' -+ %0#-+2.0o:'0 ' - %0#-+2.0o:'01' - %0#-+2.0o:'012' - %0#-+2.0o:'0144' -@@ -3793,7 +3793,7 @@ - %0#-+2.5o:'00012' - %0#-+2.5o:'00144' - %0#-+2.5o:'0777777777777777777777' -- %0#-+5.0o:' ' -+ %0#-+5.0o:'0 ' - %0#-+5.0o:'01 ' - %0#-+5.0o:'012 ' - %0#-+5.0o:'0144 ' -@@ -3893,7 +3893,7 @@ - %0-+ 5.5o:'00012' - %0-+ 5.5o:'00144' - %0-+ 5.5o:'777777777777777777777' --%0#-+ 0.0o:'' -+%0#-+ 0.0o:'0' - %0#-+ 0.0o:'01' - %0#-+ 0.0o:'012' - %0#-+ 0.0o:'0144' -@@ -3913,7 +3913,7 @@ - %0#-+ 0.5o:'00012' - %0#-+ 0.5o:'00144' - %0#-+ 0.5o:'0777777777777777777777' --%0#-+ 1.0o:' ' -+%0#-+ 1.0o:'0' - %0#-+ 1.0o:'01' - %0#-+ 1.0o:'012' - %0#-+ 1.0o:'0144' -@@ -3933,7 +3933,7 @@ - %0#-+ 1.5o:'00012' - %0#-+ 1.5o:'00144' - %0#-+ 1.5o:'0777777777777777777777' --%0#-+ 2.0o:' ' -+%0#-+ 2.0o:'0 ' - %0#-+ 2.0o:'01' - %0#-+ 2.0o:'012' - %0#-+ 2.0o:'0144' -@@ -3953,7 +3953,7 @@ - %0#-+ 2.5o:'00012' - %0#-+ 2.5o:'00144' - %0#-+ 2.5o:'0777777777777777777777' --%0#-+ 5.0o:' ' -+%0#-+ 5.0o:'0 ' - %0#-+ 5.0o:'01 ' - %0#-+ 5.0o:'012 ' - %0#-+ 5.0o:'0144 ' diff --git a/dev-lang/mercury/files/mercury-0.13.1-tests-workspace.patch b/dev-lang/mercury/files/mercury-0.13.1-tests-workspace.patch deleted file mode 100644 index a77ae47dcba2..000000000000 --- a/dev-lang/mercury/files/mercury-0.13.1-tests-workspace.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- mercury-tests-0.13.1.orig/Mmake.common 2006-01-25 20:03:44.000000000 +1300 -+++ mercury-tests-0.13.1/Mmake.common 2007-01-16 22:04:32.000000000 +1300 -@@ -73,8 +73,8 @@ - -include $(TESTS_DIR)/Mmake.params - - MCFLAGS += --flags $(TESTS_DIR)/TESTS_FLAGS --ifdef WORKSPACE_FLAGS --MCFLAGS += --flags $(TESTS_DIR)/WS_FLAGS -+ifdef WORKSPACE -+MCFLAGS += --flags $(TESTS_DIR)/WS_FLAGS.ws - endif - - # Avoid trying to make this file with `mmc --make' if it doesn't exist. ---- mercury-compiler-0.13.1.orig/configure 2006-12-01 09:37:01.000000000 +0000 -+++ mercury-compiler-0.13.1/configure 2008-08-21 03:17:23.000000000 +0000 -@@ -12301,9 +12301,9 @@ - then - test_flags="tests/TESTS_FLAGS" - else -- if test -e ../tests/TESTS_FLAGS.in -+ if test -e ../mercury-tests-0.13.1/TESTS_FLAGS.in - then -- test_flags="../tests/TESTS_FLAGS" -+ test_flags="../mercury-tests-0.13.1/TESTS_FLAGS" - else - test_flags="" - fi diff --git a/dev-lang/mercury/mercury-0.13.1-r2.ebuild b/dev-lang/mercury/mercury-0.13.1-r2.ebuild deleted file mode 100644 index b989ea631e48..000000000000 --- a/dev-lang/mercury/mercury-0.13.1-r2.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2011 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-r2.ebuild,v 1.11 2011/08/12 21:38:37 xarthisius Exp $ - -inherit eutils flag-o-matic - -MY_P=${PN}-compiler-${PV} - -DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language" -HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html" -SRC_URI="ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/mercury-compiler-0.13.1.tar.gz - test? ( ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/mercury-tests-0.13.1.tar.gz )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="debug minimal readline test threads" - -DEPEND="!dev-libs/mpatrol - !dev-util/mono-debugger - readline? ( sys-libs/readline )" - -S="${WORKDIR}"/${MY_P} -TESTDIR="${WORKDIR}"/${PN}-tests-${PV} - -src_unpack() { - unpack ${A} - - epatch "${FILESDIR}"/${P}-mmake-params.patch - epatch "${FILESDIR}"/${P}-multilib.patch - epatch "${FILESDIR}"/${P}-libgrades.patch - epatch "${FILESDIR}"/${P}-docs.patch - epatch "${FILESDIR}"/${P}-no-reconf.patch - epatch "${FILESDIR}"/${P}-rebuild-mslice.patch - - if use test; then - epatch "${FILESDIR}"/${P}-tests-dir_test.patch - epatch "${FILESDIR}"/${P}-tests-ho_and_type_spec_bug.patch - epatch "${FILESDIR}"/${P}-tests-string_format.patch - epatch "${FILESDIR}"/${P}-tests-workspace.patch - fi -} - -src_compile() { - strip-flags - - local myconf - myconf="--libdir=/usr/$(get_libdir) \ - --disable-gcc-back-end \ - --enable-aditi-back-end \ - --disable-deep-profiler \ - --disable-dotnet-grades \ - --disable-java-grades \ - --with-llds-base-grade=none \ - --with-default-grade=hlc.gc \ - $(use_enable debug debug-grades) \ - $(use_enable threads par-grades) \ - $(use_enable !minimal most-grades) \ - $(use_with readline) \ - PACKAGE_VERSION=${PV}" - - econf \ - ${myconf} \ - || die "econf failed" - emake \ - EXTRA_MLFLAGS=--no-strip \ - || die "emake failed" - - emake \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - libgrades || die "emake libgrades failed" -} - -src_test() { - TEST_GRADE=`scripts/ml --print-grade` - if [ -d "${S}"/libgrades/${TEST_GRADE} ] ; then - TWS="${S}"/libgrades/${TEST_GRADE} - cp browser/mer_browser.init "${TWS}"/browser/ - cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/ - cp runtime/mer_rt.init "${TWS}"/runtime/ - else - TWS="${S}" - fi - - cd "${TESTDIR}" - sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws - - PATH="${TWS}"/scripts:"${TWS}"/util:"${PATH}" \ - TERM="" \ - WORKSPACE="${TWS}" \ - MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \ - MERCURY_CONFIG_DIR="${TWS}" \ - MMAKE_DIR="${TWS}"/scripts \ - MERCURY_DEBUGGER_INIT="${TESTDIR}"/mdbrc \ - MERCURY_SUPPRESS_STACK_TRACE=yes \ - GRADE=${TEST_GRADE} \ - MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc \ - -I${TWS}/boehm_gc/include \ - -I${TWS}/runtime \ - -I${TWS}/library \ - -I${TWS}/mdbcomp \ - -I${TWS}/browser \ - -I${TWS}/trace" \ - mmake || die "mmake test failed" -} - -src_install() { - emake \ - 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 \ - install || die "make install failed" - - dodoc \ - BUGS HISTORY LIMITATIONS NEWS README README.Linux \ - README.Linux-Alpha README.Linux-m68k README.Linux-PPC \ - RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS -} diff --git a/dev-lang/mercury/mercury-10.04-r1.ebuild b/dev-lang/mercury/mercury-10.04-r1.ebuild deleted file mode 100644 index 4e40cac0a982..000000000000 --- a/dev-lang/mercury/mercury-10.04-r1.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04-r1.ebuild,v 1.4 2011/08/12 21:38:37 xarthisius Exp $ - -inherit elisp-common eutils flag-o-matic java-pkg-opt-2 multilib - -PATCHSET_VER="0" -MY_P=${PN}-compiler-${PV} - -DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language" -HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html" -SRC_URI="http://www.mercury.cs.mu.oz.au/download/files/${MY_P}.tar.gz - mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz - test? ( http://www.mercury.cs.mu.oz.au/download/files/mercury-tests-${PV}.tar.gz )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="debug emacs erlang java minimal readline test threads" - -DEPEND="!dev-libs/mpatrol - !dev-util/mono-debugger - readline? ( sys-libs/readline ) - erlang? ( dev-lang/erlang ) - java? ( >=virtual/jdk-1.5 )" - -RDEPEND="${DEPEND} - emacs? ( virtual/emacs )" - -S="${WORKDIR}"/${MY_P} -TESTDIR="${WORKDIR}"/${PN}-tests-${PV} - -SITEFILE=50${PN}-gentoo.el - -src_unpack() { - unpack ${A} - - EPATCH_FORCE=yes - EPATCH_SUFFIX=patch - epatch "${WORKDIR}"/${PV} - - sed -i -e "s/@libdir@/$(get_libdir)/" \ - "${S}"/compiler/make.program_target.c \ - "${S}"/scripts/Mmake.vars.in - - if use test; then - epatch "${WORKDIR}"/${PV}-tests - fi -} - -src_compile() { - strip-flags - - local myconf - myconf="--libdir=/usr/$(get_libdir) \ - --disable-gcc-back-end \ - --disable-aditi-back-end \ - --disable-deep-profiler \ - --disable-dotnet-grades \ - $(use_enable erlang erlang-grade) \ - $(use_enable java java-grade) \ - $(use_enable debug debug-grades) \ - $(use_enable threads par-grades) \ - $(use_enable !minimal most-grades) \ - $(use_with readline)" - - econf \ - ${myconf} \ - || die "econf failed" - emake \ - PARALLEL=${MAKEOPTS} \ - EXTRA_MLFLAGS=--no-strip \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - EXTRA_LD_LIBFLAGS="${LDFLAGS}" \ - || die "emake failed" - - emake \ - PARALLEL=${MAKEOPTS} \ - EXTRA_MLFLAGS=--no-strip \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - EXTRA_LD_LIBFLAGS="${LDFLAGS}" \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - default_grade || die "emake default_grade failed" -} - -src_test() { - TEST_GRADE=`scripts/ml --print-grade` - if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then - TWS="${S}"/install_grade_dir.${TEST_GRADE} - cp browser/mer_browser.init "${TWS}"/browser/ - cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/ - cp runtime/mer_rt.init "${TWS}"/runtime/ - cp ssdb/mer_ssdb.init "${TWS}"/ssdb/ - else - TWS="${S}" - fi - - cd "${TESTDIR}" - sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws - - PATH="${TWS}"/scripts:"${TWS}"/util:"${TWS}"/slice:"${PATH}" \ - TERM="" \ - WORKSPACE="${TWS}" \ - MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \ - MERCURY_CONFIG_DIR="${TWS}" \ - MMAKE_DIR="${TWS}"/scripts \ - MERCURY_SUPPRESS_STACK_TRACE=yes \ - GRADE=${TEST_GRADE} \ - MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc \ - -I${TWS}/boehm_gc/include \ - -I${TWS}/runtime \ - -I${TWS}/library \ - -I${TWS}/mdbcomp \ - -I${TWS}/browser \ - -I${TWS}/trace" \ - mmake || die "mmake test failed" -} - -src_install() { - emake \ - PARALLEL=${MAKEOPTS} \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - EXTRA_LD_LIBFLAGS="${LDFLAGS}" \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - INSTALL_PREFIX="${D}"/usr \ - INSTALL_MAN_DIR="${D}"/usr/share/man \ - INSTALL_INFO_DIR="${D}"/usr/share/info \ - INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \ - INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \ - install || die "make install failed" - - if use emacs; then - elisp-site-file-install "${FILESDIR}/${SITEFILE}" \ - || die "elisp-site-file-install failed" - fi - - dodoc \ - BUGS HISTORY LIMITATIONS NEWS README README.Linux \ - README.Linux-Alpha README.Linux-m68k README.Linux-PPC \ - RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS - - if use erlang; then - dodoc README.Erlang - fi - - if use java; then - dodoc README.Java - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-lang/mercury/mercury-10.04.1.ebuild b/dev-lang/mercury/mercury-10.04.1.ebuild deleted file mode 100644 index c73b707d17fc..000000000000 --- a/dev-lang/mercury/mercury-10.04.1.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.1.ebuild,v 1.6 2011/08/12 21:38:37 xarthisius Exp $ - -inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib - -PATCHSET_VER="0" -MY_P=${PN}-compiler-${PV} - -DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language" -HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html" -SRC_URI="http://www.mercury.cs.mu.oz.au/download/files/${MY_P}.tar.gz - mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz - test? ( http://www.mercury.cs.mu.oz.au/download/files/mercury-tests-${PV}.tar.gz )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="debug emacs erlang java minimal readline test threads" - -DEPEND="!dev-libs/mpatrol - !dev-util/mono-debugger - readline? ( sys-libs/readline ) - erlang? ( dev-lang/erlang ) - java? ( >=virtual/jdk-1.5 )" - -RDEPEND="${DEPEND} - emacs? ( virtual/emacs )" - -S="${WORKDIR}"/${MY_P} -TESTDIR="${WORKDIR}"/${PN}-tests-${PV} - -SITEFILE=50${PN}-gentoo.el - -src_unpack() { - unpack ${A} - - EPATCH_FORCE=yes - EPATCH_SUFFIX=patch - epatch "${WORKDIR}"/${PV} - - sed -i -e "s/@libdir@/$(get_libdir)/" \ - "${S}"/compiler/file_util.m \ - "${S}"/compiler/libs.file_util.c \ - "${S}"/compiler/make.program_target.m \ - "${S}"/compiler/make.program_target.c \ - "${S}"/scripts/Mmake.vars.in - - touch "${S}"/compiler/*.date - touch "${S}"/compiler/*.date0 - touch "${S}"/compiler/*.date3 - touch "${S}"/compiler/*.int - touch "${S}"/compiler/*.int0 - touch "${S}"/compiler/*.int2 - touch "${S}"/compiler/*.int3 - touch "${S}"/compiler/*.c_date - touch "${S}"/compiler/*.c - - if use test; then - epatch "${WORKDIR}"/${PV}-tests - fi - - cd "${S}" - eautoreconf -} - -src_compile() { - strip-flags - - local myconf - myconf="--libdir=/usr/$(get_libdir) \ - --disable-gcc-back-end \ - --disable-deep-profiler \ - --disable-dotnet-grades \ - $(use_enable erlang erlang-grade) \ - $(use_enable java java-grade) \ - $(use_enable debug debug-grades) \ - $(use_enable threads par-grades) \ - $(use_enable !minimal most-grades) \ - $(use_with readline)" - - econf \ - ${myconf} \ - || die "econf failed" - - emake \ - PARALLEL=${MAKEOPTS} \ - bootstrap_depend || die "emake depend failed" - - emake \ - PARALLEL=${MAKEOPTS} \ - EXTRA_MLFLAGS=--no-strip \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - EXTRA_LD_LIBFLAGS="${LDFLAGS}" \ - || die "emake failed" - - emake \ - PARALLEL=${MAKEOPTS} \ - EXTRA_MLFLAGS=--no-strip \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - EXTRA_LD_LIBFLAGS="${LDFLAGS}" \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - default_grade || die "emake default_grade failed" -} - -src_test() { - TEST_GRADE=`scripts/ml --print-grade` - if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then - TWS="${S}"/install_grade_dir.${TEST_GRADE} - cp browser/mer_browser.init "${TWS}"/browser/ - cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/ - cp runtime/mer_rt.init "${TWS}"/runtime/ - cp ssdb/mer_ssdb.init "${TWS}"/ssdb/ - else - TWS="${S}" - fi - - cd "${TESTDIR}" - sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws - - PATH="${TWS}"/scripts:"${TWS}"/util:"${TWS}"/slice:"${PATH}" \ - TERM="" \ - WORKSPACE="${TWS}" \ - MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \ - MERCURY_CONFIG_DIR="${TWS}" \ - MMAKE_DIR="${TWS}"/scripts \ - MERCURY_SUPPRESS_STACK_TRACE=yes \ - GRADE=${TEST_GRADE} \ - MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc \ - -I${TWS}/boehm_gc/include \ - -I${TWS}/runtime \ - -I${TWS}/library \ - -I${TWS}/mdbcomp \ - -I${TWS}/browser \ - -I${TWS}/trace" \ - mmake || die "mmake test failed" -} - -src_install() { - emake \ - PARALLEL=${MAKEOPTS} \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - EXTRA_LD_LIBFLAGS="${LDFLAGS}" \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - INSTALL_PREFIX="${D}"/usr \ - INSTALL_MAN_DIR="${D}"/usr/share/man \ - INSTALL_INFO_DIR="${D}"/usr/share/info \ - INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \ - INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \ - install || die "make install failed" - - if use emacs; then - elisp-site-file-install "${FILESDIR}/${SITEFILE}" \ - || die "elisp-site-file-install failed" - fi - - dodoc \ - BUGS HISTORY LIMITATIONS NEWS README README.Linux \ - README.Linux-Alpha README.Linux-m68k README.Linux-PPC \ - RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS - - if use erlang; then - dodoc README.Erlang - fi - - if use java; then - dodoc README.Java - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-lang/mercury/mercury-10.04.2-r1.ebuild b/dev-lang/mercury/mercury-10.04.2-r1.ebuild deleted file mode 100644 index f039c6b0592a..000000000000 --- a/dev-lang/mercury/mercury-10.04.2-r1.ebuild +++ /dev/null @@ -1,213 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.2-r1.ebuild,v 1.12 2011/08/12 21:38:37 xarthisius Exp $ - -inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib - -PATCHSET_VER="3" -MY_P=${PN}-compiler-${PV} - -DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language" -HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html" -SRC_URI="http://www.mercury.cs.mu.oz.au/download/files/${MY_P}.tar.gz - mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz - test? ( http://www.mercury.cs.mu.oz.au/download/files/mercury-tests-${PV}.tar.gz )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="debug emacs erlang examples java minimal readline test threads" - -DEPEND="!dev-libs/mpatrol - !dev-util/mono-debugger - readline? ( sys-libs/readline ) - erlang? ( dev-lang/erlang ) - java? ( >=virtual/jdk-1.5 )" - -RDEPEND="${DEPEND} - emacs? ( virtual/emacs )" - -S="${WORKDIR}"/${MY_P} -TESTDIR="${WORKDIR}"/${PN}-tests-${PV} - -SITEFILE=50${PN}-gentoo.el - -src_unpack() { - unpack ${A} - - EPATCH_FORCE=yes - EPATCH_SUFFIX=patch - epatch "${WORKDIR}"/${PV} - - sed -i -e "s/@libdir@/$(get_libdir)/" \ - "${S}"/scripts/Mmake.vars.in \ - || die "sed libdir failed" - - if use test; then - epatch "${WORKDIR}"/${PV}-tests - fi - - cd "${S}" - eautoconf -} - -src_compile() { - strip-flags - - local myconf - myconf="--libdir=/usr/$(get_libdir) \ - --disable-gcc-back-end \ - --disable-deep-profiler \ - --disable-dotnet-grades \ - $(use_enable erlang erlang-grade) \ - $(use_enable java java-grade) \ - $(use_enable debug debug-grades) \ - $(use_enable threads par-grades) \ - $(use_enable !minimal most-grades) \ - $(use_with readline)" - - econf ${myconf} - - # Generate Mercury .m dependencies. This step will vacuously - # succeed if we do not have a bootstrappable instance of mmc - # already installed. This step is required as mmc does not wait - # for all dependencies to be generated before compiling .m files. - emake \ - PARALLEL=${MAKEOPTS} \ - bootstrap_depend || die "emake depend failed" - - # Build Mercury using base llds grade - emake \ - PARALLEL=${MAKEOPTS} \ - EXTRA_MLFLAGS=--no-strip \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - EXTRA_LD_LIBFLAGS="${LDFLAGS}" \ - || die "emake failed" - - # We can now patch .m Mercury compiler files since we - # have just built mercury_compiler. - EPATCH_FORCE=yes - EPATCH_SUFFIX=patch - epatch "${WORKDIR}"/${PV}-mmc - - sed -i -e "s/@libdir@/$(get_libdir)/" \ - "${S}"/compiler/file_util.m \ - "${S}"/compiler/make.program_target.m \ - || die "sed libdir failed" - - # Rebuild Mercury compiler using the just built mercury_compiler - emake \ - PARALLEL=${MAKEOPTS} \ - EXTRA_MLFLAGS=--no-strip \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - EXTRA_LD_LIBFLAGS="${LDFLAGS}" \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - compiler || die "emake compiler failed" - - # The default Mercury grade may not be the same as the grade used to - # compile the llds base grade. Since src_test() is run before - # src_install() we compile the default grade now - emake \ - PARALLEL=${MAKEOPTS} \ - EXTRA_MLFLAGS=--no-strip \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - EXTRA_LD_LIBFLAGS="${LDFLAGS}" \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - default_grade || die "emake default_grade failed" -} - -src_test() { - TEST_GRADE=`scripts/ml --print-grade` - if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then - TWS="${S}"/install_grade_dir.${TEST_GRADE} - cp browser/mer_browser.init "${TWS}"/browser/ - cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/ - cp runtime/mer_rt.init "${TWS}"/runtime/ - cp ssdb/mer_ssdb.init "${TWS}"/ssdb/ - else - TWS="${S}" - fi - - cd "${TESTDIR}" - sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws \ - || die "sed WORKSPACE failed" - - # Mercury tests must be run in C locale since Mercury output is - # compared to hard-coded warnings/errors - LC_ALL="C" \ - PATH="${TWS}"/scripts:"${TWS}"/util:"${TWS}"/slice:"${PATH}" \ - TERM="" \ - WORKSPACE="${TWS}" \ - MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \ - MERCURY_CONFIG_DIR="${TWS}" \ - MMAKE_DIR="${TWS}"/scripts \ - MERCURY_SUPPRESS_STACK_TRACE=yes \ - GRADE=${TEST_GRADE} \ - MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc \ - -I${TWS}/boehm_gc/include \ - -I${TWS}/runtime \ - -I${TWS}/library \ - -I${TWS}/mdbcomp \ - -I${TWS}/browser \ - -I${TWS}/trace" \ - mmake || die "mmake test failed" -} - -src_install() { - emake \ - PARALLEL=${MAKEOPTS} \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - EXTRA_LD_LIBFLAGS="${LDFLAGS}" \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - INSTALL_PREFIX="${D}"/usr \ - INSTALL_MAN_DIR="${D}"/usr/share/man \ - INSTALL_INFO_DIR="${D}"/usr/share/info \ - INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \ - INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \ - install || die "make install failed" - - if use emacs; then - elisp-site-file-install "${FILESDIR}/${SITEFILE}" \ - || die "elisp-site-file-install failed" - fi - - dodoc \ - BUGS HISTORY LIMITATIONS NEWS README README.Linux \ - README.Linux-Alpha README.Linux-m68k README.Linux-PPC \ - RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS || die - - if use erlang; then - dodoc README.Erlang || die - fi - - if use java; then - dodoc README.Java || die - fi - - if use examples; then - insinto /usr/share/doc/${PF}/samples - doins samples/{*.m,README,Mmakefile} || die - doins -r samples/c_interface \ - samples/diff \ - samples/muz \ - samples/rot13 \ - samples/solutions \ - samples/solver_types || die - - if use java; then - doins -r samples/java_interface || die - fi - - rm -rf $(find "${D}"/usr/share/doc/${PF}/samples \ - -name CVS -o -name .cvsignore) - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-lang/mercury/mercury-10.04.2.ebuild b/dev-lang/mercury/mercury-10.04.2.ebuild deleted file mode 100644 index aa3bfa279918..000000000000 --- a/dev-lang/mercury/mercury-10.04.2.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.2.ebuild,v 1.4 2011/08/12 21:38:37 xarthisius Exp $ - -inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib - -PATCHSET_VER="0" -MY_P=${PN}-compiler-${PV} - -DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language" -HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html" -SRC_URI="http://www.mercury.cs.mu.oz.au/download/files/${MY_P}.tar.gz - mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz - test? ( http://www.mercury.cs.mu.oz.au/download/files/mercury-tests-${PV}.tar.gz )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="debug emacs erlang java minimal readline test threads" - -DEPEND="!dev-libs/mpatrol - !dev-util/mono-debugger - readline? ( sys-libs/readline ) - erlang? ( dev-lang/erlang ) - java? ( >=virtual/jdk-1.5 )" - -RDEPEND="${DEPEND} - emacs? ( virtual/emacs )" - -S="${WORKDIR}"/${MY_P} -TESTDIR="${WORKDIR}"/${PN}-tests-${PV} - -SITEFILE=50${PN}-gentoo.el - -src_unpack() { - unpack ${A} - - EPATCH_FORCE=yes - EPATCH_SUFFIX=patch - epatch "${WORKDIR}"/${PV} - - sed -i -e "s/@libdir@/$(get_libdir)/" \ - "${S}"/compiler/file_util.m \ - "${S}"/compiler/libs.file_util.c \ - "${S}"/compiler/make.program_target.m \ - "${S}"/compiler/make.program_target.c \ - "${S}"/scripts/Mmake.vars.in - - touch "${S}"/compiler/*.date - touch "${S}"/compiler/*.date0 - touch "${S}"/compiler/*.date3 - touch "${S}"/compiler/*.int - touch "${S}"/compiler/*.int0 - touch "${S}"/compiler/*.int2 - touch "${S}"/compiler/*.int3 - touch "${S}"/compiler/*.c_date - touch "${S}"/compiler/*.c - - if use test; then - epatch "${WORKDIR}"/${PV}-tests - fi - - cd "${S}" - eautoreconf -} - -src_compile() { - strip-flags - - local myconf - myconf="--libdir=/usr/$(get_libdir) \ - --disable-gcc-back-end \ - --disable-deep-profiler \ - --disable-dotnet-grades \ - $(use_enable erlang erlang-grade) \ - $(use_enable java java-grade) \ - $(use_enable debug debug-grades) \ - $(use_enable threads par-grades) \ - $(use_enable !minimal most-grades) \ - $(use_with readline)" - - econf \ - ${myconf} \ - || die "econf failed" - - emake \ - PARALLEL=${MAKEOPTS} \ - bootstrap_depend || die "emake depend failed" - - emake \ - PARALLEL=${MAKEOPTS} \ - EXTRA_MLFLAGS=--no-strip \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - EXTRA_LD_LIBFLAGS="${LDFLAGS}" \ - || die "emake failed" - - emake \ - PARALLEL=${MAKEOPTS} \ - EXTRA_MLFLAGS=--no-strip \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - EXTRA_LD_LIBFLAGS="${LDFLAGS}" \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - default_grade || die "emake default_grade failed" -} - -src_test() { - TEST_GRADE=`scripts/ml --print-grade` - if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then - TWS="${S}"/install_grade_dir.${TEST_GRADE} - cp browser/mer_browser.init "${TWS}"/browser/ - cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/ - cp runtime/mer_rt.init "${TWS}"/runtime/ - cp ssdb/mer_ssdb.init "${TWS}"/ssdb/ - else - TWS="${S}" - fi - - cd "${TESTDIR}" - sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws - - PATH="${TWS}"/scripts:"${TWS}"/util:"${TWS}"/slice:"${PATH}" \ - TERM="" \ - WORKSPACE="${TWS}" \ - MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \ - MERCURY_CONFIG_DIR="${TWS}" \ - MMAKE_DIR="${TWS}"/scripts \ - MERCURY_SUPPRESS_STACK_TRACE=yes \ - GRADE=${TEST_GRADE} \ - MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc \ - -I${TWS}/boehm_gc/include \ - -I${TWS}/runtime \ - -I${TWS}/library \ - -I${TWS}/mdbcomp \ - -I${TWS}/browser \ - -I${TWS}/trace" \ - mmake || die "mmake test failed" -} - -src_install() { - emake \ - PARALLEL=${MAKEOPTS} \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - EXTRA_LD_LIBFLAGS="${LDFLAGS}" \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - INSTALL_PREFIX="${D}"/usr \ - INSTALL_MAN_DIR="${D}"/usr/share/man \ - INSTALL_INFO_DIR="${D}"/usr/share/info \ - INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \ - INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \ - install || die "make install failed" - - if use emacs; then - elisp-site-file-install "${FILESDIR}/${SITEFILE}" \ - || die "elisp-site-file-install failed" - fi - - dodoc \ - BUGS HISTORY LIMITATIONS NEWS README README.Linux \ - README.Linux-Alpha README.Linux-m68k README.Linux-PPC \ - RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS - - if use erlang; then - dodoc README.Erlang - fi - - if use java; then - dodoc README.Java - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-lang/mercury/mercury-10.04.ebuild b/dev-lang/mercury/mercury-10.04.ebuild deleted file mode 100644 index a7f37edec92b..000000000000 --- a/dev-lang/mercury/mercury-10.04.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild,v 1.9 2011/08/12 21:38:37 xarthisius Exp $ - -inherit elisp-common eutils flag-o-matic java-pkg-opt-2 multilib - -PATCHSET_VER="0" -MY_P=${PN}-compiler-${PV} - -DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language" -HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html" -SRC_URI="http://www.mercury.cs.mu.oz.au/download/files/${MY_P}.tar.gz - mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz - test? ( http://www.mercury.cs.mu.oz.au/download/files/mercury-tests-${PV}.tar.gz )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="debug emacs erlang java minimal readline test threads" - -DEPEND="!dev-libs/mpatrol - !dev-util/mono-debugger - readline? ( sys-libs/readline ) - erlang? ( dev-lang/erlang ) - java? ( >=virtual/jdk-1.5 )" - -RDEPEND="${DEPEND} - emacs? ( virtual/emacs )" - -S="${WORKDIR}"/${MY_P} -TESTDIR="${WORKDIR}"/${PN}-tests-${PV} - -SITEFILE=50${PN}-gentoo.el - -src_unpack() { - unpack ${A} - - EPATCH_FORCE=yes - EPATCH_SUFFIX=patch - epatch "${WORKDIR}"/${PV} - - sed -i -e "s/@libdir@/$(get_libdir)/" \ - "${S}"/compiler/make.program_target.c \ - "${S}"/scripts/Mmake.vars.in - - if use test; then - epatch "${WORKDIR}"/${PV}-tests - fi -} - -src_compile() { - strip-flags - - local myconf - myconf="--libdir=/usr/$(get_libdir) \ - --disable-gcc-back-end \ - --disable-aditi-back-end \ - --disable-deep-profiler \ - --disable-dotnet-grades \ - $(use_enable erlang erlang-grade) \ - $(use_enable java java-grade) \ - $(use_enable debug debug-grades) \ - $(use_enable threads par-grades) \ - $(use_enable !minimal most-grades) \ - $(use_with readline)" - - econf \ - ${myconf} \ - || die "econf failed" - emake \ - PARALLEL=${MAKEOPTS} \ - EXTRA_MLFLAGS=--no-strip \ - || die "emake failed" - - emake \ - PARALLEL=${MAKEOPTS} \ - EXTRA_MLFLAGS=--no-strip \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - default_grade || die "emake default_grade failed" -} - -src_test() { - TEST_GRADE=`scripts/ml --print-grade` - if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then - TWS="${S}"/install_grade_dir.${TEST_GRADE} - cp browser/mer_browser.init "${TWS}"/browser/ - cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/ - cp runtime/mer_rt.init "${TWS}"/runtime/ - cp ssdb/mer_ssdb.init "${TWS}"/ssdb/ - else - TWS="${S}" - fi - - cd "${TESTDIR}" - sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws - - PATH="${TWS}"/scripts:"${TWS}"/util:"${TWS}"/slice:"${PATH}" \ - TERM="" \ - WORKSPACE="${TWS}" \ - MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \ - MERCURY_CONFIG_DIR="${TWS}" \ - MMAKE_DIR="${TWS}"/scripts \ - MERCURY_SUPPRESS_STACK_TRACE=yes \ - GRADE=${TEST_GRADE} \ - MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc \ - -I${TWS}/boehm_gc/include \ - -I${TWS}/runtime \ - -I${TWS}/library \ - -I${TWS}/mdbcomp \ - -I${TWS}/browser \ - -I${TWS}/trace" \ - mmake || die "mmake test failed" -} - -src_install() { - emake \ - PARALLEL=${MAKEOPTS} \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - INSTALL_PREFIX="${D}"/usr \ - INSTALL_MAN_DIR="${D}"/usr/share/man \ - INSTALL_INFO_DIR="${D}"/usr/share/info \ - INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \ - INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \ - install || die "make install failed" - - if use emacs; then - elisp-site-file-install "${FILESDIR}/${SITEFILE}" \ - || die "elisp-site-file-install failed" - fi - - dodoc \ - BUGS HISTORY LIMITATIONS NEWS README README.Linux \ - README.Linux-Alpha README.Linux-m68k README.Linux-PPC \ - RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS - - if use erlang; then - dodoc README.Erlang - fi - - if use java; then - dodoc README.Java - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-lang/mercury/mercury-11.01_beta1.ebuild b/dev-lang/mercury/mercury-11.01_beta1.ebuild deleted file mode 100644 index b8f1f1b93036..000000000000 --- a/dev-lang/mercury/mercury-11.01_beta1.ebuild +++ /dev/null @@ -1,217 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-11.01_beta1.ebuild,v 1.4 2011/08/12 21:38:37 xarthisius Exp $ - -EAPI=2 - -inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib - -PATCHSET_VER="0" -MY_PV=${PV/%?/-2010-12-22} -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="http://www.mercury.csse.unimelb.edu.au/download/files/beta-releases/11.01-beta/${MY_P}.tar.gz - mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz - test? ( http://www.mercury.csse.unimelb.edu.au/download/files/beta-releases/11.01-beta/mercury-tests-${MY_PV/_/-}.tar.gz )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="debug emacs erlang examples java minimal readline test threads" - -DEPEND="!dev-libs/mpatrol - !dev-util/mono-debugger - readline? ( sys-libs/readline ) - erlang? ( dev-lang/erlang ) - java? ( >=virtual/jdk-1.5 )" - -RDEPEND="${DEPEND} - emacs? ( virtual/emacs )" - -S="${WORKDIR}"/${MY_P} -TESTDIR="${WORKDIR}"/${PN}-tests-${MY_PV/_/-} - -SITEFILE=50${PN}-gentoo.el - -src_prepare() { - cd "${WORKDIR}" - EPATCH_FORCE=yes - EPATCH_SUFFIX=patch - epatch "${WORKDIR}"/${PV} - - sed -i -e "s/@libdir@/$(get_libdir)/" \ - "${S}"/scripts/Mmake.vars.in \ - || die "sed libdir failed" - - if use test; then - epatch "${WORKDIR}"/${PV}-tests - fi - - cd "${S}" - eautoconf -} - -src_configure() { - strip-flags - - local myconf - myconf="--libdir=/usr/$(get_libdir) \ - --disable-gcc-back-end \ - --disable-deep-profiler \ - --disable-dotnet-grades \ - $(use_enable erlang erlang-grade) \ - $(use_enable java java-grade) \ - $(use_enable debug debug-grades) \ - $(use_enable threads par-grades) \ - $(use_enable !minimal most-grades) \ - $(use_with readline)" - - econf ${myconf} -} - -src_compile() { - # Generate Mercury .m dependencies. This step will vacuously - # succeed if we do not have a bootstrappable instance of mmc - # already installed. This step is required as mmc does not wait - # for all dependencies to be generated before compiling .m files. - emake \ - PARALLEL=${MAKEOPTS} \ - bootstrap_depend || die "emake depend failed" - - # Build Mercury using base llds grade - emake \ - PARALLEL=${MAKEOPTS} \ - EXTRA_MLFLAGS=--no-strip \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - EXTRA_LD_LIBFLAGS="${LDFLAGS}" \ - || die "emake failed" - - # We can now patch .m Mercury compiler files since we - # have just built mercury_compiler. - EPATCH_FORCE=yes - EPATCH_SUFFIX=patch - epatch "${WORKDIR}"/${PV}-mmc - - sed -i -e "s/@libdir@/$(get_libdir)/" \ - "${S}"/compiler/file_util.m \ - "${S}"/compiler/make.program_target.m \ - || die "sed libdir failed" - - # Rebuild Mercury compiler using the just built mercury_compiler - emake \ - PARALLEL=${MAKEOPTS} \ - EXTRA_MLFLAGS=--no-strip \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - EXTRA_LD_LIBFLAGS="${LDFLAGS}" \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - compiler || die "emake compiler failed" - - # The default Mercury grade may not be the same as the grade used to - # compile the llds base grade. Since src_test() is run before - # src_install() we compile the default grade now - emake \ - PARALLEL=${MAKEOPTS} \ - EXTRA_MLFLAGS=--no-strip \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - EXTRA_LD_LIBFLAGS="${LDFLAGS}" \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - default_grade || die "emake default_grade failed" -} - -src_test() { - TEST_GRADE=`scripts/ml --print-grade` - if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then - TWS="${S}"/install_grade_dir.${TEST_GRADE} - cp browser/mer_browser.init "${TWS}"/browser/ - cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/ - cp runtime/mer_rt.init "${TWS}"/runtime/ - cp ssdb/mer_ssdb.init "${TWS}"/ssdb/ - else - TWS="${S}" - fi - - cd "${TESTDIR}" - sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws \ - || die "sed WORKSPACE failed" - - # Mercury tests must be run in C locale since Mercury output is - # compared to hard-coded warnings/errors - LC_ALL="C" \ - PATH="${TWS}"/scripts:"${TWS}"/util:"${TWS}"/slice:"${PATH}" \ - TERM="" \ - WORKSPACE="${TWS}" \ - MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \ - MERCURY_CONFIG_DIR="${TWS}" \ - MMAKE_DIR="${TWS}"/scripts \ - MERCURY_SUPPRESS_STACK_TRACE=yes \ - GRADE=${TEST_GRADE} \ - MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc \ - -I${TWS}/boehm_gc/include \ - -I${TWS}/runtime \ - -I${TWS}/library \ - -I${TWS}/mdbcomp \ - -I${TWS}/browser \ - -I${TWS}/trace" \ - mmake || die "mmake test failed" -} - -src_install() { - emake \ - PARALLEL=${MAKEOPTS} \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - EXTRA_LD_LIBFLAGS="${LDFLAGS}" \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - INSTALL_PREFIX="${D}"/usr \ - INSTALL_MAN_DIR="${D}"/usr/share/man \ - INSTALL_INFO_DIR="${D}"/usr/share/info \ - INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \ - INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \ - install || die "make install failed" - - if use emacs; then - elisp-site-file-install "${FILESDIR}/${SITEFILE}" \ - || die "elisp-site-file-install failed" - fi - - dodoc \ - BUGS HISTORY LIMITATIONS NEWS README README.Linux \ - README.Linux-Alpha README.Linux-m68k README.Linux-PPC \ - RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS || die - - if use erlang; then - dodoc README.Erlang || die - fi - - if use java; then - dodoc README.Java || die - fi - - if use examples; then - insinto /usr/share/doc/${PF}/samples - doins samples/{*.m,README,Mmakefile} || die - doins -r samples/c_interface \ - samples/diff \ - samples/muz \ - samples/rot13 \ - samples/solutions \ - samples/solver_types || die - - if use java; then - doins -r samples/java_interface || die - fi - - rm -rf $(find "${D}"/usr/share/doc/${PF}/samples \ - -name CVS -o -name .cvsignore) - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} |