16 files changed, 9 insertions, 203 deletions
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 6a0bf68fe0f0..f28bf50c8553 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest
index 4a765255cfab..28e74ce146ef 100644
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@@ -1,4 +1,4 @@
 DIST gentoo-syntax-20201216.tar.bz2 18631 BLAKE2B 9b68329ae2a64fba1d2a7a9fa6bb60b3a982dc2ebd5b84cf4d95052b3c8c138d7789a25c571e16cde371248e27dd8b28a7b73874749ec26e165724a43bbfaa9e SHA512 f7a6967c28aa669c8bfb114b0c60d52d970b68cd5b02a44f165f85ed5d8f42cff97ceccf4011481a84ab131c06f02725b4d9b53e3cbc0dc116dccb4ce55bd2f6
-EBUILD gentoo-syntax-20201216.ebuild 1268 BLAKE2B 17f1fcdb03331841097b2a5b7fddff0a8eabff9f95e7fb1e0605887e6a4257757b1cb657085f8cd396ee7a1694177a9cd32899f1944f4786f423d840c42d0e9f SHA512 a3366af4ff69b7e46312c9326ff238c47ae7bc83433d6189bfe17f8e91685604d43154caf343db21b9541c1f49291feb6497fad4ba28f42d91eb5180dcb6fa98
+EBUILD gentoo-syntax-20201216.ebuild 1248 BLAKE2B 1bb38c5a51cc9636732b30a412467970157302c4daad664a808d6ec5f67cbb2a4f359a8cfb0d92ec3488fc8a4c6184a417bec6403d7c2f22f4ea35f690803509 SHA512 6ca60924769c34456230bccd05b1dc0207597294b5efb0777d8f5a8118e09d35a3f4477db1f74e5f4b6cd88dc91e5ff9644cfb89f7d2ca214121cf263471c2d6
 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 70ff2ea1a302..94e1cddbd63c 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ignore-glep31"
 
 VIM_PLUGIN_HELPFILES="gentoo-syntax"
diff --git a/app-vim/jedi/Manifest b/app-vim/jedi/Manifest
index f5162725afb6..43609b60759b 100644
--- a/app-vim/jedi/Manifest
+++ b/app-vim/jedi/Manifest
@@ -1,5 +1,3 @@
 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.10.0.ebuild 893 BLAKE2B 25282a4ead752ab5f71dae7285adb580c98e88dc9d14fa331e78d4a8a258817b91cb46f95335959d514ff9e549b77c9ec6437f291b1c0a054e461634695ea2cb SHA512 12d5437fe8c2ef4005735423fe7b5bd9466036900c79614cd4c3d21d43f5ec810caa187d43842ac57f46748eae27e0f507d97a13cb88f91aeb1dbe9938f99205
-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.8_p20171015-r1.ebuild b/app-vim/jedi/jedi-0.8_p20171015-r1.ebuild
deleted file mode 100644
index 23aaa1f5ca30..000000000000
--- a/app-vim/jedi/jedi-0.8_p20171015-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit vim-plugin python-r1
-
-# Commit Date: Sun Oct 15 20:51:54 2017 +0200
-COMMIT="77924398bd594e238766153cec97ace62650f082"
-
-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/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/jedi[${PYTHON_USEDEP}]"
-DEPEND="app-editors/vim[python]"
-
-S="${WORKDIR}/jedi-vim-${COMMIT}"
-
-# 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
-}
diff --git a/app-vim/pydoc/Manifest b/app-vim/pydoc/Manifest
index 97c213ee4d0a..3c509d6b0664 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 614 BLAKE2B cd87b0a6112f5bd0be740bcd15c447e88085f01724c9d18e10d3193aed1876bceeb52d0399c6b1e7a9eba22c41533cd858607cd84d2a81fb1275eb5bb900e677 SHA512 401a98cb758108ca8655fc9a930af9c511331f77ad603dcc936ddc3159ed9ffcdb9adaf5e49c629a725c0b9c31961adcdbb7452ea4f9bbe49efd456e78150bb4
+EBUILD pydoc-2.0-r1.ebuild 619 BLAKE2B 4a2ca54d7d17ba04af5579bc447a7d5ab0c37e8085e87342d54fb8ccfefe1c272f06e23bfa3f743f0a7a78d362e68b6df5886bfb1f98d08d39362d9dd3ab5372 SHA512 c5fe1b69193027ed8ec2585f5385ed8766c72f225c1d5d50c5c325233ce1f960ee221c7060a7fbe2e1e6e753866359c1b489e840c08235f3b921b3a2e42fd62f
 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 db83486ae1ac..ee401b228796 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=( python3_6 )
+PYTHON_COMPAT=( python3_{6..8} )
 
 inherit vim-plugin python-single-r1
 
diff --git a/app-vim/vim-latex/Manifest b/app-vim/vim-latex/Manifest
index 0bd45d457b99..be5fe75662e3 100644
--- a/app-vim/vim-latex/Manifest
+++ b/app-vim/vim-latex/Manifest
@@ -1,4 +1,3 @@
 DIST vim-latex-1.10.0.tar.gz 260820 BLAKE2B 2314ad5ded3bea51def3172e8f2b7a7483839b58804f9d8c1cc1c8f1139c1da731f91525691d47dba57d07a7db85c371e87c5ce0d3d22a004a9402df7e7cad3a SHA512 1d22b675c124e402a280dcc3a675b49a92fb9f4d42efdda0ea97be26379cd6c023589a35e165f4231524d853380e22411901bfbcc98f171c938ba800821a1213
-EBUILD vim-latex-1.10.0-r1.ebuild 1569 BLAKE2B 528be5ca5ef37bad2794a1f8990bc768b6d47fd8427609fd574311d6474306c5a087d4ddfc1669f36dcbfc26434f704887f9ac7ad197585fea4023ffef906676 SHA512 33daa51732a577e0f75cdf70d591fa8008eaae823473813ea7d293a614987389333a941baf05364b18bb1d4f3440b8308e0a8c934a72e1696a07e18e940c4650
 EBUILD vim-latex-1.10.0-r2.ebuild 1573 BLAKE2B e1d2f5d2f502c18c56c965522aae0bf494e83e453b61fc40afff6224c8f6419e2ba012259007fb004b8c1939f6d84fb5960a9fb454f421ae38d28b27f10dfc3e SHA512 ca714850c11c279b4405489f4633774d652c163829ea455a4040fa79c72106210e287b3ad337ed68360eceb67bfff6ef14311d373c1b689940d11fb52c685bc5
 MISC metadata.xml 328 BLAKE2B bcf4c9979e43da6c141669c218e852e7a0c062d900c35790709e393f6cabc56f646f7a84e8057d9dbafa0a73e5786135a7cfe3ef825af867500bcd502f03a61f SHA512 e14b88742b6d8143cb578ddac61dbc0ac5e84c90659e8d9b5c40882ebdf35dc001b1ffae26eb90617434b2c8a898055c838738bf7cf18a45cd2a2ce66a30bdce
diff --git a/app-vim/vim-latex/vim-latex-1.10.0-r1.ebuild b/app-vim/vim-latex/vim-latex-1.10.0-r1.ebuild
deleted file mode 100644
index 98f504e5dc7e..000000000000
--- a/app-vim/vim-latex/vim-latex-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit vim-plugin python-single-r1
-
-DESCRIPTION="A comprehensive set of tools to view, edit and compile LaTeX documents"
-HOMEPAGE="http://vim-latex.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="vim"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	|| (
-		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
-		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
-	)
-	virtual/latex-base
-	!app-vim/vimtex"
-
-VIM_PLUGIN_HELPFILES="latex-suite.txt latex-suite-quickstart.txt latexhelp.txt imaps.txt"
-
-src_compile() { :; }
-
-src_install() {
-	# remove unused metadata
-	rm vim-latex.metainfo.xml || die
-
-	# don't mess up vim's doc dir with random files
-	mv doc mydoc || die
-	mkdir doc || die
-	mv mydoc/*.txt doc/ || die
-	rm -rf mydoc || die
-
-	# don't install buggy tags scripts, use ctags instead
-	rm latextags ltags || die
-
-	vim-plugin_src_install
-
-	# use executable permissions (bug #352403)
-	fperms a+x /usr/share/vim/vimfiles/ftplugin/latex-suite/outline.py
-
-	python_fix_shebang "${ED}"
-}
-
-pkg_postinst() {
-	vim-plugin_pkg_postinst
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		echo
-		elog "To use the vim-latex plugin add:"
-		elog "   filetype plugin on"
-		elog '   set grepprg=grep\ -nH\ $*'
-		elog "   let g:tex_flavor='latex'"
-		elog "to your ~/.vimrc-file"
-		echo
-	fi
-}
diff --git a/app-vim/vimoutliner/Manifest b/app-vim/vimoutliner/Manifest
index 58930a9f3fd3..43a447a311ac 100644
--- a/app-vim/vimoutliner/Manifest
+++ b/app-vim/vimoutliner/Manifest
@@ -1,7 +1,5 @@
-AUX vimoutliner-0.3.6-fix-shebangs.patch 972 BLAKE2B 2b747133ecc49f4654131bbb963ac23ae291d186cfed97e944fd5e757cbe3288e5dafc243f4caea2acbeb56c27e92d257565a84fbcc8a4900a6287056e8e38bf SHA512 44bb6760c11a21ab817141cae5817cc4d5b88a5c94ca4e30238d9e009f080d5ae98522dcde910d5352090e7bf998ad47fa658a56bb16bb50ca905b14e5d2df2b
 DIST vimoutliner-0.3.6.tar.gz 210251 BLAKE2B d50b3d1c752fba80e26d7430801baf30a7945d84d30866556821319fb052252a37e2dd7f989c47c376b4986b616c7f99e0753ef3f6b54b9f4f02aa166e998b65 SHA512 62c860067d394dbae639aa9d51627637769c22c4c651f2f9328ca88e8afd85396e1f371bb0cfee432e7a1faabee570a1e29ec086c6532681a309b909225fb90b
 DIST vimoutliner-0.4.0_p20180301.tar.gz 367361 BLAKE2B a97df5c154e6ed9b3209bd90bd57b4166877f02b9513351fda0e841de84334a1e592e1ed56b46cc59bc6bb64f3c763cdca81df3f8696f3c348a8ef4744124c02 SHA512 f9f369e7e7f09dac04b58a27a86dc2121b3aacd0002537db348517e779fd1b7c9e88ae905b4b42aace10f79cb8f91acada1ad58e26f2257e46d1af98347eab62
 EBUILD vimoutliner-0.3.6-r1.ebuild 686 BLAKE2B 36d2d1561af39a7e6ba3f9facadbd00af9fe34023268dc6ac8199107fe2e4e838386d9b9d1cd7bfcc8b8a956178a51326aeb278db7cd1d0ff8313fe669c05f78 SHA512 5c0217598f97e0733be3456c7fa495b89a436f838b088b2036c6aefa76e5be1141bb4cdc4b4c49169177c545e310ca41865852b5b66feae795c980dcc79e0bb9
-EBUILD vimoutliner-0.3.6-r3.ebuild 1330 BLAKE2B 021a5c03383c7b23d98b2076f8139ca9e311e8710c234cc6c257817707660425f382e2b9011f8513f56674901d4617da19719ba1f89b396e01c7adb366e79dd2 SHA512 8e6762e23b3c0c423784401d77309fa5bf9b68361f9c1493a1f632520a83450b21adc457c9b0e5d6116b805156ce389c053fed37686c05e7826d42c2eb25b990
-EBUILD vimoutliner-0.4.0_p20180301-r2.ebuild 1263 BLAKE2B 11d197e2641bdf5f335e641b797fddaec23b6be79819062711c6b7b44e0e56e422187af2c43793c6c3aca6092baad3f02c48a2b9ae537053d1beb96570bea51d SHA512 307a8c310122890a3a2729c2299b7354e4f85b12c25aa7b13564233b0a0b33b4d240100525fa469fd937885d7138f25d389b79bf1d80cba429661402d251d62a
-MISC metadata.xml 337 BLAKE2B c4ae899109190b6ad14fcc71ff0dbea76f7ab6b731992174b4623847291d63bb8cbdc7e73cd92343beafdba086e0b54c4cda686593ef8b836f8add578b0459d0 SHA512 782f682a6837436ee5db28f818b2168035fbae243aa466077053e17842fec96672d702b818ad28a9f1d0b8fa1a1e2fb79b056d2e31bc09d5bf522d5f18ea1c7b
+EBUILD vimoutliner-0.4.0_p20180301-r2.ebuild 1259 BLAKE2B 3674ee1f622960507479c742d4a65fdd74f250fbf7908942c1a571746849c1bf3fd5964933d25a593bb4e7c6517f78c5434f23e9b448ee2cd002dde2362fcd03 SHA512 2f42d3995a7b948bc2d3ea0813866fd9afb02dd1a572ecc65da311c340cca6c529055f7dce225d075a97e6be2c09dd26869e2363c6784d05637795e17acfdc69
+MISC metadata.xml 361 BLAKE2B fb9ec07c9fec7dedf5f8a5717a7b4eb875264294f5eb9a24fed191a1195bea800bb0f0fe9ff4d81d02f36f35910239d96e218f332bf9818e27a3f7af7a1ee502 SHA512 c65f2146f0ddf4d6c048f5e6f87db0ab5814fb05966a2b2a9f60999485125975dacb5d609ec9484f7b4c8c6ef7b128d59a4f7ed104d6cb582c8c42a88bfb1fe3
diff --git a/app-vim/vimoutliner/files/vimoutliner-0.3.6-fix-shebangs.patch b/app-vim/vimoutliner/files/vimoutliner-0.3.6-fix-shebangs.patch
deleted file mode 100644
index a363d96b34f6..000000000000
--- a/app-vim/vimoutliner/files/vimoutliner-0.3.6-fix-shebangs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/vimoutliner/scripts/outline_freemind/outline_freemind.py	2017-08-24 21:20:25.138762046 +0000
-+++ b/vimoutliner/scripts/outline_freemind/outline_freemind.py	2017-08-24 21:20:34.484797791 +0000
-@@ -1,3 +1,4 @@
-+#!/usr/bin/python
- '''Read in an otl file and generate an xml mind map viewable in freemind
- 
- Make sure that you check that round trip on your file works.
---- a/vimoutliner/scripts/outline_freemind/otl.py	2017-08-24 21:23:08.194385573 +0000
-+++ b/vimoutliner/scripts/outline_freemind/otl.py	2017-08-24 21:23:14.756410662 +0000
-@@ -1,3 +1,4 @@
-+#!/usr/bin/python
- # Some integer IDs
- # headings are 1, 2, 3, ....
- bodynowrap = -1 # ;
---- a/vimoutliner/scripts/outline_freemind/freemind_outline.py	2017-08-25 08:07:01.985459421 +0000
-+++ b/vimoutliner/scripts/outline_freemind/freemind_outline.py	2017-08-25 08:07:11.244502161 +0000
-@@ -1,3 +1,4 @@
-+#!/usr/bin/python
- '''Converts a freemind xml .mm file to an outline file compatable with vim 
- outliner.
- 
diff --git a/app-vim/vimoutliner/metadata.xml b/app-vim/vimoutliner/metadata.xml
index 8472d599577a..b9469d272f42 100644
--- a/app-vim/vimoutliner/metadata.xml
+++ b/app-vim/vimoutliner/metadata.xml
@@ -5,6 +5,7 @@
 		<email>vim@gentoo.org</email>
 		<name>Gentoo Vim Project</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">vimoutliner/vimoutliner</remote-id>
 	</upstream>
diff --git a/app-vim/vimoutliner/vimoutliner-0.3.6-r3.ebuild b/app-vim/vimoutliner/vimoutliner-0.3.6-r3.ebuild
deleted file mode 100644
index 4bea6a6dc884..000000000000
--- a/app-vim/vimoutliner/vimoutliner-0.3.6-r3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit vim-plugin python-single-r1
-
-DESCRIPTION="vim plugin: easy and fast outlining"
-HOMEPAGE="https://github.com/vimoutliner/vimoutliner"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-VIM_PLUGIN_HELPFILES="vimoutliner"
-VIM_PLUGIN_MESSAGES="filetype"
-
-PATCHES=( "${FILESDIR}/${P}-fix-shebangs.patch" )
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/autopep8[${PYTHON_MULTI_USEDEP}]
-	')"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed -i -e '/^if exists/,/endif/d' ftdetect/vo_base.vim || die
-	sed -i -e 's/g:vo_modules2load/g:vo_modules_load/' vimoutliner/vimoutlinerrc || die
-	rm -v install.sh || die
-	find "${S}" -type f -exec chmod a+r {} \; || die
-}
-
-src_compile() {
-	local pyscript _pyscript
-	for pyscript in $(find "${S}" -type f -name \*.py); do
-		_pyscript=$(basename "${pyscript}")
-		einfo "Processing ${_pyscript}"
-		sed -i -e 's#[ \t]*$##g;' "${pyscript}" || die
-		2to3 --no-diffs -w -n "${pyscript}" 2> /dev/null || die
-		autopep8 -i "${pyscript}" || die
-		python_fix_shebang -q "${pyscript}" || die
-		eend $?
-	done
-}
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 0e9694fa01f4..e386b6a97096 100644
--- a/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild
+++ b/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-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
@@ -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 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ppc sparc x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-vim/vimpython/Manifest b/app-vim/vimpython/Manifest
index aa211a3fe791..27a9d221ad45 100644
--- a/app-vim/vimpython/Manifest
+++ b/app-vim/vimpython/Manifest
@@ -1,4 +1,3 @@
 DIST vimpython-1.13.tar.bz2 4270 BLAKE2B 7973aea8ea397f3f2edcf8a2845ab47cad3015925dd9e42e37a7ada47f25073b68d6d8f8c378a86d90e39c0aae63aba784753679b4d04a5aad268db157400ae2 SHA512 467217ad160f02d3ecdc8c43e35966e496e6c5f99bef115bd4905795c0fd5b8f68f68bc8edd64ca1dbb1c6fbc088ef6ae996f524f0343943702f2a92dcc144ce
-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
deleted file mode 100644
index 2976870dc7b2..000000000000
--- a/app-vim/vimpython/vimpython-1.13-r2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-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}"
-
-DEPEND="app-arch/unzip"
-RDEPEND="${PYTHON_DEPS}"