Version bump

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

3 files changed, 237 insertions, 2 deletions

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 7c4c7c5c6f29..4855cba3c4c7 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/mercury
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.135 2011/02/12 18:28:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.136 2011/04/29 23:31:48 keri Exp $
+
+*mercury-11.01 (29 Apr 2011)
+
+  29 Apr 2011; <keri@gentoo.org> +mercury-11.01.ebuild:
+  Version bump
 
   12 Feb 2011; Raúl Porcel <armin76@gentoo.org> mercury-0.13.1-r2.ebuild,
   mercury-10.04.ebuild, mercury-10.04-r1.ebuild, mercury-10.04.1.ebuild,
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 56741b72b20a..da78f73f508a 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50mercury-gentoo.el 130 RMD160 293a39103c84059a611896e552d89736ee742789 SHA1 ea6071d0be2885090f90211ffca5474ad50b2286 SHA256 802dbbd82d775bba22bb750668e0a8462960d9e8b28e3731171cded00783d6f4
 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
@@ -13,23 +16,34 @@ DIST mercury-10.04-gentoo-patchset-0.tar.gz 8036 RMD160 6afb964cf8b592141e6b3af3
 DIST mercury-10.04.1-gentoo-patchset-0.tar.gz 9013 RMD160 59e8c0507bd2bcfb55d83425d72a89adfa5e64a0 SHA1 30b10271f342e893cfab67426c0fd25d3f06845f SHA256 14f1fb3c3927cd7c5d16407e0003b5531248f7b49f4a202e7dd288f8da5fddac
 DIST mercury-10.04.2-gentoo-patchset-0.tar.gz 9352 RMD160 475bdba037ca93062a96092bc049bf4f6659ca99 SHA1 6d614541b3c4760910f263cc6e57e09697e324db SHA256 1c1323602a30d734b298521a1749d2a25196b290d416b51f8ce512321d0f7df6
 DIST mercury-10.04.2-gentoo-patchset-3.tar.gz 9341 RMD160 ca46e0875565c27beec1a9688ce35e01d9fb8dc5 SHA1 d4c75c4fb1b05dddf6bc0938f48b96b022a0cc8f SHA256 ef110c239ad9eedad59e6dda1d2774229cc8d44fec2a3e24594c1f41bb5d5c6c
+DIST mercury-11.01-gentoo-patchset-0.tar.gz 6928 RMD160 ac49349c5b3bb478aac3ee282dab0120081e2bc2 SHA1 7c2a74de19d7329cfa04b9bb65d1f86fb9bb32e7 SHA256 6eddd309441868e96de47efef73c45092a045d820972112785eec316c546115f
 DIST mercury-11.01_beta1-gentoo-patchset-0.tar.gz 8661 RMD160 c8d40aded3e13e86e801bc4f6aa0b260f61c75bd SHA1 8cb663391b544055bfa256c030afdf8a399c09cd SHA256 f1d4183f690848a9e7289fd8995f4a5dbf78e007dda62e60a2e1ea2f47dfedfd
 DIST mercury-compiler-0.13.1.tar.gz 15938824 RMD160 a0a80cd2ac7393cf084b79d40230bd1efe795c5f SHA1 919eb45ba34c503fc2e7391225e52a5cfbb80616 SHA256 b1f4984e00ad917824d3340dcf2a41bede39fe02ef2e516351467f4761985196
 DIST mercury-compiler-10.04.1.tar.gz 24600120 RMD160 99f998845ad5c952860cd5ba3051c948dc7f3397 SHA1 9d9135d171128ce53cc77680423c5fd5e4ea4530 SHA256 63fa2b5661ab34bcb7d199c7686753c7c20b85b989c18e67f682f00cd91a02bb
 DIST mercury-compiler-10.04.2.tar.gz 24608706 RMD160 efcc35f8fcfaa66413bb04956e79a7708531327f SHA1 c1ade62620a6092f345c9c850abecfa8c69349e1 SHA256 cc7682971cb5377f69f2dbbf04cd3c7545ac98079e51dac92d71979d85fd01a8
 DIST mercury-compiler-10.04.tar.gz 24586705 RMD160 fe9b131a272ab314618cde59463e5b55686126e3 SHA1 3ae0d596ad079d62bfb6ae41bc0ab0a5d78db6fa SHA256 ecb930c2b26f804648f6432503937a669de4c2c9e85dec9a60ef65f729fbbcda
 DIST mercury-compiler-11.01-beta-2010-12-22.tar.gz 25044345 RMD160 b16a07493c47e8cd79b94559b688d4078c6fcf5e SHA1 ba9f897379ef757b5c208db3aeec88eb2ea37be9 SHA256 af6d53196e5afc573343f081bbcf4c6d808817a75b036fe1847962dcf6bb6f03
+DIST mercury-compiler-11.01.tar.gz 25122699 RMD160 bee82b6037fa1f14f27b43d6f7d751d232941bc7 SHA1 508f9fbebdf061f706a44db5c77868cb4e769066 SHA256 2d12dc9bfaed46b1b30689b0592177bc871b21cf8852c8326c86371258bb18b0
 DIST mercury-tests-0.13.1.tar.gz 986644 RMD160 779609ba5c985e562b0962434c9281c07ddaa5cb SHA1 7f08467e6642daa4fce9136e12b4e5ca2ac41b9d SHA256 f6c8250b9996584d3c7cd6cc0609716027b127e54b2aedf5ebfcab98a44159dc
 DIST mercury-tests-10.04.1.tar.gz 1332741 RMD160 e7880a095d071f4fcdce69f9e656e67dfe09de63 SHA1 4e9a9a1c12a1e435442822d28810cd209f9212b0 SHA256 1e05cb3fa3a673ab1c0464c9616181bdd07f5b09681f58f021a2da3bc5c05c26
 DIST mercury-tests-10.04.2.tar.gz 1332984 RMD160 5c56b4c92627be5903b9a7fcaa7af9dddc160ed3 SHA1 9a8dcaabcbe6aa6a398ab97f63700c2d2f53de5d SHA256 7aca501f4bb8604f09ca4d5d0c102fd327fbec4cdd789c27c7b0f08f7e9e9491
 DIST mercury-tests-10.04.tar.gz 1329423 RMD160 c85e489eea4e36fef6d12fb9bf4e7cd01bb2e7fd SHA1 32ca9267d58d2cbb7d144c1501803f0a7b92f145 SHA256 d56a76b4a2c8c2cc878b7a7cd04fd34b4069cef1316155a942f4372425d45085
 DIST mercury-tests-11.01-beta-2010-12-22.tar.gz 1338813 RMD160 5a7aca181194c0238f36f3a983aa3be0b724bbbf SHA1 1b3280783bf8140dd0d2abf6cff86992a5411816 SHA256 f97f8d36ee8cca6933f736fb877666c0e4975444c437aca0ae3be06fe6a1a1da
+DIST mercury-tests-11.01.tar.gz 1351134 RMD160 4568a0b1044a116ab59b2f0d98002e20c6819461 SHA1 180741461386f7a2b0fd526e0d4c761cd7b0c3ff SHA256 862b70a589eb2d36c9fd82dbd2e0490dc4556f6edff604a54dfd6fc0ad6cccad
 EBUILD mercury-0.13.1-r2.ebuild 3344 RMD160 23317dd77309111374fbc6afe344fa62b2defcce SHA1 3882b2f7024cc92d8c470e5a6b2c380cbd4261b9 SHA256 54e02b7aa50501a8adeb0b5fc4e9810da087c29e90b041a431be2685414ad95e
 EBUILD mercury-10.04-r1.ebuild 4054 RMD160 f4564bf75a1dbbeb3a501ca778677ebedb445178 SHA1 8123b171be49e316becfd339fe69ccdd77dac31b SHA256 a2f26d82421ba974e576f6c75a03d3e847128c4ff6ae286a2ec3b7bac4ba8e63
 EBUILD mercury-10.04.1.ebuild 4525 RMD160 595cdd7d20de4812cf6c184654a0e028b5d90b01 SHA1 0a2537c691fa08484ddc91a0b4fe94d0164d8461 SHA256 cc305fceeb28b6a79593051c666f31e1e6e6b57b835a3ad84d463e7f67a6c1b1
 EBUILD mercury-10.04.2-r1.ebuild 5775 RMD160 57cb25025e6f4b2de846d29cd144895b3486ba8c SHA1 8b89ff6fbac1cb62b4eed14c435a1440dfd71d88 SHA256 37713bdcccdef737e4ec761506289b85061082653d39e8c0d134f5ebcc3dfa83
 EBUILD mercury-10.04.2.ebuild 4525 RMD160 e4a128120720384b4915af1b4b189148218361f8 SHA1 67abac268fdac9105eaeafac15a9c95b4237be76 SHA256 43704fa4898c61185f51ef97f952ea20d15abfc90cf3efe1d094cfe2365132c0
 EBUILD mercury-10.04.ebuild 3853 RMD160 3dea197d6d7a318068321b2233066f467c3887bb SHA1 2306d79ebda984434fac5c0761128fb9a4ad9f35 SHA256 f8a6af0997de53907742f8373c613fedb53e816299d2888e9a56146d9244aa0b
+EBUILD mercury-11.01.ebuild 5816 RMD160 26cca4874996c783d5a2739d8999c6a537ea6283 SHA1 151542f6209d2786427d3123128f819d6e2693ff SHA256 408e52e7f07716c250d02a2f72750f860eb390fd320105f36a295595e44943ee
 EBUILD mercury-11.01_beta1.ebuild 5923 RMD160 b02d925088b28a277b2bd238645f73a70f7f9643 SHA1 29e1e3bc8b7cfba1b0558c04c9f34c7dacfa347f SHA256 47fdb3be92c7b63509545705ba234358127541aae2b3abc9ffa24df927f9effa
-MISC ChangeLog 29140 RMD160 958c8fbe6107f3a5283ccc33a5a6cba0e84bfbc6 SHA1 ce78cb7f470201777b46a593de253d35dd3b2e4c SHA256 2f01a6cb1dfb4e1ef1f7ef82e9c26a386579a4187deff7cecf0b9a325f9b8a73
+MISC ChangeLog 29239 RMD160 d60eae1bc5496a080c06186f2fbd6ec85e477357 SHA1 3cc97e6b2cfd988a8405736fa51477061a41e097 SHA256 5690ec3a8beb3b28b43f7228156dd732ddc9f8f5e042d450aed4f5f4d5ebfa4e
 MISC metadata.xml 318 RMD160 b9e62c5b9d04f43a6570cfcadd6a6c9a2b9e3f6f SHA1 67893d667419e727696eb2c386565794fd137418 SHA256 5e64767eb2ff6b10d88b169c87648d62b534356fb94c5407a253aeafc2d16935
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk27SnEACgkQrwS/tqE49e2edgCeNlVwXv8TZiu2TxY5gsdqkLdQ
+LX0An1EVlUXwrvCUgwGKpMLBnXoUyX2P
+=8JfI
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/mercury/mercury-11.01.ebuild b/dev-lang/mercury/mercury-11.01.ebuild
new file mode 100644
index 000000000000..4e5187893587
--- /dev/null
+++ b/dev-lang/mercury/mercury-11.01.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-11.01.ebuild,v 1.1 2011/04/29 23:31:48 keri Exp $
+
+EAPI=2
+
+inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
+
+PATCHSET_VER="0"
+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="http://www.mercury.csse.unimelb.edu.au/download/files/${MY_P}.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz
+	test? ( http://www.mercury.csse.unimelb.edu.au/download/files/mercury-tests-${PV}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="debug emacs erlang examples java minimal readline test threads"
+
+DEPEND="!dev-libs/mpatrol
+	!dev-util/mono-debugger
+	readline? ( sys-libs/readline )
+	erlang? ( dev-lang/erlang )
+	java? ( >=virtual/jdk-1.5 )"
+
+RDEPEND="${DEPEND}
+	emacs? ( virtual/emacs )"
+
+S="${WORKDIR}"/${MY_P}
+TESTDIR="${WORKDIR}"/${PN}-tests-${PV}
+
+SITEFILE=50${PN}-gentoo.el
+
+src_prepare() {
+	cd "${WORKDIR}"
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}
+
+	sed -i -e "s/@libdir@/$(get_libdir)/" \
+		"${S}"/scripts/Mmake.vars.in \
+		|| die "sed libdir failed"
+
+	if use test; then
+		epatch "${WORKDIR}"/${PV}-tests
+	fi
+
+	cd "${S}"
+	eautoconf
+}
+
+src_configure() {
+	strip-flags
+
+	local myconf
+	myconf="--libdir=/usr/$(get_libdir) \
+		--disable-gcc-back-end \
+		--disable-deep-profiler \
+		--disable-dotnet-grades \
+		$(use_enable erlang erlang-grade) \
+		$(use_enable java java-grade) \
+		$(use_enable debug debug-grades) \
+		$(use_enable threads par-grades) \
+		$(use_enable !minimal most-grades) \
+		$(use_with readline)"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	# Generate Mercury .m dependencies. This step will vacuously
+	# succeed if we do not have a bootstrappable instance of mmc
+	# already installed. This step is required as mmc does not wait
+	# for all dependencies to be generated before compiling .m files.
+	emake \
+		PARALLEL=${MAKEOPTS} \
+		bootstrap_depend || die "emake depend failed"
+
+	# Build Mercury using base llds grade
+	emake \
+		PARALLEL=${MAKEOPTS} \
+		EXTRA_MLFLAGS=--no-strip \
+		EXTRA_LDFLAGS="${LDFLAGS}" \
+		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
+		|| die "emake failed"
+
+	# We can now patch .m Mercury compiler files since we
+	# have just built mercury_compiler.
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}-mmc
+
+	sed -i -e "s/@libdir@/$(get_libdir)/" \
+		"${S}"/compiler/file_util.m \
+		"${S}"/compiler/make.program_target.m \
+		|| die "sed libdir failed"
+
+	# Rebuild Mercury compiler using the just built mercury_compiler
+	emake \
+		PARALLEL=${MAKEOPTS} \
+		EXTRA_MLFLAGS=--no-strip \
+		EXTRA_LDFLAGS="${LDFLAGS}" \
+		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		compiler || die "emake compiler failed"
+
+	# The default Mercury grade may not be the same as the grade used to
+	# compile the llds base grade. Since src_test() is run before
+	# src_install() we compile the default grade now
+	emake \
+		PARALLEL=${MAKEOPTS} \
+		EXTRA_MLFLAGS=--no-strip \
+		EXTRA_LDFLAGS="${LDFLAGS}" \
+		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		default_grade || die "emake default_grade failed"
+}
+
+src_test() {
+	TEST_GRADE=`scripts/ml --print-grade`
+	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
+		TWS="${S}"/install_grade_dir.${TEST_GRADE}
+		cp browser/mer_browser.init "${TWS}"/browser/
+		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
+		cp runtime/mer_rt.init "${TWS}"/runtime/
+		cp ssdb/mer_ssdb.init "${TWS}"/ssdb/
+	else
+		TWS="${S}"
+	fi
+
+	cd "${TESTDIR}"
+	sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws \
+		|| die "sed WORKSPACE failed"
+
+	# Mercury tests must be run in C locale since Mercury output is
+	# compared to hard-coded warnings/errors
+	LC_ALL="C" \
+	PATH="${TWS}"/scripts:"${TWS}"/util:"${TWS}"/slice:"${PATH}" \
+	TERM="" \
+	WORKSPACE="${TWS}" \
+	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
+	MERCURY_CONFIG_DIR="${TWS}" \
+	MMAKE_DIR="${TWS}"/scripts \
+	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 \
+		PARALLEL=${MAKEOPTS} \
+		EXTRA_LDFLAGS="${LDFLAGS}" \
+		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_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_ELISP_DIR="${D}/${SITELISP}"/${PN} \
+		install || die "make install failed"
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+			|| die "elisp-site-file-install failed"
+	fi
+
+	dodoc \
+		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
+		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
+		RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS || die
+
+	if use erlang; then
+		dodoc README.Erlang || die
+	fi
+
+	if use java; then
+		dodoc README.Java || die
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/samples
+		doins samples/{*.m,README,Mmakefile} || die
+		doins -r samples/c_interface \
+			samples/diff \
+			samples/muz \
+			samples/rot13 \
+			samples/solutions \
+			samples/solver_types || die
+
+		if use java; then
+			doins -r samples/java_interface || die
+		fi
+
+		rm -rf $(find "${D}"/usr/share/doc/${PF}/samples \
+				-name CVS -o -name .cvsignore)
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}