Ensure the proc_layout structure for builtin_throw in exception.m is externally visible.

Package-Manager: portage-2.1.2_rc4-r2

5 files changed, 163 insertions, 5 deletions

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 7af89ef6444a..09f38303f45a 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,14 @@
 # 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.66 2006/12/30 01:32:43 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.67 2006/12/30 01:47:37 keri Exp $
+
+*mercury-0.13.1-r1 (30 Dec 2006)
+
+  30 Dec 2006; keri <keri@gentoo.org>
+  +files/mercury-0.13.1-profdeep-builtin_throw.patch,
+  +mercury-0.13.1-r1.ebuild:
+  Ensure the proc_layout structure for builtin_throw in exception.m is
+  externally visible.
 
 *mercury-0.12.2-r4 (30 Dec 2006)
 
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 7f41560b0b48..048905ce13a6 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -126,6 +126,10 @@ AUX mercury-0.13.1-portage.patch 2891 RMD160 18690121ca57a11d9ad77a300eecb753c1e
 MD5 d1981fcad75e93320af875381190fb0c files/mercury-0.13.1-portage.patch 2891
 RMD160 18690121ca57a11d9ad77a300eecb753c1eeed12 files/mercury-0.13.1-portage.patch 2891
 SHA256 b03e021502c0440ae84587ccb3604f8c0315239c9307b1af87fcc57f81a45c30 files/mercury-0.13.1-portage.patch 2891
+AUX mercury-0.13.1-profdeep-builtin_throw.patch 562 RMD160 0259aff999acd0a77d937bea86d8549409ec119b SHA1 f667b70eafb81967480a0d6f4d6420c33a1da98c SHA256 0582bf4e1cdf3aaf56128540ef7777215efc789d4d0ed6a45e759ce6ec6ff99f
+MD5 1096becb2a63d0b9c09f07f3651913ab files/mercury-0.13.1-profdeep-builtin_throw.patch 562
+RMD160 0259aff999acd0a77d937bea86d8549409ec119b files/mercury-0.13.1-profdeep-builtin_throw.patch 562
+SHA256 0582bf4e1cdf3aaf56128540ef7777215efc789d4d0ed6a45e759ce6ec6ff99f files/mercury-0.13.1-profdeep-builtin_throw.patch 562
 AUX mercury-0.13.1-tests.patch 15074 RMD160 26594fb4404d3620ea454ec24ed3e6bb34ed501a SHA1 526488bac46ee66e0e446690054f20d44cd207af SHA256 64892634aad5abc0df4fb0be940b9956b8e85ce713818a75b9176b9e9feff647
 MD5 8f12e666c9f377c1af363f9af1d1a0c8 files/mercury-0.13.1-tests.patch 15074
 RMD160 26594fb4404d3620ea454ec24ed3e6bb34ed501a files/mercury-0.13.1-tests.patch 15074
@@ -148,14 +152,18 @@ EBUILD mercury-0.13.0.ebuild 3399 RMD160 24b4653ef73193e0de4d95d85a0aa7f589510f4
 MD5 b1c1a96d2f9339b78e135b1a8a06d5a3 mercury-0.13.0.ebuild 3399
 RMD160 24b4653ef73193e0de4d95d85a0aa7f589510f47 mercury-0.13.0.ebuild 3399
 SHA256 edf43ee4d3ca5cc66da22b7eac76f153017f8c1f453bdc8459067d7ab8b64f5a mercury-0.13.0.ebuild 3399
+EBUILD mercury-0.13.1-r1.ebuild 3405 RMD160 d4abeed72010c08a2ea32017145792d8f2990018 SHA1 2af368d065ef3cd30cfe2739c41aa586655c9173 SHA256 9da218f8a8bef38f401d0f374e2741f90afb4efd7014b88ac7960921e9722e63
+MD5 ee49f207d1e1430f36aa1ce310c7e2eb mercury-0.13.1-r1.ebuild 3405
+RMD160 d4abeed72010c08a2ea32017145792d8f2990018 mercury-0.13.1-r1.ebuild 3405
+SHA256 9da218f8a8bef38f401d0f374e2741f90afb4efd7014b88ac7960921e9722e63 mercury-0.13.1-r1.ebuild 3405
 EBUILD mercury-0.13.1.ebuild 3346 RMD160 dd731ac257203aca48294fa67b9bdee4c636e6ab SHA1 d8a9456db6ba4bfa5ece3334ffcda96c2dc4e5c5 SHA256 a27a34005f45e378df82bbad8409c9c8c30d253362982f9ebdcd5db883f66a7f
 MD5 f34187bbf12011057168c2a7583fff5c mercury-0.13.1.ebuild 3346
 RMD160 dd731ac257203aca48294fa67b9bdee4c636e6ab mercury-0.13.1.ebuild 3346
 SHA256 a27a34005f45e378df82bbad8409c9c8c30d253362982f9ebdcd5db883f66a7f mercury-0.13.1.ebuild 3346
-MISC ChangeLog 12411 RMD160 030ab49cf771b3dd41f0017c695558d0df4de5a4 SHA1 c5b78f1ea5d4933f1c0418b075796fc75244a087 SHA256 4efc62454cf546edf0fcb53f818f7892e4970e68183a1ee5514c2ee7339062e5
-MD5 d9b4eaaa3017414135d911e5ba43d104 ChangeLog 12411
-RMD160 030ab49cf771b3dd41f0017c695558d0df4de5a4 ChangeLog 12411
-SHA256 4efc62454cf546edf0fcb53f818f7892e4970e68183a1ee5514c2ee7339062e5 ChangeLog 12411
+MISC ChangeLog 12660 RMD160 2e51995d89bd16740c6192799a069ac91226aa34 SHA1 0183fe9aeef4750eb9ddebcb6ce4432486824b62 SHA256 c4fa0dc1dac8c229f381b82e12c27d66d3f67e2b41ee59c5b51eea0593d2e022
+MD5 cd21f52903ca978245e5c08f2166c892 ChangeLog 12660
+RMD160 2e51995d89bd16740c6192799a069ac91226aa34 ChangeLog 12660
+SHA256 c4fa0dc1dac8c229f381b82e12c27d66d3f67e2b41ee59c5b51eea0593d2e022 ChangeLog 12660
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
 MD5 6fca20d17d6d55a28537204aa9bb626f metadata.xml 247
 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 metadata.xml 247
@@ -172,3 +180,6 @@ SHA256 d1aea703e42770341422638e334bea55c6ec6e502d4bd15ef3667d675a903a06 files/di
 MD5 0f39d29a07bf6effc2c408dec8260607 files/digest-mercury-0.13.1 539
 RMD160 5e08dc52485dd743b512598f32091e3d32ed2baa files/digest-mercury-0.13.1 539
 SHA256 9848939c8bd8cbe954cf0eb5056cd843a0e5c4c53706fac6b44dd6d068bd8f9d files/digest-mercury-0.13.1 539
+MD5 0f39d29a07bf6effc2c408dec8260607 files/digest-mercury-0.13.1-r1 539
+RMD160 5e08dc52485dd743b512598f32091e3d32ed2baa files/digest-mercury-0.13.1-r1 539
+SHA256 9848939c8bd8cbe954cf0eb5056cd843a0e5c4c53706fac6b44dd6d068bd8f9d files/digest-mercury-0.13.1-r1 539
diff --git a/dev-lang/mercury/files/digest-mercury-0.13.1-r1 b/dev-lang/mercury/files/digest-mercury-0.13.1-r1
new file mode 100644
index 000000000000..598991491831
--- /dev/null
+++ b/dev-lang/mercury/files/digest-mercury-0.13.1-r1
@@ -0,0 +1,6 @@
+MD5 f75f2241a974792d30c18c4325c763d0 mercury-compiler-0.13.1.tar.gz 15938824
+RMD160 a0a80cd2ac7393cf084b79d40230bd1efe795c5f mercury-compiler-0.13.1.tar.gz 15938824
+SHA256 b1f4984e00ad917824d3340dcf2a41bede39fe02ef2e516351467f4761985196 mercury-compiler-0.13.1.tar.gz 15938824
+MD5 1a238a79a6c8734775bb216c252806d9 mercury-tests-0.13.1.tar.gz 986644
+RMD160 779609ba5c985e562b0962434c9281c07ddaa5cb mercury-tests-0.13.1.tar.gz 986644
+SHA256 f6c8250b9996584d3c7cd6cc0609716027b127e54b2aedf5ebfcab98a44159dc mercury-tests-0.13.1.tar.gz 986644
diff --git a/dev-lang/mercury/files/mercury-0.13.1-profdeep-builtin_throw.patch b/dev-lang/mercury/files/mercury-0.13.1-profdeep-builtin_throw.patch
new file mode 100644
index 000000000000..05da6498e79f
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.13.1-profdeep-builtin_throw.patch
@@ -0,0 +1,11 @@
+--- mercury-compiler-0.13.1.orig/library/exception.m	2006-07-31 18:01:49.000000000 +1200
++++ mercury-compiler-0.13.1/library/exception.m	2006-12-30 14:46:21.000000000 +1300
+@@ -1970,7 +1970,7 @@
+ 
+ MR_proc_static_user_no_site(exception, builtin_throw, 1, 0,
+     ""exception.m"", MR_DUMMY_LINE, MR_TRUE);
+-MR_STATIC_USER_PROC_STATIC_PROC_LAYOUT(
++MR_EXTERN_USER_PROC_STATIC_PROC_LAYOUT(
+         MR_DETISM_DET, 1, MR_LONG_LVAL_STACKVAR(1),
+         MR_PREDICATE, exception, builtin_throw, 1, 0);
+ MR_MAKE_USER_INTERNAL_LAYOUT(exception, builtin_throw, 1, 0, 1);
diff --git a/dev-lang/mercury/mercury-0.13.1-r1.ebuild b/dev-lang/mercury/mercury-0.13.1-r1.ebuild
new file mode 100644
index 000000000000..dd8e0459ce04
--- /dev/null
+++ b/dev-lang/mercury/mercury-0.13.1-r1.ebuild
@@ -0,0 +1,122 @@
+# 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.1-r1.ebuild,v 1.1 2006/12/30 01:47:37 keri Exp $
+
+inherit eutils
+
+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
+	ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/mercury-tests-0.13.1.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~sparc ~x86"
+
+IUSE="debug minimal readline threads"
+
+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
+	epatch "${FILESDIR}"/${P}-CFLAGS.patch
+	epatch "${FILESDIR}"/${P}-MAKEOPTS.patch
+	epatch "${FILESDIR}"/${P}-bootstrap.patch
+	epatch "${FILESDIR}"/${P}-LIBDIR.patch
+	epatch "${FILESDIR}"/${P}-libgrades.patch
+	epatch "${FILESDIR}"/${P}-parallel-install_grades.patch
+	epatch "${FILESDIR}"/${P}-deep_profiler.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() {
+	local myconf
+	myconf="--disable-gcc-back-end \
+		--enable-aditi-back-end \
+		--enable-deep-profiler \
+		--disable-dotnet-grades \
+		--disable-java-grades \
+		$(use_enable debug debug-grades) \
+		$(use_enable threads par-grades) \
+		$(use_enable !minimal most-grades) \
+		$(use_with readline) \
+		PACKAGE_VERSION=${PV}"
+
+	einfo "Performing stage 1 bootstrap"
+	econf \
+		${myconf} \
+		BOOTSTRAP_STAGE="1" \
+		|| die "econf stage 1 failed"
+	emake \
+		EXTRA_MLFLAGS=--no-strip \
+		|| die "emake stage 1 failed"
+
+	einfo "Performing stage 2 bootstrap"
+	cp "${S}"/compiler/mercury_compile "${S}"/mercury_compile
+	epatch "${FILESDIR}"/${P}-profdeep-builtin_throw.patch
+
+	econf \
+		${myconf} \
+		BOOTSTRAP_STAGE="2" \
+		|| die "econf stage 2 failed"
+	emake \
+		MERCURY_COMPILER="${S}"/mercury_compile \
+		depend || die "emake stage 2 depend failed"
+	emake \
+		MERCURY_COMPILER="${S}"/mercury_compile \
+		EXTRA_MLFLAGS=--no-strip \
+		|| die "emake stage 2 failed"
+
+	einfo "Compiling libgrades"
+	emake \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		libgrades || die "emake libgrades failed"
+}
+
+src_test() {
+	cd "${S}"
+	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}"
+	PATH="${TWS}"/scripts:"${TWS}"/util:"${PATH}" \
+	WORKSPACE="${TWS}" \
+	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
+	MMAKE_DIR="${TWS}"/scripts \
+	MERCURY_DEBUGGER_INIT="${TESTDIR}"/mdbrc \
+	GRADE=${TEST_GRADE} \
+		mmake || die "mmake test failed"
+}
+
+src_install() {
+	make \
+		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.Linux \
+		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
+		RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS
+}