summaryrefslogtreecommitdiff
path: root/app-vim/splice
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-04-12 03:41:30 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-04-12 03:41:30 +0100
commit623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree993eb27c93ec7a2d2d19550300d888fc1fed9e69 /app-vim/splice
parentceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'app-vim/splice')
-rw-r--r--app-vim/splice/Manifest3
-rw-r--r--app-vim/splice/splice-1.1.0-r2.ebuild35
-rw-r--r--app-vim/splice/splice-1.1.0-r3.ebuild2
3 files changed, 2 insertions, 38 deletions
diff --git a/app-vim/splice/Manifest b/app-vim/splice/Manifest
index 7cd59f91ad8a..3f2e81c852f7 100644
--- a/app-vim/splice/Manifest
+++ b/app-vim/splice/Manifest
@@ -1,4 +1,3 @@
DIST splice-1.1.0.tar.gz 15513 BLAKE2B 8517d8c2fef2ccb85267a69c606e861a7c5498af2c23454ce58fb4e6035b13d71fab08c7fe09198b99453a1475062a7916814ef2018adbb849b48fac32e16d51 SHA512 3008c5628ca7b05be451521f9e1f0f2d8dcc8c968e95f2791e76a355b2c9f3b85c62faa319a2f1427f223094b3e606577d19a61b2384b78cbd6d40f497e4ad37
-EBUILD splice-1.1.0-r2.ebuild 900 BLAKE2B 23ae844f6156b6adcfd95a3738b1bdca8fefacc37b2203b761f06381c3ae0cb9008bd86c4a1a9cfa5a3b23d622a98bea1d8feae1d64176af56ca9bad9a6bd4da SHA512 0f45f997070b8e1ac83300f342efa99b14f249685e6bc4ca120fc2e64c3111581945fe345802fd3f1ebfcf8458cceaa623b6331df96f48ecd29088311c456997
-EBUILD splice-1.1.0-r3.ebuild 909 BLAKE2B ae3fcdcaad1d736a2e928e8f7d96ab4eb203599e0afd7eb6de4fc422f18a1c7967744e865e59c33bc38af6e95bf77d2ae1f2e1946593f49f1ba5b4cf5859d85b SHA512 08a4d525508fd884b8f5a65e5f7d749fe86eef541fcf055213ce564bcaf3bbcbf4e6e79c5a0e0d3c5a8a7f4c70a32c3c1e5e941247248d61999026570ef06f84
+EBUILD splice-1.1.0-r3.ebuild 907 BLAKE2B b62ce89795613ea4d9844471c0ff425f0aa589fe84e3697d4272b0d4f05fbcc233d9bfe9f28ee8d9d22ecea9dccbecdbbc1ab5adc54cfc4288a7e09f0ccda81e SHA512 332b2af76fe2979b34e2373f0949b42e6b45f73451ae499a2412366b1621e0e54944fe08ed81f0509c1d97ade59afebe9dba544a6604bc9becbfb5b2fde95088
MISC metadata.xml 379 BLAKE2B ae1816407de2de76d021e1577e8dacf863585fe190af44b9af8b0247cfbd61fc834601b87412d1d048655924bac586fef79d869bf553213f566a81372cc545d6 SHA512 76d8d1f9dbdd2aa7fa54e8d4dde8a34fa62e69e5e20154545572f3c083df1fddf7e3ed286d1077f63cd4a46bdb7bcf3617700fedd2c77800e1dc4d15ac67e9b0
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 84be23b68c94..000000000000
--- 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 3593b4bec5ff..aea29ebb3e0e 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="