[gentoo-commits] repo/gentoo:master commit in: app-editors/vim/

[Mike Gilbert]

commit:     108507449761bd97e1aa3dd3cc06e6851a01df32
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  9 00:28:15 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Jun  9 21:17:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10850744

app-editors/vim: drop versions

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 app-editors/vim/Manifest                 |   8 -
 app-editors/vim/metadata.xml             |   1 -
 app-editors/vim/vim-8.2.0814-r100.ebuild | 343 -----------------------------
 app-editors/vim/vim-8.2.3428-r1.ebuild   | 355 ------------------------------
 app-editors/vim/vim-8.2.3567.ebuild      | 357 -------------------------------
 app-editors/vim/vim-8.2.3582.ebuild      | 357 -------------------------------
 app-editors/vim/vim-8.2.3669.ebuild      | 357 -------------------------------
 app-editors/vim/vim-8.2.3741.ebuild      | 357 -------------------------------
 app-editors/vim/vim-8.2.3950.ebuild      | 357 -------------------------------
 app-editors/vim/vim-8.2.4285.ebuild      | 357 -------------------------------
 10 files changed, 2849 deletions(-)

diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index beff7d959453..95416aebcb47 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -1,12 +1,4 @@
 DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B 
a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15
 SHA512 
00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b
-DIST vim-8.2.0814.tar.gz 14953478 BLAKE2B 
fd4155ec749bd9a705e8114ff7f8cc321182c9286733ff2f665e265ec0af830f9e70c730b8d0215f6db1f73a8e2f878d22932a72c8dbfe921591be7adcdaab00
 SHA512 
4ddd9e2d30719f931cadd1a4de5700736f641f4b074378d9ea1462a90b81975ce8e8c3ca2e3a1e15ac0288824eef5b0f0a3e31482f7637c450c6d7e52c8f40d2
-DIST vim-8.2.3428.tar.gz 15715383 BLAKE2B 
865842bae0de25c34f255085f6edfe35b6905e220bdcb76372d7289ef1f6c2b2dee2f88e4a5f849d43fa560db4ade1e8e498d86f5651c5218d9153cde5ecddd3
 SHA512 
7cb473afa0ad6a9728dfc2f7d8ca19a21de329c4790141c7cb815b71c07e92a1ce04a5fcc2a0381c4beb304670d6c08629dc2ed2cb0842998cca2fd846c8cd6b
-DIST vim-8.2.3567.tar.gz 15771981 BLAKE2B 
5a10ce998769b73a9c3b30fccb84e90eef8242d04e52b1cf475af777233ac774a6e5ec8c2aa09cadfe2db747b485fcc26d1d953017df4bb459d8a427715a3048
 SHA512 
f1b5debc77d5392966d168974eab7faae99082509a8148ea212e8e06ae980d9a2652ac77547d77d10953119527f68c633440cf813bb6dec8e259b7628af93af6
-DIST vim-8.2.3582.tar.gz 15778667 BLAKE2B 
c8eaa95fa4fde6514168a9f42a712a78442a7fe504b59158e2e7717b8025a59cb4d8948451d72418b29f2b7cf3619cd765ef43e1304d73f81a6cba405f9706e7
 SHA512 
f476f24390807b71a0e02729f1815b3743b6b42cdd28a414e9ceaf0aa3fd4cab91e3550a669b1c64b4cd83207515cfe2b4acf2358a6def60e216e101c979037e
-DIST vim-8.2.3669.tar.gz 15810783 BLAKE2B 
edac6dabfbeb11057c7b15830b30ec555a10942494bc89d7d85b4c701b5ff8f7413887e4e33e7b812057177ffebd2cdc74e69e86080a86cfee529b1da45156bb
 SHA512 
83d172f7e1a3c5a8ea6238f2766bf077463d32d429111c08e5b28b8aafb8aea584807023281abf3b1710d61820fec8d2b808b42b5c50058d5eb4eb917deb19ab
-DIST vim-8.2.3741.tar.gz 15812097 BLAKE2B 
5cd90d4c86774a63a020ac8f245005e3f7df030c1334f989862b17b70d7859d751f79dcaf98eb5216c23df6ce63f3406cb5cb3c643f9e8170987f4f705a49833
 SHA512 
19ee7cc27642253ad989e6e32ab96faa46b5e1feebba00cadd018af2de186358d686cfa5efbc8e5da00a14ceb42c226acfc81cb11cd87f34ec7ca901c98df814
-DIST vim-8.2.3950.tar.gz 15865929 BLAKE2B 
e713895f847194845c1a794fc796e97678b11686f51f9a33898d92cf1d3927c6d49cd24024b6c5cbbad82b45ab8293f6d4663f14e66a56cc8b361a5fabdbb0b0
 SHA512 
d9176f74a1b753fb9118362350b3da16f176c7bc5cc57b41dab1f470c1e80830e4a6f4851d5a090d6efdb272186bd8f6a8a5e08e5da5ae0474560cb32dd626be
-DIST vim-8.2.4285.tar.gz 15962343 BLAKE2B 
ba0971cbea3d3fe1761961f66a24281c06f0a509f1aac7c32e26f07b5d9d122b72da68646874b1f20879372d26e1b5a72f020913a31c1c0aa26f8e6bff074516
 SHA512 
760180b89c285b92f3ec40041c784e756a93d7c6d75386c1c737762b9041babfaa17fd0b9e47e3e4298b24b8f5c7300e6a1ab2addbbcda94e46c973a97d578ec
 DIST vim-8.2.4328.tar.gz 15983756 BLAKE2B 
23d95d2ae6772fbd2a15a73dff5af75dcebf87af5a6a600d8a30284d32d1f83999111bfaa0e49c0295ae42a06f49075aeb00f8ae969eff251889b363b7445fda
 SHA512 
f5e077891d22f468327e30808dba817efe74111c89948fbea5544be58333a8d3342290fa140939dd9c7d976575e63050e100daf947ba73373cc2268677020651
 DIST vim-8.2.4586.tar.gz 16251186 BLAKE2B 
26471b493397e58d3e3d6f2c0c5cc69a08c294dcd59367a12729d1762cf2043eab0987ec4c370bd1f4cbbc67d10576f8a6dcfcb748d224b2f35476dbade32597
 SHA512 
354464e51a3cc13e13f3194ef8a4d5ccec978da7eb385337a042a6b2e6b38a253c587815e7c972070c516f59c7d54c89bce6926ae7f7f9635cddfd1d0bd237b9
 DIST vim-8.2.5066.tar.gz 16497942 BLAKE2B 
613f009f6a03e28305763e471bf55b626f37bb8b0f01324d5a676f6682811e3c4a5c11442af839d06b7d94b3938f5a30306bac576eec5d3c76f4a135a3443bb3
 SHA512 
27fdd1e86b0488b974a9fd60523b31ba23b581cab4c9bd15aee9ae459e2f2d028d6887adf621ee88244b74d26697fc953b08b587a3a80b316d31b65fc588ce9e

diff --git a/app-editors/vim/metadata.xml b/app-editors/vim/metadata.xml
index 4f3a37faf97f..4d10c6621954 100644
--- a/app-editors/vim/metadata.xml
+++ b/app-editors/vim/metadata.xml
@@ -8,7 +8,6 @@
   <use>
     <flag name="crypt">Use <pkg>dev-libs/libsodium</pkg> for crypto 
support</flag>
     <flag name="cscope">Enable cscope interface</flag>
-    <flag name="ipv6">Enable IPv6 support in channel</flag>
     <flag name="racket">Enable support for Scheme using 
<pkg>dev-scheme/racket</pkg></flag>
     <flag name="terminal">Enable terminal emulation support</flag>
     <flag name="vim-pager">Install vimpager and vimmanpager links</flag>

diff --git a/app-editors/vim/vim-8.2.0814-r100.ebuild 
b/app-editors/vim/vim-8.2.0814-r100.ebuild
deleted file mode 100644
index d11b9a85892f..000000000000
--- a/app-editors/vim/vim-8.2.0814-r100.ebuild
+++ /dev/null
@@ -1,343 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VIM_VERSION="8.2"
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 
ruby-single desktop xdg-utils
-
-if [[ ${PV} == 9999* ]] ; then
-       inherit git-r3
-       EGIT_REPO_URI="https://github.com/vim/vim.git";
-else
-       SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-               
https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz";
-       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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Vim, an improved vi-style text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim";
-
-SLOT="0"
-LICENSE="vim"
-IUSE="X acl cscope debug gpm lua ipv6 minimal nls perl python racket ruby 
selinux sound tcl terminal vim-pager"
-REQUIRED_USE="
-       lua? ( ${LUA_REQUIRED_USE} )
-       python? ( ${PYTHON_REQUIRED_USE} )
-       vim-pager? ( !minimal )
-"
-
-RDEPEND="
-       >=app-eselect/eselect-vi-1.1
-       >=sys-libs/ncurses-5.2-r2:0=
-       nls? ( virtual/libintl )
-       acl? ( kernel_linux? ( sys-apps/acl ) )
-       cscope? ( dev-util/cscope )
-       gpm? ( >=sys-libs/gpm-1.19.3 )
-       lua? ( ${LUA_DEPS}
-               $(lua_gen_impl_dep 'deprecated' lua5-1)
-       )
-       !minimal? ( ~app-editors/vim-core-${PV} )
-       vim-pager? ( app-editors/vim-core[-minimal] )
-       perl? ( dev-lang/perl:= )
-       python? ( ${PYTHON_DEPS} )
-       racket? ( dev-scheme/racket )
-       ruby? ( ${RUBY_DEPS} )
-       selinux? ( sys-libs/libselinux )
-       sound? ( media-libs/libcanberra )
-       tcl? ( dev-lang/tcl:0= )
-       X? ( x11-libs/libXt )
-"
-
-DEPEND="
-       ${RDEPEND}
-       sys-devel/autoconf
-       nls? ( sys-devel/gettext )
-"
-# configure runs the Lua interpreter
-BDEPEND="lua? ( ${LUA_DEPS} )"
-
-pkg_setup() {
-       # people with broken alphabets run into trouble. bug 82186.
-       unset LANG LC_ALL
-       export LC_COLLATE="C"
-
-       # Gnome sandbox silliness. bug #114475.
-       mkdir -p "${T}"/home || die "mkdir failed"
-       export HOME="${T}"/home
-
-       use lua && lua-single_pkg_setup
-       use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-       if [[ ${PV} != 9999* ]] ; then
-               # Gentoo patches to fix runtime issues, cross-compile errors, 
etc
-               eapply "${WORKDIR}"/patches/
-       fi
-
-       # Fixup a script to use awk instead of nawk
-       sed -i -e \
-               '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-               "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-       # Read vimrc and gvimrc from /etc/vim
-       echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-               >> "${S}"/src/feature.h || die "echo failed"
-       echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-               >> "${S}"/src/feature.h || die "echo failed"
-
-       # Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-       # Hopefully this pattern won't break for a while at least.
-       # This fixes bug 29398 (27 Sep 2003 agriffis)
-       sed -i -e \
-               's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-               "${S}"/runtime/doc/syntax.txt \
-               "${S}"/runtime/doc/tagsrch.txt \
-               "${S}"/runtime/doc/usr_29.txt \
-               "${S}"/runtime/menu.vim \
-               "${S}"/src/configure.ac || die 'sed failed'
-
-       # Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-       # this is NeXT, but it's actually just a file in dev-libs/9libs
-       # This fixes bug 43885 (20 Mar 2004 agriffis)
-       sed -i -e \
-               's/ libc\.h / /' \
-               "${S}"/src/configure.ac || die 'sed failed'
-
-       # gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-       # correctly. To avoid some really entertaining error messages about 
stuff
-       # which isn't even in the source file being invalid, we'll do some 
trickery
-       # to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-       find "${S}" -name '*.c' | while read c; do
-           echo >> "$c" || die "echo failed"
-       done
-
-       # conditionally make the manpager.sh script
-       if use vim-pager; then
-               cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat 
EOF failed"
-                       #!/bin/sh
-                       sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
-                                       vim \\
-                                               -c 'let no_plugin_maps = 1' \\
-                                               -c 'set nolist nomod ft=man 
ts=8' \\
-                                               -c 'let g:showmarks_enable=0' \\
-                                               -c 'runtime! macros/less.vim' -
-                       _EOF_
-       fi
-
-       # Try to avoid sandbox problems. Bug #114475.
-       if [[ -d "${S}"/src/po ]]; then
-               sed -i -e \
-                       '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; 
./testvim -X,' \
-                       "${S}"/src/po/Makefile || die "sed failed"
-       fi
-
-       cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp 
failed"
-
-       sed -i -e \
-               "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-               "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-       eapply_user
-}
-
-src_configure() {
-       local myconf=()
-
-       # Fix bug 37354: Disallow -funroll-all-loops on amd64
-       # Bug 57859 suggests that we want to do this for all archs
-       filter-flags -funroll-all-loops
-
-       # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-       # everyone since previous flag filtering bugs have turned out to affect
-       # multiple archs...
-       replace-flags -O3 -O2
-
-       # Fix bug 18245: Prevent "make" from the following chain:
-       # (1) Notice configure.ac is newer than auto/configure
-       # (2) Rebuild auto/configure
-       # (3) Notice auto/configure is newer than auto/config.mk
-       # (4) Run ./configure (with wrong args) to remake auto/config.mk
-       sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed 
failed"
-       rm src/auto/configure || die "rm failed"
-       emake -j1 -C src autoconf
-
-       # This should fix a sandbox violation (see bug 24447). The hvc
-       # things are for ppc64, see bug 86433.
-       for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-               if [[ -e "${file}" ]]; then
-                       addwrite $file
-               fi
-       done
-
-       if use minimal; then
-               myconf=(
-                       --with-features=tiny
-                       --disable-nls
-                       --disable-canberra
-                       --disable-acl
-                       --enable-gui=no
-                       --without-x
-                       --disable-darwin
-                       --disable-luainterp
-                       --disable-perlinterp
-                       --disable-pythoninterp
-                       --disable-mzschemeinterp
-                       --disable-rubyinterp
-                       --disable-selinux
-                       --disable-tclinterp
-                       --disable-gpm
-               )
-       else
-               use debug && append-flags "-DDEBUG"
-
-               myconf=(
-                       --with-features=huge
-                       $(use_enable sound canberra)
-                       $(use_enable acl)
-                       $(use_enable cscope)
-                       $(use_enable gpm)
-                       $(use_enable nls)
-                       $(use_enable perl perlinterp)
-                       $(use_enable python python3interp)
-                       $(use_with python python3-command "${PYTHON}")
-                       $(use_enable racket mzschemeinterp)
-                       $(use_enable ruby rubyinterp)
-                       $(use_enable selinux)
-                       $(use_enable tcl tclinterp)
-                       $(use_enable terminal)
-               )
-
-               # --with-features=huge forces on cscope even if we --disable 
it. We need
-               # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-               if ! use cscope; then
-                       sed -i -e \
-                               '/# define FEAT_CSCOPE/d' src/feature.h || die 
"sed failed"
-               fi
-
-               if use lua; then
-                       myconf+=(
-                               --enable-luainterp
-                               $(use_with lua_single_target_luajit luajit)
-                               --with-lua-prefix="${EPREFIX}/usr"
-                       )
-               fi
-
-               if ! use ipv6; then
-                       myconf+=(
-                               vim_cv_ipv6_networking=no
-                       )
-               fi
-
-               # don't test USE=X here ... see bug #19115
-               # but need to provide a way to link against X ... see bug #20093
-               myconf+=(
-                       --enable-gui=no
-                       --disable-darwin
-                       $(use_with X x)
-               )
-       fi
-
-       # let package manager strip binaries
-       export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-       # keep prefix env contained within the EPREFIX
-       use prefix && myconf+=( --without-local-dir )
-
-       econf \
-               --with-modified-by=Gentoo-${PVR} \
-               "${myconf[@]}"
-}
-
-src_compile() {
-       # The following allows emake to be used
-       emake -j1 -C src auto/osdef.h objects
-
-       emake
-}
-
-src_test() {
-       einfo
-       einfo "Starting vim tests. Several error messages will be shown"
-       einfo "while the tests run. This is normal behaviour and does not"
-       einfo "indicate a fault."
-       einfo
-       ewarn "If the tests fail, your terminal may be left in a strange"
-       ewarn "state. Usually, running 'reset' will fix this."
-       einfo
-
-       # Don't let vim talk to X
-       unset DISPLAY
-
-       emake -j1 -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-       ebegin "Calling eselect vi update"
-       eselect vi update --if-unset
-       eend $?
-}
-
-src_install() {
-       local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-       # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
-       #       managed by eselect-vi
-       dobin src/vim
-       if ! use minimal ; then
-               dosym vim /usr/bin/vimdiff
-       fi
-       dosym vim /usr/bin/rvim
-       dosym vim /usr/bin/rview
-       if use vim-pager ; then
-               dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
-               dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
-               insinto ${vimfiles}/macros
-               doins runtime/macros/manpager.sh
-               fperms a+x ${vimfiles}/macros/manpager.sh
-       fi
-
-       # Fix an issue of missing defaults.vim when USE=minimal.
-       if use minimal ; then
-               if [[ ! -f "${vimfiles}/defaults.vim" ]]; then
-                       insinto ${vimfiles}
-                       doins runtime/defaults.vim
-               fi
-       fi
-
-       domenu runtime/vim.desktop
-
-       newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-       # keep in sync with 'complete ... -F' list
-       bashcomp_alias vim ex vi view rvim rview vimdiff
-}
-
-pkg_postinst() {
-       # Update documentation tags (from vim-doc.eclass)
-       update_vim_helptags
-
-       # Call eselect vi update
-       eselect_vi_update
-
-       # update desktop file mime cache
-       xdg_desktop_database_update
-}
-
-pkg_postrm() {
-       # Update documentation tags (from vim-doc.eclass)
-       update_vim_helptags
-
-       # Call eselect vi update
-       eselect_vi_update
-
-       # update desktop file mime cache
-       xdg_desktop_database_update
-}

diff --git a/app-editors/vim/vim-8.2.3428-r1.ebuild 
b/app-editors/vim/vim-8.2.3428-r1.ebuild
deleted file mode 100644
index 6496dc770195..000000000000
--- a/app-editors/vim/vim-8.2.3428-r1.ebuild
+++ /dev/null
@@ -1,355 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VIM_VERSION="8.2"
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 
ruby-single desktop xdg-utils
-
-if [[ ${PV} == 9999* ]] ; then
-       inherit git-r3
-       EGIT_REPO_URI="https://github.com/vim/vim.git";
-else
-       SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-               
https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz";
-       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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Vim, an improved vi-style text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim";
-
-SLOT="0"
-LICENSE="vim"
-IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby 
selinux sound tcl terminal vim-pager"
-REQUIRED_USE="
-       lua? ( ${LUA_REQUIRED_USE} )
-       python? ( ${PYTHON_REQUIRED_USE} )
-       vim-pager? ( !minimal )
-"
-
-RDEPEND="
-       >=app-eselect/eselect-vi-1.1
-       >=sys-libs/ncurses-5.2-r2:0=
-       nls? ( virtual/libintl )
-       acl? ( kernel_linux? ( sys-apps/acl ) )
-       crypt? ( dev-libs/libsodium:= )
-       cscope? ( dev-util/cscope )
-       gpm? ( >=sys-libs/gpm-1.19.3 )
-       lua? ( ${LUA_DEPS}
-               $(lua_gen_impl_dep 'deprecated' lua5-1)
-       )
-       !minimal? ( ~app-editors/vim-core-${PV} )
-       vim-pager? ( app-editors/vim-core[-minimal] )
-       perl? ( dev-lang/perl:= )
-       python? ( ${PYTHON_DEPS} )
-       racket? ( dev-scheme/racket )
-       ruby? ( ${RUBY_DEPS} )
-       selinux? ( sys-libs/libselinux )
-       sound? ( media-libs/libcanberra )
-       tcl? ( dev-lang/tcl:0= )
-       X? ( x11-libs/libXt )
-"
-
-DEPEND="
-       ${RDEPEND}
-       sys-devel/autoconf
-       nls? ( sys-devel/gettext )
-"
-# configure runs the Lua interpreter
-BDEPEND="lua? ( ${LUA_DEPS} )"
-
-pkg_setup() {
-       # people with broken alphabets run into trouble. bug 82186.
-       unset LANG LC_ALL
-       export LC_COLLATE="C"
-
-       # Gnome sandbox silliness. bug #114475.
-       mkdir -p "${T}"/home || die "mkdir failed"
-       export HOME="${T}"/home
-
-       use lua && lua-single_pkg_setup
-       use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-       if [[ ${PV} != 9999* ]] ; then
-               # Gentoo patches to fix runtime issues, cross-compile errors, 
etc
-               eapply "${WORKDIR}"/patches/
-       fi
-
-       # Fixup a script to use awk instead of nawk
-       sed -i -e \
-               '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-               "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-       # Read vimrc and gvimrc from /etc/vim
-       echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-               >> "${S}"/src/feature.h || die "echo failed"
-       echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-               >> "${S}"/src/feature.h || die "echo failed"
-
-       # Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-       # Hopefully this pattern won't break for a while at least.
-       # This fixes bug 29398 (27 Sep 2003 agriffis)
-       sed -i -e \
-               's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-               "${S}"/runtime/doc/syntax.txt \
-               "${S}"/runtime/doc/tagsrch.txt \
-               "${S}"/runtime/doc/usr_29.txt \
-               "${S}"/runtime/menu.vim \
-               "${S}"/src/configure.ac || die 'sed failed'
-
-       # Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-       # this is NeXT, but it's actually just a file in dev-libs/9libs
-       # This fixes bug 43885 (20 Mar 2004 agriffis)
-       sed -i -e \
-               's/ libc\.h / /' \
-               "${S}"/src/configure.ac || die 'sed failed'
-
-       # gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-       # correctly. To avoid some really entertaining error messages about 
stuff
-       # which isn't even in the source file being invalid, we'll do some 
trickery
-       # to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-       find "${S}" -name '*.c' | while read c; do
-           echo >> "$c" || die "echo failed"
-       done
-
-       # conditionally make the manpager.sh script
-       if use vim-pager; then
-               cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat 
EOF failed"
-                       #!/bin/sh
-                       sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
-                                       vim \\
-                                               -c 'let no_plugin_maps = 1' \\
-                                               -c 'set nolist nomod ft=man 
ts=8' \\
-                                               -c 'let g:showmarks_enable=0' \\
-                                               -c 'runtime! macros/less.vim' -
-                       _EOF_
-       fi
-
-       # Try to avoid sandbox problems. Bug #114475.
-       if [[ -d "${S}"/src/po ]]; then
-               sed -i -e \
-                       '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; 
./testvim -X,' \
-                       "${S}"/src/po/Makefile || die "sed failed"
-       fi
-
-       cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp 
failed"
-
-       sed -i -e \
-               "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-               "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-       eapply_user
-}
-
-src_configure() {
-       local myconf=()
-
-       # Fix bug 37354: Disallow -funroll-all-loops on amd64
-       # Bug 57859 suggests that we want to do this for all archs
-       filter-flags -funroll-all-loops
-
-       # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-       # everyone since previous flag filtering bugs have turned out to affect
-       # multiple archs...
-       replace-flags -O3 -O2
-
-       # Fix bug 18245: Prevent "make" from the following chain:
-       # (1) Notice configure.ac is newer than auto/configure
-       # (2) Rebuild auto/configure
-       # (3) Notice auto/configure is newer than auto/config.mk
-       # (4) Run ./configure (with wrong args) to remake auto/config.mk
-       sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed 
failed"
-       rm src/auto/configure || die "rm failed"
-       emake -j1 -C src autoconf
-
-       # This should fix a sandbox violation (see bug 24447). The hvc
-       # things are for ppc64, see bug 86433.
-       for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-               if [[ -e "${file}" ]]; then
-                       addwrite $file
-               fi
-       done
-
-       if use minimal; then
-               myconf=(
-                       --with-features=tiny
-                       --disable-nls
-                       --disable-canberra
-                       --disable-acl
-                       --enable-gui=no
-                       --without-x
-                       --disable-darwin
-                       --disable-luainterp
-                       --disable-perlinterp
-                       --disable-pythoninterp
-                       --disable-mzschemeinterp
-                       --disable-rubyinterp
-                       --disable-selinux
-                       --disable-tclinterp
-                       --disable-gpm
-               )
-       else
-               use debug && append-flags "-DDEBUG"
-
-               myconf=(
-                       --with-features=huge
-                       $(use_enable sound canberra)
-                       $(use_enable acl)
-                       $(use_enable crypt libsodium)
-                       $(use_enable cscope)
-                       $(use_enable gpm)
-                       $(use_enable nls)
-                       $(use_enable perl perlinterp)
-                       $(use_enable python python3interp)
-                       $(use_with python python3-command "${PYTHON}")
-                       $(use_enable racket mzschemeinterp)
-                       $(use_enable ruby rubyinterp)
-                       $(use_enable selinux)
-                       $(use_enable tcl tclinterp)
-                       $(use_enable terminal)
-               )
-
-               # --with-features=huge forces on cscope even if we --disable 
it. We need
-               # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-               if ! use cscope; then
-                       sed -i -e \
-                               '/# define FEAT_CSCOPE/d' src/feature.h || die 
"sed failed"
-               fi
-
-               if use lua; then
-                       myconf+=(
-                               --enable-luainterp
-                               $(use_with lua_single_target_luajit luajit)
-                               --with-lua-prefix="${EPREFIX}/usr"
-                       )
-               fi
-
-               # don't test USE=X here ... see bug #19115
-               # but need to provide a way to link against X ... see bug #20093
-               myconf+=(
-                       --enable-gui=no
-                       --disable-darwin
-                       $(use_with X x)
-               )
-       fi
-
-       # let package manager strip binaries
-       export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-       # keep prefix env contained within the EPREFIX
-       use prefix && myconf+=( --without-local-dir )
-
-       econf \
-               --with-modified-by=Gentoo-${PVR} \
-               "${myconf[@]}"
-}
-
-src_compile() {
-       # The following allows emake to be used
-       emake -j1 -C src auto/osdef.h objects
-
-       emake
-}
-
-src_test() {
-       einfo
-       einfo "Starting vim tests. Several error messages will be shown"
-       einfo "while the tests run. This is normal behaviour and does not"
-       einfo "indicate a fault."
-       einfo
-       ewarn "If the tests fail, your terminal may be left in a strange"
-       ewarn "state. Usually, running 'reset' will fix this."
-       einfo
-
-       # Don't let vim talk to X
-       unset DISPLAY
-
-       # See 
https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5
-       # for more information on test variables we can use.
-       # Note that certain variables need vim-compatible regex (not PCRE), see 
e.g.
-       # 
http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml.
-       #
-       # Skipped tests:
-       # - Test_expand_star_star
-       # Hangs because of a recursive symlink in /usr/include/nodejs (bug 
#616680)
-       # - Test_exrc
-       # Looks in wrong location? (bug #742710)
-       # - Test_job_tty_in_out
-       # Fragile and depends on TERM(?)
-       # - Test_spelldump_bang
-       # Hangs.
-       export 
TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\)'
-
-       emake -j1 -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-       ebegin "Calling eselect vi update"
-       eselect vi update --if-unset
-       eend $?
-}
-
-src_install() {
-       local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-       # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
-       #       managed by eselect-vi
-       dobin src/vim
-       if ! use minimal ; then
-               dosym vim /usr/bin/vimdiff
-       fi
-       dosym vim /usr/bin/rvim
-       dosym vim /usr/bin/rview
-       if use vim-pager ; then
-               dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
-               dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
-               insinto ${vimfiles}/macros
-               doins runtime/macros/manpager.sh
-               fperms a+x ${vimfiles}/macros/manpager.sh
-       fi
-
-       # Fix an issue of missing defaults.vim when USE=minimal.
-       if use minimal ; then
-               if [[ ! -f "${vimfiles}/defaults.vim" ]]; then
-                       insinto ${vimfiles}
-                       doins runtime/defaults.vim
-               fi
-       fi
-
-       domenu runtime/vim.desktop
-
-       newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-       # keep in sync with 'complete ... -F' list
-       bashcomp_alias vim ex vi view rvim rview vimdiff
-}
-
-pkg_postinst() {
-       # Update documentation tags (from vim-doc.eclass)
-       update_vim_helptags
-
-       # Call eselect vi update
-       eselect_vi_update
-
-       # update desktop file mime cache
-       xdg_desktop_database_update
-}
-
-pkg_postrm() {
-       # Update documentation tags (from vim-doc.eclass)
-       update_vim_helptags
-
-       # Call eselect vi update
-       eselect_vi_update
-
-       # update desktop file mime cache
-       xdg_desktop_database_update
-}

diff --git a/app-editors/vim/vim-8.2.3567.ebuild 
b/app-editors/vim/vim-8.2.3567.ebuild
deleted file mode 100644
index 44b4345ad6e7..000000000000
--- a/app-editors/vim/vim-8.2.3567.ebuild
+++ /dev/null
@@ -1,357 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Please bump with app-editors/vim-core and app-editors/gvim
-
-VIM_VERSION="8.2"
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 
ruby-single desktop xdg-utils
-
-if [[ ${PV} == 9999* ]] ; then
-       inherit git-r3
-       EGIT_REPO_URI="https://github.com/vim/vim.git";
-else
-       SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-               
https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz";
-       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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Vim, an improved vi-style text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim";
-
-LICENSE="vim"
-SLOT="0"
-IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby 
selinux sound tcl terminal vim-pager"
-REQUIRED_USE="
-       lua? ( ${LUA_REQUIRED_USE} )
-       python? ( ${PYTHON_REQUIRED_USE} )
-       vim-pager? ( !minimal )
-"
-
-RDEPEND="
-       >=app-eselect/eselect-vi-1.1
-       >=sys-libs/ncurses-5.2-r2:0=
-       nls? ( virtual/libintl )
-       acl? ( kernel_linux? ( sys-apps/acl ) )
-       crypt? ( dev-libs/libsodium:= )
-       cscope? ( dev-util/cscope )
-       gpm? ( >=sys-libs/gpm-1.19.3 )
-       lua? ( ${LUA_DEPS}
-               $(lua_gen_impl_dep 'deprecated' lua5-1)
-       )
-       !minimal? ( ~app-editors/vim-core-${PV} )
-       vim-pager? ( app-editors/vim-core[-minimal] )
-       perl? ( dev-lang/perl:= )
-       python? ( ${PYTHON_DEPS} )
-       racket? ( dev-scheme/racket )
-       ruby? ( ${RUBY_DEPS} )
-       selinux? ( sys-libs/libselinux )
-       sound? ( media-libs/libcanberra )
-       tcl? ( dev-lang/tcl:0= )
-       X? ( x11-libs/libXt )
-"
-DEPEND="${RDEPEND}"
-# configure runs the Lua interpreter
-BDEPEND="
-       sys-devel/autoconf
-       lua? ( ${LUA_DEPS} )
-       nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-       # people with broken alphabets run into trouble. bug #82186.
-       unset LANG LC_ALL
-       export LC_COLLATE="C"
-
-       # Gnome sandbox silliness. bug #114475.
-       mkdir -p "${T}"/home || die "mkdir failed"
-       export HOME="${T}"/home
-
-       use lua && lua-single_pkg_setup
-       use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-       if [[ ${PV} != 9999* ]] ; then
-               # Gentoo patches to fix runtime issues, cross-compile errors, 
etc
-               eapply "${WORKDIR}"/patches/
-       fi
-
-       # Fixup a script to use awk instead of nawk
-       sed -i -e \
-               '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-               "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-       # Read vimrc and gvimrc from /etc/vim
-       echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-               >> "${S}"/src/feature.h || die "echo failed"
-       echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-               >> "${S}"/src/feature.h || die "echo failed"
-
-       # Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-       # Hopefully this pattern won't break for a while at least.
-       # This fixes bug #29398 (27 Sep 2003 agriffis)
-       sed -i -e \
-               's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-               "${S}"/runtime/doc/syntax.txt \
-               "${S}"/runtime/doc/tagsrch.txt \
-               "${S}"/runtime/doc/usr_29.txt \
-               "${S}"/runtime/menu.vim \
-               "${S}"/src/configure.ac || die 'sed failed'
-
-       # Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-       # this is NeXT, but it's actually just a file in dev-libs/9libs
-       # This fixes bug #43885 (20 Mar 2004 agriffis)
-       sed -i -e \
-               's/ libc\.h / /' \
-               "${S}"/src/configure.ac || die 'sed failed'
-
-       # gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-       # correctly. To avoid some really entertaining error messages about 
stuff
-       # which isn't even in the source file being invalid, we'll do some 
trickery
-       # to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-       find "${S}" -name '*.c' | while read c; do
-           echo >> "$c" || die "echo failed"
-       done
-
-       # conditionally make the manpager.sh script
-       if use vim-pager; then
-               cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat 
EOF failed"
-                       #!/bin/sh
-                       sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
-                                       vim \\
-                                               -c 'let no_plugin_maps = 1' \\
-                                               -c 'set nolist nomod ft=man 
ts=8' \\
-                                               -c 'let g:showmarks_enable=0' \\
-                                               -c 'runtime! macros/less.vim' -
-                       _EOF_
-       fi
-
-       # Try to avoid sandbox problems. Bug #114475.
-       if [[ -d "${S}"/src/po ]]; then
-               sed -i -e \
-                       '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; 
./testvim -X,' \
-                       "${S}"/src/po/Makefile || die "sed failed"
-       fi
-
-       cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp 
failed"
-
-       sed -i -e \
-               "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-               "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-       eapply_user
-}
-
-src_configure() {
-       local myconf=()
-
-       # Fix bug #37354: Disallow -funroll-all-loops on amd64
-       # Bug #57859 suggests that we want to do this for all archs
-       filter-flags -funroll-all-loops
-
-       # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-       # everyone since previous flag filtering bugs have turned out to affect
-       # multiple archs...
-       replace-flags -O3 -O2
-
-       # Fix bug 18245: Prevent "make" from the following chain:
-       # (1) Notice configure.ac is newer than auto/configure
-       # (2) Rebuild auto/configure
-       # (3) Notice auto/configure is newer than auto/config.mk
-       # (4) Run ./configure (with wrong args) to remake auto/config.mk
-       sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed 
failed"
-       rm src/auto/configure || die "rm failed"
-       emake -j1 -C src autoconf
-
-       # This should fix a sandbox violation (see bug #24447). The hvc
-       # things are for ppc64, see bug #86433.
-       for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-               if [[ -e "${file}" ]]; then
-                       addwrite ${file}
-               fi
-       done
-
-       if use minimal; then
-               myconf=(
-                       --with-features=tiny
-                       --disable-nls
-                       --disable-canberra
-                       --disable-acl
-                       --enable-gui=no
-                       --without-x
-                       --disable-darwin
-                       --disable-luainterp
-                       --disable-perlinterp
-                       --disable-pythoninterp
-                       --disable-mzschemeinterp
-                       --disable-rubyinterp
-                       --disable-selinux
-                       --disable-tclinterp
-                       --disable-gpm
-               )
-       else
-               use debug && append-flags "-DDEBUG"
-
-               myconf=(
-                       --with-features=huge
-                       $(use_enable sound canberra)
-                       $(use_enable acl)
-                       $(use_enable crypt libsodium)
-                       $(use_enable cscope)
-                       $(use_enable gpm)
-                       $(use_enable nls)
-                       $(use_enable perl perlinterp)
-                       $(use_enable python python3interp)
-                       $(use_with python python3-command "${PYTHON}")
-                       $(use_enable racket mzschemeinterp)
-                       $(use_enable ruby rubyinterp)
-                       $(use_enable selinux)
-                       $(use_enable tcl tclinterp)
-                       $(use_enable terminal)
-               )
-
-               # --with-features=huge forces on cscope even if we --disable 
it. We need
-               # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-               if ! use cscope; then
-                       sed -i -e \
-                               '/# define FEAT_CSCOPE/d' src/feature.h || die 
"sed failed"
-               fi
-
-               if use lua; then
-                       myconf+=(
-                               --enable-luainterp
-                               $(use_with lua_single_target_luajit luajit)
-                               --with-lua-prefix="${EPREFIX}/usr"
-                       )
-               fi
-
-               # don't test USE=X here ... see bug #19115
-               # but need to provide a way to link against X ... see bug #20093
-               myconf+=(
-                       --enable-gui=no
-                       --disable-darwin
-                       $(use_with X x)
-               )
-       fi
-
-       # let package manager strip binaries
-       export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-       # keep prefix env contained within the EPREFIX
-       use prefix && myconf+=( --without-local-dir )
-
-       econf \
-               --with-modified-by=Gentoo-${PVR} \
-               "${myconf[@]}"
-}
-
-src_compile() {
-       # The following allows emake to be used
-       emake -j1 -C src auto/osdef.h objects
-
-       emake
-}
-
-src_test() {
-       einfo
-       einfo "Starting vim tests. Several error messages will be shown"
-       einfo "while the tests run. This is normal behaviour and does not"
-       einfo "indicate a fault."
-       einfo
-       ewarn "If the tests fail, your terminal may be left in a strange"
-       ewarn "state. Usually, running 'reset' will fix this."
-       einfo
-
-       # Don't let vim talk to X
-       unset DISPLAY
-
-       # See 
https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5
-       # for more information on test variables we can use.
-       # Note that certain variables need vim-compatible regex (not PCRE), see 
e.g.
-       # 
http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml.
-       #
-       # Skipped tests:
-       # - Test_expand_star_star
-       # Hangs because of a recursive symlink in /usr/include/nodejs (bug 
#616680)
-       # - Test_exrc
-       # Looks in wrong location? (bug #742710)
-       # - Test_job_tty_in_out
-       # Fragile and depends on TERM(?)
-       # - Test_spelldump_bang
-       # Hangs.
-       export 
TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\)'
-
-       emake -j1 -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug #187449)
-eselect_vi_update() {
-       ebegin "Calling eselect vi update"
-       eselect vi update --if-unset
-       eend $?
-}
-
-src_install() {
-       local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-       # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
-       #       managed by eselect-vi
-       dobin src/vim
-       if ! use minimal ; then
-               dosym vim /usr/bin/vimdiff
-       fi
-       dosym vim /usr/bin/rvim
-       dosym vim /usr/bin/rview
-       if use vim-pager ; then
-               dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
-               dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
-               insinto ${vimfiles}/macros
-               doins runtime/macros/manpager.sh
-               fperms a+x ${vimfiles}/macros/manpager.sh
-       fi
-
-       # Fix an issue of missing defaults.vim when USE=minimal.
-       if use minimal ; then
-               if [[ ! -f "${vimfiles}/defaults.vim" ]]; then
-                       insinto ${vimfiles}
-                       doins runtime/defaults.vim
-               fi
-       fi
-
-       domenu runtime/vim.desktop
-
-       newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-       # keep in sync with 'complete ... -F' list
-       bashcomp_alias vim ex vi view rvim rview vimdiff
-}
-
-pkg_postinst() {
-       # Update documentation tags (from vim-doc.eclass)
-       update_vim_helptags
-
-       # Call eselect vi update
-       eselect_vi_update
-
-       # update desktop file mime cache
-       xdg_desktop_database_update
-}
-
-pkg_postrm() {
-       # Update documentation tags (from vim-doc.eclass)
-       update_vim_helptags
-
-       # Call eselect vi update
-       eselect_vi_update
-
-       # update desktop file mime cache
-       xdg_desktop_database_update
-}

diff --git a/app-editors/vim/vim-8.2.3582.ebuild 
b/app-editors/vim/vim-8.2.3582.ebuild
deleted file mode 100644
index dd9ebf6b23de..000000000000
--- a/app-editors/vim/vim-8.2.3582.ebuild
+++ /dev/null
@@ -1,357 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Please bump with app-editors/vim-core and app-editors/gvim
-
-VIM_VERSION="8.2"
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 
ruby-single desktop xdg-utils
-
-if [[ ${PV} == 9999* ]] ; then
-       inherit git-r3
-       EGIT_REPO_URI="https://github.com/vim/vim.git";
-else
-       SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-               
https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz";
-       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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Vim, an improved vi-style text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim";
-
-LICENSE="vim"
-SLOT="0"
-IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby 
selinux sound tcl terminal vim-pager"
-REQUIRED_USE="
-       lua? ( ${LUA_REQUIRED_USE} )
-       python? ( ${PYTHON_REQUIRED_USE} )
-       vim-pager? ( !minimal )
-"
-
-RDEPEND="
-       >=app-eselect/eselect-vi-1.1
-       >=sys-libs/ncurses-5.2-r2:0=
-       nls? ( virtual/libintl )
-       acl? ( kernel_linux? ( sys-apps/acl ) )
-       crypt? ( dev-libs/libsodium:= )
-       cscope? ( dev-util/cscope )
-       gpm? ( >=sys-libs/gpm-1.19.3 )
-       lua? ( ${LUA_DEPS}
-               $(lua_gen_impl_dep 'deprecated' lua5-1)
-       )
-       !minimal? ( ~app-editors/vim-core-${PV} )
-       vim-pager? ( app-editors/vim-core[-minimal] )
-       perl? ( dev-lang/perl:= )
-       python? ( ${PYTHON_DEPS} )
-       racket? ( dev-scheme/racket )
-       ruby? ( ${RUBY_DEPS} )
-       selinux? ( sys-libs/libselinux )
-       sound? ( media-libs/libcanberra )
-       tcl? ( dev-lang/tcl:0= )
-       X? ( x11-libs/libXt )
-"
-DEPEND="${RDEPEND}"
-# configure runs the Lua interpreter
-BDEPEND="
-       sys-devel/autoconf
-       lua? ( ${LUA_DEPS} )
-       nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-       # people with broken alphabets run into trouble. bug #82186.
-       unset LANG LC_ALL
-       export LC_COLLATE="C"
-
-       # Gnome sandbox silliness. bug #114475.
-       mkdir -p "${T}"/home || die "mkdir failed"
-       export HOME="${T}"/home
-
-       use lua && lua-single_pkg_setup
-       use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-       if [[ ${PV} != 9999* ]] ; then
-               # Gentoo patches to fix runtime issues, cross-compile errors, 
etc
-               eapply "${WORKDIR}"/patches/
-       fi
-
-       # Fixup a script to use awk instead of nawk
-       sed -i -e \
-               '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-               "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-       # Read vimrc and gvimrc from /etc/vim
-       echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-               >> "${S}"/src/feature.h || die "echo failed"
-       echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-               >> "${S}"/src/feature.h || die "echo failed"
-
-       # Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-       # Hopefully this pattern won't break for a while at least.
-       # This fixes bug #29398 (27 Sep 2003 agriffis)
-       sed -i -e \
-               's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-               "${S}"/runtime/doc/syntax.txt \
-               "${S}"/runtime/doc/tagsrch.txt \
-               "${S}"/runtime/doc/usr_29.txt \
-               "${S}"/runtime/menu.vim \
-               "${S}"/src/configure.ac || die 'sed failed'
-
-       # Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-       # this is NeXT, but it's actually just a file in dev-libs/9libs
-       # This fixes bug #43885 (20 Mar 2004 agriffis)
-       sed -i -e \
-               's/ libc\.h / /' \
-               "${S}"/src/configure.ac || die 'sed failed'
-
-       # gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-       # correctly. To avoid some really entertaining error messages about 
stuff
-       # which isn't even in the source file being invalid, we'll do some 
trickery
-       # to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-       find "${S}" -name '*.c' | while read c; do
-           echo >> "$c" || die "echo failed"
-       done
-
-       # conditionally make the manpager.sh script
-       if use vim-pager; then
-               cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat 
EOF failed"
-                       #!/bin/sh
-                       sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
-                                       vim \\
-                                               -c 'let no_plugin_maps = 1' \\
-                                               -c 'set nolist nomod ft=man 
ts=8' \\
-                                               -c 'let g:showmarks_enable=0' \\
-                                               -c 'runtime! macros/less.vim' -
-                       _EOF_
-       fi
-
-       # Try to avoid sandbox problems. Bug #114475.
-       if [[ -d "${S}"/src/po ]]; then
-               sed -i -e \
-                       '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; 
./testvim -X,' \
-                       "${S}"/src/po/Makefile || die "sed failed"
-       fi
-
-       cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp 
failed"
-
-       sed -i -e \
-               "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-               "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-       eapply_user
-}
-
-src_configure() {
-       local myconf=()
-
-       # Fix bug #37354: Disallow -funroll-all-loops on amd64
-       # Bug #57859 suggests that we want to do this for all archs
-       filter-flags -funroll-all-loops
-
-       # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-       # everyone since previous flag filtering bugs have turned out to affect
-       # multiple archs...
-       replace-flags -O3 -O2
-
-       # Fix bug 18245: Prevent "make" from the following chain:
-       # (1) Notice configure.ac is newer than auto/configure
-       # (2) Rebuild auto/configure
-       # (3) Notice auto/configure is newer than auto/config.mk
-       # (4) Run ./configure (with wrong args) to remake auto/config.mk
-       sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed 
failed"
-       rm src/auto/configure || die "rm failed"
-       emake -j1 -C src autoconf
-
-       # This should fix a sandbox violation (see bug #24447). The hvc
-       # things are for ppc64, see bug #86433.
-       for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-               if [[ -e "${file}" ]]; then
-                       addwrite ${file}
-               fi
-       done
-
-       if use minimal; then
-               myconf=(
-                       --with-features=tiny
-                       --disable-nls
-                       --disable-canberra
-                       --disable-acl
-                       --enable-gui=no
-                       --without-x
-                       --disable-darwin
-                       --disable-luainterp
-                       --disable-perlinterp
-                       --disable-pythoninterp
-                       --disable-mzschemeinterp
-                       --disable-rubyinterp
-                       --disable-selinux
-                       --disable-tclinterp
-                       --disable-gpm
-               )
-       else
-               use debug && append-flags "-DDEBUG"
-
-               myconf=(
-                       --with-features=huge
-                       $(use_enable sound canberra)
-                       $(use_enable acl)
-                       $(use_enable crypt libsodium)
-                       $(use_enable cscope)
-                       $(use_enable gpm)
-                       $(use_enable nls)
-                       $(use_enable perl perlinterp)
-                       $(use_enable python python3interp)
-                       $(use_with python python3-command "${PYTHON}")
-                       $(use_enable racket mzschemeinterp)
-                       $(use_enable ruby rubyinterp)
-                       $(use_enable selinux)
-                       $(use_enable tcl tclinterp)
-                       $(use_enable terminal)
-               )
-
-               # --with-features=huge forces on cscope even if we --disable 
it. We need
-               # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-               if ! use cscope; then
-                       sed -i -e \
-                               '/# define FEAT_CSCOPE/d' src/feature.h || die 
"sed failed"
-               fi
-
-               if use lua; then
-                       myconf+=(
-                               --enable-luainterp
-                               $(use_with lua_single_target_luajit luajit)
-                               --with-lua-prefix="${EPREFIX}/usr"
-                       )
-               fi
-
-               # don't test USE=X here ... see bug #19115
-               # but need to provide a way to link against X ... see bug #20093
-               myconf+=(
-                       --enable-gui=no
-                       --disable-darwin
-                       $(use_with X x)
-               )
-       fi
-
-       # let package manager strip binaries
-       export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-       # keep prefix env contained within the EPREFIX
-       use prefix && myconf+=( --without-local-dir )
-
-       econf \
-               --with-modified-by=Gentoo-${PVR} \
-               "${myconf[@]}"
-}
-
-src_compile() {
-       # The following allows emake to be used
-       emake -j1 -C src auto/osdef.h objects
-
-       emake
-}
-
-src_test() {
-       einfo
-       einfo "Starting vim tests. Several error messages will be shown"
-       einfo "while the tests run. This is normal behaviour and does not"
-       einfo "indicate a fault."
-       einfo
-       ewarn "If the tests fail, your terminal may be left in a strange"
-       ewarn "state. Usually, running 'reset' will fix this."
-       einfo
-
-       # Don't let vim talk to X
-       unset DISPLAY
-
-       # See 
https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5
-       # for more information on test variables we can use.
-       # Note that certain variables need vim-compatible regex (not PCRE), see 
e.g.
-       # 
http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml.
-       #
-       # Skipped tests:
-       # - Test_expand_star_star
-       # Hangs because of a recursive symlink in /usr/include/nodejs (bug 
#616680)
-       # - Test_exrc
-       # Looks in wrong location? (bug #742710)
-       # - Test_job_tty_in_out
-       # Fragile and depends on TERM(?)
-       # - Test_spelldump_bang
-       # Hangs.
-       export 
TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\)'
-
-       emake -j1 -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug #187449)
-eselect_vi_update() {
-       ebegin "Calling eselect vi update"
-       eselect vi update --if-unset
-       eend $?
-}
-
-src_install() {
-       local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-       # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
-       #       managed by eselect-vi
-       dobin src/vim
-       if ! use minimal ; then
-               dosym vim /usr/bin/vimdiff
-       fi
-       dosym vim /usr/bin/rvim
-       dosym vim /usr/bin/rview
-       if use vim-pager ; then
-               dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
-               dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
-               insinto ${vimfiles}/macros
-               doins runtime/macros/manpager.sh
-               fperms a+x ${vimfiles}/macros/manpager.sh
-       fi
-
-       # Fix an issue of missing defaults.vim when USE=minimal.
-       if use minimal ; then
-               if [[ ! -f "${vimfiles}/defaults.vim" ]]; then
-                       insinto ${vimfiles}
-                       doins runtime/defaults.vim
-               fi
-       fi
-
-       domenu runtime/vim.desktop
-
-       newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-       # keep in sync with 'complete ... -F' list
-       bashcomp_alias vim ex vi view rvim rview vimdiff
-}
-
-pkg_postinst() {
-       # Update documentation tags (from vim-doc.eclass)
-       update_vim_helptags
-
-       # Call eselect vi update
-       eselect_vi_update
-
-       # update desktop file mime cache
-       xdg_desktop_database_update
-}
-
-pkg_postrm() {
-       # Update documentation tags (from vim-doc.eclass)
-       update_vim_helptags
-
-       # Call eselect vi update
-       eselect_vi_update
-
-       # update desktop file mime cache
-       xdg_desktop_database_update
-}

diff --git a/app-editors/vim/vim-8.2.3669.ebuild 
b/app-editors/vim/vim-8.2.3669.ebuild
deleted file mode 100644
index 44b4345ad6e7..000000000000
--- a/app-editors/vim/vim-8.2.3669.ebuild
+++ /dev/null
@@ -1,357 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Please bump with app-editors/vim-core and app-editors/gvim
-
-VIM_VERSION="8.2"
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 
ruby-single desktop xdg-utils
-
-if [[ ${PV} == 9999* ]] ; then
-       inherit git-r3
-       EGIT_REPO_URI="https://github.com/vim/vim.git";
-else
-       SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-               
https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz";
-       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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Vim, an improved vi-style text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim";
-
-LICENSE="vim"
-SLOT="0"
-IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby 
selinux sound tcl terminal vim-pager"
-REQUIRED_USE="
-       lua? ( ${LUA_REQUIRED_USE} )
-       python? ( ${PYTHON_REQUIRED_USE} )
-       vim-pager? ( !minimal )
-"
-
-RDEPEND="
-       >=app-eselect/eselect-vi-1.1
-       >=sys-libs/ncurses-5.2-r2:0=
-       nls? ( virtual/libintl )
-       acl? ( kernel_linux? ( sys-apps/acl ) )
-       crypt? ( dev-libs/libsodium:= )
-       cscope? ( dev-util/cscope )
-       gpm? ( >=sys-libs/gpm-1.19.3 )
-       lua? ( ${LUA_DEPS}
-               $(lua_gen_impl_dep 'deprecated' lua5-1)
-       )
-       !minimal? ( ~app-editors/vim-core-${PV} )
-       vim-pager? ( app-editors/vim-core[-minimal] )
-       perl? ( dev-lang/perl:= )
-       python? ( ${PYTHON_DEPS} )
-       racket? ( dev-scheme/racket )
-       ruby? ( ${RUBY_DEPS} )
-       selinux? ( sys-libs/libselinux )
-       sound? ( media-libs/libcanberra )
-       tcl? ( dev-lang/tcl:0= )
-       X? ( x11-libs/libXt )
-"
-DEPEND="${RDEPEND}"
-# configure runs the Lua interpreter
-BDEPEND="
-       sys-devel/autoconf
-       lua? ( ${LUA_DEPS} )
-       nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-       # people with broken alphabets run into trouble. bug #82186.
-       unset LANG LC_ALL
-       export LC_COLLATE="C"
-
-       # Gnome sandbox silliness. bug #114475.
-       mkdir -p "${T}"/home || die "mkdir failed"
-       export HOME="${T}"/home
-
-       use lua && lua-single_pkg_setup
-       use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-       if [[ ${PV} != 9999* ]] ; then
-               # Gentoo patches to fix runtime issues, cross-compile errors, 
etc
-               eapply "${WORKDIR}"/patches/
-       fi
-
-       # Fixup a script to use awk instead of nawk
-       sed -i -e \
-               '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-               "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-       # Read vimrc and gvimrc from /etc/vim
-       echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-               >> "${S}"/src/feature.h || die "echo failed"
-       echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-               >> "${S}"/src/feature.h || die "echo failed"
-
-       # Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-       # Hopefully this pattern won't break for a while at least.
-       # This fixes bug #29398 (27 Sep 2003 agriffis)
-       sed -i -e \
-               's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-               "${S}"/runtime/doc/syntax.txt \
-               "${S}"/runtime/doc/tagsrch.txt \
-               "${S}"/runtime/doc/usr_29.txt \
-               "${S}"/runtime/menu.vim \
-               "${S}"/src/configure.ac || die 'sed failed'
-
-       # Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-       # this is NeXT, but it's actually just a file in dev-libs/9libs
-       # This fixes bug #43885 (20 Mar 2004 agriffis)
-       sed -i -e \
-               's/ libc\.h / /' \
-               "${S}"/src/configure.ac || die 'sed failed'
-
-       # gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-       # correctly. To avoid some really entertaining error messages about 
stuff
-       # which isn't even in the source file being invalid, we'll do some 
trickery
-       # to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-       find "${S}" -name '*.c' | while read c; do
-           echo >> "$c" || die "echo failed"
-       done
-
-       # conditionally make the manpager.sh script
-       if use vim-pager; then
-               cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat 
EOF failed"
-                       #!/bin/sh
-                       sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
-                                       vim \\
-                                               -c 'let no_plugin_maps = 1' \\
-                                               -c 'set nolist nomod ft=man 
ts=8' \\
-                                               -c 'let g:showmarks_enable=0' \\
-                                               -c 'runtime! macros/less.vim' -
-                       _EOF_
-       fi
-
-       # Try to avoid sandbox problems. Bug #114475.
-       if [[ -d "${S}"/src/po ]]; then
-               sed -i -e \
-                       '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; 
./testvim -X,' \
-                       "${S}"/src/po/Makefile || die "sed failed"
-       fi
-
-       cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp 
failed"
-
-       sed -i -e \
-               "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-               "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-       eapply_user
-}
-
-src_configure() {
-       local myconf=()
-
-       # Fix bug #37354: Disallow -funroll-all-loops on amd64
-       # Bug #57859 suggests that we want to do this for all archs
-       filter-flags -funroll-all-loops
-
-       # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-       # everyone since previous flag filtering bugs have turned out to affect
-       # multiple archs...
-       replace-flags -O3 -O2
-
-       # Fix bug 18245: Prevent "make" from the following chain:
-       # (1) Notice configure.ac is newer than auto/configure
-       # (2) Rebuild auto/configure
-       # (3) Notice auto/configure is newer than auto/config.mk
-       # (4) Run ./configure (with wrong args) to remake auto/config.mk
-       sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed 
failed"
-       rm src/auto/configure || die "rm failed"
-       emake -j1 -C src autoconf
-
-       # This should fix a sandbox violation (see bug #24447). The hvc
-       # things are for ppc64, see bug #86433.
-       for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-               if [[ -e "${file}" ]]; then
-                       addwrite ${file}
-               fi
-       done
-
-       if use minimal; then
-               myconf=(
-                       --with-features=tiny
-                       --disable-nls
-                       --disable-canberra
-                       --disable-acl
-                       --enable-gui=no
-                       --without-x
-                       --disable-darwin
-                       --disable-luainterp
-                       --disable-perlinterp
-                       --disable-pythoninterp
-                       --disable-mzschemeinterp
-                       --disable-rubyinterp
-                       --disable-selinux
-                       --disable-tclinterp
-                       --disable-gpm
-               )
-       else
-               use debug && append-flags "-DDEBUG"
-
-               myconf=(
-                       --with-features=huge
-                       $(use_enable sound canberra)
-                       $(use_enable acl)
-                       $(use_enable crypt libsodium)
-                       $(use_enable cscope)
-                       $(use_enable gpm)
-                       $(use_enable nls)
-                       $(use_enable perl perlinterp)
-                       $(use_enable python python3interp)
-                       $(use_with python python3-command "${PYTHON}")
-                       $(use_enable racket mzschemeinterp)
-                       $(use_enable ruby rubyinterp)
-                       $(use_enable selinux)
-                       $(use_enable tcl tclinterp)
-                       $(use_enable terminal)
-               )
-
-               # --with-features=huge forces on cscope even if we --disable 
it. We need
-               # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-               if ! use cscope; then
-                       sed -i -e \
-                               '/# define FEAT_CSCOPE/d' src/feature.h || die 
"sed failed"
-               fi
-
-               if use lua; then
-                       myconf+=(
-                               --enable-luainterp
-                               $(use_with lua_single_target_luajit luajit)
-                               --with-lua-prefix="${EPREFIX}/usr"
-                       )
-               fi
-
-               # don't test USE=X here ... see bug #19115
-               # but need to provide a way to link against X ... see bug #20093
-               myconf+=(
-                       --enable-gui=no
-                       --disable-darwin
-                       $(use_with X x)
-               )
-       fi
-
-       # let package manager strip binaries
-       export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-       # keep prefix env contained within the EPREFIX
-       use prefix && myconf+=( --without-local-dir )
-
-       econf \
-               --with-modified-by=Gentoo-${PVR} \
-               "${myconf[@]}"
-}
-
-src_compile() {
-       # The following allows emake to be used
-       emake -j1 -C src auto/osdef.h objects
-
-       emake
-}
-
-src_test() {
-       einfo
-       einfo "Starting vim tests. Several error messages will be shown"
-       einfo "while the tests run. This is normal behaviour and does not"
-       einfo "indicate a fault."
-       einfo
-       ewarn "If the tests fail, your terminal may be left in a strange"
-       ewarn "state. Usually, running 'reset' will fix this."
-       einfo
-
-       # Don't let vim talk to X
-       unset DISPLAY
-
-       # See 
https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5
-       # for more information on test variables we can use.
-       # Note that certain variables need vim-compatible regex (not PCRE), see 
e.g.
-       # 
http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml.
-       #
-       # Skipped tests:
-       # - Test_expand_star_star
-       # Hangs because of a recursive symlink in /usr/include/nodejs (bug 
#616680)
-       # - Test_exrc
-       # Looks in wrong location? (bug #742710)
-       # - Test_job_tty_in_out
-       # Fragile and depends on TERM(?)
-       # - Test_spelldump_bang
-       # Hangs.
-       export 
TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\)'
-
-       emake -j1 -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug #187449)
-eselect_vi_update() {
-       ebegin "Calling eselect vi update"
-       eselect vi update --if-unset
-       eend $?
-}
-
-src_install() {
-       local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-       # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
-       #       managed by eselect-vi
-       dobin src/vim
-       if ! use minimal ; then
-               dosym vim /usr/bin/vimdiff
-       fi
-       dosym vim /usr/bin/rvim
-       dosym vim /usr/bin/rview
-       if use vim-pager ; then
-               dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
-               dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
-               insinto ${vimfiles}/macros
-               doins runtime/macros/manpager.sh
-               fperms a+x ${vimfiles}/macros/manpager.sh
-       fi
-
-       # Fix an issue of missing defaults.vim when USE=minimal.
-       if use minimal ; then
-               if [[ ! -f "${vimfiles}/defaults.vim" ]]; then
-                       insinto ${vimfiles}
-                       doins runtime/defaults.vim
-               fi
-       fi
-
-       domenu runtime/vim.desktop
-
-       newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-       # keep in sync with 'complete ... -F' list
-       bashcomp_alias vim ex vi view rvim rview vimdiff
-}
-
-pkg_postinst() {
-       # Update documentation tags (from vim-doc.eclass)
-       update_vim_helptags
-
-       # Call eselect vi update
-       eselect_vi_update
-
-       # update desktop file mime cache
-       xdg_desktop_database_update
-}
-
-pkg_postrm() {
-       # Update documentation tags (from vim-doc.eclass)
-       update_vim_helptags
-
-       # Call eselect vi update
-       eselect_vi_update
-
-       # update desktop file mime cache
-       xdg_desktop_database_update
-}

diff --git a/app-editors/vim/vim-8.2.3741.ebuild 
b/app-editors/vim/vim-8.2.3741.ebuild
deleted file mode 100644
index dd9ebf6b23de..000000000000
--- a/app-editors/vim/vim-8.2.3741.ebuild
+++ /dev/null
@@ -1,357 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Please bump with app-editors/vim-core and app-editors/gvim
-
-VIM_VERSION="8.2"
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 
ruby-single desktop xdg-utils
-
-if [[ ${PV} == 9999* ]] ; then
-       inherit git-r3
-       EGIT_REPO_URI="https://github.com/vim/vim.git";
-else
-       SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-               
https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz";
-       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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Vim, an improved vi-style text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim";
-
-LICENSE="vim"
-SLOT="0"
-IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby 
selinux sound tcl terminal vim-pager"
-REQUIRED_USE="
-       lua? ( ${LUA_REQUIRED_USE} )
-       python? ( ${PYTHON_REQUIRED_USE} )
-       vim-pager? ( !minimal )
-"
-
-RDEPEND="
-       >=app-eselect/eselect-vi-1.1
-       >=sys-libs/ncurses-5.2-r2:0=
-       nls? ( virtual/libintl )
-       acl? ( kernel_linux? ( sys-apps/acl ) )
-       crypt? ( dev-libs/libsodium:= )
-       cscope? ( dev-util/cscope )
-       gpm? ( >=sys-libs/gpm-1.19.3 )
-       lua? ( ${LUA_DEPS}
-               $(lua_gen_impl_dep 'deprecated' lua5-1)
-       )
-       !minimal? ( ~app-editors/vim-core-${PV} )
-       vim-pager? ( app-editors/vim-core[-minimal] )
-       perl? ( dev-lang/perl:= )
-       python? ( ${PYTHON_DEPS} )
-       racket? ( dev-scheme/racket )
-       ruby? ( ${RUBY_DEPS} )
-       selinux? ( sys-libs/libselinux )
-       sound? ( media-libs/libcanberra )
-       tcl? ( dev-lang/tcl:0= )
-       X? ( x11-libs/libXt )
-"
-DEPEND="${RDEPEND}"
-# configure runs the Lua interpreter
-BDEPEND="
-       sys-devel/autoconf
-       lua? ( ${LUA_DEPS} )
-       nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-       # people with broken alphabets run into trouble. bug #82186.
-       unset LANG LC_ALL
-       export LC_COLLATE="C"
-
-       # Gnome sandbox silliness. bug #114475.
-       mkdir -p "${T}"/home || die "mkdir failed"
-       export HOME="${T}"/home
-
-       use lua && lua-single_pkg_setup
-       use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-       if [[ ${PV} != 9999* ]] ; then
-               # Gentoo patches to fix runtime issues, cross-compile errors, 
etc
-               eapply "${WORKDIR}"/patches/
-       fi
-
-       # Fixup a script to use awk instead of nawk
-       sed -i -e \
-               '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-               "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-       # Read vimrc and gvimrc from /etc/vim
-       echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-               >> "${S}"/src/feature.h || die "echo failed"
-       echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-               >> "${S}"/src/feature.h || die "echo failed"
-
-       # Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-       # Hopefully this pattern won't break for a while at least.
-       # This fixes bug #29398 (27 Sep 2003 agriffis)
-       sed -i -e \
-               's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-               "${S}"/runtime/doc/syntax.txt \
-               "${S}"/runtime/doc/tagsrch.txt \
-               "${S}"/runtime/doc/usr_29.txt \
-               "${S}"/runtime/menu.vim \
-               "${S}"/src/configure.ac || die 'sed failed'
-
-       # Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-       # this is NeXT, but it's actually just a file in dev-libs/9libs
-       # This fixes bug #43885 (20 Mar 2004 agriffis)
-       sed -i -e \
-               's/ libc\.h / /' \
-               "${S}"/src/configure.ac || die 'sed failed'
-
-       # gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-       # correctly. To avoid some really entertaining error messages about 
stuff
-       # which isn't even in the source file being invalid, we'll do some 
trickery
-       # to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-       find "${S}" -name '*.c' | while read c; do
-           echo >> "$c" || die "echo failed"
-       done
-
-       # conditionally make the manpager.sh script
-       if use vim-pager; then
-               cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat 
EOF failed"
-                       #!/bin/sh
-                       sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
-                                       vim \\
-                                               -c 'let no_plugin_maps = 1' \\
-                                               -c 'set nolist nomod ft=man 
ts=8' \\
-                                               -c 'let g:showmarks_enable=0' \\
-                                               -c 'runtime! macros/less.vim' -
-                       _EOF_
-       fi
-
-       # Try to avoid sandbox problems. Bug #114475.
-       if [[ -d "${S}"/src/po ]]; then
-               sed -i -e \
-                       '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; 
./testvim -X,' \
-                       "${S}"/src/po/Makefile || die "sed failed"
-       fi
-
-       cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp 
failed"
-
-       sed -i -e \
-               "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-               "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-       eapply_user
-}
-
-src_configure() {
-       local myconf=()
-
-       # Fix bug #37354: Disallow -funroll-all-loops on amd64
-       # Bug #57859 suggests that we want to do this for all archs
-       filter-flags -funroll-all-loops
-
-       # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-       # everyone since previous flag filtering bugs have turned out to affect
-       # multiple archs...
-       replace-flags -O3 -O2
-
-       # Fix bug 18245: Prevent "make" from the following chain:
-       # (1) Notice configure.ac is newer than auto/configure
-       # (2) Rebuild auto/configure
-       # (3) Notice auto/configure is newer than auto/config.mk
-       # (4) Run ./configure (with wrong args) to remake auto/config.mk
-       sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed 
failed"
-       rm src/auto/configure || die "rm failed"
-       emake -j1 -C src autoconf
-
-       # This should fix a sandbox violation (see bug #24447). The hvc
-       # things are for ppc64, see bug #86433.
-       for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-               if [[ -e "${file}" ]]; then
-                       addwrite ${file}
-               fi
-       done
-
-       if use minimal; then
-               myconf=(
-                       --with-features=tiny
-                       --disable-nls
-                       --disable-canberra
-                       --disable-acl
-                       --enable-gui=no
-                       --without-x
-                       --disable-darwin
-                       --disable-luainterp
-                       --disable-perlinterp
-                       --disable-pythoninterp
-                       --disable-mzschemeinterp
-                       --disable-rubyinterp
-                       --disable-selinux
-                       --disable-tclinterp
-                       --disable-gpm
-               )
-       else
-               use debug && append-flags "-DDEBUG"
-
-               myconf=(
-                       --with-features=huge
-                       $(use_enable sound canberra)
-                       $(use_enable acl)
-                       $(use_enable crypt libsodium)
-                       $(use_enable cscope)
-                       $(use_enable gpm)
-                       $(use_enable nls)
-                       $(use_enable perl perlinterp)
-                       $(use_enable python python3interp)
-                       $(use_with python python3-command "${PYTHON}")
-                       $(use_enable racket mzschemeinterp)
-                       $(use_enable ruby rubyinterp)
-                       $(use_enable selinux)
-                       $(use_enable tcl tclinterp)
-                       $(use_enable terminal)
-               )
-
-               # --with-features=huge forces on cscope even if we --disable 
it. We need
-               # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-               if ! use cscope; then
-                       sed -i -e \
-                               '/# define FEAT_CSCOPE/d' src/feature.h || die 
"sed failed"
-               fi
-
-               if use lua; then
-                       myconf+=(
-                               --enable-luainterp
-                               $(use_with lua_single_target_luajit luajit)
-                               --with-lua-prefix="${EPREFIX}/usr"
-                       )
-               fi
-
-               # don't test USE=X here ... see bug #19115
-               # but need to provide a way to link against X ... see bug #20093
-               myconf+=(
-                       --enable-gui=no
-                       --disable-darwin
-                       $(use_with X x)
-               )
-       fi
-
-       # let package manager strip binaries
-       export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-       # keep prefix env contained within the EPREFIX
-       use prefix && myconf+=( --without-local-dir )
-
-       econf \
-               --with-modified-by=Gentoo-${PVR} \
-               "${myconf[@]}"
-}
-
-src_compile() {
-       # The following allows emake to be used
-       emake -j1 -C src auto/osdef.h objects
-
-       emake
-}
-
-src_test() {
-       einfo
-       einfo "Starting vim tests. Several error messages will be shown"
-       einfo "while the tests run. This is normal behaviour and does not"
-       einfo "indicate a fault."
-       einfo
-       ewarn "If the tests fail, your terminal may be left in a strange"
-       ewarn "state. Usually, running 'reset' will fix this."
-       einfo
-
-       # Don't let vim talk to X
-       unset DISPLAY
-
-       # See 
https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5
-       # for more information on test variables we can use.
-       # Note that certain variables need vim-compatible regex (not PCRE), see 
e.g.
-       # 
http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml.
-       #
-       # Skipped tests:
-       # - Test_expand_star_star
-       # Hangs because of a recursive symlink in /usr/include/nodejs (bug 
#616680)
-       # - Test_exrc
-       # Looks in wrong location? (bug #742710)
-       # - Test_job_tty_in_out
-       # Fragile and depends on TERM(?)
-       # - Test_spelldump_bang
-       # Hangs.
-       export 
TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\)'
-
-       emake -j1 -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug #187449)
-eselect_vi_update() {
-       ebegin "Calling eselect vi update"
-       eselect vi update --if-unset
-       eend $?
-}
-
-src_install() {
-       local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-       # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
-       #       managed by eselect-vi
-       dobin src/vim
-       if ! use minimal ; then
-               dosym vim /usr/bin/vimdiff
-       fi
-       dosym vim /usr/bin/rvim
-       dosym vim /usr/bin/rview
-       if use vim-pager ; then
-               dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
-               dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
-               insinto ${vimfiles}/macros
-               doins runtime/macros/manpager.sh
-               fperms a+x ${vimfiles}/macros/manpager.sh
-       fi
-
-       # Fix an issue of missing defaults.vim when USE=minimal.
-       if use minimal ; then
-               if [[ ! -f "${vimfiles}/defaults.vim" ]]; then
-                       insinto ${vimfiles}
-                       doins runtime/defaults.vim
-               fi
-       fi
-
-       domenu runtime/vim.desktop
-
-       newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-       # keep in sync with 'complete ... -F' list
-       bashcomp_alias vim ex vi view rvim rview vimdiff
-}
-
-pkg_postinst() {
-       # Update documentation tags (from vim-doc.eclass)
-       update_vim_helptags
-
-       # Call eselect vi update
-       eselect_vi_update
-
-       # update desktop file mime cache
-       xdg_desktop_database_update
-}
-
-pkg_postrm() {
-       # Update documentation tags (from vim-doc.eclass)
-       update_vim_helptags
-
-       # Call eselect vi update
-       eselect_vi_update
-
-       # update desktop file mime cache
-       xdg_desktop_database_update
-}

diff --git a/app-editors/vim/vim-8.2.3950.ebuild 
b/app-editors/vim/vim-8.2.3950.ebuild
deleted file mode 100644
index 44b4345ad6e7..000000000000
--- a/app-editors/vim/vim-8.2.3950.ebuild
+++ /dev/null
@@ -1,357 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Please bump with app-editors/vim-core and app-editors/gvim
-
-VIM_VERSION="8.2"
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 
ruby-single desktop xdg-utils
-
-if [[ ${PV} == 9999* ]] ; then
-       inherit git-r3
-       EGIT_REPO_URI="https://github.com/vim/vim.git";
-else
-       SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-               
https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz";
-       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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Vim, an improved vi-style text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim";
-
-LICENSE="vim"
-SLOT="0"
-IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby 
selinux sound tcl terminal vim-pager"
-REQUIRED_USE="
-       lua? ( ${LUA_REQUIRED_USE} )
-       python? ( ${PYTHON_REQUIRED_USE} )
-       vim-pager? ( !minimal )
-"
-
-RDEPEND="
-       >=app-eselect/eselect-vi-1.1
-       >=sys-libs/ncurses-5.2-r2:0=
-       nls? ( virtual/libintl )
-       acl? ( kernel_linux? ( sys-apps/acl ) )
-       crypt? ( dev-libs/libsodium:= )
-       cscope? ( dev-util/cscope )
-       gpm? ( >=sys-libs/gpm-1.19.3 )
-       lua? ( ${LUA_DEPS}
-               $(lua_gen_impl_dep 'deprecated' lua5-1)
-       )
-       !minimal? ( ~app-editors/vim-core-${PV} )
-       vim-pager? ( app-editors/vim-core[-minimal] )
-       perl? ( dev-lang/perl:= )
-       python? ( ${PYTHON_DEPS} )
-       racket? ( dev-scheme/racket )
-       ruby? ( ${RUBY_DEPS} )
-       selinux? ( sys-libs/libselinux )
-       sound? ( media-libs/libcanberra )
-       tcl? ( dev-lang/tcl:0= )
-       X? ( x11-libs/libXt )
-"
-DEPEND="${RDEPEND}"
-# configure runs the Lua interpreter
-BDEPEND="
-       sys-devel/autoconf
-       lua? ( ${LUA_DEPS} )
-       nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-       # people with broken alphabets run into trouble. bug #82186.
-       unset LANG LC_ALL
-       export LC_COLLATE="C"
-
-       # Gnome sandbox silliness. bug #114475.
-       mkdir -p "${T}"/home || die "mkdir failed"
-       export HOME="${T}"/home
-
-       use lua && lua-single_pkg_setup
-       use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-       if [[ ${PV} != 9999* ]] ; then
-               # Gentoo patches to fix runtime issues, cross-compile errors, 
etc
-               eapply "${WORKDIR}"/patches/
-       fi
-
-       # Fixup a script to use awk instead of nawk
-       sed -i -e \
-               '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-               "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-       # Read vimrc and gvimrc from /etc/vim
-       echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-               >> "${S}"/src/feature.h || die "echo failed"
-       echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-               >> "${S}"/src/feature.h || die "echo failed"
-
-       # Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-       # Hopefully this pattern won't break for a while at least.
-       # This fixes bug #29398 (27 Sep 2003 agriffis)
-       sed -i -e \
-               's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-               "${S}"/runtime/doc/syntax.txt \
-               "${S}"/runtime/doc/tagsrch.txt \
-               "${S}"/runtime/doc/usr_29.txt \
-               "${S}"/runtime/menu.vim \
-               "${S}"/src/configure.ac || die 'sed failed'
-
-       # Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-       # this is NeXT, but it's actually just a file in dev-libs/9libs
-       # This fixes bug #43885 (20 Mar 2004 agriffis)
-       sed -i -e \
-               's/ libc\.h / /' \
-               "${S}"/src/configure.ac || die 'sed failed'
-
-       # gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-       # correctly. To avoid some really entertaining error messages about 
stuff
-       # which isn't even in the source file being invalid, we'll do some 
trickery
-       # to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-       find "${S}" -name '*.c' | while read c; do
-           echo >> "$c" || die "echo failed"
-       done
-
-       # conditionally make the manpager.sh script
-       if use vim-pager; then
-               cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat 
EOF failed"
-                       #!/bin/sh
-                       sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
-                                       vim \\
-                                               -c 'let no_plugin_maps = 1' \\
-                                               -c 'set nolist nomod ft=man 
ts=8' \\
-                                               -c 'let g:showmarks_enable=0' \\
-                                               -c 'runtime! macros/less.vim' -
-                       _EOF_
-       fi
-
-       # Try to avoid sandbox problems. Bug #114475.
-       if [[ -d "${S}"/src/po ]]; then
-               sed -i -e \
-                       '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; 
./testvim -X,' \
-                       "${S}"/src/po/Makefile || die "sed failed"
-       fi
-
-       cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp 
failed"
-
-       sed -i -e \
-               "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-               "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-       eapply_user
-}
-
-src_configure() {
-       local myconf=()
-
-       # Fix bug #37354: Disallow -funroll-all-loops on amd64
-       # Bug #57859 suggests that we want to do this for all archs
-       filter-flags -funroll-all-loops
-
-       # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-       # everyone since previous flag filtering bugs have turned out to affect
-       # multiple archs...
-       replace-flags -O3 -O2
-
-       # Fix bug 18245: Prevent "make" from the following chain:
-       # (1) Notice configure.ac is newer than auto/configure
-       # (2) Rebuild auto/configure
-       # (3) Notice auto/configure is newer than auto/config.mk
-       # (4) Run ./configure (with wrong args) to remake auto/config.mk
-       sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed 
failed"
-       rm src/auto/configure || die "rm failed"
-       emake -j1 -C src autoconf
-
-       # This should fix a sandbox violation (see bug #24447). The hvc
-       # things are for ppc64, see bug #86433.
-       for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-               if [[ -e "${file}" ]]; then
-                       addwrite ${file}
-               fi
-       done
-
-       if use minimal; then
-               myconf=(
-                       --with-features=tiny
-                       --disable-nls
-                       --disable-canberra
-                       --disable-acl
-                       --enable-gui=no
-                       --without-x
-                       --disable-darwin
-                       --disable-luainterp
-                       --disable-perlinterp
-                       --disable-pythoninterp
-                       --disable-mzschemeinterp
-                       --disable-rubyinterp
-                       --disable-selinux
-                       --disable-tclinterp
-                       --disable-gpm
-               )
-       else
-               use debug && append-flags "-DDEBUG"
-
-               myconf=(
-                       --with-features=huge
-                       $(use_enable sound canberra)
-                       $(use_enable acl)
-                       $(use_enable crypt libsodium)
-                       $(use_enable cscope)
-                       $(use_enable gpm)
-                       $(use_enable nls)
-                       $(use_enable perl perlinterp)
-                       $(use_enable python python3interp)
-                       $(use_with python python3-command "${PYTHON}")
-                       $(use_enable racket mzschemeinterp)
-                       $(use_enable ruby rubyinterp)
-                       $(use_enable selinux)
-                       $(use_enable tcl tclinterp)
-                       $(use_enable terminal)
-               )
-
-               # --with-features=huge forces on cscope even if we --disable 
it. We need
-               # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-               if ! use cscope; then
-                       sed -i -e \
-                               '/# define FEAT_CSCOPE/d' src/feature.h || die 
"sed failed"
-               fi
-
-               if use lua; then
-                       myconf+=(
-                               --enable-luainterp
-                               $(use_with lua_single_target_luajit luajit)
-                               --with-lua-prefix="${EPREFIX}/usr"
-                       )
-               fi
-
-               # don't test USE=X here ... see bug #19115
-               # but need to provide a way to link against X ... see bug #20093
-               myconf+=(
-                       --enable-gui=no
-                       --disable-darwin
-                       $(use_with X x)
-               )
-       fi
-
-       # let package manager strip binaries
-       export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-       # keep prefix env contained within the EPREFIX
-       use prefix && myconf+=( --without-local-dir )
-
-       econf \
-               --with-modified-by=Gentoo-${PVR} \
-               "${myconf[@]}"
-}
-
-src_compile() {
-       # The following allows emake to be used
-       emake -j1 -C src auto/osdef.h objects
-
-       emake
-}
-
-src_test() {
-       einfo
-       einfo "Starting vim tests. Several error messages will be shown"
-       einfo "while the tests run. This is normal behaviour and does not"
-       einfo "indicate a fault."
-       einfo
-       ewarn "If the tests fail, your terminal may be left in a strange"
-       ewarn "state. Usually, running 'reset' will fix this."
-       einfo
-
-       # Don't let vim talk to X
-       unset DISPLAY
-
-       # See 
https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5
-       # for more information on test variables we can use.
-       # Note that certain variables need vim-compatible regex (not PCRE), see 
e.g.
-       # 
http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml.
-       #
-       # Skipped tests:
-       # - Test_expand_star_star
-       # Hangs because of a recursive symlink in /usr/include/nodejs (bug 
#616680)
-       # - Test_exrc
-       # Looks in wrong location? (bug #742710)
-       # - Test_job_tty_in_out
-       # Fragile and depends on TERM(?)
-       # - Test_spelldump_bang
-       # Hangs.
-       export 
TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\)'
-
-       emake -j1 -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug #187449)
-eselect_vi_update() {
-       ebegin "Calling eselect vi update"
-       eselect vi update --if-unset
-       eend $?
-}
-
-src_install() {
-       local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-       # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
-       #       managed by eselect-vi
-       dobin src/vim
-       if ! use minimal ; then
-               dosym vim /usr/bin/vimdiff
-       fi
-       dosym vim /usr/bin/rvim
-       dosym vim /usr/bin/rview
-       if use vim-pager ; then
-               dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
-               dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
-               insinto ${vimfiles}/macros
-               doins runtime/macros/manpager.sh
-               fperms a+x ${vimfiles}/macros/manpager.sh
-       fi
-
-       # Fix an issue of missing defaults.vim when USE=minimal.
-       if use minimal ; then
-               if [[ ! -f "${vimfiles}/defaults.vim" ]]; then
-                       insinto ${vimfiles}
-                       doins runtime/defaults.vim
-               fi
-       fi
-
-       domenu runtime/vim.desktop
-
-       newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-       # keep in sync with 'complete ... -F' list
-       bashcomp_alias vim ex vi view rvim rview vimdiff
-}
-
-pkg_postinst() {
-       # Update documentation tags (from vim-doc.eclass)
-       update_vim_helptags
-
-       # Call eselect vi update
-       eselect_vi_update
-
-       # update desktop file mime cache
-       xdg_desktop_database_update
-}
-
-pkg_postrm() {
-       # Update documentation tags (from vim-doc.eclass)
-       update_vim_helptags
-
-       # Call eselect vi update
-       eselect_vi_update
-
-       # update desktop file mime cache
-       xdg_desktop_database_update
-}

diff --git a/app-editors/vim/vim-8.2.4285.ebuild 
b/app-editors/vim/vim-8.2.4285.ebuild
deleted file mode 100644
index 44b4345ad6e7..000000000000
--- a/app-editors/vim/vim-8.2.4285.ebuild
+++ /dev/null
@@ -1,357 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Please bump with app-editors/vim-core and app-editors/gvim
-
-VIM_VERSION="8.2"
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 
ruby-single desktop xdg-utils
-
-if [[ ${PV} == 9999* ]] ; then
-       inherit git-r3
-       EGIT_REPO_URI="https://github.com/vim/vim.git";
-else
-       SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-               
https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz";
-       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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Vim, an improved vi-style text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim";
-
-LICENSE="vim"
-SLOT="0"
-IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby 
selinux sound tcl terminal vim-pager"
-REQUIRED_USE="
-       lua? ( ${LUA_REQUIRED_USE} )
-       python? ( ${PYTHON_REQUIRED_USE} )
-       vim-pager? ( !minimal )
-"
-
-RDEPEND="
-       >=app-eselect/eselect-vi-1.1
-       >=sys-libs/ncurses-5.2-r2:0=
-       nls? ( virtual/libintl )
-       acl? ( kernel_linux? ( sys-apps/acl ) )
-       crypt? ( dev-libs/libsodium:= )
-       cscope? ( dev-util/cscope )
-       gpm? ( >=sys-libs/gpm-1.19.3 )
-       lua? ( ${LUA_DEPS}
-               $(lua_gen_impl_dep 'deprecated' lua5-1)
-       )
-       !minimal? ( ~app-editors/vim-core-${PV} )
-       vim-pager? ( app-editors/vim-core[-minimal] )
-       perl? ( dev-lang/perl:= )
-       python? ( ${PYTHON_DEPS} )
-       racket? ( dev-scheme/racket )
-       ruby? ( ${RUBY_DEPS} )
-       selinux? ( sys-libs/libselinux )
-       sound? ( media-libs/libcanberra )
-       tcl? ( dev-lang/tcl:0= )
-       X? ( x11-libs/libXt )
-"
-DEPEND="${RDEPEND}"
-# configure runs the Lua interpreter
-BDEPEND="
-       sys-devel/autoconf
-       lua? ( ${LUA_DEPS} )
-       nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-       # people with broken alphabets run into trouble. bug #82186.
-       unset LANG LC_ALL
-       export LC_COLLATE="C"
-
-       # Gnome sandbox silliness. bug #114475.
-       mkdir -p "${T}"/home || die "mkdir failed"
-       export HOME="${T}"/home
-
-       use lua && lua-single_pkg_setup
-       use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-       if [[ ${PV} != 9999* ]] ; then
-               # Gentoo patches to fix runtime issues, cross-compile errors, 
etc
-               eapply "${WORKDIR}"/patches/
-       fi
-
-       # Fixup a script to use awk instead of nawk
-       sed -i -e \
-               '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-               "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-       # Read vimrc and gvimrc from /etc/vim
-       echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-               >> "${S}"/src/feature.h || die "echo failed"
-       echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-               >> "${S}"/src/feature.h || die "echo failed"
-
-       # Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-       # Hopefully this pattern won't break for a while at least.
-       # This fixes bug #29398 (27 Sep 2003 agriffis)
-       sed -i -e \
-               's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-               "${S}"/runtime/doc/syntax.txt \
-               "${S}"/runtime/doc/tagsrch.txt \
-               "${S}"/runtime/doc/usr_29.txt \
-               "${S}"/runtime/menu.vim \
-               "${S}"/src/configure.ac || die 'sed failed'
-
-       # Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-       # this is NeXT, but it's actually just a file in dev-libs/9libs
-       # This fixes bug #43885 (20 Mar 2004 agriffis)
-       sed -i -e \
-               's/ libc\.h / /' \
-               "${S}"/src/configure.ac || die 'sed failed'
-
-       # gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-       # correctly. To avoid some really entertaining error messages about 
stuff
-       # which isn't even in the source file being invalid, we'll do some 
trickery
-       # to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-       find "${S}" -name '*.c' | while read c; do
-           echo >> "$c" || die "echo failed"
-       done
-
-       # conditionally make the manpager.sh script
-       if use vim-pager; then
-               cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat 
EOF failed"
-                       #!/bin/sh
-                       sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
-                                       vim \\
-                                               -c 'let no_plugin_maps = 1' \\
-                                               -c 'set nolist nomod ft=man 
ts=8' \\
-                                               -c 'let g:showmarks_enable=0' \\
-                                               -c 'runtime! macros/less.vim' -
-                       _EOF_
-       fi
-
-       # Try to avoid sandbox problems. Bug #114475.
-       if [[ -d "${S}"/src/po ]]; then
-               sed -i -e \
-                       '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; 
./testvim -X,' \
-                       "${S}"/src/po/Makefile || die "sed failed"
-       fi
-
-       cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp 
failed"
-
-       sed -i -e \
-               "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-               "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-       eapply_user
-}
-
-src_configure() {
-       local myconf=()
-
-       # Fix bug #37354: Disallow -funroll-all-loops on amd64
-       # Bug #57859 suggests that we want to do this for all archs
-       filter-flags -funroll-all-loops
-
-       # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-       # everyone since previous flag filtering bugs have turned out to affect
-       # multiple archs...
-       replace-flags -O3 -O2
-
-       # Fix bug 18245: Prevent "make" from the following chain:
-       # (1) Notice configure.ac is newer than auto/configure
-       # (2) Rebuild auto/configure
-       # (3) Notice auto/configure is newer than auto/config.mk
-       # (4) Run ./configure (with wrong args) to remake auto/config.mk
-       sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed 
failed"
-       rm src/auto/configure || die "rm failed"
-       emake -j1 -C src autoconf
-
-       # This should fix a sandbox violation (see bug #24447). The hvc
-       # things are for ppc64, see bug #86433.
-       for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-               if [[ -e "${file}" ]]; then
-                       addwrite ${file}
-               fi
-       done
-
-       if use minimal; then
-               myconf=(
-                       --with-features=tiny
-                       --disable-nls
-                       --disable-canberra
-                       --disable-acl
-                       --enable-gui=no
-                       --without-x
-                       --disable-darwin
-                       --disable-luainterp
-                       --disable-perlinterp
-                       --disable-pythoninterp
-                       --disable-mzschemeinterp
-                       --disable-rubyinterp
-                       --disable-selinux
-                       --disable-tclinterp
-                       --disable-gpm
-               )
-       else
-               use debug && append-flags "-DDEBUG"
-
-               myconf=(
-                       --with-features=huge
-                       $(use_enable sound canberra)
-                       $(use_enable acl)
-                       $(use_enable crypt libsodium)
-                       $(use_enable cscope)
-                       $(use_enable gpm)
-                       $(use_enable nls)
-                       $(use_enable perl perlinterp)
-                       $(use_enable python python3interp)
-                       $(use_with python python3-command "${PYTHON}")
-                       $(use_enable racket mzschemeinterp)
-                       $(use_enable ruby rubyinterp)
-                       $(use_enable selinux)
-                       $(use_enable tcl tclinterp)
-                       $(use_enable terminal)
-               )
-
-               # --with-features=huge forces on cscope even if we --disable 
it. We need
-               # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-               if ! use cscope; then
-                       sed -i -e \
-                               '/# define FEAT_CSCOPE/d' src/feature.h || die 
"sed failed"
-               fi
-
-               if use lua; then
-                       myconf+=(
-                               --enable-luainterp
-                               $(use_with lua_single_target_luajit luajit)
-                               --with-lua-prefix="${EPREFIX}/usr"
-                       )
-               fi
-
-               # don't test USE=X here ... see bug #19115
-               # but need to provide a way to link against X ... see bug #20093
-               myconf+=(
-                       --enable-gui=no
-                       --disable-darwin
-                       $(use_with X x)
-               )
-       fi
-
-       # let package manager strip binaries
-       export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-       # keep prefix env contained within the EPREFIX
-       use prefix && myconf+=( --without-local-dir )
-
-       econf \
-               --with-modified-by=Gentoo-${PVR} \
-               "${myconf[@]}"
-}
-
-src_compile() {
-       # The following allows emake to be used
-       emake -j1 -C src auto/osdef.h objects
-
-       emake
-}
-
-src_test() {
-       einfo
-       einfo "Starting vim tests. Several error messages will be shown"
-       einfo "while the tests run. This is normal behaviour and does not"
-       einfo "indicate a fault."
-       einfo
-       ewarn "If the tests fail, your terminal may be left in a strange"
-       ewarn "state. Usually, running 'reset' will fix this."
-       einfo
-
-       # Don't let vim talk to X
-       unset DISPLAY
-
-       # See 
https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5
-       # for more information on test variables we can use.
-       # Note that certain variables need vim-compatible regex (not PCRE), see 
e.g.
-       # 
http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml.
-       #
-       # Skipped tests:
-       # - Test_expand_star_star
-       # Hangs because of a recursive symlink in /usr/include/nodejs (bug 
#616680)
-       # - Test_exrc
-       # Looks in wrong location? (bug #742710)
-       # - Test_job_tty_in_out
-       # Fragile and depends on TERM(?)
-       # - Test_spelldump_bang
-       # Hangs.
-       export 
TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\)'
-
-       emake -j1 -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug #187449)
-eselect_vi_update() {
-       ebegin "Calling eselect vi update"
-       eselect vi update --if-unset
-       eend $?
-}
-
-src_install() {
-       local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-       # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
-       #       managed by eselect-vi
-       dobin src/vim
-       if ! use minimal ; then
-               dosym vim /usr/bin/vimdiff
-       fi
-       dosym vim /usr/bin/rvim
-       dosym vim /usr/bin/rview
-       if use vim-pager ; then
-               dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
-               dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
-               insinto ${vimfiles}/macros
-               doins runtime/macros/manpager.sh
-               fperms a+x ${vimfiles}/macros/manpager.sh
-       fi
-
-       # Fix an issue of missing defaults.vim when USE=minimal.
-       if use minimal ; then
-               if [[ ! -f "${vimfiles}/defaults.vim" ]]; then
-                       insinto ${vimfiles}
-                       doins runtime/defaults.vim
-               fi
-       fi
-
-       domenu runtime/vim.desktop
-
-       newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-       # keep in sync with 'complete ... -F' list
-       bashcomp_alias vim ex vi view rvim rview vimdiff
-}
-
-pkg_postinst() {
-       # Update documentation tags (from vim-doc.eclass)
-       update_vim_helptags
-
-       # Call eselect vi update
-       eselect_vi_update
-
-       # update desktop file mime cache
-       xdg_desktop_database_update
-}
-
-pkg_postrm() {
-       # Update documentation tags (from vim-doc.eclass)
-       update_vim_helptags
-
-       # Call eselect vi update
-       eselect_vi_update
-
-       # update desktop file mime cache
-       xdg_desktop_database_update
-}