1 |
commit: 312c2ec66a2ade88db82d9178b18a5cbff7affe7 |
2 |
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 29 23:53:44 2022 +0000 |
4 |
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 29 23:53:44 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=312c2ec6 |
7 |
|
8 |
dev-ml/merlin: drop old 3.4.2-r3 |
9 |
|
10 |
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> |
11 |
|
12 |
dev-ml/merlin/Manifest | 1 - |
13 |
dev-ml/merlin/merlin-3.4.2-r3.ebuild | 70 ------------------------------------ |
14 |
2 files changed, 71 deletions(-) |
15 |
|
16 |
diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest |
17 |
index 0e9d80284541..2a81dd9602c4 100644 |
18 |
--- a/dev-ml/merlin/Manifest |
19 |
+++ b/dev-ml/merlin/Manifest |
20 |
@@ -1,4 +1,3 @@ |
21 |
-DIST merlin-3.4.2.tar.gz 11016272 BLAKE2B 6fa55423df7ae8f7a8056e90be630f148dd101194de1921605843caf805bd6c9694fa3fe5b8c2f8eff5d57d7d0e9d8653036b6165a49af655158925c7af87d2f SHA512 8225366ebf27ca656ca89fe00d5aec581487ae332aeab81568e7606eaf575648a7614d4d2de8e0757a4e69c6f4014fefa4574c95da13d42acb310c9dd58a468a |
22 |
DIST merlin-4.2-411.tar.gz 1601588 BLAKE2B 348b48ccf2b209bb511450e4ba46ceb3639b1a5facd70bec4519369907e162e95575fa101aa1b79c56719927272a4feebf981692ea2bcb2299fc2c284833b1be SHA512 9ca8d3690621019b8213abcc1a32e1d754b93849f0bbd79bcab3a14915acc295eb60a7b68e997a75e777daaef83d5ca3e81944b7baf352dc4cce8480905ea2d7 |
23 |
DIST merlin-4.2-ocaml-4.12.patch.gz 816740 BLAKE2B d96ab1059683799312fc8828e8a46bccaae9279b6d711eb7ed47b6e8631d80e09f236bf6f726bafb37ae243457df3220a9948f4f6de6da20c2a6c66a1edb8f3f SHA512 4eef08ac8a7f240596395d8460a4d3195c1483fb686aa7d5231d7ea28c9c6996196890f76feae951d2539ac7abc1f16ee3c453031e6d19af554ff27d67a63229 |
24 |
DIST merlin-4.3.1-411.tar.gz 1626551 BLAKE2B c4340ff9b50c72208c4cb13d13e26f36463d7c257530d183a293eaaf3d86aaa71745d8154bb5c0e2149003b3cbe5a127fb6187e7bb7fa7024924fd239f981cfc SHA512 bcbba0c1bb1c84eef7becc4a537e1c2a4bd370a33333bfba1029c82fa8b1d9cdf367f98779fe3329286e418c41b06b49bfe796f5cf8058bcd189b4f33aad1abf |
25 |
|
26 |
diff --git a/dev-ml/merlin/merlin-3.4.2-r3.ebuild b/dev-ml/merlin/merlin-3.4.2-r3.ebuild |
27 |
deleted file mode 100644 |
28 |
index c4d43185b391..000000000000 |
29 |
--- a/dev-ml/merlin/merlin-3.4.2-r3.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,70 +0,0 @@ |
32 |
-# Copyright 1999-2022 Gentoo Authors |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=7 |
36 |
- |
37 |
-# TODO: vim-plugin, although it's not clear how to make it work here |
38 |
-inherit elisp-common dune |
39 |
- |
40 |
-DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs" |
41 |
-HOMEPAGE="https://github.com/ocaml/merlin" |
42 |
-SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
43 |
- |
44 |
-LICENSE="MIT" |
45 |
-SLOT="0/${PV}" |
46 |
-KEYWORDS="~amd64" |
47 |
-IUSE="emacs +ocamlopt" |
48 |
- |
49 |
-RDEPEND=" |
50 |
- dev-ml/csexp:= |
51 |
- <dev-ml/yojson-2:= |
52 |
- >=dev-lang/ocaml-4.09:= |
53 |
- <dev-lang/ocaml-4.12:= |
54 |
- emacs? ( |
55 |
- >=app-editors/emacs-23.1:* |
56 |
- app-emacs/auto-complete |
57 |
- app-emacs/company-mode |
58 |
- ) |
59 |
-" |
60 |
-DEPEND="${RDEPEND}" |
61 |
- |
62 |
-SITEFILE="50${PN}-gentoo.el" |
63 |
- |
64 |
-src_prepare() { |
65 |
- default |
66 |
- |
67 |
- # Handle installation via the eclass |
68 |
- rm emacs/dune || die |
69 |
-} |
70 |
- |
71 |
-src_compile() { |
72 |
- dune_src_compile |
73 |
- |
74 |
- if use emacs ; then |
75 |
- # Build the emacs integration |
76 |
- cd emacs || die |
77 |
- |
78 |
- # iedit isn't packaged yet |
79 |
- rm merlin-iedit.el || die |
80 |
- |
81 |
- elisp-compile *.el |
82 |
- fi |
83 |
-} |
84 |
- |
85 |
-src_install() { |
86 |
- dune_src_install |
87 |
- |
88 |
- if use emacs ; then |
89 |
- cd "${S}/emacs" || die |
90 |
- elisp-install ${PN} *.el *.elc |
91 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
92 |
- fi |
93 |
-} |
94 |
- |
95 |
-pkg_postinst() { |
96 |
- use emacs && elisp-site-regen |
97 |
-} |
98 |
- |
99 |
-pkg_postrm() { |
100 |
- use emacs && elisp-site-regen |
101 |
-} |