summaryrefslogtreecommitdiff
path: root/dev-ml/merlin
diff options
context:
space:
mode:
Diffstat (limited to 'dev-ml/merlin')
-rw-r--r--dev-ml/merlin/Manifest2
-rw-r--r--dev-ml/merlin/merlin-4.1-r2.ebuild9
2 files changed, 8 insertions, 3 deletions
diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index d2dc0b9c546c..27ac48a08b3b 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -2,5 +2,5 @@ AUX 50merlin-gentoo.el 195 BLAKE2B a5bcca9e3af1810b18337680b4878dcfc41296b98a4b9
DIST merlin-3.4.2.tar.gz 11016272 BLAKE2B 6fa55423df7ae8f7a8056e90be630f148dd101194de1921605843caf805bd6c9694fa3fe5b8c2f8eff5d57d7d0e9d8653036b6165a49af655158925c7af87d2f SHA512 8225366ebf27ca656ca89fe00d5aec581487ae332aeab81568e7606eaf575648a7614d4d2de8e0757a4e69c6f4014fefa4574c95da13d42acb310c9dd58a468a
DIST merlin-4.1.tar.gz 2136082 BLAKE2B 3e7e1996611f0cefb3a33b2a78cd36b6e8b84d48bc48f46c45ba340c4be1b93b4a1876f8f4192e911c1c384c416ad7502ba3c7a2abb72eff01215f9fb26bfaf0 SHA512 f0f3ada007f8214b97a8557bddca87eded48ee01a8bb88aba6476e52881ead52d9f47e2666a9292b5c6a490e4cfdc7d8bb322e8489f78eaac7b0f80b6d1e87bc
EBUILD merlin-3.4.2-r1.ebuild 1265 BLAKE2B a12e5b68da2899f57ecb73de9ff4558a2069fef7056f7a6775616801bd809d058e8c457afe7c659e16f31861786311871860ce2ef58460f50a738939ffab9750 SHA512 355c89138e3838407d9f05d1d393411307700deb38fca7f17efb6cce553f2a4d159fb2b13568704bca3c655dfb975e50afa52f314f7c8815370f3ebf1cf74188
-EBUILD merlin-4.1-r2.ebuild 1258 BLAKE2B 0827684f440916233f9577321217024ffe796ca3cf233d657eae007758638c5d3e1f9f4388d0d6fb430e27a6fcfc65ca8b3ac567132144c300a45b3f9d3a4cfe SHA512 f9960931fae791496b32be1796326a7785652457e1551ba8491e744083c0efe2b11ced05e209bacafa78aae0dcb596a09611553fa30bb75eed5fcd230287ee3e
+EBUILD merlin-4.1-r2.ebuild 1404 BLAKE2B 95db10376b3937bfeff54106b8aa1099ba852590b07a670f1499764862e7f1dd74e05efc461570947e0d5f9dc5c94d3ed9bc1449805e91bae33358cace53dd68 SHA512 07798a89c19f854966f3e078127a1f599b61e17ff905f5dd300ac8101b87465995f536c85cf6ea92db0b9f3d5e34419aa11c3d36baa61ceb4386c398e4707ae9
MISC metadata.xml 310 BLAKE2B f1255dfdcb6984112e896735ea40f1171a8d52149fa7e8ed279efc1fe08de9b071554f5168bc3f8c0e432bd8344c69f5c5716c5c689ff4ff4edbc27569546246 SHA512 06710c33027574e4c13259e30ca5e862b7bbda0442013676020d00dd1114e92ebee92fa19d2993fc3881c10f9db7b51dd2710fcfbcf9ca7564f8f96e5065705e
diff --git a/dev-ml/merlin/merlin-4.1-r2.ebuild b/dev-ml/merlin/merlin-4.1-r2.ebuild
index 70e3b0b53a56..20b1824bea52 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"
@@ -35,6 +37,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() {