gentoo resync : 27.03.2021

6 files changed, 58 insertions, 3 deletions

diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index cc53f7811331..961386c7b7cb 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/frawor/Manifest b/app-vim/frawor/Manifest
index fb8e942653e3..849f2a7ec073 100644
--- a/app-vim/frawor/Manifest
+++ b/app-vim/frawor/Manifest
@@ -1,3 +1,5 @@
+DIST frawor-0.2.3.tar.gz 125909 BLAKE2B d82ddea09bba7a8b0e70b5fedbc54b40357003fb5652cc6cd94d70e50467775deb204d3c40e369675d87acaac5c3ecaf09281d90566f1d545a55c9091116d9ab SHA512 230adb0442a8c488eb3560f4d0b2ca4f70116ca30308e2ab4621b266f90eb975b10b449e3c4bdfdacb71988ba2df5191b220ff69c40499f9fc28737973cd2017
 DIST frawor-0.2.3.tar.xz 257268 BLAKE2B 4409de0fb392841676eac2d794e0e44f64e3978dea1b72b807b7660a9feb1da3850a1ba651287f624830da4d1529daea60da2b76db37e422b6a4827e73dcf8d6 SHA512 ad8c6939875b5783b3faa0a3194e187161ba10f662a896f06ea86aebf12b172bd8d419b14a95c0d14aedfb38ebc5de73895d6d472db64dc15f567509e55188b2
+EBUILD frawor-0.2.3-r1.ebuild 448 BLAKE2B e93d1cc406f4d4f5c9c1dc632d9a7836705f082be7db6cd0d691682517100b857e6e726d130227b8b73bc542bf500938d04645bbd7603335403fdff5b11559b8 SHA512 bbb9ace3b98f7f37dae38955efbd084afe00605184e426ed27582cc687e234f2b67c81e7c8ed9b664ff47889aedbb6515d527be84c97b5b59bf9db7d26284d39
 EBUILD frawor-0.2.3.ebuild 371 BLAKE2B 52bdb7fd2757213727dc3cb650035c5464fc0c4fc7f915370c182cf1cbb6d08ad59b42d273417f280241a9496cf3988f61ff43fd0f7718f2077edd1271a3442a SHA512 d9076e61edafee2e63f6fe20a119aeb88847723c95e2204210eec19e3ad8299002e94778a9cccf992fecb25168b2c7d7b1de096f592e06044bcc92a44eb07434
 MISC metadata.xml 329 BLAKE2B 17d5e9ce9b31695f1b5086d74864de622a4f36fd842f4abda1970ff98ed438f36edaaa96a4bf990a5b5cd54f59ea2bbfaa3b7da472ab570c2621ebb3cdc6d3cb SHA512 586688ee9f3cd9697e9236e9377691f5ac8c0e4ea3910020b1616a6454342021ae971ab734fb2e2ccf33d8a08fc44fea848d72f47a6acdf3b9999d3aa280ae24
diff --git a/app-vim/frawor/frawor-0.2.3-r1.ebuild b/app-vim/frawor/frawor-0.2.3-r1.ebuild
new file mode 100644
index 000000000000..066e06f56fc9
--- /dev/null
+++ b/app-vim/frawor/frawor-0.2.3-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: modular vim framework"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3631 https://github.com/vim-scripts/frawor"
+SRC_URI="https://github.com/vim-scripts/frawor/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+# Tests rely on zsh. No.
+RESTRICT="test"
diff --git a/app-vim/splice/Manifest b/app-vim/splice/Manifest
index 713935b4d0e8..28281fc496e9 100644
--- a/app-vim/splice/Manifest
+++ b/app-vim/splice/Manifest
@@ -1,3 +1,5 @@
+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
 EBUILD splice-1.1.0-r3.ebuild 905 BLAKE2B 73a11dde78740363f83bf86d606ae0dce699069e21ca18e7b4c599442e119764e661706b18c702f1ae31419a64794e2b710ac8ad264fe7fcbb3ebf6a3a56a383 SHA512 372b917d7706dd58740f5e2ed43fd0298e6944ea351f1d5098449ed3e3851bac3c08c5d460c1fb8128dbad28784800b40aed93e24e697d0a59ab7372246afbe2
-MISC metadata.xml 379 BLAKE2B 3700d212cfecb937db027eeeb498222dabb69bc46ed13cd2b0d90e5808ec2fbb4798de70bf53ea84d5947a83b477c4d7dbae2b5c88b95b540f6a1df0531fc6ea SHA512 266205403cd5a0b7453781c070d3785b02ecfe3416bda920649598d41b7272abfe0d27697e87921429765a0271ce83b5b1724930e5f1c7659224f623417ee6c4
+EBUILD splice-1.1.0-r4.ebuild 969 BLAKE2B a1b5fcd613809d7bd86d3b670b7a0ba117bcd177e4d24b036dfdbefe03f04e74caa02ecff86782df01081262a4f25f9699e498873cc583f8a195b7be1e67be5f SHA512 7c27898d9769b678f16e3b9ecdb38080893956b5b3659127c85998cc69c5cd4b1dd0facadcb216a5a6cdeb6c4b1ac25e4ce95d3eddb94bcd415afd5857c24ce2
+MISC metadata.xml 328 BLAKE2B 963c8c741fa51ae4e4a212a449425b348d78cf1ffee2bde4a1d8d84358796e8a966ceb609acd2b24fc08bc7f7207f6962bbb31d5e0fddaf751dc00550bc4ce57 SHA512 dfb28f5cc05f74d6f5682dd99195175eb1d814eb4adc9ffdf03237f27ea6f8e84f60d3405b499767968a98974fe994e57587863dd4bf42022689b15fced417ee
diff --git a/app-vim/splice/metadata.xml b/app-vim/splice/metadata.xml
index ea657fdd8a88..707c11da64b6 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 000000000000..4625bc792f6f
--- /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
+}