New development snapshot.

(Portage version: 2.1.1)

4 files changed, 112 insertions, 10 deletions

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 368e90ae0448..5e51d5416a1a 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,13 @@
 # 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.37 2006/08/14 07:51:40 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.38 2006/09/09 06:28:04 keri Exp $
+
+*mercury-0.13.0_beta20060907 (09 Sep 2006)
+
+  09 Sep 2006; keri <keri@gentoo.org>
+  files/mercury-0.13.0_beta-portage.patch,
+  -mercury-0.13.0_beta20060811.ebuild, +mercury-0.13.0_beta20060907.ebuild:
+  New development snapshot.
 
   14 Aug 2006; Keri Harris <keri@gentoo.org>
   files/mercury-0.12.2-tests.patch, mercury-0.12.2-r3.ebuild:
diff --git a/dev-lang/mercury/files/digest-mercury-0.13.0_beta20060907 b/dev-lang/mercury/files/digest-mercury-0.13.0_beta20060907
new file mode 100644
index 000000000000..97de7a41662a
--- /dev/null
+++ b/dev-lang/mercury/files/digest-mercury-0.13.0_beta20060907
@@ -0,0 +1,6 @@
+MD5 3a719d8147092ac7a2e072b1e0b913e4 mercury-compiler-0.13.0-beta-2006-09-07-unstable.tar.gz 15857850
+RMD160 9a2670470a44b72c3211441432db76668b3257b7 mercury-compiler-0.13.0-beta-2006-09-07-unstable.tar.gz 15857850
+SHA256 8d15feb50d65f4f36d90b2302c39a3b0586ddcc54a7e8f323596769cc1608bf2 mercury-compiler-0.13.0-beta-2006-09-07-unstable.tar.gz 15857850
+MD5 b7ea755fb3043173857c158332695097 mercury-tests-0.13.0-beta-2006-09-07-unstable.tar.gz 984222
+RMD160 2de938d2935f84dd803d61d43dcd67e55d61c6c2 mercury-tests-0.13.0-beta-2006-09-07-unstable.tar.gz 984222
+SHA256 cfc6efc9006e6be6e2355b477c81d91b47fea961396bdb5cf9342dd8a32be2b6 mercury-tests-0.13.0-beta-2006-09-07-unstable.tar.gz 984222
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 6110bb776f4e..a88e8962d4ff 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
@@ -76,15 +76,6 @@
  .PHONY: install_config
 --- mercury-compiler-0.13.0-beta-2006-08-11.orig/configure	2006-08-11 22:37:07.000000000 +1200
 +++ mercury-compiler-0.13.0-beta-2006-08-11/configure	2006-08-12 16:14:59.000000000 +1200
-@@ -9048,7 +9048,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;
 @@ -9148,7 +9148,6 @@
  	enable_mm_grades=no
  	enable_dmm_grades=no
diff --git a/dev-lang/mercury/mercury-0.13.0_beta20060907.ebuild b/dev-lang/mercury/mercury-0.13.0_beta20060907.ebuild
new file mode 100644
index 000000000000..9166e575be71
--- /dev/null
+++ b/dev-lang/mercury/mercury-0.13.0_beta20060907.ebuild
@@ -0,0 +1,98 @@
+# 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_beta20060907.ebuild,v 1.1 2006/09/09 06:28:04 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}-bootstrap.patch
+	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-LIBDIR.patch
+	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-libgrades.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() {
+	local myconf
+	myconf="--disable-dotnet-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 || die "emake stage 1 failed"
+
+	einfo "Performing stage 2 bootstrap"
+	cp "${S}"/compiler/mercury_compile "${S}"/mercury_compile
+	econf \
+		${myconf} \
+		BOOTSTRAP_STAGE="2" \
+		|| die "econf stage 2 failed"
+	emake \
+		MERCURY_COMPILER="${S}"/mercury_compile \
+		|| die "emake stage 2 failed"
+
+	einfo "Compiling libgrades"
+	emake \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		libgrades || die "emake libgrades 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 \
+		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
+}