gentoo resync : 14.05.2020

17 files changed, 94 insertions, 15 deletions

diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index bf7363e3a231..5ceb7467710a 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/jedi/Manifest b/app-vim/jedi/Manifest
index fd8c2a9690e6..0da48a88edce 100644
--- a/app-vim/jedi/Manifest
+++ b/app-vim/jedi/Manifest
@@ -1,3 +1,5 @@
+DIST jedi-0.10.0.tar.gz 36820 BLAKE2B a66f7c58564487d83867d61480d83364af0047cee713c41dbd5c67bff0b2ac33d066c2d0f4367c30059f46fb9f4916fc8d2eb9c64aa6a489e2c16a03f56b0b3c SHA512 65482505446b1001e92870ae64a147b38c0bb4d3151e464d325be741729506a191b284a491f4c3eb77dc46cb9bcd6b8e7bf8689ed95107e89a1f6a05c7fbc9ea
 DIST jedi-0.8_p20171015.tar.gz 31593 BLAKE2B a34fc7a7d8211cefbaef0012b801bc2dec2b447d34a1d3c338ed37306d36262694f0d8e771042e899959d04bed8925c5beee32803cb7f56add7a83ceb4bf27d9 SHA512 e4238c745d509d9d7e8c0593a46935f1de3c0cdf8e3893deb156110be53e2c9012d98379a6ca747a0bdab77f1def2a88dd46ce5c7d3936f01f0d9ab597f14182
-EBUILD jedi-0.8_p20171015-r1.ebuild 855 BLAKE2B d5fed200f6ab890c956556641013620f49523d5a5a2f12b7eb845c2dfd457ac47d4f7ce9f143c2113d6efa8f2c06716e7fa3a863209dd221c70191412cff191d SHA512 51273d6ffb6a3fca3cce545201eccaa92325a6d9f6503187c22ce280c8450388e6d718b7086b461e40128d0e0008bb8f49cea376a67326cfde48320a19bf8f64
+EBUILD jedi-0.10.0.ebuild 886 BLAKE2B 4b12294d0e08c34a9c0b987016617753a935d29a4521d754cd2cdf02a65afdafb4eb2f1c5365c0c37e780f14e1a23c9c2e0843db0849c830987d607896f44b33 SHA512 07918560371756ee224d5b3029858f61f3b4ebfb63aa822da2e5f43471d65d742184555c4d661e5ed220fb945e0ff9a9e29db22887298ee56828f942b2700e29
+EBUILD jedi-0.8_p20171015-r1.ebuild 849 BLAKE2B e508610614f56f3566f1097e0200a01cdcc4de21a6a5a2cea59625a92dfb2fe2c5703ccf863fbb568e58211cb3e023d4ed82363580d3f39432785b780f2ad2df SHA512 533d572e4249a331bf6466dcdd15a372b39b6f9af5016717e39373c97f01c0a6cbbcad371f4f6647d35edeea74278f67104f2d63db2ab7fed898522ab3c47f8b
 MISC metadata.xml 732 BLAKE2B cf90edcedbfd48646343d24df62a1946477bfb5a622976497209f822c28c0c714dda0153db2f8d541c7756d4ee3000b5fe340beb43b32408f380396cae18d735 SHA512 6fd3ce3d4ca0d4093f6d8f108925e00b51eabca129d70ec3dbaf26c0e83e7a3b58aee9d7df2da1fc1811260fdff2ebcf74322e54a65d145fdc8aaf472ab39177
diff --git a/app-vim/jedi/jedi-0.10.0.ebuild b/app-vim/jedi/jedi-0.10.0.ebuild
new file mode 100644
index 000000000000..b30e03db8527
--- /dev/null
+++ b/app-vim/jedi/jedi-0.10.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit vim-plugin python-single-r1
+
+DESCRIPTION="vim plugin: binding to the autocompletion library jedi"
+HOMEPAGE="https://github.com/davidhalter/jedi-vim"
+SRC_URI="https://github.com/davidhalter/jedi-vim/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-python/jedi[${PYTHON_MULTI_USEDEP}]')
+	app-editors/vim[python]"
+BDEPEND="${PYTHON_DEPS}
+	test? ( dev-python/pytest )"
+
+S="${WORKDIR}/jedi-vim-${PV}"
+
+# Tests are broken.
+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
+}
diff --git a/app-vim/jedi/jedi-0.8_p20171015-r1.ebuild b/app-vim/jedi/jedi-0.8_p20171015-r1.ebuild
index 6533a387cb42..23aaa1f5ca30 100644
--- a/app-vim/jedi/jedi-0.8_p20171015-r1.ebuild
+++ b/app-vim/jedi/jedi-0.8_p20171015-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit vim-plugin python-r1
 
diff --git a/app-vim/pydiction/Manifest b/app-vim/pydiction/Manifest
index 7dc4a21e8061..bd40da87da03 100644
--- a/app-vim/pydiction/Manifest
+++ b/app-vim/pydiction/Manifest
@@ -1,3 +1,3 @@
 DIST pydiction-1.2.3.zip 475441 BLAKE2B 709d4de30d21ff0ba27b5b0c11276731bdef03d754c1799857ceba7edbea4fc0640714cda4103ed58878b02cc00feed5d6b08df2647139fa84910cf92db51dea SHA512 91da1d8a9be89095072724d77bdcaa342fbd5479f5027d7ed7bb2d4a382c7385b2b7fae91c1cd94605232b34a96370a86096e3c32db0d106cbcda2a82f409922
-EBUILD pydiction-1.2.3-r2.ebuild 945 BLAKE2B 5321fc77d843213954f0d907334f335c0da8276e0d0c7d10f9e63f88bbebdbba6ee03640ce77ed70694a5eba57dba3f0753083e7aa970a20d06e038ebfc36da3 SHA512 48debfe47b6276e576f6410e8f185946de57a18b3467d89cfc73eb27e8a0df00cad9d9edbf7b3cf2da1c92992738af3d05c8ee321a15397c421e5f3103e9c2dd
+EBUILD pydiction-1.2.3-r2.ebuild 935 BLAKE2B f2192ff7e9c1df749dc895fa6bbbc7e5e43944aae01d50f9c32f09ea6af2dfa537f26adf5f5d068f7c0402116184209b94b078f49dd01047ef350b6231466f5a SHA512 22d7766fe98ce6619d5ebe308abe03196304016135cc5be3b01e97c542c06801c697cd022ddac3027371aad104b8d3cc6c7723992b1e216e59c7e5d64a10e86d
 MISC metadata.xml 361 BLAKE2B 4cd18ca933890f32a2aca909c66c48ea1539fc4d4d558657e5fb76c66a26be7c9b24882b7688b54407e044ba1e4d641e659da10065360ddba91dad4aa391da5e SHA512 f205ce2b8f61bcc7d966345b9928efccdc2adb4ce6a36166c774134bd8959a3757a3a9a556aaa2d6c6f7b71b945be84e41903a58e66f844c4258326a66b2b667
diff --git a/app-vim/pydiction/pydiction-1.2.3-r2.ebuild b/app-vim/pydiction/pydiction-1.2.3-r2.ebuild
index 4e06bb3c0bb5..ef106fe6ef4d 100644
--- a/app-vim/pydiction/pydiction-1.2.3-r2.ebuild
+++ b/app-vim/pydiction/pydiction-1.2.3-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit vim-plugin python-r1
 
diff --git a/app-vim/pydoc/Manifest b/app-vim/pydoc/Manifest
index 269c84591e01..97c213ee4d0a 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 624 BLAKE2B 56e42db66611c4db06a347e40e4ee7f4f2e6ec6365c3a9f9effdde73c2eb7c3aa0575a33e30e3d1759d72e4465da2b75840f627e493ebaf048a86f3cb6f0e0e1 SHA512 841e710c6a54154b5de3aeb1d2bc90286ea2487309ae9f54fe55b01657f166aacf4fda2e49dd5550069347ac3c3ec7bc894bb9c634bbbf44ace847b02fd36845
+EBUILD pydoc-2.0-r1.ebuild 614 BLAKE2B cd87b0a6112f5bd0be740bcd15c447e88085f01724c9d18e10d3193aed1876bceeb52d0399c6b1e7a9eba22c41533cd858607cd84d2a81fb1275eb5bb900e677 SHA512 401a98cb758108ca8655fc9a930af9c511331f77ad603dcc936ddc3159ed9ffcdb9adaf5e49c629a725c0b9c31961adcdbb7452ea4f9bbe49efd456e78150bb4
 MISC metadata.xml 424 BLAKE2B cd8fb601b39c8ff1247498a196bf776d70b0765661f866b355675b5d8ac76a713bf007b8aafa503d438ac7fb49295e6f09df9d4b1d9d7fc1cba323fd139eea12 SHA512 b64ab21cb93c8d24a87fc0434baac17c21ef9a4a23d4d2622d6c733a043d84aab2c3cb00acc41edd9c61e8599cfcfddeb50025ea0135f9f10c0f5ee243f61dab
diff --git a/app-vim/pydoc/pydoc-2.0-r1.ebuild b/app-vim/pydoc/pydoc-2.0-r1.ebuild
index c77c33197839..db83486ae1ac 100644
--- a/app-vim/pydoc/pydoc-2.0-r1.ebuild
+++ b/app-vim/pydoc/pydoc-2.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit vim-plugin python-single-r1
 
diff --git a/app-vim/vim-clang-format/Manifest b/app-vim/vim-clang-format/Manifest
new file mode 100644
index 000000000000..a2358a58a4f1
--- /dev/null
+++ b/app-vim/vim-clang-format/Manifest
@@ -0,0 +1,3 @@
+DIST vim-clang-format-0_pre20200506.tar.gz 12836 BLAKE2B be6882788c4ea582f2fbabfe3fdbd4184ab407b09b8c68177539999620413919f074bef72a52ae0cfddd58d85d9f716c36bc8593b1b745d47887dbfbd599aa63 SHA512 5bf2f9082ef64953122e87659fbafae5af4cd7e2fda1ed5bcee52ed49a3727dae0dc3bc3ab172ac4200f93421898d6cbf26def019ac33d77ca4cc67c2da37846
+EBUILD vim-clang-format-0_pre20200506.ebuild 606 BLAKE2B 47060b5800a8c30722315d91b669abe0da81a8353c69fe8071b93e47b9b3de541e4d17eaa7176a044dd73c85f2d55c4a72bd756193a8d31e1b6fae3edde204bc SHA512 2d4be9fd15182b102df510c9c4c03c3a1d3f4a3201e26189591721da728e4a5c645a8e93d7beee4999778e59b392b24afc89cfe418576707d5faacb03ced3f1d
+MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/app-vim/vim-clang-format/metadata.xml b/app-vim/vim-clang-format/metadata.xml
new file mode 100644
index 000000000000..cee379b15409
--- /dev/null
+++ b/app-vim/vim-clang-format/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/vim-clang-format/vim-clang-format-0_pre20200506.ebuild b/app-vim/vim-clang-format/vim-clang-format-0_pre20200506.ebuild
new file mode 100644
index 000000000000..3a12f0b17060
--- /dev/null
+++ b/app-vim/vim-clang-format/vim-clang-format-0_pre20200506.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+#VIM_PLUGIN_VIM_VERSION="7.0"
+inherit vim-plugin
+
+COMMIT_HASH="95593b67723f23979cd7344ecfd049f2f917830f"
+DESCRIPTION="Vim plugin for clang-format"
+HOMEPAGE="https://github.com/rhysd/vim-clang-format"
+SRC_URI="https://github.com/rhysd/${PN}/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT_HASH}"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-devel/clang"
+
+src_prepare() {
+	default
+
+	# tests are written in ruby, prefer to avoid that
+	rm -r .travis.yml test || die
+}
diff --git a/app-vim/vimoutliner/Manifest b/app-vim/vimoutliner/Manifest
index 4281c24f1da1..d09054af6296 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 699 BLAKE2B bc7e8441035031f4473dc5fa5b49ed0ee282c6dbf01ad762d2e434c1e97d22c77c464d274324da14010e93e28d865a452994d95b5efb8791032aab3ae2a48787 SHA512 3f910136f39558b7e827ec812b97ac4dca43a88d5e40cda4b46f1dc2083017ce5e117ce72bfdf0434eb08199265140032d55f37767afb1d7d29c09680576c723
-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
+EBUILD vimoutliner-0.3.6-r3.ebuild 1330 BLAKE2B 021a5c03383c7b23d98b2076f8139ca9e311e8710c234cc6c257817707660425f382e2b9011f8513f56674901d4617da19719ba1f89b396e01c7adb366e79dd2 SHA512 8e6762e23b3c0c423784401d77309fa5bf9b68361f9c1493a1f632520a83450b21adc457c9b0e5d6116b805156ce389c053fed37686c05e7826d42c2eb25b990
+EBUILD vimoutliner-0.4.0_p20180301-r2.ebuild 1141 BLAKE2B a5ed9649cfd9edc1756e1ed482f3730268353e7fc00f2aa1bcca2ed391e755ae84060b0de44ab2ad088633d9afae49a75b6e316425f376f255abdd2c14bf534b SHA512 005592f6a3bbf6cdd0927e103beee446a0168c1d0cb484cea8a6ec41c8a587de7b0664abc93e78c9eb80d0bff5dba9bb1074ae0a8c0a0906faa92b4693bd3940
 MISC metadata.xml 337 BLAKE2B c4ae899109190b6ad14fcc71ff0dbea76f7ab6b731992174b4623847291d63bb8cbdc7e73cd92343beafdba086e0b54c4cda686593ef8b836f8add578b0459d0 SHA512 782f682a6837436ee5db28f818b2168035fbae243aa466077053e17842fec96672d702b818ad28a9f1d0b8fa1a1e2fb79b056d2e31bc09d5bf522d5f18ea1c7b
diff --git a/app-vim/vimoutliner/vimoutliner-0.3.6-r3.ebuild b/app-vim/vimoutliner/vimoutliner-0.3.6-r3.ebuild
index 517d6a36c565..4bea6a6dc884 100644
--- a/app-vim/vimoutliner/vimoutliner-0.3.6-r3.ebuild
+++ b/app-vim/vimoutliner/vimoutliner-0.3.6-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit vim-plugin python-single-r1
 
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 c6da5e2e298a..2970f6b7d991 100644
--- a/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild
+++ b/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/vimoutliner/vimoutliner"
 SRC_URI="https://github.com/vimoutliner/vimoutliner/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-vim/vimpython/Manifest b/app-vim/vimpython/Manifest
index ad0e79d0f75b..aa211a3fe791 100644
--- a/app-vim/vimpython/Manifest
+++ b/app-vim/vimpython/Manifest
@@ -1,4 +1,4 @@
 DIST vimpython-1.13.tar.bz2 4270 BLAKE2B 7973aea8ea397f3f2edcf8a2845ab47cad3015925dd9e42e37a7ada47f25073b68d6d8f8c378a86d90e39c0aae63aba784753679b4d04a5aad268db157400ae2 SHA512 467217ad160f02d3ecdc8c43e35966e496e6c5f99bef115bd4905795c0fd5b8f68f68bc8edd64ca1dbb1c6fbc088ef6ae996f524f0343943702f2a92dcc144ce
-EBUILD vimpython-1.13-r2.ebuild 476 BLAKE2B c0c1efbdb02121f9168a1e6e3d025048d9c680325b2e33b71141568fb874409c915a179b16c211b86017e7429b2939b861d7f2d0eddcbfb43bbf25e1bdc68d96 SHA512 e915c6833d83bf26362304294ac71ac1983ae3e565efdb116b6dd8706dd30c41d62e89ad15ae2fb1413c945c27dc51cce673988657898fce7b321d0f2b922b9b
-EBUILD vimpython-1.13-r3.ebuild 482 BLAKE2B d19134f78f6be51ab66e9963e8ea43e3856b18e4cd074a729a099e82285184e0d30454956b6321d63aa1fd95775bbc5d90ff00137479e71eaaf01218445d4bba SHA512 28ccb1feee5c79bb914e0bea7b96aa487b91a5c3288730d6af8e234b00de342e44feb1df6b2231c4e33fd65d399f3e35646cf78ff1a89ad054332a363937cda8
+EBUILD vimpython-1.13-r2.ebuild 466 BLAKE2B 031af7ce5074f922a043a1ea9c7efb9a8613f59e626c8a7ae283388eb6559e5d08214e73461be5064b3d38c82ea8f0d9a31e8d276d35fc2b9ebf3924f81278ab SHA512 55cd89c854ae65abf57e261099d460dfba2368b6687164fe43f9938ea8a22ecd29a7c66175f1a3275c7a551b9e04451b98055836f52cbb3c22c038451e2c7601
+EBUILD vimpython-1.13-r3.ebuild 472 BLAKE2B 2b6178ac252d1898dbd9a5c77d5321733d12edfb6228e4c48645b9a8132b509a57118208b22eca61781930e53fee742ff62ecb3bdfdd582bc3fbd778bcb276e2 SHA512 6a6a32958570e045da761153864f5481358d0a449ea10fb41bbbb870a9ac13bd0aad3359a65f9b523493201d9528ef59e1017d359285308741f35e73b6070ac9
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/vimpython/vimpython-1.13-r2.ebuild b/app-vim/vimpython/vimpython-1.13-r2.ebuild
index 0102860bdeda..2976870dc7b2 100644
--- a/app-vim/vimpython/vimpython-1.13-r2.ebuild
+++ b/app-vim/vimpython/vimpython-1.13-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit vim-plugin python-single-r1
 
diff --git a/app-vim/vimpython/vimpython-1.13-r3.ebuild b/app-vim/vimpython/vimpython-1.13-r3.ebuild
index 9f704f796ebc..65cd01ec3161 100644
--- a/app-vim/vimpython/vimpython-1.13-r3.ebuild
+++ b/app-vim/vimpython/vimpython-1.13-r3.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 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"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"