Version bump

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0xA138F5ED

3 files changed, 214 insertions, 2 deletions

diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog
index 0dcb06f54727..aacdd1082615 100644
--- a/dev-lang/mercury-extras/ChangeLog
+++ b/dev-lang/mercury-extras/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/mercury-extras
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.107 2013/05/03 12:35:36 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.108 2013/06/03 07:45:21 keri Exp $
+
+*mercury-extras-13.05 (03 Jun 2013)
+
+  03 Jun 2013; <keri@gentoo.org> +mercury-extras-13.05.ebuild:
+  Version bump
 
   03 May 2013; <keri@gentoo.org> mercury-extras-11.07.2.ebuild:
   Do not install lex module for non-C grades
diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index 02d3ec69ef36..ce9c995fc74d 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST mercury-extras-11.01-gentoo-patchset-2.tar.gz 5005 SHA256 68e8a358a75527823a7c7f119ac0104acb0702263178f27be659c6b1d09cb46c SHA512 f8d434893cf63f6d49fcb2e527debf0f671a11249333afc3320c7e4c19efb5205606060350da93e57ba10bd27dacbe684e1c3b6909f049caa1b14acf292173ba WHIRLPOOL e2dd61ace52d0009109c16e1fbf1c1bf2afcb757977ae2c9247262a7ae7b6cc33cf6d51c83ce930f6fef5b9f3f7835cbbd559ccc6c50098d17c5737857ee5830
 DIST mercury-extras-11.01.tar.gz 777185 SHA256 52eb6758e2136eb288329917d4c352da98e9ce0e951d6a5c884919bf8e85b1b1 SHA512 790864bba746f53a7285ae648fcf86e7a14761ed8369536a7d05175fcf58dc67f95bcfbd13266e3b86b9475e871fd28e2b277910e4f0d72c3efe4b5f3cc16269 WHIRLPOOL fec77ffc070be51c6e5dfec1ffb18dfa4a622f87b36f062c7b5eb0175d0bf2275e37d2fd7c901b594ae1b4212eb5383c324640694db2a3adef70a615f2352a48
 DIST mercury-extras-11.07-gentoo-patchset-0.tar.gz 4886 SHA256 25452b2489ac260084735d738972c5d286c63e54ecd1a14cc26890f902714966 SHA512 dca2ae9ebae05f49ca79bd6fba510fdea25d94974d40835588174dac30667fffc5f982864888180434b7b35f6e545fbf3295caae2543f4f637a84e6ddf79a7c8 WHIRLPOOL 789fa90f8fcb75603290fb693335000f643cf6b3405242dc833e73baf53f82f5836f00c5fa4b92dfaeb076c36b853a02835e224c708d98e66012c8f8d332fa60
@@ -6,9 +9,19 @@ DIST mercury-extras-11.07.1.tar.gz 776828 SHA256 cda5891e6143f34ec0639f296c0080e
 DIST mercury-extras-11.07.2-gentoo-patchset-3.tar.gz 5320 SHA256 c6d0e12325e4bff9bd1d16c364c15d7c593c349bf175c08bab5d9a6214202110 SHA512 666fe82a34191d1ab68e23bf81fa1dd811ddda29033503a32432caee4610b8d0adbbb5950c344c4f6a9d74c15f6959a5d0d5179e6b8d4715ef45761a3d4b4e28 WHIRLPOOL 2d1731073b823a96e502fd798229d3748febaaff3bfe5f3c7160d3881ee4faa05da31018ebabdacdb179b3030bc723ed2e7edcd0b7c734787d81667640cec098
 DIST mercury-extras-11.07.2.tar.gz 774067 SHA256 424cd1e642a49f4c463e20851ba185ce60186c7c46aed96c7f32f55e41ae482b SHA512 162358a22f020f61310c29aa61c480fee0a02aff2749a89956493bed43aafe89e92427578697eb1e8e43e73acde1d19f1b9bc85705ff448e5fa8cdaf92b749c5 WHIRLPOOL 24b7093a2ed72441aafd3a1ffa84c5b9458d5fddaedb1eb46dcb66e52cc21dc0dd5ded14067c0b0be040ae5de0a14ebf5341b5c87720390b5892a872f32e9d11
 DIST mercury-extras-11.07.tar.gz 776589 SHA256 25eaf999666ceb4217cfe0f9fbcb38b892c57fb36efaa16099a471287a7a9019 SHA512 ea2c3231cbb32dc91f36d1d09a5bdac65b468bff64f79aab46baa0e7e9460f75fa5239c96b5b2a616aebb499954b62d8ac7acea93fa971df1e7d81955ca0c5ea WHIRLPOOL 9617163e15b44bf373d5e9204dd8882c4921ed56a38ec41aabd7a81eda1aebedade70e7cfa0eeb21d46349e64fc9ed565cb1eb12dd49c98b8d5dfacdb49fd229
+DIST mercury-extras-13.05-gentoo-patchset-0.tar.gz 6333 SHA256 36d286a20f70e21262ac8d19004400df0a356ef7a85763027ef36f16d7de17cc SHA512 78c1391607e1a8a76c091deef112e9c4e0004fb63b9fe461c3100f2dd6ca03efe069036b081b4de8b4399052a1b10f0ef02188cc2def3d47f6aceb1b61c168c3 WHIRLPOOL 72b16b5948b2fb8048496f094e0c2343af0723f33ebbd024a7e8c0785fc949b2226f3ef78fba16a65903b1675f1280f6a3d35dab1d276203b845f140ccd3e4a7
+DIST mercury-srcdist-13.05.tar.gz 54533409 SHA256 71f1f97484eaecf2c2f91f6731e23afc5cee966e149b61a7525b2bd9a2712d55 SHA512 d76fd3a0c487b2c65168b19ec6a5ea6b792c96692e029afe0589f93132422fc39e0aec856ae02e676cc30dc83780f9c4d4e0ea5f71681442279b900146b58c47 WHIRLPOOL b2cc0f1b074d980701c6d364f30f8bb2dd2556cbc23dca5a982b7c16b71c6834d7c81ea76bfcea25e369f32d606698b77eea168e3b25d4850f924dfa4f6929f4
 EBUILD mercury-extras-11.01.ebuild 4746 SHA256 269cec438029e39a7c62cf0825e621aeea38362b83e2a6a830e0cba74c3ab5d1 SHA512 f44e327f692f195e1aeb05b03f6e9133537c357c0ecf4d2ea20a19a5a900e25939b15ab7f2204516b81021169f09699ad62864d3b17a9407a299aa561dad3f2a WHIRLPOOL 4b6378da9350e7745363b98bb43850e46fed8c3e799202ae3caab568070e45671fe3b70107e40897274d3c2254b17bfc0299105c85ed4d1c009848b9f131eac7
 EBUILD mercury-extras-11.07.1.ebuild 4821 SHA256 5ad84f7b493eb4020ded9bcce92a65855983b4fb1022b05c37b61ea4a71c831a SHA512 e6adffcaa0ec6ae3adcb24ee45bd18cbce0a13a57c8a3f4db1716e6fa1bcc4b02f01a4d1d3956a973c612d0037b885835069f47e234cf53b840f57b78195a149 WHIRLPOOL b2d96e05d4a6f71aa20a4ed6a93ac323c5d0127132acd273233fba8d0f3a4a43ae3e77b8f628876957ba1af499c8a813d377197555c819fba94b36466ed816de
 EBUILD mercury-extras-11.07.2.ebuild 4800 SHA256 7b8f34999614a5ba7be6c18b65901e818ad1b9718fbaedf4ce8f817d60710f1d SHA512 61c991d6f20e6de409643a6f04eabd9195b45fdee27e311f66a6ec90384d612cab241fac2ef1e70b9f6f6b9dd2b0b3d53a57540fde5f2cbdb9fc30780afaaf18 WHIRLPOOL 7534f04889476369e3628b0737d9a9118c1a6f5c2e5eeb330bede348aaa499ff6b344ade1cfaee471b791a84dd1e18242ae5582a01905b86aa874c207d784e33
 EBUILD mercury-extras-11.07.ebuild 4819 SHA256 b90bb9dcfc6207cfbafce32514e4d17f83cc8fed410a11be8f0b3ac82089c34c SHA512 48a46067f08776000d6cf39c3fb27bb45467a86c84974b958926745d53f06a973e5f1b6a3d9c8e9fc9f58aa553ffdb350e39ac6498b5770140bdbcb6d035553e WHIRLPOOL c9748cc183907f35ee8c24275c488e2e8d5cadf7c43a694c81119d53b9091d783de0e2156a842e1cb0c54bea7a8854a413bf46198e29fcac4ce38cbb80baa64d
-MISC ChangeLog 28592 SHA256 7e138565d3d113aa6deb192929fbdf5be4a08ba41876af3e987239d2fa42265c SHA512 2bea3dffadaa640be1e3c6ca58ef9d3bf999fa8566b2045ce8fb37e6e4636b8a735e4969865b13f45e6d0ee6843de502632149668e4a7344f6e20da4fd7f60ee WHIRLPOOL 1385cf1b3bc7daf489324f1fb7ff545235931ae310394b7cda50763cbb8f7992251c4d3a074c70b40ec2bf600d2dc1b30a140275fdadbe535e646598d83e874e
+EBUILD mercury-extras-13.05.ebuild 4799 SHA256 e28749972435700fc2dc64b8ee7e0579f8f049941335080a7c207a7d4ff47996 SHA512 dbb7c691e28b879ccc9540882382f0b82e7787471313155cc1079e59f8cb1bc44bc9c1bca412e52bb2c5b76b7bb8d334b34ab40fdc92f117a7ab9b5195c95146 WHIRLPOOL 5cec23d2c73ff52f3aec7e6513eb66aea0d091fef5a4436fc04cf6ca5bc7183ed6353bbe71f2ace58d514d7fd0e740acdec10733e1e4e282d6cc7586af3e40b2
+MISC ChangeLog 28708 SHA256 318787f45fbb051b1f79030e0e8372e0ee5c408b7fb8f8388f03997e2cc810fa SHA512 220327d9d378036bf57418c2ef2d82f364bbe40e422e6c77a9a327e70905daf8bfe545c9d188295a64c40a38c2bcb2c7f56aa6334d8c6964788e1608145d1ce9 WHIRLPOOL 62fa2f36f1889be1b977832d04189e69974134dbe4ba7dd2d440538c909107586fe17c5077098316f961c2111753388d9d6aa71bcecdfce0daf22fbc3193cc41
 MISC metadata.xml 226 SHA256 0d359bc56d5b0e47547d7033243f050a6d77a558ad92f2386ea9e847daf964f1 SHA512 8b376d61a45854d0a2e5642d1dd7dc572a7b25d31dd918574ba674ccf3c58e13982a674277b5ea84c42131bcddb30d5189fd46472fb79246d698ffad13cae134 WHIRLPOOL b34f0dc45ade06d3683142ae218be827894805c82548773061d82e2d2d98527db436d6f3efeeacea9257266f0c55dbc9a70719ea8d47b2f6f6705e1bac2cd949
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlGsSO8ACgkQrwS/tqE49e1E7wCfQo+Lf1qulxDVaEbj3iU5ENQT
+hBEAni+l84jqJfNSlINvoWIV745Tq/8J
+=wwIp
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/mercury-extras/mercury-extras-13.05.ebuild b/dev-lang/mercury-extras/mercury-extras-13.05.ebuild
new file mode 100644
index 000000000000..5328023cf959
--- /dev/null
+++ b/dev-lang/mercury-extras/mercury-extras-13.05.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-13.05.ebuild,v 1.1 2013/06/03 07:45:21 keri Exp $
+
+EAPI=2
+
+inherit eutils multilib
+
+PATCHSET_VER="0"
+MY_P=mercury-srcdist-${PV}
+
+DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
+HOMEPAGE="http://www.mercurylang.org/index.html"
+SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="X cairo examples glut iodbc ncurses odbc opengl ssl tcl tk xml"
+
+RDEPEND="~dev-lang/mercury-${PV}
+	cairo? ( >=x11-libs/cairo-1.10.0 )
+	glut? ( media-libs/freeglut )
+	odbc? ( dev-db/unixODBC )
+	iodbc? ( !odbc? ( dev-db/libiodbc ) )
+	ncurses? ( sys-libs/ncurses )
+	opengl? ( virtual/opengl )
+	tcl? ( tk? (
+			dev-lang/tcl
+			dev-lang/tk
+			x11-libs/libX11
+			x11-libs/libXmu ) )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}/extras
+
+src_prepare() {
+	cd "${WORKDIR}"
+
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}
+
+	if use odbc; then
+		epatch "${WORKDIR}"/${PV}-odbc/${P}-odbc.patch
+	elif use iodbc; then
+		epatch "${WORKDIR}"/${PV}-odbc/${P}-iodbc.patch
+	fi
+
+	cd "${S}"
+	sed -i	-e "s:references:references solver_types/library:" \
+		-e "s:windows_installer_generator::" \
+		Mmakefile || die "sed default packages failed"
+
+	if use cairo; then
+		sed -i -e "s:lex[ \t]*\\\\:graphics/mercury_cairo lex \\\\:" Mmakefile \
+			|| die "sed cairo failed"
+	fi
+
+	if use glut; then
+		sed -i -e "s:lex[ \t]*\\\\:graphics/mercury_glut lex \\\\:" Mmakefile \
+			|| die "sed glut failed"
+	fi
+
+	if use opengl; then
+		sed -i -e "s:lex[ \t]*\\\\:graphics/mercury_opengl lex \\\\:" Mmakefile \
+			|| die "sed opengl failed"
+	fi
+
+	if use tcl && use tk; then
+		sed -i -e "s:lex[ \t]*\\\\:graphics/mercury_tcltk lex \\\\:" Mmakefile \
+			|| die "sed tcltk failed"
+	fi
+
+	if use odbc || use iodbc; then
+		sed -i -e "s:moose:moose odbc:" Mmakefile \
+			|| die "sed odbc failed"
+	fi
+
+	if use ncurses; then
+		sed -i -e "s:complex_numbers:complex_numbers curs curses:" Mmakefile \
+			|| die "sed ncurses failed"
+	fi
+
+	if ! use xml; then
+		sed -i -e "s:xml::" Mmakefile \
+			|| die "sed xml failed"
+	fi
+
+	sed -i -e "s:@libdir@:$(get_libdir):" \
+		dynamic_linking/Mmakefile \
+		|| die "sed libdir failed"
+
+	# disable broken packages
+	sed -i -e "s:references::" Mmakefile \
+		|| die "sed broken packages failed"
+}
+
+src_compile() {
+	# Mercury dependency generation must be run single-threaded
+	mmake \
+		-j1 depend || die "mmake depend failed"
+
+	mmake \
+		MMAKEFLAGS="${MAKEOPTS}" \
+		EXTRA_MLFLAGS=--no-strip \
+		EXTRA_LDFLAGS="${LDFLAGS}" \
+		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
+		|| die "mmake failed"
+}
+
+src_install() {
+	mmake \
+		MMAKEFLAGS="${MAKEOPTS}" \
+		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
+		INSTALL_PREFIX="${D}"/usr \
+		install || die "mmake install failed"
+
+	find "${D}"/usr/$(get_libdir)/mercury -type l | xargs rm
+
+	cd "${S}"
+	if use examples; then
+		insinto /usr/share/doc/${PF}/samples/base64
+		doins base64/*.m || die
+
+		insinto /usr/share/doc/${PF}/samples/complex_numbers
+		doins complex_numbers/samples/* || die
+
+		insinto /usr/share/doc/${PF}/samples/dynamic_linking
+		doins dynamic_linking/hello.m || die
+
+		insinto /usr/share/doc/${PF}/samples/error
+		doins error/* || die
+
+		insinto /usr/share/doc/${PF}/samples/fixed
+		doins fixed/*.m || die
+
+		insinto /usr/share/doc/${PF}/samples/gator
+		doins -r gator/* || die
+
+		insinto /usr/share/doc/${PF}/samples/lex
+		doins lex/samples/* || die
+
+		insinto /usr/share/doc/${PF}/samples/log4m
+		doins log4m/*.m || die
+
+		insinto /usr/share/doc/${PF}/samples/monte
+		doins monte/*.m || die
+
+		insinto /usr/share/doc/${PF}/samples/moose
+		doins moose/samples/* || die
+
+		insinto /usr/share/doc/${PF}/samples/net
+		doins net/*.m || die
+
+		if use ncurses; then
+			insinto /usr/share/doc/${PF}/samples/curs
+			doins curs/samples/* || die
+
+			insinto /usr/share/doc/${PF}/samples/curses
+			doins curses/sample/* || die
+		fi
+
+		if use X; then
+			insinto /usr/share/doc/${PF}/samples/graphics
+			doins graphics/easyx/samples/*.m || die
+		fi
+
+		if use glut && use opengl; then
+			insinto /usr/share/doc/${PF}/samples/graphics
+			doins graphics/samples/calc/* || die
+			doins graphics/samples/gears/* || die
+			doins graphics/samples/maze/* || die
+			doins graphics/samples/pent/* || die
+		fi
+
+		if use opengl && use tcl && use tk; then
+			insinto /usr/share/doc/${PF}/samples/graphics
+			doins graphics/samples/pent/*.m || die
+		fi
+
+		if use ssl; then
+			insinto /usr/share/doc/${PF}/samples/mopenssl
+			doins mopenssl/*.m || die
+		fi
+
+		rm -rf $(find "${D}"/usr/share/doc/${PF}/samples -name CVS)
+	fi
+
+	dodoc README || die
+}