New development snapshot incorporating support for threaded libgrades and src_test.

(Portage version: 2.1)

6 files changed, 248 insertions, 6 deletions

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 4cd7ab01ea45..d7d77300f438 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,16 @@
 # 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.30 2006/06/17 06:00:38 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.31 2006/06/17 09:28:37 keri Exp $
+
+*mercury-0.13.0_beta20060615 (17 Jun 2006)
+
+  17 Jun 2006; Keri Harris <keri@gentoo.org>
+  -files/mercury-0.13.0_beta-LIBDIR.patch,
+  files/mercury-0.13.0_beta-portage.patch,
+  +files/mercury-0.13.0_beta-tests.patch, mercury-0.12.2-r2.ebuild,
+  -mercury-0.13.0_beta20060609.ebuild, +mercury-0.13.0_beta20060615.ebuild:
+  New development snapshot incorporating support for threaded libgrades and
+  src_test.
 
   17 Jun 2006; Keri Harris <keri@gentoo.org>
   +files/mercury-0.12.2-portage-r2.patch, mercury-0.12.2-r2.ebuild:
diff --git a/dev-lang/mercury/files/digest-mercury-0.13.0_beta20060615 b/dev-lang/mercury/files/digest-mercury-0.13.0_beta20060615
new file mode 100644
index 000000000000..32f583c74620
--- /dev/null
+++ b/dev-lang/mercury/files/digest-mercury-0.13.0_beta20060615
@@ -0,0 +1,6 @@
+MD5 4449e6286edcef47d90b59a086d5a84e mercury-compiler-0.13.0-beta-2006-06-15-unstable.tar.gz 15853119
+RMD160 7fc153df37a7e5977d5dca9abc18763684b8ba12 mercury-compiler-0.13.0-beta-2006-06-15-unstable.tar.gz 15853119
+SHA256 8f207aade2587849daaf2ba0b96e5a06ac84c30d0b50c8c2999e76dbd941ed75 mercury-compiler-0.13.0-beta-2006-06-15-unstable.tar.gz 15853119
+MD5 2f38bc98ac8769282655645652a7c596 mercury-tests-0.13.0-beta-2006-06-15-unstable.tar.gz 980888
+RMD160 21321ee66fc006442d3a80005a24447e7bdfc40d mercury-tests-0.13.0-beta-2006-06-15-unstable.tar.gz 980888
+SHA256 00745f179f8dbb8880bdff85cb4493931d7844247422f892126002b901c0c864 mercury-tests-0.13.0-beta-2006-06-15-unstable.tar.gz 980888
diff --git a/dev-lang/mercury/files/mercury-0.13.0_beta-portage.patch b/dev-lang/mercury/files/mercury-0.13.0_beta-portage.patch
index 6727c51c0b56..d4b4cdfbd69b 100644
--- a/dev-lang/mercury/files/mercury-0.13.0_beta-portage.patch
+++ b/dev-lang/mercury/files/mercury-0.13.0_beta-portage.patch
@@ -18,9 +18,9 @@
  
  # `mmake clean' has a different meaning to the usual GNU standard `make clean':
  # it removes the .c files, which makes bootstrapping impossible unless you
---- mercury-compiler-0.13.0-beta-2006-04-03.orig/Mmakefile	2005-08-12 03:56:57.000000000 +1200
-+++ mercury-compiler-0.13.0-beta-2006-04-03/Mmakefile	2006-04-04 22:34:34.000000000 +1200
-@@ -483,21 +483,6 @@
+--- mercury-compiler-0.13.0-beta-2006-06-09.orig/Mmakefile	2005-08-12 03:56:57.000000000 +1200
++++ mercury-compiler-0.13.0-beta-2006-06-09/Mmakefile	2006-06-14 22:46:40.000000000 +1200
+@@ -483,28 +483,13 @@
  	@echo
  	@echo "-- Installation complete."
  	@echo
@@ -42,3 +42,77 @@
  
  .PHONY: install_main
  install_main: all \
+ 		install_scripts install_util install_runtime install_boehm_gc \
+ 		install_library install_mdbcomp install_browser install_trace \
+ 		install_compiler install_slice install_profiler \
+-		install_deep_profiler install_doc install_config
++		install_deep_profiler install_doc
+ 
+ .PHONY: install_scripts
+ install_scripts: scripts
+--- mercury-compiler-0.13.0-beta-2006-06-09.orig/runtime/Mmakefile	2006-03-30 18:13:48.000000000 +1200
++++ mercury-compiler-0.13.0-beta-2006-06-09/runtime/Mmakefile	2006-06-14 22:49:57.000000000 +1200
+@@ -434,8 +434,6 @@
+ 	-[ -d $(INSTALL_MODULE_DIR) ] || mkdir -p $(INSTALL_MODULE_DIR)
+ 	-[ -d $(INSTALL_MERC_LIB_DIR) ] || mkdir -p $(INSTALL_MERC_LIB_DIR)
+ 	-[ -d $(INSTALL_CONF_DIR) ] || mkdir -p $(INSTALL_CONF_DIR)
+-	-[ -d $(INSTALL_RECONF_DIR)/runtime ] || \
+-		mkdir -p $(INSTALL_RECONF_DIR)/runtime
+ 
+ ifeq ($(findstring java,$(GRADE)),java)
+ 
+@@ -481,7 +479,6 @@
+ 	rm -f $(INSTALL_INC_DIR)/mercury_conf.h
+ 	cp `vpath_find mercury_conf.h` $(INSTALL_CONF_DIR)
+ 	-chmod u+w $(INSTALL_CONF_DIR)/mercury_conf.h
+-	cp `vpath_find mercury_conf.h.in` $(INSTALL_RECONF_DIR)/runtime
+ 	cp `vpath_find $(MACHHDRS)` $(INSTALL_INC_DIR)/machdeps
+ 
+ .PHONY: install_init
+--- mercury-compiler-0.13.0-beta-2006-06-09.orig/scripts/Mmakefile	2006-04-04 19:41:49.000000000 +1200
++++ mercury-compiler-0.13.0-beta-2006-06-09/scripts/Mmakefile	2006-06-14 22:53:13.000000000 +1200
+@@ -26,16 +26,12 @@
+ 	canonical_grade \
+ 	mdb \
+ 	mdprof \
+-	mercury.bat \
+-	mercury_config \
+ 	mercury_update_interface \
+ 	mgnuc \
+-	mkfifo_using_mknod \
+ 	ml \
+ 	mmake \
+ 	mmc \
+-	mprof \
+-	prepare_tmp_dir_fixed_part
++	mprof
+ 
+ SCRIPTS = $(NONCONF_SCRIPTS) $(CONF_SCRIPTS)
+ 
+@@ -103,8 +99,6 @@
+ 	[ -d $(INSTALL_LIBDIR)/mdb ] || mkdir -p $(INSTALL_LIBDIR)/mdb
+ 	[ -d $(INSTALL_CONF_DIR) ] || mkdir -p $(INSTALL_CONF_DIR)
+ 	[ -d $(INSTALL_ELISP_DIR) ] || mkdir -p $(INSTALL_ELISP_DIR)
+-	[ -d $(INSTALL_RECONF_DIR)/scripts ] || \
+-		mkdir -p $(INSTALL_RECONF_DIR)/scripts
+ 
+ .PHONY: install_mmake
+ install_mmake: Mmake.vars Mmake.rules install_dirs
+@@ -122,7 +116,6 @@
+ 	-for file in $(SCRIPTS); do \
+ 		chmod u+w $(INSTALL_BINDIR)/$$file ;\
+ 	done
+-	cp *.in *.sh-subr $(SCRIPTS) $(INSTALL_RECONF_DIR)/scripts
+ 	-rm -f $(INSTALL_BINDIR)/mmake.old
+ 
+ .PHONY: install_config
+--- mercury-compiler-0.13.0-beta-2006-06-15.orig/configure	2006-06-15 22:36:38.000000000 +1200
++++ mercury-compiler-0.13.0-beta-2006-06-15/configure	2006-06-17 20:49:30.000000000 +1200
+@@ -9140,7 +9140,6 @@
+ 	enable_mm_grades=no
+ 	enable_dmm_grades=no
+ 	enable_hlc_prof_grades=no
+-	enable_par_grades=no
+ 	enable_dotnet_grades=no
+ 	enable_java_grade=no
+ fi
diff --git a/dev-lang/mercury/files/mercury-0.13.0_beta-tests.patch b/dev-lang/mercury/files/mercury-0.13.0_beta-tests.patch
new file mode 100644
index 000000000000..6fcb8daf9a9f
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.13.0_beta-tests.patch
@@ -0,0 +1,76 @@
+diff -urN mercury-tests-0.13.0-beta-2006-06-09.orig/hard_coded/dir_test.exp mercury-tests-0.13.0-beta-2006-06-09/hard_coded/dir_test.exp
+--- mercury-tests-0.13.0-beta-2006-06-09.orig/hard_coded/dir_test.exp	2003-07-29 03:50:45.000000000 +1200
++++ mercury-tests-0.13.0-beta-2006-06-09/hard_coded/dir_test.exp	2006-06-14 23:21:55.000000000 +1200
+@@ -130,7 +130,6 @@
+ "foo"/"bar/baz" = "foo\bar\baz".

+ "foo/"/"bar/baz" = "foo\bar\baz".

+ checking whether `unwritable' is readable...ok

+-unwritable file found to be unwritable

+ make_directory succeeded

+ make_directory succeeded

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

+diff -urN mercury-tests-0.13.0-beta-2006-06-09.orig/hard_coded/dir_test.exp2 mercury-tests-0.13.0-beta-2006-06-09/hard_coded/dir_test.exp2
+--- mercury-tests-0.13.0-beta-2006-06-09.orig/hard_coded/dir_test.exp2	2003-07-29 03:50:45.000000000 +1200
++++ mercury-tests-0.13.0-beta-2006-06-09/hard_coded/dir_test.exp2	2006-06-14 23:22:25.000000000 +1200
+@@ -127,7 +127,6 @@
+ "foo"/"bar/baz" = "foo/bar/baz".
+ "foo/"/"bar/baz" = "foo/bar/baz".
+ checking whether `unwritable' is readable...ok
+-unwritable file found to be unwritable
+ make_directory succeeded
+ make_directory succeeded
+ dir.make_single_directory with non-existent parent failed as expected.
+diff -urN mercury-tests-0.13.0-beta-2006-06-09.orig/hard_coded/dir_test.exp3 mercury-tests-0.13.0-beta-2006-06-09/hard_coded/dir_test.exp3
+--- mercury-tests-0.13.0-beta-2006-06-09.orig/hard_coded/dir_test.exp3	2003-07-29 03:50:45.000000000 +1200
++++ mercury-tests-0.13.0-beta-2006-06-09/hard_coded/dir_test.exp3	2006-06-14 23:22:52.000000000 +1200
+@@ -130,7 +130,6 @@
+ "foo"/"bar/baz" = "foo/bar/baz".
+ "foo/"/"bar/baz" = "foo/bar/baz".
+ checking whether `unwritable' is readable...ok
+-unwritable file found to be unwritable
+ make_directory succeeded
+ make_directory succeeded
+ dir.make_single_directory with non-existent parent failed as expected.
+diff -urN mercury-tests-0.13.0-beta-2006-06-09.orig/hard_coded/dir_test.m mercury-tests-0.13.0-beta-2006-06-09/hard_coded/dir_test.m
+--- mercury-tests-0.13.0-beta-2006-06-09.orig/hard_coded/dir_test.m	2006-03-29 20:08:00.000000000 +1200
++++ mercury-tests-0.13.0-beta-2006-06-09/hard_coded/dir_test.m	2006-06-14 23:21:10.000000000 +1200
+@@ -50,16 +50,6 @@
+ 	io__write(ReadResult),
+ 	io__nl,
+ 
+-	io__check_file_accessibility("unwritable",
+-		[read, write], WriteResult),
+-	( { WriteResult = ok } ->
+-		io__write_string(
+-		"Error: unwritable file found to be writable\n")
+-	;
+-		io__write_string(
+-		"unwritable file found to be unwritable\n")
+-	),
+-
+ 	{ Dir1 = "test_dir"/"d1" },
+ 	test0("make_directory", dir__make_directory(Dir1)),
+ 	% Test making a directory that already exists.
+diff -urN mercury-tests-0.13.0-beta-2006-06-09.orig/mdbrc mercury-tests-0.13.0-beta-2006-06-09/mdbrc
+--- mercury-tests-0.13.0-beta-2006-06-09.orig/mdbrc	1970-01-01 12:00:00.000000000 +1200
++++ mercury-tests-0.13.0-beta-2006-06-09/mdbrc	2006-06-14 22:59:49.000000000 +1200
+@@ -0,0 +1,19 @@
++source MDB_DOC
++alias	s	step
++alias	g	goto
++alias	f	finish
++alias	r	retry
++alias	v	vars
++alias	p	print
++alias	P	print *
++alias	d	stack
++alias	c	continue
++alias	b	break
++alias	h	help
++alias	?	help
++alias	excp	exception
++alias	e	exception
++alias	EMPTY	step
++alias	NUMBER	step
++xml_browser_cmd ''
++xml_tmp_filename ''
diff --git a/dev-lang/mercury/mercury-0.12.2-r2.ebuild b/dev-lang/mercury/mercury-0.12.2-r2.ebuild
index cec395fa2b04..a835db4e603c 100644
--- a/dev-lang/mercury/mercury-0.12.2-r2.ebuild
+++ b/dev-lang/mercury/mercury-0.12.2-r2.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-r2.ebuild,v 1.2 2006/06/17 06:00:38 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.12.2-r2.ebuild,v 1.3 2006/06/17 09:28:37 keri Exp $
 
 inherit eutils
 
@@ -40,7 +40,7 @@ src_compile() {
 	econf \
 		--disable-dotnet-grades \
 		$(use_enable debug debug-grades) \
-		$(use_enable threads par_grades) \
+		$(use_enable threads par-grades) \
 		$(use_enable !minimal most-grades) \
 		$(use_with readline) \
 		PACKAGE_VERSION=${PV} \
diff --git a/dev-lang/mercury/mercury-0.13.0_beta20060615.ebuild b/dev-lang/mercury/mercury-0.13.0_beta20060615.ebuild
new file mode 100644
index 000000000000..d8618f7778bb
--- /dev/null
+++ b/dev-lang/mercury/mercury-0.13.0_beta20060615.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.13.0_beta20060615.ebuild,v 1.1 2006/06/17 09:28:37 keri Exp $
+
+inherit eutils versionator
+
+BETA_V=$(get_version_component_range 4 $PV)
+BETA_V_YYYY=${BETA_V:4:4}
+BETA_V_MM=${BETA_V:8:2}
+BETA_V_DD=${BETA_V:10:2}
+MY_PV=$(get_version_component_range 1-3 $PV)-beta-${BETA_V_YYYY}-${BETA_V_MM}-${BETA_V_DD}
+MY_P=${PN}-compiler-${MY_PV}
+
+DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
+HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
+SRC_URI="ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/beta-releases/0.13.0-beta/${MY_P}-unstable.tar.gz
+	ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/beta-releases/0.13.0-beta/mercury-tests-${MY_PV}-unstable.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+
+IUSE="debug minimal readline threads"
+
+DEPEND="readline? ( sys-libs/readline )"
+
+S="${WORKDIR}"/${MY_P}
+TESTDIR="${WORKDIR}"/${PN}-tests-${MY_PV}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-portage.patch
+	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-CFLAGS.patch
+	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-docs.patch
+
+	cd "${TESTDIR}"
+	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-tests.patch
+	sed -i -e "s:MDB_DOC:${S}/doc/mdb_doc:" mdbrc
+}
+
+src_compile() {
+	econf \
+		--disable-dotnet-grades \
+		$(use_enable debug debug-grades) \
+		$(use_enable threads par-grades) \
+		$(use_enable !minimal most-grades) \
+		$(use_with readline) \
+		PACKAGE_VERSION=${PV} \
+		|| die "econf failed"
+	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/bin/${PN}_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 || die "make install failed"
+
+	dodoc BUGS HISTORY LIMITATIONS NEWS README README.Java README.Linux README.Linux-Alpha README.Linux-m68k README.Linux-PPC RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS
+}