[gentoo-commits] repo/gentoo:master commit in: app-vim/splice/

[gentoo-commits] repo/gentoo:master commit in: app-vim/splice/

[Tim Harder]

commit:     0776c76c7b97b12a3d85416e87225466ab9a7529
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 31 04:45:06 2016 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 04:45:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0776c76c

app-vim/splice: version bump to 1.1.0

 app-vim/splice/Manifest            |  1 +
 app-vim/splice/splice-1.1.0.ebuild | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/app-vim/splice/Manifest b/app-vim/splice/Manifest
index 34d2eda..fcaa3e7 100644
--- a/app-vim/splice/Manifest
+++ b/app-vim/splice/Manifest
@@ -1 +1,2 @@
 DIST splice-1.0.1.tar.bz2 12369 SHA256 30e7d947defb29971d8c750670bbdae6625e2238d4f892e6b5590609d6a6a81a SHA512 65826a9054163f59d8dc0a558e3b748f27015bb6075e8d158214e6824c922599552a69c7d09364599285d6effdfc42fa6dd98e858a8bfa47ebc21a4d18394ede WHIRLPOOL a8e4405f5169857c07b81f0a778757aebd198f4c0e73f4cf239a451dfae64911d5fb164121413799a750646df609fcb864a08393510d012a84383261f6c006ab
+DIST splice-1.1.0.tar.gz 15513 SHA256 5f4b8324b873230124b93462581ca438c517a14076703ec36ec91a561ecb1504 SHA512 3008c5628ca7b05be451521f9e1f0f2d8dcc8c968e95f2791e76a355b2c9f3b85c62faa319a2f1427f223094b3e606577d19a61b2384b78cbd6d40f497e4ad37 WHIRLPOOL 83807c37e17c204e84fde1d02bc7f9645f259f7f6bc24d05fc9d41f0d2f2a366ea77c46615ae2a92811ee19ef1b7ccbedeb1c23a9bac0a1a413fa03113df306e

diff --git a/app-vim/splice/splice-1.1.0.ebuild b/app-vim/splice/splice-1.1.0.ebuild
new file mode 100644
index 00000000..a4d376c
--- /dev/null
+++ b/app-vim/splice/splice-1.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 http://vim.sourceforge.net/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="|| ( app-editors/vim[python] app-editors/gvim[python] )"
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: app-vim/splice/

[David Seifert]

commit:     8ef7fd0068f0db1f718baf00952df0b1fab0ffb3
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 21 07:20:45 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Apr 21 07:20:45 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ef7fd00

app-vim/splice: [QA] Add missing python metadata variables

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-vim/splice/splice-1.0.1.ebuild | 10 ++++++++--
 app-vim/splice/splice-1.1.0.ebuild | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app-vim/splice/splice-1.0.1.ebuild b/app-vim/splice/splice-1.0.1.ebuild
index f14b0fae48c..60628b4e947 100644
--- a/app-vim/splice/splice-1.0.1.ebuild
+++ b/app-vim/splice/splice-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,11 +8,17 @@ inherit vim-plugin python-single-r1
 
 DESCRIPTION="vim plugin: resolve conflicts during three-way merges"
 HOMEPAGE="https://sjl.bitbucket.org/splice.vim/ http://vim.sourceforge.net/scripts/script.php?script_id=4026"
+
 LICENSE="MIT"
 KEYWORDS="amd64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="|| ( app-editors/vim[python] app-editors/gvim[python] )"
+RDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		app-editors/vim[python]
+		app-editors/gvim[python]
+	)"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
 

diff --git a/app-vim/splice/splice-1.1.0.ebuild b/app-vim/splice/splice-1.1.0.ebuild
index 823dfad780b..236c096c3a2 100644
--- a/app-vim/splice/splice-1.1.0.ebuild
+++ b/app-vim/splice/splice-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,11 +9,17 @@ inherit vim-plugin python-single-r1 vcs-snapshot
 DESCRIPTION="vim plugin: resolve conflicts during three-way merges"
 HOMEPAGE="https://bitbucket.org/sjl/splice.vim http://vim.sourceforge.net/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="|| ( app-editors/vim[python] app-editors/gvim[python] )"
+RDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		app-editors/vim[python]
+		app-editors/gvim[python]
+	)"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
 

[gentoo-commits] repo/gentoo:master commit in: app-vim/splice/

[Michał Górny]

commit:     d8fdad30f62d47f1076950bc6caa6886e586bf5e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 21 16:33:15 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May 27 15:19:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8fdad30

app-vim/splice: Add missing PYTHON_USEDEP on vim

 app-vim/splice/splice-1.1.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-vim/splice/splice-1.1.0.ebuild b/app-vim/splice/splice-1.1.0.ebuild
index 236c096c3a2..f74cf9af1d3 100644
--- a/app-vim/splice/splice-1.1.0.ebuild
+++ b/app-vim/splice/splice-1.1.0.ebuild
@@ -17,8 +17,8 @@ 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"

[gentoo-commits] repo/gentoo:master commit in: app-vim/splice/

[Aaron Bauman]

commit:     032c08b8f679be9cb19dcc3647636a3559e6126d
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Jun  1 15:55:51 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue Jun 18 00:35:02 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=032c08b8

app-vim/splice: update HOMEPAGE, use HTTPS

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12150
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 app-vim/splice/splice-1.0.1.ebuild | 4 ++--
 app-vim/splice/splice-1.1.0.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-vim/splice/splice-1.0.1.ebuild b/app-vim/splice/splice-1.0.1.ebuild
index 60628b4e947..4edbc76ad7f 100644
--- a/app-vim/splice/splice-1.0.1.ebuild
+++ b/app-vim/splice/splice-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit vim-plugin python-single-r1
 
 DESCRIPTION="vim plugin: resolve conflicts during three-way merges"
-HOMEPAGE="https://sjl.bitbucket.org/splice.vim/ http://vim.sourceforge.net/scripts/script.php?script_id=4026"
+HOMEPAGE="https://bitbucket.org/sjl/splice.vim/ https://www.vim.org/scripts/script.php?script_id=4026"
 
 LICENSE="MIT"
 KEYWORDS="amd64 x86"

diff --git a/app-vim/splice/splice-1.1.0.ebuild b/app-vim/splice/splice-1.1.0.ebuild
index f74cf9af1d3..cdcb146ca4a 100644
--- a/app-vim/splice/splice-1.1.0.ebuild
+++ b/app-vim/splice/splice-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ 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 http://vim.sourceforge.net/scripts/script.php?script_id=4026"
+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"

[gentoo-commits] repo/gentoo:master commit in: app-vim/splice/

[Patrice Clement]

commit:     e0fb3fdc7f501a2a723149094d47a0f6d421f0ed
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 08:28:05 2019 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Dec 13 08:28:05 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0fb3fdc

app-vim/splice: clean up old.

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 app-vim/splice/Manifest            |  1 -
 app-vim/splice/splice-1.0.1.ebuild | 32 --------------------------------
 2 files changed, 33 deletions(-)

diff --git a/app-vim/splice/Manifest b/app-vim/splice/Manifest
index 37f9589ee1c..db03af64ddf 100644
--- a/app-vim/splice/Manifest
+++ b/app-vim/splice/Manifest
@@ -1,2 +1 @@
-DIST splice-1.0.1.tar.bz2 12369 BLAKE2B ce43b38a74dd8c51c4fb2d23951119c259595dcc3f5bbeb5524d747a373ba7e71dc2bf4df957b48dca5aba5f2c04bb18bbe83d9551f63d2b055cdeddbc523713 SHA512 65826a9054163f59d8dc0a558e3b748f27015bb6075e8d158214e6824c922599552a69c7d09364599285d6effdfc42fa6dd98e858a8bfa47ebc21a4d18394ede
 DIST splice-1.1.0.tar.gz 15513 BLAKE2B 8517d8c2fef2ccb85267a69c606e861a7c5498af2c23454ce58fb4e6035b13d71fab08c7fe09198b99453a1475062a7916814ef2018adbb849b48fac32e16d51 SHA512 3008c5628ca7b05be451521f9e1f0f2d8dcc8c968e95f2791e76a355b2c9f3b85c62faa319a2f1427f223094b3e606577d19a61b2384b78cbd6d40f497e4ad37

diff --git a/app-vim/splice/splice-1.0.1.ebuild b/app-vim/splice/splice-1.0.1.ebuild
deleted file mode 100644
index 4edbc76ad7f..00000000000
--- a/app-vim/splice/splice-1.0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit vim-plugin python-single-r1
-
-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"
-
-LICENSE="MIT"
-KEYWORDS="amd64 x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	|| (
-		app-editors/vim[python]
-		app-editors/gvim[python]
-	)"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-src_prepare() {
-	rm LICENSE.markdown || die
-}
-
-src_install() {
-	vim-plugin_src_install
-	python_optimize "${ED}"/usr/share/vim/vimfiles/autoload/splicelib
-}

[gentoo-commits] repo/gentoo:master commit in: app-vim/splice/

[Patrice Clement]

commit:     ff1103ae9dcf65162dd8a2a8549b90601aa6c05e
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 08:31:04 2019 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Dec 13 08:31:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff1103ae

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 <AT> gentoo.org>

 app-vim/splice/splice-1.1.0-r1.ebuild | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/app-vim/splice/splice-1.1.0-r1.ebuild b/app-vim/splice/splice-1.1.0-r1.ebuild
new file mode 100644
index 00000000000..3753a52afbe
--- /dev/null
+++ b/app-vim/splice/splice-1.1.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_6 )
+
+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_USEDEP}]
+		app-editors/gvim[python,${PYTHON_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
+}

[gentoo-commits] repo/gentoo:master commit in: app-vim/splice/

[Tim Harder]

commit:     5b561360f2ba43f23a5622d9697fec5053dc9ae6
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 13 02:55:20 2020 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Mon Jan 13 02:55:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b561360

app-vim/splice: update PYTHON_COMPAT and HOMEPAGE

Also, bump to EAPI 7.

Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 app-vim/splice/splice-1.1.0-r1.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-vim/splice/splice-1.1.0-r1.ebuild b/app-vim/splice/splice-1.1.0-r1.ebuild
index 3753a52afbe..e23492a64dc 100644
--- a/app-vim/splice/splice-1.1.0-r1.ebuild
+++ b/app-vim/splice/splice-1.1.0-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 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"
+HOMEPAGE="https://docs.stevelosh.com/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"

[gentoo-commits] repo/gentoo:master commit in: app-vim/splice/

[Michał Górny]

commit:     8cc219671821cf212a969216cbc3c3067054e581
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  7 12:15:40 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 16:17:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cc21967

app-vim/splice: Switch to PYTHON_SINGLE_USEDEP

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-vim/splice/{splice-1.1.0.ebuild => splice-1.1.0-r2.ebuild}    | 6 +++---
 app-vim/splice/{splice-1.1.0-r1.ebuild => splice-1.1.0-r3.ebuild} | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app-vim/splice/splice-1.1.0.ebuild b/app-vim/splice/splice-1.1.0-r2.ebuild
similarity index 84%
rename from app-vim/splice/splice-1.1.0.ebuild
rename to app-vim/splice/splice-1.1.0-r2.ebuild
index cdcb146ca4a..84be23b68c9 100644
--- a/app-vim/splice/splice-1.1.0.ebuild
+++ b/app-vim/splice/splice-1.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,8 +17,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
 	${PYTHON_DEPS}
 	|| (
-		app-editors/vim[python,${PYTHON_USEDEP}]
-		app-editors/gvim[python,${PYTHON_USEDEP}]
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
 	)"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"

diff --git a/app-vim/splice/splice-1.1.0-r1.ebuild b/app-vim/splice/splice-1.1.0-r3.ebuild
similarity index 88%
rename from app-vim/splice/splice-1.1.0-r1.ebuild
rename to app-vim/splice/splice-1.1.0-r3.ebuild
index e23492a64dc..3593b4bec5f 100644
--- a/app-vim/splice/splice-1.1.0-r1.ebuild
+++ b/app-vim/splice/splice-1.1.0-r3.ebuild
@@ -17,8 +17,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
 	${PYTHON_DEPS}
 	|| (
-		app-editors/vim[python,${PYTHON_USEDEP}]
-		app-editors/gvim[python,${PYTHON_USEDEP}]
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
 	)"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"

[gentoo-commits] repo/gentoo:master commit in: app-vim/splice/

[Mikle Kolyada]

commit:     7c84463c18f4118b175584c993a59e1e9a372ae9
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  4 12:15:42 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Apr  4 12:15:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c84463c

app-vim/splice: mark stable

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 app-vim/splice/splice-1.1.0-r2.ebuild | 35 -----------------------------------
 app-vim/splice/splice-1.1.0-r3.ebuild |  2 +-
 2 files changed, 1 insertion(+), 36 deletions(-)

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 84be23b68c9..00000000000
--- 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 3593b4bec5f..aea29ebb3e0 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="

[gentoo-commits] repo/gentoo:master commit in: app-vim/splice/

[Patrice Clement]

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
+}

[gentoo-commits] repo/gentoo:master commit in: app-vim/splice/

[Michał Górny]

commit:     da1546f08fa7444970b145a05ca23a865eacad16
Author:     Zamarin Arthur <arthurzam <AT> gmail <DOT> com>
AuthorDate: Mon May 24 08:52:40 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May 24 18:52:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da1546f0

app-vim/splice: bump to python 3.9, 3.10

Signed-off-by: Zamarin Arthur <arthurzam <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20964
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-vim/splice/splice-1.1.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-vim/splice/splice-1.1.0-r4.ebuild b/app-vim/splice/splice-1.1.0-r4.ebuild
index eff1b3d2837..7b5c124b6b0 100644
--- a/app-vim/splice/splice-1.1.0-r4.ebuild
+++ b/app-vim/splice/splice-1.1.0-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit vim-plugin python-single-r1
 

[gentoo-commits] repo/gentoo:master commit in: app-vim/splice/

[Agostino Sarubbo]

commit:     9e880569d7148467af72e2d864733a5bf611fd2b
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  1 06:30:17 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Jun  1 06:30:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e880569

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 <AT> gentoo.org>

 app-vim/splice/splice-1.1.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-vim/splice/splice-1.1.0-r4.ebuild b/app-vim/splice/splice-1.1.0-r4.ebuild
index 7b5c124b6b0..294812c4ecb 100644
--- a/app-vim/splice/splice-1.1.0-r4.ebuild
+++ b/app-vim/splice/splice-1.1.0-r4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://docs.stevelosh.com/splice.vim/ https://github.com/sjl/splice.v
 SRC_URI="https://github.com/sjl/splice.vim/archive/v${PV}.tar.gz -> ${P}-github.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-vim/splice/

[Agostino Sarubbo]

commit:     ea1287462e5084e663ffb74de404e1f944ef029e
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  1 06:57:39 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Jun  1 06:59:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea128746

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 <AT> gentoo.org>

 app-vim/splice/splice-1.1.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-vim/splice/splice-1.1.0-r4.ebuild b/app-vim/splice/splice-1.1.0-r4.ebuild
index 294812c4ecb..12c64c54cb3 100644
--- a/app-vim/splice/splice-1.1.0-r4.ebuild
+++ b/app-vim/splice/splice-1.1.0-r4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://docs.stevelosh.com/splice.vim/ https://github.com/sjl/splice.v
 SRC_URI="https://github.com/sjl/splice.vim/archive/v${PV}.tar.gz -> ${P}-github.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-vim/splice/

[Matt Turner]

commit:     411ceee2ebea746fdc9d374183fb0b179174a02f
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 10 17:44:37 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 10 18:07:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=411ceee2

app-vim/splice: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-vim/splice/Manifest               |  1 -
 app-vim/splice/splice-1.1.0-r3.ebuild | 36 -----------------------------------
 2 files changed, 37 deletions(-)

diff --git a/app-vim/splice/Manifest b/app-vim/splice/Manifest
index 14d785488a78..28aebdd62d1e 100644
--- a/app-vim/splice/Manifest
+++ b/app-vim/splice/Manifest
@@ -1,2 +1 @@
 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/splice-1.1.0-r3.ebuild b/app-vim/splice/splice-1.1.0-r3.ebuild
deleted file mode 100644
index f1d5e4025c5a..000000000000
--- a/app-vim/splice/splice-1.1.0-r3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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 vcs-snapshot
-
-DESCRIPTION="vim plugin: resolve conflicts during three-way merges"
-HOMEPAGE="https://docs.stevelosh.com/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 -r site || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	vim-plugin_src_install
-	python_optimize "${ED}"/usr/share/vim/vimfiles/autoload/splicelib
-}