From e8aa09f74c8ba0c9e1c5ae3ab49f93b6a0820330 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sat, 14 Sep 2024 12:32:28 +0100
Subject: gentoo auto-resync : 14:09:2024 - 12:32:27

---
 dev-ml/merlin/Manifest              |   2 +-
 dev-ml/merlin/merlin-4.13-r3.ebuild | 105 ------------------------------------
 dev-ml/merlin/merlin-4.13-r4.ebuild | 105 ++++++++++++++++++++++++++++++++++++
 3 files changed, 106 insertions(+), 106 deletions(-)
 delete mode 100644 dev-ml/merlin/merlin-4.13-r3.ebuild
 create mode 100644 dev-ml/merlin/merlin-4.13-r4.ebuild

(limited to 'dev-ml/merlin')

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index 97335c17fdd6..8d250753c2d0 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -2,5 +2,5 @@ AUX 50merlin-gentoo.el 169 BLAKE2B 97dca8debe038783d44200315f883f4918cee1cca9f1d
 DIST merlin-4.12-414.tbz 1991877 BLAKE2B d68a45efb29d7ed2dd8d2e377a7778fad5500064206e5ae27914a0be9f208f919f44f73f14be283aca653adf56462a782c4f5f895282e078478e60f13e9c09f1 SHA512 3bf4f5e4754def9818ce0abbdf2253fe9d5e0abec7e8814012e2ff9de6a174f288c257780eb9f8aa4d794c0b62a524848d579d2a3495a5747a0970ee9fbfff29
 DIST merlin-4.13-414.tbz 1993752 BLAKE2B 8b5704252f771ddac843340bf2aa24f62a2b490f6bb03c46a1daa2560fae72226b92fb5a9720b18c82f476571e7e6ffc7c30e695c8a0e1a3de6bd65ee58461e1 SHA512 cf7e292a515122756bd614eedbf11cc09108e6afab77cd5805428207b3ca5a98494ee43ad59fcfb667b48fe0874f0a8359882b3c14ee270769f99c41e176d455
 EBUILD merlin-4.12-r1.ebuild 2174 BLAKE2B ee448ce796df926d0c7098fe76c8a13cc03ad8787f01fac289d0754bd4bf7c8f70932a2001ef1930e1eaf8ce4fa27a9a57901609403487f3d99d916f87d21bd5 SHA512 2dfae34c5a8557c9dee9dea6f0ea62a471d3b883fb0fb6713f01a398abaa9dfcf23259a9949f7df53e1da38d3dd98999f1f4ec2c4ee6847923b2e4284c821ce4
-EBUILD merlin-4.13-r3.ebuild 2304 BLAKE2B 3b1e908f6c7fc2b84c086ac6ee7cef4e9aa64edc89be3ae3acb43d7cbebf690cc59d91a0726522da57c1bbfa5c848d5499b8aaccd2ba2f0b2729c564fdda0274 SHA512 9f7dd36ec5c2b71c7e43eeee54184b0720165070b11b475e312d536b2cc95f295b1944b13bc63b9f96bf0806ffe1caf8cf0096384944024c6973290d49ad647a
+EBUILD merlin-4.13-r4.ebuild 2314 BLAKE2B 2804a0c9a0b1fa251a0a002a785fb77f1c5390f9fa3f0a6cec361b0a54740df78268c277359804a3d39f901780bbe171efb8d4cc6fc8f936a1d2eead05535e51 SHA512 92ecce4f176d01bec7f72d3cb310ccb0fa045392b9b186ecfa0311852c87144ce929e5673d719e1fc1003ea317b4343223b284dd7fa40cb66dd9f2059019df27
 MISC metadata.xml 310 BLAKE2B f1255dfdcb6984112e896735ea40f1171a8d52149fa7e8ed279efc1fe08de9b071554f5168bc3f8c0e432bd8344c69f5c5716c5c689ff4ff4edbc27569546246 SHA512 06710c33027574e4c13259e30ca5e862b7bbda0442013676020d00dd1114e92ebee92fa19d2993fc3881c10f9db7b51dd2710fcfbcf9ca7564f8f96e5065705e
diff --git a/dev-ml/merlin/merlin-4.13-r3.ebuild b/dev-ml/merlin/merlin-4.13-r3.ebuild
deleted file mode 100644
index 18c16155ded7..000000000000
--- a/dev-ml/merlin/merlin-4.13-r3.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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 edo
-
-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"
-
-# Tests fail unexpectedly on Tinderbox. See https://bugs.gentoo.org/933857
-# RESTRICT="!test? ( test )"
-RESTRICT="test"
-
-RDEPEND="
-	<dev-lang/ocaml-5
-	>=dev-lang/ocaml-4.14.1
-	dev-lang/ocaml:=[ocamlopt?]
-	>=dev-ml/dune-2.9:=
-	>=dev-ml/yojson-2.0.0:=
-	dev-ml/csexp:=
-	dev-ml/menhir:=
-	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
-	dev-ml/findlib
-	test? (
-		app-misc/jq
-	)
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_unpack() {
-	default
-
-	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
-}
-
-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
-}
diff --git a/dev-ml/merlin/merlin-4.13-r4.ebuild b/dev-ml/merlin/merlin-4.13-r4.ebuild
new file mode 100644
index 000000000000..d7c237c47237
--- /dev/null
+++ b/dev-ml/merlin/merlin-4.13-r4.ebuild
@@ -0,0 +1,105 @@
+# 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 edo
+
+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"
+
+# Tests fail unexpectedly on Tinderbox. See https://bugs.gentoo.org/933857
+# RESTRICT="!test? ( test )"
+RESTRICT="test"
+
+RDEPEND="
+	<dev-lang/ocaml-5
+	>=dev-lang/ocaml-4.14.1
+	<dev-ml/menhir-20240715:=
+	>=dev-ml/dune-2.9:=
+	>=dev-ml/yojson-2.0.0:=
+	dev-lang/ocaml:=[ocamlopt?]
+	dev-ml/csexp:=
+	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
+	dev-ml/findlib
+	test? (
+		app-misc/jq
+	)
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_unpack() {
+	default
+
+	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
+}
+
+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
+}
-- 
cgit v1.2.3