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

2021-10-15 Thread Alfredo Tupone 
commit: c517feba1c81ce3fac443797d1debc3d674418bf
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Fri Oct 15 17:46:47 2021 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Fri Oct 15 17:46:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c517feba

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

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

 dev-ml/merlin/Manifest  |  1 +
 dev-ml/merlin/files/merlin-4.2-ocaml-4.12.patch | 30 -
 dev-ml/merlin/merlin-4.2.ebuild |  5 +++--
 3 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index 2cc2c5d29fb..4898821f67c 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -1,3 +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

diff --git a/dev-ml/merlin/files/merlin-4.2-ocaml-4.12.patch 
b/dev-ml/merlin/files/merlin-4.2-ocaml-4.12.patch
deleted file mode 100644
index f0d0c430193..000
--- a/dev-ml/merlin/files/merlin-4.2-ocaml-4.12.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -u merlin-4.2-411/dot-merlin-reader.opam 
merlin-4.2-412/dot-merlin-reader.opam
 merlin-4.2-411/dot-merlin-reader.opam  2021-04-13 11:01:00.0 
+0200
-+++ merlin-4.2-412/dot-merlin-reader.opam  2021-04-13 10:53:39.0 
+0200
-@@ -10,10 +10,12 @@
-   ["dune" "build" "-p" name "-j" jobs]
- ]
- depends: [
--  "ocaml" {>= "4.02.1" & < "4.12"}
--  "dune" {>= "1.8.0"}
-+  "ocaml" {>= "4.06.1" }
-+  "dune" {>= "2.7.0"}
-   "yojson" {>= "1.6.0"}
-   "ocamlfind" {>= "1.6.0"}
-   "csexp" {>= "1.2.3"}
-   "result" {>= "1.5"}
- ]
-+description:
-+  "Helper process: reads .merlin files and gives the normalized content to 
merlin"
-diff -u merlin-4.2-411/merlin.opam merlin-4.2-412/merlin.opam
 merlin-4.2-411/merlin.opam 2021-04-13 11:01:00.0 +0200
-+++ merlin-4.2-412/merlin.opam 2021-04-13 10:53:39.0 +0200
-@@ -10,7 +10,7 @@
-   ["dune" "runtest" "-p" "merlin,dot-merlin-reader" "-j" "1"] {with-test}
- ]
- depends: [
--  "ocaml" {>= "4.11.0" & < "4.12"}
-+  "ocaml" {>= "4.12" & < "4.13"}
-   "dune" {>= "2.7.0"}
-   "dot-merlin-reader" {>= "4.0"}
-   "yojson" {>= "1.6.0"}

diff --git a/dev-ml/merlin/merlin-4.2.ebuild b/dev-ml/merlin/merlin-4.2.ebuild
index e3b8f11d972..ba04028ea42 100644
--- a/dev-ml/merlin/merlin-4.2.ebuild
+++ b/dev-ml/merlin/merlin-4.2.ebuild
@@ -8,7 +8,8 @@ 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"
+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}"
@@ -39,7 +40,7 @@ S="${WORKDIR}"/${P}-411
 
 src_prepare() {
has_version "dev-lang/ocaml:0/4.12" && \
-   eapply "${FILESDIR}"/${P}-ocaml-4.12.patch
+   eapply "${WORKDIR}"/${P}-ocaml-4.12.patch
default
 
# Handle installation via the eclass

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

2021-03-19 Thread Sam James 
commit: 9654bbac4ee1a823d76fb5ae9924b2fbf7b1efdd
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 19 09:51:07 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 19 10:23:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9654bbac

dev-ml/merlin: add 3.4.2 (initial import)

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

 dev-ml/merlin/Manifest |  2 +
 dev-ml/merlin/files/50merlin-gentoo.el |  4 ++
 dev-ml/merlin/merlin-3.4.2.ebuild  | 68 ++
 dev-ml/merlin/metadata.xml | 11 ++
 4 files changed, 85 insertions(+)

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
new file mode 100644
index 000..22bfea096e9
--- /dev/null
+++ b/dev-ml/merlin/Manifest
@@ -0,0 +1,2 @@
+DIST merlin-3.4.2.tar.gz 11016272 BLAKE2B 
6fa55423df7ae8f7a8056e90be630f148dd101194de1921605843caf805bd6c9694fa3fe5b8c2f8eff5d57d7d0e9d8653036b6165a49af655158925c7af87d2f
 SHA512 
8225366ebf27ca656ca89fe00d5aec581487ae332aeab81568e7606eaf575648a7614d4d2de8e0757a4e69c6f4014fefa4574c95da13d42acb310c9dd58a468a
+DIST merlin-4.1.tar.gz 2136082 BLAKE2B 
3e7e1996611f0cefb3a33b2a78cd36b6e8b84d48bc48f46c45ba340c4be1b93b4a1876f8f4192e911c1c384c416ad7502ba3c7a2abb72eff01215f9fb26bfaf0
 SHA512 
f0f3ada007f8214b97a8557bddca87eded48ee01a8bb88aba6476e52881ead52d9f47e2666a9292b5c6a490e4cfdc7d8bb322e8489f78eaac7b0f80b6d1e87bc

diff --git a/dev-ml/merlin/files/50merlin-gentoo.el 
b/dev-ml/merlin/files/50merlin-gentoo.el
new file mode 100644
index 000..fbbbf201941
--- /dev/null
+++ b/dev-ml/merlin/files/50merlin-gentoo.el
@@ -0,0 +1,4 @@
+(push "@SLITELISP@" load-path) ; directory containing merlin.el
+(autoload 'merlin-mode "merlin" "Merlin mode" t)
+(add-hook 'tuareg-mode-hook 'merlin-mode)
+(add-hook 'caml-mode-hook 'merlin-mode)

diff --git a/dev-ml/merlin/merlin-3.4.2.ebuild 
b/dev-ml/merlin/merlin-3.4.2.ebuild
new file mode 100644
index 000..6a56c013b53
--- /dev/null
+++ b/dev-ml/merlin/merlin-3.4.2.ebuild
@@ -0,0 +1,68 @@
+# 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.09:=
+   =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
+}

diff --git a/dev-ml/merlin/metadata.xml b/dev-ml/merlin/metadata.xml
new file mode 100644
index 000..fe5fd4f15a0
--- /dev/null
+++ b/dev-ml/merlin/metadata.xml
@@ -0,0 +1,11 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   m...@gentoo.org
+   ML
+   
+   
+   ocaml/merlin
+   
+