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 BCF23138350 for ; Sat, 4 Apr 2020 12:16:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0144AE0C02; Sat, 4 Apr 2020 12:16:01 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A0B0AE0C02 for ; Sat, 4 Apr 2020 12:16:00 +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 97E5D34F12A for ; Sat, 4 Apr 2020 12:15:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3ABAF162 for ; Sat, 4 Apr 2020 12:15:58 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1586002542.7c84463c18f4118b175584c993a59e1e9a372ae9.zlogene@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-vim/splice/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-vim/splice/splice-1.1.0-r2.ebuild app-vim/splice/splice-1.1.0-r3.ebuild X-VCS-Directories: app-vim/splice/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: 7c84463c18f4118b175584c993a59e1e9a372ae9 X-VCS-Branch: master Date: Sat, 4 Apr 2020 12:15:58 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9e50c48b-a2a2-4cf6-a7fe-856aab24a552 X-Archives-Hash: a3d1490dda7e2fc4b141aa0620dd94d7 commit: 7c84463c18f4118b175584c993a59e1e9a372ae9 Author: Mikle Kolyada gentoo org> AuthorDate: Sat Apr 4 12:15:42 2020 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Sat Apr 4 12:15:42 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c84463c app-vim/splice: mark stable Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Mikle Kolyada gentoo.org> app-vim/splice/splice-1.1.0-r2.ebuild | 35 ----------------------------------- app-vim/splice/splice-1.1.0-r3.ebuild | 2 +- 2 files changed, 1 insertion(+), 36 deletions(-) diff --git a/app-vim/splice/splice-1.1.0-r2.ebuild b/app-vim/splice/splice-1.1.0-r2.ebuild deleted file mode 100644 index 84be23b68c9..00000000000 --- a/app-vim/splice/splice-1.1.0-r2.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -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/ https://www.vim.org/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=" - ${PYTHON_DEPS} - || ( - app-editors/vim[python,${PYTHON_SINGLE_USEDEP}] - app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}] - )" - -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 -} diff --git a/app-vim/splice/splice-1.1.0-r3.ebuild b/app-vim/splice/splice-1.1.0-r3.ebuild index 3593b4bec5f..aea29ebb3e0 100644 --- a/app-vim/splice/splice-1.1.0-r3.ebuild +++ b/app-vim/splice/splice-1.1.0-r3.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://docs.stevelosh.com/splice.vim/ https://www.vim.org/scripts/scr SRC_URI="https://bitbucket.org/sjl/${PN}.vim/get/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="