[gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/

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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2017-04-03 10:22 Alexis Ballier
  0 siblings, 0 replies; 44+ messages in thread
From: Alexis Ballier @ 2017-04-03 10:22 UTC (permalink / raw
  To: gentoo-commits

commit:     461ea5502f9d20518d38584fd1e9f62dcbc66557
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  3 10:22:23 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Apr  3 10:22:48 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=461ea550

dev-ml/merlin: Initial import

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-ml/merlin/Manifest            |  1 +
 dev-ml/merlin/merlin-2.5.3.ebuild | 33 +++++++++++++++++++++++++++++++++
 dev-ml/merlin/metadata.xml        |  8 ++++++++
 3 files changed, 42 insertions(+)

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
new file mode 100644
index 00000000000..c943d1c23c3
--- /dev/null
+++ b/dev-ml/merlin/Manifest
@@ -0,0 +1 @@
+DIST merlin-2.5.3.tar.gz 3090459 SHA256 3538a02ad025090240825596fc4e1f86806d3808154d3135b090cc1a1192c2ca SHA512 7399b8afc3cd6c0c26fab44aec80cc7614cbe148bafea3512be9a4165b0ba0c93bc738e2d7e5dcc4b51208c9b9f185cc83e408c484e38b2e72e357cefb9ad5f0 WHIRLPOOL 33f7a83f9bcdcfab4f681dddb6153d0aa7c9177b733e26a24119e50bb3521e310e831bbfbcdde24e27c7cf8a5c778384b6e65e947bee0c0852d1e184e56df9e5

diff --git a/dev-ml/merlin/merlin-2.5.3.ebuild b/dev-ml/merlin/merlin-2.5.3.ebuild
new file mode 100644
index 00000000000..609f9767e4c
--- /dev/null
+++ b/dev-ml/merlin/merlin-2.5.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib vim-plugin
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-lang/ocaml:=
+	dev-ml/yojson:=
+"
+RDEPEND="${DEPEND}
+	|| ( app-editors/vim[python] app-editors/gvim[python] )"
+
+src_configure() {
+	./configure \
+		--prefix "${EPREFIX}/usr" \
+		--vimdir "${EPREFIX}//usr/share/vim/vimfiles" \
+		|| die
+}
+
+src_install() {
+	default
+}

diff --git a/dev-ml/merlin/metadata.xml b/dev-ml/merlin/metadata.xml
new file mode 100644
index 00000000000..ffac4d7ebc0
--- /dev/null
+++ b/dev-ml/merlin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2017-04-25 17:32 Alexis Ballier
  0 siblings, 0 replies; 44+ messages in thread
From: Alexis Ballier @ 2017-04-25 17:32 UTC (permalink / raw
  To: gentoo-commits

commit:     f056a530513094c1621bbfde63ce65dfd80bfba4
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 25 16:37:17 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 17:32:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f056a530

dev-ml/merlin: bump to 2.5.4

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-ml/merlin/Manifest            |  1 +
 dev-ml/merlin/merlin-2.5.4.ebuild | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index c943d1c23c3..1f854647868 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -1 +1,2 @@
 DIST merlin-2.5.3.tar.gz 3090459 SHA256 3538a02ad025090240825596fc4e1f86806d3808154d3135b090cc1a1192c2ca SHA512 7399b8afc3cd6c0c26fab44aec80cc7614cbe148bafea3512be9a4165b0ba0c93bc738e2d7e5dcc4b51208c9b9f185cc83e408c484e38b2e72e357cefb9ad5f0 WHIRLPOOL 33f7a83f9bcdcfab4f681dddb6153d0aa7c9177b733e26a24119e50bb3521e310e831bbfbcdde24e27c7cf8a5c778384b6e65e947bee0c0852d1e184e56df9e5
+DIST merlin-2.5.4.tar.gz 3094234 SHA256 e4e53f680e5e143ed0fb1a5dee4aba2e39e65e2d5619247526b85f5d6cc77e00 SHA512 ca6a1cc1da0b0211bac4f0e8b9c78b531fdd0ed97f7d978ae740b7bf7a97bb02d318bde97d8a9f143b6207b72bd47eb626748b86feebf6a60bcd222d5bddb759 WHIRLPOOL 50c33f65da5dfa9949fa1e21360580f52d5d73092a5ec791085bc53d9d834765a745d8f14a9df8717812d0f565c6c871a38a624e7ae885f7367effabcfb99daa

diff --git a/dev-ml/merlin/merlin-2.5.4.ebuild b/dev-ml/merlin/merlin-2.5.4.ebuild
new file mode 100644
index 00000000000..609f9767e4c
--- /dev/null
+++ b/dev-ml/merlin/merlin-2.5.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib vim-plugin
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-lang/ocaml:=
+	dev-ml/yojson:=
+"
+RDEPEND="${DEPEND}
+	|| ( app-editors/vim[python] app-editors/gvim[python] )"
+
+src_configure() {
+	./configure \
+		--prefix "${EPREFIX}/usr" \
+		--vimdir "${EPREFIX}//usr/share/vim/vimfiles" \
+		|| die
+}
+
+src_install() {
+	default
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2017-06-15  8:49 Alexis Ballier
  0 siblings, 0 replies; 44+ messages in thread
From: Alexis Ballier @ 2017-06-15  8:49 UTC (permalink / raw
  To: gentoo-commits

commit:     8bedda265f99963762de244d1e3d77c9a6e07c84
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 15 08:13:31 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jun 15 08:49:42 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bedda26

dev-ml/merlin: bump to 2.5.5

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-ml/merlin/Manifest            |  1 +
 dev-ml/merlin/merlin-2.5.5.ebuild | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index 1f854647868..af411583cad 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -1,2 +1,3 @@
 DIST merlin-2.5.3.tar.gz 3090459 SHA256 3538a02ad025090240825596fc4e1f86806d3808154d3135b090cc1a1192c2ca SHA512 7399b8afc3cd6c0c26fab44aec80cc7614cbe148bafea3512be9a4165b0ba0c93bc738e2d7e5dcc4b51208c9b9f185cc83e408c484e38b2e72e357cefb9ad5f0 WHIRLPOOL 33f7a83f9bcdcfab4f681dddb6153d0aa7c9177b733e26a24119e50bb3521e310e831bbfbcdde24e27c7cf8a5c778384b6e65e947bee0c0852d1e184e56df9e5
 DIST merlin-2.5.4.tar.gz 3094234 SHA256 e4e53f680e5e143ed0fb1a5dee4aba2e39e65e2d5619247526b85f5d6cc77e00 SHA512 ca6a1cc1da0b0211bac4f0e8b9c78b531fdd0ed97f7d978ae740b7bf7a97bb02d318bde97d8a9f143b6207b72bd47eb626748b86feebf6a60bcd222d5bddb759 WHIRLPOOL 50c33f65da5dfa9949fa1e21360580f52d5d73092a5ec791085bc53d9d834765a745d8f14a9df8717812d0f565c6c871a38a624e7ae885f7367effabcfb99daa
+DIST merlin-2.5.5.tar.gz 3094071 SHA256 5730cc1128bf6cf0af63985178307bbfd684bb5a03dc9dd62f14e4d3f8ae3d89 SHA512 9ba79f2fd2e2cdefe94da60b52096696bf08dcfd332188496c35074377a106bb3987025069784a96846a6c1cef1c0793b0525781aed8192227dd0c67266baaf1 WHIRLPOOL 263f0adb685d361cc72f99f9ff43dad75a54c92ff1341e12fa2b199c6a4351549e5fe1f13be22fe5053822179efaf0ead92a0f579910a85d36e7971bb2881baa

diff --git a/dev-ml/merlin/merlin-2.5.5.ebuild b/dev-ml/merlin/merlin-2.5.5.ebuild
new file mode 100644
index 00000000000..609f9767e4c
--- /dev/null
+++ b/dev-ml/merlin/merlin-2.5.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib vim-plugin
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-lang/ocaml:=
+	dev-ml/yojson:=
+"
+RDEPEND="${DEPEND}
+	|| ( app-editors/vim[python] app-editors/gvim[python] )"
+
+src_configure() {
+	./configure \
+		--prefix "${EPREFIX}/usr" \
+		--vimdir "${EPREFIX}//usr/share/vim/vimfiles" \
+		|| die
+}
+
+src_install() {
+	default
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2017-07-25 18:14 Alexis Ballier
  0 siblings, 0 replies; 44+ messages in thread
From: Alexis Ballier @ 2017-07-25 18:14 UTC (permalink / raw
  To: gentoo-commits

commit:     5b59649804c07f9f9603fcf4bd898b854401b111
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 25 13:54:35 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Jul 25 18:13:55 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b596498

dev-ml/merlin: bump to 3.0.0

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-ml/merlin/Manifest            |  1 +
 dev-ml/merlin/merlin-3.0.0.ebuild | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index af411583cad..95bd984488a 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -1,3 +1,4 @@
 DIST merlin-2.5.3.tar.gz 3090459 SHA256 3538a02ad025090240825596fc4e1f86806d3808154d3135b090cc1a1192c2ca SHA512 7399b8afc3cd6c0c26fab44aec80cc7614cbe148bafea3512be9a4165b0ba0c93bc738e2d7e5dcc4b51208c9b9f185cc83e408c484e38b2e72e357cefb9ad5f0 WHIRLPOOL 33f7a83f9bcdcfab4f681dddb6153d0aa7c9177b733e26a24119e50bb3521e310e831bbfbcdde24e27c7cf8a5c778384b6e65e947bee0c0852d1e184e56df9e5
 DIST merlin-2.5.4.tar.gz 3094234 SHA256 e4e53f680e5e143ed0fb1a5dee4aba2e39e65e2d5619247526b85f5d6cc77e00 SHA512 ca6a1cc1da0b0211bac4f0e8b9c78b531fdd0ed97f7d978ae740b7bf7a97bb02d318bde97d8a9f143b6207b72bd47eb626748b86feebf6a60bcd222d5bddb759 WHIRLPOOL 50c33f65da5dfa9949fa1e21360580f52d5d73092a5ec791085bc53d9d834765a745d8f14a9df8717812d0f565c6c871a38a624e7ae885f7367effabcfb99daa
 DIST merlin-2.5.5.tar.gz 3094071 SHA256 5730cc1128bf6cf0af63985178307bbfd684bb5a03dc9dd62f14e4d3f8ae3d89 SHA512 9ba79f2fd2e2cdefe94da60b52096696bf08dcfd332188496c35074377a106bb3987025069784a96846a6c1cef1c0793b0525781aed8192227dd0c67266baaf1 WHIRLPOOL 263f0adb685d361cc72f99f9ff43dad75a54c92ff1341e12fa2b199c6a4351549e5fe1f13be22fe5053822179efaf0ead92a0f579910a85d36e7971bb2881baa
+DIST merlin-3.0.0.tar.gz 3971353 SHA256 dc215cc974e41e21e47d02497b67b94a2ac1682295c5f8ec58de753b9de67dbb SHA512 674495c01d4afef8273e904f656475d1e05e6c06b9f8a39ce2e3eb8aacd870a2e721ba510dccd2d9d154f5b6fbfb42840603d189819a573d136a3bcc85ff4551 WHIRLPOOL 94992412ac18fef020539738f19bd8a529f526cb589e53ebd8f55179f3b56467e690b1434b73590ea5fcb4efab90c0d33bfcea990ede9d745fd95024061d8da0

diff --git a/dev-ml/merlin/merlin-3.0.0.ebuild b/dev-ml/merlin/merlin-3.0.0.ebuild
new file mode 100644
index 00000000000..609f9767e4c
--- /dev/null
+++ b/dev-ml/merlin/merlin-3.0.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib vim-plugin
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-lang/ocaml:=
+	dev-ml/yojson:=
+"
+RDEPEND="${DEPEND}
+	|| ( app-editors/vim[python] app-editors/gvim[python] )"
+
+src_configure() {
+	./configure \
+		--prefix "${EPREFIX}/usr" \
+		--vimdir "${EPREFIX}//usr/share/vim/vimfiles" \
+		|| die
+}
+
+src_install() {
+	default
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2017-07-29 10:06 Alexis Ballier
  0 siblings, 0 replies; 44+ messages in thread
From: Alexis Ballier @ 2017-07-29 10:06 UTC (permalink / raw
  To: gentoo-commits

commit:     64903f4f98760c3cf30446a2e895327321c3af48
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 28 08:28:38 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sat Jul 29 10:05:37 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64903f4f

dev-ml/merlin: bump to 3.0.1

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-ml/merlin/Manifest            |  1 +
 dev-ml/merlin/merlin-3.0.1.ebuild | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index 95bd984488a..d5328dfb465 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -2,3 +2,4 @@ DIST merlin-2.5.3.tar.gz 3090459 SHA256 3538a02ad025090240825596fc4e1f86806d3808
 DIST merlin-2.5.4.tar.gz 3094234 SHA256 e4e53f680e5e143ed0fb1a5dee4aba2e39e65e2d5619247526b85f5d6cc77e00 SHA512 ca6a1cc1da0b0211bac4f0e8b9c78b531fdd0ed97f7d978ae740b7bf7a97bb02d318bde97d8a9f143b6207b72bd47eb626748b86feebf6a60bcd222d5bddb759 WHIRLPOOL 50c33f65da5dfa9949fa1e21360580f52d5d73092a5ec791085bc53d9d834765a745d8f14a9df8717812d0f565c6c871a38a624e7ae885f7367effabcfb99daa
 DIST merlin-2.5.5.tar.gz 3094071 SHA256 5730cc1128bf6cf0af63985178307bbfd684bb5a03dc9dd62f14e4d3f8ae3d89 SHA512 9ba79f2fd2e2cdefe94da60b52096696bf08dcfd332188496c35074377a106bb3987025069784a96846a6c1cef1c0793b0525781aed8192227dd0c67266baaf1 WHIRLPOOL 263f0adb685d361cc72f99f9ff43dad75a54c92ff1341e12fa2b199c6a4351549e5fe1f13be22fe5053822179efaf0ead92a0f579910a85d36e7971bb2881baa
 DIST merlin-3.0.0.tar.gz 3971353 SHA256 dc215cc974e41e21e47d02497b67b94a2ac1682295c5f8ec58de753b9de67dbb SHA512 674495c01d4afef8273e904f656475d1e05e6c06b9f8a39ce2e3eb8aacd870a2e721ba510dccd2d9d154f5b6fbfb42840603d189819a573d136a3bcc85ff4551 WHIRLPOOL 94992412ac18fef020539738f19bd8a529f526cb589e53ebd8f55179f3b56467e690b1434b73590ea5fcb4efab90c0d33bfcea990ede9d745fd95024061d8da0
+DIST merlin-3.0.1.tar.gz 3971680 SHA256 1dac05fde93de570473e48a89ac19975734c524218893300aff9cbfcce4b7cc6 SHA512 7f6bedba954fde712b5eda80910c27f80f74f1346c67b0c29b896944c7d51dd268db0aa996610a1dda6edc0798b322369390bb3213f8c42584676790756542ec WHIRLPOOL 2940783f8a05aba48c96538aebbcbae0309ef24893ac45d6593d71b6ef12b09ab399427a8fb61a3d161008d92354fff82addd4e26268d48af3e015aa8df7eaf6

diff --git a/dev-ml/merlin/merlin-3.0.1.ebuild b/dev-ml/merlin/merlin-3.0.1.ebuild
new file mode 100644
index 00000000000..609f9767e4c
--- /dev/null
+++ b/dev-ml/merlin/merlin-3.0.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib vim-plugin
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-lang/ocaml:=
+	dev-ml/yojson:=
+"
+RDEPEND="${DEPEND}
+	|| ( app-editors/vim[python] app-editors/gvim[python] )"
+
+src_configure() {
+	./configure \
+		--prefix "${EPREFIX}/usr" \
+		--vimdir "${EPREFIX}//usr/share/vim/vimfiles" \
+		|| die
+}
+
+src_install() {
+	default
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2017-08-06  7:40 Alexis Ballier
  0 siblings, 0 replies; 44+ messages in thread
From: Alexis Ballier @ 2017-08-06  7:40 UTC (permalink / raw
  To: gentoo-commits

commit:     30f26adabcaa13f1986efbfca9a174c6d529fcdb
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  4 18:43:22 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Aug  6 06:45:10 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30f26ada

dev-ml/merlin: bump to 3.0.2

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-ml/merlin/Manifest            |  1 +
 dev-ml/merlin/merlin-3.0.2.ebuild | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index d5328dfb465..0fa9cd2b09d 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -3,3 +3,4 @@ DIST merlin-2.5.4.tar.gz 3094234 SHA256 e4e53f680e5e143ed0fb1a5dee4aba2e39e65e2d
 DIST merlin-2.5.5.tar.gz 3094071 SHA256 5730cc1128bf6cf0af63985178307bbfd684bb5a03dc9dd62f14e4d3f8ae3d89 SHA512 9ba79f2fd2e2cdefe94da60b52096696bf08dcfd332188496c35074377a106bb3987025069784a96846a6c1cef1c0793b0525781aed8192227dd0c67266baaf1 WHIRLPOOL 263f0adb685d361cc72f99f9ff43dad75a54c92ff1341e12fa2b199c6a4351549e5fe1f13be22fe5053822179efaf0ead92a0f579910a85d36e7971bb2881baa
 DIST merlin-3.0.0.tar.gz 3971353 SHA256 dc215cc974e41e21e47d02497b67b94a2ac1682295c5f8ec58de753b9de67dbb SHA512 674495c01d4afef8273e904f656475d1e05e6c06b9f8a39ce2e3eb8aacd870a2e721ba510dccd2d9d154f5b6fbfb42840603d189819a573d136a3bcc85ff4551 WHIRLPOOL 94992412ac18fef020539738f19bd8a529f526cb589e53ebd8f55179f3b56467e690b1434b73590ea5fcb4efab90c0d33bfcea990ede9d745fd95024061d8da0
 DIST merlin-3.0.1.tar.gz 3971680 SHA256 1dac05fde93de570473e48a89ac19975734c524218893300aff9cbfcce4b7cc6 SHA512 7f6bedba954fde712b5eda80910c27f80f74f1346c67b0c29b896944c7d51dd268db0aa996610a1dda6edc0798b322369390bb3213f8c42584676790756542ec WHIRLPOOL 2940783f8a05aba48c96538aebbcbae0309ef24893ac45d6593d71b6ef12b09ab399427a8fb61a3d161008d92354fff82addd4e26268d48af3e015aa8df7eaf6
+DIST merlin-3.0.2.tar.gz 3971755 SHA256 a730c66a1abba62006e4ce7a2d5d1d10ec47ae154c9c029cccbfbc8c55a28bb7 SHA512 3f7ae1981a95a58f694928a8b2d5186a304750219655e52d360f1f6fd6f832d5390f3346cf2c58c8618e6de34ab920f92a6c077d241fac5ce41241d7bed4476a WHIRLPOOL 5a9b651a88bb73dfcddb42a4e7f0841a48c30dd3d788156044fd76585e0bee3767a6f969f0b2bf2cc8b05e1a06711a4607a4b22509fc26fdbb8f9141f49b9cd2

diff --git a/dev-ml/merlin/merlin-3.0.2.ebuild b/dev-ml/merlin/merlin-3.0.2.ebuild
new file mode 100644
index 00000000000..609f9767e4c
--- /dev/null
+++ b/dev-ml/merlin/merlin-3.0.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib vim-plugin
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-lang/ocaml:=
+	dev-ml/yojson:=
+"
+RDEPEND="${DEPEND}
+	|| ( app-editors/vim[python] app-editors/gvim[python] )"
+
+src_configure() {
+	./configure \
+		--prefix "${EPREFIX}/usr" \
+		--vimdir "${EPREFIX}//usr/share/vim/vimfiles" \
+		|| die
+}
+
+src_install() {
+	default
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2017-10-04  8:02 Alexis Ballier
  0 siblings, 0 replies; 44+ messages in thread
From: Alexis Ballier @ 2017-10-04  8:02 UTC (permalink / raw
  To: gentoo-commits

commit:     24afb16a1858a31795681bf7f5750b3cb6fde78b
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  4 07:46:57 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Oct  4 08:01:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24afb16a

dev-ml/merlin: bump to 3.0.3

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 dev-ml/merlin/Manifest            |  1 +
 dev-ml/merlin/merlin-3.0.3.ebuild | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index 0fa9cd2b09d..68c74c5f249 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -4,3 +4,4 @@ DIST merlin-2.5.5.tar.gz 3094071 SHA256 5730cc1128bf6cf0af63985178307bbfd684bb5a
 DIST merlin-3.0.0.tar.gz 3971353 SHA256 dc215cc974e41e21e47d02497b67b94a2ac1682295c5f8ec58de753b9de67dbb SHA512 674495c01d4afef8273e904f656475d1e05e6c06b9f8a39ce2e3eb8aacd870a2e721ba510dccd2d9d154f5b6fbfb42840603d189819a573d136a3bcc85ff4551 WHIRLPOOL 94992412ac18fef020539738f19bd8a529f526cb589e53ebd8f55179f3b56467e690b1434b73590ea5fcb4efab90c0d33bfcea990ede9d745fd95024061d8da0
 DIST merlin-3.0.1.tar.gz 3971680 SHA256 1dac05fde93de570473e48a89ac19975734c524218893300aff9cbfcce4b7cc6 SHA512 7f6bedba954fde712b5eda80910c27f80f74f1346c67b0c29b896944c7d51dd268db0aa996610a1dda6edc0798b322369390bb3213f8c42584676790756542ec WHIRLPOOL 2940783f8a05aba48c96538aebbcbae0309ef24893ac45d6593d71b6ef12b09ab399427a8fb61a3d161008d92354fff82addd4e26268d48af3e015aa8df7eaf6
 DIST merlin-3.0.2.tar.gz 3971755 SHA256 a730c66a1abba62006e4ce7a2d5d1d10ec47ae154c9c029cccbfbc8c55a28bb7 SHA512 3f7ae1981a95a58f694928a8b2d5186a304750219655e52d360f1f6fd6f832d5390f3346cf2c58c8618e6de34ab920f92a6c077d241fac5ce41241d7bed4476a WHIRLPOOL 5a9b651a88bb73dfcddb42a4e7f0841a48c30dd3d788156044fd76585e0bee3767a6f969f0b2bf2cc8b05e1a06711a4607a4b22509fc26fdbb8f9141f49b9cd2
+DIST merlin-3.0.3.tar.gz 3979949 SHA256 3ebe20b36d96072fe920e6d2b8970b501575c36c934f905fe3346d6488ff660c SHA512 54532c7e0c2e724d96bea4f60d5368b1aed2b9ac4dc4c81ebeb05486b2c649ef1b911610a7beddce03f81be807efa0bb13fbc1e7e0d598cd92217bf84e9f87f7 WHIRLPOOL 6dba90e6dc9b1bc12f6ba1dd68907a01dbc348f1630e4c5e46ee19a0210cf996902f7bc7d0d5bb4c8c8ab3677e8537094b14a239359f80f2f001ddc5f22bd77f

diff --git a/dev-ml/merlin/merlin-3.0.3.ebuild b/dev-ml/merlin/merlin-3.0.3.ebuild
new file mode 100644
index 00000000000..609f9767e4c
--- /dev/null
+++ b/dev-ml/merlin/merlin-3.0.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib vim-plugin
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-lang/ocaml:=
+	dev-ml/yojson:=
+"
+RDEPEND="${DEPEND}
+	|| ( app-editors/vim[python] app-editors/gvim[python] )"
+
+src_configure() {
+	./configure \
+		--prefix "${EPREFIX}/usr" \
+		--vimdir "${EPREFIX}//usr/share/vim/vimfiles" \
+		|| die
+}
+
+src_install() {
+	default
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2021-03-19 10:24 Sam James
  0 siblings, 0 replies; 44+ messages in thread
From: Sam James @ 2021-03-19 10:24 UTC (permalink / raw
  To: gentoo-commits

commit:     e90cd3a78292328d6011bb750cadf46c8bef72b8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 19 09:51:42 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 19 10:23:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e90cd3a7

dev-ml/merlin: add 4.1

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

 dev-ml/merlin/merlin-4.1.ebuild | 67 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/dev-ml/merlin/merlin-4.1.ebuild b/dev-ml/merlin/merlin-4.1.ebuild
new file mode 100644
index 00000000000..44da757af90
--- /dev/null
+++ b/dev-ml/merlin/merlin-4.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO: vim-plugin, although it's not clear how to make it work here
+inherit elisp-common dune
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="emacs +ocamlopt"
+
+RDEPEND="
+	app-emacs/auto-complete
+	app-emacs/company-mode
+	dev-ml/csexp:=
+	dev-ml/yojson:=
+	=dev-lang/ocaml-4.11*:=
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+DEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	default
+
+	# Handle installation via the eclass
+	rm emacs/dune || die
+}
+
+src_compile() {
+	dune_src_compile
+
+	if use emacs ; then
+		# Build the emacs integration
+		cd emacs || die
+
+		# iedit isn't packaged yet
+		rm merlin-iedit.el || die
+
+		elisp-compile *.el
+	fi
+}
+
+src_install() {
+	dune_src_install
+
+	if use emacs ; then
+		cd "${S}/emacs" || die
+		elisp-install ${PN} *.el *.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2021-03-20  1:15 Sam James
  0 siblings, 0 replies; 44+ messages in thread
From: Sam James @ 2021-03-20  1:15 UTC (permalink / raw
  To: gentoo-commits

commit:     ee2b32a8b891eb4c4c0bb853761f09400ee4e459
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 20 01:15:02 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 20 01:15:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee2b32a8

dev-ml/merlin: fix emacs dependencies

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

 dev-ml/merlin/{merlin-3.4.2.ebuild => merlin-3.4.2-r1.ebuild} | 8 +++++---
 dev-ml/merlin/{merlin-4.1.ebuild => merlin-4.1-r1.ebuild}     | 6 +++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/dev-ml/merlin/merlin-3.4.2.ebuild b/dev-ml/merlin/merlin-3.4.2-r1.ebuild
similarity index 92%
rename from dev-ml/merlin/merlin-3.4.2.ebuild
rename to dev-ml/merlin/merlin-3.4.2-r1.ebuild
index 6a56c013b53..d14be4876eb 100644
--- a/dev-ml/merlin/merlin-3.4.2.ebuild
+++ b/dev-ml/merlin/merlin-3.4.2-r1.ebuild
@@ -16,13 +16,15 @@ KEYWORDS="~amd64"
 IUSE="emacs +ocamlopt"
 
 RDEPEND="
-	app-emacs/auto-complete
-	app-emacs/company-mode
 	dev-ml/csexp:=
 	dev-ml/yojson:=
 	>=dev-lang/ocaml-4.09:=
 	<dev-lang/ocaml-4.12:=
-	emacs? ( >=app-editors/emacs-23.1:* )
+	emacs? (
+		>=app-editors/emacs-23.1:*
+		app-emacs/auto-complete
+		app-emacs/company-mode
+	)
 "
 DEPEND="${RDEPEND}"
 

diff --git a/dev-ml/merlin/merlin-4.1.ebuild b/dev-ml/merlin/merlin-4.1-r1.ebuild
similarity index 92%
rename from dev-ml/merlin/merlin-4.1.ebuild
rename to dev-ml/merlin/merlin-4.1-r1.ebuild
index 44da757af90..2197e4695f9 100644
--- a/dev-ml/merlin/merlin-4.1.ebuild
+++ b/dev-ml/merlin/merlin-4.1-r1.ebuild
@@ -21,7 +21,11 @@ RDEPEND="
 	dev-ml/csexp:=
 	dev-ml/yojson:=
 	=dev-lang/ocaml-4.11*:=
-	emacs? ( >=app-editors/emacs-23.1:* )
+	emacs? (
+		>=app-editors/emacs-23.1:*
+		app-emacs/auto-complete
+		app-emacs/company-mode
+	)
 "
 DEPEND="${RDEPEND}"
 


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2021-05-10 17:09 Alfredo Tupone
  0 siblings, 0 replies; 44+ messages in thread
From: Alfredo Tupone @ 2021-05-10 17:09 UTC (permalink / raw
  To: gentoo-commits

commit:     1d9999989b55433a81bdb35777d4c4f617e3e301
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon May 10 17:08:40 2021 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon May 10 17:09:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d999998

dev-ml/merlin: add dependency

Closes: https://bugs.gentoo.org/777261
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ml/merlin/merlin-4.1-r1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-ml/merlin/merlin-4.1-r1.ebuild b/dev-ml/merlin/merlin-4.1-r1.ebuild
index 2197e4695f9..7bd1055d440 100644
--- a/dev-ml/merlin/merlin-4.1-r1.ebuild
+++ b/dev-ml/merlin/merlin-4.1-r1.ebuild
@@ -20,6 +20,7 @@ RDEPEND="
 	app-emacs/company-mode
 	dev-ml/csexp:=
 	dev-ml/yojson:=
+	dev-ml/menhir:=
 	=dev-lang/ocaml-4.11*:=
 	emacs? (
 		>=app-editors/emacs-23.1:*


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2021-06-21 22:36 Sam James
  0 siblings, 0 replies; 44+ messages in thread
From: Sam James @ 2021-06-21 22:36 UTC (permalink / raw
  To: gentoo-commits

commit:     b9a307b91a72104f340aebc967368b49d84a5af5
Author:     Pierre-Nicolas Clauss <pinicarus <AT> protonmail <DOT> com>
AuthorDate: Sat Jun 19 17:36:25 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 21 22:31:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9a307b9

dev-ml/merlin: remove unneeded emacs dependencies

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Pierre-Nicolas Clauss <pinicarus <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/21332
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-ml/merlin/{merlin-4.1-r1.ebuild => merlin-4.1-r2.ebuild} | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dev-ml/merlin/merlin-4.1-r1.ebuild b/dev-ml/merlin/merlin-4.1-r2.ebuild
similarity index 96%
rename from dev-ml/merlin/merlin-4.1-r1.ebuild
rename to dev-ml/merlin/merlin-4.1-r2.ebuild
index 7bd1055d440..70e3b0b53a5 100644
--- a/dev-ml/merlin/merlin-4.1-r1.ebuild
+++ b/dev-ml/merlin/merlin-4.1-r2.ebuild
@@ -16,8 +16,6 @@ KEYWORDS="~amd64"
 IUSE="emacs +ocamlopt"
 
 RDEPEND="
-	app-emacs/auto-complete
-	app-emacs/company-mode
 	dev-ml/csexp:=
 	dev-ml/yojson:=
 	dev-ml/menhir:=


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2021-09-28 20:43 Alfredo Tupone
  0 siblings, 0 replies; 44+ messages in thread
From: Alfredo Tupone @ 2021-09-28 20:43 UTC (permalink / raw
  To: gentoo-commits

commit:     3e83e357130d22d0d6f0001edecc791f7a0d86c6
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 28 20:43:22 2021 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Sep 28 20:43:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e83e357

dev-ml/merlin: rm failing test

Closes: https://bugs.gentoo.org/789360
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ml/merlin/merlin-4.1-r2.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-ml/merlin/merlin-4.1-r2.ebuild b/dev-ml/merlin/merlin-4.1-r2.ebuild
index 70e3b0b53a5..1da4c679bcf 100644
--- a/dev-ml/merlin/merlin-4.1-r2.ebuild
+++ b/dev-ml/merlin/merlin-4.1-r2.ebuild
@@ -35,6 +35,9 @@ src_prepare() {
 
 	# Handle installation via the eclass
 	rm emacs/dune || die
+
+	# rm failing test
+	rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die
 }
 
 src_compile() {


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2021-09-29  7:13 Alfredo Tupone
  0 siblings, 0 replies; 44+ messages in thread
From: Alfredo Tupone @ 2021-09-29  7:13 UTC (permalink / raw
  To: gentoo-commits

commit:     c0fa0b80d5b8802c51d01f44d7f288e4019b6d5e
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 29 07:12:46 2021 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Sep 29 07:12:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0fa0b80

dev-ml/merlin: fix test dep

Closes: https://bugs.gentoo.org/815310
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ml/merlin/merlin-4.1-r2.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-ml/merlin/merlin-4.1-r2.ebuild b/dev-ml/merlin/merlin-4.1-r2.ebuild
index 1da4c679bcf..20b1824bea5 100644
--- a/dev-ml/merlin/merlin-4.1-r2.ebuild
+++ b/dev-ml/merlin/merlin-4.1-r2.ebuild
@@ -13,7 +13,8 @@ SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
-IUSE="emacs +ocamlopt"
+IUSE="emacs +ocamlopt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-ml/csexp:=
@@ -26,7 +27,8 @@ RDEPEND="
 		app-emacs/company-mode
 	)
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? ( app-misc/jq )"
 
 SITEFILE="50${PN}-gentoo.el"
 


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2021-10-07  6:23 Alfredo Tupone
  0 siblings, 0 replies; 44+ messages in thread
From: Alfredo Tupone @ 2021-10-07  6:23 UTC (permalink / raw
  To: gentoo-commits

commit:     106b46becebae7b193bfc1740dc0900f245d03df
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  7 06:23:03 2021 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Oct  7 06:23:03 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=106b46be

dev-ml/merlin: fix after dune eclass change

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ml/merlin/merlin-4.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-ml/merlin/merlin-4.1-r2.ebuild b/dev-ml/merlin/merlin-4.1-r2.ebuild
index 20b1824bea5..1433cc088f6 100644
--- a/dev-ml/merlin/merlin-4.1-r2.ebuild
+++ b/dev-ml/merlin/merlin-4.1-r2.ebuild
@@ -43,7 +43,7 @@ src_prepare() {
 }
 
 src_compile() {
-	dune_src_compile
+	dune build @install
 
 	if use emacs ; then
 		# Build the emacs integration


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2021-10-17 14:54 Alfredo Tupone
  0 siblings, 0 replies; 44+ messages in thread
From: Alfredo Tupone @ 2021-10-17 14:54 UTC (permalink / raw
  To: gentoo-commits

commit:     05a921bb15ccf3dafaab67b7b9e51ef2b8a78282
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 17 14:53:45 2021 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Oct 17 14:54:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05a921bb

dev-ml/merlin: bump to 4.3.1

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ml/merlin/Manifest            |  2 +
 dev-ml/merlin/merlin-4.3.1.ebuild | 84 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+)

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index 4898821f67c..e46fef33184 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -2,3 +2,5 @@ DIST merlin-3.4.2.tar.gz 11016272 BLAKE2B 6fa55423df7ae8f7a8056e90be630f148dd101
 DIST merlin-4.1.tar.gz 2136082 BLAKE2B 3e7e1996611f0cefb3a33b2a78cd36b6e8b84d48bc48f46c45ba340c4be1b93b4a1876f8f4192e911c1c384c416ad7502ba3c7a2abb72eff01215f9fb26bfaf0 SHA512 f0f3ada007f8214b97a8557bddca87eded48ee01a8bb88aba6476e52881ead52d9f47e2666a9292b5c6a490e4cfdc7d8bb322e8489f78eaac7b0f80b6d1e87bc
 DIST merlin-4.2-411.tar.gz 1601588 BLAKE2B 348b48ccf2b209bb511450e4ba46ceb3639b1a5facd70bec4519369907e162e95575fa101aa1b79c56719927272a4feebf981692ea2bcb2299fc2c284833b1be SHA512 9ca8d3690621019b8213abcc1a32e1d754b93849f0bbd79bcab3a14915acc295eb60a7b68e997a75e777daaef83d5ca3e81944b7baf352dc4cce8480905ea2d7
 DIST merlin-4.2-ocaml-4.12.patch.gz 816740 BLAKE2B d96ab1059683799312fc8828e8a46bccaae9279b6d711eb7ed47b6e8631d80e09f236bf6f726bafb37ae243457df3220a9948f4f6de6da20c2a6c66a1edb8f3f SHA512 4eef08ac8a7f240596395d8460a4d3195c1483fb686aa7d5231d7ea28c9c6996196890f76feae951d2539ac7abc1f16ee3c453031e6d19af554ff27d67a63229
+DIST merlin-4.3.1-411.tar.gz 1626551 BLAKE2B c4340ff9b50c72208c4cb13d13e26f36463d7c257530d183a293eaaf3d86aaa71745d8154bb5c0e2149003b3cbe5a127fb6187e7bb7fa7024924fd239f981cfc SHA512 bcbba0c1bb1c84eef7becc4a537e1c2a4bd370a33333bfba1029c82fa8b1d9cdf367f98779fe3329286e418c41b06b49bfe796f5cf8058bcd189b4f33aad1abf
+DIST merlin-4.3.1-ocaml-4.12.patch.gz 818559 BLAKE2B accf65bd5d5798bafe2be022d685da8f829aa9a9c98784420d8a62646d80ab73d1e189e3601266e09eebd4732ae241e8d11dc9663adac3b03a555db663a6d649 SHA512 8823b6e30e49ab3cf35a78063066f01aa7dcbc9174d45b0fed94a3f50e388c35e7ac810c5548c57d7bcf9304b045c483080496865b011269913120a5509a1149

diff --git a/dev-ml/merlin/merlin-4.3.1.ebuild b/dev-ml/merlin/merlin-4.3.1.ebuild
new file mode 100644
index 00000000000..d269247a372
--- /dev/null
+++ b/dev-ml/merlin/merlin-4.3.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO: vim-plugin, although it's not clear how to make it work here
+inherit elisp-common dune
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}-411.tar.gz -> ${P}-411.tar.gz
+	https://dev.gentoo.org/~tupone/distfiles/${P}-ocaml-4.12.patch.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="emacs +ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ml/csexp:=
+	dev-ml/yojson:=
+	dev-ml/menhir:=
+	>=dev-ml/dune-2.9
+	|| (
+		dev-lang/ocaml:0/4.11
+		dev-lang/ocaml:0/4.12
+	)
+	emacs? (
+		>=app-editors/emacs-23.1:*
+		app-emacs/auto-complete
+		app-emacs/company-mode
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( app-misc/jq )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+S="${WORKDIR}"/${P}-411
+
+src_prepare() {
+	has_version "dev-lang/ocaml:0/4.12" && \
+		eapply "${WORKDIR}"/${P}-ocaml-4.12.patch
+	default
+
+	# Handle installation via the eclass
+	rm emacs/dune || die
+
+	# rm failing test
+	rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die
+}
+
+src_compile() {
+	dune build @install
+
+	if use emacs ; then
+		# Build the emacs integration
+		cd emacs || die
+
+		# iedit isn't packaged yet
+		rm merlin-iedit.el || die
+
+		elisp-compile *.el
+	fi
+}
+
+src_install() {
+	dune_src_install
+
+	if use emacs ; then
+		cd "${S}/emacs" || die
+		elisp-install ${PN} *.el *.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2022-01-16 10:35 Alfredo Tupone
  0 siblings, 0 replies; 44+ messages in thread
From: Alfredo Tupone @ 2022-01-16 10:35 UTC (permalink / raw
  To: gentoo-commits

commit:     6cdfc94276649c70a61ade4286bed9a3a010af50
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 16 10:34:43 2022 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Jan 16 10:34:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cdfc942

dev-ml/merlin: rm an old version

Closes: https://bugs.gentoo.org/815343
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ml/merlin/Manifest             |  1 -
 dev-ml/merlin/merlin-4.1-r2.ebuild | 75 --------------------------------------
 2 files changed, 76 deletions(-)

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index e46fef33184a..93d634bcf027 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -1,5 +1,4 @@
 DIST merlin-3.4.2.tar.gz 11016272 BLAKE2B 6fa55423df7ae8f7a8056e90be630f148dd101194de1921605843caf805bd6c9694fa3fe5b8c2f8eff5d57d7d0e9d8653036b6165a49af655158925c7af87d2f SHA512 8225366ebf27ca656ca89fe00d5aec581487ae332aeab81568e7606eaf575648a7614d4d2de8e0757a4e69c6f4014fefa4574c95da13d42acb310c9dd58a468a
-DIST merlin-4.1.tar.gz 2136082 BLAKE2B 3e7e1996611f0cefb3a33b2a78cd36b6e8b84d48bc48f46c45ba340c4be1b93b4a1876f8f4192e911c1c384c416ad7502ba3c7a2abb72eff01215f9fb26bfaf0 SHA512 f0f3ada007f8214b97a8557bddca87eded48ee01a8bb88aba6476e52881ead52d9f47e2666a9292b5c6a490e4cfdc7d8bb322e8489f78eaac7b0f80b6d1e87bc
 DIST merlin-4.2-411.tar.gz 1601588 BLAKE2B 348b48ccf2b209bb511450e4ba46ceb3639b1a5facd70bec4519369907e162e95575fa101aa1b79c56719927272a4feebf981692ea2bcb2299fc2c284833b1be SHA512 9ca8d3690621019b8213abcc1a32e1d754b93849f0bbd79bcab3a14915acc295eb60a7b68e997a75e777daaef83d5ca3e81944b7baf352dc4cce8480905ea2d7
 DIST merlin-4.2-ocaml-4.12.patch.gz 816740 BLAKE2B d96ab1059683799312fc8828e8a46bccaae9279b6d711eb7ed47b6e8631d80e09f236bf6f726bafb37ae243457df3220a9948f4f6de6da20c2a6c66a1edb8f3f SHA512 4eef08ac8a7f240596395d8460a4d3195c1483fb686aa7d5231d7ea28c9c6996196890f76feae951d2539ac7abc1f16ee3c453031e6d19af554ff27d67a63229
 DIST merlin-4.3.1-411.tar.gz 1626551 BLAKE2B c4340ff9b50c72208c4cb13d13e26f36463d7c257530d183a293eaaf3d86aaa71745d8154bb5c0e2149003b3cbe5a127fb6187e7bb7fa7024924fd239f981cfc SHA512 bcbba0c1bb1c84eef7becc4a537e1c2a4bd370a33333bfba1029c82fa8b1d9cdf367f98779fe3329286e418c41b06b49bfe796f5cf8058bcd189b4f33aad1abf

diff --git a/dev-ml/merlin/merlin-4.1-r2.ebuild b/dev-ml/merlin/merlin-4.1-r2.ebuild
deleted file mode 100644
index 1433cc088f65..000000000000
--- a/dev-ml/merlin/merlin-4.1-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# TODO: vim-plugin, although it's not clear how to make it work here
-inherit elisp-common dune
-
-DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
-HOMEPAGE="https://github.com/ocaml/merlin"
-SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="emacs +ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ml/csexp:=
-	dev-ml/yojson:=
-	dev-ml/menhir:=
-	=dev-lang/ocaml-4.11*:=
-	emacs? (
-		>=app-editors/emacs-23.1:*
-		app-emacs/auto-complete
-		app-emacs/company-mode
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( app-misc/jq )"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	default
-
-	# Handle installation via the eclass
-	rm emacs/dune || die
-
-	# rm failing test
-	rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die
-}
-
-src_compile() {
-	dune build @install
-
-	if use emacs ; then
-		# Build the emacs integration
-		cd emacs || die
-
-		# iedit isn't packaged yet
-		rm merlin-iedit.el || die
-
-		elisp-compile *.el
-	fi
-}
-
-src_install() {
-	dune_src_install
-
-	if use emacs ; then
-		cd "${S}/emacs" || die
-		elisp-install ${PN} *.el *.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2022-01-26  7:55 Alfredo Tupone
  0 siblings, 0 replies; 44+ messages in thread
From: Alfredo Tupone @ 2022-01-26  7:55 UTC (permalink / raw
  To: gentoo-commits

commit:     6593fe642942bc22ddf1cb5a9e83361833b05d7c
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 26 07:55:19 2022 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Jan 26 07:55:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6593fe64

dev-ml/merlin: 4.4 bump. ocaml 4.13 ready

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ml/merlin/Manifest          |  3 ++
 dev-ml/merlin/merlin-4.4.ebuild | 93 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+)

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index 93d634bcf027..1159f08039b6 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -3,3 +3,6 @@ DIST merlin-4.2-411.tar.gz 1601588 BLAKE2B 348b48ccf2b209bb511450e4ba46ceb3639b1
 DIST merlin-4.2-ocaml-4.12.patch.gz 816740 BLAKE2B d96ab1059683799312fc8828e8a46bccaae9279b6d711eb7ed47b6e8631d80e09f236bf6f726bafb37ae243457df3220a9948f4f6de6da20c2a6c66a1edb8f3f SHA512 4eef08ac8a7f240596395d8460a4d3195c1483fb686aa7d5231d7ea28c9c6996196890f76feae951d2539ac7abc1f16ee3c453031e6d19af554ff27d67a63229
 DIST merlin-4.3.1-411.tar.gz 1626551 BLAKE2B c4340ff9b50c72208c4cb13d13e26f36463d7c257530d183a293eaaf3d86aaa71745d8154bb5c0e2149003b3cbe5a127fb6187e7bb7fa7024924fd239f981cfc SHA512 bcbba0c1bb1c84eef7becc4a537e1c2a4bd370a33333bfba1029c82fa8b1d9cdf367f98779fe3329286e418c41b06b49bfe796f5cf8058bcd189b4f33aad1abf
 DIST merlin-4.3.1-ocaml-4.12.patch.gz 818559 BLAKE2B accf65bd5d5798bafe2be022d685da8f829aa9a9c98784420d8a62646d80ab73d1e189e3601266e09eebd4732ae241e8d11dc9663adac3b03a555db663a6d649 SHA512 8823b6e30e49ab3cf35a78063066f01aa7dcbc9174d45b0fed94a3f50e388c35e7ac810c5548c57d7bcf9304b045c483080496865b011269913120a5509a1149
+DIST merlin-4.4-411.tbz 1314200 BLAKE2B 0d16308e1ece70f8200e78233ecdff553f28e9a83b17f044eba8a4af170b65935b59ecf6e887299d9373b16d0a0cce24e0f9697f7cde4b3889df9db954e796c8 SHA512 82e4b025db6c6ec0c8b53bce82e980bfc2a507b9092dc513fb10c11be0bc2e37ad9efd5436263ecfa03acc3ec3a4b20ef9599b1814abe530f99d84b2f484fecc
+DIST merlin-4.4-412.tbz 1762888 BLAKE2B adee3863e6fab90643db91b5da418324c65d9b2712140fa4f6b65ef3915bc24126a2cf8c2ceda14a914213595ed1951c7c79c388be7ca407f59c230bcc95eecb SHA512 f51b2875b75215d0be378de86b9dca0957b5e62241ce625a46c6341c219582510d37af94dedf67e1d3db61ebacfef8fa764e4719fac16c0b4b99bb85d0b991d4
+DIST merlin-4.4-413.tbz 2284368 BLAKE2B 1c7f0c9cda8dda4fa91888c3ba91eb74cacffe54bdcc3b9ca49ea816558216ece50cab5f69c4d54298610ca0781a6332a8d0e1ed7526711c97fbc1748f45c309 SHA512 b0bf3c7d72dfc7c70e22d60afca5b7fee71a35127839181fdb46e1e15a230e58765960548c545bbef4fdab180291c738cacb724b9ecf284eee5640ebef07c4ff

diff --git a/dev-ml/merlin/merlin-4.4.ebuild b/dev-ml/merlin/merlin-4.4.ebuild
new file mode 100644
index 000000000000..2975d266d475
--- /dev/null
+++ b/dev-ml/merlin/merlin-4.4.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO: vim-plugin, although it's not clear how to make it work here
+inherit elisp-common dune
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/releases/download/v${PV}-411/${P}-411.tbz
+	https://github.com/ocaml/merlin/releases/download/v${PV}-412/${P}-412.tbz
+	https://github.com/ocaml/merlin/releases/download/v${PV}-413/${P}-413.tbz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="emacs +ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ml/csexp:=
+	dev-ml/yojson:=
+	dev-ml/menhir:=
+	>=dev-ml/dune-2.9
+	|| (
+		dev-lang/ocaml:0/4.11
+		dev-lang/ocaml:0/4.12
+		dev-lang/ocaml:0/4.13
+	)
+	emacs? (
+		>=app-editors/emacs-23.1:*
+		app-emacs/auto-complete
+		app-emacs/company-mode
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( app-misc/jq )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_unpack() {
+	default
+	if has_version "dev-lang/ocaml:0/4.11" ; then
+		mv merlin-4.4-411 "${S}" || die
+	elif has_version "dev-lang/ocaml:0/4.12" ; then
+		mv merlin-4.4-412 "${S}" || die
+	elif has_version "dev-lang/ocaml:0/4.13" ; then
+		mv merlin-4.4-413 "${S}" || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Handle installation via the eclass
+	rm emacs/dune || die
+
+	# rm failing test
+	rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die
+}
+
+src_compile() {
+	dune build @install
+
+	if use emacs ; then
+		# Build the emacs integration
+		cd emacs || die
+
+		# iedit isn't packaged yet
+		rm merlin-iedit.el || die
+
+		elisp-compile *.el
+	fi
+}
+
+src_install() {
+	dune_src_install
+
+	if use emacs ; then
+		cd "${S}/emacs" || die
+		elisp-install ${PN} *.el *.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2022-04-12 21:43 Maciej Barć
  0 siblings, 0 replies; 44+ messages in thread
From: Maciej Barć @ 2022-04-12 21:43 UTC (permalink / raw
  To: gentoo-commits

commit:     7b148120a0279015e7b62a44eeb2cf86c35009cf
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 20:36:15 2022 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 21:42:55 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b148120

dev-ml/merlin: bump to 4.5

Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-ml/merlin/Manifest          |  4 ++
 dev-ml/merlin/merlin-4.5.ebuild | 94 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+)

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index 1159f08039b6..9e5795e8cf56 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -6,3 +6,7 @@ DIST merlin-4.3.1-ocaml-4.12.patch.gz 818559 BLAKE2B accf65bd5d5798bafe2be022d68
 DIST merlin-4.4-411.tbz 1314200 BLAKE2B 0d16308e1ece70f8200e78233ecdff553f28e9a83b17f044eba8a4af170b65935b59ecf6e887299d9373b16d0a0cce24e0f9697f7cde4b3889df9db954e796c8 SHA512 82e4b025db6c6ec0c8b53bce82e980bfc2a507b9092dc513fb10c11be0bc2e37ad9efd5436263ecfa03acc3ec3a4b20ef9599b1814abe530f99d84b2f484fecc
 DIST merlin-4.4-412.tbz 1762888 BLAKE2B adee3863e6fab90643db91b5da418324c65d9b2712140fa4f6b65ef3915bc24126a2cf8c2ceda14a914213595ed1951c7c79c388be7ca407f59c230bcc95eecb SHA512 f51b2875b75215d0be378de86b9dca0957b5e62241ce625a46c6341c219582510d37af94dedf67e1d3db61ebacfef8fa764e4719fac16c0b4b99bb85d0b991d4
 DIST merlin-4.4-413.tbz 2284368 BLAKE2B 1c7f0c9cda8dda4fa91888c3ba91eb74cacffe54bdcc3b9ca49ea816558216ece50cab5f69c4d54298610ca0781a6332a8d0e1ed7526711c97fbc1748f45c309 SHA512 b0bf3c7d72dfc7c70e22d60afca5b7fee71a35127839181fdb46e1e15a230e58765960548c545bbef4fdab180291c738cacb724b9ecf284eee5640ebef07c4ff
+DIST merlin-4.5-411.tbz 1316537 BLAKE2B 8850ea6b15819a178f763d8b55fecca9104cec5097c39afad7dc8b59543d961d7aa4a86590ebb59a3066d1f6630f11284e24835398ab967f45a52faf004477f1 SHA512 9e68ebabdc0cc398edcd255516070d6459f3bf5738c0dbe332c11c6bc4070e7bf340bc086fa2ea58597972ebe9d15860ecd0e549444809be809f0509b41652c2
+DIST merlin-4.5-412.tbz 1765436 BLAKE2B eaed065a2814f4c1bfc5337d026c7c42287b8cbbe50097415a983f7fdd7323f4c88f3b8c8cff4ca88a0813204617f39807709a6703fd618269eca6063b3c47b1 SHA512 f9edc3e1c9f753d7bacbdf1b92c118b54f9e9eff0bf752a2b44f39a2f7ecc76c4cd3bbe9227e910aea8b5ea947e8fe1b8d92ba0245fe47bc8cc2f45404cca973
+DIST merlin-4.5-413.tbz 2290507 BLAKE2B 32aeda63caec645da8043c49ceaa0ea54d095b3e286f687b5f3da1b44d54bbc291d0358768d2180825cb620a91765da83d90b645151a694a4131788ab4438fbf SHA512 b1db98c38a97ca0eef3051ab2b5d1b158e757863de6908a830308e7ea7f960eebd64b1a60bf51b10b7ea2eea3141ee0917a7c3570b63f9faa2e3f69c5d6fe0c2
+DIST merlin-4.5-414.tbz 1964688 BLAKE2B 41cb76fb367545af3b5ac7d62f5b69ae031ed99956aca947dc8b91e2fa906d500bed272f7f46a7ad9e57bf3cb5620893072b52ac7f2246d6ae3be1ae22e99406 SHA512 cc2cf2c208091b3ae435a8124617e56f2002b7091532002ab49a1f817d90a5c4f9cf0bc5741dc7f2526e0352c3ca95b42c3b3a17c6cbfb80ad73d42310a25d22

diff --git a/dev-ml/merlin/merlin-4.5.ebuild b/dev-ml/merlin/merlin-4.5.ebuild
new file mode 100644
index 000000000000..52caa02ed44d
--- /dev/null
+++ b/dev-ml/merlin/merlin-4.5.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO: vim-plugin, although it's not clear how to make it work here
+inherit elisp-common dune
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/releases/download/v${PV}-411/${P}-411.tbz
+	https://github.com/ocaml/merlin/releases/download/v${PV}-412/${P}-412.tbz
+	https://github.com/ocaml/merlin/releases/download/v${PV}-413/${P}-413.tbz
+	https://github.com/ocaml/merlin/releases/download/v${PV}-414/${P}-414.tbz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="emacs +ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ml/csexp:=
+	dev-ml/yojson:=
+	dev-ml/menhir:=
+	>=dev-ml/dune-2.9
+	|| (
+		dev-lang/ocaml:0/4.11
+		dev-lang/ocaml:0/4.12
+		dev-lang/ocaml:0/4.13
+		dev-lang/ocaml:0/4.14
+	)
+	emacs? (
+		>=app-editors/emacs-23.1:*
+		app-emacs/auto-complete
+		app-emacs/company-mode
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( app-misc/jq )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_unpack() {
+	default
+
+	if has_version "dev-lang/ocaml:0/4.11" ; then
+		mv ${P}-411 "${S}" || die
+	elif has_version "dev-lang/ocaml:0/4.12" ; then
+		mv ${P}-412 "${S}" || die
+	elif has_version "dev-lang/ocaml:0/4.13" ; then
+		mv ${P}-413 "${S}" || die
+	elif has_version "dev-lang/ocaml:0/4.14" ; then
+		mv ${P}-414 "${S}" || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Handle installation via the eclass
+	rm emacs/dune || die
+
+	# This test runs only inside a git repo
+	rm -r tests/test-dirs/occurrences/issue1404.t || die
+}
+
+src_compile() {
+	dune build @install
+
+	if use emacs ; then
+		# iedit isn't packaged yet
+		rm emacs/merlin-iedit.el || die
+
+		BYTECOMPFLAGS="-L emacs" elisp-compile emacs/*.el
+	fi
+}
+
+src_install() {
+	dune_src_install
+
+	if use emacs ; then
+		elisp-install ${PN} emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2022-06-08 20:27 Maciej Barć
  0 siblings, 0 replies; 44+ messages in thread
From: Maciej Barć @ 2022-06-08 20:27 UTC (permalink / raw
  To: gentoo-commits

commit:     f839dbde90cb4c7efaed2b599613fb830ba1b53b
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  6 20:20:53 2022 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Wed Jun  8 20:25:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f839dbde

dev-ml/merlin: use <yojson-2

Bug: https://github.com/ocaml/merlin/pull/1475
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-ml/merlin/{merlin-3.4.2-r2.ebuild => merlin-3.4.2-r3.ebuild} | 2 +-
 dev-ml/merlin/{merlin-4.2-r1.ebuild => merlin-4.2-r2.ebuild}     | 2 +-
 dev-ml/merlin/{merlin-4.3.1-r1.ebuild => merlin-4.3.1-r2.ebuild} | 2 +-
 dev-ml/merlin/{merlin-4.4-r1.ebuild => merlin-4.4-r2.ebuild}     | 2 +-
 dev-ml/merlin/{merlin-4.5-r1.ebuild => merlin-4.5-r2.ebuild}     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-ml/merlin/merlin-3.4.2-r2.ebuild b/dev-ml/merlin/merlin-3.4.2-r3.ebuild
similarity index 98%
rename from dev-ml/merlin/merlin-3.4.2-r2.ebuild
rename to dev-ml/merlin/merlin-3.4.2-r3.ebuild
index bf15b8d8aaef..c4d43185b391 100644
--- a/dev-ml/merlin/merlin-3.4.2-r2.ebuild
+++ b/dev-ml/merlin/merlin-3.4.2-r3.ebuild
@@ -17,7 +17,7 @@ IUSE="emacs +ocamlopt"
 
 RDEPEND="
 	dev-ml/csexp:=
-	dev-ml/yojson:=
+	<dev-ml/yojson-2:=
 	>=dev-lang/ocaml-4.09:=
 	<dev-lang/ocaml-4.12:=
 	emacs? (

diff --git a/dev-ml/merlin/merlin-4.2-r1.ebuild b/dev-ml/merlin/merlin-4.2-r2.ebuild
similarity index 98%
rename from dev-ml/merlin/merlin-4.2-r1.ebuild
rename to dev-ml/merlin/merlin-4.2-r2.ebuild
index d6a09238ac2f..ec4d4384818f 100644
--- a/dev-ml/merlin/merlin-4.2-r1.ebuild
+++ b/dev-ml/merlin/merlin-4.2-r2.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-ml/csexp:=
-	dev-ml/yojson:=
+	<dev-ml/yojson-2:=
 	dev-ml/menhir:=
 	|| (
 		dev-lang/ocaml:0/4.11

diff --git a/dev-ml/merlin/merlin-4.3.1-r1.ebuild b/dev-ml/merlin/merlin-4.3.1-r2.ebuild
similarity index 98%
rename from dev-ml/merlin/merlin-4.3.1-r1.ebuild
rename to dev-ml/merlin/merlin-4.3.1-r2.ebuild
index 0ddc350e9d9b..3ba67542cafd 100644
--- a/dev-ml/merlin/merlin-4.3.1-r1.ebuild
+++ b/dev-ml/merlin/merlin-4.3.1-r2.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-ml/csexp:=
-	dev-ml/yojson:=
+	<dev-ml/yojson-2:=
 	dev-ml/menhir:=
 	>=dev-ml/dune-2.9
 	|| (

diff --git a/dev-ml/merlin/merlin-4.4-r1.ebuild b/dev-ml/merlin/merlin-4.4-r2.ebuild
similarity index 98%
rename from dev-ml/merlin/merlin-4.4-r1.ebuild
rename to dev-ml/merlin/merlin-4.4-r2.ebuild
index 2975d266d475..33b8e14ab23b 100644
--- a/dev-ml/merlin/merlin-4.4-r1.ebuild
+++ b/dev-ml/merlin/merlin-4.4-r2.ebuild
@@ -20,7 +20,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-ml/csexp:=
-	dev-ml/yojson:=
+	<dev-ml/yojson-2:=
 	dev-ml/menhir:=
 	>=dev-ml/dune-2.9
 	|| (

diff --git a/dev-ml/merlin/merlin-4.5-r1.ebuild b/dev-ml/merlin/merlin-4.5-r2.ebuild
similarity index 99%
rename from dev-ml/merlin/merlin-4.5-r1.ebuild
rename to dev-ml/merlin/merlin-4.5-r2.ebuild
index 52caa02ed44d..fe9006bed302 100644
--- a/dev-ml/merlin/merlin-4.5-r1.ebuild
+++ b/dev-ml/merlin/merlin-4.5-r2.ebuild
@@ -21,7 +21,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-ml/csexp:=
-	dev-ml/yojson:=
+	<dev-ml/yojson-2:=
 	dev-ml/menhir:=
 	>=dev-ml/dune-2.9
 	|| (


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2022-06-21  1:53 Sam James
  0 siblings, 0 replies; 44+ messages in thread
From: Sam James @ 2022-06-21  1:53 UTC (permalink / raw
  To: gentoo-commits

commit:     fa80ca50ec340b46502980aac8e31e2558915888
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 01:49:14 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 01:49:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa80ca50

dev-ml/merlin: fix OCaml dep

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

 dev-ml/merlin/{merlin-4.3.1-r2.ebuild => merlin-4.3.1-r3.ebuild} | 2 +-
 dev-ml/merlin/{merlin-4.4-r2.ebuild => merlin-4.4-r3.ebuild}     | 2 +-
 dev-ml/merlin/{merlin-4.5-r2.ebuild => merlin-4.5-r3.ebuild}     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-ml/merlin/merlin-4.3.1-r2.ebuild b/dev-ml/merlin/merlin-4.3.1-r3.ebuild
similarity index 98%
rename from dev-ml/merlin/merlin-4.3.1-r2.ebuild
rename to dev-ml/merlin/merlin-4.3.1-r3.ebuild
index 3ba67542cafd..be803860afbb 100644
--- a/dev-ml/merlin/merlin-4.3.1-r2.ebuild
+++ b/dev-ml/merlin/merlin-4.3.1-r3.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	dev-ml/csexp:=
 	<dev-ml/yojson-2:=
 	dev-ml/menhir:=
-	>=dev-ml/dune-2.9
+	>=dev-ml/dune-2.9:=
 	|| (
 		dev-lang/ocaml:0/4.11
 		dev-lang/ocaml:0/4.12

diff --git a/dev-ml/merlin/merlin-4.4-r2.ebuild b/dev-ml/merlin/merlin-4.4-r3.ebuild
similarity index 98%
rename from dev-ml/merlin/merlin-4.4-r2.ebuild
rename to dev-ml/merlin/merlin-4.4-r3.ebuild
index 33b8e14ab23b..805435c72192 100644
--- a/dev-ml/merlin/merlin-4.4-r2.ebuild
+++ b/dev-ml/merlin/merlin-4.4-r3.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	dev-ml/csexp:=
 	<dev-ml/yojson-2:=
 	dev-ml/menhir:=
-	>=dev-ml/dune-2.9
+	>=dev-ml/dune-2.9:=
 	|| (
 		dev-lang/ocaml:0/4.11
 		dev-lang/ocaml:0/4.12

diff --git a/dev-ml/merlin/merlin-4.5-r2.ebuild b/dev-ml/merlin/merlin-4.5-r3.ebuild
similarity index 98%
rename from dev-ml/merlin/merlin-4.5-r2.ebuild
rename to dev-ml/merlin/merlin-4.5-r3.ebuild
index fe9006bed302..0d4848e27208 100644
--- a/dev-ml/merlin/merlin-4.5-r2.ebuild
+++ b/dev-ml/merlin/merlin-4.5-r3.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	dev-ml/csexp:=
 	<dev-ml/yojson-2:=
 	dev-ml/menhir:=
-	>=dev-ml/dune-2.9
+	>=dev-ml/dune-2.9:=
 	|| (
 		dev-lang/ocaml:0/4.11
 		dev-lang/ocaml:0/4.12


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2022-07-22  2:26 Maciej Barć
  0 siblings, 0 replies; 44+ messages in thread
From: Maciej Barć @ 2022-07-22  2:26 UTC (permalink / raw
  To: gentoo-commits

commit:     95fd2a01495e7c82266a5afe22e67e259a33509c
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 22 01:59:26 2022 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Fri Jul 22 01:59:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95fd2a01

dev-ml/merlin: add missing dies

Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-ml/merlin/merlin-4.2-r2.ebuild   | 2 +-
 dev-ml/merlin/merlin-4.3.1-r3.ebuild | 2 +-
 dev-ml/merlin/merlin-4.4-r3.ebuild   | 2 +-
 dev-ml/merlin/merlin-4.5-r3.ebuild   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-ml/merlin/merlin-4.2-r2.ebuild b/dev-ml/merlin/merlin-4.2-r2.ebuild
index ec4d4384818f..531c1f5309e7 100644
--- a/dev-ml/merlin/merlin-4.2-r2.ebuild
+++ b/dev-ml/merlin/merlin-4.2-r2.ebuild
@@ -51,7 +51,7 @@ src_prepare() {
 }
 
 src_compile() {
-	dune build @install
+	dune build @install || die
 
 	if use emacs ; then
 		# Build the emacs integration

diff --git a/dev-ml/merlin/merlin-4.3.1-r3.ebuild b/dev-ml/merlin/merlin-4.3.1-r3.ebuild
index be803860afbb..2f3b6848a507 100644
--- a/dev-ml/merlin/merlin-4.3.1-r3.ebuild
+++ b/dev-ml/merlin/merlin-4.3.1-r3.ebuild
@@ -52,7 +52,7 @@ src_prepare() {
 }
 
 src_compile() {
-	dune build @install
+	dune build @install || die
 
 	if use emacs ; then
 		# Build the emacs integration

diff --git a/dev-ml/merlin/merlin-4.4-r3.ebuild b/dev-ml/merlin/merlin-4.4-r3.ebuild
index 805435c72192..858b8e8cfce7 100644
--- a/dev-ml/merlin/merlin-4.4-r3.ebuild
+++ b/dev-ml/merlin/merlin-4.4-r3.ebuild
@@ -61,7 +61,7 @@ src_prepare() {
 }
 
 src_compile() {
-	dune build @install
+	dune build @install || die
 
 	if use emacs ; then
 		# Build the emacs integration

diff --git a/dev-ml/merlin/merlin-4.5-r3.ebuild b/dev-ml/merlin/merlin-4.5-r3.ebuild
index 0d4848e27208..c33b0aee04ac 100644
--- a/dev-ml/merlin/merlin-4.5-r3.ebuild
+++ b/dev-ml/merlin/merlin-4.5-r3.ebuild
@@ -66,7 +66,7 @@ src_prepare() {
 }
 
 src_compile() {
-	dune build @install
+	dune build @install || die
 
 	if use emacs ; then
 		# iedit isn't packaged yet


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2022-07-23  0:06 Maciej Barć
  0 siblings, 0 replies; 44+ messages in thread
From: Maciej Barć @ 2022-07-23  0:06 UTC (permalink / raw
  To: gentoo-commits

commit:     1dee4d23ef6344427fb704191a6cc24ff8ed7425
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 22 23:03:22 2022 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sat Jul 23 00:03:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dee4d23

dev-ml/merlin: bump to 4.6

Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-ml/merlin/Manifest          |   3 ++
 dev-ml/merlin/merlin-4.6.ebuild | 100 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 103 insertions(+)

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index 9e5795e8cf56..536daa402927 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -10,3 +10,6 @@ DIST merlin-4.5-411.tbz 1316537 BLAKE2B 8850ea6b15819a178f763d8b55fecca9104cec50
 DIST merlin-4.5-412.tbz 1765436 BLAKE2B eaed065a2814f4c1bfc5337d026c7c42287b8cbbe50097415a983f7fdd7323f4c88f3b8c8cff4ca88a0813204617f39807709a6703fd618269eca6063b3c47b1 SHA512 f9edc3e1c9f753d7bacbdf1b92c118b54f9e9eff0bf752a2b44f39a2f7ecc76c4cd3bbe9227e910aea8b5ea947e8fe1b8d92ba0245fe47bc8cc2f45404cca973
 DIST merlin-4.5-413.tbz 2290507 BLAKE2B 32aeda63caec645da8043c49ceaa0ea54d095b3e286f687b5f3da1b44d54bbc291d0358768d2180825cb620a91765da83d90b645151a694a4131788ab4438fbf SHA512 b1db98c38a97ca0eef3051ab2b5d1b158e757863de6908a830308e7ea7f960eebd64b1a60bf51b10b7ea2eea3141ee0917a7c3570b63f9faa2e3f69c5d6fe0c2
 DIST merlin-4.5-414.tbz 1964688 BLAKE2B 41cb76fb367545af3b5ac7d62f5b69ae031ed99956aca947dc8b91e2fa906d500bed272f7f46a7ad9e57bf3cb5620893072b52ac7f2246d6ae3be1ae22e99406 SHA512 cc2cf2c208091b3ae435a8124617e56f2002b7091532002ab49a1f817d90a5c4f9cf0bc5741dc7f2526e0352c3ca95b42c3b3a17c6cbfb80ad73d42310a25d22
+DIST merlin-4.6-412.tbz 1767545 BLAKE2B 95b4f4e53accf55f4d2bc381779fa31bb5db39c21fa2cd8dc0b1d5b0e4a4acf484f2eb58327bce1c990cbbb2205bb87215aeba1b923ba6a62c82862d884dd410 SHA512 4362482ecd7c8af1c4e740e3816100cd5408eba3aebc01b867b45bdd1dcc237819cb0640e0f618b6ecf00aa8d55e58e55ecfeb176ed7b358c404ea71302443b0
+DIST merlin-4.6-413.tbz 2292506 BLAKE2B ec61d3b9cbfd9cddbb27fed70ebf7b69816244afb8a6c36347fbb762fc6aee1e6dd2b728db0687cd984603c3847ba3fe858b9663a7b3dcd17aedede662848299 SHA512 fe88a52c4c3c94505da142fbb7d400fce11bfafe6e47ec7cd39437308baa7122399a008bb6d0ef7b8f29636c2a51f4d49e3535136010fec198a1188293914a56
+DIST merlin-4.6-414.tbz 1969647 BLAKE2B fdb55f7ba9a597fb03bb377556238dedc2a5d60bdc772a479a9ad98c0feb243a7fc61dd47a65194ddba9afb8509858d8956a87ca5af9fc68597ba746b0d56d60 SHA512 7373fadf05c692c9f054c7fe6a7d4bdfeefe237b9df432024ef9923782ee72e09021c0c3fba869da8347728105cb2d3ff0aa94b0c5eb09811bb25aa8da9fb520

diff --git a/dev-ml/merlin/merlin-4.6.ebuild b/dev-ml/merlin/merlin-4.6.ebuild
new file mode 100644
index 000000000000..54eef9ec4a64
--- /dev/null
+++ b/dev-ml/merlin/merlin-4.6.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO: vim-plugin, although it's not clear how to make it work here
+inherit elisp-common dune
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin/"
+SRC_URI="
+	https://github.com/ocaml/merlin/releases/download/v${PV}-412/${P}-412.tbz
+	https://github.com/ocaml/merlin/releases/download/v${PV}-413/${P}-413.tbz
+	https://github.com/ocaml/merlin/releases/download/v${PV}-414/${P}-414.tbz
+"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="emacs +ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.12:=[ocamlopt?]
+	dev-ml/csexp:=
+	>=dev-ml/yojson-2.0.0:=
+	dev-ml/menhir:=
+	>=dev-ml/dune-2.9:=
+	|| (
+		dev-lang/ocaml:0/4.12
+		dev-lang/ocaml:0/4.13
+		dev-lang/ocaml:0/4.14
+	)
+	emacs? (
+		>=app-editors/emacs-23.1:*
+		app-emacs/auto-complete
+		app-emacs/company-mode
+	)
+"
+DEPEND="${RDEPEND}"
+# NOTICE: Block dev-ml/seq (which is a back-port of code to ocaml <4.07)
+# because it breaks merlin builds.
+# https://github.com/ocaml/merlin/issues/1500
+BDEPEND="
+	!<dev-ml/seq-0.3
+	test? ( app-misc/jq )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_unpack() {
+	default
+
+	if has_version "dev-lang/ocaml:0/4.12" ; then
+		mv ${P}-412 "${S}" || die
+	elif has_version "dev-lang/ocaml:0/4.13" ; then
+		mv ${P}-413 "${S}" || die
+	elif has_version "dev-lang/ocaml:0/4.14" ; then
+		mv ${P}-414 "${S}" || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Handle installation via the eclass
+	rm emacs/dune || die
+
+	# This test runs only inside a git repo
+	rm -r tests/test-dirs/occurrences/issue1404.t || die
+	rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die
+}
+
+src_compile() {
+	dune build @install || die
+
+	if use emacs ; then
+		# iedit isn't packaged yet
+		rm emacs/merlin-iedit.el || die
+
+		BYTECOMPFLAGS="-L emacs" elisp-compile emacs/*.el
+	fi
+}
+
+src_install() {
+	dune_src_install
+
+	if use emacs ; then
+		elisp-install ${PN} emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2022-09-25 19:01 Maciej Barć
  0 siblings, 0 replies; 44+ messages in thread
From: Maciej Barć @ 2022-09-25 19:01 UTC (permalink / raw
  To: gentoo-commits

commit:     424be3e2d4438b6261de17cf18957aa513bae50f
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 25 19:00:36 2022 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sun Sep 25 19:01:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=424be3e2

dev-ml/merlin: strong block dev-ml/seq

Closes: https://bugs.gentoo.org/860213
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-ml/merlin/merlin-4.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-ml/merlin/merlin-4.6.ebuild b/dev-ml/merlin/merlin-4.6.ebuild
index 54eef9ec4a64..fa661a5ad042 100644
--- a/dev-ml/merlin/merlin-4.6.ebuild
+++ b/dev-ml/merlin/merlin-4.6.ebuild
@@ -42,7 +42,7 @@ DEPEND="${RDEPEND}"
 # because it breaks merlin builds.
 # https://github.com/ocaml/merlin/issues/1500
 BDEPEND="
-	!<dev-ml/seq-0.3
+	!!<dev-ml/seq-0.3
 	test? ( app-misc/jq )
 "
 


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2022-10-23  8:14 Maciej Barć
  0 siblings, 0 replies; 44+ messages in thread
From: Maciej Barć @ 2022-10-23  8:14 UTC (permalink / raw
  To: gentoo-commits

commit:     bd51c806ea638fd618f62fefde355f762058a137
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 23 08:12:29 2022 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sun Oct 23 08:14:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd51c806

dev-ml/merlin: src_prepare test fixes

Closes: https://bugs.gentoo.org/878049
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-ml/merlin/merlin-4.5-r3.ebuild | 7 +++++--
 dev-ml/merlin/merlin-4.6.ebuild    | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/dev-ml/merlin/merlin-4.5-r3.ebuild b/dev-ml/merlin/merlin-4.5-r3.ebuild
index c33b0aee04ac..b3cc5b868e42 100644
--- a/dev-ml/merlin/merlin-4.5-r3.ebuild
+++ b/dev-ml/merlin/merlin-4.5-r3.ebuild
@@ -61,8 +61,11 @@ src_prepare() {
 	# Handle installation via the eclass
 	rm emacs/dune || die
 
-	# This test runs only inside a git repo
-	rm -r tests/test-dirs/occurrences/issue1404.t || die
+	# This test runs only inside a git repo,
+	# it is not included in merlin release for ocaml 4.12.
+	if [[ -f tests/test-dirs/occurrences/issue1404.t ]] ; then
+		rm tests/test-dirs/occurrences/issue1404.t || die
+	fi
 }
 
 src_compile() {

diff --git a/dev-ml/merlin/merlin-4.6.ebuild b/dev-ml/merlin/merlin-4.6.ebuild
index fa661a5ad042..8086c63f9c25 100644
--- a/dev-ml/merlin/merlin-4.6.ebuild
+++ b/dev-ml/merlin/merlin-4.6.ebuild
@@ -66,8 +66,11 @@ src_prepare() {
 	# Handle installation via the eclass
 	rm emacs/dune || die
 
-	# This test runs only inside a git repo
-	rm -r tests/test-dirs/occurrences/issue1404.t || die
+	# This test runs only inside a git repo,
+	# it is not included in merlin release for ocaml 4.12.
+	if [[ -f tests/test-dirs/occurrences/issue1404.t ]] ; then
+		rm tests/test-dirs/occurrences/issue1404.t || die
+	fi
 	rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die
 }
 


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2022-11-28 20:33 Maciej Barć
  0 siblings, 0 replies; 44+ messages in thread
From: Maciej Barć @ 2022-11-28 20:33 UTC (permalink / raw
  To: gentoo-commits

commit:     eb08ef7e5b810912fc1f9f90a5f584fff171af0c
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 28 20:15:20 2022 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Mon Nov 28 20:33:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb08ef7e

dev-ml/merlin: remove seq reference from dune build file

Closes: https://bugs.gentoo.org/883433
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-ml/merlin/merlin-4.6.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-ml/merlin/merlin-4.6.ebuild b/dev-ml/merlin/merlin-4.6.ebuild
index 8086c63f9c25..f7843381a666 100644
--- a/dev-ml/merlin/merlin-4.6.ebuild
+++ b/dev-ml/merlin/merlin-4.6.ebuild
@@ -63,7 +63,7 @@ src_unpack() {
 src_prepare() {
 	default
 
-	# Handle installation via the eclass
+	# Handle ELisp installation via the Emacs Eclass.
 	rm emacs/dune || die
 
 	# This test runs only inside a git repo,
@@ -72,6 +72,9 @@ src_prepare() {
 		rm tests/test-dirs/occurrences/issue1404.t || die
 	fi
 	rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die
+
+	# Remove seq references from dune build files.
+	sed -i 's|seq||g' src/frontend/ocamlmerlin/dune || die
 }
 
 src_compile() {


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2022-11-29 23:58 Maciej Barć
  0 siblings, 0 replies; 44+ messages in thread
From: Maciej Barć @ 2022-11-29 23:58 UTC (permalink / raw
  To: gentoo-commits

commit:     fc2dc078e950840193afd1a90df022b7ed2cd002
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 23:53:09 2022 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 23:53:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc2dc078

dev-ml/merlin: bump to 4.7

Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-ml/merlin/Manifest          |   3 ++
 dev-ml/merlin/merlin-4.7.ebuild | 106 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 109 insertions(+)

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index 536daa402927..7166b9a9a28a 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -13,3 +13,6 @@ DIST merlin-4.5-414.tbz 1964688 BLAKE2B 41cb76fb367545af3b5ac7d62f5b69ae031ed999
 DIST merlin-4.6-412.tbz 1767545 BLAKE2B 95b4f4e53accf55f4d2bc381779fa31bb5db39c21fa2cd8dc0b1d5b0e4a4acf484f2eb58327bce1c990cbbb2205bb87215aeba1b923ba6a62c82862d884dd410 SHA512 4362482ecd7c8af1c4e740e3816100cd5408eba3aebc01b867b45bdd1dcc237819cb0640e0f618b6ecf00aa8d55e58e55ecfeb176ed7b358c404ea71302443b0
 DIST merlin-4.6-413.tbz 2292506 BLAKE2B ec61d3b9cbfd9cddbb27fed70ebf7b69816244afb8a6c36347fbb762fc6aee1e6dd2b728db0687cd984603c3847ba3fe858b9663a7b3dcd17aedede662848299 SHA512 fe88a52c4c3c94505da142fbb7d400fce11bfafe6e47ec7cd39437308baa7122399a008bb6d0ef7b8f29636c2a51f4d49e3535136010fec198a1188293914a56
 DIST merlin-4.6-414.tbz 1969647 BLAKE2B fdb55f7ba9a597fb03bb377556238dedc2a5d60bdc772a479a9ad98c0feb243a7fc61dd47a65194ddba9afb8509858d8956a87ca5af9fc68597ba746b0d56d60 SHA512 7373fadf05c692c9f054c7fe6a7d4bdfeefe237b9df432024ef9923782ee72e09021c0c3fba869da8347728105cb2d3ff0aa94b0c5eb09811bb25aa8da9fb520
+DIST merlin-4.7-412.tbz 1771126 BLAKE2B 1454873ecc1d533a5e82adaa71082339c44b93c2626d46cc5147d1b8049b397ef34e6137256560d6c9b7eaf826155e34617c071d1aae3aa3f02807e73c209cf1 SHA512 d13e307d87b4719b56397e54e6f771a3ea77a766ab38b22414c4b1d4d5828b5f790c82f28d3feaf7fe45be10abd50d9a905ece932f43fdad98c88b73b35dd936
+DIST merlin-4.7-413.tbz 2296558 BLAKE2B 2e6d9918c911eab017bb3491cab97f2b0362d13e072a0c39a6637f25d2a15ac7f3027cec51ab0d66a2239fea055f70b5b1e3294c05985faae5d11c57bff81501 SHA512 71068a6b50628c57003b29de3968e41c24b67394dcc1d1f1a0b335211e9d1ef3e527584b868514bd5489db5a130f2ff6fd145d3665a7d2bca5a117074cb08ce8
+DIST merlin-4.7-414.tbz 1976276 BLAKE2B 91fc5221b536d20174e36c4fdf4bc32f125f2af0f23c95c2e917f425826b0c58fe65b1b849eded570b8f4aece0fb00f1bdf7d0a00fa67f6c4e58892a095e1466 SHA512 c325c29bea91699739d7cb7df12876b7ffb8edf685deabb5dce5553b570a6bf8ff415c45e3295b674edbc7711f69f4be202b866d157516380f888e80dcee1082

diff --git a/dev-ml/merlin/merlin-4.7.ebuild b/dev-ml/merlin/merlin-4.7.ebuild
new file mode 100644
index 000000000000..f7843381a666
--- /dev/null
+++ b/dev-ml/merlin/merlin-4.7.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO: vim-plugin, although it's not clear how to make it work here
+inherit elisp-common dune
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin/"
+SRC_URI="
+	https://github.com/ocaml/merlin/releases/download/v${PV}-412/${P}-412.tbz
+	https://github.com/ocaml/merlin/releases/download/v${PV}-413/${P}-413.tbz
+	https://github.com/ocaml/merlin/releases/download/v${PV}-414/${P}-414.tbz
+"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="emacs +ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.12:=[ocamlopt?]
+	dev-ml/csexp:=
+	>=dev-ml/yojson-2.0.0:=
+	dev-ml/menhir:=
+	>=dev-ml/dune-2.9:=
+	|| (
+		dev-lang/ocaml:0/4.12
+		dev-lang/ocaml:0/4.13
+		dev-lang/ocaml:0/4.14
+	)
+	emacs? (
+		>=app-editors/emacs-23.1:*
+		app-emacs/auto-complete
+		app-emacs/company-mode
+	)
+"
+DEPEND="${RDEPEND}"
+# NOTICE: Block dev-ml/seq (which is a back-port of code to ocaml <4.07)
+# because it breaks merlin builds.
+# https://github.com/ocaml/merlin/issues/1500
+BDEPEND="
+	!!<dev-ml/seq-0.3
+	test? ( app-misc/jq )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_unpack() {
+	default
+
+	if has_version "dev-lang/ocaml:0/4.12" ; then
+		mv ${P}-412 "${S}" || die
+	elif has_version "dev-lang/ocaml:0/4.13" ; then
+		mv ${P}-413 "${S}" || die
+	elif has_version "dev-lang/ocaml:0/4.14" ; then
+		mv ${P}-414 "${S}" || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Handle ELisp installation via the Emacs Eclass.
+	rm emacs/dune || die
+
+	# This test runs only inside a git repo,
+	# it is not included in merlin release for ocaml 4.12.
+	if [[ -f tests/test-dirs/occurrences/issue1404.t ]] ; then
+		rm tests/test-dirs/occurrences/issue1404.t || die
+	fi
+	rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die
+
+	# Remove seq references from dune build files.
+	sed -i 's|seq||g' src/frontend/ocamlmerlin/dune || die
+}
+
+src_compile() {
+	dune build @install || die
+
+	if use emacs ; then
+		# iedit isn't packaged yet
+		rm emacs/merlin-iedit.el || die
+
+		BYTECOMPFLAGS="-L emacs" elisp-compile emacs/*.el
+	fi
+}
+
+src_install() {
+	dune_src_install
+
+	if use emacs ; then
+		elisp-install ${PN} emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2022-11-29 23:58 Maciej Barć
  0 siblings, 0 replies; 44+ messages in thread
From: Maciej Barć @ 2022-11-29 23:58 UTC (permalink / raw
  To: gentoo-commits

commit:     312c2ec66a2ade88db82d9178b18a5cbff7affe7
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 23:53:44 2022 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 23:53:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=312c2ec6

dev-ml/merlin: drop old 3.4.2-r3

Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-ml/merlin/Manifest               |  1 -
 dev-ml/merlin/merlin-3.4.2-r3.ebuild | 70 ------------------------------------
 2 files changed, 71 deletions(-)

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index 0e9d80284541..2a81dd9602c4 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -1,4 +1,3 @@
-DIST merlin-3.4.2.tar.gz 11016272 BLAKE2B 6fa55423df7ae8f7a8056e90be630f148dd101194de1921605843caf805bd6c9694fa3fe5b8c2f8eff5d57d7d0e9d8653036b6165a49af655158925c7af87d2f SHA512 8225366ebf27ca656ca89fe00d5aec581487ae332aeab81568e7606eaf575648a7614d4d2de8e0757a4e69c6f4014fefa4574c95da13d42acb310c9dd58a468a
 DIST merlin-4.2-411.tar.gz 1601588 BLAKE2B 348b48ccf2b209bb511450e4ba46ceb3639b1a5facd70bec4519369907e162e95575fa101aa1b79c56719927272a4feebf981692ea2bcb2299fc2c284833b1be SHA512 9ca8d3690621019b8213abcc1a32e1d754b93849f0bbd79bcab3a14915acc295eb60a7b68e997a75e777daaef83d5ca3e81944b7baf352dc4cce8480905ea2d7
 DIST merlin-4.2-ocaml-4.12.patch.gz 816740 BLAKE2B d96ab1059683799312fc8828e8a46bccaae9279b6d711eb7ed47b6e8631d80e09f236bf6f726bafb37ae243457df3220a9948f4f6de6da20c2a6c66a1edb8f3f SHA512 4eef08ac8a7f240596395d8460a4d3195c1483fb686aa7d5231d7ea28c9c6996196890f76feae951d2539ac7abc1f16ee3c453031e6d19af554ff27d67a63229
 DIST merlin-4.3.1-411.tar.gz 1626551 BLAKE2B c4340ff9b50c72208c4cb13d13e26f36463d7c257530d183a293eaaf3d86aaa71745d8154bb5c0e2149003b3cbe5a127fb6187e7bb7fa7024924fd239f981cfc SHA512 bcbba0c1bb1c84eef7becc4a537e1c2a4bd370a33333bfba1029c82fa8b1d9cdf367f98779fe3329286e418c41b06b49bfe796f5cf8058bcd189b4f33aad1abf

diff --git a/dev-ml/merlin/merlin-3.4.2-r3.ebuild b/dev-ml/merlin/merlin-3.4.2-r3.ebuild
deleted file mode 100644
index c4d43185b391..000000000000
--- a/dev-ml/merlin/merlin-3.4.2-r3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# TODO: vim-plugin, although it's not clear how to make it work here
-inherit elisp-common dune
-
-DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
-HOMEPAGE="https://github.com/ocaml/merlin"
-SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="emacs +ocamlopt"
-
-RDEPEND="
-	dev-ml/csexp:=
-	<dev-ml/yojson-2:=
-	>=dev-lang/ocaml-4.09:=
-	<dev-lang/ocaml-4.12:=
-	emacs? (
-		>=app-editors/emacs-23.1:*
-		app-emacs/auto-complete
-		app-emacs/company-mode
-	)
-"
-DEPEND="${RDEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	default
-
-	# Handle installation via the eclass
-	rm emacs/dune || die
-}
-
-src_compile() {
-	dune_src_compile
-
-	if use emacs ; then
-		# Build the emacs integration
-		cd emacs || die
-
-		# iedit isn't packaged yet
-		rm merlin-iedit.el || die
-
-		elisp-compile *.el
-	fi
-}
-
-src_install() {
-	dune_src_install
-
-	if use emacs ; then
-		cd "${S}/emacs" || die
-		elisp-install ${PN} *.el *.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2022-11-29 23:58 Maciej Barć
  0 siblings, 0 replies; 44+ messages in thread
From: Maciej Barć @ 2022-11-29 23:58 UTC (permalink / raw
  To: gentoo-commits

commit:     217682927ce836b08c99c70e9bd1a51bfded3c24
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 23:53:54 2022 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 23:53:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21768292

dev-ml/merlin: drop old 4.2-r2

Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-ml/merlin/Manifest             |  2 -
 dev-ml/merlin/merlin-4.2-r2.ebuild | 83 --------------------------------------
 2 files changed, 85 deletions(-)

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index 2a81dd9602c4..b9cfc9204251 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -1,5 +1,3 @@
-DIST merlin-4.2-411.tar.gz 1601588 BLAKE2B 348b48ccf2b209bb511450e4ba46ceb3639b1a5facd70bec4519369907e162e95575fa101aa1b79c56719927272a4feebf981692ea2bcb2299fc2c284833b1be SHA512 9ca8d3690621019b8213abcc1a32e1d754b93849f0bbd79bcab3a14915acc295eb60a7b68e997a75e777daaef83d5ca3e81944b7baf352dc4cce8480905ea2d7
-DIST merlin-4.2-ocaml-4.12.patch.gz 816740 BLAKE2B d96ab1059683799312fc8828e8a46bccaae9279b6d711eb7ed47b6e8631d80e09f236bf6f726bafb37ae243457df3220a9948f4f6de6da20c2a6c66a1edb8f3f SHA512 4eef08ac8a7f240596395d8460a4d3195c1483fb686aa7d5231d7ea28c9c6996196890f76feae951d2539ac7abc1f16ee3c453031e6d19af554ff27d67a63229
 DIST merlin-4.3.1-411.tar.gz 1626551 BLAKE2B c4340ff9b50c72208c4cb13d13e26f36463d7c257530d183a293eaaf3d86aaa71745d8154bb5c0e2149003b3cbe5a127fb6187e7bb7fa7024924fd239f981cfc SHA512 bcbba0c1bb1c84eef7becc4a537e1c2a4bd370a33333bfba1029c82fa8b1d9cdf367f98779fe3329286e418c41b06b49bfe796f5cf8058bcd189b4f33aad1abf
 DIST merlin-4.3.1-ocaml-4.12.patch.gz 818559 BLAKE2B accf65bd5d5798bafe2be022d685da8f829aa9a9c98784420d8a62646d80ab73d1e189e3601266e09eebd4732ae241e8d11dc9663adac3b03a555db663a6d649 SHA512 8823b6e30e49ab3cf35a78063066f01aa7dcbc9174d45b0fed94a3f50e388c35e7ac810c5548c57d7bcf9304b045c483080496865b011269913120a5509a1149
 DIST merlin-4.5-411.tbz 1316537 BLAKE2B 8850ea6b15819a178f763d8b55fecca9104cec5097c39afad7dc8b59543d961d7aa4a86590ebb59a3066d1f6630f11284e24835398ab967f45a52faf004477f1 SHA512 9e68ebabdc0cc398edcd255516070d6459f3bf5738c0dbe332c11c6bc4070e7bf340bc086fa2ea58597972ebe9d15860ecd0e549444809be809f0509b41652c2

diff --git a/dev-ml/merlin/merlin-4.2-r2.ebuild b/dev-ml/merlin/merlin-4.2-r2.ebuild
deleted file mode 100644
index 531c1f5309e7..000000000000
--- a/dev-ml/merlin/merlin-4.2-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# TODO: vim-plugin, although it's not clear how to make it work here
-inherit elisp-common dune
-
-DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
-HOMEPAGE="https://github.com/ocaml/merlin"
-SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}-411.tar.gz -> ${P}-411.tar.gz
-	https://dev.gentoo.org/~tupone/distfiles/${P}-ocaml-4.12.patch.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="emacs +ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ml/csexp:=
-	<dev-ml/yojson-2:=
-	dev-ml/menhir:=
-	|| (
-		dev-lang/ocaml:0/4.11
-		dev-lang/ocaml:0/4.12
-	)
-	emacs? (
-		>=app-editors/emacs-23.1:*
-		app-emacs/auto-complete
-		app-emacs/company-mode
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( app-misc/jq )"
-
-SITEFILE="50${PN}-gentoo.el"
-
-S="${WORKDIR}"/${P}-411
-
-src_prepare() {
-	has_version "dev-lang/ocaml:0/4.12" && \
-		eapply "${WORKDIR}"/${P}-ocaml-4.12.patch
-	default
-
-	# Handle installation via the eclass
-	rm emacs/dune || die
-
-	# rm failing test
-	rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die
-}
-
-src_compile() {
-	dune build @install || die
-
-	if use emacs ; then
-		# Build the emacs integration
-		cd emacs || die
-
-		# iedit isn't packaged yet
-		rm merlin-iedit.el || die
-
-		elisp-compile *.el
-	fi
-}
-
-src_install() {
-	dune_src_install
-
-	if use emacs ; then
-		cd "${S}/emacs" || die
-		elisp-install ${PN} *.el *.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2022-11-29 23:58 Maciej Barć
  0 siblings, 0 replies; 44+ messages in thread
From: Maciej Barć @ 2022-11-29 23:58 UTC (permalink / raw
  To: gentoo-commits

commit:     7399602e42432ee153c60d9e98cdf9fe04b88e4a
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 23:53:29 2022 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 23:53:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7399602e

dev-ml/merlin: drop old 4.4-r3

Closes: https://bugs.gentoo.org/883625
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-ml/merlin/Manifest             |  3 --
 dev-ml/merlin/merlin-4.4-r3.ebuild | 93 --------------------------------------
 2 files changed, 96 deletions(-)

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index 7166b9a9a28a..0e9d80284541 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -3,9 +3,6 @@ DIST merlin-4.2-411.tar.gz 1601588 BLAKE2B 348b48ccf2b209bb511450e4ba46ceb3639b1
 DIST merlin-4.2-ocaml-4.12.patch.gz 816740 BLAKE2B d96ab1059683799312fc8828e8a46bccaae9279b6d711eb7ed47b6e8631d80e09f236bf6f726bafb37ae243457df3220a9948f4f6de6da20c2a6c66a1edb8f3f SHA512 4eef08ac8a7f240596395d8460a4d3195c1483fb686aa7d5231d7ea28c9c6996196890f76feae951d2539ac7abc1f16ee3c453031e6d19af554ff27d67a63229
 DIST merlin-4.3.1-411.tar.gz 1626551 BLAKE2B c4340ff9b50c72208c4cb13d13e26f36463d7c257530d183a293eaaf3d86aaa71745d8154bb5c0e2149003b3cbe5a127fb6187e7bb7fa7024924fd239f981cfc SHA512 bcbba0c1bb1c84eef7becc4a537e1c2a4bd370a33333bfba1029c82fa8b1d9cdf367f98779fe3329286e418c41b06b49bfe796f5cf8058bcd189b4f33aad1abf
 DIST merlin-4.3.1-ocaml-4.12.patch.gz 818559 BLAKE2B accf65bd5d5798bafe2be022d685da8f829aa9a9c98784420d8a62646d80ab73d1e189e3601266e09eebd4732ae241e8d11dc9663adac3b03a555db663a6d649 SHA512 8823b6e30e49ab3cf35a78063066f01aa7dcbc9174d45b0fed94a3f50e388c35e7ac810c5548c57d7bcf9304b045c483080496865b011269913120a5509a1149
-DIST merlin-4.4-411.tbz 1314200 BLAKE2B 0d16308e1ece70f8200e78233ecdff553f28e9a83b17f044eba8a4af170b65935b59ecf6e887299d9373b16d0a0cce24e0f9697f7cde4b3889df9db954e796c8 SHA512 82e4b025db6c6ec0c8b53bce82e980bfc2a507b9092dc513fb10c11be0bc2e37ad9efd5436263ecfa03acc3ec3a4b20ef9599b1814abe530f99d84b2f484fecc
-DIST merlin-4.4-412.tbz 1762888 BLAKE2B adee3863e6fab90643db91b5da418324c65d9b2712140fa4f6b65ef3915bc24126a2cf8c2ceda14a914213595ed1951c7c79c388be7ca407f59c230bcc95eecb SHA512 f51b2875b75215d0be378de86b9dca0957b5e62241ce625a46c6341c219582510d37af94dedf67e1d3db61ebacfef8fa764e4719fac16c0b4b99bb85d0b991d4
-DIST merlin-4.4-413.tbz 2284368 BLAKE2B 1c7f0c9cda8dda4fa91888c3ba91eb74cacffe54bdcc3b9ca49ea816558216ece50cab5f69c4d54298610ca0781a6332a8d0e1ed7526711c97fbc1748f45c309 SHA512 b0bf3c7d72dfc7c70e22d60afca5b7fee71a35127839181fdb46e1e15a230e58765960548c545bbef4fdab180291c738cacb724b9ecf284eee5640ebef07c4ff
 DIST merlin-4.5-411.tbz 1316537 BLAKE2B 8850ea6b15819a178f763d8b55fecca9104cec5097c39afad7dc8b59543d961d7aa4a86590ebb59a3066d1f6630f11284e24835398ab967f45a52faf004477f1 SHA512 9e68ebabdc0cc398edcd255516070d6459f3bf5738c0dbe332c11c6bc4070e7bf340bc086fa2ea58597972ebe9d15860ecd0e549444809be809f0509b41652c2
 DIST merlin-4.5-412.tbz 1765436 BLAKE2B eaed065a2814f4c1bfc5337d026c7c42287b8cbbe50097415a983f7fdd7323f4c88f3b8c8cff4ca88a0813204617f39807709a6703fd618269eca6063b3c47b1 SHA512 f9edc3e1c9f753d7bacbdf1b92c118b54f9e9eff0bf752a2b44f39a2f7ecc76c4cd3bbe9227e910aea8b5ea947e8fe1b8d92ba0245fe47bc8cc2f45404cca973
 DIST merlin-4.5-413.tbz 2290507 BLAKE2B 32aeda63caec645da8043c49ceaa0ea54d095b3e286f687b5f3da1b44d54bbc291d0358768d2180825cb620a91765da83d90b645151a694a4131788ab4438fbf SHA512 b1db98c38a97ca0eef3051ab2b5d1b158e757863de6908a830308e7ea7f960eebd64b1a60bf51b10b7ea2eea3141ee0917a7c3570b63f9faa2e3f69c5d6fe0c2

diff --git a/dev-ml/merlin/merlin-4.4-r3.ebuild b/dev-ml/merlin/merlin-4.4-r3.ebuild
deleted file mode 100644
index 858b8e8cfce7..000000000000
--- a/dev-ml/merlin/merlin-4.4-r3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# TODO: vim-plugin, although it's not clear how to make it work here
-inherit elisp-common dune
-
-DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
-HOMEPAGE="https://github.com/ocaml/merlin"
-SRC_URI="https://github.com/ocaml/merlin/releases/download/v${PV}-411/${P}-411.tbz
-	https://github.com/ocaml/merlin/releases/download/v${PV}-412/${P}-412.tbz
-	https://github.com/ocaml/merlin/releases/download/v${PV}-413/${P}-413.tbz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="emacs +ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ml/csexp:=
-	<dev-ml/yojson-2:=
-	dev-ml/menhir:=
-	>=dev-ml/dune-2.9:=
-	|| (
-		dev-lang/ocaml:0/4.11
-		dev-lang/ocaml:0/4.12
-		dev-lang/ocaml:0/4.13
-	)
-	emacs? (
-		>=app-editors/emacs-23.1:*
-		app-emacs/auto-complete
-		app-emacs/company-mode
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( app-misc/jq )"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_unpack() {
-	default
-	if has_version "dev-lang/ocaml:0/4.11" ; then
-		mv merlin-4.4-411 "${S}" || die
-	elif has_version "dev-lang/ocaml:0/4.12" ; then
-		mv merlin-4.4-412 "${S}" || die
-	elif has_version "dev-lang/ocaml:0/4.13" ; then
-		mv merlin-4.4-413 "${S}" || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Handle installation via the eclass
-	rm emacs/dune || die
-
-	# rm failing test
-	rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die
-}
-
-src_compile() {
-	dune build @install || die
-
-	if use emacs ; then
-		# Build the emacs integration
-		cd emacs || die
-
-		# iedit isn't packaged yet
-		rm merlin-iedit.el || die
-
-		elisp-compile *.el
-	fi
-}
-
-src_install() {
-	dune_src_install
-
-	if use emacs ; then
-		cd "${S}/emacs" || die
-		elisp-install ${PN} *.el *.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2022-11-29 23:58 Maciej Barć
  0 siblings, 0 replies; 44+ messages in thread
From: Maciej Barć @ 2022-11-29 23:58 UTC (permalink / raw
  To: gentoo-commits

commit:     32a497c373e037835894bd73e960e534a108680c
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 23:54:07 2022 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 23:54:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32a497c3

dev-ml/merlin: drop old 4.3.1-r3

Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-ml/merlin/Manifest               |  2 -
 dev-ml/merlin/merlin-4.3.1-r3.ebuild | 84 ------------------------------------
 2 files changed, 86 deletions(-)

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index b9cfc9204251..4da55eef03ef 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -1,5 +1,3 @@
-DIST merlin-4.3.1-411.tar.gz 1626551 BLAKE2B c4340ff9b50c72208c4cb13d13e26f36463d7c257530d183a293eaaf3d86aaa71745d8154bb5c0e2149003b3cbe5a127fb6187e7bb7fa7024924fd239f981cfc SHA512 bcbba0c1bb1c84eef7becc4a537e1c2a4bd370a33333bfba1029c82fa8b1d9cdf367f98779fe3329286e418c41b06b49bfe796f5cf8058bcd189b4f33aad1abf
-DIST merlin-4.3.1-ocaml-4.12.patch.gz 818559 BLAKE2B accf65bd5d5798bafe2be022d685da8f829aa9a9c98784420d8a62646d80ab73d1e189e3601266e09eebd4732ae241e8d11dc9663adac3b03a555db663a6d649 SHA512 8823b6e30e49ab3cf35a78063066f01aa7dcbc9174d45b0fed94a3f50e388c35e7ac810c5548c57d7bcf9304b045c483080496865b011269913120a5509a1149
 DIST merlin-4.5-411.tbz 1316537 BLAKE2B 8850ea6b15819a178f763d8b55fecca9104cec5097c39afad7dc8b59543d961d7aa4a86590ebb59a3066d1f6630f11284e24835398ab967f45a52faf004477f1 SHA512 9e68ebabdc0cc398edcd255516070d6459f3bf5738c0dbe332c11c6bc4070e7bf340bc086fa2ea58597972ebe9d15860ecd0e549444809be809f0509b41652c2
 DIST merlin-4.5-412.tbz 1765436 BLAKE2B eaed065a2814f4c1bfc5337d026c7c42287b8cbbe50097415a983f7fdd7323f4c88f3b8c8cff4ca88a0813204617f39807709a6703fd618269eca6063b3c47b1 SHA512 f9edc3e1c9f753d7bacbdf1b92c118b54f9e9eff0bf752a2b44f39a2f7ecc76c4cd3bbe9227e910aea8b5ea947e8fe1b8d92ba0245fe47bc8cc2f45404cca973
 DIST merlin-4.5-413.tbz 2290507 BLAKE2B 32aeda63caec645da8043c49ceaa0ea54d095b3e286f687b5f3da1b44d54bbc291d0358768d2180825cb620a91765da83d90b645151a694a4131788ab4438fbf SHA512 b1db98c38a97ca0eef3051ab2b5d1b158e757863de6908a830308e7ea7f960eebd64b1a60bf51b10b7ea2eea3141ee0917a7c3570b63f9faa2e3f69c5d6fe0c2

diff --git a/dev-ml/merlin/merlin-4.3.1-r3.ebuild b/dev-ml/merlin/merlin-4.3.1-r3.ebuild
deleted file mode 100644
index 2f3b6848a507..000000000000
--- a/dev-ml/merlin/merlin-4.3.1-r3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# TODO: vim-plugin, although it's not clear how to make it work here
-inherit elisp-common dune
-
-DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
-HOMEPAGE="https://github.com/ocaml/merlin"
-SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}-411.tar.gz -> ${P}-411.tar.gz
-	https://dev.gentoo.org/~tupone/distfiles/${P}-ocaml-4.12.patch.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="emacs +ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ml/csexp:=
-	<dev-ml/yojson-2:=
-	dev-ml/menhir:=
-	>=dev-ml/dune-2.9:=
-	|| (
-		dev-lang/ocaml:0/4.11
-		dev-lang/ocaml:0/4.12
-	)
-	emacs? (
-		>=app-editors/emacs-23.1:*
-		app-emacs/auto-complete
-		app-emacs/company-mode
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( app-misc/jq )"
-
-SITEFILE="50${PN}-gentoo.el"
-
-S="${WORKDIR}"/${P}-411
-
-src_prepare() {
-	has_version "dev-lang/ocaml:0/4.12" && \
-		eapply "${WORKDIR}"/${P}-ocaml-4.12.patch
-	default
-
-	# Handle installation via the eclass
-	rm emacs/dune || die
-
-	# rm failing test
-	rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die
-}
-
-src_compile() {
-	dune build @install || die
-
-	if use emacs ; then
-		# Build the emacs integration
-		cd emacs || die
-
-		# iedit isn't packaged yet
-		rm merlin-iedit.el || die
-
-		elisp-compile *.el
-	fi
-}
-
-src_install() {
-	dune_src_install
-
-	if use emacs ; then
-		cd "${S}/emacs" || die
-		elisp-install ${PN} *.el *.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2023-02-12 13:28 Alfredo Tupone
  0 siblings, 0 replies; 44+ messages in thread
From: Alfredo Tupone @ 2023-02-12 13:28 UTC (permalink / raw
  To: gentoo-commits

commit:     da6978e56be698805a0fac2efa92c645f0b823fe
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 09:23:53 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 13:28:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da6978e5

dev-ml/merlin: fix build with ocaml-4.14.1

Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ml/merlin/{merlin-4.7.ebuild => merlin-4.7-r1.ebuild} | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dev-ml/merlin/merlin-4.7.ebuild b/dev-ml/merlin/merlin-4.7-r1.ebuild
similarity index 93%
rename from dev-ml/merlin/merlin-4.7.ebuild
rename to dev-ml/merlin/merlin-4.7-r1.ebuild
index f7843381a666..55c9b7015515 100644
--- a/dev-ml/merlin/merlin-4.7.ebuild
+++ b/dev-ml/merlin/merlin-4.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ IUSE="emacs +ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-lang/ocaml-4.12:=[ocamlopt?]
+	dev-lang/ocaml:=[ocamlopt?]
 	dev-ml/csexp:=
 	>=dev-ml/yojson-2.0.0:=
 	dev-ml/menhir:=
@@ -30,6 +30,7 @@ RDEPEND="
 		dev-lang/ocaml:0/4.12
 		dev-lang/ocaml:0/4.13
 		dev-lang/ocaml:0/4.14
+		dev-lang/ocaml:0/4.14.1
 	)
 	emacs? (
 		>=app-editors/emacs-23.1:*
@@ -57,6 +58,8 @@ src_unpack() {
 		mv ${P}-413 "${S}" || die
 	elif has_version "dev-lang/ocaml:0/4.14" ; then
 		mv ${P}-414 "${S}" || die
+	elif has_version "dev-lang/ocaml:0/4.14.1" ; then
+		mv ${P}-414 "${S}" || die
 	fi
 }
 


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2023-08-10 22:19 Maciej Barć
  0 siblings, 0 replies; 44+ messages in thread
From: Maciej Barć @ 2023-08-10 22:19 UTC (permalink / raw
  To: gentoo-commits

commit:     2b1fed87b5ff16067334d3c74410c2162b88f883
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 10 22:16:43 2023 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Thu Aug 10 22:19:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b1fed87

dev-ml/merlin: bump to 4.9

Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-ml/merlin/Manifest          |  1 +
 dev-ml/merlin/merlin-4.9.ebuild | 99 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 100 insertions(+)

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index 4da55eef03ef..44e3b33147cf 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -8,3 +8,4 @@ DIST merlin-4.6-414.tbz 1969647 BLAKE2B fdb55f7ba9a597fb03bb377556238dedc2a5d60b
 DIST merlin-4.7-412.tbz 1771126 BLAKE2B 1454873ecc1d533a5e82adaa71082339c44b93c2626d46cc5147d1b8049b397ef34e6137256560d6c9b7eaf826155e34617c071d1aae3aa3f02807e73c209cf1 SHA512 d13e307d87b4719b56397e54e6f771a3ea77a766ab38b22414c4b1d4d5828b5f790c82f28d3feaf7fe45be10abd50d9a905ece932f43fdad98c88b73b35dd936
 DIST merlin-4.7-413.tbz 2296558 BLAKE2B 2e6d9918c911eab017bb3491cab97f2b0362d13e072a0c39a6637f25d2a15ac7f3027cec51ab0d66a2239fea055f70b5b1e3294c05985faae5d11c57bff81501 SHA512 71068a6b50628c57003b29de3968e41c24b67394dcc1d1f1a0b335211e9d1ef3e527584b868514bd5489db5a130f2ff6fd145d3665a7d2bca5a117074cb08ce8
 DIST merlin-4.7-414.tbz 1976276 BLAKE2B 91fc5221b536d20174e36c4fdf4bc32f125f2af0f23c95c2e917f425826b0c58fe65b1b849eded570b8f4aece0fb00f1bdf7d0a00fa67f6c4e58892a095e1466 SHA512 c325c29bea91699739d7cb7df12876b7ffb8edf685deabb5dce5553b570a6bf8ff415c45e3295b674edbc7711f69f4be202b866d157516380f888e80dcee1082
+DIST merlin-4.9-414.tbz 1983485 BLAKE2B 1a538df53ab5c575cf217c2dc832512aa8384c0483c9a46c42b86e52c8af454c15e25d7f8a961b8e19251fc75575fb6bf09f5693d36ce0b2e5b40757bb2985ea SHA512 2199f963368597d10cc197e41ebb883f6a166018c9da3fe259c354550df41b713781003598a2fe5956b0a4ae96f8c07ba33831d3cf6f9d494b731944f87e491e

diff --git a/dev-ml/merlin/merlin-4.9.ebuild b/dev-ml/merlin/merlin-4.9.ebuild
new file mode 100644
index 000000000000..3e4435149b42
--- /dev/null
+++ b/dev-ml/merlin/merlin-4.9.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO: vim-plugin, although it's not clear how to make it work here
+inherit elisp-common dune
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin/"
+SRC_URI="https://github.com/ocaml/merlin/releases/download/v${PV}-414/${P}-414.tbz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="emacs +ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-lang/ocaml:=[ocamlopt?]
+	dev-ml/csexp:=
+	>=dev-ml/yojson-2.0.0:=
+	dev-ml/menhir:=
+	>=dev-ml/dune-2.9:=
+	|| (
+		dev-lang/ocaml:0/4.14
+		dev-lang/ocaml:0/4.14.1
+	)
+	emacs? (
+		>=app-editors/emacs-23.1:*
+		app-emacs/auto-complete
+		app-emacs/company-mode
+	)
+"
+DEPEND="${RDEPEND}"
+# NOTICE: Block dev-ml/seq (which is a back-port of code to ocaml <4.07)
+# because it breaks merlin builds.
+# https://github.com/ocaml/merlin/issues/1500
+BDEPEND="
+	!!<dev-ml/seq-0.3
+	test? ( app-misc/jq )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_unpack() {
+	default
+
+	if has_version "dev-lang/ocaml:0/4.14" ; then
+		mv ${P}-414 "${S}" || die
+	elif has_version "dev-lang/ocaml:0/4.14.1" ; then
+		mv ${P}-414 "${S}" || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Handle ELisp installation via the Emacs Eclass.
+	rm emacs/dune || die
+
+	# This test runs only inside a git repo,
+	# it is not included in merlin release for ocaml 4.12.
+	if [[ -f tests/test-dirs/occurrences/issue1404.t ]] ; then
+		rm tests/test-dirs/occurrences/issue1404.t || die
+	fi
+	rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die
+
+	# Remove seq references from dune build files.
+	sed -i 's|seq||g' src/frontend/ocamlmerlin/dune || die
+}
+
+src_compile() {
+	edune build @install
+
+	if use emacs ; then
+		# iedit isn't packaged yet
+		rm emacs/merlin-iedit.el || die
+
+		BYTECOMPFLAGS="-L emacs" elisp-compile emacs/*.el
+	fi
+}
+
+src_install() {
+	dune_src_install
+
+	if use emacs ; then
+		elisp-install ${PN} emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2023-08-27 12:42 Maciej Barć
  0 siblings, 0 replies; 44+ messages in thread
From: Maciej Barć @ 2023-08-27 12:42 UTC (permalink / raw
  To: gentoo-commits

commit:     0834efea40c25bdae2e66b5ca0ed5ca7fe07a2f2
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 27 12:39:55 2023 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sun Aug 27 12:42:47 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0834efea

dev-ml/merlin: bump to 4.10

Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-ml/merlin/Manifest           |  1 +
 dev-ml/merlin/merlin-4.10.ebuild | 99 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 100 insertions(+)

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index 44e3b33147cf..0daf01decf3a 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -1,3 +1,4 @@
+DIST merlin-4.10-414.tbz 1989927 BLAKE2B 9a65e9c1a2d5795e1e0235d5c8b0274bd9d8ef052ed421e8809224de73f577da273c9f1ca0f071d6ea0accd349b9b6d59b2e1fb5561effe483ebb0de89a4c766 SHA512 7805b99c2a73b2e3f70d26fd7183a90f97657d66946e2a4b58563f00fd3ed8d82da1fb0597b033b8c8c9e8db415d66e51720c972d34db4b66b71bb8f0c9ee08c
 DIST merlin-4.5-411.tbz 1316537 BLAKE2B 8850ea6b15819a178f763d8b55fecca9104cec5097c39afad7dc8b59543d961d7aa4a86590ebb59a3066d1f6630f11284e24835398ab967f45a52faf004477f1 SHA512 9e68ebabdc0cc398edcd255516070d6459f3bf5738c0dbe332c11c6bc4070e7bf340bc086fa2ea58597972ebe9d15860ecd0e549444809be809f0509b41652c2
 DIST merlin-4.5-412.tbz 1765436 BLAKE2B eaed065a2814f4c1bfc5337d026c7c42287b8cbbe50097415a983f7fdd7323f4c88f3b8c8cff4ca88a0813204617f39807709a6703fd618269eca6063b3c47b1 SHA512 f9edc3e1c9f753d7bacbdf1b92c118b54f9e9eff0bf752a2b44f39a2f7ecc76c4cd3bbe9227e910aea8b5ea947e8fe1b8d92ba0245fe47bc8cc2f45404cca973
 DIST merlin-4.5-413.tbz 2290507 BLAKE2B 32aeda63caec645da8043c49ceaa0ea54d095b3e286f687b5f3da1b44d54bbc291d0358768d2180825cb620a91765da83d90b645151a694a4131788ab4438fbf SHA512 b1db98c38a97ca0eef3051ab2b5d1b158e757863de6908a830308e7ea7f960eebd64b1a60bf51b10b7ea2eea3141ee0917a7c3570b63f9faa2e3f69c5d6fe0c2

diff --git a/dev-ml/merlin/merlin-4.10.ebuild b/dev-ml/merlin/merlin-4.10.ebuild
new file mode 100644
index 000000000000..3e4435149b42
--- /dev/null
+++ b/dev-ml/merlin/merlin-4.10.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO: vim-plugin, although it's not clear how to make it work here
+inherit elisp-common dune
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin/"
+SRC_URI="https://github.com/ocaml/merlin/releases/download/v${PV}-414/${P}-414.tbz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="emacs +ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-lang/ocaml:=[ocamlopt?]
+	dev-ml/csexp:=
+	>=dev-ml/yojson-2.0.0:=
+	dev-ml/menhir:=
+	>=dev-ml/dune-2.9:=
+	|| (
+		dev-lang/ocaml:0/4.14
+		dev-lang/ocaml:0/4.14.1
+	)
+	emacs? (
+		>=app-editors/emacs-23.1:*
+		app-emacs/auto-complete
+		app-emacs/company-mode
+	)
+"
+DEPEND="${RDEPEND}"
+# NOTICE: Block dev-ml/seq (which is a back-port of code to ocaml <4.07)
+# because it breaks merlin builds.
+# https://github.com/ocaml/merlin/issues/1500
+BDEPEND="
+	!!<dev-ml/seq-0.3
+	test? ( app-misc/jq )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_unpack() {
+	default
+
+	if has_version "dev-lang/ocaml:0/4.14" ; then
+		mv ${P}-414 "${S}" || die
+	elif has_version "dev-lang/ocaml:0/4.14.1" ; then
+		mv ${P}-414 "${S}" || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Handle ELisp installation via the Emacs Eclass.
+	rm emacs/dune || die
+
+	# This test runs only inside a git repo,
+	# it is not included in merlin release for ocaml 4.12.
+	if [[ -f tests/test-dirs/occurrences/issue1404.t ]] ; then
+		rm tests/test-dirs/occurrences/issue1404.t || die
+	fi
+	rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die
+
+	# Remove seq references from dune build files.
+	sed -i 's|seq||g' src/frontend/ocamlmerlin/dune || die
+}
+
+src_compile() {
+	edune build @install
+
+	if use emacs ; then
+		# iedit isn't packaged yet
+		rm emacs/merlin-iedit.el || die
+
+		BYTECOMPFLAGS="-L emacs" elisp-compile emacs/*.el
+	fi
+}
+
+src_install() {
+	dune_src_install
+
+	if use emacs ; then
+		elisp-install ${PN} emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2023-08-27 12:42 Maciej Barć
  0 siblings, 0 replies; 44+ messages in thread
From: Maciej Barć @ 2023-08-27 12:42 UTC (permalink / raw
  To: gentoo-commits

commit:     527b219857dec53783a33474fefa70d175037259
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 27 12:40:31 2023 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sun Aug 27 12:42:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=527b2198

dev-ml/merlin: drop old 4.5-r3

Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-ml/merlin/Manifest             |  4 --
 dev-ml/merlin/merlin-4.5-r3.ebuild | 97 --------------------------------------
 2 files changed, 101 deletions(-)

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index 0daf01decf3a..425ce511f87f 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -1,8 +1,4 @@
 DIST merlin-4.10-414.tbz 1989927 BLAKE2B 9a65e9c1a2d5795e1e0235d5c8b0274bd9d8ef052ed421e8809224de73f577da273c9f1ca0f071d6ea0accd349b9b6d59b2e1fb5561effe483ebb0de89a4c766 SHA512 7805b99c2a73b2e3f70d26fd7183a90f97657d66946e2a4b58563f00fd3ed8d82da1fb0597b033b8c8c9e8db415d66e51720c972d34db4b66b71bb8f0c9ee08c
-DIST merlin-4.5-411.tbz 1316537 BLAKE2B 8850ea6b15819a178f763d8b55fecca9104cec5097c39afad7dc8b59543d961d7aa4a86590ebb59a3066d1f6630f11284e24835398ab967f45a52faf004477f1 SHA512 9e68ebabdc0cc398edcd255516070d6459f3bf5738c0dbe332c11c6bc4070e7bf340bc086fa2ea58597972ebe9d15860ecd0e549444809be809f0509b41652c2
-DIST merlin-4.5-412.tbz 1765436 BLAKE2B eaed065a2814f4c1bfc5337d026c7c42287b8cbbe50097415a983f7fdd7323f4c88f3b8c8cff4ca88a0813204617f39807709a6703fd618269eca6063b3c47b1 SHA512 f9edc3e1c9f753d7bacbdf1b92c118b54f9e9eff0bf752a2b44f39a2f7ecc76c4cd3bbe9227e910aea8b5ea947e8fe1b8d92ba0245fe47bc8cc2f45404cca973
-DIST merlin-4.5-413.tbz 2290507 BLAKE2B 32aeda63caec645da8043c49ceaa0ea54d095b3e286f687b5f3da1b44d54bbc291d0358768d2180825cb620a91765da83d90b645151a694a4131788ab4438fbf SHA512 b1db98c38a97ca0eef3051ab2b5d1b158e757863de6908a830308e7ea7f960eebd64b1a60bf51b10b7ea2eea3141ee0917a7c3570b63f9faa2e3f69c5d6fe0c2
-DIST merlin-4.5-414.tbz 1964688 BLAKE2B 41cb76fb367545af3b5ac7d62f5b69ae031ed99956aca947dc8b91e2fa906d500bed272f7f46a7ad9e57bf3cb5620893072b52ac7f2246d6ae3be1ae22e99406 SHA512 cc2cf2c208091b3ae435a8124617e56f2002b7091532002ab49a1f817d90a5c4f9cf0bc5741dc7f2526e0352c3ca95b42c3b3a17c6cbfb80ad73d42310a25d22
 DIST merlin-4.6-412.tbz 1767545 BLAKE2B 95b4f4e53accf55f4d2bc381779fa31bb5db39c21fa2cd8dc0b1d5b0e4a4acf484f2eb58327bce1c990cbbb2205bb87215aeba1b923ba6a62c82862d884dd410 SHA512 4362482ecd7c8af1c4e740e3816100cd5408eba3aebc01b867b45bdd1dcc237819cb0640e0f618b6ecf00aa8d55e58e55ecfeb176ed7b358c404ea71302443b0
 DIST merlin-4.6-413.tbz 2292506 BLAKE2B ec61d3b9cbfd9cddbb27fed70ebf7b69816244afb8a6c36347fbb762fc6aee1e6dd2b728db0687cd984603c3847ba3fe858b9663a7b3dcd17aedede662848299 SHA512 fe88a52c4c3c94505da142fbb7d400fce11bfafe6e47ec7cd39437308baa7122399a008bb6d0ef7b8f29636c2a51f4d49e3535136010fec198a1188293914a56
 DIST merlin-4.6-414.tbz 1969647 BLAKE2B fdb55f7ba9a597fb03bb377556238dedc2a5d60bdc772a479a9ad98c0feb243a7fc61dd47a65194ddba9afb8509858d8956a87ca5af9fc68597ba746b0d56d60 SHA512 7373fadf05c692c9f054c7fe6a7d4bdfeefe237b9df432024ef9923782ee72e09021c0c3fba869da8347728105cb2d3ff0aa94b0c5eb09811bb25aa8da9fb520

diff --git a/dev-ml/merlin/merlin-4.5-r3.ebuild b/dev-ml/merlin/merlin-4.5-r3.ebuild
deleted file mode 100644
index b3cc5b868e42..000000000000
--- a/dev-ml/merlin/merlin-4.5-r3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: vim-plugin, although it's not clear how to make it work here
-inherit elisp-common dune
-
-DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
-HOMEPAGE="https://github.com/ocaml/merlin"
-SRC_URI="https://github.com/ocaml/merlin/releases/download/v${PV}-411/${P}-411.tbz
-	https://github.com/ocaml/merlin/releases/download/v${PV}-412/${P}-412.tbz
-	https://github.com/ocaml/merlin/releases/download/v${PV}-413/${P}-413.tbz
-	https://github.com/ocaml/merlin/releases/download/v${PV}-414/${P}-414.tbz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="emacs +ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ml/csexp:=
-	<dev-ml/yojson-2:=
-	dev-ml/menhir:=
-	>=dev-ml/dune-2.9:=
-	|| (
-		dev-lang/ocaml:0/4.11
-		dev-lang/ocaml:0/4.12
-		dev-lang/ocaml:0/4.13
-		dev-lang/ocaml:0/4.14
-	)
-	emacs? (
-		>=app-editors/emacs-23.1:*
-		app-emacs/auto-complete
-		app-emacs/company-mode
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( app-misc/jq )"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_unpack() {
-	default
-
-	if has_version "dev-lang/ocaml:0/4.11" ; then
-		mv ${P}-411 "${S}" || die
-	elif has_version "dev-lang/ocaml:0/4.12" ; then
-		mv ${P}-412 "${S}" || die
-	elif has_version "dev-lang/ocaml:0/4.13" ; then
-		mv ${P}-413 "${S}" || die
-	elif has_version "dev-lang/ocaml:0/4.14" ; then
-		mv ${P}-414 "${S}" || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Handle installation via the eclass
-	rm emacs/dune || die
-
-	# This test runs only inside a git repo,
-	# it is not included in merlin release for ocaml 4.12.
-	if [[ -f tests/test-dirs/occurrences/issue1404.t ]] ; then
-		rm tests/test-dirs/occurrences/issue1404.t || die
-	fi
-}
-
-src_compile() {
-	dune build @install || die
-
-	if use emacs ; then
-		# iedit isn't packaged yet
-		rm emacs/merlin-iedit.el || die
-
-		BYTECOMPFLAGS="-L emacs" elisp-compile emacs/*.el
-	fi
-}
-
-src_install() {
-	dune_src_install
-
-	if use emacs ; then
-		elisp-install ${PN} emacs/*.el{,c}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2023-08-27 12:42 Maciej Barć
  0 siblings, 0 replies; 44+ messages in thread
From: Maciej Barć @ 2023-08-27 12:42 UTC (permalink / raw
  To: gentoo-commits

commit:     0f5e162b212b4449c9a70e32fa9bb155708e62ff
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 27 12:40:44 2023 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sun Aug 27 12:42:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f5e162b

dev-ml/merlin: drop old 4.6

Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-ml/merlin/Manifest          |   3 --
 dev-ml/merlin/merlin-4.6.ebuild | 106 ----------------------------------------
 2 files changed, 109 deletions(-)

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index 425ce511f87f..12f69e065f7d 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -1,7 +1,4 @@
 DIST merlin-4.10-414.tbz 1989927 BLAKE2B 9a65e9c1a2d5795e1e0235d5c8b0274bd9d8ef052ed421e8809224de73f577da273c9f1ca0f071d6ea0accd349b9b6d59b2e1fb5561effe483ebb0de89a4c766 SHA512 7805b99c2a73b2e3f70d26fd7183a90f97657d66946e2a4b58563f00fd3ed8d82da1fb0597b033b8c8c9e8db415d66e51720c972d34db4b66b71bb8f0c9ee08c
-DIST merlin-4.6-412.tbz 1767545 BLAKE2B 95b4f4e53accf55f4d2bc381779fa31bb5db39c21fa2cd8dc0b1d5b0e4a4acf484f2eb58327bce1c990cbbb2205bb87215aeba1b923ba6a62c82862d884dd410 SHA512 4362482ecd7c8af1c4e740e3816100cd5408eba3aebc01b867b45bdd1dcc237819cb0640e0f618b6ecf00aa8d55e58e55ecfeb176ed7b358c404ea71302443b0
-DIST merlin-4.6-413.tbz 2292506 BLAKE2B ec61d3b9cbfd9cddbb27fed70ebf7b69816244afb8a6c36347fbb762fc6aee1e6dd2b728db0687cd984603c3847ba3fe858b9663a7b3dcd17aedede662848299 SHA512 fe88a52c4c3c94505da142fbb7d400fce11bfafe6e47ec7cd39437308baa7122399a008bb6d0ef7b8f29636c2a51f4d49e3535136010fec198a1188293914a56
-DIST merlin-4.6-414.tbz 1969647 BLAKE2B fdb55f7ba9a597fb03bb377556238dedc2a5d60bdc772a479a9ad98c0feb243a7fc61dd47a65194ddba9afb8509858d8956a87ca5af9fc68597ba746b0d56d60 SHA512 7373fadf05c692c9f054c7fe6a7d4bdfeefe237b9df432024ef9923782ee72e09021c0c3fba869da8347728105cb2d3ff0aa94b0c5eb09811bb25aa8da9fb520
 DIST merlin-4.7-412.tbz 1771126 BLAKE2B 1454873ecc1d533a5e82adaa71082339c44b93c2626d46cc5147d1b8049b397ef34e6137256560d6c9b7eaf826155e34617c071d1aae3aa3f02807e73c209cf1 SHA512 d13e307d87b4719b56397e54e6f771a3ea77a766ab38b22414c4b1d4d5828b5f790c82f28d3feaf7fe45be10abd50d9a905ece932f43fdad98c88b73b35dd936
 DIST merlin-4.7-413.tbz 2296558 BLAKE2B 2e6d9918c911eab017bb3491cab97f2b0362d13e072a0c39a6637f25d2a15ac7f3027cec51ab0d66a2239fea055f70b5b1e3294c05985faae5d11c57bff81501 SHA512 71068a6b50628c57003b29de3968e41c24b67394dcc1d1f1a0b335211e9d1ef3e527584b868514bd5489db5a130f2ff6fd145d3665a7d2bca5a117074cb08ce8
 DIST merlin-4.7-414.tbz 1976276 BLAKE2B 91fc5221b536d20174e36c4fdf4bc32f125f2af0f23c95c2e917f425826b0c58fe65b1b849eded570b8f4aece0fb00f1bdf7d0a00fa67f6c4e58892a095e1466 SHA512 c325c29bea91699739d7cb7df12876b7ffb8edf685deabb5dce5553b570a6bf8ff415c45e3295b674edbc7711f69f4be202b866d157516380f888e80dcee1082

diff --git a/dev-ml/merlin/merlin-4.6.ebuild b/dev-ml/merlin/merlin-4.6.ebuild
deleted file mode 100644
index f7843381a666..000000000000
--- a/dev-ml/merlin/merlin-4.6.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: vim-plugin, although it's not clear how to make it work here
-inherit elisp-common dune
-
-DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
-HOMEPAGE="https://github.com/ocaml/merlin/"
-SRC_URI="
-	https://github.com/ocaml/merlin/releases/download/v${PV}-412/${P}-412.tbz
-	https://github.com/ocaml/merlin/releases/download/v${PV}-413/${P}-413.tbz
-	https://github.com/ocaml/merlin/releases/download/v${PV}-414/${P}-414.tbz
-"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="emacs +ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.12:=[ocamlopt?]
-	dev-ml/csexp:=
-	>=dev-ml/yojson-2.0.0:=
-	dev-ml/menhir:=
-	>=dev-ml/dune-2.9:=
-	|| (
-		dev-lang/ocaml:0/4.12
-		dev-lang/ocaml:0/4.13
-		dev-lang/ocaml:0/4.14
-	)
-	emacs? (
-		>=app-editors/emacs-23.1:*
-		app-emacs/auto-complete
-		app-emacs/company-mode
-	)
-"
-DEPEND="${RDEPEND}"
-# NOTICE: Block dev-ml/seq (which is a back-port of code to ocaml <4.07)
-# because it breaks merlin builds.
-# https://github.com/ocaml/merlin/issues/1500
-BDEPEND="
-	!!<dev-ml/seq-0.3
-	test? ( app-misc/jq )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_unpack() {
-	default
-
-	if has_version "dev-lang/ocaml:0/4.12" ; then
-		mv ${P}-412 "${S}" || die
-	elif has_version "dev-lang/ocaml:0/4.13" ; then
-		mv ${P}-413 "${S}" || die
-	elif has_version "dev-lang/ocaml:0/4.14" ; then
-		mv ${P}-414 "${S}" || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Handle ELisp installation via the Emacs Eclass.
-	rm emacs/dune || die
-
-	# This test runs only inside a git repo,
-	# it is not included in merlin release for ocaml 4.12.
-	if [[ -f tests/test-dirs/occurrences/issue1404.t ]] ; then
-		rm tests/test-dirs/occurrences/issue1404.t || die
-	fi
-	rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die
-
-	# Remove seq references from dune build files.
-	sed -i 's|seq||g' src/frontend/ocamlmerlin/dune || die
-}
-
-src_compile() {
-	dune build @install || die
-
-	if use emacs ; then
-		# iedit isn't packaged yet
-		rm emacs/merlin-iedit.el || die
-
-		BYTECOMPFLAGS="-L emacs" elisp-compile emacs/*.el
-	fi
-}
-
-src_install() {
-	dune_src_install
-
-	if use emacs ; then
-		elisp-install ${PN} emacs/*.el{,c}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2023-10-09  7:35 Maciej Barć
  0 siblings, 0 replies; 44+ messages in thread
From: Maciej Barć @ 2023-10-09  7:35 UTC (permalink / raw
  To: gentoo-commits

commit:     afa2872bfae8a6f470e05a4f59eda19d87288e55
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  9 07:31:59 2023 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Mon Oct  9 07:31:59 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afa2872b

dev-ml/merlin: bump to 4.12

Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-ml/merlin/Manifest           |  1 +
 dev-ml/merlin/merlin-4.12.ebuild | 99 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 100 insertions(+)

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index 12f69e065f7d..10a6fa3f5697 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -1,4 +1,5 @@
 DIST merlin-4.10-414.tbz 1989927 BLAKE2B 9a65e9c1a2d5795e1e0235d5c8b0274bd9d8ef052ed421e8809224de73f577da273c9f1ca0f071d6ea0accd349b9b6d59b2e1fb5561effe483ebb0de89a4c766 SHA512 7805b99c2a73b2e3f70d26fd7183a90f97657d66946e2a4b58563f00fd3ed8d82da1fb0597b033b8c8c9e8db415d66e51720c972d34db4b66b71bb8f0c9ee08c
+DIST merlin-4.12-414.tbz 1991877 BLAKE2B d68a45efb29d7ed2dd8d2e377a7778fad5500064206e5ae27914a0be9f208f919f44f73f14be283aca653adf56462a782c4f5f895282e078478e60f13e9c09f1 SHA512 3bf4f5e4754def9818ce0abbdf2253fe9d5e0abec7e8814012e2ff9de6a174f288c257780eb9f8aa4d794c0b62a524848d579d2a3495a5747a0970ee9fbfff29
 DIST merlin-4.7-412.tbz 1771126 BLAKE2B 1454873ecc1d533a5e82adaa71082339c44b93c2626d46cc5147d1b8049b397ef34e6137256560d6c9b7eaf826155e34617c071d1aae3aa3f02807e73c209cf1 SHA512 d13e307d87b4719b56397e54e6f771a3ea77a766ab38b22414c4b1d4d5828b5f790c82f28d3feaf7fe45be10abd50d9a905ece932f43fdad98c88b73b35dd936
 DIST merlin-4.7-413.tbz 2296558 BLAKE2B 2e6d9918c911eab017bb3491cab97f2b0362d13e072a0c39a6637f25d2a15ac7f3027cec51ab0d66a2239fea055f70b5b1e3294c05985faae5d11c57bff81501 SHA512 71068a6b50628c57003b29de3968e41c24b67394dcc1d1f1a0b335211e9d1ef3e527584b868514bd5489db5a130f2ff6fd145d3665a7d2bca5a117074cb08ce8
 DIST merlin-4.7-414.tbz 1976276 BLAKE2B 91fc5221b536d20174e36c4fdf4bc32f125f2af0f23c95c2e917f425826b0c58fe65b1b849eded570b8f4aece0fb00f1bdf7d0a00fa67f6c4e58892a095e1466 SHA512 c325c29bea91699739d7cb7df12876b7ffb8edf685deabb5dce5553b570a6bf8ff415c45e3295b674edbc7711f69f4be202b866d157516380f888e80dcee1082

diff --git a/dev-ml/merlin/merlin-4.12.ebuild b/dev-ml/merlin/merlin-4.12.ebuild
new file mode 100644
index 000000000000..3e4435149b42
--- /dev/null
+++ b/dev-ml/merlin/merlin-4.12.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO: vim-plugin, although it's not clear how to make it work here
+inherit elisp-common dune
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin/"
+SRC_URI="https://github.com/ocaml/merlin/releases/download/v${PV}-414/${P}-414.tbz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="emacs +ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-lang/ocaml:=[ocamlopt?]
+	dev-ml/csexp:=
+	>=dev-ml/yojson-2.0.0:=
+	dev-ml/menhir:=
+	>=dev-ml/dune-2.9:=
+	|| (
+		dev-lang/ocaml:0/4.14
+		dev-lang/ocaml:0/4.14.1
+	)
+	emacs? (
+		>=app-editors/emacs-23.1:*
+		app-emacs/auto-complete
+		app-emacs/company-mode
+	)
+"
+DEPEND="${RDEPEND}"
+# NOTICE: Block dev-ml/seq (which is a back-port of code to ocaml <4.07)
+# because it breaks merlin builds.
+# https://github.com/ocaml/merlin/issues/1500
+BDEPEND="
+	!!<dev-ml/seq-0.3
+	test? ( app-misc/jq )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_unpack() {
+	default
+
+	if has_version "dev-lang/ocaml:0/4.14" ; then
+		mv ${P}-414 "${S}" || die
+	elif has_version "dev-lang/ocaml:0/4.14.1" ; then
+		mv ${P}-414 "${S}" || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Handle ELisp installation via the Emacs Eclass.
+	rm emacs/dune || die
+
+	# This test runs only inside a git repo,
+	# it is not included in merlin release for ocaml 4.12.
+	if [[ -f tests/test-dirs/occurrences/issue1404.t ]] ; then
+		rm tests/test-dirs/occurrences/issue1404.t || die
+	fi
+	rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die
+
+	# Remove seq references from dune build files.
+	sed -i 's|seq||g' src/frontend/ocamlmerlin/dune || die
+}
+
+src_compile() {
+	edune build @install
+
+	if use emacs ; then
+		# iedit isn't packaged yet
+		rm emacs/merlin-iedit.el || die
+
+		BYTECOMPFLAGS="-L emacs" elisp-compile emacs/*.el
+	fi
+}
+
+src_install() {
+	dune_src_install
+
+	if use emacs ; then
+		elisp-install ${PN} emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2023-10-09  7:35 Maciej Barć
  0 siblings, 0 replies; 44+ messages in thread
From: Maciej Barć @ 2023-10-09  7:35 UTC (permalink / raw
  To: gentoo-commits

commit:     cd32fe570acb171a53b826772072b8e1421dae7b
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  9 07:34:12 2023 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Mon Oct  9 07:34:12 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd32fe57

dev-ml/merlin: drop old 4.9

Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-ml/merlin/Manifest          |  1 -
 dev-ml/merlin/merlin-4.9.ebuild | 99 -----------------------------------------
 2 files changed, 100 deletions(-)

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index 10a6fa3f5697..f67378418f5d 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -3,4 +3,3 @@ DIST merlin-4.12-414.tbz 1991877 BLAKE2B d68a45efb29d7ed2dd8d2e377a7778fad550006
 DIST merlin-4.7-412.tbz 1771126 BLAKE2B 1454873ecc1d533a5e82adaa71082339c44b93c2626d46cc5147d1b8049b397ef34e6137256560d6c9b7eaf826155e34617c071d1aae3aa3f02807e73c209cf1 SHA512 d13e307d87b4719b56397e54e6f771a3ea77a766ab38b22414c4b1d4d5828b5f790c82f28d3feaf7fe45be10abd50d9a905ece932f43fdad98c88b73b35dd936
 DIST merlin-4.7-413.tbz 2296558 BLAKE2B 2e6d9918c911eab017bb3491cab97f2b0362d13e072a0c39a6637f25d2a15ac7f3027cec51ab0d66a2239fea055f70b5b1e3294c05985faae5d11c57bff81501 SHA512 71068a6b50628c57003b29de3968e41c24b67394dcc1d1f1a0b335211e9d1ef3e527584b868514bd5489db5a130f2ff6fd145d3665a7d2bca5a117074cb08ce8
 DIST merlin-4.7-414.tbz 1976276 BLAKE2B 91fc5221b536d20174e36c4fdf4bc32f125f2af0f23c95c2e917f425826b0c58fe65b1b849eded570b8f4aece0fb00f1bdf7d0a00fa67f6c4e58892a095e1466 SHA512 c325c29bea91699739d7cb7df12876b7ffb8edf685deabb5dce5553b570a6bf8ff415c45e3295b674edbc7711f69f4be202b866d157516380f888e80dcee1082
-DIST merlin-4.9-414.tbz 1983485 BLAKE2B 1a538df53ab5c575cf217c2dc832512aa8384c0483c9a46c42b86e52c8af454c15e25d7f8a961b8e19251fc75575fb6bf09f5693d36ce0b2e5b40757bb2985ea SHA512 2199f963368597d10cc197e41ebb883f6a166018c9da3fe259c354550df41b713781003598a2fe5956b0a4ae96f8c07ba33831d3cf6f9d494b731944f87e491e

diff --git a/dev-ml/merlin/merlin-4.9.ebuild b/dev-ml/merlin/merlin-4.9.ebuild
deleted file mode 100644
index 3e4435149b42..000000000000
--- a/dev-ml/merlin/merlin-4.9.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: vim-plugin, although it's not clear how to make it work here
-inherit elisp-common dune
-
-DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
-HOMEPAGE="https://github.com/ocaml/merlin/"
-SRC_URI="https://github.com/ocaml/merlin/releases/download/v${PV}-414/${P}-414.tbz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="emacs +ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-lang/ocaml:=[ocamlopt?]
-	dev-ml/csexp:=
-	>=dev-ml/yojson-2.0.0:=
-	dev-ml/menhir:=
-	>=dev-ml/dune-2.9:=
-	|| (
-		dev-lang/ocaml:0/4.14
-		dev-lang/ocaml:0/4.14.1
-	)
-	emacs? (
-		>=app-editors/emacs-23.1:*
-		app-emacs/auto-complete
-		app-emacs/company-mode
-	)
-"
-DEPEND="${RDEPEND}"
-# NOTICE: Block dev-ml/seq (which is a back-port of code to ocaml <4.07)
-# because it breaks merlin builds.
-# https://github.com/ocaml/merlin/issues/1500
-BDEPEND="
-	!!<dev-ml/seq-0.3
-	test? ( app-misc/jq )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_unpack() {
-	default
-
-	if has_version "dev-lang/ocaml:0/4.14" ; then
-		mv ${P}-414 "${S}" || die
-	elif has_version "dev-lang/ocaml:0/4.14.1" ; then
-		mv ${P}-414 "${S}" || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Handle ELisp installation via the Emacs Eclass.
-	rm emacs/dune || die
-
-	# This test runs only inside a git repo,
-	# it is not included in merlin release for ocaml 4.12.
-	if [[ -f tests/test-dirs/occurrences/issue1404.t ]] ; then
-		rm tests/test-dirs/occurrences/issue1404.t || die
-	fi
-	rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die
-
-	# Remove seq references from dune build files.
-	sed -i 's|seq||g' src/frontend/ocamlmerlin/dune || die
-}
-
-src_compile() {
-	edune build @install
-
-	if use emacs ; then
-		# iedit isn't packaged yet
-		rm emacs/merlin-iedit.el || die
-
-		BYTECOMPFLAGS="-L emacs" elisp-compile emacs/*.el
-	fi
-}
-
-src_install() {
-	dune_src_install
-
-	if use emacs ; then
-		elisp-install ${PN} emacs/*.el{,c}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2024-02-08 10:31 Maciej Barć
  0 siblings, 0 replies; 44+ messages in thread
From: Maciej Barć @ 2024-02-08 10:31 UTC (permalink / raw
  To: gentoo-commits

commit:     7e142e23eeca668737b95d59e0f21930b6ebbb30
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  8 10:23:16 2024 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Thu Feb  8 10:31:27 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e142e23

dev-ml/merlin: drop old 4.7-r1

Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-ml/merlin/Manifest             |   3 -
 dev-ml/merlin/merlin-4.7-r1.ebuild | 109 -------------------------------------
 2 files changed, 112 deletions(-)

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index 63f43cc9655b..12b74679d882 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -1,4 +1 @@
 DIST merlin-4.12-414.tbz 1991877 BLAKE2B d68a45efb29d7ed2dd8d2e377a7778fad5500064206e5ae27914a0be9f208f919f44f73f14be283aca653adf56462a782c4f5f895282e078478e60f13e9c09f1 SHA512 3bf4f5e4754def9818ce0abbdf2253fe9d5e0abec7e8814012e2ff9de6a174f288c257780eb9f8aa4d794c0b62a524848d579d2a3495a5747a0970ee9fbfff29
-DIST merlin-4.7-412.tbz 1771126 BLAKE2B 1454873ecc1d533a5e82adaa71082339c44b93c2626d46cc5147d1b8049b397ef34e6137256560d6c9b7eaf826155e34617c071d1aae3aa3f02807e73c209cf1 SHA512 d13e307d87b4719b56397e54e6f771a3ea77a766ab38b22414c4b1d4d5828b5f790c82f28d3feaf7fe45be10abd50d9a905ece932f43fdad98c88b73b35dd936
-DIST merlin-4.7-413.tbz 2296558 BLAKE2B 2e6d9918c911eab017bb3491cab97f2b0362d13e072a0c39a6637f25d2a15ac7f3027cec51ab0d66a2239fea055f70b5b1e3294c05985faae5d11c57bff81501 SHA512 71068a6b50628c57003b29de3968e41c24b67394dcc1d1f1a0b335211e9d1ef3e527584b868514bd5489db5a130f2ff6fd145d3665a7d2bca5a117074cb08ce8
-DIST merlin-4.7-414.tbz 1976276 BLAKE2B 91fc5221b536d20174e36c4fdf4bc32f125f2af0f23c95c2e917f425826b0c58fe65b1b849eded570b8f4aece0fb00f1bdf7d0a00fa67f6c4e58892a095e1466 SHA512 c325c29bea91699739d7cb7df12876b7ffb8edf685deabb5dce5553b570a6bf8ff415c45e3295b674edbc7711f69f4be202b866d157516380f888e80dcee1082

diff --git a/dev-ml/merlin/merlin-4.7-r1.ebuild b/dev-ml/merlin/merlin-4.7-r1.ebuild
deleted file mode 100644
index 55c9b7015515..000000000000
--- a/dev-ml/merlin/merlin-4.7-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: vim-plugin, although it's not clear how to make it work here
-inherit elisp-common dune
-
-DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
-HOMEPAGE="https://github.com/ocaml/merlin/"
-SRC_URI="
-	https://github.com/ocaml/merlin/releases/download/v${PV}-412/${P}-412.tbz
-	https://github.com/ocaml/merlin/releases/download/v${PV}-413/${P}-413.tbz
-	https://github.com/ocaml/merlin/releases/download/v${PV}-414/${P}-414.tbz
-"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="emacs +ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-lang/ocaml:=[ocamlopt?]
-	dev-ml/csexp:=
-	>=dev-ml/yojson-2.0.0:=
-	dev-ml/menhir:=
-	>=dev-ml/dune-2.9:=
-	|| (
-		dev-lang/ocaml:0/4.12
-		dev-lang/ocaml:0/4.13
-		dev-lang/ocaml:0/4.14
-		dev-lang/ocaml:0/4.14.1
-	)
-	emacs? (
-		>=app-editors/emacs-23.1:*
-		app-emacs/auto-complete
-		app-emacs/company-mode
-	)
-"
-DEPEND="${RDEPEND}"
-# NOTICE: Block dev-ml/seq (which is a back-port of code to ocaml <4.07)
-# because it breaks merlin builds.
-# https://github.com/ocaml/merlin/issues/1500
-BDEPEND="
-	!!<dev-ml/seq-0.3
-	test? ( app-misc/jq )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_unpack() {
-	default
-
-	if has_version "dev-lang/ocaml:0/4.12" ; then
-		mv ${P}-412 "${S}" || die
-	elif has_version "dev-lang/ocaml:0/4.13" ; then
-		mv ${P}-413 "${S}" || die
-	elif has_version "dev-lang/ocaml:0/4.14" ; then
-		mv ${P}-414 "${S}" || die
-	elif has_version "dev-lang/ocaml:0/4.14.1" ; then
-		mv ${P}-414 "${S}" || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Handle ELisp installation via the Emacs Eclass.
-	rm emacs/dune || die
-
-	# This test runs only inside a git repo,
-	# it is not included in merlin release for ocaml 4.12.
-	if [[ -f tests/test-dirs/occurrences/issue1404.t ]] ; then
-		rm tests/test-dirs/occurrences/issue1404.t || die
-	fi
-	rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die
-
-	# Remove seq references from dune build files.
-	sed -i 's|seq||g' src/frontend/ocamlmerlin/dune || die
-}
-
-src_compile() {
-	dune build @install || die
-
-	if use emacs ; then
-		# iedit isn't packaged yet
-		rm emacs/merlin-iedit.el || die
-
-		BYTECOMPFLAGS="-L emacs" elisp-compile emacs/*.el
-	fi
-}
-
-src_install() {
-	dune_src_install
-
-	if use emacs ; then
-		elisp-install ${PN} emacs/*.el{,c}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2024-02-08 10:31 Maciej Barć
  0 siblings, 0 replies; 44+ messages in thread
From: Maciej Barć @ 2024-02-08 10:31 UTC (permalink / raw
  To: gentoo-commits

commit:     334922875c9719fa23ad32fd4d2b8fbd2247a873
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  8 10:30:13 2024 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Thu Feb  8 10:31:27 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33492287

dev-ml/merlin: bump to 4.13

Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-ml/merlin/Manifest           |   1 +
 dev-ml/merlin/merlin-4.13.ebuild | 101 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 102 insertions(+)

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index 12b74679d882..3714fde4055e 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -1 +1,2 @@
 DIST merlin-4.12-414.tbz 1991877 BLAKE2B d68a45efb29d7ed2dd8d2e377a7778fad5500064206e5ae27914a0be9f208f919f44f73f14be283aca653adf56462a782c4f5f895282e078478e60f13e9c09f1 SHA512 3bf4f5e4754def9818ce0abbdf2253fe9d5e0abec7e8814012e2ff9de6a174f288c257780eb9f8aa4d794c0b62a524848d579d2a3495a5747a0970ee9fbfff29
+DIST merlin-4.13-414.tbz 1993752 BLAKE2B 8b5704252f771ddac843340bf2aa24f62a2b490f6bb03c46a1daa2560fae72226b92fb5a9720b18c82f476571e7e6ffc7c30e695c8a0e1a3de6bd65ee58461e1 SHA512 cf7e292a515122756bd614eedbf11cc09108e6afab77cd5805428207b3ca5a98494ee43ad59fcfb667b48fe0874f0a8359882b3c14ee270769f99c41e176d455

diff --git a/dev-ml/merlin/merlin-4.13.ebuild b/dev-ml/merlin/merlin-4.13.ebuild
new file mode 100644
index 000000000000..80b96bc1404a
--- /dev/null
+++ b/dev-ml/merlin/merlin-4.13.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO: vim-plugin, although it's not clear how to make it work here
+inherit elisp-common dune
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin/"
+SRC_URI="https://github.com/ocaml/merlin/releases/download/v${PV}-414/${P}-414.tbz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="emacs +ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-lang/ocaml:=[ocamlopt?]
+	dev-ml/csexp:=
+	>=dev-ml/yojson-2.0.0:=
+	dev-ml/menhir:=
+	>=dev-ml/dune-2.9:=
+	|| (
+		dev-lang/ocaml:0/4.14
+		dev-lang/ocaml:0/4.14.1
+	)
+	emacs? (
+		>=app-editors/emacs-23.1:*
+		app-emacs/auto-complete
+		app-emacs/company-mode
+	)
+"
+DEPEND="${RDEPEND}"
+# NOTICE: Block dev-ml/seq (which is a back-port of code to ocaml <4.07)
+# because it breaks merlin builds.
+# https://github.com/ocaml/merlin/issues/1500
+BDEPEND="
+	!!<dev-ml/seq-0.3
+	test? (
+		app-misc/jq
+	)
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_unpack() {
+	default
+
+	if has_version "dev-lang/ocaml:0/4.14" ; then
+		mv ${P}-414 "${S}" || die
+	elif has_version "dev-lang/ocaml:0/4.14.1" ; then
+		mv ${P}-414 "${S}" || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Handle ELisp installation via the Emacs Eclass.
+	rm emacs/dune || die
+
+	# This test runs only inside a git repo,
+	# it is not included in merlin release for ocaml 4.12.
+	if [[ -f tests/test-dirs/occurrences/issue1404.t ]] ; then
+		rm tests/test-dirs/occurrences/issue1404.t || die
+	fi
+	rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die
+
+	# Remove seq references from dune build files.
+	sed -i 's|seq||g' src/frontend/ocamlmerlin/dune || die
+}
+
+src_compile() {
+	edune build --display=short @install
+
+	if use emacs ; then
+		# iedit isn't packaged yet
+		rm emacs/merlin-iedit.el || die
+
+		BYTECOMPFLAGS="-L emacs" elisp-compile emacs/*.el
+	fi
+}
+
+src_install() {
+	dune_src_install
+
+	if use emacs ; then
+		elisp-install ${PN} emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2024-02-08 10:31 Maciej Barć
  0 siblings, 0 replies; 44+ messages in thread
From: Maciej Barć @ 2024-02-08 10:31 UTC (permalink / raw
  To: gentoo-commits

commit:     905ccd7b11893593b8b25e5cbff2048e913438e9
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  8 10:13:33 2024 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Thu Feb  8 10:31:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=905ccd7b

dev-ml/merlin: drop old 4.10

Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-ml/merlin/Manifest           |  1 -
 dev-ml/merlin/merlin-4.10.ebuild | 99 ----------------------------------------
 2 files changed, 100 deletions(-)

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index f67378418f5d..63f43cc9655b 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -1,4 +1,3 @@
-DIST merlin-4.10-414.tbz 1989927 BLAKE2B 9a65e9c1a2d5795e1e0235d5c8b0274bd9d8ef052ed421e8809224de73f577da273c9f1ca0f071d6ea0accd349b9b6d59b2e1fb5561effe483ebb0de89a4c766 SHA512 7805b99c2a73b2e3f70d26fd7183a90f97657d66946e2a4b58563f00fd3ed8d82da1fb0597b033b8c8c9e8db415d66e51720c972d34db4b66b71bb8f0c9ee08c
 DIST merlin-4.12-414.tbz 1991877 BLAKE2B d68a45efb29d7ed2dd8d2e377a7778fad5500064206e5ae27914a0be9f208f919f44f73f14be283aca653adf56462a782c4f5f895282e078478e60f13e9c09f1 SHA512 3bf4f5e4754def9818ce0abbdf2253fe9d5e0abec7e8814012e2ff9de6a174f288c257780eb9f8aa4d794c0b62a524848d579d2a3495a5747a0970ee9fbfff29
 DIST merlin-4.7-412.tbz 1771126 BLAKE2B 1454873ecc1d533a5e82adaa71082339c44b93c2626d46cc5147d1b8049b397ef34e6137256560d6c9b7eaf826155e34617c071d1aae3aa3f02807e73c209cf1 SHA512 d13e307d87b4719b56397e54e6f771a3ea77a766ab38b22414c4b1d4d5828b5f790c82f28d3feaf7fe45be10abd50d9a905ece932f43fdad98c88b73b35dd936
 DIST merlin-4.7-413.tbz 2296558 BLAKE2B 2e6d9918c911eab017bb3491cab97f2b0362d13e072a0c39a6637f25d2a15ac7f3027cec51ab0d66a2239fea055f70b5b1e3294c05985faae5d11c57bff81501 SHA512 71068a6b50628c57003b29de3968e41c24b67394dcc1d1f1a0b335211e9d1ef3e527584b868514bd5489db5a130f2ff6fd145d3665a7d2bca5a117074cb08ce8

diff --git a/dev-ml/merlin/merlin-4.10.ebuild b/dev-ml/merlin/merlin-4.10.ebuild
deleted file mode 100644
index 3e4435149b42..000000000000
--- a/dev-ml/merlin/merlin-4.10.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: vim-plugin, although it's not clear how to make it work here
-inherit elisp-common dune
-
-DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
-HOMEPAGE="https://github.com/ocaml/merlin/"
-SRC_URI="https://github.com/ocaml/merlin/releases/download/v${PV}-414/${P}-414.tbz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="emacs +ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-lang/ocaml:=[ocamlopt?]
-	dev-ml/csexp:=
-	>=dev-ml/yojson-2.0.0:=
-	dev-ml/menhir:=
-	>=dev-ml/dune-2.9:=
-	|| (
-		dev-lang/ocaml:0/4.14
-		dev-lang/ocaml:0/4.14.1
-	)
-	emacs? (
-		>=app-editors/emacs-23.1:*
-		app-emacs/auto-complete
-		app-emacs/company-mode
-	)
-"
-DEPEND="${RDEPEND}"
-# NOTICE: Block dev-ml/seq (which is a back-port of code to ocaml <4.07)
-# because it breaks merlin builds.
-# https://github.com/ocaml/merlin/issues/1500
-BDEPEND="
-	!!<dev-ml/seq-0.3
-	test? ( app-misc/jq )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_unpack() {
-	default
-
-	if has_version "dev-lang/ocaml:0/4.14" ; then
-		mv ${P}-414 "${S}" || die
-	elif has_version "dev-lang/ocaml:0/4.14.1" ; then
-		mv ${P}-414 "${S}" || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Handle ELisp installation via the Emacs Eclass.
-	rm emacs/dune || die
-
-	# This test runs only inside a git repo,
-	# it is not included in merlin release for ocaml 4.12.
-	if [[ -f tests/test-dirs/occurrences/issue1404.t ]] ; then
-		rm tests/test-dirs/occurrences/issue1404.t || die
-	fi
-	rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die
-
-	# Remove seq references from dune build files.
-	sed -i 's|seq||g' src/frontend/ocamlmerlin/dune || die
-}
-
-src_compile() {
-	edune build @install
-
-	if use emacs ; then
-		# iedit isn't packaged yet
-		rm emacs/merlin-iedit.el || die
-
-		BYTECOMPFLAGS="-L emacs" elisp-compile emacs/*.el
-	fi
-}
-
-src_install() {
-	dune_src_install
-
-	if use emacs ; then
-		elisp-install ${PN} emacs/*.el{,c}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2024-06-08 23:11 Maciej Barć
  0 siblings, 0 replies; 44+ messages in thread
From: Maciej Barć @ 2024-06-08 23:11 UTC (permalink / raw
  To: gentoo-commits

commit:     6e5b6388a5e82b62c4d4de64c075193ffd9a2cf5
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  8 22:21:01 2024 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sat Jun  8 23:11:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e5b6388

dev-ml/merlin: bump ocaml compat to 4.14.2

Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-ml/merlin/{merlin-4.13.ebuild => merlin-4.13-r1.ebuild} | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-ml/merlin/merlin-4.13.ebuild b/dev-ml/merlin/merlin-4.13-r1.ebuild
similarity index 95%
rename from dev-ml/merlin/merlin-4.13.ebuild
rename to dev-ml/merlin/merlin-4.13-r1.ebuild
index 80b96bc1404a..92bd8816e400 100644
--- a/dev-ml/merlin/merlin-4.13.ebuild
+++ b/dev-ml/merlin/merlin-4.13-r1.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
 	|| (
 		dev-lang/ocaml:0/4.14
 		dev-lang/ocaml:0/4.14.1
+		dev-lang/ocaml:0/4.14.2
 	)
 	emacs? (
 		>=app-editors/emacs-23.1:*
@@ -52,6 +53,8 @@ src_unpack() {
 		mv ${P}-414 "${S}" || die
 	elif has_version "dev-lang/ocaml:0/4.14.1" ; then
 		mv ${P}-414 "${S}" || die
+	elif has_version "dev-lang/ocaml:0/4.14.2" ; then
+		mv ${P}-414 "${S}" || die
 	fi
 }
 


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2024-06-09 21:22 Maciej Barć
  0 siblings, 0 replies; 44+ messages in thread
From: Maciej Barć @ 2024-06-09 21:22 UTC (permalink / raw
  To: gentoo-commits

commit:     3235abf774e61ec9199450ab0000fbdab5049d61
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 21:09:12 2024 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 21:22:35 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3235abf7

dev-ml/merlin: optimize OCmal version detection

Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 ...merlin-4.13-r1.ebuild => merlin-4.13-r2.ebuild} | 27 ++++++++++------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/dev-ml/merlin/merlin-4.13-r1.ebuild b/dev-ml/merlin/merlin-4.13-r2.ebuild
similarity index 84%
rename from dev-ml/merlin/merlin-4.13-r1.ebuild
rename to dev-ml/merlin/merlin-4.13-r2.ebuild
index 92bd8816e400..d2d79ed2fc21 100644
--- a/dev-ml/merlin/merlin-4.13-r1.ebuild
+++ b/dev-ml/merlin/merlin-4.13-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 # TODO: vim-plugin, although it's not clear how to make it work here
-inherit elisp-common dune
+inherit elisp-common dune edo
 
 DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
 HOMEPAGE="https://github.com/ocaml/merlin/"
@@ -17,23 +17,22 @@ IUSE="emacs +ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	<dev-lang/ocaml-5
+	>=dev-lang/ocaml-4.14.1
 	dev-lang/ocaml:=[ocamlopt?]
-	dev-ml/csexp:=
+	>=dev-ml/dune-2.9:=
 	>=dev-ml/yojson-2.0.0:=
+	dev-ml/csexp:=
 	dev-ml/menhir:=
-	>=dev-ml/dune-2.9:=
-	|| (
-		dev-lang/ocaml:0/4.14
-		dev-lang/ocaml:0/4.14.1
-		dev-lang/ocaml:0/4.14.2
-	)
 	emacs? (
 		>=app-editors/emacs-23.1:*
 		app-emacs/auto-complete
 		app-emacs/company-mode
 	)
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+"
 # NOTICE: Block dev-ml/seq (which is a back-port of code to ocaml <4.07)
 # because it breaks merlin builds.
 # https://github.com/ocaml/merlin/issues/1500
@@ -49,12 +48,10 @@ SITEFILE="50${PN}-gentoo.el"
 src_unpack() {
 	default
 
-	if has_version "dev-lang/ocaml:0/4.14" ; then
-		mv ${P}-414 "${S}" || die
-	elif has_version "dev-lang/ocaml:0/4.14.1" ; then
-		mv ${P}-414 "${S}" || die
-	elif has_version "dev-lang/ocaml:0/4.14.2" ; then
-		mv ${P}-414 "${S}" || die
+	if has_version "=dev-lang/ocaml-4.14*" ; then
+		edo mv "${P}-414" "${S}"
+	elif has_version "dev-lang/ocaml" ; then
+		die "Currently installed version of OCaml is not yet supported"
 	fi
 }
 


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2024-06-09 21:22 Maciej Barć
  0 siblings, 0 replies; 44+ messages in thread
From: Maciej Barć @ 2024-06-09 21:22 UTC (permalink / raw
  To: gentoo-commits

commit:     775340ee91c7c8ee9900154c08d84888a671f874
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 21:12:47 2024 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 21:22:36 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=775340ee

dev-ml/merlin: disable tests as they seem unreliable

Closes: https://bugs.gentoo.org/933857
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-ml/merlin/merlin-4.13-r2.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-ml/merlin/merlin-4.13-r2.ebuild b/dev-ml/merlin/merlin-4.13-r2.ebuild
index d2d79ed2fc21..a46713572004 100644
--- a/dev-ml/merlin/merlin-4.13-r2.ebuild
+++ b/dev-ml/merlin/merlin-4.13-r2.ebuild
@@ -14,7 +14,10 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="emacs +ocamlopt test"
-RESTRICT="!test? ( test )"
+
+# Tests fail unexpectedly on Tinderbox. See https://bugs.gentoo.org/933857
+# RESTRICT="!test? ( test )"
+RESTRICT="test"
 
 RDEPEND="
 	<dev-lang/ocaml-5


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

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
@ 2024-07-17 20:27 Maciej Barć
  0 siblings, 0 replies; 44+ messages in thread
From: Maciej Barć @ 2024-07-17 20:27 UTC (permalink / raw
  To: gentoo-commits

commit:     09b861d699190db8599e0126d81dae54ef6cb0c4
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 17 19:27:54 2024 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Wed Jul 17 19:27:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09b861d6

dev-ml/merlin: add missing findlib dep

Closes: https://bugs.gentoo.org/936226
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-ml/merlin/{merlin-4.12.ebuild => merlin-4.12-r1.ebuild}    | 7 +++++--
 dev-ml/merlin/{merlin-4.13-r2.ebuild => merlin-4.13-r3.ebuild} | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev-ml/merlin/merlin-4.12.ebuild b/dev-ml/merlin/merlin-4.12-r1.ebuild
similarity index 96%
rename from dev-ml/merlin/merlin-4.12.ebuild
rename to dev-ml/merlin/merlin-4.12-r1.ebuild
index 3e4435149b42..fdaafaef2c57 100644
--- a/dev-ml/merlin/merlin-4.12.ebuild
+++ b/dev-ml/merlin/merlin-4.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -38,7 +38,10 @@ DEPEND="${RDEPEND}"
 # https://github.com/ocaml/merlin/issues/1500
 BDEPEND="
 	!!<dev-ml/seq-0.3
-	test? ( app-misc/jq )
+	dev-ml/findlib
+	test? (
+		app-misc/jq
+	)
 "
 
 SITEFILE="50${PN}-gentoo.el"

diff --git a/dev-ml/merlin/merlin-4.13-r2.ebuild b/dev-ml/merlin/merlin-4.13-r3.ebuild
similarity index 99%
rename from dev-ml/merlin/merlin-4.13-r2.ebuild
rename to dev-ml/merlin/merlin-4.13-r3.ebuild
index a46713572004..18c16155ded7 100644
--- a/dev-ml/merlin/merlin-4.13-r2.ebuild
+++ b/dev-ml/merlin/merlin-4.13-r3.ebuild
@@ -41,6 +41,7 @@ DEPEND="
 # https://github.com/ocaml/merlin/issues/1500
 BDEPEND="
 	!!<dev-ml/seq-0.3
+	dev-ml/findlib
 	test? (
 		app-misc/jq
 	)


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

end of thread, other threads:[~2024-07-17 20:27 UTC | newest]

Thread overview: 44+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-25 18:14 [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/ Alexis Ballier
  -- strict thread matches above, loose matches on Subject: below --
2024-07-17 20:27 Maciej Barć
2024-06-09 21:22 Maciej Barć
2024-06-09 21:22 Maciej Barć
2024-06-08 23:11 Maciej Barć
2024-02-08 10:31 Maciej Barć
2024-02-08 10:31 Maciej Barć
2024-02-08 10:31 Maciej Barć
2023-10-09  7:35 Maciej Barć
2023-10-09  7:35 Maciej Barć
2023-08-27 12:42 Maciej Barć
2023-08-27 12:42 Maciej Barć
2023-08-27 12:42 Maciej Barć
2023-08-10 22:19 Maciej Barć
2023-02-12 13:28 Alfredo Tupone
2022-11-29 23:58 Maciej Barć
2022-11-29 23:58 Maciej Barć
2022-11-29 23:58 Maciej Barć
2022-11-29 23:58 Maciej Barć
2022-11-29 23:58 Maciej Barć
2022-11-28 20:33 Maciej Barć
2022-10-23  8:14 Maciej Barć
2022-09-25 19:01 Maciej Barć
2022-07-23  0:06 Maciej Barć
2022-07-22  2:26 Maciej Barć
2022-06-21  1:53 Sam James
2022-06-08 20:27 Maciej Barć
2022-04-12 21:43 Maciej Barć
2022-01-26  7:55 Alfredo Tupone
2022-01-16 10:35 Alfredo Tupone
2021-10-17 14:54 Alfredo Tupone
2021-10-07  6:23 Alfredo Tupone
2021-09-29  7:13 Alfredo Tupone
2021-09-28 20:43 Alfredo Tupone
2021-06-21 22:36 Sam James
2021-05-10 17:09 Alfredo Tupone
2021-03-20  1:15 Sam James
2021-03-19 10:24 Sam James
2017-10-04  8:02 Alexis Ballier
2017-08-06  7:40 Alexis Ballier
2017-07-29 10:06 Alexis Ballier
2017-06-15  8:49 Alexis Ballier
2017-04-25 17:32 Alexis Ballier
2017-04-03 10:22 Alexis Ballier

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