14 files changed, 0 insertions, 2077 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index f7684da6c2cf..da6bcd49450c 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index b878a58f9100..32516ec31956 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -1,14 +1,8 @@
 AUX gvim-completion 1219 BLAKE2B 8a8d8ac5b42be0103da00ecda3445f24993df0b2762310dcc1a9e1cf892048b57c02b7da2ea19d900c40b782cabeda4c6f7b79b9b7b44b6fb7ad7ae723b46f88 SHA512 08bb32a3c9fcbdd00977b7343dda9cda44b389a13b1717ebddb462e22b6cf9d4db37d5b49ff752b931e305bf57e8f9f4a7d6e32ea25f8acd1b00e5f8320ac132
 AUX gvimrc-r1 990 BLAKE2B 5fc0b805458aff22485e3e180ca8c32a62f2cfe49572edffa5725d2cfc4ed9a7bded20c1a5cd1f19f41e0849e3ca08be4798ff23edd66a92bcbb31aee16c433a SHA512 f6538550f1ecadcccf74a6bbd5a6a0b71d18a234a854d1a0179144125555c42280000df9523e7c3d5a8b449f421af7bafcca1034951f085279cee0dd1160808a
-AUX vim-0.0.0828-configure-clang16.patch 892 BLAKE2B 52c2c344f76856f3d6ed3559950e3ae6e0b118c2ec5b4ba3a39ae8f39cd7759ddac44479562071567690de47152e506dc07f441b910d443da1597e0798f6bd18 SHA512 d6653f7274fce3b703f798ae56a714da1c576016e4a13b950b5492851bd3864ee33ce8b486b12f9830bdc0792d4b4f1378a3d7ec5a3a36f550183f06e1dc6543
-DIST vim-9.0.0099.tar.gz 16712565 BLAKE2B b3277ebda0bb40601d995935422006d1a266bb862be612e69abd057a7342d13457ded5cb4743cf43a09b7d2001438f5a426ba12c30947bb7c193188c5fc13cf7 SHA512 ca0dea7b7fd78cf9c7cd4656611d066540f9d81ab17bcb75c79f0e989bdcfb769940ea29f75445c554b159e9eb3b2c4f9d77448254c3e4e4457b1bf721936498
-DIST vim-9.0.0828.tar.gz 16782339 BLAKE2B 6b997c1c828338d64a8b204a1e232676ec075834b1b7e74c2fc671e315f9bf6026b0c419ebb3c31e7ce58dbca23828ca11d866b2bfcb73f8a86fb31fa0d51b00 SHA512 03f93515039a2f275a8fe6b84bbac5875ffff17768ab3201e111eba4897a2485fe4ccfe238151f393334c7a6ea77eddd8898f0b816e26dbdb884f4e6bcbd2943
 DIST vim-9.0.1000.tar.gz 16842747 BLAKE2B 85edab7d13daa3e84ef0aeb50e3e9bfd31f0634d8e480c105727b0c34318e0adf7f1276dcdac53df8fc416fd8dfb70377cd74ed570752a3e77f07a083fa6c113 SHA512 9d2b914a112948d77b92c8dcafc2f711a83c3fdaf35a28f7f606e77007b9320e2260a0f6b24fc875a817c33c012f077f89730b34e9f12d6f00795c5c806704c8
 DIST vim-9.0.1157.tar.gz 16924574 BLAKE2B 0cdc6cf61f5abdaff0762b98550bfa5bae8f0485ddd0e9947a5fe52390f9da54fc8f5fdae767fb8f5d3ac2b441253917a80ae7f6092f67b69bdc9b6a630df8e2 SHA512 19240a9bcf5900766db42e2894b1bf7b849274711f17dc267671aacd867b334c3d30f39947dde7dd0245f289e9ad801eeb272f34a2ab15d01fac40bf71a54271
-DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b1af2d1414d10b794dbee9f5e7797fb3d34e00c2e065c339d4c82bf28aed53e0b5f2f8f1ee5c7ce69851cd63360788609bf144ac922 SHA512 7d5c64d674fa77048fdca7287072c0e488723133e254c10711dbadf750416c368725327ca9b76f332017bc70aa544a9baef671765eabf0d172d39921ffd7d942
 DIST vim-patches-vim-9.0.1000-patches.tar.bz2 3245 BLAKE2B 3bf3d0e314cc3f96d5d9675de196a62c4c8a72645d56ef94b80768571c99cba5cc556442e3bd2dfa8818460fd851fe7bd1ae15999af7225fb271b81c43105843 SHA512 2883441a2001bf7ce89a7f0862f780b71cc0164c8fcb8dbdf7040e1bcbcf408d138d3d77f308aa54c762e9975fa5ec89cfceeabbf721344dfc938870a363667a
-EBUILD gvim-9.0.0099.ebuild 10278 BLAKE2B 338f500618bf704b56dfa5318b76616dd12c3b2b5c1e26a7040e05f6ae10687e86debf138a901b952c36229acd1ce630abdf134728ac66718f4a7cff460b6d33 SHA512 c7ee8fe11736fd7eb1035d7a1d3054b24819d9aabb9176d32032d90ffbeb0787453c5e7046f06c809a69cf7938d7cbdf4f52ee955539038f63a2564cdedb4328
-EBUILD gvim-9.0.0828-r1.ebuild 10404 BLAKE2B ff70cad86edc288fa2f9a537a4d316ec7eab3d07367245453393d85bb995fbb3f30c50990887fd4202716fb6accc37127caa9931373d3f4f6eeeb710cdf44e95 SHA512 915b0c6249953430a59a3cb3907670eee8bd47c984d35268f5b240985f4cab61fae123dbd13eb8d60f2059c851b642ee4aa635d010cb3cd8b8e3060ce260c3ac
 EBUILD gvim-9.0.1000.ebuild 10393 BLAKE2B 73c3666b5fdc446eb7e2677a5748e88672041b8251809d960e925d241a5a50ba6e0a9be46815ab17b2558ebdbfd034dadec7131eabccd72b9ba5143357462980 SHA512 d06f3779bb46523af81cced017db015f9f4d990544f088eb31902d43fd38aff2571bfafe29229462eb3b89a6c2d6dcba341e8ecf7db88e04c5d92074f0830270
 EBUILD gvim-9.0.1157.ebuild 10400 BLAKE2B caa44925105e6fad530eecf1bdc9c013148aa2b795efd82fa8281cf070426bdea065c795155362342d1cd7ebd2771e89db00413fceaa7bf5ebed6b9171708b45 SHA512 5ac94a12308b98230ee919b4039260a345f20ad3170300d2310ab46755fd8189bb4b0eba135ac57ef46870d19978b727bb3bc3115da8df81c34f2ebd6b419c5e
 EBUILD gvim-9999.ebuild 10400 BLAKE2B caa44925105e6fad530eecf1bdc9c013148aa2b795efd82fa8281cf070426bdea065c795155362342d1cd7ebd2771e89db00413fceaa7bf5ebed6b9171708b45 SHA512 5ac94a12308b98230ee919b4039260a345f20ad3170300d2310ab46755fd8189bb4b0eba135ac57ef46870d19978b727bb3bc3115da8df81c34f2ebd6b419c5e
diff --git a/app-editors/gvim/files/vim-0.0.0828-configure-clang16.patch b/app-editors/gvim/files/vim-0.0.0828-configure-clang16.patch
deleted file mode 100644
index e202a9dd3caa..000000000000
--- a/app-editors/gvim/files/vim-0.0.0828-configure-clang16.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/vim/vim/pull/11496
-
-From 360b569f86b851c37e32b7cfaec079823188ff27 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 4 Nov 2022 03:18:23 +0000
-Subject: [PATCH] configure.ac: Fix -Wimplicit-int
-
-Clang 16 makes -Wimplicit-int an error by default. Fixes errors like:
-```
-error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Werror,-Wimplicit-int]
-```
-
-We already use proper declarations with every other test anyway, so
-let's be consistent.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/src/configure.ac
-+++ b/src/configure.ac
-@@ -3654,7 +3654,7 @@ dnl check if struct sigcontext is defined (used for SGI only)
- AC_MSG_CHECKING(for struct sigcontext)
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
- #include <signal.h>
--test_sig()
-+int test_sig()
- {
-     struct sigcontext *scont;
-     scont = (struct sigcontext *)0;
-
diff --git a/app-editors/gvim/gvim-9.0.0099.ebuild b/app-editors/gvim/gvim-9.0.0099.ebuild
deleted file mode 100644
index 32ed34079b16..000000000000
--- a/app-editors/gvim/gvim-9.0.0099.ebuild
+++ /dev/null
@@ -1,364 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please bump with app-editors/vim-core and app-editors/vim
-
-VIM_VERSION="9.0"
-LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single python-single-r1 toolchain-funcs ruby-single
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-fi
-S="${WORKDIR}"/vim-${PV}
-
-DESCRIPTION="GUI version of the Vim text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-LICENSE="vim"
-SLOT="0"
-IUSE="acl aqua crypt cscope debug lua motif netbeans nls perl python racket ruby selinux session sound tcl"
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	aqua? ( !motif )
-"
-
-RDEPEND="
-	~app-editors/vim-core-${PV}
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/libXt
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	!aqua? (
-		motif? ( >=x11-libs/motif-2.3:0 )
-		!motif? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
-	)
-	crypt? ( dev-libs/libsodium:= )
-	cscope? ( dev-util/cscope )
-	lua? (
-		${LUA_DEPS}
-		$(lua_gen_impl_dep 'deprecated' lua5-1)
-	)
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( ${RUBY_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	session? ( x11-libs/libSM )
-	sound? ( media-libs/libcanberra )
-	tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="${RDEPEND}"
-# configure runs the Lua interpreter
-BDEPEND="
-	sys-devel/autoconf
-	virtual/pkgconfig
-	lua? ( ${LUA_DEPS} )
-	nls? ( sys-devel/gettext )
-"
-
-# various failures (bugs #630042 and #682320)
-RESTRICT="test"
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	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}/vim-patches-vim-9.0.0049-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
-
-	# 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
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	# 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 -e \
-		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -v src/auto/configure || die "rm failed"
-
-	# --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 "couldn't disable cscope"
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-
-	# 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
-
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	local file
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e ${file} ]]; then
-			addwrite $file
-		fi
-	done
-
-	use debug && append-flags "-DDEBUG"
-
-	local myconf=(
-		--with-features=huge
-		--disable-gpm
-		--with-gnome=no
-		$(use_enable sound canberra)
-		$(use_enable acl)
-		$(use_enable crypt libsodium)
-		$(use_enable cscope)
-		$(use_enable netbeans)
-		$(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 session xsmp)
-		$(use_enable tcl tclinterp)
-	)
-
-	if use lua; then
-		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
-		# deprecated (in 5.1) luaL_openlib API (#874690)
-		use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1
-
-		myconf+=(
-			--enable-luainterp
-			$(use_with lua_single_target_luajit luajit)
-			--with-lua-prefix="${EPREFIX}/usr"
-		)
-	fi
-
-	# Default is gtk unless aqua or motif are enabled
-	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use motif; then
-		einfo "Building gvim with the MOTIF GUI"
-		myconf+=( --enable-gui=motif )
-	else
-		myconf+=( --enable-gtk3-check )
-		einfo "Building gvim with the gtk+-3 GUI"
-		myconf+=( --enable-gui=gtk3 )
-	fi
-	echo ; echo
-
-	# 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 )
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		# avoid finding of this function, to avoid having to patch either
-		# configure or the source, which would be much more hackish.
-		# after all vim does it right, only interix is badly broken (again)
-		export ac_cv_func_sigaction=no
-	fi
-
-	if tc-is-cross-compiler ; then
-		export vim_cv_getcwd_broken=no \
-			   vim_cv_memmove_handles_overlap=yes \
-			   vim_cv_stat_ignores_slash=yes \
-			   vim_cv_terminfo=yes \
-			   vim_cv_toupper_broken=no
-	fi
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--with-vim-name=gvim \
-		--with-x \
-		"${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
-
-	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
-	# this evil trickery works.
-	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
-
-	# Make sure our VIMPROG is used.
-	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
-
-	# Don't do additional GUI tests.
-	emake -j1 VIMPROG=../testvim -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/.}
-
-	dobin src/gvim
-	dosym gvim /usr/bin/gvimdiff
-	dosym gvim /usr/bin/evim
-	dosym gvim /usr/bin/eview
-	dosym gvim /usr/bin/gview
-	dosym gvim /usr/bin/rgvim
-	dosym gvim /usr/bin/rgview
-
-	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
-
-	dodir /usr/share/man/man1
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
-	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
-		die "echo failed"
-
-	insinto /etc/vim
-	newins "${FILESDIR}"/gvimrc-r1 gvimrc
-	eprefixify "${ED}"/etc/vim/gvimrc
-
-	# bash completion script, bug #79018.
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# don't install vim desktop file
-	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
-}
-
-pkg_postinst() {
-	# update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# update icon cache
-	xdg_icon_cache_update
-
-	# call eselect vi update
-	eselect_vi_update
-}
-
-pkg_postrm() {
-	# update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# update icon cache
-	xdg_icon_cache_update
-
-	# call eselect vi update
-	eselect_vi_update
-}
diff --git a/app-editors/gvim/gvim-9.0.0828-r1.ebuild b/app-editors/gvim/gvim-9.0.0828-r1.ebuild
deleted file mode 100644
index 4ca38c8c283f..000000000000
--- a/app-editors/gvim/gvim-9.0.0828-r1.ebuild
+++ /dev/null
@@ -1,369 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please bump with app-editors/vim-core and app-editors/vim
-
-VIM_VERSION="9.0"
-LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit bash-completion-r1 flag-o-matic lua-single prefix python-single-r1 ruby-single toolchain-funcs vim-doc xdg-utils
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-fi
-S="${WORKDIR}"/vim-${PV}
-
-DESCRIPTION="GUI version of the Vim text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-LICENSE="vim"
-SLOT="0"
-IUSE="acl aqua crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl"
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	aqua? ( !motif )
-"
-
-RDEPEND="
-	~app-editors/vim-core-${PV}
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/libXt
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	!aqua? (
-		motif? ( >=x11-libs/motif-2.3:0 )
-		!motif? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
-	)
-	crypt? ( dev-libs/libsodium:= )
-	cscope? ( dev-util/cscope )
-	lua? (
-		${LUA_DEPS}
-		$(lua_gen_impl_dep 'deprecated' lua5-1)
-	)
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( ${RUBY_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	session? ( x11-libs/libSM )
-	sound? ( media-libs/libcanberra )
-	tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="${RDEPEND}"
-# configure runs the Lua interpreter
-BDEPEND="
-	sys-devel/autoconf
-	virtual/pkgconfig
-	lua? ( ${LUA_DEPS} )
-	nls? ( sys-devel/gettext )
-"
-PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
-
-# various failures (bugs #630042 and #682320)
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/vim-0.0.0828-configure-clang16.patch
-)
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	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}/vim-patches-vim-9.0.0049-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
-
-	# 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
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	# 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 -e \
-		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -v src/auto/configure || die "rm failed"
-
-	# --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 "couldn't disable cscope"
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-
-	# 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
-
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	local file
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e ${file} ]]; then
-			addwrite $file
-		fi
-	done
-
-	use debug && append-flags "-DDEBUG"
-
-	local myconf=(
-		--with-features=huge
-		--disable-gpm
-		--with-gnome=no
-		$(use_enable sound canberra)
-		$(use_enable acl)
-		$(use_enable crypt libsodium)
-		$(use_enable cscope)
-		$(use_enable netbeans)
-		$(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 session xsmp)
-		$(use_enable tcl tclinterp)
-	)
-
-	if use lua; then
-		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
-		# deprecated (in 5.1) luaL_openlib API (#874690)
-		use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1
-
-		myconf+=(
-			--enable-luainterp
-			$(use_with lua_single_target_luajit luajit)
-			--with-lua-prefix="${EPREFIX}/usr"
-		)
-	fi
-
-	# Default is gtk unless aqua or motif are enabled
-	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use motif; then
-		einfo "Building gvim with the MOTIF GUI"
-		myconf+=( --enable-gui=motif )
-	else
-		myconf+=( --enable-gtk3-check )
-		einfo "Building gvim with the gtk+-3 GUI"
-		myconf+=( --enable-gui=gtk3 )
-	fi
-	echo ; echo
-
-	# 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 )
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		# avoid finding of this function, to avoid having to patch either
-		# configure or the source, which would be much more hackish.
-		# after all vim does it right, only interix is badly broken (again)
-		export ac_cv_func_sigaction=no
-	fi
-
-	if tc-is-cross-compiler ; then
-		export vim_cv_getcwd_broken=no \
-			   vim_cv_memmove_handles_overlap=yes \
-			   vim_cv_stat_ignores_slash=yes \
-			   vim_cv_terminfo=yes \
-			   vim_cv_toupper_broken=no
-	fi
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--with-vim-name=gvim \
-		--with-x \
-		"${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
-
-	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
-	# this evil trickery works.
-	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
-
-	# Make sure our VIMPROG is used.
-	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
-
-	# Don't do additional GUI tests.
-	emake -j1 VIMPROG=../testvim -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/.}
-
-	dobin src/gvim
-	dosym gvim /usr/bin/gvimdiff
-	dosym gvim /usr/bin/evim
-	dosym gvim /usr/bin/eview
-	dosym gvim /usr/bin/gview
-	dosym gvim /usr/bin/rgvim
-	dosym gvim /usr/bin/rgview
-
-	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
-
-	dodir /usr/share/man/man1
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
-	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
-		die "echo failed"
-
-	insinto /etc/vim
-	newins "${FILESDIR}"/gvimrc-r1 gvimrc
-	eprefixify "${ED}"/etc/vim/gvimrc
-
-	# bash completion script, bug #79018.
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# don't install vim desktop file
-	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
-}
-
-pkg_postinst() {
-	# update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# update icon cache
-	xdg_icon_cache_update
-
-	# call eselect vi update
-	eselect_vi_update
-}
-
-pkg_postrm() {
-	# update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# update icon cache
-	xdg_icon_cache_update
-
-	# call eselect vi update
-	eselect_vi_update
-}
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 753709a4b527..f532a3623dfa 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -1,16 +1,10 @@
 AUX gvim.svg 4584 BLAKE2B 53d896f90404df6b185d1f4404c22e6bd6035722beb61d2223a6003e7c274cdfd4d97d7274346427d873a8e98a4ad32321c0a3ceab2b436124f90c707045b233 SHA512 78f5fb460281ab5d8b0ff6e28bf24231c1ade5ae46caab2e2d345d82b983ada7d945dd7d603b3e470c77dbd1eb329027852b6ba22afc441d64a1b66a1ee3867a
-AUX vim-0.0.0828-configure-clang16.patch 892 BLAKE2B 52c2c344f76856f3d6ed3559950e3ae6e0b118c2ec5b4ba3a39ae8f39cd7759ddac44479562071567690de47152e506dc07f441b910d443da1597e0798f6bd18 SHA512 d6653f7274fce3b703f798ae56a714da1c576016e4a13b950b5492851bd3864ee33ce8b486b12f9830bdc0792d4b4f1378a3d7ec5a3a36f550183f06e1dc6543
 AUX vim-9.0-fix-create-timer-for-cros-compiling.patch 851 BLAKE2B 27b7e6db6a75a5b58e90f57de969e5c7c57ce663ec243cfac8391b9befb52da776245c0255694b335e17251d1423264ff12ba1cfcad2a2957f6c6d05b62c9967 SHA512 271e04e1e683de89cf77aa9d48d502382496fa1b2176ca511d4cbf5cecf9a026442c8142d0cf8d273c23d15f81fdc26f9be00dff91cd516e563f2b2dc2937f9b
 AUX vimrc-r6 7488 BLAKE2B 959724b9fbb54755553ae6448bf7ff9991288a2473af122ec769157060465559c7fef6481f1e773936df1d3b7c2344376bb8ea405542b7b17b2deb8d03544623 SHA512 60dcb1d954103d3fc9943c884b9891627adf70801d819dc65972887d516720b5a2db0db234ba891cca7269e0b117b73f34ab6dee851bc057b9abf518b52e967e
 AUX xxd-completion 461 BLAKE2B 1f36c4877fffd68e951d80c1a64cd2d458d92555a99fd06e29513da8caa6c28c27e44131b2873258e3ff5a0ab232d66f75a8f051ccf7a4d940b3b0102e6967dd SHA512 fc92426ea657e86ff765aa5a60736cdc70db938156dd8946db0a30c54d3f557bd8af421f1713bd750e779ccacd73f8f290a12a5e71ed48259fe1e6dece2de19c
-DIST vim-9.0.0099.tar.gz 16712565 BLAKE2B b3277ebda0bb40601d995935422006d1a266bb862be612e69abd057a7342d13457ded5cb4743cf43a09b7d2001438f5a426ba12c30947bb7c193188c5fc13cf7 SHA512 ca0dea7b7fd78cf9c7cd4656611d066540f9d81ab17bcb75c79f0e989bdcfb769940ea29f75445c554b159e9eb3b2c4f9d77448254c3e4e4457b1bf721936498
-DIST vim-9.0.0828.tar.gz 16782339 BLAKE2B 6b997c1c828338d64a8b204a1e232676ec075834b1b7e74c2fc671e315f9bf6026b0c419ebb3c31e7ce58dbca23828ca11d866b2bfcb73f8a86fb31fa0d51b00 SHA512 03f93515039a2f275a8fe6b84bbac5875ffff17768ab3201e111eba4897a2485fe4ccfe238151f393334c7a6ea77eddd8898f0b816e26dbdb884f4e6bcbd2943
 DIST vim-9.0.1000.tar.gz 16842747 BLAKE2B 85edab7d13daa3e84ef0aeb50e3e9bfd31f0634d8e480c105727b0c34318e0adf7f1276dcdac53df8fc416fd8dfb70377cd74ed570752a3e77f07a083fa6c113 SHA512 9d2b914a112948d77b92c8dcafc2f711a83c3fdaf35a28f7f606e77007b9320e2260a0f6b24fc875a817c33c012f077f89730b34e9f12d6f00795c5c806704c8
 DIST vim-9.0.1157.tar.gz 16924574 BLAKE2B 0cdc6cf61f5abdaff0762b98550bfa5bae8f0485ddd0e9947a5fe52390f9da54fc8f5fdae767fb8f5d3ac2b441253917a80ae7f6092f67b69bdc9b6a630df8e2 SHA512 19240a9bcf5900766db42e2894b1bf7b849274711f17dc267671aacd867b334c3d30f39947dde7dd0245f289e9ad801eeb272f34a2ab15d01fac40bf71a54271
-DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b1af2d1414d10b794dbee9f5e7797fb3d34e00c2e065c339d4c82bf28aed53e0b5f2f8f1ee5c7ce69851cd63360788609bf144ac922 SHA512 7d5c64d674fa77048fdca7287072c0e488723133e254c10711dbadf750416c368725327ca9b76f332017bc70aa544a9baef671765eabf0d172d39921ffd7d942
 DIST vim-patches-vim-9.0.1000-patches.tar.bz2 3245 BLAKE2B 3bf3d0e314cc3f96d5d9675de196a62c4c8a72645d56ef94b80768571c99cba5cc556442e3bd2dfa8818460fd851fe7bd1ae15999af7225fb271b81c43105843 SHA512 2883441a2001bf7ce89a7f0862f780b71cc0164c8fcb8dbdf7040e1bcbcf408d138d3d77f308aa54c762e9975fa5ec89cfceeabbf721344dfc938870a363667a
-EBUILD vim-core-9.0.0099.ebuild 7207 BLAKE2B 351af53baf2e0419a2e6c6531cdfed3bc1461073a5561616164b3ce1a6090d8da3ba65befd7c256017cf4da91b0183c6acdbe38a59d94af68ec6a477207a7823 SHA512 35e4db86f6988c1a74649e8f636d97a7724efa6ea0ec6bdfe11f5dcdcd3e4b2b64688deaf786837340127c2a38e7b8882314459e5542fb5d31be23cd9ef8d935
-EBUILD vim-core-9.0.0828-r1.ebuild 7096 BLAKE2B 255e993d1c86c0fa0de57d5ba7f2835133a021ac48aeffea19085a210b5b30cd5fe017fd69d2bf690d6a67afb5cd4bc4d4d984e61ad05faa463935b97796b8a7 SHA512 014db8ff80c6d6c77734db3255cb65c5cd25e6300435ed6e54ea2506ae9b2745a1220c5ab6e5f6891bfd188b80d0942e63ddd1462692776f8e9b947e8e6cdb8c
 EBUILD vim-core-9.0.1000.ebuild 7083 BLAKE2B 05d3ba8dc8f37359bc5c956a9aabbac04f1d683e150e9e9d2bc7466412d71083ad31cb5079a6f55694bd52ca99ef639517b1eb5fd37066cbf7fbb02e783d5146 SHA512 7d716793e002bdf7cbba46568c27b1092611eedb87cd9f9d5418a25e7b0721ce5034604b29eca683147d7bfaf7c972942182774bd3a657dd52eb2acae836b300
 EBUILD vim-core-9.0.1157.ebuild 7091 BLAKE2B 986e066c7a69fd1f67b3f8bd6b4e70273492751a804eb4f44c9697dec67d4b9c95d21d2e65dc6dc45af46618cde47c0b276888d320a6f322b61cc1372ada13b7 SHA512 740b1d4f18f6db3ecd629c6ae60cd601133f02c976437b3d546ab0aeeb542b669b17a1aa55d395c1742b007b079dfa8a0947ca1e456e70f73bf6b7f7d5e0bd9d
 EBUILD vim-core-9999.ebuild 7077 BLAKE2B 4a5e4b103c9f1636ab0b28825d6799928908b5abc59adf2714bda281b0553215641d7c0fa5ec4fbdefaa19ad2ab71faccce43018275633ae01c368782f4cca24 SHA512 13dd6138758701ed3a13448dfd18e701967d85f1bdb09a890d5599018846faa7b3fd67a7a0276cc3642c56bcfcaa4552a5d462cea3cda3a84e7a53f13e02cfa4
diff --git a/app-editors/vim-core/files/vim-0.0.0828-configure-clang16.patch b/app-editors/vim-core/files/vim-0.0.0828-configure-clang16.patch
deleted file mode 100644
index e202a9dd3caa..000000000000
--- a/app-editors/vim-core/files/vim-0.0.0828-configure-clang16.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/vim/vim/pull/11496
-
-From 360b569f86b851c37e32b7cfaec079823188ff27 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 4 Nov 2022 03:18:23 +0000
-Subject: [PATCH] configure.ac: Fix -Wimplicit-int
-
-Clang 16 makes -Wimplicit-int an error by default. Fixes errors like:
-```
-error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Werror,-Wimplicit-int]
-```
-
-We already use proper declarations with every other test anyway, so
-let's be consistent.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/src/configure.ac
-+++ b/src/configure.ac
-@@ -3654,7 +3654,7 @@ dnl check if struct sigcontext is defined (used for SGI only)
- AC_MSG_CHECKING(for struct sigcontext)
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
- #include <signal.h>
--test_sig()
-+int test_sig()
- {
-     struct sigcontext *scont;
-     scont = (struct sigcontext *)0;
-
diff --git a/app-editors/vim-core/vim-core-9.0.0099.ebuild b/app-editors/vim-core/vim-core-9.0.0099.ebuild
deleted file mode 100644
index f754552aef6f..000000000000
--- a/app-editors/vim-core/vim-core-9.0.0099.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please bump with app-editors/vim and app-editors/gvim
-
-VIM_VERSION="9.0"
-inherit vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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
-S="${WORKDIR}/vim-${PV}"
-
-DESCRIPTION="vim and gvim shared files"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-LICENSE="vim"
-SLOT="0"
-IUSE="nls acl minimal"
-
-# ncurses is only needed by ./configure, so no subslot operator required
-DEPEND=">=sys-libs/ncurses-5.2-r2:0"
-BDEPEND="sys-devel/autoconf"
-# Avoid icon file collision, bug #673880
-RDEPEND="!<app-editors/vim-8.2.4328-r1"
-PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug #82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/vim-patches-vim-9.0.0049-patches
-		eapply "${FILESDIR}"/vim-9.0-fix-create-timer-for-cros-compiling.patch
-	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 "sed failed"
-
-	# See bug #77841. We remove this file after the tarball extraction.
-	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h || die
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h || die
-
-	# 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 '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 '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
-
-	# 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"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	# 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"
-
-	# Remove src/auto/configure file.
-	rm -v src/auto/configure || die "rm configure failed"
-
-	eapply_user
-}
-
-src_configure() {
-	# 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
-
-	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
-
-	# Let Portage do the stripping. Some people like that.
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	local myconf=(
-		--with-modified-by=Gentoo-${PVR}
-		--enable-gui=no
-		--without-x
-		--disable-darwin
-		--disable-perlinterp
-		--disable-pythoninterp
-		--disable-rubyinterp
-		--disable-gpm
-		--disable-selinux
-		$(use_enable nls)
-		$(use_enable acl)
-	)
-
-	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	if tc-is-cross-compiler ; then
-		export vim_cv_getcwd_broken=no \
-			   vim_cv_memmove_handles_overlap=yes \
-			   vim_cv_stat_ignores_slash=yes \
-			   vim_cv_terminfo=yes \
-			   vim_cv_toupper_broken=no
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake -j1 -C src auto/osdef.h objects
-	emake tools
-}
-
-src_test() { :; }
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dodir /usr/{bin,share/{man/man1,vim}}
-	emake -C src \
-		installruntime \
-		installmanlinks \
-		installmacros \
-		installtutor \
-		installtutorbin \
-		installtools \
-		install-languages \
-		DESTDIR="${D}" \
-		BINDIR="${EPREFIX}"/usr/bin \
-		MANDIR="${EPREFIX}"/usr/share/man \
-		DATADIR="${EPREFIX}"/usr/share
-
-	keepdir ${vimfiles}/keymap
-
-	# default vimrc is installed by vim-core since it applies to
-	# both vim and gvim
-	insinto /etc/vim/
-	newins "${FILESDIR}"/vimrc-r6 vimrc
-	eprefixify "${ED}"/etc/vim/vimrc
-
-	if use minimal; then
-		# To save space, install only a subset of the files.
-		# Helps minimalize the livecd, bug 65144.
-		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die
-		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die
-		rm -v "${ED}"/usr/bin/vimtutor || die
-
-		for f in "${ED}${vimfiles}"/colors/*.vim; do
-			if [[ ${f} != */@(default).vim ]] ; then
-				printf '%s\0' "${f}"
-			fi
-		done | xargs -0 rm -f || die
-
-		for f in "${ED}${vimfiles}"/syntax/*.vim; do
-			if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then
-				printf '%s\0' "${f}"
-			fi
-		done | xargs -0 rm -f || die
-	fi
-
-	newbashcomp "${FILESDIR}"/xxd-completion xxd
-
-	# install gvim icon since both vim/gvim desktop files reference it
-	doicon -s scalable "${FILESDIR}"/gvim.svg
-}
-
-pkg_postinst() {
-	# update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# update icon cache
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# update icon cache
-	xdg_icon_cache_update
-}
diff --git a/app-editors/vim-core/vim-core-9.0.0828-r1.ebuild b/app-editors/vim-core/vim-core-9.0.0828-r1.ebuild
deleted file mode 100644
index e078361724fc..000000000000
--- a/app-editors/vim-core/vim-core-9.0.0828-r1.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please bump with app-editors/vim and app-editors/gvim
-
-VIM_VERSION="9.0"
-inherit bash-completion-r1 desktop flag-o-matic prefix toolchain-funcs vim-doc xdg-utils
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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
-S="${WORKDIR}/vim-${PV}"
-
-DESCRIPTION="vim and gvim shared files"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-LICENSE="vim"
-SLOT="0"
-IUSE="nls acl minimal"
-
-# ncurses is only needed by ./configure, so no subslot operator required
-DEPEND=">=sys-libs/ncurses-5.2-r2:0"
-BDEPEND="sys-devel/autoconf"
-
-PATCHES=(
-	"${FILESDIR}"/vim-0.0.0828-configure-clang16.patch
-)
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug #82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/vim-patches-vim-9.0.0049-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 "sed failed"
-
-	# See bug #77841. We remove this file after the tarball extraction.
-	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h || die
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h || die
-
-	# 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 '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 '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
-
-	# 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"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	# 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"
-
-	# Remove src/auto/configure file.
-	rm -v src/auto/configure || die "rm configure failed"
-
-	eapply_user
-}
-
-src_configure() {
-	# 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
-
-	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
-
-	# Let Portage do the stripping. Some people like that.
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	local myconf=(
-		--with-modified-by=Gentoo-${PVR}
-		--enable-gui=no
-		--without-x
-		--disable-darwin
-		--disable-perlinterp
-		--disable-pythoninterp
-		--disable-rubyinterp
-		--disable-gpm
-		--disable-selinux
-		$(use_enable nls)
-		$(use_enable acl)
-	)
-
-	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	if tc-is-cross-compiler ; then
-		export vim_cv_getcwd_broken=no \
-			   vim_cv_memmove_handles_overlap=yes \
-			   vim_cv_stat_ignores_slash=yes \
-			   vim_cv_terminfo=yes \
-			   vim_cv_toupper_broken=no
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake -j1 -C src auto/osdef.h objects
-	emake tools
-}
-
-src_test() { :; }
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dodir /usr/{bin,share/{man/man1,vim}}
-	emake -C src \
-		installruntime \
-		installmanlinks \
-		installmacros \
-		installtutor \
-		installtutorbin \
-		installtools \
-		install-languages \
-		DESTDIR="${D}" \
-		BINDIR="${EPREFIX}"/usr/bin \
-		MANDIR="${EPREFIX}"/usr/share/man \
-		DATADIR="${EPREFIX}"/usr/share
-
-	keepdir ${vimfiles}/keymap
-
-	# default vimrc is installed by vim-core since it applies to
-	# both vim and gvim
-	insinto /etc/vim/
-	newins "${FILESDIR}"/vimrc-r6 vimrc
-	eprefixify "${ED}"/etc/vim/vimrc
-
-	if use minimal; then
-		# To save space, install only a subset of the files.
-		# Helps minimalize the livecd, bug 65144.
-		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die
-		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die
-		rm -v "${ED}"/usr/bin/vimtutor || die
-
-		for f in "${ED}${vimfiles}"/colors/*.vim; do
-			if [[ ${f} != */@(default).vim ]] ; then
-				printf '%s\0' "${f}"
-			fi
-		done | xargs -0 rm -f || die
-
-		for f in "${ED}${vimfiles}"/syntax/*.vim; do
-			if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then
-				printf '%s\0' "${f}"
-			fi
-		done | xargs -0 rm -f || die
-	fi
-
-	newbashcomp "${FILESDIR}"/xxd-completion xxd
-
-	# install gvim icon since both vim/gvim desktop files reference it
-	doicon -s scalable "${FILESDIR}"/gvim.svg
-}
-
-pkg_postinst() {
-	# update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# update icon cache
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# update icon cache
-	xdg_icon_cache_update
-}
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 65ed041d26df..5be079659340 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -1,14 +1,7 @@
-AUX vim-0.0.0828-configure-clang16.patch 892 BLAKE2B 52c2c344f76856f3d6ed3559950e3ae6e0b118c2ec5b4ba3a39ae8f39cd7759ddac44479562071567690de47152e506dc07f441b910d443da1597e0798f6bd18 SHA512 d6653f7274fce3b703f798ae56a714da1c576016e4a13b950b5492851bd3864ee33ce8b486b12f9830bdc0792d4b4f1378a3d7ec5a3a36f550183f06e1dc6543
-AUX vim-9.0-fix-create-timer-for-cros-compiling.patch 851 BLAKE2B 27b7e6db6a75a5b58e90f57de969e5c7c57ce663ec243cfac8391b9befb52da776245c0255694b335e17251d1423264ff12ba1cfcad2a2957f6c6d05b62c9967 SHA512 271e04e1e683de89cf77aa9d48d502382496fa1b2176ca511d4cbf5cecf9a026442c8142d0cf8d273c23d15f81fdc26f9be00dff91cd516e563f2b2dc2937f9b
 AUX vim-completion 1004 BLAKE2B dea4230a8d2a57fd1af18df4037504a44382a97ff672410e987cb287d802c964baa502da4d08f09cb8684307481fec503c1d8cae7f4f6e61500f1cb06033a2c4 SHA512 dccf663a93efdf2ec3be69f49e418a0ef66277e2fae6c12287adde772592e19f5130388a04242121846f1dae39f78b30780c99dc6fe1b847f4f08354bda3cc41
-DIST vim-9.0.0099.tar.gz 16712565 BLAKE2B b3277ebda0bb40601d995935422006d1a266bb862be612e69abd057a7342d13457ded5cb4743cf43a09b7d2001438f5a426ba12c30947bb7c193188c5fc13cf7 SHA512 ca0dea7b7fd78cf9c7cd4656611d066540f9d81ab17bcb75c79f0e989bdcfb769940ea29f75445c554b159e9eb3b2c4f9d77448254c3e4e4457b1bf721936498
-DIST vim-9.0.0828.tar.gz 16782339 BLAKE2B 6b997c1c828338d64a8b204a1e232676ec075834b1b7e74c2fc671e315f9bf6026b0c419ebb3c31e7ce58dbca23828ca11d866b2bfcb73f8a86fb31fa0d51b00 SHA512 03f93515039a2f275a8fe6b84bbac5875ffff17768ab3201e111eba4897a2485fe4ccfe238151f393334c7a6ea77eddd8898f0b816e26dbdb884f4e6bcbd2943
 DIST vim-9.0.1000.tar.gz 16842747 BLAKE2B 85edab7d13daa3e84ef0aeb50e3e9bfd31f0634d8e480c105727b0c34318e0adf7f1276dcdac53df8fc416fd8dfb70377cd74ed570752a3e77f07a083fa6c113 SHA512 9d2b914a112948d77b92c8dcafc2f711a83c3fdaf35a28f7f606e77007b9320e2260a0f6b24fc875a817c33c012f077f89730b34e9f12d6f00795c5c806704c8
 DIST vim-9.0.1157.tar.gz 16924574 BLAKE2B 0cdc6cf61f5abdaff0762b98550bfa5bae8f0485ddd0e9947a5fe52390f9da54fc8f5fdae767fb8f5d3ac2b441253917a80ae7f6092f67b69bdc9b6a630df8e2 SHA512 19240a9bcf5900766db42e2894b1bf7b849274711f17dc267671aacd867b334c3d30f39947dde7dd0245f289e9ad801eeb272f34a2ab15d01fac40bf71a54271
-DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b1af2d1414d10b794dbee9f5e7797fb3d34e00c2e065c339d4c82bf28aed53e0b5f2f8f1ee5c7ce69851cd63360788609bf144ac922 SHA512 7d5c64d674fa77048fdca7287072c0e488723133e254c10711dbadf750416c368725327ca9b76f332017bc70aa544a9baef671765eabf0d172d39921ffd7d942
 DIST vim-patches-vim-9.0.1000-patches.tar.bz2 3245 BLAKE2B 3bf3d0e314cc3f96d5d9675de196a62c4c8a72645d56ef94b80768571c99cba5cc556442e3bd2dfa8818460fd851fe7bd1ae15999af7225fb271b81c43105843 SHA512 2883441a2001bf7ce89a7f0862f780b71cc0164c8fcb8dbdf7040e1bcbcf408d138d3d77f308aa54c762e9975fa5ec89cfceeabbf721344dfc938870a363667a
-EBUILD vim-9.0.0099-r1.ebuild 10885 BLAKE2B af6781566ea5271c5f702542bef5f9a27350dfb8a5090134f00990086355ac5688db2e30a13e3b39fc32f685708ce7475de636d75e916ce23d32b69a743ea2ab SHA512 4291aa8a8894fec8c2ef79537554ca3ce353cc6d5cc6b99e5f137605b70787ec9bc1afd426f6c643ae603acf420925932fe7579939d50e05bb361c05dd00febd
-EBUILD vim-9.0.0828-r1.ebuild 10930 BLAKE2B c4a917fa75e868a70ad52011797ec3d2b91ba5dc335272ba4b457336f89a23f56f27ce2fe4b9b393fdeff1ec0a278f4167867e8e7db611e2f0e34f394f546981 SHA512 f16c90f1fb1085dabdf45e85b2861d3bed93cf9effedd6f2c4c8e5674faec82e1dec746707fb8adba43ae19c0bac7f05cf62c2ccd6d3e6d2fa46a539ce4f3ac4
 EBUILD vim-9.0.1000.ebuild 10918 BLAKE2B 7172e7d24417e5292b0d5a86fe99e72804c4c0a1c14f5a39ae9b0850be43152544a14421b085f925eb4a9a363ae1771ccaac579caabff3f0e5aaad72f767e30b SHA512 e3b8c7b44652f742b69999ae662f5def4906cd5573130e81c31543e29325f86173144b43e71b55d6ff6d65a4135a0ea567166f94716d728ea912316811a80be2
 EBUILD vim-9.0.1157.ebuild 10926 BLAKE2B 0c03063a5ac05cd48afa642d3c6ca03312dd4913aa3f4e9ab8c504fd6eb8dc4ec4b4420eb69659fd316594750020892c8849546d407e57690863d3e5feb809a7 SHA512 9e68eeb02cc5ad3b7289dc73528957c1b105a9f8ebe3ad1aba0f8b6b17515fd7ffe7e7ffbd629364e516212c8208674478a41fcd0a6cadbe77f7bcae79d59b58
 EBUILD vim-9999.ebuild 10926 BLAKE2B 0c03063a5ac05cd48afa642d3c6ca03312dd4913aa3f4e9ab8c504fd6eb8dc4ec4b4420eb69659fd316594750020892c8849546d407e57690863d3e5feb809a7 SHA512 9e68eeb02cc5ad3b7289dc73528957c1b105a9f8ebe3ad1aba0f8b6b17515fd7ffe7e7ffbd629364e516212c8208674478a41fcd0a6cadbe77f7bcae79d59b58
diff --git a/app-editors/vim/files/vim-0.0.0828-configure-clang16.patch b/app-editors/vim/files/vim-0.0.0828-configure-clang16.patch
deleted file mode 100644
index e202a9dd3caa..000000000000
--- a/app-editors/vim/files/vim-0.0.0828-configure-clang16.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/vim/vim/pull/11496
-
-From 360b569f86b851c37e32b7cfaec079823188ff27 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 4 Nov 2022 03:18:23 +0000
-Subject: [PATCH] configure.ac: Fix -Wimplicit-int
-
-Clang 16 makes -Wimplicit-int an error by default. Fixes errors like:
-```
-error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Werror,-Wimplicit-int]
-```
-
-We already use proper declarations with every other test anyway, so
-let's be consistent.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/src/configure.ac
-+++ b/src/configure.ac
-@@ -3654,7 +3654,7 @@ dnl check if struct sigcontext is defined (used for SGI only)
- AC_MSG_CHECKING(for struct sigcontext)
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
- #include <signal.h>
--test_sig()
-+int test_sig()
- {
-     struct sigcontext *scont;
-     scont = (struct sigcontext *)0;
-
diff --git a/app-editors/vim/files/vim-9.0-fix-create-timer-for-cros-compiling.patch b/app-editors/vim/files/vim-9.0-fix-create-timer-for-cros-compiling.patch
deleted file mode 100644
index 5247a80754cc..000000000000
--- a/app-editors/vim/files/vim-9.0-fix-create-timer-for-cros-compiling.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bba26c9ed9d4ddc82afd0343f145dc9e14b91498 Mon Sep 17 00:00:00 2001
-From: Varsha Teratipally <teratipally@google.com>
-Date: Tue, 2 Aug 2022 22:18:29 +0000
-Subject: [PATCH] Configure check for timer_create may give wrong error.
-Give a warning instead of an error
-
-Partial solution from github.com/vim/vim/commit/5f6cae8b8a49c435556e32f84d067cd0b4d28e4c
-
----
- src/configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/configure.ac b/src/configure.ac
-index e8522ec05..41f41dee3 100644
---- a/src/configure.ac
-+++ b/src/configure.ac
-@@ -3850,7 +3850,7 @@ static void set_flag(union sigval sv) {}
-     ])],
-     vim_cv_timer_create=yes,
-     vim_cv_timer_create=no),
--    AC_MSG_ERROR(cross-compiling: please set 'vim_cv_timer_create')
-+    AC_MSG_WARN(cross-compiling: please set 'vim_cv_timer_create')
-     )]
- )
- 
--- 
-
-
diff --git a/app-editors/vim/vim-9.0.0099-r1.ebuild b/app-editors/vim/vim-9.0.0099-r1.ebuild
deleted file mode 100644
index 2e4c3941c673..000000000000
--- a/app-editors/vim/vim-9.0.0099-r1.ebuild
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please bump with app-editors/vim-core and app-editors/gvim
-
-VIM_VERSION="9.0"
-LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single toolchain-funcs 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://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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)
-	)
-	~app-editors/vim-core-${PV}
-	!<app-editors/vim-core-8.2.4328-r1
-	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"
-
-	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}"/vim-patches-vim-9.0.0049-patches
-		eapply "${FILESDIR}"/vim-9.0-fix-create-timer-for-cros-compiling.patch
-	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'
-
-	# 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"
-
-	eapply_user
-}
-
-src_configure() {
-
-	# 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
-
-	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
-
-	local myconf=()
-	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
-			# -DLUA_COMPAT_OPENLIB=1 is required to enable the
-			# deprecated (in 5.1) luaL_openlib API (#874690)
-			use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1
-
-			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 )
-
-	if tc-is-cross-compiler ; then
-		export vim_cv_getcwd_broken=no \
-			   vim_cv_memmove_handles_overlap=yes \
-			   vim_cv_stat_ignores_slash=yes \
-			   vim_cv_terminfo=yes \
-			   vim_cv_toupper_broken=no
-	fi
-
-	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
-
-	# Arch and opensuse seem to do this and at this point, I'm willing
-	# to try anything to avoid random test hangs!
-	export TERM=xterm
-
-	# 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.
-	# - Test_fuzzy_completion_env
-	# Too sensitive to leaked environment variables.
-	# - Test_term_mouse_multiple_clicks_to_select_mode
-	# Hangs.
-	# - Test_spelldump
-	# Hangs.
-	export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\|Test_fuzzy_completion_env\|Test_term_mouse_multiple_clicks_to_select_mode\|Test_spelldump\)'
-
-	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
-
-	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-9.0.0828-r1.ebuild b/app-editors/vim/vim-9.0.0828-r1.ebuild
deleted file mode 100644
index 035c07e22f0e..000000000000
--- a/app-editors/vim/vim-9.0.0828-r1.ebuild
+++ /dev/null
@@ -1,374 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please bump with app-editors/vim-core and app-editors/gvim
-
-VIM_VERSION="9.0"
-LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single toolchain-funcs 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://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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)
-	)
-	~app-editors/vim-core-${PV}
-	!<app-editors/vim-core-8.2.4328-r1
-	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 )
-"
-PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
-
-PATCHES=(
-	"${FILESDIR}"/vim-0.0.0828-configure-clang16.patch
-)
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug #82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	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}"/vim-patches-vim-9.0.0049-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'
-
-	# 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"
-
-	eapply_user
-}
-
-src_configure() {
-
-	# 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
-
-	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
-
-	local myconf=()
-	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
-			# -DLUA_COMPAT_OPENLIB=1 is required to enable the
-			# deprecated (in 5.1) luaL_openlib API (#874690)
-			use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1
-
-			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 )
-
-	if tc-is-cross-compiler ; then
-		export vim_cv_getcwd_broken=no \
-			   vim_cv_memmove_handles_overlap=yes \
-			   vim_cv_stat_ignores_slash=yes \
-			   vim_cv_terminfo=yes \
-			   vim_cv_toupper_broken=no
-	fi
-
-	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
-
-	# Arch and opensuse seem to do this and at this point, I'm willing
-	# to try anything to avoid random test hangs!
-	export TERM=xterm
-
-	# 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.
-	# - Test_fuzzy_completion_env
-	# Too sensitive to leaked environment variables.
-	# - Test_term_mouse_multiple_clicks_to_select_mode
-	# Hangs.
-	# - Test_spelldump
-	# Hangs.
-	export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\|Test_fuzzy_completion_env\|Test_term_mouse_multiple_clicks_to_select_mode\|Test_spelldump\)'
-
-	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
-
-	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
-}