| 1 |
commit: 217682927ce836b08c99c70e9bd1a51bfded3c24 |
| 2 |
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 29 23:53:54 2022 +0000 |
| 4 |
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 29 23:53:54 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21768292 |
| 7 |
|
| 8 |
dev-ml/merlin: drop old 4.2-r2 |
| 9 |
|
| 10 |
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-ml/merlin/Manifest | 2 - |
| 13 |
dev-ml/merlin/merlin-4.2-r2.ebuild | 83 -------------------------------------- |
| 14 |
2 files changed, 85 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest |
| 17 |
index 2a81dd9602c4..b9cfc9204251 100644 |
| 18 |
--- a/dev-ml/merlin/Manifest |
| 19 |
+++ b/dev-ml/merlin/Manifest |
| 20 |
@@ -1,5 +1,3 @@ |
| 21 |
-DIST merlin-4.2-411.tar.gz 1601588 BLAKE2B 348b48ccf2b209bb511450e4ba46ceb3639b1a5facd70bec4519369907e162e95575fa101aa1b79c56719927272a4feebf981692ea2bcb2299fc2c284833b1be SHA512 9ca8d3690621019b8213abcc1a32e1d754b93849f0bbd79bcab3a14915acc295eb60a7b68e997a75e777daaef83d5ca3e81944b7baf352dc4cce8480905ea2d7 |
| 22 |
-DIST merlin-4.2-ocaml-4.12.patch.gz 816740 BLAKE2B d96ab1059683799312fc8828e8a46bccaae9279b6d711eb7ed47b6e8631d80e09f236bf6f726bafb37ae243457df3220a9948f4f6de6da20c2a6c66a1edb8f3f SHA512 4eef08ac8a7f240596395d8460a4d3195c1483fb686aa7d5231d7ea28c9c6996196890f76feae951d2539ac7abc1f16ee3c453031e6d19af554ff27d67a63229 |
| 23 |
DIST merlin-4.3.1-411.tar.gz 1626551 BLAKE2B c4340ff9b50c72208c4cb13d13e26f36463d7c257530d183a293eaaf3d86aaa71745d8154bb5c0e2149003b3cbe5a127fb6187e7bb7fa7024924fd239f981cfc SHA512 bcbba0c1bb1c84eef7becc4a537e1c2a4bd370a33333bfba1029c82fa8b1d9cdf367f98779fe3329286e418c41b06b49bfe796f5cf8058bcd189b4f33aad1abf |
| 24 |
DIST merlin-4.3.1-ocaml-4.12.patch.gz 818559 BLAKE2B accf65bd5d5798bafe2be022d685da8f829aa9a9c98784420d8a62646d80ab73d1e189e3601266e09eebd4732ae241e8d11dc9663adac3b03a555db663a6d649 SHA512 8823b6e30e49ab3cf35a78063066f01aa7dcbc9174d45b0fed94a3f50e388c35e7ac810c5548c57d7bcf9304b045c483080496865b011269913120a5509a1149 |
| 25 |
DIST merlin-4.5-411.tbz 1316537 BLAKE2B 8850ea6b15819a178f763d8b55fecca9104cec5097c39afad7dc8b59543d961d7aa4a86590ebb59a3066d1f6630f11284e24835398ab967f45a52faf004477f1 SHA512 9e68ebabdc0cc398edcd255516070d6459f3bf5738c0dbe332c11c6bc4070e7bf340bc086fa2ea58597972ebe9d15860ecd0e549444809be809f0509b41652c2 |
| 26 |
|
| 27 |
diff --git a/dev-ml/merlin/merlin-4.2-r2.ebuild b/dev-ml/merlin/merlin-4.2-r2.ebuild |
| 28 |
deleted file mode 100644 |
| 29 |
index 531c1f5309e7..000000000000 |
| 30 |
--- a/dev-ml/merlin/merlin-4.2-r2.ebuild |
| 31 |
+++ /dev/null |
| 32 |
@@ -1,83 +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 |
- || ( |
| 57 |
- dev-lang/ocaml:0/4.11 |
| 58 |
- dev-lang/ocaml:0/4.12 |
| 59 |
- ) |
| 60 |
- emacs? ( |
| 61 |
- >=app-editors/emacs-23.1:* |
| 62 |
- app-emacs/auto-complete |
| 63 |
- app-emacs/company-mode |
| 64 |
- ) |
| 65 |
-" |
| 66 |
-DEPEND="${RDEPEND} |
| 67 |
- test? ( app-misc/jq )" |
| 68 |
- |
| 69 |
-SITEFILE="50${PN}-gentoo.el" |
| 70 |
- |
| 71 |
-S="${WORKDIR}"/${P}-411 |
| 72 |
- |
| 73 |
-src_prepare() { |
| 74 |
- has_version "dev-lang/ocaml:0/4.12" && \ |
| 75 |
- eapply "${WORKDIR}"/${P}-ocaml-4.12.patch |
| 76 |
- default |
| 77 |
- |
| 78 |
- # Handle installation via the eclass |
| 79 |
- rm emacs/dune || die |
| 80 |
- |
| 81 |
- # rm failing test |
| 82 |
- rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die |
| 83 |
-} |
| 84 |
- |
| 85 |
-src_compile() { |
| 86 |
- dune build @install || die |
| 87 |
- |
| 88 |
- if use emacs ; then |
| 89 |
- # Build the emacs integration |
| 90 |
- cd emacs || die |
| 91 |
- |
| 92 |
- # iedit isn't packaged yet |
| 93 |
- rm merlin-iedit.el || die |
| 94 |
- |
| 95 |
- elisp-compile *.el |
| 96 |
- fi |
| 97 |
-} |
| 98 |
- |
| 99 |
-src_install() { |
| 100 |
- dune_src_install |
| 101 |
- |
| 102 |
- if use emacs ; then |
| 103 |
- cd "${S}/emacs" || die |
| 104 |
- elisp-install ${PN} *.el *.elc |
| 105 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
| 106 |
- fi |
| 107 |
-} |
| 108 |
- |
| 109 |
-pkg_postinst() { |
| 110 |
- use emacs && elisp-site-regen |
| 111 |
-} |
| 112 |
- |
| 113 |
-pkg_postrm() { |
| 114 |
- use emacs && elisp-site-regen |
| 115 |
-} |
Archives