[gentoo-commits] repo/gentoo:master commit in: app-vim/nginx-syntax/, app-vim/vcscommand/, app-vim/supertab/, ...

[Patrice Clement]

commit:     6cf4381cdbc342ec0583a21316c5e64f881e05c9
Author:     Marco Sirabella <marco <AT> sirabella <DOT> org>
AuthorDate: Wed Apr 28 03:03:13 2021 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun May  2 20:22:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cf4381c

app-vim/*: bump EAPI 5 -> 7.

Signed-off-by: Marco Sirabella <marco <AT> sirabella.org>
Closes: https://github.com/gentoo/gentoo/pull/20530
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 app-vim/align/align-43.ebuild                                 |  2 +-
 app-vim/ansiesc/ansiesc-12.ebuild                             |  2 +-
 app-vim/autoalign/autoalign-14.ebuild                         |  3 ++-
 app-vim/bash-support/bash-support-4.2.1.ebuild                |  2 +-
 app-vim/c-support/c-support-6.1.1.ebuild                      |  2 +-
 app-vim/cecutil/cecutil-17.ebuild                             |  2 +-
 app-vim/cfengine-syntax/cfengine-syntax-20141019.ebuild       |  2 +-
 app-vim/checkattach/checkattach-0.17.ebuild                   |  2 +-
 app-vim/colorschemes/colorschemes-20140623-r1.ebuild          | 10 ++++------
 app-vim/colorsel/colorsel-20100406.ebuild                     |  2 +-
 app-vim/detectindent/detectindent-1.0_p20150908.ebuild        |  2 +-
 app-vim/fuzzyfinder/fuzzyfinder-4.2.2.ebuild                  |  2 +-
 app-vim/git-patch-tags/git-patch-tags-0.2.ebuild              |  2 +-
 app-vim/gitlog/gitlog-5.1.0.ebuild                            |  2 +-
 app-vim/gtk-syntax/gtk-syntax-20130716.ebuild                 |  2 +-
 app-vim/json/json-20150511.ebuild                             |  3 ++-
 app-vim/l9/l9-1.1.ebuild                                      |  2 +-
 app-vim/multiplesearch/multiplesearch-1.3.ebuild              |  2 +-
 app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild                |  2 +-
 app-vim/perl-support/perl-support-5.3.2.ebuild                |  3 ++-
 app-vim/perl-support/perl-support-5.4.ebuild                  |  3 ++-
 app-vim/project/project-1.4.1.ebuild                          |  2 +-
 app-vim/rails/rails-5.2.ebuild                                |  3 ++-
 app-vim/recover/recover-0.18.ebuild                           |  2 +-
 app-vim/repeat/repeat-1.1.ebuild                              |  3 ++-
 app-vim/salt-vim/salt-vim-20151119.ebuild                     |  2 +-
 app-vim/screen/screen-1.5.ebuild                              |  3 ++-
 app-vim/securemodelines/securemodelines-20140926.ebuild       |  2 +-
 app-vim/sleuth/sleuth-1.1.ebuild                              |  2 +-
 app-vim/snipmate/snipmate-0.87-r1.ebuild                      |  3 ++-
 app-vim/sudoedit/sudoedit-0.21.ebuild                         |  3 ++-
 app-vim/supertab/supertab-2.1.ebuild                          |  3 ++-
 app-vim/surround/surround-2.1-r1.ebuild                       |  2 +-
 app-vim/vcscommand/vcscommand-1.99.47.ebuild                  |  2 +-
 app-vim/vim-addon-mw-utils/vim-addon-mw-utils-20121105.ebuild |  2 +-
 app-vim/vim-misc/vim-misc-1.17.6.ebuild                       |  3 ++-
 app-vim/vim-r/vim-r-1.2.6.ebuild                              |  2 +-
 app-vim/vimcommander/vimcommander-0.81.ebuild                 |  2 +-
 app-vim/yankring/yankring-19.0.ebuild                         |  2 +-
 39 files changed, 53 insertions(+), 44 deletions(-)

diff --git a/app-vim/align/align-43.ebuild b/app-vim/align/align-43.ebuild
index 02b75287879..c4bba070b47 100644
--- a/app-vim/align/align-43.ebuild
+++ b/app-vim/align/align-43.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vim-plugin
 

diff --git a/app-vim/ansiesc/ansiesc-12.ebuild b/app-vim/ansiesc/ansiesc-12.ebuild
index b45dfc4f9b2..b5e497766e8 100644
--- a/app-vim/ansiesc/ansiesc-12.ebuild
+++ b/app-vim/ansiesc/ansiesc-12.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vim-plugin
 

diff --git a/app-vim/autoalign/autoalign-14.ebuild b/app-vim/autoalign/autoalign-14.ebuild
index ace02e79d75..15c54639ed3 100644
--- a/app-vim/autoalign/autoalign-14.ebuild
+++ b/app-vim/autoalign/autoalign-14.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vim-plugin
 
@@ -28,4 +28,5 @@ src_prepare() {
 	# Don't use the cecutil.vim included in the tarball, use the one
 	# provided by app-vim/cecutil instead.
 	rm plugin/cecutil.vim || die
+	default
 }

diff --git a/app-vim/bash-support/bash-support-4.2.1.ebuild b/app-vim/bash-support/bash-support-4.2.1.ebuild
index f4800891387..cce06f718a9 100644
--- a/app-vim/bash-support/bash-support-4.2.1.ebuild
+++ b/app-vim/bash-support/bash-support-4.2.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vim-plugin
 

diff --git a/app-vim/c-support/c-support-6.1.1.ebuild b/app-vim/c-support/c-support-6.1.1.ebuild
index f9cfe8c262e..1d7b2734f2a 100644
--- a/app-vim/c-support/c-support-6.1.1.ebuild
+++ b/app-vim/c-support/c-support-6.1.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vim-plugin
 

diff --git a/app-vim/cecutil/cecutil-17.ebuild b/app-vim/cecutil/cecutil-17.ebuild
index fc93400ec1d..6901653b085 100644
--- a/app-vim/cecutil/cecutil-17.ebuild
+++ b/app-vim/cecutil/cecutil-17.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vim-plugin
 

diff --git a/app-vim/cfengine-syntax/cfengine-syntax-20141019.ebuild b/app-vim/cfengine-syntax/cfengine-syntax-20141019.ebuild
index 5bc129da502..9af1ff1f0e4 100644
--- a/app-vim/cfengine-syntax/cfengine-syntax-20141019.ebuild
+++ b/app-vim/cfengine-syntax/cfengine-syntax-20141019.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: Cfengine 3 configuration files syntax"

diff --git a/app-vim/checkattach/checkattach-0.17.ebuild b/app-vim/checkattach/checkattach-0.17.ebuild
index 8e37492bd15..c55dee6ff51 100644
--- a/app-vim/checkattach/checkattach-0.17.ebuild
+++ b/app-vim/checkattach/checkattach-0.17.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vim-plugin
 

diff --git a/app-vim/colorschemes/colorschemes-20140623-r1.ebuild b/app-vim/colorschemes/colorschemes-20140623-r1.ebuild
index 6293de9868d..0d4162e15f5 100644
--- a/app-vim/colorschemes/colorschemes-20140623-r1.ebuild
+++ b/app-vim/colorschemes/colorschemes-20140623-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit edos2unix epatch vim-plugin
+inherit edos2unix vim-plugin
 
 DESCRIPTION="vim plugin: a collection of color schemes from vim.org"
 HOMEPAGE="https://www.vim.org/"
@@ -18,10 +18,8 @@ for scheme names). To automatically set a scheme at startup, please see
 :help vimrc."
 
 src_prepare() {
-	EPATCH_SOURCE="${S}/patches" \
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch
+	default
+	eapply -p0 "${S}"/patches/*.patch
 	rm -rf patches/
 
 	# fix line endings

diff --git a/app-vim/colorsel/colorsel-20100406.ebuild b/app-vim/colorsel/colorsel-20100406.ebuild
index a98a469b5b4..2ebf3f5ec76 100644
--- a/app-vim/colorsel/colorsel-20100406.ebuild
+++ b/app-vim/colorsel/colorsel-20100406.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vim-plugin
 

diff --git a/app-vim/detectindent/detectindent-1.0_p20150908.ebuild b/app-vim/detectindent/detectindent-1.0_p20150908.ebuild
index 48402b60c7e..ba779e5ec0c 100644
--- a/app-vim/detectindent/detectindent-1.0_p20150908.ebuild
+++ b/app-vim/detectindent/detectindent-1.0_p20150908.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vim-plugin
 

diff --git a/app-vim/fuzzyfinder/fuzzyfinder-4.2.2.ebuild b/app-vim/fuzzyfinder/fuzzyfinder-4.2.2.ebuild
index 46f399bbb7b..b1f5a9af5db 100644
--- a/app-vim/fuzzyfinder/fuzzyfinder-4.2.2.ebuild
+++ b/app-vim/fuzzyfinder/fuzzyfinder-4.2.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vim-plugin
 

diff --git a/app-vim/git-patch-tags/git-patch-tags-0.2.ebuild b/app-vim/git-patch-tags/git-patch-tags-0.2.ebuild
index fc3d10475db..9048275a2eb 100644
--- a/app-vim/git-patch-tags/git-patch-tags-0.2.ebuild
+++ b/app-vim/git-patch-tags/git-patch-tags-0.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vim-plugin
 

diff --git a/app-vim/gitlog/gitlog-5.1.0.ebuild b/app-vim/gitlog/gitlog-5.1.0.ebuild
index 55e58752e73..fe95f8f1921 100644
--- a/app-vim/gitlog/gitlog-5.1.0.ebuild
+++ b/app-vim/gitlog/gitlog-5.1.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: git log and diff plugin for vim"

diff --git a/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild b/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
index 601005bf200..b498994c9d1 100644
--- a/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
+++ b/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vim-plugin
 

diff --git a/app-vim/json/json-20150511.ebuild b/app-vim/json/json-20150511.ebuild
index 945e149aa0e..efdbe9a258c 100644
--- a/app-vim/json/json-20150511.ebuild
+++ b/app-vim/json/json-20150511.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vim-plugin
 
@@ -12,4 +12,5 @@ KEYWORDS="amd64 x86"
 
 src_prepare() {
 	rm *-test.* license.md || die
+	default
 }

diff --git a/app-vim/l9/l9-1.1.ebuild b/app-vim/l9/l9-1.1.ebuild
index 9bee6627521..53007dd4fe0 100644
--- a/app-vim/l9/l9-1.1.ebuild
+++ b/app-vim/l9/l9-1.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vim-plugin
 

diff --git a/app-vim/multiplesearch/multiplesearch-1.3.ebuild b/app-vim/multiplesearch/multiplesearch-1.3.ebuild
index 107274f07b1..61ba9db3859 100644
--- a/app-vim/multiplesearch/multiplesearch-1.3.ebuild
+++ b/app-vim/multiplesearch/multiplesearch-1.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vim-plugin
 

diff --git a/app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild b/app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild
index 44bdb0ebfa0..89bac4a2685 100644
--- a/app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild
+++ b/app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 inherit vim-plugin
 

diff --git a/app-vim/perl-support/perl-support-5.3.2.ebuild b/app-vim/perl-support/perl-support-5.3.2.ebuild
index 9950764795c..03d23b7e14c 100644
--- a/app-vim/perl-support/perl-support-5.3.2.ebuild
+++ b/app-vim/perl-support/perl-support-5.3.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: Perl-IDE - Write and run Perl scripts using menus and hotkeys"
@@ -18,6 +18,7 @@ RDEPEND="
 src_prepare() {
 	# Don't set tabstop and shiftwidth
 	sed -i '/=4/s/^/"/' ftplugin/perl.vim || die
+	default
 }
 
 src_install() {

diff --git a/app-vim/perl-support/perl-support-5.4.ebuild b/app-vim/perl-support/perl-support-5.4.ebuild
index 6ff67a56f55..b36b555f700 100644
--- a/app-vim/perl-support/perl-support-5.4.ebuild
+++ b/app-vim/perl-support/perl-support-5.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: Perl-IDE - Write and run Perl scripts using menus and hotkeys"
@@ -23,6 +23,7 @@ S="${WORKDIR}/${PN}-version-${PV}"
 src_prepare() {
 	# Don't set tabstop and shiftwidth
 	sed -i '/=4/s/^/"/' ftplugin/perl.vim || die
+	default
 }
 
 src_install() {

diff --git a/app-vim/project/project-1.4.1.ebuild b/app-vim/project/project-1.4.1.ebuild
index b90a25189c6..e1880f059a4 100644
--- a/app-vim/project/project-1.4.1.ebuild
+++ b/app-vim/project/project-1.4.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vim-plugin
 

diff --git a/app-vim/rails/rails-5.2.ebuild b/app-vim/rails/rails-5.2.ebuild
index 10a6335781c..0cc49294e6d 100644
--- a/app-vim/rails/rails-5.2.ebuild
+++ b/app-vim/rails/rails-5.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vim-plugin
 
@@ -20,4 +20,5 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	rm *.markdown || die
+	default
 }

diff --git a/app-vim/recover/recover-0.18.ebuild b/app-vim/recover/recover-0.18.ebuild
index 7512b666fb1..f9b860a5657 100644
--- a/app-vim/recover/recover-0.18.ebuild
+++ b/app-vim/recover/recover-0.18.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: show differences for recovered files"

diff --git a/app-vim/repeat/repeat-1.1.ebuild b/app-vim/repeat/repeat-1.1.ebuild
index c2506991860..7ef2b6215c1 100644
--- a/app-vim/repeat/repeat-1.1.ebuild
+++ b/app-vim/repeat/repeat-1.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vim-plugin
 
@@ -18,4 +18,5 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	rm *.markdown || die
+	default
 }

diff --git a/app-vim/salt-vim/salt-vim-20151119.ebuild b/app-vim/salt-vim/salt-vim-20151119.ebuild
index c063d767601..b5584b45525 100644
--- a/app-vim/salt-vim/salt-vim-20151119.ebuild
+++ b/app-vim/salt-vim/salt-vim-20151119.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vim-plugin
 

diff --git a/app-vim/screen/screen-1.5.ebuild b/app-vim/screen/screen-1.5.ebuild
index 1dfb67f9091..d1ca61950c7 100644
--- a/app-vim/screen/screen-1.5.ebuild
+++ b/app-vim/screen/screen-1.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vim-plugin vcs-snapshot
 
@@ -18,4 +18,5 @@ RDEPEND="|| ( app-misc/screen app-misc/tmux )"
 
 src_prepare() {
 	rm README || die
+	default
 }

diff --git a/app-vim/securemodelines/securemodelines-20140926.ebuild b/app-vim/securemodelines/securemodelines-20140926.ebuild
index 7ab9e570dfd..8a417ec2e23 100644
--- a/app-vim/securemodelines/securemodelines-20140926.ebuild
+++ b/app-vim/securemodelines/securemodelines-20140926.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: secure, user-configurable modeline support"

diff --git a/app-vim/sleuth/sleuth-1.1.ebuild b/app-vim/sleuth/sleuth-1.1.ebuild
index f3ba9c8c956..4d001af564f 100644
--- a/app-vim/sleuth/sleuth-1.1.ebuild
+++ b/app-vim/sleuth/sleuth-1.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 inherit vim-plugin
 

diff --git a/app-vim/snipmate/snipmate-0.87-r1.ebuild b/app-vim/snipmate/snipmate-0.87-r1.ebuild
index 4397b174c5a..51acbd7d698 100644
--- a/app-vim/snipmate/snipmate-0.87-r1.ebuild
+++ b/app-vim/snipmate/snipmate-0.87-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vim-plugin
 
@@ -26,4 +26,5 @@ VIM_PLUGIN_MESSAGES="filetype"
 
 src_prepare() {
 	rm addon-info.json || die
+	default
 }

diff --git a/app-vim/sudoedit/sudoedit-0.21.ebuild b/app-vim/sudoedit/sudoedit-0.21.ebuild
index c2dac75eec6..9f298e3eff3 100644
--- a/app-vim/sudoedit/sudoedit-0.21.ebuild
+++ b/app-vim/sudoedit/sudoedit-0.21.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vim-plugin
 
@@ -16,4 +16,5 @@ RDEPEND="|| ( app-admin/sudo sys-apps/shadow )"
 src_prepare() {
 	# remove unused windows related files
 	rm autoload/{sudo.cmd,SudoEdit.vbs} || die
+	default
 }

diff --git a/app-vim/supertab/supertab-2.1.ebuild b/app-vim/supertab/supertab-2.1.ebuild
index cef7dfb0d3d..8f0cb83ec49 100644
--- a/app-vim/supertab/supertab-2.1.ebuild
+++ b/app-vim/supertab/supertab-2.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 inherit vim-plugin
 
@@ -15,4 +15,5 @@ VIM_PLUGIN_HELPFILES="${PN}.txt"
 
 src_prepare() {
 	rm Makefile .gitignore || die
+	default
 }

diff --git a/app-vim/surround/surround-2.1-r1.ebuild b/app-vim/surround/surround-2.1-r1.ebuild
index c74a7ec85ae..13e9d2e108c 100644
--- a/app-vim/surround/surround-2.1-r1.ebuild
+++ b/app-vim/surround/surround-2.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vim-plugin
 

diff --git a/app-vim/vcscommand/vcscommand-1.99.47.ebuild b/app-vim/vcscommand/vcscommand-1.99.47.ebuild
index 4fb0a58bc0a..fab405141ae 100644
--- a/app-vim/vcscommand/vcscommand-1.99.47.ebuild
+++ b/app-vim/vcscommand/vcscommand-1.99.47.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vim-plugin
 

diff --git a/app-vim/vim-addon-mw-utils/vim-addon-mw-utils-20121105.ebuild b/app-vim/vim-addon-mw-utils/vim-addon-mw-utils-20121105.ebuild
index e1a865ff200..1bdd624d46a 100644
--- a/app-vim/vim-addon-mw-utils/vim-addon-mw-utils-20121105.ebuild
+++ b/app-vim/vim-addon-mw-utils/vim-addon-mw-utils-20121105.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vim-plugin
 

diff --git a/app-vim/vim-misc/vim-misc-1.17.6.ebuild b/app-vim/vim-misc/vim-misc-1.17.6.ebuild
index 10ce26e479e..43180c27bd2 100644
--- a/app-vim/vim-misc/vim-misc-1.17.6.ebuild
+++ b/app-vim/vim-misc/vim-misc-1.17.6.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vim-plugin
 
@@ -15,4 +15,5 @@ VIM_PLUGIN_HELPFILES="misc.txt"
 
 src_prepare() {
 	rm INSTALL.md addon-info.json autoload/xolox/misc/echo.exe || die
+	default
 }

diff --git a/app-vim/vim-r/vim-r-1.2.6.ebuild b/app-vim/vim-r/vim-r-1.2.6.ebuild
index c02b63c3817..5f14e094b4c 100644
--- a/app-vim/vim-r/vim-r-1.2.6.ebuild
+++ b/app-vim/vim-r/vim-r-1.2.6.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vim-plugin
 

diff --git a/app-vim/vimcommander/vimcommander-0.81.ebuild b/app-vim/vimcommander/vimcommander-0.81.ebuild
index 1033bee83c8..88837cdb1d9 100644
--- a/app-vim/vimcommander/vimcommander-0.81.ebuild
+++ b/app-vim/vimcommander/vimcommander-0.81.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: Total Commander style file explorer"

diff --git a/app-vim/yankring/yankring-19.0.ebuild b/app-vim/yankring/yankring-19.0.ebuild
index 5f82da83915..71a8fd7d17f 100644
--- a/app-vim/yankring/yankring-19.0.ebuild
+++ b/app-vim/yankring/yankring-19.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: maintains a history of previous yanks and deletes"