From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-955559-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 5E8F4139694
	for <garchives@archives.gentoo.org>; Thu, 15 Jun 2017 08:49:55 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 1B17321C04E;
	Thu, 15 Jun 2017 08:49:52 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id D9AC1E0BF6
	for <gentoo-commits@lists.gentoo.org>; Thu, 15 Jun 2017 08:49:51 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 90BB83418C2
	for <gentoo-commits@lists.gentoo.org>; Thu, 15 Jun 2017 08:49:50 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id CDDEA7479
	for <gentoo-commits@lists.gentoo.org>; Thu, 15 Jun 2017 08:49:48 +0000 (UTC)
From: "Alexis Ballier" <aballier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" <aballier@gentoo.org>
Message-ID: <1497516582.8bedda265f99963762de244d1e3d77c9a6e07c84.aballier@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-ml/merlin/Manifest dev-ml/merlin/merlin-2.5.5.ebuild
X-VCS-Directories: dev-ml/merlin/
X-VCS-Committer: aballier
X-VCS-Committer-Name: Alexis Ballier
X-VCS-Revision: 8bedda265f99963762de244d1e3d77c9a6e07c84
X-VCS-Branch: master
Date: Thu, 15 Jun 2017 08:49:48 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: d705c719-e0da-403e-83d6-be5c510be4e2
X-Archives-Hash: aaf126708770bf7d76045c6c00bb9cd9

commit:     8bedda265f99963762de244d1e3d77c9a6e07c84
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 15 08:13:31 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jun 15 08:49:42 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bedda26

dev-ml/merlin: bump to 2.5.5

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-ml/merlin/Manifest            |  1 +
 dev-ml/merlin/merlin-2.5.5.ebuild | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index 1f854647868..af411583cad 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -1,2 +1,3 @@
 DIST merlin-2.5.3.tar.gz 3090459 SHA256 3538a02ad025090240825596fc4e1f86806d3808154d3135b090cc1a1192c2ca SHA512 7399b8afc3cd6c0c26fab44aec80cc7614cbe148bafea3512be9a4165b0ba0c93bc738e2d7e5dcc4b51208c9b9f185cc83e408c484e38b2e72e357cefb9ad5f0 WHIRLPOOL 33f7a83f9bcdcfab4f681dddb6153d0aa7c9177b733e26a24119e50bb3521e310e831bbfbcdde24e27c7cf8a5c778384b6e65e947bee0c0852d1e184e56df9e5
 DIST merlin-2.5.4.tar.gz 3094234 SHA256 e4e53f680e5e143ed0fb1a5dee4aba2e39e65e2d5619247526b85f5d6cc77e00 SHA512 ca6a1cc1da0b0211bac4f0e8b9c78b531fdd0ed97f7d978ae740b7bf7a97bb02d318bde97d8a9f143b6207b72bd47eb626748b86feebf6a60bcd222d5bddb759 WHIRLPOOL 50c33f65da5dfa9949fa1e21360580f52d5d73092a5ec791085bc53d9d834765a745d8f14a9df8717812d0f565c6c871a38a624e7ae885f7367effabcfb99daa
+DIST merlin-2.5.5.tar.gz 3094071 SHA256 5730cc1128bf6cf0af63985178307bbfd684bb5a03dc9dd62f14e4d3f8ae3d89 SHA512 9ba79f2fd2e2cdefe94da60b52096696bf08dcfd332188496c35074377a106bb3987025069784a96846a6c1cef1c0793b0525781aed8192227dd0c67266baaf1 WHIRLPOOL 263f0adb685d361cc72f99f9ff43dad75a54c92ff1341e12fa2b199c6a4351549e5fe1f13be22fe5053822179efaf0ead92a0f579910a85d36e7971bb2881baa

diff --git a/dev-ml/merlin/merlin-2.5.5.ebuild b/dev-ml/merlin/merlin-2.5.5.ebuild
new file mode 100644
index 00000000000..609f9767e4c
--- /dev/null
+++ b/dev-ml/merlin/merlin-2.5.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib vim-plugin
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-lang/ocaml:=
+	dev-ml/yojson:=
+"
+RDEPEND="${DEPEND}
+	|| ( app-editors/vim[python] app-editors/gvim[python] )"
+
+src_configure() {
+	./configure \
+		--prefix "${EPREFIX}/usr" \
+		--vimdir "${EPREFIX}//usr/share/vim/vimfiles" \
+		|| die
+}
+
+src_install() {
+	default
+}