Version bump to development release.

Package-Manager: portage-2.1_pre7-r4

7 files changed, 174 insertions, 1 deletions

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 54ec8888761d..ab28aafc8b3b 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.4 2006/03/27 07:14:22 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.5 2006/04/07 12:11:44 keri Exp $
+
+*mercury-0.13.0_beta (07 Apr 2006)
+
+  07 Apr 2006; Keri Harris <keri@gentoo.org>
+  +files/mercury-0.13.0_beta-CFLAGS.patch,
+  +files/mercury-0.13.0_beta-docs.patch,
+  +files/mercury-0.13.0_beta-portage.patch, +mercury-0.13.0_beta.ebuild:
+  Version bump to development release.
 
   27 Mar 2006; Keri Harris <keri@gentoo.org> mercury-0.12.2.ebuild:
   Explicitly disable building dotnet grades. Thanks to Brian Danilko
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 8feb50a17913..81e5ecbd1f97 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -4,6 +4,9 @@ SHA256 c8eb9480b8c5cdeadea304b61f90ac8b5f3ba93f5f38246b8d3aedc586fff2ee ChangeLo
 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 3834ccecda2b3021976d7059ddaa5b24 files/digest-mercury-0.13.0_beta 352
+RMD160 275171fc80243f6f0d3fe09dfbd472fe901aaa93 files/digest-mercury-0.13.0_beta 352
+SHA256 60c11e495a36f4607b8aea2d1b332f11a556f09e340845655f0631f82cfdef24 files/digest-mercury-0.13.0_beta 352
 MD5 f9d8db42316ea25a27a1bbc6806f60d7 files/mercury-0.12.2-CFLAGS.patch 1267
 RMD160 70cbaa9b85c8ac23cd17c41c3d834c69af5bff1a files/mercury-0.12.2-CFLAGS.patch 1267
 SHA256 b27660a29a71b56071daa5e7fc6c62c697c53c55bf8b9068c1bc42002cdb00f1 files/mercury-0.12.2-CFLAGS.patch 1267
@@ -13,9 +16,21 @@ SHA256 78be9f8ef2960ce9ea99b33734d9143a998d87056efa84bafb618cab74fcd514 files/me
 MD5 8ba4f9e032e6b3d148dcb3dc80cc9938 files/mercury-0.12.2-portage.patch 1606
 RMD160 485229c1485e0acade8df39dca0da1ae2ade9a7f files/mercury-0.12.2-portage.patch 1606
 SHA256 5b56cdfc254d7e20b0fba5c3bb8187fd9883e7ea2063930de5f6c4fb8da25be1 files/mercury-0.12.2-portage.patch 1606
+MD5 978c7b688fa22fbf08bbd85f052cc603 files/mercury-0.13.0_beta-CFLAGS.patch 1387
+RMD160 50beda679059cfa2f1c4c0868c34d7fcad147336 files/mercury-0.13.0_beta-CFLAGS.patch 1387
+SHA256 aa3e882f2590d2962b2421495f92d1ae24030799e829f72caf5a55b17fcdea58 files/mercury-0.13.0_beta-CFLAGS.patch 1387
+MD5 825e199f587b2ceb1521e68ac78ec58a files/mercury-0.13.0_beta-docs.patch 828
+RMD160 451ce70dc6f2121f6585d3633693c289b584db47 files/mercury-0.13.0_beta-docs.patch 828
+SHA256 0dd010fa6acdef885b2bca5d79c4bb7b2b3aba2b2569e17035de1fbd0d32cbf7 files/mercury-0.13.0_beta-docs.patch 828
+MD5 7b1cd28fdc808a7c8cdfadb8722013ea files/mercury-0.13.0_beta-portage.patch 1608
+RMD160 30c59012a80aebac452d6ec7d24e7af193e8ab7d files/mercury-0.13.0_beta-portage.patch 1608
+SHA256 00fee4b44e779fd4cc79be60b95309a98999ae2fedfe602195fa1855e62d2da9 files/mercury-0.13.0_beta-portage.patch 1608
 MD5 d78f860592f44275fa723f1e945204f1 mercury-0.12.2.ebuild 1420
 RMD160 0f54075c4025dd99f6f60b6dabd5d761a92ba38c mercury-0.12.2.ebuild 1420
 SHA256 295e09a313b2f6129eadf492b3d9d266a3a1ba8cb933e7cac74eb4a386a5a45b mercury-0.12.2.ebuild 1420
+MD5 c7cd5233dab9f40d08c0c3bb0930865b mercury-0.13.0_beta.ebuild 1500
+RMD160 83a9c22127e3b7829887a455d442f2365b5300c5 mercury-0.13.0_beta.ebuild 1500
+SHA256 f479cbb8ff77408127502933cf23a945b530ffdb163da9288757393c5c8c1bdf mercury-0.13.0_beta.ebuild 1500
 MD5 6fca20d17d6d55a28537204aa9bb626f metadata.xml 247
 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 metadata.xml 247
 SHA256 be2c02607bd8d5bf707b178d925fa94c6c705014aa488156323589ca4eaac380 metadata.xml 247
diff --git a/dev-lang/mercury/files/digest-mercury-0.13.0_beta b/dev-lang/mercury/files/digest-mercury-0.13.0_beta
new file mode 100644
index 000000000000..02279fbfa41c
--- /dev/null
+++ b/dev-lang/mercury/files/digest-mercury-0.13.0_beta
@@ -0,0 +1,3 @@
+MD5 6ff38a4e1db247dfb80ec4151adc936e mercury-compiler-0.13.0-beta-2006-04-03-unstable.tar.gz 15829295
+RMD160 17eef81d33fa9250a68099ddb279f0a840a4cc8b mercury-compiler-0.13.0-beta-2006-04-03-unstable.tar.gz 15829295
+SHA256 82a9be9b1f5140559b165d8263de108363f2fe9439f8f60e1768e6405d683af6 mercury-compiler-0.13.0-beta-2006-04-03-unstable.tar.gz 15829295
diff --git a/dev-lang/mercury/files/mercury-0.13.0_beta-CFLAGS.patch b/dev-lang/mercury/files/mercury-0.13.0_beta-CFLAGS.patch
new file mode 100644
index 000000000000..cac785ea102f
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.13.0_beta-CFLAGS.patch
@@ -0,0 +1,31 @@
+--- mercury-compiler-0.13.0-beta-2006-04-03.orig/scripts/mgnuc.in	2006-01-25 17:57:48.000000000 +1300
++++ mercury-compiler-0.13.0-beta-2006-04-03/scripts/mgnuc.in	2006-04-04 22:39:40.000000000 +1200
+@@ -53,7 +53,7 @@
+ # -Wenum-clash          is for C++ only
+ # -Wunused              causes various spurious warnings
+ 
+-        OPT_OPTS="-O2 $CFLAGS_FOR_NO_STRICT_ALIASING -fomit-frame-pointer"
++        OPT_OPTS="@CFLAGS_FOR_OPT@"
+         DEBUG_OPT="-g"
+         COMPILER=gcc
+         ;;
+--- mercury-compiler-0.13.0-beta-2006-04-03.orig/configure	2006-04-03 22:37:02.000000000 +1200
++++ mercury-compiler-0.13.0-beta-2006-04-03/configure	2006-04-04 22:42:25.000000000 +1200
+@@ -3739,7 +3739,7 @@
+ # the `-lc' and `-lg' libraries have different contents; specifically,
+ # only the latter contains memalign().  We need to make sure that the
+ # test for memalign() doesn't use `-g', since `ml' doesn't use `-g'.
+-CFLAGS="-O"
++# CFLAGS="-O"
+ 
+ # we also need to add the appropriate `-I' options so that the test programs
+ # can #include various Mercury runtime headers.
+@@ -10005,7 +10005,7 @@
+ 		# enable, and why, see scripts/mgnuc.in.
+ 		CFLAGS_FOR_WARNINGS="-Wall -Wwrite-strings -Wshadow -Wmissing-prototypes -Wno-unused -Wno-uninitialized -Wstrict-prototypes"
+ 
+-		CFLAGS_FOR_OPT="-O2 -fomit-frame-pointer"
++		CFLAGS_FOR_OPT="$CFLAGS"
+ 		CFLAGS_FOR_DEBUG="-g"
+ 		MCFLAGS_FOR_CC=
+ 		;;
diff --git a/dev-lang/mercury/files/mercury-0.13.0_beta-docs.patch b/dev-lang/mercury/files/mercury-0.13.0_beta-docs.patch
new file mode 100644
index 000000000000..7f998b6a9159
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.13.0_beta-docs.patch
@@ -0,0 +1,20 @@
+--- mercury-compiler-0.13.0-beta-2006-04-03.orig/doc/Mmakefile	2006-03-29 13:35:18.000000000 +1200
++++ mercury-compiler-0.13.0-beta-2006-04-03/doc/Mmakefile	2006-04-04 22:45:41.000000000 +1200
+@@ -120,7 +120,7 @@
+ 	# formatted versions of the man pages.
+ 	# But it might make sense to add them.
+ .PHONY: all
+-all: $(INFOPAGES) $(DVI) $(HTML) manpages $(MDB_DOC) 
++all: $(INFOPAGES) $(HTML) manpages $(MDB_DOC) 
+ #all: ps pdf text formatted_manpages
+ 
+ #-----------------------------------------------------------------------------#
+@@ -331,7 +331,7 @@
+ 	# versions of the documentation.  If they are added they should
+ 	# be installed here.
+ .PHONY: install
+-install: install_info install_html install_dvi install_manpages \
++install: install_info install_html install_manpages \
+ 	install_mdb_doc
+ 	# install_text install_ps
+ 
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
new file mode 100644
index 000000000000..6727c51c0b56
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.13.0_beta-portage.patch
@@ -0,0 +1,44 @@
+--- mercury-compiler-0.13.0-beta-2006-04-03.orig/Makefile	2005-08-22 15:38:34.000000000 +1200
++++ mercury-compiler-0.13.0-beta-2006-04-03/Makefile	2006-04-04 22:34:14.000000000 +1200
+@@ -26,7 +26,7 @@
+ 
+ .PHONY: all
+ all:
+-	$(MMAKE) MMAKEFLAGS=$(PARALLEL) all
++	$(MMAKE) MMAKEFLAGS=$(PARALLEL) all || exit 1
+ 
+ .PHONY: libmmc
+ libmmc:
+@@ -34,7 +34,7 @@
+ 
+ .PHONY: install
+ install:
+-	$(MMAKE) MMAKEFLAGS=$(PARALLEL) install
++	$(MMAKE) MMAKEFLAGS=$(PARALLEL) install || 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.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 @@
+ 	@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 \
diff --git a/dev-lang/mercury/mercury-0.13.0_beta.ebuild b/dev-lang/mercury/mercury-0.13.0_beta.ebuild
new file mode 100644
index 000000000000..f87b5de6ad7e
--- /dev/null
+++ b/dev-lang/mercury/mercury-0.13.0_beta.ebuild
@@ -0,0 +1,52 @@
+# 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_beta.ebuild,v 1.1 2006/04/07 12:11:44 keri Exp $
+
+inherit eutils versionator
+
+MY_PV=$(replace_version_separator 3 '-')
+MY_P=${PN}-compiler-${MY_PV}-2006-04-03
+
+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/${PN}/beta-releases/${MY_PV}/${MY_P}-unstable.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+
+IUSE="minimal readline"
+
+DEPEND="readline? ( sys-libs/readline )"
+
+S="${WORKDIR}"/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-portage.patch
+	epatch "${FILESDIR}"/${P}-CFLAGS.patch
+	epatch "${FILESDIR}"/${P}-docs.patch
+}
+
+src_compile() {
+	econf \
+		--disable-dotnet-grades \
+		$(use_enable !minimal most-grades) \
+		$(use_with readline) \
+		|| die "econf failed"
+	emake || die "emake 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
+}