Version bump

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

3 files changed, 230 insertions, 5 deletions

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index fbee13c621a3..62c1e6f87811 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/mercury
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.144 2012/01/09 08:26:49 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.145 2012/03/09 20:00:21 keri Exp $
+
+*mercury-11.07.1 (09 Mar 2012)
+
+  09 Mar 2012; <keri@gentoo.org> +mercury-11.07.1.ebuild:
+  Version bump
 
 *mercury-11.07 (09 Jan 2012)
 
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 8c486877f1b0..37785333fbf2 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -4,22 +4,26 @@ Hash: SHA1
 AUX 50mercury-gentoo.el 130 RMD160 293a39103c84059a611896e552d89736ee742789 SHA1 ea6071d0be2885090f90211ffca5474ad50b2286 SHA256 802dbbd82d775bba22bb750668e0a8462960d9e8b28e3731171cded00783d6f4
 DIST mercury-11.01-gentoo-patchset-1.tar.gz 7129 RMD160 cfb89fa798724744ea7f1912b0015affdb1ea63c SHA1 d23e615b81cfd259e369cfcd1c5cd9965780f946 SHA256 43dbcb63add22b24da7515b7d42d8b4ad119d9923f80dbb29767d756436d0fa4
 DIST mercury-11.07-gentoo-patchset-0.tar.gz 6889 RMD160 38152c3e6e10524fdc3c6911adda90ad384ad8c4 SHA1 e2f95ce3384ea8618ce86f65512b79154640f1cf SHA256 2fce2c95b6cb8b5819fb576de8ce184293a926c52f120027e3195d14f0552d78
+DIST mercury-11.07.1-gentoo-patchset-0.tar.gz 6916 RMD160 c1d024685386fd58d53ba670eac3c06f99441b3d SHA1 c20a69ef1ba4226a23bf683a6e4153dd5ac360fa SHA256 27ca405aef5111cba8db0f0bedf2b08d0222bc9a91683d0fa32778148dfde711
 DIST mercury-11.07_beta1-gentoo-patchset-1.tar.gz 7157 RMD160 c82f9937fb1fce9a76a402fded8abfc254cfaf5a SHA1 37d4861d991962d37c2e25c4da2dc9834491511c SHA256 9e07bd3232463eb6bb679a86202bae0edb41385551b9dc5d01eac054880263f5
 DIST mercury-compiler-11.01.tar.gz 25122699 RMD160 bee82b6037fa1f14f27b43d6f7d751d232941bc7 SHA1 508f9fbebdf061f706a44db5c77868cb4e769066 SHA256 2d12dc9bfaed46b1b30689b0592177bc871b21cf8852c8326c86371258bb18b0
 DIST mercury-compiler-11.07-beta-2011-06-28-unstable.tar.gz 25281973 RMD160 87a7ce5d4840521c033de59330756eb2a30e388e SHA1 14e494716717a21989e17219c540a14c79d7a415 SHA256 54e2327f247f6ae795d9963622ffd8ca00e8e3e85519eb7896ac39f1000c3793
+DIST mercury-compiler-11.07.1.tar.gz 25308185 RMD160 10593ad6decefffdd8225d0c29fdb731d1470ca9 SHA1 717daf9bf74ae22e759b78f4e1f101dba951f89b SHA256 f3f1d4f0fb34567a69aaa9fb6f4ecff52b97a66ab6c8a868c4e284eb61d3dc11
 DIST mercury-compiler-11.07.tar.gz 25298643 RMD160 1573be5c26415c6fac96f85ff9558db736890b83 SHA1 d27541f5fcd5ec6b8ca2fc39f72ed74c833f243a SHA256 77940d03834a3967e4505c4a92253c19aaea0fed4650ee94e772078abd6be6a2
 DIST mercury-tests-11.01.tar.gz 1351134 RMD160 4568a0b1044a116ab59b2f0d98002e20c6819461 SHA1 180741461386f7a2b0fd526e0d4c761cd7b0c3ff SHA256 862b70a589eb2d36c9fd82dbd2e0490dc4556f6edff604a54dfd6fc0ad6cccad
 DIST mercury-tests-11.07-beta-2011-06-28-unstable.tar.gz 1641484 RMD160 4a6db1128b13b24042626a99b4f89c21759605fd SHA1 da86df499f0ea46ec430a3233055396e0b8eec71 SHA256 6ee6131fb20e8b0fa6ad2a8947f234d768f95a3e0dc71ebdcff4583d99833bee
+DIST mercury-tests-11.07.1.tar.gz 1648437 RMD160 929364e2ca22db8b3a7bcb80fa146b70584ac95d SHA1 8c3fb4381817dc79cab56eb5859b117aa1d168be SHA256 01558a6ddd28d2f832d88da8bbf38fec542d091fc53b5adf92fac5e2564c2057
 DIST mercury-tests-11.07.tar.gz 1647435 RMD160 146fd0a87a6e70d817c39e15fda660f747330a5d SHA1 2e41846f2e0020e3f9a27caf5b30d8217fa787b2 SHA256 9206c7ffaace2357367bb6f8c3efe9aeb05ccac6a02946f6579c6001f953501b
 EBUILD mercury-11.01.ebuild 5815 RMD160 07b2850968c2411bc41062b3e3217a5e3ca51b51 SHA1 e6334dc5b6ceb4607a640a820c496b3e02fcafb5 SHA256 1677f4b9f63c3bd405898616204bdf67c9bf8a88f0e71173478fbf5ca1c68a62
+EBUILD mercury-11.07.1.ebuild 5813 RMD160 0bcd33bc73e4c71e4f964d320e1423049ffc99d3 SHA1 0415a7026050056f4f2da72bbd2d813ab92386c4 SHA256 389d35b6374a983650496dd1811ec7583d669730deed8d8f43c12b39ff256371
 EBUILD mercury-11.07.ebuild 5811 RMD160 611fa430491d0403f1c3ed692068a237c0cdcd20 SHA1 fc921a6eeef92b5a648e8189e0ac0c0e0e277bc8 SHA256 3164de7bf4263e502b84a11213c6232f88dc9282a148b1bc4b22fbd91428a85a
 EBUILD mercury-11.07_beta1.ebuild 5939 RMD160 2f1a6b50a35a45dfc7c54a6f896d29b1ee54b1e0 SHA1 b5332c7a7b2f07cba10e187ddce0acf4fe519218 SHA256 93eb5cf7d476dbd8968e9ef8a44e7979914961e117a67f79d0c18a8282642cce
-MISC ChangeLog 30937 RMD160 db73035068f205cd54ddd451021848e16b57f8bb SHA1 94abc226c2ee992cd36cf23eccf73cc6bcd6f0bb SHA256 dc56e0aea583c5204d73762eaeea7e1abba9c7d75d9e4d8b4a7913450d3316b0
+MISC ChangeLog 31043 RMD160 4a547a63157e7b607e1e8147c155da3f4efe3873 SHA1 4a25e878171cb2e1ec3eca0edf0dad0b4a8321bc SHA256 17794891744202c69f79aa7c2a69bb5b66048483447dde3375d3de0e4e37f680
 MISC metadata.xml 297 RMD160 a6000ba142c7a80d67b574399247e5ef95b22dce SHA1 f4a1c6383313475d951175f6b167457a2cf87d27 SHA256 6814d23336067f1c5aace679d091bb6f4450122bfa7a94cbc66f625a8d970f4f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk8KpNUACgkQrwS/tqE49e3KoACgn2/97TFa5RwNNYXHpdqAEbWk
-sgIAnA7HjbV6bAZSvT2g1AA/AimhjIPq
-=bjTK
+iEYEARECAAYFAk9aYWAACgkQrwS/tqE49e3zSwCeMAbAdY4WiCrSwI7A+oktYvav
+rO4An1+GveO3iw5RYLvTYloHmod9y0ID
+=Hatq
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/mercury/mercury-11.07.1.ebuild b/dev-lang/mercury/mercury-11.07.1.ebuild
new file mode 100644
index 000000000000..e3a647842ca4
--- /dev/null
+++ b/dev-lang/mercury/mercury-11.07.1.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-11.07.1.ebuild,v 1.1 2012/03/09 20:00:21 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 ~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
+}