commit: 38edf6c5de2e95504d57696f2d04cfdbe17f78b3 Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> AuthorDate: Sun Feb 28 21:41:44 2021 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Sun Mar 21 19:48:55 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38edf6c5
app-vim/splice: update HOMEPAGE and SRC_URI. Closes: https://bugs.gentoo.org/739792 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/19716 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> app-vim/splice/Manifest | 1 + app-vim/splice/metadata.xml | 3 +-- app-vim/splice/splice-1.1.0-r4.ebuild | 36 +++++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/app-vim/splice/Manifest b/app-vim/splice/Manifest index db03af64ddf..14d785488a7 100644 --- a/app-vim/splice/Manifest +++ b/app-vim/splice/Manifest @@ -1 +1,2 @@ +DIST splice-1.1.0-github.tar.gz 15821 BLAKE2B 37c402e7961471dd21e443550b4005cd98eab7a58d4b1d33f8522ac6fb180c6ce18f78174338c98fb63f5e7881d529c6f0d67d52bf40f357e530c404741a2d8f SHA512 3bd9a97522ec3fab08bd41e8e58b54ff0bb1a1f42251bd17c53057d6e5a1266bfff8683d47f85a83d84547bba2a8ea0682fe74da3cb06dc567271dd9ab5c4080 DIST splice-1.1.0.tar.gz 15513 BLAKE2B 8517d8c2fef2ccb85267a69c606e861a7c5498af2c23454ce58fb4e6035b13d71fab08c7fe09198b99453a1475062a7916814ef2018adbb849b48fac32e16d51 SHA512 3008c5628ca7b05be451521f9e1f0f2d8dcc8c968e95f2791e76a355b2c9f3b85c62faa319a2f1427f223094b3e606577d19a61b2384b78cbd6d40f497e4ad37 diff --git a/app-vim/splice/metadata.xml b/app-vim/splice/metadata.xml index ea657fdd8a8..707c11da64b 100644 --- a/app-vim/splice/metadata.xml +++ b/app-vim/splice/metadata.xml @@ -6,7 +6,6 @@ <name>Gentoo Vim Project</name> </maintainer> <upstream> - <remote-id type="sourceforge">vim</remote-id> - <remote-id type="bitbucket">sjl/splice.vim</remote-id> + <remote-id type="github">sjl/splice.vim</remote-id> </upstream> </pkgmetadata> diff --git a/app-vim/splice/splice-1.1.0-r4.ebuild b/app-vim/splice/splice-1.1.0-r4.ebuild new file mode 100644 index 00000000000..4625bc792f6 --- /dev/null +++ b/app-vim/splice/splice-1.1.0-r4.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7,8} ) + +inherit vim-plugin python-single-r1 + +DESCRIPTION="vim plugin: resolve conflicts during three-way merges" +HOMEPAGE="https://docs.stevelosh.com/splice.vim/ https://github.com/sjl/splice.vim https://www.vim.org/scripts/script.php?script_id=4026"; +SRC_URI="https://github.com/sjl/splice.vim/archive/v${PV}.tar.gz -> ${P}-github.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}] + )" + +S="${WORKDIR}/splice.vim-${PV}" +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 +}
