Simplify bootstrap; mmc re-conf update; MCFLAGS fixups

Package-Manager: portage-2.1.4.4

6 files changed, 207 insertions, 7 deletions

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 235a70f9b98f..53e7af01e424 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/mercury
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.83 2008/05/09 07:28:40 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.84 2008/08/21 07:01:55 keri Exp $
+
+*mercury-0.13.1-r2 (21 Aug 2008)
+
+  21 Aug 2008; <keri@gentoo.org> +files/mercury-0.13.1-mmake-params.patch,
+  +files/mercury-0.13.1-no-reconf.patch,
+  files/mercury-0.13.1-tests-workspace.patch, +mercury-0.13.1-r2.ebuild:
+  Simplify bootstrap; mmc re-conf update; MCFLAGS fixups. Closes #201828 and
+  #206144.
 
   09 May 2008; keri <keri@gentoo.org> mercury-0.12.2-r3.ebuild,
   mercury-0.12.2-r4.ebuild, mercury-0.13.1.ebuild, mercury-0.13.1-r1.ebuild:
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index b7dc30fcdca3..6fde04d0bc73 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -23,7 +23,9 @@ AUX mercury-0.13.1-bootstrap.patch 5283 RMD160 b85ada36841331175262ff1391b8d38b6
 AUX mercury-0.13.1-deep_profiler.patch 2807 RMD160 f7b3c9efb95a81b5f076fa6385c21dd3b63aacdb SHA1 0a8a267ba6d1f1fb64e1993866136e3f443efdfb SHA256 2871b0d82e8442019611cf2ed9b563f85b1067a68967c54e06e2131e6cf08430
 AUX mercury-0.13.1-docs.patch 796 RMD160 842e415a6c97d910e77e7179ab9b3f7d6447827c SHA1 4abd392a9f8030c87c3be7e7a183deaa61966e74 SHA256 c5e3ff95f34e8822bafc54d511a1f5f710ba485cffb661fccac163daf73ea6c2
 AUX mercury-0.13.1-libgrades.patch 13854 RMD160 0f4dd4b97390962524944e3e57ce8d5b405967ed SHA1 8f5bdb0c367cb94aea0eae0dd15bddd164003cf1 SHA256 207d9af7c741845c1b0fcc098413952f8b002f4f71803fb38e474c63118d578f
+AUX mercury-0.13.1-mmake-params.patch 191 RMD160 1ba2f7b0c02fde277ffbc348eb672396a43615bd SHA1 46c4568f8c3db5e1b9a1f392f5e5f8f74edc5424 SHA256 f1edb292107f87db8d97303031e0603ac847f73e2de54fb971b44e621b183ba4
 AUX mercury-0.13.1-multilib.patch 3170 RMD160 fad84c0177d9611c869ad85657fc1fdeafc52942 SHA1 9f14ca95c454f426773aaa06b71a7b2e7e3f421b SHA256 58ebef426a8f7cf0015dfb92d6448e96b8db46070844e9d1e191c153cf79e647
+AUX mercury-0.13.1-no-reconf.patch 1872 RMD160 76682430bfd858261068cf3c25eb06d5ec72acf9 SHA1 1cb7437db5cb485fbc1ebd52795747f61a54852e SHA256 bd552856cc6a2cfbcbdf5cbe888aae01360ecd67eca39f1ff5a0ce5e7c6341b6
 AUX mercury-0.13.1-parallel-install_grades.patch 633 RMD160 5492e49f5ab7c8f16f52148a2678cc56c9398071 SHA1 fc90c6aebb4501178836d67ccc67a5b997f5314a SHA256 5630e0d82d4d76603817852601a6c0aeffe1f56e73b57f3c562ba29e5e5eeb1f
 AUX mercury-0.13.1-portage.patch 2891 RMD160 18690121ca57a11d9ad77a300eecb753c1eeed12 SHA1 f5cf54bcffe37764b96228e112e95da8b4cb93e5 SHA256 b03e021502c0440ae84587ccb3604f8c0315239c9307b1af87fcc57f81a45c30
 AUX mercury-0.13.1-profdeep-builtin_throw.patch 562 RMD160 0259aff999acd0a77d937bea86d8549409ec119b SHA1 f667b70eafb81967480a0d6f4d6420c33a1da98c SHA256 0582bf4e1cdf3aaf56128540ef7777215efc789d4d0ed6a45e759ce6ec6ff99f
@@ -32,7 +34,7 @@ AUX mercury-0.13.1-tests-dir_test.patch 2476 RMD160 99c040bc588d0f455b1da42279fe
 AUX mercury-0.13.1-tests-ho_and_type_spec_bug.patch 429 RMD160 4afcbd1b73c51c06187a0af02086e6c0527a8b8c SHA1 efe5458ab76060a37f0110000ee68e07212ff8d6 SHA256 d81c5e0a3cbf07190433cee583f9be8f14624b3f5e982bf04079fdb559b1f88c
 AUX mercury-0.13.1-tests-mdbrc.patch 472 RMD160 a990e4f7d2c956b636a8ac7105593c487c424567 SHA1 af5f42ea2181c0bbd041f37f0c0ce879483b0c04 SHA256 ad27a2a74c5f9ceca3b39ed992ac6c8b24985f36e59f46969496ee8bd6f5288b
 AUX mercury-0.13.1-tests-string_format.patch 15357 RMD160 1b3f5538f6c8aa9daa430d918e42c9c3e95122c5 SHA1 fb78eba72aae7de933951941f6db890548e298b0 SHA256 a0a3f1a5d9d75443d9f442925eb15131b7bfbe3c92f737a51f1340111b46a34e
-AUX mercury-0.13.1-tests-workspace.patch 511 RMD160 a301c0849acc241a4a8ca329e6095559d74cbfc8 SHA1 692fa396652554f29fbee1a6f52ed445ac7f5c33 SHA256 47de84c65ff66fa6b028891f76b9d2831855cbd23924fee8f3ac504c3a5aeb12
+AUX mercury-0.13.1-tests-workspace.patch 899 RMD160 f866379e0e4f8e4debebb86bfed778e881c9e790 SHA1 6b6cc428a516c082bcd7ac8bdbe05de1b1e75831 SHA256 8ab0c250ccdfdb57ba377335fd61dc980ad87135e388c6ae4ebe0ff3c464e456
 AUX mercury-0.13.1-tests.patch 15074 RMD160 26594fb4404d3620ea454ec24ed3e6bb34ed501a SHA1 526488bac46ee66e0e446690054f20d44cd207af SHA256 64892634aad5abc0df4fb0be940b9956b8e85ce713818a75b9176b9e9feff647
 DIST mercury-compiler-0.12.2.tar.gz 15074997 RMD160 227a3e1796d96ad77324d9f1d39efd6be7fce80e SHA1 96b7a878370bb256da28c8ffa1c4b0a4bc3711d6 SHA256 7fa1df8030cdc3d4dc848d102ba64bf23c12004461c985290622b81753b89572
 DIST mercury-compiler-0.13.1.tar.gz 15938824 RMD160 a0a80cd2ac7393cf084b79d40230bd1efe795c5f SHA1 919eb45ba34c503fc2e7391225e52a5cfbb80616 SHA256 b1f4984e00ad917824d3340dcf2a41bede39fe02ef2e516351467f4761985196
@@ -41,6 +43,7 @@ DIST mercury-tests-0.13.1.tar.gz 986644 RMD160 779609ba5c985e562b0962434c9281c07
 EBUILD mercury-0.12.2-r3.ebuild 3473 RMD160 f5fa94389d94de889efa91efa3aecd96aa5c1d02 SHA1 63e17af97901e6625460a92dfa7a3f5dc8336494 SHA256 9468a2a9bfd91144b4586ceed3ee020e510d2475c0ae716ddf747b2267f07ad6
 EBUILD mercury-0.12.2-r4.ebuild 3805 RMD160 18307839b493b1693e290ee09a2f40a9ff9984b1 SHA1 88ca4ad27252d821ac8dee0ec87966c09d542f46 SHA256 9662741a1cf22b630168673ee1b1432b5ade0ce0513e2c5fbd4ee68a65f79317
 EBUILD mercury-0.13.1-r1.ebuild 4139 RMD160 fd3f6fcb6629daf99a84031c54b300f69aaaba04 SHA1 2e1e1b48e2d73c72bd85f96fac5ce116e04d8725 SHA256 473554123b1834380e09233be867fdf1e8b52f9ca539b075c7181ef5d2a16fe6
+EBUILD mercury-0.13.1-r2.ebuild 3288 RMD160 463c4865f2572caeb4e108f40eab4b3d493866f8 SHA1 b9ac3ff89b33d2d4c517cf188008ee083d5217e2 SHA256 4b7c093ca5cb9ef0f717115b0a24c8ebb29798adadf5f811a02aaba4d466fb6f
 EBUILD mercury-0.13.1.ebuild 3339 RMD160 87d85335493e9fd02903defd6414001dc1864e36 SHA1 43ad234914a774ff90b9b84468cbd2f92ed07a6e SHA256 42290613f10e60643bae1bb53bbf1113df985fe1046e9cffdbfe1956fb4ee226
-MISC ChangeLog 16430 RMD160 975df821dddabb69bfe32b97dc40e082131ace61 SHA1 96c3748b8037cf0bb1f5c6ba77b9c3be63fb8909 SHA256 0d4b13b316e16e11efe997c0ed245e7341e83e630a59f93af87b0365537f3bcb
+MISC ChangeLog 16742 RMD160 7e2d6ed61cc4fca4afd8203a8273332b65b191e4 SHA1 715a5d2d1f9d16bef4d6f7151796975013dc77bd SHA256 c913cadd1965457cc0b12e1d716d698dd60b2a9db9a9731362965eaba0ef11ad
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
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
new file mode 100644
index 000000000000..d45e9bd563b4
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.13.1-mmake-params.patch
@@ -0,0 +1,4 @@
+--- 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 @@
++EXTRA_CFLAGS=-O0
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
new file mode 100644
index 000000000000..5b7be8a470c3
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.13.1-no-reconf.patch
@@ -0,0 +1,56 @@
+--- 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:37:11.000000000 +1300
+@@ -434,8 +437,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 +482,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.1.orig/scripts/Mmakefile	2006-04-04 19:41:49.000000000 +1200
++++ mercury-compiler-0.13.1/scripts/Mmakefile	2006-12-04 21:37:11.000000000 +1300
+@@ -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
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
index fb38c5312c72..a77ae47dcba2 100644
--- a/dev-lang/mercury/files/mercury-0.13.1-tests-workspace.patch
+++ b/dev-lang/mercury/files/mercury-0.13.1-tests-workspace.patch
@@ -1,15 +1,27 @@
 --- 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
-@@ -72,9 +72,9 @@
- 
+@@ -73,8 +73,8 @@
  -include $(TESTS_DIR)/Mmake.params
  
--MCFLAGS += --flags $(TESTS_DIR)/TESTS_FLAGS
+ MCFLAGS += --flags $(TESTS_DIR)/TESTS_FLAGS
 -ifdef WORKSPACE_FLAGS
 -MCFLAGS += --flags $(TESTS_DIR)/WS_FLAGS
-+#MCFLAGS += --flags $(TESTS_DIR)/TESTS_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
new file mode 100644
index 000000000000..a7f9403db0a0
--- /dev/null
+++ b/dev-lang/mercury/mercury-0.13.1-r2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2008 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.1 2008/08/21 07:01:55 keri 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 ~ppc ~sparc ~x86"
+
+IUSE="debug minimal readline test threads"
+
+DEPEND="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
+
+	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
+		sed -i -e "s:MDB_DOC:${S}/doc/mdb_doc:" "${TESTDIR}"/mdbrc
+	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 \
+	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
+}