gentoo resync : 25.11.2020

24 files changed, 104 insertions, 73 deletions

diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 0ba36667b8d7..68e8b4e54735 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/conque/Manifest b/app-vim/conque/Manifest
deleted file mode 100644
index 9ec55caa998a..000000000000
--- a/app-vim/conque/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST conque_2.3.tar.gz 52195 BLAKE2B 31546d8e0797525cd05a4663f3598a11cbb5dd7dcc6fabf181d277e2cab88593e1458f5e646688e9e46a8d01952eb1383f358454200d59634c40920b93b7db9e SHA512 b69c0564ccaf897ee2f18d0769877986e67006cf33dbefe2bbc85261726372f09669d19aa118de58ccfb847cc8b7e670e25c030128eec665e1cecf0a96cb4b89
-EBUILD conque-2.3-r1.ebuild 681 BLAKE2B 061eaa78420d76e40c66bdb3c6b965059848dc73d0f47fc5a2ef44034d5d5b16b6d4b088aa73b2ba09ea487310863ad519050da32ff9e25f7ba07c74ae89cd35 SHA512 f096075a3886716e361377dd70b25298e02d7efc14e749e66730ec4c2e496eae0ec38db34bbc0f722574e085ea9e94e21e95b91011136c3ceb007951b0f282ee
-MISC metadata.xml 325 BLAKE2B d9e43a221c8ce8ec5a6cdfbed4c1d76cbebc9922587a1414a9bd09a14dbe1462ce2bad738ca2fa74e21686e20dc1c05a6dac2faf91abe29beb4ccc046e2014c1 SHA512 6bbcbd15af2e070d8b377cb9ce8d267b4321c895375a874d77cc85f6d9ec5aee8787415f3799b93801aa748d10a15e64968dab7ace10d9f19d48c252d2b2e4a3
diff --git a/app-vim/conque/conque-2.3-r1.ebuild b/app-vim/conque/conque-2.3-r1.ebuild
deleted file mode 100644
index c4d72f0ec19a..000000000000
--- a/app-vim/conque/conque-2.3-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python3_6 )
-VIM_PLUGIN_VIM_VERSION="7.1"
-
-inherit python-single-r1 vim-plugin
-
-MY_P="${PN}_${PV}"
-DESCRIPTION="vim plugin: Run interactive commands inside a Vim buffer"
-HOMEPAGE="https://code.google.com/p/conque/"
-SRC_URI="https://${PN}.googlecode.com/files/${MY_P}.tar.gz"
-LICENSE="MIT"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	|| (
-		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
-		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
-	)
-	${PYTHON_DEPS}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-VIM_PLUGIN_HELPFILES="ConqueTerm"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/app-vim/conque/metadata.xml b/app-vim/conque/metadata.xml
deleted file mode 100644
index 6fa1407c232d..000000000000
--- a/app-vim/conque/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>vim@gentoo.org</email>
-		<name>Gentoo Vim Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">conque</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-vim/csound-syntax/Manifest b/app-vim/csound-syntax/Manifest
index e05010585f80..1ea2b7033999 100644
--- a/app-vim/csound-syntax/Manifest
+++ b/app-vim/csound-syntax/Manifest
@@ -1,4 +1,6 @@
-AUX csound-syntax-20160804-doc.patch 388 BLAKE2B ec94940f41e3e9b891f4d70488bfc17b00e8f95a8efa989bb040261ccee8fca60b21e1a6f80c5b9189473ea73a46b3fb1f30d6f384607a97db89cf2d7c51aeb5 SHA512 a05e5bdb3165bdb3c86fd963e9767eaaca7c7047dffd73d239fa58248ad24f78667ebea6106777123ea1e366ba4c72387b5765ead760acbfc881d581691920bc
+AUX csound-syntax-doc.patch 388 BLAKE2B ec94940f41e3e9b891f4d70488bfc17b00e8f95a8efa989bb040261ccee8fca60b21e1a6f80c5b9189473ea73a46b3fb1f30d6f384607a97db89cf2d7c51aeb5 SHA512 a05e5bdb3165bdb3c86fd963e9767eaaca7c7047dffd73d239fa58248ad24f78667ebea6106777123ea1e366ba4c72387b5765ead760acbfc881d581691920bc
+DIST csound-syntax-0.8.1.tar.gz 404555 BLAKE2B a26d158a3a050b3767cade77a0ccb8f12491a4b9e6957c6c8ccf1de5402367f58ddf9c367f314c0410346de08ddde49964cc4c5e38f6bc7605a4965f28afcedd SHA512 a87458efabcef4e3681b8f6b6325ad1fbe5b68befbf602fe858db2baf455c66c3a5b953a6aeeb28155867f7c53ae29618801c6b66a30118346069a1598b5ada1
 DIST csound-syntax-20160804.tar.bz2 326658 BLAKE2B 04ba7e1eb3afee6b32de4603e91f78fdc7fd3b70b137bd05ecac5ace2b34222a1cc8c095cd7776abe46b7bb18bd67d1711bca75f20e2f656162d414f2c6e2b2f SHA512 83ba89768be3d9e5dd701cc8323fbbff75ce399210891fc1e5676e278c39cfdb4b5e4a354c93c1f439a667d0ea65f459aea0b6f79740a061381e22d2557c0eb8
-EBUILD csound-syntax-20160804.ebuild 422 BLAKE2B d7e5f6383d08e2d7866dc9327d4fd972e94c3cc3599a15abc469ff848ead5dbb1d7bb31569c93337385e328b1c09639c0a3c663a47e840484cc23506aa1c90dd SHA512 a1b2c9f4fff3e4399feaa556fd0c0dd973f4211c92b409f4de0cbfa6bf14b99180b4d7a114dcd1dddfcbadbc0ba809c1bcd5fbe7be907112caf6a4d723bef077
+EBUILD csound-syntax-0.8.1.ebuild 556 BLAKE2B 234fa59dfe739d5f7279e8611f529126bd7cc5df1ebd325ea14ed7e7dff5f52b4e75e1e557c308e0dfe388742d0890528128ded4e72aaeeb4641806fb45d960c SHA512 308a47c79d16af3d41f8d8b72f5ec429cf425da19ccfc7e104e3842e6c3c8fd694ec9ee8adb4309af08d542f74b4a923bbca6bebf3150c418a7a367e7b68c00c
+EBUILD csound-syntax-20160804.ebuild 423 BLAKE2B a46f9dace11fd719e902b1ac03c605443b828a4e4ab26566c6eff7de7d90d9a781706473d52c3854ac0697ac7917ac9e6566c014332e13a45c3d5da115f56fe8 SHA512 06903ae4a771239f63738d7445e4894be9ca2464a7ece68dcda2a605d46ac182f0a85a26072e667dd5d689100cbd7564973ee9adec582241fe6e3e900aed9bd5
 MISC metadata.xml 329 BLAKE2B e0693430b5111554bfcbd4929204c4e88534933d4f5d8d445345845487adfcebc4181e5b55b6c04211c696a794b53c4dcac068e150949b419cd022c4de612a44 SHA512 5caad244c40e0c4a7db09f340c0119758dc579db6bfc5a82e1e0023e7cc63964dc85b4f35546155f15c1f858991d8ed428910bb5b7c41d5538b34bbeffa8354a
diff --git a/app-vim/csound-syntax/csound-syntax-0.8.1.ebuild b/app-vim/csound-syntax/csound-syntax-0.8.1.ebuild
new file mode 100644
index 000000000000..a2e3cf0246cc
--- /dev/null
+++ b/app-vim/csound-syntax/csound-syntax-0.8.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vim-plugin
+MY_P="csound-vim-${PV}"
+
+DESCRIPTION="vim plugin: set of tools for editing Csound files with vim"
+HOMEPAGE="https://github.com/luisjure/csound"
+SRC_URI="https://github.com/luisjure/csound-vim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+PATCHES=( "${FILESDIR}/${PN}-doc.patch" )
+
+src_prepare() {
+	rm -v LICENSE README.md || die
+	default
+}
diff --git a/app-vim/csound-syntax/csound-syntax-20160804.ebuild b/app-vim/csound-syntax/csound-syntax-20160804.ebuild
index 1562317fb7f5..f562b9ebe09c 100644
--- a/app-vim/csound-syntax/csound-syntax-20160804.ebuild
+++ b/app-vim/csound-syntax/csound-syntax-20160804.ebuild
@@ -12,7 +12,7 @@ KEYWORDS="amd64 x86"
 
 VIM_PLUGIN_HELPFILES="${PN}"
 
-PATCHES=( "${FILESDIR}/${P}-doc.patch" )
+PATCHES=( "${FILESDIR}/${PN}-doc.patch" )
 
 src_prepare() {
 	rm -v LICENSE README.md || die
diff --git a/app-vim/csound-syntax/files/csound-syntax-20160804-doc.patch b/app-vim/csound-syntax/files/csound-syntax-doc.patch
index c2cc7eccbad1..c2cc7eccbad1 100644
--- a/app-vim/csound-syntax/files/csound-syntax-20160804-doc.patch
+++ b/app-vim/csound-syntax/files/csound-syntax-doc.patch
diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest
index 27ee6e2e76f6..5e4623d3c516 100644
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@@ -1,4 +1,6 @@
 DIST gentoo-syntax-20200120.tar.bz2 18593 BLAKE2B c29dd3b3896bdb78e5c07b40474434c5ba6fa8b3a89f8ec237136d0474e8eaace8a72c7e3974ff63eaa24d3e57a1e61785bfc7889a93f7263ef9387caa651936 SHA512 ab57707b4a44f33c085a39eb745ca206312d84ca49680e24a462eb75d65cc37694a545f4a31b4ee2919d0f6b30276ce25f6caa7e20782511c7534bf2319e8a4f
+DIST gentoo-syntax-20201007.tar.bz2 18645 BLAKE2B 5ec28f03dde8d0be7dc24b337fabc02b0fbd53f4a97e4f22b9d042c0d3631f1be3a1e6e7d270b39e43688eb414f04525014acc3ac6e450dc9737341471fc15a7 SHA512 7b5554fdc68616177c906f6185c7c0843a75aac14ed28516d86ab7a37f67c5934e84c15b88c23e39c34665c1a3bb43deeff53e09ec665a4b4822309f77110ca9
 EBUILD gentoo-syntax-20200120.ebuild 1268 BLAKE2B 17f1fcdb03331841097b2a5b7fddff0a8eabff9f95e7fb1e0605887e6a4257757b1cb657085f8cd396ee7a1694177a9cd32899f1944f4786f423d840c42d0e9f SHA512 a3366af4ff69b7e46312c9326ff238c47ae7bc83433d6189bfe17f8e91685604d43154caf343db21b9541c1f49291feb6497fad4ba28f42d91eb5180dcb6fa98
+EBUILD gentoo-syntax-20201007.ebuild 1276 BLAKE2B 7fedf5d7d85ce73923da1974b4e6ea6b7b09f060146e44357acb38f3b1ec0500c081546759b19a5f9f5ca74acf29b2487e37175c2cc7c603a81ee4cb11c153e3 SHA512 990d9dbe0b21ab506676ee36a65f49590a5a804f4e48a17056f904a3c6f343828ead9f5b314b35f374e01fd039d24564f5258335f97bccdd12fdb67d8479d0e9
 EBUILD gentoo-syntax-99999999.ebuild 1087 BLAKE2B 9b7c64f1ec0215aa53e39c0c4db8352c47b19ee89a894dc95ef4a867415337ff901befaadf2ce468804e4167410c1d034002ca476c90925096875b3dc27b8868 SHA512 5f0e991bcc491e807ea86d89c47dcc8d6879c35d0f42d191a4e2cd4d40f117022e70cfb92503184e638273daed9780363066d07667c138592be1e1b6f4435b99
 MISC metadata.xml 585 BLAKE2B 7f904a47ab12627ae911fa96328c50af2cb16b785fa0b60cace8a586b17de344625b749b52ef6b89b4751aba74bc25339b3e6c9105ee47d15b5c6539b5d902ee SHA512 dfed3c4c2b3697b00896591dc4b23eb6433ce77b4aaaab05119ca0b11e355e321b2cf5f0ab5e0b2dd075abd1a266908e07b80846a11d50f17155d7ab35e6c742
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20201007.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20201007.ebuild
new file mode 100644
index 000000000000..4651f7723a99
--- /dev/null
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20201007.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting"
+HOMEPAGE="https://github.com/gentoo/gentoo-syntax"
+SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2"
+
+LICENSE="vim"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="ignore-glep31"
+
+VIM_PLUGIN_HELPFILES="gentoo-syntax"
+VIM_PLUGIN_MESSAGES="filetype"
+
+src_prepare() {
+	default
+	if use ignore-glep31 ; then
+		for f in ftplugin/*.vim ; do
+			ebegin "Removing UTF-8 rules from ${f} ..."
+			sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \
+				|| die "waah! bad sed voodoo. need more goats."
+			eend $?
+		done
+	fi
+}
+
+pkg_postinst() {
+	vim-plugin_pkg_postinst
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		if use ignore-glep31 1>/dev/null ; then
+			ewarn "You have chosen to disable the rules which ensure GLEP 31"
+			ewarn "compliance. When editing ebuilds, please make sure you get"
+			ewarn "the character set correct."
+		fi
+	fi
+}
diff --git a/app-vim/gundo/Manifest b/app-vim/gundo/Manifest
index 62fba7c462d5..4e1ab7ed5bd2 100644
--- a/app-vim/gundo/Manifest
+++ b/app-vim/gundo/Manifest
@@ -1,4 +1,4 @@
 AUX gundo-2.6.2-python3.patch 395 BLAKE2B b39d17b6046f59d9a89fc89f4f6b941fb78777a98525993a046241f780087cf3450833cd966a42354a3d1f26a0171c5ed0d57aa11606ab42c9f04d44aaeafbfc SHA512 0fc80a6ade3a2b53843444a4ec9404d4d1ae54d5add0c5807a49c7a6818282f73c5635df69167a7f5b02da8b198bf83466f7b4da17f5d16f225a72081bd61df5
 DIST gundo-2.6.2.tar.bz2 144107 BLAKE2B 7915a60a77e07e49cc1a214c6e250028e61ff33e6f085960836a3e49c1562f4ff713ff4c57125f677d352ae3477bb514fd94d636ee5ba9afac5d23c4ecd70029 SHA512 e03450a1bfb0a7f5013c1493f1b25b963c2bbb37fc8fa24c1b85237bd12847c3edd7b9465caae7bdadf8923dbdcdb24930b160d7824f835417bf30725fa910b4
-EBUILD gundo-2.6.2-r3.ebuild 775 BLAKE2B 07ea7f8dd81316d06fc8db6b461a16283e0e72b7bf8a528e834c357abf404840edce0e811057d402b43510842dab41aa7c5b4aa16c82dfa0a328faa016c050f5 SHA512 54e5fd57a332d4de2bddd877af73310050db0defd5b6aefd7284b140bbcc1223b6d56f604b04755fbef4042e02ff52611b175c37557ef5ef23433c637af22569
+EBUILD gundo-2.6.2-r3.ebuild 773 BLAKE2B 82e4bd5c6890ba4b933594b3ec9cf3f59739e697e3c68992b292968f04a6841fb94bef37721234d2b16d5e6601af5644a4a39843b1d037201811279d1550a1d0 SHA512 1e8c23b2cec8137a47019dc319a2f39ba0841541b7a65911513930a2c05e123c17500de1d56a9f94db824fdeb744b1e8adc4932f9be261381559d2d08d0bcf8c
 MISC metadata.xml 337 BLAKE2B 08b3c90ab9c289b83c58c3c67fa09f3306082e9d660b8ac81e75f14a44d434fec2657ca4f21ef6660ae46923abe92053a22b404ee9fd443b34775191a999a7e8 SHA512 14459476fa97a611646909941de602646af184e1de555dfff407e71b8fa935c23b5f863b58432be84c31378badabecf8893eafd454d06f8c57759a3bb8035854
diff --git a/app-vim/gundo/gundo-2.6.2-r3.ebuild b/app-vim/gundo/gundo-2.6.2-r3.ebuild
index 6d5959d40788..99e5e27abc4c 100644
--- a/app-vim/gundo/gundo-2.6.2-r3.ebuild
+++ b/app-vim/gundo/gundo-2.6.2-r3.ebuild
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit vim-plugin python-single-r1 vcs-snapshot
 
 DESCRIPTION="vim plugin: visualize your vim undo tree"
-HOMEPAGE="https://sjl.bitbucket.io/gundo.vim/"
-SRC_URI="https://bitbucket.org/sjl/gundo.vim/get/v${PV}.tar.bz2 -> ${P}.tar.bz2"
+HOMEPAGE="https://github.com/sjl/gundo.vim"
+SRC_URI="https://github.com/sjl/gundo.vim/archive/v${PV}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 KEYWORDS="amd64 x86 ~x64-macos"
diff --git a/app-vim/omnicppcomplete/Manifest b/app-vim/omnicppcomplete/Manifest
index 81bd9064a1a7..f5c60cea50d0 100644
--- a/app-vim/omnicppcomplete/Manifest
+++ b/app-vim/omnicppcomplete/Manifest
@@ -1,3 +1,3 @@
 DIST omnicppcomplete-0.41.zip 38331 BLAKE2B bc85f1a90edbb837363a09d28db6c36842a90952f8965ee9005dff0aeea1e63bf68ff8ce37f09da36f245f3ef3aca36b9cbc5439d0c1c2c6c759fb0d4b276cfd SHA512 565703f0e21f818308dbfbfaaec981eb522621568dee5b021bb8fe243da464b1d7defa45dc1cc2ac3370b3b3c67fb39dcb0dd7a1535a4dfe2ad81218f4ac71f3
-EBUILD omnicppcomplete-0.41.ebuild 539 BLAKE2B a5ebc502e49b84c764801b76b4556b4a1f3684544f0514c1acc65f1d21d41c3fc2d744f48bd3e771b8ec0111a46392bd0d0e8f7d4bce10903cbd1ab0db3320c4 SHA512 2a785f79fab852d80b6dfdb8174ed1bafca626af2f27da6b760b11f2ff1ba7f877cf78e39baba3e8bf4669dc5d3988d6a98c5f194f10f3ad87f128ddb07d8553
+EBUILD omnicppcomplete-0.41.ebuild 537 BLAKE2B c33544b7270be70f0ce7d671d92ac5db567cd5c123851b6723cf9a381526c4f18b357158a1cf6552a7e88d0e694d5483200c453140835d35feb8c0fc615a4c1e SHA512 23931326c6b7c1dc8e34d94b12133e6cc28a3847c3d18be4afdc6771840b453d77c1f7802169a8953a910e095bd8b38bf60376d4932859adf4a94724d44c55a6
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/omnicppcomplete/omnicppcomplete-0.41.ebuild b/app-vim/omnicppcomplete/omnicppcomplete-0.41.ebuild
index 542416719fbc..a5bfffb40832 100644
--- a/app-vim/omnicppcomplete/omnicppcomplete-0.41.ebuild
+++ b/app-vim/omnicppcomplete/omnicppcomplete-0.41.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1520"
 SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=7722 -> ${P}.zip"
 
 LICENSE="vim.org"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/app-vim/screen/Manifest b/app-vim/screen/Manifest
index 69c5c3b28585..9cd7e32578c3 100644
--- a/app-vim/screen/Manifest
+++ b/app-vim/screen/Manifest
@@ -1,3 +1,3 @@
 DIST screen-1.5.tar.gz 16395 BLAKE2B 5fa885a0c1f149b8f4228e4d724af4589368601466f87838bb597bbfebddde8c92b5199c1ee8f220ca6c9298709f4bd2467211d97ec70c2c42e579dc2a793001 SHA512 eef9fbe327b1ef16cb5d5ffb851b04c6d4c8f1b8ef215ae9a0f05c91eaa39538bb470fc1ecd2cbb7697ec23a4fdce2515b97818b47050cbfc4fe7da199648549
-EBUILD screen-1.5.ebuild 563 BLAKE2B fc002ca5bbe95c8670392f36cb8daa93ee73f0c1b337c660414c965dcfd36f4219acd3e20929d30499c4bf9aa8803e453ccf140290587d7d2a077b88251d9be6 SHA512 fb2a3ecde80947de48c15a3275de808aefa55054b71c0d972e10e488355f49fcbc3b6e547be83f205fadf8b988ff7b2c1dac9b55431dbb548cbb68c66bcfbf39
+EBUILD screen-1.5.ebuild 567 BLAKE2B b57b3cc56371953eff029f962292b48ad6181e5fdaecbc8ef72589bbf83bfd77ee67a96425250d7c8260a78a4d069a60ea3f7fe775081806b1f606af51516017 SHA512 2b68779e1ad33ca45919c162f5c387277fe625627ead03a80e88f07513a82a59fc2a05b2f72222108a887b7ae139e7a451b27efeee541d5ff5477f26b93cb3d3
 MISC metadata.xml 363 BLAKE2B 48314a7e338d84a79ad374f1ed872be01a423b38d5bc4306823e8d748bfd7993a51460cba684f78218df55b642417c0464077ac02128a8fb22278407f81faf88 SHA512 0396f42997f43d9feeddfcf10787c98722380b77986b193c4216764391fda7ff901b2616202f607ac1182a92b44dca9097b07a79f7980929350d970cb6154a7d
diff --git a/app-vim/screen/screen-1.5.ebuild b/app-vim/screen/screen-1.5.ebuild
index f2a15aa2def7..1dfb67f9091b 100644
--- a/app-vim/screen/screen-1.5.ebuild
+++ b/app-vim/screen/screen-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ DESCRIPTION="vim plugin: simulate a split shell with screen or tmux"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2711"
 SRC_URI="https://github.com/vim-scripts/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
 LICENSE="public-domain"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 VIM_PLUGIN_HELPFILES="screen.txt"
 
diff --git a/app-vim/vim-spell-en/Manifest b/app-vim/vim-spell-en/Manifest
index 9949f9b83ee9..a9381fa9472a 100644
--- a/app-vim/vim-spell-en/Manifest
+++ b/app-vim/vim-spell-en/Manifest
@@ -1,3 +1,3 @@
 DIST vim-spell-en-20060123.tar.bz2 1819791 BLAKE2B 943265e3db6f0c47ed71381e12bcc23cc0f8636b40c5a694d49064a5f27a845b37810cc5468fcfcebbf9f37537ab574467fd6cc25a3e61966b2851d3d4353a34 SHA512 145a4cbf976b5472b2474f9d84978e9907f0dabdee05fa55b0b4ce5f56dc27ef568e8c28fe67d9d8b86a33e0392b1fc6af6f44d6f147ce894070b58e40109dc0
-EBUILD vim-spell-en-20060123-r1.ebuild 343 BLAKE2B 39b82e33d8b909aa8c47283e4f2bab756903ac0f48f5b0ec2dfb552411a92baeac9f590df719af54f6417a663255f7e15d9485aca0ca469315ddc8c59bbd9af4 SHA512 7c917329462c25c39b043e06c5eb7372fccd51dc6fc8c8af04319e9e003b1482a498ee2bd155516cab94e2d230d153b271f9dc8ccd73fc403b5538f809f009f7
+EBUILD vim-spell-en-20060123-r1.ebuild 347 BLAKE2B 46366992323e0937646ae2e9f9d46a93d99e0a8f5f9887535fcd385b9e3bb33fbde370475179cdbcd7fab8a8f0158d706410232492637331a89aea8a8a444c1c SHA512 315fef697e9336d4be179d9073dce487e2f0b89d3ec73816b510606205a634f1255a4e372a98550e15524c141272c909202910cdd53f51279308860ae5e8122c
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/vim-spell-en/vim-spell-en-20060123-r1.ebuild b/app-vim/vim-spell-en/vim-spell-en-20060123-r1.ebuild
index 765ba9b7bfcd..f2aa5a410321 100644
--- a/app-vim/vim-spell-en/vim-spell-en-20060123-r1.ebuild
+++ b/app-vim/vim-spell-en/vim-spell-en-20060123-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,6 +7,6 @@ VIM_SPELL_LANGUAGE="English"
 
 inherit vim-spell
 
-KEYWORDS="~alpha amd64 ~arm ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 LICENSE="BSD LGPL-2.1 public-domain"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-vim/vimoutliner/Manifest b/app-vim/vimoutliner/Manifest
index 8d94547740a3..58930a9f3fd3 100644
--- a/app-vim/vimoutliner/Manifest
+++ b/app-vim/vimoutliner/Manifest
@@ -1,7 +1,7 @@
 AUX vimoutliner-0.3.6-fix-shebangs.patch 972 BLAKE2B 2b747133ecc49f4654131bbb963ac23ae291d186cfed97e944fd5e757cbe3288e5dafc243f4caea2acbeb56c27e92d257565a84fbcc8a4900a6287056e8e38bf SHA512 44bb6760c11a21ab817141cae5817cc4d5b88a5c94ca4e30238d9e009f080d5ae98522dcde910d5352090e7bf998ad47fa658a56bb16bb50ca905b14e5d2df2b
 DIST vimoutliner-0.3.6.tar.gz 210251 BLAKE2B d50b3d1c752fba80e26d7430801baf30a7945d84d30866556821319fb052252a37e2dd7f989c47c376b4986b616c7f99e0753ef3f6b54b9f4f02aa166e998b65 SHA512 62c860067d394dbae639aa9d51627637769c22c4c651f2f9328ca88e8afd85396e1f371bb0cfee432e7a1faabee570a1e29ec086c6532681a309b909225fb90b
 DIST vimoutliner-0.4.0_p20180301.tar.gz 367361 BLAKE2B a97df5c154e6ed9b3209bd90bd57b4166877f02b9513351fda0e841de84334a1e592e1ed56b46cc59bc6bb64f3c763cdca81df3f8696f3c348a8ef4744124c02 SHA512 f9f369e7e7f09dac04b58a27a86dc2121b3aacd0002537db348517e779fd1b7c9e88ae905b4b42aace10f79cb8f91acada1ad58e26f2257e46d1af98347eab62
-EBUILD vimoutliner-0.3.6-r1.ebuild 692 BLAKE2B eaba6b518a890480abaac5eb234a0ff96a37d93f03f0f323aeed19b754f6a77267b97619aa0e30e8f10d320af2d8e0ed3235d25ab442e1933af659485039d2c8 SHA512 7b66c1a82d6537e631f9ef4268f375e4c4b883a973be0492689580de46b39f70220588dff9b2eb31edd1f8e262f4faf11ab2e5c100a449cb5074ee4f5e5333cc
+EBUILD vimoutliner-0.3.6-r1.ebuild 686 BLAKE2B 36d2d1561af39a7e6ba3f9facadbd00af9fe34023268dc6ac8199107fe2e4e838386d9b9d1cd7bfcc8b8a956178a51326aeb278db7cd1d0ff8313fe669c05f78 SHA512 5c0217598f97e0733be3456c7fa495b89a436f838b088b2036c6aefa76e5be1141bb4cdc4b4c49169177c545e310ca41865852b5b66feae795c980dcc79e0bb9
 EBUILD vimoutliner-0.3.6-r3.ebuild 1330 BLAKE2B 021a5c03383c7b23d98b2076f8139ca9e311e8710c234cc6c257817707660425f382e2b9011f8513f56674901d4617da19719ba1f89b396e01c7adb366e79dd2 SHA512 8e6762e23b3c0c423784401d77309fa5bf9b68361f9c1493a1f632520a83450b21adc457c9b0e5d6116b805156ce389c053fed37686c05e7826d42c2eb25b990
 EBUILD vimoutliner-0.4.0_p20180301-r2.ebuild 1263 BLAKE2B 11d197e2641bdf5f335e641b797fddaec23b6be79819062711c6b7b44e0e56e422187af2c43793c6c3aca6092baad3f02c48a2b9ae537053d1beb96570bea51d SHA512 307a8c310122890a3a2729c2299b7354e4f85b12c25aa7b13564233b0a0b33b4d240100525fa469fd937885d7138f25d389b79bf1d80cba429661402d251d62a
 MISC metadata.xml 337 BLAKE2B c4ae899109190b6ad14fcc71ff0dbea76f7ab6b731992174b4623847291d63bb8cbdc7e73cd92343beafdba086e0b54c4cda686593ef8b836f8add578b0459d0 SHA512 782f682a6837436ee5db28f818b2168035fbae243aa466077053e17842fec96672d702b818ad28a9f1d0b8fa1a1e2fb79b056d2e31bc09d5bf522d5f18ea1c7b
diff --git a/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild b/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild
index 19119a8ef09b..b5f625af1cfa 100644
--- a/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild
+++ b/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: easy and fast outlining"
 HOMEPAGE="https://github.com/vimoutliner/vimoutliner"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ia64 ~mips ppc sparc x86"
+KEYWORDS="amd64 ~ia64 ppc sparc x86"
 
 VIM_PLUGIN_HELPFILES="vimoutliner"
 VIM_PLUGIN_MESSAGES="filetype"
diff --git a/app-vim/vimtex/Manifest b/app-vim/vimtex/Manifest
index bd598cb80f14..908e32f889da 100644
--- a/app-vim/vimtex/Manifest
+++ b/app-vim/vimtex/Manifest
@@ -1,4 +1,4 @@
-DIST vimtex-20180324.tar.gz 684092 BLAKE2B 4472c9e62c5795b621a9230fbd7ea1f018c6df440f58065e7b439f64ae67f4064b158094c8d0b8a6eba6202bc9e6729b792fced02ea9deeaf400f0240537795d SHA512 59038aff6ec761a9f73db7d638a70e9ea5ba4d3ef4bd9283f3a62beb5e412f1a3c752dd0d739dc4c9c5e33e4a00a84a91da56e8fea2b8113b7ef73d219997409
-EBUILD vimtex-20180324-r1.ebuild 736 BLAKE2B ad937be74d4694a47e28ca026ee6b270c845c8b3e395112158f8f1d14a8e4ae8d97120daefe1faf46997926144e8a35aa72c712fafeb13be489bcde849a64c95 SHA512 69d34541e86d57eb315683b0cde5bcac2a18c15ba7ab14f477603ba93978553035530e87f4ad7533bf249226cd0c55f41105b28d8494c92d791a88297767ab0c
+DIST vimtex-1.5.tar.gz 1666938 BLAKE2B 7d203f25b1f5c653bb270fb4cb5463d2851fe63d52dde9b99d8ca4e2c7936f7291c649e5a71d25c01329a2caf3aa4258f302d2585c6b7e67991e5f91dd785526 SHA512 9009a830e117c8d1d6b00f97cb1382704c77120e05810ad40d1ec191cb547e5045101d2901b88d85b42d17ba51cdd5f5a00b2f80aa2424e2529bb19c7f651f00
+EBUILD vimtex-1.5.ebuild 539 BLAKE2B b93a9305341360d25f7e78551b7af43e272330cf3ed9f40119f66e88729e635b2fc67268d11c8f3375320e65701901d0253bf0eb838d4c9c289f70628b04f1d9 SHA512 4f5af40dfed668dc503673c8ac326da8b6922a53e7d2a2365cfef8d6ecd68148ee5d0d62fbb8e0ecbcc56316bdf43aa2731a1f43218e58f626265c2b9556582a
 EBUILD vimtex-99999999.ebuild 736 BLAKE2B ad937be74d4694a47e28ca026ee6b270c845c8b3e395112158f8f1d14a8e4ae8d97120daefe1faf46997926144e8a35aa72c712fafeb13be489bcde849a64c95 SHA512 69d34541e86d57eb315683b0cde5bcac2a18c15ba7ab14f477603ba93978553035530e87f4ad7533bf249226cd0c55f41105b28d8494c92d791a88297767ab0c
 MISC metadata.xml 337 BLAKE2B 7cdee52f7b90fb4f600900bf2766b17b00992c1f947bb590a95d17a83ea6d3a9d48d7da4dfef2de1b2101118729ea95298fab28798dee7ec77977fdb659a3e27 SHA512 d2be801e0e552815e32e818ed13172288ebaa4505d6074dcabfaac760fab3227d019e4ddb8610062ceb5680e8b0cd543bd169333eefc80cefc6f5bf790801a0f
diff --git a/app-vim/vimtex/vimtex-20180324-r1.ebuild b/app-vim/vimtex/vimtex-1.5.ebuild
index fc0060ecefde..23e077e8f05f 100644
--- a/app-vim/vimtex/vimtex-20180324-r1.ebuild
+++ b/app-vim/vimtex/vimtex-1.5.ebuild
@@ -1,22 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit vim-plugin
 
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/lervag/vimtex.git"
-	inherit git-r3
-else
-	inherit vcs-snapshot
-	COMMIT_HASH="17d809706edcb277f1ee7fa5e33aff3619926fe4"
-	SRC_URI="https://github.com/lervag/vimtex/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
 DESCRIPTION="vim plugin: a modern vim plugin for editing LaTeX files"
 HOMEPAGE="https://github.com/lervag/vimtex"
+SRC_URI="https://github.com/lervag/vimtex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
 LICENSE="MIT"
 
 VIM_PLUGIN_HELPFILES="${PN}"
diff --git a/app-vim/yankring/Manifest b/app-vim/yankring/Manifest
index c8fdfab8dc43..51cb1b7b317a 100644
--- a/app-vim/yankring/Manifest
+++ b/app-vim/yankring/Manifest
@@ -1,3 +1,4 @@
 DIST yankring-19.0.tar.bz2 36512 BLAKE2B 7bd68ded17ae506f67099d1fe8d41aa2b77aad6b9ebfba37c242e185ba3ba17ed72f6096ec404bea3a88b120ddd80e4871fb7a8eb005124932b9b3eebe2a1f9c SHA512 714d619e572f739c6d02b32d1da1ede449dccd45c4a74441c4806df1c6fdf51033da84412534dc021b0d082f72925ddcd9b29b5b0b1afcca34a79d0133263b18
+EBUILD yankring-19.0-r1.ebuild 311 BLAKE2B 372ce6554fcd82637d18a40aaa603145e9c6aa6e4c81625c71f6c2cbd023197615401f7f3576c786e829b0c2557a093239f270b82357e6319aa24570635fbb2c SHA512 316beeb683e3f05ff90c20b7d7d8f85e189ca3de0ffe3414f401ebd4fdba0fdcc03d40b690b54079fbeb6a35902205afda7d718d2bf84d2e3b9726539793c833
 EBUILD yankring-19.0.ebuild 344 BLAKE2B ecf277aeae90edade3a7a56c22302aabf107ed678b660b5c743d86800891180f5733268665afa71016e5a6d5ef3e10faf86be1eca583c128a7635b7135ce6ace SHA512 77f677215da8e1e33287173ba15c6dbdcbfc8a08040a5d81920e8433e7dff0a569c0df2e602393c418afa7e846fdceb3ba87e8cdd3c16fd11307d88c6a06d816
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/yankring/yankring-19.0-r1.ebuild b/app-vim/yankring/yankring-19.0-r1.ebuild
new file mode 100644
index 000000000000..37789791440c
--- /dev/null
+++ b/app-vim/yankring/yankring-19.0-r1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: maintains a history of previous yanks and deletes"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1234"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"