gentoo auto-resync : 04:11:2024 - 03:03:54

3 files changed, 24 insertions, 16 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index a45fdac61181..55eeed26f3b5 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index 8d250753c2d0..b73a86b01ee8 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -1,6 +1,5 @@
 AUX 50merlin-gentoo.el 169 BLAKE2B 97dca8debe038783d44200315f883f4918cee1cca9f1d53df1c70b8fbd6e922b38c43b436ac73854970f1438eb837cbcbff4e07d12054fc0d0222b5222b95970 SHA512 00db283dffe923971fe451bcbea687bf35152e9c09783d307d9dec4ac0f273d27edfcc0e1ac74db3885bdeec98e7d60f1d46fa381d3b2c813e2f55fb5d4adbb5
-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-r4.ebuild 2314 BLAKE2B 2804a0c9a0b1fa251a0a002a785fb77f1c5390f9fa3f0a6cec361b0a54740df78268c277359804a3d39f901780bbe171efb8d4cc6fc8f936a1d2eead05535e51 SHA512 92ecce4f176d01bec7f72d3cb310ccb0fa045392b9b186ecfa0311852c87144ce929e5673d719e1fc1003ea317b4343223b284dd7fa40cb66dd9f2059019df27
+EBUILD merlin-4.13-r5.ebuild 2466 BLAKE2B d450c9860b0f7726fd659e6d3e2fed02759806b1fcae4b412871589109d7aef0130d371668d8cb80c3fa1c7d06b9b007c272884668be5b41149de276e9af01ab SHA512 88d8396651018b0b3138f46ff1e2cc922e2b2727c0f80d80b5c73468d69bd5fe5865a1b7c0865bc0657ef8f1c719ed66e58e73486d3c7b82485b51d75089fe3d
 MISC metadata.xml 310 BLAKE2B f1255dfdcb6984112e896735ea40f1171a8d52149fa7e8ed279efc1fe08de9b071554f5168bc3f8c0e432bd8344c69f5c5716c5c689ff4ff4edbc27569546246 SHA512 06710c33027574e4c13259e30ca5e862b7bbda0442013676020d00dd1114e92ebee92fa19d2993fc3881c10f9db7b51dd2710fcfbcf9ca7564f8f96e5065705e
diff --git a/dev-ml/merlin/merlin-4.12-r1.ebuild b/dev-ml/merlin/merlin-4.13-r5.ebuild
index fdaafaef2c57..9a3d8f67b7e5 100644
--- a/dev-ml/merlin/merlin-4.12-r1.ebuild
+++ b/dev-ml/merlin/merlin-4.13-r5.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/"
@@ -14,25 +14,28 @@ 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
+	>=dev-lang/ocaml-4.14.1
+	>=dev-ml/dune-2.9:=
+	>=dev-ml/yojson-2.0.0:=
 	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}"
+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,10 +52,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
+	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
 }
 
@@ -71,10 +74,16 @@ src_prepare() {
 
 	# Remove seq references from dune build files.
 	sed -i 's|seq||g' src/frontend/ocamlmerlin/dune || die
+
+	# Remove Menhir requirement.
+	# > MenhirLib.StaticVersion.require_20201216
+	sed -i src/ocaml/preprocess/parser_raw.ml \
+		-e "s|MenhirLib.StaticVersion.require_.*|()|g" \
+		|| die
 }
 
 src_compile() {
-	edune build @install
+	dune_src_compile
 
 	if use emacs ; then
 		# iedit isn't packaged yet