summaryrefslogtreecommitdiff
path: root/app-vim/splice
diff options
context:
space:
mode:
Diffstat (limited to 'app-vim/splice')
-rw-r--r--app-vim/splice/Manifest3
-rw-r--r--app-vim/splice/splice-1.1.0-r4.ebuild37
-rw-r--r--app-vim/splice/splice-1.1.0-r5.ebuild2
3 files changed, 2 insertions, 40 deletions
diff --git a/app-vim/splice/Manifest b/app-vim/splice/Manifest
index b4290e3298bf..43e68396a550 100644
--- a/app-vim/splice/Manifest
+++ b/app-vim/splice/Manifest
@@ -1,4 +1,3 @@
DIST splice-1.1.0-github.tar.gz 15821 BLAKE2B 37c402e7961471dd21e443550b4005cd98eab7a58d4b1d33f8522ac6fb180c6ce18f78174338c98fb63f5e7881d529c6f0d67d52bf40f357e530c404741a2d8f SHA512 3bd9a97522ec3fab08bd41e8e58b54ff0bb1a1f42251bd17c53057d6e5a1266bfff8683d47f85a83d84547bba2a8ea0682fe74da3cb06dc567271dd9ab5c4080
-EBUILD splice-1.1.0-r4.ebuild 935 BLAKE2B 440af80c6aa4448d0e52fad077f9c03fb3be6c9177424b31e681f6170ad65d519d295a3486902a34711b9298072b873927f3d3a6be6a1811cff57d8067aca2c1 SHA512 c0352e9a7b955fb463dc783ed25b6bd088070420eb6edf12ae056a688943e0e260c65bede4eb736d14491fda0f797ed54797d610656d6869a673c42634282a2a
-EBUILD splice-1.1.0-r5.ebuild 940 BLAKE2B bc0874302624d70458034e71878a3e72ed87f49cf4705f248c1ebee2a151c4e1638e202a481ba9fb8114e4ab2ea9e0de5812193d049c4612ee1d1df9b29c9aee SHA512 53ac2d79c9155210ad51f8101e62222bc3c1fa71d7a15cf7d447ee392ca2fdfb319a3211368568f477564650f28c96d80d1b19c1d7ef512de9795dff94971973
+EBUILD splice-1.1.0-r5.ebuild 938 BLAKE2B f718cc8f86af5dc5fa854319a0f040da5c5c88e07ea450865b4ad37446687d1de7a7626062b71fdd38d764e686f85d33c790049c5a2c2449e77615aff0473bac SHA512 6f15ea61920b37e52cc9732d4b0ecae703b2010d90a5ae3f6617ff269910c083821130ae96d004e382c32ade974b8691f2f29465d2c7ee9b3e69fd237abfd9db
MISC metadata.xml 370 BLAKE2B b2d01b4accef2a77e95efe8c32069e35342ad677193d697a7998142038dd8aefa950cd7cef74d02bcd28305382c05520607a633c5deb0fcfddacc395ddcc229e SHA512 ed25407c6cf320b58af3638a50b4294f9544f3728694ee6352b0e141914ff07c02d50ea4a9a4b3be04a932c7f6ead480f2ccaa8f2266a0121d4fc73fe7065513
diff --git a/app-vim/splice/splice-1.1.0-r4.ebuild b/app-vim/splice/splice-1.1.0-r4.ebuild
deleted file mode 100644
index a035d2f8dd84..000000000000
--- a/app-vim/splice/splice-1.1.0-r4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{9..10} )
-
-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 -r site || die
-}
-
-src_compile() { :; }
-
-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-r5.ebuild b/app-vim/splice/splice-1.1.0-r5.ebuild
index 1f17cfe102f6..4d9eab8750c1 100644
--- a/app-vim/splice/splice-1.1.0-r5.ebuild
+++ b/app-vim/splice/splice-1.1.0-r5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/sjl/splice.vim/archive/v${PV}.tar.gz -> ${P}-github.
S=${WORKDIR}/splice.vim-${PV}
LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="