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

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

2022-10-08 Thread Sam James

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

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

Signed-off-by: Sam James  gentoo.org>

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

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

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

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

2022-08-14 Thread Keri Harris

commit: 0188d5e398c76759ef69f0d015bd35eb58979f3b
Author: Keri Harris  gentoo  org>
AuthorDate: Sun Aug 14 15:17:36 2022 +
Commit: Keri Harris  gentoo  org>
CommitDate: Sun Aug 14 15:17:36 2022 +
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  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-extras/

2022-08-14 Thread Keri Harris

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

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

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

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

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

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

2022-06-25 Thread Keri Harris

commit: c576999d058d23f25024ba308802959ec26e85ec
Author: Keri Harris  gentoo  org>
AuthorDate: Sat Jun 25 16:54:01 2022 +
Commit: Keri Harris  gentoo  org>
CommitDate: Sat Jun 25 16:54:36 2022 +
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  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 
0539611691cfb714937bca8dc967246ce32c515b7133391d81333284e6ceffe29b929c042ee752bd9980c2d2332de20d7c5dc4e1a6077a6421056d975808
 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/

2022-06-03 Thread Keri Harris

commit: 38e82205ae0bee1c6b0caf5dd8f0ec9b199e27df
Author: Keri Harris  gentoo  org>
AuthorDate: Fri Jun  3 14:35:16 2022 +
Commit: Keri Harris  gentoo  org>
CommitDate: Fri Jun  3 14:36:02 2022 +
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  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-extras/

2022-05-22 Thread Keri Harris

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

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

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

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

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

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

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

2022-05-21 Thread Keri Harris

commit: ba86c1ac1e835f2e7bc38f0d98a5fbce2f312b23
Author: Keri Harris  gentoo  org>
AuthorDate: Sat May 21 15:10:08 2022 +
Commit: Keri Harris  gentoo  org>
CommitDate: Sat May 21 15:10:08 2022 +
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  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/

2022-05-21 Thread Keri Harris

commit: 183635c624cde5980761a8d6df3c17a4ae8e3b88
Author: Keri Harris  gentoo  org>
AuthorDate: Sat May 21 15:00:52 2022 +
Commit: Keri Harris  gentoo  org>
CommitDate: Sat May 21 15:01:14 2022 +
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  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 
0539611691cfb714937bca8dc967246ce32c515b7133391d81333284e6ceffe29b929c042ee752bd9980c2d2332de20d7c5dc4e1a6077a6421056d975808
 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/

2022-05-21 Thread Keri Harris

commit: 622706b9807ea72038ea0dd0ba762a2747610ae5
Author: Keri Harris  gentoo  org>
AuthorDate: Sat May 21 13:22:13 2022 +
Commit: Keri Harris  gentoo  org>
CommitDate: Sat May 21 13:23:46 2022 +
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  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/

2022-05-15 Thread Keri Harris

commit: b45e9aa0ba961a0df35803117a5814b047d9baf4
Author: Keri Harris  gentoo  org>
AuthorDate: Sun May 15 10:52:08 2022 +
Commit: Keri Harris  gentoo  org>
CommitDate: Sun May 15 10:53:40 2022 +
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  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 
0539611691cfb714937bca8dc967246ce32c515b7133391d81333284e6ceffe29b929c042ee752bd9980c2d2332de20d7c5dc4e1a6077a6421056d975808
 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 ..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) \
+

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

2022-05-15 Thread Keri Harris

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

dev-lang/mercury-extras: version bump

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

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

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

diff --git a/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild 
b/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild
new file mode 100644
index ..c90f5ea06af4
--- /dev/null
+++ b/dev-lang/mercury-extras/mercury-extras-22.01.1.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils multilib vcs-clean
+
+PATCHSET_VER="0"
+MY_P=mercury-srcdist-${PV}
+
+DESCRIPTION="Additional libraries and tools that are not part of the Mercury 
standard library"
+HOMEPAGE="https://www.mercurylang.org/index.html;
+SRC_URI="https://dl.mercurylang.org/release/${MY_P}.tar.gz
+   
https://dev.gentoo.org/~keri/distfiles/mercury-extras/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz;
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml"
+REQUIRED_USE="?? ( odbc iodbc )"
+
+RDEPEND="
+   ~dev-lang/mercury-${PV}
+   cairo? ( >=x11-libs/cairo-1.10.0 )
+   gmp? ( dev-libs/gmp:0 )
+   glut? ( media-libs/freeglut )
+   odbc? ( dev-db/unixODBC )
+   iodbc? ( dev-db/libiodbc )
+   tommath? ( dev-libs/libtommath )
+   ncurses? ( sys-libs/ncurses:= )
+   opengl? (
+   virtual/opengl
+   virtual/glu
+   )
+   tk? (
+   dev-lang/tcl:0
+   dev-lang/tk:0
+   )
+   X? ( x11-libs/libX11 )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}/extras
+
+mercury_pkgs() {
+   echo "
+

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

2022-05-14 Thread Keri Harris

commit: c202ce59ca38b4906d2aaf1813f672cfd3f6f7cf
Author: Keri Harris  gentoo  org>
AuthorDate: Sat May 14 18:26:34 2022 +
Commit: Keri Harris  gentoo  org>
CommitDate: Sat May 14 18:30:38 2022 +
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  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 
0539611691cfb714937bca8dc967246ce32c515b7133391d81333284e6ceffe29b929c042ee752bd9980c2d2332de20d7c5dc4e1a6077a6421056d975808
 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 ..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
+

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

2022-05-14 Thread Keri Harris

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

dev-lang/mercury-extras: version bump

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

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

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

diff --git a/dev-lang/mercury-extras/mercury-extras-22.01.ebuild 
b/dev-lang/mercury-extras/mercury-extras-22.01.ebuild
new file mode 100644
index ..c90f5ea06af4
--- /dev/null
+++ b/dev-lang/mercury-extras/mercury-extras-22.01.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils multilib vcs-clean
+
+PATCHSET_VER="0"
+MY_P=mercury-srcdist-${PV}
+
+DESCRIPTION="Additional libraries and tools that are not part of the Mercury 
standard library"
+HOMEPAGE="https://www.mercurylang.org/index.html;
+SRC_URI="https://dl.mercurylang.org/release/${MY_P}.tar.gz
+   
https://dev.gentoo.org/~keri/distfiles/mercury-extras/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz;
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml"
+REQUIRED_USE="?? ( odbc iodbc )"
+
+RDEPEND="
+   ~dev-lang/mercury-${PV}
+   cairo? ( >=x11-libs/cairo-1.10.0 )
+   gmp? ( dev-libs/gmp:0 )
+   glut? ( media-libs/freeglut )
+   odbc? ( dev-db/unixODBC )
+   iodbc? ( dev-db/libiodbc )
+   tommath? ( dev-libs/libtommath )
+   ncurses? ( sys-libs/ncurses:= )
+   opengl? (
+   virtual/opengl
+   virtual/glu
+   )
+   tk? (
+   dev-lang/tcl:0
+   dev-lang/tk:0
+   )
+   X? ( x11-libs/libX11 )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}/extras
+
+mercury_pkgs() {
+   echo "
+   align_right/align_right:bin:
+   base64/mercury_base64:lib:
+   cgi/mercury_www:lib:
+   complex_numbers/complex_numbers:lib:
+   $(use ncurses && echo \
+   curs/curs:lib:ncurses,panel curses/mcurses:lib:ncurses)
+   dynamic_linking/dl:lib:
+   error/error:bin:
+   fixed/fixed:lib:
+   $(use gmp && echo gmp_int/gmp_int:lib:)
+   $(use tommath && echo mp_int/mp_int:lib:libtommath)
+   $(use X && echo graphics/easyx/easyx:lib:x11)
+   $(use cairo && echo

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

2022-05-14 Thread Keri Harris

commit: fdf90b4e32f83ff9db172053ee9c981931382d21
Author: Keri Harris  gentoo  org>
AuthorDate: Sat May 14 14:53:06 2022 +
Commit: Keri Harris  gentoo  org>
CommitDate: Sat May 14 14:53:38 2022 +
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  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-extras/

2021-10-03 Thread Keri Harris

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

dev-lang/mercury-extras: version bump

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

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

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

diff --git a/dev-lang/mercury-extras/mercury-extras-20.06.1.ebuild 
b/dev-lang/mercury-extras/mercury-extras-20.06.1.ebuild
new file mode 100644
index 000..6069ed489b0
--- /dev/null
+++ b/dev-lang/mercury-extras/mercury-extras-20.06.1.ebuild
@@ -0,0 +1,307 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib toolchain-funcs vcs-clean
+
+PATCHSET_VER="0"
+MY_P=mercury-srcdist-${PV}
+
+DESCRIPTION="Additional libraries and tools that are not part of the Mercury 
standard library"
+HOMEPAGE="https://www.mercurylang.org/index.html;
+SRC_URI="https://dl.mercurylang.org/release/${MY_P}.tar.gz
+   
https://dev.gentoo.org/~keri/distfiles/mercury-extras/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz;
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml"
+REQUIRED_USE="?? ( odbc iodbc )"
+
+RDEPEND="
+   ~dev-lang/mercury-${PV}
+   cairo? ( >=x11-libs/cairo-1.10.0 )
+   gmp? ( dev-libs/gmp:0 )
+   glut? ( media-libs/freeglut )
+   odbc? ( dev-db/unixODBC )
+   iodbc? ( dev-db/libiodbc )
+   tommath? ( dev-libs/libtommath )
+   ncurses? ( sys-libs/ncurses:= )
+   opengl? (
+   virtual/opengl
+   virtual/glu
+   )
+   tk? (
+   dev-lang/tcl:0
+   dev-lang/tk:0
+   )
+   X? ( x11-libs/libX11 )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/${MY_P}/extras
+
+mercury_pkgs() {
+   echo "
+   align_right/align_right:bin:
+   base64/mercury_base64:lib:
+   cgi/mercury_www:lib:
+   complex_numbers/complex_numbers:lib:
+   $(use ncurses && echo \
+   curs/curs:lib:ncurses,panel curses/mcurses:lib:ncurses)
+   dynamic_linking/dl:lib:
+   error/error:bin:
+   fixed/fixed:lib:
+   $(use gmp && echo gmp_int/gmp_int:lib:)
+   $(use tommath && echo mp_int/mp_int:lib:libtommath)
+   $(use X && echo graphics/easyx/easyx:lib:x11)
+   $(use cairo && echo 
graphics/mercury_cairo/mercury_cairo:lib:cairo)
+   $(use glut && echo 
graphics/mercury_glut/mercury_glut:lib:freeglut)
+   $(use opengl && echo 
graphics/mercury_opengl/mercury_opengl:lib:gl,glu)
+   $(use tk && echo graphics/mercury_tcltk/mercury_tcltk:lib:tk)
+   lex/lex:lib:
+   lex/regex:lib:
+   moose/moose:bin:
+   net/net:lib:
+   net/echo:bin:
+   $(use ssl && echo mopenssl/mopenssl:lib:openssl)
+   $(use odbc && echo odbc/odbc:lib:odbc)
+   $(use iodbc && echo odbc/odbc:lib:libiodbc)
+

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

2021-10-03 Thread Keri Harris

commit: 15ae8d113686c40375ccc0cc70422a9ca9cb4bed
Author: Keri Harris  gentoo  org>
AuthorDate: Sun Oct  3 11:07:04 2021 +
Commit: Keri Harris  gentoo  org>
CommitDate: Sun Oct  3 11:07:25 2021 +
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  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 
0539611691cfb714937bca8dc967246ce32c515b7133391d81333284e6ceffe29b929c042ee752bd9980c2d2332de20d7c5dc4e1a6077a6421056d975808
 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 000..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
+

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

2021-10-03 Thread Keri Harris

commit: e4d79a81c3ddee5579e975e7c89b236534e3de26
Author: Keri Harris  gentoo  org>
AuthorDate: Sun Oct  3 08:10:35 2021 +
Commit: Keri Harris  gentoo  org>
CommitDate: Sun Oct  3 08:11:34 2021 +
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  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 
0539611691cfb714937bca8dc967246ce32c515b7133391d81333284e6ceffe29b929c042ee752bd9980c2d2332de20d7c5dc4e1a6077a6421056d975808
 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/

2021-07-31 Thread Keri Harris

commit: b749221e184c37cb56edc74489e3e39aad35ba94
Author: Keri Harris  gentoo  org>
AuthorDate: Sat Jul 31 17:16:28 2021 +
Commit: Keri Harris  gentoo  org>
CommitDate: Sat Jul 31 17:16:58 2021 +
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  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-extras/

2021-06-18 Thread David Seifert

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

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

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

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

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

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

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

2021-05-28 Thread David Seifert

commit: aa90de39b74ad6e4f9c048d33f8d308c23d851d3
Author: Sam James  gentoo  org>
AuthorDate: Fri May 28 15:56:48 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri May 28 15:56:48 2021 +
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  gentoo.org>
Signed-off-by: David Seifert  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/

2021-05-15 Thread Keri Harris

commit: c6d1da5ef99e7cdb8b558b1f8d2f677e3913c273
Author: Keri Harris  gentoo  org>
AuthorDate: Sat May 15 16:48:49 2021 +
Commit: Keri Harris  gentoo  org>
CommitDate: Sat May 15 16:49:01 2021 +
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  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-extras/

2021-01-18 Thread Keri Harris

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

dev-lang/mercury-extras: remove old versions

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

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

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

diff --git a/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild 
b/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
deleted file mode 100644
index 6298fa9e072..000
--- a/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib vcs-clean
-
-PATCHSET_VER="4"
-MY_P=mercury-srcdist-${PV}
-
-DESCRIPTION="Additional libraries and tools that are not part of the Mercury 
standard library"
-HOMEPAGE="http://www.mercurylang.org/index.html;

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

2021-01-18 Thread Keri Harris

commit: 2f6f48ba7f447081357c4257aea9af2c3b26fa60
Author: Keri Harris  gentoo  org>
AuthorDate: Mon Jan 18 16:02:18 2021 +
Commit: Keri Harris  gentoo  org>
CommitDate: Mon Jan 18 16:03:53 2021 +
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  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..000
--- 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
-

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

2021-01-06 Thread Keri Harris

commit: 8c1c3e8b51ef46439451c25b7b55382db9cbed12
Author: Keri Harris  gentoo  org>
AuthorDate: Thu Jan  7 07:25:08 2021 +
Commit: Keri Harris  gentoo  org>
CommitDate: Thu Jan  7 07:25:08 2021 +
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  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-extras/

2021-01-06 Thread Keri Harris

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

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

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

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

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

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

2021-01-06 Thread Keri Harris

commit: 349242b4933d8833bbad53cad06f933b69e34167
Author: Keri Harris  gentoo  org>
AuthorDate: Wed Jan  6 14:32:01 2021 +
Commit: Keri Harris  gentoo  org>
CommitDate: Wed Jan  6 14:32:19 2021 +
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  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-extras/

2020-09-15 Thread Keri Harris

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

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

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

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

diff --git a/dev-lang/mercury-extras/mercury-extras-20.06.ebuild 
b/dev-lang/mercury-extras/mercury-extras-20.06.ebuild
index 323a4b75ed0..cf0817367fe 100644
--- a/dev-lang/mercury-extras/mercury-extras-20.06.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-20.06.ebuild
@@ -67,11 +67,11 @@ mercury_pkgs() {
net/net:lib:
net/echo:bin:
$(use ssl && echo mopenssl/mopenssl:lib:openssl)
-   $(use odbc && echo odbc/odbc:lib:)
+   $(use odbc && echo odbc/odbc:lib:odbc)
$(use iodbc && echo odbc/odbc:lib:libiodbc)
posix/posix:lib:
$(has_version dev-lang/mercury[trail] && echo \
-   references/global:lib: 
trailed_update/trailed_update:lib:)
+   references/global:lib:)
show_ops/show_ops:bin:
solver_types/library/any:lib:
$(use xml && echo xml/xml:lib:)"
@@ -90,43 +90,33 @@ mercury_pkg_setup() {
 
echo ">> Preparing Mercury package: ${mercury_pkg}"
 
-   if ! test -f "${S}"/${mercury_pkg_dir}/gentoo.params; then
-   echo "LIBGRADES := \$(filter-out java,\$(LIBGRADES))" \
-   > "${S}"/${mercury_pkg_dir}/gentoo.params
-   echo "LIBGRADES := \$(filter-out erlang,\$(LIBGRADES))" \
-   >> "${S}"/${mercury_pkg_dir}/gentoo.params
-   echo "LIBGRADES := \$(filter-out csharp,\$(LIBGRADES))" \
-   >> "${S}"/${mercury_pkg_dir}/gentoo.params
-   echo "include gentoo.params" > 
"${S}"/${mercury_pkg_dir}/Mmakefile
-   fi
+   echo "MCFLAGS += --libgrades-exclude java" \
+   >> "${S}"/${mercury_pkg_dir}/Mercury.options
+   echo "MCFLAGS += --libgrades-exclude erlang" \
+   >> "${S}"/${mercury_pkg_dir}/Mercury.options
+   echo "MCFLAGS += --libgrades-exclude csharp" \
+   >> "${S}"/${mercury_pkg_dir}/Mercury.options
 
if test -n "$mercury_pkg_deps"; then
echo "EXTRA_CFLAGS += $(pkg-config --cflags 
${mercury_pkg_deps/,/ })" \
-   >> "${S}"/${mercury_pkg_dir}/gentoo.params
-   echo "EXTRA_MLLIBS += $(pkg-config --libs ${mercury_pkg_deps/,/ 
})" \
-   >> "${S}"/${mercury_pkg_dir}/gentoo.params
+   >> "${S}"/${mercury_pkg_dir}/Mercury.options
+   echo "EXTRA_LDFLAGS += $(pkg-config --libs 
${mercury_pkg_deps/,/ })" \
+   >> "${S}"/${mercury_pkg_dir}/Mercury.options
fi
 
if test ${mercury_pkg_name} = dl; then
-   echo "EXTRA_MLLIBS = -ldl" >> 
"${S}"/${mercury_pkg_dir}/gentoo.params
+   echo "EXTRA_LDFLAGS += -ldl" >> 
"${S}"/${mercury_pkg_dir}/Mercury.options
elif test ${mercury_pkg_name} = gmp_int; then
-   echo "EXTRA_MLLIBS = -lgmp" >> 
"${S}"/${mercury_pkg_dir}/gentoo.params
+   echo "EXTRA_LDFLAGS += -lgmp" >> 
"${S}"/${mercury_pkg_dir}/Mercury.options
elif test ${mercury_pkg_name} = mercury_tcltk; then
echo "EXTRA_CFLAGS += -DUSE_INTERP_RESULT" \
-   >> "${S}"/${mercury_pkg_dir}/gentoo.params
-   elif test ${mercury_pkg_name} = mopenssl; then
-   local 
net_libdir="${D}/usr/$(get_libdir)/mercury/extras/lib/\$(GRADE)"
-   echo "EXTRA_MLLIBS += -L${net_libdir} -L../net -lnet" \
-   >> "${S}"/${mercury_pkg_dir}/gentoo.params
-   echo "net%:" >> "${S}"/${mercury_pkg_dir}/gentoo.params
-   echo "  cp ../net/\$@ \$@" >> 
"${S}"/${mercury_pkg_dir}/gentoo.params
+   >> "${S}"/${mercury_pkg_dir}/Mercury.options
elif test ${mercury_pkg_name} = odbc && use odbc; then
-   echo "EXTRA_CFLAGS = -DMODBC_UNIX -DMODBC_MYSQL" \
-   >> "${S}"/${mercury_pkg_dir}/Mmakefile
-   echo "EXTRA_MLLIBS = -lodbc" >> 
"${S}"/${mercury_pkg_dir}/gentoo.params
+   echo "EXTRA_CFLAGS += -DMODBC_UNIX -DMODBC_MYSQL" \
+   >> "${S}"/${mercury_pkg_dir}/Mercury.options
elif test ${mercury_pkg_name} = odbc && use iodbc; then
echo "EXTRA_CFLAGS += -DMODBC_IODBC -DMODBC_MYSQL" \
-   >> "${S}"/${mercury_pkg_dir}/gentoo.params
+   >>

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

2020-09-14 Thread Keri Harris

commit: b0f66d83976eedc5f6dc6a37c2296a95d063f9c8
Author: Keri Harris  gentoo  org>
AuthorDate: Mon Sep 14 16:09:21 2020 +
Commit: Keri Harris  gentoo  org>
CommitDate: Mon Sep 14 16:09:40 2020 +
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  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/

2020-09-13 Thread Keri Harris

commit: d1652cd72b7ef2a04a783c56d0648c479b486c0b
Author: Keri Harris  gentoo  org>
AuthorDate: Sun Sep 13 10:46:27 2020 +
Commit: Keri Harris  gentoo  org>
CommitDate: Sun Sep 13 10:48:23 2020 +
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  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 000..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:* )"
+

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

2020-09-13 Thread Keri Harris

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

dev-lang/mercury-extras: version bump

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

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

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

diff --git a/dev-lang/mercury-extras/mercury-extras-20.06.ebuild 
b/dev-lang/mercury-extras/mercury-extras-20.06.ebuild
new file mode 100644
index 000..323a4b75ed0
--- /dev/null
+++ b/dev-lang/mercury-extras/mercury-extras-20.06.ebuild
@@ -0,0 +1,319 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils multilib vcs-clean
+
+PATCHSET_VER="0"
+MY_P=mercury-srcdist-${PV}
+
+DESCRIPTION="Additional libraries and tools that are not part of the Mercury 
standard library"
+HOMEPAGE="https://www.mercurylang.org/index.html;
+SRC_URI="https://dl.mercurylang.org/release/${MY_P}.tar.gz
+   
https://dev.gentoo.org/~keri/distfiles/mercury-extras/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz;
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml"
+REQUIRED_USE="?? ( odbc iodbc )"
+
+RDEPEND="
+   ~dev-lang/mercury-${PV}
+   cairo? ( >=x11-libs/cairo-1.10.0 )
+   gmp? ( dev-libs/gmp:0 )
+   glut? ( media-libs/freeglut )
+   odbc? ( dev-db/unixODBC )
+   iodbc? (

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

2020-07-26 Thread Keri Harris

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

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

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

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

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

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

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

2020-07-24 Thread Keri Harris

commit: d2e5abe0c94cade4df6e0b50c5fd8a346070a893
Author: Keri Harris  gentoo  org>
AuthorDate: Sat Jul 25 04:21:32 2020 +
Commit: Keri Harris  gentoo  org>
CommitDate: Sat Jul 25 04:21:32 2020 +
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  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/

2020-07-23 Thread Keri Harris

commit: fe4e8c82c5af85ea023adcd2d4e60f3bbe12eb6a
Author: Keri Harris  gentoo  org>
AuthorDate: Thu Jul 23 13:41:30 2020 +
Commit: Keri Harris  gentoo  org>
CommitDate: Thu Jul 23 13:42:05 2020 +
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  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-extras/

2020-07-23 Thread Keri Harris

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

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

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

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

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

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

2020-07-19 Thread Keri Harris

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

dev-lang/mercury-extras: version bump

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

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

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

diff --git a/dev-lang/mercury-extras/mercury-extras-20.01.2.ebuild 
b/dev-lang/mercury-extras/mercury-extras-20.01.2.ebuild
new file mode 100644
index 000..99be15c46be
--- /dev/null
+++ b/dev-lang/mercury-extras/mercury-extras-20.01.2.ebuild
@@ -0,0 +1,317 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils multilib vcs-clean
+
+PATCHSET_VER="0"
+MY_P=mercury-srcdist-${PV}
+
+DESCRIPTION="Additional libraries and tools that are not part of the Mercury 
standard library"
+HOMEPAGE="https://www.mercurylang.org/index.html;
+SRC_URI="https://dl.mercurylang.org/release/${MY_P}.tar.gz
+   
https://dev.gentoo.org/~keri/distfiles/mercury-extras/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz;
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml"
+REQUIRED_USE="?? ( odbc iodbc )"
+
+RDEPEND="
+   ~dev-lang/mercury-${PV}
+   cairo? ( >=x11-libs/cairo-1.10.0 )
+   gmp? ( dev-libs/gmp:0 )
+   glut? ( media-libs/freeglut )
+   odbc? ( dev-db/unixODBC )
+   iodbc? ( dev-db/libiodbc )
+   tommath? ( dev-libs/libtommath )
+   ncurses? ( sys-libs/ncurses:= )
+   opengl? (
+   virtual/opengl
+   virtual/glu
+   )
+   tk? (
+   dev-lang/tcl:0
+   dev-lang/tk:0
+   )
+   X? ( x11-libs/libX11 )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}/extras
+
+mercury_pkgs() {
+   echo "
+

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

2020-07-19 Thread Keri Harris

commit: 1d44bd4bc5a4685f6efd4c7487500b29ec900d4a
Author: Keri Harris  gentoo  org>
AuthorDate: Sun Jul 19 20:24:46 2020 +
Commit: Keri Harris  gentoo  org>
CommitDate: Sun Jul 19 20:25:09 2020 +
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  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 000..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

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

2020-04-02 Thread Keri Harris

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

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

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

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

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

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

2020-04-01 Thread Keri Harris

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

dev-lang/mercury-extras: version bump

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

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

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

diff --git a/dev-lang/mercury-extras/mercury-extras-20.01.1.ebuild 
b/dev-lang/mercury-extras/mercury-extras-20.01.1.ebuild
new file mode 100644
index 000..8a9593959ae
--- /dev/null
+++ b/dev-lang/mercury-extras/mercury-extras-20.01.1.ebuild
@@ -0,0 +1,317 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils multilib vcs-clean
+
+PATCHSET_VER="0"
+MY_P=mercury-srcdist-${PV}
+
+DESCRIPTION="Additional libraries and tools that are not part of the Mercury 
standard library"
+HOMEPAGE="http://www.mercurylang.org/index.html;
+SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz
+   mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml"
+REQUIRED_USE="?? ( odbc iodbc )"
+
+RDEPEND="
+   ~dev-lang/mercury-${PV}
+   cairo? ( >=x11-libs/cairo-1.10.0 )
+   gmp? ( dev-libs/gmp:0 )
+   glut? ( media-libs/freeglut )
+   odbc? ( dev-db/unixODBC )
+   iodbc? ( dev-db/libiodbc )
+   tommath? ( dev-libs/libtommath )
+   ncurses? ( sys-libs/ncurses:= )
+   opengl? (
+   virtual/opengl
+   virtual/glu
+   )
+   tk? (
+   dev-lang/tcl:0
+   dev-lang/tk:0
+   )
+   X? ( x11-libs/libX11 )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}/extras
+
+mercury_pkgs() {
+   echo "
+   align_right/align_right:bin:
+   base64/mercury_base64:lib:
+   cgi/mercury_www:lib:
+   complex_numbers/complex_numbers:lib:
+   $(use ncurses && echo \
+   curs/curs:lib:ncurses,panel curses/mcurses:lib:ncurses)
+   dynamic_linking/dl:lib:
+   error/error:bin:
+   fixed/fixed:lib:
+   $(use gmp && echo gmp_int/gmp_int:lib:)
+   $(use tommath && echo mp_int/mp_int:lib:libtommath)
+   $(use X && echo graphics/easyx/easyx:lib:x11)
+   $(use cairo && echo 
graphics/mercury_cairo/mercury_cairo:lib:cairo)
+   $(use

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

2020-04-01 Thread Keri Harris

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

dev-lang/mercury: version bump

Signed-off-by: Keri Harris  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 000..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" >>

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

2020-03-29 Thread Keri Harris

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

dev-lang/mercury-extras: version bump

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

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

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

diff --git a/dev-lang/mercury-extras/mercury-extras-20.01.ebuild 
b/dev-lang/mercury-extras/mercury-extras-20.01.ebuild
new file mode 100644
index 000..8a9593959ae
--- /dev/null
+++ b/dev-lang/mercury-extras/mercury-extras-20.01.ebuild
@@ -0,0 +1,317 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils multilib vcs-clean
+
+PATCHSET_VER="0"
+MY_P=mercury-srcdist-${PV}
+
+DESCRIPTION="Additional libraries and tools that are not part of the Mercury 
standard library"
+HOMEPAGE="http://www.mercurylang.org/index.html;
+SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz
+   mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml"
+REQUIRED_USE="?? ( odbc iodbc )"
+
+RDEPEND="
+   ~dev-lang/mercury-${PV}
+   cairo? ( >=x11-libs/cairo-1.10.0 )
+   gmp? ( dev-libs/gmp:0 )
+   glut? ( media-libs/freeglut )
+   odbc? ( dev-db/unixODBC )
+   iodbc? ( dev-db/libiodbc )
+   tommath? ( dev-libs/libtommath )
+   ncurses? ( sys-libs/ncurses:= )
+   opengl? (
+   virtual/opengl
+   virtual/glu
+   )
+   tk? (
+   dev-lang/tcl:0
+   dev-lang/tk:0
+   )
+   X? ( x11-libs/libX11 )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}/extras
+
+mercury_pkgs() {
+   echo "
+   align_right/align_right:bin:
+   base64/mercury_base64:lib:
+   cgi/mercury_www:lib:
+   complex_numbers/complex_numbers:lib:
+   $(use ncurses && echo \
+   curs/curs:lib:ncurses,panel curses/mcurses:lib:ncurses)
+   dynamic_linking/dl:lib:
+   error/error:bin:
+   fixed/fixed:lib:
+   $(use gmp && echo gmp_int/gmp_int:lib:)
+   $(use tommath && echo mp_int/mp_int:lib:libtommath)
+   $(use X && echo graphics/easyx/easyx:lib:x11)
+   $(use cairo && echo 
graphics/mercury_cairo/mercury_cairo:lib:cairo)
+   $(use glut && echo 
graphics/mercury_glut/mercury_glut:lib:freeglut)
+   $(use opengl && echo 
graphics/mercury_opengl/mercury_opengl:lib:gl,glu)
+   $(use tk && echo graphics/mercury_tcltk/mercury_tcltk:lib:tk)
+   lex/lex:lib:
+   lex/regex:lib:
+   moose/moose:bin:
+   net/net:lib:
+   net/echo:bin:
+   $(use ssl && echo mopenssl/mopenssl:lib:openssl)
+   $(use odbc && echo odbc/odbc:lib:)
+   $(use iodbc && echo odbc/odbc:lib:libiodbc)
+   posix/posix:lib:
+

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

2020-03-29 Thread Keri Harris

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

dev-lang/mercury: version bump

Signed-off-by: Keri Harris  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 000..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 \
+

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

2020-03-22 Thread Keri Harris

commit: ce83ade5c169cbdc0d40841e3e150a0c0671672c
Author: Keri Harris  gentoo  org>
AuthorDate: Sun Mar 22 13:30:11 2020 +
Commit: Keri Harris  gentoo  org>
CommitDate: Sun Mar 22 13:30:47 2020 +
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  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-extras/

2020-03-21 Thread Keri Harris

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

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

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

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

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

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

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

2020-03-21 Thread Keri Harris

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

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

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

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

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

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

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

2020-03-21 Thread Keri Harris

commit: b5beaa03f0b86411a925078e232f825471189336
Author: Keri Harris  gentoo  org>
AuthorDate: Sat Mar 21 12:24:17 2020 +
Commit: Keri Harris  gentoo  org>
CommitDate: Sat Mar 21 12:24:35 2020 +
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  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/

2020-02-12 Thread David Seifert

commit: 57e609cfaf7d0d13ae986d6660b6df59a7cf514a
Author: David Seifert  gentoo  org>
AuthorDate: Wed Feb 12 18:02:21 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Feb 12 18:02:21 2020 +
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  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-extras/

2020-02-12 Thread David Seifert

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

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

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

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

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

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

2019-12-30 Thread Sergei Trofimovich

commit: 936d69cdde5f02975d29795b7356f580f41d6739
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Dec 30 22:47:55 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Dec 30 22:50:22 2019 +
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  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-extras/

2019-04-15 Thread Keri Harris

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

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

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

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

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

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

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

2018-10-28 Thread Keri Harris

commit: d894d3afc2800e3cc34bd4a4594f52d553b40374
Author: Keri Harris  gentoo  org>
AuthorDate: Sun Oct 28 18:01:53 2018 +
Commit: Keri Harris  gentoo  org>
CommitDate: Sun Oct 28 18:02:49 2018 +
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  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/

2018-10-27 Thread Keri Harris

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

dev-lang/mercury: remove old versions

Signed-off-by: Keri Harris  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..000
--- 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}'" \
-

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

2018-10-27 Thread Keri Harris

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

dev-lang/mercury-extras: remove old versions

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

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

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

diff --git a/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild 
b/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild
deleted file mode 100644
index a3abc55dadf..000
--- a/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils multilib
-
-PATCHSET_VER="3"
-MY_P=mercury-srcdist-${PV}
-
-DESCRIPTION="Additional libraries and tools that are not part of the Mercury 
standard library"
-HOMEPAGE="http://www.mercurylang.org/index.html;
-SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz
-   mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="X cairo examples glut iodbc ncurses odbc opengl ssl tcl tk xml"
-
-RDEPEND="~dev-lang/mercury-${PV}
-   cairo? ( >=x11-libs/cairo-1.10.0 )
-   glut? ( media-libs/freeglut )
-   odbc? ( dev-db/unixODBC )
-   iodbc? ( !odbc? ( dev-db/libiodbc ) )
-   ncurses? ( sys-libs/ncurses )
-   opengl? (
-   virtual/opengl
-   virtual/glu
-   )
-   tcl? ( tk? (
-   dev-lang/tcl:0
-   dev-lang/tk:0
-   x11-libs/libX11
-   x11-libs/libXmu
-   )
-   )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}/extras
-
-src_prepare() {
-   cd "${WORKDIR}"
-
-   EPATCH_FORCE=yes
-   EPATCH_SUFFIX=patch
-   epatch "${WORKDIR}"/${PV}
-
-   if use odbc; then
-   epatch "${WORKDIR}"/${PV}-odbc/${P}-odbc.patch
-   elif use iodbc; then
-   epatch "${WORKDIR}"/${PV}-odbc/${P}-iodbc.patch
-   fi
-
-   cd "${S}"
-   sed -i  -e "s:references:references solver_types/library:" \
-   -e "s:windows_installer_generator::" \
-   Mmakefile || die "sed default packages failed"
-
-   if use cairo; then
-   sed -i -e "s:lex[ \t]*:graphics/mercury_cairo lex :" 
Mmakefile \
-

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

2018-10-23 Thread Keri Harris

commit: c0bf824f276438bbbe039c4b45000a075c56beee
Author: Keri Harris  gentoo  org>
AuthorDate: Tue Oct 23 07:27:00 2018 +
Commit: Keri Harris  gentoo  org>
CommitDate: Tue Oct 23 07:32:20 2018 +
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  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/

2018-09-09 Thread Thomas Deutschmann

commit: 689e0cb93fd7b90518f82c9631033995e3f69355
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Sep  9 22:46:10 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Sep  9 22:46:10 2018 +
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-extras/

2018-09-09 Thread Thomas Deutschmann

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

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

Package-Manager: Portage-2.3.49, Repoman-2.3.10

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

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

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

2018-09-09 Thread Keri Harris

commit: ca5466aefb2f11bea52231abfa0ea7488a3cc057
Author: Keri Harris  gentoo  org>
AuthorDate: Sun Sep  9 14:27:11 2018 +
Commit: Keri Harris  gentoo  org>
CommitDate: Sun Sep  9 14:27:37 2018 +
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-extras/

2018-09-03 Thread Keri Harris

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

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

Package-Manager: Portage-2.3.40, Repoman-2.3.9

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

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

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

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

2018-07-21 Thread Keri Harris

commit: 4eda54c4fa871957f3f3729141ca1695163ff5e7
Author: Keri Harris  gentoo  org>
AuthorDate: Sat Jul 21 06:39:35 2018 +
Commit: Keri Harris  gentoo  org>
CommitDate: Sat Jul 21 06:39:35 2018 +
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/

2018-07-19 Thread Keri Harris

commit: 6d5d2c9108c97e996c4ca920d58f3d16e697da18
Author: Keri Harris  gentoo  org>
AuthorDate: Thu Jul 19 08:55:26 2018 +
Commit: Keri Harris  gentoo  org>
CommitDate: Thu Jul 19 08:55:53 2018 +
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-extras/

2018-07-17 Thread Keri Harris

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

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

Package-Manager: Portage-2.3.40, Repoman-2.3.9

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

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

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

2018-07-17 Thread Keri Harris

commit: 30afff5b2ad90bbb71a18e69e955a3bca9f9c02b
Author: Keri Harris  gentoo  org>
AuthorDate: Tue Jul 17 11:24:05 2018 +
Commit: Keri Harris  gentoo  org>
CommitDate: Tue Jul 17 11:24:22 2018 +
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/

2018-07-16 Thread Keri Harris

commit: 1e49d9a72ee97e6b4325f81b8fbd541ee4f341e8
Author: Keri Harris  gentoo  org>
AuthorDate: Mon Jul 16 19:45:20 2018 +
Commit: Keri Harris  gentoo  org>
CommitDate: Mon Jul 16 19:45:43 2018 +
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} \
+

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

2017-11-03 Thread Andreas Hüttel

commit: 242daa256decc13d070e5f42ac1481a0bb0719c8
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Fri Nov  3 20:43:26 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Fri Nov  3 20:44:38 2017 +
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/

2017-10-01 Thread Keri Harris

commit: eeeab1a8ebfb0d3ac9c34bdf0eb272d68ef6e672
Author: Keri Harris  gentoo  org>
AuthorDate: Sun Oct  1 16:26:16 2017 +
Commit: Keri Harris  gentoo  org>
CommitDate: Sun Oct  1 16:26:34 2017 +
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 
7b859eb5c7c1194d63c0aac3686c57436100b5618ae31a901119a33443363acb80a908a15dfdfa8b61fd9ccb4e552cbb972a3cc735b7a768ee7c9b1b6091
 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" \

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

2017-09-30 Thread Keri Harris

commit: c2fba202b9fdcdcf0e40340908fe86feff818edd
Author: Keri Harris  gentoo  org>
AuthorDate: Sat Sep 30 13:03:08 2017 +
Commit: Keri Harris  gentoo  org>
CommitDate: Sat Sep 30 13:03:24 2017 +
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/

2017-09-30 Thread Keri Harris

commit: 940d71899dc80882ebdaeab62fd79e647e851dce
Author: Keri Harris  gentoo  org>
AuthorDate: Sat Sep 30 11:32:16 2017 +
Commit: Keri Harris  gentoo  org>
CommitDate: Sat Sep 30 11:32:16 2017 +
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 
7b859eb5c7c1194d63c0aac3686c57436100b5618ae31a901119a33443363acb80a908a15dfdfa8b61fd9ccb4e552cbb972a3cc735b7a768ee7c9b1b6091
 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 000..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

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

2017-09-30 Thread Keri Harris

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

dev-lang/mercury-extras: version bump

Package-Manager: Portage-2.3.8, Repoman-2.3.1

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

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

diff --git a/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild 
b/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
new file mode 100644
index 000..0fb9ffe07f2
--- /dev/null
+++ b/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib
+
+PATCHSET_VER="0"
+MY_P=mercury-srcdist-${PV}
+
+DESCRIPTION="Additional libraries and tools that are not part of the Mercury 
standard library"
+HOMEPAGE="http://www.mercurylang.org/index.html;
+SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz
+   mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="X cairo examples glut iodbc ncurses odbc opengl ssl tcl tk xml"
+
+RDEPEND="~dev-lang/mercury-${PV}
+   cairo? ( >=x11-libs/cairo-1.10.0 )
+   glut? ( media-libs/freeglut )
+   odbc? ( dev-db/unixODBC )
+   iodbc? ( !odbc? ( dev-db/libiodbc ) )
+   ncurses? ( sys-libs/ncurses:= )
+   opengl? (
+   virtual/opengl
+   virtual/glu
+   )
+   tcl? ( tk? (
+   dev-lang/tcl:0
+   dev-lang/tk:0
+   x11-libs/libX11
+   x11-libs/libXmu
+   )
+   )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}/extras
+
+mercury_pkgs()
+{
+   echo   "base64
+   cgi
+   complex_numbers
+   dynamic_linking
+   error
+   fixed
+   lex
+   moose
+   posix
+   solver_types/library
+   $(use ncurses && echo curs curses)
+   $(use glut &&

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

2017-09-28 Thread Keri Harris

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

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

Package-Manager: Portage-2.3.8, Repoman-2.3.1

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

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

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

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

2017-09-27 Thread Keri Harris

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

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

Package-Manager: Portage-2.3.8, Repoman-2.3.1

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

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

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

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

2017-09-27 Thread Keri Harris

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

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

Package-Manager: Portage-2.3.8, Repoman-2.3.1

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

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

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

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

2017-09-26 Thread Keri Harris

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

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

Package-Manager: Portage-2.3.8, Repoman-2.3.1

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

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

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

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

2017-09-26 Thread Keri Harris

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

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

Package-Manager: Portage-2.3.8, Repoman-2.3.1

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

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

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

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

2017-09-26 Thread Keri Harris

commit: 6c1c7d835bc38a4b1e6039d43b1131acc612ed96
Author: Keri Harris  gentoo  org>
AuthorDate: Tue Sep 26 18:44:53 2017 +
Commit: Keri Harris  gentoo  org>
CommitDate: Tue Sep 26 18:45:15 2017 +
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-extras/

2017-09-26 Thread Keri Harris

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

dev-lang/mercury-extras: version bump

Package-Manager: Portage-2.3.8, Repoman-2.3.1

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

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

diff --git a/dev-lang/mercury-extras/mercury-extras-14.01.ebuild 
b/dev-lang/mercury-extras/mercury-extras-14.01.ebuild
new file mode 100644
index 000..3b4938613ef
--- /dev/null
+++ b/dev-lang/mercury-extras/mercury-extras-14.01.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib
+
+PATCHSET_VER="0"
+MY_P=mercury-srcdist-${PV}
+
+DESCRIPTION="Additional libraries and tools that are not part of the Mercury 
standard library"
+HOMEPAGE="http://www.mercurylang.org/index.html;
+SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz
+   mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="X cairo examples glut iodbc ncurses odbc opengl ssl tcl tk xml"
+
+RDEPEND="~dev-lang/mercury-${PV}
+   cairo? ( >=x11-libs/cairo-1.10.0 )
+   glut? ( media-libs/freeglut )
+   odbc? ( dev-db/unixODBC )
+   iodbc? ( !odbc? ( dev-db/libiodbc ) )
+   ncurses? ( sys-libs/ncurses:= )
+   opengl? ( virtual/opengl )
+   tcl? ( tk? (
+   dev-lang/tcl:0
+   dev-lang/tk:0
+   x11-libs/libX11
+   x11-libs/libXmu ) )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}/extras
+
+mercury_pkgs()
+{
+   echo   "base64
+   cgi
+   complex_numbers
+   dynamic_linking
+   error
+   fixed
+   lex
+   moose
+   posix
+   solver_types/library
+   $(use ncurses && echo curs curses)
+   $(use glut && echo graphics/mercury_glut)
+   $(use opengl && echo graphics/mercury_opengl)
+   $(use tcl && use tk && echo graphics/mercury_tcltk)
+   $(use odbc && echo odbc || use iodbc && echo odbc)
+   $(has_version dev-lang/mercury[-minimal] && echo references)
+   $(usev xml)"
+}
+
+src_prepare() {
+   cd "${WORKDIR}"
+
+   EPATCH_FORCE=yes
+   EPATCH_SUFFIX=patch
+   if [[ -d "${WORKDIR}"/${PV} ]] ; then
+   epatch "${WORKDIR}"/${PV}
+   fi
+
+   cd "${S}"
+   if use odbc; then
+   cp odbc/Mmakefile.odbc odbc/Mmakefile
+   elif use iodbc; then
+   cp odbc/Mmakefile.iodbc odbc/Mmakefile
+   fi
+}
+
+src_compile() {
+   local MERCURY_PKGS="$(mercury_pkgs)"
+
+   # Mercury dependency generation must be run single-threaded
+   mmake -j1 \
+

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

2017-09-26 Thread Keri Harris

commit: 31ff53a17e4106d5b26287d047fd077f7ccbef7d
Author: Keri Harris  gentoo  org>
AuthorDate: Tue Sep 26 17:26:55 2017 +
Commit: Keri Harris  gentoo  org>
CommitDate: Tue Sep 26 17:26:55 2017 +
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 000..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
+

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

2017-09-25 Thread Keri Harris

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

dev-lang/mercury-extras: remove old versions

Package-Manager: Portage-2.3.8, Repoman-2.3.1

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

diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index ca06916e9ef..db3f6b5f51e 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,14 +1,2 @@
-DIST mercury-extras-11.01-gentoo-patchset-2.tar.gz 5005 SHA256 
68e8a358a75527823a7c7f119ac0104acb0702263178f27be659c6b1d09cb46c SHA512 
f8d434893cf63f6d49fcb2e527debf0f671a11249333afc3320c7e4c19efb5205606060350da93e57ba10bd27dacbe684e1c3b6909f049caa1b14acf292173ba
 WHIRLPOOL 
e2dd61ace52d0009109c16e1fbf1c1bf2afcb757977ae2c9247262a7ae7b6cc33cf6d51c83ce930f6fef5b9f3f7835cbbd559ccc6c50098d17c5737857ee5830
-DIST mercury-extras-11.01.tar.gz 777185 SHA256 
52eb6758e2136eb288329917d4c352da98e9ce0e951d6a5c884919bf8e85b1b1 SHA512 
790864bba746f53a7285ae648fcf86e7a14761ed8369536a7d05175fcf58dc67f95bcfbd13266e3b86b9475e871fd28e2b277910e4f0d72c3efe4b5f3cc16269
 WHIRLPOOL 
fec77ffc070be51c6e5dfec1ffb18dfa4a622f87b36f062c7b5eb0175d0bf2275e37d2fd7c901b594ae1b4212eb5383c324640694db2a3adef70a615f2352a48
-DIST mercury-extras-11.07-gentoo-patchset-0.tar.gz 4886 SHA256 
25452b2489ac260084735d738972c5d286c63e54ecd1a14cc26890f902714966 SHA512 
dca2ae9ebae05f49ca79bd6fba510fdea25d94974d40835588174dac30667fffc5f982864888180434b7b35f6e545fbf3295caae2543f4f637a84e6ddf79a7c8
 WHIRLPOOL 
789fa90f8fcb75603290fb693335000f643cf6b3405242dc833e73baf53f82f5836f00c5fa4b92dfaeb076c36b853a02835e224c708d98e66012c8f8d332fa60
-DIST mercury-extras-11.07.1-gentoo-patchset-0.tar.gz 5114 SHA256 
8236342a8e9fc36794401ccbe30c58d351fa6f3663cb5febbcb45742b978b49a SHA512 
b9d0774466e68b9aa4b3e8a22347f8d41b8ea4cc0b328fcb794b158563dac448f46e5dc1638dae3d1345a71534debcf7bfcfe4a1597b235851bf77b58e7ed23c
 WHIRLPOOL 
de588622eefec04cce6d610defcba37bb95a2e0f7e0527d68c412c1d55529686fab3e801f2f81805ddb621d3ec2c1cbd9db16c5a736682a7ae142287f3054f00
-DIST mercury-extras-11.07.1.tar.gz 776828 SHA256 
cda5891e6143f34ec0639f296c0080e252bc18e59c663143750945a033eaa54c SHA512 
cfa7690f4399bff98c0b56705f6b85af7409a7770e3af8b3f7dbf622300b756b0878b9b1bf46bf3953d6318c6e9f8ba6c57b125d180619c1e98e92d225a7351f
 WHIRLPOOL 
9eb64278188ab9cd0bf37ef32be639cb3c71b2aa24c4929dcd6f9b1f2045de4ee79045b8344716cc89ac1c2d174b852ee411a538c49f77e846ee0b0b970fe751
-DIST mercury-extras-11.07.2-gentoo-patchset-3.tar.gz 5320 SHA256 
c6d0e12325e4bff9bd1d16c364c15d7c593c349bf175c08bab5d9a6214202110 SHA512 
666fe82a34191d1ab68e23bf81fa1dd811ddda29033503a32432caee4610b8d0adbbb5950c344c4f6a9d74c15f6959a5d0d5179e6b8d4715ef45761a3d4b4e28
 WHIRLPOOL 
2d1731073b823a96e502fd798229d3748febaaff3bfe5f3c7160d3881ee4faa05da31018ebabdacdb179b3030bc723ed2e7edcd0b7c734787d81667640cec098
-DIST mercury-extras-11.07.2.tar.gz 774067 SHA256 
424cd1e642a49f4c463e20851ba185ce60186c7c46aed96c7f32f55e41ae482b SHA512 
162358a22f020f61310c29aa61c480fee0a02aff2749a89956493bed43aafe89e92427578697eb1e8e43e73acde1d19f1b9bc85705ff448e5fa8cdaf92b749c5
 WHIRLPOOL 
24b7093a2ed72441aafd3a1ffa84c5b9458d5fddaedb1eb46dcb66e52cc21dc0dd5ded14067c0b0be040ae5de0a14ebf5341b5c87720390b5892a872f32e9d11
-DIST mercury-extras-11.07.tar.gz 776589 SHA256 
25eaf999666ceb4217cfe0f9fbcb38b892c57fb36efaa16099a471287a7a9019 SHA512 
ea2c3231cbb32dc91f36d1d09a5bdac65b468bff64f79aab46baa0e7e9460f75fa5239c96b5b2a616aebb499954b62d8ac7acea93fa971df1e7d81955ca0c5ea
 WHIRLPOOL 
9617163e15b44bf373d5e9204dd8882c4921ed56a38ec41aabd7a81eda1aebedade70e7cfa0eeb21d46349e64fc9ed565cb1eb12dd49c98b8d5dfacdb49fd229
-DIST mercury-extras-13.05-gentoo-patchset-0.tar.gz 6333 SHA256 
36d286a20f70e21262ac8d19004400df0a356ef7a85763027ef36f16d7de17cc SHA512 
78c1391607e1a8a76c091deef112e9c4e0004fb63b9fe461c3100f2dd6ca03efe069036b081b4de8b4399052a1b10f0ef02188cc2def3d47f6aceb1b61c168c3
 WHIRLPOOL 
72b16b5948b2fb8048496f094e0c2343af0723f33ebbd024a7e8c0785fc949b2226f3ef78fba16a65903b1675f1280f6a3d35dab1d276203b845f140ccd3e4a7
-DIST mercury-extras-13.05.1-gentoo-patchset-0.tar.gz 3423 SHA256 
b15b87c86313e9a038f6ab55c9b47bc9f8eaca51aedf578a9d9e6ab1dc785d9b SHA512

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

2017-09-25 Thread Keri Harris

commit: 169d25bcff633b4249035c9f2d112fb502313a6d
Author: Keri Harris  gentoo  org>
AuthorDate: Mon Sep 25 10:07:38 2017 +
Commit: Keri Harris  gentoo  org>
CommitDate: Mon Sep 25 10:07:38 2017 +
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

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

2017-09-25 Thread Keri Harris

commit: e04ed4f2821cd87a7983d8bf190d24afc7b6a9ed
Author: Keri Harris  gentoo  org>
AuthorDate: Mon Sep 25 06:37:06 2017 +
Commit: Keri Harris  gentoo  org>
CommitDate: Mon Sep 25 06:37:31 2017 +
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-extras/

2017-01-23 Thread Agostino Sarubbo

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

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

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

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

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

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

2017-01-23 Thread Agostino Sarubbo

commit: 1dfd33ce6f58070ac764ac8e395d6adf1035be35
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Jan 23 15:44:12 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Jan 23 15:44:12 2017 +
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  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-extras/

2017-01-23 Thread Agostino Sarubbo

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

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

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

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

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

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

2017-01-23 Thread Agostino Sarubbo

commit: e425a3d20045aa28a5a91df4e6aef6fb275f35df
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Jan 23 13:48:44 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Jan 23 13:50:57 2017 +
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  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/

2016-01-22 Thread Justin Lecher

commit: 0dbd28d2e94105b4faaea44fc578ecbc8874efb4
Author: Justin Lecher  gentoo  org>
AuthorDate: Fri Jan 22 19:00:56 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Fri Jan 22 21:03:03 2016 +
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  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

83 matches

Mail list logo