summaryrefslogtreecommitdiff
path: root/app-vim/splice
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-12-15 18:09:03 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-12-15 18:09:03 +0000
commit7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /app-vim/splice
parentb284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
gentoo resync : 15.12.2019
Diffstat (limited to 'app-vim/splice')
-rw-r--r--app-vim/splice/Manifest3
-rw-r--r--app-vim/splice/splice-1.1.0-r1.ebuild (renamed from app-vim/splice/splice-1.0.1.ebuild)17
2 files changed, 11 insertions, 9 deletions
diff --git a/app-vim/splice/Manifest b/app-vim/splice/Manifest
index 4a0d42e64d57..58a6c3c84ab5 100644
--- a/app-vim/splice/Manifest
+++ b/app-vim/splice/Manifest
@@ -1,5 +1,4 @@
-DIST splice-1.0.1.tar.bz2 12369 BLAKE2B ce43b38a74dd8c51c4fb2d23951119c259595dcc3f5bbeb5524d747a373ba7e71dc2bf4df957b48dca5aba5f2c04bb18bbe83d9551f63d2b055cdeddbc523713 SHA512 65826a9054163f59d8dc0a558e3b748f27015bb6075e8d158214e6824c922599552a69c7d09364599285d6effdfc42fa6dd98e858a8bfa47ebc21a4d18394ede
DIST splice-1.1.0.tar.gz 15513 BLAKE2B 8517d8c2fef2ccb85267a69c606e861a7c5498af2c23454ce58fb4e6035b13d71fab08c7fe09198b99453a1475062a7916814ef2018adbb849b48fac32e16d51 SHA512 3008c5628ca7b05be451521f9e1f0f2d8dcc8c968e95f2791e76a355b2c9f3b85c62faa319a2f1427f223094b3e606577d19a61b2384b78cbd6d40f497e4ad37
-EBUILD splice-1.0.1.ebuild 704 BLAKE2B 48796ab35b24832539495210a80b93a6e0981da47b6c2fcdc7ec3f5b41bfe6e30aeef2d630d9390c94c196a524001675d80e70a7318a2af9aeb48f607acc695c SHA512 1e8d8bb58cbb54e586fec5c082675189c45152d49ad10c7b6e37d5a2724b9d0780f2d9f8d124880d5a294b95f59e793eb0d2c58a489e956b6e7585abaec8cdac
+EBUILD splice-1.1.0-r1.ebuild 888 BLAKE2B 4d9110698998a8d705b8826ea6e0cd58888604b9dcbe5199777a4ab8721581fcabbeca5f704025fcdbe7fca4bf16785443c1090f3405ca81d918041b5e52dabd SHA512 f022fcd65e2b9699221c0f39120b891cf7485205b82c874e6caeed075100806124743a54459a4e79c3679d2a54ce4a941d7cb14c6314741f832317dd0fe4f196
EBUILD splice-1.1.0.ebuild 886 BLAKE2B 1465580ca5ac656b5f400911dffd513c09795a9f7aaeb96bb5de7316bcb1f9a86a0904a69f416ccf7a6bf5c93604ee2c543761a9cd2ca5b030ef1f0b9d6724b6 SHA512 3bd938952eb3155f5430d0b98afbe8fa3e41e27b6f9efa47504fa9158ca8afdc80c95d10d8df011d99190e8ac9b4c91266a4347e4f01b9cd048642d0b1d39fde
MISC metadata.xml 379 BLAKE2B ae1816407de2de76d021e1577e8dacf863585fe190af44b9af8b0247cfbd61fc834601b87412d1d048655924bac586fef79d869bf553213f566a81372cc545d6 SHA512 76d8d1f9dbdd2aa7fa54e8d4dde8a34fa62e69e5e20154545572f3c083df1fddf7e3ed286d1077f63cd4a46bdb7bcf3617700fedd2c77800e1dc4d15ac67e9b0
diff --git a/app-vim/splice/splice-1.0.1.ebuild b/app-vim/splice/splice-1.1.0-r1.ebuild
index 4edbc76ad7f3..3753a52afbed 100644
--- a/app-vim/splice/splice-1.0.1.ebuild
+++ b/app-vim/splice/splice-1.1.0-r1.ebuild
@@ -1,29 +1,32 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
+EAPI=6
+PYTHON_COMPAT=( python3_6 )
-inherit vim-plugin python-single-r1
+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"
+KEYWORDS="~amd64 ~x86"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
${PYTHON_DEPS}
|| (
- app-editors/vim[python]
- app-editors/gvim[python]
+ app-editors/vim[python,${PYTHON_USEDEP}]
+ app-editors/gvim[python,${PYTHON_USEDEP}]
)"
VIM_PLUGIN_HELPFILES="${PN}.txt"
src_prepare() {
- rm LICENSE.markdown || die
+ default
+ rm .[a-z]* Makefile LICENSE.markdown package.sh || die
+ rm -r site || die
}
src_install() {