[gentoo-commits] repo/gentoo:master commit in: app-vim/splice/

["Mikle Kolyada" <zlogene@gentoo.org>]

commit:     7c84463c18f4118b175584c993a59e1e9a372ae9
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  4 12:15:42 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> 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 <zlogene <AT> 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="