app-vim / splice

vim plugin: resolve conflicts during three-way merges

Official package sites : https://docs.stevelosh.com/splice.vim/ · https://github.com/sjl/splice.vim · https://www.vim.org/scripts/script.php?script_id=4026 ·

v1.1.0-r4 :: 0 :: gentoo

Modified
License
MIT
Keywords
amd64 x86

python_single_target

python3_10
Build for Python 3.10 only

app-editors / gvim : GUI version of the Vim text editor

app-editors / vim : Vim, an improved vi-style text editor

app-editors / gvim : GUI version of the Vim text editor

app-editors / vim : Vim, an improved vi-style text editor

dev-lang / python : An interpreted, interactive, object-oriented programming language

896656
app-vim/splice: needs upgrade to Python 3.11 (PythonCompatUpdate)
929375
app-vim/splice: needs upgrade to Python 3.12 (PythonCompatUpdate)
Repository mirror & CI · gentoo
Merge updates from master
David Seifert · gentoo
*/*: remove py3.8 from PYTHON_COMPAT
Signed-off-by: David Seifert <soap@gentoo.org>
Repository mirror & CI · gentoo
Merge updates from master
Matt Turner · gentoo
app-vim/splice: Drop old versions
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Repository mirror & CI · gentoo
Merge updates from master
Agostino Sarubbo · gentoo
app-vim/splice: x86 stable wrt bug #793314
Package-Manager: Portage-3.0.13, Repoman-3.0.2 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
Repository mirror & CI · gentoo
Merge updates from master
Agostino Sarubbo · gentoo
app-vim/splice: amd64 stable wrt bug #793314
Package-Manager: Portage-3.0.13, Repoman-3.0.2 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
Repository mirror & CI · gentoo
Merge updates from master
Zamarin Arthur · gentoo
app-vim/splice: bump to python 3.9, 3.10
Signed-off-by: Zamarin Arthur <arthurzam@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/20964 Signed-off-by: Michał Górny <mgorny@gentoo.org>
Repository mirror & CI · gentoo
Merge updates from master
Marco Sirabella · gentoo
app-vim/*: bump copyright year.
Signed-off-by: Marco Sirabella <marco@sirabella.org> Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Marco Sirabella · gentoo
app-vim/*: memove redundant cleanup code.
This is a follow up of 47cf99c7. Leave a lot of heavy lifting to einstalldocs when possible. Signed-off-by: Marco Sirabella <marco@sirabella.org> Closes: https://github.com/gentoo/gentoo/pull/20726 Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Repository mirror & CI · gentoo
Merge updates from master
Azamat H. Hackimov · gentoo
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@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/19716 Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Repository mirror & CI · gentoo
Merge updates from master
Michał Górny · gentoo
*/*: Remove obsolete values from PYTHON_COMPAT
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Repository mirror & CI · gentoo
Merge updates from master
Mikle Kolyada · gentoo
app-vim/splice: mark stable
Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
Repository mirror & CI · gentoo
Merge updates from master
Michał Górny · gentoo
app-vim/splice: Switch to PYTHON_SINGLE_USEDEP
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Repository mirror & CI · gentoo
Merge updates from master
Tim Harder · gentoo
app-vim/splice: update PYTHON_COMPAT and HOMEPAGE
Also, bump to EAPI 7. Signed-off-by: Tim Harder <radhermit@gentoo.org>
Repository mirror & CI · gentoo
Merge updates from master
Patrice Clement · gentoo
app-vim/splice: add python3.6 support.
Closes: https://bugs.gentoo.org/658840 Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Patrice Clement · gentoo
app-vim/splice: clean up old.
Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Repository mirror & CI · gentoo
Merge updates from master
Michael Mair-Keimberger · gentoo
app-vim/splice: update HOMEPAGE, use HTTPS
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/12150 Signed-off-by: Aaron Bauman <bman@gentoo.org>
Michał Górny · gentoo
app-vim/splice: Add missing PYTHON_USEDEP on vim
David Seifert · gentoo
app-vim/splice: [QA] Add missing python metadata variables
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Robin H. Johnson · gentoo
Drop $Id$ per council decision in bug #611234.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
T. Malfatti · gentoo
media-libs/portaudio: Version bump
Tim Harder · gentoo
app-vim/splice: version bump to 1.1.0
Justin Lecher · gentoo
Use https by default
Convert all URLs for sites supporting encrypted connections from http to https Signed-off-by: Justin Lecher <jlec@gentoo.org>
Robin H. Johnson · gentoo
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed