1 |
commit: 32a497c373e037835894bd73e960e534a108680c |
2 |
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 29 23:54:07 2022 +0000 |
4 |
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 29 23:54:07 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32a497c3 |
7 |
|
8 |
dev-ml/merlin: drop old 4.3.1-r3 |
9 |
|
10 |
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> |
11 |
|
12 |
dev-ml/merlin/Manifest | 2 - |
13 |
dev-ml/merlin/merlin-4.3.1-r3.ebuild | 84 ------------------------------------ |
14 |
2 files changed, 86 deletions(-) |
15 |
|
16 |
diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest |
17 |
index b9cfc9204251..4da55eef03ef 100644 |
18 |
--- a/dev-ml/merlin/Manifest |
19 |
+++ b/dev-ml/merlin/Manifest |
20 |
@@ -1,5 +1,3 @@ |
21 |
-DIST merlin-4.3.1-411.tar.gz 1626551 BLAKE2B c4340ff9b50c72208c4cb13d13e26f36463d7c257530d183a293eaaf3d86aaa71745d8154bb5c0e2149003b3cbe5a127fb6187e7bb7fa7024924fd239f981cfc SHA512 bcbba0c1bb1c84eef7becc4a537e1c2a4bd370a33333bfba1029c82fa8b1d9cdf367f98779fe3329286e418c41b06b49bfe796f5cf8058bcd189b4f33aad1abf |
22 |
-DIST merlin-4.3.1-ocaml-4.12.patch.gz 818559 BLAKE2B accf65bd5d5798bafe2be022d685da8f829aa9a9c98784420d8a62646d80ab73d1e189e3601266e09eebd4732ae241e8d11dc9663adac3b03a555db663a6d649 SHA512 8823b6e30e49ab3cf35a78063066f01aa7dcbc9174d45b0fed94a3f50e388c35e7ac810c5548c57d7bcf9304b045c483080496865b011269913120a5509a1149 |
23 |
DIST merlin-4.5-411.tbz 1316537 BLAKE2B 8850ea6b15819a178f763d8b55fecca9104cec5097c39afad7dc8b59543d961d7aa4a86590ebb59a3066d1f6630f11284e24835398ab967f45a52faf004477f1 SHA512 9e68ebabdc0cc398edcd255516070d6459f3bf5738c0dbe332c11c6bc4070e7bf340bc086fa2ea58597972ebe9d15860ecd0e549444809be809f0509b41652c2 |
24 |
DIST merlin-4.5-412.tbz 1765436 BLAKE2B eaed065a2814f4c1bfc5337d026c7c42287b8cbbe50097415a983f7fdd7323f4c88f3b8c8cff4ca88a0813204617f39807709a6703fd618269eca6063b3c47b1 SHA512 f9edc3e1c9f753d7bacbdf1b92c118b54f9e9eff0bf752a2b44f39a2f7ecc76c4cd3bbe9227e910aea8b5ea947e8fe1b8d92ba0245fe47bc8cc2f45404cca973 |
25 |
DIST merlin-4.5-413.tbz 2290507 BLAKE2B 32aeda63caec645da8043c49ceaa0ea54d095b3e286f687b5f3da1b44d54bbc291d0358768d2180825cb620a91765da83d90b645151a694a4131788ab4438fbf SHA512 b1db98c38a97ca0eef3051ab2b5d1b158e757863de6908a830308e7ea7f960eebd64b1a60bf51b10b7ea2eea3141ee0917a7c3570b63f9faa2e3f69c5d6fe0c2 |
26 |
|
27 |
diff --git a/dev-ml/merlin/merlin-4.3.1-r3.ebuild b/dev-ml/merlin/merlin-4.3.1-r3.ebuild |
28 |
deleted file mode 100644 |
29 |
index 2f3b6848a507..000000000000 |
30 |
--- a/dev-ml/merlin/merlin-4.3.1-r3.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,84 +0,0 @@ |
33 |
-# Copyright 1999-2022 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=7 |
37 |
- |
38 |
-# TODO: vim-plugin, although it's not clear how to make it work here |
39 |
-inherit elisp-common dune |
40 |
- |
41 |
-DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs" |
42 |
-HOMEPAGE="https://github.com/ocaml/merlin" |
43 |
-SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}-411.tar.gz -> ${P}-411.tar.gz |
44 |
- https://dev.gentoo.org/~tupone/distfiles/${P}-ocaml-4.12.patch.gz" |
45 |
- |
46 |
-LICENSE="MIT" |
47 |
-SLOT="0/${PV}" |
48 |
-KEYWORDS="~amd64" |
49 |
-IUSE="emacs +ocamlopt test" |
50 |
-RESTRICT="!test? ( test )" |
51 |
- |
52 |
-RDEPEND=" |
53 |
- dev-ml/csexp:= |
54 |
- <dev-ml/yojson-2:= |
55 |
- dev-ml/menhir:= |
56 |
- >=dev-ml/dune-2.9:= |
57 |
- || ( |
58 |
- dev-lang/ocaml:0/4.11 |
59 |
- dev-lang/ocaml:0/4.12 |
60 |
- ) |
61 |
- emacs? ( |
62 |
- >=app-editors/emacs-23.1:* |
63 |
- app-emacs/auto-complete |
64 |
- app-emacs/company-mode |
65 |
- ) |
66 |
-" |
67 |
-DEPEND="${RDEPEND} |
68 |
- test? ( app-misc/jq )" |
69 |
- |
70 |
-SITEFILE="50${PN}-gentoo.el" |
71 |
- |
72 |
-S="${WORKDIR}"/${P}-411 |
73 |
- |
74 |
-src_prepare() { |
75 |
- has_version "dev-lang/ocaml:0/4.12" && \ |
76 |
- eapply "${WORKDIR}"/${P}-ocaml-4.12.patch |
77 |
- default |
78 |
- |
79 |
- # Handle installation via the eclass |
80 |
- rm emacs/dune || die |
81 |
- |
82 |
- # rm failing test |
83 |
- rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die |
84 |
-} |
85 |
- |
86 |
-src_compile() { |
87 |
- dune build @install || die |
88 |
- |
89 |
- if use emacs ; then |
90 |
- # Build the emacs integration |
91 |
- cd emacs || die |
92 |
- |
93 |
- # iedit isn't packaged yet |
94 |
- rm merlin-iedit.el || die |
95 |
- |
96 |
- elisp-compile *.el |
97 |
- fi |
98 |
-} |
99 |
- |
100 |
-src_install() { |
101 |
- dune_src_install |
102 |
- |
103 |
- if use emacs ; then |
104 |
- cd "${S}/emacs" || die |
105 |
- elisp-install ${PN} *.el *.elc |
106 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
107 |
- fi |
108 |
-} |
109 |
- |
110 |
-pkg_postinst() { |
111 |
- use emacs && elisp-site-regen |
112 |
-} |
113 |
- |
114 |
-pkg_postrm() { |
115 |
- use emacs && elisp-site-regen |
116 |
-} |