[gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2017-01-23 13:51 Agostino Sarubbo
  0 siblings, 0 replies; 40+ messages in thread
From: Agostino Sarubbo @ 2017-01-23 13:51 UTC (permalink / raw
  To: gentoo-commits

commit:     7f6bd0293dfe021a594163bbbf42b22c3b74dcf9
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 13:48:50 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Jan 23 13:50:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f6bd029

dev-lang/mercury-extras: amd64 stable wrt bug #605126

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild b/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild
index effc719..70dfd4c 100644
--- a/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,7 @@ SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE="X cairo examples glut iodbc ncurses odbc opengl ssl tcl tk xml"
 


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2017-01-23 15:46 Agostino Sarubbo
  0 siblings, 0 replies; 40+ messages in thread
From: Agostino Sarubbo @ 2017-01-23 15:46 UTC (permalink / raw
  To: gentoo-commits

commit:     aa92a8a24615fe1e04441e76cfbfc99e58fc741f
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 15:44:17 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Jan 23 15:44:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa92a8a2

dev-lang/mercury-extras: x86 stable wrt bug #605126

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild b/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild
index 70dfd4c..3781822 100644
--- a/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="X cairo examples glut iodbc ncurses odbc opengl ssl tcl tk xml"
 


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2017-09-25 10:43 Keri Harris
  0 siblings, 0 replies; 40+ messages in thread
From: Keri Harris @ 2017-09-25 10:43 UTC (permalink / raw
  To: gentoo-commits

commit:     23e59915d89aba9d32b03ae6452c907b942d5bf8
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 25 10:43:19 2017 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Mon Sep 25 10:43:31 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23e59915

dev-lang/mercury-extras: remove old versions

Package-Manager: Portage-2.3.8, Repoman-2.3.1

 dev-lang/mercury-extras/Manifest                   |  12 --
 .../mercury-extras/mercury-extras-11.01.ebuild     | 192 --------------------
 .../mercury-extras/mercury-extras-11.07.1.ebuild   | 193 ---------------------
 .../mercury-extras/mercury-extras-11.07.2.ebuild   | 193 ---------------------
 .../mercury-extras/mercury-extras-11.07.ebuild     | 193 ---------------------
 .../mercury-extras/mercury-extras-13.05.1.ebuild   | 193 ---------------------
 .../mercury-extras/mercury-extras-13.05.ebuild     | 193 ---------------------
 7 files changed, 1169 deletions(-)

diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index ca06916e9ef..db3f6b5f51e 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,14 +1,2 @@
-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
-DIST mercury-extras-11.07.1-gentoo-patchset-0.tar.gz 5114 SHA256 8236342a8e9fc36794401ccbe30c58d351fa6f3663cb5febbcb45742b978b49a SHA512 b9d0774466e68b9aa4b3e8a22347f8d41b8ea4cc0b328fcb794b158563dac448f46e5dc1638dae3d1345a71534debcf7bfcfe4a1597b235851bf77b58e7ed23c WHIRLPOOL de588622eefec04cce6d610defcba37bb95a2e0f7e0527d68c412c1d55529686fab3e801f2f81805ddb621d3ec2c1cbd9db16c5a736682a7ae142287f3054f00
-DIST mercury-extras-11.07.1.tar.gz 776828 SHA256 cda5891e6143f34ec0639f296c0080e252bc18e59c663143750945a033eaa54c SHA512 cfa7690f4399bff98c0b56705f6b85af7409a7770e3af8b3f7dbf622300b756b0878b9b1bf46bf3953d6318c6e9f8ba6c57b125d180619c1e98e92d225a7351f WHIRLPOOL 9eb64278188ab9cd0bf37ef32be639cb3c71b2aa24c4929dcd6f9b1f2045de4ee79045b8344716cc89ac1c2d174b852ee411a538c49f77e846ee0b0b970fe751
-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-extras-13.05.1-gentoo-patchset-0.tar.gz 3423 SHA256 b15b87c86313e9a038f6ab55c9b47bc9f8eaca51aedf578a9d9e6ab1dc785d9b SHA512 51ade5a5c99fdd0417afb8c0f78c6a5c77d2161091894b62d570ad8d614f2f614e07bb07cbdf5212fd2ca8b6d67778717856a7939e506c56b1597ec05d18c6c4 WHIRLPOOL 7ed609dcde3ac5a89ddebc99365f4e13f50eddb8d6685e40fdf227842b5edfbcaf0bf6a8621696d1484970666fb303e828c5a0d4877e98fb6df6cca147b73a70
 DIST mercury-extras-13.05.2-gentoo-patchset-0.tar.gz 3434 SHA256 4c9d7bd5cd098a9e21981053d854307e8b27efcfd4ea86e4bc44532a1707a2c6 SHA512 7212bce048ac6cda4678bcf5f5046efab101c040324078ab01d5dea1436a495d19574c4d07810447795aec49d79b69a557f60a558e9b6837fe55ccaff80d3077 WHIRLPOOL 239461342b164209fd876f5925b7b03ff9082210cc1242c7fa897bad9029caa6dd6f457feb51e963bd2ce2839cba33146ee7c4daa45c204e6ef2a4f59fe3f7c2
-DIST mercury-srcdist-13.05.1.tar.gz 54558577 SHA256 a90de00fc5905a8421675b04dc3c9d5eda54bedaf8b2ebcefae4de551fbcfd2c SHA512 784069af3ba470e9618e5b7917873e8ad7f4e9dc27eb54afa74eb6d6e659dcfab7007ae93163937412f9eb1b997a327d4378dcd868810c08880d4fa4542dfade WHIRLPOOL ec7281a6e01523b296dcfce595189cb96ad693c9b36ab60cbc6b61672333f5c8d7d9def10cc3c5bba876fddf0eefea3e9c22c1b98ee577d1b6d6aab6d1267915
 DIST mercury-srcdist-13.05.2.tar.gz 53847394 SHA256 8491cf419b996a315bf8664154dd91aed940274ded98e3aded733dbe1939f95f SHA512 2298804d3a04bca6be4bd3046643c7c0d0b22c447423017869cd9bf3a4fb6ec9fd29b5d8e1a386d5d52d07be5cad73608f1fcacf46732a7add93a01dcd199c08 WHIRLPOOL 2a81bebfd4b97b9bb1b0e174025e6050149c8e5f812cd97cbdc41818faa18c15f9494925f1f320682087cc45264bc00db07bef6862afef12317f77cc169a7f86
-DIST mercury-srcdist-13.05.tar.gz 54533409 SHA256 71f1f97484eaecf2c2f91f6731e23afc5cee966e149b61a7525b2bd9a2712d55 SHA512 d76fd3a0c487b2c65168b19ec6a5ea6b792c96692e029afe0589f93132422fc39e0aec856ae02e676cc30dc83780f9c4d4e0ea5f71681442279b900146b58c47 WHIRLPOOL b2cc0f1b074d980701c6d364f30f8bb2dd2556cbc23dca5a982b7c16b71c6834d7c81ea76bfcea25e369f32d606698b77eea168e3b25d4850f924dfa4f6929f4

diff --git a/dev-lang/mercury-extras/mercury-extras-11.01.ebuild b/dev-lang/mercury-extras/mercury-extras-11.01.ebuild
deleted file mode 100644
index 423539f0435..00000000000
--- a/dev-lang/mercury-extras/mercury-extras-11.01.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils multilib
-
-PATCHSET_VER="2"
-
-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/${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:0
-			dev-lang/tk:0
-			x11-libs/libX11
-			x11-libs/libXmu ) )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${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 : graphics/mercury_cairo lex :" Mmakefile \
-			|| die "sed cairo failed"
-	fi
-
-	if use glut; then
-		sed -i -e "s: lex : graphics/mercury_glut lex :" Mmakefile \
-			|| die "sed glut failed"
-	fi
-
-	if use opengl; then
-		sed -i -e "s: lex : graphics/mercury_opengl lex :" Mmakefile \
-			|| die "sed opengl failed"
-	fi
-
-	if use tcl && use tk; then
-		sed -i -e "s: lex : 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: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:lazy_evaluation::" -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
-
-		ecvs_clean
-	fi
-
-	dodoc README || die
-}

diff --git a/dev-lang/mercury-extras/mercury-extras-11.07.1.ebuild b/dev-lang/mercury-extras/mercury-extras-11.07.1.ebuild
deleted file mode 100644
index 4168583b7e7..00000000000
--- a/dev-lang/mercury-extras/mercury-extras-11.07.1.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils multilib
-
-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:0
-			dev-lang/tk:0
-			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
-
-		ecvs_clean
-	fi
-
-	dodoc README || die
-}

diff --git a/dev-lang/mercury-extras/mercury-extras-11.07.2.ebuild b/dev-lang/mercury-extras/mercury-extras-11.07.2.ebuild
deleted file mode 100644
index 51c0059f30a..00000000000
--- a/dev-lang/mercury-extras/mercury-extras-11.07.2.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils multilib
-
-PATCHSET_VER="3"
-MY_P=${PN}-${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:0
-			dev-lang/tk:0
-			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
-
-		ecvs_clean
-	fi
-
-	dodoc README || die
-}

diff --git a/dev-lang/mercury-extras/mercury-extras-11.07.ebuild b/dev-lang/mercury-extras/mercury-extras-11.07.ebuild
deleted file mode 100644
index 4168583b7e7..00000000000
--- a/dev-lang/mercury-extras/mercury-extras-11.07.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils multilib
-
-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:0
-			dev-lang/tk:0
-			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
-
-		ecvs_clean
-	fi
-
-	dodoc README || die
-}

diff --git a/dev-lang/mercury-extras/mercury-extras-13.05.1.ebuild b/dev-lang/mercury-extras/mercury-extras-13.05.1.ebuild
deleted file mode 100644
index 7b0d3304287..00000000000
--- a/dev-lang/mercury-extras/mercury-extras-13.05.1.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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:0
-			dev-lang/tk:0
-			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"
-
-	# Compiling Mercury submodules is not thread-safe
-	mmake -j1 \
-		EXTRA_MLFLAGS=--no-strip \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		|| die "mmake failed"
-}
-
-src_install() {
-	# Compiling Mercury submodules is not thread-safe
-	mmake -j1 \
-		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
-
-		ecvs_clean
-	fi
-
-	dodoc README || die
-}

diff --git a/dev-lang/mercury-extras/mercury-extras-13.05.ebuild b/dev-lang/mercury-extras/mercury-extras-13.05.ebuild
deleted file mode 100644
index 7b0d3304287..00000000000
--- a/dev-lang/mercury-extras/mercury-extras-13.05.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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:0
-			dev-lang/tk:0
-			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"
-
-	# Compiling Mercury submodules is not thread-safe
-	mmake -j1 \
-		EXTRA_MLFLAGS=--no-strip \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		|| die "mmake failed"
-}
-
-src_install() {
-	# Compiling Mercury submodules is not thread-safe
-	mmake -j1 \
-		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
-
-		ecvs_clean
-	fi
-
-	dodoc README || die
-}


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2017-09-26 17:30 Keri Harris
  0 siblings, 0 replies; 40+ messages in thread
From: Keri Harris @ 2017-09-26 17:30 UTC (permalink / raw
  To: gentoo-commits

commit:     dd3f322614ac0b842ec82287afb4e0ab3d98f403
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 26 17:30:04 2017 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 17:30:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd3f3226

dev-lang/mercury-extras: version bump

Package-Manager: Portage-2.3.8, Repoman-2.3.1

 dev-lang/mercury-extras/Manifest                   |   2 +
 .../mercury-extras/mercury-extras-14.01.ebuild     | 193 +++++++++++++++++++++
 2 files changed, 195 insertions(+)

diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index db3f6b5f51e..b4530c6965e 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,2 +1,4 @@
 DIST mercury-extras-13.05.2-gentoo-patchset-0.tar.gz 3434 SHA256 4c9d7bd5cd098a9e21981053d854307e8b27efcfd4ea86e4bc44532a1707a2c6 SHA512 7212bce048ac6cda4678bcf5f5046efab101c040324078ab01d5dea1436a495d19574c4d07810447795aec49d79b69a557f60a558e9b6837fe55ccaff80d3077 WHIRLPOOL 239461342b164209fd876f5925b7b03ff9082210cc1242c7fa897bad9029caa6dd6f457feb51e963bd2ce2839cba33146ee7c4daa45c204e6ef2a4f59fe3f7c2
+DIST mercury-extras-14.01-gentoo-patchset-0.tar.gz 2682 SHA256 87d7f4b7ffd8443628d3e3d519de396d6f13f6bfd54e76f1ee796adfb3c0bd19 SHA512 64d1efc45a0fea63c56f619063ff5d60f8db4d9b858eedc444c5dacf4b131bb0594fb1604d59840d4cdd7dc26b2c019a543d6ea49ece59abeb8cd3c248821cf6 WHIRLPOOL 2b199487e175c5d19e44c8875ef624b68644e6bd99e3ffc5e2c3963bc7e07c48870f29157fa15e0e05aa3c495dd92f6cd6e50bbad56fc2a74fdece1ac08cf63d
 DIST mercury-srcdist-13.05.2.tar.gz 53847394 SHA256 8491cf419b996a315bf8664154dd91aed940274ded98e3aded733dbe1939f95f SHA512 2298804d3a04bca6be4bd3046643c7c0d0b22c447423017869cd9bf3a4fb6ec9fd29b5d8e1a386d5d52d07be5cad73608f1fcacf46732a7add93a01dcd199c08 WHIRLPOOL 2a81bebfd4b97b9bb1b0e174025e6050149c8e5f812cd97cbdc41818faa18c15f9494925f1f320682087cc45264bc00db07bef6862afef12317f77cc169a7f86
+DIST mercury-srcdist-14.01.tar.gz 52683989 SHA256 4446b7b4eafd35540495ef90ce93b71cb88efa2d744628aee80f76a694aefcc1 SHA512 77f61df64fc150e08f191860f285b97d11a71a52eabc95f660b3c90d88f8ee71d1227f7ab4b8be78be9d4aa3d62a260a874020023e4795da4cfd2e6fefa9965f WHIRLPOOL a7123063590e39ae15222eb59a2c3681ae37bea211967c857eb8725090d342f0aba7a55446529f8608afb9895746581943527b1b3c313c5cbb96f638a3377404

diff --git a/dev-lang/mercury-extras/mercury-extras-14.01.ebuild b/dev-lang/mercury-extras/mercury-extras-14.01.ebuild
new file mode 100644
index 00000000000..3b4938613ef
--- /dev/null
+++ b/dev-lang/mercury-extras/mercury-extras-14.01.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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:0
+			dev-lang/tk:0
+			x11-libs/libX11
+			x11-libs/libXmu ) )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}/extras
+
+mercury_pkgs()
+{
+	echo   "base64
+		cgi
+		complex_numbers
+		dynamic_linking
+		error
+		fixed
+		lex
+		moose
+		posix
+		solver_types/library
+		$(use ncurses && echo curs curses)
+		$(use glut && echo graphics/mercury_glut)
+		$(use opengl && echo graphics/mercury_opengl)
+		$(use tcl && use tk && echo graphics/mercury_tcltk)
+		$(use odbc && echo odbc || use iodbc && echo odbc)
+		$(has_version dev-lang/mercury[-minimal] && echo references)
+		$(usev xml)"
+}
+
+src_prepare() {
+	cd "${WORKDIR}"
+
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		epatch "${WORKDIR}"/${PV}
+	fi
+
+	cd "${S}"
+	if use odbc; then
+		cp odbc/Mmakefile.odbc odbc/Mmakefile
+	elif use iodbc; then
+		cp odbc/Mmakefile.iodbc odbc/Mmakefile
+	fi
+}
+
+src_compile() {
+	local MERCURY_PKGS="$(mercury_pkgs)"
+
+	# Mercury dependency generation must be run single-threaded
+	mmake -j1 \
+		SUBDIRS="${MERCURY_PKGS}" \
+		depend || die "mmake depend failed"
+
+	# Compiling Mercury submodules is not thread-safe
+	mmake -j1 \
+		SUBDIRS="${MERCURY_PKGS}" \
+		EXTRA_MLFLAGS=--no-strip \
+		EXTRA_CFLAGS="${CFLAGS}" \
+		EXTRA_LDFLAGS="${LDFLAGS}" \
+		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
+		|| die "mmake failed"
+
+	if use cairo; then
+		cd "${S}"/graphics/mercury_cairo
+		mmc --make libmercury_cairo \
+			|| die "mmc --make libmercury_cairo failed"
+	fi
+}
+
+src_install() {
+	local MERCURY_PKGS="$(mercury_pkgs)"
+
+	# Compiling Mercury submodules is not thread-safe
+	mmake -j1 \
+		SUBDIRS="${MERCURY_PKGS}" \
+		EXTRA_MLFLAGS=--no-strip \
+		EXTRA_CFLAGS="${CFLAGS}" \
+		EXTRA_LDFLAGS="${LDFLAGS}" \
+		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
+		INSTALL_PREFIX="${D}"/usr \
+		install || die "mmake install failed"
+
+	if use cairo; then
+		cd "${S}"/graphics/mercury_cairo
+		INSTALL_PREFIX="${D}"/usr \
+		mmc --make libmercury_cairo.install \
+			|| die "mmc --make libmercury_cairo.install failed"
+	fi
+
+	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
+
+		ecvs_clean
+	fi
+
+	dodoc README || die
+}


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2017-09-26 19:09 Keri Harris
  0 siblings, 0 replies; 40+ messages in thread
From: Keri Harris @ 2017-09-26 19:09 UTC (permalink / raw
  To: gentoo-commits

commit:     20bdc13b0180bc98a149ac0f240bc82ebac71bce
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 26 19:08:33 2017 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 19:08:48 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20bdc13b

dev-lang/mercury-extras: support building mercury_tcltk library with Tcl/Tk 8.6

Package-Manager: Portage-2.3.8, Repoman-2.3.1

 dev-lang/mercury-extras/Manifest                      | 2 +-
 dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index b4530c6965e..f5278a9d12f 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,4 +1,4 @@
-DIST mercury-extras-13.05.2-gentoo-patchset-0.tar.gz 3434 SHA256 4c9d7bd5cd098a9e21981053d854307e8b27efcfd4ea86e4bc44532a1707a2c6 SHA512 7212bce048ac6cda4678bcf5f5046efab101c040324078ab01d5dea1436a495d19574c4d07810447795aec49d79b69a557f60a558e9b6837fe55ccaff80d3077 WHIRLPOOL 239461342b164209fd876f5925b7b03ff9082210cc1242c7fa897bad9029caa6dd6f457feb51e963bd2ce2839cba33146ee7c4daa45c204e6ef2a4f59fe3f7c2
+DIST mercury-extras-13.05.2-gentoo-patchset-1.tar.gz 3513 SHA256 0d57f37e67fa7092243eaaf1edad5024628ff7ce40545aa722baa514d3553ddf SHA512 bd2639de9195519803c2653c898928203bdad83b04cbd868bc74f98b605bc80791c50c16546c545d8bfcd605eebef7dff9ca79be4022eb601f54b29c748e2f9d WHIRLPOOL 703faf67f9be5877225d75d47b8752f94bb55276f9858120bc3c25eb90f3d07e369bebdd64a64a35524fca7621162687146fc1c5993af58956775562ec8ad331
 DIST mercury-extras-14.01-gentoo-patchset-0.tar.gz 2682 SHA256 87d7f4b7ffd8443628d3e3d519de396d6f13f6bfd54e76f1ee796adfb3c0bd19 SHA512 64d1efc45a0fea63c56f619063ff5d60f8db4d9b858eedc444c5dacf4b131bb0594fb1604d59840d4cdd7dc26b2c019a543d6ea49ece59abeb8cd3c248821cf6 WHIRLPOOL 2b199487e175c5d19e44c8875ef624b68644e6bd99e3ffc5e2c3963bc7e07c48870f29157fa15e0e05aa3c495dd92f6cd6e50bbad56fc2a74fdece1ac08cf63d
 DIST mercury-srcdist-13.05.2.tar.gz 53847394 SHA256 8491cf419b996a315bf8664154dd91aed940274ded98e3aded733dbe1939f95f SHA512 2298804d3a04bca6be4bd3046643c7c0d0b22c447423017869cd9bf3a4fb6ec9fd29b5d8e1a386d5d52d07be5cad73608f1fcacf46732a7add93a01dcd199c08 WHIRLPOOL 2a81bebfd4b97b9bb1b0e174025e6050149c8e5f812cd97cbdc41818faa18c15f9494925f1f320682087cc45264bc00db07bef6862afef12317f77cc169a7f86
 DIST mercury-srcdist-14.01.tar.gz 52683989 SHA256 4446b7b4eafd35540495ef90ce93b71cb88efa2d744628aee80f76a694aefcc1 SHA512 77f61df64fc150e08f191860f285b97d11a71a52eabc95f660b3c90d88f8ee71d1227f7ab4b8be78be9d4aa3d62a260a874020023e4795da4cfd2e6fefa9965f WHIRLPOOL a7123063590e39ae15222eb59a2c3681ae37bea211967c857eb8725090d342f0aba7a55446529f8608afb9895746581943527b1b3c313c5cbb96f638a3377404

diff --git a/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild b/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild
index 259f4e012e1..d2edef93931 100644
--- a/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild
@@ -5,7 +5,7 @@ EAPI=2
 
 inherit eutils multilib
 
-PATCHSET_VER="0"
+PATCHSET_VER="1"
 MY_P=mercury-srcdist-${PV}
 
 DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2017-09-26 19:59 Keri Harris
  0 siblings, 0 replies; 40+ messages in thread
From: Keri Harris @ 2017-09-26 19:59 UTC (permalink / raw
  To: gentoo-commits

commit:     a8011b6288263260e1f743af6b4dd2a75ed275c5
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 26 19:59:17 2017 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 19:59:33 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8011b62

dev-lang/mercury-extras: virtual/glu is a dependency of the Mercury OpenGL library

Package-Manager: Portage-2.3.8, Repoman-2.3.1

 dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild | 9 +++++++--
 dev-lang/mercury-extras/mercury-extras-14.01.ebuild   | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild b/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild
index d2edef93931..9f5036cdf1f 100644
--- a/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild
@@ -25,12 +25,17 @@ RDEPEND="~dev-lang/mercury-${PV}
 	odbc? ( dev-db/unixODBC )
 	iodbc? ( !odbc? ( dev-db/libiodbc ) )
 	ncurses? ( sys-libs/ncurses )
-	opengl? ( virtual/opengl )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+	)
 	tcl? ( tk? (
 			dev-lang/tcl:0
 			dev-lang/tk:0
 			x11-libs/libX11
-			x11-libs/libXmu ) )"
+			x11-libs/libXmu
+		)
+	)"
 
 DEPEND="${RDEPEND}"
 

diff --git a/dev-lang/mercury-extras/mercury-extras-14.01.ebuild b/dev-lang/mercury-extras/mercury-extras-14.01.ebuild
index 3b4938613ef..cb9bdaa0529 100644
--- a/dev-lang/mercury-extras/mercury-extras-14.01.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-14.01.ebuild
@@ -25,12 +25,17 @@ RDEPEND="~dev-lang/mercury-${PV}
 	odbc? ( dev-db/unixODBC )
 	iodbc? ( !odbc? ( dev-db/libiodbc ) )
 	ncurses? ( sys-libs/ncurses:= )
-	opengl? ( virtual/opengl )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+	)
 	tcl? ( tk? (
 			dev-lang/tcl:0
 			dev-lang/tk:0
 			x11-libs/libX11
-			x11-libs/libXmu ) )"
+			x11-libs/libXmu
+		)
+	)"
 
 DEPEND="${RDEPEND}"
 


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2017-09-27  7:36 Keri Harris
  0 siblings, 0 replies; 40+ messages in thread
From: Keri Harris @ 2017-09-27  7:36 UTC (permalink / raw
  To: gentoo-commits

commit:     0c8a9886f916e6a33c83741001c59f22be8c0b0b
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 27 07:36:08 2017 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Wed Sep 27 07:36:28 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c8a9886

dev-lang/mercury-extras: filter out java+erlang grades for Mercury packages that do not have java/erlang bindings

Package-Manager: Portage-2.3.8, Repoman-2.3.1

 dev-lang/mercury-extras/Manifest                    | 2 +-
 dev-lang/mercury-extras/mercury-extras-14.01.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index f5278a9d12f..27275008951 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,4 +1,4 @@
 DIST mercury-extras-13.05.2-gentoo-patchset-1.tar.gz 3513 SHA256 0d57f37e67fa7092243eaaf1edad5024628ff7ce40545aa722baa514d3553ddf SHA512 bd2639de9195519803c2653c898928203bdad83b04cbd868bc74f98b605bc80791c50c16546c545d8bfcd605eebef7dff9ca79be4022eb601f54b29c748e2f9d WHIRLPOOL 703faf67f9be5877225d75d47b8752f94bb55276f9858120bc3c25eb90f3d07e369bebdd64a64a35524fca7621162687146fc1c5993af58956775562ec8ad331
-DIST mercury-extras-14.01-gentoo-patchset-0.tar.gz 2682 SHA256 87d7f4b7ffd8443628d3e3d519de396d6f13f6bfd54e76f1ee796adfb3c0bd19 SHA512 64d1efc45a0fea63c56f619063ff5d60f8db4d9b858eedc444c5dacf4b131bb0594fb1604d59840d4cdd7dc26b2c019a543d6ea49ece59abeb8cd3c248821cf6 WHIRLPOOL 2b199487e175c5d19e44c8875ef624b68644e6bd99e3ffc5e2c3963bc7e07c48870f29157fa15e0e05aa3c495dd92f6cd6e50bbad56fc2a74fdece1ac08cf63d
+DIST mercury-extras-14.01-gentoo-patchset-1.tar.gz 3856 SHA256 2ea27bc699998834298dab3f9c1179681ac528b32f005493cd5027d0dbe52fbc SHA512 c584efd4c7af54d2e8d5af0a63acced118f356527a2bf692262e37366e1018247aac8c1bb8f700f08f8f0a2c95d979e215e3c949ec1dc2994ab40048eb5b253c WHIRLPOOL 4b5169eb5cdd70caa350e562c276a59bfe9eca5fc3d66d10a3e10b6b653d0a41dd18409c1d26a66a20d1cecf31282408fcbf2d3e5321f16a57f095dd4907165f
 DIST mercury-srcdist-13.05.2.tar.gz 53847394 SHA256 8491cf419b996a315bf8664154dd91aed940274ded98e3aded733dbe1939f95f SHA512 2298804d3a04bca6be4bd3046643c7c0d0b22c447423017869cd9bf3a4fb6ec9fd29b5d8e1a386d5d52d07be5cad73608f1fcacf46732a7add93a01dcd199c08 WHIRLPOOL 2a81bebfd4b97b9bb1b0e174025e6050149c8e5f812cd97cbdc41818faa18c15f9494925f1f320682087cc45264bc00db07bef6862afef12317f77cc169a7f86
 DIST mercury-srcdist-14.01.tar.gz 52683989 SHA256 4446b7b4eafd35540495ef90ce93b71cb88efa2d744628aee80f76a694aefcc1 SHA512 77f61df64fc150e08f191860f285b97d11a71a52eabc95f660b3c90d88f8ee71d1227f7ab4b8be78be9d4aa3d62a260a874020023e4795da4cfd2e6fefa9965f WHIRLPOOL a7123063590e39ae15222eb59a2c3681ae37bea211967c857eb8725090d342f0aba7a55446529f8608afb9895746581943527b1b3c313c5cbb96f638a3377404

diff --git a/dev-lang/mercury-extras/mercury-extras-14.01.ebuild b/dev-lang/mercury-extras/mercury-extras-14.01.ebuild
index cb9bdaa0529..e6be7669abd 100644
--- a/dev-lang/mercury-extras/mercury-extras-14.01.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-14.01.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit eutils multilib
 
-PATCHSET_VER="0"
+PATCHSET_VER="1"
 MY_P=mercury-srcdist-${PV}
 
 DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2017-09-27 18:57 Keri Harris
  0 siblings, 0 replies; 40+ messages in thread
From: Keri Harris @ 2017-09-27 18:57 UTC (permalink / raw
  To: gentoo-commits

commit:     bcd77a6b385245c78d50769b410680a96c28400c
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 27 18:56:41 2017 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Wed Sep 27 18:56:55 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcd77a6b

dev-lang/mercury-extras: filter out java+erlang grades for Mercury packages that do not have java/erlang bindings

Package-Manager: Portage-2.3.8, Repoman-2.3.1

 dev-lang/mercury-extras/Manifest                      | 2 +-
 dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index 27275008951..3b0092588c3 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,4 +1,4 @@
-DIST mercury-extras-13.05.2-gentoo-patchset-1.tar.gz 3513 SHA256 0d57f37e67fa7092243eaaf1edad5024628ff7ce40545aa722baa514d3553ddf SHA512 bd2639de9195519803c2653c898928203bdad83b04cbd868bc74f98b605bc80791c50c16546c545d8bfcd605eebef7dff9ca79be4022eb601f54b29c748e2f9d WHIRLPOOL 703faf67f9be5877225d75d47b8752f94bb55276f9858120bc3c25eb90f3d07e369bebdd64a64a35524fca7621162687146fc1c5993af58956775562ec8ad331
+DIST mercury-extras-13.05.2-gentoo-patchset-2.tar.gz 3513 SHA256 e9ae698655daa5b4e2e71dcad19281b5de6b6f9086f23c305f43c7330f7c387d SHA512 b47820a22ad67dd6fab3e14d58a9ce3a8284a32ce9970acec10f6296213a6bfe0821185f00dbc4492f7b063376049edf87e0e746d90beabd19b786eda8b7354c WHIRLPOOL ac8c6377a2656872f58346ff737580086f2933c0658babee440fbfef11a1a2e53f1e8fde053d9f1d1b74eed75a8d37e04c1b4ab13fa93265a3e6fa0ece482343
 DIST mercury-extras-14.01-gentoo-patchset-1.tar.gz 3856 SHA256 2ea27bc699998834298dab3f9c1179681ac528b32f005493cd5027d0dbe52fbc SHA512 c584efd4c7af54d2e8d5af0a63acced118f356527a2bf692262e37366e1018247aac8c1bb8f700f08f8f0a2c95d979e215e3c949ec1dc2994ab40048eb5b253c WHIRLPOOL 4b5169eb5cdd70caa350e562c276a59bfe9eca5fc3d66d10a3e10b6b653d0a41dd18409c1d26a66a20d1cecf31282408fcbf2d3e5321f16a57f095dd4907165f
 DIST mercury-srcdist-13.05.2.tar.gz 53847394 SHA256 8491cf419b996a315bf8664154dd91aed940274ded98e3aded733dbe1939f95f SHA512 2298804d3a04bca6be4bd3046643c7c0d0b22c447423017869cd9bf3a4fb6ec9fd29b5d8e1a386d5d52d07be5cad73608f1fcacf46732a7add93a01dcd199c08 WHIRLPOOL 2a81bebfd4b97b9bb1b0e174025e6050149c8e5f812cd97cbdc41818faa18c15f9494925f1f320682087cc45264bc00db07bef6862afef12317f77cc169a7f86
 DIST mercury-srcdist-14.01.tar.gz 52683989 SHA256 4446b7b4eafd35540495ef90ce93b71cb88efa2d744628aee80f76a694aefcc1 SHA512 77f61df64fc150e08f191860f285b97d11a71a52eabc95f660b3c90d88f8ee71d1227f7ab4b8be78be9d4aa3d62a260a874020023e4795da4cfd2e6fefa9965f WHIRLPOOL a7123063590e39ae15222eb59a2c3681ae37bea211967c857eb8725090d342f0aba7a55446529f8608afb9895746581943527b1b3c313c5cbb96f638a3377404

diff --git a/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild b/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild
index 9f5036cdf1f..74983d84649 100644
--- a/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild
@@ -5,7 +5,7 @@ EAPI=2
 
 inherit eutils multilib
 
-PATCHSET_VER="1"
+PATCHSET_VER="2"
 MY_P=mercury-srcdist-${PV}
 
 DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2017-09-28  6:47 Keri Harris
  0 siblings, 0 replies; 40+ messages in thread
From: Keri Harris @ 2017-09-28  6:47 UTC (permalink / raw
  To: gentoo-commits

commit:     05282df37935ef3b13c0371e679ba83f3a3d5cf1
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 28 06:47:00 2017 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Thu Sep 28 06:47:36 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05282df3

dev-lang/mercury-extras: filter out java+erlang grades for Mercury packages that do not have java/erlang bindings

Package-Manager: Portage-2.3.8, Repoman-2.3.1

 dev-lang/mercury-extras/Manifest                      | 2 +-
 dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index 3b0092588c3..3c743fffd58 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,4 +1,4 @@
-DIST mercury-extras-13.05.2-gentoo-patchset-2.tar.gz 3513 SHA256 e9ae698655daa5b4e2e71dcad19281b5de6b6f9086f23c305f43c7330f7c387d SHA512 b47820a22ad67dd6fab3e14d58a9ce3a8284a32ce9970acec10f6296213a6bfe0821185f00dbc4492f7b063376049edf87e0e746d90beabd19b786eda8b7354c WHIRLPOOL ac8c6377a2656872f58346ff737580086f2933c0658babee440fbfef11a1a2e53f1e8fde053d9f1d1b74eed75a8d37e04c1b4ab13fa93265a3e6fa0ece482343
+DIST mercury-extras-13.05.2-gentoo-patchset-3.tar.gz 3538 SHA256 96a041d185778befa98c98b232041738878666a33bd695dbc7d1e2ab9eccca41 SHA512 c151f876768c6b6ab7b46b4e2501569586249f5e185e534ebb5817206ac0844cd081ccae86a26ef85f27eab9d851017393c837728bd194520a549a0a60f738ef WHIRLPOOL 3b8eccd3252027a99a700240a45be2a1dc650055e65a4699ee3f93b8aca39da9057787e576c3e76a48a9134f25cff2c3e7a9ab88c1fc25a6eb2580d1f38ddb42
 DIST mercury-extras-14.01-gentoo-patchset-1.tar.gz 3856 SHA256 2ea27bc699998834298dab3f9c1179681ac528b32f005493cd5027d0dbe52fbc SHA512 c584efd4c7af54d2e8d5af0a63acced118f356527a2bf692262e37366e1018247aac8c1bb8f700f08f8f0a2c95d979e215e3c949ec1dc2994ab40048eb5b253c WHIRLPOOL 4b5169eb5cdd70caa350e562c276a59bfe9eca5fc3d66d10a3e10b6b653d0a41dd18409c1d26a66a20d1cecf31282408fcbf2d3e5321f16a57f095dd4907165f
 DIST mercury-srcdist-13.05.2.tar.gz 53847394 SHA256 8491cf419b996a315bf8664154dd91aed940274ded98e3aded733dbe1939f95f SHA512 2298804d3a04bca6be4bd3046643c7c0d0b22c447423017869cd9bf3a4fb6ec9fd29b5d8e1a386d5d52d07be5cad73608f1fcacf46732a7add93a01dcd199c08 WHIRLPOOL 2a81bebfd4b97b9bb1b0e174025e6050149c8e5f812cd97cbdc41818faa18c15f9494925f1f320682087cc45264bc00db07bef6862afef12317f77cc169a7f86
 DIST mercury-srcdist-14.01.tar.gz 52683989 SHA256 4446b7b4eafd35540495ef90ce93b71cb88efa2d744628aee80f76a694aefcc1 SHA512 77f61df64fc150e08f191860f285b97d11a71a52eabc95f660b3c90d88f8ee71d1227f7ab4b8be78be9d4aa3d62a260a874020023e4795da4cfd2e6fefa9965f WHIRLPOOL a7123063590e39ae15222eb59a2c3681ae37bea211967c857eb8725090d342f0aba7a55446529f8608afb9895746581943527b1b3c313c5cbb96f638a3377404

diff --git a/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild b/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild
index 74983d84649..a3abc55dadf 100644
--- a/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild
@@ -5,7 +5,7 @@ EAPI=2
 
 inherit eutils multilib
 
-PATCHSET_VER="2"
+PATCHSET_VER="3"
 MY_P=mercury-srcdist-${PV}
 
 DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2017-09-30 11:35 Keri Harris
  0 siblings, 0 replies; 40+ messages in thread
From: Keri Harris @ 2017-09-30 11:35 UTC (permalink / raw
  To: gentoo-commits

commit:     bbbedf53fb236143807961217443cf887b58d9ca
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 30 11:35:17 2017 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sat Sep 30 11:35:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbbedf53

dev-lang/mercury-extras: version bump

Package-Manager: Portage-2.3.8, Repoman-2.3.1

 dev-lang/mercury-extras/Manifest                   |   2 +
 .../mercury-extras/mercury-extras-14.01.1.ebuild   | 199 +++++++++++++++++++++
 2 files changed, 201 insertions(+)

diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index 3c743fffd58..326e6ec613e 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,4 +1,6 @@
 DIST mercury-extras-13.05.2-gentoo-patchset-3.tar.gz 3538 SHA256 96a041d185778befa98c98b232041738878666a33bd695dbc7d1e2ab9eccca41 SHA512 c151f876768c6b6ab7b46b4e2501569586249f5e185e534ebb5817206ac0844cd081ccae86a26ef85f27eab9d851017393c837728bd194520a549a0a60f738ef WHIRLPOOL 3b8eccd3252027a99a700240a45be2a1dc650055e65a4699ee3f93b8aca39da9057787e576c3e76a48a9134f25cff2c3e7a9ab88c1fc25a6eb2580d1f38ddb42
 DIST mercury-extras-14.01-gentoo-patchset-1.tar.gz 3856 SHA256 2ea27bc699998834298dab3f9c1179681ac528b32f005493cd5027d0dbe52fbc SHA512 c584efd4c7af54d2e8d5af0a63acced118f356527a2bf692262e37366e1018247aac8c1bb8f700f08f8f0a2c95d979e215e3c949ec1dc2994ab40048eb5b253c WHIRLPOOL 4b5169eb5cdd70caa350e562c276a59bfe9eca5fc3d66d10a3e10b6b653d0a41dd18409c1d26a66a20d1cecf31282408fcbf2d3e5321f16a57f095dd4907165f
+DIST mercury-extras-14.01.1-gentoo-patchset-0.tar.gz 3688 SHA256 4aa4d2f1e1b7637b8df0dfba1ac6e46bf0314c06645ed3197452c615e84d6b66 SHA512 02781ca23e72920c932067f7270d06e45909728133588c181b94f7b7580f841b4b0f1dd523e0c100350b191e5b28a7d1f10ad51fdffe2dcb02ff78cd5a906e3b WHIRLPOOL 834923a00ea98ae4d28cfd451e5d6e0638adac99c92a85d173210b87e357cc8419a3a80cf6f11242ce548b3c4b3658841da226600df73821b57c4192766e0cc3
 DIST mercury-srcdist-13.05.2.tar.gz 53847394 SHA256 8491cf419b996a315bf8664154dd91aed940274ded98e3aded733dbe1939f95f SHA512 2298804d3a04bca6be4bd3046643c7c0d0b22c447423017869cd9bf3a4fb6ec9fd29b5d8e1a386d5d52d07be5cad73608f1fcacf46732a7add93a01dcd199c08 WHIRLPOOL 2a81bebfd4b97b9bb1b0e174025e6050149c8e5f812cd97cbdc41818faa18c15f9494925f1f320682087cc45264bc00db07bef6862afef12317f77cc169a7f86
+DIST mercury-srcdist-14.01.1.tar.gz 52658945 SHA256 98f7cbde7a7425365400feef3e69f1d6a848b25dc56ba959050523d546c4e88b SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c WHIRLPOOL 7b859eb5c7c1194d63c0aeeeeac3686c57436100b5618ae31a901119a33443363acb80a908a15dfdfa8b61fd9ccb4e552cbb972a3cc735b7a768ee7c9b1b6091
 DIST mercury-srcdist-14.01.tar.gz 52683989 SHA256 4446b7b4eafd35540495ef90ce93b71cb88efa2d744628aee80f76a694aefcc1 SHA512 77f61df64fc150e08f191860f285b97d11a71a52eabc95f660b3c90d88f8ee71d1227f7ab4b8be78be9d4aa3d62a260a874020023e4795da4cfd2e6fefa9965f WHIRLPOOL a7123063590e39ae15222eb59a2c3681ae37bea211967c857eb8725090d342f0aba7a55446529f8608afb9895746581943527b1b3c313c5cbb96f638a3377404

diff --git a/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild b/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
new file mode 100644
index 00000000000..0fb9ffe07f2
--- /dev/null
+++ b/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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
+		virtual/glu
+	)
+	tcl? ( tk? (
+			dev-lang/tcl:0
+			dev-lang/tk:0
+			x11-libs/libX11
+			x11-libs/libXmu
+		)
+	)"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}/extras
+
+mercury_pkgs()
+{
+	echo   "base64
+		cgi
+		complex_numbers
+		dynamic_linking
+		error
+		fixed
+		lex
+		moose
+		posix
+		solver_types/library
+		$(use ncurses && echo curs curses)
+		$(use glut && echo graphics/mercury_glut)
+		$(use opengl && echo graphics/mercury_opengl)
+		$(use tcl && use tk && echo graphics/mercury_tcltk)
+		$(use odbc && echo odbc || use iodbc && echo odbc)
+		$(has_version dev-lang/mercury[trail] && echo references)
+		$(usev xml)"
+}
+
+src_prepare() {
+	cd "${WORKDIR}"
+
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		epatch "${WORKDIR}"/${PV}
+	fi
+
+	cd "${S}"
+	if use odbc; then
+		cp odbc/Mmakefile.odbc odbc/Mmakefile
+	elif use iodbc; then
+		cp odbc/Mmakefile.iodbc odbc/Mmakefile
+	fi
+}
+
+src_compile() {
+	local MERCURY_PKGS="$(mercury_pkgs)"
+
+	# Mercury dependency generation must be run single-threaded
+	mmake -j1 \
+		SUBDIRS="${MERCURY_PKGS}" \
+		depend || die "mmake depend failed"
+
+	# Compiling Mercury submodules is not thread-safe
+	mmake -j1 \
+		SUBDIRS="${MERCURY_PKGS}" \
+		EXTRA_MLFLAGS=--no-strip \
+		EXTRA_CFLAGS="${CFLAGS}" \
+		EXTRA_LDFLAGS="${LDFLAGS}" \
+		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
+		|| die "mmake failed"
+
+	if use cairo; then
+		cd "${S}"/graphics/mercury_cairo
+		mmc --make libmercury_cairo \
+			|| die "mmc --make libmercury_cairo failed"
+	fi
+}
+
+src_install() {
+	local MERCURY_PKGS="$(mercury_pkgs)"
+
+	# Compiling Mercury submodules is not thread-safe
+	mmake -j1 \
+		SUBDIRS="${MERCURY_PKGS}" \
+		EXTRA_MLFLAGS=--no-strip \
+		EXTRA_CFLAGS="${CFLAGS}" \
+		EXTRA_LDFLAGS="${LDFLAGS}" \
+		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
+		DESTDIR="${D}" \
+		INSTALL_PREFIX="${D}"/usr \
+		install || die "mmake install failed"
+
+	if use cairo; then
+		cd "${S}"/graphics/mercury_cairo
+		INSTALL_PREFIX="${D}"/usr \
+		mmc --make libmercury_cairo.install \
+			|| die "mmc --make libmercury_cairo.install failed"
+	fi
+
+	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
+
+		ecvs_clean
+	fi
+
+	dodoc README || die
+}


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2018-07-17 11:58 Keri Harris
  0 siblings, 0 replies; 40+ messages in thread
From: Keri Harris @ 2018-07-17 11:58 UTC (permalink / raw
  To: gentoo-commits

commit:     c6244f2def60b239411f42000f4251bde7b7c212
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 17 11:57:54 2018 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Tue Jul 17 11:58:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6244f2d

dev-lang/mercury-extras: fix precedence of mercury-pkgs

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild b/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
index d18808de18d..9d5d603fcfe 100644
--- a/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
@@ -57,7 +57,7 @@ mercury_pkgs()
 		$(use glut && echo graphics/mercury_glut)
 		$(use opengl && echo graphics/mercury_opengl)
 		$(use tcl && use tk && echo graphics/mercury_tcltk)
-		$(use odbc && echo odbc || use iodbc && echo odbc)
+		$(use odbc && echo odbc || (use iodbc && echo odbc) )
 		$(has_version dev-lang/mercury[trail] && echo references)
 		$(usev xml)"
 }


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2018-09-03 12:49 Keri Harris
  0 siblings, 0 replies; 40+ messages in thread
From: Keri Harris @ 2018-09-03 12:49 UTC (permalink / raw
  To: gentoo-commits

commit:     647be130a3ea64f1e4b088862cc26a03b9355291
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  3 12:49:12 2018 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Mon Sep  3 12:49:30 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=647be130

dev-lang/mercury-extras: filter out csharp grades

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-lang/mercury-extras/Manifest                      | 2 +-
 dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index ccc794915f5..1934cb34492 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,6 +1,6 @@
 DIST mercury-extras-13.05.2-gentoo-patchset-3.tar.gz 3538 BLAKE2B b323347ce98ecbc412cbd8683f8236b38b048e331c2b41d74874acdf17cc8b132211c15a2d29f8b98b7238e0e4e7cc1492b8e0a5ade4d348eb679fd322a22b2d SHA512 c151f876768c6b6ab7b46b4e2501569586249f5e185e534ebb5817206ac0844cd081ccae86a26ef85f27eab9d851017393c837728bd194520a549a0a60f738ef
 DIST mercury-extras-14.01-gentoo-patchset-1.tar.gz 3856 BLAKE2B 8a0792150a30ee552d1877e8736e25b0554ac68aaa7074e296886ea445c31a4b1593a438220da7bca45f49b2e49b0e4848f1e4ab852502bd3865632d378439c8 SHA512 c584efd4c7af54d2e8d5af0a63acced118f356527a2bf692262e37366e1018247aac8c1bb8f700f08f8f0a2c95d979e215e3c949ec1dc2994ab40048eb5b253c
-DIST mercury-extras-14.01.1-gentoo-patchset-0.tar.gz 3688 BLAKE2B aa78c8390e783a3d6ac9fe47508c4f86918a98c0d27204e7a19cb0bdc6572e34f76167f428f777af9a42b9cb744d93023abd00a6b097724f8438e6622541765d SHA512 02781ca23e72920c932067f7270d06e45909728133588c181b94f7b7580f841b4b0f1dd523e0c100350b191e5b28a7d1f10ad51fdffe2dcb02ff78cd5a906e3b
+DIST mercury-extras-14.01.1-gentoo-patchset-1.tar.gz 3847 BLAKE2B ce30b98c5cfe96ad67bd6fa5a8d03ebdfe6f4539e39a970ce48eb794b663d7164ae38a619beb4ce85d6cc3a1e3b5a5ee8fa59b6acd00dc6d23670fceac87734e SHA512 2afad01fb778d0e84e8d83a507b37080974840c81408827559df455d8082552131cdbfdae59c77f2f7bc3a643a087f1563c6c67d527f7b0bdef3412385bf4818
 DIST mercury-srcdist-13.05.2.tar.gz 53847394 BLAKE2B 23d2f8de6e9a4a2803fca9f3dec73215f6636389fdf388ef950042eff2ee43671577120f8324b309786d463e30ba9360d2df07ee498d78800182096f8773697e SHA512 2298804d3a04bca6be4bd3046643c7c0d0b22c447423017869cd9bf3a4fb6ec9fd29b5d8e1a386d5d52d07be5cad73608f1fcacf46732a7add93a01dcd199c08
 DIST mercury-srcdist-14.01.1.tar.gz 52658945 BLAKE2B 6497921a0227b9a6fbcbabdd309ef3325f32dda14fc4ddb443368385b89be4011d677a24b30b3702147d1b782fe2597760ad66dd34503aa6aebaf79707466529 SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c
 DIST mercury-srcdist-14.01.tar.gz 52683989 BLAKE2B 32fa014f08ad6a7a4ca62dd08a460620f0c60d311021f3643a81868acdd1eb58150caca81b18612f760125c339a25ed908862e17e38b65dd56bde8c8bd0bffb0 SHA512 77f61df64fc150e08f191860f285b97d11a71a52eabc95f660b3c90d88f8ee71d1227f7ab4b8be78be9d4aa3d62a260a874020023e4795da4cfd2e6fefa9965f

diff --git a/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild b/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
index 9d5d603fcfe..55f9783589c 100644
--- a/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit eutils multilib
 
-PATCHSET_VER="0"
+PATCHSET_VER="1"
 MY_P=mercury-srcdist-${PV}
 
 DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2018-09-09 22:49 Thomas Deutschmann
  0 siblings, 0 replies; 40+ messages in thread
From: Thomas Deutschmann @ 2018-09-09 22:49 UTC (permalink / raw
  To: gentoo-commits

commit:     a975ee9dbc0ff90e1a21aca80643edb59f408f0e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  9 22:46:41 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Sep  9 22:46:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a975ee9d

dev-lang/mercury-extras: x86 stable (bug #648224)

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild b/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
index 55f9783589c..e8d26a4cb81 100644
--- a/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="X cairo examples glut iodbc ncurses odbc opengl ssl tcl tk xml"
 


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2018-10-27  6:58 Keri Harris
  0 siblings, 0 replies; 40+ messages in thread
From: Keri Harris @ 2018-10-27  6:58 UTC (permalink / raw
  To: gentoo-commits

commit:     27b92e81350e1c5a7acb83ede255068d5f530123
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 27 06:57:12 2018 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sat Oct 27 06:57:12 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27b92e81

dev-lang/mercury-extras: remove old versions

Signed-off-by: Keri Harris <keri <AT> gentoo.org>
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-lang/mercury-extras/Manifest                   |   4 -
 .../mercury-extras/mercury-extras-13.05.2.ebuild   | 198 ---------------------
 .../mercury-extras/mercury-extras-14.01.ebuild     | 198 ---------------------
 3 files changed, 400 deletions(-)

diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index 1934cb34492..75e814e6c25 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,6 +1,2 @@
-DIST mercury-extras-13.05.2-gentoo-patchset-3.tar.gz 3538 BLAKE2B b323347ce98ecbc412cbd8683f8236b38b048e331c2b41d74874acdf17cc8b132211c15a2d29f8b98b7238e0e4e7cc1492b8e0a5ade4d348eb679fd322a22b2d SHA512 c151f876768c6b6ab7b46b4e2501569586249f5e185e534ebb5817206ac0844cd081ccae86a26ef85f27eab9d851017393c837728bd194520a549a0a60f738ef
-DIST mercury-extras-14.01-gentoo-patchset-1.tar.gz 3856 BLAKE2B 8a0792150a30ee552d1877e8736e25b0554ac68aaa7074e296886ea445c31a4b1593a438220da7bca45f49b2e49b0e4848f1e4ab852502bd3865632d378439c8 SHA512 c584efd4c7af54d2e8d5af0a63acced118f356527a2bf692262e37366e1018247aac8c1bb8f700f08f8f0a2c95d979e215e3c949ec1dc2994ab40048eb5b253c
 DIST mercury-extras-14.01.1-gentoo-patchset-1.tar.gz 3847 BLAKE2B ce30b98c5cfe96ad67bd6fa5a8d03ebdfe6f4539e39a970ce48eb794b663d7164ae38a619beb4ce85d6cc3a1e3b5a5ee8fa59b6acd00dc6d23670fceac87734e SHA512 2afad01fb778d0e84e8d83a507b37080974840c81408827559df455d8082552131cdbfdae59c77f2f7bc3a643a087f1563c6c67d527f7b0bdef3412385bf4818
-DIST mercury-srcdist-13.05.2.tar.gz 53847394 BLAKE2B 23d2f8de6e9a4a2803fca9f3dec73215f6636389fdf388ef950042eff2ee43671577120f8324b309786d463e30ba9360d2df07ee498d78800182096f8773697e SHA512 2298804d3a04bca6be4bd3046643c7c0d0b22c447423017869cd9bf3a4fb6ec9fd29b5d8e1a386d5d52d07be5cad73608f1fcacf46732a7add93a01dcd199c08
 DIST mercury-srcdist-14.01.1.tar.gz 52658945 BLAKE2B 6497921a0227b9a6fbcbabdd309ef3325f32dda14fc4ddb443368385b89be4011d677a24b30b3702147d1b782fe2597760ad66dd34503aa6aebaf79707466529 SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c
-DIST mercury-srcdist-14.01.tar.gz 52683989 BLAKE2B 32fa014f08ad6a7a4ca62dd08a460620f0c60d311021f3643a81868acdd1eb58150caca81b18612f760125c339a25ed908862e17e38b65dd56bde8c8bd0bffb0 SHA512 77f61df64fc150e08f191860f285b97d11a71a52eabc95f660b3c90d88f8ee71d1227f7ab4b8be78be9d4aa3d62a260a874020023e4795da4cfd2e6fefa9965f

diff --git a/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild b/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild
deleted file mode 100644
index a3abc55dadf..00000000000
--- a/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils multilib
-
-PATCHSET_VER="3"
-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
-		virtual/glu
-	)
-	tcl? ( tk? (
-			dev-lang/tcl:0
-			dev-lang/tk:0
-			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"
-
-	# Compiling Mercury submodules is not thread-safe
-	mmake -j1 \
-		EXTRA_MLFLAGS=--no-strip \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		|| die "mmake failed"
-}
-
-src_install() {
-	# Compiling Mercury submodules is not thread-safe
-	mmake -j1 \
-		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
-
-		ecvs_clean
-	fi
-
-	dodoc README || die
-}

diff --git a/dev-lang/mercury-extras/mercury-extras-14.01.ebuild b/dev-lang/mercury-extras/mercury-extras-14.01.ebuild
deleted file mode 100644
index e6be7669abd..00000000000
--- a/dev-lang/mercury-extras/mercury-extras-14.01.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib
-
-PATCHSET_VER="1"
-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
-		virtual/glu
-	)
-	tcl? ( tk? (
-			dev-lang/tcl:0
-			dev-lang/tk:0
-			x11-libs/libX11
-			x11-libs/libXmu
-		)
-	)"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}/extras
-
-mercury_pkgs()
-{
-	echo   "base64
-		cgi
-		complex_numbers
-		dynamic_linking
-		error
-		fixed
-		lex
-		moose
-		posix
-		solver_types/library
-		$(use ncurses && echo curs curses)
-		$(use glut && echo graphics/mercury_glut)
-		$(use opengl && echo graphics/mercury_opengl)
-		$(use tcl && use tk && echo graphics/mercury_tcltk)
-		$(use odbc && echo odbc || use iodbc && echo odbc)
-		$(has_version dev-lang/mercury[-minimal] && echo references)
-		$(usev xml)"
-}
-
-src_prepare() {
-	cd "${WORKDIR}"
-
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		epatch "${WORKDIR}"/${PV}
-	fi
-
-	cd "${S}"
-	if use odbc; then
-		cp odbc/Mmakefile.odbc odbc/Mmakefile
-	elif use iodbc; then
-		cp odbc/Mmakefile.iodbc odbc/Mmakefile
-	fi
-}
-
-src_compile() {
-	local MERCURY_PKGS="$(mercury_pkgs)"
-
-	# Mercury dependency generation must be run single-threaded
-	mmake -j1 \
-		SUBDIRS="${MERCURY_PKGS}" \
-		depend || die "mmake depend failed"
-
-	# Compiling Mercury submodules is not thread-safe
-	mmake -j1 \
-		SUBDIRS="${MERCURY_PKGS}" \
-		EXTRA_MLFLAGS=--no-strip \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		|| die "mmake failed"
-
-	if use cairo; then
-		cd "${S}"/graphics/mercury_cairo
-		mmc --make libmercury_cairo \
-			|| die "mmc --make libmercury_cairo failed"
-	fi
-}
-
-src_install() {
-	local MERCURY_PKGS="$(mercury_pkgs)"
-
-	# Compiling Mercury submodules is not thread-safe
-	mmake -j1 \
-		SUBDIRS="${MERCURY_PKGS}" \
-		EXTRA_MLFLAGS=--no-strip \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		INSTALL_PREFIX="${D}"/usr \
-		install || die "mmake install failed"
-
-	if use cairo; then
-		cd "${S}"/graphics/mercury_cairo
-		INSTALL_PREFIX="${D}"/usr \
-		mmc --make libmercury_cairo.install \
-			|| die "mmc --make libmercury_cairo.install failed"
-	fi
-
-	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
-
-		ecvs_clean
-	fi
-
-	dodoc README || die
-}


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2019-04-15 11:45 Keri Harris
  0 siblings, 0 replies; 40+ messages in thread
From: Keri Harris @ 2019-04-15 11:45 UTC (permalink / raw
  To: gentoo-commits

commit:     be3876092817a2d4de0072e58670273092c49ef9
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 15 11:45:06 2019 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 11:45:06 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be387609

dev-lang/mercury-extras: fix compilation with _FORTIFY_SOURCE

Signed-off-by: Keri Harris <keri <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 dev-lang/mercury-extras/Manifest                      | 2 +-
 dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index 75e814e6c25..ba011a040ba 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,2 +1,2 @@
-DIST mercury-extras-14.01.1-gentoo-patchset-1.tar.gz 3847 BLAKE2B ce30b98c5cfe96ad67bd6fa5a8d03ebdfe6f4539e39a970ce48eb794b663d7164ae38a619beb4ce85d6cc3a1e3b5a5ee8fa59b6acd00dc6d23670fceac87734e SHA512 2afad01fb778d0e84e8d83a507b37080974840c81408827559df455d8082552131cdbfdae59c77f2f7bc3a643a087f1563c6c67d527f7b0bdef3412385bf4818
+DIST mercury-extras-14.01.1-gentoo-patchset-2.tar.gz 4021 BLAKE2B 6fd5551ec01dd7303a8e1c5661ebec5e33226c1604955f4f69d15e532744584d50bb6cb0e2939c87fd62eb10b1f2f394425ef88cab3e96b81a08a3dcbe695059 SHA512 947ce6fabf661e431f53e4f0a4679eea3ee3fa0c2c585b51cb8b5c9dff98d75697654d5860db3364203e0e657c4d5f68cae1bca469bd0b3f7de9583e97413529
 DIST mercury-srcdist-14.01.1.tar.gz 52658945 BLAKE2B 6497921a0227b9a6fbcbabdd309ef3325f32dda14fc4ddb443368385b89be4011d677a24b30b3702147d1b782fe2597760ad66dd34503aa6aebaf79707466529 SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c

diff --git a/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild b/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
index e8d26a4cb81..cd9279191c5 100644
--- a/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 inherit eutils multilib
 
-PATCHSET_VER="1"
+PATCHSET_VER="2"
 MY_P=mercury-srcdist-${PV}
 
 DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2020-02-12 18:06 David Seifert
  0 siblings, 0 replies; 40+ messages in thread
From: David Seifert @ 2020-02-12 18:06 UTC (permalink / raw
  To: gentoo-commits

commit:     7077c5e3dca25a9984b4854a6910ab6602d7efac
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 18:02:18 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 18:02:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7077c5e3

dev-lang/mercury-extras: [QA] inherit vcs-clean.eclass directly

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild b/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
index 11bd6cc09b4..6fc2a533fc9 100644
--- a/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils multilib
+inherit eutils multilib vcs-clean
 
 PATCHSET_VER="2"
 MY_P=mercury-srcdist-${PV}


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2020-03-21 16:40 Keri Harris
  0 siblings, 0 replies; 40+ messages in thread
From: Keri Harris @ 2020-03-21 16:40 UTC (permalink / raw
  To: gentoo-commits

commit:     7552050bc2dd61db07500ff962fff4ce75bd26f3
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 21 16:39:45 2020 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sat Mar 21 16:40:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7552050b

dev-lang/mercury-extras: fix ml compatibility with 17.1 profiles

Signed-off-by: Keri Harris <keri <AT> gentoo.org>
Package-Manager: Portage-2.3.89, Repoman-2.3.11

 dev-lang/mercury-extras/Manifest                      |  2 +-
 dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index ba011a040ba..6d6a7049d18 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,2 +1,2 @@
-DIST mercury-extras-14.01.1-gentoo-patchset-2.tar.gz 4021 BLAKE2B 6fd5551ec01dd7303a8e1c5661ebec5e33226c1604955f4f69d15e532744584d50bb6cb0e2939c87fd62eb10b1f2f394425ef88cab3e96b81a08a3dcbe695059 SHA512 947ce6fabf661e431f53e4f0a4679eea3ee3fa0c2c585b51cb8b5c9dff98d75697654d5860db3364203e0e657c4d5f68cae1bca469bd0b3f7de9583e97413529
+DIST mercury-extras-14.01.1-gentoo-patchset-3.tar.gz 3891 BLAKE2B dfec573f14070cfddb2cd47178d92cc42e59dfc7cfaeef77654d255ed074ed40e3b704e0f7c6889b8ffa82d75ebf4f5907ac2b91642f8a0ff738e5ee085237be SHA512 05bbdf95192746bd4e478c47258f5c7e1dae0e2b8d34ae6283304b47ba902183e0a416ec08bfd031d6ed486e51e52de338ef312f8ad790dd91678c4b28730b47
 DIST mercury-srcdist-14.01.1.tar.gz 52658945 BLAKE2B 6497921a0227b9a6fbcbabdd309ef3325f32dda14fc4ddb443368385b89be4011d677a24b30b3702147d1b782fe2597760ad66dd34503aa6aebaf79707466529 SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c

diff --git a/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild b/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
index 6fc2a533fc9..e2dabd39840 100644
--- a/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit eutils multilib vcs-clean
 
-PATCHSET_VER="2"
+PATCHSET_VER="3"
 MY_P=mercury-srcdist-${PV}
 
 DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
@@ -92,8 +92,8 @@ src_compile() {
 		SUBDIRS="${MERCURY_PKGS}" \
 		EXTRA_MLFLAGS=--no-strip \
 		EXTRA_CFLAGS="${CFLAGS}" \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
+		EXTRA_LDFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \
+		EXTRA_LD_LIBFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \
 		|| die "mmake failed"
 
 	if use cairo; then
@@ -111,8 +111,8 @@ src_install() {
 		SUBDIRS="${MERCURY_PKGS}" \
 		EXTRA_MLFLAGS=--no-strip \
 		EXTRA_CFLAGS="${CFLAGS}" \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
+		EXTRA_LDFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \
+		EXTRA_LD_LIBFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \
 		DESTDIR="${D}" \
 		INSTALL_PREFIX="${D}"/usr \
 		install || die "mmake install failed"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2020-03-21 17:17 Keri Harris
  0 siblings, 0 replies; 40+ messages in thread
From: Keri Harris @ 2020-03-21 17:17 UTC (permalink / raw
  To: gentoo-commits

commit:     61b09eb192be413c51758209e887b4fd099bde9a
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 21 17:16:41 2020 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sat Mar 21 17:16:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61b09eb1

dev-lang/mercury-extras: TCL+curses compile-time fixes

Signed-off-by: Keri Harris <keri <AT> gentoo.org>
Package-Manager: Portage-2.3.89, Repoman-2.3.11

 dev-lang/mercury-extras/Manifest                      | 2 +-
 dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index 6d6a7049d18..7e5e48b7128 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,2 +1,2 @@
-DIST mercury-extras-14.01.1-gentoo-patchset-3.tar.gz 3891 BLAKE2B dfec573f14070cfddb2cd47178d92cc42e59dfc7cfaeef77654d255ed074ed40e3b704e0f7c6889b8ffa82d75ebf4f5907ac2b91642f8a0ff738e5ee085237be SHA512 05bbdf95192746bd4e478c47258f5c7e1dae0e2b8d34ae6283304b47ba902183e0a416ec08bfd031d6ed486e51e52de338ef312f8ad790dd91678c4b28730b47
+DIST mercury-extras-14.01.1-gentoo-patchset-4.tar.gz 4361 BLAKE2B a1939e4b76782cb01fc7ee5dcb1ccbb885e93992d0e6f540552eb987f405b3a70671527dfacb873323f6030bb6de2f6cdd23768dbc36e8b656d836e2890b7d8a SHA512 e30ac4e9c0592a1ea5253663bf351814e91977ea53892dca4d996b217aac959265563910cc21aa64ee12a93ea379cb8143730585c7d32390bcf05f2a1b0590d7
 DIST mercury-srcdist-14.01.1.tar.gz 52658945 BLAKE2B 6497921a0227b9a6fbcbabdd309ef3325f32dda14fc4ddb443368385b89be4011d677a24b30b3702147d1b782fe2597760ad66dd34503aa6aebaf79707466529 SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c

diff --git a/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild b/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
index e2dabd39840..6298fa9e072 100644
--- a/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit eutils multilib vcs-clean
 
-PATCHSET_VER="3"
+PATCHSET_VER="4"
 MY_P=mercury-srcdist-${PV}
 
 DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2020-03-29 10:43 Keri Harris
  0 siblings, 0 replies; 40+ messages in thread
From: Keri Harris @ 2020-03-29 10:43 UTC (permalink / raw
  To: gentoo-commits

commit:     afd55ec4490b855a0ec20b080aef810ec497708b
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 29 10:42:52 2020 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sun Mar 29 10:43:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afd55ec4

dev-lang/mercury-extras: version bump

Signed-off-by: Keri Harris <keri <AT> gentoo.org>
Package-Manager: Portage-2.3.89, Repoman-2.3.11

 dev-lang/mercury-extras/Manifest                   |   2 +
 .../mercury-extras/mercury-extras-20.01.ebuild     | 317 +++++++++++++++++++++
 dev-lang/mercury-extras/metadata.xml               |   3 +
 3 files changed, 322 insertions(+)

diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index 7e5e48b7128..e20f8ef9a2c 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,2 +1,4 @@
 DIST mercury-extras-14.01.1-gentoo-patchset-4.tar.gz 4361 BLAKE2B a1939e4b76782cb01fc7ee5dcb1ccbb885e93992d0e6f540552eb987f405b3a70671527dfacb873323f6030bb6de2f6cdd23768dbc36e8b656d836e2890b7d8a SHA512 e30ac4e9c0592a1ea5253663bf351814e91977ea53892dca4d996b217aac959265563910cc21aa64ee12a93ea379cb8143730585c7d32390bcf05f2a1b0590d7
+DIST mercury-extras-20.01-gentoo-patchset-0.tar.gz 542 BLAKE2B 4f24f5af21cbd566eb72ce03d618d858f16d02a921b506c933342181ea057d98377077535571223c85b1f1fa5854e52005f67f40dd75bb392929faaad889eed1 SHA512 6a2eb1dbaac1f028c0ce5f0e21a8f24bd4ba9b068f1ea5d8554c5fb7376642797709f0aa93db336d2f015b6f815d0aa27c7d60720aab340ace180d49791bd852
 DIST mercury-srcdist-14.01.1.tar.gz 52658945 BLAKE2B 6497921a0227b9a6fbcbabdd309ef3325f32dda14fc4ddb443368385b89be4011d677a24b30b3702147d1b782fe2597760ad66dd34503aa6aebaf79707466529 SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c
+DIST mercury-srcdist-20.01.tar.gz 47103868 BLAKE2B 68be786e925bdf94dcba6c6a2a746a384da345ee33250785d8d2b9281815694a4525cdd694c26f58051c097f2a897291e640e2139729ccede9bd2e472077d8c9 SHA512 90e36faa375603e596b2dd692363528120fda62ae6d2e2b119cf76de1656dae4028aff00858a4bff3fdfb9b2210ea17db0aa516ce4283604c46a5935dd2cd4b7

diff --git a/dev-lang/mercury-extras/mercury-extras-20.01.ebuild b/dev-lang/mercury-extras/mercury-extras-20.01.ebuild
new file mode 100644
index 00000000000..8a9593959ae
--- /dev/null
+++ b/dev-lang/mercury-extras/mercury-extras-20.01.ebuild
@@ -0,0 +1,317 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils multilib vcs-clean
+
+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="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml"
+REQUIRED_USE="?? ( odbc iodbc )"
+
+RDEPEND="
+	~dev-lang/mercury-${PV}
+	cairo? ( >=x11-libs/cairo-1.10.0 )
+	gmp? ( dev-libs/gmp:0 )
+	glut? ( media-libs/freeglut )
+	odbc? ( dev-db/unixODBC )
+	iodbc? ( dev-db/libiodbc )
+	tommath? ( dev-libs/libtommath )
+	ncurses? ( sys-libs/ncurses:= )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+	)
+	tk? (
+		dev-lang/tcl:0
+		dev-lang/tk:0
+	)
+	X? ( x11-libs/libX11 )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}/extras
+
+mercury_pkgs() {
+	echo "
+		align_right/align_right:bin:
+		base64/mercury_base64:lib:
+		cgi/mercury_www:lib:
+		complex_numbers/complex_numbers:lib:
+		$(use ncurses && echo \
+			curs/curs:lib:ncurses,panel curses/mcurses:lib:ncurses)
+		dynamic_linking/dl:lib:
+		error/error:bin:
+		fixed/fixed:lib:
+		$(use gmp && echo gmp_int/gmp_int:lib:)
+		$(use tommath && echo mp_int/mp_int:lib:libtommath)
+		$(use X && echo graphics/easyx/easyx:lib:x11)
+		$(use cairo && echo graphics/mercury_cairo/mercury_cairo:lib:cairo)
+		$(use glut && echo graphics/mercury_glut/mercury_glut:lib:freeglut)
+		$(use opengl && echo graphics/mercury_opengl/mercury_opengl:lib:gl,glu)
+		$(use tk && echo graphics/mercury_tcltk/mercury_tcltk:lib:tk)
+		lex/lex:lib:
+		lex/regex:lib:
+		moose/moose:bin:
+		net/net:lib:
+		net/echo:bin:
+		$(use ssl && echo mopenssl/mopenssl:lib:openssl)
+		$(use odbc && echo odbc/odbc:lib:)
+		$(use iodbc && echo odbc/odbc:lib:libiodbc)
+		posix/posix:lib:
+		$(has_version dev-lang/mercury[trail] && echo \
+			references/global:lib: trailed_update/trailed_update:lib:)
+		show_ops/show_ops:bin:
+		solver_types/library/any:lib:
+		$(use xml && echo xml/xml:lib:)"
+}
+
+mercury_pkg_setup() {
+	mercury_pkg=${1%%:*}
+	mercury_pkg_dir=${mercury_pkg%/*}
+	mercury_pkg_name=${mercury_pkg##*/}
+
+	mercury_pkg_atts=${1#*:}
+	mercury_pkg_type=${mercury_pkg_atts%%:*}
+	mercury_pkg_deps=${mercury_pkg_atts#*:}
+
+	cd "${S}"/${mercury_pkg_dir} || die
+
+	echo ">> Preparing Mercury package: ${mercury_pkg}"
+
+	if ! test -f "${S}"/${mercury_pkg_dir}/gentoo.params; then
+		echo "LIBGRADES := \$(filter-out java,\$(LIBGRADES))" \
+			> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "LIBGRADES := \$(filter-out erlang,\$(LIBGRADES))" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "LIBGRADES := \$(filter-out csharp,\$(LIBGRADES))" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "include gentoo.params" > "${S}"/${mercury_pkg_dir}/Mmakefile
+	fi
+
+	if test -n "$mercury_pkg_deps"; then
+		echo "EXTRA_CFLAGS += $(pkg-config --cflags ${mercury_pkg_deps/,/ })" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "EXTRA_MLLIBS += $(pkg-config --libs ${mercury_pkg_deps/,/ })" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+	fi
+
+	if test ${mercury_pkg_name} = dl; then
+		echo "EXTRA_MLLIBS = -ldl" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+	elif test ${mercury_pkg_name} = gmp_int; then
+		echo "EXTRA_MLLIBS = -lgmp" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+	elif test ${mercury_pkg_name} = mercury_tcltk; then
+		echo "EXTRA_CFLAGS += -DUSE_INTERP_RESULT" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+	elif test ${mercury_pkg_name} = mopenssl; then
+		local net_libdir="${D}/usr/$(get_libdir)/mercury/extras/lib/\$(GRADE)"
+		echo "EXTRA_MLLIBS += -L${net_libdir} -L../net -lnet" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "net%:" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "	cp ../net/\$@ \$@" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+	elif test ${mercury_pkg_name} = odbc && use odbc; then
+		echo "EXTRA_CFLAGS = -DMODBC_UNIX -DMODBC_MYSQL" \
+			>> "${S}"/${mercury_pkg_dir}/Mmakefile
+		echo "EXTRA_MLLIBS = -lodbc" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+	elif test ${mercury_pkg_name} = odbc && use iodbc; then
+		echo "EXTRA_CFLAGS += -DMODBC_IODBC -DMODBC_MYSQL" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+	fi
+}
+
+mercury_pkg_compile() {
+	mercury_pkg=${1%%:*}
+	mercury_pkg_dir=${mercury_pkg%/*}
+	mercury_pkg_name=${mercury_pkg##*/}
+
+	mercury_pkg_atts=${1#*:}
+	mercury_pkg_type=${mercury_pkg_atts%:*}
+
+	cd "${S}"/${mercury_pkg_dir} || die
+
+	echo ">> Compiling Mercury package: ${mercury_pkg}"
+
+	if test "${mercury_pkg_type}" = "bin"; then
+		mercury_mmc_target=${mercury_pkg_name}
+	else
+		mercury_mmc_target=lib${mercury_pkg_name}
+	fi
+
+	# Mercury dependency generation must be run single-threaded
+	mmc -f *.m || die "mmc -f .m failed"
+	mmake -j1 \
+		${mercury_pkg_name}.depend \
+		|| die "mmake ${mercury_pkg} depend failed"
+
+	# Compiling Mercury submodules is not thread-safe
+	mmake -j1 \
+		MLFLAGS=--no-strip \
+		CFLAGS="${CFLAGS}" \
+		LD_LIBFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \
+		${mercury_mmc_target} || die "mmake ${mercury_pkg} failed"
+
+}
+
+mercury_pkg_install() {
+	mercury_pkg=${1%%:*}
+	mercury_pkg_dir=${mercury_pkg%/*}
+	mercury_pkg_name=${mercury_pkg##*/}
+
+	mercury_pkg_atts=${1#*:}
+	mercury_pkg_type=${mercury_pkg_atts%:*}
+
+	cd "${S}"/${mercury_pkg_dir} || die
+
+	echo ">> Installing Mercury package: ${mercury_pkg}"
+
+	if test "${mercury_pkg_type}" = "bin"; then
+		into /usr/$(get_libdir)/mercury/extras
+		dobin ${mercury_pkg_name}
+	else
+		# Compiling Mercury submodules is not thread-safe
+		mmake -j1 \
+			MLFLAGS=--no-strip \
+			CFLAGS="${CFLAGS}" \
+			LD_LIBFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \
+			INSTALL_LIBDIR="${D}/usr/$(get_libdir)/mercury/extras" \
+			lib${mercury_pkg_name}.install || die "mmake ${mercury_pkg} failed"
+	fi
+}
+
+src_prepare() {
+	cd "${WORKDIR}"/${MY_P}
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		eapply "${WORKDIR}"/${PV}
+	fi
+	eapply_user
+
+	cd "${S}"
+	for mercury_pkg in $(mercury_pkgs); do
+		mercury_pkg_setup ${mercury_pkg}
+	done
+}
+
+src_compile() {
+	for mercury_pkg in $(mercury_pkgs); do
+		mercury_pkg_compile ${mercury_pkg}
+	done
+}
+
+src_install() {
+	for mercury_pkg in $(mercury_pkgs); do
+		mercury_pkg_install ${mercury_pkg}
+	done
+
+	cd "${S}"
+	dodoc README
+
+	if use examples; then
+		docinto samples/cgi
+		dodoc cgi/form_test.m
+
+		docinto samples/complex_numbers
+		dodoc complex_numbers/samples/*.m
+
+		if use ncurses; then
+			docinto samples/curs
+			dodoc curs/samples/*.m
+
+			docinto samples/curses
+			dodoc curses/sample/*.m
+		fi
+
+		docinto samples/dynamic_linking
+		dodoc dynamic_linking/{hello,dl_test}.m
+
+		docinto samples/gator
+		dodoc -r gator/*
+
+		if use gmp; then
+			docinto samples/gmp_int
+			dodoc gmp_int/gmp_int_test.m
+		fi
+
+		if use tommath; then
+			docinto samples/mp_int
+			dodoc mp_int/mp_int_test.m
+		fi
+
+		if use X; then
+			docinto samples/graphics
+			dodoc graphics/easyx/samples/*.m
+		fi
+
+		if use glut && use opengl; then
+			docinto samples/graphics
+			dodoc graphics/samples/gears/*.m
+			dodoc graphics/samples/maze/*.m
+		fi
+
+		if use tk; then
+			docinto samples/graphics
+			dodoc graphics/samples/calc/*.m
+		fi
+
+		if use opengl && use tk; then
+			docinto samples/graphics
+			dodoc graphics/samples/pent/*.m
+		fi
+
+		docinto samples/lex
+		dodoc lex/samples/*.m
+
+		docinto samples/log4m
+		dodoc log4m/*.m
+
+		docinto samples/monte
+		dodoc monte/*.m
+
+		docinto samples/moose
+		dodoc moose/samples/*
+
+		docinto samples/net
+		dodoc net/test_lookups.m
+
+		if use odbc || use iodbc; then
+			docinto samples/odbc
+			dodoc odbc/odbc_test.m
+		fi
+
+		docinto samples/posix
+		dodoc posix/samples/*.m
+
+		docinto samples/random
+		dodoc random/*.m
+
+		if has_version dev-lang/mercury[trail]; then
+			docinto samples/references
+			dodoc references/samples/*.m
+
+			docinto samples/trail
+			dodoc trail/*.m
+
+			docinto samples/trailed_update
+			dodoc trailed_update/samples/*.m
+		fi
+
+		if use xml; then
+			docinto samples/xml
+			dodoc xml/tryit.m
+			dodoc xml/samples/*
+			dodoc xml_stylesheets/*.xsl
+		fi
+
+		ecvs_clean
+	fi
+}

diff --git a/dev-lang/mercury-extras/metadata.xml b/dev-lang/mercury-extras/metadata.xml
index c301cedb922..d51dcb06bfd 100644
--- a/dev-lang/mercury-extras/metadata.xml
+++ b/dev-lang/mercury-extras/metadata.xml
@@ -5,4 +5,7 @@
   <email>keri@gentoo.org</email>
   <name>Keri Harris</name>
 </maintainer>
+<use>
+  <flag name="tommath">Enable support for tommath library</flag>
+</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2020-04-01 10:37 Keri Harris
  0 siblings, 0 replies; 40+ messages in thread
From: Keri Harris @ 2020-04-01 10:37 UTC (permalink / raw
  To: gentoo-commits

commit:     18342f8029785f8e9645cb5bb64ef6e5c7954004
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  1 10:36:24 2020 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Wed Apr  1 10:36:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18342f80

dev-lang/mercury-extras: version bump

Signed-off-by: Keri Harris <keri <AT> gentoo.org>
Package-Manager: Portage-2.3.89, Repoman-2.3.11

 dev-lang/mercury-extras/Manifest                   |   2 +
 .../mercury-extras/mercury-extras-20.01.1.ebuild   | 317 +++++++++++++++++++++
 2 files changed, 319 insertions(+)

diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index e20f8ef9a2c..34143af31a7 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,4 +1,6 @@
 DIST mercury-extras-14.01.1-gentoo-patchset-4.tar.gz 4361 BLAKE2B a1939e4b76782cb01fc7ee5dcb1ccbb885e93992d0e6f540552eb987f405b3a70671527dfacb873323f6030bb6de2f6cdd23768dbc36e8b656d836e2890b7d8a SHA512 e30ac4e9c0592a1ea5253663bf351814e91977ea53892dca4d996b217aac959265563910cc21aa64ee12a93ea379cb8143730585c7d32390bcf05f2a1b0590d7
 DIST mercury-extras-20.01-gentoo-patchset-0.tar.gz 542 BLAKE2B 4f24f5af21cbd566eb72ce03d618d858f16d02a921b506c933342181ea057d98377077535571223c85b1f1fa5854e52005f67f40dd75bb392929faaad889eed1 SHA512 6a2eb1dbaac1f028c0ce5f0e21a8f24bd4ba9b068f1ea5d8554c5fb7376642797709f0aa93db336d2f015b6f815d0aa27c7d60720aab340ace180d49791bd852
+DIST mercury-extras-20.01.1-gentoo-patchset-0.tar.gz 732 BLAKE2B 32287e116b94b540ca0b710eac8921669ff9a56b5d8a812eba8443609ccfc8c937baaa53a0ae4704abdc78013d58eddd0dc5cda7c807d7a0b724ebda1dede723 SHA512 0d3ca2984eb054ec2add5e05fb49d4fa711b3c78038b4e9777c4767083fc3bae552a261677fed6f07c293d2fb1ebf632ba633eb64a3a8ab4880c6f6619a197ea
 DIST mercury-srcdist-14.01.1.tar.gz 52658945 BLAKE2B 6497921a0227b9a6fbcbabdd309ef3325f32dda14fc4ddb443368385b89be4011d677a24b30b3702147d1b782fe2597760ad66dd34503aa6aebaf79707466529 SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c
+DIST mercury-srcdist-20.01.1.tar.gz 47088335 BLAKE2B 1e3285dadc3748934e801b8ac0316d3005fbe24c20c9ceb694e9fc316d820fdb89c659107b25ee474fd6ac50d661dd029af9ca5082016a3b0827dd640a54a707 SHA512 24ad0bbecee46ab6ff669d63d64096b37a0d010bb44978a1785eee2701a8b30a83eab229af97cbbb18bca55b5e89be9ba74fe126d1d430da1e1e909366dc5b90
 DIST mercury-srcdist-20.01.tar.gz 47103868 BLAKE2B 68be786e925bdf94dcba6c6a2a746a384da345ee33250785d8d2b9281815694a4525cdd694c26f58051c097f2a897291e640e2139729ccede9bd2e472077d8c9 SHA512 90e36faa375603e596b2dd692363528120fda62ae6d2e2b119cf76de1656dae4028aff00858a4bff3fdfb9b2210ea17db0aa516ce4283604c46a5935dd2cd4b7

diff --git a/dev-lang/mercury-extras/mercury-extras-20.01.1.ebuild b/dev-lang/mercury-extras/mercury-extras-20.01.1.ebuild
new file mode 100644
index 00000000000..8a9593959ae
--- /dev/null
+++ b/dev-lang/mercury-extras/mercury-extras-20.01.1.ebuild
@@ -0,0 +1,317 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils multilib vcs-clean
+
+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="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml"
+REQUIRED_USE="?? ( odbc iodbc )"
+
+RDEPEND="
+	~dev-lang/mercury-${PV}
+	cairo? ( >=x11-libs/cairo-1.10.0 )
+	gmp? ( dev-libs/gmp:0 )
+	glut? ( media-libs/freeglut )
+	odbc? ( dev-db/unixODBC )
+	iodbc? ( dev-db/libiodbc )
+	tommath? ( dev-libs/libtommath )
+	ncurses? ( sys-libs/ncurses:= )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+	)
+	tk? (
+		dev-lang/tcl:0
+		dev-lang/tk:0
+	)
+	X? ( x11-libs/libX11 )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}/extras
+
+mercury_pkgs() {
+	echo "
+		align_right/align_right:bin:
+		base64/mercury_base64:lib:
+		cgi/mercury_www:lib:
+		complex_numbers/complex_numbers:lib:
+		$(use ncurses && echo \
+			curs/curs:lib:ncurses,panel curses/mcurses:lib:ncurses)
+		dynamic_linking/dl:lib:
+		error/error:bin:
+		fixed/fixed:lib:
+		$(use gmp && echo gmp_int/gmp_int:lib:)
+		$(use tommath && echo mp_int/mp_int:lib:libtommath)
+		$(use X && echo graphics/easyx/easyx:lib:x11)
+		$(use cairo && echo graphics/mercury_cairo/mercury_cairo:lib:cairo)
+		$(use glut && echo graphics/mercury_glut/mercury_glut:lib:freeglut)
+		$(use opengl && echo graphics/mercury_opengl/mercury_opengl:lib:gl,glu)
+		$(use tk && echo graphics/mercury_tcltk/mercury_tcltk:lib:tk)
+		lex/lex:lib:
+		lex/regex:lib:
+		moose/moose:bin:
+		net/net:lib:
+		net/echo:bin:
+		$(use ssl && echo mopenssl/mopenssl:lib:openssl)
+		$(use odbc && echo odbc/odbc:lib:)
+		$(use iodbc && echo odbc/odbc:lib:libiodbc)
+		posix/posix:lib:
+		$(has_version dev-lang/mercury[trail] && echo \
+			references/global:lib: trailed_update/trailed_update:lib:)
+		show_ops/show_ops:bin:
+		solver_types/library/any:lib:
+		$(use xml && echo xml/xml:lib:)"
+}
+
+mercury_pkg_setup() {
+	mercury_pkg=${1%%:*}
+	mercury_pkg_dir=${mercury_pkg%/*}
+	mercury_pkg_name=${mercury_pkg##*/}
+
+	mercury_pkg_atts=${1#*:}
+	mercury_pkg_type=${mercury_pkg_atts%%:*}
+	mercury_pkg_deps=${mercury_pkg_atts#*:}
+
+	cd "${S}"/${mercury_pkg_dir} || die
+
+	echo ">> Preparing Mercury package: ${mercury_pkg}"
+
+	if ! test -f "${S}"/${mercury_pkg_dir}/gentoo.params; then
+		echo "LIBGRADES := \$(filter-out java,\$(LIBGRADES))" \
+			> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "LIBGRADES := \$(filter-out erlang,\$(LIBGRADES))" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "LIBGRADES := \$(filter-out csharp,\$(LIBGRADES))" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "include gentoo.params" > "${S}"/${mercury_pkg_dir}/Mmakefile
+	fi
+
+	if test -n "$mercury_pkg_deps"; then
+		echo "EXTRA_CFLAGS += $(pkg-config --cflags ${mercury_pkg_deps/,/ })" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "EXTRA_MLLIBS += $(pkg-config --libs ${mercury_pkg_deps/,/ })" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+	fi
+
+	if test ${mercury_pkg_name} = dl; then
+		echo "EXTRA_MLLIBS = -ldl" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+	elif test ${mercury_pkg_name} = gmp_int; then
+		echo "EXTRA_MLLIBS = -lgmp" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+	elif test ${mercury_pkg_name} = mercury_tcltk; then
+		echo "EXTRA_CFLAGS += -DUSE_INTERP_RESULT" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+	elif test ${mercury_pkg_name} = mopenssl; then
+		local net_libdir="${D}/usr/$(get_libdir)/mercury/extras/lib/\$(GRADE)"
+		echo "EXTRA_MLLIBS += -L${net_libdir} -L../net -lnet" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "net%:" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "	cp ../net/\$@ \$@" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+	elif test ${mercury_pkg_name} = odbc && use odbc; then
+		echo "EXTRA_CFLAGS = -DMODBC_UNIX -DMODBC_MYSQL" \
+			>> "${S}"/${mercury_pkg_dir}/Mmakefile
+		echo "EXTRA_MLLIBS = -lodbc" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+	elif test ${mercury_pkg_name} = odbc && use iodbc; then
+		echo "EXTRA_CFLAGS += -DMODBC_IODBC -DMODBC_MYSQL" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+	fi
+}
+
+mercury_pkg_compile() {
+	mercury_pkg=${1%%:*}
+	mercury_pkg_dir=${mercury_pkg%/*}
+	mercury_pkg_name=${mercury_pkg##*/}
+
+	mercury_pkg_atts=${1#*:}
+	mercury_pkg_type=${mercury_pkg_atts%:*}
+
+	cd "${S}"/${mercury_pkg_dir} || die
+
+	echo ">> Compiling Mercury package: ${mercury_pkg}"
+
+	if test "${mercury_pkg_type}" = "bin"; then
+		mercury_mmc_target=${mercury_pkg_name}
+	else
+		mercury_mmc_target=lib${mercury_pkg_name}
+	fi
+
+	# Mercury dependency generation must be run single-threaded
+	mmc -f *.m || die "mmc -f .m failed"
+	mmake -j1 \
+		${mercury_pkg_name}.depend \
+		|| die "mmake ${mercury_pkg} depend failed"
+
+	# Compiling Mercury submodules is not thread-safe
+	mmake -j1 \
+		MLFLAGS=--no-strip \
+		CFLAGS="${CFLAGS}" \
+		LD_LIBFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \
+		${mercury_mmc_target} || die "mmake ${mercury_pkg} failed"
+
+}
+
+mercury_pkg_install() {
+	mercury_pkg=${1%%:*}
+	mercury_pkg_dir=${mercury_pkg%/*}
+	mercury_pkg_name=${mercury_pkg##*/}
+
+	mercury_pkg_atts=${1#*:}
+	mercury_pkg_type=${mercury_pkg_atts%:*}
+
+	cd "${S}"/${mercury_pkg_dir} || die
+
+	echo ">> Installing Mercury package: ${mercury_pkg}"
+
+	if test "${mercury_pkg_type}" = "bin"; then
+		into /usr/$(get_libdir)/mercury/extras
+		dobin ${mercury_pkg_name}
+	else
+		# Compiling Mercury submodules is not thread-safe
+		mmake -j1 \
+			MLFLAGS=--no-strip \
+			CFLAGS="${CFLAGS}" \
+			LD_LIBFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \
+			INSTALL_LIBDIR="${D}/usr/$(get_libdir)/mercury/extras" \
+			lib${mercury_pkg_name}.install || die "mmake ${mercury_pkg} failed"
+	fi
+}
+
+src_prepare() {
+	cd "${WORKDIR}"/${MY_P}
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		eapply "${WORKDIR}"/${PV}
+	fi
+	eapply_user
+
+	cd "${S}"
+	for mercury_pkg in $(mercury_pkgs); do
+		mercury_pkg_setup ${mercury_pkg}
+	done
+}
+
+src_compile() {
+	for mercury_pkg in $(mercury_pkgs); do
+		mercury_pkg_compile ${mercury_pkg}
+	done
+}
+
+src_install() {
+	for mercury_pkg in $(mercury_pkgs); do
+		mercury_pkg_install ${mercury_pkg}
+	done
+
+	cd "${S}"
+	dodoc README
+
+	if use examples; then
+		docinto samples/cgi
+		dodoc cgi/form_test.m
+
+		docinto samples/complex_numbers
+		dodoc complex_numbers/samples/*.m
+
+		if use ncurses; then
+			docinto samples/curs
+			dodoc curs/samples/*.m
+
+			docinto samples/curses
+			dodoc curses/sample/*.m
+		fi
+
+		docinto samples/dynamic_linking
+		dodoc dynamic_linking/{hello,dl_test}.m
+
+		docinto samples/gator
+		dodoc -r gator/*
+
+		if use gmp; then
+			docinto samples/gmp_int
+			dodoc gmp_int/gmp_int_test.m
+		fi
+
+		if use tommath; then
+			docinto samples/mp_int
+			dodoc mp_int/mp_int_test.m
+		fi
+
+		if use X; then
+			docinto samples/graphics
+			dodoc graphics/easyx/samples/*.m
+		fi
+
+		if use glut && use opengl; then
+			docinto samples/graphics
+			dodoc graphics/samples/gears/*.m
+			dodoc graphics/samples/maze/*.m
+		fi
+
+		if use tk; then
+			docinto samples/graphics
+			dodoc graphics/samples/calc/*.m
+		fi
+
+		if use opengl && use tk; then
+			docinto samples/graphics
+			dodoc graphics/samples/pent/*.m
+		fi
+
+		docinto samples/lex
+		dodoc lex/samples/*.m
+
+		docinto samples/log4m
+		dodoc log4m/*.m
+
+		docinto samples/monte
+		dodoc monte/*.m
+
+		docinto samples/moose
+		dodoc moose/samples/*
+
+		docinto samples/net
+		dodoc net/test_lookups.m
+
+		if use odbc || use iodbc; then
+			docinto samples/odbc
+			dodoc odbc/odbc_test.m
+		fi
+
+		docinto samples/posix
+		dodoc posix/samples/*.m
+
+		docinto samples/random
+		dodoc random/*.m
+
+		if has_version dev-lang/mercury[trail]; then
+			docinto samples/references
+			dodoc references/samples/*.m
+
+			docinto samples/trail
+			dodoc trail/*.m
+
+			docinto samples/trailed_update
+			dodoc trailed_update/samples/*.m
+		fi
+
+		if use xml; then
+			docinto samples/xml
+			dodoc xml/tryit.m
+			dodoc xml/samples/*
+			dodoc xml_stylesheets/*.xsl
+		fi
+
+		ecvs_clean
+	fi
+}


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2020-04-02  9:38 Keri Harris
  0 siblings, 0 replies; 40+ messages in thread
From: Keri Harris @ 2020-04-02  9:38 UTC (permalink / raw
  To: gentoo-commits

commit:     de675aa379ca516c9fd09e49bdb3cea34eec11e4
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  2 09:36:49 2020 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Thu Apr  2 09:38:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de675aa3

dev-lang/mercury-extras: fix mercury lib search paths. Closes #715838

Signed-off-by: Keri Harris <keri <AT> gentoo.org>
Package-Manager: Portage-2.3.89, Repoman-2.3.11

 dev-lang/mercury-extras/mercury-extras-20.01.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/mercury-extras/mercury-extras-20.01.1.ebuild b/dev-lang/mercury-extras/mercury-extras-20.01.1.ebuild
index 8a9593959ae..7595eae754b 100644
--- a/dev-lang/mercury-extras/mercury-extras-20.01.1.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-20.01.1.ebuild
@@ -158,7 +158,7 @@ mercury_pkg_compile() {
 	mmake -j1 \
 		MLFLAGS=--no-strip \
 		CFLAGS="${CFLAGS}" \
-		LD_LIBFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \
+		LD_LIBFLAGS="${LDFLAGS}" \
 		${mercury_mmc_target} || die "mmake ${mercury_pkg} failed"
 
 }
@@ -183,7 +183,7 @@ mercury_pkg_install() {
 		mmake -j1 \
 			MLFLAGS=--no-strip \
 			CFLAGS="${CFLAGS}" \
-			LD_LIBFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \
+			LD_LIBFLAGS="${LDFLAGS}" \
 			INSTALL_LIBDIR="${D}/usr/$(get_libdir)/mercury/extras" \
 			lib${mercury_pkg_name}.install || die "mmake ${mercury_pkg} failed"
 	fi


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2020-07-19 20:27 Keri Harris
  0 siblings, 0 replies; 40+ messages in thread
From: Keri Harris @ 2020-07-19 20:27 UTC (permalink / raw
  To: gentoo-commits

commit:     ac16fbeb58a47552b296b1fc5dff971d17e25e1e
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 19 20:26:54 2020 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sun Jul 19 20:26:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac16fbeb

dev-lang/mercury-extras: version bump

Package-Manager: Portage-2.3.103, Repoman-2.3.22
Signed-off-by: Keri Harris <keri <AT> gentoo.org>

 dev-lang/mercury-extras/Manifest                   |   2 +
 .../mercury-extras/mercury-extras-20.01.2.ebuild   | 317 +++++++++++++++++++++
 2 files changed, 319 insertions(+)

diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index 34143af31a7..6be97f64c4a 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,6 +1,8 @@
 DIST mercury-extras-14.01.1-gentoo-patchset-4.tar.gz 4361 BLAKE2B a1939e4b76782cb01fc7ee5dcb1ccbb885e93992d0e6f540552eb987f405b3a70671527dfacb873323f6030bb6de2f6cdd23768dbc36e8b656d836e2890b7d8a SHA512 e30ac4e9c0592a1ea5253663bf351814e91977ea53892dca4d996b217aac959265563910cc21aa64ee12a93ea379cb8143730585c7d32390bcf05f2a1b0590d7
 DIST mercury-extras-20.01-gentoo-patchset-0.tar.gz 542 BLAKE2B 4f24f5af21cbd566eb72ce03d618d858f16d02a921b506c933342181ea057d98377077535571223c85b1f1fa5854e52005f67f40dd75bb392929faaad889eed1 SHA512 6a2eb1dbaac1f028c0ce5f0e21a8f24bd4ba9b068f1ea5d8554c5fb7376642797709f0aa93db336d2f015b6f815d0aa27c7d60720aab340ace180d49791bd852
 DIST mercury-extras-20.01.1-gentoo-patchset-0.tar.gz 732 BLAKE2B 32287e116b94b540ca0b710eac8921669ff9a56b5d8a812eba8443609ccfc8c937baaa53a0ae4704abdc78013d58eddd0dc5cda7c807d7a0b724ebda1dede723 SHA512 0d3ca2984eb054ec2add5e05fb49d4fa711b3c78038b4e9777c4767083fc3bae552a261677fed6f07c293d2fb1ebf632ba633eb64a3a8ab4880c6f6619a197ea
+DIST mercury-extras-20.01.2-gentoo-patchset-0.tar.gz 715 BLAKE2B f59a10b6f313efb8446d2d8f1e69b5cb5118de01a59e67996897ba48726ed43a38fc763ee7fe9afad43999d416333138e6d9595eb76b31b10d990671e41b6e8e SHA512 a76e59b4737611de24fa7a25fc9e9dfff6df7199749209965ca888d2bd728be2f9092e0e9f73b7a83e165f178300a9a43ab287c1cafb9221246eecc48bf12c6f
 DIST mercury-srcdist-14.01.1.tar.gz 52658945 BLAKE2B 6497921a0227b9a6fbcbabdd309ef3325f32dda14fc4ddb443368385b89be4011d677a24b30b3702147d1b782fe2597760ad66dd34503aa6aebaf79707466529 SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c
 DIST mercury-srcdist-20.01.1.tar.gz 47088335 BLAKE2B 1e3285dadc3748934e801b8ac0316d3005fbe24c20c9ceb694e9fc316d820fdb89c659107b25ee474fd6ac50d661dd029af9ca5082016a3b0827dd640a54a707 SHA512 24ad0bbecee46ab6ff669d63d64096b37a0d010bb44978a1785eee2701a8b30a83eab229af97cbbb18bca55b5e89be9ba74fe126d1d430da1e1e909366dc5b90
+DIST mercury-srcdist-20.01.2.tar.gz 46789217 BLAKE2B bc9637c1b4afb81d4bf35cd94a1f1d87b17094d8a6cbb7e5c8b0ff9c99ce59178d9e32bae246dd041ad781fe5d04e68db8f5effbb6bfcc29b76a83aad91a5666 SHA512 0deed9c0a13ebf793fb80def3fe6d9ee0aa4f0f2974865364eff81bdcac1ec0c41aafbec3e0146c8bdcf3245789e1003b2e4f8e219b53bec71e90074867a834d
 DIST mercury-srcdist-20.01.tar.gz 47103868 BLAKE2B 68be786e925bdf94dcba6c6a2a746a384da345ee33250785d8d2b9281815694a4525cdd694c26f58051c097f2a897291e640e2139729ccede9bd2e472077d8c9 SHA512 90e36faa375603e596b2dd692363528120fda62ae6d2e2b119cf76de1656dae4028aff00858a4bff3fdfb9b2210ea17db0aa516ce4283604c46a5935dd2cd4b7

diff --git a/dev-lang/mercury-extras/mercury-extras-20.01.2.ebuild b/dev-lang/mercury-extras/mercury-extras-20.01.2.ebuild
new file mode 100644
index 00000000000..99be15c46be
--- /dev/null
+++ b/dev-lang/mercury-extras/mercury-extras-20.01.2.ebuild
@@ -0,0 +1,317 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils multilib vcs-clean
+
+PATCHSET_VER="0"
+MY_P=mercury-srcdist-${PV}
+
+DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
+HOMEPAGE="https://www.mercurylang.org/index.html"
+SRC_URI="https://dl.mercurylang.org/release/${MY_P}.tar.gz
+	https://dev.gentoo.org/~keri/distfiles/mercury-extras/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml"
+REQUIRED_USE="?? ( odbc iodbc )"
+
+RDEPEND="
+	~dev-lang/mercury-${PV}
+	cairo? ( >=x11-libs/cairo-1.10.0 )
+	gmp? ( dev-libs/gmp:0 )
+	glut? ( media-libs/freeglut )
+	odbc? ( dev-db/unixODBC )
+	iodbc? ( dev-db/libiodbc )
+	tommath? ( dev-libs/libtommath )
+	ncurses? ( sys-libs/ncurses:= )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+	)
+	tk? (
+		dev-lang/tcl:0
+		dev-lang/tk:0
+	)
+	X? ( x11-libs/libX11 )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}/extras
+
+mercury_pkgs() {
+	echo "
+		align_right/align_right:bin:
+		base64/mercury_base64:lib:
+		cgi/mercury_www:lib:
+		complex_numbers/complex_numbers:lib:
+		$(use ncurses && echo \
+			curs/curs:lib:ncurses,panel curses/mcurses:lib:ncurses)
+		dynamic_linking/dl:lib:
+		error/error:bin:
+		fixed/fixed:lib:
+		$(use gmp && echo gmp_int/gmp_int:lib:)
+		$(use tommath && echo mp_int/mp_int:lib:libtommath)
+		$(use X && echo graphics/easyx/easyx:lib:x11)
+		$(use cairo && echo graphics/mercury_cairo/mercury_cairo:lib:cairo)
+		$(use glut && echo graphics/mercury_glut/mercury_glut:lib:freeglut)
+		$(use opengl && echo graphics/mercury_opengl/mercury_opengl:lib:gl,glu)
+		$(use tk && echo graphics/mercury_tcltk/mercury_tcltk:lib:tk)
+		lex/lex:lib:
+		lex/regex:lib:
+		moose/moose:bin:
+		net/net:lib:
+		net/echo:bin:
+		$(use ssl && echo mopenssl/mopenssl:lib:openssl)
+		$(use odbc && echo odbc/odbc:lib:)
+		$(use iodbc && echo odbc/odbc:lib:libiodbc)
+		posix/posix:lib:
+		$(has_version dev-lang/mercury[trail] && echo \
+			references/global:lib: trailed_update/trailed_update:lib:)
+		show_ops/show_ops:bin:
+		solver_types/library/any:lib:
+		$(use xml && echo xml/xml:lib:)"
+}
+
+mercury_pkg_setup() {
+	mercury_pkg=${1%%:*}
+	mercury_pkg_dir=${mercury_pkg%/*}
+	mercury_pkg_name=${mercury_pkg##*/}
+
+	mercury_pkg_atts=${1#*:}
+	mercury_pkg_type=${mercury_pkg_atts%%:*}
+	mercury_pkg_deps=${mercury_pkg_atts#*:}
+
+	cd "${S}"/${mercury_pkg_dir} || die
+
+	echo ">> Preparing Mercury package: ${mercury_pkg}"
+
+	if ! test -f "${S}"/${mercury_pkg_dir}/gentoo.params; then
+		echo "LIBGRADES := \$(filter-out java,\$(LIBGRADES))" \
+			> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "LIBGRADES := \$(filter-out erlang,\$(LIBGRADES))" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "LIBGRADES := \$(filter-out csharp,\$(LIBGRADES))" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "include gentoo.params" > "${S}"/${mercury_pkg_dir}/Mmakefile
+	fi
+
+	if test -n "$mercury_pkg_deps"; then
+		echo "EXTRA_CFLAGS += $(pkg-config --cflags ${mercury_pkg_deps/,/ })" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "EXTRA_MLLIBS += $(pkg-config --libs ${mercury_pkg_deps/,/ })" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+	fi
+
+	if test ${mercury_pkg_name} = dl; then
+		echo "EXTRA_MLLIBS = -ldl" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+	elif test ${mercury_pkg_name} = gmp_int; then
+		echo "EXTRA_MLLIBS = -lgmp" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+	elif test ${mercury_pkg_name} = mercury_tcltk; then
+		echo "EXTRA_CFLAGS += -DUSE_INTERP_RESULT" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+	elif test ${mercury_pkg_name} = mopenssl; then
+		local net_libdir="${D}/usr/$(get_libdir)/mercury/extras/lib/\$(GRADE)"
+		echo "EXTRA_MLLIBS += -L${net_libdir} -L../net -lnet" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "net%:" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "	cp ../net/\$@ \$@" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+	elif test ${mercury_pkg_name} = odbc && use odbc; then
+		echo "EXTRA_CFLAGS = -DMODBC_UNIX -DMODBC_MYSQL" \
+			>> "${S}"/${mercury_pkg_dir}/Mmakefile
+		echo "EXTRA_MLLIBS = -lodbc" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+	elif test ${mercury_pkg_name} = odbc && use iodbc; then
+		echo "EXTRA_CFLAGS += -DMODBC_IODBC -DMODBC_MYSQL" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+	fi
+}
+
+mercury_pkg_compile() {
+	mercury_pkg=${1%%:*}
+	mercury_pkg_dir=${mercury_pkg%/*}
+	mercury_pkg_name=${mercury_pkg##*/}
+
+	mercury_pkg_atts=${1#*:}
+	mercury_pkg_type=${mercury_pkg_atts%:*}
+
+	cd "${S}"/${mercury_pkg_dir} || die
+
+	echo ">> Compiling Mercury package: ${mercury_pkg}"
+
+	if test "${mercury_pkg_type}" = "bin"; then
+		mercury_mmc_target=${mercury_pkg_name}
+	else
+		mercury_mmc_target=lib${mercury_pkg_name}
+	fi
+
+	# Mercury dependency generation must be run single-threaded
+	mmc -f *.m || die "mmc -f .m failed"
+	mmake -j1 \
+		${mercury_pkg_name}.depend \
+		|| die "mmake ${mercury_pkg} depend failed"
+
+	# Compiling Mercury submodules is not thread-safe
+	mmake -j1 \
+		MLFLAGS=--no-strip \
+		CFLAGS="${CFLAGS}" \
+		LD_LIBFLAGS="${LDFLAGS}" \
+		${mercury_mmc_target} || die "mmake ${mercury_pkg} failed"
+
+}
+
+mercury_pkg_install() {
+	mercury_pkg=${1%%:*}
+	mercury_pkg_dir=${mercury_pkg%/*}
+	mercury_pkg_name=${mercury_pkg##*/}
+
+	mercury_pkg_atts=${1#*:}
+	mercury_pkg_type=${mercury_pkg_atts%:*}
+
+	cd "${S}"/${mercury_pkg_dir} || die
+
+	echo ">> Installing Mercury package: ${mercury_pkg}"
+
+	if test "${mercury_pkg_type}" = "bin"; then
+		into /usr/$(get_libdir)/mercury/extras
+		dobin ${mercury_pkg_name}
+	else
+		# Compiling Mercury submodules is not thread-safe
+		mmake -j1 \
+			MLFLAGS=--no-strip \
+			CFLAGS="${CFLAGS}" \
+			LD_LIBFLAGS="${LDFLAGS}" \
+			INSTALL_LIBDIR="${D}/usr/$(get_libdir)/mercury/extras" \
+			lib${mercury_pkg_name}.install || die "mmake ${mercury_pkg} failed"
+	fi
+}
+
+src_prepare() {
+	cd "${WORKDIR}"/${MY_P}
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		eapply "${WORKDIR}"/${PV}
+	fi
+	eapply_user
+
+	cd "${S}"
+	for mercury_pkg in $(mercury_pkgs); do
+		mercury_pkg_setup ${mercury_pkg}
+	done
+}
+
+src_compile() {
+	for mercury_pkg in $(mercury_pkgs); do
+		mercury_pkg_compile ${mercury_pkg}
+	done
+}
+
+src_install() {
+	for mercury_pkg in $(mercury_pkgs); do
+		mercury_pkg_install ${mercury_pkg}
+	done
+
+	cd "${S}"
+	dodoc README
+
+	if use examples; then
+		docinto samples/cgi
+		dodoc cgi/form_test.m
+
+		docinto samples/complex_numbers
+		dodoc complex_numbers/samples/*.m
+
+		if use ncurses; then
+			docinto samples/curs
+			dodoc curs/samples/*.m
+
+			docinto samples/curses
+			dodoc curses/sample/*.m
+		fi
+
+		docinto samples/dynamic_linking
+		dodoc dynamic_linking/{hello,dl_test}.m
+
+		docinto samples/gator
+		dodoc -r gator/*
+
+		if use gmp; then
+			docinto samples/gmp_int
+			dodoc gmp_int/gmp_int_test.m
+		fi
+
+		if use tommath; then
+			docinto samples/mp_int
+			dodoc mp_int/mp_int_test.m
+		fi
+
+		if use X; then
+			docinto samples/graphics
+			dodoc graphics/easyx/samples/*.m
+		fi
+
+		if use glut && use opengl; then
+			docinto samples/graphics
+			dodoc graphics/samples/gears/*.m
+			dodoc graphics/samples/maze/*.m
+		fi
+
+		if use tk; then
+			docinto samples/graphics
+			dodoc graphics/samples/calc/*.m
+		fi
+
+		if use opengl && use tk; then
+			docinto samples/graphics
+			dodoc graphics/samples/pent/*.m
+		fi
+
+		docinto samples/lex
+		dodoc lex/samples/*.m
+
+		docinto samples/log4m
+		dodoc log4m/*.m
+
+		docinto samples/monte
+		dodoc monte/*.m
+
+		docinto samples/moose
+		dodoc moose/samples/*
+
+		docinto samples/net
+		dodoc net/test_lookups.m
+
+		if use odbc || use iodbc; then
+			docinto samples/odbc
+			dodoc odbc/odbc_test.m
+		fi
+
+		docinto samples/posix
+		dodoc posix/samples/*.m
+
+		docinto samples/random
+		dodoc random/*.m
+
+		if has_version dev-lang/mercury[trail]; then
+			docinto samples/references
+			dodoc references/samples/*.m
+
+			docinto samples/trail
+			dodoc trail/*.m
+
+			docinto samples/trailed_update
+			dodoc trailed_update/samples/*.m
+		fi
+
+		if use xml; then
+			docinto samples/xml
+			dodoc xml/tryit.m
+			dodoc xml/samples/*
+			dodoc xml_stylesheets/*.xsl
+		fi
+
+		ecvs_clean
+	fi
+}


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2020-07-23 11:43 Keri Harris
  0 siblings, 0 replies; 40+ messages in thread
From: Keri Harris @ 2020-07-23 11:43 UTC (permalink / raw
  To: gentoo-commits

commit:     71b7df4cb2c12d7ebe7ef2d3db43b27224a1ad33
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 23 11:42:50 2020 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Thu Jul 23 11:43:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71b7df4c

dev-lang/mercury-extras: respect LDFLAGS. Closes #723054

Package-Manager: Portage-2.3.103, Repoman-2.3.22
Signed-off-by: Keri Harris <keri <AT> gentoo.org>

 dev-lang/mercury-extras/mercury-extras-20.01.2.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-lang/mercury-extras/mercury-extras-20.01.2.ebuild b/dev-lang/mercury-extras/mercury-extras-20.01.2.ebuild
index 99be15c46be..323a4b75ed0 100644
--- a/dev-lang/mercury-extras/mercury-extras-20.01.2.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-20.01.2.ebuild
@@ -158,6 +158,7 @@ mercury_pkg_compile() {
 	mmake -j1 \
 		MLFLAGS=--no-strip \
 		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
 		LD_LIBFLAGS="${LDFLAGS}" \
 		${mercury_mmc_target} || die "mmake ${mercury_pkg} failed"
 
@@ -183,6 +184,7 @@ mercury_pkg_install() {
 		mmake -j1 \
 			MLFLAGS=--no-strip \
 			CFLAGS="${CFLAGS}" \
+			LDFLAGS="${LDFLAGS}" \
 			LD_LIBFLAGS="${LDFLAGS}" \
 			INSTALL_LIBDIR="${D}/usr/$(get_libdir)/mercury/extras" \
 			lib${mercury_pkg_name}.install || die "mmake ${mercury_pkg} failed"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2020-07-26 13:37 Keri Harris
  0 siblings, 0 replies; 40+ messages in thread
From: Keri Harris @ 2020-07-26 13:37 UTC (permalink / raw
  To: gentoo-commits

commit:     0cb6b917403a0c4c5116ccde8cfb491b10d73185
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 26 13:36:32 2020 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sun Jul 26 13:36:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cb6b917

dev-lang/mercury-extras: support libressl in mopenssl Mercury package

Package-Manager: Portage-2.3.103, Repoman-2.3.22
Signed-off-by: Keri Harris <keri <AT> gentoo.org>

 dev-lang/mercury-extras/Manifest                      | 2 +-
 dev-lang/mercury-extras/mercury-extras-20.01.2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index 6be97f64c4a..f77046c4602 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,7 +1,7 @@
 DIST mercury-extras-14.01.1-gentoo-patchset-4.tar.gz 4361 BLAKE2B a1939e4b76782cb01fc7ee5dcb1ccbb885e93992d0e6f540552eb987f405b3a70671527dfacb873323f6030bb6de2f6cdd23768dbc36e8b656d836e2890b7d8a SHA512 e30ac4e9c0592a1ea5253663bf351814e91977ea53892dca4d996b217aac959265563910cc21aa64ee12a93ea379cb8143730585c7d32390bcf05f2a1b0590d7
 DIST mercury-extras-20.01-gentoo-patchset-0.tar.gz 542 BLAKE2B 4f24f5af21cbd566eb72ce03d618d858f16d02a921b506c933342181ea057d98377077535571223c85b1f1fa5854e52005f67f40dd75bb392929faaad889eed1 SHA512 6a2eb1dbaac1f028c0ce5f0e21a8f24bd4ba9b068f1ea5d8554c5fb7376642797709f0aa93db336d2f015b6f815d0aa27c7d60720aab340ace180d49791bd852
 DIST mercury-extras-20.01.1-gentoo-patchset-0.tar.gz 732 BLAKE2B 32287e116b94b540ca0b710eac8921669ff9a56b5d8a812eba8443609ccfc8c937baaa53a0ae4704abdc78013d58eddd0dc5cda7c807d7a0b724ebda1dede723 SHA512 0d3ca2984eb054ec2add5e05fb49d4fa711b3c78038b4e9777c4767083fc3bae552a261677fed6f07c293d2fb1ebf632ba633eb64a3a8ab4880c6f6619a197ea
-DIST mercury-extras-20.01.2-gentoo-patchset-0.tar.gz 715 BLAKE2B f59a10b6f313efb8446d2d8f1e69b5cb5118de01a59e67996897ba48726ed43a38fc763ee7fe9afad43999d416333138e6d9595eb76b31b10d990671e41b6e8e SHA512 a76e59b4737611de24fa7a25fc9e9dfff6df7199749209965ca888d2bd728be2f9092e0e9f73b7a83e165f178300a9a43ab287c1cafb9221246eecc48bf12c6f
+DIST mercury-extras-20.01.2-gentoo-patchset-1.tar.gz 922 BLAKE2B 3713bb18147328acfda4e605ca241a000b19c787f15998ba79b9198bf0bd2e5597df3198837efc24679655d923c56391973085c59498d5441626cab4bbce6226 SHA512 70fa7bb240ccee87557eaf84dba712f162543c0caca4e80ec2ab47ed9f5a81cc8f1ad47a85671cfe3f917c4757a653a6602e1c6461307887656683f638db225d
 DIST mercury-srcdist-14.01.1.tar.gz 52658945 BLAKE2B 6497921a0227b9a6fbcbabdd309ef3325f32dda14fc4ddb443368385b89be4011d677a24b30b3702147d1b782fe2597760ad66dd34503aa6aebaf79707466529 SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c
 DIST mercury-srcdist-20.01.1.tar.gz 47088335 BLAKE2B 1e3285dadc3748934e801b8ac0316d3005fbe24c20c9ceb694e9fc316d820fdb89c659107b25ee474fd6ac50d661dd029af9ca5082016a3b0827dd640a54a707 SHA512 24ad0bbecee46ab6ff669d63d64096b37a0d010bb44978a1785eee2701a8b30a83eab229af97cbbb18bca55b5e89be9ba74fe126d1d430da1e1e909366dc5b90
 DIST mercury-srcdist-20.01.2.tar.gz 46789217 BLAKE2B bc9637c1b4afb81d4bf35cd94a1f1d87b17094d8a6cbb7e5c8b0ff9c99ce59178d9e32bae246dd041ad781fe5d04e68db8f5effbb6bfcc29b76a83aad91a5666 SHA512 0deed9c0a13ebf793fb80def3fe6d9ee0aa4f0f2974865364eff81bdcac1ec0c41aafbec3e0146c8bdcf3245789e1003b2e4f8e219b53bec71e90074867a834d

diff --git a/dev-lang/mercury-extras/mercury-extras-20.01.2.ebuild b/dev-lang/mercury-extras/mercury-extras-20.01.2.ebuild
index 323a4b75ed0..bce2fa7c29f 100644
--- a/dev-lang/mercury-extras/mercury-extras-20.01.2.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-20.01.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit eutils multilib vcs-clean
 
-PATCHSET_VER="0"
+PATCHSET_VER="1"
 MY_P=mercury-srcdist-${PV}
 
 DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2020-09-13 10:48 Keri Harris
  0 siblings, 0 replies; 40+ messages in thread
From: Keri Harris @ 2020-09-13 10:48 UTC (permalink / raw
  To: gentoo-commits

commit:     6169fa84bab087e3f67bffe70222cdd0d4df9eb0
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 13 10:47:52 2020 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sun Sep 13 10:48:24 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6169fa84

dev-lang/mercury-extras: version bump

Package-Manager: Portage-2.3.103, Repoman-2.3.22
Signed-off-by: Keri Harris <keri <AT> gentoo.org>

 dev-lang/mercury-extras/Manifest                   |   2 +
 .../mercury-extras/mercury-extras-20.06.ebuild     | 319 +++++++++++++++++++++
 2 files changed, 321 insertions(+)

diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index f77046c4602..e308fc5a33e 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -2,7 +2,9 @@ DIST mercury-extras-14.01.1-gentoo-patchset-4.tar.gz 4361 BLAKE2B a1939e4b76782c
 DIST mercury-extras-20.01-gentoo-patchset-0.tar.gz 542 BLAKE2B 4f24f5af21cbd566eb72ce03d618d858f16d02a921b506c933342181ea057d98377077535571223c85b1f1fa5854e52005f67f40dd75bb392929faaad889eed1 SHA512 6a2eb1dbaac1f028c0ce5f0e21a8f24bd4ba9b068f1ea5d8554c5fb7376642797709f0aa93db336d2f015b6f815d0aa27c7d60720aab340ace180d49791bd852
 DIST mercury-extras-20.01.1-gentoo-patchset-0.tar.gz 732 BLAKE2B 32287e116b94b540ca0b710eac8921669ff9a56b5d8a812eba8443609ccfc8c937baaa53a0ae4704abdc78013d58eddd0dc5cda7c807d7a0b724ebda1dede723 SHA512 0d3ca2984eb054ec2add5e05fb49d4fa711b3c78038b4e9777c4767083fc3bae552a261677fed6f07c293d2fb1ebf632ba633eb64a3a8ab4880c6f6619a197ea
 DIST mercury-extras-20.01.2-gentoo-patchset-1.tar.gz 922 BLAKE2B 3713bb18147328acfda4e605ca241a000b19c787f15998ba79b9198bf0bd2e5597df3198837efc24679655d923c56391973085c59498d5441626cab4bbce6226 SHA512 70fa7bb240ccee87557eaf84dba712f162543c0caca4e80ec2ab47ed9f5a81cc8f1ad47a85671cfe3f917c4757a653a6602e1c6461307887656683f638db225d
+DIST mercury-extras-20.06-gentoo-patchset-0.tar.gz 1093 BLAKE2B cd0087a7a878c303a610e0007b352deec2e54b8223af1fbdcdd5e1fec0a7d6b4533895ba4ec01d4f90734349535a4c16c69f4ec60495f5a7888f99e4580e3ce3 SHA512 abd74dee931a01085a75f45d2793109737662345bdc68f4cf25dd874b59726da6a5ec8acd84cc8f0957052eeb9e5a9e3502090a0688fbea817d05c6948728ecb
 DIST mercury-srcdist-14.01.1.tar.gz 52658945 BLAKE2B 6497921a0227b9a6fbcbabdd309ef3325f32dda14fc4ddb443368385b89be4011d677a24b30b3702147d1b782fe2597760ad66dd34503aa6aebaf79707466529 SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c
 DIST mercury-srcdist-20.01.1.tar.gz 47088335 BLAKE2B 1e3285dadc3748934e801b8ac0316d3005fbe24c20c9ceb694e9fc316d820fdb89c659107b25ee474fd6ac50d661dd029af9ca5082016a3b0827dd640a54a707 SHA512 24ad0bbecee46ab6ff669d63d64096b37a0d010bb44978a1785eee2701a8b30a83eab229af97cbbb18bca55b5e89be9ba74fe126d1d430da1e1e909366dc5b90
 DIST mercury-srcdist-20.01.2.tar.gz 46789217 BLAKE2B bc9637c1b4afb81d4bf35cd94a1f1d87b17094d8a6cbb7e5c8b0ff9c99ce59178d9e32bae246dd041ad781fe5d04e68db8f5effbb6bfcc29b76a83aad91a5666 SHA512 0deed9c0a13ebf793fb80def3fe6d9ee0aa4f0f2974865364eff81bdcac1ec0c41aafbec3e0146c8bdcf3245789e1003b2e4f8e219b53bec71e90074867a834d
 DIST mercury-srcdist-20.01.tar.gz 47103868 BLAKE2B 68be786e925bdf94dcba6c6a2a746a384da345ee33250785d8d2b9281815694a4525cdd694c26f58051c097f2a897291e640e2139729ccede9bd2e472077d8c9 SHA512 90e36faa375603e596b2dd692363528120fda62ae6d2e2b119cf76de1656dae4028aff00858a4bff3fdfb9b2210ea17db0aa516ce4283604c46a5935dd2cd4b7
+DIST mercury-srcdist-20.06.tar.gz 47768559 BLAKE2B f242aa2ef7da53aa2dfa054e4fee8646434d276f0748b014e33ea52d22f2a8a37e6fecaa20617f4943c4c1e7d8c179ed0603a344fde2dd58da98b2bacadf1a71 SHA512 b76bd22d8eb16242c68b614ff122ed7ee7535efef6c0ceb8cc798fee4c550bc41b6faff2135cea43b24c652b654bb35ae049656585d8e7bf3a1122d07cb1ecf4

diff --git a/dev-lang/mercury-extras/mercury-extras-20.06.ebuild b/dev-lang/mercury-extras/mercury-extras-20.06.ebuild
new file mode 100644
index 00000000000..323a4b75ed0
--- /dev/null
+++ b/dev-lang/mercury-extras/mercury-extras-20.06.ebuild
@@ -0,0 +1,319 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils multilib vcs-clean
+
+PATCHSET_VER="0"
+MY_P=mercury-srcdist-${PV}
+
+DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
+HOMEPAGE="https://www.mercurylang.org/index.html"
+SRC_URI="https://dl.mercurylang.org/release/${MY_P}.tar.gz
+	https://dev.gentoo.org/~keri/distfiles/mercury-extras/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml"
+REQUIRED_USE="?? ( odbc iodbc )"
+
+RDEPEND="
+	~dev-lang/mercury-${PV}
+	cairo? ( >=x11-libs/cairo-1.10.0 )
+	gmp? ( dev-libs/gmp:0 )
+	glut? ( media-libs/freeglut )
+	odbc? ( dev-db/unixODBC )
+	iodbc? ( dev-db/libiodbc )
+	tommath? ( dev-libs/libtommath )
+	ncurses? ( sys-libs/ncurses:= )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+	)
+	tk? (
+		dev-lang/tcl:0
+		dev-lang/tk:0
+	)
+	X? ( x11-libs/libX11 )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}/extras
+
+mercury_pkgs() {
+	echo "
+		align_right/align_right:bin:
+		base64/mercury_base64:lib:
+		cgi/mercury_www:lib:
+		complex_numbers/complex_numbers:lib:
+		$(use ncurses && echo \
+			curs/curs:lib:ncurses,panel curses/mcurses:lib:ncurses)
+		dynamic_linking/dl:lib:
+		error/error:bin:
+		fixed/fixed:lib:
+		$(use gmp && echo gmp_int/gmp_int:lib:)
+		$(use tommath && echo mp_int/mp_int:lib:libtommath)
+		$(use X && echo graphics/easyx/easyx:lib:x11)
+		$(use cairo && echo graphics/mercury_cairo/mercury_cairo:lib:cairo)
+		$(use glut && echo graphics/mercury_glut/mercury_glut:lib:freeglut)
+		$(use opengl && echo graphics/mercury_opengl/mercury_opengl:lib:gl,glu)
+		$(use tk && echo graphics/mercury_tcltk/mercury_tcltk:lib:tk)
+		lex/lex:lib:
+		lex/regex:lib:
+		moose/moose:bin:
+		net/net:lib:
+		net/echo:bin:
+		$(use ssl && echo mopenssl/mopenssl:lib:openssl)
+		$(use odbc && echo odbc/odbc:lib:)
+		$(use iodbc && echo odbc/odbc:lib:libiodbc)
+		posix/posix:lib:
+		$(has_version dev-lang/mercury[trail] && echo \
+			references/global:lib: trailed_update/trailed_update:lib:)
+		show_ops/show_ops:bin:
+		solver_types/library/any:lib:
+		$(use xml && echo xml/xml:lib:)"
+}
+
+mercury_pkg_setup() {
+	mercury_pkg=${1%%:*}
+	mercury_pkg_dir=${mercury_pkg%/*}
+	mercury_pkg_name=${mercury_pkg##*/}
+
+	mercury_pkg_atts=${1#*:}
+	mercury_pkg_type=${mercury_pkg_atts%%:*}
+	mercury_pkg_deps=${mercury_pkg_atts#*:}
+
+	cd "${S}"/${mercury_pkg_dir} || die
+
+	echo ">> Preparing Mercury package: ${mercury_pkg}"
+
+	if ! test -f "${S}"/${mercury_pkg_dir}/gentoo.params; then
+		echo "LIBGRADES := \$(filter-out java,\$(LIBGRADES))" \
+			> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "LIBGRADES := \$(filter-out erlang,\$(LIBGRADES))" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "LIBGRADES := \$(filter-out csharp,\$(LIBGRADES))" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "include gentoo.params" > "${S}"/${mercury_pkg_dir}/Mmakefile
+	fi
+
+	if test -n "$mercury_pkg_deps"; then
+		echo "EXTRA_CFLAGS += $(pkg-config --cflags ${mercury_pkg_deps/,/ })" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "EXTRA_MLLIBS += $(pkg-config --libs ${mercury_pkg_deps/,/ })" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+	fi
+
+	if test ${mercury_pkg_name} = dl; then
+		echo "EXTRA_MLLIBS = -ldl" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+	elif test ${mercury_pkg_name} = gmp_int; then
+		echo "EXTRA_MLLIBS = -lgmp" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+	elif test ${mercury_pkg_name} = mercury_tcltk; then
+		echo "EXTRA_CFLAGS += -DUSE_INTERP_RESULT" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+	elif test ${mercury_pkg_name} = mopenssl; then
+		local net_libdir="${D}/usr/$(get_libdir)/mercury/extras/lib/\$(GRADE)"
+		echo "EXTRA_MLLIBS += -L${net_libdir} -L../net -lnet" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "net%:" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "	cp ../net/\$@ \$@" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+	elif test ${mercury_pkg_name} = odbc && use odbc; then
+		echo "EXTRA_CFLAGS = -DMODBC_UNIX -DMODBC_MYSQL" \
+			>> "${S}"/${mercury_pkg_dir}/Mmakefile
+		echo "EXTRA_MLLIBS = -lodbc" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+	elif test ${mercury_pkg_name} = odbc && use iodbc; then
+		echo "EXTRA_CFLAGS += -DMODBC_IODBC -DMODBC_MYSQL" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+	fi
+}
+
+mercury_pkg_compile() {
+	mercury_pkg=${1%%:*}
+	mercury_pkg_dir=${mercury_pkg%/*}
+	mercury_pkg_name=${mercury_pkg##*/}
+
+	mercury_pkg_atts=${1#*:}
+	mercury_pkg_type=${mercury_pkg_atts%:*}
+
+	cd "${S}"/${mercury_pkg_dir} || die
+
+	echo ">> Compiling Mercury package: ${mercury_pkg}"
+
+	if test "${mercury_pkg_type}" = "bin"; then
+		mercury_mmc_target=${mercury_pkg_name}
+	else
+		mercury_mmc_target=lib${mercury_pkg_name}
+	fi
+
+	# Mercury dependency generation must be run single-threaded
+	mmc -f *.m || die "mmc -f .m failed"
+	mmake -j1 \
+		${mercury_pkg_name}.depend \
+		|| die "mmake ${mercury_pkg} depend failed"
+
+	# Compiling Mercury submodules is not thread-safe
+	mmake -j1 \
+		MLFLAGS=--no-strip \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		LD_LIBFLAGS="${LDFLAGS}" \
+		${mercury_mmc_target} || die "mmake ${mercury_pkg} failed"
+
+}
+
+mercury_pkg_install() {
+	mercury_pkg=${1%%:*}
+	mercury_pkg_dir=${mercury_pkg%/*}
+	mercury_pkg_name=${mercury_pkg##*/}
+
+	mercury_pkg_atts=${1#*:}
+	mercury_pkg_type=${mercury_pkg_atts%:*}
+
+	cd "${S}"/${mercury_pkg_dir} || die
+
+	echo ">> Installing Mercury package: ${mercury_pkg}"
+
+	if test "${mercury_pkg_type}" = "bin"; then
+		into /usr/$(get_libdir)/mercury/extras
+		dobin ${mercury_pkg_name}
+	else
+		# Compiling Mercury submodules is not thread-safe
+		mmake -j1 \
+			MLFLAGS=--no-strip \
+			CFLAGS="${CFLAGS}" \
+			LDFLAGS="${LDFLAGS}" \
+			LD_LIBFLAGS="${LDFLAGS}" \
+			INSTALL_LIBDIR="${D}/usr/$(get_libdir)/mercury/extras" \
+			lib${mercury_pkg_name}.install || die "mmake ${mercury_pkg} failed"
+	fi
+}
+
+src_prepare() {
+	cd "${WORKDIR}"/${MY_P}
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		eapply "${WORKDIR}"/${PV}
+	fi
+	eapply_user
+
+	cd "${S}"
+	for mercury_pkg in $(mercury_pkgs); do
+		mercury_pkg_setup ${mercury_pkg}
+	done
+}
+
+src_compile() {
+	for mercury_pkg in $(mercury_pkgs); do
+		mercury_pkg_compile ${mercury_pkg}
+	done
+}
+
+src_install() {
+	for mercury_pkg in $(mercury_pkgs); do
+		mercury_pkg_install ${mercury_pkg}
+	done
+
+	cd "${S}"
+	dodoc README
+
+	if use examples; then
+		docinto samples/cgi
+		dodoc cgi/form_test.m
+
+		docinto samples/complex_numbers
+		dodoc complex_numbers/samples/*.m
+
+		if use ncurses; then
+			docinto samples/curs
+			dodoc curs/samples/*.m
+
+			docinto samples/curses
+			dodoc curses/sample/*.m
+		fi
+
+		docinto samples/dynamic_linking
+		dodoc dynamic_linking/{hello,dl_test}.m
+
+		docinto samples/gator
+		dodoc -r gator/*
+
+		if use gmp; then
+			docinto samples/gmp_int
+			dodoc gmp_int/gmp_int_test.m
+		fi
+
+		if use tommath; then
+			docinto samples/mp_int
+			dodoc mp_int/mp_int_test.m
+		fi
+
+		if use X; then
+			docinto samples/graphics
+			dodoc graphics/easyx/samples/*.m
+		fi
+
+		if use glut && use opengl; then
+			docinto samples/graphics
+			dodoc graphics/samples/gears/*.m
+			dodoc graphics/samples/maze/*.m
+		fi
+
+		if use tk; then
+			docinto samples/graphics
+			dodoc graphics/samples/calc/*.m
+		fi
+
+		if use opengl && use tk; then
+			docinto samples/graphics
+			dodoc graphics/samples/pent/*.m
+		fi
+
+		docinto samples/lex
+		dodoc lex/samples/*.m
+
+		docinto samples/log4m
+		dodoc log4m/*.m
+
+		docinto samples/monte
+		dodoc monte/*.m
+
+		docinto samples/moose
+		dodoc moose/samples/*
+
+		docinto samples/net
+		dodoc net/test_lookups.m
+
+		if use odbc || use iodbc; then
+			docinto samples/odbc
+			dodoc odbc/odbc_test.m
+		fi
+
+		docinto samples/posix
+		dodoc posix/samples/*.m
+
+		docinto samples/random
+		dodoc random/*.m
+
+		if has_version dev-lang/mercury[trail]; then
+			docinto samples/references
+			dodoc references/samples/*.m
+
+			docinto samples/trail
+			dodoc trail/*.m
+
+			docinto samples/trailed_update
+			dodoc trailed_update/samples/*.m
+		fi
+
+		if use xml; then
+			docinto samples/xml
+			dodoc xml/tryit.m
+			dodoc xml/samples/*
+			dodoc xml_stylesheets/*.xsl
+		fi
+
+		ecvs_clean
+	fi
+}


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2020-09-15 11:07 Keri Harris
  0 siblings, 0 replies; 40+ messages in thread
From: Keri Harris @ 2020-09-15 11:07 UTC (permalink / raw
  To: gentoo-commits

commit:     86466ba3088d0d222daade58230ede2729dc4bed
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 15 11:07:13 2020 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Tue Sep 15 11:07:41 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86466ba3

dev-lang/mercury-extras: use mmc instead of mmake to build libraries

Package-Manager: Portage-3.0.4, Repoman-2.3.22
Signed-off-by: Keri Harris <keri <AT> gentoo.org>

 .../mercury-extras/mercury-extras-20.06.ebuild     | 86 +++++++++-------------
 1 file changed, 36 insertions(+), 50 deletions(-)

diff --git a/dev-lang/mercury-extras/mercury-extras-20.06.ebuild b/dev-lang/mercury-extras/mercury-extras-20.06.ebuild
index 323a4b75ed0..cf0817367fe 100644
--- a/dev-lang/mercury-extras/mercury-extras-20.06.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-20.06.ebuild
@@ -67,11 +67,11 @@ mercury_pkgs() {
 		net/net:lib:
 		net/echo:bin:
 		$(use ssl && echo mopenssl/mopenssl:lib:openssl)
-		$(use odbc && echo odbc/odbc:lib:)
+		$(use odbc && echo odbc/odbc:lib:odbc)
 		$(use iodbc && echo odbc/odbc:lib:libiodbc)
 		posix/posix:lib:
 		$(has_version dev-lang/mercury[trail] && echo \
-			references/global:lib: trailed_update/trailed_update:lib:)
+			references/global:lib:)
 		show_ops/show_ops:bin:
 		solver_types/library/any:lib:
 		$(use xml && echo xml/xml:lib:)"
@@ -90,43 +90,33 @@ mercury_pkg_setup() {
 
 	echo ">> Preparing Mercury package: ${mercury_pkg}"
 
-	if ! test -f "${S}"/${mercury_pkg_dir}/gentoo.params; then
-		echo "LIBGRADES := \$(filter-out java,\$(LIBGRADES))" \
-			> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "LIBGRADES := \$(filter-out erlang,\$(LIBGRADES))" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "LIBGRADES := \$(filter-out csharp,\$(LIBGRADES))" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "include gentoo.params" > "${S}"/${mercury_pkg_dir}/Mmakefile
-	fi
+	echo "MCFLAGS += --libgrades-exclude java" \
+		>> "${S}"/${mercury_pkg_dir}/Mercury.options
+	echo "MCFLAGS += --libgrades-exclude erlang" \
+		>> "${S}"/${mercury_pkg_dir}/Mercury.options
+	echo "MCFLAGS += --libgrades-exclude csharp" \
+		>> "${S}"/${mercury_pkg_dir}/Mercury.options
 
 	if test -n "$mercury_pkg_deps"; then
 		echo "EXTRA_CFLAGS += $(pkg-config --cflags ${mercury_pkg_deps/,/ })" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "EXTRA_MLLIBS += $(pkg-config --libs ${mercury_pkg_deps/,/ })" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+			>> "${S}"/${mercury_pkg_dir}/Mercury.options
+		echo "EXTRA_LDFLAGS += $(pkg-config --libs ${mercury_pkg_deps/,/ })" \
+			>> "${S}"/${mercury_pkg_dir}/Mercury.options
 	fi
 
 	if test ${mercury_pkg_name} = dl; then
-		echo "EXTRA_MLLIBS = -ldl" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "EXTRA_LDFLAGS += -ldl" >> "${S}"/${mercury_pkg_dir}/Mercury.options
 	elif test ${mercury_pkg_name} = gmp_int; then
-		echo "EXTRA_MLLIBS = -lgmp" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "EXTRA_LDFLAGS += -lgmp" >> "${S}"/${mercury_pkg_dir}/Mercury.options
 	elif test ${mercury_pkg_name} = mercury_tcltk; then
 		echo "EXTRA_CFLAGS += -DUSE_INTERP_RESULT" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-	elif test ${mercury_pkg_name} = mopenssl; then
-		local net_libdir="${D}/usr/$(get_libdir)/mercury/extras/lib/\$(GRADE)"
-		echo "EXTRA_MLLIBS += -L${net_libdir} -L../net -lnet" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "net%:" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "	cp ../net/\$@ \$@" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+			>> "${S}"/${mercury_pkg_dir}/Mercury.options
 	elif test ${mercury_pkg_name} = odbc && use odbc; then
-		echo "EXTRA_CFLAGS = -DMODBC_UNIX -DMODBC_MYSQL" \
-			>> "${S}"/${mercury_pkg_dir}/Mmakefile
-		echo "EXTRA_MLLIBS = -lodbc" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "EXTRA_CFLAGS += -DMODBC_UNIX -DMODBC_MYSQL" \
+			>> "${S}"/${mercury_pkg_dir}/Mercury.options
 	elif test ${mercury_pkg_name} = odbc && use iodbc; then
 		echo "EXTRA_CFLAGS += -DMODBC_IODBC -DMODBC_MYSQL" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+			>> "${S}"/${mercury_pkg_dir}/Mercury.options
 	fi
 }
 
@@ -148,20 +138,16 @@ mercury_pkg_compile() {
 		mercury_mmc_target=lib${mercury_pkg_name}
 	fi
 
-	# Mercury dependency generation must be run single-threaded
 	mmc -f *.m || die "mmc -f .m failed"
-	mmake -j1 \
-		${mercury_pkg_name}.depend \
-		|| die "mmake ${mercury_pkg} depend failed"
-
-	# Compiling Mercury submodules is not thread-safe
-	mmake -j1 \
-		MLFLAGS=--no-strip \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		LD_LIBFLAGS="${LDFLAGS}" \
-		${mercury_mmc_target} || die "mmake ${mercury_pkg} failed"
 
+	mmc \
+		--make \
+		--verbose-commands \
+		--no-strip \
+		--cflags "${CFLAGS}" \
+		--ld-flags "${LDFLAGS}" \
+		--ld-libflags "${LDFLAGS}" \
+		${mercury_mmc_target} || die "mmc ${mercury_mmc_target} failed"
 }
 
 mercury_pkg_install() {
@@ -180,14 +166,15 @@ mercury_pkg_install() {
 		into /usr/$(get_libdir)/mercury/extras
 		dobin ${mercury_pkg_name}
 	else
-		# Compiling Mercury submodules is not thread-safe
-		mmake -j1 \
-			MLFLAGS=--no-strip \
-			CFLAGS="${CFLAGS}" \
-			LDFLAGS="${LDFLAGS}" \
-			LD_LIBFLAGS="${LDFLAGS}" \
-			INSTALL_LIBDIR="${D}/usr/$(get_libdir)/mercury/extras" \
-			lib${mercury_pkg_name}.install || die "mmake ${mercury_pkg} failed"
+		mmc \
+			--make \
+			--verbose-commands \
+			--no-strip \
+			--cflags "${CFLAGS}" \
+			--ld-flags "${LDFLAGS}" \
+			--ld-libflags "${LDFLAGS}" \
+			--install-prefix "${D}/usr/$(get_libdir)/mercury/extras" \
+			lib${mercury_pkg_name}.install || die "mmc lib${mercury_pkg_name}.install failed"
 	fi
 }
 
@@ -202,6 +189,8 @@ src_prepare() {
 	for mercury_pkg in $(mercury_pkgs); do
 		mercury_pkg_setup ${mercury_pkg}
 	done
+
+	cp "${S}"/net/*.m "${S}"/mopenssl/ || die
 }
 
 src_compile() {
@@ -302,9 +291,6 @@ src_install() {
 
 			docinto samples/trail
 			dodoc trail/*.m
-
-			docinto samples/trailed_update
-			dodoc trailed_update/samples/*.m
 		fi
 
 		if use xml; then


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2021-01-07  7:25 Keri Harris
  0 siblings, 0 replies; 40+ messages in thread
From: Keri Harris @ 2021-01-07  7:25 UTC (permalink / raw
  To: gentoo-commits

commit:     7b966011600f6cb04397d2e7715ccdbec545b4a6
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  7 07:25:30 2021 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Thu Jan  7 07:25:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b966011

dev-lang/mercury-extras: stabilize 20.06 amd64 + x86, #764194

Package-Manager: Portage-3.0.4, Repoman-2.3.22
Signed-off-by: Keri Harris <keri <AT> gentoo.org>

 dev-lang/mercury-extras/mercury-extras-20.06.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/mercury-extras/mercury-extras-20.06.ebuild b/dev-lang/mercury-extras/mercury-extras-20.06.ebuild
index cf0817367fe..7a5e3bfc206 100644
--- a/dev-lang/mercury-extras/mercury-extras-20.06.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-20.06.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://dl.mercurylang.org/release/${MY_P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml"
 REQUIRED_USE="?? ( odbc iodbc )"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2021-01-18 16:04 Keri Harris
  0 siblings, 0 replies; 40+ messages in thread
From: Keri Harris @ 2021-01-18 16:04 UTC (permalink / raw
  To: gentoo-commits

commit:     92466fed84ff7f9478fcded8f2ccdcd7f92c16c1
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 18 16:03:15 2021 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 16:03:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92466fed

dev-lang/mercury-extras: remove old versions

Package-Manager: Portage-3.0.4, Repoman-2.3.22
Signed-off-by: Keri Harris <keri <AT> gentoo.org>

 dev-lang/mercury-extras/Manifest                   |   8 -
 .../mercury-extras/mercury-extras-14.01.1.ebuild   | 199 -------------
 .../mercury-extras/mercury-extras-20.01.1.ebuild   | 317 --------------------
 .../mercury-extras/mercury-extras-20.01.2.ebuild   | 319 ---------------------
 .../mercury-extras/mercury-extras-20.01.ebuild     | 317 --------------------
 5 files changed, 1160 deletions(-)

diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index e308fc5a33e..e3dcc3fd7ef 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,10 +1,2 @@
-DIST mercury-extras-14.01.1-gentoo-patchset-4.tar.gz 4361 BLAKE2B a1939e4b76782cb01fc7ee5dcb1ccbb885e93992d0e6f540552eb987f405b3a70671527dfacb873323f6030bb6de2f6cdd23768dbc36e8b656d836e2890b7d8a SHA512 e30ac4e9c0592a1ea5253663bf351814e91977ea53892dca4d996b217aac959265563910cc21aa64ee12a93ea379cb8143730585c7d32390bcf05f2a1b0590d7
-DIST mercury-extras-20.01-gentoo-patchset-0.tar.gz 542 BLAKE2B 4f24f5af21cbd566eb72ce03d618d858f16d02a921b506c933342181ea057d98377077535571223c85b1f1fa5854e52005f67f40dd75bb392929faaad889eed1 SHA512 6a2eb1dbaac1f028c0ce5f0e21a8f24bd4ba9b068f1ea5d8554c5fb7376642797709f0aa93db336d2f015b6f815d0aa27c7d60720aab340ace180d49791bd852
-DIST mercury-extras-20.01.1-gentoo-patchset-0.tar.gz 732 BLAKE2B 32287e116b94b540ca0b710eac8921669ff9a56b5d8a812eba8443609ccfc8c937baaa53a0ae4704abdc78013d58eddd0dc5cda7c807d7a0b724ebda1dede723 SHA512 0d3ca2984eb054ec2add5e05fb49d4fa711b3c78038b4e9777c4767083fc3bae552a261677fed6f07c293d2fb1ebf632ba633eb64a3a8ab4880c6f6619a197ea
-DIST mercury-extras-20.01.2-gentoo-patchset-1.tar.gz 922 BLAKE2B 3713bb18147328acfda4e605ca241a000b19c787f15998ba79b9198bf0bd2e5597df3198837efc24679655d923c56391973085c59498d5441626cab4bbce6226 SHA512 70fa7bb240ccee87557eaf84dba712f162543c0caca4e80ec2ab47ed9f5a81cc8f1ad47a85671cfe3f917c4757a653a6602e1c6461307887656683f638db225d
 DIST mercury-extras-20.06-gentoo-patchset-0.tar.gz 1093 BLAKE2B cd0087a7a878c303a610e0007b352deec2e54b8223af1fbdcdd5e1fec0a7d6b4533895ba4ec01d4f90734349535a4c16c69f4ec60495f5a7888f99e4580e3ce3 SHA512 abd74dee931a01085a75f45d2793109737662345bdc68f4cf25dd874b59726da6a5ec8acd84cc8f0957052eeb9e5a9e3502090a0688fbea817d05c6948728ecb
-DIST mercury-srcdist-14.01.1.tar.gz 52658945 BLAKE2B 6497921a0227b9a6fbcbabdd309ef3325f32dda14fc4ddb443368385b89be4011d677a24b30b3702147d1b782fe2597760ad66dd34503aa6aebaf79707466529 SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c
-DIST mercury-srcdist-20.01.1.tar.gz 47088335 BLAKE2B 1e3285dadc3748934e801b8ac0316d3005fbe24c20c9ceb694e9fc316d820fdb89c659107b25ee474fd6ac50d661dd029af9ca5082016a3b0827dd640a54a707 SHA512 24ad0bbecee46ab6ff669d63d64096b37a0d010bb44978a1785eee2701a8b30a83eab229af97cbbb18bca55b5e89be9ba74fe126d1d430da1e1e909366dc5b90
-DIST mercury-srcdist-20.01.2.tar.gz 46789217 BLAKE2B bc9637c1b4afb81d4bf35cd94a1f1d87b17094d8a6cbb7e5c8b0ff9c99ce59178d9e32bae246dd041ad781fe5d04e68db8f5effbb6bfcc29b76a83aad91a5666 SHA512 0deed9c0a13ebf793fb80def3fe6d9ee0aa4f0f2974865364eff81bdcac1ec0c41aafbec3e0146c8bdcf3245789e1003b2e4f8e219b53bec71e90074867a834d
-DIST mercury-srcdist-20.01.tar.gz 47103868 BLAKE2B 68be786e925bdf94dcba6c6a2a746a384da345ee33250785d8d2b9281815694a4525cdd694c26f58051c097f2a897291e640e2139729ccede9bd2e472077d8c9 SHA512 90e36faa375603e596b2dd692363528120fda62ae6d2e2b119cf76de1656dae4028aff00858a4bff3fdfb9b2210ea17db0aa516ce4283604c46a5935dd2cd4b7
 DIST mercury-srcdist-20.06.tar.gz 47768559 BLAKE2B f242aa2ef7da53aa2dfa054e4fee8646434d276f0748b014e33ea52d22f2a8a37e6fecaa20617f4943c4c1e7d8c179ed0603a344fde2dd58da98b2bacadf1a71 SHA512 b76bd22d8eb16242c68b614ff122ed7ee7535efef6c0ceb8cc798fee4c550bc41b6faff2135cea43b24c652b654bb35ae049656585d8e7bf3a1122d07cb1ecf4

diff --git a/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild b/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
deleted file mode 100644
index 6298fa9e072..00000000000
--- a/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib vcs-clean
-
-PATCHSET_VER="4"
-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
-		virtual/glu
-	)
-	tcl? ( tk? (
-			dev-lang/tcl:0
-			dev-lang/tk:0
-			x11-libs/libX11
-			x11-libs/libXmu
-		)
-	)"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}/extras
-
-mercury_pkgs()
-{
-	echo   "base64
-		cgi
-		complex_numbers
-		dynamic_linking
-		error
-		fixed
-		lex
-		moose
-		posix
-		solver_types/library
-		$(use ncurses && echo curs curses)
-		$(use glut && echo graphics/mercury_glut)
-		$(use opengl && echo graphics/mercury_opengl)
-		$(use tcl && use tk && echo graphics/mercury_tcltk)
-		$(use odbc && echo odbc || (use iodbc && echo odbc) )
-		$(has_version dev-lang/mercury[trail] && echo references)
-		$(usev xml)"
-}
-
-src_prepare() {
-	cd "${WORKDIR}"
-
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		epatch "${WORKDIR}"/${PV}
-	fi
-
-	cd "${S}"
-	if use odbc; then
-		cp odbc/Mmakefile.odbc odbc/Mmakefile
-	elif use iodbc; then
-		cp odbc/Mmakefile.iodbc odbc/Mmakefile
-	fi
-}
-
-src_compile() {
-	local MERCURY_PKGS="$(mercury_pkgs)"
-
-	# Mercury dependency generation must be run single-threaded
-	mmake -j1 \
-		SUBDIRS="${MERCURY_PKGS}" \
-		depend || die "mmake depend failed"
-
-	# Compiling Mercury submodules is not thread-safe
-	mmake -j1 \
-		SUBDIRS="${MERCURY_PKGS}" \
-		EXTRA_MLFLAGS=--no-strip \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		EXTRA_LDFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \
-		|| die "mmake failed"
-
-	if use cairo; then
-		cd "${S}"/graphics/mercury_cairo
-		mmc --make libmercury_cairo \
-			|| die "mmc --make libmercury_cairo failed"
-	fi
-}
-
-src_install() {
-	local MERCURY_PKGS="$(mercury_pkgs)"
-
-	# Compiling Mercury submodules is not thread-safe
-	mmake -j1 \
-		SUBDIRS="${MERCURY_PKGS}" \
-		EXTRA_MLFLAGS=--no-strip \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		EXTRA_LDFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \
-		DESTDIR="${D}" \
-		INSTALL_PREFIX="${D}"/usr \
-		install || die "mmake install failed"
-
-	if use cairo; then
-		cd "${S}"/graphics/mercury_cairo
-		INSTALL_PREFIX="${D}"/usr \
-		mmc --make libmercury_cairo.install \
-			|| die "mmc --make libmercury_cairo.install failed"
-	fi
-
-	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
-
-		insinto /usr/share/doc/${PF}/samples/complex_numbers
-		doins complex_numbers/samples/*
-
-		insinto /usr/share/doc/${PF}/samples/dynamic_linking
-		doins dynamic_linking/hello.m
-
-		insinto /usr/share/doc/${PF}/samples/error
-		doins error/*
-
-		insinto /usr/share/doc/${PF}/samples/fixed
-		doins fixed/*.m
-
-		insinto /usr/share/doc/${PF}/samples/gator
-		doins -r gator/*
-
-		insinto /usr/share/doc/${PF}/samples/lex
-		doins lex/samples/*
-
-		insinto /usr/share/doc/${PF}/samples/log4m
-		doins log4m/*.m
-
-		insinto /usr/share/doc/${PF}/samples/monte
-		doins monte/*.m
-
-		insinto /usr/share/doc/${PF}/samples/moose
-		doins moose/samples/*
-
-		insinto /usr/share/doc/${PF}/samples/net
-		doins net/*.m
-
-		if use ncurses; then
-			insinto /usr/share/doc/${PF}/samples/curs
-			doins curs/samples/*
-
-			insinto /usr/share/doc/${PF}/samples/curses
-			doins curses/sample/*
-		fi
-
-		if use X; then
-			insinto /usr/share/doc/${PF}/samples/graphics
-			doins graphics/easyx/samples/*.m
-		fi
-
-		if use glut && use opengl; then
-			insinto /usr/share/doc/${PF}/samples/graphics
-			doins graphics/samples/calc/*
-			doins graphics/samples/gears/*
-			doins graphics/samples/maze/*
-			doins graphics/samples/pent/*
-		fi
-
-		if use opengl && use tcl && use tk; then
-			insinto /usr/share/doc/${PF}/samples/graphics
-			doins graphics/samples/pent/*.m
-		fi
-
-		if use ssl; then
-			insinto /usr/share/doc/${PF}/samples/mopenssl
-			doins mopenssl/*.m
-		fi
-
-		ecvs_clean
-	fi
-
-	dodoc README
-}

diff --git a/dev-lang/mercury-extras/mercury-extras-20.01.1.ebuild b/dev-lang/mercury-extras/mercury-extras-20.01.1.ebuild
deleted file mode 100644
index 7595eae754b..00000000000
--- a/dev-lang/mercury-extras/mercury-extras-20.01.1.ebuild
+++ /dev/null
@@ -1,317 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils multilib vcs-clean
-
-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="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml"
-REQUIRED_USE="?? ( odbc iodbc )"
-
-RDEPEND="
-	~dev-lang/mercury-${PV}
-	cairo? ( >=x11-libs/cairo-1.10.0 )
-	gmp? ( dev-libs/gmp:0 )
-	glut? ( media-libs/freeglut )
-	odbc? ( dev-db/unixODBC )
-	iodbc? ( dev-db/libiodbc )
-	tommath? ( dev-libs/libtommath )
-	ncurses? ( sys-libs/ncurses:= )
-	opengl? (
-		virtual/opengl
-		virtual/glu
-	)
-	tk? (
-		dev-lang/tcl:0
-		dev-lang/tk:0
-	)
-	X? ( x11-libs/libX11 )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}/extras
-
-mercury_pkgs() {
-	echo "
-		align_right/align_right:bin:
-		base64/mercury_base64:lib:
-		cgi/mercury_www:lib:
-		complex_numbers/complex_numbers:lib:
-		$(use ncurses && echo \
-			curs/curs:lib:ncurses,panel curses/mcurses:lib:ncurses)
-		dynamic_linking/dl:lib:
-		error/error:bin:
-		fixed/fixed:lib:
-		$(use gmp && echo gmp_int/gmp_int:lib:)
-		$(use tommath && echo mp_int/mp_int:lib:libtommath)
-		$(use X && echo graphics/easyx/easyx:lib:x11)
-		$(use cairo && echo graphics/mercury_cairo/mercury_cairo:lib:cairo)
-		$(use glut && echo graphics/mercury_glut/mercury_glut:lib:freeglut)
-		$(use opengl && echo graphics/mercury_opengl/mercury_opengl:lib:gl,glu)
-		$(use tk && echo graphics/mercury_tcltk/mercury_tcltk:lib:tk)
-		lex/lex:lib:
-		lex/regex:lib:
-		moose/moose:bin:
-		net/net:lib:
-		net/echo:bin:
-		$(use ssl && echo mopenssl/mopenssl:lib:openssl)
-		$(use odbc && echo odbc/odbc:lib:)
-		$(use iodbc && echo odbc/odbc:lib:libiodbc)
-		posix/posix:lib:
-		$(has_version dev-lang/mercury[trail] && echo \
-			references/global:lib: trailed_update/trailed_update:lib:)
-		show_ops/show_ops:bin:
-		solver_types/library/any:lib:
-		$(use xml && echo xml/xml:lib:)"
-}
-
-mercury_pkg_setup() {
-	mercury_pkg=${1%%:*}
-	mercury_pkg_dir=${mercury_pkg%/*}
-	mercury_pkg_name=${mercury_pkg##*/}
-
-	mercury_pkg_atts=${1#*:}
-	mercury_pkg_type=${mercury_pkg_atts%%:*}
-	mercury_pkg_deps=${mercury_pkg_atts#*:}
-
-	cd "${S}"/${mercury_pkg_dir} || die
-
-	echo ">> Preparing Mercury package: ${mercury_pkg}"
-
-	if ! test -f "${S}"/${mercury_pkg_dir}/gentoo.params; then
-		echo "LIBGRADES := \$(filter-out java,\$(LIBGRADES))" \
-			> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "LIBGRADES := \$(filter-out erlang,\$(LIBGRADES))" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "LIBGRADES := \$(filter-out csharp,\$(LIBGRADES))" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "include gentoo.params" > "${S}"/${mercury_pkg_dir}/Mmakefile
-	fi
-
-	if test -n "$mercury_pkg_deps"; then
-		echo "EXTRA_CFLAGS += $(pkg-config --cflags ${mercury_pkg_deps/,/ })" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "EXTRA_MLLIBS += $(pkg-config --libs ${mercury_pkg_deps/,/ })" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-	fi
-
-	if test ${mercury_pkg_name} = dl; then
-		echo "EXTRA_MLLIBS = -ldl" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-	elif test ${mercury_pkg_name} = gmp_int; then
-		echo "EXTRA_MLLIBS = -lgmp" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-	elif test ${mercury_pkg_name} = mercury_tcltk; then
-		echo "EXTRA_CFLAGS += -DUSE_INTERP_RESULT" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-	elif test ${mercury_pkg_name} = mopenssl; then
-		local net_libdir="${D}/usr/$(get_libdir)/mercury/extras/lib/\$(GRADE)"
-		echo "EXTRA_MLLIBS += -L${net_libdir} -L../net -lnet" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "net%:" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "	cp ../net/\$@ \$@" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-	elif test ${mercury_pkg_name} = odbc && use odbc; then
-		echo "EXTRA_CFLAGS = -DMODBC_UNIX -DMODBC_MYSQL" \
-			>> "${S}"/${mercury_pkg_dir}/Mmakefile
-		echo "EXTRA_MLLIBS = -lodbc" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-	elif test ${mercury_pkg_name} = odbc && use iodbc; then
-		echo "EXTRA_CFLAGS += -DMODBC_IODBC -DMODBC_MYSQL" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-	fi
-}
-
-mercury_pkg_compile() {
-	mercury_pkg=${1%%:*}
-	mercury_pkg_dir=${mercury_pkg%/*}
-	mercury_pkg_name=${mercury_pkg##*/}
-
-	mercury_pkg_atts=${1#*:}
-	mercury_pkg_type=${mercury_pkg_atts%:*}
-
-	cd "${S}"/${mercury_pkg_dir} || die
-
-	echo ">> Compiling Mercury package: ${mercury_pkg}"
-
-	if test "${mercury_pkg_type}" = "bin"; then
-		mercury_mmc_target=${mercury_pkg_name}
-	else
-		mercury_mmc_target=lib${mercury_pkg_name}
-	fi
-
-	# Mercury dependency generation must be run single-threaded
-	mmc -f *.m || die "mmc -f .m failed"
-	mmake -j1 \
-		${mercury_pkg_name}.depend \
-		|| die "mmake ${mercury_pkg} depend failed"
-
-	# Compiling Mercury submodules is not thread-safe
-	mmake -j1 \
-		MLFLAGS=--no-strip \
-		CFLAGS="${CFLAGS}" \
-		LD_LIBFLAGS="${LDFLAGS}" \
-		${mercury_mmc_target} || die "mmake ${mercury_pkg} failed"
-
-}
-
-mercury_pkg_install() {
-	mercury_pkg=${1%%:*}
-	mercury_pkg_dir=${mercury_pkg%/*}
-	mercury_pkg_name=${mercury_pkg##*/}
-
-	mercury_pkg_atts=${1#*:}
-	mercury_pkg_type=${mercury_pkg_atts%:*}
-
-	cd "${S}"/${mercury_pkg_dir} || die
-
-	echo ">> Installing Mercury package: ${mercury_pkg}"
-
-	if test "${mercury_pkg_type}" = "bin"; then
-		into /usr/$(get_libdir)/mercury/extras
-		dobin ${mercury_pkg_name}
-	else
-		# Compiling Mercury submodules is not thread-safe
-		mmake -j1 \
-			MLFLAGS=--no-strip \
-			CFLAGS="${CFLAGS}" \
-			LD_LIBFLAGS="${LDFLAGS}" \
-			INSTALL_LIBDIR="${D}/usr/$(get_libdir)/mercury/extras" \
-			lib${mercury_pkg_name}.install || die "mmake ${mercury_pkg} failed"
-	fi
-}
-
-src_prepare() {
-	cd "${WORKDIR}"/${MY_P}
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-	eapply_user
-
-	cd "${S}"
-	for mercury_pkg in $(mercury_pkgs); do
-		mercury_pkg_setup ${mercury_pkg}
-	done
-}
-
-src_compile() {
-	for mercury_pkg in $(mercury_pkgs); do
-		mercury_pkg_compile ${mercury_pkg}
-	done
-}
-
-src_install() {
-	for mercury_pkg in $(mercury_pkgs); do
-		mercury_pkg_install ${mercury_pkg}
-	done
-
-	cd "${S}"
-	dodoc README
-
-	if use examples; then
-		docinto samples/cgi
-		dodoc cgi/form_test.m
-
-		docinto samples/complex_numbers
-		dodoc complex_numbers/samples/*.m
-
-		if use ncurses; then
-			docinto samples/curs
-			dodoc curs/samples/*.m
-
-			docinto samples/curses
-			dodoc curses/sample/*.m
-		fi
-
-		docinto samples/dynamic_linking
-		dodoc dynamic_linking/{hello,dl_test}.m
-
-		docinto samples/gator
-		dodoc -r gator/*
-
-		if use gmp; then
-			docinto samples/gmp_int
-			dodoc gmp_int/gmp_int_test.m
-		fi
-
-		if use tommath; then
-			docinto samples/mp_int
-			dodoc mp_int/mp_int_test.m
-		fi
-
-		if use X; then
-			docinto samples/graphics
-			dodoc graphics/easyx/samples/*.m
-		fi
-
-		if use glut && use opengl; then
-			docinto samples/graphics
-			dodoc graphics/samples/gears/*.m
-			dodoc graphics/samples/maze/*.m
-		fi
-
-		if use tk; then
-			docinto samples/graphics
-			dodoc graphics/samples/calc/*.m
-		fi
-
-		if use opengl && use tk; then
-			docinto samples/graphics
-			dodoc graphics/samples/pent/*.m
-		fi
-
-		docinto samples/lex
-		dodoc lex/samples/*.m
-
-		docinto samples/log4m
-		dodoc log4m/*.m
-
-		docinto samples/monte
-		dodoc monte/*.m
-
-		docinto samples/moose
-		dodoc moose/samples/*
-
-		docinto samples/net
-		dodoc net/test_lookups.m
-
-		if use odbc || use iodbc; then
-			docinto samples/odbc
-			dodoc odbc/odbc_test.m
-		fi
-
-		docinto samples/posix
-		dodoc posix/samples/*.m
-
-		docinto samples/random
-		dodoc random/*.m
-
-		if has_version dev-lang/mercury[trail]; then
-			docinto samples/references
-			dodoc references/samples/*.m
-
-			docinto samples/trail
-			dodoc trail/*.m
-
-			docinto samples/trailed_update
-			dodoc trailed_update/samples/*.m
-		fi
-
-		if use xml; then
-			docinto samples/xml
-			dodoc xml/tryit.m
-			dodoc xml/samples/*
-			dodoc xml_stylesheets/*.xsl
-		fi
-
-		ecvs_clean
-	fi
-}

diff --git a/dev-lang/mercury-extras/mercury-extras-20.01.2.ebuild b/dev-lang/mercury-extras/mercury-extras-20.01.2.ebuild
deleted file mode 100644
index bce2fa7c29f..00000000000
--- a/dev-lang/mercury-extras/mercury-extras-20.01.2.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils multilib vcs-clean
-
-PATCHSET_VER="1"
-MY_P=mercury-srcdist-${PV}
-
-DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
-HOMEPAGE="https://www.mercurylang.org/index.html"
-SRC_URI="https://dl.mercurylang.org/release/${MY_P}.tar.gz
-	https://dev.gentoo.org/~keri/distfiles/mercury-extras/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml"
-REQUIRED_USE="?? ( odbc iodbc )"
-
-RDEPEND="
-	~dev-lang/mercury-${PV}
-	cairo? ( >=x11-libs/cairo-1.10.0 )
-	gmp? ( dev-libs/gmp:0 )
-	glut? ( media-libs/freeglut )
-	odbc? ( dev-db/unixODBC )
-	iodbc? ( dev-db/libiodbc )
-	tommath? ( dev-libs/libtommath )
-	ncurses? ( sys-libs/ncurses:= )
-	opengl? (
-		virtual/opengl
-		virtual/glu
-	)
-	tk? (
-		dev-lang/tcl:0
-		dev-lang/tk:0
-	)
-	X? ( x11-libs/libX11 )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}/extras
-
-mercury_pkgs() {
-	echo "
-		align_right/align_right:bin:
-		base64/mercury_base64:lib:
-		cgi/mercury_www:lib:
-		complex_numbers/complex_numbers:lib:
-		$(use ncurses && echo \
-			curs/curs:lib:ncurses,panel curses/mcurses:lib:ncurses)
-		dynamic_linking/dl:lib:
-		error/error:bin:
-		fixed/fixed:lib:
-		$(use gmp && echo gmp_int/gmp_int:lib:)
-		$(use tommath && echo mp_int/mp_int:lib:libtommath)
-		$(use X && echo graphics/easyx/easyx:lib:x11)
-		$(use cairo && echo graphics/mercury_cairo/mercury_cairo:lib:cairo)
-		$(use glut && echo graphics/mercury_glut/mercury_glut:lib:freeglut)
-		$(use opengl && echo graphics/mercury_opengl/mercury_opengl:lib:gl,glu)
-		$(use tk && echo graphics/mercury_tcltk/mercury_tcltk:lib:tk)
-		lex/lex:lib:
-		lex/regex:lib:
-		moose/moose:bin:
-		net/net:lib:
-		net/echo:bin:
-		$(use ssl && echo mopenssl/mopenssl:lib:openssl)
-		$(use odbc && echo odbc/odbc:lib:)
-		$(use iodbc && echo odbc/odbc:lib:libiodbc)
-		posix/posix:lib:
-		$(has_version dev-lang/mercury[trail] && echo \
-			references/global:lib: trailed_update/trailed_update:lib:)
-		show_ops/show_ops:bin:
-		solver_types/library/any:lib:
-		$(use xml && echo xml/xml:lib:)"
-}
-
-mercury_pkg_setup() {
-	mercury_pkg=${1%%:*}
-	mercury_pkg_dir=${mercury_pkg%/*}
-	mercury_pkg_name=${mercury_pkg##*/}
-
-	mercury_pkg_atts=${1#*:}
-	mercury_pkg_type=${mercury_pkg_atts%%:*}
-	mercury_pkg_deps=${mercury_pkg_atts#*:}
-
-	cd "${S}"/${mercury_pkg_dir} || die
-
-	echo ">> Preparing Mercury package: ${mercury_pkg}"
-
-	if ! test -f "${S}"/${mercury_pkg_dir}/gentoo.params; then
-		echo "LIBGRADES := \$(filter-out java,\$(LIBGRADES))" \
-			> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "LIBGRADES := \$(filter-out erlang,\$(LIBGRADES))" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "LIBGRADES := \$(filter-out csharp,\$(LIBGRADES))" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "include gentoo.params" > "${S}"/${mercury_pkg_dir}/Mmakefile
-	fi
-
-	if test -n "$mercury_pkg_deps"; then
-		echo "EXTRA_CFLAGS += $(pkg-config --cflags ${mercury_pkg_deps/,/ })" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "EXTRA_MLLIBS += $(pkg-config --libs ${mercury_pkg_deps/,/ })" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-	fi
-
-	if test ${mercury_pkg_name} = dl; then
-		echo "EXTRA_MLLIBS = -ldl" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-	elif test ${mercury_pkg_name} = gmp_int; then
-		echo "EXTRA_MLLIBS = -lgmp" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-	elif test ${mercury_pkg_name} = mercury_tcltk; then
-		echo "EXTRA_CFLAGS += -DUSE_INTERP_RESULT" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-	elif test ${mercury_pkg_name} = mopenssl; then
-		local net_libdir="${D}/usr/$(get_libdir)/mercury/extras/lib/\$(GRADE)"
-		echo "EXTRA_MLLIBS += -L${net_libdir} -L../net -lnet" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "net%:" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "	cp ../net/\$@ \$@" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-	elif test ${mercury_pkg_name} = odbc && use odbc; then
-		echo "EXTRA_CFLAGS = -DMODBC_UNIX -DMODBC_MYSQL" \
-			>> "${S}"/${mercury_pkg_dir}/Mmakefile
-		echo "EXTRA_MLLIBS = -lodbc" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-	elif test ${mercury_pkg_name} = odbc && use iodbc; then
-		echo "EXTRA_CFLAGS += -DMODBC_IODBC -DMODBC_MYSQL" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-	fi
-}
-
-mercury_pkg_compile() {
-	mercury_pkg=${1%%:*}
-	mercury_pkg_dir=${mercury_pkg%/*}
-	mercury_pkg_name=${mercury_pkg##*/}
-
-	mercury_pkg_atts=${1#*:}
-	mercury_pkg_type=${mercury_pkg_atts%:*}
-
-	cd "${S}"/${mercury_pkg_dir} || die
-
-	echo ">> Compiling Mercury package: ${mercury_pkg}"
-
-	if test "${mercury_pkg_type}" = "bin"; then
-		mercury_mmc_target=${mercury_pkg_name}
-	else
-		mercury_mmc_target=lib${mercury_pkg_name}
-	fi
-
-	# Mercury dependency generation must be run single-threaded
-	mmc -f *.m || die "mmc -f .m failed"
-	mmake -j1 \
-		${mercury_pkg_name}.depend \
-		|| die "mmake ${mercury_pkg} depend failed"
-
-	# Compiling Mercury submodules is not thread-safe
-	mmake -j1 \
-		MLFLAGS=--no-strip \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		LD_LIBFLAGS="${LDFLAGS}" \
-		${mercury_mmc_target} || die "mmake ${mercury_pkg} failed"
-
-}
-
-mercury_pkg_install() {
-	mercury_pkg=${1%%:*}
-	mercury_pkg_dir=${mercury_pkg%/*}
-	mercury_pkg_name=${mercury_pkg##*/}
-
-	mercury_pkg_atts=${1#*:}
-	mercury_pkg_type=${mercury_pkg_atts%:*}
-
-	cd "${S}"/${mercury_pkg_dir} || die
-
-	echo ">> Installing Mercury package: ${mercury_pkg}"
-
-	if test "${mercury_pkg_type}" = "bin"; then
-		into /usr/$(get_libdir)/mercury/extras
-		dobin ${mercury_pkg_name}
-	else
-		# Compiling Mercury submodules is not thread-safe
-		mmake -j1 \
-			MLFLAGS=--no-strip \
-			CFLAGS="${CFLAGS}" \
-			LDFLAGS="${LDFLAGS}" \
-			LD_LIBFLAGS="${LDFLAGS}" \
-			INSTALL_LIBDIR="${D}/usr/$(get_libdir)/mercury/extras" \
-			lib${mercury_pkg_name}.install || die "mmake ${mercury_pkg} failed"
-	fi
-}
-
-src_prepare() {
-	cd "${WORKDIR}"/${MY_P}
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-	eapply_user
-
-	cd "${S}"
-	for mercury_pkg in $(mercury_pkgs); do
-		mercury_pkg_setup ${mercury_pkg}
-	done
-}
-
-src_compile() {
-	for mercury_pkg in $(mercury_pkgs); do
-		mercury_pkg_compile ${mercury_pkg}
-	done
-}
-
-src_install() {
-	for mercury_pkg in $(mercury_pkgs); do
-		mercury_pkg_install ${mercury_pkg}
-	done
-
-	cd "${S}"
-	dodoc README
-
-	if use examples; then
-		docinto samples/cgi
-		dodoc cgi/form_test.m
-
-		docinto samples/complex_numbers
-		dodoc complex_numbers/samples/*.m
-
-		if use ncurses; then
-			docinto samples/curs
-			dodoc curs/samples/*.m
-
-			docinto samples/curses
-			dodoc curses/sample/*.m
-		fi
-
-		docinto samples/dynamic_linking
-		dodoc dynamic_linking/{hello,dl_test}.m
-
-		docinto samples/gator
-		dodoc -r gator/*
-
-		if use gmp; then
-			docinto samples/gmp_int
-			dodoc gmp_int/gmp_int_test.m
-		fi
-
-		if use tommath; then
-			docinto samples/mp_int
-			dodoc mp_int/mp_int_test.m
-		fi
-
-		if use X; then
-			docinto samples/graphics
-			dodoc graphics/easyx/samples/*.m
-		fi
-
-		if use glut && use opengl; then
-			docinto samples/graphics
-			dodoc graphics/samples/gears/*.m
-			dodoc graphics/samples/maze/*.m
-		fi
-
-		if use tk; then
-			docinto samples/graphics
-			dodoc graphics/samples/calc/*.m
-		fi
-
-		if use opengl && use tk; then
-			docinto samples/graphics
-			dodoc graphics/samples/pent/*.m
-		fi
-
-		docinto samples/lex
-		dodoc lex/samples/*.m
-
-		docinto samples/log4m
-		dodoc log4m/*.m
-
-		docinto samples/monte
-		dodoc monte/*.m
-
-		docinto samples/moose
-		dodoc moose/samples/*
-
-		docinto samples/net
-		dodoc net/test_lookups.m
-
-		if use odbc || use iodbc; then
-			docinto samples/odbc
-			dodoc odbc/odbc_test.m
-		fi
-
-		docinto samples/posix
-		dodoc posix/samples/*.m
-
-		docinto samples/random
-		dodoc random/*.m
-
-		if has_version dev-lang/mercury[trail]; then
-			docinto samples/references
-			dodoc references/samples/*.m
-
-			docinto samples/trail
-			dodoc trail/*.m
-
-			docinto samples/trailed_update
-			dodoc trailed_update/samples/*.m
-		fi
-
-		if use xml; then
-			docinto samples/xml
-			dodoc xml/tryit.m
-			dodoc xml/samples/*
-			dodoc xml_stylesheets/*.xsl
-		fi
-
-		ecvs_clean
-	fi
-}

diff --git a/dev-lang/mercury-extras/mercury-extras-20.01.ebuild b/dev-lang/mercury-extras/mercury-extras-20.01.ebuild
deleted file mode 100644
index 8a9593959ae..00000000000
--- a/dev-lang/mercury-extras/mercury-extras-20.01.ebuild
+++ /dev/null
@@ -1,317 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils multilib vcs-clean
-
-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="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml"
-REQUIRED_USE="?? ( odbc iodbc )"
-
-RDEPEND="
-	~dev-lang/mercury-${PV}
-	cairo? ( >=x11-libs/cairo-1.10.0 )
-	gmp? ( dev-libs/gmp:0 )
-	glut? ( media-libs/freeglut )
-	odbc? ( dev-db/unixODBC )
-	iodbc? ( dev-db/libiodbc )
-	tommath? ( dev-libs/libtommath )
-	ncurses? ( sys-libs/ncurses:= )
-	opengl? (
-		virtual/opengl
-		virtual/glu
-	)
-	tk? (
-		dev-lang/tcl:0
-		dev-lang/tk:0
-	)
-	X? ( x11-libs/libX11 )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}/extras
-
-mercury_pkgs() {
-	echo "
-		align_right/align_right:bin:
-		base64/mercury_base64:lib:
-		cgi/mercury_www:lib:
-		complex_numbers/complex_numbers:lib:
-		$(use ncurses && echo \
-			curs/curs:lib:ncurses,panel curses/mcurses:lib:ncurses)
-		dynamic_linking/dl:lib:
-		error/error:bin:
-		fixed/fixed:lib:
-		$(use gmp && echo gmp_int/gmp_int:lib:)
-		$(use tommath && echo mp_int/mp_int:lib:libtommath)
-		$(use X && echo graphics/easyx/easyx:lib:x11)
-		$(use cairo && echo graphics/mercury_cairo/mercury_cairo:lib:cairo)
-		$(use glut && echo graphics/mercury_glut/mercury_glut:lib:freeglut)
-		$(use opengl && echo graphics/mercury_opengl/mercury_opengl:lib:gl,glu)
-		$(use tk && echo graphics/mercury_tcltk/mercury_tcltk:lib:tk)
-		lex/lex:lib:
-		lex/regex:lib:
-		moose/moose:bin:
-		net/net:lib:
-		net/echo:bin:
-		$(use ssl && echo mopenssl/mopenssl:lib:openssl)
-		$(use odbc && echo odbc/odbc:lib:)
-		$(use iodbc && echo odbc/odbc:lib:libiodbc)
-		posix/posix:lib:
-		$(has_version dev-lang/mercury[trail] && echo \
-			references/global:lib: trailed_update/trailed_update:lib:)
-		show_ops/show_ops:bin:
-		solver_types/library/any:lib:
-		$(use xml && echo xml/xml:lib:)"
-}
-
-mercury_pkg_setup() {
-	mercury_pkg=${1%%:*}
-	mercury_pkg_dir=${mercury_pkg%/*}
-	mercury_pkg_name=${mercury_pkg##*/}
-
-	mercury_pkg_atts=${1#*:}
-	mercury_pkg_type=${mercury_pkg_atts%%:*}
-	mercury_pkg_deps=${mercury_pkg_atts#*:}
-
-	cd "${S}"/${mercury_pkg_dir} || die
-
-	echo ">> Preparing Mercury package: ${mercury_pkg}"
-
-	if ! test -f "${S}"/${mercury_pkg_dir}/gentoo.params; then
-		echo "LIBGRADES := \$(filter-out java,\$(LIBGRADES))" \
-			> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "LIBGRADES := \$(filter-out erlang,\$(LIBGRADES))" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "LIBGRADES := \$(filter-out csharp,\$(LIBGRADES))" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "include gentoo.params" > "${S}"/${mercury_pkg_dir}/Mmakefile
-	fi
-
-	if test -n "$mercury_pkg_deps"; then
-		echo "EXTRA_CFLAGS += $(pkg-config --cflags ${mercury_pkg_deps/,/ })" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "EXTRA_MLLIBS += $(pkg-config --libs ${mercury_pkg_deps/,/ })" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-	fi
-
-	if test ${mercury_pkg_name} = dl; then
-		echo "EXTRA_MLLIBS = -ldl" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-	elif test ${mercury_pkg_name} = gmp_int; then
-		echo "EXTRA_MLLIBS = -lgmp" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-	elif test ${mercury_pkg_name} = mercury_tcltk; then
-		echo "EXTRA_CFLAGS += -DUSE_INTERP_RESULT" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-	elif test ${mercury_pkg_name} = mopenssl; then
-		local net_libdir="${D}/usr/$(get_libdir)/mercury/extras/lib/\$(GRADE)"
-		echo "EXTRA_MLLIBS += -L${net_libdir} -L../net -lnet" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "net%:" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-		echo "	cp ../net/\$@ \$@" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-	elif test ${mercury_pkg_name} = odbc && use odbc; then
-		echo "EXTRA_CFLAGS = -DMODBC_UNIX -DMODBC_MYSQL" \
-			>> "${S}"/${mercury_pkg_dir}/Mmakefile
-		echo "EXTRA_MLLIBS = -lodbc" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-	elif test ${mercury_pkg_name} = odbc && use iodbc; then
-		echo "EXTRA_CFLAGS += -DMODBC_IODBC -DMODBC_MYSQL" \
-			>> "${S}"/${mercury_pkg_dir}/gentoo.params
-	fi
-}
-
-mercury_pkg_compile() {
-	mercury_pkg=${1%%:*}
-	mercury_pkg_dir=${mercury_pkg%/*}
-	mercury_pkg_name=${mercury_pkg##*/}
-
-	mercury_pkg_atts=${1#*:}
-	mercury_pkg_type=${mercury_pkg_atts%:*}
-
-	cd "${S}"/${mercury_pkg_dir} || die
-
-	echo ">> Compiling Mercury package: ${mercury_pkg}"
-
-	if test "${mercury_pkg_type}" = "bin"; then
-		mercury_mmc_target=${mercury_pkg_name}
-	else
-		mercury_mmc_target=lib${mercury_pkg_name}
-	fi
-
-	# Mercury dependency generation must be run single-threaded
-	mmc -f *.m || die "mmc -f .m failed"
-	mmake -j1 \
-		${mercury_pkg_name}.depend \
-		|| die "mmake ${mercury_pkg} depend failed"
-
-	# Compiling Mercury submodules is not thread-safe
-	mmake -j1 \
-		MLFLAGS=--no-strip \
-		CFLAGS="${CFLAGS}" \
-		LD_LIBFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \
-		${mercury_mmc_target} || die "mmake ${mercury_pkg} failed"
-
-}
-
-mercury_pkg_install() {
-	mercury_pkg=${1%%:*}
-	mercury_pkg_dir=${mercury_pkg%/*}
-	mercury_pkg_name=${mercury_pkg##*/}
-
-	mercury_pkg_atts=${1#*:}
-	mercury_pkg_type=${mercury_pkg_atts%:*}
-
-	cd "${S}"/${mercury_pkg_dir} || die
-
-	echo ">> Installing Mercury package: ${mercury_pkg}"
-
-	if test "${mercury_pkg_type}" = "bin"; then
-		into /usr/$(get_libdir)/mercury/extras
-		dobin ${mercury_pkg_name}
-	else
-		# Compiling Mercury submodules is not thread-safe
-		mmake -j1 \
-			MLFLAGS=--no-strip \
-			CFLAGS="${CFLAGS}" \
-			LD_LIBFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \
-			INSTALL_LIBDIR="${D}/usr/$(get_libdir)/mercury/extras" \
-			lib${mercury_pkg_name}.install || die "mmake ${mercury_pkg} failed"
-	fi
-}
-
-src_prepare() {
-	cd "${WORKDIR}"/${MY_P}
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-	eapply_user
-
-	cd "${S}"
-	for mercury_pkg in $(mercury_pkgs); do
-		mercury_pkg_setup ${mercury_pkg}
-	done
-}
-
-src_compile() {
-	for mercury_pkg in $(mercury_pkgs); do
-		mercury_pkg_compile ${mercury_pkg}
-	done
-}
-
-src_install() {
-	for mercury_pkg in $(mercury_pkgs); do
-		mercury_pkg_install ${mercury_pkg}
-	done
-
-	cd "${S}"
-	dodoc README
-
-	if use examples; then
-		docinto samples/cgi
-		dodoc cgi/form_test.m
-
-		docinto samples/complex_numbers
-		dodoc complex_numbers/samples/*.m
-
-		if use ncurses; then
-			docinto samples/curs
-			dodoc curs/samples/*.m
-
-			docinto samples/curses
-			dodoc curses/sample/*.m
-		fi
-
-		docinto samples/dynamic_linking
-		dodoc dynamic_linking/{hello,dl_test}.m
-
-		docinto samples/gator
-		dodoc -r gator/*
-
-		if use gmp; then
-			docinto samples/gmp_int
-			dodoc gmp_int/gmp_int_test.m
-		fi
-
-		if use tommath; then
-			docinto samples/mp_int
-			dodoc mp_int/mp_int_test.m
-		fi
-
-		if use X; then
-			docinto samples/graphics
-			dodoc graphics/easyx/samples/*.m
-		fi
-
-		if use glut && use opengl; then
-			docinto samples/graphics
-			dodoc graphics/samples/gears/*.m
-			dodoc graphics/samples/maze/*.m
-		fi
-
-		if use tk; then
-			docinto samples/graphics
-			dodoc graphics/samples/calc/*.m
-		fi
-
-		if use opengl && use tk; then
-			docinto samples/graphics
-			dodoc graphics/samples/pent/*.m
-		fi
-
-		docinto samples/lex
-		dodoc lex/samples/*.m
-
-		docinto samples/log4m
-		dodoc log4m/*.m
-
-		docinto samples/monte
-		dodoc monte/*.m
-
-		docinto samples/moose
-		dodoc moose/samples/*
-
-		docinto samples/net
-		dodoc net/test_lookups.m
-
-		if use odbc || use iodbc; then
-			docinto samples/odbc
-			dodoc odbc/odbc_test.m
-		fi
-
-		docinto samples/posix
-		dodoc posix/samples/*.m
-
-		docinto samples/random
-		dodoc random/*.m
-
-		if has_version dev-lang/mercury[trail]; then
-			docinto samples/references
-			dodoc references/samples/*.m
-
-			docinto samples/trail
-			dodoc trail/*.m
-
-			docinto samples/trailed_update
-			dodoc trailed_update/samples/*.m
-		fi
-
-		if use xml; then
-			docinto samples/xml
-			dodoc xml/tryit.m
-			dodoc xml/samples/*
-			dodoc xml_stylesheets/*.xsl
-		fi
-
-		ecvs_clean
-	fi
-}


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2021-06-18 21:07 David Seifert
  0 siblings, 0 replies; 40+ messages in thread
From: David Seifert @ 2021-06-18 21:07 UTC (permalink / raw
  To: gentoo-commits

commit:     a3ea6ecca91ba660b0b9768aa9d4c24475d8adc7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 18 21:06:24 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Jun 18 21:06:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3ea6ecc

dev-lang/mercury-extras: add pkgconfig or pkgconfig-referenced libs deps

Add dependencies for either virtual/pkgconfig, move it into BDEPEND
where applicable, or add dependencies for libraries we're trying to find
with pkgconfig.

Package-Manager: Portage-3.0.18-prefix, Repoman-3.0.3
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-lang/mercury-extras/mercury-extras-20.06.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-lang/mercury-extras/mercury-extras-20.06.ebuild b/dev-lang/mercury-extras/mercury-extras-20.06.ebuild
index f6e581425bd..29d3f055a11 100644
--- a/dev-lang/mercury-extras/mercury-extras-20.06.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-20.06.ebuild
@@ -41,6 +41,8 @@ RDEPEND="
 
 DEPEND="${RDEPEND}"
 
+BDEPEND="virtual/pkgconfig"
+
 S="${WORKDIR}"/${MY_P}/extras
 
 mercury_pkgs() {


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2021-10-03 11:11 Keri Harris
  0 siblings, 0 replies; 40+ messages in thread
From: Keri Harris @ 2021-10-03 11:11 UTC (permalink / raw
  To: gentoo-commits

commit:     27b4dbcf6a9a1a9bb32de2bf2373e3ed5a8a22b8
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  3 11:10:36 2021 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sun Oct  3 11:10:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27b4dbcf

dev-lang/mercury-extras: version bump

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Keri Harris <keri <AT> gentoo.org>

 dev-lang/mercury-extras/Manifest                   |   2 +
 .../mercury-extras/mercury-extras-20.06.1.ebuild   | 307 +++++++++++++++++++++
 2 files changed, 309 insertions(+)

diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index e3dcc3fd7ef..f58135466d9 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,2 +1,4 @@
 DIST mercury-extras-20.06-gentoo-patchset-0.tar.gz 1093 BLAKE2B cd0087a7a878c303a610e0007b352deec2e54b8223af1fbdcdd5e1fec0a7d6b4533895ba4ec01d4f90734349535a4c16c69f4ec60495f5a7888f99e4580e3ce3 SHA512 abd74dee931a01085a75f45d2793109737662345bdc68f4cf25dd874b59726da6a5ec8acd84cc8f0957052eeb9e5a9e3502090a0688fbea817d05c6948728ecb
+DIST mercury-extras-20.06.1-gentoo-patchset-0.tar.gz 617 BLAKE2B e16a3887bd0927911e2062befa38119d0347e01eae08d21dcf185942648ce52a94890c26059d39b096f69d19227c2ed22e2d3ded0cc762ebfd1bcb702810f5ea SHA512 1274c08c7c02f6f5fa5183f42e958a8e469df38d8e693722134a24aa846d4f3a74dafa0dd4f9d11fbca58497ff6d714aa7456dc2fd516d8961bc1ba43f3b3b8c
+DIST mercury-srcdist-20.06.1.tar.gz 47796261 BLAKE2B f282c6edb78e9090eb451585c65c9214927b94eaa5fcdf6f674aef6beb62eb65179f998bcc2e56c3c93b73dd1dc94973084eb8363bc05e334384096c9520d478 SHA512 94e901e5d3db39e3342bf2d6a2a74556a7b18b295c7e02669b487a81d41c72e572046ce1133d670ca6c1b8e246dd277439087efe8fb99b979a73555a101aa9a8
 DIST mercury-srcdist-20.06.tar.gz 47768559 BLAKE2B f242aa2ef7da53aa2dfa054e4fee8646434d276f0748b014e33ea52d22f2a8a37e6fecaa20617f4943c4c1e7d8c179ed0603a344fde2dd58da98b2bacadf1a71 SHA512 b76bd22d8eb16242c68b614ff122ed7ee7535efef6c0ceb8cc798fee4c550bc41b6faff2135cea43b24c652b654bb35ae049656585d8e7bf3a1122d07cb1ecf4

diff --git a/dev-lang/mercury-extras/mercury-extras-20.06.1.ebuild b/dev-lang/mercury-extras/mercury-extras-20.06.1.ebuild
new file mode 100644
index 00000000000..6069ed489b0
--- /dev/null
+++ b/dev-lang/mercury-extras/mercury-extras-20.06.1.ebuild
@@ -0,0 +1,307 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib toolchain-funcs vcs-clean
+
+PATCHSET_VER="0"
+MY_P=mercury-srcdist-${PV}
+
+DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
+HOMEPAGE="https://www.mercurylang.org/index.html"
+SRC_URI="https://dl.mercurylang.org/release/${MY_P}.tar.gz
+	https://dev.gentoo.org/~keri/distfiles/mercury-extras/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml"
+REQUIRED_USE="?? ( odbc iodbc )"
+
+RDEPEND="
+	~dev-lang/mercury-${PV}
+	cairo? ( >=x11-libs/cairo-1.10.0 )
+	gmp? ( dev-libs/gmp:0 )
+	glut? ( media-libs/freeglut )
+	odbc? ( dev-db/unixODBC )
+	iodbc? ( dev-db/libiodbc )
+	tommath? ( dev-libs/libtommath )
+	ncurses? ( sys-libs/ncurses:= )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+	)
+	tk? (
+		dev-lang/tcl:0
+		dev-lang/tk:0
+	)
+	X? ( x11-libs/libX11 )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/${MY_P}/extras
+
+mercury_pkgs() {
+	echo "
+		align_right/align_right:bin:
+		base64/mercury_base64:lib:
+		cgi/mercury_www:lib:
+		complex_numbers/complex_numbers:lib:
+		$(use ncurses && echo \
+			curs/curs:lib:ncurses,panel curses/mcurses:lib:ncurses)
+		dynamic_linking/dl:lib:
+		error/error:bin:
+		fixed/fixed:lib:
+		$(use gmp && echo gmp_int/gmp_int:lib:)
+		$(use tommath && echo mp_int/mp_int:lib:libtommath)
+		$(use X && echo graphics/easyx/easyx:lib:x11)
+		$(use cairo && echo graphics/mercury_cairo/mercury_cairo:lib:cairo)
+		$(use glut && echo graphics/mercury_glut/mercury_glut:lib:freeglut)
+		$(use opengl && echo graphics/mercury_opengl/mercury_opengl:lib:gl,glu)
+		$(use tk && echo graphics/mercury_tcltk/mercury_tcltk:lib:tk)
+		lex/lex:lib:
+		lex/regex:lib:
+		moose/moose:bin:
+		net/net:lib:
+		net/echo:bin:
+		$(use ssl && echo mopenssl/mopenssl:lib:openssl)
+		$(use odbc && echo odbc/odbc:lib:odbc)
+		$(use iodbc && echo odbc/odbc:lib:libiodbc)
+		posix/posix:lib:
+		$(has_version dev-lang/mercury[trail] && echo \
+			references/global:lib:)
+		show_ops/show_ops:bin:
+		solver_types/library/any:lib:
+		$(use xml && echo xml/xml:lib:)"
+}
+
+mercury_pkg_setup() {
+	mercury_pkg=${1%%:*}
+	mercury_pkg_dir=${mercury_pkg%/*}
+	mercury_pkg_name=${mercury_pkg##*/}
+
+	mercury_pkg_atts=${1#*:}
+	mercury_pkg_type=${mercury_pkg_atts%%:*}
+	mercury_pkg_deps=${mercury_pkg_atts#*:}
+
+	cd "${S}"/${mercury_pkg_dir} || die
+
+	echo ">> Preparing Mercury package: ${mercury_pkg}"
+
+	echo "MCFLAGS += --libgrades-exclude java" \
+		>> "${S}"/${mercury_pkg_dir}/Mercury.options
+	echo "MCFLAGS += --libgrades-exclude erlang" \
+		>> "${S}"/${mercury_pkg_dir}/Mercury.options
+	echo "MCFLAGS += --libgrades-exclude csharp" \
+		>> "${S}"/${mercury_pkg_dir}/Mercury.options
+
+	if test -n "$mercury_pkg_deps"; then
+		echo "EXTRA_CFLAGS += $($(tc-getPKG_CONFIG) --cflags ${mercury_pkg_deps/,/ })" \
+			>> "${S}"/${mercury_pkg_dir}/Mercury.options
+		echo "EXTRA_LDFLAGS += $($(tc-getPKG_CONFIG) --libs ${mercury_pkg_deps/,/ })" \
+			>> "${S}"/${mercury_pkg_dir}/Mercury.options
+	fi
+
+	if test ${mercury_pkg_name} = dl; then
+		echo "EXTRA_LDFLAGS += -ldl" >> "${S}"/${mercury_pkg_dir}/Mercury.options
+	elif test ${mercury_pkg_name} = gmp_int; then
+		echo "EXTRA_LDFLAGS += -lgmp" >> "${S}"/${mercury_pkg_dir}/Mercury.options
+	elif test ${mercury_pkg_name} = mercury_tcltk; then
+		echo "EXTRA_CFLAGS += -DUSE_INTERP_RESULT" \
+			>> "${S}"/${mercury_pkg_dir}/Mercury.options
+	elif test ${mercury_pkg_name} = odbc && use odbc; then
+		echo "EXTRA_CFLAGS += -DMODBC_UNIX -DMODBC_MYSQL" \
+			>> "${S}"/${mercury_pkg_dir}/Mercury.options
+	elif test ${mercury_pkg_name} = odbc && use iodbc; then
+		echo "EXTRA_CFLAGS += -DMODBC_IODBC -DMODBC_MYSQL" \
+			>> "${S}"/${mercury_pkg_dir}/Mercury.options
+	fi
+}
+
+mercury_pkg_compile() {
+	mercury_pkg=${1%%:*}
+	mercury_pkg_dir=${mercury_pkg%/*}
+	mercury_pkg_name=${mercury_pkg##*/}
+
+	mercury_pkg_atts=${1#*:}
+	mercury_pkg_type=${mercury_pkg_atts%:*}
+
+	cd "${S}"/${mercury_pkg_dir} || die
+
+	echo ">> Compiling Mercury package: ${mercury_pkg}"
+
+	if test "${mercury_pkg_type}" = "bin"; then
+		mercury_mmc_target=${mercury_pkg_name}
+	else
+		mercury_mmc_target=lib${mercury_pkg_name}
+	fi
+
+	mmc -f *.m || die "mmc -f .m failed"
+
+	mmc \
+		--make \
+		--verbose-commands \
+		--no-strip \
+		--cflags "${CFLAGS}" \
+		--ld-flags "${LDFLAGS}" \
+		--ld-libflags "${LDFLAGS}" \
+		${mercury_mmc_target} || die "mmc ${mercury_mmc_target} failed"
+}
+
+mercury_pkg_install() {
+	mercury_pkg=${1%%:*}
+	mercury_pkg_dir=${mercury_pkg%/*}
+	mercury_pkg_name=${mercury_pkg##*/}
+
+	mercury_pkg_atts=${1#*:}
+	mercury_pkg_type=${mercury_pkg_atts%:*}
+
+	cd "${S}"/${mercury_pkg_dir} || die
+
+	echo ">> Installing Mercury package: ${mercury_pkg}"
+
+	if test "${mercury_pkg_type}" = "bin"; then
+		into /usr/$(get_libdir)/mercury/extras
+		dobin ${mercury_pkg_name}
+	else
+		mmc \
+			--make \
+			--verbose-commands \
+			--no-strip \
+			--cflags "${CFLAGS}" \
+			--ld-flags "${LDFLAGS}" \
+			--ld-libflags "${LDFLAGS}" \
+			--install-prefix "${D}/usr/$(get_libdir)/mercury/extras" \
+			lib${mercury_pkg_name}.install || die "mmc lib${mercury_pkg_name}.install failed"
+	fi
+}
+
+src_prepare() {
+	cd "${WORKDIR}"/${MY_P}
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		eapply "${WORKDIR}"/${PV}
+	fi
+	eapply_user
+
+	cd "${S}"
+	for mercury_pkg in $(mercury_pkgs); do
+		mercury_pkg_setup ${mercury_pkg}
+	done
+
+	cp "${S}"/net/*.m "${S}"/mopenssl/ || die
+}
+
+src_compile() {
+	for mercury_pkg in $(mercury_pkgs); do
+		mercury_pkg_compile ${mercury_pkg}
+	done
+}
+
+src_install() {
+	for mercury_pkg in $(mercury_pkgs); do
+		mercury_pkg_install ${mercury_pkg}
+	done
+
+	cd "${S}"
+	dodoc README
+
+	if use examples; then
+		docinto samples/cgi
+		dodoc cgi/form_test.m
+
+		docinto samples/complex_numbers
+		dodoc complex_numbers/samples/*.m
+
+		if use ncurses; then
+			docinto samples/curs
+			dodoc curs/samples/*.m
+
+			docinto samples/curses
+			dodoc curses/sample/*.m
+		fi
+
+		docinto samples/dynamic_linking
+		dodoc dynamic_linking/{hello,dl_test}.m
+
+		docinto samples/gator
+		dodoc -r gator/*
+
+		if use gmp; then
+			docinto samples/gmp_int
+			dodoc gmp_int/gmp_int_test.m
+		fi
+
+		if use tommath; then
+			docinto samples/mp_int
+			dodoc mp_int/mp_int_test.m
+		fi
+
+		if use X; then
+			docinto samples/graphics
+			dodoc graphics/easyx/samples/*.m
+		fi
+
+		if use glut && use opengl; then
+			docinto samples/graphics
+			dodoc graphics/samples/gears/*.m
+			dodoc graphics/samples/maze/*.m
+		fi
+
+		if use tk; then
+			docinto samples/graphics
+			dodoc graphics/samples/calc/*.m
+		fi
+
+		if use opengl && use tk; then
+			docinto samples/graphics
+			dodoc graphics/samples/pent/*.m
+		fi
+
+		docinto samples/lex
+		dodoc lex/samples/*.m
+
+		docinto samples/log4m
+		dodoc log4m/*.m
+
+		docinto samples/monte
+		dodoc monte/*.m
+
+		docinto samples/moose
+		dodoc moose/samples/*
+
+		docinto samples/net
+		dodoc net/test_lookups.m
+
+		if use odbc || use iodbc; then
+			docinto samples/odbc
+			dodoc odbc/odbc_test.m
+		fi
+
+		docinto samples/posix
+		dodoc posix/samples/*.m
+
+		docinto samples/random
+		dodoc random/*.m
+
+		if has_version dev-lang/mercury[trail]; then
+			docinto samples/references
+			dodoc references/samples/*.m
+
+			docinto samples/trail
+			dodoc trail/*.m
+		fi
+
+		if use xml; then
+			docinto samples/xml
+			dodoc xml/tryit.m
+			dodoc xml/samples/*
+			dodoc xml_stylesheets/*.xsl
+		fi
+
+		ecvs_clean
+	fi
+}


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2022-05-14 18:31 Keri Harris
  0 siblings, 0 replies; 40+ messages in thread
From: Keri Harris @ 2022-05-14 18:31 UTC (permalink / raw
  To: gentoo-commits

commit:     23570d13762049e4c6abc53e3b1d5bb7c8462d2e
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 18:29:53 2022 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sat May 14 18:30:39 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23570d13

dev-lang/mercury-extras: version bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Keri Harris <keri <AT> gentoo.org>

 dev-lang/mercury-extras/Manifest                   |   2 +
 .../mercury-extras/mercury-extras-22.01.ebuild     | 298 +++++++++++++++++++++
 2 files changed, 300 insertions(+)

diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index f58135466d92..18e6588dc2eb 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,4 +1,6 @@
 DIST mercury-extras-20.06-gentoo-patchset-0.tar.gz 1093 BLAKE2B cd0087a7a878c303a610e0007b352deec2e54b8223af1fbdcdd5e1fec0a7d6b4533895ba4ec01d4f90734349535a4c16c69f4ec60495f5a7888f99e4580e3ce3 SHA512 abd74dee931a01085a75f45d2793109737662345bdc68f4cf25dd874b59726da6a5ec8acd84cc8f0957052eeb9e5a9e3502090a0688fbea817d05c6948728ecb
 DIST mercury-extras-20.06.1-gentoo-patchset-0.tar.gz 617 BLAKE2B e16a3887bd0927911e2062befa38119d0347e01eae08d21dcf185942648ce52a94890c26059d39b096f69d19227c2ed22e2d3ded0cc762ebfd1bcb702810f5ea SHA512 1274c08c7c02f6f5fa5183f42e958a8e469df38d8e693722134a24aa846d4f3a74dafa0dd4f9d11fbca58497ff6d714aa7456dc2fd516d8961bc1ba43f3b3b8c
+DIST mercury-extras-22.01-gentoo-patchset-0.tar.gz 436 BLAKE2B 2c1ff61b87e04777f3d3b66e7a6ae1c8e82e7caec413e2ed51eeb785b5dd8bc1773aa065219ccc58833b1c2aae3d481f531b94a48c215ce7eea2e0762948f946 SHA512 eac4615c951665150c6e6d2cc317d68be8e510aa9be663cadfe04b55d30fe8a0d17fae93a19d1e54556179618262ea4fdb6381e05aca278c4c516bc1f52656bd
 DIST mercury-srcdist-20.06.1.tar.gz 47796261 BLAKE2B f282c6edb78e9090eb451585c65c9214927b94eaa5fcdf6f674aef6beb62eb65179f998bcc2e56c3c93b73dd1dc94973084eb8363bc05e334384096c9520d478 SHA512 94e901e5d3db39e3342bf2d6a2a74556a7b18b295c7e02669b487a81d41c72e572046ce1133d670ca6c1b8e246dd277439087efe8fb99b979a73555a101aa9a8
 DIST mercury-srcdist-20.06.tar.gz 47768559 BLAKE2B f242aa2ef7da53aa2dfa054e4fee8646434d276f0748b014e33ea52d22f2a8a37e6fecaa20617f4943c4c1e7d8c179ed0603a344fde2dd58da98b2bacadf1a71 SHA512 b76bd22d8eb16242c68b614ff122ed7ee7535efef6c0ceb8cc798fee4c550bc41b6faff2135cea43b24c652b654bb35ae049656585d8e7bf3a1122d07cb1ecf4
+DIST mercury-srcdist-22.01.tar.gz 48960609 BLAKE2B 4ac45251bc098c1465f4bc418501db152bfcf36a2e04bb9153a44c44ff2dff300545103c29551818e773728c5a61947c019997fcc2cb64900e538d5ef64c1b39 SHA512 35b3b1e9fd85062edea5263b304bfc965382d04353e5548d59211519ee222bb6a8e8c95cb03faa089062e39c90b2d1c4af7ca0d9eabbf3bb44872d461e10ff2d

diff --git a/dev-lang/mercury-extras/mercury-extras-22.01.ebuild b/dev-lang/mercury-extras/mercury-extras-22.01.ebuild
new file mode 100644
index 000000000000..c90f5ea06af4
--- /dev/null
+++ b/dev-lang/mercury-extras/mercury-extras-22.01.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils multilib vcs-clean
+
+PATCHSET_VER="0"
+MY_P=mercury-srcdist-${PV}
+
+DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
+HOMEPAGE="https://www.mercurylang.org/index.html"
+SRC_URI="https://dl.mercurylang.org/release/${MY_P}.tar.gz
+	https://dev.gentoo.org/~keri/distfiles/mercury-extras/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml"
+REQUIRED_USE="?? ( odbc iodbc )"
+
+RDEPEND="
+	~dev-lang/mercury-${PV}
+	cairo? ( >=x11-libs/cairo-1.10.0 )
+	gmp? ( dev-libs/gmp:0 )
+	glut? ( media-libs/freeglut )
+	odbc? ( dev-db/unixODBC )
+	iodbc? ( dev-db/libiodbc )
+	tommath? ( dev-libs/libtommath )
+	ncurses? ( sys-libs/ncurses:= )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+	)
+	tk? (
+		dev-lang/tcl:0
+		dev-lang/tk:0
+	)
+	X? ( x11-libs/libX11 )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}/extras
+
+mercury_pkgs() {
+	echo "
+		align_right/align_right:bin:
+		base64/mercury_base64:lib:
+		cgi/mercury_www:lib:
+		complex_numbers/complex_numbers:lib:
+		$(use ncurses && echo \
+			curs/curs:lib:ncurses,panel curses/mcurses:lib:ncurses)
+		dynamic_linking/dl:lib:
+		error/error:bin:
+		fixed/fixed:lib:
+		$(use gmp && echo gmp_int/gmp_int:lib:)
+		$(use tommath && echo mp_int/mp_int:lib:libtommath)
+		$(use X && echo graphics/easyx/easyx:lib:x11)
+		$(use cairo && echo graphics/mercury_cairo/mercury_cairo:lib:cairo)
+		$(use glut && echo graphics/mercury_glut/mercury_glut:lib:freeglut)
+		$(use opengl && echo graphics/mercury_opengl/mercury_opengl:lib:gl,glu)
+		$(use tk && echo graphics/mercury_tcltk/mercury_tcltk:lib:tk)
+		lex/lex:lib:
+		lex/regex:lib:
+		moose/moose:bin:
+		net/net:lib:
+		net/echo:bin:
+		$(use ssl && echo mopenssl/mopenssl:lib:openssl)
+		$(use odbc && echo odbc/odbc:lib:odbc)
+		$(use iodbc && echo odbc/odbc:lib:libiodbc)
+		posix/posix:lib:
+		$(has_version dev-lang/mercury[trail] && echo \
+			references/global:lib:)
+		show_ops/show_ops:bin:
+		solver_types/library/any:lib:
+		$(use xml && echo xml/xml:lib:)"
+}
+
+mercury_pkg_setup() {
+	mercury_pkg=${1%%:*}
+	mercury_pkg_dir=${mercury_pkg%/*}
+	mercury_pkg_name=${mercury_pkg##*/}
+
+	mercury_pkg_atts=${1#*:}
+	mercury_pkg_type=${mercury_pkg_atts%%:*}
+	mercury_pkg_deps=${mercury_pkg_atts#*:}
+
+	cd "${S}"/${mercury_pkg_dir} || die
+
+	echo ">> Preparing Mercury package: ${mercury_pkg}"
+
+	echo "MCFLAGS += --libgrades-exclude java" \
+		>> "${S}"/${mercury_pkg_dir}/Mercury.options
+	echo "MCFLAGS += --libgrades-exclude csharp" \
+		>> "${S}"/${mercury_pkg_dir}/Mercury.options
+
+	if test -n "$mercury_pkg_deps"; then
+		echo "EXTRA_CFLAGS += $(pkg-config --cflags ${mercury_pkg_deps/,/ })" \
+			>> "${S}"/${mercury_pkg_dir}/Mercury.options
+		echo "EXTRA_LDFLAGS += $(pkg-config --libs ${mercury_pkg_deps/,/ })" \
+			>> "${S}"/${mercury_pkg_dir}/Mercury.options
+	fi
+
+	if test ${mercury_pkg_name} = dl; then
+		echo "EXTRA_LDFLAGS += -ldl" >> "${S}"/${mercury_pkg_dir}/Mercury.options
+	elif test ${mercury_pkg_name} = gmp_int; then
+		echo "EXTRA_LDFLAGS += -lgmp" >> "${S}"/${mercury_pkg_dir}/Mercury.options
+	elif test ${mercury_pkg_name} = mercury_tcltk; then
+		echo "EXTRA_CFLAGS += -DUSE_INTERP_RESULT" \
+			>> "${S}"/${mercury_pkg_dir}/Mercury.options
+	elif test ${mercury_pkg_name} = odbc && use odbc; then
+		echo "EXTRA_CFLAGS += -DMODBC_UNIX -DMODBC_MYSQL" \
+			>> "${S}"/${mercury_pkg_dir}/Mercury.options
+	elif test ${mercury_pkg_name} = odbc && use iodbc; then
+		echo "EXTRA_CFLAGS += -DMODBC_IODBC -DMODBC_MYSQL" \
+			>> "${S}"/${mercury_pkg_dir}/Mercury.options
+	fi
+}
+
+mercury_pkg_compile() {
+	mercury_pkg=${1%%:*}
+	mercury_pkg_dir=${mercury_pkg%/*}
+	mercury_pkg_name=${mercury_pkg##*/}
+
+	mercury_pkg_atts=${1#*:}
+	mercury_pkg_type=${mercury_pkg_atts%:*}
+
+	cd "${S}"/${mercury_pkg_dir} || die
+
+	echo ">> Compiling Mercury package: ${mercury_pkg}"
+
+	if test "${mercury_pkg_type}" = "bin"; then
+		mercury_mmc_target=${mercury_pkg_name}
+	else
+		mercury_mmc_target=lib${mercury_pkg_name}
+	fi
+
+	mmc -f *.m || die "mmc -f .m failed"
+
+	mmc \
+		--make \
+		--verbose-commands \
+		--no-strip \
+		--cflags "${CFLAGS}" \
+		--ld-flags "${LDFLAGS}" \
+		--ld-libflags "${LDFLAGS}" \
+		${mercury_mmc_target} || die "mmc ${mercury_mmc_target} failed"
+}
+
+mercury_pkg_install() {
+	mercury_pkg=${1%%:*}
+	mercury_pkg_dir=${mercury_pkg%/*}
+	mercury_pkg_name=${mercury_pkg##*/}
+
+	mercury_pkg_atts=${1#*:}
+	mercury_pkg_type=${mercury_pkg_atts%:*}
+
+	cd "${S}"/${mercury_pkg_dir} || die
+
+	echo ">> Installing Mercury package: ${mercury_pkg}"
+
+	if test "${mercury_pkg_type}" = "bin"; then
+		into /usr/$(get_libdir)/mercury/extras
+		dobin ${mercury_pkg_name}
+	else
+		mmc \
+			--make \
+			--verbose-commands \
+			--no-strip \
+			--cflags "${CFLAGS}" \
+			--ld-flags "${LDFLAGS}" \
+			--ld-libflags "${LDFLAGS}" \
+			--install-prefix "${D}/usr/$(get_libdir)/mercury/extras" \
+			lib${mercury_pkg_name}.install || die "mmc lib${mercury_pkg_name}.install failed"
+	fi
+}
+
+src_prepare() {
+	cd "${WORKDIR}"/${MY_P}
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		eapply "${WORKDIR}"/${PV}
+	fi
+	eapply_user
+
+	cd "${S}"
+	for mercury_pkg in $(mercury_pkgs); do
+		mercury_pkg_setup ${mercury_pkg}
+	done
+
+	cp "${S}"/net/*.m "${S}"/mopenssl/ || die
+}
+
+src_compile() {
+	for mercury_pkg in $(mercury_pkgs); do
+		mercury_pkg_compile ${mercury_pkg}
+	done
+}
+
+src_install() {
+	for mercury_pkg in $(mercury_pkgs); do
+		mercury_pkg_install ${mercury_pkg}
+	done
+
+	cd "${S}"
+	dodoc README.md
+
+	if use examples; then
+		docinto samples/cgi
+		dodoc cgi/form_test.m
+
+		docinto samples/complex_numbers
+		dodoc complex_numbers/samples/*.m
+
+		if use ncurses; then
+			docinto samples/curs
+			dodoc curs/samples/*.m
+
+			docinto samples/curses
+			dodoc curses/sample/*.m
+		fi
+
+		docinto samples/dynamic_linking
+		dodoc dynamic_linking/{hello,dl_test}.m
+
+		docinto samples/gator
+		dodoc -r gator/*
+
+		if use gmp; then
+			docinto samples/gmp_int
+			dodoc gmp_int/gmp_int_test.m
+		fi
+
+		if use tommath; then
+			docinto samples/mp_int
+			dodoc mp_int/mp_int_test.m
+		fi
+
+		if use X; then
+			docinto samples/graphics
+			dodoc graphics/easyx/samples/*.m
+		fi
+
+		if use glut && use opengl; then
+			docinto samples/graphics
+			dodoc graphics/samples/gears/*.m
+			dodoc graphics/samples/maze/*.m
+		fi
+
+		if use tk; then
+			docinto samples/graphics
+			dodoc graphics/samples/calc/*.m
+		fi
+
+		docinto samples/lex
+		dodoc lex/samples/*.m
+
+		docinto samples/log4m
+		dodoc log4m/*.m
+
+		docinto samples/monte
+		dodoc monte/*.m
+
+		docinto samples/moose
+		dodoc moose/samples/*
+
+		docinto samples/net
+		dodoc net/test_lookups.m
+
+		if use odbc || use iodbc; then
+			docinto samples/odbc
+			dodoc odbc/odbc_test.m
+		fi
+
+		docinto samples/posix
+		dodoc posix/samples/*.m
+
+		docinto samples/random
+		dodoc random/*.m
+
+		if has_version dev-lang/mercury[trail]; then
+			docinto samples/references
+			dodoc references/samples/*.m
+
+			docinto samples/trail
+			dodoc trail/*.m
+		fi
+
+		if use xml; then
+			docinto samples/xml
+			dodoc xml/tryit.m
+			dodoc xml/samples/*
+			dodoc xml_stylesheets/*.xsl
+		fi
+
+		ecvs_clean
+	fi
+}


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2022-05-15 10:54 Keri Harris
  0 siblings, 0 replies; 40+ messages in thread
From: Keri Harris @ 2022-05-15 10:54 UTC (permalink / raw
  To: gentoo-commits

commit:     97ef1506bc735363ac47854b942ff44511d38bf2
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 10:53:24 2022 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sun May 15 10:53:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97ef1506

dev-lang/mercury-extras: version bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Keri Harris <keri <AT> gentoo.org>

 dev-lang/mercury-extras/Manifest                   |   2 +
 .../mercury-extras/mercury-extras-22.01.1.ebuild   | 298 +++++++++++++++++++++
 2 files changed, 300 insertions(+)

diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index 18e6588dc2eb..067a2a2e4038 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,6 +1,8 @@
 DIST mercury-extras-20.06-gentoo-patchset-0.tar.gz 1093 BLAKE2B cd0087a7a878c303a610e0007b352deec2e54b8223af1fbdcdd5e1fec0a7d6b4533895ba4ec01d4f90734349535a4c16c69f4ec60495f5a7888f99e4580e3ce3 SHA512 abd74dee931a01085a75f45d2793109737662345bdc68f4cf25dd874b59726da6a5ec8acd84cc8f0957052eeb9e5a9e3502090a0688fbea817d05c6948728ecb
 DIST mercury-extras-20.06.1-gentoo-patchset-0.tar.gz 617 BLAKE2B e16a3887bd0927911e2062befa38119d0347e01eae08d21dcf185942648ce52a94890c26059d39b096f69d19227c2ed22e2d3ded0cc762ebfd1bcb702810f5ea SHA512 1274c08c7c02f6f5fa5183f42e958a8e469df38d8e693722134a24aa846d4f3a74dafa0dd4f9d11fbca58497ff6d714aa7456dc2fd516d8961bc1ba43f3b3b8c
 DIST mercury-extras-22.01-gentoo-patchset-0.tar.gz 436 BLAKE2B 2c1ff61b87e04777f3d3b66e7a6ae1c8e82e7caec413e2ed51eeb785b5dd8bc1773aa065219ccc58833b1c2aae3d481f531b94a48c215ce7eea2e0762948f946 SHA512 eac4615c951665150c6e6d2cc317d68be8e510aa9be663cadfe04b55d30fe8a0d17fae93a19d1e54556179618262ea4fdb6381e05aca278c4c516bc1f52656bd
+DIST mercury-extras-22.01.1-gentoo-patchset-0.tar.gz 435 BLAKE2B 7583123da479602ab257abdd3e72cf74e713447603d39e5776a4eb074755b80d0be64e07f43e80a88f9de922feafcee554acc99c1588af70e874052843ccebe4 SHA512 5e014ed507d11546f6e85299cd59a547331bc7253494427965c88a900577c885e7bb9da5fe7fd21ea5bfcb6d3e6f1b61645881f221b613224a5e01be3ed2c2b2
 DIST mercury-srcdist-20.06.1.tar.gz 47796261 BLAKE2B f282c6edb78e9090eb451585c65c9214927b94eaa5fcdf6f674aef6beb62eb65179f998bcc2e56c3c93b73dd1dc94973084eb8363bc05e334384096c9520d478 SHA512 94e901e5d3db39e3342bf2d6a2a74556a7b18b295c7e02669b487a81d41c72e572046ce1133d670ca6c1b8e246dd277439087efe8fb99b979a73555a101aa9a8
 DIST mercury-srcdist-20.06.tar.gz 47768559 BLAKE2B f242aa2ef7da53aa2dfa054e4fee8646434d276f0748b014e33ea52d22f2a8a37e6fecaa20617f4943c4c1e7d8c179ed0603a344fde2dd58da98b2bacadf1a71 SHA512 b76bd22d8eb16242c68b614ff122ed7ee7535efef6c0ceb8cc798fee4c550bc41b6faff2135cea43b24c652b654bb35ae049656585d8e7bf3a1122d07cb1ecf4
+DIST mercury-srcdist-22.01.1.tar.gz 48956249 BLAKE2B 0f5a7662327f27c27a4d9e421f71afa58920f6232093452781124817ce5c34d1953a80a08b75e95101a7e2e88159b7d4ead08d25c67a99abcb908a9582af2bab SHA512 5fa49640307233ea0f641488e5ea526385e52833007a31469e083711b63925ca7568d7ad6e09301ddf7816384a080546bc4cf46b1422f974e008917d1aa4f37a
 DIST mercury-srcdist-22.01.tar.gz 48960609 BLAKE2B 4ac45251bc098c1465f4bc418501db152bfcf36a2e04bb9153a44c44ff2dff300545103c29551818e773728c5a61947c019997fcc2cb64900e538d5ef64c1b39 SHA512 35b3b1e9fd85062edea5263b304bfc965382d04353e5548d59211519ee222bb6a8e8c95cb03faa089062e39c90b2d1c4af7ca0d9eabbf3bb44872d461e10ff2d

diff --git a/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild b/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild
new file mode 100644
index 000000000000..c90f5ea06af4
--- /dev/null
+++ b/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils multilib vcs-clean
+
+PATCHSET_VER="0"
+MY_P=mercury-srcdist-${PV}
+
+DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
+HOMEPAGE="https://www.mercurylang.org/index.html"
+SRC_URI="https://dl.mercurylang.org/release/${MY_P}.tar.gz
+	https://dev.gentoo.org/~keri/distfiles/mercury-extras/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml"
+REQUIRED_USE="?? ( odbc iodbc )"
+
+RDEPEND="
+	~dev-lang/mercury-${PV}
+	cairo? ( >=x11-libs/cairo-1.10.0 )
+	gmp? ( dev-libs/gmp:0 )
+	glut? ( media-libs/freeglut )
+	odbc? ( dev-db/unixODBC )
+	iodbc? ( dev-db/libiodbc )
+	tommath? ( dev-libs/libtommath )
+	ncurses? ( sys-libs/ncurses:= )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+	)
+	tk? (
+		dev-lang/tcl:0
+		dev-lang/tk:0
+	)
+	X? ( x11-libs/libX11 )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}/extras
+
+mercury_pkgs() {
+	echo "
+		align_right/align_right:bin:
+		base64/mercury_base64:lib:
+		cgi/mercury_www:lib:
+		complex_numbers/complex_numbers:lib:
+		$(use ncurses && echo \
+			curs/curs:lib:ncurses,panel curses/mcurses:lib:ncurses)
+		dynamic_linking/dl:lib:
+		error/error:bin:
+		fixed/fixed:lib:
+		$(use gmp && echo gmp_int/gmp_int:lib:)
+		$(use tommath && echo mp_int/mp_int:lib:libtommath)
+		$(use X && echo graphics/easyx/easyx:lib:x11)
+		$(use cairo && echo graphics/mercury_cairo/mercury_cairo:lib:cairo)
+		$(use glut && echo graphics/mercury_glut/mercury_glut:lib:freeglut)
+		$(use opengl && echo graphics/mercury_opengl/mercury_opengl:lib:gl,glu)
+		$(use tk && echo graphics/mercury_tcltk/mercury_tcltk:lib:tk)
+		lex/lex:lib:
+		lex/regex:lib:
+		moose/moose:bin:
+		net/net:lib:
+		net/echo:bin:
+		$(use ssl && echo mopenssl/mopenssl:lib:openssl)
+		$(use odbc && echo odbc/odbc:lib:odbc)
+		$(use iodbc && echo odbc/odbc:lib:libiodbc)
+		posix/posix:lib:
+		$(has_version dev-lang/mercury[trail] && echo \
+			references/global:lib:)
+		show_ops/show_ops:bin:
+		solver_types/library/any:lib:
+		$(use xml && echo xml/xml:lib:)"
+}
+
+mercury_pkg_setup() {
+	mercury_pkg=${1%%:*}
+	mercury_pkg_dir=${mercury_pkg%/*}
+	mercury_pkg_name=${mercury_pkg##*/}
+
+	mercury_pkg_atts=${1#*:}
+	mercury_pkg_type=${mercury_pkg_atts%%:*}
+	mercury_pkg_deps=${mercury_pkg_atts#*:}
+
+	cd "${S}"/${mercury_pkg_dir} || die
+
+	echo ">> Preparing Mercury package: ${mercury_pkg}"
+
+	echo "MCFLAGS += --libgrades-exclude java" \
+		>> "${S}"/${mercury_pkg_dir}/Mercury.options
+	echo "MCFLAGS += --libgrades-exclude csharp" \
+		>> "${S}"/${mercury_pkg_dir}/Mercury.options
+
+	if test -n "$mercury_pkg_deps"; then
+		echo "EXTRA_CFLAGS += $(pkg-config --cflags ${mercury_pkg_deps/,/ })" \
+			>> "${S}"/${mercury_pkg_dir}/Mercury.options
+		echo "EXTRA_LDFLAGS += $(pkg-config --libs ${mercury_pkg_deps/,/ })" \
+			>> "${S}"/${mercury_pkg_dir}/Mercury.options
+	fi
+
+	if test ${mercury_pkg_name} = dl; then
+		echo "EXTRA_LDFLAGS += -ldl" >> "${S}"/${mercury_pkg_dir}/Mercury.options
+	elif test ${mercury_pkg_name} = gmp_int; then
+		echo "EXTRA_LDFLAGS += -lgmp" >> "${S}"/${mercury_pkg_dir}/Mercury.options
+	elif test ${mercury_pkg_name} = mercury_tcltk; then
+		echo "EXTRA_CFLAGS += -DUSE_INTERP_RESULT" \
+			>> "${S}"/${mercury_pkg_dir}/Mercury.options
+	elif test ${mercury_pkg_name} = odbc && use odbc; then
+		echo "EXTRA_CFLAGS += -DMODBC_UNIX -DMODBC_MYSQL" \
+			>> "${S}"/${mercury_pkg_dir}/Mercury.options
+	elif test ${mercury_pkg_name} = odbc && use iodbc; then
+		echo "EXTRA_CFLAGS += -DMODBC_IODBC -DMODBC_MYSQL" \
+			>> "${S}"/${mercury_pkg_dir}/Mercury.options
+	fi
+}
+
+mercury_pkg_compile() {
+	mercury_pkg=${1%%:*}
+	mercury_pkg_dir=${mercury_pkg%/*}
+	mercury_pkg_name=${mercury_pkg##*/}
+
+	mercury_pkg_atts=${1#*:}
+	mercury_pkg_type=${mercury_pkg_atts%:*}
+
+	cd "${S}"/${mercury_pkg_dir} || die
+
+	echo ">> Compiling Mercury package: ${mercury_pkg}"
+
+	if test "${mercury_pkg_type}" = "bin"; then
+		mercury_mmc_target=${mercury_pkg_name}
+	else
+		mercury_mmc_target=lib${mercury_pkg_name}
+	fi
+
+	mmc -f *.m || die "mmc -f .m failed"
+
+	mmc \
+		--make \
+		--verbose-commands \
+		--no-strip \
+		--cflags "${CFLAGS}" \
+		--ld-flags "${LDFLAGS}" \
+		--ld-libflags "${LDFLAGS}" \
+		${mercury_mmc_target} || die "mmc ${mercury_mmc_target} failed"
+}
+
+mercury_pkg_install() {
+	mercury_pkg=${1%%:*}
+	mercury_pkg_dir=${mercury_pkg%/*}
+	mercury_pkg_name=${mercury_pkg##*/}
+
+	mercury_pkg_atts=${1#*:}
+	mercury_pkg_type=${mercury_pkg_atts%:*}
+
+	cd "${S}"/${mercury_pkg_dir} || die
+
+	echo ">> Installing Mercury package: ${mercury_pkg}"
+
+	if test "${mercury_pkg_type}" = "bin"; then
+		into /usr/$(get_libdir)/mercury/extras
+		dobin ${mercury_pkg_name}
+	else
+		mmc \
+			--make \
+			--verbose-commands \
+			--no-strip \
+			--cflags "${CFLAGS}" \
+			--ld-flags "${LDFLAGS}" \
+			--ld-libflags "${LDFLAGS}" \
+			--install-prefix "${D}/usr/$(get_libdir)/mercury/extras" \
+			lib${mercury_pkg_name}.install || die "mmc lib${mercury_pkg_name}.install failed"
+	fi
+}
+
+src_prepare() {
+	cd "${WORKDIR}"/${MY_P}
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		eapply "${WORKDIR}"/${PV}
+	fi
+	eapply_user
+
+	cd "${S}"
+	for mercury_pkg in $(mercury_pkgs); do
+		mercury_pkg_setup ${mercury_pkg}
+	done
+
+	cp "${S}"/net/*.m "${S}"/mopenssl/ || die
+}
+
+src_compile() {
+	for mercury_pkg in $(mercury_pkgs); do
+		mercury_pkg_compile ${mercury_pkg}
+	done
+}
+
+src_install() {
+	for mercury_pkg in $(mercury_pkgs); do
+		mercury_pkg_install ${mercury_pkg}
+	done
+
+	cd "${S}"
+	dodoc README.md
+
+	if use examples; then
+		docinto samples/cgi
+		dodoc cgi/form_test.m
+
+		docinto samples/complex_numbers
+		dodoc complex_numbers/samples/*.m
+
+		if use ncurses; then
+			docinto samples/curs
+			dodoc curs/samples/*.m
+
+			docinto samples/curses
+			dodoc curses/sample/*.m
+		fi
+
+		docinto samples/dynamic_linking
+		dodoc dynamic_linking/{hello,dl_test}.m
+
+		docinto samples/gator
+		dodoc -r gator/*
+
+		if use gmp; then
+			docinto samples/gmp_int
+			dodoc gmp_int/gmp_int_test.m
+		fi
+
+		if use tommath; then
+			docinto samples/mp_int
+			dodoc mp_int/mp_int_test.m
+		fi
+
+		if use X; then
+			docinto samples/graphics
+			dodoc graphics/easyx/samples/*.m
+		fi
+
+		if use glut && use opengl; then
+			docinto samples/graphics
+			dodoc graphics/samples/gears/*.m
+			dodoc graphics/samples/maze/*.m
+		fi
+
+		if use tk; then
+			docinto samples/graphics
+			dodoc graphics/samples/calc/*.m
+		fi
+
+		docinto samples/lex
+		dodoc lex/samples/*.m
+
+		docinto samples/log4m
+		dodoc log4m/*.m
+
+		docinto samples/monte
+		dodoc monte/*.m
+
+		docinto samples/moose
+		dodoc moose/samples/*
+
+		docinto samples/net
+		dodoc net/test_lookups.m
+
+		if use odbc || use iodbc; then
+			docinto samples/odbc
+			dodoc odbc/odbc_test.m
+		fi
+
+		docinto samples/posix
+		dodoc posix/samples/*.m
+
+		docinto samples/random
+		dodoc random/*.m
+
+		if has_version dev-lang/mercury[trail]; then
+			docinto samples/references
+			dodoc references/samples/*.m
+
+			docinto samples/trail
+			dodoc trail/*.m
+		fi
+
+		if use xml; then
+			docinto samples/xml
+			dodoc xml/tryit.m
+			dodoc xml/samples/*
+			dodoc xml_stylesheets/*.xsl
+		fi
+
+		ecvs_clean
+	fi
+}


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2022-05-22 16:24 Keri Harris
  0 siblings, 0 replies; 40+ messages in thread
From: Keri Harris @ 2022-05-22 16:24 UTC (permalink / raw
  To: gentoo-commits

commit:     3b78f24ad9a265196432c7f7aefe11b4a2bb58b4
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sun May 22 16:24:18 2022 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sun May 22 16:24:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b78f24a

dev-lang/mercury-extras: fix compile of netdb with musl

Closes: https://bugs.gentoo.org/832706
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Keri Harris <keri <AT> gentoo.org>

 dev-lang/mercury-extras/Manifest                      | 2 +-
 dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index 067a2a2e4038..7fd31befe526 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,7 +1,7 @@
 DIST mercury-extras-20.06-gentoo-patchset-0.tar.gz 1093 BLAKE2B cd0087a7a878c303a610e0007b352deec2e54b8223af1fbdcdd5e1fec0a7d6b4533895ba4ec01d4f90734349535a4c16c69f4ec60495f5a7888f99e4580e3ce3 SHA512 abd74dee931a01085a75f45d2793109737662345bdc68f4cf25dd874b59726da6a5ec8acd84cc8f0957052eeb9e5a9e3502090a0688fbea817d05c6948728ecb
 DIST mercury-extras-20.06.1-gentoo-patchset-0.tar.gz 617 BLAKE2B e16a3887bd0927911e2062befa38119d0347e01eae08d21dcf185942648ce52a94890c26059d39b096f69d19227c2ed22e2d3ded0cc762ebfd1bcb702810f5ea SHA512 1274c08c7c02f6f5fa5183f42e958a8e469df38d8e693722134a24aa846d4f3a74dafa0dd4f9d11fbca58497ff6d714aa7456dc2fd516d8961bc1ba43f3b3b8c
 DIST mercury-extras-22.01-gentoo-patchset-0.tar.gz 436 BLAKE2B 2c1ff61b87e04777f3d3b66e7a6ae1c8e82e7caec413e2ed51eeb785b5dd8bc1773aa065219ccc58833b1c2aae3d481f531b94a48c215ce7eea2e0762948f946 SHA512 eac4615c951665150c6e6d2cc317d68be8e510aa9be663cadfe04b55d30fe8a0d17fae93a19d1e54556179618262ea4fdb6381e05aca278c4c516bc1f52656bd
-DIST mercury-extras-22.01.1-gentoo-patchset-0.tar.gz 435 BLAKE2B 7583123da479602ab257abdd3e72cf74e713447603d39e5776a4eb074755b80d0be64e07f43e80a88f9de922feafcee554acc99c1588af70e874052843ccebe4 SHA512 5e014ed507d11546f6e85299cd59a547331bc7253494427965c88a900577c885e7bb9da5fe7fd21ea5bfcb6d3e6f1b61645881f221b613224a5e01be3ed2c2b2
+DIST mercury-extras-22.01.1-gentoo-patchset-1.tar.gz 824 BLAKE2B 677ab82f668f2e35cccf6eff0fc453fb5483941b5315891b1b02a2afb3216b59c86aa3712cdbc7382aa604ce7d1ac7cd8e32bb25c7643b8a3786bae09e987dbb SHA512 bb6ca63a9d4ceb71f7e2c07540301ca319a0163414b5d005251de4b8d4948fcd551b892e1520be0e95c845c31fd6953f2293f5fe52990af680b5bf9117a22e69
 DIST mercury-srcdist-20.06.1.tar.gz 47796261 BLAKE2B f282c6edb78e9090eb451585c65c9214927b94eaa5fcdf6f674aef6beb62eb65179f998bcc2e56c3c93b73dd1dc94973084eb8363bc05e334384096c9520d478 SHA512 94e901e5d3db39e3342bf2d6a2a74556a7b18b295c7e02669b487a81d41c72e572046ce1133d670ca6c1b8e246dd277439087efe8fb99b979a73555a101aa9a8
 DIST mercury-srcdist-20.06.tar.gz 47768559 BLAKE2B f242aa2ef7da53aa2dfa054e4fee8646434d276f0748b014e33ea52d22f2a8a37e6fecaa20617f4943c4c1e7d8c179ed0603a344fde2dd58da98b2bacadf1a71 SHA512 b76bd22d8eb16242c68b614ff122ed7ee7535efef6c0ceb8cc798fee4c550bc41b6faff2135cea43b24c652b654bb35ae049656585d8e7bf3a1122d07cb1ecf4
 DIST mercury-srcdist-22.01.1.tar.gz 48956249 BLAKE2B 0f5a7662327f27c27a4d9e421f71afa58920f6232093452781124817ce5c34d1953a80a08b75e95101a7e2e88159b7d4ead08d25c67a99abcb908a9582af2bab SHA512 5fa49640307233ea0f641488e5ea526385e52833007a31469e083711b63925ca7568d7ad6e09301ddf7816384a080546bc4cf46b1422f974e008917d1aa4f37a

diff --git a/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild b/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild
index c90f5ea06af4..6ab5fe3c9458 100644
--- a/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit eutils multilib vcs-clean
 
-PATCHSET_VER="0"
+PATCHSET_VER="1"
 MY_P=mercury-srcdist-${PV}
 
 DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2022-08-14 15:18 Keri Harris
  0 siblings, 0 replies; 40+ messages in thread
From: Keri Harris @ 2022-08-14 15:18 UTC (permalink / raw
  To: gentoo-commits

commit:     f5618481569d46a509a4cef6b4a5be8722421d7d
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 14 15:17:59 2022 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sun Aug 14 15:17:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5618481

dev-lang/mercury-extras: stable on amd64, x86. Bug #865153

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Keri Harris <keri <AT> gentoo.org>

 dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild b/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild
index 6ab5fe3c9458..55097f04e108 100644
--- a/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dl.mercurylang.org/release/${MY_P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml"
 REQUIRED_USE="?? ( odbc iodbc )"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2022-10-08 20:01 Sam James
  0 siblings, 0 replies; 40+ messages in thread
From: Sam James @ 2022-10-08 20:01 UTC (permalink / raw
  To: gentoo-commits

commit:     c709f5d0e9c8b12437751864ff93e861f5f92554
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  8 19:56:38 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct  8 20:01:31 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c709f5d0

dev-lang/mercury-extras: fix DeprecatedEclass (eutils)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild | 2 +-
 dev-lang/mercury-extras/mercury-extras-22.01.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild b/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild
index 55097f04e108..173c1939754c 100644
--- a/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils multilib vcs-clean
+inherit multilib vcs-clean
 
 PATCHSET_VER="1"
 MY_P=mercury-srcdist-${PV}

diff --git a/dev-lang/mercury-extras/mercury-extras-22.01.ebuild b/dev-lang/mercury-extras/mercury-extras-22.01.ebuild
index c90f5ea06af4..c73b6e8a9b8c 100644
--- a/dev-lang/mercury-extras/mercury-extras-22.01.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-22.01.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils multilib vcs-clean
+inherit multilib vcs-clean
 
 PATCHSET_VER="0"
 MY_P=mercury-srcdist-${PV}


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2024-06-08  7:57 Miroslav Šulc
  0 siblings, 0 replies; 40+ messages in thread
From: Miroslav Šulc @ 2024-06-08  7:57 UTC (permalink / raw
  To: gentoo-commits

commit:     163b45aca4e345b3c2ba75bc4d84378830d13272
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Jun  1 09:09:12 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jun  8 07:56:46 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=163b45ac

dev-lang/mercury-extras: drop 20.06, 20.06.1, 22.01

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-lang/mercury-extras/Manifest                   |   6 -
 .../mercury-extras/mercury-extras-20.06.1.ebuild   | 307 ---------------------
 .../mercury-extras/mercury-extras-20.06.ebuild     | 307 ---------------------
 .../mercury-extras/mercury-extras-22.01.ebuild     | 298 --------------------
 4 files changed, 918 deletions(-)

diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index 7fd31befe526..1b76bcf84db7 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,8 +1,2 @@
-DIST mercury-extras-20.06-gentoo-patchset-0.tar.gz 1093 BLAKE2B cd0087a7a878c303a610e0007b352deec2e54b8223af1fbdcdd5e1fec0a7d6b4533895ba4ec01d4f90734349535a4c16c69f4ec60495f5a7888f99e4580e3ce3 SHA512 abd74dee931a01085a75f45d2793109737662345bdc68f4cf25dd874b59726da6a5ec8acd84cc8f0957052eeb9e5a9e3502090a0688fbea817d05c6948728ecb
-DIST mercury-extras-20.06.1-gentoo-patchset-0.tar.gz 617 BLAKE2B e16a3887bd0927911e2062befa38119d0347e01eae08d21dcf185942648ce52a94890c26059d39b096f69d19227c2ed22e2d3ded0cc762ebfd1bcb702810f5ea SHA512 1274c08c7c02f6f5fa5183f42e958a8e469df38d8e693722134a24aa846d4f3a74dafa0dd4f9d11fbca58497ff6d714aa7456dc2fd516d8961bc1ba43f3b3b8c
-DIST mercury-extras-22.01-gentoo-patchset-0.tar.gz 436 BLAKE2B 2c1ff61b87e04777f3d3b66e7a6ae1c8e82e7caec413e2ed51eeb785b5dd8bc1773aa065219ccc58833b1c2aae3d481f531b94a48c215ce7eea2e0762948f946 SHA512 eac4615c951665150c6e6d2cc317d68be8e510aa9be663cadfe04b55d30fe8a0d17fae93a19d1e54556179618262ea4fdb6381e05aca278c4c516bc1f52656bd
 DIST mercury-extras-22.01.1-gentoo-patchset-1.tar.gz 824 BLAKE2B 677ab82f668f2e35cccf6eff0fc453fb5483941b5315891b1b02a2afb3216b59c86aa3712cdbc7382aa604ce7d1ac7cd8e32bb25c7643b8a3786bae09e987dbb SHA512 bb6ca63a9d4ceb71f7e2c07540301ca319a0163414b5d005251de4b8d4948fcd551b892e1520be0e95c845c31fd6953f2293f5fe52990af680b5bf9117a22e69
-DIST mercury-srcdist-20.06.1.tar.gz 47796261 BLAKE2B f282c6edb78e9090eb451585c65c9214927b94eaa5fcdf6f674aef6beb62eb65179f998bcc2e56c3c93b73dd1dc94973084eb8363bc05e334384096c9520d478 SHA512 94e901e5d3db39e3342bf2d6a2a74556a7b18b295c7e02669b487a81d41c72e572046ce1133d670ca6c1b8e246dd277439087efe8fb99b979a73555a101aa9a8
-DIST mercury-srcdist-20.06.tar.gz 47768559 BLAKE2B f242aa2ef7da53aa2dfa054e4fee8646434d276f0748b014e33ea52d22f2a8a37e6fecaa20617f4943c4c1e7d8c179ed0603a344fde2dd58da98b2bacadf1a71 SHA512 b76bd22d8eb16242c68b614ff122ed7ee7535efef6c0ceb8cc798fee4c550bc41b6faff2135cea43b24c652b654bb35ae049656585d8e7bf3a1122d07cb1ecf4
 DIST mercury-srcdist-22.01.1.tar.gz 48956249 BLAKE2B 0f5a7662327f27c27a4d9e421f71afa58920f6232093452781124817ce5c34d1953a80a08b75e95101a7e2e88159b7d4ead08d25c67a99abcb908a9582af2bab SHA512 5fa49640307233ea0f641488e5ea526385e52833007a31469e083711b63925ca7568d7ad6e09301ddf7816384a080546bc4cf46b1422f974e008917d1aa4f37a
-DIST mercury-srcdist-22.01.tar.gz 48960609 BLAKE2B 4ac45251bc098c1465f4bc418501db152bfcf36a2e04bb9153a44c44ff2dff300545103c29551818e773728c5a61947c019997fcc2cb64900e538d5ef64c1b39 SHA512 35b3b1e9fd85062edea5263b304bfc965382d04353e5548d59211519ee222bb6a8e8c95cb03faa089062e39c90b2d1c4af7ca0d9eabbf3bb44872d461e10ff2d

diff --git a/dev-lang/mercury-extras/mercury-extras-20.06.1.ebuild b/dev-lang/mercury-extras/mercury-extras-20.06.1.ebuild
deleted file mode 100644
index 6069ed489b0f..000000000000
--- a/dev-lang/mercury-extras/mercury-extras-20.06.1.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs vcs-clean
-
-PATCHSET_VER="0"
-MY_P=mercury-srcdist-${PV}
-
-DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
-HOMEPAGE="https://www.mercurylang.org/index.html"
-SRC_URI="https://dl.mercurylang.org/release/${MY_P}.tar.gz
-	https://dev.gentoo.org/~keri/distfiles/mercury-extras/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml"
-REQUIRED_USE="?? ( odbc iodbc )"
-
-RDEPEND="
-	~dev-lang/mercury-${PV}
-	cairo? ( >=x11-libs/cairo-1.10.0 )
-	gmp? ( dev-libs/gmp:0 )
-	glut? ( media-libs/freeglut )
-	odbc? ( dev-db/unixODBC )
-	iodbc? ( dev-db/libiodbc )
-	tommath? ( dev-libs/libtommath )
-	ncurses? ( sys-libs/ncurses:= )
-	opengl? (
-		virtual/opengl
-		virtual/glu
-	)
-	tk? (
-		dev-lang/tcl:0
-		dev-lang/tk:0
-	)
-	X? ( x11-libs/libX11 )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}"/${MY_P}/extras
-
-mercury_pkgs() {
-	echo "
-		align_right/align_right:bin:
-		base64/mercury_base64:lib:
-		cgi/mercury_www:lib:
-		complex_numbers/complex_numbers:lib:
-		$(use ncurses && echo \
-			curs/curs:lib:ncurses,panel curses/mcurses:lib:ncurses)
-		dynamic_linking/dl:lib:
-		error/error:bin:
-		fixed/fixed:lib:
-		$(use gmp && echo gmp_int/gmp_int:lib:)
-		$(use tommath && echo mp_int/mp_int:lib:libtommath)
-		$(use X && echo graphics/easyx/easyx:lib:x11)
-		$(use cairo && echo graphics/mercury_cairo/mercury_cairo:lib:cairo)
-		$(use glut && echo graphics/mercury_glut/mercury_glut:lib:freeglut)
-		$(use opengl && echo graphics/mercury_opengl/mercury_opengl:lib:gl,glu)
-		$(use tk && echo graphics/mercury_tcltk/mercury_tcltk:lib:tk)
-		lex/lex:lib:
-		lex/regex:lib:
-		moose/moose:bin:
-		net/net:lib:
-		net/echo:bin:
-		$(use ssl && echo mopenssl/mopenssl:lib:openssl)
-		$(use odbc && echo odbc/odbc:lib:odbc)
-		$(use iodbc && echo odbc/odbc:lib:libiodbc)
-		posix/posix:lib:
-		$(has_version dev-lang/mercury[trail] && echo \
-			references/global:lib:)
-		show_ops/show_ops:bin:
-		solver_types/library/any:lib:
-		$(use xml && echo xml/xml:lib:)"
-}
-
-mercury_pkg_setup() {
-	mercury_pkg=${1%%:*}
-	mercury_pkg_dir=${mercury_pkg%/*}
-	mercury_pkg_name=${mercury_pkg##*/}
-
-	mercury_pkg_atts=${1#*:}
-	mercury_pkg_type=${mercury_pkg_atts%%:*}
-	mercury_pkg_deps=${mercury_pkg_atts#*:}
-
-	cd "${S}"/${mercury_pkg_dir} || die
-
-	echo ">> Preparing Mercury package: ${mercury_pkg}"
-
-	echo "MCFLAGS += --libgrades-exclude java" \
-		>> "${S}"/${mercury_pkg_dir}/Mercury.options
-	echo "MCFLAGS += --libgrades-exclude erlang" \
-		>> "${S}"/${mercury_pkg_dir}/Mercury.options
-	echo "MCFLAGS += --libgrades-exclude csharp" \
-		>> "${S}"/${mercury_pkg_dir}/Mercury.options
-
-	if test -n "$mercury_pkg_deps"; then
-		echo "EXTRA_CFLAGS += $($(tc-getPKG_CONFIG) --cflags ${mercury_pkg_deps/,/ })" \
-			>> "${S}"/${mercury_pkg_dir}/Mercury.options
-		echo "EXTRA_LDFLAGS += $($(tc-getPKG_CONFIG) --libs ${mercury_pkg_deps/,/ })" \
-			>> "${S}"/${mercury_pkg_dir}/Mercury.options
-	fi
-
-	if test ${mercury_pkg_name} = dl; then
-		echo "EXTRA_LDFLAGS += -ldl" >> "${S}"/${mercury_pkg_dir}/Mercury.options
-	elif test ${mercury_pkg_name} = gmp_int; then
-		echo "EXTRA_LDFLAGS += -lgmp" >> "${S}"/${mercury_pkg_dir}/Mercury.options
-	elif test ${mercury_pkg_name} = mercury_tcltk; then
-		echo "EXTRA_CFLAGS += -DUSE_INTERP_RESULT" \
-			>> "${S}"/${mercury_pkg_dir}/Mercury.options
-	elif test ${mercury_pkg_name} = odbc && use odbc; then
-		echo "EXTRA_CFLAGS += -DMODBC_UNIX -DMODBC_MYSQL" \
-			>> "${S}"/${mercury_pkg_dir}/Mercury.options
-	elif test ${mercury_pkg_name} = odbc && use iodbc; then
-		echo "EXTRA_CFLAGS += -DMODBC_IODBC -DMODBC_MYSQL" \
-			>> "${S}"/${mercury_pkg_dir}/Mercury.options
-	fi
-}
-
-mercury_pkg_compile() {
-	mercury_pkg=${1%%:*}
-	mercury_pkg_dir=${mercury_pkg%/*}
-	mercury_pkg_name=${mercury_pkg##*/}
-
-	mercury_pkg_atts=${1#*:}
-	mercury_pkg_type=${mercury_pkg_atts%:*}
-
-	cd "${S}"/${mercury_pkg_dir} || die
-
-	echo ">> Compiling Mercury package: ${mercury_pkg}"
-
-	if test "${mercury_pkg_type}" = "bin"; then
-		mercury_mmc_target=${mercury_pkg_name}
-	else
-		mercury_mmc_target=lib${mercury_pkg_name}
-	fi
-
-	mmc -f *.m || die "mmc -f .m failed"
-
-	mmc \
-		--make \
-		--verbose-commands \
-		--no-strip \
-		--cflags "${CFLAGS}" \
-		--ld-flags "${LDFLAGS}" \
-		--ld-libflags "${LDFLAGS}" \
-		${mercury_mmc_target} || die "mmc ${mercury_mmc_target} failed"
-}
-
-mercury_pkg_install() {
-	mercury_pkg=${1%%:*}
-	mercury_pkg_dir=${mercury_pkg%/*}
-	mercury_pkg_name=${mercury_pkg##*/}
-
-	mercury_pkg_atts=${1#*:}
-	mercury_pkg_type=${mercury_pkg_atts%:*}
-
-	cd "${S}"/${mercury_pkg_dir} || die
-
-	echo ">> Installing Mercury package: ${mercury_pkg}"
-
-	if test "${mercury_pkg_type}" = "bin"; then
-		into /usr/$(get_libdir)/mercury/extras
-		dobin ${mercury_pkg_name}
-	else
-		mmc \
-			--make \
-			--verbose-commands \
-			--no-strip \
-			--cflags "${CFLAGS}" \
-			--ld-flags "${LDFLAGS}" \
-			--ld-libflags "${LDFLAGS}" \
-			--install-prefix "${D}/usr/$(get_libdir)/mercury/extras" \
-			lib${mercury_pkg_name}.install || die "mmc lib${mercury_pkg_name}.install failed"
-	fi
-}
-
-src_prepare() {
-	cd "${WORKDIR}"/${MY_P}
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-	eapply_user
-
-	cd "${S}"
-	for mercury_pkg in $(mercury_pkgs); do
-		mercury_pkg_setup ${mercury_pkg}
-	done
-
-	cp "${S}"/net/*.m "${S}"/mopenssl/ || die
-}
-
-src_compile() {
-	for mercury_pkg in $(mercury_pkgs); do
-		mercury_pkg_compile ${mercury_pkg}
-	done
-}
-
-src_install() {
-	for mercury_pkg in $(mercury_pkgs); do
-		mercury_pkg_install ${mercury_pkg}
-	done
-
-	cd "${S}"
-	dodoc README
-
-	if use examples; then
-		docinto samples/cgi
-		dodoc cgi/form_test.m
-
-		docinto samples/complex_numbers
-		dodoc complex_numbers/samples/*.m
-
-		if use ncurses; then
-			docinto samples/curs
-			dodoc curs/samples/*.m
-
-			docinto samples/curses
-			dodoc curses/sample/*.m
-		fi
-
-		docinto samples/dynamic_linking
-		dodoc dynamic_linking/{hello,dl_test}.m
-
-		docinto samples/gator
-		dodoc -r gator/*
-
-		if use gmp; then
-			docinto samples/gmp_int
-			dodoc gmp_int/gmp_int_test.m
-		fi
-
-		if use tommath; then
-			docinto samples/mp_int
-			dodoc mp_int/mp_int_test.m
-		fi
-
-		if use X; then
-			docinto samples/graphics
-			dodoc graphics/easyx/samples/*.m
-		fi
-
-		if use glut && use opengl; then
-			docinto samples/graphics
-			dodoc graphics/samples/gears/*.m
-			dodoc graphics/samples/maze/*.m
-		fi
-
-		if use tk; then
-			docinto samples/graphics
-			dodoc graphics/samples/calc/*.m
-		fi
-
-		if use opengl && use tk; then
-			docinto samples/graphics
-			dodoc graphics/samples/pent/*.m
-		fi
-
-		docinto samples/lex
-		dodoc lex/samples/*.m
-
-		docinto samples/log4m
-		dodoc log4m/*.m
-
-		docinto samples/monte
-		dodoc monte/*.m
-
-		docinto samples/moose
-		dodoc moose/samples/*
-
-		docinto samples/net
-		dodoc net/test_lookups.m
-
-		if use odbc || use iodbc; then
-			docinto samples/odbc
-			dodoc odbc/odbc_test.m
-		fi
-
-		docinto samples/posix
-		dodoc posix/samples/*.m
-
-		docinto samples/random
-		dodoc random/*.m
-
-		if has_version dev-lang/mercury[trail]; then
-			docinto samples/references
-			dodoc references/samples/*.m
-
-			docinto samples/trail
-			dodoc trail/*.m
-		fi
-
-		if use xml; then
-			docinto samples/xml
-			dodoc xml/tryit.m
-			dodoc xml/samples/*
-			dodoc xml_stylesheets/*.xsl
-		fi
-
-		ecvs_clean
-	fi
-}

diff --git a/dev-lang/mercury-extras/mercury-extras-20.06.ebuild b/dev-lang/mercury-extras/mercury-extras-20.06.ebuild
deleted file mode 100644
index 29d3f055a119..000000000000
--- a/dev-lang/mercury-extras/mercury-extras-20.06.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs vcs-clean
-
-PATCHSET_VER="0"
-MY_P=mercury-srcdist-${PV}
-
-DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
-HOMEPAGE="https://www.mercurylang.org/index.html"
-SRC_URI="https://dl.mercurylang.org/release/${MY_P}.tar.gz
-	https://dev.gentoo.org/~keri/distfiles/mercury-extras/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml"
-REQUIRED_USE="?? ( odbc iodbc )"
-
-RDEPEND="
-	~dev-lang/mercury-${PV}
-	cairo? ( >=x11-libs/cairo-1.10.0 )
-	gmp? ( dev-libs/gmp:0 )
-	glut? ( media-libs/freeglut )
-	odbc? ( dev-db/unixODBC )
-	iodbc? ( dev-db/libiodbc )
-	tommath? ( dev-libs/libtommath )
-	ncurses? ( sys-libs/ncurses:= )
-	opengl? (
-		virtual/opengl
-		virtual/glu
-	)
-	tk? (
-		dev-lang/tcl:0
-		dev-lang/tk:0
-	)
-	X? ( x11-libs/libX11 )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}"/${MY_P}/extras
-
-mercury_pkgs() {
-	echo "
-		align_right/align_right:bin:
-		base64/mercury_base64:lib:
-		cgi/mercury_www:lib:
-		complex_numbers/complex_numbers:lib:
-		$(use ncurses && echo \
-			curs/curs:lib:ncurses,panel curses/mcurses:lib:ncurses)
-		dynamic_linking/dl:lib:
-		error/error:bin:
-		fixed/fixed:lib:
-		$(use gmp && echo gmp_int/gmp_int:lib:)
-		$(use tommath && echo mp_int/mp_int:lib:libtommath)
-		$(use X && echo graphics/easyx/easyx:lib:x11)
-		$(use cairo && echo graphics/mercury_cairo/mercury_cairo:lib:cairo)
-		$(use glut && echo graphics/mercury_glut/mercury_glut:lib:freeglut)
-		$(use opengl && echo graphics/mercury_opengl/mercury_opengl:lib:gl,glu)
-		$(use tk && echo graphics/mercury_tcltk/mercury_tcltk:lib:tk)
-		lex/lex:lib:
-		lex/regex:lib:
-		moose/moose:bin:
-		net/net:lib:
-		net/echo:bin:
-		$(use ssl && echo mopenssl/mopenssl:lib:openssl)
-		$(use odbc && echo odbc/odbc:lib:odbc)
-		$(use iodbc && echo odbc/odbc:lib:libiodbc)
-		posix/posix:lib:
-		$(has_version dev-lang/mercury[trail] && echo \
-			references/global:lib:)
-		show_ops/show_ops:bin:
-		solver_types/library/any:lib:
-		$(use xml && echo xml/xml:lib:)"
-}
-
-mercury_pkg_setup() {
-	mercury_pkg=${1%%:*}
-	mercury_pkg_dir=${mercury_pkg%/*}
-	mercury_pkg_name=${mercury_pkg##*/}
-
-	mercury_pkg_atts=${1#*:}
-	mercury_pkg_type=${mercury_pkg_atts%%:*}
-	mercury_pkg_deps=${mercury_pkg_atts#*:}
-
-	cd "${S}"/${mercury_pkg_dir} || die
-
-	echo ">> Preparing Mercury package: ${mercury_pkg}"
-
-	echo "MCFLAGS += --libgrades-exclude java" \
-		>> "${S}"/${mercury_pkg_dir}/Mercury.options
-	echo "MCFLAGS += --libgrades-exclude erlang" \
-		>> "${S}"/${mercury_pkg_dir}/Mercury.options
-	echo "MCFLAGS += --libgrades-exclude csharp" \
-		>> "${S}"/${mercury_pkg_dir}/Mercury.options
-
-	if test -n "$mercury_pkg_deps"; then
-		echo "EXTRA_CFLAGS += $($(tc-getPKG_CONFIG) --cflags ${mercury_pkg_deps/,/ })" \
-			>> "${S}"/${mercury_pkg_dir}/Mercury.options
-		echo "EXTRA_LDFLAGS += $($(tc-getPKG_CONFIG) --libs ${mercury_pkg_deps/,/ })" \
-			>> "${S}"/${mercury_pkg_dir}/Mercury.options
-	fi
-
-	if test ${mercury_pkg_name} = dl; then
-		echo "EXTRA_LDFLAGS += -ldl" >> "${S}"/${mercury_pkg_dir}/Mercury.options
-	elif test ${mercury_pkg_name} = gmp_int; then
-		echo "EXTRA_LDFLAGS += -lgmp" >> "${S}"/${mercury_pkg_dir}/Mercury.options
-	elif test ${mercury_pkg_name} = mercury_tcltk; then
-		echo "EXTRA_CFLAGS += -DUSE_INTERP_RESULT" \
-			>> "${S}"/${mercury_pkg_dir}/Mercury.options
-	elif test ${mercury_pkg_name} = odbc && use odbc; then
-		echo "EXTRA_CFLAGS += -DMODBC_UNIX -DMODBC_MYSQL" \
-			>> "${S}"/${mercury_pkg_dir}/Mercury.options
-	elif test ${mercury_pkg_name} = odbc && use iodbc; then
-		echo "EXTRA_CFLAGS += -DMODBC_IODBC -DMODBC_MYSQL" \
-			>> "${S}"/${mercury_pkg_dir}/Mercury.options
-	fi
-}
-
-mercury_pkg_compile() {
-	mercury_pkg=${1%%:*}
-	mercury_pkg_dir=${mercury_pkg%/*}
-	mercury_pkg_name=${mercury_pkg##*/}
-
-	mercury_pkg_atts=${1#*:}
-	mercury_pkg_type=${mercury_pkg_atts%:*}
-
-	cd "${S}"/${mercury_pkg_dir} || die
-
-	echo ">> Compiling Mercury package: ${mercury_pkg}"
-
-	if test "${mercury_pkg_type}" = "bin"; then
-		mercury_mmc_target=${mercury_pkg_name}
-	else
-		mercury_mmc_target=lib${mercury_pkg_name}
-	fi
-
-	mmc -f *.m || die "mmc -f .m failed"
-
-	mmc \
-		--make \
-		--verbose-commands \
-		--no-strip \
-		--cflags "${CFLAGS}" \
-		--ld-flags "${LDFLAGS}" \
-		--ld-libflags "${LDFLAGS}" \
-		${mercury_mmc_target} || die "mmc ${mercury_mmc_target} failed"
-}
-
-mercury_pkg_install() {
-	mercury_pkg=${1%%:*}
-	mercury_pkg_dir=${mercury_pkg%/*}
-	mercury_pkg_name=${mercury_pkg##*/}
-
-	mercury_pkg_atts=${1#*:}
-	mercury_pkg_type=${mercury_pkg_atts%:*}
-
-	cd "${S}"/${mercury_pkg_dir} || die
-
-	echo ">> Installing Mercury package: ${mercury_pkg}"
-
-	if test "${mercury_pkg_type}" = "bin"; then
-		into /usr/$(get_libdir)/mercury/extras
-		dobin ${mercury_pkg_name}
-	else
-		mmc \
-			--make \
-			--verbose-commands \
-			--no-strip \
-			--cflags "${CFLAGS}" \
-			--ld-flags "${LDFLAGS}" \
-			--ld-libflags "${LDFLAGS}" \
-			--install-prefix "${D}/usr/$(get_libdir)/mercury/extras" \
-			lib${mercury_pkg_name}.install || die "mmc lib${mercury_pkg_name}.install failed"
-	fi
-}
-
-src_prepare() {
-	cd "${WORKDIR}"/${MY_P}
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-	eapply_user
-
-	cd "${S}"
-	for mercury_pkg in $(mercury_pkgs); do
-		mercury_pkg_setup ${mercury_pkg}
-	done
-
-	cp "${S}"/net/*.m "${S}"/mopenssl/ || die
-}
-
-src_compile() {
-	for mercury_pkg in $(mercury_pkgs); do
-		mercury_pkg_compile ${mercury_pkg}
-	done
-}
-
-src_install() {
-	for mercury_pkg in $(mercury_pkgs); do
-		mercury_pkg_install ${mercury_pkg}
-	done
-
-	cd "${S}"
-	dodoc README
-
-	if use examples; then
-		docinto samples/cgi
-		dodoc cgi/form_test.m
-
-		docinto samples/complex_numbers
-		dodoc complex_numbers/samples/*.m
-
-		if use ncurses; then
-			docinto samples/curs
-			dodoc curs/samples/*.m
-
-			docinto samples/curses
-			dodoc curses/sample/*.m
-		fi
-
-		docinto samples/dynamic_linking
-		dodoc dynamic_linking/{hello,dl_test}.m
-
-		docinto samples/gator
-		dodoc -r gator/*
-
-		if use gmp; then
-			docinto samples/gmp_int
-			dodoc gmp_int/gmp_int_test.m
-		fi
-
-		if use tommath; then
-			docinto samples/mp_int
-			dodoc mp_int/mp_int_test.m
-		fi
-
-		if use X; then
-			docinto samples/graphics
-			dodoc graphics/easyx/samples/*.m
-		fi
-
-		if use glut && use opengl; then
-			docinto samples/graphics
-			dodoc graphics/samples/gears/*.m
-			dodoc graphics/samples/maze/*.m
-		fi
-
-		if use tk; then
-			docinto samples/graphics
-			dodoc graphics/samples/calc/*.m
-		fi
-
-		if use opengl && use tk; then
-			docinto samples/graphics
-			dodoc graphics/samples/pent/*.m
-		fi
-
-		docinto samples/lex
-		dodoc lex/samples/*.m
-
-		docinto samples/log4m
-		dodoc log4m/*.m
-
-		docinto samples/monte
-		dodoc monte/*.m
-
-		docinto samples/moose
-		dodoc moose/samples/*
-
-		docinto samples/net
-		dodoc net/test_lookups.m
-
-		if use odbc || use iodbc; then
-			docinto samples/odbc
-			dodoc odbc/odbc_test.m
-		fi
-
-		docinto samples/posix
-		dodoc posix/samples/*.m
-
-		docinto samples/random
-		dodoc random/*.m
-
-		if has_version dev-lang/mercury[trail]; then
-			docinto samples/references
-			dodoc references/samples/*.m
-
-			docinto samples/trail
-			dodoc trail/*.m
-		fi
-
-		if use xml; then
-			docinto samples/xml
-			dodoc xml/tryit.m
-			dodoc xml/samples/*
-			dodoc xml_stylesheets/*.xsl
-		fi
-
-		ecvs_clean
-	fi
-}

diff --git a/dev-lang/mercury-extras/mercury-extras-22.01.ebuild b/dev-lang/mercury-extras/mercury-extras-22.01.ebuild
deleted file mode 100644
index c73b6e8a9b8c..000000000000
--- a/dev-lang/mercury-extras/mercury-extras-22.01.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib vcs-clean
-
-PATCHSET_VER="0"
-MY_P=mercury-srcdist-${PV}
-
-DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
-HOMEPAGE="https://www.mercurylang.org/index.html"
-SRC_URI="https://dl.mercurylang.org/release/${MY_P}.tar.gz
-	https://dev.gentoo.org/~keri/distfiles/mercury-extras/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml"
-REQUIRED_USE="?? ( odbc iodbc )"
-
-RDEPEND="
-	~dev-lang/mercury-${PV}
-	cairo? ( >=x11-libs/cairo-1.10.0 )
-	gmp? ( dev-libs/gmp:0 )
-	glut? ( media-libs/freeglut )
-	odbc? ( dev-db/unixODBC )
-	iodbc? ( dev-db/libiodbc )
-	tommath? ( dev-libs/libtommath )
-	ncurses? ( sys-libs/ncurses:= )
-	opengl? (
-		virtual/opengl
-		virtual/glu
-	)
-	tk? (
-		dev-lang/tcl:0
-		dev-lang/tk:0
-	)
-	X? ( x11-libs/libX11 )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}/extras
-
-mercury_pkgs() {
-	echo "
-		align_right/align_right:bin:
-		base64/mercury_base64:lib:
-		cgi/mercury_www:lib:
-		complex_numbers/complex_numbers:lib:
-		$(use ncurses && echo \
-			curs/curs:lib:ncurses,panel curses/mcurses:lib:ncurses)
-		dynamic_linking/dl:lib:
-		error/error:bin:
-		fixed/fixed:lib:
-		$(use gmp && echo gmp_int/gmp_int:lib:)
-		$(use tommath && echo mp_int/mp_int:lib:libtommath)
-		$(use X && echo graphics/easyx/easyx:lib:x11)
-		$(use cairo && echo graphics/mercury_cairo/mercury_cairo:lib:cairo)
-		$(use glut && echo graphics/mercury_glut/mercury_glut:lib:freeglut)
-		$(use opengl && echo graphics/mercury_opengl/mercury_opengl:lib:gl,glu)
-		$(use tk && echo graphics/mercury_tcltk/mercury_tcltk:lib:tk)
-		lex/lex:lib:
-		lex/regex:lib:
-		moose/moose:bin:
-		net/net:lib:
-		net/echo:bin:
-		$(use ssl && echo mopenssl/mopenssl:lib:openssl)
-		$(use odbc && echo odbc/odbc:lib:odbc)
-		$(use iodbc && echo odbc/odbc:lib:libiodbc)
-		posix/posix:lib:
-		$(has_version dev-lang/mercury[trail] && echo \
-			references/global:lib:)
-		show_ops/show_ops:bin:
-		solver_types/library/any:lib:
-		$(use xml && echo xml/xml:lib:)"
-}
-
-mercury_pkg_setup() {
-	mercury_pkg=${1%%:*}
-	mercury_pkg_dir=${mercury_pkg%/*}
-	mercury_pkg_name=${mercury_pkg##*/}
-
-	mercury_pkg_atts=${1#*:}
-	mercury_pkg_type=${mercury_pkg_atts%%:*}
-	mercury_pkg_deps=${mercury_pkg_atts#*:}
-
-	cd "${S}"/${mercury_pkg_dir} || die
-
-	echo ">> Preparing Mercury package: ${mercury_pkg}"
-
-	echo "MCFLAGS += --libgrades-exclude java" \
-		>> "${S}"/${mercury_pkg_dir}/Mercury.options
-	echo "MCFLAGS += --libgrades-exclude csharp" \
-		>> "${S}"/${mercury_pkg_dir}/Mercury.options
-
-	if test -n "$mercury_pkg_deps"; then
-		echo "EXTRA_CFLAGS += $(pkg-config --cflags ${mercury_pkg_deps/,/ })" \
-			>> "${S}"/${mercury_pkg_dir}/Mercury.options
-		echo "EXTRA_LDFLAGS += $(pkg-config --libs ${mercury_pkg_deps/,/ })" \
-			>> "${S}"/${mercury_pkg_dir}/Mercury.options
-	fi
-
-	if test ${mercury_pkg_name} = dl; then
-		echo "EXTRA_LDFLAGS += -ldl" >> "${S}"/${mercury_pkg_dir}/Mercury.options
-	elif test ${mercury_pkg_name} = gmp_int; then
-		echo "EXTRA_LDFLAGS += -lgmp" >> "${S}"/${mercury_pkg_dir}/Mercury.options
-	elif test ${mercury_pkg_name} = mercury_tcltk; then
-		echo "EXTRA_CFLAGS += -DUSE_INTERP_RESULT" \
-			>> "${S}"/${mercury_pkg_dir}/Mercury.options
-	elif test ${mercury_pkg_name} = odbc && use odbc; then
-		echo "EXTRA_CFLAGS += -DMODBC_UNIX -DMODBC_MYSQL" \
-			>> "${S}"/${mercury_pkg_dir}/Mercury.options
-	elif test ${mercury_pkg_name} = odbc && use iodbc; then
-		echo "EXTRA_CFLAGS += -DMODBC_IODBC -DMODBC_MYSQL" \
-			>> "${S}"/${mercury_pkg_dir}/Mercury.options
-	fi
-}
-
-mercury_pkg_compile() {
-	mercury_pkg=${1%%:*}
-	mercury_pkg_dir=${mercury_pkg%/*}
-	mercury_pkg_name=${mercury_pkg##*/}
-
-	mercury_pkg_atts=${1#*:}
-	mercury_pkg_type=${mercury_pkg_atts%:*}
-
-	cd "${S}"/${mercury_pkg_dir} || die
-
-	echo ">> Compiling Mercury package: ${mercury_pkg}"
-
-	if test "${mercury_pkg_type}" = "bin"; then
-		mercury_mmc_target=${mercury_pkg_name}
-	else
-		mercury_mmc_target=lib${mercury_pkg_name}
-	fi
-
-	mmc -f *.m || die "mmc -f .m failed"
-
-	mmc \
-		--make \
-		--verbose-commands \
-		--no-strip \
-		--cflags "${CFLAGS}" \
-		--ld-flags "${LDFLAGS}" \
-		--ld-libflags "${LDFLAGS}" \
-		${mercury_mmc_target} || die "mmc ${mercury_mmc_target} failed"
-}
-
-mercury_pkg_install() {
-	mercury_pkg=${1%%:*}
-	mercury_pkg_dir=${mercury_pkg%/*}
-	mercury_pkg_name=${mercury_pkg##*/}
-
-	mercury_pkg_atts=${1#*:}
-	mercury_pkg_type=${mercury_pkg_atts%:*}
-
-	cd "${S}"/${mercury_pkg_dir} || die
-
-	echo ">> Installing Mercury package: ${mercury_pkg}"
-
-	if test "${mercury_pkg_type}" = "bin"; then
-		into /usr/$(get_libdir)/mercury/extras
-		dobin ${mercury_pkg_name}
-	else
-		mmc \
-			--make \
-			--verbose-commands \
-			--no-strip \
-			--cflags "${CFLAGS}" \
-			--ld-flags "${LDFLAGS}" \
-			--ld-libflags "${LDFLAGS}" \
-			--install-prefix "${D}/usr/$(get_libdir)/mercury/extras" \
-			lib${mercury_pkg_name}.install || die "mmc lib${mercury_pkg_name}.install failed"
-	fi
-}
-
-src_prepare() {
-	cd "${WORKDIR}"/${MY_P}
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-	eapply_user
-
-	cd "${S}"
-	for mercury_pkg in $(mercury_pkgs); do
-		mercury_pkg_setup ${mercury_pkg}
-	done
-
-	cp "${S}"/net/*.m "${S}"/mopenssl/ || die
-}
-
-src_compile() {
-	for mercury_pkg in $(mercury_pkgs); do
-		mercury_pkg_compile ${mercury_pkg}
-	done
-}
-
-src_install() {
-	for mercury_pkg in $(mercury_pkgs); do
-		mercury_pkg_install ${mercury_pkg}
-	done
-
-	cd "${S}"
-	dodoc README.md
-
-	if use examples; then
-		docinto samples/cgi
-		dodoc cgi/form_test.m
-
-		docinto samples/complex_numbers
-		dodoc complex_numbers/samples/*.m
-
-		if use ncurses; then
-			docinto samples/curs
-			dodoc curs/samples/*.m
-
-			docinto samples/curses
-			dodoc curses/sample/*.m
-		fi
-
-		docinto samples/dynamic_linking
-		dodoc dynamic_linking/{hello,dl_test}.m
-
-		docinto samples/gator
-		dodoc -r gator/*
-
-		if use gmp; then
-			docinto samples/gmp_int
-			dodoc gmp_int/gmp_int_test.m
-		fi
-
-		if use tommath; then
-			docinto samples/mp_int
-			dodoc mp_int/mp_int_test.m
-		fi
-
-		if use X; then
-			docinto samples/graphics
-			dodoc graphics/easyx/samples/*.m
-		fi
-
-		if use glut && use opengl; then
-			docinto samples/graphics
-			dodoc graphics/samples/gears/*.m
-			dodoc graphics/samples/maze/*.m
-		fi
-
-		if use tk; then
-			docinto samples/graphics
-			dodoc graphics/samples/calc/*.m
-		fi
-
-		docinto samples/lex
-		dodoc lex/samples/*.m
-
-		docinto samples/log4m
-		dodoc log4m/*.m
-
-		docinto samples/monte
-		dodoc monte/*.m
-
-		docinto samples/moose
-		dodoc moose/samples/*
-
-		docinto samples/net
-		dodoc net/test_lookups.m
-
-		if use odbc || use iodbc; then
-			docinto samples/odbc
-			dodoc odbc/odbc_test.m
-		fi
-
-		docinto samples/posix
-		dodoc posix/samples/*.m
-
-		docinto samples/random
-		dodoc random/*.m
-
-		if has_version dev-lang/mercury[trail]; then
-			docinto samples/references
-			dodoc references/samples/*.m
-
-			docinto samples/trail
-			dodoc trail/*.m
-		fi
-
-		if use xml; then
-			docinto samples/xml
-			dodoc xml/tryit.m
-			dodoc xml/samples/*
-			dodoc xml_stylesheets/*.xsl
-		fi
-
-		ecvs_clean
-	fi
-}


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2024-06-30 20:18 Florian Schmaus
  0 siblings, 0 replies; 40+ messages in thread
From: Florian Schmaus @ 2024-06-30 20:18 UTC (permalink / raw
  To: gentoo-commits

commit:     96ba2c936cb27edeac858345b3db06830697e03a
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Jun  3 08:24:50 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Jun 30 20:18:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96ba2c93

dev-lang/mercury-extras: add github upstream metadata

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/36940
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-lang/mercury-extras/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-lang/mercury-extras/metadata.xml b/dev-lang/mercury-extras/metadata.xml
index d6a4b0b729f8..1736dbb41e2a 100644
--- a/dev-lang/mercury-extras/metadata.xml
+++ b/dev-lang/mercury-extras/metadata.xml
@@ -5,4 +5,7 @@
 <use>
   <flag name="tommath">Enable support for tommath library</flag>
 </use>
+<upstream>
+  <remote-id type="github">Mercury-Language/mercury</remote-id>
+</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2024-06-30 20:18 Florian Schmaus
  0 siblings, 0 replies; 40+ messages in thread
From: Florian Schmaus @ 2024-06-30 20:18 UTC (permalink / raw
  To: gentoo-commits

commit:     73ee547e3f45c927d525326869327302d30dbe8d
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Jun  3 08:21:32 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Jun 30 20:18:04 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73ee547e

dev-lang/mercury-extras: drop unused multilib.eclass

Closes: https://bugs.gentoo.org/933817
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild b/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild
index 173c1939754c..239c88e3cd60 100644
--- a/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit multilib vcs-clean
+inherit vcs-clean
 
 PATCHSET_VER="1"
 MY_P=mercury-srcdist-${PV}
@@ -12,6 +12,7 @@ DESCRIPTION="Additional libraries and tools that are not part of the Mercury sta
 HOMEPAGE="https://www.mercurylang.org/index.html"
 SRC_URI="https://dl.mercurylang.org/release/${MY_P}.tar.gz
 	https://dev.gentoo.org/~keri/distfiles/mercury-extras/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+S="${WORKDIR}"/${MY_P}/extras
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
@@ -41,8 +42,6 @@ RDEPEND="
 
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}"/${MY_P}/extras
-
 mercury_pkgs() {
 	echo "
 		align_right/align_right:bin:


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2024-10-14  5:28 Eli Schwartz
  0 siblings, 0 replies; 40+ messages in thread
From: Eli Schwartz @ 2024-10-14  5:28 UTC (permalink / raw
  To: gentoo-commits

commit:     b3e643353b25028826a85390411a840ed0deecec
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 22:52:00 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Mon Oct 14 05:27:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3e64335

dev-lang/mercury-extras: mark as LTO-unsafe

It appears to be a fundamental design issue. It is not really C code,
though they do generate it as an intermediate format.

```
ccJwDryZ.ltrans0.ltrans.o:(.data.rel.ro.local+0x330): undefined reference to `<unification predicate for type 'align_right.squeeze'/0 mode 0>'
```

Closes: https://bugs.gentoo.org/855638
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild b/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild
index 239c88e3cd60..441311e6c725 100644
--- a/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild
@@ -191,6 +191,12 @@ src_prepare() {
 }
 
 src_compile() {
+	# ccJwDryZ.ltrans0.ltrans.o:(.data.rel.ro.local+0x330): undefined reference to `<unification predicate for type 'align_right.squeeze'/0 mode 0>'
+	# https://bugs.gentoo.org/855638
+	#
+	# Custom language-specific compiler infrastructure, the main mercury compiler cannot handle LTO either.
+	filter-lto
+
 	for mercury_pkg in $(mercury_pkgs); do
 		mercury_pkg_compile ${mercury_pkg}
 	done


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
@ 2024-10-15  1:39 Eli Schwartz
  0 siblings, 0 replies; 40+ messages in thread
From: Eli Schwartz @ 2024-10-15  1:39 UTC (permalink / raw
  To: gentoo-commits

commit:     7584b42b435c894fc69811e4af50b13178bca6ca
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 15 01:01:58 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Tue Oct 15 01:39:08 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7584b42b

dev-lang/mercury-extras: fix filter-lto to include inherit

Otherwise filter-lto doesn't actually run. Oops!

Closes: https://bugs.gentoo.org/941515
Fixes: b3e643353b25028826a85390411a840ed0deecec
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild b/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild
index 441311e6c725..d747270e30b0 100644
--- a/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit vcs-clean
+inherit flag-o-matic vcs-clean
 
 PATCHSET_VER="1"
 MY_P=mercury-srcdist-${PV}


^ permalink raw reply related	[flat|nested] 40+ messages in thread

end of thread, other threads:[~2024-10-15  1:39 UTC | newest]

Thread overview: 40+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-23 11:43 [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/ Keri Harris
  -- strict thread matches above, loose matches on Subject: below --
2024-10-15  1:39 Eli Schwartz
2024-10-14  5:28 Eli Schwartz
2024-06-30 20:18 Florian Schmaus
2024-06-30 20:18 Florian Schmaus
2024-06-08  7:57 Miroslav Šulc
2022-10-08 20:01 Sam James
2022-08-14 15:18 Keri Harris
2022-05-22 16:24 Keri Harris
2022-05-15 10:54 Keri Harris
2022-05-14 18:31 Keri Harris
2021-10-03 11:11 Keri Harris
2021-06-18 21:07 David Seifert
2021-01-18 16:04 Keri Harris
2021-01-07  7:25 Keri Harris
2020-09-15 11:07 Keri Harris
2020-09-13 10:48 Keri Harris
2020-07-26 13:37 Keri Harris
2020-07-19 20:27 Keri Harris
2020-04-02  9:38 Keri Harris
2020-04-01 10:37 Keri Harris
2020-03-29 10:43 Keri Harris
2020-03-21 17:17 Keri Harris
2020-03-21 16:40 Keri Harris
2020-02-12 18:06 David Seifert
2019-04-15 11:45 Keri Harris
2018-10-27  6:58 Keri Harris
2018-09-09 22:49 Thomas Deutschmann
2018-09-03 12:49 Keri Harris
2018-07-17 11:58 Keri Harris
2017-09-30 11:35 Keri Harris
2017-09-28  6:47 Keri Harris
2017-09-27 18:57 Keri Harris
2017-09-27  7:36 Keri Harris
2017-09-26 19:59 Keri Harris
2017-09-26 19:09 Keri Harris
2017-09-26 17:30 Keri Harris
2017-09-25 10:43 Keri Harris
2017-01-23 15:46 Agostino Sarubbo
2017-01-23 13:51 Agostino Sarubbo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox