summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeri Harris <keri@gentoo.org>2006-06-14 09:57:55 +0000
committerKeri Harris <keri@gentoo.org>2006-06-14 09:57:55 +0000
commit15bc59e3916135ffc007e3fa8b6307456a7170b1 (patch)
tree614e37cf7257ed73517afce853a844ebe1313213 /dev-lang
parentStable on hppa (bug #135853). (diff)
downloadhistorical-15bc59e3916135ffc007e3fa8b6307456a7170b1.tar.gz
historical-15bc59e3916135ffc007e3fa8b6307456a7170b1.tar.bz2
historical-15bc59e3916135ffc007e3fa8b6307456a7170b1.zip
Add src_test support for default libgrade.
Package-Manager: portage-2.1
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/mercury/ChangeLog7
-rw-r--r--dev-lang/mercury/Manifest31
-rw-r--r--dev-lang/mercury/files/digest-mercury-0.12.2-r13
-rw-r--r--dev-lang/mercury/files/mercury-0.12.2-portage-r1.patch111
-rw-r--r--dev-lang/mercury/files/mercury-0.12.2-tests.patch120
-rw-r--r--dev-lang/mercury/mercury-0.12.2-r1.ebuild25
6 files changed, 281 insertions, 16 deletions
diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 56248fbd4b72..5de471bb7e73 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-lang/mercury
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.27 2006/06/12 07:47:04 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.28 2006/06/14 09:57:55 keri Exp $
+
+ 14 Jun 2006; Keri Harris <keri@gentoo.org>
+ +files/mercury-0.12.2-portage-r1.patch, +files/mercury-0.12.2-tests.patch,
+ mercury-0.12.2-r1.ebuild:
+ Add src_test support for default libgrade.
*mercury-0.13.0_beta20060609 (12 Jun 2006)
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 16ba89e902ba..7702e3920714 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -10,10 +10,18 @@ AUX mercury-0.12.2-docs.patch 796 RMD160 27543c5201dfcc3112878026c06f193e126288b
MD5 5e8e5942a015e9832289c90913fa2bca files/mercury-0.12.2-docs.patch 796
RMD160 27543c5201dfcc3112878026c06f193e126288be files/mercury-0.12.2-docs.patch 796
SHA256 78be9f8ef2960ce9ea99b33734d9143a998d87056efa84bafb618cab74fcd514 files/mercury-0.12.2-docs.patch 796
+AUX mercury-0.12.2-portage-r1.patch 4311 RMD160 e7b08a1914620410ebe216fd7677cd0e3a36a462 SHA1 5cd9b30bfffbef94e1f0b182ad262bdf8c9b5ccd SHA256 0c3e24245829c21b1661c927cb155dba262f8d671ade173de796968c249e1e80
+MD5 4d8eab7ca5541308733940a58a5d6ecf files/mercury-0.12.2-portage-r1.patch 4311
+RMD160 e7b08a1914620410ebe216fd7677cd0e3a36a462 files/mercury-0.12.2-portage-r1.patch 4311
+SHA256 0c3e24245829c21b1661c927cb155dba262f8d671ade173de796968c249e1e80 files/mercury-0.12.2-portage-r1.patch 4311
AUX mercury-0.12.2-portage.patch 2052 RMD160 3fdcd9a309c27da3cf539829413ca8b15d5b50ab SHA1 3b9cc1c7ff9b0885feeeab35857ae862a7366169 SHA256 80189cf0515f212f2756f5c944b9eab5db3acdece1404ab11a4e5eedcd1b42e0
MD5 bfc5cb304791178b3283d7cd48e750a7 files/mercury-0.12.2-portage.patch 2052
RMD160 3fdcd9a309c27da3cf539829413ca8b15d5b50ab files/mercury-0.12.2-portage.patch 2052
SHA256 80189cf0515f212f2756f5c944b9eab5db3acdece1404ab11a4e5eedcd1b42e0 files/mercury-0.12.2-portage.patch 2052
+AUX mercury-0.12.2-tests.patch 5622 RMD160 81f2ecfb77f556d7b34669834e56f550926069d6 SHA1 c1cd73d6658220945a5d667289e70b88ff06da9f SHA256 efde85a6808d479fb3f2ddffea297f09ab4c222597dad2c2e1be9d6ecf321e0d
+MD5 51efbe3f5889096eb70c40dfe4cb40d1 files/mercury-0.12.2-tests.patch 5622
+RMD160 81f2ecfb77f556d7b34669834e56f550926069d6 files/mercury-0.12.2-tests.patch 5622
+SHA256 efde85a6808d479fb3f2ddffea297f09ab4c222597dad2c2e1be9d6ecf321e0d files/mercury-0.12.2-tests.patch 5622
AUX mercury-0.13.0_beta-CFLAGS.patch 1387 RMD160 50beda679059cfa2f1c4c0868c34d7fcad147336 SHA1 ccde9305e9ee1b1705ffc96de36fbb766dc1f12e SHA256 aa3e882f2590d2962b2421495f92d1ae24030799e829f72caf5a55b17fcdea58
MD5 978c7b688fa22fbf08bbd85f052cc603 files/mercury-0.13.0_beta-CFLAGS.patch 1387
RMD160 50beda679059cfa2f1c4c0868c34d7fcad147336 files/mercury-0.13.0_beta-CFLAGS.patch 1387
@@ -32,10 +40,11 @@ RMD160 30c59012a80aebac452d6ec7d24e7af193e8ab7d files/mercury-0.13.0_beta-portag
SHA256 00fee4b44e779fd4cc79be60b95309a98999ae2fedfe602195fa1855e62d2da9 files/mercury-0.13.0_beta-portage.patch 1608
DIST mercury-compiler-0.12.2.tar.gz 15074997 RMD160 227a3e1796d96ad77324d9f1d39efd6be7fce80e SHA1 96b7a878370bb256da28c8ffa1c4b0a4bc3711d6 SHA256 7fa1df8030cdc3d4dc848d102ba64bf23c12004461c985290622b81753b89572
DIST mercury-compiler-0.13.0-beta-2006-06-09-unstable.tar.gz 15849120 RMD160 3dfe2e2229e5a8c47a71d1af5e8f305039cd53b3 SHA1 18f99b74bc67749c689f680efb0563132cbaf938 SHA256 3ff27dff11dbf45f82824d3c3bff1f3bbde0b24f36b709c5e334360127dd7c54
-EBUILD mercury-0.12.2-r1.ebuild 1533 RMD160 9fa48ee0a1639e971bf994064c94cc600b402357 SHA1 9984c71e82de63231cd7e67ecac99946674e5275 SHA256 459aeb074c15284a421832fb87154e97d48324ab89319c92113a505ed7f08d29
-MD5 b61155455083e4dc38e72db7c2c4cb4d mercury-0.12.2-r1.ebuild 1533
-RMD160 9fa48ee0a1639e971bf994064c94cc600b402357 mercury-0.12.2-r1.ebuild 1533
-SHA256 459aeb074c15284a421832fb87154e97d48324ab89319c92113a505ed7f08d29 mercury-0.12.2-r1.ebuild 1533
+DIST mercury-tests-0.12.2.tar.gz 897454 RMD160 e7cf515b0d56aff5432c5ec3e535faa907ce2955 SHA1 1f80ff38f141b975fe472c2aee48d44b8e187c08 SHA256 6d3fd92d11ce2a9ce99cfa35990027557d1c70f00a3417639523b6e27f746280
+EBUILD mercury-0.12.2-r1.ebuild 2004 RMD160 df7e09f85f3748560f9282b667c76b87b05948d1 SHA1 394830e247c97b6893bff8da65346d041298193d SHA256 9aae052739461b696b10863110da7eab47406c6a629ce36d8792f258af0d2eeb
+MD5 8ac12895463559881728628ff9ce81cf mercury-0.12.2-r1.ebuild 2004
+RMD160 df7e09f85f3748560f9282b667c76b87b05948d1 mercury-0.12.2-r1.ebuild 2004
+SHA256 9aae052739461b696b10863110da7eab47406c6a629ce36d8792f258af0d2eeb mercury-0.12.2-r1.ebuild 2004
EBUILD mercury-0.12.2.ebuild 1423 RMD160 9e5613b7a510ad5ba00c7ff079dffc3b788fb755 SHA1 8e8a9063248f02f94c4417a6c3f57626c04bd30b SHA256 89e50f4a3ca1267ba3b9715b42015c3be397a85068d7588c121473d3de2b78c8
MD5 6f79d42347ca00bfe02253c965d88574 mercury-0.12.2.ebuild 1423
RMD160 9e5613b7a510ad5ba00c7ff079dffc3b788fb755 mercury-0.12.2.ebuild 1423
@@ -44,10 +53,10 @@ EBUILD mercury-0.13.0_beta20060609.ebuild 1845 RMD160 354f5bb90e5dda319de58063c5
MD5 5c1e60c4336b3b9feae61b32cfe6c65d mercury-0.13.0_beta20060609.ebuild 1845
RMD160 354f5bb90e5dda319de58063c5a3c5bec4b71d61 mercury-0.13.0_beta20060609.ebuild 1845
SHA256 58d18b4dbc89ab02c776b9f81b164e0d77c30c0fb695e8cfec0fd7c470a6238f mercury-0.13.0_beta20060609.ebuild 1845
-MISC ChangeLog 4745 RMD160 c622795f3013fdaf1287a052a492406f40d6f8d5 SHA1 cc8e4d97359c98f82d7ca433feadc490852308f0 SHA256 0420e4f0f8865217a7689d657c9a63006d24e3886c122599d4fc60276f5b898e
-MD5 e9c217eddf7ab47477de1f13ade2824d ChangeLog 4745
-RMD160 c622795f3013fdaf1287a052a492406f40d6f8d5 ChangeLog 4745
-SHA256 0420e4f0f8865217a7689d657c9a63006d24e3886c122599d4fc60276f5b898e ChangeLog 4745
+MISC ChangeLog 4941 RMD160 5d0194944ec160d4c2b562bc9bb48473a9c22cc5 SHA1 2d1caaa8385bb72cf48b923a1a3613535ba43d40 SHA256 fd81aabf79604a6722ac1bd6d13f70269a6eb6b9af641efc9f46cf804f933349
+MD5 1329f5a44128425226fbd1af242e402f ChangeLog 4941
+RMD160 5d0194944ec160d4c2b562bc9bb48473a9c22cc5 ChangeLog 4941
+SHA256 fd81aabf79604a6722ac1bd6d13f70269a6eb6b9af641efc9f46cf804f933349 ChangeLog 4941
MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
MD5 6fca20d17d6d55a28537204aa9bb626f metadata.xml 247
RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 metadata.xml 247
@@ -55,9 +64,9 @@ SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa metadata
MD5 1de216638d19d62bd270bcc2ec55d75d files/digest-mercury-0.12.2 277
RMD160 56137f9a814f0f6f0d1d4b7200dfda77320ecc48 files/digest-mercury-0.12.2 277
SHA256 b9767d0d39801d79c2c6fad1bb77b2f7327bc0f5e70c8e9adcc4126352c8ddf9 files/digest-mercury-0.12.2 277
-MD5 1de216638d19d62bd270bcc2ec55d75d files/digest-mercury-0.12.2-r1 277
-RMD160 56137f9a814f0f6f0d1d4b7200dfda77320ecc48 files/digest-mercury-0.12.2-r1 277
-SHA256 b9767d0d39801d79c2c6fad1bb77b2f7327bc0f5e70c8e9adcc4126352c8ddf9 files/digest-mercury-0.12.2-r1 277
+MD5 0d30492cc04519cf02a3453c452710c5 files/digest-mercury-0.12.2-r1 539
+RMD160 6be0bed956edd23408af2bcf449cd393419f64c0 files/digest-mercury-0.12.2-r1 539
+SHA256 76206eb085f179635a04f8ad1b2b53b1e4a2b4e1dccab1d25bac557e609f7df2 files/digest-mercury-0.12.2-r1 539
MD5 457220c8f04fd9572c27674a4815623d files/digest-mercury-0.13.0_beta20060609 352
RMD160 5eb045511b07f5b0592d3da95fa44a1c88e793a0 files/digest-mercury-0.13.0_beta20060609 352
SHA256 de54e3fa9defbe8da86bc8ed33ef0d3cccae339ad7c7c66d324ebec7611296da files/digest-mercury-0.13.0_beta20060609 352
diff --git a/dev-lang/mercury/files/digest-mercury-0.12.2-r1 b/dev-lang/mercury/files/digest-mercury-0.12.2-r1
index 8447aec3d358..44b741b8da2b 100644
--- a/dev-lang/mercury/files/digest-mercury-0.12.2-r1
+++ b/dev-lang/mercury/files/digest-mercury-0.12.2-r1
@@ -1,3 +1,6 @@
MD5 49796cb9f475a0959d13ec7694777a94 mercury-compiler-0.12.2.tar.gz 15074997
RMD160 227a3e1796d96ad77324d9f1d39efd6be7fce80e mercury-compiler-0.12.2.tar.gz 15074997
SHA256 7fa1df8030cdc3d4dc848d102ba64bf23c12004461c985290622b81753b89572 mercury-compiler-0.12.2.tar.gz 15074997
+MD5 46099512bf8b9f1a336759845f2737f7 mercury-tests-0.12.2.tar.gz 897454
+RMD160 e7cf515b0d56aff5432c5ec3e535faa907ce2955 mercury-tests-0.12.2.tar.gz 897454
+SHA256 6d3fd92d11ce2a9ce99cfa35990027557d1c70f00a3417639523b6e27f746280 mercury-tests-0.12.2.tar.gz 897454
diff --git a/dev-lang/mercury/files/mercury-0.12.2-portage-r1.patch b/dev-lang/mercury/files/mercury-0.12.2-portage-r1.patch
new file mode 100644
index 000000000000..5955c6f00db3
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.12.2-portage-r1.patch
@@ -0,0 +1,111 @@
+--- mercury-compiler-0.12.2.orig/Makefile 2004-11-01 17:46:18.000000000 +1300
++++ mercury-compiler-0.12.2/Makefile 2006-03-18 12:54:23.000000000 +1300
+@@ -26,7 +26,7 @@
+
+ .PHONY: all
+ all:
+- $(MMAKE) MMAKEFLAGS=$(PARALLEL) all 2>&1 | tee make_all.log
++ $(MMAKE) MMAKEFLAGS=$(PARALLEL) all 2>&1 || exit 1
+
+ .PHONY: libmmc
+ libmmc:
+@@ -34,7 +34,7 @@
+
+ .PHONY: install
+ install:
+- $(MMAKE) MMAKEFLAGS=$(PARALLEL) install 2>&1 | tee make_install.log
++ $(MMAKE) MMAKEFLAGS=$(PARALLEL) install 2>&1 || exit 1
+
+ # `mmake clean' has a different meaning to the usual GNU standard `make clean':
+ # it removes the .c files, which makes bootstrapping impossible unless you
+--- mercury-compiler-0.12.2.orig/Mmakefile 2005-01-28 20:11:29.000000000 +1300
++++ mercury-compiler-0.12.2/Mmakefile 2006-06-14 21:14:22.000000000 +1200
+@@ -429,28 +429,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_profiler install_deep_profiler \
+- install_doc install_config
++ install_doc
+
+ .PHONY: install_scripts
+ install_scripts: scripts
+--- mercury-compiler-0.12.2.orig/configure 2006-01-25 17:24:01.000000000 +1300
++++ mercury-compiler-0.12.2/configure 2006-06-08 19:31:53.000000000 +1200
+@@ -8861,7 +8861,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;
+--- mercury-compiler-0.12.2.orig/runtime/Mmakefile 2005-12-05 16:34:46.000000000 +1300
++++ mercury-compiler-0.12.2/runtime/Mmakefile 2006-06-14 20:52:31.000000000 +1200
+@@ -390,8 +390,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)
+
+@@ -437,7 +435,6 @@
+ rm -f $(INSTALL_INC_DIR)/mercury_conf.h
+ cp `vpath_find mercury_conf.h` $(INSTALL_CONF_DIR)
+ -chmod u+w $(INSTALL_CONF_DIR)/mercury_conf.h
+- cp `vpath_find mercury_conf.h.in` $(INSTALL_RECONF_DIR)/runtime
+ cp `vpath_find $(MACHHDRS)` $(INSTALL_INC_DIR)/machdeps
+
+ .PHONY: install_init
+--- mercury-compiler-0.12.2.orig/scripts/Mmakefile 2005-01-28 20:11:59.000000000 +1300
++++ mercury-compiler-0.12.2/scripts/Mmakefile 2006-06-14 20:51:21.000000000 +1200
+@@ -16,8 +16,7 @@
+
+ SCRIPTS = mmake mmc mdb c2init mgnuc ml mprof mprof_merge_runs \
+ mtags vpath_find mercury_update_interface \
+- mkfifo_using_mknod mercury_cleanup_install canonical_grade \
+- mercury_config mercury.bat prepare_tmp_dir_fixed_part
++ mercury_cleanup_install canonical_grade
+ DEBUGGER_SCRIPTS = mdbrc xul_tree.xsl
+ EMACS_SCRIPTS = gud.el
+
+@@ -58,8 +57,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
+@@ -77,7 +74,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.12.2-tests.patch b/dev-lang/mercury/files/mercury-0.12.2-tests.patch
new file mode 100644
index 000000000000..b158216d7a70
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.12.2-tests.patch
@@ -0,0 +1,120 @@
+diff -urN mercury-tests-0.12.2.orig/hard_coded/dir_test.exp mercury-tests-0.12.2/hard_coded/dir_test.exp
+--- mercury-tests-0.12.2.orig/hard_coded/dir_test.exp 2003-07-29 03:50:45.000000000 +1200
++++ mercury-tests-0.12.2/hard_coded/dir_test.exp 2006-06-11 18:52:41.000000000 +1200
+@@ -130,7 +130,6 @@
+ "foo"/"bar/baz" = "foo\bar\baz".
+ "foo/"/"bar/baz" = "foo\bar\baz".
+ checking whether `unwritable' is readable...ok
+-unwritable file found to be unwritable
+ make_directory succeeded
+ make_directory succeeded
+ dir.make_single_directory with non-existent parent failed as expected.
+diff -urN mercury-tests-0.12.2.orig/hard_coded/dir_test.exp2 mercury-tests-0.12.2/hard_coded/dir_test.exp2
+--- mercury-tests-0.12.2.orig/hard_coded/dir_test.exp2 2003-07-29 03:50:45.000000000 +1200
++++ mercury-tests-0.12.2/hard_coded/dir_test.exp2 2006-06-11 18:48:26.000000000 +1200
+@@ -127,7 +127,6 @@
+ "foo"/"bar/baz" = "foo/bar/baz".
+ "foo/"/"bar/baz" = "foo/bar/baz".
+ checking whether `unwritable' is readable...ok
+-unwritable file found to be unwritable
+ make_directory succeeded
+ make_directory succeeded
+ dir.make_single_directory with non-existent parent failed as expected.
+diff -urN mercury-tests-0.12.2.orig/hard_coded/dir_test.exp3 mercury-tests-0.12.2/hard_coded/dir_test.exp3
+--- mercury-tests-0.12.2.orig/hard_coded/dir_test.exp3 2003-07-29 03:50:45.000000000 +1200
++++ mercury-tests-0.12.2/hard_coded/dir_test.exp3 2006-06-11 18:51:44.000000000 +1200
+@@ -130,7 +130,6 @@
+ "foo"/"bar/baz" = "foo/bar/baz".
+ "foo/"/"bar/baz" = "foo/bar/baz".
+ checking whether `unwritable' is readable...ok
+-unwritable file found to be unwritable
+ make_directory succeeded
+ make_directory succeeded
+ dir.make_single_directory with non-existent parent failed as expected.
+diff -urN mercury-tests-0.12.2.orig/hard_coded/dir_test.m mercury-tests-0.12.2/hard_coded/dir_test.m
+--- mercury-tests-0.12.2.orig/hard_coded/dir_test.m 2003-08-05 22:50:33.000000000 +1200
++++ mercury-tests-0.12.2/hard_coded/dir_test.m 2006-06-11 18:47:35.000000000 +1200
+@@ -50,16 +50,6 @@
+ io__write(ReadResult),
+ io__nl,
+
+- io__check_file_accessibility("unwritable",
+- [read, write], WriteResult),
+- ( { WriteResult = ok } ->
+- io__write_string(
+- "Error: unwritable file found to be writable\n")
+- ;
+- io__write_string(
+- "unwritable file found to be unwritable\n")
+- ),
+-
+ { Dir1 = "test_dir"/"d1" },
+ test0("make_directory", dir__make_directory(Dir1)),
+ % Test making a directory that already exists.
+diff -urN mercury-tests-0.12.2.orig/mdbrc mercury-tests-0.12.2/mdbrc
+--- mercury-tests-0.12.2.orig/mdbrc 1970-01-01 12:00:00.000000000 +1200
++++ mercury-tests-0.12.2/mdbrc 2006-06-13 23:14:54.000000000 +1200
+@@ -0,0 +1,19 @@
++source MDB_DOC
++alias s step
++alias g goto
++alias f finish
++alias r retry
++alias v vars
++alias p print
++alias P print *
++alias d stack
++alias c continue
++alias b break
++alias h help
++alias ? help
++alias excp exception
++alias e exception
++alias EMPTY step
++alias NUMBER step
++set xml_browser_cmd ''
++set xml_tmp_filename ''
+diff -urN mercury-tests-0.12.2.orig/tabling/loopcheck.exp5 mercury-tests-0.12.2/tabling/loopcheck.exp5
+--- mercury-tests-0.12.2.orig/tabling/loopcheck.exp5 1970-01-01 12:00:00.000000000 +1200
++++ mercury-tests-0.12.2/tabling/loopcheck.exp5 2006-06-11 13:36:36.000000000 +1200
+@@ -0,0 +1,3 @@
++Uncaught Mercury exception:
++Software Error: detected infinite recursion in pred loopcheck.loop/1
++Stack dump not available in this grade.
+diff -urN mercury-tests-0.12.2.orig/tabling/loopcheck_nondet.exp2 mercury-tests-0.12.2/tabling/loopcheck_nondet.exp2
+--- mercury-tests-0.12.2.orig/tabling/loopcheck_nondet.exp2 1970-01-01 12:00:00.000000000 +1200
++++ mercury-tests-0.12.2/tabling/loopcheck_nondet.exp2 2006-06-11 13:38:18.000000000 +1200
+@@ -0,0 +1,3 @@
++Uncaught Mercury exception:
++Software Error: detected infinite recursion in pred loopcheck_nondet.loop/2
++Stack dump not available in this grade.
+diff -urN mercury-tests-0.12.2.orig/tabling/tc_loop.exp3 mercury-tests-0.12.2/tabling/tc_loop.exp3
+--- mercury-tests-0.12.2.orig/tabling/tc_loop.exp3 1970-01-01 12:00:00.000000000 +1200
++++ mercury-tests-0.12.2/tabling/tc_loop.exp3 2006-06-11 13:32:14.000000000 +1200
+@@ -0,0 +1,3 @@
++Uncaught Mercury exception:
++Software Error: detected infinite recursion in pred tc_loop.tc/2
++Stack dump not available in this grade.
+diff -urN mercury-tests-0.12.2.orig/tabling/tc_memo.exp2 mercury-tests-0.12.2/tabling/tc_memo.exp2
+--- mercury-tests-0.12.2.orig/tabling/tc_memo.exp2 1970-01-01 12:00:00.000000000 +1200
++++ mercury-tests-0.12.2/tabling/tc_memo.exp2 2006-06-11 13:37:21.000000000 +1200
+@@ -0,0 +1,3 @@
++Uncaught Mercury exception:
++Software Error: detected infinite recursion in pred tc_memo.tc/2
++Stack dump not available in this grade.
+diff -urN mercury-tests-0.12.2.orig/tabling/tc_memo2.exp2 mercury-tests-0.12.2/tabling/tc_memo2.exp2
+--- mercury-tests-0.12.2.orig/tabling/tc_memo2.exp2 1970-01-01 12:00:00.000000000 +1200
++++ mercury-tests-0.12.2/tabling/tc_memo2.exp2 2006-06-11 13:33:49.000000000 +1200
+@@ -0,0 +1,3 @@
++Uncaught Mercury exception:
++Software Error: detected need for minimal model in pred tc_memo2.tc/2
++Stack dump not available in this grade.
+diff -urN mercury-tests-0.12.2.orig/valid/Mmakefile mercury-tests-0.12.2/valid/Mmakefile
+--- mercury-tests-0.12.2.orig/valid/Mmakefile 2005-08-17 16:44:17.000000000 +1200
++++ mercury-tests-0.12.2/valid/Mmakefile 2006-06-11 20:48:47.000000000 +1200
+@@ -376,3 +376,5 @@
+ rm -f *.err *.h
+
+ #-----------------------------------------------------------------------------#
++
++MCFLAGS-ho_and_type_spec_bug+=--no-optimize-higher-order
diff --git a/dev-lang/mercury/mercury-0.12.2-r1.ebuild b/dev-lang/mercury/mercury-0.12.2-r1.ebuild
index 8cca106bf864..a3631533a350 100644
--- a/dev-lang/mercury/mercury-0.12.2-r1.ebuild
+++ b/dev-lang/mercury/mercury-0.12.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.12.2-r1.ebuild,v 1.1 2006/06/09 08:53:24 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.12.2-r1.ebuild,v 1.2 2006/06/14 09:57:55 keri Exp $
inherit eutils
@@ -8,7 +8,8 @@ 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/${MY_P}.tar.gz"
+SRC_URI="ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/${MY_P}.tar.gz
+ ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/mercury-tests-${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
@@ -19,15 +20,20 @@ IUSE="debug minimal readline"
DEPEND="readline? ( sys-libs/readline )"
S="${WORKDIR}"/${MY_P}
+TESTDIR="${WORKDIR}"/${PN}-tests-${PV}
src_unpack() {
unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-portage.patch
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-portage-r1.patch
epatch "${FILESDIR}"/${P}-CFLAGS.patch
epatch "${FILESDIR}"/${P}-LIBDIR.patch
epatch "${FILESDIR}"/${P}-docs.patch
+
+ cd "${TESTDIR}"
+ epatch "${FILESDIR}"/${P}-tests.patch
+ sed -i -e "s:MDB_DOC:${S}/doc/mdb_doc:" mdbrc
}
src_compile() {
@@ -41,6 +47,17 @@ src_compile() {
emake || die "emake failed"
}
+src_test() {
+ cd "${TESTDIR}"
+
+ PATH="${S}"/scripts:"${S}"/util:"${PATH}" \
+ WORKSPACE="${S}" \
+ MERCURY_COMPILER="${S}"/compiler/${PN}_compile \
+ MMAKE_DIR="${S}"/scripts \
+ MERCURY_DEBUGGER_INIT="${TESTDIR}"/mdbrc \
+ mmake || die "mmake test failed"
+}
+
src_install() {
make \
MERCURY_COMPILER="${D}"/usr/lib/${P}/bin/${CHOST}/${PN}_compile \