gentoo resync : 28.04.2021

36 files changed, 98 insertions, 100 deletions

diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 961386c7b7cb..2ebda481fe7e 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/alternate/Manifest b/app-vim/alternate/Manifest
index 5f765e3cf1ab..7ea79ee0a7f4 100644
--- a/app-vim/alternate/Manifest
+++ b/app-vim/alternate/Manifest
@@ -1,7 +1,5 @@
 AUX alternate-2.18-hh-cc-alternation.patch 918 BLAKE2B 0362420f64fdd1607529842d965e4f6bcafa49467e7d6befd9621844f47ff2c1f58e22bd1e1efd5579b6373bd24a0c7974e468cf9edf471a58e964718a25c506 SHA512 b1f524d47785e7482791b56f891e624da2a06739483d0584d080f691eaf89c9a350e708fd1369c41b6f99a263d7395b25572366e0b90b0349230079fbdcea4b9
-DIST alternate-2.18.tar.bz2 7907 BLAKE2B 574369557d3a56b163e7288bc60636649a2c44192c56d1d30464cbc2eb89e672aece59a205d39124e062037b3bc4983f628ae0bed53b7982915c8f9546ec4117 SHA512 397d39a5c5fd186f32f3e0a1651f9b9f739899ffcfdd344e85117c4bb676d8fb8c668410754fefe8934ff1a57537387d49d115dfa17bdca896e423935840ae3f
 DIST alternate-2.18.tar.gz 8652 BLAKE2B f6e50d3e1499fb913f7cfa4ff95df180855c7857a700428be1339916aed4513bf77a8da62b75407a6c129f4da3e3bcd00f5caed53d7a939a2eac96a287a11ffe SHA512 d797b99cbe536285d87c5bb14adfcaa3e18611351c8529d9a0755606e766ecc006f19af5cd9b9535f236220dc525bbc27e1280cbb1e3c71f7444cdefd506cefa
 DIST alternate.txt 8897 BLAKE2B b2c2ad9e39c98c82592034ddb0db79803f39bdf3c8d55307aecc488855a75c7be508b41a6a6cf9d3f3d0f4e938feb65fdd756040d8e51e0244c9dc6b9fbacd86 SHA512 92b24aef5fe1fb459b4cb85ca780ae20126bc79138ac15dec652c15a89b688d40bedc00bdae8fce912c8805b24b8805e45ddbd9e6b1ec10c20e61eed11d37651
-EBUILD alternate-2.18-r1.ebuild 715 BLAKE2B c48f19be85c246029265f9eb74aa45b979d2899a34c057af1c663514e0bcd6c6693275e223755a4c729082d3a1e782291f7294058ba6c8e955377264ba52c6c5 SHA512 147f6c0e9738de4ff21948de71af3287277cb69817399d8c77202429123ed635ca8b755e151fae4b97e9cd4c9019be2fbcaa0dcfe26b17e1cd65df6e1460be1a
-EBUILD alternate-2.18-r2.ebuild 999 BLAKE2B 07e53304e03cdf38f1908efe9da443d1959d017c68297636939c49fc3afe0350bda9cc092cbadbbdf1f3f00247594fdc6935d9faaab7a7c362c12e6845c859d5 SHA512 febfbb3378e1a3b5179100d3e9b664bccabd17f96b861dd4c4bca65f525ee1d6390b805f020db5759e0af65ca2abf3c3055a4b47e89fc70c01a03935336edee7
+EBUILD alternate-2.18-r2.ebuild 995 BLAKE2B 96fdeff6a4d502b7c368643cdc3fd8388892003613908f7408b3cc8be896bba3911cd0e129b82006c678c1fb162dd6d197ebc67252d856e9f1cf59142319b720 SHA512 2f4e22cc32f3c1cb80edebcfebef3db3d133bb5f451e043d3d9c25d83f14b579883d0a408486d691d3ce0d4f6f10f54b2e96980c8a585f6226056ca6e66eb365
 MISC metadata.xml 331 BLAKE2B 1837a5a93c5114047149660345bcc4f52fddc80d7d711c6e4002b9ff1972577714c9d30a09a2d3038b72f9496e96b9a1d9e9971f68b8d7ea5718621a647fb20f SHA512 9c7969dd9021d0ff15d7e91f3b750b66bb683202d5e9262fed75f3114527e6de5a1d81f558a556f9d4974192f1cb64d12052cd444d09e0a7d105a6a93a6721b1
diff --git a/app-vim/alternate/alternate-2.18-r1.ebuild b/app-vim/alternate/alternate-2.18-r1.ebuild
deleted file mode 100644
index 9e0fb3109393..000000000000
--- a/app-vim/alternate/alternate-2.18-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin eutils
-
-DESCRIPTION="vim plugin: quickly switch between .c and .h files"
-HOMEPAGE="https://github.com/vim-scripts/a.vim
-https://www.vim.org/scripts/script.php?script_id=31"
-
-LICENSE="alternate"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE=""
-
-VIM_PLUGIN_HELPTEXT=\
-"This plugin provides a new :A command which will switch between a .c
-file and the associated .h file. There is also :AS to split windows and
-:AV to split windows vertiically."
-
-PATCHES=(
-	"${FILESDIR}"/${P}-hh-cc-alternation.patch
-)
-
-src_prepare() {
-	default
-}
diff --git a/app-vim/alternate/alternate-2.18-r2.ebuild b/app-vim/alternate/alternate-2.18-r2.ebuild
index 5dfca7cea024..50ccc8cac641 100644
--- a/app-vim/alternate/alternate-2.18-r2.ebuild
+++ b/app-vim/alternate/alternate-2.18-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 	https://www.vim.org/scripts/download_script.php?src_id=6347 -> ${PN}.txt"
 
 LICENSE="alternate"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides a new :A command which will switch between a .c
diff --git a/app-vim/breakpts/Manifest b/app-vim/breakpts/Manifest
index 8bde9fa70e2b..c03adb132761 100644
--- a/app-vim/breakpts/Manifest
+++ b/app-vim/breakpts/Manifest
@@ -1,5 +1,5 @@
 DIST breakpts-4.0.tar.bz2 17349 BLAKE2B c7ad9eed8fb13537c940e6868f5e4e5dd812a6b7f7c26c4617e3c24905b6e2a817dc91990b613b700e793dd763a6841f85dd7f9cc42fb9f5afc25c3609f909fc SHA512 a480bf32cd3e756ac25849b1d5fd20521bd8c965454bb94c33810c9d1d4464762a731d08dcae858c59853a6cf41ab3cb6cddeda440c8b041cc8ec192ab2bd2fd
 DIST breakpts-4.0.zip 20124 BLAKE2B 2ea7568af5407d57c4d4b505c69d625056d62e8f5bd25bf5ca13918e3ffbc0f83de2aedb0abc3468215a650308ed8b592a618c0b50c24dd8ad3f931ef5d2ff8b SHA512 3e7f148896a10abd30a16d903c14460668ee48d078ae3c3b6ff663dab53d32199d8cf9cd3a56164a32d0be2684e64a882e917f3f632318ce85db5eb07e29754d
 EBUILD breakpts-4.0-r1.ebuild 681 BLAKE2B 5671fde59eb738dae846a860f0af3bcb6b76215f8c658ec6ba8594d7c1155030faaf59d29d1b02b67468803a5015d28286136b21fcda4bccc8aa4d8c36aa81d1 SHA512 cec0b57a54c643e6ed84c6802c0a63c3744a270c317dc29d976bdba8b6826adbcb0fc0df3cd07b7bedd1a87be930d759db3439c90902dfb166b550383035e6c6
-EBUILD breakpts-4.0-r2.ebuild 803 BLAKE2B 1ac75b05bd5d45dbcdc8cedb9687769c1deff041acd406824b62e40758c57927e95c031533d15a353a59a436d45f2cb3ca1519fb37c1dfdfcc6e27abb3d4d2e8 SHA512 eaf5a8afbd71843625a60c672bacc09b3e1d52d6ba6a69e0878ad48d0dd9fe1000ee67619b9cc0e5981fa80fd676e9ad0f62563bda5901eb9b97d2a09fbac701
+EBUILD breakpts-4.0-r2.ebuild 801 BLAKE2B e0417c25f8ae35a1859eb049ea8b4e81a89211d1d61a397ae74a5ec66d2d2fa8876e0548071acc08a926bcfd2296e4493b43b0365bf45cea22ed90e4fa29c738 SHA512 fdc14c3be283ddaff47d15c8c6b17172f175b6ab09359b171966a9b6fbec8f1f145a10b5ba7fc0caca0cdf3a1d3867e4538518059be6ac13ae510a7f615627d5
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/breakpts/breakpts-4.0-r2.ebuild b/app-vim/breakpts/breakpts-4.0-r2.ebuild
index 1dcdff18bc43..79666b518bb0 100644
--- a/app-vim/breakpts/breakpts-4.0-r2.ebuild
+++ b/app-vim/breakpts/breakpts-4.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ RDEPEND="
 	>=app-vim/multvals-3.6.1
 	>=app-vim/genutils-1.13
 	>=app-vim/foldutil-1.6"
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin allows breakpoints to be set and cleared visually. To start,
diff --git a/app-vim/cfengine-syntax/Manifest b/app-vim/cfengine-syntax/Manifest
index cda1f372a7c4..2157c35ae56e 100644
--- a/app-vim/cfengine-syntax/Manifest
+++ b/app-vim/cfengine-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST cfengine-syntax-20141019.tar.bz2 7611 BLAKE2B e43f3c374292404ebe28dd63bc4ee7f95d51ef6e88948d9155f3c1f6c58c948a58e844325ab7b12b300d277e573a61ea9855041c5389bea4341586ed5e1ce2b6 SHA512 c8987073b9cc9b1494b0d3cb8737a5b99f62c1b99f5b1e84ce1903e37a924ec9b3e2487cb3b72c75dfba40528809289efdaf3641bf6c059a668c6bf073bcb83e
-EBUILD cfengine-syntax-20141019.ebuild 532 BLAKE2B 49ace72a6b7d9a1a596e3876cb86881eb0522b2239e7b143636244774c4b6f1bdd9ce6cfb053d7d7dd8c4fc3b5ff25ec84d7abfd24e060e98b5d716683f06d72 SHA512 ba93a2481ee4610c83144e597b5c640edf30958efc7b5071d3a2175239fb3e7f4777d0a2aa73bc22f72dec649118849f24facd39a6bcaf04201a48f5ffb96780
+EBUILD cfengine-syntax-20141019.ebuild 533 BLAKE2B c37f25b2e85d7de268d8fbd0385f9385a38f33f175a357ffa6bd1caa69f42866058bf0215667a4adc7d5126dd9e8f1d9b729148804cffb36f4c19248b86932ae SHA512 e47c2bd15798dbf5883bca8c06b3ef5bbd2da30f5a49c13fbb6756e51fe72d8eaa8a19735d9d81149e9669f1cc3cf8ce3d5b2eaf2c9d4cb55ab565caac7731f8
 MISC metadata.xml 538 BLAKE2B 3eb09b3af0b2cb8732cc07640aeef9218ce4bffa529437cd2e5fa18a32c36411e29a4a923dcfa9691c67d274e039f54dad872e45979a14cb29c53af746a45bcb SHA512 64ce2e382ba91771caf3d654164d111191f65cbe281d8525ce4ae683ee3148c47f8514e1f01dcc9ec052e0db6ab75c5b2453dbbde5f0e00bd1b4b6da5b0433cc
diff --git a/app-vim/cfengine-syntax/cfengine-syntax-20141019.ebuild b/app-vim/cfengine-syntax/cfengine-syntax-20141019.ebuild
index ece327603d8e..5bc129da5027 100644
--- a/app-vim/cfengine-syntax/cfengine-syntax-20141019.ebuild
+++ b/app-vim/cfengine-syntax/cfengine-syntax-20141019.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: Cfengine 3 configuration files syntax"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2904 https://github.com/neilhwatson/vim_cf3"
 LICENSE="GPL-3+"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides syntax highlighting for Cfengine configuration
diff --git a/app-vim/colorschemes/Manifest b/app-vim/colorschemes/Manifest
index 9de430e1b2e3..21a585924221 100644
--- a/app-vim/colorschemes/Manifest
+++ b/app-vim/colorschemes/Manifest
@@ -1,3 +1,3 @@
 DIST colorschemes-20140623.tar.bz2 683654 BLAKE2B 465c6dda4b45b847ac674d0116987723f68454a97b57471569d3d7333e64960a6ffac8a3bb4d157f2f9f87d0be9ea871871ec33de2e9e09fd67eed1ad8fa96b3 SHA512 523a1fcc5f179ede94887c844397bf507ba6432f7e8812794be3a2451f467370e0c2119000e138ca021f05eee4b3f43e34444916f3fed3eeb7749db459b502e3
-EBUILD colorschemes-20140623-r1.ebuild 833 BLAKE2B f9547edfffb1997ba70674a741411f64d234f409c33ca31f556f97d8b8e2c9c92a892a8a15f2e0d2a29d91a097a7fb39f32d2af2a387f6848ea2ce5ac3838d04 SHA512 e6a5d45bf9cea68879644c0b5a45da299bc0362d07658d6fda5666ababb33a374219e8f82f43b6fe3dea1563a5e666e936823a78933052de1d8f90d5a635b796
+EBUILD colorschemes-20140623-r1.ebuild 843 BLAKE2B f3b99fa8be1d51202aad3e6b5fa2d03ac7f4170ea6448fcc12ff3649b0f529ef8916682586e685194e4c26a3183e50b8e67e547c932634b76906fcebeabc1217 SHA512 c3864d9a9a91cef5a8ab0a41ca60a9ad907ae97a8e8eb7869f3f29ca3722362127c9718b7781ebb5c6638179cff48498625b470256f2f579e318bbe460e681c7
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/colorschemes/colorschemes-20140623-r1.ebuild b/app-vim/colorschemes/colorschemes-20140623-r1.ebuild
index c7dcc62f768e..6293de9868d2 100644
--- a/app-vim/colorschemes/colorschemes-20140623-r1.ebuild
+++ b/app-vim/colorschemes/colorschemes-20140623-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit vim-plugin eutils
+inherit edos2unix epatch vim-plugin
 
 DESCRIPTION="vim plugin: a collection of color schemes from vim.org"
 HOMEPAGE="https://www.vim.org/"
diff --git a/app-vim/dhcpd-syntax/Manifest b/app-vim/dhcpd-syntax/Manifest
index f8d83bfeddf9..883effd9f94c 100644
--- a/app-vim/dhcpd-syntax/Manifest
+++ b/app-vim/dhcpd-syntax/Manifest
@@ -1,4 +1,4 @@
 AUX dhcpd-syntax-20030825-multiple-addresses.patch 588 BLAKE2B 1f38da00084f2e3c42ec7c851e0d4798782e7727f4677a289b0db9096d93bcd8fb2a28695c05f390727bca1c1f27ed7f4918472496e94e673009ca8ba40d9600 SHA512 9b6a22f50bb4402fbe63c7971b11a1b1d7dfec5976758897aebf14a8f0025c52daaed9e3c8668a93f5b2c7c61afde600040f6c64aeac62f2e0e9a6b01735a74a
 DIST dhcpd-syntax-20030825.tar.bz2 2761 BLAKE2B 95478de740c28a93e03179e576e2edf02a682a6161bccae676b379dbb5b654d0239c3f8e523925f2e6d36f949847f9ba7cefae20104196d71f42837afcaae76d SHA512 97c1706e0ab2c89ee20618ae0c854347f8674a3008a5c4414aacb78e984e35b0eb6eeb5f641363ed6601ceeac0c794577d518658db9200c7391871ffae5341bc
-EBUILD dhcpd-syntax-20030825-r1.ebuild 492 BLAKE2B fdb91a3839f52dd97d6b81711508a77cbe3b07a8624ee7eceb23314a7b574a408955753bd2dc423a25aaff2edcbf27f6e796778f1e5bbef9b1bc0560c7fdaff0 SHA512 7fc73a370813f92ffea285ee4abc8aa4d8da7044ae16b16a824381e9175ce79c21cf913ec4645253097f8ed620a6aa89248f4b8bb4cee1ab86f96e3ffe185c84
+EBUILD dhcpd-syntax-20030825-r1.ebuild 493 BLAKE2B 2fba5cf84b9881857acc425d0199f888aa0a1cfd09f161fa8b9626d2017bfdca3b991dfeab341823a4850c43d2291e176d6b4eacab5a26f392afaf188c2e13b7 SHA512 3039c63507481cf1b6df17d7ddbe1eea2a5f5c99d6e349811cf53238f786f1cf51e5580ebb4b1836db4a71b947fb22a698c98c91277d6761e47e47fa092ee2f1
 MISC metadata.xml 451 BLAKE2B d8b36c756c321d18b52d77db7cfcd40b3ee3c9e8cdc282c090f6172f8b58b2639026650c317cbd2f4b1d575353a4b3cd22d80fbcea298d875fa5b737d69976b7 SHA512 cc138ac01df08624272da2daac14b2efd86fa8880e79b76de9fed6798fb5b8f6421fe608e2851af9c1afb7e6586f8d3f27865729960ce82ea76ac29f499e9e9a
diff --git a/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
index c04a8ee628a4..7e8abbc1e05b 100644
--- a/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
+++ b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: syntax highlighting for dhcpd.conf"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=744"
 LICENSE="vim"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 VIM_PLUGIN_HELPTEXT="This plugin provides syntax highlighting for dhcpd.conf files."
 
diff --git a/app-vim/eselect-syntax/Manifest b/app-vim/eselect-syntax/Manifest
index cf7a3f440a60..291961c15d8d 100644
--- a/app-vim/eselect-syntax/Manifest
+++ b/app-vim/eselect-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-syntax-20070506.tar.bz2 3006 BLAKE2B 2ad4175a678e03870ef59166e06ec41d4cc5fb6c8fd34b8b066b06eea17747416e19bdfdacfe68ea63341ac7284b47d2d3efe5d700c4602ae2429ffe81f1f825 SHA512 8206d445eb1a3097cbcf9821e5437033887f3b588a85c70fd849b000f18f06492498864992325da09de767af0303a118001b4f3d39249e28c8d944bc0c329de0
-EBUILD eselect-syntax-20070506-r1.ebuild 579 BLAKE2B fd4059bad53d6879e0600e132cec4ea40d627df662e9bdfaba64b487a1d6b4ef8302dd188ef5316aec255277b5146c07825416a9654c0782f01f3c1438c67108 SHA512 fec27ac929477dafdf3b2a13db684ea1b158916be5ab75562445b6f74996fdb194b717a6dd6e449cd7c9023fe9654e31cb6aad493279feaabbeedb8390ad7ab9
+EBUILD eselect-syntax-20070506-r1.ebuild 573 BLAKE2B ce23e0c59f5730f6bb28e0e17e56ec33a965122b1a8da9b1b14a213793ec92f2fd31d587926a7a13fee8686ed49225ea9f35c22df723a081f27093d3be45ae68 SHA512 d00336e246dc8bb54cea796338fe99466ba81316d6a1654d2e37fa4bcec4b1fc864181760826fd6c27207f2532bed04a4906a86c1c958ad45e1543492b58c2ab
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild b/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild
index 6c84945e0813..931982222d19 100644
--- a/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild
+++ b/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=6
 
-inherit eutils vim-plugin
+inherit vim-plugin
 
 DESCRIPTION="vim plugin: eselect syntax highlighting, filetype and indent settings"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="vim"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 DEPEND="!<app-vim/gentoo-syntax-20070506"
 RDEPEND="${DEPEND}"
diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest
index 09083b682552..9b708e7b612b 100644
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@@ -1,4 +1,6 @@
 DIST gentoo-syntax-20201216.tar.bz2 18631 BLAKE2B 9b68329ae2a64fba1d2a7a9fa6bb60b3a982dc2ebd5b84cf4d95052b3c8c138d7789a25c571e16cde371248e27dd8b28a7b73874749ec26e165724a43bbfaa9e SHA512 f7a6967c28aa669c8bfb114b0c60d52d970b68cd5b02a44f165f85ed5d8f42cff97ceccf4011481a84ab131c06f02725b4d9b53e3cbc0dc116dccb4ce55bd2f6
-EBUILD gentoo-syntax-20201216.ebuild 1237 BLAKE2B 336eadacb864fc16c39c8206f26fb74f4c0cb395fc209fd0be3fb4e87e97825c70a8248d6f7fbd6337270ee232be0f4817c1e80e23771baf808669a97568968b SHA512 560f7ecbc622cb4c9adfd6ec584ae4accb58e1bb9e83fde9632e3820561930c48f046a5611725391e024fef7ce3d0e69a0ff2234ec7a821a851dfa6a26556bf5
+DIST gentoo-syntax-20210428.tar.bz2 18737 BLAKE2B 437bf954e2bca61e3f612761a056de3c248d8f1f7afd3d07fab01770b1ff6e0ed8adb7222a61683770f369392d2c6f52ec5594b946c9e7a69d1cc1f6033caa5b SHA512 db64f53e0c6dd0c9b7fa9142422e4b24f037e9fb012235756443556a20a2bbce9c0b712a5375f482d3caf83760bc96239afc17a1a4f2ad89e9a6166063c6af68
+EBUILD gentoo-syntax-20201216.ebuild 1238 BLAKE2B 3916495228ba1ec18105d683abab3120935f1f4cef4c5696611369fcaf972d359659b671ba0ff4861550c25502cf16ec7124289f179bcc1ece7b39f5dc72c4eb SHA512 ee61a219cb0be58be48e458fd9955dd97ee6aa2358c31951b42a4168285969f8b31e507ff00b73b43484649c5a2225e6af34d24e6e4f8c078f075de4dbc4b2e4
+EBUILD gentoo-syntax-20210428.ebuild 1245 BLAKE2B 4de7b82e15d0e8e0716fa3b419297d3ce15bbe12d7fc8007e231bc09cd3d9236af4c5d08e7c6dec0c1058150eec401c37a24d3b5bade0319947617db9d358bb6 SHA512 9a14cb1d43d22cde53c0f7c9598bfdbb2cd1f0417bc69b604823f595b6f1a59a95aeb47cd61a68707abe8412a2ca44d71a67a51c731d7e083b2f4cab299e6584
 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-20201216.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20201216.ebuild
index 4f2b304b22b5..d36c89efc9ed 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-20201216.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20201216.ebuild
@@ -11,7 +11,7 @@ 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ignore-glep31"
 
 VIM_PLUGIN_HELPFILES="gentoo-syntax"
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20210428.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20210428.ebuild
new file mode 100644
index 000000000000..72f25ef766b6
--- /dev/null
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20210428.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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/genutils/Manifest b/app-vim/genutils/Manifest
index ea0f29419664..527cd02e7f7f 100644
--- a/app-vim/genutils/Manifest
+++ b/app-vim/genutils/Manifest
@@ -1,4 +1,3 @@
 DIST genutils-2.5.zip 30510 BLAKE2B 4e9466844efc0cc607b22ed6aca4cb49f1b65ce569e631a2a0c7f4534e433ac70a3b57b18b8de930eb2604169f71e35c4fbca26b4a521a2ee34a48471a6c6240 SHA512 80a751038f629d58ce962a6be7d806cf2b7c35ad28f9d90e58cad32e1e462083629f2069ac23281683db026510d7e3d96d6883027d424fae3de63352b80fc5db
-EBUILD genutils-2.5-r1.ebuild 575 BLAKE2B 4d6b2df7ccb4507a477277da8f274d56770fbfbfe06edcaecb5d30b5dfd8ef5789e089a02e94d8d2ea92b0b699bc38b4950f0203831c5eae2e999de3c0dee31f SHA512 7e62d6852e6deec0b15e0fe34b7fc763f29f1862c6c0d35bc78eadd5187dc742b6062693907da5a58e2a67eb2cf1e581439a75e17933a1e46431c2290bcb7268
-EBUILD genutils-2.5.ebuild 566 BLAKE2B 2db5a4aea8fc9e6d44076200bc8978f3ed3011b2c26abd5791456cc677235765221bda12828c77ac5b48410f847ef27d4d38c0cc000aabf8c703c812948a9155 SHA512 4bb01bc5f1ac5130afaf3158b25a089e88a79341fa9fc18d268c1889f594770a2d2bb14ae62bca43719a95319dc8a26b49c791c3aea4f033af5cdc0978ef2711
+EBUILD genutils-2.5-r1.ebuild 569 BLAKE2B fe1a6f05048c98482437be078fdea6b9c01b8716949e169accd3e44e3d9cf88e54412cabb46fdd84b6f6577ddc116b90b9edbd9d6637666d146aa9d751f233f7 SHA512 238315ea42e5aab7aa9c05a5b7093762efddca524c25956594926c15f27c339c7a09a97149da55c94c7d4c129e63f70157623679207c06b2977eb874426f40ba
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/genutils/genutils-2.5-r1.ebuild b/app-vim/genutils/genutils-2.5-r1.ebuild
index 57fc9d0c385a..1d1770abc285 100644
--- a/app-vim/genutils/genutils-2.5-r1.ebuild
+++ b/app-vim/genutils/genutils-2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,9 +7,10 @@ inherit vim-plugin
 
 DESCRIPTION="vim plugin: library with various useful functions"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=197"
+
 SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=11399 -> ${P}.zip"
 LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ppc sparc x86"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides library functions and is not intended to be used
diff --git a/app-vim/genutils/genutils-2.5.ebuild b/app-vim/genutils/genutils-2.5.ebuild
deleted file mode 100644
index 8cac5cf0724e..000000000000
--- a/app-vim/genutils/genutils-2.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: library with various useful functions"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=197"
-SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=11399 -> ${P}.zip"
-LICENSE="GPL-3"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ppc sparc x86"
-
-VIM_PLUGIN_HELPTEXT=\
-"This plugin provides library functions and is not intended to be used
-directly by the user."
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
diff --git a/app-vim/gtk-syntax/Manifest b/app-vim/gtk-syntax/Manifest
index 35089e082605..dc9583a9e55c 100644
--- a/app-vim/gtk-syntax/Manifest
+++ b/app-vim/gtk-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST gtk-syntax-20130716.tar.bz2 234878 BLAKE2B 0d412e1a04f4cfa0303108bf7e83e21332e1ef4d84f6f65054b860db032aa65bcc0c1ae827ba4968e650114343eeb444bbf9e985e6c4cf8cf4f69b957936a100 SHA512 a90bdf84765ebaf10946b974c7720ebb9366f7ae5e360c8254ffd54bf9eacf1d0e35cf2061ef42727ffd7df3b4d78bb9e5f3ab7392180c435f8eef06c81ff5da
-EBUILD gtk-syntax-20130716.ebuild 427 BLAKE2B 1ddeabdab7e71d421b61c45be48433d44052c15ed9ab2f3949ad9c23215df33fc9cca67e4a43ee49cef519c9efba6b73d5a49f692aaaf68ca7b81b5cc4fd7b12 SHA512 c88da296ea814450bc1053873f56bf38d68cd012c5a8afd4eba71e947f7b1325de1a5ec6785b0b54f8c0b19c2c62a510d22b873dcb43a8ef91fabb7c0638db6d
+EBUILD gtk-syntax-20130716.ebuild 428 BLAKE2B 079ed9a039e42458a2ab5f05dcbd55a44847d189cdedb8e851e55bf66d8657b5b5498bbdeef93b310cbe724b296edb111af32b6ff221c68747a97ed93fc4f5ee SHA512 53bd4d0c2b03c5599b11265ccd9bb7b1c57bf05a3cfc50099eea96dbac20eca5733cff342e33619eb2df20874343b3399e6a2beb651187910a5024fa34412ed5
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild b/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
index 90422fa07210..601005bf2004 100644
--- a/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
+++ b/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
@@ -8,4 +8,4 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: Syntax highlighting for GLib, Gtk+, Xlib, Gimp, Gnome, and more"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1000"
 LICENSE="vim"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
diff --git a/app-vim/info/Manifest b/app-vim/info/Manifest
index 22df4452d64a..9ffeefe82cba 100644
--- a/app-vim/info/Manifest
+++ b/app-vim/info/Manifest
@@ -1,3 +1,3 @@
 DIST info-1.7.tar.bz2 3958 BLAKE2B 23c8f8e06e923adc6d97ac578331cd5669dfe54ba7dc470c07426dbcf475cab4cf66ceb60a1f1b79c0fc12109db4ed3fee575bde56de221a9ebf8fe99dca9d63 SHA512 8d1d00b844a7485544fe02e17a3938a08b25be8cea7cf9f5e139be5b1f1f1b37abed8d717e149154d7bb87028f4d7e94b1ded844a6f83e8e645da2a214eaa81e
-EBUILD info-1.7-r2.ebuild 635 BLAKE2B 4ae45f725ed3ed64bd07518a308a9b6c706b02421854fc51ace9c657231aef137fa03379a6364b3b39ecb9f4a168f02d1ac4db8f74725d1d2b9b0a7270b76dbc SHA512 5d7cd2db944534408d818f18e520b73f65c4ba3b1ebbc4c68969adafcc6761d4dda87c0daf5bca9364dbe15515143cec6704edae4d2e39d43fa1181a47a684c9
+EBUILD info-1.7-r2.ebuild 636 BLAKE2B 682bede432915cb5eb2d65fccf5fe35e544f01182053dcb3ac4e8c5164aa4eddc5b301bfd4767faa5eb36513ef32b11e9e021ee36c48d73443b53a3e8b8ffc21 SHA512 42ac2c88b6a80336c6784ebdd48ee099eeda231781d225d7de7e7262c656ae1c8c9570959ae560e0d932367bc53e0f08b80acc5309c5ebfa3300ee71c03bf275
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/info/info-1.7-r2.ebuild b/app-vim/info/info-1.7-r2.ebuild
index a0ff16bff546..6a15d0ae680f 100644
--- a/app-vim/info/info-1.7-r2.ebuild
+++ b/app-vim/info/info-1.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: GNU info documentation browser"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=21"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 ~ia64 ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~s390 sparc x86"
 IUSE=""
 
 VIM_PLUGIN_HELPTEXT="This plugin adds the :Info command."
diff --git a/app-vim/ntp-syntax/Manifest b/app-vim/ntp-syntax/Manifest
index b1f422a9d892..7e400765371c 100644
--- a/app-vim/ntp-syntax/Manifest
+++ b/app-vim/ntp-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST ntp-syntax-20031001.tar.bz2 1636 BLAKE2B 43cf45ba4d6096c1f07a89c8e006d3fb6ca1b81e6d0e25a11541ea17cff96979e1221f48141799fb26655b3337017dd06d900bbc087b25efeb666cb45dbe5de6 SHA512 3c427dcd2cc065f3ae76c694ba57954c090a565c389aa4dd277e828eef1e25cf0c21781821526267728b1e2b30486007f618a2ba2f422be079cd540d8471c5d8
-EBUILD ntp-syntax-20031001-r1.ebuild 428 BLAKE2B 0b078197e7990a60fe59f422fabea1ba0c61d8d3bd1a8be63ba702e211b6d0c563d28e743deb4f90d52719076dba24c1276d6cb12e63b44b306c64da477d8eb3 SHA512 4eb79429d7e0bd8bea74a71e4edc0e56a8514b4973260bf7a14d6d7753341fdd2a5aa5625a128e34fb2ea44233b476818f701fe14024a9cc85afb8c1fafbb713
+EBUILD ntp-syntax-20031001-r1.ebuild 429 BLAKE2B 76c5983a9e7b30d19ee8d447cfa8f27511f787f812683ae8fd9ca83bd764952c0b4223534885d63b3d2930471d4591ae4bd9f7e1ce353a2aa16d7446f72a1780 SHA512 27a45af661338561dae638e26234bc461d36812c8bdd5e6a263c3f7e012fc9d3a60091cbcaa44a2a76e104fdb17f96eb92903301c395fc6268986f2e0ec14225
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild b/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild
index cafa395a54b9..1440ffa45093 100644
--- a/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild
+++ b/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,6 +9,6 @@ DESCRIPTION="vim plugin: ntp.conf syntax highlighting"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=778"
 
 LICENSE="vim"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 VIM_PLUGIN_HELPTEXT="This plugin provides syntax highlighting for ntp.conf files."
diff --git a/app-vim/taglist/Manifest b/app-vim/taglist/Manifest
index 77edcb55afe7..949c485c5e7b 100644
--- a/app-vim/taglist/Manifest
+++ b/app-vim/taglist/Manifest
@@ -1,4 +1,4 @@
-AUX taglist-3.4-ebuilds.patch 451 BLAKE2B 4d22d3ceaa1af58b804710cd1af60b402c6295a269d51fd39bb78911e3a44f0a775c52676ca6d939a9c9c8a99ecdd17996b3c3ad0b4c9bade0866ccedd742eec SHA512 9fbff7c21e0c3bc73738dbb28ce8a10bf9f5b052d669468940f471988e8e15862b75104db1b0cdd209a679c4d72f58b3c147f5fdaaf8248e5ed0bc18f3615684
+AUX taglist-3.4-ebuilds.patch 354 BLAKE2B 8e2c03ac0be6275e80b88fbbadd6d15f60b3fcad44ce727eb92dd920d7a4660f7585c9644f19378708a10f46548f8aecbb595cc8cc499ab693f1da7b94c89d36 SHA512 7088511f4719f769c9fd384ca70c85ec21f66f1f601bc905abf0b073e3b6f4928a314a940b5e5a4628425ed0d46341b076a46a2f1e5d6ec834007fe47e6338fc
 DIST taglist-4.6.tar.bz2 40344 BLAKE2B e6377f8ac353f77ee7656b95eae0d79722f66ade3f575de14194aa7c2ced7e30d2d3e62ba3873db8b0b3e2985d360f3b4f100072d0bb26617941d3d632ab5cc4 SHA512 64686f2685cf4f9b09eeb7e1981a1b9d514cce2f6ea4bdf3e3613037d9818556ad6ed95740a84b4d73eba3fa1d5d58a41f15e1bc0a1403c50a810f5a704f3073
-EBUILD taglist-4.6.ebuild 490 BLAKE2B 3c70e50c708a79ace0596bd44db28bc11cd1b73d5225cba88be6310cf3247430490cc0784705e6101914a29ceba2efa72b837cfbddc4a4388ee3885bd8b423d8 SHA512 66e688cb7a4f366c384498a00cdd0242db982a02c72597e95c4fe60490aa213fb114e4dcefd98a71e9e9b1276e2a4cda4a49acc856172ef1afbfee246800bcdc
+EBUILD taglist-4.6.ebuild 471 BLAKE2B 00397dcaa5a8f806ffca50f54391b1d42033b93ca7bcefca514a97305e1f0514406e85537273632d58bb8bdcacad6539c8bf41265a5eb6dae530df31087ce901 SHA512 cc91e710352157a1e1cbd43a49426cd78cb7cbc5e29016c9e4eed00eff0d7f164b719c55e1538bfe33ff4d623a6c90c0ce68b7204789fa3be797c66bc9d09342
 MISC metadata.xml 330 BLAKE2B 4c578f7ca8885b73f0a298749a5f1335815b25ea619b65200d8d5acf9a6b27502fe00a13b0ab0bd6684c604f87099f0740857054d9e6e62865dc800fa09a4e1a SHA512 0965202e6286e18810375b491ed126f12a309958cb726c259c549c38b1813468e0d17a1d00d01dab882f5ea069cb03aa5c1d4ce09399fb2efefadfe70aaf5dde
diff --git a/app-vim/taglist/files/taglist-3.4-ebuilds.patch b/app-vim/taglist/files/taglist-3.4-ebuilds.patch
index 8fcc928d4497..51b1a2435e59 100644
--- a/app-vim/taglist/files/taglist-3.4-ebuilds.patch
+++ b/app-vim/taglist/files/taglist-3.4-ebuilds.patch
@@ -1,5 +1,5 @@
---- taglist-3.4/plugin/taglist.vim.orig	2004-10-02 00:12:58.400215576 +0100
-+++ taglist-3.4/plugin/taglist.vim	2004-10-02 00:26:28.535056360 +0100
+--- a/plugin/taglist.vim
++++ b/plugin/taglist.vim
 @@ -205,6 +205,9 @@
  let s:tlist_def_cobol_settings = 'cobol;d:data;f:file;g:group;p:paragraph;' .
                                 \ 'P:program;s:section'
diff --git a/app-vim/taglist/taglist-4.6.ebuild b/app-vim/taglist/taglist-4.6.ebuild
index 282a134b2979..80f6a853fddb 100644
--- a/app-vim/taglist/taglist-4.6.ebuild
+++ b/app-vim/taglist/taglist-4.6.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit vim-plugin eutils
+inherit vim-plugin
 
 DESCRIPTION="vim plugin: ctags-based source code browser"
 HOMEPAGE="http://vim-taglist.sourceforge.net/"
+
 LICENSE="vim"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
@@ -14,6 +15,6 @@ RDEPEND="dev-util/ctags"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.4-ebuilds.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4-ebuilds.patch
+)
diff --git a/app-vim/vim-go/Manifest b/app-vim/vim-go/Manifest
index 3e81aabe340b..d58e9a632ffa 100644
--- a/app-vim/vim-go/Manifest
+++ b/app-vim/vim-go/Manifest
@@ -1,7 +1,7 @@
 DIST vim-go-1.13.tar.gz 870173 BLAKE2B a2f67cef249191cf91caf45c120e471301a89ee365ba9add839edea17990ff3aba7238965dac1c71a89d2004dfcfd486319fc4f1474c7ee94d3845724cd9b289 SHA512 c2aa31104168f3a8e1f96b0ad2c51dc1c2e5a1de3db76f0009edfb38bf60ebfcd9bd8a86fedb6ff6d6d789973a557d6ed03e38e67159bc43c5231449b0253c25
 DIST vim-go-1.19.tar.gz 218988 BLAKE2B 3bbafde28342b8febc8763fe9858575abc8f3e9735f3886de508cb7986bd97d1d2eeb36bdd4eb9b2f514e74f47b08355549e32c101519dac41427f302f57e29f SHA512 fc2cdcbc58878ab435c6b253a226e46ca60083bfd4e6df683e1dbeb368bb25b10fc531630a6b1f6cbfc32306a255eb6eae6bcc3f7a7b770758d4beb71c539f77
 DIST vim-go-1.20.tar.gz 232322 BLAKE2B f72664c79d781152748b6d5e48e9363a924e257eb0054931127d83fe4dc56d5b3e3592800ae3be3812609ec92c9b66fbcba8a1b1ca76891573408db14a0b2865 SHA512 1f5499dd33b72466127c1fbbd7a10dca41d9e8c3add6a0b2b3efa8dc0caf2aaa26311357a5b5eaecf2461a3465aabbf608a9ca35203139ead083bbcc806ea552
-EBUILD vim-go-1.13.ebuild 585 BLAKE2B a46b8e468163abddf2ec305b76e24fe82ab82f631dbf773bf927c0962f55303b21e2eeba36e44a0c2d172160c65fa6ec02cde729260783b0ae9c7a5e0f199fe5 SHA512 4d7b8ba229f5c1318993517923701078909ac0fda31c34ea296b62e5e16395a7bb926ea9811b6fbfc8df4e660435bdc1407da209dc4dbb56cb7f887854e31e73
-EBUILD vim-go-1.19.ebuild 584 BLAKE2B a1d61f13d28312d2956db0cb8773d1726e4dba10779d0f30dd6837876e9fa1f5e88e7d9d36f7f02e38b6baeaee639df28f42157c96db5d770b082fd8f2568dee SHA512 c709456699e0a87ed9908a01f92cc0fc5d78e3648cc6656181c63683daeb7caf5af173d755fc3109736df53572e11e4616a70235fc8bd3a78823237bb00d17bd
+EBUILD vim-go-1.13.ebuild 585 BLAKE2B 6fa633e32386ce4e26cfb787e6055d29c005b5265f005f00084b7f01c78c9b83e8506985af79fa4477310f68ee13160da464823bc375ffd72fe19ad7dd16a41c SHA512 6156d8ade7e35d6d8cedeed3410039540ec1405fccc76bc1805e4000a3e4fd74ef580d861284e901f6da4d74a2bed236b69bd3311d6327e8aeae60e908cd0788
+EBUILD vim-go-1.19.ebuild 587 BLAKE2B 98931df6a6ced6e0835dbf336f77476a137f3aa783d39be76b8cce280ee8a8e5cbd5de7a47d3c37ea956343b8ce29ba8bd710aaecccbd86b31386877fa004dd3 SHA512 d9ad79e51cf19c9b0b83747f3caec1bd1326310a51c6674f43c031ad8df4a0c00c2642ee475887c25b3ebd782f5acd472a29b9e9fd22ad4e3f98cd5d8c852420
 EBUILD vim-go-1.20.ebuild 586 BLAKE2B c444e95a3a815b6277442b67080c341005d3e3449ec49c1699cfcdd4d583df27d97d23bd71e789240fbb840415bcfb2f0e9c968e224a2ba0771cbb291216ee0f SHA512 6322c39bd08299e5de49c08541f84c265c2843ba35337d17feafc2a5d068c27beb6f70075a34b57ae02e6e69cd2a5282fa5247812009c94ce4a0ba85d69d2620
 MISC metadata.xml 326 BLAKE2B 2c1d1ecf6dc417d2646fbeeebbd2bf1191c93f6439df663e863cebe0b33cfea5040bbe3f1b85107f5370395d9472c4f903379c3a5cf925a997789c492ac0cc66 SHA512 0075500c50b5ad7cf5610fbc4bb71e3ee3d655bc089916371ee0d66731387a2268df98ed6d7fcad6e70db28d6852b48c2e6742e131b7c5d50fc7a9656807fc60
diff --git a/app-vim/vim-go/vim-go-1.13.ebuild b/app-vim/vim-go/vim-go-1.13.ebuild
index 39d68cf0d91e..13ca24a19263 100644
--- a/app-vim/vim-go/vim-go-1.13.ebuild
+++ b/app-vim/vim-go/vim-go-1.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,10 +8,11 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: Go development plugin for Vim"
 HOMEPAGE="https://github.com/fatih/vim-go"
 SRC_URI="https://github.com/fatih/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="BSD"
 KEYWORDS="amd64 x86"
 
-VIM_PLUGIN_HELPFILES="$PN"
+VIM_PLUGIN_HELPFILES="${PN}"
 
 RESTRICT="test"
 
diff --git a/app-vim/vim-go/vim-go-1.19.ebuild b/app-vim/vim-go/vim-go-1.19.ebuild
index af04db9720d6..34139c8cfca2 100644
--- a/app-vim/vim-go/vim-go-1.19.ebuild
+++ b/app-vim/vim-go/vim-go-1.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,10 +8,11 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: Go development plugin for Vim"
 HOMEPAGE="https://github.com/fatih/vim-go"
 SRC_URI="https://github.com/fatih/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="BSD"
 KEYWORDS="~amd64 ~x86"
 
-VIM_PLUGIN_HELPFILES="$PN"
+VIM_PLUGIN_HELPFILES="${PN}"
 
 RESTRICT="test"
 
diff --git a/app-vim/vimbuddy/Manifest b/app-vim/vimbuddy/Manifest
index c73ab6693b03..4768476a5a77 100644
--- a/app-vim/vimbuddy/Manifest
+++ b/app-vim/vimbuddy/Manifest
@@ -1,3 +1,3 @@
 DIST vimbuddy-0.9.2.tar.gz 1152 BLAKE2B cc7ea6fcffa05bacbcbcab2850486c648cc9dd4fe2d7896865ef17acef6c9cf8b05ee33a14fd212b156b4ee9c4c04a8abb764c320a74b0cfead545f1ab3f9636 SHA512 feca2b303e677cdc0ed1a02e92c54ae293ccd380006667ea49c93ea804975bf8c40044c11e2599ad3e81062a453465249120fc7daaf2eea994d8d81d3d2f87cb
-EBUILD vimbuddy-0.9.2-r1.ebuild 522 BLAKE2B 9a933bc2d54aaa69971701e9ddc805a11a91fef45d16e0e3a8187fdb099427842235f2a770eaf6c64afd03710ebfe3c65aaa86371b6e785584b79ada5a27dbc6 SHA512 eed9ddec2c60fc07d9a09e01c4104d73f86a30ddc1d7c471edf9908b46291195bcc5c2ae88d83534e8104fd71d8bc182753296cd94c4cb14e1193c48bff1ff04
+EBUILD vimbuddy-0.9.2-r1.ebuild 515 BLAKE2B a48fbfccc37773c3db406389d9ea454f1dbc53496802894e1e7908a95565f85a6737dfb4e916a9eb8585b85357a492fbffd420f7831eb0a4f2d95dc593ddd048 SHA512 2fa54fd67a50f4b6ff51a4759163e867b89eaf5276af5990f4dad333d789b178c1c52b555dcce10000bb835179b0d7f32addecf38b2ab591ebb0702f02903244
 MISC metadata.xml 338 BLAKE2B 30fdbc67a6a8f29665abab1a3b13f147e35f3e623e865ed087fd8646727e5414e5c30197cc2cf6aede1e8d179f508ed2c352b4b7d18d21e267ca316cd3e6615b SHA512 10eca8357fdf09722d6e495da71416e11eeca34d60d4e3f6bb089ed57ab06bd0266951cc773090bf5d780fffd303f315087882c4eab7317f7dbad054fb8d2e34
diff --git a/app-vim/vimbuddy/vimbuddy-0.9.2-r1.ebuild b/app-vim/vimbuddy/vimbuddy-0.9.2-r1.ebuild
index 228535a41a65..bce56bc5ca8a 100644
--- a/app-vim/vimbuddy/vimbuddy-0.9.2-r1.ebuild
+++ b/app-vim/vimbuddy/vimbuddy-0.9.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit vim-plugin eutils
+inherit vim-plugin
 
 DESCRIPTION="vim plugin: vimbuddy for the status line"
 HOMEPAGE="https://github.com/vim-scripts/vimbuddy.vim"
diff --git a/app-vim/vimpython/Manifest b/app-vim/vimpython/Manifest
index c1b8d974aa5e..a897381d4cdd 100644
--- a/app-vim/vimpython/Manifest
+++ b/app-vim/vimpython/Manifest
@@ -1,3 +1,3 @@
 DIST vimpython-1.13.tar.bz2 4270 BLAKE2B 7973aea8ea397f3f2edcf8a2845ab47cad3015925dd9e42e37a7ada47f25073b68d6d8f8c378a86d90e39c0aae63aba784753679b4d04a5aad268db157400ae2 SHA512 467217ad160f02d3ecdc8c43e35966e496e6c5f99bef115bd4905795c0fd5b8f68f68bc8edd64ca1dbb1c6fbc088ef6ae996f524f0343943702f2a92dcc144ce
-EBUILD vimpython-1.13-r3.ebuild 470 BLAKE2B 21d09bbd55d13befe91496d1a36dd340d6bb2ef9ce007c42273e25043ab3a6fc7369377cf1724114109d875727158105a467b26b7c36685b4ec21e02659dbdba SHA512 69ea03fac547e017eb681cd81b5d3fd4e2d8a031707b3518375ce25c57719ecd3973c795c87cab81284dd7418b1856bdbe47d4d33e1083eacfbb790db0eaf469
+EBUILD vimpython-1.13-r3.ebuild 471 BLAKE2B 37210a64b186cbca77852434b0914d2d9761eebdf0d5032b30729aa73c7589738b3798927c274535f8ff4d9032b7a651f7a74f11e1a97f1f0b172f6e1418d55d SHA512 a8002f8c241915a769825f6b0804ca314ee08ece4a60511bf719ea957e49b7d050140ca9752c6561ba961e355c2a6aadb77fab6ce3c929a2bb086b540d153f5c
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/vimpython/vimpython-1.13-r3.ebuild b/app-vim/vimpython/vimpython-1.13-r3.ebuild
index 73600cf3bfd8..923da1931b4c 100644
--- a/app-vim/vimpython/vimpython-1.13-r3.ebuild
+++ b/app-vim/vimpython/vimpython-1.13-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,5 +14,5 @@ KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 RDEPEND="${PYTHON_DEPS}"