From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 800231395E1 for ; Mon, 31 Oct 2016 04:46:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ACBD6E0BCC; Mon, 31 Oct 2016 04:45:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 90F07E0BCC for ; Mon, 31 Oct 2016 04:45:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EE374341016 for ; Mon, 31 Oct 2016 04:45:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 345A024C0 for ; Mon, 31 Oct 2016 04:45:55 +0000 (UTC) From: "Tim Harder" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tim Harder" Message-ID: <1477889106.0776c76c7b97b12a3d85416e87225466ab9a7529.radhermit@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-vim/splice/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-vim/splice/Manifest app-vim/splice/splice-1.1.0.ebuild X-VCS-Directories: app-vim/splice/ X-VCS-Committer: radhermit X-VCS-Committer-Name: Tim Harder X-VCS-Revision: 0776c76c7b97b12a3d85416e87225466ab9a7529 X-VCS-Branch: master Date: Mon, 31 Oct 2016 04:45:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e144039a-9a51-4655-85a9-2765259c6074 X-Archives-Hash: 50f8662662e8364cfd392906588902ca commit: 0776c76c7b97b12a3d85416e87225466ab9a7529 Author: Tim Harder gentoo org> AuthorDate: Mon Oct 31 04:45:06 2016 +0000 Commit: Tim Harder gentoo org> CommitDate: Mon Oct 31 04:45:06 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0776c76c app-vim/splice: version bump to 1.1.0 app-vim/splice/Manifest | 1 + app-vim/splice/splice-1.1.0.ebuild | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/app-vim/splice/Manifest b/app-vim/splice/Manifest index 34d2eda..fcaa3e7 100644 --- a/app-vim/splice/Manifest +++ b/app-vim/splice/Manifest @@ -1 +1,2 @@ DIST splice-1.0.1.tar.bz2 12369 SHA256 30e7d947defb29971d8c750670bbdae6625e2238d4f892e6b5590609d6a6a81a SHA512 65826a9054163f59d8dc0a558e3b748f27015bb6075e8d158214e6824c922599552a69c7d09364599285d6effdfc42fa6dd98e858a8bfa47ebc21a4d18394ede WHIRLPOOL a8e4405f5169857c07b81f0a778757aebd198f4c0e73f4cf239a451dfae64911d5fb164121413799a750646df609fcb864a08393510d012a84383261f6c006ab +DIST splice-1.1.0.tar.gz 15513 SHA256 5f4b8324b873230124b93462581ca438c517a14076703ec36ec91a561ecb1504 SHA512 3008c5628ca7b05be451521f9e1f0f2d8dcc8c968e95f2791e76a355b2c9f3b85c62faa319a2f1427f223094b3e606577d19a61b2384b78cbd6d40f497e4ad37 WHIRLPOOL 83807c37e17c204e84fde1d02bc7f9645f259f7f6bc24d05fc9d41f0d2f2a366ea77c46615ae2a92811ee19ef1b7ccbedeb1c23a9bac0a1a413fa03113df306e diff --git a/app-vim/splice/splice-1.1.0.ebuild b/app-vim/splice/splice-1.1.0.ebuild new file mode 100644 index 00000000..a4d376c --- /dev/null +++ b/app-vim/splice/splice-1.1.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) + +inherit vim-plugin python-single-r1 vcs-snapshot + +DESCRIPTION="vim plugin: resolve conflicts during three-way merges" +HOMEPAGE="https://bitbucket.org/sjl/splice.vim http://vim.sourceforge.net/scripts/script.php?script_id=4026" +SRC_URI="https://bitbucket.org/sjl/${PN}.vim/get/v${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="MIT" +KEYWORDS="amd64 x86" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="|| ( app-editors/vim[python] app-editors/gvim[python] )" + +VIM_PLUGIN_HELPFILES="${PN}.txt" + +src_prepare() { + default + rm .[a-z]* Makefile LICENSE.markdown package.sh || die + rm -r site || die +} + +src_install() { + vim-plugin_src_install + python_optimize "${ED}"/usr/share/vim/vimfiles/autoload/splicelib +}