gentoo resync : 10.02.2020

37 files changed, 116 insertions, 126 deletions

diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 8633386d8e19..1d02eba32a17 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/automatictexplugin/Manifest b/app-vim/automatictexplugin/Manifest
index d9e8ade29fa8..6220d2d1d02f 100644
--- a/app-vim/automatictexplugin/Manifest
+++ b/app-vim/automatictexplugin/Manifest
@@ -1,3 +1,3 @@
 DIST AutomaticTexPlugin_12.5.tar.gz 442431 BLAKE2B 8e6c199df24336f318d37248d96f1f1c953c9f0d0e6cd05f1891403b896aa3ea870dcd9ac72c530aa3779e65804f318bfec6ca769592091dc29cba25b2371316 SHA512 93e48b3d7eb9bdc0319bf03d0ddc59f49c2aab63170030b4234fa83aa3aeb739f1384c4a94e09e630b82d328d9cbfbbdfbf493e6decff915ad9cd4d5b2fc3a5b
-EBUILD automatictexplugin-12.5-r1.ebuild 825 BLAKE2B 5c0a06bd07f68d396b66552c5159e945e3137dc70adad006396bb3adb50aaf359a7a181f009a380830caba6a343b0951afde277f12e267a8d95c7c23e2f48156 SHA512 129af107a67db846ed10fb3b82b2e08e141d836b5d1ad673266457c5d3d05a658c6c48ccfb7efe722f229fe9baa376733efaad28bf72787b74a6ad36d3cfb442
+EBUILD automatictexplugin-12.5-r2.ebuild 879 BLAKE2B e3f98b2d5f419ba755e2d6a773d8f633daeff6091c13335228068ed41de520cf0ecd0e2e919498853e6274d4f2f7b2d041d92a1dd2a516b197f9a668349afbfb SHA512 0f3c9ec25b8214a95a064d5c0bbdbc2ba4a8caeb56aa0a85b1dc575cd5a6200467d3699e9f161625eaaec77828716b4121e800900269fcbd367236c78d3dc411
 MISC metadata.xml 326 BLAKE2B 06ff44159678364bab7d0bbc453b9ce39504c5b70b23438919f8fe449a60aa8e1755624bd7474073dc9f2f1135a403d207765171fde940d3c5e56d7fb1019f0f SHA512 8ed4ff2cf60c6e0c39bb3c60c4f9ad4f1a5b6888192bb43fa9f0fb45efd89a549de839c60678bfbe6ed2353f594ea6b28b53f63ae2530650c0ea563325a0f5ff
diff --git a/app-vim/automatictexplugin/automatictexplugin-12.5-r1.ebuild b/app-vim/automatictexplugin/automatictexplugin-12.5-r2.ebuild
index d3a67dadea3a..d32b783b6b13 100644
--- a/app-vim/automatictexplugin/automatictexplugin-12.5-r1.ebuild
+++ b/app-vim/automatictexplugin/automatictexplugin-12.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,11 +17,17 @@ S=${WORKDIR}
 
 VIM_PLUGIN_HELPFILES="automatic-tex-plugin.txt"
 
-RDEPEND="|| ( app-editors/vim[python,${PYTHON_USEDEP}] app-editors/gvim[python,${PYTHON_USEDEP}] )
+RDEPEND="
+	|| (
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
+	)
 	!app-vim/vim-latex
 	app-vim/align
 	app-text/wdiff
-	dev-python/psutil[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/psutil[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-tex/latexmk
 	dev-tex/detex
 	virtual/tex-base
diff --git a/app-vim/colorv/Manifest b/app-vim/colorv/Manifest
index b90b9d88cd3f..e068069847dc 100644
--- a/app-vim/colorv/Manifest
+++ b/app-vim/colorv/Manifest
@@ -1,3 +1,3 @@
 DIST colorv-3.0.2.tar.bz2 47059 BLAKE2B 2a84b264085d61f02d3ec881bd1f097d11f23286f53f52e46db468f3bb49df94dcbb9a3514bbbe143167fc597f871064dc998665a25796c43d000c051a62debb SHA512 cb4a893d65bbada5cec27c0810bf3e78db3c64e64f4179529d5da30402ab65b141f53dd7f2a9e8bbccf3d5f7dc5843afc7cab0d908e66a86fc41a5c38c9a848e
-EBUILD colorv-3.0.2-r1.ebuild 950 BLAKE2B cdfcdc7dc3194f2df142652c5c0aff747aae19c03b2706584b80fa4cf070e42b10ba2fe6ac6aeb6fd1d1e798360d8b26761c803c40100a7dc797904a8680ff67 SHA512 703c0521578c74c3b4a533faadb28419ba8e442d2cfcf97c85b5026d483ca09a82587ae3f925dfbfa2fc21c5c43dc82062fbc84b967e71d52e1a25c0e9c36fe0
+EBUILD colorv-3.0.2-r2.ebuild 1011 BLAKE2B 7ba5342cb4601b9124767fea12dc004c1ccf9f77ea96093133977eeb7a538bc68cea62f6dc259ec52cf512b8fbe7ac38335ed4689171418ad7379edf763720ae SHA512 09ddef248e432ecab47afdfe9031e13350d11bf91f0aeb002cb159ddaeaf919a59673c5e18f1c44bd1d903a1b455e415314cf5ccde72894b2a1488ba1d9ac45f
 MISC metadata.xml 332 BLAKE2B aadba68bd1f0ea3b25ff5b0e807175ec9438e0b10479b539ad60199e9ea3c4442ab45dba549b6507b98b5416d4a65cf981d750cb8698b219e56bb792da616543 SHA512 f7665a682723f68af0fb47584b8442216937a348a9bee52959209cdb44de6d79453ef4029c0ae536371e5a2292624d1cad8c2058d569c703d4f2fa17c0eef0d9
diff --git a/app-vim/colorv/colorv-3.0.2-r1.ebuild b/app-vim/colorv/colorv-3.0.2-r2.ebuild
index 7f371d403d8d..2f7155bb1008 100644
--- a/app-vim/colorv/colorv-3.0.2-r1.ebuild
+++ b/app-vim/colorv/colorv-3.0.2-r2.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
@@ -19,10 +19,15 @@ VIM_PLUGIN_HELPFILES="${PN}.txt"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	|| (
-		app-editors/vim[python,${PYTHON_USEDEP}]
-		( app-editors/gvim[python,${PYTHON_USEDEP}] dev-python/pygtk:2[${PYTHON_USEDEP}] )
-	)"
+	$(python_gen_cond_dep '
+		|| (
+			app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+			(
+				app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
+				dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+	')"
 
 src_prepare() {
 	eapply_user
diff --git a/app-vim/conque/Manifest b/app-vim/conque/Manifest
index df987dba3e70..c74aa4f6a4a7 100644
--- a/app-vim/conque/Manifest
+++ b/app-vim/conque/Manifest
@@ -1,3 +1,3 @@
 DIST conque_2.3.tar.gz 52195 BLAKE2B 31546d8e0797525cd05a4663f3598a11cbb5dd7dcc6fabf181d277e2cab88593e1458f5e646688e9e46a8d01952eb1383f358454200d59634c40920b93b7db9e SHA512 b69c0564ccaf897ee2f18d0769877986e67006cf33dbefe2bbc85261726372f09669d19aa118de58ccfb847cc8b7e670e25c030128eec665e1cecf0a96cb4b89
-EBUILD conque-2.3-r1.ebuild 666 BLAKE2B bb212862c205a66a1c106bdb99e5e027c1b4f727a45c16004edfd3c6bd5c3df485f4ba192c3f526be1d0ff9faf4f1091e44e072be95f38a0e86e6da00407466f SHA512 f5a3d6dceadab4cb80debfe16363f4830eb1aea4520a34c2efd7c2e9540cf482278608f7be706586308dde7c5095662138743254411ee0cdc217c092fa5c3719
+EBUILD conque-2.3-r1.ebuild 687 BLAKE2B 04ba99fca5c2aaf5ec798819988c4574398030689d7424b37bcc93ad785cf1c8cd8b982bdd21edce609c6b73c615960799dc1c4199be0013b6f2227411225ab6 SHA512 a18795efde16110c82cd88ad5cdb9fdba62e0b3f8a5af8245db20b4e53834751ebb6b0428ef6473206ed9495154762b582eac367a12204ad2c61d9e9d00be322
 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
index 970df3e6eb86..ff3d95216cca 100644
--- a/app-vim/conque/conque-2.3-r1.ebuild
+++ b/app-vim/conque/conque-2.3-r1.ebuild
@@ -15,7 +15,11 @@ LICENSE="MIT"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="|| ( app-editors/vim[python,${PYTHON_USEDEP}] app-editors/gvim[python,${PYTHON_USEDEP}] )
+RDEPEND="
+	|| (
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
+	)
 	${PYTHON_DEPS}"
 
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/app-vim/editorconfig-vim/Manifest b/app-vim/editorconfig-vim/Manifest
index e005d4b0e112..c48f5a7347c2 100644
--- a/app-vim/editorconfig-vim/Manifest
+++ b/app-vim/editorconfig-vim/Manifest
@@ -4,6 +4,6 @@ AUX editorconfig-vim-0.3.3-python3.patch 5601 BLAKE2B 4a9bee66b7b3b2b016d13a557a
 AUX editorconfig-vim-1.0.0_beta-wildcard-slash.patch 808 BLAKE2B bc35a580b10a9fcad5916197fb891fa4b9bb8abf7842fbd292b2a91dca60f95282b1bddb365d2286bc2eda4b4a8d922e8aea89312aafbce3a039288adb112e71 SHA512 004f27b01d0f8bd2a71687ce2c09bc70895377034775ee7b2705874d2458cacf36b5d1300d6ed9e1a6925b33428c7a208e223e4f65824cd3bedf56b938c7bd92
 DIST editorconfig-vim-0.3.3.tar.gz 35395 BLAKE2B a7b65c1472024017dd408e5c4ac5048004d0bd55f44c7cfba49b5973cb445125ed89cc3d4363fb902a4c5fbb507f3ee5ed0ca48aece3fb6915e643bae0dbf70c SHA512 2dd968cf6bb162db8e6242ffb60cc61fb05a8042804b6b46b9f9cd35be968f83b473f04797e47c5cff11d7c052ff523bf8ba1d568992d44b72b97b54a81425a1
 DIST editorconfig-vim-1.0.0-beta.tar.gz 31519 BLAKE2B 2d5e8e55e8dccc0b45453b8da9ecad80867a84d1ea20146581886f793c093c201521a7d1d4451122ae441d30f58acec28d29aa20da9de737b5beb7f44d55c0ed SHA512 159e3ca32a7ffe71853ba62a14d0469310b81345b0e704dd6a9f42c56f6f6b9a3f63502ccabcf43a15443acf4acefdaf078063ae747f49315b89f5518d7f9816
-EBUILD editorconfig-vim-0.3.3-r2.ebuild 934 BLAKE2B 155150d1a69046983912213b39845e903db3b8fc300b2b730026eb980f24e88f37cc9865f3426826a90ccbacf83d293ad92854de8036b0166ecd3ad147d54d0d SHA512 6b3c96e74dfa6e15b1c733a590e3b04b3b9372804fb12dcc194ab0cc61608dc69019191ded4e0cfa5970e7a4aa3c98560f4522a536107e26e45ccfcbce67c08b
+EBUILD editorconfig-vim-0.3.3-r2.ebuild 984 BLAKE2B 4d5151da95882cc23e8d05553e52ec6c926e9d3b8167d6509846bc76f9ebc87b6797c0fe928ec48bae0b711d46fdc416e2de835b0f9ba7a5887b866325899fba SHA512 5b989484463ab68fc9a07d90174a79b7a8cd0d18bf817b2403ff6505d04cdb710f668cec5cbfacdcab8c1a9df10ac3214aa3a651dab5aed0c27520a4c26a84ff
 EBUILD editorconfig-vim-1.0.0_beta.ebuild 781 BLAKE2B 2580c0c64c53203e5e09fe72459239b8992f5f644c6d0af485525fc445417fef88fdd62adb22019066dc6860ae84be82f01a1febbc2742808e6b84e529f4a14f SHA512 eda756f5ae0697fba4cee959571ef3314f575b6d11c1aa1023f71cd3bbed9c147f8d210235ef306af74e6988849cb242d8baf45ceefb19421ccaa0b3eb3ea13d
 MISC metadata.xml 419 BLAKE2B b73a8d7814d585826406516eff8e391fbeec6b1da25bb5b583ad65709260819753bba45f88cafd3c7337854843ce7aa02a8f00f9ab49973c0bfa422e4ef801d6 SHA512 57167b4b86b6bb89094b28341476c03f8415c1dff97fd90f91c882991afe5e33fbd14edd38a18e07d06f3498f070ced5ca9e598b66e7e615c37146b598b6282d
diff --git a/app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild b/app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild
index a3f80d6cb8c4..006508da113a 100644
--- a/app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild
+++ b/app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild
@@ -17,10 +17,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
 	${PYTHON_DEPS}
-	dev-python/editorconfig-core-py[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/editorconfig-core-py[${PYTHON_MULTI_USEDEP}]
+	')
 	|| (
-		app-editors/vim[python,${PYTHON_USEDEP}]
-		app-editors/gvim[python,${PYTHON_USEDEP}]
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
 	)"
 RDEPEND="${DEPEND}"
 
diff --git a/app-vim/eselect-syntax/Manifest b/app-vim/eselect-syntax/Manifest
index 44e83b1df93e..0a772b82198e 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 573 BLAKE2B de496253ba0762399e52d3642e2b7c04dfbf676eff946985bf929313030e3a80d4cad91ca143bd76f8d792f9baf8cd45be088abbd404d3cfbe45dee06c8f27fa SHA512 e7b7e117b9a92bc88ba56438c76364cbee6d0ca7f4deeda5acb58152e4f262b7783ed67f2fddafd31a1980669783549a1d829e53ee38294bdc4657ab030f1350
+EBUILD eselect-syntax-20070506-r1.ebuild 590 BLAKE2B 21f9a68ba3b03b35861cd9585c2ea3d76bb0fa71e9f5ce8ad912eb5b1d83b1192b968e78a815bb62b0aadbea5b088b9bb5a327d480746b81dcd496c2c272c767 SHA512 519e6dc3dee4651f81ad1b53f7bf97259ce3204fc02ad0f38a3fadc444a47a467c198df81c20f3502e17110201958d18ad1b625d6e4cec66df1d5fe840a15310
 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 ea10ddd21780..f6378382284d 100644
--- a/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild
+++ b/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit eutils vim-plugin
 
 DESCRIPTION="vim plugin: eselect syntax highlighting, filetype and indent settings"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="vim"
diff --git a/app-vim/gundo/Manifest b/app-vim/gundo/Manifest
index f6e8a3a04fdb..5ba30bec618e 100644
--- a/app-vim/gundo/Manifest
+++ b/app-vim/gundo/Manifest
@@ -1,5 +1,5 @@
 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-r1.ebuild 763 BLAKE2B 475944514327afa9c6ded866d535b4087e068ae8bd6f47f61501912f2101628fb011e8ec919da9946524fb10216a29845c228f77af1d783b83e4121b02a8171d SHA512 0d512e790e4cb81ea73e1015c40d86084a485cd084003b71a2fa98465134a6937dbfff649b88eb4300a78cab5b6da63684368504f0a41f545a145e1980c6b3a2
-EBUILD gundo-2.6.2.ebuild 715 BLAKE2B d17f051fd9c56d9e20b91b63ecfc1c14231fe74c22d9847ee01151cf3662810324437d1c44aa7fdbaf57727b5013de447719cff542de3bbc632b4e9a10567d27 SHA512 cc9056ab97e1e31a34176960c782f0f86f242affdc7863c9562f1eee4c623082eda7c91c922dd655808d30985e348bdb923c133bf565c875fa978df8783b11b3
+EBUILD gundo-2.6.2-r2.ebuild 729 BLAKE2B 7258e63f666c6a2a9470830d1066f72109cf4a5a2275a33989fe2e732a0b31818bc1e55b60dfb112c31d6d0e5979e206443d3c672693d85b676ce84244c45fa3 SHA512 8645215b5d72cb5cde46318cd1c7b542a99191b2611a41a162eabb76c35aff2c9f1887e311fb833f92c9e736ffdd313e8d0da0bfa5410a7c0cfabd4531ef2435
+EBUILD gundo-2.6.2-r3.ebuild 777 BLAKE2B b683fb073a2957142b9f0aec041edfaaea4594427c503db286878e6e0e47509eea8fbd101132ccbd3b3010eb5e2c55716b88698de4d3af9c48a1589858cb6034 SHA512 4191fee5a4c5bc1ff16a45fd443f5566750baa9125ba57bf4372cb1ea2aad314be0933cc17a954c0e33a16ac3a57cc0fdfba9beab6a871f5cc95f5af9cf7dc83
 MISC metadata.xml 337 BLAKE2B 08b3c90ab9c289b83c58c3c67fa09f3306082e9d660b8ac81e75f14a44d434fec2657ca4f21ef6660ae46923abe92053a22b404ee9fd443b34775191a999a7e8 SHA512 14459476fa97a611646909941de602646af184e1de555dfff407e71b8fa935c23b5f863b58432be84c31378badabecf8893eafd454d06f8c57759a3bb8035854
diff --git a/app-vim/gundo/gundo-2.6.2.ebuild b/app-vim/gundo/gundo-2.6.2-r2.ebuild
index 0c3b69a6049a..4dfdca739ac5 100644
--- a/app-vim/gundo/gundo-2.6.2.ebuild
+++ b/app-vim/gundo/gundo-2.6.2-r2.ebuild
@@ -17,8 +17,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	|| (
-		app-editors/vim[python,${PYTHON_USEDEP}]
-		app-editors/gvim[python,${PYTHON_USEDEP}]
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
 	)
 	${PYTHON_DEPS}"
 
diff --git a/app-vim/gundo/gundo-2.6.2-r1.ebuild b/app-vim/gundo/gundo-2.6.2-r3.ebuild
index 3140f0d8ba4b..fa78d2605c20 100644
--- a/app-vim/gundo/gundo-2.6.2-r1.ebuild
+++ b/app-vim/gundo/gundo-2.6.2-r3.ebuild
@@ -17,8 +17,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	|| (
-		app-editors/vim[python,${PYTHON_USEDEP}]
-		app-editors/gvim[python,${PYTHON_USEDEP}]
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
 	)
 	${PYTHON_DEPS}"
 
diff --git a/app-vim/pyclewn/Manifest b/app-vim/pyclewn/Manifest
index 167cdda2da2c..9c322bc4a3f7 100644
--- a/app-vim/pyclewn/Manifest
+++ b/app-vim/pyclewn/Manifest
@@ -1,5 +1,3 @@
-DIST pyclewn-2.0.1.tar.gz 124914 BLAKE2B e1dc12174d2ac640476a36714a8ef221f64db4b19c9509a179bc0cf573200de0f1f888bcc3bb69f433064e2de2d881845099f609468e12ed72e5c547623d44e5 SHA512 996acbedbb7922109925f188efba4c71e83f1823c029f92dc00bb21449f024232ef55df0c74a9fd4bfa7229523ed9ad4301aa9dbb8a3c20424082fc6939f63db
 DIST pyclewn-2.1.tar.gz 129697 BLAKE2B 0dfef92cb36ea9fa89c7f0d85ed45e21c634732fc2d3d888dd792de22529bea86719f8ac8ed870dd5ab00efbfdb08011013a36880781abf9e0c64a62b2aa301a SHA512 346b98a9e37957a5bf97b8901247f56fa8e38bddac38727867773cf4e78e555d6a85848c4c400d1faf1159ba61122cfd4931c95a67e3b2abdfaae7996beb4f1b
-EBUILD pyclewn-2.0.1.ebuild 1048 BLAKE2B 6c2cf7d1cbda3ecfc26a217b6cabc4823ab722cbff6c07849d669d2f6153851ca1c6acb98c52314e0c4a40175283104f02de5156d4e09a96615371c85da08293 SHA512 35af5d02607e69b5a287607aca6561a51822d929b4a7549bd6e591777a33751748ad5f46ecf4c9d4bef1cdb36492c8e8e6643e8fb3052eb66778716c62e1eecb
-EBUILD pyclewn-2.1-r1.ebuild 1109 BLAKE2B 5dc0509349899c2551e33fb6188112f07b16321fbf6d7a822062d7e02d0bdfc1ef29edefcb97fca570940e918e6f82fd157655f169c32d910a142e2b37693ee8 SHA512 b7dae7a31a43986b65ee42eda290b3f4ba7ab0ff02872a738b9cae7e37cbc239ca4be96db68927cdddcf8e839cc2e87a11c315094de11bbf02bea466ec456308
+EBUILD pyclewn-2.1-r1.ebuild 1103 BLAKE2B a28594428383a1005b95f9244c590511cebd508e7f63a635e243fe3436e8bfd9a2a7d312c47321a2be433877978192c8014b821191dedc8ce1b34b5673bc48e9 SHA512 5ee737d51fa4249f7349c16a7dcf508d699abb0a26156ad35e490790eb9c8439752414e7b99220b251e6156cfa58cb4bf79a1cbcd5459b691cd577e837040da1
 MISC metadata.xml 499 BLAKE2B 4955bd7a080dc2ae909143477040d191cb48ab4badfd47b6b7c11fd4686139bbbe77475f005e10c3b2bba50d0615b94600a55cda57a7d02ecaaffe1e504219dd SHA512 30b127677f0d5a9afce208e5cbb00c9b98f6d7e771ef273155f9acad764da789e71249289104e8006420cf5ff62075bb7572527150f9b339e0e51cb219c76a81
diff --git a/app-vim/pyclewn/pyclewn-2.0.1.ebuild b/app-vim/pyclewn/pyclewn-2.0.1.ebuild
deleted file mode 100644
index fb63112b6704..000000000000
--- a/app-vim/pyclewn/pyclewn-2.0.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils vim-plugin distutils-r1
-
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-DESCRIPTION="Pyclewn allows using vim as a front end to a debugger (pdb or gdb)"
-HOMEPAGE="http://pyclewn.sourceforge.net/"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="|| (
-	>=app-editors/vim-7.3[${PYTHON_USEDEP}]
-	>=app-editors/gvim-7.3[netbeans,${PYTHON_USEDEP}]
-)"
-DEPEND="${CDEPEND}
-	app-arch/vimball
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep \
-		'dev-python/trollius[${PYTHON_USEDEP}]' python{2_7,3_3})
-"
-
-SLOT="0"
-
-#Completely broken (runs vim), disable for now
-#python_test() {
-#	esetup.py test
-#}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	vimball -x -C "${ED}"/usr/share/vim/vimfiles lib/clewn/runtime/${P}.vmb || die "Extracting vimball failed"
-}
-
-pkg_postinst() {
-	vim-plugin_pkg_postinst
-
-	optfeature "C/C++ debugging" sys-devel/gdb
-	optfeature "Python debugging" dev-python/pdb-clone
-}
diff --git a/app-vim/pyclewn/pyclewn-2.1-r1.ebuild b/app-vim/pyclewn/pyclewn-2.1-r1.ebuild
index d8c0d5884df9..82746ceb4849 100644
--- a/app-vim/pyclewn/pyclewn-2.1-r1.ebuild
+++ b/app-vim/pyclewn/pyclewn-2.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils vim-plugin distutils-r1
 
diff --git a/app-vim/slimv/Manifest b/app-vim/slimv/Manifest
index 3f37ab7e0cfb..efd208d67be6 100644
--- a/app-vim/slimv/Manifest
+++ b/app-vim/slimv/Manifest
@@ -1,3 +1,3 @@
 DIST slimv-0.9.13_p20170910.tar.gz 634493 BLAKE2B af7963e1d1b60b20294c935ecd076220777eec333b4e91bac82a111b727ce71c312c347b865f9e0c9072c0f94b40dc920b15feaf10f8683e1bba7590a177e62e SHA512 562e08866d62a6af5c20064a4533da7f0577ceb43391fac59acc0bb9c76319e3520c951c325277edbb2d0461fa227b91456c54ec5d9d1e3bca18d344f3e9a5e2
-EBUILD slimv-0.9.13_p20170910.ebuild 996 BLAKE2B 412643972587fd97dfdcd2e61fb30ab5642be1f3fb964b955b95d656948907d13916f52a35b79c366d8231321c8191b6b1826ab3f7dd9b0b51241b5a8849d932 SHA512 5d3d6ade3c3565c34db01f21e6649fad364f323bdaff36df8e2f4b0396592a5378c043562168716ae23a2717f89e7594eccfdf7b3203df03311aed9bc865d216
+EBUILD slimv-0.9.13_p20170910-r1.ebuild 1010 BLAKE2B 1f7791f1d7d17a9b38df7242dbd38749ed46dc7c081ec912cd7274f9e693f63c74425d460024d66cb9f5b36db60484db559b7a7fc8806df1120ad546d14cf81f SHA512 df500baad06d612685981a2c474d9985409676962e246fe703174071279c7659c0f31db617070749923d3f9d6cc2e615324beb811e8dda878dc2963c0d24a381
 MISC metadata.xml 1220 BLAKE2B 7d60a456299acdd198b51276a1016fec37007bdb6220efaa786889b0d046de73d14724e2a8bd5efaec84e0c850ff69bdaf344bbedcafa132a0a8c0c45fad051e SHA512 11c6fb3a83ea65ea97e57e70b24d9e011d48fb456bff15ea8b501e0dab767f73c78ae1c63e662423599252dee9969c1983b17fd1505533b3ee26f3afde2a3b29
diff --git a/app-vim/slimv/slimv-0.9.13_p20170910.ebuild b/app-vim/slimv/slimv-0.9.13_p20170910-r1.ebuild
index ab6f8f4b3d30..82a26de9ea02 100644
--- a/app-vim/slimv/slimv-0.9.13_p20170910.ebuild
+++ b/app-vim/slimv/slimv-0.9.13_p20170910-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,8 +17,8 @@ KEYWORDS="amd64 x86"
 
 RDEPEND="
 	|| (
-		app-editors/vim[python,${PYTHON_USEDEP}]
-		app-editors/gvim[python,${PYTHON_USEDEP}]
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
 	)
 	${PYTHON_DEPS}
 	|| (
diff --git a/app-vim/splice/Manifest b/app-vim/splice/Manifest
index a134bc35a846..7cd59f91ad8a 100644
--- a/app-vim/splice/Manifest
+++ b/app-vim/splice/Manifest
@@ -1,4 +1,4 @@
 DIST splice-1.1.0.tar.gz 15513 BLAKE2B 8517d8c2fef2ccb85267a69c606e861a7c5498af2c23454ce58fb4e6035b13d71fab08c7fe09198b99453a1475062a7916814ef2018adbb849b48fac32e16d51 SHA512 3008c5628ca7b05be451521f9e1f0f2d8dcc8c968e95f2791e76a355b2c9f3b85c62faa319a2f1427f223094b3e606577d19a61b2384b78cbd6d40f497e4ad37
-EBUILD splice-1.1.0-r1.ebuild 895 BLAKE2B d0063aa7c5d4788216974c034c426837954c162b3f192b13a48c64ba2912216628a3514e8201d40dc1ef70805ba9f49cdb91303ff37bedfb137b749de3bed3ca SHA512 270cbbb682bdcc9dfb1a25a883085807611e090405d6351d4ed9dc3eeace4107a736b85c9ca28bf1019aead61d6058389b4f6b373e9accf3a8c0a39ef03b8dfb
-EBUILD splice-1.1.0.ebuild 886 BLAKE2B 1465580ca5ac656b5f400911dffd513c09795a9f7aaeb96bb5de7316bcb1f9a86a0904a69f416ccf7a6bf5c93604ee2c543761a9cd2ca5b030ef1f0b9d6724b6 SHA512 3bd938952eb3155f5430d0b98afbe8fa3e41e27b6f9efa47504fa9158ca8afdc80c95d10d8df011d99190e8ac9b4c91266a4347e4f01b9cd048642d0b1d39fde
+EBUILD splice-1.1.0-r2.ebuild 900 BLAKE2B 23ae844f6156b6adcfd95a3738b1bdca8fefacc37b2203b761f06381c3ae0cb9008bd86c4a1a9cfa5a3b23d622a98bea1d8feae1d64176af56ca9bad9a6bd4da SHA512 0f45f997070b8e1ac83300f342efa99b14f249685e6bc4ca120fc2e64c3111581945fe345802fd3f1ebfcf8458cceaa623b6331df96f48ecd29088311c456997
+EBUILD splice-1.1.0-r3.ebuild 909 BLAKE2B ae3fcdcaad1d736a2e928e8f7d96ab4eb203599e0afd7eb6de4fc422f18a1c7967744e865e59c33bc38af6e95bf77d2ae1f2e1946593f49f1ba5b4cf5859d85b SHA512 08a4d525508fd884b8f5a65e5f7d749fe86eef541fcf055213ce564bcaf3bbcbf4e6e79c5a0e0d3c5a8a7f4c70a32c3c1e5e941247248d61999026570ef06f84
 MISC metadata.xml 379 BLAKE2B ae1816407de2de76d021e1577e8dacf863585fe190af44b9af8b0247cfbd61fc834601b87412d1d048655924bac586fef79d869bf553213f566a81372cc545d6 SHA512 76d8d1f9dbdd2aa7fa54e8d4dde8a34fa62e69e5e20154545572f3c083df1fddf7e3ed286d1077f63cd4a46bdb7bcf3617700fedd2c77800e1dc4d15ac67e9b0
diff --git a/app-vim/splice/splice-1.1.0.ebuild b/app-vim/splice/splice-1.1.0-r2.ebuild
index cdcb146ca4aa..84be23b68c94 100644
--- a/app-vim/splice/splice-1.1.0.ebuild
+++ b/app-vim/splice/splice-1.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,8 +17,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
 	${PYTHON_DEPS}
 	|| (
-		app-editors/vim[python,${PYTHON_USEDEP}]
-		app-editors/gvim[python,${PYTHON_USEDEP}]
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
 	)"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/splice/splice-1.1.0-r1.ebuild b/app-vim/splice/splice-1.1.0-r3.ebuild
index e23492a64dc3..3593b4bec5ff 100644
--- a/app-vim/splice/splice-1.1.0-r1.ebuild
+++ b/app-vim/splice/splice-1.1.0-r3.ebuild
@@ -17,8 +17,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
 	${PYTHON_DEPS}
 	|| (
-		app-editors/vim[python,${PYTHON_USEDEP}]
-		app-editors/gvim[python,${PYTHON_USEDEP}]
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
 	)"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/vim-latex/Manifest b/app-vim/vim-latex/Manifest
index 56b6f7f09b0d..fa12b07b4fcd 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.ebuild 1564 BLAKE2B 08054adb116e161a8d0943b94aae1754c3ba0d24677aeb8a8deb2043a9d8b70365b57d6a5ca5a2ef2a1563a437868a4b497bedbd98a4e26c61927feab81413da SHA512 3946e141d0f138416b6786d374b58033929a72dad232c743a2f160826a76245d1e53bafe4de095dec655dd5f3b14ff2ae32e63544671c4096d624b29efa1cb37
+EBUILD vim-latex-1.10.0-r1.ebuild 1578 BLAKE2B d07b352d0d5c3af5989008b8a9ecacf6950fa21cfcbdf51cdf089a369b2ef929f3fcaa3e080f85cf0859d6ca0bfb23ed92a875c13edd47788618f28d47d16307 SHA512 53554507ccf73f681a82eeb581fe0b9688b3ef82638c40d0f8d403ed451004a648d07bf6fde1e0eae1792c01621092c3f92f0a769115299999e0628bf5de807a
 MISC metadata.xml 328 BLAKE2B bcf4c9979e43da6c141669c218e852e7a0c062d900c35790709e393f6cabc56f646f7a84e8057d9dbafa0a73e5786135a7cfe3ef825af867500bcd502f03a61f SHA512 e14b88742b6d8143cb578ddac61dbc0ac5e84c90659e8d9b5c40882ebdf35dc001b1ffae26eb90617434b2c8a898055c838738bf7cf18a45cd2a2ce66a30bdce
diff --git a/app-vim/vim-latex/vim-latex-1.10.0.ebuild b/app-vim/vim-latex/vim-latex-1.10.0-r1.ebuild
index 58de37ae2552..3543ff2aafe0 100644
--- a/app-vim/vim-latex/vim-latex-1.10.0.ebuild
+++ b/app-vim/vim-latex/vim-latex-1.10.0-r1.ebuild
@@ -18,8 +18,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
 	${PYTHON_DEPS}
 	|| (
-		app-editors/vim[python,${PYTHON_USEDEP}]
-		app-editors/gvim[python,${PYTHON_USEDEP}]
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
 	)
 	virtual/latex-base
 	!app-vim/vimtex"
diff --git a/app-vim/vimcalc/Manifest b/app-vim/vimcalc/Manifest
index 2f85d5e40c09..e130eca9edbb 100644
--- a/app-vim/vimcalc/Manifest
+++ b/app-vim/vimcalc/Manifest
@@ -1,3 +1,3 @@
 DIST vimcalc-1.3.zip 24993 BLAKE2B 8cfd0a399b4888fa4e9244f7f6a315f97a3e74c78879c281d596a1a5c109711933b66b44493a2ee3c136e1159d937c95707b06c54a5342457494a3c945dcf66f SHA512 1b377f284a7b68d200b08bdacee2080a60412e6ba1fd530eb0075dbc84fba30b37cec45e60d916aa80d057809b79f4d816f3a85f903d0e2fc7d06240dcdbb600
-EBUILD vimcalc-1.3-r2.ebuild 963 BLAKE2B 53db13c995c4e07119bd6da43967f657f24c86e487aa2b1b897656bf5cdea224db211ea501e375e98d1f2b28e8f80318b4e2a0930ea02eabe93ba084f573f2e2 SHA512 0df90e193f0fb553ce840ae499821fdd83d135787e64124d4bc767e4fdeee5dbb29ea180bd0507ce80a38ba50aaab156349f8fac49542ef9eb631d4f39fe4ba9
+EBUILD vimcalc-1.3-r3.ebuild 979 BLAKE2B 19a38980f1dda9203486e3e865446c4e027a8beb1502a90742a6def1b5750bb9066bc9cccd08ee98dce3425d70cecd4c1c3b85a22508f41277d8e0af3ba3a7f3 SHA512 ce993e26464d3f7ca3cdd0ae01a0cbfd3130d76d3901c59eed6ad2a0025a9f293ef53e00ab5ba08c5fadba989fa6165d82bdde27fb14ec6182cb812d750e260e
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/vimcalc/vimcalc-1.3-r2.ebuild b/app-vim/vimcalc/vimcalc-1.3-r3.ebuild
index 151fa8451f7a..dcf1201a0108 100644
--- a/app-vim/vimcalc/vimcalc-1.3-r2.ebuild
+++ b/app-vim/vimcalc/vimcalc-1.3-r3.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
@@ -20,7 +20,10 @@ DEPEND="
 	${PYTHON_DEPS}"
 
 RDEPEND="
-	|| ( app-editors/vim[python,${PYTHON_USEDEP}] app-editors/gvim[python,${PYTHON_USEDEP}] )
+	|| (
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
+	)
 	${PYTHON_DEPS}"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-vim/vimoutliner/Manifest b/app-vim/vimoutliner/Manifest
index ac5e35bb8a25..ac3d25f299d1 100644
--- a/app-vim/vimoutliner/Manifest
+++ b/app-vim/vimoutliner/Manifest
@@ -2,6 +2,6 @@ AUX vimoutliner-0.3.6-fix-shebangs.patch 972 BLAKE2B 2b747133ecc49f4654131bbb963
 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 698 BLAKE2B 33fe3fb434089f26f8f0b1c4e95917297bea59d45b0238166df71e244289ed0daf438a78447223fb0d42e2d3d4c645c684791810e67b96489046a45e97738065 SHA512 25c71e241bfd205ac87418c61377591dbb0119b188c6b2ee52cef9f05ee25fbaca52deebae40139da903ae3a20805e3f9307f3ccf89cbc656115533a042322e0
-EBUILD vimoutliner-0.3.6-r2.ebuild 1300 BLAKE2B f2359427b0553a0e05caeb370a21c2433b3b1c9d1918166d77e27cf83462cc6d216ecbcc972dc9f3a1bb0e466708ec32fd57027ee602d12a51ac22f78427a47e SHA512 dcc2f89e998ff2bb70eb5200dff6a17b8d38ca2c8d68492aa47dce216d313af8db81c0d79d1a2cf1aefa04aaf2fcd96f904705cff4d5676c8234e50f8daac934
-EBUILD vimoutliner-0.4.0_p20180301-r1.ebuild 1094 BLAKE2B 06f2432288653826cb839fb0043701444355c2dd1161a5baa0d7f99eae6d4a987ca99c09858c810af284472dcf9a80971d6681cbdc940137d19410ef022515b7 SHA512 56413d64eda82ed2cc01813b6dab78769e28498f9013e483948461c5e7da111fba1e3b10374f188db8712d5009cb5861942b0db3450d9f553c0d9006df713520
+EBUILD vimoutliner-0.3.6-r3.ebuild 1336 BLAKE2B b8153db24bafb8b713ed2b033ea742d17e66749b2ce58da68a5c4c87164bb8bb72e4031458c646a7dfba194f71883fec276fc6836bbf275c6478576435b00c9b SHA512 148bcbca2c7f91cd62047e6b3beb75b9789d011b574a8024e3a53e04f8138c9099553a0f73d294eeba50f05883c0979cc9984c47016822268a0187cb66074ec9
+EBUILD vimoutliner-0.4.0_p20180301-r2.ebuild 1130 BLAKE2B a212d7a6d0881aeb1f138ce93d7897d3ffb71916f515756d32f829d564def93bf03f7c421e4345aabcd67bdb579d31b71aa9b72d5497d322b057b4ae63abbe98 SHA512 5a7a85bd26c6391cce4b514af9643bbc20a2f78e1655accf5b3fc3d704cb4673ed5e4699ef503188ae3bb9856bc1ed7ca49169f039c36396d671e8ad9b2dbb4c
 MISC metadata.xml 337 BLAKE2B c4ae899109190b6ad14fcc71ff0dbea76f7ab6b731992174b4623847291d63bb8cbdc7e73cd92343beafdba086e0b54c4cda686593ef8b836f8add578b0459d0 SHA512 782f682a6837436ee5db28f818b2168035fbae243aa466077053e17842fec96672d702b818ad28a9f1d0b8fa1a1e2fb79b056d2e31bc09d5bf522d5f18ea1c7b
diff --git a/app-vim/vimoutliner/vimoutliner-0.3.6-r2.ebuild b/app-vim/vimoutliner/vimoutliner-0.3.6-r3.ebuild
index 4168f3a1c1b7..517d6a36c565 100644
--- a/app-vim/vimoutliner/vimoutliner-0.3.6-r2.ebuild
+++ b/app-vim/vimoutliner/vimoutliner-0.3.6-r3.ebuild
@@ -21,7 +21,9 @@ VIM_PLUGIN_MESSAGES="filetype"
 PATCHES=( "${FILESDIR}/${P}-fix-shebangs.patch" )
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/autopep8[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/autopep8[${PYTHON_MULTI_USEDEP}]
+	')"
 
 pkg_setup() {
 	python-single-r1_pkg_setup
diff --git a/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r1.ebuild b/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild
index 91f8bce967ca..c6da5e2e298a 100644
--- a/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r1.ebuild
+++ b/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,9 @@ VIM_PLUGIN_HELPFILES="vimoutliner"
 VIM_PLUGIN_MESSAGES="filetype"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/autopep8[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/autopep8[${PYTHON_MULTI_USEDEP}]
+	')"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/app-vim/vimpress/Manifest b/app-vim/vimpress/Manifest
index db15622c3806..c3abfcf60d71 100644
--- a/app-vim/vimpress/Manifest
+++ b/app-vim/vimpress/Manifest
@@ -1,3 +1,3 @@
 DIST vimpress-3.2.0.tar.bz2 11456 BLAKE2B 39be21c2a65418f8e9e370997db5c64fc79f6ae608a85ba8c19ea2e0010823002caa35e1f7fb887fd20176eb987c23a7719b14c4a7a8acb9818dc3802d35557a SHA512 793f013ccc42180e095c2e8cc847719479418cc0b184688924520f0782ee27e99a7fc64e44bf5c25f2a720b19dd813a4756fc90b87c18e13766ef0ce7772334a
-EBUILD vimpress-3.2.0.ebuild 573 BLAKE2B 8f9d3ab01e72512eeee14e5d6f28545df4f74dfb5e8b481a2c4c8f22799a37fd669cddf47c4f8e9de7ed05adeb970c3b71046e1099e34ae05144dc1a5956f1a0 SHA512 8d3f43cdb27cf936b7ab7d9247b974b956bd3876dbbbcaec5fe02b0e5bc5766bdc19b802454c67ba9ee7c01fc65cc20b674b1b6c1279c6becd777dc344149b2b
+EBUILD vimpress-3.2.0-r1.ebuild 627 BLAKE2B b442e46b05c65fead041c49dbd1bec7403961cfc5f7069847c9d7b5f1ac3e565b110d775304c68408d72b13fbdd89a66ff5000900977352a8929b721da7d0be0 SHA512 1fac4eaa8d75d238a5ea3e64f317849c54f7938bbc0b124b60318f88441f82e7d3e08b7c012640199e747e32ff6f098b9dac517f1bd09bede6d7790c94609999
 MISC metadata.xml 336 BLAKE2B 5154fbe13f738bf9020da237e4e8bafc26c160f0bcee4f042263e17d34f9bfdc9fc673e5a7ee15f8221dc6b1530131c1567049822c5540c34c2362b6b37316b5 SHA512 f2f18b31a5a60c51d7d563d8a53814625a6310ad2925ef297275a75ed5b40f475a25aa7089a0f641335e2c73d889d39e6473f224644c572ffe3118cf03fe4c90
diff --git a/app-vim/vimpress/vimpress-3.2.0.ebuild b/app-vim/vimpress/vimpress-3.2.0-r1.ebuild
index 863178d710d4..e7e8ba8673dd 100644
--- a/app-vim/vimpress/vimpress-3.2.0.ebuild
+++ b/app-vim/vimpress/vimpress-3.2.0-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=5
@@ -12,9 +12,15 @@ LICENSE="vim"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="|| ( app-editors/vim[python,${PYTHON_USEDEP}] app-editors/gvim[python,${PYTHON_USEDEP}] )
+RDEPEND="
+	|| (
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
+	)
 	${PYTHON_DEPS}
-	dev-python/markdown[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+	')"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/voom/Manifest b/app-vim/voom/Manifest
index 9322ee2386af..576175099157 100644
--- a/app-vim/voom/Manifest
+++ b/app-vim/voom/Manifest
@@ -1,6 +1,6 @@
 DIST voom-5.1.tar.bz2 102211 BLAKE2B 3835fb8f41638ca2ff91c106d94ee04aca3b6b3efcb44c7f023faba164512a96ff5b310b6fba3604ba2abe10e1371102997a3a9c67df28772fd68910836d2eb1 SHA512 3798c6d5079ebdf4f447f62613340e46a6b593e0a97226b0aecc90889c6cd2f6f2ce36eb88395a12a0e27ff3803c7693f1c56443928914bfea134d8a75df8c91
 DIST voom-5.3.tar.gz 115841 BLAKE2B 6e88c4121b796a75ee623537483ff579acb4de73ff353408381ee64ce708cff1d7f8c45bdbe1e0c9761b5a17dd3aa54b3a0a2cf83873628bd1490e1524962ea2 SHA512 f51f30641d8b3d0ff5cd0d6b31cd1d8a15cb14f20f973ac83b9b5d046b94452e6e4e4ff0b28ce7842aa7f9b656a9dd631297aeae16ea75eea4411d911057873e
-EBUILD voom-5.1-r1.ebuild 571 BLAKE2B 24492913fe6eee9eecd498e3f887f829e29dccf1742034866b4d5fb42b76d1b9e0379ed0b5bd785f1e902b5d66978cb2a733fd6e5c3d2ced7b5e2749626d3e6d SHA512 7c6df11bc6670fc264fe9d022a7510fa7fcb1297ab02f6877718f389eb2807ec62dccf9fbb357030bfa1553f0f0a308e032c71371acf8553f6312b231100571a
+EBUILD voom-5.1-r2.ebuild 582 BLAKE2B e87655f0e6aef5fabb0e16a11ace437b5a1c375b6cb9f9d8d0c0b8698782e7d8941b6aa4e4e9f8c16c352195d56b4c758aad6bb1bf9a4dad6534e6bd9f40490e SHA512 c4d378792e6ae7a44ce0b4cae2f9be06ed18a441f05befe7510515337b54a1a67be6bbffb236712f81f770d4c30b1d5c17818b000e711bc6923426887b854772
 EBUILD voom-5.1.ebuild 430 BLAKE2B 2ea7160d3a98943bd45094e74d453313a55a399ec379aa1adfd62578a4d605c070c5c20c2175363f5d1a8525e0e7ae27d7fe2beaf1b20695b48f4de0976bb753 SHA512 2084dcade6865875468e6822a9096950aed77d51674b4ba712cfecdc1c28961a0a72cca14d60703472fef7f249926b2b1ca5ce1551e1481310fc80b794da010f
-EBUILD voom-5.3.ebuild 679 BLAKE2B 6d5ed84caa190fb72f9babdd46404db9b35cce69f34c442504bfba635b04a476fe29a902a1b02dffba187289a6ebd18645b17eb79f9454e18b63c7eb8f1886e4 SHA512 318362a6bcc71d970e408c82c451d079fa136ffb89e5ee23f5b0bf11816b19a62ab4a421c0084a77c1f516abf78f9aa21ab890adeb5256b33ed4c0a44ec0ab8d
+EBUILD voom-5.3-r1.ebuild 693 BLAKE2B 5ef41ce995a2daccf34fff53a61bc04455c103cdda1b8014ba0b004f1fed36ae1803c1874fea335bff4159c213c687478a309781421921cb991fbcbec022db73 SHA512 e2cf7d088cd57e34f126976149fffe0de5c47bd0ee47d4a1262973c3607b9491c737816a95c48233ef733d8065574196d70d0bd611532915734966e11a15cfa4
 MISC metadata.xml 245 BLAKE2B d4f5ef381d0a479a17bfde792cd6828e5fa0ecdd26732c1a13c97fcae2f22396b879fb430aaea7680920d5ba897f78cfbb6e50bb2f65165613a5a0ba1f7dc609 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2
diff --git a/app-vim/voom/voom-5.1-r1.ebuild b/app-vim/voom/voom-5.1-r2.ebuild
index 661ae4f5bd8b..53ff9daabbe1 100644
--- a/app-vim/voom/voom-5.1-r1.ebuild
+++ b/app-vim/voom/voom-5.1-r2.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
@@ -17,6 +17,6 @@ VIM_PLUGIN_HELPFILES="${PN}.txt"
 
 RDEPEND="${PYTHON_DEPS}
 	|| (
-		app-editors/vim[python,${PYTHON_USEDEP}]
-		app-editors/gvim[python,${PYTHON_USEDEP}]
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
 	)"
diff --git a/app-vim/voom/voom-5.3.ebuild b/app-vim/voom/voom-5.3-r1.ebuild
index 78f809834f6f..af13fa790883 100644
--- a/app-vim/voom/voom-5.3.ebuild
+++ b/app-vim/voom/voom-5.3-r1.ebuild
@@ -18,8 +18,8 @@ VIM_PLUGIN_HELPFILES="${PN}.txt"
 
 RDEPEND="${PYTHON_DEPS}
 	|| (
-		app-editors/vim[python,${PYTHON_USEDEP}]
-		app-editors/gvim[python,${PYTHON_USEDEP}]
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
 	)"
 
 S=${WORKDIR}/VOoM-${PV}
diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest
index 5d701c54e7af..58f2c096da18 100644
--- a/app-vim/youcompleteme/Manifest
+++ b/app-vim/youcompleteme/Manifest
@@ -1,4 +1,4 @@
 DIST youcompleteme-20130910.tar.xz 2340104 BLAKE2B 1d50eae1e53d1acc3e9599ade6c5686602cf28997574dcf128b1ed1f812548c51e0c5ad45547ec12fc44d7391ce539c7cd8785ae823978ce18b870dd794f07a2 SHA512 c1022a27ced00e8ba8e9aa25029a0032805331cf0f80342aaaf9d7d4ec7780a098ffbd315068f19f6c98b00c4b4b43e59c7fa40070057e097ca40f6398b53b6b
-EBUILD youcompleteme-20130910.ebuild 1897 BLAKE2B b59b6e8a2a86493ad5941630d29d83215b646fd2bd2953fa740a4b20ce061ee558d6dda180709227045cf4dfc7e9a47218fc7e44c42bcc083d92c1808cd228fd SHA512 0257ae1f18dfcba799f4493e4b9acfa60a360124527e2da703dff8262f50217341935f873ca036ca1ede2a845d9d1ae1c25ba6cd94f26c2d7790a405eef6ee5d
-EBUILD youcompleteme-99999999.ebuild 2895 BLAKE2B 208ed961f7a7079b0c1668cbeb28471fd19f23ff7f4086c393a349671b1b348371fb48d6aa4e8997028b7054d0297cf5b822be35c1abbe83c815bc92ec65a518 SHA512 0c49cd018a82b239c90cda3f6978cf6b2d3b3fa78671d9ebf085f32382e65e1011fca1c8a4c682afaa90c2bc6c74a3f76b51974445772bd8e6c9d3f7f42fa708
+EBUILD youcompleteme-20130910.ebuild 1956 BLAKE2B a34dbf6f15544c10ad23c2809aa827c2b43a272a01739c189700e749bb9ebe513dd81bfb4c03974996184067409853f5a2bb1202f5316bd615abc8f29cdaf393 SHA512 c731d0679cf373157f2950a1d938d40ed6f5a3ba99d59274435fdc5a202f2201f7f4fdb789dacd6167b613a2ef38c959c4c20912d48776bef0aa1dbf53556f9c
+EBUILD youcompleteme-99999999.ebuild 3061 BLAKE2B e7fc5d4996047c1a8d3f49e34cafd3dad50ed21fce60e7af5958a8fc800576dad2f2a5405e85731c27462fd1f5e974832e633d998498a08022583a9b4e8a8327 SHA512 3d2e577ff0c0bacfdd0cf2addf8d9857f4021d32c161ad319f64024ef3604984570e531ef5529735b4b75edd258f10e2096f88ff4e8f1e7f3663d5daab579612
 MISC metadata.xml 372 BLAKE2B b057ef7819a6a3018c88a692b3f94befe2b3055d3d014790bfdf4de690cdd9e589e12b1d802e5487af104b5cb7d87395e7c0a4130dde622a3a48d7c2f3c507a2 SHA512 3afacd989d495928012e5a1b1c2bb6d14209cbcb1e347a24c1c0881c758642cc8457ee7b6202b8d129e3f08dc21492792715fc5452f8ffc33f719da9a447fdac
diff --git a/app-vim/youcompleteme/youcompleteme-20130910.ebuild b/app-vim/youcompleteme/youcompleteme-20130910.ebuild
index 90bc485b4174..29e5f6c94260 100644
--- a/app-vim/youcompleteme/youcompleteme-20130910.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-20130910.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,13 +26,15 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}
 	clang? ( >=sys-devel/clang-3.3 )
 	|| (
-		app-editors/vim[python,${PYTHON_USEDEP}]
-		app-editors/gvim[python,${PYTHON_USEDEP}]
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
 	)"
 DEPEND="${RDEPEND}
 	test? (
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/mock-1.0.1[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/nose-1.3.0[${PYTHON_MULTI_USEDEP}]
+		')
 	)"
 
 CMAKE_IN_SOURCE_BUILD=1
diff --git a/app-vim/youcompleteme/youcompleteme-99999999.ebuild b/app-vim/youcompleteme/youcompleteme-99999999.ebuild
index 987fec6263bf..c5e133ef7435 100644
--- a/app-vim/youcompleteme/youcompleteme-99999999.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,26 +26,32 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 COMMON_DEPEND="
 	${PYTHON_DEPS}
 	clang? ( >=sys-devel/clang-3.3 )
-	dev-libs/boost[python,threads,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/boost[python,threads,${PYTHON_MULTI_USEDEP}]
+	')
 	|| (
-		app-editors/vim[python,${PYTHON_USEDEP}]
-		app-editors/gvim[python,${PYTHON_USEDEP}]
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
 	)
 "
 RDEPEND="
 	${COMMON_DEPEND}
-	dev-python/bottle[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	dev-python/jedi[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/sh[${PYTHON_USEDEP}]
-	dev-python/waitress[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/bottle[${PYTHON_MULTI_USEDEP}]
+		virtual/python-futures[${PYTHON_MULTI_USEDEP}]
+		dev-python/jedi[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/sh[${PYTHON_MULTI_USEDEP}]
+		dev-python/waitress[${PYTHON_MULTI_USEDEP}]
+	')
 "
 DEPEND="
 	${COMMON_DEPEND}
 	test? (
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/mock-1.0.1[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/nose-1.3.0[${PYTHON_MULTI_USEDEP}]
+		')
 		>=dev-cpp/gtest-1.8.0
 	)
 "