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

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

[Agostino Sarubbo]

commit:     e425a3d20045aa28a5a91df4e6aef6fb275f35df
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 13:48:44 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=e425a3d2

dev-lang/mercury: 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/mercury-13.05.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/mercury/mercury-13.05.2.ebuild b/dev-lang/mercury/mercury-13.05.2.ebuild
index 44f38dc..7fc2a6c 100644
--- a/dev-lang/mercury/mercury-13.05.2.ebuild
+++ b/dev-lang/mercury/mercury-13.05.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 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="debug emacs erlang examples java minimal readline threads"
 

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

[Eli Schwartz]

commit:     be7134514c457e8a7f8945d85208828a40b47230
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 11 06:11: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=be713451

dev-lang/mercury: add missing build dependencies

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

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

diff --git a/dev-lang/mercury/mercury-22.01.1-r1.ebuild b/dev-lang/mercury/mercury-22.01.1-r1.ebuild
index 965d58b1c65e..78b5f0afb2fb 100644
--- a/dev-lang/mercury/mercury-22.01.1-r1.ebuild
+++ b/dev-lang/mercury/mercury-22.01.1-r1.ebuild
@@ -33,7 +33,12 @@ RDEPEND="${COMMON_DEP}
 	emacs? ( >=app-editors/emacs-23.1:* )
 	java? ( >=virtual/jre-1.8:* )"
 
-BDEPEND="test? ( sys-libs/timezone-data )"
+# specifically verifies that you are not using generic lex/yacc
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	test? ( sys-libs/timezone-data )
+"
 
 SITEFILE=50${PN}-gentoo.el
 

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

[Eli Schwartz]

commit:     c316d7e2bbe573c43b1ea26751da5a48f14a0c3c
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 11 05:22:44 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=c316d7e2

dev-lang/mercury: mark as LTO-unsafe

It is using global register variables, and there's a GCC bug that makes
this not work with lto.

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

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

diff --git a/dev-lang/mercury/mercury-22.01.1-r1.ebuild b/dev-lang/mercury/mercury-22.01.1-r1.ebuild
index d992abd8eb01..965d58b1c65e 100644
--- a/dev-lang/mercury/mercury-22.01.1-r1.ebuild
+++ b/dev-lang/mercury/mercury-22.01.1-r1.ebuild
@@ -51,6 +51,11 @@ src_prepare() {
 src_configure() {
 	strip-flags
 
+	# machdeps/x86_64_regs.h:37:25: error: global register variable follows a function definition
+	# https://bugs.gentoo.org/924767
+	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68384
+	filter-lto
+
 	local myconf
 	myconf="--libdir=/usr/$(get_libdir) \
 		$(use_enable mono csharp-grade) \

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

[Florian Schmaus]

commit:     9f82b53b18065460cc460537593ebfa8fbef0151
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Jun  1 09:33:23 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Jun 30 20:18:03 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f82b53b

dev-lang/mercury: update EAPI 7 -> 8

- drops 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/mercury-22.01.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/mercury/mercury-22.01.1-r1.ebuild b/dev-lang/mercury/mercury-22.01.1-r1.ebuild
index 1e265cff12ff..d992abd8eb01 100644
--- a/dev-lang/mercury/mercury-22.01.1-r1.ebuild
+++ b/dev-lang/mercury/mercury-22.01.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools elisp-common flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
+inherit autotools elisp-common flag-o-matic java-pkg-opt-2 vcs-clean xdg-utils
 
 PATCHSET_VER="2"
 MY_P=${PN}-srcdist-${PV}

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

[Florian Schmaus]

commit:     9710dca8c320423fe6e4e2e873c12fbc9fd3b3f7
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Jun  1 09:10:21 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Jun 30 20:18:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9710dca8

dev-lang/mercury: avoid jdk in RDEPEND

according to Java_Developer_Guide

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 .../{mercury-22.01.1.ebuild => mercury-22.01.1-r1.ebuild}  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/dev-lang/mercury/mercury-22.01.1.ebuild b/dev-lang/mercury/mercury-22.01.1-r1.ebuild
similarity index 96%
rename from dev-lang/mercury/mercury-22.01.1.ebuild
rename to dev-lang/mercury/mercury-22.01.1-r1.ebuild
index 37e98fc591fe..1e265cff12ff 100644
--- a/dev-lang/mercury/mercury-22.01.1.ebuild
+++ b/dev-lang/mercury/mercury-22.01.1-r1.ebuild
@@ -12,6 +12,7 @@ DESCRIPTION="Mercury is a modern general-purpose logic/functional programming la
 HOMEPAGE="https://mercurylang.org"
 SRC_URI="https://dl.mercurylang.org/release/${MY_P}.tar.gz
 	https://dev.gentoo.org/~keri/distfiles/mercury/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
@@ -20,18 +21,19 @@ KEYWORDS="amd64 x86"
 IUSE="debug doc emacs examples java mono profile readline test threads trail"
 RESTRICT="!test? ( test )"
 
-DEPEND="net-libs/libnsl:0=
+COMMON_DEP="net-libs/libnsl:0=
 	readline? ( sys-libs/readline:= )
-	java? ( >=virtual/jdk-1.8:* )
 	mono? ( dev-lang/mono )
 	doc? ( sys-apps/texinfo )"
 
-RDEPEND="${DEPEND}
-	emacs? ( >=app-editors/emacs-23.1:* )"
+DEPEND="${COMMON_DEP}
+	java? ( >=virtual/jdk-1.8:* )"
 
-BDEPEND="test? ( sys-libs/timezone-data )"
+RDEPEND="${COMMON_DEP}
+	emacs? ( >=app-editors/emacs-23.1:* )
+	java? ( >=virtual/jre-1.8:* )"
 
-S="${WORKDIR}"/${MY_P}
+BDEPEND="test? ( sys-libs/timezone-data )"
 
 SITEFILE=50${PN}-gentoo.el
 

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

[Florian Schmaus]

commit:     d18662db347a5fd34b36d3f1a2295a58d54d7844
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Jun  1 07:35:41 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Jun 30 20:18:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d18662db

dev-lang/mercury: add github upstream metadata

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

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

diff --git a/dev-lang/mercury/metadata.xml b/dev-lang/mercury/metadata.xml
index 5061e4f27e59..3695e0c64d9e 100644
--- a/dev-lang/mercury/metadata.xml
+++ b/dev-lang/mercury/metadata.xml
@@ -5,4 +5,7 @@
   <use>
     <flag name="trail">Support Mercury trail grades</flag>
   </use>
+  <upstream>
+    <remote-id type="github">Mercury-Language/mercury</remote-id>
+  </upstream>
 </pkgmetadata>

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

[Florian Schmaus]

commit:     1c357f893ee7949669dbb63209339e14c82bb24b
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Jun  1 07:32:59 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Jun 30 20:18:01 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c357f89

dev-lang/mercury: update HOMEPAGE

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

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

diff --git a/dev-lang/mercury/mercury-22.01.1.ebuild b/dev-lang/mercury/mercury-22.01.1.ebuild
index b56c538277e8..37e98fc591fe 100644
--- a/dev-lang/mercury/mercury-22.01.1.ebuild
+++ b/dev-lang/mercury/mercury-22.01.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ PATCHSET_VER="2"
 MY_P=${PN}-srcdist-${PV}
 
 DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-HOMEPAGE="https://www.mercurylang.org/index.html"
+HOMEPAGE="https://mercurylang.org"
 SRC_URI="https://dl.mercurylang.org/release/${MY_P}.tar.gz
 	https://dev.gentoo.org/~keri/distfiles/mercury/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
 

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

[Miroslav Šulc]

commit:     d62360d749b9bc7144d5cb61f3067d93857b1244
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Jun  1 08:20:02 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=d62360d7

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

Avoid two stable versions in same slot.

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

 dev-lang/mercury/Manifest                |   6 -
 dev-lang/mercury/mercury-20.06-r1.ebuild | 207 -------------------------------
 dev-lang/mercury/mercury-20.06.1.ebuild  | 207 -------------------------------
 dev-lang/mercury/mercury-22.01.ebuild    | 201 ------------------------------
 4 files changed, 621 deletions(-)

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 98779fca5b66..0d34064a0b84 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,8 +1,2 @@
-DIST mercury-20.06-gentoo-patchset-3.tar.gz 5265 BLAKE2B 0539611691cfb714937bca8dc967246ce32c515b7133391d81333284e6ceffe29b929c042ee0000752bd9980c2d2332de20d7c5dc4e1a6077a6421056d975808 SHA512 54595a71db4d7684071c6496c3e92fe8c9de0a29832cc85901046f2627bd453cf0760b9857e73a91e87edfddc80d384627dc5c2cb7f3bc12ea5737eb5afa4f3b
-DIST mercury-20.06.1-gentoo-patchset-0.tar.gz 4426 BLAKE2B df6f1a3b52b1f57f502621abba175a55342ae88ecbbe8e37d22b89a7514e0dea14299c87fb1dd47866c5fc89bbb2746a92de8dcf037c1a9d5d2ba4e2e9b8c828 SHA512 c26c209a2fc2380793373785c7a8290ea336c38fe1c243df5c71791e2d1f8b6f8d4a9452a9139181aeb0422cd538c5e6ffe40332ea5b2635cab3324dc4dc320b
-DIST mercury-22.01-gentoo-patchset-0.tar.gz 4147 BLAKE2B d59f58cb8870ee3ba636f62c1df7ab54d45d23e92626e1a18717e2ef7511c8a14a63c7d9bbfbeb8ec78841f6a05311f2431c5488df9996dae1ab71ce39c99a55 SHA512 a38d524e900b1771a12921618f785436ebca6029d94c9bd7a3115682b900d688d4cab3e3167a7b110f2fc4f5e9d09c1f24dffe9e39222efd20bb17782829b4a8
 DIST mercury-22.01.1-gentoo-patchset-2.tar.gz 4975 BLAKE2B 73dfe5688f7f2c44ee236e3b9fd38811afecc7f8f4dd8f0694c2c3f27ce20a74aade3678bb3a16f7bcfc1fc8b07e518a5954802e410a3f566c00df7898800675 SHA512 16319d2e78af5cb73f67555c1498b277e8c6435cfe4e62fc87817cf06f04deadfad6f8264a5270100aaf6985866b879e9b7c69d3c1839c25d36ca2506bbabd72
-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/mercury-20.06-r1.ebuild b/dev-lang/mercury/mercury-20.06-r1.ebuild
deleted file mode 100644
index d2f14d41fd07..000000000000
--- a/dev-lang/mercury/mercury-20.06-r1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools elisp-common flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
-
-PATCHSET_VER="3"
-MY_P=${PN}-srcdist-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-HOMEPAGE="https://www.mercurylang.org/index.html"
-SRC_URI="https://dl.mercurylang.org/release-20.06/${MY_P}.tar.gz
-	https://dev.gentoo.org/~keri/distfiles/mercury/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="debug doc emacs erlang examples java mono profile readline threads trail"
-
-DEPEND="net-libs/libnsl:0=
-	readline? ( sys-libs/readline:= )
-	erlang? ( dev-lang/erlang )
-	java? ( >=virtual/jdk-1.8:* )
-	mono? ( dev-lang/mono )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="${DEPEND}
-	emacs? ( >=app-editors/emacs-23.1:* )"
-
-S="${WORKDIR}"/${MY_P}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-	eapply_user
-
-	AT_M4DIR=m4 eautoreconf
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	strip-flags
-
-	local myconf
-	myconf="--libdir=/usr/$(get_libdir) \
-		$(use_enable mono csharp-grade) \
-		$(use_enable erlang erlang-grade) \
-		$(use_enable java java-grade) \
-		$(use_enable debug debug-grades) \
-		$(use_enable profile prof-grades) \
-		$(use_enable threads par-grades) \
-		$(use_enable trail trail-grades) \
-		$(use_with readline)"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Prepare mmake flags
-	echo "EXTRA_CFLAGS = ${CFLAGS}"  >> Mmake.params
-	echo "EXTRA_LDFLAGS = ${LDFLAGS}" >> Mmake.params
-	echo "EXTRA_LD_LIBFLAGS = ${LDFLAGS}" >> Mmake.params
-	echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params
-
-	if use trail; then
-		echo "CFLAGS-int = -O0" >> Mmake.params
-		echo "CFLAGS-uint = -O0" >> Mmake.params
-	fi
-
-	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libgc.so" >> boehm_gc/Mmake.boehm_gc.params
-	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_rt.so" >> runtime/Mmake.runtime.params
-	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_std.so" >> library/Mmake.library.params
-
-	# Build Mercury using bootstrap grade
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		TEXI2DVI="" PDFTEX=""
-
-	# We can now patch .m Mercury compiler files since we
-	# have just built mercury_compiler.
-	if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then
-		eapply "${WORKDIR}"/${PV}-mmc
-	fi
-
-	# Rebuild Mercury compiler using the just built mercury_compiler
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX=""
-
-	# The default Mercury grade may not be the same as the bootstrap
-	# grade. Since src_test() is run before src_install() we compile
-	# the default grade now
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX="" \
-		default_grade
-}
-
-src_test() {
-	TEST_GRADE=$(scripts/ml --print-grade)
-	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
-		TWS="${S}"/install_grade_dir.${TEST_GRADE}
-		cp runtime/mer_rt.init "${TWS}"/runtime/
-		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
-		cp browser/mer_browser.init "${TWS}"/browser/
-	else
-		TWS="${S}"
-	fi
-
-	cd "${S}"/tests || die
-	sed -e "s:@WORKSPACE@:${TWS}:" \
-		< WS_FLAGS.ws \
-		> WS_FLAGS \
-		|| die "sed WORKSPACE failed"
-	sed -e "s:@WORKSPACE@:${TWS}:" \
-		< .mgnuc_copts.ws \
-		> .mgnuc_copts \
-		|| die "sed WORKSPACE failed"
-	find . -mindepth 1 -type d -exec cp .mgnuc_opts  {} \;
-	find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \;
-
-	# Mercury tests must be run in C locale since Mercury output is
-	# compared to hard-coded warnings/errors
-	LC_ALL="C" \
-	PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
-	TERM="" \
-	WORKSPACE="${TWS}" \
-	WORKSPACE_FLAGS=yes \
-	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
-	MMAKE_DIR="${TWS}"/scripts \
-	MERCURY_SUPPRESS_STACK_TRACE=yes \
-	GRADE=${TEST_GRADE} \
-		mmake || die "mmake test failed"
-}
-
-src_install() {
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX="" \
-		DESTDIR="${D}" \
-		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
-		install
-
-	if use java; then
-		keepdir /usr/$(get_libdir)/mercury/modules/java
-	fi
-
-	if use mono; then
-		keepdir /usr/$(get_libdir)/mercury/modules/csharp
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-
-	dodoc \
-		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
-		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
-		RELEASE_NOTES VERSION || die
-
-	if use erlang; then
-		dodoc README.Erlang
-	fi
-
-	if use java; then
-		dodoc README.Java
-	fi
-
-	if use mono; then
-		dodoc README.CSharp
-	fi
-
-	if use examples; then
-		docinto samples
-		dodoc samples/{*.m,README,Mmakefile}
-		dodoc -r samples/c_interface \
-			samples/diff \
-			samples/muz \
-			samples/rot13 \
-			samples/solutions \
-			samples/solver_types
-
-		if use java; then
-			dodoc -r samples/java_interface
-		fi
-
-		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

diff --git a/dev-lang/mercury/mercury-20.06.1.ebuild b/dev-lang/mercury/mercury-20.06.1.ebuild
deleted file mode 100644
index ece3d848fee3..000000000000
--- a/dev-lang/mercury/mercury-20.06.1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools elisp-common flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
-
-PATCHSET_VER="0"
-MY_P=${PN}-srcdist-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-HOMEPAGE="https://www.mercurylang.org/index.html"
-SRC_URI="https://dl.mercurylang.org/release-20.06/${MY_P}.tar.gz
-	https://dev.gentoo.org/~keri/distfiles/mercury/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug doc emacs erlang examples java mono profile readline threads trail"
-
-DEPEND="net-libs/libnsl:0=
-	readline? ( sys-libs/readline:= )
-	erlang? ( dev-lang/erlang )
-	java? ( >=virtual/jdk-1.8:* )
-	mono? ( dev-lang/mono )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="${DEPEND}
-	emacs? ( >=app-editors/emacs-23.1:* )"
-
-S="${WORKDIR}"/${MY_P}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-	eapply_user
-
-	AT_M4DIR=m4 eautoreconf
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	strip-flags
-
-	local myconf
-	myconf="--libdir=/usr/$(get_libdir) \
-		$(use_enable mono csharp-grade) \
-		$(use_enable erlang erlang-grade) \
-		$(use_enable java java-grade) \
-		$(use_enable debug debug-grades) \
-		$(use_enable profile prof-grades) \
-		$(use_enable threads par-grades) \
-		$(use_enable trail trail-grades) \
-		$(use_with readline)"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Prepare mmake flags
-	echo "EXTRA_CFLAGS = ${CFLAGS} -Wno-error"  >> Mmake.params
-	echo "EXTRA_LDFLAGS = ${LDFLAGS}" >> Mmake.params
-	echo "EXTRA_LD_LIBFLAGS = ${LDFLAGS}" >> Mmake.params
-	echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params
-
-	if use trail; then
-		echo "CFLAGS-int = -O0" >> Mmake.params
-		echo "CFLAGS-uint = -O0" >> Mmake.params
-	fi
-
-	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libgc.so" >> boehm_gc/Mmake.boehm_gc.params
-	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_rt.so" >> runtime/Mmake.runtime.params
-	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_std.so" >> library/Mmake.library.params
-
-	# Build Mercury using bootstrap grade
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		TEXI2DVI="" PDFTEX=""
-
-	# We can now patch .m Mercury compiler files since we
-	# have just built mercury_compiler.
-	if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then
-		eapply "${WORKDIR}"/${PV}-mmc
-	fi
-
-	# Rebuild Mercury compiler using the just built mercury_compiler
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX=""
-
-	# The default Mercury grade may not be the same as the bootstrap
-	# grade. Since src_test() is run before src_install() we compile
-	# the default grade now
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX="" \
-		default_grade
-}
-
-src_test() {
-	TEST_GRADE=$(scripts/ml --print-grade)
-	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
-		TWS="${S}"/install_grade_dir.${TEST_GRADE}
-		cp runtime/mer_rt.init "${TWS}"/runtime/
-		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
-		cp browser/mer_browser.init "${TWS}"/browser/
-	else
-		TWS="${S}"
-	fi
-
-	cd "${S}"/tests || die
-	sed -e "s:@WORKSPACE@:${TWS}:" \
-		< WS_FLAGS.ws \
-		> WS_FLAGS \
-		|| die "sed WORKSPACE failed"
-	sed -e "s:@WORKSPACE@:${TWS}:" \
-		< .mgnuc_copts.ws \
-		> .mgnuc_copts \
-		|| die "sed WORKSPACE failed"
-	find . -mindepth 1 -type d -exec cp .mgnuc_opts  {} \;
-	find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \;
-
-	# Mercury tests must be run in C locale since Mercury output is
-	# compared to hard-coded warnings/errors
-	LC_ALL="C" \
-	PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
-	TERM="" \
-	WORKSPACE="${TWS}" \
-	WORKSPACE_FLAGS=yes \
-	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
-	MMAKE_DIR="${TWS}"/scripts \
-	MERCURY_SUPPRESS_STACK_TRACE=yes \
-	GRADE=${TEST_GRADE} \
-		mmake || die "mmake test failed"
-}
-
-src_install() {
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX="" \
-		DESTDIR="${D}" \
-		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
-		install
-
-	if use java; then
-		keepdir /usr/$(get_libdir)/mercury/modules/java
-	fi
-
-	if use mono; then
-		keepdir /usr/$(get_libdir)/mercury/modules/csharp
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-
-	dodoc \
-		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
-		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
-		RELEASE_NOTES VERSION || die
-
-	if use erlang; then
-		dodoc README.Erlang
-	fi
-
-	if use java; then
-		dodoc README.Java
-	fi
-
-	if use mono; then
-		dodoc README.CSharp
-	fi
-
-	if use examples; then
-		docinto samples
-		dodoc samples/{*.m,README,Mmakefile}
-		dodoc -r samples/c_interface \
-			samples/diff \
-			samples/muz \
-			samples/rot13 \
-			samples/solutions \
-			samples/solver_types
-
-		if use java; then
-			dodoc -r samples/java_interface
-		fi
-
-		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

diff --git a/dev-lang/mercury/mercury-22.01.ebuild b/dev-lang/mercury/mercury-22.01.ebuild
deleted file mode 100644
index 3524e6009a37..000000000000
--- a/dev-lang/mercury/mercury-22.01.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools elisp-common flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
-
-PATCHSET_VER="0"
-MY_P=${PN}-srcdist-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-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/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug doc emacs examples java mono profile readline threads trail"
-
-DEPEND="net-libs/libnsl:0=
-	readline? ( sys-libs/readline:= )
-	java? ( >=virtual/jdk-1.8:* )
-	mono? ( dev-lang/mono )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="${DEPEND}
-	emacs? ( >=app-editors/emacs-23.1:* )"
-
-S="${WORKDIR}"/${MY_P}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-	eapply_user
-
-	AT_M4DIR=m4 eautoreconf
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	strip-flags
-
-	local myconf
-	myconf="--libdir=/usr/$(get_libdir) \
-		$(use_enable mono csharp-grade) \
-		$(use_enable java java-grade) \
-		$(use_enable debug debug-grades) \
-		$(use_enable profile prof-grades) \
-		$(use_enable threads par-grades) \
-		$(use_enable trail trail-grades) \
-		$(use_with readline)"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Prepare mmake flags
-	echo "EXTRA_CFLAGS = ${CFLAGS} -Wno-error"  >> Mmake.params
-	echo "EXTRA_LDFLAGS = ${LDFLAGS}" >> Mmake.params
-	echo "EXTRA_LD_LIBFLAGS = ${LDFLAGS}" >> Mmake.params
-	echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params
-
-	if use trail; then
-		echo "CFLAGS-int = -O0" >> Mmake.params
-		echo "CFLAGS-uint = -O0" >> Mmake.params
-	fi
-
-	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libgc.so" >> boehm_gc/Mmake.boehm_gc.params
-	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_rt.so" >> runtime/Mmake.runtime.params
-	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_std.so" >> library/Mmake.library.params
-
-	# Build Mercury using bootstrap grade
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		TEXI2DVI="" PDFTEX=""
-
-	# We can now patch .m Mercury compiler files since we
-	# have just built mercury_compiler.
-	if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then
-		eapply "${WORKDIR}"/${PV}-mmc
-	fi
-
-	# Rebuild Mercury compiler using the just built mercury_compiler
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX=""
-
-	# The default Mercury grade may not be the same as the bootstrap
-	# grade. Since src_test() is run before src_install() we compile
-	# the default grade now
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX="" \
-		default_grade
-}
-
-src_test() {
-	TEST_GRADE=$(scripts/ml --print-grade)
-	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
-		TWS="${S}"/install_grade_dir.${TEST_GRADE}
-		cp runtime/mer_rt.init "${TWS}"/runtime/
-		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
-		cp browser/mer_browser.init "${TWS}"/browser/
-	else
-		TWS="${S}"
-	fi
-
-	cd "${S}"/tests || die
-	sed -e "s:@WORKSPACE@:${TWS}:" \
-		< WS_FLAGS.ws \
-		> WS_FLAGS \
-		|| die "sed WORKSPACE failed"
-	sed -e "s:@WORKSPACE@:${TWS}:" \
-		< .mgnuc_copts.ws \
-		> .mgnuc_copts \
-		|| die "sed WORKSPACE failed"
-	find . -mindepth 1 -type d -exec cp .mgnuc_opts  {} \;
-	find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \;
-
-	# Mercury tests must be run in C locale since Mercury output is
-	# compared to hard-coded warnings/errors
-	LC_ALL="C" \
-	PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
-	TERM="" \
-	WORKSPACE="${TWS}" \
-	WORKSPACE_FLAGS=yes \
-	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
-	MMAKE_DIR="${TWS}"/scripts \
-	MERCURY_SUPPRESS_STACK_TRACE=yes \
-	GRADE=${TEST_GRADE} \
-		mmake || die "mmake test failed"
-}
-
-src_install() {
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX="" \
-		DESTDIR="${D}" \
-		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
-		install
-
-	if use java; then
-		keepdir /usr/$(get_libdir)/mercury/modules/java
-	fi
-
-	if use mono; then
-		keepdir /usr/$(get_libdir)/mercury/modules/csharp
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-
-	dodoc \
-		BUGS HISTORY LIMITATIONS.md NEWS README README.md \
-		README.Linux README.Linux-m68k README.Linux-PPC \
-		RELEASE_NOTES VERSION || die
-
-	if use java; then
-		dodoc README.Java
-	fi
-
-	if use mono; then
-		dodoc README.CSharp
-	fi
-
-	if use examples; then
-		docinto samples
-		dodoc samples/{*.m,README,Mmakefile}
-		dodoc -r samples/c_interface \
-			samples/diff \
-			samples/muz \
-			samples/rot13 \
-			samples/solutions \
-			samples/solver_types
-
-		if use java; then
-			dodoc -r samples/java_interface
-		fi
-
-		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

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

[Miroslav Šulc]

commit:     f5325098b13311b0e61014f8f31f233be4b6ef05
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Jun  8 06:47:53 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jun  8 07:56:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5325098

dev-lang/mercury: remove unused local USE flag: [ erlang ]

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/37076
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-lang/mercury/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-lang/mercury/metadata.xml b/dev-lang/mercury/metadata.xml
index 99628dd871a5..5061e4f27e59 100644
--- a/dev-lang/mercury/metadata.xml
+++ b/dev-lang/mercury/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
   <!-- maintainer-needed -->
   <use>
-    <flag name="erlang">Support Mercury Erlang grade</flag>
     <flag name="trail">Support Mercury trail grades</flag>
   </use>
 </pkgmetadata>

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

[Keri Harris]

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

dev-lang/mercury: 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/mercury-22.01.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/mercury/mercury-22.01.1.ebuild b/dev-lang/mercury/mercury-22.01.1.ebuild
index ce546ba92a86..b56c538277e8 100644
--- a/dev-lang/mercury/mercury-22.01.1.ebuild
+++ b/dev-lang/mercury/mercury-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="debug doc emacs examples java mono profile readline test threads trail"
 RESTRICT="!test? ( test )"

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

[Keri Harris]

commit:     c576999d058d23f25024ba308802959ec26e85ec
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 16:54:01 2022 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 16:54:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c576999d

dev-lang/mercury: gcc 12 vectorization workaround

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

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

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index bf943fb0c142..98779fca5b66 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,7 +1,7 @@
 DIST mercury-20.06-gentoo-patchset-3.tar.gz 5265 BLAKE2B 0539611691cfb714937bca8dc967246ce32c515b7133391d81333284e6ceffe29b929c042ee0000752bd9980c2d2332de20d7c5dc4e1a6077a6421056d975808 SHA512 54595a71db4d7684071c6496c3e92fe8c9de0a29832cc85901046f2627bd453cf0760b9857e73a91e87edfddc80d384627dc5c2cb7f3bc12ea5737eb5afa4f3b
 DIST mercury-20.06.1-gentoo-patchset-0.tar.gz 4426 BLAKE2B df6f1a3b52b1f57f502621abba175a55342ae88ecbbe8e37d22b89a7514e0dea14299c87fb1dd47866c5fc89bbb2746a92de8dcf037c1a9d5d2ba4e2e9b8c828 SHA512 c26c209a2fc2380793373785c7a8290ea336c38fe1c243df5c71791e2d1f8b6f8d4a9452a9139181aeb0422cd538c5e6ffe40332ea5b2635cab3324dc4dc320b
 DIST mercury-22.01-gentoo-patchset-0.tar.gz 4147 BLAKE2B d59f58cb8870ee3ba636f62c1df7ab54d45d23e92626e1a18717e2ef7511c8a14a63c7d9bbfbeb8ec78841f6a05311f2431c5488df9996dae1ab71ce39c99a55 SHA512 a38d524e900b1771a12921618f785436ebca6029d94c9bd7a3115682b900d688d4cab3e3167a7b110f2fc4f5e9d09c1f24dffe9e39222efd20bb17782829b4a8
-DIST mercury-22.01.1-gentoo-patchset-1.tar.gz 4292 BLAKE2B f094e6702b633f5acb1dd9ef9c56f7183ecdc162b0f9c741ceb9fdbf1e64652f5f525adeb168c0177f4d043561c797dd652eb67dbd66fba816b4d9c5151f176a SHA512 4f12079fb8392a19dcf96078222591c60f3f6724c5f0b154475665c843f9a459c5b3bbc881405d6ef0acc65d9d689aed7f41977e4d712577a9b4f2f027470baf
+DIST mercury-22.01.1-gentoo-patchset-2.tar.gz 4975 BLAKE2B 73dfe5688f7f2c44ee236e3b9fd38811afecc7f8f4dd8f0694c2c3f27ce20a74aade3678bb3a16f7bcfc1fc8b07e518a5954802e410a3f566c00df7898800675 SHA512 16319d2e78af5cb73f67555c1498b277e8c6435cfe4e62fc87817cf06f04deadfad6f8264a5270100aaf6985866b879e9b7c69d3c1839c25d36ca2506bbabd72
 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/mercury-22.01.1.ebuild b/dev-lang/mercury/mercury-22.01.1.ebuild
index 8991e0cd933e..ce546ba92a86 100644
--- a/dev-lang/mercury/mercury-22.01.1.ebuild
+++ b/dev-lang/mercury/mercury-22.01.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit autotools elisp-common flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
 
-PATCHSET_VER="1"
+PATCHSET_VER="2"
 MY_P=${PN}-srcdist-${PV}
 
 DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"

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

[Keri Harris]

commit:     38e82205ae0bee1c6b0caf5dd8f0ec9b199e27df
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  3 14:35:16 2022 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Fri Jun  3 14:36:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38e82205

dev-lang/mercury: install README.md with USE=examples

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

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

diff --git a/dev-lang/mercury/mercury-22.01.1.ebuild b/dev-lang/mercury/mercury-22.01.1.ebuild
index d1c1fc3cff2f..8991e0cd933e 100644
--- a/dev-lang/mercury/mercury-22.01.1.ebuild
+++ b/dev-lang/mercury/mercury-22.01.1.ebuild
@@ -179,7 +179,7 @@ src_install() {
 
 	if use examples; then
 		docinto samples
-		dodoc samples/{*.m,README,Mmakefile}
+		dodoc samples/{*.m,README.md,Mmakefile}
 		dodoc -r samples/c_interface \
 			samples/diff \
 			samples/muz \

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

[Keri Harris]

commit:     ba86c1ac1e835f2e7bc38f0d98a5fbce2f312b23
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sat May 21 15:10:08 2022 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sat May 21 15:10:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba86c1ac

dev-lang/mercury: add missing RESTRICT for test IUSE

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

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

diff --git a/dev-lang/mercury/mercury-22.01.1.ebuild b/dev-lang/mercury/mercury-22.01.1.ebuild
index 5f96444a4965..d1c1fc3cff2f 100644
--- a/dev-lang/mercury/mercury-22.01.1.ebuild
+++ b/dev-lang/mercury/mercury-22.01.1.ebuild
@@ -18,6 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 IUSE="debug doc emacs examples java mono profile readline test threads trail"
+RESTRICT="!test? ( test )"
 
 DEPEND="net-libs/libnsl:0=
 	readline? ( sys-libs/readline:= )

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

[Keri Harris]

commit:     183635c624cde5980761a8d6df3c17a4ae8e3b88
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sat May 21 15:00:52 2022 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sat May 21 15:01:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=183635c6

dev-lang/mercury: fix MCC file-options unit test

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

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

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index c2244bf563a8..bf943fb0c142 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,7 +1,7 @@
 DIST mercury-20.06-gentoo-patchset-3.tar.gz 5265 BLAKE2B 0539611691cfb714937bca8dc967246ce32c515b7133391d81333284e6ceffe29b929c042ee0000752bd9980c2d2332de20d7c5dc4e1a6077a6421056d975808 SHA512 54595a71db4d7684071c6496c3e92fe8c9de0a29832cc85901046f2627bd453cf0760b9857e73a91e87edfddc80d384627dc5c2cb7f3bc12ea5737eb5afa4f3b
 DIST mercury-20.06.1-gentoo-patchset-0.tar.gz 4426 BLAKE2B df6f1a3b52b1f57f502621abba175a55342ae88ecbbe8e37d22b89a7514e0dea14299c87fb1dd47866c5fc89bbb2746a92de8dcf037c1a9d5d2ba4e2e9b8c828 SHA512 c26c209a2fc2380793373785c7a8290ea336c38fe1c243df5c71791e2d1f8b6f8d4a9452a9139181aeb0422cd538c5e6ffe40332ea5b2635cab3324dc4dc320b
 DIST mercury-22.01-gentoo-patchset-0.tar.gz 4147 BLAKE2B d59f58cb8870ee3ba636f62c1df7ab54d45d23e92626e1a18717e2ef7511c8a14a63c7d9bbfbeb8ec78841f6a05311f2431c5488df9996dae1ab71ce39c99a55 SHA512 a38d524e900b1771a12921618f785436ebca6029d94c9bd7a3115682b900d688d4cab3e3167a7b110f2fc4f5e9d09c1f24dffe9e39222efd20bb17782829b4a8
-DIST mercury-22.01.1-gentoo-patchset-0.tar.gz 4120 BLAKE2B 23942084f25f4f7e367674838fd7526a6f225ab0ec99409c4a344a176836be2928ac0fc65488ad4e17eb0a962471dfceaf52c775282cc8c70173bda533eb218a SHA512 27457af98d1589152eb241f7c2107920c8cfa400fb94cfe25ea234d185eb5f54f21ebbbdd8ae70808addca102ac8d06e7d01ddac2fda8176e6d8c1a338f4c182
+DIST mercury-22.01.1-gentoo-patchset-1.tar.gz 4292 BLAKE2B f094e6702b633f5acb1dd9ef9c56f7183ecdc162b0f9c741ceb9fdbf1e64652f5f525adeb168c0177f4d043561c797dd652eb67dbd66fba816b4d9c5151f176a SHA512 4f12079fb8392a19dcf96078222591c60f3f6724c5f0b154475665c843f9a459c5b3bbc881405d6ef0acc65d9d689aed7f41977e4d712577a9b4f2f027470baf
 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/mercury-22.01.1.ebuild b/dev-lang/mercury/mercury-22.01.1.ebuild
index d44d3fc8d740..5f96444a4965 100644
--- a/dev-lang/mercury/mercury-22.01.1.ebuild
+++ b/dev-lang/mercury/mercury-22.01.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit autotools elisp-common flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
 
-PATCHSET_VER="0"
+PATCHSET_VER="1"
 MY_P=${PN}-srcdist-${PV}
 
 DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"

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

[Keri Harris]

commit:     622706b9807ea72038ea0dd0ba762a2747610ae5
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sat May 21 13:22:13 2022 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sat May 21 13:23:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=622706b9

dev-lang/mercury: depend on timezone-data for testsuite

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

 dev-lang/mercury/mercury-22.01.1.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-lang/mercury/mercury-22.01.1.ebuild b/dev-lang/mercury/mercury-22.01.1.ebuild
index 3524e6009a37..d44d3fc8d740 100644
--- a/dev-lang/mercury/mercury-22.01.1.ebuild
+++ b/dev-lang/mercury/mercury-22.01.1.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="debug doc emacs examples java mono profile readline threads trail"
+IUSE="debug doc emacs examples java mono profile readline test threads trail"
 
 DEPEND="net-libs/libnsl:0=
 	readline? ( sys-libs/readline:= )
@@ -28,6 +28,8 @@ DEPEND="net-libs/libnsl:0=
 RDEPEND="${DEPEND}
 	emacs? ( >=app-editors/emacs-23.1:* )"
 
+BDEPEND="test? ( sys-libs/timezone-data )"
+
 S="${WORKDIR}"/${MY_P}
 
 SITEFILE=50${PN}-gentoo.el

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

[Keri Harris]

commit:     b45e9aa0ba961a0df35803117a5814b047d9baf4
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 10:52:08 2022 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sun May 15 10:53:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b45e9aa0

dev-lang/mercury: version bump

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

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

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 7b52e540f6fd..c2244bf563a8 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,6 +1,8 @@
 DIST mercury-20.06-gentoo-patchset-3.tar.gz 5265 BLAKE2B 0539611691cfb714937bca8dc967246ce32c515b7133391d81333284e6ceffe29b929c042ee0000752bd9980c2d2332de20d7c5dc4e1a6077a6421056d975808 SHA512 54595a71db4d7684071c6496c3e92fe8c9de0a29832cc85901046f2627bd453cf0760b9857e73a91e87edfddc80d384627dc5c2cb7f3bc12ea5737eb5afa4f3b
 DIST mercury-20.06.1-gentoo-patchset-0.tar.gz 4426 BLAKE2B df6f1a3b52b1f57f502621abba175a55342ae88ecbbe8e37d22b89a7514e0dea14299c87fb1dd47866c5fc89bbb2746a92de8dcf037c1a9d5d2ba4e2e9b8c828 SHA512 c26c209a2fc2380793373785c7a8290ea336c38fe1c243df5c71791e2d1f8b6f8d4a9452a9139181aeb0422cd538c5e6ffe40332ea5b2635cab3324dc4dc320b
 DIST mercury-22.01-gentoo-patchset-0.tar.gz 4147 BLAKE2B d59f58cb8870ee3ba636f62c1df7ab54d45d23e92626e1a18717e2ef7511c8a14a63c7d9bbfbeb8ec78841f6a05311f2431c5488df9996dae1ab71ce39c99a55 SHA512 a38d524e900b1771a12921618f785436ebca6029d94c9bd7a3115682b900d688d4cab3e3167a7b110f2fc4f5e9d09c1f24dffe9e39222efd20bb17782829b4a8
+DIST mercury-22.01.1-gentoo-patchset-0.tar.gz 4120 BLAKE2B 23942084f25f4f7e367674838fd7526a6f225ab0ec99409c4a344a176836be2928ac0fc65488ad4e17eb0a962471dfceaf52c775282cc8c70173bda533eb218a SHA512 27457af98d1589152eb241f7c2107920c8cfa400fb94cfe25ea234d185eb5f54f21ebbbdd8ae70808addca102ac8d06e7d01ddac2fda8176e6d8c1a338f4c182
 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/mercury-22.01.1.ebuild b/dev-lang/mercury/mercury-22.01.1.ebuild
new file mode 100644
index 000000000000..3524e6009a37
--- /dev/null
+++ b/dev-lang/mercury/mercury-22.01.1.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
+
+PATCHSET_VER="0"
+MY_P=${PN}-srcdist-${PV}
+
+DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
+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/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug doc emacs examples java mono profile readline threads trail"
+
+DEPEND="net-libs/libnsl:0=
+	readline? ( sys-libs/readline:= )
+	java? ( >=virtual/jdk-1.8:* )
+	mono? ( dev-lang/mono )
+	doc? ( sys-apps/texinfo )"
+
+RDEPEND="${DEPEND}
+	emacs? ( >=app-editors/emacs-23.1:* )"
+
+S="${WORKDIR}"/${MY_P}
+
+SITEFILE=50${PN}-gentoo.el
+
+src_prepare() {
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		eapply "${WORKDIR}"/${PV}
+	fi
+	eapply_user
+
+	AT_M4DIR=m4 eautoreconf
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	strip-flags
+
+	local myconf
+	myconf="--libdir=/usr/$(get_libdir) \
+		$(use_enable mono csharp-grade) \
+		$(use_enable java java-grade) \
+		$(use_enable debug debug-grades) \
+		$(use_enable profile prof-grades) \
+		$(use_enable threads par-grades) \
+		$(use_enable trail trail-grades) \
+		$(use_with readline)"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	# Prepare mmake flags
+	echo "EXTRA_CFLAGS = ${CFLAGS} -Wno-error"  >> Mmake.params
+	echo "EXTRA_LDFLAGS = ${LDFLAGS}" >> Mmake.params
+	echo "EXTRA_LD_LIBFLAGS = ${LDFLAGS}" >> Mmake.params
+	echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params
+
+	if use trail; then
+		echo "CFLAGS-int = -O0" >> Mmake.params
+		echo "CFLAGS-uint = -O0" >> Mmake.params
+	fi
+
+	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libgc.so" >> boehm_gc/Mmake.boehm_gc.params
+	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_rt.so" >> runtime/Mmake.runtime.params
+	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_std.so" >> library/Mmake.library.params
+
+	# Build Mercury using bootstrap grade
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		TEXI2DVI="" PDFTEX=""
+
+	# We can now patch .m Mercury compiler files since we
+	# have just built mercury_compiler.
+	if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then
+		eapply "${WORKDIR}"/${PV}-mmc
+	fi
+
+	# Rebuild Mercury compiler using the just built mercury_compiler
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX=""
+
+	# The default Mercury grade may not be the same as the bootstrap
+	# grade. Since src_test() is run before src_install() we compile
+	# the default grade now
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX="" \
+		default_grade
+}
+
+src_test() {
+	TEST_GRADE=$(scripts/ml --print-grade)
+	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
+		TWS="${S}"/install_grade_dir.${TEST_GRADE}
+		cp runtime/mer_rt.init "${TWS}"/runtime/
+		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
+		cp browser/mer_browser.init "${TWS}"/browser/
+	else
+		TWS="${S}"
+	fi
+
+	cd "${S}"/tests || die
+	sed -e "s:@WORKSPACE@:${TWS}:" \
+		< WS_FLAGS.ws \
+		> WS_FLAGS \
+		|| die "sed WORKSPACE failed"
+	sed -e "s:@WORKSPACE@:${TWS}:" \
+		< .mgnuc_copts.ws \
+		> .mgnuc_copts \
+		|| die "sed WORKSPACE failed"
+	find . -mindepth 1 -type d -exec cp .mgnuc_opts  {} \;
+	find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \;
+
+	# Mercury tests must be run in C locale since Mercury output is
+	# compared to hard-coded warnings/errors
+	LC_ALL="C" \
+	PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
+	TERM="" \
+	WORKSPACE="${TWS}" \
+	WORKSPACE_FLAGS=yes \
+	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
+	MMAKE_DIR="${TWS}"/scripts \
+	MERCURY_SUPPRESS_STACK_TRACE=yes \
+	GRADE=${TEST_GRADE} \
+		mmake || die "mmake test failed"
+}
+
+src_install() {
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX="" \
+		DESTDIR="${D}" \
+		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
+		install
+
+	if use java; then
+		keepdir /usr/$(get_libdir)/mercury/modules/java
+	fi
+
+	if use mono; then
+		keepdir /usr/$(get_libdir)/mercury/modules/csharp
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+			|| die "elisp-site-file-install failed"
+	fi
+
+	dodoc \
+		BUGS HISTORY LIMITATIONS.md NEWS README README.md \
+		README.Linux README.Linux-m68k README.Linux-PPC \
+		RELEASE_NOTES VERSION || die
+
+	if use java; then
+		dodoc README.Java
+	fi
+
+	if use mono; then
+		dodoc README.CSharp
+	fi
+
+	if use examples; then
+		docinto samples
+		dodoc samples/{*.m,README,Mmakefile}
+		dodoc -r samples/c_interface \
+			samples/diff \
+			samples/muz \
+			samples/rot13 \
+			samples/solutions \
+			samples/solver_types
+
+		if use java; then
+			dodoc -r samples/java_interface
+		fi
+
+		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}

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

[Keri Harris]

commit:     c202ce59ca38b4906d2aaf1813f672cfd3f6f7cf
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 18:26:34 2022 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sat May 14 18:30:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c202ce59

dev-lang/mercury: version bump

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

 dev-lang/mercury/Manifest             |   2 +
 dev-lang/mercury/mercury-22.01.ebuild | 201 ++++++++++++++++++++++++++++++++++
 2 files changed, 203 insertions(+)

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 210ada8b36bb..7b52e540f6fd 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,4 +1,6 @@
 DIST mercury-20.06-gentoo-patchset-3.tar.gz 5265 BLAKE2B 0539611691cfb714937bca8dc967246ce32c515b7133391d81333284e6ceffe29b929c042ee0000752bd9980c2d2332de20d7c5dc4e1a6077a6421056d975808 SHA512 54595a71db4d7684071c6496c3e92fe8c9de0a29832cc85901046f2627bd453cf0760b9857e73a91e87edfddc80d384627dc5c2cb7f3bc12ea5737eb5afa4f3b
 DIST mercury-20.06.1-gentoo-patchset-0.tar.gz 4426 BLAKE2B df6f1a3b52b1f57f502621abba175a55342ae88ecbbe8e37d22b89a7514e0dea14299c87fb1dd47866c5fc89bbb2746a92de8dcf037c1a9d5d2ba4e2e9b8c828 SHA512 c26c209a2fc2380793373785c7a8290ea336c38fe1c243df5c71791e2d1f8b6f8d4a9452a9139181aeb0422cd538c5e6ffe40332ea5b2635cab3324dc4dc320b
+DIST mercury-22.01-gentoo-patchset-0.tar.gz 4147 BLAKE2B d59f58cb8870ee3ba636f62c1df7ab54d45d23e92626e1a18717e2ef7511c8a14a63c7d9bbfbeb8ec78841f6a05311f2431c5488df9996dae1ab71ce39c99a55 SHA512 a38d524e900b1771a12921618f785436ebca6029d94c9bd7a3115682b900d688d4cab3e3167a7b110f2fc4f5e9d09c1f24dffe9e39222efd20bb17782829b4a8
 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/mercury-22.01.ebuild b/dev-lang/mercury/mercury-22.01.ebuild
new file mode 100644
index 000000000000..3524e6009a37
--- /dev/null
+++ b/dev-lang/mercury/mercury-22.01.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
+
+PATCHSET_VER="0"
+MY_P=${PN}-srcdist-${PV}
+
+DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
+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/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug doc emacs examples java mono profile readline threads trail"
+
+DEPEND="net-libs/libnsl:0=
+	readline? ( sys-libs/readline:= )
+	java? ( >=virtual/jdk-1.8:* )
+	mono? ( dev-lang/mono )
+	doc? ( sys-apps/texinfo )"
+
+RDEPEND="${DEPEND}
+	emacs? ( >=app-editors/emacs-23.1:* )"
+
+S="${WORKDIR}"/${MY_P}
+
+SITEFILE=50${PN}-gentoo.el
+
+src_prepare() {
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		eapply "${WORKDIR}"/${PV}
+	fi
+	eapply_user
+
+	AT_M4DIR=m4 eautoreconf
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	strip-flags
+
+	local myconf
+	myconf="--libdir=/usr/$(get_libdir) \
+		$(use_enable mono csharp-grade) \
+		$(use_enable java java-grade) \
+		$(use_enable debug debug-grades) \
+		$(use_enable profile prof-grades) \
+		$(use_enable threads par-grades) \
+		$(use_enable trail trail-grades) \
+		$(use_with readline)"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	# Prepare mmake flags
+	echo "EXTRA_CFLAGS = ${CFLAGS} -Wno-error"  >> Mmake.params
+	echo "EXTRA_LDFLAGS = ${LDFLAGS}" >> Mmake.params
+	echo "EXTRA_LD_LIBFLAGS = ${LDFLAGS}" >> Mmake.params
+	echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params
+
+	if use trail; then
+		echo "CFLAGS-int = -O0" >> Mmake.params
+		echo "CFLAGS-uint = -O0" >> Mmake.params
+	fi
+
+	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libgc.so" >> boehm_gc/Mmake.boehm_gc.params
+	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_rt.so" >> runtime/Mmake.runtime.params
+	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_std.so" >> library/Mmake.library.params
+
+	# Build Mercury using bootstrap grade
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		TEXI2DVI="" PDFTEX=""
+
+	# We can now patch .m Mercury compiler files since we
+	# have just built mercury_compiler.
+	if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then
+		eapply "${WORKDIR}"/${PV}-mmc
+	fi
+
+	# Rebuild Mercury compiler using the just built mercury_compiler
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX=""
+
+	# The default Mercury grade may not be the same as the bootstrap
+	# grade. Since src_test() is run before src_install() we compile
+	# the default grade now
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX="" \
+		default_grade
+}
+
+src_test() {
+	TEST_GRADE=$(scripts/ml --print-grade)
+	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
+		TWS="${S}"/install_grade_dir.${TEST_GRADE}
+		cp runtime/mer_rt.init "${TWS}"/runtime/
+		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
+		cp browser/mer_browser.init "${TWS}"/browser/
+	else
+		TWS="${S}"
+	fi
+
+	cd "${S}"/tests || die
+	sed -e "s:@WORKSPACE@:${TWS}:" \
+		< WS_FLAGS.ws \
+		> WS_FLAGS \
+		|| die "sed WORKSPACE failed"
+	sed -e "s:@WORKSPACE@:${TWS}:" \
+		< .mgnuc_copts.ws \
+		> .mgnuc_copts \
+		|| die "sed WORKSPACE failed"
+	find . -mindepth 1 -type d -exec cp .mgnuc_opts  {} \;
+	find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \;
+
+	# Mercury tests must be run in C locale since Mercury output is
+	# compared to hard-coded warnings/errors
+	LC_ALL="C" \
+	PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
+	TERM="" \
+	WORKSPACE="${TWS}" \
+	WORKSPACE_FLAGS=yes \
+	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
+	MMAKE_DIR="${TWS}"/scripts \
+	MERCURY_SUPPRESS_STACK_TRACE=yes \
+	GRADE=${TEST_GRADE} \
+		mmake || die "mmake test failed"
+}
+
+src_install() {
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX="" \
+		DESTDIR="${D}" \
+		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
+		install
+
+	if use java; then
+		keepdir /usr/$(get_libdir)/mercury/modules/java
+	fi
+
+	if use mono; then
+		keepdir /usr/$(get_libdir)/mercury/modules/csharp
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+			|| die "elisp-site-file-install failed"
+	fi
+
+	dodoc \
+		BUGS HISTORY LIMITATIONS.md NEWS README README.md \
+		README.Linux README.Linux-m68k README.Linux-PPC \
+		RELEASE_NOTES VERSION || die
+
+	if use java; then
+		dodoc README.Java
+	fi
+
+	if use mono; then
+		dodoc README.CSharp
+	fi
+
+	if use examples; then
+		docinto samples
+		dodoc samples/{*.m,README,Mmakefile}
+		dodoc -r samples/c_interface \
+			samples/diff \
+			samples/muz \
+			samples/rot13 \
+			samples/solutions \
+			samples/solver_types
+
+		if use java; then
+			dodoc -r samples/java_interface
+		fi
+
+		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}

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

[Keri Harris]

commit:     fdf90b4e32f83ff9db172053ee9c981931382d21
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 14:53:06 2022 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sat May 14 14:53:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdf90b4e

dev-lang/mercury: disable MCC halt-at-warn during bootstrap

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

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

diff --git a/dev-lang/mercury/mercury-20.06.1.ebuild b/dev-lang/mercury/mercury-20.06.1.ebuild
index c8cd32155c46..ece3d848fee3 100644
--- a/dev-lang/mercury/mercury-20.06.1.ebuild
+++ b/dev-lang/mercury/mercury-20.06.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -63,7 +63,7 @@ src_configure() {
 
 src_compile() {
 	# Prepare mmake flags
-	echo "EXTRA_CFLAGS = ${CFLAGS}"  >> Mmake.params
+	echo "EXTRA_CFLAGS = ${CFLAGS} -Wno-error"  >> Mmake.params
 	echo "EXTRA_LDFLAGS = ${LDFLAGS}" >> Mmake.params
 	echo "EXTRA_LD_LIBFLAGS = ${LDFLAGS}" >> Mmake.params
 	echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params

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

[Keri Harris]

commit:     15ae8d113686c40375ccc0cc70422a9ca9cb4bed
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  3 11:07:04 2021 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sun Oct  3 11:07:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15ae8d11

dev-lang/mercury: version bump

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

 dev-lang/mercury/Manifest               |   2 +
 dev-lang/mercury/mercury-20.06.1.ebuild | 207 ++++++++++++++++++++++++++++++++
 2 files changed, 209 insertions(+)

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index db766ffb277..210ada8b36b 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,2 +1,4 @@
 DIST mercury-20.06-gentoo-patchset-3.tar.gz 5265 BLAKE2B 0539611691cfb714937bca8dc967246ce32c515b7133391d81333284e6ceffe29b929c042ee0000752bd9980c2d2332de20d7c5dc4e1a6077a6421056d975808 SHA512 54595a71db4d7684071c6496c3e92fe8c9de0a29832cc85901046f2627bd453cf0760b9857e73a91e87edfddc80d384627dc5c2cb7f3bc12ea5737eb5afa4f3b
+DIST mercury-20.06.1-gentoo-patchset-0.tar.gz 4426 BLAKE2B df6f1a3b52b1f57f502621abba175a55342ae88ecbbe8e37d22b89a7514e0dea14299c87fb1dd47866c5fc89bbb2746a92de8dcf037c1a9d5d2ba4e2e9b8c828 SHA512 c26c209a2fc2380793373785c7a8290ea336c38fe1c243df5c71791e2d1f8b6f8d4a9452a9139181aeb0422cd538c5e6ffe40332ea5b2635cab3324dc4dc320b
+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/mercury-20.06.1.ebuild b/dev-lang/mercury/mercury-20.06.1.ebuild
new file mode 100644
index 00000000000..c8cd32155c4
--- /dev/null
+++ b/dev-lang/mercury/mercury-20.06.1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
+
+PATCHSET_VER="0"
+MY_P=${PN}-srcdist-${PV}
+
+DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
+HOMEPAGE="https://www.mercurylang.org/index.html"
+SRC_URI="https://dl.mercurylang.org/release-20.06/${MY_P}.tar.gz
+	https://dev.gentoo.org/~keri/distfiles/mercury/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug doc emacs erlang examples java mono profile readline threads trail"
+
+DEPEND="net-libs/libnsl:0=
+	readline? ( sys-libs/readline:= )
+	erlang? ( dev-lang/erlang )
+	java? ( >=virtual/jdk-1.8:* )
+	mono? ( dev-lang/mono )
+	doc? ( sys-apps/texinfo )"
+
+RDEPEND="${DEPEND}
+	emacs? ( >=app-editors/emacs-23.1:* )"
+
+S="${WORKDIR}"/${MY_P}
+
+SITEFILE=50${PN}-gentoo.el
+
+src_prepare() {
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		eapply "${WORKDIR}"/${PV}
+	fi
+	eapply_user
+
+	AT_M4DIR=m4 eautoreconf
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	strip-flags
+
+	local myconf
+	myconf="--libdir=/usr/$(get_libdir) \
+		$(use_enable mono csharp-grade) \
+		$(use_enable erlang erlang-grade) \
+		$(use_enable java java-grade) \
+		$(use_enable debug debug-grades) \
+		$(use_enable profile prof-grades) \
+		$(use_enable threads par-grades) \
+		$(use_enable trail trail-grades) \
+		$(use_with readline)"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	# Prepare mmake flags
+	echo "EXTRA_CFLAGS = ${CFLAGS}"  >> Mmake.params
+	echo "EXTRA_LDFLAGS = ${LDFLAGS}" >> Mmake.params
+	echo "EXTRA_LD_LIBFLAGS = ${LDFLAGS}" >> Mmake.params
+	echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params
+
+	if use trail; then
+		echo "CFLAGS-int = -O0" >> Mmake.params
+		echo "CFLAGS-uint = -O0" >> Mmake.params
+	fi
+
+	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libgc.so" >> boehm_gc/Mmake.boehm_gc.params
+	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_rt.so" >> runtime/Mmake.runtime.params
+	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_std.so" >> library/Mmake.library.params
+
+	# Build Mercury using bootstrap grade
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		TEXI2DVI="" PDFTEX=""
+
+	# We can now patch .m Mercury compiler files since we
+	# have just built mercury_compiler.
+	if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then
+		eapply "${WORKDIR}"/${PV}-mmc
+	fi
+
+	# Rebuild Mercury compiler using the just built mercury_compiler
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX=""
+
+	# The default Mercury grade may not be the same as the bootstrap
+	# grade. Since src_test() is run before src_install() we compile
+	# the default grade now
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX="" \
+		default_grade
+}
+
+src_test() {
+	TEST_GRADE=$(scripts/ml --print-grade)
+	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
+		TWS="${S}"/install_grade_dir.${TEST_GRADE}
+		cp runtime/mer_rt.init "${TWS}"/runtime/
+		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
+		cp browser/mer_browser.init "${TWS}"/browser/
+	else
+		TWS="${S}"
+	fi
+
+	cd "${S}"/tests || die
+	sed -e "s:@WORKSPACE@:${TWS}:" \
+		< WS_FLAGS.ws \
+		> WS_FLAGS \
+		|| die "sed WORKSPACE failed"
+	sed -e "s:@WORKSPACE@:${TWS}:" \
+		< .mgnuc_copts.ws \
+		> .mgnuc_copts \
+		|| die "sed WORKSPACE failed"
+	find . -mindepth 1 -type d -exec cp .mgnuc_opts  {} \;
+	find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \;
+
+	# Mercury tests must be run in C locale since Mercury output is
+	# compared to hard-coded warnings/errors
+	LC_ALL="C" \
+	PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
+	TERM="" \
+	WORKSPACE="${TWS}" \
+	WORKSPACE_FLAGS=yes \
+	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
+	MMAKE_DIR="${TWS}"/scripts \
+	MERCURY_SUPPRESS_STACK_TRACE=yes \
+	GRADE=${TEST_GRADE} \
+		mmake || die "mmake test failed"
+}
+
+src_install() {
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX="" \
+		DESTDIR="${D}" \
+		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
+		install
+
+	if use java; then
+		keepdir /usr/$(get_libdir)/mercury/modules/java
+	fi
+
+	if use mono; then
+		keepdir /usr/$(get_libdir)/mercury/modules/csharp
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+			|| die "elisp-site-file-install failed"
+	fi
+
+	dodoc \
+		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
+		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
+		RELEASE_NOTES VERSION || die
+
+	if use erlang; then
+		dodoc README.Erlang
+	fi
+
+	if use java; then
+		dodoc README.Java
+	fi
+
+	if use mono; then
+		dodoc README.CSharp
+	fi
+
+	if use examples; then
+		docinto samples
+		dodoc samples/{*.m,README,Mmakefile}
+		dodoc -r samples/c_interface \
+			samples/diff \
+			samples/muz \
+			samples/rot13 \
+			samples/solutions \
+			samples/solver_types
+
+		if use java; then
+			dodoc -r samples/java_interface
+		fi
+
+		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}

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

[Keri Harris]

commit:     e4d79a81c3ddee5579e975e7c89b236534e3de26
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  3 08:10:35 2021 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sun Oct  3 08:11:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4d79a81

dev-lang/mercury: avoid using cygpath references when building GC

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

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

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 1cdcf35fbe4..db766ffb277 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,2 +1,2 @@
-DIST mercury-20.06-gentoo-patchset-2.tar.gz 4834 BLAKE2B 33781113c4033b0efb19faf4227b609dd6410bf992fa8720302f732b18e669f2b7d5c650da4b04427ba94c9ce4fdbb1eefc2408e7927e360c531b88e1f2c1748 SHA512 22eb34d5a2d70d671ff717350770008fd844afbc39ae2cb7901407943500c6ebd6b8ebd81c19c602bf461c5772d915b2c1f1b2460b29e8b94df2ed6472eea971
+DIST mercury-20.06-gentoo-patchset-3.tar.gz 5265 BLAKE2B 0539611691cfb714937bca8dc967246ce32c515b7133391d81333284e6ceffe29b929c042ee0000752bd9980c2d2332de20d7c5dc4e1a6077a6421056d975808 SHA512 54595a71db4d7684071c6496c3e92fe8c9de0a29832cc85901046f2627bd453cf0760b9857e73a91e87edfddc80d384627dc5c2cb7f3bc12ea5737eb5afa4f3b
 DIST mercury-srcdist-20.06.tar.gz 47768559 BLAKE2B f242aa2ef7da53aa2dfa054e4fee8646434d276f0748b014e33ea52d22f2a8a37e6fecaa20617f4943c4c1e7d8c179ed0603a344fde2dd58da98b2bacadf1a71 SHA512 b76bd22d8eb16242c68b614ff122ed7ee7535efef6c0ceb8cc798fee4c550bc41b6faff2135cea43b24c652b654bb35ae049656585d8e7bf3a1122d07cb1ecf4

diff --git a/dev-lang/mercury/mercury-20.06-r1.ebuild b/dev-lang/mercury/mercury-20.06-r1.ebuild
index e3819e130b4..d2f14d41fd0 100644
--- a/dev-lang/mercury/mercury-20.06-r1.ebuild
+++ b/dev-lang/mercury/mercury-20.06-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit autotools elisp-common flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
 
-PATCHSET_VER="2"
+PATCHSET_VER="3"
 MY_P=${PN}-srcdist-${PV}
 
 DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"

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

[Keri Harris]

commit:     b749221e184c37cb56edc74489e3e39aad35ba94
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 31 17:16:28 2021 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sat Jul 31 17:16:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b749221e

dev-lang/mercury: allow mercury to compile with GCC 11

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

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

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 92e703f5328..1cdcf35fbe4 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,2 +1,2 @@
-DIST mercury-20.06-gentoo-patchset-1.tar.gz 4555 BLAKE2B 8609ba7cd43d82ceb6b6e25fd6af3b2c750df6446c1235bd9c6f8e3bc87bb1fe0a43cafb9f1d061562bb80ade1deb7809889bf0d703c99ea1e2286bbeb7c5182 SHA512 23fae769c5c1204154c6ed55cc31644967e3554f499b23a6585d34615d062a214d6485de3a4acf8cf90a582a229aeab519e57a6df80cee62e9e6789f210e8256
+DIST mercury-20.06-gentoo-patchset-2.tar.gz 4834 BLAKE2B 33781113c4033b0efb19faf4227b609dd6410bf992fa8720302f732b18e669f2b7d5c650da4b04427ba94c9ce4fdbb1eefc2408e7927e360c531b88e1f2c1748 SHA512 22eb34d5a2d70d671ff717350770008fd844afbc39ae2cb7901407943500c6ebd6b8ebd81c19c602bf461c5772d915b2c1f1b2460b29e8b94df2ed6472eea971
 DIST mercury-srcdist-20.06.tar.gz 47768559 BLAKE2B f242aa2ef7da53aa2dfa054e4fee8646434d276f0748b014e33ea52d22f2a8a37e6fecaa20617f4943c4c1e7d8c179ed0603a344fde2dd58da98b2bacadf1a71 SHA512 b76bd22d8eb16242c68b614ff122ed7ee7535efef6c0ceb8cc798fee4c550bc41b6faff2135cea43b24c652b654bb35ae049656585d8e7bf3a1122d07cb1ecf4

diff --git a/dev-lang/mercury/mercury-20.06-r1.ebuild b/dev-lang/mercury/mercury-20.06-r1.ebuild
index 56a047bcb57..e3819e130b4 100644
--- a/dev-lang/mercury/mercury-20.06-r1.ebuild
+++ b/dev-lang/mercury/mercury-20.06-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit autotools elisp-common flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
 
-PATCHSET_VER="1"
+PATCHSET_VER="2"
 MY_P=${PN}-srcdist-${PV}
 
 DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"

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

[David Seifert]

commit:     aa90de39b74ad6e4f9c048d33f8d308c23d851d3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 28 15:56:48 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri May 28 15:56:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa90de39

dev-lang/mercury: fix docinto argument (avoid double 'prefix')

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

 dev-lang/mercury/{mercury-20.06.ebuild => mercury-20.06-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/mercury/mercury-20.06.ebuild b/dev-lang/mercury/mercury-20.06-r1.ebuild
similarity index 99%
rename from dev-lang/mercury/mercury-20.06.ebuild
rename to dev-lang/mercury/mercury-20.06-r1.ebuild
index be12f843b0e..56a047bcb57 100644
--- a/dev-lang/mercury/mercury-20.06.ebuild
+++ b/dev-lang/mercury/mercury-20.06-r1.ebuild
@@ -181,7 +181,7 @@ src_install() {
 	fi
 
 	if use examples; then
-		docinto /usr/share/doc/${PF}/samples
+		docinto samples
 		dodoc samples/{*.m,README,Mmakefile}
 		dodoc -r samples/c_interface \
 			samples/diff \

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

[Keri Harris]

commit:     c6d1da5ef99e7cdb8b558b1f8d2f677e3913c273
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sat May 15 16:48:49 2021 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sat May 15 16:49:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6d1da5e

dev-lang/mercury: update JDK dependency

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

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

diff --git a/dev-lang/mercury/mercury-20.06.ebuild b/dev-lang/mercury/mercury-20.06.ebuild
index ce13209041b..be12f843b0e 100644
--- a/dev-lang/mercury/mercury-20.06.ebuild
+++ b/dev-lang/mercury/mercury-20.06.ebuild
@@ -22,7 +22,7 @@ IUSE="debug doc emacs erlang examples java mono profile readline threads trail"
 DEPEND="net-libs/libnsl:0=
 	readline? ( sys-libs/readline:= )
 	erlang? ( dev-lang/erlang )
-	java? ( >=virtual/jdk-1.6:= )
+	java? ( >=virtual/jdk-1.8:* )
 	mono? ( dev-lang/mono )
 	doc? ( sys-apps/texinfo )"
 

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

[Keri Harris]

commit:     2f6f48ba7f447081357c4257aea9af2c3b26fa60
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 18 16:02:18 2021 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 16:03:53 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f6f48ba

dev-lang/mercury: 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/Manifest                  |   8 --
 dev-lang/mercury/mercury-14.01.1-r1.ebuild | 222 -----------------------------
 dev-lang/mercury/mercury-20.01.1.ebuild    | 201 --------------------------
 dev-lang/mercury/mercury-20.01.2.ebuild    | 202 --------------------------
 dev-lang/mercury/mercury-20.01.ebuild      | 206 --------------------------
 5 files changed, 839 deletions(-)

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 81b026c9b23..92e703f5328 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,10 +1,2 @@
-DIST mercury-14.01.1-gentoo-patchset-5.tar.gz 5693 BLAKE2B 300de3254bc0d2f59493c0e2243b0d8786fccce714134a11ce510120b7d9f05ebe4835f084ec2db2ddaf2d405cbae65e86d809847079a7d63a6a68021d9d29e8 SHA512 3f9f1e2359f372e4f510b9a00c197978657b28d1308d12cba4d08a982877e2311d7fb6e626dad07d0fa09d24f97334575557cb49003508fdc7b32288c1ae8f2d
-DIST mercury-20.01-gentoo-patchset-0.tar.gz 3862 BLAKE2B 79ef6d30add63a5d419e3dd5b376fd9c1727038102db2bc0e8ccd8b71cdc1c80e721647f34764b0aa4fd6d58b9e38c9675f234714f381f94be572b9b64b478e1 SHA512 2835b4740453bcc358363f9eaa0264706125b5e5f7a38802d5f280ccd777d4c760124ed3a635f17ecc2ae772767e9fa5d61093c40094358a0a96a726a23ff08e
-DIST mercury-20.01.1-gentoo-patchset-0.tar.gz 3943 BLAKE2B 0fd149c622715bf191182bd93e264096327d7869e30aaa10bb19b70bec5563520026e2561cc6607c62801ed00ed6b5907bbae4be997869b9facb2f9d65ec0c7a SHA512 d866b35b6df14645ef60ff25497f9bbf0c2caeae2145bc0aef2adea0e651379c673c1815c717f1a51457d93cc67e9ae3dafe5d9fce1d4734bf1673e4cfcbd367
-DIST mercury-20.01.2-gentoo-patchset-1.tar.gz 4562 BLAKE2B f1e9d040cfd5930c4f4d9722fc10e11532272f1fa0ab6bd25cc0d2ed42eb0edfbe6f9bc1d41972775fa720b80601d5fdae1681d56f677861fab15e10cc6d05cb SHA512 4f89b09e1e196a61892811167bc0dc1b3ee868ef336efdf66e417574c18ea53b557bd87d5c5300eee8194a3c4250b47e70f5991fcc25b1c58d956a4b097eaec5
 DIST mercury-20.06-gentoo-patchset-1.tar.gz 4555 BLAKE2B 8609ba7cd43d82ceb6b6e25fd6af3b2c750df6446c1235bd9c6f8e3bc87bb1fe0a43cafb9f1d061562bb80ade1deb7809889bf0d703c99ea1e2286bbeb7c5182 SHA512 23fae769c5c1204154c6ed55cc31644967e3554f499b23a6585d34615d062a214d6485de3a4acf8cf90a582a229aeab519e57a6df80cee62e9e6789f210e8256
-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/mercury-14.01.1-r1.ebuild b/dev-lang/mercury/mercury-14.01.1-r1.ebuild
deleted file mode 100644
index 3584581c3ce..00000000000
--- a/dev-lang/mercury/mercury-14.01.1-r1.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
-
-PATCHSET_VER="5"
-MY_P=${PN}-srcdist-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-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="debug doc emacs erlang examples java mono profile readline threads trail"
-
-DEPEND="!dev-libs/mpatrol
-	!dev-util/mono-debugger
-	net-libs/libnsl:0=
-	readline? ( sys-libs/readline:= )
-	erlang? ( dev-lang/erlang )
-	java? ( >=virtual/jdk-1.6:= )
-	mono? ( dev-lang/mono )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="${DEPEND}
-	emacs? ( >=app-editors/emacs-23.1:* )"
-
-S="${WORKDIR}"/${MY_P}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		epatch "${WORKDIR}"/${PV}
-	fi
-
-	sed -i -e "s/@libdir@/$(get_libdir)/" \
-		"${S}"/scripts/Mmake.vars.in \
-		|| die "sed libdir failed"
-
-	cd "${S}" || die
-	eautoconf
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	strip-flags
-
-	local myconf
-	myconf="--libdir=/usr/$(get_libdir) \
-		$(use_enable mono csharp-grade) \
-		$(use_enable erlang erlang-grade) \
-		$(use_enable java java-grade) \
-		$(use_enable debug debug-grades) \
-		$(use_enable profile prof-grades) \
-		$(use_enable threads par-grades) \
-		$(use_enable trail trail-grades) \
-		$(use_with readline)"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Prepare mmake flags
-	echo "EXTRA_CFLAGS  = ${CFLAGS}"  >> Mmake.params
-	echo "EXTRA_LDFLAGS = ${LDFLAGS}" >> Mmake.params
-	echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params
-
-	if use x86; then
-		echo "CFLAGS-ml_backend.ml_closure_gen = -O0" >> Mmake.params
-		echo "CFLAGS-ml_backend.ml_unify_gen = -O0" >> Mmake.params
-		echo "CFLAGS-ml_backend.rtti_to_mlds = -O0" >> Mmake.params
-		echo "CFLAGS-display_report = -O0" >> Mmake.params
-		echo "CFLAGS-mercury_ho_call = -O0" >> Mmake.params
-		echo "CFLAGS-mercury_trace_vars = -O0" >> Mmake.params
-	fi
-
-	# Build Mercury using bootstrap grade
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		TEXI2DVI="" PDFTEX=""
-
-	# We can now patch .m Mercury compiler files since we
-	# have just built mercury_compiler.
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then
-		epatch "${WORKDIR}"/${PV}-mmc
-	fi
-
-	sed -i -e "s/@libdir@/$(get_libdir)/" \
-		"${S}"/compiler/file_util.m \
-		"${S}"/compiler/make.program_target.m \
-		|| die "sed libdir failed"
-
-	# Rebuild Mercury compiler using the just built mercury_compiler
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX=""
-
-	# The default Mercury grade may not be the same as the bootstrap
-	# grade. Since src_test() is run before src_install() we compile
-	# the default grade now
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX="" \
-		default_grade
-}
-
-src_test() {
-	TEST_GRADE=$(scripts/ml --print-grade)
-	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
-		TWS="${S}"/install_grade_dir.${TEST_GRADE}
-		cp runtime/mer_rt.init "${TWS}"/runtime/
-		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
-		cp browser/mer_browser.init "${TWS}"/browser/
-	else
-		TWS="${S}"
-	fi
-
-	cd "${S}"/tests || die
-	sed -e "s:@WORKSPACE@:${TWS}:" \
-		< WS_FLAGS.ws \
-		> WS_FLAGS \
-		|| die "sed WORKSPACE failed"
-	sed -e "s:@WORKSPACE@:${TWS}:" \
-		< .mgnuc_copts.ws \
-		> .mgnuc_copts \
-		|| die "sed WORKSPACE failed"
-	find . -mindepth 1 -type d -exec cp .mgnuc_opts  {} \;
-	find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \;
-
-	# Mercury tests must be run in C locale since Mercury output is
-	# compared to hard-coded warnings/errors
-	LC_ALL="C" \
-	PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
-	TERM="" \
-	WORKSPACE="${TWS}" \
-	WORKSPACE_FLAGS=yes \
-	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
-	MMAKE_DIR="${TWS}"/scripts \
-	MERCURY_SUPPRESS_STACK_TRACE=yes \
-	GRADE=${TEST_GRADE} \
-		mmake || die "mmake test failed"
-}
-
-src_install() {
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX="" \
-		DESTDIR="${D}" \
-		INSTALL_PREFIX="${D}"/usr \
-		INSTALL_MAN_DIR="${D}"/usr/share/man \
-		INSTALL_INFO_DIR="${D}"/usr/share/info \
-		INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \
-		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
-		install
-
-	if use java; then
-		keepdir /usr/$(get_libdir)/mercury/modules/java
-	fi
-
-	if use mono; then
-		keepdir /usr/$(get_libdir)/mercury/modules/csharp
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-
-	dodoc \
-		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
-		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
-		RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS || die
-
-	if use erlang; then
-		dodoc README.Erlang
-	fi
-
-	if use java; then
-		dodoc README.Java
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/samples
-		doins samples/{*.m,README,Mmakefile}
-		doins -r samples/c_interface \
-			samples/diff \
-			samples/muz \
-			samples/rot13 \
-			samples/solutions \
-			samples/solver_types
-
-		if use java; then
-			doins -r samples/java_interface
-		fi
-
-		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

diff --git a/dev-lang/mercury/mercury-20.01.1.ebuild b/dev-lang/mercury/mercury-20.01.1.ebuild
deleted file mode 100644
index 6770d4264de..00000000000
--- a/dev-lang/mercury/mercury-20.01.1.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
-
-PATCHSET_VER="0"
-MY_P=${PN}-srcdist-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-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="debug doc emacs erlang examples java mono profile readline threads trail"
-
-DEPEND="net-libs/libnsl:0=
-	readline? ( sys-libs/readline:= )
-	erlang? ( dev-lang/erlang )
-	java? ( >=virtual/jdk-1.6:= )
-	mono? ( dev-lang/mono )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="${DEPEND}
-	emacs? ( >=app-editors/emacs-23.1:* )"
-
-S="${WORKDIR}"/${MY_P}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-	eapply_user
-
-	AT_M4DIR=m4 eautoreconf
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	strip-flags
-
-	local myconf
-	myconf="--libdir=/usr/$(get_libdir) \
-		$(use_enable mono csharp-grade) \
-		$(use_enable erlang erlang-grade) \
-		$(use_enable java java-grade) \
-		$(use_enable debug debug-grades) \
-		$(use_enable profile prof-grades) \
-		$(use_enable threads par-grades) \
-		$(use_enable trail trail-grades) \
-		$(use_with readline)"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Prepare mmake flags
-	echo "EXTRA_CFLAGS  = ${CFLAGS}"  >> Mmake.params
-	echo "EXTRA_LD_LIBFLAGS = ${LDFLAGS}" >> Mmake.params
-	echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params
-
-	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libgc.so" >> boehm_gc/Mmake.boehm_gc.params
-	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_rt.so" >> runtime/Mmake.runtime.params
-	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_std.so" >> library/Mmake.library.params
-
-	# Build Mercury using bootstrap grade
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		TEXI2DVI="" PDFTEX=""
-
-	# We can now patch .m Mercury compiler files since we
-	# have just built mercury_compiler.
-	if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then
-		eapply "${WORKDIR}"/${PV}-mmc
-	fi
-
-	# Rebuild Mercury compiler using the just built mercury_compiler
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX=""
-
-	# The default Mercury grade may not be the same as the bootstrap
-	# grade. Since src_test() is run before src_install() we compile
-	# the default grade now
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX="" \
-		default_grade
-}
-
-src_test() {
-	TEST_GRADE=$(scripts/ml --print-grade)
-	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
-		TWS="${S}"/install_grade_dir.${TEST_GRADE}
-		cp runtime/mer_rt.init "${TWS}"/runtime/
-		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
-		cp browser/mer_browser.init "${TWS}"/browser/
-	else
-		TWS="${S}"
-	fi
-
-	cd "${S}"/tests || die
-	sed -e "s:@WORKSPACE@:${TWS}:" \
-		< WS_FLAGS.ws \
-		> WS_FLAGS \
-		|| die "sed WORKSPACE failed"
-	sed -e "s:@WORKSPACE@:${TWS}:" \
-		< .mgnuc_copts.ws \
-		> .mgnuc_copts \
-		|| die "sed WORKSPACE failed"
-	find . -mindepth 1 -type d -exec cp .mgnuc_opts  {} \;
-	find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \;
-
-	# Mercury tests must be run in C locale since Mercury output is
-	# compared to hard-coded warnings/errors
-	LC_ALL="C" \
-	PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
-	TERM="" \
-	WORKSPACE="${TWS}" \
-	WORKSPACE_FLAGS=yes \
-	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
-	MMAKE_DIR="${TWS}"/scripts \
-	MERCURY_SUPPRESS_STACK_TRACE=yes \
-	GRADE=${TEST_GRADE} \
-		mmake || die "mmake test failed"
-}
-
-src_install() {
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX="" \
-		DESTDIR="${D}" \
-		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
-		install
-
-	if use java; then
-		keepdir /usr/$(get_libdir)/mercury/modules/java
-	fi
-
-	if use mono; then
-		keepdir /usr/$(get_libdir)/mercury/modules/csharp
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-
-	dodoc \
-		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
-		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
-		RELEASE_NOTES VERSION || die
-
-	if use erlang; then
-		dodoc README.Erlang
-	fi
-
-	if use java; then
-		dodoc README.Java
-	fi
-
-	if use mono; then
-		dodoc README.CSharp
-	fi
-
-	if use examples; then
-		docinto /usr/share/doc/${PF}/samples
-		dodoc samples/{*.m,README,Mmakefile}
-		dodoc -r samples/c_interface \
-			samples/diff \
-			samples/muz \
-			samples/rot13 \
-			samples/solutions \
-			samples/solver_types
-
-		if use java; then
-			dodoc -r samples/java_interface
-		fi
-
-		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

diff --git a/dev-lang/mercury/mercury-20.01.2.ebuild b/dev-lang/mercury/mercury-20.01.2.ebuild
deleted file mode 100644
index b0c5ecffdb0..00000000000
--- a/dev-lang/mercury/mercury-20.01.2.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
-
-PATCHSET_VER="1"
-MY_P=${PN}-srcdist-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-HOMEPAGE="https://www.mercurylang.org/index.html"
-SRC_URI="https://dl.mercurylang.org/release-20.01/${MY_P}.tar.gz
-	https://dev.gentoo.org/~keri/distfiles/mercury/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug doc emacs erlang examples java mono profile readline threads trail"
-
-DEPEND="net-libs/libnsl:0=
-	readline? ( sys-libs/readline:= )
-	erlang? ( dev-lang/erlang )
-	java? ( >=virtual/jdk-1.6:= )
-	mono? ( dev-lang/mono )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="${DEPEND}
-	emacs? ( >=app-editors/emacs-23.1:* )"
-
-S="${WORKDIR}"/${MY_P}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-	eapply_user
-
-	AT_M4DIR=m4 eautoreconf
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	strip-flags
-
-	local myconf
-	myconf="--libdir=/usr/$(get_libdir) \
-		$(use_enable mono csharp-grade) \
-		$(use_enable erlang erlang-grade) \
-		$(use_enable java java-grade) \
-		$(use_enable debug debug-grades) \
-		$(use_enable profile prof-grades) \
-		$(use_enable threads par-grades) \
-		$(use_enable trail trail-grades) \
-		$(use_with readline)"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Prepare mmake flags
-	echo "EXTRA_CFLAGS = ${CFLAGS}"  >> Mmake.params
-	echo "EXTRA_LDFLAGS = ${LDFLAGS}" >> Mmake.params
-	echo "EXTRA_LD_LIBFLAGS = ${LDFLAGS}" >> Mmake.params
-	echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params
-
-	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libgc.so" >> boehm_gc/Mmake.boehm_gc.params
-	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_rt.so" >> runtime/Mmake.runtime.params
-	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_std.so" >> library/Mmake.library.params
-
-	# Build Mercury using bootstrap grade
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		TEXI2DVI="" PDFTEX=""
-
-	# We can now patch .m Mercury compiler files since we
-	# have just built mercury_compiler.
-	if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then
-		eapply "${WORKDIR}"/${PV}-mmc
-	fi
-
-	# Rebuild Mercury compiler using the just built mercury_compiler
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX=""
-
-	# The default Mercury grade may not be the same as the bootstrap
-	# grade. Since src_test() is run before src_install() we compile
-	# the default grade now
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX="" \
-		default_grade
-}
-
-src_test() {
-	TEST_GRADE=$(scripts/ml --print-grade)
-	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
-		TWS="${S}"/install_grade_dir.${TEST_GRADE}
-		cp runtime/mer_rt.init "${TWS}"/runtime/
-		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
-		cp browser/mer_browser.init "${TWS}"/browser/
-	else
-		TWS="${S}"
-	fi
-
-	cd "${S}"/tests || die
-	sed -e "s:@WORKSPACE@:${TWS}:" \
-		< WS_FLAGS.ws \
-		> WS_FLAGS \
-		|| die "sed WORKSPACE failed"
-	sed -e "s:@WORKSPACE@:${TWS}:" \
-		< .mgnuc_copts.ws \
-		> .mgnuc_copts \
-		|| die "sed WORKSPACE failed"
-	find . -mindepth 1 -type d -exec cp .mgnuc_opts  {} \;
-	find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \;
-
-	# Mercury tests must be run in C locale since Mercury output is
-	# compared to hard-coded warnings/errors
-	LC_ALL="C" \
-	PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
-	TERM="" \
-	WORKSPACE="${TWS}" \
-	WORKSPACE_FLAGS=yes \
-	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
-	MMAKE_DIR="${TWS}"/scripts \
-	MERCURY_SUPPRESS_STACK_TRACE=yes \
-	GRADE=${TEST_GRADE} \
-		mmake || die "mmake test failed"
-}
-
-src_install() {
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX="" \
-		DESTDIR="${D}" \
-		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
-		install
-
-	if use java; then
-		keepdir /usr/$(get_libdir)/mercury/modules/java
-	fi
-
-	if use mono; then
-		keepdir /usr/$(get_libdir)/mercury/modules/csharp
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-
-	dodoc \
-		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
-		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
-		RELEASE_NOTES VERSION || die
-
-	if use erlang; then
-		dodoc README.Erlang
-	fi
-
-	if use java; then
-		dodoc README.Java
-	fi
-
-	if use mono; then
-		dodoc README.CSharp
-	fi
-
-	if use examples; then
-		docinto /usr/share/doc/${PF}/samples
-		dodoc samples/{*.m,README,Mmakefile}
-		dodoc -r samples/c_interface \
-			samples/diff \
-			samples/muz \
-			samples/rot13 \
-			samples/solutions \
-			samples/solver_types
-
-		if use java; then
-			dodoc -r samples/java_interface
-		fi
-
-		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

diff --git a/dev-lang/mercury/mercury-20.01.ebuild b/dev-lang/mercury/mercury-20.01.ebuild
deleted file mode 100644
index 4ee03178b5f..00000000000
--- a/dev-lang/mercury/mercury-20.01.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
-
-PATCHSET_VER="0"
-MY_P=${PN}-srcdist-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-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="debug doc emacs erlang examples java mono profile readline threads trail"
-
-DEPEND="net-libs/libnsl:0=
-	readline? ( sys-libs/readline:= )
-	erlang? ( dev-lang/erlang )
-	java? ( >=virtual/jdk-1.6:= )
-	mono? ( dev-lang/mono )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="${DEPEND}
-	emacs? ( >=app-editors/emacs-23.1:* )"
-
-S="${WORKDIR}"/${MY_P}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-	eapply_user
-
-	AT_M4DIR=m4 eautoreconf
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	strip-flags
-
-	local myconf
-	myconf="--libdir=/usr/$(get_libdir) \
-		$(use_enable mono csharp-grade) \
-		$(use_enable erlang erlang-grade) \
-		$(use_enable java java-grade) \
-		$(use_enable debug debug-grades) \
-		$(use_enable profile prof-grades) \
-		$(use_enable threads par-grades) \
-		$(use_enable trail trail-grades) \
-		$(use_with readline)"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Prepare mmake flags
-	echo "EXTRA_CFLAGS  = ${CFLAGS}"  >> Mmake.params
-	echo "EXTRA_LD_LIBFLAGS = ${LDFLAGS}" >> Mmake.params
-	echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params
-
-	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libgc.so" >> boehm_gc/Mmake.boehm_gc.params
-	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_rt.so" >> runtime/Mmake.runtime.params
-	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_std.so" >> library/Mmake.library.params
-
-	# Build Mercury using bootstrap grade
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		TEXI2DVI="" PDFTEX=""
-
-	# We can now patch .m Mercury compiler files since we
-	# have just built mercury_compiler.
-	if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then
-		eapply "${WORKDIR}"/${PV}-mmc
-	fi
-
-	sed -i -e "s/@libdir@/$(get_libdir)/" \
-		"${S}"/compiler/file_util.m \
-		"${S}"/compiler/make.program_target.m \
-		|| die "sed libdir failed"
-
-	# Rebuild Mercury compiler using the just built mercury_compiler
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX=""
-
-	# The default Mercury grade may not be the same as the bootstrap
-	# grade. Since src_test() is run before src_install() we compile
-	# the default grade now
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX="" \
-		default_grade
-}
-
-src_test() {
-	TEST_GRADE=$(scripts/ml --print-grade)
-	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
-		TWS="${S}"/install_grade_dir.${TEST_GRADE}
-		cp runtime/mer_rt.init "${TWS}"/runtime/
-		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
-		cp browser/mer_browser.init "${TWS}"/browser/
-	else
-		TWS="${S}"
-	fi
-
-	cd "${S}"/tests || die
-	sed -e "s:@WORKSPACE@:${TWS}:" \
-		< WS_FLAGS.ws \
-		> WS_FLAGS \
-		|| die "sed WORKSPACE failed"
-	sed -e "s:@WORKSPACE@:${TWS}:" \
-		< .mgnuc_copts.ws \
-		> .mgnuc_copts \
-		|| die "sed WORKSPACE failed"
-	find . -mindepth 1 -type d -exec cp .mgnuc_opts  {} \;
-	find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \;
-
-	# Mercury tests must be run in C locale since Mercury output is
-	# compared to hard-coded warnings/errors
-	LC_ALL="C" \
-	PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
-	TERM="" \
-	WORKSPACE="${TWS}" \
-	WORKSPACE_FLAGS=yes \
-	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
-	MMAKE_DIR="${TWS}"/scripts \
-	MERCURY_SUPPRESS_STACK_TRACE=yes \
-	GRADE=${TEST_GRADE} \
-		mmake || die "mmake test failed"
-}
-
-src_install() {
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX="" \
-		DESTDIR="${D}" \
-		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
-		install
-
-	if use java; then
-		keepdir /usr/$(get_libdir)/mercury/modules/java
-	fi
-
-	if use mono; then
-		keepdir /usr/$(get_libdir)/mercury/modules/csharp
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-
-	dodoc \
-		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
-		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
-		RELEASE_NOTES VERSION || die
-
-	if use erlang; then
-		dodoc README.Erlang
-	fi
-
-	if use java; then
-		dodoc README.Java
-	fi
-
-	if use mono; then
-		dodoc README.CSharp
-	fi
-
-	if use examples; then
-		docinto /usr/share/doc/${PF}/samples
-		dodoc samples/{*.m,README,Mmakefile}
-		dodoc -r samples/c_interface \
-			samples/diff \
-			samples/muz \
-			samples/rot13 \
-			samples/solutions \
-			samples/solver_types
-
-		if use java; then
-			dodoc -r samples/java_interface
-		fi
-
-		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

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

[Keri Harris]

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

dev-lang/mercury: 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/mercury-20.06.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/mercury/mercury-20.06.ebuild b/dev-lang/mercury/mercury-20.06.ebuild
index a55437c1221..2a3855fb795 100644
--- a/dev-lang/mercury/mercury-20.06.ebuild
+++ b/dev-lang/mercury/mercury-20.06.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dl.mercurylang.org/release-20.06/${MY_P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="debug doc emacs erlang examples java mono profile readline threads trail"
 

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

[Keri Harris]

commit:     349242b4933d8833bbad53cad06f933b69e34167
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  6 14:32:01 2021 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Wed Jan  6 14:32:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=349242b4

dev-lang/mercury: disable foreign_import_module tests

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

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

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index e1e93e43462..81b026c9b23 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -2,7 +2,7 @@ DIST mercury-14.01.1-gentoo-patchset-5.tar.gz 5693 BLAKE2B 300de3254bc0d2f59493c
 DIST mercury-20.01-gentoo-patchset-0.tar.gz 3862 BLAKE2B 79ef6d30add63a5d419e3dd5b376fd9c1727038102db2bc0e8ccd8b71cdc1c80e721647f34764b0aa4fd6d58b9e38c9675f234714f381f94be572b9b64b478e1 SHA512 2835b4740453bcc358363f9eaa0264706125b5e5f7a38802d5f280ccd777d4c760124ed3a635f17ecc2ae772767e9fa5d61093c40094358a0a96a726a23ff08e
 DIST mercury-20.01.1-gentoo-patchset-0.tar.gz 3943 BLAKE2B 0fd149c622715bf191182bd93e264096327d7869e30aaa10bb19b70bec5563520026e2561cc6607c62801ed00ed6b5907bbae4be997869b9facb2f9d65ec0c7a SHA512 d866b35b6df14645ef60ff25497f9bbf0c2caeae2145bc0aef2adea0e651379c673c1815c717f1a51457d93cc67e9ae3dafe5d9fce1d4734bf1673e4cfcbd367
 DIST mercury-20.01.2-gentoo-patchset-1.tar.gz 4562 BLAKE2B f1e9d040cfd5930c4f4d9722fc10e11532272f1fa0ab6bd25cc0d2ed42eb0edfbe6f9bc1d41972775fa720b80601d5fdae1681d56f677861fab15e10cc6d05cb SHA512 4f89b09e1e196a61892811167bc0dc1b3ee868ef336efdf66e417574c18ea53b557bd87d5c5300eee8194a3c4250b47e70f5991fcc25b1c58d956a4b097eaec5
-DIST mercury-20.06-gentoo-patchset-0.tar.gz 4429 BLAKE2B 3093f022073a1183f34036612a78335fdb317462332933ce415d859573ac7074f55e5311dd4802d263ab9c8c14962e63dcbfc08dd8d8f08c31cebb93e1a82881 SHA512 3e20ef930076dc8833f5ed5563130345e131fb17a7990f7a57552ad806c7cc3ac90667c8a3de4e5fa9a2d451ed104c35e3146f59fce4efb48e8891ac05cc9a41
+DIST mercury-20.06-gentoo-patchset-1.tar.gz 4555 BLAKE2B 8609ba7cd43d82ceb6b6e25fd6af3b2c750df6446c1235bd9c6f8e3bc87bb1fe0a43cafb9f1d061562bb80ade1deb7809889bf0d703c99ea1e2286bbeb7c5182 SHA512 23fae769c5c1204154c6ed55cc31644967e3554f499b23a6585d34615d062a214d6485de3a4acf8cf90a582a229aeab519e57a6df80cee62e9e6789f210e8256
 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/mercury-20.06.ebuild b/dev-lang/mercury/mercury-20.06.ebuild
index 3757ae56109..a55437c1221 100644
--- a/dev-lang/mercury/mercury-20.06.ebuild
+++ b/dev-lang/mercury/mercury-20.06.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
 
-PATCHSET_VER="0"
+PATCHSET_VER="1"
 MY_P=${PN}-srcdist-${PV}
 
 DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"

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

[Keri Harris]

commit:     b0f66d83976eedc5f6dc6a37c2296a95d063f9c8
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 14 16:09:21 2020 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 16:09:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0f66d83

dev-lang/mercury: avoid ICE when compiling Mercury trail grades

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

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

diff --git a/dev-lang/mercury/mercury-20.06.ebuild b/dev-lang/mercury/mercury-20.06.ebuild
index 0eb603a4882..3757ae56109 100644
--- a/dev-lang/mercury/mercury-20.06.ebuild
+++ b/dev-lang/mercury/mercury-20.06.ebuild
@@ -68,6 +68,11 @@ src_compile() {
 	echo "EXTRA_LD_LIBFLAGS = ${LDFLAGS}" >> Mmake.params
 	echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params
 
+	if use trail; then
+		echo "CFLAGS-int = -O0" >> Mmake.params
+		echo "CFLAGS-uint = -O0" >> Mmake.params
+	fi
+
 	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libgc.so" >> boehm_gc/Mmake.boehm_gc.params
 	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_rt.so" >> runtime/Mmake.runtime.params
 	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_std.so" >> library/Mmake.library.params

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

[Keri Harris]

commit:     d1652cd72b7ef2a04a783c56d0648c479b486c0b
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 13 10:46:27 2020 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sun Sep 13 10:48:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1652cd7

dev-lang/mercury: version bump

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

 dev-lang/mercury/Manifest             |   2 +
 dev-lang/mercury/mercury-20.06.ebuild | 202 ++++++++++++++++++++++++++++++++++
 2 files changed, 204 insertions(+)

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 03c5549bd26..e1e93e43462 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -2,7 +2,9 @@ DIST mercury-14.01.1-gentoo-patchset-5.tar.gz 5693 BLAKE2B 300de3254bc0d2f59493c
 DIST mercury-20.01-gentoo-patchset-0.tar.gz 3862 BLAKE2B 79ef6d30add63a5d419e3dd5b376fd9c1727038102db2bc0e8ccd8b71cdc1c80e721647f34764b0aa4fd6d58b9e38c9675f234714f381f94be572b9b64b478e1 SHA512 2835b4740453bcc358363f9eaa0264706125b5e5f7a38802d5f280ccd777d4c760124ed3a635f17ecc2ae772767e9fa5d61093c40094358a0a96a726a23ff08e
 DIST mercury-20.01.1-gentoo-patchset-0.tar.gz 3943 BLAKE2B 0fd149c622715bf191182bd93e264096327d7869e30aaa10bb19b70bec5563520026e2561cc6607c62801ed00ed6b5907bbae4be997869b9facb2f9d65ec0c7a SHA512 d866b35b6df14645ef60ff25497f9bbf0c2caeae2145bc0aef2adea0e651379c673c1815c717f1a51457d93cc67e9ae3dafe5d9fce1d4734bf1673e4cfcbd367
 DIST mercury-20.01.2-gentoo-patchset-1.tar.gz 4562 BLAKE2B f1e9d040cfd5930c4f4d9722fc10e11532272f1fa0ab6bd25cc0d2ed42eb0edfbe6f9bc1d41972775fa720b80601d5fdae1681d56f677861fab15e10cc6d05cb SHA512 4f89b09e1e196a61892811167bc0dc1b3ee868ef336efdf66e417574c18ea53b557bd87d5c5300eee8194a3c4250b47e70f5991fcc25b1c58d956a4b097eaec5
+DIST mercury-20.06-gentoo-patchset-0.tar.gz 4429 BLAKE2B 3093f022073a1183f34036612a78335fdb317462332933ce415d859573ac7074f55e5311dd4802d263ab9c8c14962e63dcbfc08dd8d8f08c31cebb93e1a82881 SHA512 3e20ef930076dc8833f5ed5563130345e131fb17a7990f7a57552ad806c7cc3ac90667c8a3de4e5fa9a2d451ed104c35e3146f59fce4efb48e8891ac05cc9a41
 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/mercury-20.06.ebuild b/dev-lang/mercury/mercury-20.06.ebuild
new file mode 100644
index 00000000000..0eb603a4882
--- /dev/null
+++ b/dev-lang/mercury/mercury-20.06.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
+
+PATCHSET_VER="0"
+MY_P=${PN}-srcdist-${PV}
+
+DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
+HOMEPAGE="https://www.mercurylang.org/index.html"
+SRC_URI="https://dl.mercurylang.org/release-20.06/${MY_P}.tar.gz
+	https://dev.gentoo.org/~keri/distfiles/mercury/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug doc emacs erlang examples java mono profile readline threads trail"
+
+DEPEND="net-libs/libnsl:0=
+	readline? ( sys-libs/readline:= )
+	erlang? ( dev-lang/erlang )
+	java? ( >=virtual/jdk-1.6:= )
+	mono? ( dev-lang/mono )
+	doc? ( sys-apps/texinfo )"
+
+RDEPEND="${DEPEND}
+	emacs? ( >=app-editors/emacs-23.1:* )"
+
+S="${WORKDIR}"/${MY_P}
+
+SITEFILE=50${PN}-gentoo.el
+
+src_prepare() {
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		eapply "${WORKDIR}"/${PV}
+	fi
+	eapply_user
+
+	AT_M4DIR=m4 eautoreconf
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	strip-flags
+
+	local myconf
+	myconf="--libdir=/usr/$(get_libdir) \
+		$(use_enable mono csharp-grade) \
+		$(use_enable erlang erlang-grade) \
+		$(use_enable java java-grade) \
+		$(use_enable debug debug-grades) \
+		$(use_enable profile prof-grades) \
+		$(use_enable threads par-grades) \
+		$(use_enable trail trail-grades) \
+		$(use_with readline)"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	# Prepare mmake flags
+	echo "EXTRA_CFLAGS = ${CFLAGS}"  >> Mmake.params
+	echo "EXTRA_LDFLAGS = ${LDFLAGS}" >> Mmake.params
+	echo "EXTRA_LD_LIBFLAGS = ${LDFLAGS}" >> Mmake.params
+	echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params
+
+	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libgc.so" >> boehm_gc/Mmake.boehm_gc.params
+	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_rt.so" >> runtime/Mmake.runtime.params
+	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_std.so" >> library/Mmake.library.params
+
+	# Build Mercury using bootstrap grade
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		TEXI2DVI="" PDFTEX=""
+
+	# We can now patch .m Mercury compiler files since we
+	# have just built mercury_compiler.
+	if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then
+		eapply "${WORKDIR}"/${PV}-mmc
+	fi
+
+	# Rebuild Mercury compiler using the just built mercury_compiler
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX=""
+
+	# The default Mercury grade may not be the same as the bootstrap
+	# grade. Since src_test() is run before src_install() we compile
+	# the default grade now
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX="" \
+		default_grade
+}
+
+src_test() {
+	TEST_GRADE=$(scripts/ml --print-grade)
+	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
+		TWS="${S}"/install_grade_dir.${TEST_GRADE}
+		cp runtime/mer_rt.init "${TWS}"/runtime/
+		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
+		cp browser/mer_browser.init "${TWS}"/browser/
+	else
+		TWS="${S}"
+	fi
+
+	cd "${S}"/tests || die
+	sed -e "s:@WORKSPACE@:${TWS}:" \
+		< WS_FLAGS.ws \
+		> WS_FLAGS \
+		|| die "sed WORKSPACE failed"
+	sed -e "s:@WORKSPACE@:${TWS}:" \
+		< .mgnuc_copts.ws \
+		> .mgnuc_copts \
+		|| die "sed WORKSPACE failed"
+	find . -mindepth 1 -type d -exec cp .mgnuc_opts  {} \;
+	find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \;
+
+	# Mercury tests must be run in C locale since Mercury output is
+	# compared to hard-coded warnings/errors
+	LC_ALL="C" \
+	PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
+	TERM="" \
+	WORKSPACE="${TWS}" \
+	WORKSPACE_FLAGS=yes \
+	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
+	MMAKE_DIR="${TWS}"/scripts \
+	MERCURY_SUPPRESS_STACK_TRACE=yes \
+	GRADE=${TEST_GRADE} \
+		mmake || die "mmake test failed"
+}
+
+src_install() {
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX="" \
+		DESTDIR="${D}" \
+		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
+		install
+
+	if use java; then
+		keepdir /usr/$(get_libdir)/mercury/modules/java
+	fi
+
+	if use mono; then
+		keepdir /usr/$(get_libdir)/mercury/modules/csharp
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+			|| die "elisp-site-file-install failed"
+	fi
+
+	dodoc \
+		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
+		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
+		RELEASE_NOTES VERSION || die
+
+	if use erlang; then
+		dodoc README.Erlang
+	fi
+
+	if use java; then
+		dodoc README.Java
+	fi
+
+	if use mono; then
+		dodoc README.CSharp
+	fi
+
+	if use examples; then
+		docinto /usr/share/doc/${PF}/samples
+		dodoc samples/{*.m,README,Mmakefile}
+		dodoc -r samples/c_interface \
+			samples/diff \
+			samples/muz \
+			samples/rot13 \
+			samples/solutions \
+			samples/solver_types
+
+		if use java; then
+			dodoc -r samples/java_interface
+		fi
+
+		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}

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

[Keri Harris]

commit:     d2e5abe0c94cade4df6e0b50c5fd8a346070a893
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 25 04:21:32 2020 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sat Jul 25 04:21:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2e5abe0

dev-lang/mercury: respect -fno-common. Closes #727156

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

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

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 23652683b6c..03c5549bd26 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,7 +1,7 @@
 DIST mercury-14.01.1-gentoo-patchset-5.tar.gz 5693 BLAKE2B 300de3254bc0d2f59493c0e2243b0d8786fccce714134a11ce510120b7d9f05ebe4835f084ec2db2ddaf2d405cbae65e86d809847079a7d63a6a68021d9d29e8 SHA512 3f9f1e2359f372e4f510b9a00c197978657b28d1308d12cba4d08a982877e2311d7fb6e626dad07d0fa09d24f97334575557cb49003508fdc7b32288c1ae8f2d
 DIST mercury-20.01-gentoo-patchset-0.tar.gz 3862 BLAKE2B 79ef6d30add63a5d419e3dd5b376fd9c1727038102db2bc0e8ccd8b71cdc1c80e721647f34764b0aa4fd6d58b9e38c9675f234714f381f94be572b9b64b478e1 SHA512 2835b4740453bcc358363f9eaa0264706125b5e5f7a38802d5f280ccd777d4c760124ed3a635f17ecc2ae772767e9fa5d61093c40094358a0a96a726a23ff08e
 DIST mercury-20.01.1-gentoo-patchset-0.tar.gz 3943 BLAKE2B 0fd149c622715bf191182bd93e264096327d7869e30aaa10bb19b70bec5563520026e2561cc6607c62801ed00ed6b5907bbae4be997869b9facb2f9d65ec0c7a SHA512 d866b35b6df14645ef60ff25497f9bbf0c2caeae2145bc0aef2adea0e651379c673c1815c717f1a51457d93cc67e9ae3dafe5d9fce1d4734bf1673e4cfcbd367
-DIST mercury-20.01.2-gentoo-patchset-0.tar.gz 3869 BLAKE2B e4bcf2b962836f217e439adb9428e4ca2fb95b3640aba1733c9a2df0321ec1ef1d7e4f8970e28517f48ad4a22207b94b6e654c9f1869725ad23369eb89672917 SHA512 e05f8afa0497cb9b41aaeff0de61828c11a8c51bfb6bbe2ac3d5c1e606aa208c7df6fd1cb7df42614705765d9eeaa853b6de5abfae07b90c2cf47df699021a89
+DIST mercury-20.01.2-gentoo-patchset-1.tar.gz 4562 BLAKE2B f1e9d040cfd5930c4f4d9722fc10e11532272f1fa0ab6bd25cc0d2ed42eb0edfbe6f9bc1d41972775fa720b80601d5fdae1681d56f677861fab15e10cc6d05cb SHA512 4f89b09e1e196a61892811167bc0dc1b3ee868ef336efdf66e417574c18ea53b557bd87d5c5300eee8194a3c4250b47e70f5991fcc25b1c58d956a4b097eaec5
 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/mercury-20.01.2.ebuild b/dev-lang/mercury/mercury-20.01.2.ebuild
index f8f02f5ba6e..b0c5ecffdb0 100644
--- a/dev-lang/mercury/mercury-20.01.2.ebuild
+++ b/dev-lang/mercury/mercury-20.01.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
 
-PATCHSET_VER="0"
+PATCHSET_VER="1"
 MY_P=${PN}-srcdist-${PV}
 
 DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"

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

[Keri Harris]

commit:     fe4e8c82c5af85ea023adcd2d4e60f3bbe12eb6a
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 23 13:41:30 2020 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Thu Jul 23 13:42:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe4e8c82

dev-lang/mercury: respect LDFLAGS

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

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

diff --git a/dev-lang/mercury/mercury-20.01.2.ebuild b/dev-lang/mercury/mercury-20.01.2.ebuild
index dc94963281e..f8f02f5ba6e 100644
--- a/dev-lang/mercury/mercury-20.01.2.ebuild
+++ b/dev-lang/mercury/mercury-20.01.2.ebuild
@@ -63,7 +63,8 @@ src_configure() {
 
 src_compile() {
 	# Prepare mmake flags
-	echo "EXTRA_CFLAGS  = ${CFLAGS}"  >> Mmake.params
+	echo "EXTRA_CFLAGS = ${CFLAGS}"  >> Mmake.params
+	echo "EXTRA_LDFLAGS = ${LDFLAGS}" >> Mmake.params
 	echo "EXTRA_LD_LIBFLAGS = ${LDFLAGS}" >> Mmake.params
 	echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params
 

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

[Keri Harris]

commit:     1d44bd4bc5a4685f6efd4c7487500b29ec900d4a
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 19 20:24:46 2020 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sun Jul 19 20:25:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d44bd4b

dev-lang/mercury: version bump

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

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

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 728f4bebfb4..23652683b6c 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,6 +1,8 @@
 DIST mercury-14.01.1-gentoo-patchset-5.tar.gz 5693 BLAKE2B 300de3254bc0d2f59493c0e2243b0d8786fccce714134a11ce510120b7d9f05ebe4835f084ec2db2ddaf2d405cbae65e86d809847079a7d63a6a68021d9d29e8 SHA512 3f9f1e2359f372e4f510b9a00c197978657b28d1308d12cba4d08a982877e2311d7fb6e626dad07d0fa09d24f97334575557cb49003508fdc7b32288c1ae8f2d
 DIST mercury-20.01-gentoo-patchset-0.tar.gz 3862 BLAKE2B 79ef6d30add63a5d419e3dd5b376fd9c1727038102db2bc0e8ccd8b71cdc1c80e721647f34764b0aa4fd6d58b9e38c9675f234714f381f94be572b9b64b478e1 SHA512 2835b4740453bcc358363f9eaa0264706125b5e5f7a38802d5f280ccd777d4c760124ed3a635f17ecc2ae772767e9fa5d61093c40094358a0a96a726a23ff08e
 DIST mercury-20.01.1-gentoo-patchset-0.tar.gz 3943 BLAKE2B 0fd149c622715bf191182bd93e264096327d7869e30aaa10bb19b70bec5563520026e2561cc6607c62801ed00ed6b5907bbae4be997869b9facb2f9d65ec0c7a SHA512 d866b35b6df14645ef60ff25497f9bbf0c2caeae2145bc0aef2adea0e651379c673c1815c717f1a51457d93cc67e9ae3dafe5d9fce1d4734bf1673e4cfcbd367
+DIST mercury-20.01.2-gentoo-patchset-0.tar.gz 3869 BLAKE2B e4bcf2b962836f217e439adb9428e4ca2fb95b3640aba1733c9a2df0321ec1ef1d7e4f8970e28517f48ad4a22207b94b6e654c9f1869725ad23369eb89672917 SHA512 e05f8afa0497cb9b41aaeff0de61828c11a8c51bfb6bbe2ac3d5c1e606aa208c7df6fd1cb7df42614705765d9eeaa853b6de5abfae07b90c2cf47df699021a89
 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/mercury-20.01.2.ebuild b/dev-lang/mercury/mercury-20.01.2.ebuild
new file mode 100644
index 00000000000..dc94963281e
--- /dev/null
+++ b/dev-lang/mercury/mercury-20.01.2.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
+
+PATCHSET_VER="0"
+MY_P=${PN}-srcdist-${PV}
+
+DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
+HOMEPAGE="https://www.mercurylang.org/index.html"
+SRC_URI="https://dl.mercurylang.org/release-20.01/${MY_P}.tar.gz
+	https://dev.gentoo.org/~keri/distfiles/mercury/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug doc emacs erlang examples java mono profile readline threads trail"
+
+DEPEND="net-libs/libnsl:0=
+	readline? ( sys-libs/readline:= )
+	erlang? ( dev-lang/erlang )
+	java? ( >=virtual/jdk-1.6:= )
+	mono? ( dev-lang/mono )
+	doc? ( sys-apps/texinfo )"
+
+RDEPEND="${DEPEND}
+	emacs? ( >=app-editors/emacs-23.1:* )"
+
+S="${WORKDIR}"/${MY_P}
+
+SITEFILE=50${PN}-gentoo.el
+
+src_prepare() {
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		eapply "${WORKDIR}"/${PV}
+	fi
+	eapply_user
+
+	AT_M4DIR=m4 eautoreconf
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	strip-flags
+
+	local myconf
+	myconf="--libdir=/usr/$(get_libdir) \
+		$(use_enable mono csharp-grade) \
+		$(use_enable erlang erlang-grade) \
+		$(use_enable java java-grade) \
+		$(use_enable debug debug-grades) \
+		$(use_enable profile prof-grades) \
+		$(use_enable threads par-grades) \
+		$(use_enable trail trail-grades) \
+		$(use_with readline)"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	# Prepare mmake flags
+	echo "EXTRA_CFLAGS  = ${CFLAGS}"  >> Mmake.params
+	echo "EXTRA_LD_LIBFLAGS = ${LDFLAGS}" >> Mmake.params
+	echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params
+
+	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libgc.so" >> boehm_gc/Mmake.boehm_gc.params
+	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_rt.so" >> runtime/Mmake.runtime.params
+	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_std.so" >> library/Mmake.library.params
+
+	# Build Mercury using bootstrap grade
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		TEXI2DVI="" PDFTEX=""
+
+	# We can now patch .m Mercury compiler files since we
+	# have just built mercury_compiler.
+	if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then
+		eapply "${WORKDIR}"/${PV}-mmc
+	fi
+
+	# Rebuild Mercury compiler using the just built mercury_compiler
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX=""
+
+	# The default Mercury grade may not be the same as the bootstrap
+	# grade. Since src_test() is run before src_install() we compile
+	# the default grade now
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX="" \
+		default_grade
+}
+
+src_test() {
+	TEST_GRADE=$(scripts/ml --print-grade)
+	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
+		TWS="${S}"/install_grade_dir.${TEST_GRADE}
+		cp runtime/mer_rt.init "${TWS}"/runtime/
+		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
+		cp browser/mer_browser.init "${TWS}"/browser/
+	else
+		TWS="${S}"
+	fi
+
+	cd "${S}"/tests || die
+	sed -e "s:@WORKSPACE@:${TWS}:" \
+		< WS_FLAGS.ws \
+		> WS_FLAGS \
+		|| die "sed WORKSPACE failed"
+	sed -e "s:@WORKSPACE@:${TWS}:" \
+		< .mgnuc_copts.ws \
+		> .mgnuc_copts \
+		|| die "sed WORKSPACE failed"
+	find . -mindepth 1 -type d -exec cp .mgnuc_opts  {} \;
+	find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \;
+
+	# Mercury tests must be run in C locale since Mercury output is
+	# compared to hard-coded warnings/errors
+	LC_ALL="C" \
+	PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
+	TERM="" \
+	WORKSPACE="${TWS}" \
+	WORKSPACE_FLAGS=yes \
+	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
+	MMAKE_DIR="${TWS}"/scripts \
+	MERCURY_SUPPRESS_STACK_TRACE=yes \
+	GRADE=${TEST_GRADE} \
+		mmake || die "mmake test failed"
+}
+
+src_install() {
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX="" \
+		DESTDIR="${D}" \
+		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
+		install
+
+	if use java; then
+		keepdir /usr/$(get_libdir)/mercury/modules/java
+	fi
+
+	if use mono; then
+		keepdir /usr/$(get_libdir)/mercury/modules/csharp
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+			|| die "elisp-site-file-install failed"
+	fi
+
+	dodoc \
+		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
+		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
+		RELEASE_NOTES VERSION || die
+
+	if use erlang; then
+		dodoc README.Erlang
+	fi
+
+	if use java; then
+		dodoc README.Java
+	fi
+
+	if use mono; then
+		dodoc README.CSharp
+	fi
+
+	if use examples; then
+		docinto /usr/share/doc/${PF}/samples
+		dodoc samples/{*.m,README,Mmakefile}
+		dodoc -r samples/c_interface \
+			samples/diff \
+			samples/muz \
+			samples/rot13 \
+			samples/solutions \
+			samples/solver_types
+
+		if use java; then
+			dodoc -r samples/java_interface
+		fi
+
+		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}

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

[Keri Harris]

commit:     32ebe0cfa35562636183e0924720e1dab271e0ad
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  1 10:31:05 2020 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Wed Apr  1 10:31:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32ebe0cf

dev-lang/mercury: version bump

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

 dev-lang/mercury/Manifest               |   2 +
 dev-lang/mercury/mercury-20.01.1.ebuild | 201 ++++++++++++++++++++++++++++++++
 2 files changed, 203 insertions(+)

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 358ce03909a..728f4bebfb4 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,4 +1,6 @@
 DIST mercury-14.01.1-gentoo-patchset-5.tar.gz 5693 BLAKE2B 300de3254bc0d2f59493c0e2243b0d8786fccce714134a11ce510120b7d9f05ebe4835f084ec2db2ddaf2d405cbae65e86d809847079a7d63a6a68021d9d29e8 SHA512 3f9f1e2359f372e4f510b9a00c197978657b28d1308d12cba4d08a982877e2311d7fb6e626dad07d0fa09d24f97334575557cb49003508fdc7b32288c1ae8f2d
 DIST mercury-20.01-gentoo-patchset-0.tar.gz 3862 BLAKE2B 79ef6d30add63a5d419e3dd5b376fd9c1727038102db2bc0e8ccd8b71cdc1c80e721647f34764b0aa4fd6d58b9e38c9675f234714f381f94be572b9b64b478e1 SHA512 2835b4740453bcc358363f9eaa0264706125b5e5f7a38802d5f280ccd777d4c760124ed3a635f17ecc2ae772767e9fa5d61093c40094358a0a96a726a23ff08e
+DIST mercury-20.01.1-gentoo-patchset-0.tar.gz 3943 BLAKE2B 0fd149c622715bf191182bd93e264096327d7869e30aaa10bb19b70bec5563520026e2561cc6607c62801ed00ed6b5907bbae4be997869b9facb2f9d65ec0c7a SHA512 d866b35b6df14645ef60ff25497f9bbf0c2caeae2145bc0aef2adea0e651379c673c1815c717f1a51457d93cc67e9ae3dafe5d9fce1d4734bf1673e4cfcbd367
 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/mercury-20.01.1.ebuild b/dev-lang/mercury/mercury-20.01.1.ebuild
new file mode 100644
index 00000000000..6770d4264de
--- /dev/null
+++ b/dev-lang/mercury/mercury-20.01.1.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
+
+PATCHSET_VER="0"
+MY_P=${PN}-srcdist-${PV}
+
+DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
+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="debug doc emacs erlang examples java mono profile readline threads trail"
+
+DEPEND="net-libs/libnsl:0=
+	readline? ( sys-libs/readline:= )
+	erlang? ( dev-lang/erlang )
+	java? ( >=virtual/jdk-1.6:= )
+	mono? ( dev-lang/mono )
+	doc? ( sys-apps/texinfo )"
+
+RDEPEND="${DEPEND}
+	emacs? ( >=app-editors/emacs-23.1:* )"
+
+S="${WORKDIR}"/${MY_P}
+
+SITEFILE=50${PN}-gentoo.el
+
+src_prepare() {
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		eapply "${WORKDIR}"/${PV}
+	fi
+	eapply_user
+
+	AT_M4DIR=m4 eautoreconf
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	strip-flags
+
+	local myconf
+	myconf="--libdir=/usr/$(get_libdir) \
+		$(use_enable mono csharp-grade) \
+		$(use_enable erlang erlang-grade) \
+		$(use_enable java java-grade) \
+		$(use_enable debug debug-grades) \
+		$(use_enable profile prof-grades) \
+		$(use_enable threads par-grades) \
+		$(use_enable trail trail-grades) \
+		$(use_with readline)"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	# Prepare mmake flags
+	echo "EXTRA_CFLAGS  = ${CFLAGS}"  >> Mmake.params
+	echo "EXTRA_LD_LIBFLAGS = ${LDFLAGS}" >> Mmake.params
+	echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params
+
+	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libgc.so" >> boehm_gc/Mmake.boehm_gc.params
+	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_rt.so" >> runtime/Mmake.runtime.params
+	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_std.so" >> library/Mmake.library.params
+
+	# Build Mercury using bootstrap grade
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		TEXI2DVI="" PDFTEX=""
+
+	# We can now patch .m Mercury compiler files since we
+	# have just built mercury_compiler.
+	if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then
+		eapply "${WORKDIR}"/${PV}-mmc
+	fi
+
+	# Rebuild Mercury compiler using the just built mercury_compiler
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX=""
+
+	# The default Mercury grade may not be the same as the bootstrap
+	# grade. Since src_test() is run before src_install() we compile
+	# the default grade now
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX="" \
+		default_grade
+}
+
+src_test() {
+	TEST_GRADE=$(scripts/ml --print-grade)
+	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
+		TWS="${S}"/install_grade_dir.${TEST_GRADE}
+		cp runtime/mer_rt.init "${TWS}"/runtime/
+		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
+		cp browser/mer_browser.init "${TWS}"/browser/
+	else
+		TWS="${S}"
+	fi
+
+	cd "${S}"/tests || die
+	sed -e "s:@WORKSPACE@:${TWS}:" \
+		< WS_FLAGS.ws \
+		> WS_FLAGS \
+		|| die "sed WORKSPACE failed"
+	sed -e "s:@WORKSPACE@:${TWS}:" \
+		< .mgnuc_copts.ws \
+		> .mgnuc_copts \
+		|| die "sed WORKSPACE failed"
+	find . -mindepth 1 -type d -exec cp .mgnuc_opts  {} \;
+	find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \;
+
+	# Mercury tests must be run in C locale since Mercury output is
+	# compared to hard-coded warnings/errors
+	LC_ALL="C" \
+	PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
+	TERM="" \
+	WORKSPACE="${TWS}" \
+	WORKSPACE_FLAGS=yes \
+	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
+	MMAKE_DIR="${TWS}"/scripts \
+	MERCURY_SUPPRESS_STACK_TRACE=yes \
+	GRADE=${TEST_GRADE} \
+		mmake || die "mmake test failed"
+}
+
+src_install() {
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX="" \
+		DESTDIR="${D}" \
+		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
+		install
+
+	if use java; then
+		keepdir /usr/$(get_libdir)/mercury/modules/java
+	fi
+
+	if use mono; then
+		keepdir /usr/$(get_libdir)/mercury/modules/csharp
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+			|| die "elisp-site-file-install failed"
+	fi
+
+	dodoc \
+		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
+		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
+		RELEASE_NOTES VERSION || die
+
+	if use erlang; then
+		dodoc README.Erlang
+	fi
+
+	if use java; then
+		dodoc README.Java
+	fi
+
+	if use mono; then
+		dodoc README.CSharp
+	fi
+
+	if use examples; then
+		docinto /usr/share/doc/${PF}/samples
+		dodoc samples/{*.m,README,Mmakefile}
+		dodoc -r samples/c_interface \
+			samples/diff \
+			samples/muz \
+			samples/rot13 \
+			samples/solutions \
+			samples/solver_types
+
+		if use java; then
+			dodoc -r samples/java_interface
+		fi
+
+		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}

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

[Keri Harris]

commit:     831b26f71c4f82765396e430cc509bbde688aef0
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 29 10:34:47 2020 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sun Mar 29 10:35:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=831b26f7

dev-lang/mercury: version bump

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

 dev-lang/mercury/Manifest             |   2 +
 dev-lang/mercury/mercury-20.01.ebuild | 206 ++++++++++++++++++++++++++++++++++
 2 files changed, 208 insertions(+)

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index c326f77f384..358ce03909a 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,2 +1,4 @@
 DIST mercury-14.01.1-gentoo-patchset-5.tar.gz 5693 BLAKE2B 300de3254bc0d2f59493c0e2243b0d8786fccce714134a11ce510120b7d9f05ebe4835f084ec2db2ddaf2d405cbae65e86d809847079a7d63a6a68021d9d29e8 SHA512 3f9f1e2359f372e4f510b9a00c197978657b28d1308d12cba4d08a982877e2311d7fb6e626dad07d0fa09d24f97334575557cb49003508fdc7b32288c1ae8f2d
+DIST mercury-20.01-gentoo-patchset-0.tar.gz 3862 BLAKE2B 79ef6d30add63a5d419e3dd5b376fd9c1727038102db2bc0e8ccd8b71cdc1c80e721647f34764b0aa4fd6d58b9e38c9675f234714f381f94be572b9b64b478e1 SHA512 2835b4740453bcc358363f9eaa0264706125b5e5f7a38802d5f280ccd777d4c760124ed3a635f17ecc2ae772767e9fa5d61093c40094358a0a96a726a23ff08e
 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/mercury-20.01.ebuild b/dev-lang/mercury/mercury-20.01.ebuild
new file mode 100644
index 00000000000..4ee03178b5f
--- /dev/null
+++ b/dev-lang/mercury/mercury-20.01.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
+
+PATCHSET_VER="0"
+MY_P=${PN}-srcdist-${PV}
+
+DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
+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="debug doc emacs erlang examples java mono profile readline threads trail"
+
+DEPEND="net-libs/libnsl:0=
+	readline? ( sys-libs/readline:= )
+	erlang? ( dev-lang/erlang )
+	java? ( >=virtual/jdk-1.6:= )
+	mono? ( dev-lang/mono )
+	doc? ( sys-apps/texinfo )"
+
+RDEPEND="${DEPEND}
+	emacs? ( >=app-editors/emacs-23.1:* )"
+
+S="${WORKDIR}"/${MY_P}
+
+SITEFILE=50${PN}-gentoo.el
+
+src_prepare() {
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		eapply "${WORKDIR}"/${PV}
+	fi
+	eapply_user
+
+	AT_M4DIR=m4 eautoreconf
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	strip-flags
+
+	local myconf
+	myconf="--libdir=/usr/$(get_libdir) \
+		$(use_enable mono csharp-grade) \
+		$(use_enable erlang erlang-grade) \
+		$(use_enable java java-grade) \
+		$(use_enable debug debug-grades) \
+		$(use_enable profile prof-grades) \
+		$(use_enable threads par-grades) \
+		$(use_enable trail trail-grades) \
+		$(use_with readline)"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	# Prepare mmake flags
+	echo "EXTRA_CFLAGS  = ${CFLAGS}"  >> Mmake.params
+	echo "EXTRA_LD_LIBFLAGS = ${LDFLAGS}" >> Mmake.params
+	echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params
+
+	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libgc.so" >> boehm_gc/Mmake.boehm_gc.params
+	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_rt.so" >> runtime/Mmake.runtime.params
+	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_std.so" >> library/Mmake.library.params
+
+	# Build Mercury using bootstrap grade
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		TEXI2DVI="" PDFTEX=""
+
+	# We can now patch .m Mercury compiler files since we
+	# have just built mercury_compiler.
+	if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then
+		eapply "${WORKDIR}"/${PV}-mmc
+	fi
+
+	sed -i -e "s/@libdir@/$(get_libdir)/" \
+		"${S}"/compiler/file_util.m \
+		"${S}"/compiler/make.program_target.m \
+		|| die "sed libdir failed"
+
+	# Rebuild Mercury compiler using the just built mercury_compiler
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX=""
+
+	# The default Mercury grade may not be the same as the bootstrap
+	# grade. Since src_test() is run before src_install() we compile
+	# the default grade now
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX="" \
+		default_grade
+}
+
+src_test() {
+	TEST_GRADE=$(scripts/ml --print-grade)
+	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
+		TWS="${S}"/install_grade_dir.${TEST_GRADE}
+		cp runtime/mer_rt.init "${TWS}"/runtime/
+		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
+		cp browser/mer_browser.init "${TWS}"/browser/
+	else
+		TWS="${S}"
+	fi
+
+	cd "${S}"/tests || die
+	sed -e "s:@WORKSPACE@:${TWS}:" \
+		< WS_FLAGS.ws \
+		> WS_FLAGS \
+		|| die "sed WORKSPACE failed"
+	sed -e "s:@WORKSPACE@:${TWS}:" \
+		< .mgnuc_copts.ws \
+		> .mgnuc_copts \
+		|| die "sed WORKSPACE failed"
+	find . -mindepth 1 -type d -exec cp .mgnuc_opts  {} \;
+	find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \;
+
+	# Mercury tests must be run in C locale since Mercury output is
+	# compared to hard-coded warnings/errors
+	LC_ALL="C" \
+	PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
+	TERM="" \
+	WORKSPACE="${TWS}" \
+	WORKSPACE_FLAGS=yes \
+	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
+	MMAKE_DIR="${TWS}"/scripts \
+	MERCURY_SUPPRESS_STACK_TRACE=yes \
+	GRADE=${TEST_GRADE} \
+		mmake || die "mmake test failed"
+}
+
+src_install() {
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX="" \
+		DESTDIR="${D}" \
+		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
+		install
+
+	if use java; then
+		keepdir /usr/$(get_libdir)/mercury/modules/java
+	fi
+
+	if use mono; then
+		keepdir /usr/$(get_libdir)/mercury/modules/csharp
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+			|| die "elisp-site-file-install failed"
+	fi
+
+	dodoc \
+		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
+		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
+		RELEASE_NOTES VERSION || die
+
+	if use erlang; then
+		dodoc README.Erlang
+	fi
+
+	if use java; then
+		dodoc README.Java
+	fi
+
+	if use mono; then
+		dodoc README.CSharp
+	fi
+
+	if use examples; then
+		docinto /usr/share/doc/${PF}/samples
+		dodoc samples/{*.m,README,Mmakefile}
+		dodoc -r samples/c_interface \
+			samples/diff \
+			samples/muz \
+			samples/rot13 \
+			samples/solutions \
+			samples/solver_types
+
+		if use java; then
+			dodoc -r samples/java_interface
+		fi
+
+		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}

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

[Keri Harris]

commit:     ce83ade5c169cbdc0d40841e3e150a0c0671672c
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 22 13:30:11 2020 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sun Mar 22 13:30:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce83ade5

dev-lang/mercury: enable MCC to be patched as part of bootstrap

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

 dev-lang/mercury/mercury-14.01.1-r1.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev-lang/mercury/mercury-14.01.1-r1.ebuild b/dev-lang/mercury/mercury-14.01.1-r1.ebuild
index 1812ea52521..3584581c3ce 100644
--- a/dev-lang/mercury/mercury-14.01.1-r1.ebuild
+++ b/dev-lang/mercury/mercury-14.01.1-r1.ebuild
@@ -107,8 +107,7 @@ src_compile() {
 	emake \
 		PARALLEL="'${MAKEOPTS}'" \
 		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX="" \
-		compiler
+		TEXI2DVI="" PDFTEX=""
 
 	# The default Mercury grade may not be the same as the bootstrap
 	# grade. Since src_test() is run before src_install() we compile

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

[Keri Harris]

commit:     b5beaa03f0b86411a925078e232f825471189336
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 21 12:24:17 2020 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sat Mar 21 12:24:35 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5beaa03

dev-lang/mercury: support Mercury GC compiled using musl

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

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

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 08688f6f072..c326f77f384 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,2 +1,2 @@
-DIST mercury-14.01.1-gentoo-patchset-4.tar.gz 4903 BLAKE2B 3301e220a5d4461c268bf68f1596e2204b4f0931b20c027fcdd35128af20317eb32d646b64fceebd4958e7e4c7efd2fd289e7f57013c1f78f80ee6b97da5d91d SHA512 3fbf75fb88c8fdebefcf847acb7959fe582503922f0cbb6c234f18a56cea8153eaf2325db3b827e8cc802803c9ecf9e755493a895c4a15445dc406ac143d0200
+DIST mercury-14.01.1-gentoo-patchset-5.tar.gz 5693 BLAKE2B 300de3254bc0d2f59493c0e2243b0d8786fccce714134a11ce510120b7d9f05ebe4835f084ec2db2ddaf2d405cbae65e86d809847079a7d63a6a68021d9d29e8 SHA512 3f9f1e2359f372e4f510b9a00c197978657b28d1308d12cba4d08a982877e2311d7fb6e626dad07d0fa09d24f97334575557cb49003508fdc7b32288c1ae8f2d
 DIST mercury-srcdist-14.01.1.tar.gz 52658945 BLAKE2B 6497921a0227b9a6fbcbabdd309ef3325f32dda14fc4ddb443368385b89be4011d677a24b30b3702147d1b782fe2597760ad66dd34503aa6aebaf79707466529 SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c

diff --git a/dev-lang/mercury/mercury-14.01.1-r1.ebuild b/dev-lang/mercury/mercury-14.01.1-r1.ebuild
index 9ba41fae06f..1812ea52521 100644
--- a/dev-lang/mercury/mercury-14.01.1-r1.ebuild
+++ b/dev-lang/mercury/mercury-14.01.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
 
-PATCHSET_VER="4"
+PATCHSET_VER="5"
 MY_P=${PN}-srcdist-${PV}
 
 DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"

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

[David Seifert]

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

dev-lang/mercury: [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/mercury-14.01.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/mercury/mercury-14.01.1-r1.ebuild b/dev-lang/mercury/mercury-14.01.1-r1.ebuild
index 595078fd7f7..9ba41fae06f 100644
--- a/dev-lang/mercury/mercury-14.01.1-r1.ebuild
+++ b/dev-lang/mercury/mercury-14.01.1-r1.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 autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib xdg-utils
+inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
 
 PATCHSET_VER="4"
 MY_P=${PN}-srcdist-${PV}

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

[Sergei Trofimovich]

commit:     936d69cdde5f02975d29795b7356f580f41d6739
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 30 22:47:55 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Dec 30 22:50:22 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=936d69cd

dev-lang/mercury: use ASCII whitespace

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

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

diff --git a/dev-lang/mercury/mercury-14.01.1-r1.ebuild b/dev-lang/mercury/mercury-14.01.1-r1.ebuild
index b8eada115fd..595078fd7f7 100644
--- a/dev-lang/mercury/mercury-14.01.1-r1.ebuild
+++ b/dev-lang/mercury/mercury-14.01.1-r1.ebuild
@@ -47,7 +47,7 @@ src_prepare() {
 		"${S}"/scripts/Mmake.vars.in \
 		|| die "sed libdir failed"
 
-	cd "${S}" || die
+	cd "${S}" || die
 	eautoconf
 
 	xdg_environment_reset

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

[Keri Harris]

commit:     d894d3afc2800e3cc34bd4a4594f52d553b40374
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 28 18:01:53 2018 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sun Oct 28 18:02:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d894d3af

dev-lang/mercury: fix libdir in mmc/mmake scripts

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

 dev-lang/mercury/Manifest                                              | 2 +-
 dev-lang/mercury/{mercury-14.01.1.ebuild => mercury-14.01.1-r1.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 0b2d28d0261..08688f6f072 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,2 +1,2 @@
-DIST mercury-14.01.1-gentoo-patchset-3.tar.gz 4676 BLAKE2B 05a927ff9785fc03a94e56e2abc50f38692dbc81462e107be2b1982ea4a09916066420bef2a95c505c1a475aaa318a1679a3f377a3ac100e57493c987768d10f SHA512 acf3c04dbcf2700e6543d4a0085bad5de8e752c77f1a1f2d456ec57121e956e41cb22438a61ce602c9a355e9ad943ec27ae73c35433599e3252f2b382ee432d5
+DIST mercury-14.01.1-gentoo-patchset-4.tar.gz 4903 BLAKE2B 3301e220a5d4461c268bf68f1596e2204b4f0931b20c027fcdd35128af20317eb32d646b64fceebd4958e7e4c7efd2fd289e7f57013c1f78f80ee6b97da5d91d SHA512 3fbf75fb88c8fdebefcf847acb7959fe582503922f0cbb6c234f18a56cea8153eaf2325db3b827e8cc802803c9ecf9e755493a895c4a15445dc406ac143d0200
 DIST mercury-srcdist-14.01.1.tar.gz 52658945 BLAKE2B 6497921a0227b9a6fbcbabdd309ef3325f32dda14fc4ddb443368385b89be4011d677a24b30b3702147d1b782fe2597760ad66dd34503aa6aebaf79707466529 SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c

diff --git a/dev-lang/mercury/mercury-14.01.1.ebuild b/dev-lang/mercury/mercury-14.01.1-r1.ebuild
similarity index 99%
rename from dev-lang/mercury/mercury-14.01.1.ebuild
rename to dev-lang/mercury/mercury-14.01.1-r1.ebuild
index f09175693e3..21f002551ab 100644
--- a/dev-lang/mercury/mercury-14.01.1.ebuild
+++ b/dev-lang/mercury/mercury-14.01.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib xdg-utils
 
-PATCHSET_VER="3"
+PATCHSET_VER="4"
 MY_P=${PN}-srcdist-${PV}
 
 DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"

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

[Keri Harris]

commit:     7705e75fb7f8e5035566a77e0951cc48a30e3913
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 27 06:59:39 2018 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sat Oct 27 06:59:39 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7705e75f

dev-lang/mercury: 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/Manifest               |   4 -
 dev-lang/mercury/mercury-13.05.2.ebuild | 198 -------------------------------
 dev-lang/mercury/mercury-14.01.ebuild   | 203 --------------------------------
 3 files changed, 405 deletions(-)

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 92b1f14cc0b..0b2d28d0261 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,6 +1,2 @@
-DIST mercury-13.05.2-gentoo-patchset-1.tar.gz 5622 BLAKE2B c22b3c21a53d10e564b703adbcde2d7986aecad378fc7f904642ad1c59e7de8a1a34c302309a03f35927782eaaa36d9b3f639fd654750d36c1af612b97cb35af SHA512 387956a120b2bbb7da1913e89cf33e7bdb8f205fe207701a33d19ccb667d1ae73a342955642120822448621bdba349ab628290d78fdef35c08b9ccbadda4177f
-DIST mercury-14.01-gentoo-patchset-0.tar.gz 5728 BLAKE2B acfc49facf63c3ce4dc50463a5cd38fbfe45bc463b619c1e01d653bfe13172ce9773a3c652c0ad9f1f929ad7806d0e69327249575a2065b77a9ac02de2188469 SHA512 f1e375ac192e478a82863aa7b8e28c1044a490c41bb63f7842b16b12b7cfa9c85938eacad4c3eacf348aafd42dfaa0dea5324b734d0d2a7454e3e9334369658e
 DIST mercury-14.01.1-gentoo-patchset-3.tar.gz 4676 BLAKE2B 05a927ff9785fc03a94e56e2abc50f38692dbc81462e107be2b1982ea4a09916066420bef2a95c505c1a475aaa318a1679a3f377a3ac100e57493c987768d10f SHA512 acf3c04dbcf2700e6543d4a0085bad5de8e752c77f1a1f2d456ec57121e956e41cb22438a61ce602c9a355e9ad943ec27ae73c35433599e3252f2b382ee432d5
-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/mercury-13.05.2.ebuild b/dev-lang/mercury/mercury-13.05.2.ebuild
deleted file mode 100644
index 99339c2a2bc..00000000000
--- a/dev-lang/mercury/mercury-13.05.2.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib xdg-utils
-
-PATCHSET_VER="1"
-MY_P=${PN}-srcdist-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-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="debug emacs erlang examples java minimal readline threads"
-
-DEPEND="!dev-libs/mpatrol
-	!dev-util/mono-debugger
-	readline? ( sys-libs/readline )
-	erlang? ( dev-lang/erlang )
-	java? ( >=virtual/jdk-1.5 )"
-
-RDEPEND="${DEPEND}
-	emacs? ( virtual/emacs )"
-
-S="${WORKDIR}"/${MY_P}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-
-	sed -i -e "s/@libdir@/$(get_libdir)/" \
-		"${S}"/scripts/Mmake.vars.in \
-		|| die "sed libdir failed"
-
-	cd "${S}" || die
-	eautoconf
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	strip-flags
-
-	local myconf
-	myconf="--libdir=/usr/$(get_libdir) \
-		--disable-deep-profiler \
-		--disable-dotnet-grades \
-		--without-hwloc \
-		$(use_enable erlang erlang-grade) \
-		$(use_enable java java-grade) \
-		$(use_enable debug debug-grades) \
-		$(use_enable threads par-grades) \
-		$(use_enable !minimal most-grades) \
-		$(use_with readline)"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Build Mercury using base llds grade
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
-			    EXTRA_LDFLAGS='${LDFLAGS}' \
-			    EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \
-		|| die "emake failed"
-
-	# We can now patch .m Mercury compiler files since we
-	# have just built mercury_compiler.
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}-mmc
-
-	sed -i -e "s/@libdir@/$(get_libdir)/" \
-		"${S}"/compiler/file_util.m \
-		"${S}"/compiler/make.program_target.m \
-		|| die "sed libdir failed"
-
-	# Rebuild Mercury compiler using the just built mercury_compiler
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
-			    EXTRA_LDFLAGS='${LDFLAGS}' \
-			    EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		compiler || die "emake compiler failed"
-
-	# The default Mercury grade may not be the same as the grade used to
-	# compile the llds base grade. Since src_test() is run before
-	# src_install() we compile the default grade now
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
-			    EXTRA_LDFLAGS='${LDFLAGS}' \
-			    EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		default_grade || die "emake default_grade failed"
-}
-
-src_test() {
-	TEST_GRADE=`scripts/ml --print-grade`
-	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
-		TWS="${S}"/install_grade_dir.${TEST_GRADE}
-		cp runtime/mer_rt.init "${TWS}"/runtime/
-		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
-		cp browser/mer_browser.init "${TWS}"/browser/
-	else
-		TWS="${S}"
-	fi
-
-	cd "${S}"/tests || die
-	sed -e "s:@WORKSPACE@:${TWS}:" < WS_FLAGS.ws > WS_FLAGS \
-		|| die "sed WORKSPACE failed"
-
-	# Mercury tests must be run in C locale since Mercury output is
-	# compared to hard-coded warnings/errors
-	LC_ALL="C" \
-	PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
-	TERM="" \
-	WORKSPACE="${TWS}" \
-	WORKSPACE_FLAGS=yes \
-	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
-	MMAKE_DIR="${TWS}"/scripts \
-	MERCURY_SUPPRESS_STACK_TRACE=yes \
-	GRADE=${TEST_GRADE} \
-	MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc/include \
-					-I${TWS}/runtime \
-					-I${TWS}/library" \
-		mmake || die "mmake test failed"
-}
-
-src_install() {
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
-			    EXTRA_LDFLAGS='${LDFLAGS}' \
-			    EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		INSTALL_PREFIX="${D}"/usr \
-		INSTALL_MAN_DIR="${D}"/usr/share/man \
-		INSTALL_INFO_DIR="${D}"/usr/share/info \
-		INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \
-		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
-		install || die "emake install failed"
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-
-	dodoc \
-		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
-		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
-		RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS || die
-
-	if use erlang; then
-		dodoc README.Erlang || die
-	fi
-
-	if use java; then
-		dodoc README.Java || die
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/samples
-		doins samples/{*.m,README,Mmakefile} || die
-		doins -r samples/c_interface \
-			samples/diff \
-			samples/muz \
-			samples/rot13 \
-			samples/solutions \
-			samples/solver_types || die
-
-		if use java; then
-			doins -r samples/java_interface || die
-		fi
-
-		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

diff --git a/dev-lang/mercury/mercury-14.01.ebuild b/dev-lang/mercury/mercury-14.01.ebuild
deleted file mode 100644
index 3ef81523eda..00000000000
--- a/dev-lang/mercury/mercury-14.01.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib xdg-utils
-
-PATCHSET_VER="0"
-MY_P=${PN}-srcdist-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-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="debug emacs erlang examples java minimal readline threads"
-
-DEPEND="!dev-libs/mpatrol
-	!dev-util/mono-debugger
-	net-libs/libnsl:0=
-	readline? ( sys-libs/readline:= )
-	erlang? ( dev-lang/erlang )
-	java? ( >=virtual/jdk-1.6:= )"
-
-RDEPEND="${DEPEND}
-	emacs? ( virtual/emacs )"
-
-S="${WORKDIR}"/${MY_P}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		epatch "${WORKDIR}"/${PV}
-	fi
-
-	sed -i -e "s/@libdir@/$(get_libdir)/" \
-		"${S}"/scripts/Mmake.vars.in \
-		|| die "sed libdir failed"
-
-	cd "${S}" || die
-	eautoconf
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	strip-flags
-
-	local myconf
-	myconf="--libdir=/usr/$(get_libdir) \
-		--disable-deep-profiler \
-		--disable-dotnet-grades \
-		--without-hwloc \
-		$(use_enable erlang erlang-grade) \
-		$(use_enable java java-grade) \
-		$(use_enable debug debug-grades) \
-		$(use_enable threads par-grades) \
-		$(use_enable !minimal most-grades) \
-		$(use_with readline)"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Build Mercury using base llds grade
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
-			    EXTRA_CFLAGS='${CFLAGS}' \
-			    EXTRA_LDFLAGS='${LDFLAGS}'" \
-		|| die "emake failed"
-
-	# We can now patch .m Mercury compiler files since we
-	# have just built mercury_compiler.
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then
-		epatch "${WORKDIR}"/${PV}-mmc
-	fi
-
-	sed -i -e "s/@libdir@/$(get_libdir)/" \
-		"${S}"/compiler/file_util.m \
-		"${S}"/compiler/make.program_target.m \
-		|| die "sed libdir failed"
-
-	# Rebuild Mercury compiler using the just built mercury_compiler
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
-			    EXTRA_CFLAGS='${CFLAGS}' \
-			    EXTRA_LDFLAGS='${LDFLAGS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		compiler || die "emake compiler failed"
-
-	# The default Mercury grade may not be the same as the grade used to
-	# compile the llds base grade. Since src_test() is run before
-	# src_install() we compile the default grade now
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
-			    EXTRA_CFLAGS='${CFLAGS}' \
-			    EXTRA_LDFLAGS='${LDFLAGS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		default_grade || die "emake default_grade failed"
-}
-
-src_test() {
-	TEST_GRADE=`scripts/ml --print-grade`
-	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
-		TWS="${S}"/install_grade_dir.${TEST_GRADE}
-		cp runtime/mer_rt.init "${TWS}"/runtime/
-		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
-		cp browser/mer_browser.init "${TWS}"/browser/
-	else
-		TWS="${S}"
-	fi
-
-	cd "${S}"/tests || die
-	sed -e "s:@WORKSPACE@:${TWS}:" < WS_FLAGS.ws > WS_FLAGS \
-		|| die "sed WORKSPACE failed"
-
-	# Mercury tests must be run in C locale since Mercury output is
-	# compared to hard-coded warnings/errors
-	LC_ALL="C" \
-	PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
-	TERM="" \
-	WORKSPACE="${TWS}" \
-	WORKSPACE_FLAGS=yes \
-	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
-	MMAKE_DIR="${TWS}"/scripts \
-	MERCURY_SUPPRESS_STACK_TRACE=yes \
-	GRADE=${TEST_GRADE} \
-	MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc/include \
-					-I${TWS}/runtime \
-					-I${TWS}/library" \
-		mmake || die "mmake test failed"
-}
-
-src_install() {
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
-			    EXTRA_CFLAGS='${CFLAGS}' \
-			    EXTRA_LDFLAGS='${LDFLAGS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		INSTALL_PREFIX="${D}"/usr \
-		INSTALL_MAN_DIR="${D}"/usr/share/man \
-		INSTALL_INFO_DIR="${D}"/usr/share/info \
-		INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \
-		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
-		install || die "emake install failed"
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-
-	dodoc \
-		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
-		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
-		RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS || die
-
-	if use erlang; then
-		dodoc README.Erlang || die
-	fi
-
-	if use java; then
-		dodoc README.Java || die
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/samples
-		doins samples/{*.m,README,Mmakefile} || die
-		doins -r samples/c_interface \
-			samples/diff \
-			samples/muz \
-			samples/rot13 \
-			samples/solutions \
-			samples/solver_types || die
-
-		if use java; then
-			doins -r samples/java_interface || die
-		fi
-
-		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

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

[Keri Harris]

commit:     c0bf824f276438bbbe039c4b45000a075c56beee
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 23 07:27:00 2018 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Tue Oct 23 07:32:20 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0bf824f

dev-lang/mercury: do not build dvi/pdf documentation. Closes #575140

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

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

diff --git a/dev-lang/mercury/mercury-14.01.1.ebuild b/dev-lang/mercury/mercury-14.01.1.ebuild
index ff23c0e2a73..f09175693e3 100644
--- a/dev-lang/mercury/mercury-14.01.1.ebuild
+++ b/dev-lang/mercury/mercury-14.01.1.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-IUSE="debug emacs erlang examples java mono profile readline threads trail"
+IUSE="debug doc emacs erlang examples java mono profile readline threads trail"
 
 DEPEND="!dev-libs/mpatrol
 	!dev-util/mono-debugger
@@ -25,7 +25,8 @@ DEPEND="!dev-libs/mpatrol
 	readline? ( sys-libs/readline:= )
 	erlang? ( dev-lang/erlang )
 	java? ( >=virtual/jdk-1.6:= )
-	mono? ( dev-lang/mono )"
+	mono? ( dev-lang/mono )
+	doc? ( sys-apps/texinfo )"
 
 RDEPEND="${DEPEND}
 	emacs? ( virtual/emacs )"
@@ -87,6 +88,7 @@ src_compile() {
 	# Build Mercury using bootstrap grade
 	emake \
 		PARALLEL="'${MAKEOPTS}'" \
+		TEXI2DVI="" PDFTEX="" \
 		|| die "emake failed"
 
 	# We can now patch .m Mercury compiler files since we
@@ -106,6 +108,7 @@ src_compile() {
 	emake \
 		PARALLEL="'${MAKEOPTS}'" \
 		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX="" \
 		compiler || die "emake compiler failed"
 
 	# The default Mercury grade may not be the same as the bootstrap
@@ -114,6 +117,7 @@ src_compile() {
 	emake \
 		PARALLEL="'${MAKEOPTS}'" \
 		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX="" \
 		default_grade || die "emake default_grade failed"
 }
 
@@ -158,6 +162,7 @@ src_install() {
 	emake \
 		PARALLEL="'${MAKEOPTS}'" \
 		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX="" \
 		DESTDIR="${D}" \
 		INSTALL_PREFIX="${D}"/usr \
 		INSTALL_MAN_DIR="${D}"/usr/share/man \

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

[Thomas Deutschmann]

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

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

Package-Manager: Portage-2.3.49, Repoman-2.3.10

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

diff --git a/dev-lang/mercury/mercury-14.01.1.ebuild b/dev-lang/mercury/mercury-14.01.1.ebuild
index 858cefaf244..ff23c0e2a73 100644
--- a/dev-lang/mercury/mercury-14.01.1.ebuild
+++ b/dev-lang/mercury/mercury-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="debug emacs erlang examples java mono profile readline threads trail"
 

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

[Keri Harris]

commit:     ca5466aefb2f11bea52231abfa0ea7488a3cc057
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  9 14:27:11 2018 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sun Sep  9 14:27:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca5466ae

dev-lang/mercury: fixes for x86 grades using global registers

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-lang/mercury/mercury-14.01.1.ebuild | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/dev-lang/mercury/mercury-14.01.1.ebuild b/dev-lang/mercury/mercury-14.01.1.ebuild
index 3b22be993c3..858cefaf244 100644
--- a/dev-lang/mercury/mercury-14.01.1.ebuild
+++ b/dev-lang/mercury/mercury-14.01.1.ebuild
@@ -75,6 +75,15 @@ src_compile() {
 	echo "EXTRA_LDFLAGS = ${LDFLAGS}" >> Mmake.params
 	echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params
 
+	if use x86; then
+		echo "CFLAGS-ml_backend.ml_closure_gen = -O0" >> Mmake.params
+		echo "CFLAGS-ml_backend.ml_unify_gen = -O0" >> Mmake.params
+		echo "CFLAGS-ml_backend.rtti_to_mlds = -O0" >> Mmake.params
+		echo "CFLAGS-display_report = -O0" >> Mmake.params
+		echo "CFLAGS-mercury_ho_call = -O0" >> Mmake.params
+		echo "CFLAGS-mercury_trace_vars = -O0" >> Mmake.params
+	fi
+
 	# Build Mercury using bootstrap grade
 	emake \
 		PARALLEL="'${MAKEOPTS}'" \

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

[Keri Harris]

commit:     4eda54c4fa871957f3f3729141ca1695163ff5e7
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 21 06:39:35 2018 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sat Jul 21 06:39:35 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eda54c4

dev-lang/mercury: fix mmc erlang grade determination

Package-Manager: Portage-2.3.40, Repoman-2.3.9

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

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index b3175b0af74..92b1f14cc0b 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,6 +1,6 @@
 DIST mercury-13.05.2-gentoo-patchset-1.tar.gz 5622 BLAKE2B c22b3c21a53d10e564b703adbcde2d7986aecad378fc7f904642ad1c59e7de8a1a34c302309a03f35927782eaaa36d9b3f639fd654750d36c1af612b97cb35af SHA512 387956a120b2bbb7da1913e89cf33e7bdb8f205fe207701a33d19ccb667d1ae73a342955642120822448621bdba349ab628290d78fdef35c08b9ccbadda4177f
 DIST mercury-14.01-gentoo-patchset-0.tar.gz 5728 BLAKE2B acfc49facf63c3ce4dc50463a5cd38fbfe45bc463b619c1e01d653bfe13172ce9773a3c652c0ad9f1f929ad7806d0e69327249575a2065b77a9ac02de2188469 SHA512 f1e375ac192e478a82863aa7b8e28c1044a490c41bb63f7842b16b12b7cfa9c85938eacad4c3eacf348aafd42dfaa0dea5324b734d0d2a7454e3e9334369658e
-DIST mercury-14.01.1-gentoo-patchset-2.tar.gz 4549 BLAKE2B c14b4fe14b490e9df8346980ec92dd7a971b0ad27f04fe2b0fd3cf5f69d8399ab0c84aba2623f7ab6e2de37b8cf392f9176e25c5c6dec6f63defa1b52fc3bc91 SHA512 be4b2da451ecf706a22f2628911dc644977fdc5a814bbe7879b27ea611c6b04ee1f88fdf9bf34aaa9b1d28b29afe79a2f1c5205f3ec252301663c32339a3eaab
+DIST mercury-14.01.1-gentoo-patchset-3.tar.gz 4676 BLAKE2B 05a927ff9785fc03a94e56e2abc50f38692dbc81462e107be2b1982ea4a09916066420bef2a95c505c1a475aaa318a1679a3f377a3ac100e57493c987768d10f SHA512 acf3c04dbcf2700e6543d4a0085bad5de8e752c77f1a1f2d456ec57121e956e41cb22438a61ce602c9a355e9ad943ec27ae73c35433599e3252f2b382ee432d5
 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/mercury-14.01.1.ebuild b/dev-lang/mercury/mercury-14.01.1.ebuild
index e49b1099762..3b22be993c3 100644
--- a/dev-lang/mercury/mercury-14.01.1.ebuild
+++ b/dev-lang/mercury/mercury-14.01.1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib xdg-utils
 
-PATCHSET_VER="2"
+PATCHSET_VER="3"
 MY_P=${PN}-srcdist-${PV}
 
 DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"

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

[Keri Harris]

commit:     6d5d2c9108c97e996c4ca920d58f3d16e697da18
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 19 08:55:26 2018 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Thu Jul 19 08:55:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d5d2c91

dev-lang/mercury: keep java/csharp module directories

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-lang/mercury/mercury-14.01.1.ebuild | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dev-lang/mercury/mercury-14.01.1.ebuild b/dev-lang/mercury/mercury-14.01.1.ebuild
index e45c8ecaeee..e49b1099762 100644
--- a/dev-lang/mercury/mercury-14.01.1.ebuild
+++ b/dev-lang/mercury/mercury-14.01.1.ebuild
@@ -157,6 +157,14 @@ src_install() {
 		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
 		install || die "emake install failed"
 
+	if use java; then
+		keepdir /usr/$(get_libdir)/mercury/modules/java
+	fi
+
+	if use mono; then
+		keepdir /usr/$(get_libdir)/mercury/modules/csharp
+	fi
+
 	if use emacs; then
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
 			|| die "elisp-site-file-install failed"

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

[Keri Harris]

commit:     30afff5b2ad90bbb71a18e69e955a3bca9f9c02b
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 17 11:24:05 2018 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Tue Jul 17 11:24:22 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30afff5b

dev-lang/mercury: do not use csc as mercury C# compiler

Package-Manager: Portage-2.3.40, Repoman-2.3.9

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

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index d8cdd373416..b3175b0af74 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,6 +1,6 @@
 DIST mercury-13.05.2-gentoo-patchset-1.tar.gz 5622 BLAKE2B c22b3c21a53d10e564b703adbcde2d7986aecad378fc7f904642ad1c59e7de8a1a34c302309a03f35927782eaaa36d9b3f639fd654750d36c1af612b97cb35af SHA512 387956a120b2bbb7da1913e89cf33e7bdb8f205fe207701a33d19ccb667d1ae73a342955642120822448621bdba349ab628290d78fdef35c08b9ccbadda4177f
 DIST mercury-14.01-gentoo-patchset-0.tar.gz 5728 BLAKE2B acfc49facf63c3ce4dc50463a5cd38fbfe45bc463b619c1e01d653bfe13172ce9773a3c652c0ad9f1f929ad7806d0e69327249575a2065b77a9ac02de2188469 SHA512 f1e375ac192e478a82863aa7b8e28c1044a490c41bb63f7842b16b12b7cfa9c85938eacad4c3eacf348aafd42dfaa0dea5324b734d0d2a7454e3e9334369658e
-DIST mercury-14.01.1-gentoo-patchset-1.tar.gz 4397 BLAKE2B 2eb2b371c7c7c1a8330c9b5ee8f58c5c353214c4ca8115d355ffa13fac27b41836485ef8706e456897e71619571336cab89cadf2b19e966d4b731e83eb9b90d2 SHA512 6b4908e620d60c1745e311ac95336a008656c16a426b697c68cd417ba7eef8f9664f4c7b46e410fc33cfbc4655b8a2ff6ab48fdd979c6197b585c58a6e0346dd
+DIST mercury-14.01.1-gentoo-patchset-2.tar.gz 4549 BLAKE2B c14b4fe14b490e9df8346980ec92dd7a971b0ad27f04fe2b0fd3cf5f69d8399ab0c84aba2623f7ab6e2de37b8cf392f9176e25c5c6dec6f63defa1b52fc3bc91 SHA512 be4b2da451ecf706a22f2628911dc644977fdc5a814bbe7879b27ea611c6b04ee1f88fdf9bf34aaa9b1d28b29afe79a2f1c5205f3ec252301663c32339a3eaab
 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/mercury-14.01.1.ebuild b/dev-lang/mercury/mercury-14.01.1.ebuild
index 65cb6d098ab..e45c8ecaeee 100644
--- a/dev-lang/mercury/mercury-14.01.1.ebuild
+++ b/dev-lang/mercury/mercury-14.01.1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib xdg-utils
 
-PATCHSET_VER="1"
+PATCHSET_VER="2"
 MY_P=${PN}-srcdist-${PV}
 
 DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"

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

[Keri Harris]

commit:     1e49d9a72ee97e6b4325f81b8fbd541ee4f341e8
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 16 19:45:20 2018 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Mon Jul 16 19:45:43 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e49d9a7

dev-lang/mercury: handle spaces in mercury PARALLEL args

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-lang/mercury/mercury-13.05.2.ebuild | 10 +++++-----
 dev-lang/mercury/mercury-14.01.1.ebuild |  8 ++++----
 dev-lang/mercury/mercury-14.01.ebuild   | 10 +++++-----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/dev-lang/mercury/mercury-13.05.2.ebuild b/dev-lang/mercury/mercury-13.05.2.ebuild
index b0836202a1b..99339c2a2bc 100644
--- a/dev-lang/mercury/mercury-13.05.2.ebuild
+++ b/dev-lang/mercury/mercury-13.05.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
@@ -69,7 +69,7 @@ src_configure() {
 src_compile() {
 	# Build Mercury using base llds grade
 	emake \
-		PARALLEL=${MAKEOPTS} \
+		PARALLEL="'${MAKEOPTS}'" \
 		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
 			    EXTRA_LDFLAGS='${LDFLAGS}' \
 			    EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \
@@ -88,7 +88,7 @@ src_compile() {
 
 	# Rebuild Mercury compiler using the just built mercury_compiler
 	emake \
-		PARALLEL=${MAKEOPTS} \
+		PARALLEL="'${MAKEOPTS}'" \
 		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
 			    EXTRA_LDFLAGS='${LDFLAGS}' \
 			    EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \
@@ -99,7 +99,7 @@ src_compile() {
 	# compile the llds base grade. Since src_test() is run before
 	# src_install() we compile the default grade now
 	emake \
-		PARALLEL=${MAKEOPTS} \
+		PARALLEL="'${MAKEOPTS}'" \
 		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
 			    EXTRA_LDFLAGS='${LDFLAGS}' \
 			    EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \
@@ -141,7 +141,7 @@ src_test() {
 
 src_install() {
 	emake \
-		PARALLEL=${MAKEOPTS} \
+		PARALLEL="'${MAKEOPTS}'" \
 		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
 			    EXTRA_LDFLAGS='${LDFLAGS}' \
 			    EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \

diff --git a/dev-lang/mercury/mercury-14.01.1.ebuild b/dev-lang/mercury/mercury-14.01.1.ebuild
index f192627fc96..65cb6d098ab 100644
--- a/dev-lang/mercury/mercury-14.01.1.ebuild
+++ b/dev-lang/mercury/mercury-14.01.1.ebuild
@@ -77,7 +77,7 @@ src_compile() {
 
 	# Build Mercury using bootstrap grade
 	emake \
-		PARALLEL="${MAKEOPTS}" \
+		PARALLEL="'${MAKEOPTS}'" \
 		|| die "emake failed"
 
 	# We can now patch .m Mercury compiler files since we
@@ -95,7 +95,7 @@ src_compile() {
 
 	# Rebuild Mercury compiler using the just built mercury_compiler
 	emake \
-		PARALLEL="${MAKEOPTS}" \
+		PARALLEL="'${MAKEOPTS}'" \
 		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
 		compiler || die "emake compiler failed"
 
@@ -103,7 +103,7 @@ src_compile() {
 	# grade. Since src_test() is run before src_install() we compile
 	# the default grade now
 	emake \
-		PARALLEL="${MAKEOPTS}" \
+		PARALLEL="'${MAKEOPTS}'" \
 		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
 		default_grade || die "emake default_grade failed"
 }
@@ -147,7 +147,7 @@ src_test() {
 
 src_install() {
 	emake \
-		PARALLEL="${MAKEOPTS}" \
+		PARALLEL="'${MAKEOPTS}'" \
 		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
 		DESTDIR="${D}" \
 		INSTALL_PREFIX="${D}"/usr \

diff --git a/dev-lang/mercury/mercury-14.01.ebuild b/dev-lang/mercury/mercury-14.01.ebuild
index 003906b05de..3ef81523eda 100644
--- a/dev-lang/mercury/mercury-14.01.ebuild
+++ b/dev-lang/mercury/mercury-14.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -72,7 +72,7 @@ src_configure() {
 src_compile() {
 	# Build Mercury using base llds grade
 	emake \
-		PARALLEL=${MAKEOPTS} \
+		PARALLEL="'${MAKEOPTS}'" \
 		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
 			    EXTRA_CFLAGS='${CFLAGS}' \
 			    EXTRA_LDFLAGS='${LDFLAGS}'" \
@@ -93,7 +93,7 @@ src_compile() {
 
 	# Rebuild Mercury compiler using the just built mercury_compiler
 	emake \
-		PARALLEL=${MAKEOPTS} \
+		PARALLEL="'${MAKEOPTS}'" \
 		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
 			    EXTRA_CFLAGS='${CFLAGS}' \
 			    EXTRA_LDFLAGS='${LDFLAGS}'" \
@@ -104,7 +104,7 @@ src_compile() {
 	# compile the llds base grade. Since src_test() is run before
 	# src_install() we compile the default grade now
 	emake \
-		PARALLEL=${MAKEOPTS} \
+		PARALLEL="'${MAKEOPTS}'" \
 		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
 			    EXTRA_CFLAGS='${CFLAGS}' \
 			    EXTRA_LDFLAGS='${LDFLAGS}'" \
@@ -146,7 +146,7 @@ src_test() {
 
 src_install() {
 	emake \
-		PARALLEL=${MAKEOPTS} \
+		PARALLEL="'${MAKEOPTS}'" \
 		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
 			    EXTRA_CFLAGS='${CFLAGS}' \
 			    EXTRA_LDFLAGS='${LDFLAGS}'" \

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

[Andreas Hüttel]

commit:     242daa256decc13d070e5f42ac1481a0bb0719c8
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  3 20:43:26 2017 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Nov  3 20:44:38 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=242daa25

dev-lang/mercury: Links to libnsl, so add dependency

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 dev-lang/mercury/mercury-14.01.1.ebuild | 1 +
 dev-lang/mercury/mercury-14.01.ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev-lang/mercury/mercury-14.01.1.ebuild b/dev-lang/mercury/mercury-14.01.1.ebuild
index 8bc496d6371..ff64b53c886 100644
--- a/dev-lang/mercury/mercury-14.01.1.ebuild
+++ b/dev-lang/mercury/mercury-14.01.1.ebuild
@@ -21,6 +21,7 @@ IUSE="debug emacs erlang examples java mono profile readline threads trail"
 
 DEPEND="!dev-libs/mpatrol
 	!dev-util/mono-debugger
+	net-libs/libnsl:0=
 	readline? ( sys-libs/readline:= )
 	erlang? ( dev-lang/erlang )
 	java? ( >=virtual/jdk-1.6:= )

diff --git a/dev-lang/mercury/mercury-14.01.ebuild b/dev-lang/mercury/mercury-14.01.ebuild
index 9dd9a6bf182..003906b05de 100644
--- a/dev-lang/mercury/mercury-14.01.ebuild
+++ b/dev-lang/mercury/mercury-14.01.ebuild
@@ -21,6 +21,7 @@ IUSE="debug emacs erlang examples java minimal readline threads"
 
 DEPEND="!dev-libs/mpatrol
 	!dev-util/mono-debugger
+	net-libs/libnsl:0=
 	readline? ( sys-libs/readline:= )
 	erlang? ( dev-lang/erlang )
 	java? ( >=virtual/jdk-1.6:= )"

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

[Keri Harris]

commit:     eeeab1a8ebfb0d3ac9c34bdf0eb272d68ef6e672
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  1 16:26:16 2017 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sun Oct  1 16:26:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeeab1a8

dev-lang/mercury: use Mmake.params to specify CFLAGS/LDFLAGS

Package-Manager: Portage-2.3.8, Repoman-2.3.1

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

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 760f43cd5a0..b72dce975f5 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,6 +1,6 @@
 DIST mercury-13.05.2-gentoo-patchset-1.tar.gz 5622 SHA256 5a6559c207c0161beef2eb3bce6f890eadab7dd8fbc5909dc720085498c51777 SHA512 387956a120b2bbb7da1913e89cf33e7bdb8f205fe207701a33d19ccb667d1ae73a342955642120822448621bdba349ab628290d78fdef35c08b9ccbadda4177f WHIRLPOOL 9da5ec0cc6dba6f0ed98c77583213852bc94014c584eae22705c282cbdc137ee30efd83401f8e28c6320a4909c9abbc6d0cf8e79e953c2ce4cfd504156267c82
 DIST mercury-14.01-gentoo-patchset-0.tar.gz 5728 SHA256 43fc8145e784b9e09561fd2b7268cfd37151b134203785b9256b4b7fd87e3d13 SHA512 f1e375ac192e478a82863aa7b8e28c1044a490c41bb63f7842b16b12b7cfa9c85938eacad4c3eacf348aafd42dfaa0dea5324b734d0d2a7454e3e9334369658e WHIRLPOOL eaad62d89285404518e3dca7f98065eea5aaa2f8b46d8ff0f01a0a6b6f886db51800faab81b4e1cd89cd61b771d65562a75f28c399aef053e730d7975ac8f8b6
-DIST mercury-14.01.1-gentoo-patchset-0.tar.gz 4701 SHA256 f85eafed1ba9276986d37aa6fd0e1792037c9a6e42009626791cb1bc8a07c8a9 SHA512 5b9afda5361ce68b3c39e15764bfd066eff032b9e1a67d3a53f438b60c92841f304456c0ae7bfe04a7dec35c1c00a3bdd88afc62392814eea5565c1e1c90b129 WHIRLPOOL ab6c8746d5f4ffc0edac7623c6deecc65629fa09a5b8e02f101f65fa8cd54702a9a450c999bfd90f5a3177864f85648814604adf540e2344ff79711c828d6b61
+DIST mercury-14.01.1-gentoo-patchset-1.tar.gz 4397 SHA256 734ff72c9172f21e9299b553b1d4768515009db66fda183ef2f16e9edb7ff77f SHA512 6b4908e620d60c1745e311ac95336a008656c16a426b697c68cd417ba7eef8f9664f4c7b46e410fc33cfbc4655b8a2ff6ab48fdd979c6197b585c58a6e0346dd WHIRLPOOL 132fd89972c3628fa50862a6d6e134fc8d896f09e6d9241e65157e83ad1ddcdfdcc5d3ba74795e8ba98a771954311d6b0be6512528a3e5fc437e7446bad33447
 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/mercury-14.01.1.ebuild b/dev-lang/mercury/mercury-14.01.1.ebuild
index d500a59e179..8bc496d6371 100644
--- a/dev-lang/mercury/mercury-14.01.1.ebuild
+++ b/dev-lang/mercury/mercury-14.01.1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib xdg-utils
 
-PATCHSET_VER="0"
+PATCHSET_VER="1"
 MY_P=${PN}-srcdist-${PV}
 
 DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
@@ -69,12 +69,14 @@ src_configure() {
 }
 
 src_compile() {
+	# Prepare mmake flags
+	echo "EXTRA_CFLAGS  = ${CFLAGS}"  >> Mmake.params
+	echo "EXTRA_LDFLAGS = ${LDFLAGS}" >> Mmake.params
+	echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params
+
 	# Build Mercury using bootstrap grade
 	emake \
 		PARALLEL="${MAKEOPTS}" \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_MLFLAGS="--no-strip" \
 		|| die "emake failed"
 
 	# We can now patch .m Mercury compiler files since we
@@ -93,9 +95,6 @@ src_compile() {
 	# Rebuild Mercury compiler using the just built mercury_compiler
 	emake \
 		PARALLEL="${MAKEOPTS}" \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_MLFLAGS="--no-strip" \
 		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
 		compiler || die "emake compiler failed"
 
@@ -104,9 +103,6 @@ src_compile() {
 	# the default grade now
 	emake \
 		PARALLEL="${MAKEOPTS}" \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_MLFLAGS="--no-strip" \
 		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
 		default_grade || die "emake default_grade failed"
 }
@@ -123,8 +119,16 @@ src_test() {
 	fi
 
 	cd "${S}"/tests || die
-	sed -e "s:@WORKSPACE@:${TWS}:" < WS_FLAGS.ws > WS_FLAGS \
+	sed -e "s:@WORKSPACE@:${TWS}:" \
+		< WS_FLAGS.ws \
+		> WS_FLAGS \
+		|| die "sed WORKSPACE failed"
+	sed -e "s:@WORKSPACE@:${TWS}:" \
+		< .mgnuc_copts.ws \
+		> .mgnuc_copts \
 		|| die "sed WORKSPACE failed"
+	find . -mindepth 1 -type d -exec cp .mgnuc_opts  {} \;
+	find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \;
 
 	# Mercury tests must be run in C locale since Mercury output is
 	# compared to hard-coded warnings/errors
@@ -137,18 +141,12 @@ src_test() {
 	MMAKE_DIR="${TWS}"/scripts \
 	MERCURY_SUPPRESS_STACK_TRACE=yes \
 	GRADE=${TEST_GRADE} \
-	MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc/include \
-					-I${TWS}/runtime \
-					-I${TWS}/library" \
 		mmake || die "mmake test failed"
 }
 
 src_install() {
 	emake \
 		PARALLEL="${MAKEOPTS}" \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_MLFLAGS="--no-strip" \
 		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
 		DESTDIR="${D}" \
 		INSTALL_PREFIX="${D}"/usr \

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

[Keri Harris]

commit:     c2fba202b9fdcdcf0e40340908fe86feff818edd
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 30 13:03:08 2017 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sat Sep 30 13:03:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2fba202

dev-lang/mercury: do not allow the Mercury compiler to pre-strip binaries while bootstrapping

Package-Manager: Portage-2.3.8, Repoman-2.3.1

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

diff --git a/dev-lang/mercury/mercury-13.05.2.ebuild b/dev-lang/mercury/mercury-13.05.2.ebuild
index 1089fcd1ea0..b0836202a1b 100644
--- a/dev-lang/mercury/mercury-13.05.2.ebuild
+++ b/dev-lang/mercury/mercury-13.05.2.ebuild
@@ -142,7 +142,8 @@ src_test() {
 src_install() {
 	emake \
 		PARALLEL=${MAKEOPTS} \
-		MMAKEFLAGS="EXTRA_LDFLAGS='${LDFLAGS}' \
+		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
+			    EXTRA_LDFLAGS='${LDFLAGS}' \
 			    EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \
 		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
 		INSTALL_PREFIX="${D}"/usr \

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

[Keri Harris]

commit:     940d71899dc80882ebdaeab62fd79e647e851dce
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 30 11:32:16 2017 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sat Sep 30 11:32:16 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=940d7189

dev-lang/mercury: version bump

Package-Manager: Portage-2.3.8, Repoman-2.3.1

 dev-lang/mercury/Manifest               |   2 +
 dev-lang/mercury/mercury-14.01.1.ebuild | 203 ++++++++++++++++++++++++++++++++
 dev-lang/mercury/metadata.xml           |   1 +
 3 files changed, 206 insertions(+)

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 4a3d2f1b85f..760f43cd5a0 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,4 +1,6 @@
 DIST mercury-13.05.2-gentoo-patchset-1.tar.gz 5622 SHA256 5a6559c207c0161beef2eb3bce6f890eadab7dd8fbc5909dc720085498c51777 SHA512 387956a120b2bbb7da1913e89cf33e7bdb8f205fe207701a33d19ccb667d1ae73a342955642120822448621bdba349ab628290d78fdef35c08b9ccbadda4177f WHIRLPOOL 9da5ec0cc6dba6f0ed98c77583213852bc94014c584eae22705c282cbdc137ee30efd83401f8e28c6320a4909c9abbc6d0cf8e79e953c2ce4cfd504156267c82
 DIST mercury-14.01-gentoo-patchset-0.tar.gz 5728 SHA256 43fc8145e784b9e09561fd2b7268cfd37151b134203785b9256b4b7fd87e3d13 SHA512 f1e375ac192e478a82863aa7b8e28c1044a490c41bb63f7842b16b12b7cfa9c85938eacad4c3eacf348aafd42dfaa0dea5324b734d0d2a7454e3e9334369658e WHIRLPOOL eaad62d89285404518e3dca7f98065eea5aaa2f8b46d8ff0f01a0a6b6f886db51800faab81b4e1cd89cd61b771d65562a75f28c399aef053e730d7975ac8f8b6
+DIST mercury-14.01.1-gentoo-patchset-0.tar.gz 4701 SHA256 f85eafed1ba9276986d37aa6fd0e1792037c9a6e42009626791cb1bc8a07c8a9 SHA512 5b9afda5361ce68b3c39e15764bfd066eff032b9e1a67d3a53f438b60c92841f304456c0ae7bfe04a7dec35c1c00a3bdd88afc62392814eea5565c1e1c90b129 WHIRLPOOL ab6c8746d5f4ffc0edac7623c6deecc65629fa09a5b8e02f101f65fa8cd54702a9a450c999bfd90f5a3177864f85648814604adf540e2344ff79711c828d6b61
 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/mercury-14.01.1.ebuild b/dev-lang/mercury/mercury-14.01.1.ebuild
new file mode 100644
index 00000000000..d500a59e179
--- /dev/null
+++ b/dev-lang/mercury/mercury-14.01.1.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib xdg-utils
+
+PATCHSET_VER="0"
+MY_P=${PN}-srcdist-${PV}
+
+DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
+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="debug emacs erlang examples java mono profile readline threads trail"
+
+DEPEND="!dev-libs/mpatrol
+	!dev-util/mono-debugger
+	readline? ( sys-libs/readline:= )
+	erlang? ( dev-lang/erlang )
+	java? ( >=virtual/jdk-1.6:= )
+	mono? ( dev-lang/mono )"
+
+RDEPEND="${DEPEND}
+	emacs? ( virtual/emacs )"
+
+S="${WORKDIR}"/${MY_P}
+
+SITEFILE=50${PN}-gentoo.el
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		epatch "${WORKDIR}"/${PV}
+	fi
+
+	sed -i -e "s/@libdir@/$(get_libdir)/" \
+		"${S}"/scripts/Mmake.vars.in \
+		|| die "sed libdir failed"
+
+	cd "${S}" || die
+	eautoconf
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	strip-flags
+
+	local myconf
+	myconf="--libdir=/usr/$(get_libdir) \
+		$(use_enable mono csharp-grade) \
+		$(use_enable erlang erlang-grade) \
+		$(use_enable java java-grade) \
+		$(use_enable debug debug-grades) \
+		$(use_enable profile prof-grades) \
+		$(use_enable threads par-grades) \
+		$(use_enable trail trail-grades) \
+		$(use_with readline)"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	# Build Mercury using bootstrap grade
+	emake \
+		PARALLEL="${MAKEOPTS}" \
+		EXTRA_CFLAGS="${CFLAGS}" \
+		EXTRA_LDFLAGS="${LDFLAGS}" \
+		EXTRA_MLFLAGS="--no-strip" \
+		|| die "emake failed"
+
+	# We can now patch .m Mercury compiler files since we
+	# have just built mercury_compiler.
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then
+		epatch "${WORKDIR}"/${PV}-mmc
+	fi
+
+	sed -i -e "s/@libdir@/$(get_libdir)/" \
+		"${S}"/compiler/file_util.m \
+		"${S}"/compiler/make.program_target.m \
+		|| die "sed libdir failed"
+
+	# Rebuild Mercury compiler using the just built mercury_compiler
+	emake \
+		PARALLEL="${MAKEOPTS}" \
+		EXTRA_CFLAGS="${CFLAGS}" \
+		EXTRA_LDFLAGS="${LDFLAGS}" \
+		EXTRA_MLFLAGS="--no-strip" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		compiler || die "emake compiler failed"
+
+	# The default Mercury grade may not be the same as the bootstrap
+	# grade. Since src_test() is run before src_install() we compile
+	# the default grade now
+	emake \
+		PARALLEL="${MAKEOPTS}" \
+		EXTRA_CFLAGS="${CFLAGS}" \
+		EXTRA_LDFLAGS="${LDFLAGS}" \
+		EXTRA_MLFLAGS="--no-strip" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		default_grade || die "emake default_grade failed"
+}
+
+src_test() {
+	TEST_GRADE=$(scripts/ml --print-grade)
+	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
+		TWS="${S}"/install_grade_dir.${TEST_GRADE}
+		cp runtime/mer_rt.init "${TWS}"/runtime/
+		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
+		cp browser/mer_browser.init "${TWS}"/browser/
+	else
+		TWS="${S}"
+	fi
+
+	cd "${S}"/tests || die
+	sed -e "s:@WORKSPACE@:${TWS}:" < WS_FLAGS.ws > WS_FLAGS \
+		|| die "sed WORKSPACE failed"
+
+	# Mercury tests must be run in C locale since Mercury output is
+	# compared to hard-coded warnings/errors
+	LC_ALL="C" \
+	PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
+	TERM="" \
+	WORKSPACE="${TWS}" \
+	WORKSPACE_FLAGS=yes \
+	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
+	MMAKE_DIR="${TWS}"/scripts \
+	MERCURY_SUPPRESS_STACK_TRACE=yes \
+	GRADE=${TEST_GRADE} \
+	MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc/include \
+					-I${TWS}/runtime \
+					-I${TWS}/library" \
+		mmake || die "mmake test failed"
+}
+
+src_install() {
+	emake \
+		PARALLEL="${MAKEOPTS}" \
+		EXTRA_CFLAGS="${CFLAGS}" \
+		EXTRA_LDFLAGS="${LDFLAGS}" \
+		EXTRA_MLFLAGS="--no-strip" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		DESTDIR="${D}" \
+		INSTALL_PREFIX="${D}"/usr \
+		INSTALL_MAN_DIR="${D}"/usr/share/man \
+		INSTALL_INFO_DIR="${D}"/usr/share/info \
+		INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \
+		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
+		install || die "emake install failed"
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+			|| die "elisp-site-file-install failed"
+	fi
+
+	dodoc \
+		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
+		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
+		RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS || die
+
+	if use erlang; then
+		dodoc README.Erlang || die
+	fi
+
+	if use java; then
+		dodoc README.Java || die
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/samples
+		doins samples/{*.m,README,Mmakefile} || die
+		doins -r samples/c_interface \
+			samples/diff \
+			samples/muz \
+			samples/rot13 \
+			samples/solutions \
+			samples/solver_types || die
+
+		if use java; then
+			doins -r samples/java_interface || die
+		fi
+
+		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}

diff --git a/dev-lang/mercury/metadata.xml b/dev-lang/mercury/metadata.xml
index 8db223fdceb..9ecd0bc6506 100644
--- a/dev-lang/mercury/metadata.xml
+++ b/dev-lang/mercury/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <use>
     <flag name="erlang">Support Mercury Erlang grade</flag>
+    <flag name="trail">Support Mercury trail grades</flag>
   </use>
 </pkgmetadata>

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

[Keri Harris]

commit:     6c1c7d835bc38a4b1e6039d43b1131acc612ed96
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 26 18:44:53 2017 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 18:45:15 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c1c7d83

dev-lang/mercury: fix failing foreign-decl-line-number unit test due to GCC diagnostic output

Package-Manager: Portage-2.3.8, Repoman-2.3.1

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

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 4ac655aaa95..4a3d2f1b85f 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,4 +1,4 @@
-DIST mercury-13.05.2-gentoo-patchset-0.tar.gz 5155 SHA256 647fb5931a76b86a003063e7f17f929866bb2f2791c98a444a1e9765e70ab4c4 SHA512 8c7305be8c97eebb2107f9ec9debdb572e19b77dbc2e9b5879387322acf06bb0a0a200583d1f01f892640991817c3f17d7c723825c6c1a94d365415cf1d648c6 WHIRLPOOL ce41a9eb302416125816dc09df87b97daeb39253b6ef686ef7ae783366a15e387390b03d63a5ee582a1ddd0244bd109e9da4c6ebbfaa8ad8ee574c87b286a91f
+DIST mercury-13.05.2-gentoo-patchset-1.tar.gz 5622 SHA256 5a6559c207c0161beef2eb3bce6f890eadab7dd8fbc5909dc720085498c51777 SHA512 387956a120b2bbb7da1913e89cf33e7bdb8f205fe207701a33d19ccb667d1ae73a342955642120822448621bdba349ab628290d78fdef35c08b9ccbadda4177f WHIRLPOOL 9da5ec0cc6dba6f0ed98c77583213852bc94014c584eae22705c282cbdc137ee30efd83401f8e28c6320a4909c9abbc6d0cf8e79e953c2ce4cfd504156267c82
 DIST mercury-14.01-gentoo-patchset-0.tar.gz 5728 SHA256 43fc8145e784b9e09561fd2b7268cfd37151b134203785b9256b4b7fd87e3d13 SHA512 f1e375ac192e478a82863aa7b8e28c1044a490c41bb63f7842b16b12b7cfa9c85938eacad4c3eacf348aafd42dfaa0dea5324b734d0d2a7454e3e9334369658e WHIRLPOOL eaad62d89285404518e3dca7f98065eea5aaa2f8b46d8ff0f01a0a6b6f886db51800faab81b4e1cd89cd61b771d65562a75f28c399aef053e730d7975ac8f8b6
 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/mercury-13.05.2.ebuild b/dev-lang/mercury/mercury-13.05.2.ebuild
index 446def6b399..1089fcd1ea0 100644
--- a/dev-lang/mercury/mercury-13.05.2.ebuild
+++ b/dev-lang/mercury/mercury-13.05.2.ebuild
@@ -5,7 +5,7 @@ EAPI=2
 
 inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib xdg-utils
 
-PATCHSET_VER="0"
+PATCHSET_VER="1"
 MY_P=${PN}-srcdist-${PV}
 
 DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"

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

[Keri Harris]

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

dev-lang/mercury: version bump

Package-Manager: Portage-2.3.8, Repoman-2.3.1

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

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 3d88bd89110..4ac655aaa95 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,2 +1,4 @@
 DIST mercury-13.05.2-gentoo-patchset-0.tar.gz 5155 SHA256 647fb5931a76b86a003063e7f17f929866bb2f2791c98a444a1e9765e70ab4c4 SHA512 8c7305be8c97eebb2107f9ec9debdb572e19b77dbc2e9b5879387322acf06bb0a0a200583d1f01f892640991817c3f17d7c723825c6c1a94d365415cf1d648c6 WHIRLPOOL ce41a9eb302416125816dc09df87b97daeb39253b6ef686ef7ae783366a15e387390b03d63a5ee582a1ddd0244bd109e9da4c6ebbfaa8ad8ee574c87b286a91f
+DIST mercury-14.01-gentoo-patchset-0.tar.gz 5728 SHA256 43fc8145e784b9e09561fd2b7268cfd37151b134203785b9256b4b7fd87e3d13 SHA512 f1e375ac192e478a82863aa7b8e28c1044a490c41bb63f7842b16b12b7cfa9c85938eacad4c3eacf348aafd42dfaa0dea5324b734d0d2a7454e3e9334369658e WHIRLPOOL eaad62d89285404518e3dca7f98065eea5aaa2f8b46d8ff0f01a0a6b6f886db51800faab81b4e1cd89cd61b771d65562a75f28c399aef053e730d7975ac8f8b6
 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/mercury-14.01.ebuild b/dev-lang/mercury/mercury-14.01.ebuild
new file mode 100644
index 00000000000..9dd9a6bf182
--- /dev/null
+++ b/dev-lang/mercury/mercury-14.01.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib xdg-utils
+
+PATCHSET_VER="0"
+MY_P=${PN}-srcdist-${PV}
+
+DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
+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="debug emacs erlang examples java minimal readline threads"
+
+DEPEND="!dev-libs/mpatrol
+	!dev-util/mono-debugger
+	readline? ( sys-libs/readline:= )
+	erlang? ( dev-lang/erlang )
+	java? ( >=virtual/jdk-1.6:= )"
+
+RDEPEND="${DEPEND}
+	emacs? ( virtual/emacs )"
+
+S="${WORKDIR}"/${MY_P}
+
+SITEFILE=50${PN}-gentoo.el
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		epatch "${WORKDIR}"/${PV}
+	fi
+
+	sed -i -e "s/@libdir@/$(get_libdir)/" \
+		"${S}"/scripts/Mmake.vars.in \
+		|| die "sed libdir failed"
+
+	cd "${S}" || die
+	eautoconf
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	strip-flags
+
+	local myconf
+	myconf="--libdir=/usr/$(get_libdir) \
+		--disable-deep-profiler \
+		--disable-dotnet-grades \
+		--without-hwloc \
+		$(use_enable erlang erlang-grade) \
+		$(use_enable java java-grade) \
+		$(use_enable debug debug-grades) \
+		$(use_enable threads par-grades) \
+		$(use_enable !minimal most-grades) \
+		$(use_with readline)"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	# Build Mercury using base llds grade
+	emake \
+		PARALLEL=${MAKEOPTS} \
+		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
+			    EXTRA_CFLAGS='${CFLAGS}' \
+			    EXTRA_LDFLAGS='${LDFLAGS}'" \
+		|| die "emake failed"
+
+	# We can now patch .m Mercury compiler files since we
+	# have just built mercury_compiler.
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then
+		epatch "${WORKDIR}"/${PV}-mmc
+	fi
+
+	sed -i -e "s/@libdir@/$(get_libdir)/" \
+		"${S}"/compiler/file_util.m \
+		"${S}"/compiler/make.program_target.m \
+		|| die "sed libdir failed"
+
+	# Rebuild Mercury compiler using the just built mercury_compiler
+	emake \
+		PARALLEL=${MAKEOPTS} \
+		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
+			    EXTRA_CFLAGS='${CFLAGS}' \
+			    EXTRA_LDFLAGS='${LDFLAGS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		compiler || die "emake compiler failed"
+
+	# The default Mercury grade may not be the same as the grade used to
+	# compile the llds base grade. Since src_test() is run before
+	# src_install() we compile the default grade now
+	emake \
+		PARALLEL=${MAKEOPTS} \
+		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
+			    EXTRA_CFLAGS='${CFLAGS}' \
+			    EXTRA_LDFLAGS='${LDFLAGS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		default_grade || die "emake default_grade failed"
+}
+
+src_test() {
+	TEST_GRADE=`scripts/ml --print-grade`
+	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
+		TWS="${S}"/install_grade_dir.${TEST_GRADE}
+		cp runtime/mer_rt.init "${TWS}"/runtime/
+		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
+		cp browser/mer_browser.init "${TWS}"/browser/
+	else
+		TWS="${S}"
+	fi
+
+	cd "${S}"/tests || die
+	sed -e "s:@WORKSPACE@:${TWS}:" < WS_FLAGS.ws > WS_FLAGS \
+		|| die "sed WORKSPACE failed"
+
+	# Mercury tests must be run in C locale since Mercury output is
+	# compared to hard-coded warnings/errors
+	LC_ALL="C" \
+	PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
+	TERM="" \
+	WORKSPACE="${TWS}" \
+	WORKSPACE_FLAGS=yes \
+	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
+	MMAKE_DIR="${TWS}"/scripts \
+	MERCURY_SUPPRESS_STACK_TRACE=yes \
+	GRADE=${TEST_GRADE} \
+	MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc/include \
+					-I${TWS}/runtime \
+					-I${TWS}/library" \
+		mmake || die "mmake test failed"
+}
+
+src_install() {
+	emake \
+		PARALLEL=${MAKEOPTS} \
+		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
+			    EXTRA_CFLAGS='${CFLAGS}' \
+			    EXTRA_LDFLAGS='${LDFLAGS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		INSTALL_PREFIX="${D}"/usr \
+		INSTALL_MAN_DIR="${D}"/usr/share/man \
+		INSTALL_INFO_DIR="${D}"/usr/share/info \
+		INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \
+		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
+		install || die "emake install failed"
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+			|| die "elisp-site-file-install failed"
+	fi
+
+	dodoc \
+		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
+		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
+		RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS || die
+
+	if use erlang; then
+		dodoc README.Erlang || die
+	fi
+
+	if use java; then
+		dodoc README.Java || die
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/samples
+		doins samples/{*.m,README,Mmakefile} || die
+		doins -r samples/c_interface \
+			samples/diff \
+			samples/muz \
+			samples/rot13 \
+			samples/solutions \
+			samples/solver_types || die
+
+		if use java; then
+			doins -r samples/java_interface || die
+		fi
+
+		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}

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

[Keri Harris]

commit:     169d25bcff633b4249035c9f2d112fb502313a6d
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 25 10:07:38 2017 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Mon Sep 25 10:07:38 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=169d25bc

dev-lang/mercury: remove old versions

Package-Manager: Portage-2.3.8, Repoman-2.3.1

 dev-lang/mercury/Manifest               |  16 ---
 dev-lang/mercury/mercury-11.01.ebuild   | 214 --------------------------------
 dev-lang/mercury/mercury-11.07.1.ebuild | 214 --------------------------------
 dev-lang/mercury/mercury-11.07.2.ebuild | 214 --------------------------------
 dev-lang/mercury/mercury-11.07.ebuild   | 214 --------------------------------
 dev-lang/mercury/mercury-13.05.1.ebuild | 195 -----------------------------
 dev-lang/mercury/mercury-13.05.ebuild   | 194 -----------------------------
 7 files changed, 1261 deletions(-)

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index ee92806a622..3d88bd89110 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,18 +1,2 @@
-DIST mercury-11.01-gentoo-patchset-1.tar.gz 7129 SHA256 43dbcb63add22b24da7515b7d42d8b4ad119d9923f80dbb29767d756436d0fa4 SHA512 0c6ca4d2705735ea2c60848223cccb68371dfb36ab1bfc124587b21231320e18b1fe287853a392604c2807caa126c422c34d8c6867539adc3f4411ff10a8c6f6 WHIRLPOOL b5c6668ac8b974caebc3a733565e6d3b23ba7b2a8fbe3ef5c0bf3376c14bbe1c7aa24cc11616dcb9e1ff9ab44659485c8156bcb6952ecb807a1ec855aa9ac32b
-DIST mercury-11.07-gentoo-patchset-0.tar.gz 6889 SHA256 2fce2c95b6cb8b5819fb576de8ce184293a926c52f120027e3195d14f0552d78 SHA512 adb182f4d020052db715e5beb2da6fa86470414735430393253c14240782f6a94e86d50b181cc8c7a9bf09fad62091ea5d53903bc8ddf09df7a85a5f0de3f631 WHIRLPOOL 908846defe2681086ee5cc93ccc86456696826abc9b2b8cdf80896616df053f8f812fcb45fd7fffb4f0062dc478c1b183b87f3d1276581e3a89feb5b6ef2cb0d
-DIST mercury-11.07.1-gentoo-patchset-4.tar.gz 7336 SHA256 477cde26b06650b96accdc32da4bb7edb382b8ad8a2ed3908a985d895070ad4a SHA512 1ae54d05cac374ac02f7368b19ba98567d7c513d471fc98e27f0d794137ff920d42acf7105e6652e6610b4ffec74c3f5b282e81668735a626f8d762d8192d1c4 WHIRLPOOL 529f6e4675b0437dffa83f6cdc5daf4d8c7e9a59e81dc0f6c54cc35be7255fca0ddb6afca4257bc960ded245b50b80cbeaf80c9d2b589fc92564845884f218c5
-DIST mercury-11.07.2-gentoo-patchset-0.tar.gz 7265 SHA256 d400e40ae62c5cb8e777c2409d70eee7f71f231733a95fd6549f82c6c2933500 SHA512 110e0aacd1ef274d9c7154b359267ec0277e680fe2bb9ec4942dfc167c4f02dfef85fbd205120875e485f1b186432157814891ea9f1d0d55f0cdf236b0a80257 WHIRLPOOL 9002362cc04943558399dc4350a9368d12ce6d9717afe42e7c150ad55c8b2fe326697bdea6e457c1b3611d448ecdf7b171219e23a123aec2d0e70f14ab443afa
-DIST mercury-13.05-gentoo-patchset-0.tar.gz 5947 SHA256 8af2076b571215e403079fab840bf4a769ff67ec1ebfdf7b92bf203a503acb99 SHA512 0662126b9802fe9cd6156b204dc28b4e02a7d55fc5f88e97717c7aeb764014ed537822c5a2d2a5520a6b78c092d2fe25b603f05e1e6d19821b7b2905aad53d0c WHIRLPOOL 56a10ac2503fe87099f29294d44a58902192c18a95d438908fbb31969050289ecd8461fc3188368309d1693bd89e1380c140e58d165d02bf5d8f10e4ccbf30e5
-DIST mercury-13.05.1-gentoo-patchset-0.tar.gz 6013 SHA256 d9cfe7017f234d361f51e0dad1a0f6cdcbf82bf841c312660ffd76d6cdada71a SHA512 8f0a8cd4bf814c8d6903843b4e264da4708cf352439116766a63d5d68ef1043543d53b5729f38e5fef0272c006913b3e6c839c37f1e3486fc6f8d382b280aaee WHIRLPOOL a89cf3170498af1f3ffbd5d56db216932f9c96109b4f2c1c267b51e3f81f1f9e0fe7e755a8d86e8a0cc7eb6c4487918ea2ae9738377a7dd4d369f328b3f7d208
 DIST mercury-13.05.2-gentoo-patchset-0.tar.gz 5155 SHA256 647fb5931a76b86a003063e7f17f929866bb2f2791c98a444a1e9765e70ab4c4 SHA512 8c7305be8c97eebb2107f9ec9debdb572e19b77dbc2e9b5879387322acf06bb0a0a200583d1f01f892640991817c3f17d7c723825c6c1a94d365415cf1d648c6 WHIRLPOOL ce41a9eb302416125816dc09df87b97daeb39253b6ef686ef7ae783366a15e387390b03d63a5ee582a1ddd0244bd109e9da4c6ebbfaa8ad8ee574c87b286a91f
-DIST mercury-compiler-11.01.tar.gz 25122699 SHA256 2d12dc9bfaed46b1b30689b0592177bc871b21cf8852c8326c86371258bb18b0 SHA512 628eb95cc647a3334ed6cc9cdb19256dece544cac34600db2a495815215b494db74b1f196e3c48ba1cbb37b51404158d5a583caa20fd3e53488111927615b666 WHIRLPOOL 6720586514dfa954e8e777986d7b62fd2fb10ce1a309034bdc4e40431762c834cba98e93b129e69ba5a78451cd0f776fe916bce2b15996d1621cab59215481a6
-DIST mercury-compiler-11.07.1.tar.gz 25308185 SHA256 f3f1d4f0fb34567a69aaa9fb6f4ecff52b97a66ab6c8a868c4e284eb61d3dc11 SHA512 c102a1f2c2ed4384919685e3e11ba3b7da0152f6fe8899c2124e9bbb056ab81a5e2fc1dbb07934ca011ed96e7c6af168308c64eb4901db7d247fffd2ff226c4f WHIRLPOOL 6df5a68a9c0adc6d5ae490bd909951d8330db2c4e0bb704ab9be0fe8cdf7177093cd0943256fcbea8d666793d3d53c20b8c703deca43121114d89f1a508f32d5
-DIST mercury-compiler-11.07.2.tar.gz 25311504 SHA256 8afee5732d6d52343fbba8d6b9dd3f87b819673743a408a564eede17956ea659 SHA512 144f496cdfbdb88e15a18b3c295d326ebb1054055c42cb1a5fd634b79797c8dbd46ef5d1731f4c4cb1add02795e9b7d1d72e0426c39e672e208f10068e65df8b WHIRLPOOL a443bad02d714737aa2e1875205915db78bc776cf75f01f98e99efab992a5a542c86772615e9a4066b1143977e354441f07a033ef81a2d8f464226004f5de198
-DIST mercury-compiler-11.07.tar.gz 25298643 SHA256 77940d03834a3967e4505c4a92253c19aaea0fed4650ee94e772078abd6be6a2 SHA512 671bebb67ceca8af0844c2ba0d9db538564d3b324a913141be29c7632adb7a343b93fe771533173d5460ac34d5a69fd18b3ef7f55b26c0d0ee70b7cc2e35f10d WHIRLPOOL 992f5f52292066b775b264401f25b5e8ef246ced9b79c0ec06701f715e22e068ad81a17dea49f62bd72bc9cc0539b2ef7beb9be1401391209e2ab1e3876d0bfc
-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
-DIST mercury-tests-11.01.tar.gz 1351134 SHA256 862b70a589eb2d36c9fd82dbd2e0490dc4556f6edff604a54dfd6fc0ad6cccad SHA512 7cd0c2a5f3ef2b05ea32ea8867f788c583a9da96b6e3b4ed9c2ec5705fc7384c0811da782ed50b6d7f60963680036e116684b5bcc3f5f72cf6f0b319480ad997 WHIRLPOOL 298a898b970da20f64530cf736b5f901cc61ef028117f2434135b9efc77223e120a71e97373d494cdb89b422ef9bbf02ef51db4be3c383ffd6facaabb2018c6a
-DIST mercury-tests-11.07.1.tar.gz 1648437 SHA256 01558a6ddd28d2f832d88da8bbf38fec542d091fc53b5adf92fac5e2564c2057 SHA512 1b8f3749091e6a3cd8d3f07ca7ff87c20d9c90761c6dbf35253f68f4cb4ccb42310d66ebc98742508a4e1f6fb4d6497e7e34f10b2601ffec73694702f1b363b5 WHIRLPOOL 66cd530de280d34a037cc191818abb6f11bf4ea8f6f3143629883ff2d885350bdd8841215b6076d5b6ea2102d6ef913a9324d997fd287af12eed0cbe708692b2
-DIST mercury-tests-11.07.2.tar.gz 1573648 SHA256 039b5ecf25412b7f867b4b41aa1e27fa8e381533b5641fe5520cca8ba782d78c SHA512 247fd2521257d1eed8d5a00efdaf85c1b30d5ec430ed09b605bb7596295775ed1b62c1274caca6fba66b28b51c92380f42f003bffab4054bfd755fbaa2c16888 WHIRLPOOL 5213e51dc95a35345e5005c03741bf90f35106f4974f7e25e9277e945a3b88411a561769cc6be80f84e9ac0b7cf7b5c8f32b17d9c22785991995fbe3fdf53002
-DIST mercury-tests-11.07.tar.gz 1647435 SHA256 9206c7ffaace2357367bb6f8c3efe9aeb05ccac6a02946f6579c6001f953501b SHA512 889c6dc4810fbe9cb55b32b0676b7f15ce0b92d1fd8b605e9576e6d69bcb7f02fefc40a504a47b49b3c3afd6abe57b405c81aac21a9ac7adb594dfcb4f740c85 WHIRLPOOL 096a54bb3d28a177ae7b31b4fbb9ff4b77abb434e8fcd9174aec486d8a0d2bceff4f5d4e81d0b8d4fbeed7fd9dbce1400ec48dcd677b6bf1ed561f0c41ce4cae

diff --git a/dev-lang/mercury/mercury-11.01.ebuild b/dev-lang/mercury/mercury-11.01.ebuild
deleted file mode 100644
index a29432db80a..00000000000
--- a/dev-lang/mercury/mercury-11.01.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="1"
-MY_P=${PN}-compiler-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
-SRC_URI="http://www.mercury.csse.unimelb.edu.au/download/files/${MY_P}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz
-	test? ( http://www.mercury.csse.unimelb.edu.au/download/files/mercury-tests-${PV}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="debug emacs erlang examples java minimal readline test threads"
-
-DEPEND="!dev-libs/mpatrol
-	!dev-util/mono-debugger
-	readline? ( sys-libs/readline )
-	erlang? ( dev-lang/erlang )
-	java? ( >=virtual/jdk-1.5 )"
-
-RDEPEND="${DEPEND}
-	emacs? ( virtual/emacs )"
-
-S="${WORKDIR}"/${MY_P}
-TESTDIR="${WORKDIR}"/${PN}-tests-${PV}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-
-	sed -i -e "s/@libdir@/$(get_libdir)/" \
-		"${S}"/scripts/Mmake.vars.in \
-		|| die "sed libdir failed"
-
-	if use test; then
-		epatch "${WORKDIR}"/${PV}-tests
-	fi
-
-	cd "${S}" || die
-	eautoconf
-}
-
-src_configure() {
-	strip-flags
-
-	local myconf
-	myconf="--libdir=/usr/$(get_libdir) \
-		--disable-gcc-back-end \
-		--disable-deep-profiler \
-		--disable-dotnet-grades \
-		$(use_enable erlang erlang-grade) \
-		$(use_enable java java-grade) \
-		$(use_enable debug debug-grades) \
-		$(use_enable threads par-grades) \
-		$(use_enable !minimal most-grades) \
-		$(use_with readline)"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Generate Mercury .m dependencies. This step will vacuously
-	# succeed if we do not have a bootstrappable instance of mmc
-	# already installed. This step is required as mmc does not wait
-	# for all dependencies to be generated before compiling .m files.
-	emake \
-		PARALLEL=${MAKEOPTS} \
-		bootstrap_depend || die "emake depend failed"
-
-	# Build Mercury using base llds grade
-	emake \
-		PARALLEL=${MAKEOPTS} \
-		EXTRA_MLFLAGS=--no-strip \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		|| die "emake failed"
-
-	# We can now patch .m Mercury compiler files since we
-	# have just built mercury_compiler.
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}-mmc
-
-	sed -i -e "s/@libdir@/$(get_libdir)/" \
-		"${S}"/compiler/file_util.m \
-		"${S}"/compiler/make.program_target.m \
-		|| die "sed libdir failed"
-
-	# Rebuild Mercury compiler using the just built mercury_compiler
-	emake \
-		PARALLEL=${MAKEOPTS} \
-		EXTRA_MLFLAGS=--no-strip \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		compiler || die "emake compiler failed"
-
-	# The default Mercury grade may not be the same as the grade used to
-	# compile the llds base grade. Since src_test() is run before
-	# src_install() we compile the default grade now
-	emake \
-		PARALLEL=${MAKEOPTS} \
-		EXTRA_MLFLAGS=--no-strip \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		default_grade || die "emake default_grade failed"
-}
-
-src_test() {
-	TEST_GRADE=`scripts/ml --print-grade`
-	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
-		TWS="${S}"/install_grade_dir.${TEST_GRADE}
-		cp browser/mer_browser.init "${TWS}"/browser/
-		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
-		cp runtime/mer_rt.init "${TWS}"/runtime/
-		cp ssdb/mer_ssdb.init "${TWS}"/ssdb/
-	else
-		TWS="${S}"
-	fi
-
-	cd "${TESTDIR}" || die
-	sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws \
-		|| die "sed WORKSPACE failed"
-
-	# Mercury tests must be run in C locale since Mercury output is
-	# compared to hard-coded warnings/errors
-	LC_ALL="C" \
-	PATH="${TWS}"/scripts:"${TWS}"/util:"${TWS}"/slice:"${PATH}" \
-	TERM="" \
-	WORKSPACE="${TWS}" \
-	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
-	MERCURY_CONFIG_DIR="${TWS}" \
-	MMAKE_DIR="${TWS}"/scripts \
-	MERCURY_SUPPRESS_STACK_TRACE=yes \
-	GRADE=${TEST_GRADE} \
-	MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc \
-					-I${TWS}/boehm_gc/include \
-					-I${TWS}/runtime \
-					-I${TWS}/library \
-					-I${TWS}/mdbcomp \
-					-I${TWS}/browser \
-					-I${TWS}/trace" \
-		mmake || die "mmake test failed"
-}
-
-src_install() {
-	emake \
-		PARALLEL=${MAKEOPTS} \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		INSTALL_PREFIX="${D}"/usr \
-		INSTALL_MAN_DIR="${D}"/usr/share/man \
-		INSTALL_INFO_DIR="${D}"/usr/share/info \
-		INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \
-		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
-		install || die "make install failed"
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-
-	dodoc \
-		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
-		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
-		RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS || die
-
-	if use erlang; then
-		dodoc README.Erlang || die
-	fi
-
-	if use java; then
-		dodoc README.Java || die
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/samples
-		doins samples/{*.m,README,Mmakefile} || die
-		doins -r samples/c_interface \
-			samples/diff \
-			samples/muz \
-			samples/rot13 \
-			samples/solutions \
-			samples/solver_types || die
-
-		if use java; then
-			doins -r samples/java_interface || die
-		fi
-
-		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

diff --git a/dev-lang/mercury/mercury-11.07.1.ebuild b/dev-lang/mercury/mercury-11.07.1.ebuild
deleted file mode 100644
index 4a496687680..00000000000
--- a/dev-lang/mercury/mercury-11.07.1.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="4"
-MY_P=${PN}-compiler-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
-SRC_URI="http://www.mercury.csse.unimelb.edu.au/download/files/${MY_P}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz
-	test? ( http://www.mercury.csse.unimelb.edu.au/download/files/mercury-tests-${PV}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug emacs erlang examples java minimal readline test threads"
-
-DEPEND="!dev-libs/mpatrol
-	!dev-util/mono-debugger
-	readline? ( sys-libs/readline )
-	erlang? ( dev-lang/erlang )
-	java? ( >=virtual/jdk-1.5 )"
-
-RDEPEND="${DEPEND}
-	emacs? ( virtual/emacs )"
-
-S="${WORKDIR}"/${MY_P}
-TESTDIR="${WORKDIR}"/${PN}-tests-${PV}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-
-	sed -i -e "s/@libdir@/$(get_libdir)/" \
-		"${S}"/scripts/Mmake.vars.in \
-		|| die "sed libdir failed"
-
-	if use test; then
-		epatch "${WORKDIR}"/${PV}-tests
-	fi
-
-	cd "${S}" || die
-	eautoconf
-}
-
-src_configure() {
-	strip-flags
-
-	local myconf
-	myconf="--libdir=/usr/$(get_libdir) \
-		--disable-gcc-back-end \
-		--disable-deep-profiler \
-		--disable-dotnet-grades \
-		$(use_enable erlang erlang-grade) \
-		$(use_enable java java-grade) \
-		$(use_enable debug debug-grades) \
-		$(use_enable threads par-grades) \
-		$(use_enable !minimal most-grades) \
-		$(use_with readline)"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Generate Mercury .m dependencies. This step will vacuously
-	# succeed if we do not have a bootstrappable instance of mmc
-	# already installed. This step is required as mmc does not wait
-	# for all dependencies to be generated before compiling .m files.
-	emake \
-		PARALLEL=${MAKEOPTS} \
-		bootstrap_depend || die "emake depend failed"
-
-	# Build Mercury using base llds grade
-	emake \
-		PARALLEL=${MAKEOPTS} \
-		EXTRA_MLFLAGS=--no-strip \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		|| die "emake failed"
-
-	# We can now patch .m Mercury compiler files since we
-	# have just built mercury_compiler.
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}-mmc
-
-	sed -i -e "s/@libdir@/$(get_libdir)/" \
-		"${S}"/compiler/file_util.m \
-		"${S}"/compiler/make.program_target.m \
-		|| die "sed libdir failed"
-
-	# Rebuild Mercury compiler using the just built mercury_compiler
-	emake \
-		PARALLEL=${MAKEOPTS} \
-		EXTRA_MLFLAGS=--no-strip \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		compiler || die "emake compiler failed"
-
-	# The default Mercury grade may not be the same as the grade used to
-	# compile the llds base grade. Since src_test() is run before
-	# src_install() we compile the default grade now
-	emake \
-		PARALLEL=${MAKEOPTS} \
-		EXTRA_MLFLAGS=--no-strip \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		default_grade || die "emake default_grade failed"
-}
-
-src_test() {
-	TEST_GRADE=`scripts/ml --print-grade`
-	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
-		TWS="${S}"/install_grade_dir.${TEST_GRADE}
-		cp browser/mer_browser.init "${TWS}"/browser/
-		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
-		cp runtime/mer_rt.init "${TWS}"/runtime/
-		cp ssdb/mer_ssdb.init "${TWS}"/ssdb/
-	else
-		TWS="${S}"
-	fi
-
-	cd "${TESTDIR}" || die
-	sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws \
-		|| die "sed WORKSPACE failed"
-
-	# Mercury tests must be run in C locale since Mercury output is
-	# compared to hard-coded warnings/errors
-	LC_ALL="C" \
-	PATH="${TWS}"/scripts:"${TWS}"/util:"${TWS}"/slice:"${PATH}" \
-	TERM="" \
-	WORKSPACE="${TWS}" \
-	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
-	MERCURY_CONFIG_DIR="${TWS}" \
-	MMAKE_DIR="${TWS}"/scripts \
-	MERCURY_SUPPRESS_STACK_TRACE=yes \
-	GRADE=${TEST_GRADE} \
-	MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc \
-					-I${TWS}/boehm_gc/include \
-					-I${TWS}/runtime \
-					-I${TWS}/library \
-					-I${TWS}/mdbcomp \
-					-I${TWS}/browser \
-					-I${TWS}/trace" \
-		mmake || die "mmake test failed"
-}
-
-src_install() {
-	emake \
-		PARALLEL=${MAKEOPTS} \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		INSTALL_PREFIX="${D}"/usr \
-		INSTALL_MAN_DIR="${D}"/usr/share/man \
-		INSTALL_INFO_DIR="${D}"/usr/share/info \
-		INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \
-		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
-		install || die "make install failed"
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-
-	dodoc \
-		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
-		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
-		RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS || die
-
-	if use erlang; then
-		dodoc README.Erlang || die
-	fi
-
-	if use java; then
-		dodoc README.Java || die
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/samples
-		doins samples/{*.m,README,Mmakefile} || die
-		doins -r samples/c_interface \
-			samples/diff \
-			samples/muz \
-			samples/rot13 \
-			samples/solutions \
-			samples/solver_types || die
-
-		if use java; then
-			doins -r samples/java_interface || die
-		fi
-
-		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

diff --git a/dev-lang/mercury/mercury-11.07.2.ebuild b/dev-lang/mercury/mercury-11.07.2.ebuild
deleted file mode 100644
index 4b8bd8fce94..00000000000
--- a/dev-lang/mercury/mercury-11.07.2.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-MY_P=${PN}-compiler-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-HOMEPAGE="http://www.mercurylang.org/index.html"
-SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz
-	test? ( mirror://gentoo/mercury-tests-${PV}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug emacs erlang examples java minimal readline test threads"
-
-DEPEND="!dev-libs/mpatrol
-	!dev-util/mono-debugger
-	readline? ( sys-libs/readline )
-	erlang? ( dev-lang/erlang )
-	java? ( >=virtual/jdk-1.5 )"
-
-RDEPEND="${DEPEND}
-	emacs? ( virtual/emacs )"
-
-S="${WORKDIR}"/${MY_P}
-TESTDIR="${WORKDIR}"/${PN}-tests-${PV}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-
-	sed -i -e "s/@libdir@/$(get_libdir)/" \
-		"${S}"/scripts/Mmake.vars.in \
-		|| die "sed libdir failed"
-
-	if use test; then
-		epatch "${WORKDIR}"/${PV}-tests
-	fi
-
-	cd "${S}" || die
-	eautoconf
-}
-
-src_configure() {
-	strip-flags
-
-	local myconf
-	myconf="--libdir=/usr/$(get_libdir) \
-		--disable-gcc-back-end \
-		--disable-deep-profiler \
-		--disable-dotnet-grades \
-		$(use_enable erlang erlang-grade) \
-		$(use_enable java java-grade) \
-		$(use_enable debug debug-grades) \
-		$(use_enable threads par-grades) \
-		$(use_enable !minimal most-grades) \
-		$(use_with readline)"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Generate Mercury .m dependencies. This step will vacuously
-	# succeed if we do not have a bootstrappable instance of mmc
-	# already installed. This step is required as mmc does not wait
-	# for all dependencies to be generated before compiling .m files.
-	emake \
-		PARALLEL=${MAKEOPTS} \
-		bootstrap_depend || die "emake depend failed"
-
-	# Build Mercury using base llds grade
-	emake \
-		PARALLEL=${MAKEOPTS} \
-		EXTRA_MLFLAGS=--no-strip \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		|| die "emake failed"
-
-	# We can now patch .m Mercury compiler files since we
-	# have just built mercury_compiler.
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}-mmc
-
-	sed -i -e "s/@libdir@/$(get_libdir)/" \
-		"${S}"/compiler/file_util.m \
-		"${S}"/compiler/make.program_target.m \
-		|| die "sed libdir failed"
-
-	# Rebuild Mercury compiler using the just built mercury_compiler
-	emake \
-		PARALLEL=${MAKEOPTS} \
-		EXTRA_MLFLAGS=--no-strip \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		compiler || die "emake compiler failed"
-
-	# The default Mercury grade may not be the same as the grade used to
-	# compile the llds base grade. Since src_test() is run before
-	# src_install() we compile the default grade now
-	emake \
-		PARALLEL=${MAKEOPTS} \
-		EXTRA_MLFLAGS=--no-strip \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		default_grade || die "emake default_grade failed"
-}
-
-src_test() {
-	TEST_GRADE=`scripts/ml --print-grade`
-	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
-		TWS="${S}"/install_grade_dir.${TEST_GRADE}
-		cp browser/mer_browser.init "${TWS}"/browser/
-		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
-		cp runtime/mer_rt.init "${TWS}"/runtime/
-		cp ssdb/mer_ssdb.init "${TWS}"/ssdb/
-	else
-		TWS="${S}"
-	fi
-
-	cd "${TESTDIR}" || die
-	sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws \
-		|| die "sed WORKSPACE failed"
-
-	# Mercury tests must be run in C locale since Mercury output is
-	# compared to hard-coded warnings/errors
-	LC_ALL="C" \
-	PATH="${TWS}"/scripts:"${TWS}"/util:"${TWS}"/slice:"${PATH}" \
-	TERM="" \
-	WORKSPACE="${TWS}" \
-	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
-	MERCURY_CONFIG_DIR="${TWS}" \
-	MMAKE_DIR="${TWS}"/scripts \
-	MERCURY_SUPPRESS_STACK_TRACE=yes \
-	GRADE=${TEST_GRADE} \
-	MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc \
-					-I${TWS}/boehm_gc/include \
-					-I${TWS}/runtime \
-					-I${TWS}/library \
-					-I${TWS}/mdbcomp \
-					-I${TWS}/browser \
-					-I${TWS}/trace" \
-		mmake || die "mmake test failed"
-}
-
-src_install() {
-	emake \
-		PARALLEL=${MAKEOPTS} \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		INSTALL_PREFIX="${D}"/usr \
-		INSTALL_MAN_DIR="${D}"/usr/share/man \
-		INSTALL_INFO_DIR="${D}"/usr/share/info \
-		INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \
-		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
-		install || die "make install failed"
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-
-	dodoc \
-		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
-		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
-		RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS || die
-
-	if use erlang; then
-		dodoc README.Erlang || die
-	fi
-
-	if use java; then
-		dodoc README.Java || die
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/samples
-		doins samples/{*.m,README,Mmakefile} || die
-		doins -r samples/c_interface \
-			samples/diff \
-			samples/muz \
-			samples/rot13 \
-			samples/solutions \
-			samples/solver_types || die
-
-		if use java; then
-			doins -r samples/java_interface || die
-		fi
-
-		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

diff --git a/dev-lang/mercury/mercury-11.07.ebuild b/dev-lang/mercury/mercury-11.07.ebuild
deleted file mode 100644
index 9a42617edcd..00000000000
--- a/dev-lang/mercury/mercury-11.07.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-MY_P=${PN}-compiler-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
-SRC_URI="http://www.mercury.csse.unimelb.edu.au/download/files/${MY_P}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz
-	test? ( http://www.mercury.csse.unimelb.edu.au/download/files/mercury-tests-${PV}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug emacs erlang examples java minimal readline test threads"
-
-DEPEND="!dev-libs/mpatrol
-	!dev-util/mono-debugger
-	readline? ( sys-libs/readline )
-	erlang? ( dev-lang/erlang )
-	java? ( >=virtual/jdk-1.5 )"
-
-RDEPEND="${DEPEND}
-	emacs? ( virtual/emacs )"
-
-S="${WORKDIR}"/${MY_P}
-TESTDIR="${WORKDIR}"/${PN}-tests-${PV}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-
-	sed -i -e "s/@libdir@/$(get_libdir)/" \
-		"${S}"/scripts/Mmake.vars.in \
-		|| die "sed libdir failed"
-
-	if use test; then
-		epatch "${WORKDIR}"/${PV}-tests
-	fi
-
-	cd "${S}" || die
-	eautoconf
-}
-
-src_configure() {
-	strip-flags
-
-	local myconf
-	myconf="--libdir=/usr/$(get_libdir) \
-		--disable-gcc-back-end \
-		--disable-deep-profiler \
-		--disable-dotnet-grades \
-		$(use_enable erlang erlang-grade) \
-		$(use_enable java java-grade) \
-		$(use_enable debug debug-grades) \
-		$(use_enable threads par-grades) \
-		$(use_enable !minimal most-grades) \
-		$(use_with readline)"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Generate Mercury .m dependencies. This step will vacuously
-	# succeed if we do not have a bootstrappable instance of mmc
-	# already installed. This step is required as mmc does not wait
-	# for all dependencies to be generated before compiling .m files.
-	emake \
-		PARALLEL=${MAKEOPTS} \
-		bootstrap_depend || die "emake depend failed"
-
-	# Build Mercury using base llds grade
-	emake \
-		PARALLEL=${MAKEOPTS} \
-		EXTRA_MLFLAGS=--no-strip \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		|| die "emake failed"
-
-	# We can now patch .m Mercury compiler files since we
-	# have just built mercury_compiler.
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}-mmc
-
-	sed -i -e "s/@libdir@/$(get_libdir)/" \
-		"${S}"/compiler/file_util.m \
-		"${S}"/compiler/make.program_target.m \
-		|| die "sed libdir failed"
-
-	# Rebuild Mercury compiler using the just built mercury_compiler
-	emake \
-		PARALLEL=${MAKEOPTS} \
-		EXTRA_MLFLAGS=--no-strip \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		compiler || die "emake compiler failed"
-
-	# The default Mercury grade may not be the same as the grade used to
-	# compile the llds base grade. Since src_test() is run before
-	# src_install() we compile the default grade now
-	emake \
-		PARALLEL=${MAKEOPTS} \
-		EXTRA_MLFLAGS=--no-strip \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		default_grade || die "emake default_grade failed"
-}
-
-src_test() {
-	TEST_GRADE=`scripts/ml --print-grade`
-	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
-		TWS="${S}"/install_grade_dir.${TEST_GRADE}
-		cp browser/mer_browser.init "${TWS}"/browser/
-		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
-		cp runtime/mer_rt.init "${TWS}"/runtime/
-		cp ssdb/mer_ssdb.init "${TWS}"/ssdb/
-	else
-		TWS="${S}"
-	fi
-
-	cd "${TESTDIR}" || die
-	sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws \
-		|| die "sed WORKSPACE failed"
-
-	# Mercury tests must be run in C locale since Mercury output is
-	# compared to hard-coded warnings/errors
-	LC_ALL="C" \
-	PATH="${TWS}"/scripts:"${TWS}"/util:"${TWS}"/slice:"${PATH}" \
-	TERM="" \
-	WORKSPACE="${TWS}" \
-	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
-	MERCURY_CONFIG_DIR="${TWS}" \
-	MMAKE_DIR="${TWS}"/scripts \
-	MERCURY_SUPPRESS_STACK_TRACE=yes \
-	GRADE=${TEST_GRADE} \
-	MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc \
-					-I${TWS}/boehm_gc/include \
-					-I${TWS}/runtime \
-					-I${TWS}/library \
-					-I${TWS}/mdbcomp \
-					-I${TWS}/browser \
-					-I${TWS}/trace" \
-		mmake || die "mmake test failed"
-}
-
-src_install() {
-	emake \
-		PARALLEL=${MAKEOPTS} \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		INSTALL_PREFIX="${D}"/usr \
-		INSTALL_MAN_DIR="${D}"/usr/share/man \
-		INSTALL_INFO_DIR="${D}"/usr/share/info \
-		INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \
-		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
-		install || die "make install failed"
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-
-	dodoc \
-		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
-		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
-		RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS || die
-
-	if use erlang; then
-		dodoc README.Erlang || die
-	fi
-
-	if use java; then
-		dodoc README.Java || die
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/samples
-		doins samples/{*.m,README,Mmakefile} || die
-		doins -r samples/c_interface \
-			samples/diff \
-			samples/muz \
-			samples/rot13 \
-			samples/solutions \
-			samples/solver_types || die
-
-		if use java; then
-			doins -r samples/java_interface || die
-		fi
-
-		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

diff --git a/dev-lang/mercury/mercury-13.05.1.ebuild b/dev-lang/mercury/mercury-13.05.1.ebuild
deleted file mode 100644
index aaf2da72f63..00000000000
--- a/dev-lang/mercury/mercury-13.05.1.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-MY_P=${PN}-srcdist-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-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="debug emacs erlang examples java minimal readline threads"
-
-DEPEND="!dev-libs/mpatrol
-	!dev-util/mono-debugger
-	readline? ( sys-libs/readline )
-	erlang? ( dev-lang/erlang )
-	java? ( >=virtual/jdk-1.5 )"
-
-RDEPEND="${DEPEND}
-	emacs? ( virtual/emacs )"
-
-S="${WORKDIR}"/${MY_P}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-
-	sed -i -e "s/@libdir@/$(get_libdir)/" \
-		"${S}"/scripts/Mmake.vars.in \
-		|| die "sed libdir failed"
-
-	cd "${S}" || die
-	eautoconf
-}
-
-src_configure() {
-	strip-flags
-
-	local myconf
-	myconf="--libdir=/usr/$(get_libdir) \
-		--disable-deep-profiler \
-		--disable-dotnet-grades \
-		--without-hwloc \
-		$(use_enable erlang erlang-grade) \
-		$(use_enable java java-grade) \
-		$(use_enable debug debug-grades) \
-		$(use_enable threads par-grades) \
-		$(use_enable !minimal most-grades) \
-		$(use_with readline)"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Build Mercury using base llds grade
-	emake \
-		PARALLEL=${MAKEOPTS} \
-		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
-			    EXTRA_LDFLAGS='${LDFLAGS}' \
-			    EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \
-		|| die "emake failed"
-
-	# We can now patch .m Mercury compiler files since we
-	# have just built mercury_compiler.
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}-mmc
-
-	sed -i -e "s/@libdir@/$(get_libdir)/" \
-		"${S}"/compiler/file_util.m \
-		"${S}"/compiler/make.program_target.m \
-		|| die "sed libdir failed"
-
-	# Rebuild Mercury compiler using the just built mercury_compiler
-	emake \
-		PARALLEL=${MAKEOPTS} \
-		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
-			    EXTRA_LDFLAGS='${LDFLAGS}' \
-			    EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		compiler || die "emake compiler failed"
-
-	# The default Mercury grade may not be the same as the grade used to
-	# compile the llds base grade. Since src_test() is run before
-	# src_install() we compile the default grade now
-	emake \
-		PARALLEL=${MAKEOPTS} \
-		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
-			    EXTRA_LDFLAGS='${LDFLAGS}' \
-			    EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		default_grade || die "emake default_grade failed"
-}
-
-src_test() {
-	TEST_GRADE=`scripts/ml --print-grade`
-	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
-		TWS="${S}"/install_grade_dir.${TEST_GRADE}
-		cp runtime/mer_rt.init "${TWS}"/runtime/
-		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
-		cp browser/mer_browser.init "${TWS}"/browser/
-	else
-		TWS="${S}"
-	fi
-
-	cd "${S}"/tests || die
-	sed -e "s:@WORKSPACE@:${TWS}:" < WS_FLAGS.ws > WS_FLAGS \
-		|| die "sed WORKSPACE failed"
-
-	# Mercury tests must be run in C locale since Mercury output is
-	# compared to hard-coded warnings/errors
-	LC_ALL="C" \
-	PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
-	TERM="" \
-	WORKSPACE="${TWS}" \
-	WORKSPACE_FLAGS=yes \
-	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
-	MMAKE_DIR="${TWS}"/scripts \
-	MERCURY_SUPPRESS_STACK_TRACE=yes \
-	GRADE=${TEST_GRADE} \
-	MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc/include \
-					-I${TWS}/runtime \
-					-I${TWS}/library" \
-		mmake || die "mmake test failed"
-}
-
-src_install() {
-	emake \
-		PARALLEL=${MAKEOPTS} \
-		MMAKEFLAGS="EXTRA_LDFLAGS='${LDFLAGS}' \
-			    EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		INSTALL_PREFIX="${D}"/usr \
-		INSTALL_MAN_DIR="${D}"/usr/share/man \
-		INSTALL_INFO_DIR="${D}"/usr/share/info \
-		INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \
-		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
-		install || die "emake install failed"
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-
-	dodoc \
-		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
-		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
-		RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS || die
-
-	if use erlang; then
-		dodoc README.Erlang || die
-	fi
-
-	if use java; then
-		dodoc README.Java || die
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/samples
-		doins samples/{*.m,README,Mmakefile} || die
-		doins -r samples/c_interface \
-			samples/diff \
-			samples/muz \
-			samples/rot13 \
-			samples/solutions \
-			samples/solver_types || die
-
-		if use java; then
-			doins -r samples/java_interface || die
-		fi
-
-		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

diff --git a/dev-lang/mercury/mercury-13.05.ebuild b/dev-lang/mercury/mercury-13.05.ebuild
deleted file mode 100644
index 0c607879e27..00000000000
--- a/dev-lang/mercury/mercury-13.05.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-MY_P=${PN}-srcdist-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-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="debug emacs erlang examples java minimal readline threads"
-
-DEPEND="!dev-libs/mpatrol
-	!dev-util/mono-debugger
-	readline? ( sys-libs/readline )
-	erlang? ( dev-lang/erlang )
-	java? ( >=virtual/jdk-1.5 )"
-
-RDEPEND="${DEPEND}
-	emacs? ( virtual/emacs )"
-
-S="${WORKDIR}"/${MY_P}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-
-	sed -i -e "s/@libdir@/$(get_libdir)/" \
-		"${S}"/scripts/Mmake.vars.in \
-		|| die "sed libdir failed"
-
-	cd "${S}" || die
-	eautoconf
-}
-
-src_configure() {
-	strip-flags
-
-	local myconf
-	myconf="--libdir=/usr/$(get_libdir) \
-		--disable-deep-profiler \
-		--disable-dotnet-grades \
-		$(use_enable erlang erlang-grade) \
-		$(use_enable java java-grade) \
-		$(use_enable debug debug-grades) \
-		$(use_enable threads par-grades) \
-		$(use_enable !minimal most-grades) \
-		$(use_with readline)"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Build Mercury using base llds grade
-	emake \
-		PARALLEL=${MAKEOPTS} \
-		EXTRA_MLFLAGS=--no-strip \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		|| die "emake failed"
-
-	# We can now patch .m Mercury compiler files since we
-	# have just built mercury_compiler.
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}-mmc
-
-	sed -i -e "s/@libdir@/$(get_libdir)/" \
-		"${S}"/compiler/file_util.m \
-		"${S}"/compiler/make.program_target.m \
-		|| die "sed libdir failed"
-
-	# Rebuild Mercury compiler using the just built mercury_compiler
-	emake \
-		PARALLEL=${MAKEOPTS} \
-		EXTRA_MLFLAGS=--no-strip \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		compiler || die "emake compiler failed"
-
-	# The default Mercury grade may not be the same as the grade used to
-	# compile the llds base grade. Since src_test() is run before
-	# src_install() we compile the default grade now
-	emake \
-		PARALLEL=${MAKEOPTS} \
-		EXTRA_MLFLAGS=--no-strip \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		default_grade || die "emake default_grade failed"
-}
-
-src_test() {
-	TEST_GRADE=`scripts/ml --print-grade`
-	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
-		TWS="${S}"/install_grade_dir.${TEST_GRADE}
-		cp runtime/mer_rt.init "${TWS}"/runtime/
-		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
-		cp browser/mer_browser.init "${TWS}"/browser/
-	else
-		TWS="${S}"
-	fi
-
-	cd "${S}"/tests || die
-	sed -e "s:@WORKSPACE@:${TWS}:" < WS_FLAGS.ws > WS_FLAGS \
-		|| die "sed WORKSPACE failed"
-
-	# Mercury tests must be run in C locale since Mercury output is
-	# compared to hard-coded warnings/errors
-	LC_ALL="C" \
-	PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
-	TERM="" \
-	WORKSPACE="${TWS}" \
-	WORKSPACE_FLAGS=yes \
-	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
-	MMAKE_DIR="${TWS}"/scripts \
-	MERCURY_SUPPRESS_STACK_TRACE=yes \
-	GRADE=${TEST_GRADE} \
-	MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc/include \
-					-I${TWS}/runtime \
-					-I${TWS}/library" \
-		mmake || die "mmake test failed"
-}
-
-src_install() {
-	emake \
-		PARALLEL=${MAKEOPTS} \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		INSTALL_PREFIX="${D}"/usr \
-		INSTALL_MAN_DIR="${D}"/usr/share/man \
-		INSTALL_INFO_DIR="${D}"/usr/share/info \
-		INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \
-		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
-		install || die "make install failed"
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-
-	dodoc \
-		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
-		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
-		RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS || die
-
-	if use erlang; then
-		dodoc README.Erlang || die
-	fi
-
-	if use java; then
-		dodoc README.Java || die
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/samples
-		doins samples/{*.m,README,Mmakefile} || die
-		doins -r samples/c_interface \
-			samples/diff \
-			samples/muz \
-			samples/rot13 \
-			samples/solutions \
-			samples/solver_types || die
-
-		if use java; then
-			doins -r samples/java_interface || die
-		fi
-
-		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

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

[Keri Harris]

commit:     e04ed4f2821cd87a7983d8bf190d24afc7b6a9ed
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 25 06:37:06 2017 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Mon Sep 25 06:37:31 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e04ed4f2

dev-lang/mercury: fix XDG_xxx_DIR sandbox issue. Bug #575140

Package-Manager: Portage-2.3.8, Repoman-2.3.1

 dev-lang/mercury/mercury-13.05.2.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-lang/mercury/mercury-13.05.2.ebuild b/dev-lang/mercury/mercury-13.05.2.ebuild
index 5cbc529e473..446def6b399 100644
--- a/dev-lang/mercury/mercury-13.05.2.ebuild
+++ b/dev-lang/mercury/mercury-13.05.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=2
 
-inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
+inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib xdg-utils
 
 PATCHSET_VER="0"
 MY_P=${PN}-srcdist-${PV}
@@ -44,6 +44,8 @@ src_prepare() {
 
 	cd "${S}" || die
 	eautoconf
+
+	xdg_environment_reset
 }
 
 src_configure() {

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

[Agostino Sarubbo]

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

dev-lang/mercury: 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/mercury-13.05.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/mercury/mercury-13.05.2.ebuild b/dev-lang/mercury/mercury-13.05.2.ebuild
index 7fc2a6c..c8032d2 100644
--- a/dev-lang/mercury/mercury-13.05.2.ebuild
+++ b/dev-lang/mercury/mercury-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="debug emacs erlang examples java minimal readline threads"
 

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

[Justin Lecher]

commit:     0dbd28d2e94105b4faaea44fc578ecbc8874efb4
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 19:00:56 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 21:03:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dbd28d2

dev-lang/mercury: Use ecvs_clean to clean workdir

* add missing die

Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 dev-lang/mercury/mercury-11.01.ebuild   | 11 +++++------
 dev-lang/mercury/mercury-11.07.1.ebuild | 11 +++++------
 dev-lang/mercury/mercury-11.07.2.ebuild | 11 +++++------
 dev-lang/mercury/mercury-11.07.ebuild   | 11 +++++------
 dev-lang/mercury/mercury-13.05.1.ebuild | 11 +++++------
 dev-lang/mercury/mercury-13.05.2.ebuild | 11 +++++------
 dev-lang/mercury/mercury-13.05.ebuild   | 11 +++++------
 dev-lang/mercury/metadata.xml           | 14 +++++++-------
 8 files changed, 42 insertions(+), 49 deletions(-)

diff --git a/dev-lang/mercury/mercury-11.01.ebuild b/dev-lang/mercury/mercury-11.01.ebuild
index bb7c875..f8f9bc7 100644
--- a/dev-lang/mercury/mercury-11.01.ebuild
+++ b/dev-lang/mercury/mercury-11.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -36,7 +36,7 @@ TESTDIR="${WORKDIR}"/${PN}-tests-${PV}
 SITEFILE=50${PN}-gentoo.el
 
 src_prepare() {
-	cd "${WORKDIR}"
+	cd "${WORKDIR}" || die
 	EPATCH_FORCE=yes
 	EPATCH_SUFFIX=patch
 	epatch "${WORKDIR}"/${PV}
@@ -49,7 +49,7 @@ src_prepare() {
 		epatch "${WORKDIR}"/${PV}-tests
 	fi
 
-	cd "${S}"
+	cd "${S}" || die
 	eautoconf
 }
 
@@ -132,7 +132,7 @@ src_test() {
 		TWS="${S}"
 	fi
 
-	cd "${TESTDIR}"
+	cd "${TESTDIR}" || die
 	sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws \
 		|| die "sed WORKSPACE failed"
 
@@ -202,8 +202,7 @@ src_install() {
 			doins -r samples/java_interface || die
 		fi
 
-		rm -rf $(find "${D}"/usr/share/doc/${PF}/samples \
-				-name CVS -o -name .cvsignore)
+		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
 	fi
 }
 

diff --git a/dev-lang/mercury/mercury-11.07.1.ebuild b/dev-lang/mercury/mercury-11.07.1.ebuild
index fbc3732..f143a22 100644
--- a/dev-lang/mercury/mercury-11.07.1.ebuild
+++ b/dev-lang/mercury/mercury-11.07.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -36,7 +36,7 @@ TESTDIR="${WORKDIR}"/${PN}-tests-${PV}
 SITEFILE=50${PN}-gentoo.el
 
 src_prepare() {
-	cd "${WORKDIR}"
+	cd "${WORKDIR}" || die
 	EPATCH_FORCE=yes
 	EPATCH_SUFFIX=patch
 	epatch "${WORKDIR}"/${PV}
@@ -49,7 +49,7 @@ src_prepare() {
 		epatch "${WORKDIR}"/${PV}-tests
 	fi
 
-	cd "${S}"
+	cd "${S}" || die
 	eautoconf
 }
 
@@ -132,7 +132,7 @@ src_test() {
 		TWS="${S}"
 	fi
 
-	cd "${TESTDIR}"
+	cd "${TESTDIR}" || die
 	sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws \
 		|| die "sed WORKSPACE failed"
 
@@ -202,8 +202,7 @@ src_install() {
 			doins -r samples/java_interface || die
 		fi
 
-		rm -rf $(find "${D}"/usr/share/doc/${PF}/samples \
-				-name CVS -o -name .cvsignore)
+		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
 	fi
 }
 

diff --git a/dev-lang/mercury/mercury-11.07.2.ebuild b/dev-lang/mercury/mercury-11.07.2.ebuild
index 9d8b648..74cb440 100644
--- a/dev-lang/mercury/mercury-11.07.2.ebuild
+++ b/dev-lang/mercury/mercury-11.07.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -36,7 +36,7 @@ TESTDIR="${WORKDIR}"/${PN}-tests-${PV}
 SITEFILE=50${PN}-gentoo.el
 
 src_prepare() {
-	cd "${WORKDIR}"
+	cd "${WORKDIR}" || die
 	EPATCH_FORCE=yes
 	EPATCH_SUFFIX=patch
 	epatch "${WORKDIR}"/${PV}
@@ -49,7 +49,7 @@ src_prepare() {
 		epatch "${WORKDIR}"/${PV}-tests
 	fi
 
-	cd "${S}"
+	cd "${S}" || die
 	eautoconf
 }
 
@@ -132,7 +132,7 @@ src_test() {
 		TWS="${S}"
 	fi
 
-	cd "${TESTDIR}"
+	cd "${TESTDIR}" || die
 	sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws \
 		|| die "sed WORKSPACE failed"
 
@@ -202,8 +202,7 @@ src_install() {
 			doins -r samples/java_interface || die
 		fi
 
-		rm -rf $(find "${D}"/usr/share/doc/${PF}/samples \
-				-name CVS -o -name .cvsignore)
+		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
 	fi
 }
 

diff --git a/dev-lang/mercury/mercury-11.07.ebuild b/dev-lang/mercury/mercury-11.07.ebuild
index 2792e67..6883d44 100644
--- a/dev-lang/mercury/mercury-11.07.ebuild
+++ b/dev-lang/mercury/mercury-11.07.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -36,7 +36,7 @@ TESTDIR="${WORKDIR}"/${PN}-tests-${PV}
 SITEFILE=50${PN}-gentoo.el
 
 src_prepare() {
-	cd "${WORKDIR}"
+	cd "${WORKDIR}" || die
 	EPATCH_FORCE=yes
 	EPATCH_SUFFIX=patch
 	epatch "${WORKDIR}"/${PV}
@@ -49,7 +49,7 @@ src_prepare() {
 		epatch "${WORKDIR}"/${PV}-tests
 	fi
 
-	cd "${S}"
+	cd "${S}" || die
 	eautoconf
 }
 
@@ -132,7 +132,7 @@ src_test() {
 		TWS="${S}"
 	fi
 
-	cd "${TESTDIR}"
+	cd "${TESTDIR}" || die
 	sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws \
 		|| die "sed WORKSPACE failed"
 
@@ -202,8 +202,7 @@ src_install() {
 			doins -r samples/java_interface || die
 		fi
 
-		rm -rf $(find "${D}"/usr/share/doc/${PF}/samples \
-				-name CVS -o -name .cvsignore)
+		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
 	fi
 }
 

diff --git a/dev-lang/mercury/mercury-13.05.1.ebuild b/dev-lang/mercury/mercury-13.05.1.ebuild
index c0fcf9d..44f38dc 100644
--- a/dev-lang/mercury/mercury-13.05.1.ebuild
+++ b/dev-lang/mercury/mercury-13.05.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -34,7 +34,7 @@ S="${WORKDIR}"/${MY_P}
 SITEFILE=50${PN}-gentoo.el
 
 src_prepare() {
-	cd "${WORKDIR}"
+	cd "${WORKDIR}" || die
 	EPATCH_FORCE=yes
 	EPATCH_SUFFIX=patch
 	epatch "${WORKDIR}"/${PV}
@@ -43,7 +43,7 @@ src_prepare() {
 		"${S}"/scripts/Mmake.vars.in \
 		|| die "sed libdir failed"
 
-	cd "${S}"
+	cd "${S}" || die
 	eautoconf
 }
 
@@ -117,7 +117,7 @@ src_test() {
 		TWS="${S}"
 	fi
 
-	cd "${S}"/tests
+	cd "${S}"/tests || die
 	sed -e "s:@WORKSPACE@:${TWS}:" < WS_FLAGS.ws > WS_FLAGS \
 		|| die "sed WORKSPACE failed"
 
@@ -183,8 +183,7 @@ src_install() {
 			doins -r samples/java_interface || die
 		fi
 
-		rm -rf $(find "${D}"/usr/share/doc/${PF}/samples \
-				-name CVS -o -name .cvsignore)
+		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
 	fi
 }
 

diff --git a/dev-lang/mercury/mercury-13.05.2.ebuild b/dev-lang/mercury/mercury-13.05.2.ebuild
index c82ce14..44f38dc 100644
--- a/dev-lang/mercury/mercury-13.05.2.ebuild
+++ b/dev-lang/mercury/mercury-13.05.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -34,7 +34,7 @@ S="${WORKDIR}"/${MY_P}
 SITEFILE=50${PN}-gentoo.el
 
 src_prepare() {
-	cd "${WORKDIR}"
+	cd "${WORKDIR}" || die
 	EPATCH_FORCE=yes
 	EPATCH_SUFFIX=patch
 	epatch "${WORKDIR}"/${PV}
@@ -43,7 +43,7 @@ src_prepare() {
 		"${S}"/scripts/Mmake.vars.in \
 		|| die "sed libdir failed"
 
-	cd "${S}"
+	cd "${S}" || die
 	eautoconf
 }
 
@@ -117,7 +117,7 @@ src_test() {
 		TWS="${S}"
 	fi
 
-	cd "${S}"/tests
+	cd "${S}"/tests || die
 	sed -e "s:@WORKSPACE@:${TWS}:" < WS_FLAGS.ws > WS_FLAGS \
 		|| die "sed WORKSPACE failed"
 
@@ -183,8 +183,7 @@ src_install() {
 			doins -r samples/java_interface || die
 		fi
 
-		rm -rf $(find "${D}"/usr/share/doc/${PF}/samples \
-				-name CVS -o -name .cvsignore)
+		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
 	fi
 }
 

diff --git a/dev-lang/mercury/mercury-13.05.ebuild b/dev-lang/mercury/mercury-13.05.ebuild
index 3092ceb..7cefb73 100644
--- a/dev-lang/mercury/mercury-13.05.ebuild
+++ b/dev-lang/mercury/mercury-13.05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -34,7 +34,7 @@ S="${WORKDIR}"/${MY_P}
 SITEFILE=50${PN}-gentoo.el
 
 src_prepare() {
-	cd "${WORKDIR}"
+	cd "${WORKDIR}" || die
 	EPATCH_FORCE=yes
 	EPATCH_SUFFIX=patch
 	epatch "${WORKDIR}"/${PV}
@@ -43,7 +43,7 @@ src_prepare() {
 		"${S}"/scripts/Mmake.vars.in \
 		|| die "sed libdir failed"
 
-	cd "${S}"
+	cd "${S}" || die
 	eautoconf
 }
 
@@ -116,7 +116,7 @@ src_test() {
 		TWS="${S}"
 	fi
 
-	cd "${S}"/tests
+	cd "${S}"/tests || die
 	sed -e "s:@WORKSPACE@:${TWS}:" < WS_FLAGS.ws > WS_FLAGS \
 		|| die "sed WORKSPACE failed"
 
@@ -182,8 +182,7 @@ src_install() {
 			doins -r samples/java_interface || die
 		fi
 
-		rm -rf $(find "${D}"/usr/share/doc/${PF}/samples \
-				-name CVS -o -name .cvsignore)
+		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
 	fi
 }
 

diff --git a/dev-lang/mercury/metadata.xml b/dev-lang/mercury/metadata.xml
index 1af61ab..7e9ce0a 100644
--- a/dev-lang/mercury/metadata.xml
+++ b/dev-lang/mercury/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>keri@gentoo.org</email>
-  <name>Keri Harris</name>
-</maintainer>
-<use>
-  <flag name='erlang'>Support Mercury Erlang grade</flag>
-</use>
+  <maintainer>
+    <email>keri@gentoo.org</email>
+    <name>Keri Harris</name>
+  </maintainer>
+  <use>
+    <flag name="erlang">Support Mercury Erlang grade</flag>
+  </use>
 </pkgmetadata>