gentoo resync : 31.05.2021

21 files changed, 28 insertions, 33 deletions

diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 517607a5d756..5280a6d3b29a 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/fluxbox-syntax/Manifest b/app-vim/fluxbox-syntax/Manifest
index 8c7365ca720a..b9f1b32ce0db 100644
--- a/app-vim/fluxbox-syntax/Manifest
+++ b/app-vim/fluxbox-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST fluxbox-syntax-1.5.tar.bz2 1376 BLAKE2B 2006668a89077febb4ec919354359cae1170156950abb553695d6424cb277bca69a5e8ffa93a9e4b09b990e96f9ee34654d34dc15320140dad589808ef9960dc SHA512 0567af6fe0994ea228ac56c3a26485ba5cce7762e3d70d6dced978e56017f6769072c83ae68125de3e03190562a7a10102bef038c02ae148cf70cc0c5951b8df
-EBUILD fluxbox-syntax-1.5-r1.ebuild 879 BLAKE2B 48182770b61ba2c6e32b2d8988602465c0db368268c7803fe3dea920769e6332de5e0001cde350a271e6294d99bb2acd0e0c2c152f0692690c0949d679955fd2 SHA512 b8b50061683693c6abfec2c8cd230a34cf7cebad9c0318b7adcd4cd92d64372729b8948a78e06ef3cdbf3f851e502b5fd83d74f8431fc05dca7be3dde3216c3f
+EBUILD fluxbox-syntax-1.5-r1.ebuild 886 BLAKE2B f59b53cdcae36d9dfe27e6d6ff1b3353ae7a567a95093220127b27717585b0719062bddd485a63cb5586b95b7630c945f119419d15ac4a7d7a1f99a58af7fd79 SHA512 51697c27f4c28d7313d0f6dc72aa4ef0fd549b78c7ad30796dc98798924f2aa4b12aac94fc64f47e016ca703d3fa23b98646680a431ce7ae0ff49439c064dabb
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/fluxbox-syntax/fluxbox-syntax-1.5-r1.ebuild b/app-vim/fluxbox-syntax/fluxbox-syntax-1.5-r1.ebuild
index a3ba7f3b4ffc..359380c0e8b5 100644
--- a/app-vim/fluxbox-syntax/fluxbox-syntax-1.5-r1.ebuild
+++ b/app-vim/fluxbox-syntax/fluxbox-syntax-1.5-r1.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: fluxbox files syntax and indent"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=679"
 LICENSE="vim"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="app-vim/genindent"
 
diff --git a/app-vim/genindent/Manifest b/app-vim/genindent/Manifest
index 775142c8fc4e..6a8823dd94d6 100644
--- a/app-vim/genindent/Manifest
+++ b/app-vim/genindent/Manifest
@@ -1,3 +1,3 @@
 DIST genindent-1.1.tar.bz2 1248 BLAKE2B 761b5285ba8816ec8b64542d9e6784f9d771be8d02fc085dacfc8422dd636be600c44c973089b1922d19e8b2ec0256f66d547f35609db6d3f08eeb0998fb69e2 SHA512 aa90cfc988b08708bb25352b66196191e6cc322f2072a771cf768a0e2ace2e4e193e2e34dc0556266bd84c49055ec1d4183f1aec3d89fffc29f5ded88c26a2af
-EBUILD genindent-1.1-r1.ebuild 489 BLAKE2B c2b9a601c7d5a21e01aa95918f09e0e878a9760d403e8c8fd65eaff31f8676381d9ad7ca9c57fb2cd1cae5eb3ab1db7e0523af467393fd8a7673859b92a6b6de SHA512 fe5023f7f2b0fac0d437c238f17aec71fb5530b1458e889c8f3b0ca74f85ebd2e42691c824a0ab0a44913c42987c979338e05a901fe0f005711dc4a69d008154
+EBUILD genindent-1.1-r1.ebuild 496 BLAKE2B e77ee2e71a083141e84394f7b54cbb2b7064eceb4a62b39f250429173e35befb682c4e0acd5ffa2a94b6ea38581c83abb2765346a81e9a25638589b0e65eab55 SHA512 5d1decdc5458bdff167cf954fdbff5656b2406f8feb87fe1562f451161cee728433b18335e0f038bb94b9c5b250f7810a7e1f505acada2baf2e6e3548b1a7b4a
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/genindent/genindent-1.1-r1.ebuild b/app-vim/genindent/genindent-1.1-r1.ebuild
index a36c924bab07..761dda039b69 100644
--- a/app-vim/genindent/genindent-1.1-r1.ebuild
+++ b/app-vim/genindent/genindent-1.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: library for simplifying indent files"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=678"
 LICENSE="vim"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 VIM_PLUGIN_HELPTEXT=\
diff --git a/app-vim/gundo/Manifest b/app-vim/gundo/Manifest
index dce6c10a0539..2ce76d0193a3 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 736 BLAKE2B b5c607c1cba1ef627fcbe47a148b29abeef8f0cf8828f214ce4914566349a143641d069581368264749dfcbf0f366797f129d0eaf7a1b3fc9ac69d3024fd757a SHA512 7c52172d79458dc8fcfdcc3afdb9fa486995e5f012053e8482ca0e88fd3f063b53d82897585cb95dd7022532008f8a290b6bd57e376ec724e999056340fa9b04
+EBUILD gundo-2.6.2-r3.ebuild 738 BLAKE2B 47bd6a3e8e471b0b50ad7218b75b87dd81d8a845ef2772fe0b6221f4594845d4f18b39d881ad18cce35b0b1f24e3e3717aadfaa848acf9328fff024e9b134ecb SHA512 e6583a63cb0db2d8bef80079f3c90bc42003d567f049346df4df8b82448bef13e282677b8a320d47337945fe61e7e6338b73ddef7a4f42b13e056c126329e3b7
 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 c15b5f74838d..2c1a2f2402a7 100644
--- a/app-vim/gundo/gundo-2.6.2-r3.ebuild
+++ b/app-vim/gundo/gundo-2.6.2-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit vim-plugin python-single-r1 vcs-snapshot
 
diff --git a/app-vim/jedi/Manifest b/app-vim/jedi/Manifest
index 1bb451bba357..0d3e9a4cb858 100644
--- a/app-vim/jedi/Manifest
+++ b/app-vim/jedi/Manifest
@@ -1,3 +1,3 @@
 DIST jedi-0.10.0.tar.gz 36820 BLAKE2B a66f7c58564487d83867d61480d83364af0047cee713c41dbd5c67bff0b2ac33d066c2d0f4367c30059f46fb9f4916fc8d2eb9c64aa6a489e2c16a03f56b0b3c SHA512 65482505446b1001e92870ae64a147b38c0bb4d3151e464d325be741729506a191b284a491f4c3eb77dc46cb9bcd6b8e7bf8689ed95107e89a1f6a05c7fbc9ea
-EBUILD jedi-0.10.0.ebuild 891 BLAKE2B d9586d6370d814223e3a4e76c5318a53b3f77fabadd07b5910783216b0a9c428feb1642680fdd35ff5ed9ec5d33b072c6cb227b6fc6f0381a8c75b47608a8cc2 SHA512 5cfaa9478152f1f9f0e77a8f83c10e0d1a6a001bbb3cec6b5524bbd0462119e5bd8eb62ccef9ddfe93861336bb8fd799568daf40326f7a6e1b4ed6c7e2475bbf
+EBUILD jedi-0.10.0.ebuild 833 BLAKE2B 2419296219ee6f21c4572edcd22bd11106478153297098a5e67b885797b28dc5d6f9cb36e33680a527852534c927307577d5c420b134cd2402913c913f408c4e SHA512 8857a9a90b5bb354147f66f8ea0dd5d31622a3436fad9dcb34b06d9b2b8e0a9fd5f43871fd666943bc83209f42fc3841a2d0b5c86ad76a1581551455d54f33bf
 MISC metadata.xml 765 BLAKE2B 18bf7233db72f6301ebe3a4b5e13b747299ce71686b6d230463c6b6e5758255843bef176160821038cf129bbbb45d070e232cbdde0b866fbb1e3c13629a0b28b SHA512 aece590777da00e80f991f372d0fb264f1973ce5f814f56eaeda95c476d0ad9949cec6acfc7ed2aa6c98f29add4f954066470a4bff72b86bae33e9911099179b
diff --git a/app-vim/jedi/jedi-0.10.0.ebuild b/app-vim/jedi/jedi-0.10.0.ebuild
index ef127090588c..7b566e307035 100644
--- a/app-vim/jedi/jedi-0.10.0.ebuild
+++ b/app-vim/jedi/jedi-0.10.0.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=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit vim-plugin python-single-r1
 
@@ -19,7 +19,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-python/jedi[${PYTHON_MULTI_USEDEP}]')
+	$(python_gen_cond_dep 'dev-python/jedi[${PYTHON_USEDEP}]')
 	app-editors/vim[python]"
 BDEPEND="${PYTHON_DEPS}
 	test? ( dev-python/pytest )"
@@ -32,10 +32,6 @@ RESTRICT="test"
 # Makefile tries hard to call tests so let's silence this phase.
 src_compile() { :; }
 
-src_install() {
-	vim-plugin_src_install
-}
-
 src_test() {
-	pytest -vv || die
+	epytest
 }
diff --git a/app-vim/pydoc/Manifest b/app-vim/pydoc/Manifest
index a09aa94034c4..7c35253bfd87 100644
--- a/app-vim/pydoc/Manifest
+++ b/app-vim/pydoc/Manifest
@@ -1,3 +1,3 @@
 DIST pydoc-2.0.tar.gz 2795 BLAKE2B d780265c474081431e43076db9e5bc244677d9deaaa44bbd6ba2c2bdce7e88b8e2f0c6a9e14ca5a3a4bda7925b5c5bc108a34d5d6fecaabe9f0a025774b101ca SHA512 bea2e0dcb82090803b45e0cbccf5ad610a39f22d04c099e5e946e2b3707c9cbd69b85e3f1024a73760d1ff81a0199aeeb3bab20546307676953156eff7185214
-EBUILD pydoc-2.0-r1.ebuild 619 BLAKE2B 9ac901d928c314864d69f2c2ce9daee0baa3f5f66199cb4e1bfc54a3e2516e54720ab6d836dbc91a0f8dc9764ed850771c147518b581889d5ffb05d71dc59538 SHA512 af000656cf4129eb33f83b4f8c6c3ec43488c66d16b685d126901909afc05d2d237d828a4a9f49a190059e0afc8ca9bd2794520d95469b67c9454edda6f9da6d
+EBUILD pydoc-2.0-r1.ebuild 597 BLAKE2B cc913af019e5f46ebce5b8e325847249167b36e5f2394b6b0201cf9ca263c2d52ab759c32964da7387a9ad448b8e945b930383f43f95afc56a43bf02e9c70bea SHA512 650d1545350452445c475f6d6c2908e1d7aa63c98b29d51334e41b96e43dd70a5b6aa776b819532111f9712045cd6c7f5d8ca013ebb5b586f92a39941472a624
 MISC metadata.xml 424 BLAKE2B 0326e93be286c9818941c853171cf1d7b2dc2de43526fb9de9d1ec265809420ca7134141c0fbeabcd02d840b9fd0df68210bff65251444db757f14bddbdfbd3c SHA512 2b361ec74c215e39afd3541703b6d4313aaaa5987432e60334a70e20cad3203dfa3630da5cf4b148f7d1a68bbcfda3f48f2db941847b76c8c8d0797b319f9859
diff --git a/app-vim/pydoc/pydoc-2.0-r1.ebuild b/app-vim/pydoc/pydoc-2.0-r1.ebuild
index 757edeaf85d1..9bf0728a9061 100644
--- a/app-vim/pydoc/pydoc-2.0-r1.ebuild
+++ b/app-vim/pydoc/pydoc-2.0-r1.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit vim-plugin python-single-r1
 
 DESCRIPTION="vim plugin: integrates python documentation view and search tool"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=910 https://github.com/fs111/pydoc.vim"
 SRC_URI="https://github.com/fs111/${PN}.vim/tarball/${PV} -> ${P}.tar.gz"
+
 LICENSE="GPL-2"
 KEYWORDS="amd64 ppc ppc64 x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="app-arch/unzip"
 RDEPEND="${PYTHON_DEPS}"
 
 src_unpack() {
diff --git a/app-vim/splice/Manifest b/app-vim/splice/Manifest
index 9a2902beccff..71a82bf63708 100644
--- a/app-vim/splice/Manifest
+++ b/app-vim/splice/Manifest
@@ -1,5 +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 871 BLAKE2B 22b254f872ddd102e49ae9e8af460635a0d647276e043a3fefe0c0b25ba621e4fb31498982b2056d9a9942da3899485ad62e7cf082e23325ce0f951a9478bd86 SHA512 37a57d67b13a116af80327af16ece994d86764d4386fcb09d5e91ab3eda8d4b589284b80fa5ad3afd6d63061dc6bd6471826ac22fe162234271a18189ef23612
-EBUILD splice-1.1.0-r4.ebuild 935 BLAKE2B d8309cf93500a18f76c8f952c20571d4a32eed5aabdf185d9e86b454bbc97a8c4823dfe3c536b636c9a53b0101595fed5fe96dd6d560849efbc7c92ba258c04e SHA512 00e058b966c3abacf38a20300586df8d506f89fdbc852cd014125b9792ed504d4229f45aea4d788f35033bb25d2e6d936b76476fe44363124518860136954c34
+EBUILD splice-1.1.0-r4.ebuild 937 BLAKE2B 0686d5ae1e1616de252c292079b0bb70795a06f062bdd80585d2ffd566c8eeae8d803f9de7e4cdf060052e3b4f6108ab14a955b4e66f19ba2136613e83c4db99 SHA512 140ba4044d384974fe24604de6b7e78e66865b1b3102c35f849fab88b50eef7c2f6d9babac5a3c21d4274a862bdfff8d8f442d7a276a00748f398d06b8aff2c4
 MISC metadata.xml 328 BLAKE2B 963c8c741fa51ae4e4a212a449425b348d78cf1ffee2bde4a1d8d84358796e8a966ceb609acd2b24fc08bc7f7207f6962bbb31d5e0fddaf751dc00550bc4ce57 SHA512 dfb28f5cc05f74d6f5682dd99195175eb1d814eb4adc9ffdf03237f27ea6f8e84f60d3405b499767968a98974fe994e57587863dd4bf42022689b15fced417ee
diff --git a/app-vim/splice/splice-1.1.0-r4.ebuild b/app-vim/splice/splice-1.1.0-r4.ebuild
index eff1b3d2837b..7b5c124b6b0a 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
 
diff --git a/app-vim/vim-latex/Manifest b/app-vim/vim-latex/Manifest
index efbdd9beb103..971e332f10c7 100644
--- a/app-vim/vim-latex/Manifest
+++ b/app-vim/vim-latex/Manifest
@@ -1,3 +1,3 @@
 DIST vim-latex-1.10.0.tar.gz 260820 BLAKE2B 2314ad5ded3bea51def3172e8f2b7a7483839b58804f9d8c1cc1c8f1139c1da731f91525691d47dba57d07a7db85c371e87c5ce0d3d22a004a9402df7e7cad3a SHA512 1d22b675c124e402a280dcc3a675b49a92fb9f4d42efdda0ea97be26379cd6c023589a35e165f4231524d853380e22411901bfbcc98f171c938ba800821a1213
-EBUILD vim-latex-1.10.0-r2.ebuild 1497 BLAKE2B e070a54eab65f29777b4fd3adef6b06e3191dc4632520cfeff8ab1972fbe6a9e5dd10af0a3a4dc6ef486c83ccd49355cbf83b534ca66b602ea65e090b551ca63 SHA512 96c55c68e1717b239ab478b9fb7e9ddc20962bbba2df5355369d156e8fc5fe7409291b7c6ec1c0c66865c3e5c885a124393adc118d3cfc28ae6093a21133b2e1
+EBUILD vim-latex-1.10.0-r2.ebuild 1497 BLAKE2B 61baba11619b3492d401284bd6feca6ece3e33c316d96df5629041e2085337f608bb3274f9712d29cfb0db250883e96cd6bce871f005bf8dc009f6def653c74b SHA512 944a514d273a6f289a38ec09a9c721b6b29a9277edf300370e43118057772487b987bcf40513872e91b236aa373ef88cce763267178af93e67190cc800b8705e
 MISC metadata.xml 328 BLAKE2B bcf4c9979e43da6c141669c218e852e7a0c062d900c35790709e393f6cabc56f646f7a84e8057d9dbafa0a73e5786135a7cfe3ef825af867500bcd502f03a61f SHA512 e14b88742b6d8143cb578ddac61dbc0ac5e84c90659e8d9b5c40882ebdf35dc001b1ffae26eb90617434b2c8a898055c838738bf7cf18a45cd2a2ce66a30bdce
diff --git a/app-vim/vim-latex/vim-latex-1.10.0-r2.ebuild b/app-vim/vim-latex/vim-latex-1.10.0-r2.ebuild
index 4631efb668fe..375ef8e5228c 100644
--- a/app-vim/vim-latex/vim-latex-1.10.0-r2.ebuild
+++ b/app-vim/vim-latex/vim-latex-1.10.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit vim-plugin python-single-r1
 
diff --git a/app-vim/vimoutliner/Manifest b/app-vim/vimoutliner/Manifest
index 5d9320f9a243..e0614c99c9b0 100644
--- a/app-vim/vimoutliner/Manifest
+++ b/app-vim/vimoutliner/Manifest
@@ -1,5 +1,5 @@
 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 661 BLAKE2B 696d301988c28922e2a0ac21ae968cd7e839637c8f32feb9eaac0a0838d08cb258c62ef82bdf2e46982fada5a4bb96a2d5f4c60c542f7db69764588484527210 SHA512 4a6e991e78db3baf9650c4ced113f479dff68b6a81f12002b20c267fbdf8441da69851817c13601fbc308da32368da611b0b199f03f18c72f6acaf58c73779ab
-EBUILD vimoutliner-0.4.0_p20180301-r2.ebuild 1261 BLAKE2B 8e200382c2c6b30e1bc1d3271671405ee6aa5dd721dbf5f16dce56468c2dd175dae3d5a1617a776188546fc7d477abd48f7da1824937fe4e25cc14ebc88ac71a SHA512 568b970a90353320771640880863f6299506fd2f865b22198bdbc3df3ad3c597134ed4d29ac28a80bc4a2f03cd1ab81d50c6a84d23680353c16b483340c40cde
+EBUILD vimoutliner-0.4.0_p20180301-r2.ebuild 1258 BLAKE2B 2f5d01548bf83169e64ffbac3f4d91a247d4d18671da4259bb8a59667a639cce90c68bfb01521134bba612964c11dfec47221e83e8b51b981f95f10b38b3b04c SHA512 9ef0474a410b97eee83cdf2a49c3cde6c8dc4b366e8a2b46188d521024b93ff212fe1a06d44f2f90f142a2f1d909c70f1a8b90c02cd1ca856405ba37f5f18f7e
 MISC metadata.xml 361 BLAKE2B fb9ec07c9fec7dedf5f8a5717a7b4eb875264294f5eb9a24fed191a1195bea800bb0f0fe9ff4d81d02f36f35910239d96e218f332bf9818e27a3f7af7a1ee502 SHA512 c65f2146f0ddf4d6c048f5e6f87db0ab5814fb05966a2b2a9f60999485125975dacb5d609ec9484f7b4c8c6ef7b128d59a4f7ed104d6cb582c8c42a88bfb1fe3
diff --git a/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild b/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild
index 0d2e68eecfbc..2478967b3053 100644
--- a/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild
+++ b/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit python-single-r1 vim-plugin vcs-snapshot
 
@@ -27,8 +27,7 @@ RDEPEND="
 	$(python_gen_cond_dep 'dev-python/autopep8[${PYTHON_MULTI_USEDEP}]')
 "
 
-DEPEND="
-	${RDEPEND}"
+DEPEND="${RDEPEND}"
 
 DOCS=( README CHANGELOG TODO.otl )
 
diff --git a/app-vim/vimpython/Manifest b/app-vim/vimpython/Manifest
index a897381d4cdd..456ae4aea29f 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 471 BLAKE2B 37210a64b186cbca77852434b0914d2d9761eebdf0d5032b30729aa73c7589738b3798927c274535f8ff4d9032b7a651f7a74f11e1a97f1f0b172f6e1418d55d SHA512 a8002f8c241915a769825f6b0804ca314ee08ece4a60511bf719ea957e49b7d050140ca9752c6561ba961e355c2a6aadb77fab6ce3c929a2bb086b540d153f5c
+EBUILD vimpython-1.13-r3.ebuild 449 BLAKE2B e58ef13f67ff90555160c559b5c49eb068a61d65f4589136ce6c7f03ba7fb27085a1a87601439a9895f665a9e04a39926ac52e9d5ed83745950d0b70e532f497 SHA512 c954a8fe3b64b74fe39fe3d6a70c57e44c12bdff4d898137054d3caf00742b3b3a9197fd58f5bd7dbdabfddf44e833b7e0f761e4fe81093169fafa8564ea4c05
 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 923da1931b4c..08146d8bd75d 100644
--- a/app-vim/vimpython/vimpython-1.13-r3.ebuild
+++ b/app-vim/vimpython/vimpython-1.13-r3.ebuild
@@ -3,16 +3,16 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit vim-plugin python-single-r1
 
 DESCRIPTION="vim plugin: A set of menus/shortcuts to work with Python files"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=30"
+
 LICENSE="vim"
 KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-BDEPEND="app-arch/unzip"
 RDEPEND="${PYTHON_DEPS}"
diff --git a/app-vim/voom/Manifest b/app-vim/voom/Manifest
index 94a71fe76803..dec1083764c0 100644
--- a/app-vim/voom/Manifest
+++ b/app-vim/voom/Manifest
@@ -1,3 +1,3 @@
 DIST voom-5.3.tar.gz 115841 BLAKE2B 6e88c4121b796a75ee623537483ff579acb4de73ff353408381ee64ce708cff1d7f8c45bdbe1e0c9761b5a17dd3aa54b3a0a2cf83873628bd1490e1524962ea2 SHA512 f51f30641d8b3d0ff5cd0d6b31cd1d8a15cb14f20f973ac83b9b5d046b94452e6e4e4ff0b28ce7842aa7f9b656a9dd631297aeae16ea75eea4411d911057873e
-EBUILD voom-5.3-r1.ebuild 689 BLAKE2B 6992c00a34f6b295fe87f4922e77fcd9e2917754eed1cb447b06df486985aaa57ba115044d3c35e7d66c0f29326f1adcf07e1a513a5567c2dc9c7b5ff1bd94fb SHA512 108533bdcaae97ed04f657a2411c1ca907f83ea777848caa7c99f620aa1a434b9e77cc8fd85b2702fef179982289b704016ce596b83cb3090d97cf21596bec2f
+EBUILD voom-5.3-r1.ebuild 691 BLAKE2B b72132664b2b17ce74671b5c6b7babc3c6050ff35d54897648439209da75cf543669c0ae6b56fadb038d157d5a866eb70827c38498a7e8687d7fe16aef31aff8 SHA512 937cb46c9616dc8778accce4be0469ee6588bb5d184557f9ea3ee28dd450e54f89e8c067782fcb81d6d2074ba6c559a5d4b70e05967361196c1e09f46be09647
 MISC metadata.xml 245 BLAKE2B d4f5ef381d0a479a17bfde792cd6828e5fa0ecdd26732c1a13c97fcae2f22396b879fb430aaea7680920d5ba897f78cfbb6e50bb2f65165613a5a0ba1f7dc609 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2
diff --git a/app-vim/voom/voom-5.3-r1.ebuild b/app-vim/voom/voom-5.3-r1.ebuild
index c66903414fd2..c816d1df2d79 100644
--- a/app-vim/voom/voom-5.3-r1.ebuild
+++ b/app-vim/voom/voom-5.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit python-single-r1 vim-plugin