Version bump

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

3 files changed, 207 insertions, 5 deletions

diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog
index b8f8ad10bd45..b877d61eb7b0 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.100 2012/01/09 08:30:13 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.101 2012/03/09 21:14:59 keri Exp $
+
+*mercury-extras-11.07.1 (09 Mar 2012)
+
+  09 Mar 2012; <keri@gentoo.org> +mercury-extras-11.07.1.ebuild:
+  Version bump
 
 *mercury-extras-11.07 (09 Jan 2012)
 
diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index d26553d9a4f0..46ddd6683124 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -5,17 +5,20 @@ DIST mercury-extras-11.01-gentoo-patchset-2.tar.gz 5005 RMD160 4621a6c46793b4144
 DIST mercury-extras-11.01.tar.gz 777185 RMD160 992446a01d81d26d06ff60ed7f98d47e897c59fc SHA1 b82bdeded6ebcd843202ad2b4649edb3e2a402c3 SHA256 52eb6758e2136eb288329917d4c352da98e9ce0e951d6a5c884919bf8e85b1b1
 DIST mercury-extras-11.07-beta-2011-06-28-unstable.tar.gz 777409 RMD160 f889ec5b921415d50aa573dca30a86db489d8467 SHA1 5fe0b52ef45df8c00ab09b0f292ed1fd16a5a51f SHA256 e93e2c8116927d30ac70158a95dd0a2833f20fcf6dea7cca57119ef39daef613
 DIST mercury-extras-11.07-gentoo-patchset-0.tar.gz 4886 RMD160 ebddab77c2a89cf8d2dcdcc667c9c2c546720ee4 SHA1 7230e5be75f89a4957d3de976df547e365398217 SHA256 25452b2489ac260084735d738972c5d286c63e54ecd1a14cc26890f902714966
+DIST mercury-extras-11.07.1-gentoo-patchset-0.tar.gz 5114 RMD160 38784df25223ceb94b4134889f1d7cc6723113fc SHA1 4c5b945e5855334e77546e16940faa8945efcc51 SHA256 8236342a8e9fc36794401ccbe30c58d351fa6f3663cb5febbcb45742b978b49a
+DIST mercury-extras-11.07.1.tar.gz 776828 RMD160 5d862c036c21963af906024e7ca44e6cb6f71a05 SHA1 bf44ec96e76b5f7dae590b7fd41f915b10afa904 SHA256 cda5891e6143f34ec0639f296c0080e252bc18e59c663143750945a033eaa54c
 DIST mercury-extras-11.07.tar.gz 776589 RMD160 e6b53c3b9021530f55ae3000a610afe3700bafc6 SHA1 17490d93be8ec5c013736ed246e14e260bb15636 SHA256 25eaf999666ceb4217cfe0f9fbcb38b892c57fb36efaa16099a471287a7a9019
 DIST mercury-extras-11.07_beta1-gentoo-patchset-0.tar.gz 5011 RMD160 5a9588d154d0a4ffa03b2eb8434842d6691cdf5c SHA1 c6033c23a29f1afc415711f55ead7ec65bbc5547 SHA256 c90f601e2ab05c9bf3d3a606cf106d3bcfe552773286c0860e84ab179df0f2a6
 EBUILD mercury-extras-11.01.ebuild 4740 RMD160 db03a85e22168dd89235d2a3eb33676a3dac8448 SHA1 6304ef451f2c31155c3c52a5d4eb9f27709a5def SHA256 47365648d8d8a1c8104337e48618b87318cf9054ab6e112d5d59142590d06bc0
+EBUILD mercury-extras-11.07.1.ebuild 4809 RMD160 e4ab5e169c1f2ea1297201632efd9e8815aaa5b9 SHA1 6bc6dafed8d23cf4385485985459445126370f7f SHA256 f9cb680a22d932241e7fed982bfb5fa0f596bcb57286b0f002c0f6a3fd6dc3fa
 EBUILD mercury-extras-11.07.ebuild 4807 RMD160 459033bbb005b5fdf567aaaa626080d2b491144d SHA1 ab999193e082387b9fcd669b9f6db8badde26040 SHA256 e40112a2185c9c33c89d28e0df798fc8f5cf06fe76c7574e018f6a7cb1c7625b
 EBUILD mercury-extras-11.07_beta1.ebuild 4839 RMD160 56c73f9c8448bd0f764d9bb5a82d80205c2ddb40 SHA1 09368e0be06b16cfd4e4ecfafe4663a1d042ba67 SHA256 57c898896c92c4e009b544021395761c7dafb883ca2cba76ea84227dab3b8191
-MISC ChangeLog 27759 RMD160 a6ddddc9e9af553d1740f4506ce181bd1ffbae93 SHA1 8331f7997af5b38a5b55155ad4e74db620fc9750 SHA256 10e0a1311810600811c494bc6083178350bce8a9c049c0c12ca6a3d1acf509a9
+MISC ChangeLog 27879 RMD160 d5bfccfdbec845fbfc99e301121b2507c38b1f93 SHA1 bb99f9cae61a3b676db2b6ea4948b9c318e9d84f SHA256 f5092f23eabf1923d36e5d16e6de441c2a00b02243ad3f62644483b6e01211c8
 MISC metadata.xml 226 RMD160 032dc54160cc5cacf9e3024d3a43f1167dac1ed9 SHA1 982009afe57c899a3f756ae2be18c201a6c5f8a1 SHA256 0d359bc56d5b0e47547d7033243f050a6d77a558ad92f2386ea9e847daf964f1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk8KpZsACgkQrwS/tqE49e2R5gCfc9s6ObXBQwYDIZo5lJaEJP4A
-VCgAoIYzimZ/mhRsQ8AChzaVu9lbKUjq
-=vOmJ
+iEYEARECAAYFAk9act8ACgkQrwS/tqE49e3+IwCfVlNhPyqKtlK/TlDdn0N+rK1r
+TGUAn2in/A5ZUVuFQkwb3rchGMEEuD7v
+=hBfD
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/mercury-extras/mercury-extras-11.07.1.ebuild b/dev-lang/mercury-extras/mercury-extras-11.07.1.ebuild
new file mode 100644
index 000000000000..89bc8caef2b2
--- /dev/null
+++ b/dev-lang/mercury-extras/mercury-extras-11.07.1.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-11.07.1.ebuild,v 1.1 2012/03/09 21:14:59 keri Exp $
+
+EAPI=2
+
+inherit eutils
+
+PATCHSET_VER="0"
+MY_P=${PN}-${PV}
+
+DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
+HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
+SRC_URI="http://www.mercury.cs.mu.oz.au/download/files/${MY_P}.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="GPL-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}
+
+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 posix/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
+}