gentoo resync : 29.12.2022

133 files changed, 1540 insertions, 8756 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 60ac5e3d0b4b..1ecc8685deb1 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/bluefish/Manifest b/app-editors/bluefish/Manifest
index 8cf86d11abde..40ae6b5f4d2a 100644
--- a/app-editors/bluefish/Manifest
+++ b/app-editors/bluefish/Manifest
@@ -1,4 +1,5 @@
 AUX bluefish-2.2.9-charmap_configure.patch 728 BLAKE2B fc7231ab28c0d0c4480e48f965d26ee18ae5819e412488ab8a5e30e3cee6925b73daa72fa178cdf204e00d1074121ddc57fd4c5795ccc6335460409a245bca5c SHA512 46482a73b6d374cdd5881e9ed7a79199c85cb436cc700950c09541a94d61fc4f200613a34575e74d013409f0e42a7c1df4ed25ed65880f25cbebd926d47c6889
 DIST bluefish-2.2.12.tar.bz2 4180228 BLAKE2B 9e05a4618c37951da6a669e9bd4e0dd7e9993ea764dd467f875039b28cdc6d71ae70d1a87df7f0c63f850ebbff6ceeb8550d1d036bab32b7435f362d5b137147 SHA512 f0eb6496d371db8a9b4aee33ddf67e5e87bcc86ff283704cac115be7f00609b1ccbd47ff2d8f8b0bc30f234a339069cc1f7cb1f8809d97f94f0b0e09e4f16754
-EBUILD bluefish-2.2.12.ebuild 2382 BLAKE2B 2fdedb0cdf138a9a65e6eae58474a1e81f60d12170bc0d5475ca1419bea3428ef6b4f4843f5c67b0297d966d11a8d1e64011bd261414f17a413a4c0afe81dae8 SHA512 9a49b547b46a052a305079a1beb8027e68d1a9da2b3d06c78df5fde26a273f3fef1ff6de0df88cfd27d61dfbc5a65fde291bdea89f63cbcb7a971d659992154d
+EBUILD bluefish-2.2.12-r1.ebuild 2459 BLAKE2B eec16cbac14d1e11d15212029ad6a85aab1f21c3be125d81fc9759438472f5766a389e123a10441fde17a5ca6a83af5cb22255944ac871a17f05c33a339a8dc2 SHA512 57420024d52dea27990dae3726f54981ede4279a8ca515d08def57c16b46e3a7b1fb4ecd6caacf6b4add5deba52f604d64c735f7ed890fb95bf57b2b1a946af1
+EBUILD bluefish-2.2.12.ebuild 2463 BLAKE2B 96e7b71add78bf5ac5e6888d6f27e9fe18502bfc6819653402119fe3adfd684654fd7d042cf6d25e8ed4fefa15a01dca26f14c085edc4ab539b0a64a81752a38 SHA512 6a8ad043ef2c2d1db89cea9f8ac3535678d4425207729c0facf67604d5f2fab9aae8a955f83a017d502ca7a92b0426ad577b7784013d2e44631ff12aea1ba1dc
 MISC metadata.xml 333 BLAKE2B 5a5f339d26d78d99050d8324891a3d6ef97af31e3e6a397e763cc2e7561f892e43856e38fefe72be28db1962a4da153b0ebde42db6a53074bdf6b9c13eb74d87 SHA512 144b48f78b13ad3f07868b3171db5935431befd92821a6b70b6e626943996bcc4219ff27808b9062b2da4b5ff1c86dcb1c3778757b0b2a905c5bea3e90dcf152
diff --git a/app-editors/bluefish/bluefish-2.2.12-r1.ebuild b/app-editors/bluefish/bluefish-2.2.12-r1.ebuild
new file mode 100644
index 000000000000..02c2c22c45b3
--- /dev/null
+++ b/app-editors/bluefish/bluefish-2.2.12-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+MY_P=${P/_/-}
+inherit autotools python-single-r1 xdg
+
+DESCRIPTION="GTK HTML editor for the experienced web designer or programmer"
+HOMEPAGE="https://bluefish.openoffice.nl/"
+SRC_URI="https://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3+"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+SLOT="0"
+IUSE="gucharmap nls python spell"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="sys-libs/zlib
+	x11-libs/gtk+:3
+	gucharmap? ( gnome-extra/gucharmap:2.90 )
+	python? ( ${PYTHON_DEPS} )
+	spell? ( app-text/enchant:2 )"
+DEPEND="${RDEPEND}
+	x11-libs/pango"
+BDEPEND=">=dev-libs/glib-2.24:2
+	dev-libs/libxml2:2
+	virtual/pkgconfig
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+# there actually is just some broken manpage checkup -> not bother
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${PN}-2.2.9-charmap_configure.patch" )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# eautoreconf seems to no longer kill translation files.
+	eautoreconf
+	sed -i 's:gzip -n $< -c:gzip -n -c $<:' data/bflib/Makefile.* || die "Cannot fix makefile"
+}
+
+src_configure() {
+	CONFIG_SHELL="${BROOT}/bin/bash" econf \
+		--disable-update-databases \
+		--disable-xml-catalog-update \
+		--with-freedesktop_org-appdata="${EPREFIX}"/usr/share/metainfo \
+		--without-gtk2 \
+		$(use_with gucharmap charmap) \
+		$(use_enable nls) \
+		$(use_enable spell spell-check) \
+		$(use_enable python)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	einfo "Adding XML catalog entries..."
+	"${EPREFIX}"/usr/bin/xmlcatalog  --noout \
+		--add 'public' 'Bluefish/DTD/Bflang' 'bflang.dtd' \
+		--add 'system' 'http://bluefish.openoffice.nl/DTD/bflang.dtd' 'bflang.dtd' \
+		--add 'rewriteURI' 'http://bluefish.openoffice.nl/DTD' '/usr/share/xml/bluefish-unstable' \
+		"${EROOT}"/etc/xml/catalog \
+		|| ewarn "Failed to add XML catalog entries."
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	einfo "Removing XML catalog entries..."
+	"${EPREFIX}"/usr/bin/xmlcatalog  --noout \
+		--del 'Bluefish/DTD/Bflang' \
+		--del 'http://bluefish.openoffice.nl/DTD/bflang.dtd' \
+		--del 'http://bluefish.openoffice.nl/DTD' \
+		"${EROOT}"/etc/xml/catalog \
+		|| ewarn "Failed to remove XML catalog entries."
+}
diff --git a/app-editors/bluefish/bluefish-2.2.12.ebuild b/app-editors/bluefish/bluefish-2.2.12.ebuild
index 2580098daeac..5e75105359f7 100644
--- a/app-editors/bluefish/bluefish-2.2.12.ebuild
+++ b/app-editors/bluefish/bluefish-2.2.12.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 MY_P=${P/_/-}
 inherit autotools python-single-r1 xdg
@@ -18,8 +18,7 @@ SLOT="0"
 IUSE="gucharmap nls python spell"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="
-	sys-libs/zlib
+RDEPEND="sys-libs/zlib
 	x11-libs/gtk+:3
 	gucharmap? ( gnome-extra/gucharmap:2.90 )
 	python? ( ${PYTHON_DEPS} )
@@ -30,8 +29,8 @@ BDEPEND=">=dev-libs/glib-2.24:2
 	dev-libs/libxml2:2
 	virtual/pkgconfig
 	nls? (
-		sys-devel/gettext
 		dev-util/intltool
+		sys-devel/gettext
 	)"
 
 S="${WORKDIR}/${MY_P}"
@@ -39,21 +38,22 @@ S="${WORKDIR}/${MY_P}"
 # there actually is just some broken manpage checkup -> not bother
 RESTRICT="test"
 
+PATCHES=( "${FILESDIR}/${PN}-2.2.9-charmap_configure.patch" )
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
-PATCHES=( "${FILESDIR}/${PN}-2.2.9-charmap_configure.patch" )
-
-# eautoreconf seems to no longer kill translation files.
 src_prepare() {
 	default
+
+	# eautoreconf seems to no longer kill translation files.
 	eautoreconf
 	sed -i 's:gzip -n $< -c:gzip -n -c $<:' data/bflib/Makefile.* || die "Cannot fix makefile"
 }
 
 src_configure() {
-	econf \
+	CONFIG_SHELL="${BROOT}/bin/bash" econf \
 		--disable-update-databases \
 		--disable-xml-catalog-update \
 		--with-freedesktop_org-appdata="${EPREFIX}"/usr/share/metainfo \
@@ -66,27 +66,30 @@ src_configure() {
 
 src_install() {
 	default
+
 	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
 	xdg_pkg_postinst
+
 	einfo "Adding XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
+	"${EPREFIX}"/usr/bin/xmlcatalog  --noout \
 		--add 'public' 'Bluefish/DTD/Bflang' 'bflang.dtd' \
 		--add 'system' 'http://bluefish.openoffice.nl/DTD/bflang.dtd' 'bflang.dtd' \
 		--add 'rewriteURI' 'http://bluefish.openoffice.nl/DTD' '/usr/share/xml/bluefish-unstable' \
-		/etc/xml/catalog \
+		"${EROOT}"/etc/xml/catalog \
 		|| ewarn "Failed to add XML catalog entries."
 }
 
 pkg_postrm() {
 	xdg_pkg_postrm
+
 	einfo "Removing XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
+	"${EPREFIX}"/usr/bin/xmlcatalog  --noout \
 		--del 'Bluefish/DTD/Bflang' \
 		--del 'http://bluefish.openoffice.nl/DTD/bflang.dtd' \
 		--del 'http://bluefish.openoffice.nl/DTD' \
-		/etc/xml/catalog \
+		"${EROOT}"/etc/xml/catalog \
 		|| ewarn "Failed to remove XML catalog entries."
 }
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 9c484e4fcfef..a07cb65dfac3 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,4 +1,4 @@
-DIST emacs-18.59-patches-13.tar.xz 33532 BLAKE2B 17682fb03c3606794743e702f8389a9476fe09a8c0cc970828aa515a5fc2b1d2df620cdc168d4727635492b38da81ab525c05e20cb77c86d5ae691976deb8d94 SHA512 912afbb4e42efb9e42df4e06c21bcf1d7e2f203d35edb2b410b80c9e25f2e4b37dbb28e6fa36691ce44c53da9f3eb57518da164ecca1599147072219244a8b35
+DIST emacs-18.59-patches-14.tar.xz 33760 BLAKE2B 9235d720e1218e9b1912c6968ba22e0971e3cc8ef1b3ea5023f1970499874c145fb03f883d37455ebdc83a0a3091f054f42fc63f1d5f75ca9ba5f4f66364e6d1 SHA512 74cc19cce1b65c01f5d2f7c1aa674e3923f68e52a61108d4140c41c7fac90d32833fc457eccbe4fb551e0453d1c01f12fcf760fda394a5c34668675c52a24459
 DIST emacs-18.59.tar.gz 2962652 BLAKE2B d617636daff41e672af2dcda26ec24b2495cf0a3e6373561ee26a2a922b7252c074dd6b79289d771853a4720c60f084f5726b904bf65989718173232ac874b0b SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33
 DIST emacs-23.4-patches-23.tar.xz 19932 BLAKE2B 941d939d1a66af162016eb7f4a34a3a6d19736ecbd06e2499ccb0bf8806b2b3583de324308698b00d0b47a3d0b8a046e5d5dcb2d681c2bba90ec40b58b4e9855 SHA512 83e2cef7ebe07fc69806d01946c6e96fa0e92b363e9c6531992593eeb29413518217fef05bba48729356af7d1326c3667748185aad971a625daccb803b2bfe58
 DIST emacs-23.4.tar.bz2 38646508 BLAKE2B 33dac5d27a63b7aab6b4053964a0ecf7f7939c7aea5af15103f2da7bd34fbb18dba7a1bf44cc4fcc2e3fb1439cdf7085d8dfc4b0005f5485748996e75ca6872d SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296
@@ -11,13 +11,13 @@ DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee7
 DIST emacs-27.2-patches-3.tar.xz 7776 BLAKE2B c03947780518ebf86994b1af20cc24377094c55c783e3cbb0230da5ecb4c92613c4e6d599cefe51b297cc117e3a832c6b34365cc983da0630a9ca6f39b58d10e SHA512 a72af0dd47989b5e4ceecc48d8dfd1a362cdda17070a6a5a9c53c0448a7bceed3b27efd0dd78a0cbe3eb503015b1475cd52fc01c5aca10a52ad30635f385b190
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156 SHA512 0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9
 DIST emacs-28.1.tar.xz 47699512 BLAKE2B 42a12bec2dc74f4838ae79b5589fb7439ff415d8ddd34f2ff7a8c503f909ddd4144ad35ae19c758d8627cfa9ed29276b326c5bec3853a77cd179e9fb17d22ad7 SHA512 c146ff7086aba49fa6c18adf4e485a59eb4c6525fddb9d385034446830b8bb0ac9e6fb76e7b6d94a9fddc41643415f36acad57a1ae16a841c97f61bc211459d9
-EBUILD emacs-18.59-r14.ebuild 4351 BLAKE2B 43b9d632623afd061f1259166faebd1c5329a172c16c718623de60a3c7bf77762eb59e4e5e37f97ea84d3e9623277c83a9364d2af6bf5118b3143d3391da5fe7 SHA512 0527e11b681a053438c89d1576f3ea5967f7892fb79885d126aff1d38d4321d55c317a331cd48aee3464ce9f5a391439ff1dba8e47ac334ec2cc8645fb41b3f4
+EBUILD emacs-18.59-r14.ebuild 4426 BLAKE2B 836c0e10eb9bee637d215bc13d695a631ba495728b5c8da1a2b6a29e31f17be8de4bb0aebe6401fecaee8488da0d5302b898b1a8b528eb18a0ebb46b3ed04e43 SHA512 4540d9bb492309c983c75c2cfb2f3aad2653252303d7d25c5d59723f43b9ece3ee43a216e3775c86f75714b29d2387371aab734c94cbe59d29cde64e077f27cf
 EBUILD emacs-23.4-r21.ebuild 11040 BLAKE2B 5743514f4e5be8649ed1b2a8bafaa873876c71e5035632f61bc4ef808e540edf144af1277c355bbb215f922be7dd7ac843af34a42f6b6109aaecb2ef2027a6dd SHA512 049dfb3eff159a1cfe6e62e4ecbe04df614b5cbb79b9a8619bb9793e08191754270e36295124e6fa6fe79832c2d20e55138d42080d5cf7fc4dce5bbd8ad6fe54
 EBUILD emacs-24.5-r11.ebuild 10781 BLAKE2B 436f02959a1aa71165682f8e133dc0d7964cf7742b3d3a15906ac0f702e6ba42a3828d5b3beec1e84e4c5b9c74316e421bb6fe2392df9680b85efb23868b88f1 SHA512 61ef707e3d26d4d303754bc854834e915f09956ec2f9cfbf0f4916faf4a12f1922f0581c5f1baa93c5fa4ac6acbffe494f0e8d6ef8f0a904b9aa5d546a5f4d9e
 EBUILD emacs-25.3-r11.ebuild 11091 BLAKE2B 02e66e0142e1fe4a5bd262548ee01bc399328d3b3cfeaf81bf67ad76dd10405bac1013de66d648f0e3cf5aa09b46ec69989130b514ad9989c5962a06d465bc68 SHA512 1ec9fdc1c130274277da7dd689640c48b9f3e439bf948dada9d4b79d6f2dee74e22d53e2854c1a2bd223da4b81916f2217efb9dd788e344004d50a28ba9f2b7d
 EBUILD emacs-26.3-r7.ebuild 11779 BLAKE2B 69ef04e1707478913d6d574cc9569e1b7eece4152f68c70112e9caf1e192b6b2d5f74fff7e0e89f4d730429861c1b4e1d70a0c1e6b9cb42565fefe740085f8d3 SHA512 6757269a4fdd86292b107d138d8ac39f44f055858d017e988ce005dcb4985ed3b49ce58b61335aa61fb031865f8a15bd1cbb46c402ae5466529adcee6280b552
-EBUILD emacs-27.2-r5.ebuild 14466 BLAKE2B 1d561530cd52bec8ff1cb43390e0ee246a252f0776e13c726bcf3664f42f2a23cc29a2994eaa13a86bd5bd365e8457f185e5879188e36be5cddeb223548af32c SHA512 cb11f31b3e70c89147c3a0e043cdbc16808c70b505ff28eb50728d186a94db021bbf51dbb3dd7d3dd1aa2186b542db2e95b3be56325fa018b87cfddf838c2c31
+EBUILD emacs-27.2-r5.ebuild 14310 BLAKE2B 8875ffdd3002c88240d58891d67c840ea67bba108009e7fbf5963050a36b9e4f1cc4903e38c37a7456c3becf9a5c42c29bb910e8797940b9389b3fad8747948d SHA512 e47f5035c3d687b7a58ef3a05952ec301a00d17ae7633a9d5055c15f8fe9631d7d60927966eaf0b3e9fb1a3f0d892e3830269dc995efc2ff3400aad23815df1c
 EBUILD emacs-28.1.9999.ebuild 14795 BLAKE2B 8f6313b9dc044f3a275b948b2d198b281a4422e36c6aa787b494cc13194cc1b6c26d816a275843dfdc9bd45b540b8cfc0e67f62cc0f10f4cfc1cc23e2c3dff6d SHA512 ee41220d8407d12b77ee6bfea0bad06992d8573e9b1e91a8ca8cf7e9d066b3ed07d89a84cd6d4591fec63770c79892b8b2ae069d7471b8684765c8bc1d9d2c79
-EBUILD emacs-28.1.ebuild 14954 BLAKE2B 2e41f1659fc11bf58ef1af36e707ecf7dec8214db204aae7daf7558da1c8659a3702c1505d8381a06387844345eba9c7567b82b864cd6c27f7afce1744b9dbd1 SHA512 3637eebb94593365bf811efd36f61d61266c9363b4f80569b4ab8770453240ad709aed906a9bc02e7482b83f252591cf2083b9123184219080d24d5d63fe96c8
+EBUILD emacs-28.1.ebuild 14790 BLAKE2B 9555b8b3d692fd33b9575e5666a63345369070187799e1a33556565c15a4f1c07b91197223e9db311911ca9ee4e797e9840b525fe8a2e8a9255f153c1bb541a5 SHA512 22757ca82108d2a47ee187119e82460a33c1df1d7b6cfd543a7bedd87e22aaff63083b2dffe47bcbb795430fa40e0a43477d0ef415a0de6e8b6bc5aaae425670
 EBUILD emacs-29.0.9999.ebuild 16277 BLAKE2B d6d43701019061a4903c3d78187b3d25f306460a3bf9936b869843235e83dd46ad1423c74002318ddba40a7188ddc4a3460bc1d4a8f7ecaefd1f3068ff940261 SHA512 fc5098ac1e241fe6db6457a6fdf6f56d4f6e5e3608dfc81ff17abdf57ac640aa9ec15ec6066abba013ae75d56a7d9b4d53bd6cc5c9906d22a45d08d004c2a57a
 MISC metadata.xml 3130 BLAKE2B 162f49aa253a87b89e80dcbc961cacf659220c16c5b9d83e96b1eb90c40f828b87830173a80fb24cbfae50efb2ddfe51aed3e334c8c0f8e5cd30b63569e991cb SHA512 71a1b4b298ae915a33c7876a20892799c3c7b39f913b7b2606c18e6c14a4169b60f17c41742cdaab870cb60bceee14c0d10ea6f345739b1e9c3d07a14d9d60ee
diff --git a/app-editors/emacs/emacs-18.59-r14.ebuild b/app-editors/emacs/emacs-18.59-r14.ebuild
index 053a862305ea..1cbf3f94a44c 100644
--- a/app-editors/emacs/emacs-18.59-r14.ebuild
+++ b/app-editors/emacs/emacs-18.59-r14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ inherit toolchain-funcs flag-o-matic multilib
 DESCRIPTION="The extensible self-documenting text editor"
 HOMEPAGE="https://www.gnu.org/software/emacs/"
 SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${P}.tar.gz
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-13.tar.xz"
+	https://dev.gentoo.org/~ulm/emacs/${P}-patches-14.tar.xz"
 
 LICENSE="GPL-1+ GPL-2+ BSD HPND"
 SLOT="18"
@@ -76,11 +76,11 @@ src_configure() {
 		src/s-linux.h || die
 
 	# -O3 and -finline-functions cause segmentation faults at run time.
-	# -Wno-implicit will quieten GCC 5; feel free to submit a patch
-	# adding all those missing prototypes.
+	# -Wno-implicit and -Wno-return-type will quieten newer versions of GCC;
+	# feel free to submit a patch adding all those missing prototypes.
 	strip-flags
 	filter-flags -finline-functions -fpie
-	append-flags -Wno-implicit
+	append-flags -fno-strict-aliasing -Wno-implicit -Wno-return-type
 	append-ldflags $(test-flags -no-pie)	#639562
 	replace-flags -O[3-9] -O2
 }
diff --git a/app-editors/emacs/emacs-27.2-r5.ebuild b/app-editors/emacs/emacs-27.2-r5.ebuild
index 50165a4c30ce..18395bf3a2ec 100644
--- a/app-editors/emacs/emacs-27.2-r5.ebuild
+++ b/app-editors/emacs/emacs-27.2-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
+inherit elisp-common readme.gentoo-r1 toolchain-funcs #autotools
 
 if [[ ${PV##*.} = 9999 ]]; then
 	inherit git-r3
@@ -159,15 +159,6 @@ src_prepare() {
 }
 
 src_configure() {
-	strip-flags
-	filter-flags -pie					#526948
-
-	if use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
 	local myconf
 
 	if use alsa; then
diff --git a/app-editors/emacs/emacs-28.1.ebuild b/app-editors/emacs/emacs-28.1.ebuild
index d304d33f2d1f..69b2645dfb9b 100644
--- a/app-editors/emacs/emacs-28.1.ebuild
+++ b/app-editors/emacs/emacs-28.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs #autotools
+inherit elisp-common readme.gentoo-r1 toolchain-funcs #autotools
 
 if [[ ${PV##*.} = 9999 ]]; then
 	inherit git-r3
@@ -33,7 +33,7 @@ else
 	fi
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
@@ -169,15 +169,6 @@ src_prepare() {
 }
 
 src_configure() {
-	strip-flags
-	filter-flags -pie					#526948
-
-	if use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
 	local myconf
 
 	if use alsa; then
diff --git a/app-editors/featherpad/Manifest b/app-editors/featherpad/Manifest
index 4bb5d654d71d..36d9cc8f70c8 100644
--- a/app-editors/featherpad/Manifest
+++ b/app-editors/featherpad/Manifest
@@ -1,7 +1,9 @@
 DIST featherpad-1.0.0.tar.gz 1010200 BLAKE2B 22a11a0655ed57f7a7d53949e59c3b989a304b7c3db1f7308af0a52cc00a151cee505b02c19ece286da1be37e76c8874cee4102db3d881ef2c4ad48ecbb2f20a SHA512 9f7e24fa5e89e269693bc0a37f79d987e4914dde2d2b46bd0385886383dab8b35556fbc0f5c5b7b9a2c3a41694174ffa8532c48def87d2972fbc73c1e9c38bf3
 DIST featherpad-1.0.1.tar.gz 1014744 BLAKE2B 1525b0894e47facdc51da0c6417d69b12d630bb0e6e8d7b3916b0c4e82380243b1b4dd0ddf82f7954d83edcd7b30346cff0305d98296b4aeccc1fe3cab325cd7 SHA512 8d1a07f8f32f63ec77e6bff8a39badd1eef87b0675096f964ff2fa770dda7c79ec9a1f788cbfa77528163aeb6c6067ca74e009293eca2e718dce92a48aef5f98
 DIST featherpad-1.1.0.tar.gz 1061070 BLAKE2B 78c7ddf0b7961a300fe2e425876bfaf32a1186eb88c2619202cb2f07a780aed3c2f8d1ced0e963b1868c94e890d1d809baae534fe1f3d06b3f3036aeeccf7414 SHA512 c734619ea8eda2709ccfa4d1b3c2ac541f32d52f31f0896ddf3c1c5733f175da9d955458a62a34221400a73003970cf796f59cf574b499831267b6f4d1a28d21
+DIST featherpad-1.2.0.tar.gz 1091776 BLAKE2B f63ddcc8bf02b3f9ad5f6ad2b56b8f99cc8566f70351a293fbe339930b41542e9ba27888afabfcf98a04ec6a1087dd77aa35006ea33526e1a7d6c45f5fe3b7d9 SHA512 cf21ed9394444920fcf3a8ce3a8338814d69322389c4652e79f0754fe67ee61260f81604c91adf0a864fb1441307706c60ee1bd29efd2e617ab8e1f5fc254cdd
 EBUILD featherpad-1.0.0.ebuild 758 BLAKE2B 65419f5390e095a0e67ac4b60beb278fc5e390ab61c78bafd3a4c17c8eae139511d3203853aa5b054e8c71e1233d583cecf8a67250dea4ff635969f9ec6b4798 SHA512 ba15e7b6ea2b02da544bf346752f5d1bcbd3ec732b62abcd115079d329593d114a510fe401e2172ffefa299bd57ca5f78ed0f09592ab5a53908465e155eb51b6
 EBUILD featherpad-1.0.1.ebuild 758 BLAKE2B 65419f5390e095a0e67ac4b60beb278fc5e390ab61c78bafd3a4c17c8eae139511d3203853aa5b054e8c71e1233d583cecf8a67250dea4ff635969f9ec6b4798 SHA512 ba15e7b6ea2b02da544bf346752f5d1bcbd3ec732b62abcd115079d329593d114a510fe401e2172ffefa299bd57ca5f78ed0f09592ab5a53908465e155eb51b6
 EBUILD featherpad-1.1.0.ebuild 763 BLAKE2B 53acb0884d81da49e51ef6012e8e64e9f8ba009117b6ac83aeeac3a0c8ae4e421d0f2ca73faa86e8379f4c1471daeaca417c8f38ab1495732a1e6d22607c892b SHA512 407e8dc0667213f8c6bad387fb4b0102047ac39b05768fcfe8a7ee5c58aa2dfe5e7b74a064c3a1a2f27172a41f423367becaa8412435a44c39cb352903b72fd8
+EBUILD featherpad-1.2.0.ebuild 770 BLAKE2B c7f29009e12a6f7d6db402ebb44539048425333d52d7f2a06f60825d2abbe1d664036b44abeada9d8630de90754d05736a3e1e407bd4931fbb34ef7f7611b11a SHA512 5e2e341eff0a90ae49cf1638c862711a628ccb6e59776e954cc0ba8f80c53094e325d3b19e240dbc4c15f19b036f660faf2c4924de75a340569993dbada0eb16
 MISC metadata.xml 829 BLAKE2B d6d60de9902f49b8f04e15818d2da71a30e9b54fa6c73245eabf33bdfcbbb193f017e0b3967512578bd538c7ac718b26276442e411fe934a75873fef05fd3a67 SHA512 218c520af75da8a59b2b75cf2d4dbaa3f67c63620afe69221c854c2e5815518dc1514cffe54e57e4bca29529d99b95ca83a7879713552b9e0635aa27069f500e
diff --git a/app-editors/featherpad/featherpad-1.2.0.ebuild b/app-editors/featherpad/featherpad-1.2.0.ebuild
new file mode 100644
index 000000000000..e82070d4a429
--- /dev/null
+++ b/app-editors/featherpad/featherpad-1.2.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg cmake
+
+DESCRIPTION="Lightweight Qt5 Plain-Text Editor for Linux"
+HOMEPAGE="https://github.com/tsujan/FeatherPad"
+SRC_URI="https://github.com/tsujan/FeatherPad/archive/V${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/FeatherPad-${PV}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="+X"
+
+RDEPEND="app-text/hunspell:=
+	>=dev-qt/qtcore-5.15.0
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	X? (
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITHOUT_X11=$(usex !X)
+	)
+	cmake_src_configure
+}
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index bb7e5ea36a12..288844b01050 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,5 +1,5 @@
-DIST gedit-plugins-41.0.tar.xz 948364 BLAKE2B d5efe779e1f0f70e23a7dadb01b0e5b22c47d3326df6530559698ace274e2a4a3647d34640e89bb250d76bee1f6369d5728316730ce9cf89f3a7db627b3c4d49 SHA512 e0389e8be68406fdcd3c9537b2d2dad0faf19d9a49804a7b5d9cf8e1006254906605dd0b14e2fa1eb7a22d6533d9b55d7f5593fe01a5b412df6361c8b9089f34
 DIST gedit-plugins-42.0.tar.xz 949068 BLAKE2B d9076d7ef420177b5d859bdee651b4304da183430d651510ea4ab50bc7286d23f536c1be47e6a6f425bdf90dcb31f015fa315e9ed530d54eb235832d92c4f438 SHA512 b7b6b6c71538ca767e20e4bdde0a5530657bf3d444fee5e1b2918b768188f224acfd2a44c4b0b6203ee3bde9ec47d2bacb0e25426cf49e500120461d44ae6b9a
-EBUILD gedit-plugins-41.0.ebuild 2717 BLAKE2B 5ca39394512387999dc672d688372a43f29ba1ce410e8f0c7654a478780caa614a61fb949fff8293d3e58b5c022d8adbc405b7d481bb8924966a32ed4a274c8f SHA512 d79253703e9bfcb340937608c6382131a545735fcd4dbc6a9282a97c914f68a4b1de28c24c7da6a0397681ad04e5376fdbd7c1e974e8896097848b073d7e176b
-EBUILD gedit-plugins-42.0.ebuild 2728 BLAKE2B 7c6899d997fe6f337d97930ac5c696622cc58d6e458a039d8511516b741201476cdc9ab65f8daf6b3231cae7518ee0fad46f6b4b87cb0cabc09aa75d800e0dbf SHA512 704bbdd88b0bd4586ceec5fe28f592b11b2d0795fbc507194d5da6f21834485909e72c3547c07c8b2ce9c9da39267797265c7f129c3bd81e18cb54c857c24e06
+DIST gedit-plugins-42.1.tar.xz 946368 BLAKE2B 6ee8c42d5d5214cdb9095bce71623f9486c973ade69aad91eed4ae13a1ad5ab59bcc43d30078bdb9db46527160f8bc6b183a56c255d10f8027c4ff2e603fffa6 SHA512 2e36919f7b7232e4471e2c1277c33e2f79ff513b76574cf765e451064979587c170ae003c9517d33f3b9cfce916cb7f25f9e3d0a4f6a6b203086fcfff9f265aa
+EBUILD gedit-plugins-42.0.ebuild 2729 BLAKE2B 0c78a2720f64215aee779ffce2b87ec5f9fdc27ad376d729556c8520d1f2ef9f8ddb40b0253e2b1eb36ad86cdc5bff57be6f2c51ac5d38f4cd1f258c16c0bc27 SHA512 26ee76a158f1d42341d402c1bc77a147e6ad54a480f909af16fc3fcad900773405d12fe38be180e1869fad5f99c8e0b19ecf3d42d72eb1099c3969a0a82b663d
+EBUILD gedit-plugins-42.1.ebuild 2731 BLAKE2B e371cbcac77e43bd9b5430de78ed1691ada16fe393f865e39938337b501426d1eea91b382e06fd4b33b74cb7036aff6106a2b19e3c0089b7ab9a0c6f9cba9012 SHA512 b91092eec9cf47f8a9d7d0fc58bb66079b30d9eb5b1d6dff8b2e80006a6f4aacfa03a44efd0f64c84a6f94da5b6ab840e54d56d6d91b6fd3b4ded32d60cf90fd
 MISC metadata.xml 481 BLAKE2B 5fbf2df78aa40fce971741bb7d04de00cdc7a6371c2652ae0ae4bf253ee469c4bbb5e5a7c2b88226f95bb8865930dd19e9adedb191fd5a173ce915890ce40b32 SHA512 3b4b858659d1597e6c1ee574143de4864be8b75d4a6399d47bff85c4b18ec35472523bfeaa0815189a9008764405ee3b2fa53e73fcdc3edc8eda00a5f943f762
diff --git a/app-editors/gedit-plugins/gedit-plugins-42.0.ebuild b/app-editors/gedit-plugins/gedit-plugins-42.0.ebuild
index 092e6a590b14..e908fd082b71 100644
--- a/app-editors/gedit-plugins/gedit-plugins-42.0.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-42.0.ebuild
@@ -9,10 +9,10 @@ VALA_MIN_API_VERSION="0.28"
 inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
 
 DESCRIPTION="Collection of extra plugins for the gedit Text Editor"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ThirdPartyPlugins"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 SLOT="0"
 
 IUSE="charmap git +python terminal vala"
diff --git a/app-editors/gedit-plugins/gedit-plugins-41.0.ebuild b/app-editors/gedit-plugins/gedit-plugins-42.1.ebuild
index d056232a64b2..1bb2deb8b219 100644
--- a/app-editors/gedit-plugins/gedit-plugins-41.0.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-42.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="xml"
 VALA_MIN_API_VERSION="0.28"
@@ -9,10 +9,10 @@ VALA_MIN_API_VERSION="0.28"
 inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
 
 DESCRIPTION="Collection of extra plugins for the gedit Text Editor"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ThirdPartyPlugins"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 SLOT="0"
 
 IUSE="charmap git +python terminal vala"
@@ -63,8 +63,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
+	default
+	use vala && vala_setup
+	xdg_environment_reset
 }
 
 src_configure() {
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index e91537debc26..8e89a180180e 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,5 +1,5 @@
-DIST gedit-41.0.tar.xz 6889320 BLAKE2B c4d2b923eab18cd27ffc0ff99882953e952c0956135fa7f6401ef01dd5cd0e1cf9a5a86c5751db9206fd88200c70434710881cd5b934a3620f14130a5066f18f SHA512 97c51ef24e53d6bd4b29350a8749eacbfcfb90b7c66c9f6d462101c53966282452f6a02043628e157e8179cf6260f103b41c61d7ba2a31da08b0687f8031974e
 DIST gedit-42.0.tar.xz 6923352 BLAKE2B 751c4cae8ad0c146f2607f259ab72f4723c433934f75356bf71e44daadc82d4403e19228b52ec2f98c3fa7bc61274a6ed648ef8af143adb7c89213d39db64473 SHA512 d0f3c05e0a6f96634cc2deb24d95d906e5bb9d380b248a810560b60ac8590831fb25672a41e143fe7bba3882a08ec7ec85208f896751a7b66cabe4ade00cdaca
-EBUILD gedit-41.0.ebuild 1885 BLAKE2B b0595f782edd0b276965eb4c42d3a73562e12bdbb83775b174f6e26f8befa22238a1e020dc0da55ce5f8fe09f18adda5c42e15d70098a541f82e3af8c105fbc1 SHA512 431b90921835a15040037a89cc9b95d9c9b393bb471fcbf36155e5ef3fd5a51fd18bc28abba269b8e57c54b0ff77797ea2a13af70b5277736909e404b8343daa
-EBUILD gedit-42.0.ebuild 1934 BLAKE2B 493674d1c02662948f2b0e1ac1360b198857dd0f2834df9e72bba05df9f6d4281d563d8e214fc784c5836f517fe704bb028c9b0057eb48436bfc7d8b331593db SHA512 1c34f3f2f749644be8e2e262efb00e1f616ee770a6ecd0559f52144418fd1582cf4754fed9148e3444fc622ce3636f6594251f66c4930e41869b9a48d8ce2ae7
+DIST gedit-42.1.tar.xz 6916780 BLAKE2B a4350a62811ee689f9a7f70a4b166aa82185a17ab6c6f0f6264404756a2e7f2b93e81b2cf88beaf4141527720437f9e6ee9f7584e65e63fe242975e346d26586 SHA512 b7b1dd4ab31412a2bdeb6298065d1e3f52a9c813e26e943aea606b30e3de9b7690cc8ba478e2d0e49fb51bed57dd3f7c441184964270629d51dc1f6d132045a6
+EBUILD gedit-42.0.ebuild 1931 BLAKE2B 3d9a00b326c1c696cd224f4a9a22d328ddb04b2cf29ee3f881396fa412fcf262e8517de984f33ac22052a37bf636fb476ea5dc02b768445a6174ab7e4135f3f8 SHA512 fe4e7e13da0fbe5209794a8d209555b9423b7b6c37a118a8a9ae825cf29b175f6ef6d10da8c65ade5f22bd56f7a7cf63af5f002d8f34524dd1929b5d49e734ef
+EBUILD gedit-42.1.ebuild 1939 BLAKE2B 51245ba03c4ba43baaf8a15f0b7e4fe5a87236ffe0ff4b7b4fb9f5baa50e4743572c03ef5d148319bcd514cb15e02a132e26aa2386ff7380c867e8228bf638a3 SHA512 8441cf0605a1e4df336a31f26ba0a10d8775c14b4871e1a878c5f60bd44cb1e1bcac5ca3c4b4178106b8fcee671fe8043aab869d6210be6df430ac8dd3f88e92
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-editors/gedit/gedit-42.0.ebuild b/app-editors/gedit/gedit-42.0.ebuild
index 6028c770e278..846500147d20 100644
--- a/app-editors/gedit/gedit-42.0.ebuild
+++ b/app-editors/gedit/gedit-42.0.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 IUSE="+python gtk-doc spell"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.64:2
diff --git a/app-editors/gedit/gedit-41.0.ebuild b/app-editors/gedit/gedit-42.1.ebuild
index 7db98cfaddf2..5d3830ed2ae1 100644
--- a/app-editors/gedit/gedit-41.0.ebuild
+++ b/app-editors/gedit/gedit-42.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 PYTHON_COMPAT=( python3_{8..10} )
 VALA_MIN_API_VERSION="0.26"
 VALA_USE_DEPEND="vapigen"
@@ -9,7 +9,7 @@ VALA_USE_DEPEND="vapigen"
 inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
 
 DESCRIPTION="A text editor for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gedit https://gitlab.gnome.org/GNOME/gedit"
 
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
@@ -17,12 +17,12 @@ SLOT="0"
 IUSE="+python gtk-doc spell"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 DEPEND="
 	>=dev-libs/glib-2.64:2
 	>=x11-libs/gtk+-3.22.0:3[introspection]
-	>=x11-libs/gtksourceview-4.0.2:4[introspection]
+	>=x11-libs/gtksourceview-4.0.2:4[introspection,vala]
 	>=dev-libs/libpeas-1.14.1[gtk]
 	>=dev-libs/libxml2-2.5.0:2
 	>=dev-libs/gobject-introspection-1.54:=
@@ -57,8 +57,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
+	default
+	vala_setup
+	xdg_environment_reset
 }
 
 src_configure() {
diff --git a/app-editors/ghex/Manifest b/app-editors/ghex/Manifest
index 486b00a37bb7..b5161a4ab38a 100644
--- a/app-editors/ghex/Manifest
+++ b/app-editors/ghex/Manifest
@@ -1,10 +1,6 @@
-DIST ghex-3.41.1.tar.xz 1499804 BLAKE2B dd75dc1cc5d847ae3b932ed0bb98b8e15f44943f76f0ba9f053c6770d05e31d211c9f75a910c93c09cf2de143db8fa0eda4fdb876a0ea3ed0534650e7ac36a65 SHA512 5eccf81c41f5ae56bfe5eab0fb843db0095c75080e7dfc0b19a4c71f40f89931e1cbcd2c58744a6b249d16e2a2e4f96513aaac4c41f46d3b5ae8b2bc851851a0
-DIST ghex-42.0.tar.xz 1007772 BLAKE2B db85755e22470f345fcd926e26addcb3ea71c90bc0d71fb5f02ad71e875b3b0100856e4365f950a4040f266c1826be992e6a7a23e32ddebbf9ccdfce88e45f46 SHA512 20eb8b876e65e3a63b2bf5bcb7258f4c196380395805e7aa374a4dba79e8e0356507b7dad660cdfd49490cb9832863e84dfcfa74dd680f05d34742a3c23f6108
-DIST ghex-42.1.tar.xz 1002984 BLAKE2B c526536c9e2a1b115a2af591ebf4a044950411ec6000c3d5a6e662813219d060ac0a0bd34549c76c9663c82c9ae3777b99e92e810de07e71905c524c37a76355 SHA512 7dc6ef8fc84b53e82367794ad4684232bb492fd8ae9320db499fb5d2ff5e15f23ae5e4839b91c0828ea74ec81d7bdc30383f3087e3165bc67761eaafa03efd61
 DIST ghex-42.2.tar.xz 1003120 BLAKE2B db44dbb7c2cb7447dea3dd48a1ad90ee75c6ce5b9c76178550be1f638f63a9748144e8aac7434d526c24c3eddd0c6f7c0178c6976d2a11e32e943127b7f09219 SHA512 d7c64013d894d1803e03b1afc025a3f39fa65d156aaf7885e692b2b10574f320fb329abd8059a9c084c701a655d7708b8f0dec09f8300c8491fc75a66b475bf7
-EBUILD ghex-3.41.1.ebuild 688 BLAKE2B eb2299b663b824da78475537d939b41f2d3be2f1f0c8d2f28852dc613d78b60221500ec592c0a93af2b0f865f9dd593a21e6f2d149077244695f13de0b68d996 SHA512 30750b262e0282ddc7e44b5f893e9dd4cbddf99acb2923d7c409884775a928b9d3ce1f7427d5060a66e62997989c4cee9b997e44c846430b02ff9b6e695bccfe
-EBUILD ghex-42.0-r1.ebuild 1133 BLAKE2B 292942cc63824ecc03559a0fa8cf8151fa28996cf9ee167fe76df7d8a65209917b93ab23d99e0232de494140448d0e5db59f3ebda252e9efddd8ff547fde5173 SHA512 3b18ffc6c3ac5ea2db326e140bba172ca95809a4412f508e56a39f4e2d30315331cc31c205f137d414a3900e56ff88c971d12ec85f318804ef470454cc66f1df
-EBUILD ghex-42.1.ebuild 1133 BLAKE2B 292942cc63824ecc03559a0fa8cf8151fa28996cf9ee167fe76df7d8a65209917b93ab23d99e0232de494140448d0e5db59f3ebda252e9efddd8ff547fde5173 SHA512 3b18ffc6c3ac5ea2db326e140bba172ca95809a4412f508e56a39f4e2d30315331cc31c205f137d414a3900e56ff88c971d12ec85f318804ef470454cc66f1df
-EBUILD ghex-42.2.ebuild 1145 BLAKE2B 099778e4549aaa45647450e023553a1d81e0136aaaaf15102f994b8bf175f90b32810d7fde0ac19207d5eac0f1562a859a3d059e638bf6bbaa3538dee4d070ed SHA512 9a479828bf3fe8588c2cd90bb235338d286cd5f4a2cb5e4a6d05a2119b8c0d8622e8a483a2deabea8f5b2ca929bd0b49c3aadff0953ce3378012547b89862729
+DIST ghex-42.3.tar.xz 1003928 BLAKE2B 26bb123fc5a56fc2ff891a057ac276a36bc500a2e23f29bd26a85d6888035e2b8af7aed7f7b679a898c0a98bf042bb4e05c66e55a8fac0eb63422ee03823dc74 SHA512 9eff44892d203a2a9aab7239d85f61a860458fd7a8b4d7410f94d4f596ca5e2ff269faa81e620e7fc08bebe40c819a4c0cafefb5278121a9f2c8885bfd17c59f
+EBUILD ghex-42.2.ebuild 1141 BLAKE2B 4115c3ce3a4d786dbc56b9d25f529306c6d9e1495dd8d8fa5544c494b2ef5c83c24935ec1de544bc0937320f80470eeb02624a7a091dc09c811ad39fdae8ed30 SHA512 ddcd5e958f36b07a77a08a57a0f63be8755047427881b1e306c28a7b2a0e92bc36cf31a32e9b88d0f070b13034f93e9e6042545fbd9d7b089a09fa3026da5ea4
+EBUILD ghex-42.3.ebuild 1145 BLAKE2B 099778e4549aaa45647450e023553a1d81e0136aaaaf15102f994b8bf175f90b32810d7fde0ac19207d5eac0f1562a859a3d059e638bf6bbaa3538dee4d070ed SHA512 9a479828bf3fe8588c2cd90bb235338d286cd5f4a2cb5e4a6d05a2119b8c0d8622e8a483a2deabea8f5b2ca929bd0b49c3aadff0953ce3378012547b89862729
 EBUILD ghex-9999.ebuild 1133 BLAKE2B 292942cc63824ecc03559a0fa8cf8151fa28996cf9ee167fe76df7d8a65209917b93ab23d99e0232de494140448d0e5db59f3ebda252e9efddd8ff547fde5173 SHA512 3b18ffc6c3ac5ea2db326e140bba172ca95809a4412f508e56a39f4e2d30315331cc31c205f137d414a3900e56ff88c971d12ec85f318804ef470454cc66f1df
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-editors/ghex/ghex-3.41.1.ebuild b/app-editors/ghex/ghex-3.41.1.ebuild
deleted file mode 100644
index 399cf0f42e07..000000000000
--- a/app-editors/ghex/ghex-3.41.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="GNOME hexadecimal editor"
-HOMEPAGE="https://wiki.gnome.org/Apps/Ghex"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="2"
-KEYWORDS="amd64 ~arm ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-libs/atk-1.0.0
-	>=dev-libs/glib-2.31.10:2
-	>=x11-libs/gtk+-3.3.8:3
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-editors/ghex/ghex-42.0-r1.ebuild b/app-editors/ghex/ghex-42.0-r1.ebuild
deleted file mode 100644
index b9a8b8490096..000000000000
--- a/app-editors/ghex/ghex-42.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="GNOME hexadecimal editor"
-HOMEPAGE="https://wiki.gnome.org/Apps/Ghex"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/ghex.git"
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2+ FDL-1.1+"
-IUSE="gtk-doc test"
-RESTRICT="!test? ( test )"
-SLOT="4"
-
-RDEPEND="
-	>=dev-libs/glib-2.66.0:2
-	>=gui-libs/gtk-4.0.0:4
-	dev-libs/gobject-introspection
-	!app-editors/ghex:2
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gtk-doc? ( dev-util/gi-docgen )
-	test? (
-		dev-util/desktop-file-utils
-		dev-libs/appstream-glib
-	)
-	dev-util/gtk-update-icon-cache
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}"/usr/share/gtk-doc/
-		-Dintrospection=enabled
-		$(meson_use gtk-doc gtk_doc)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-editors/ghex/ghex-42.2.ebuild b/app-editors/ghex/ghex-42.2.ebuild
index 60b2aa480d88..af0a9aa90029 100644
--- a/app-editors/ghex/ghex-42.2.ebuild
+++ b/app-editors/ghex/ghex-42.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/ghex.git"
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2+ FDL-1.1+"
diff --git a/app-editors/ghex/ghex-42.1.ebuild b/app-editors/ghex/ghex-42.3.ebuild
index b9a8b8490096..60b2aa480d88 100644
--- a/app-editors/ghex/ghex-42.1.ebuild
+++ b/app-editors/ghex/ghex-42.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/ghex.git"
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2+ FDL-1.1+"
diff --git a/app-editors/ghostwriter/Manifest b/app-editors/ghostwriter/Manifest
index 4c64019c0c8e..60c4a84b3e4d 100644
--- a/app-editors/ghostwriter/Manifest
+++ b/app-editors/ghostwriter/Manifest
@@ -1,9 +1,5 @@
-AUX ghostwriter-1.8.1-appdata-path.patch 811 BLAKE2B d3feb82a74d27484c56e5f05818f8f78914cd269700457deef69854fe8158d1e4068393c7b57114093450f7b347d26e4b143fc426bf5b66e0997f5ee94382276 SHA512 8e015c55dd1905dabb7ddcb06cb8a05e93bf8bdeedfb2002f2568232382871e65251ebfeda632e614e9a090372dde10fb468002459d50641847d4f97c9b789de
-AUX ghostwriter-1.8.1-qt-5.15.patch 550 BLAKE2B 2c0d60746273f851f94677c0f0dd8b14f4bc4ab24d59605855cd5ad8570b30b8d4bf92a2bcfe32825a19b1c2b39fee4bf783affc75bc6ecf0c516cc95a731ebd SHA512 2bc77bd62a9d6adbd5eb1cfd40b1893fc2b6f2c321db228e0b22f4cf85a3c09634c3b5fa15c7a9fd25fd7071012efe636f69065776abc51c9ed920920f2feaed
-DIST ghostwriter-1.8.1.tar.gz 1220000 BLAKE2B 3fa3d95ed819bc8f7b76b396e6634658a8bda23e9100cbb298d301fc382db451430a4a31fbd092326af198825c83d2c998172c90a7e318aeb57ef7799751995a SHA512 9f60f81a594cf161edfeac8c75830e186ab4ec2c22859b2bad40768e1ecf64e6842b52a69024a1f014d24a2f1cbb38e15a7799101d7fd54ef7709e245f6ac521
 DIST ghostwriter-2.0.2.tar.gz 7802654 BLAKE2B a52a96ba6aecb8c6b8ff565bd9b3b7622d15ae68af5e393da4f1e1c8dae70a8053228e302e87e2530c907be825df5e7eebc7de14bb23e0e46f4b4308b9ae6e63 SHA512 1e51b86b8afae41c47e5e7ec96752d356dd9dca8a44d1aab6a541e1ce188cb40add52f96a52da7a689df47a2e7a9a1dc7211f480c3456f4a11c81f80e2779a7e
-DIST ghostwriter-2.1.2.tar.gz 7722873 BLAKE2B 62144986e5524fdb8eb774e80349b1814adefb69c79affb8f7dd3239c0850215864e16cc80998258b09b18f0f03ace817fbd35534205145de49ce18fd54fc38f SHA512 7ae715bd2f1313953629bcebd2aa2f36b7185e1cd3d5e90c69f7f30345a81974506f3035b1449b3ef9b6027cab029c43644b0167b5dfbf8353623ae7b6441407
-EBUILD ghostwriter-1.8.1.ebuild 1216 BLAKE2B d43b703b8af7c0a62e747e0796dc9303ec2f1ea96278c047177328354ea18fe892e3a577f44e6191ba65720eb66901e4889bb6f19346b236e86a42ec99d7f5e4 SHA512 24748a5f81ef965b3b95355e6a75294956f6ecac4bbadc6ad302bd9b94221f13c6266a0254afb2fb340251588a194200576061a5ec40925ce5a43c6ee68763fa
+DIST ghostwriter-2.1.3.tar.gz 7725244 BLAKE2B 06e868bdc599cfb1fd9b7ab18b571ba4c401a401efa1189cacf8faec076041d579e1894b93bf1a7bf0bf9b823d40fb498b535dc0be4e0d5c4b24a578db7bf5df SHA512 ce7192caa0100d7264856193bd1fb765b8f4307146f7b3828875f4316a9bcc7d61b94768a01beacfab23631ba24b385aab1be5b72d309153ceba92c84081be30
 EBUILD ghostwriter-2.0.2.ebuild 1125 BLAKE2B baa0bb57907e8eedff6c2bdea151181ffeaf0a7ad923bb30f6cd671a2e9bea2d0361af3a0678d197325c60f7a8660443e379c74b77fcf30043316adb92075bcf SHA512 86c1c610cc58b226218f3665ac0bca122e3e41051659808a3154ec60b493e3d2dcc010a8a243058f547bedddbf5bebb2b997d975e1bea5bc98104c38a2a33bf7
-EBUILD ghostwriter-2.1.2.ebuild 875 BLAKE2B a1c8f1bdddd51f7bbfc2e42e0ca16df365e3a8faa8a1c53bc4925e80bf8c45cd43b4f9d444890b09ea041e6fd26640612557724df1b958a4bd7af0b9f758af72 SHA512 65754af8280fb663605e67cfe3b82f5e2e869e155dc5ca04c6be61d5d3d0ebb14257ec3da6df791b567194a8f6c0567dd5368484cb059762212d30f11c0307b9
+EBUILD ghostwriter-2.1.3.ebuild 875 BLAKE2B a1c8f1bdddd51f7bbfc2e42e0ca16df365e3a8faa8a1c53bc4925e80bf8c45cd43b4f9d444890b09ea041e6fd26640612557724df1b958a4bd7af0b9f758af72 SHA512 65754af8280fb663605e67cfe3b82f5e2e869e155dc5ca04c6be61d5d3d0ebb14257ec3da6df791b567194a8f6c0567dd5368484cb059762212d30f11c0307b9
 MISC metadata.xml 608 BLAKE2B 9ed4995ed4884fb0bed607208afdd5122bd86f08aa1c5a94f3dad2f7c111e54e94413f1f1a298aa974f6626026e8cfb42789b4f0992690ee769ecce8630f6e72 SHA512 082f086394ef9a7a37162852090ff0e022f87bcbd18991a2ba6fb862d8690a23fc5d1a2cee090a1401a530bd3580fdc126a04c61ed7e627f6d558f8e6a1f49d6
diff --git a/app-editors/ghostwriter/files/ghostwriter-1.8.1-appdata-path.patch b/app-editors/ghostwriter/files/ghostwriter-1.8.1-appdata-path.patch
deleted file mode 100644
index 514ab6262e5a..000000000000
--- a/app-editors/ghostwriter/files/ghostwriter-1.8.1-appdata-path.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5e63fa9cb6d4020413db071ed68aa85f3e79fd9e Mon Sep 17 00:00:00 2001
-From: David Roman <davidroman96@gmail.com>
-Date: Mon, 9 Mar 2020 21:42:58 +0100
-Subject: [PATCH] update appdata path
-
-The previous location is deprecated
-see https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
----
- ghostwriter.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ghostwriter.pro b/ghostwriter.pro
-index d399fb5..7f5f22c 100644
---- a/ghostwriter.pro
-+++ b/ghostwriter.pro
-@@ -264,7 +264,7 @@ macx {
-     desktop.path = $$DATADIR/applications/
- 
-     appdata.files = resources/linux/ghostwriter.appdata.xml
--    appdata.path = $$DATADIR/appdata/
-+    appdata.path = $$DATADIR/metainfo/
- 
-     man.files = resources/linux/ghostwriter.1
-     man.path = $$PREFIX/share/man/man1
--- 
-2.25.1
-
diff --git a/app-editors/ghostwriter/files/ghostwriter-1.8.1-qt-5.15.patch b/app-editors/ghostwriter/files/ghostwriter-1.8.1-qt-5.15.patch
deleted file mode 100644
index 0f7425ff35e7..000000000000
--- a/app-editors/ghostwriter/files/ghostwriter-1.8.1-qt-5.15.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From f8f4ec0a1b53d1f3e670817f051c59444851cf7f Mon Sep 17 00:00:00 2001
-From: Jakob Gahde <j5lx@fmail.co.uk>
-Date: Tue, 9 Jun 2020 10:30:44 +0200
-Subject: [PATCH] Fix build error with Qt 5.15
-
----
- src/MarkdownEditor.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/MarkdownEditor.cpp b/src/MarkdownEditor.cpp
-index c5e46d5..c103173 100644
---- a/src/MarkdownEditor.cpp
-+++ b/src/MarkdownEditor.cpp
-@@ -30,6 +30,7 @@
- #include <QUrl>
- #include <QPixmap>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QFileInfo>
- #include <QDir>
- 
diff --git a/app-editors/ghostwriter/ghostwriter-1.8.1.ebuild b/app-editors/ghostwriter/ghostwriter-1.8.1.ebuild
deleted file mode 100644
index eb51f8371cc7..000000000000
--- a/app-editors/ghostwriter/ghostwriter-1.8.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="Cross-platform, aesthetic, distraction-free markdown editor"
-HOMEPAGE="https://wereturtle.github.io/ghostwriter/"
-SRC_URI="https://github.com/wereturtle/ghostwriter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-BDEPEND="dev-qt/linguist-tools:5"
-
-RDEPEND="
-	app-text/hunspell:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebchannel:5
-	dev-qt/qtwebengine:5[widgets]
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CREDITS.md README.md )
-
-PATCHES=(
-	"${FILESDIR}/${P}-appdata-path.patch"
-	"${FILESDIR}/${P}-qt-5.15.patch" # git master
-)
-
-src_prepare() {
-	default
-
-	sed -i -e "/^VERSION =/s/\$.*/${PV}/" ghostwriter.pro || die "failed to override version"
-}
-
-src_configure() {
-	eqmake5 \
-		CONFIG+=$(usex debug debug release) \
-		PREFIX="${EPREFIX}"/usr
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-editors/ghostwriter/ghostwriter-2.1.2.ebuild b/app-editors/ghostwriter/ghostwriter-2.1.3.ebuild
index 5c1c71d26b2e..5c1c71d26b2e 100644
--- a/app-editors/ghostwriter/ghostwriter-2.1.2.ebuild
+++ b/app-editors/ghostwriter/ghostwriter-2.1.3.ebuild
diff --git a/app-editors/gnome-text-editor/Manifest b/app-editors/gnome-text-editor/Manifest
index 9e0ee8bb095f..edc2ede6155b 100644
--- a/app-editors/gnome-text-editor/Manifest
+++ b/app-editors/gnome-text-editor/Manifest
@@ -1,6 +1,5 @@
-AUX 42.0-appdata-fix-appstream-validation.patch 712 BLAKE2B d8d19718488343f41c0144a293ff094cb498a44beb57c487601891eb79338fbcaf2991f9fecd75ebe586dcd0fa504a9780e64c1e50afd0352b5c7fb9233b87ad SHA512 6c88ab7162e8e3ae1068da2b9eeb2ada66915edfd153d5911945c88eaee05124893ccc7a7b9447b62d4867d941bd1bc707453da350bfc4f76af7e379f442900c
-DIST gnome-text-editor-42.0.tar.xz 1126224 BLAKE2B 7e02cea493696630284d7994f1d227a5589ad7aa7d7b98e5f67655ebcd69f7e2ded1195368e666ad26621b6b32168c7defde1cd3c2e278ca8741bf572979154e SHA512 4462ef0e0113863e752ce2c4d499386cbf9d72c67126fb60512eea39bd53bed6d56b2a62511e9af62024f9704ba722411ebbd5040aabcefce0b460925b91ad1f
 DIST gnome-text-editor-42.1.tar.xz 1131572 BLAKE2B 8d1b59131d8230af0dc9e3029798f1200b6a00f8991e912c34ce4808ca5517e14763825aa8ed7aecdac88e422e9d224d3c027282f6373c023c4ffe9f3e4896b6 SHA512 4616750d15d61b2bd2c708e414b564d0aa6c1202c765fbb895e60cdb46f8335fbefa70a24e8d99f208b186f2c8c244b752475cefdbe0184a67b60de116d5ac2f
-EBUILD gnome-text-editor-42.0.ebuild 1108 BLAKE2B a27db557a0419cb0ce7797b14e6552f19c4aa98cdd4ade357e9e12d7c3e92b0a1470d20d0f2c1101abb1e3c61bcc24dd741f17fed3aac9a5a58d031b36da61ac SHA512 154f0fc1bd5fe9eb64388b458a6a60d7d97e3c90b9a8805a817cdd4e29d677ffb66fdb710946b74754604aa445b174aeecfe3ad2e800aa62f49095a17819ea24
-EBUILD gnome-text-editor-42.1.ebuild 1035 BLAKE2B 9acfd1099bdcf2f61b276d6022449e7b48aed1649395ddb40afbf23660b853023f7eb3f4b4361dfbe85e2f6055e88220d61e1556403959f18eeddc16c19bdd38 SHA512 372fccc9cd4c7ae22081b4ea1f7a09e999f364844951c5e555df05268661001d16ce9f19e10a30058e2c941d33410e7d544b62ecf1c16f13a3c382019fc12380
+DIST gnome-text-editor-42.2.tar.xz 1168504 BLAKE2B 0bbd02fab92c3ac2df2a38352561dda27662b4ede30d9cfd05b54d58c4dc4824375ee427e764415dc450a2f8dd793ba539e5681df984a20b1d121bd97a3f3008 SHA512 4373b048118c7a4253fe99a6ec6091c054154399d34e5a33f933d535f0e6c659023603e08e1cbcddb972d6385632b2b9351455eaa1398dcd7c50b3b4562400ae
+EBUILD gnome-text-editor-42.1.ebuild 1034 BLAKE2B 529a22dedf22189af0f29a43f858cf45a85407ebe0a2e3381d0822c482c3106ed306f9d566615fce747114f002d1b7ef723a22e3858a5cb8fb26b9dd21e47447 SHA512 a42fe9bc4648c8f32beb360c20531ca0df19055231467214280b50390cb22463f4b2683d12d67a22400544753fa801840ac38c45a732914ac5c845d8b60384a8
+EBUILD gnome-text-editor-42.2.ebuild 1035 BLAKE2B 9acfd1099bdcf2f61b276d6022449e7b48aed1649395ddb40afbf23660b853023f7eb3f4b4361dfbe85e2f6055e88220d61e1556403959f18eeddc16c19bdd38 SHA512 372fccc9cd4c7ae22081b4ea1f7a09e999f364844951c5e555df05268661001d16ce9f19e10a30058e2c941d33410e7d544b62ecf1c16f13a3c382019fc12380
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-editors/gnome-text-editor/files/42.0-appdata-fix-appstream-validation.patch b/app-editors/gnome-text-editor/files/42.0-appdata-fix-appstream-validation.patch
deleted file mode 100644
index d53b8d481ba3..000000000000
--- a/app-editors/gnome-text-editor/files/42.0-appdata-fix-appstream-validation.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 985c8dd411a27ad067fe9ac8951d644bad57324a Mon Sep 17 00:00:00 2001
-From: Christian Hergert <chergert@redhat.com>
-Date: Fri, 18 Mar 2022 22:35:37 -0700
-Subject: [PATCH] appdata: fix appstream validation
-
-Fixes #329
----
- data/org.gnome.TextEditor.appdata.xml.in.in | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/data/org.gnome.TextEditor.appdata.xml.in.in b/data/org.gnome.TextEditor.appdata.xml.in.in
-index f4e751f..3a39a8d 100644
---- a/data/org.gnome.TextEditor.appdata.xml.in.in
-+++ b/data/org.gnome.TextEditor.appdata.xml.in.in
-@@ -45,7 +45,6 @@
- 
-   <releases>
-     <release version="42.0" date="2022-03-18"/>
--    <release version="42.rc1" date="2022-03-07"/>
-   </releases>
- 
-   <kudos>
--- 
-2.34.1
-
diff --git a/app-editors/gnome-text-editor/gnome-text-editor-42.1.ebuild b/app-editors/gnome-text-editor/gnome-text-editor-42.1.ebuild
index 979bb30ca006..7b3a567e5004 100644
--- a/app-editors/gnome-text-editor/gnome-text-editor-42.1.ebuild
+++ b/app-editors/gnome-text-editor/gnome-text-editor-42.1.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 
 IUSE="spell"
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="
 	>=dev-libs/glib-2.69:2
diff --git a/app-editors/gnome-text-editor/gnome-text-editor-42.0.ebuild b/app-editors/gnome-text-editor/gnome-text-editor-42.2.ebuild
index c48b7bacaddd..979bb30ca006 100644
--- a/app-editors/gnome-text-editor/gnome-text-editor-42.0.ebuild
+++ b/app-editors/gnome-text-editor/gnome-text-editor-42.2.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~amd64"
 DEPEND="
 	>=dev-libs/glib-2.69:2
 	>=gui-libs/gtk-4.6:4
-	>=gui-libs/gtksourceview-5.3.1:5
+	>=gui-libs/gtksourceview-5.4.1:5
 	gui-libs/libadwaita:1
 	dev-libs/libpcre
 	spell? (
@@ -38,10 +38,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PV}-appdata-fix-appstream-validation.patch
-)
-
 src_configure() {
 	local emesonargs=(
 		$(meson_feature spell enchant)
diff --git a/app-editors/gummi/Manifest b/app-editors/gummi/Manifest
index 384f6b0b2b05..1dad4a99cfb7 100644
--- a/app-editors/gummi/Manifest
+++ b/app-editors/gummi/Manifest
@@ -1,3 +1,5 @@
 DIST gummi-0.8.2.tar.gz 595733 BLAKE2B 9c7366df2b8fe40f7876f065a1156eb4992048b3eaec5dde332c50ccb98ef2a5d8d2cbe73ebb56eb3736bbce49f3168f165db82f562ee7265ce0859952801a2c SHA512 3882f1e2779b94348cc0cc243c3968a78165c16de41029f9fcb8ba2fa942d329c43f5ecc8ba8327590e14343556ca472a51d1e824ce0985a415ab92aa2cbbc42
+DIST gummi-0.8.3.tar.gz 590485 BLAKE2B d919544eca87e22da49afc879933b5b54b23ed0a21303c95deb405c5ecdec57981d19f526e7cef27f904a6cc1fb5e1bea7af1131578b0f4275460035a5d9167f SHA512 c8c7b5427ed37a995bc8c6f814a5af2926595acfe4dea649e02af424291b8dff0d7264f1e68c7a86b457a9710ad6b18fed2238f1adeec91360921a242a7cb980
 EBUILD gummi-0.8.2.ebuild 940 BLAKE2B 10274733b4460d5c800aa046b08d64a598c6522c66d4be667daec174415ca6e3fee75d27ee42a8b09111f0bca312cc5a5224f0a48f35851ccb0a3823bd04cf8e SHA512 be92f379568a87311fb467d73dd0b7974dbb4fa9c346245f9d2472f5551988f75c2269f7972b7cdd78812faef4e285b9dbe644e6cf6930adde390f0d77a6a54c
+EBUILD gummi-0.8.3.ebuild 942 BLAKE2B b39de23b7a464f1806667d8b62d1c9aee09e3df84c9efa5eb58a8ff7e51af6161cb51e504c3dd3aeca24f647f52211231ebf1faf9e14050a51b5e51617538281 SHA512 549f44f7f6c942b17724eea8398bfbb4782eea6c360f942f83b882089b1565da76e5927832a07c5ccb416fbc7f631ce50394b8bf8b2333c413d1f3c8b403ced5
 MISC metadata.xml 616 BLAKE2B 6a28c7bb204b0545080adaadc1eeff936a25e4ea0c66b6b869a8ee5b3aa21fd212fe22addfeb6e7c6ec22afece7e831cda4afa1ac0369cbb392738d471050398 SHA512 d2233d0cd21cdcfe87c20db06fe5e9c2a430c57d4fe644ab80f3eb3f434e614d2a7aa006db80d7c3d7c84b93ce8abf7a1b7124c23feee056aa52e42205c86485
diff --git a/app-editors/gummi/gummi-0.8.3.ebuild b/app-editors/gummi/gummi-0.8.3.ebuild
new file mode 100644
index 000000000000..71b4d8dc5e59
--- /dev/null
+++ b/app-editors/gummi/gummi-0.8.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="Simple LaTeX editor for GTK+ users"
+HOMEPAGE="https://github.com/alexandervdm/gummi"
+SRC_URI="https://github.com/alexandervdm/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	app-text/gtkspell:3
+	app-text/poppler[cairo]
+	dev-libs/glib:2
+	dev-texlive/texlive-latex
+	dev-texlive/texlive-latexextra
+	x11-libs/gtk+:3
+	x11-libs/gtksourceview:3.0
+	x11-libs/pango
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	elog "Gummi supports spell-checking through gtkspell. Support for"
+	elog "additional languages can be added by installing myspell-**-"
+	elog "packages for your language of choice."
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 9c876a5d4de3..74a80017d483 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -1,25 +1,9 @@
 AUX gvim-completion 1219 BLAKE2B 8a8d8ac5b42be0103da00ecda3445f24993df0b2762310dcc1a9e1cf892048b57c02b7da2ea19d900c40b782cabeda4c6f7b79b9b7b44b6fb7ad7ae723b46f88 SHA512 08bb32a3c9fcbdd00977b7343dda9cda44b389a13b1717ebddb462e22b6cf9d4db37d5b49ff752b931e305bf57e8f9f4a7d6e32ea25f8acd1b00e5f8320ac132
 AUX gvimrc-r1 990 BLAKE2B 5fc0b805458aff22485e3e180ca8c32a62f2cfe49572edffa5725d2cfc4ed9a7bded20c1a5cd1f19f41e0849e3ca08be4798ff23edd66a92bcbb31aee16c433a SHA512 f6538550f1ecadcccf74a6bbd5a6a0b71d18a234a854d1a0179144125555c42280000df9523e7c3d5a8b449f421af7bafcca1034951f085279cee0dd1160808a
 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
-EBUILD gvim-8.2.0814-r100.ebuild 10548 BLAKE2B 97622d1ec117107f2576a4b7f75097c3b4711402c3affbf433b2b317048b74697a0fb2b795f2ce6e388cf26885af9b972b68d7f0f73db5110a2bb9a43061ed4f SHA512 654432cab7092fadfabf35996a1ccd807eb76becdd8ed5eb95a5e153e8a6dd342debbd7fd28398bb9e83b4fbe87fa89995a619d4044a1a6300213c04f48325d6
-EBUILD gvim-8.2.3428-r1.ebuild 10626 BLAKE2B 21872f8aebfe15e9b94620f3a36298a78c54d749dad73aabe5ed01c63e6fe19778e5be9485aa3bd4da440c2e02a82c395f350a643e320bbcd00d8d839e414646 SHA512 c1908d7918609f66d956392d31083a2521cc0ee8178b02af0a5591695772b1e1ff89a5c9cff4f2040b8b7bc1999c776ed633f8e14620a6fd7d28395ed287501f
-EBUILD gvim-8.2.3567.ebuild 10699 BLAKE2B 461bfc24a1267cb1037ef273d4c9d88556f518cb81ef8dbda78c417a5d0cd419e2e8760529f7be782d456757de954bf847cf19f01157f0d05d4d588a139b2895 SHA512 f51a04503239d7ec680391577a82a0f27039a2d096cf6850e2af90fb20f9b905cdc865faed74c5b8cf76b77fd9b1107b07a19d6b7ae139d2a0036d61c62ce439
-EBUILD gvim-8.2.3582.ebuild 10692 BLAKE2B 1f6f50d88e1985c917dfe7dbab0c9d71bec007bc8d057ad4b6c670f975a6e8b92ad4bec7447210c2eae43f8c039487bfc61a5fc161a3b6be11ac6c2751ae2440 SHA512 ecf615e9997ef893479928855634c9ad61eefccb334312229dd3d2079f50ad676c3c94769b8cdb798d1b760cc5420f1e30e011fdfa0b9eba4f8f9ed07e04600b
-EBUILD gvim-8.2.3669.ebuild 10699 BLAKE2B 461bfc24a1267cb1037ef273d4c9d88556f518cb81ef8dbda78c417a5d0cd419e2e8760529f7be782d456757de954bf847cf19f01157f0d05d4d588a139b2895 SHA512 f51a04503239d7ec680391577a82a0f27039a2d096cf6850e2af90fb20f9b905cdc865faed74c5b8cf76b77fd9b1107b07a19d6b7ae139d2a0036d61c62ce439
-EBUILD gvim-8.2.3741.ebuild 10692 BLAKE2B 1f6f50d88e1985c917dfe7dbab0c9d71bec007bc8d057ad4b6c670f975a6e8b92ad4bec7447210c2eae43f8c039487bfc61a5fc161a3b6be11ac6c2751ae2440 SHA512 ecf615e9997ef893479928855634c9ad61eefccb334312229dd3d2079f50ad676c3c94769b8cdb798d1b760cc5420f1e30e011fdfa0b9eba4f8f9ed07e04600b
-EBUILD gvim-8.2.3950.ebuild 10699 BLAKE2B ce18ce82ae56c2d9a4ed744a02dbd63a606944d36deb3e7ee239011822e9a92db5363fad797afafc68708b18646192e8a74c14fc32c06e6c017efa185952d33c SHA512 4c414f797e134761db8da9d006093f7a71d470941f4d8e1b6dfc0b09676099e8dafabd364af1589cc9a83188f0b16441fdb3e62b401431ddad9e12eaf1e9b7d7
-EBUILD gvim-8.2.4285.ebuild 10699 BLAKE2B ce18ce82ae56c2d9a4ed744a02dbd63a606944d36deb3e7ee239011822e9a92db5363fad797afafc68708b18646192e8a74c14fc32c06e6c017efa185952d33c SHA512 4c414f797e134761db8da9d006093f7a71d470941f4d8e1b6dfc0b09676099e8dafabd364af1589cc9a83188f0b16441fdb3e62b401431ddad9e12eaf1e9b7d7
-EBUILD gvim-8.2.4328.ebuild 10694 BLAKE2B 5f76cb6574ac71786a47f0f4f8ffe5b44eedc6fbabe6d7685d33999bc2df07a0fa22d3734f2adcf3e4e7e5b3accaa9f1cccb6ad668005ec57edd9b972218215e SHA512 11c9792ae94a79104d3cf8e4ddc105b49fff996938ac4ae03de182066f3bbc8405d4806d0e0569f9e30975f97626ffd49511277df4675a59fc07e45eb0bf5d85
-EBUILD gvim-8.2.4586.ebuild 10699 BLAKE2B ce18ce82ae56c2d9a4ed744a02dbd63a606944d36deb3e7ee239011822e9a92db5363fad797afafc68708b18646192e8a74c14fc32c06e6c017efa185952d33c SHA512 4c414f797e134761db8da9d006093f7a71d470941f4d8e1b6dfc0b09676099e8dafabd364af1589cc9a83188f0b16441fdb3e62b401431ddad9e12eaf1e9b7d7
-EBUILD gvim-9999.ebuild 10699 BLAKE2B 461bfc24a1267cb1037ef273d4c9d88556f518cb81ef8dbda78c417a5d0cd419e2e8760529f7be782d456757de954bf847cf19f01157f0d05d4d588a139b2895 SHA512 f51a04503239d7ec680391577a82a0f27039a2d096cf6850e2af90fb20f9b905cdc865faed74c5b8cf76b77fd9b1107b07a19d6b7ae139d2a0036d61c62ce439
+DIST vim-8.2.5066.tar.gz 16497942 BLAKE2B 613f009f6a03e28305763e471bf55b626f37bb8b0f01324d5a676f6682811e3c4a5c11442af839d06b7d94b3938f5a30306bac576eec5d3c76f4a135a3443bb3 SHA512 27fdd1e86b0488b974a9fd60523b31ba23b581cab4c9bd15aee9ae459e2f2d028d6887adf621ee88244b74d26697fc953b08b587a3a80b316d31b65fc588ce9e
+EBUILD gvim-8.2.4586.ebuild 10692 BLAKE2B 6cfe421fbb3cd2ea0132f8d1b2f6bcccdf575eb6527dc056c8a35549ed4bcdb06056188c383186d0a41bf375dab44cc35f9ee97f156b1ac4fa245a54c892a60f SHA512 6e134cdca1e03729cfc4400850ce8c74ad3bc9ccb08f8afaf48f7998fe238098993c6f18fe26e553d0930c4507e5ad6f3c52df1b17e580f24a7c59df698ca767
+EBUILD gvim-8.2.5066.ebuild 10752 BLAKE2B 03bffa111a79f704377ca932f852a887244f2d0177a159cafc03d77fc0c687e513555d0d88b041f27a8fafb612bdf54bdf7730b84f93d0f3e12f7b4a94091e8e SHA512 1b5185359767eb6a792fd68ebe3ab37ba7a9a681a19811259f0058078fd81e44a056ab23b1768d48a2a43ebd3438fa223e8505a682480ee98842824b1f60ba99
+EBUILD gvim-9999.ebuild 10752 BLAKE2B 03bffa111a79f704377ca932f852a887244f2d0177a159cafc03d77fc0c687e513555d0d88b041f27a8fafb612bdf54bdf7730b84f93d0f3e12f7b4a94091e8e SHA512 1b5185359767eb6a792fd68ebe3ab37ba7a9a681a19811259f0058078fd81e44a056ab23b1768d48a2a43ebd3438fa223e8505a682480ee98842824b1f60ba99
 MISC metadata.xml 717 BLAKE2B dd4eae2fc90d0a00452dd91391acb2e15538a956af6a2a423427dd4835292fb17c43d805bb32d119d3743a00a524e2216befdc32831339241d7285871798e7f7 SHA512 b0cc1bae40d3cfb51bcab00ea245688d68410c17220a3f3c80793b6fb62abb007251c2ee2abd7612ed507462a3c77de48f3ceaf622a75c54436298fd43b7df10
diff --git a/app-editors/gvim/gvim-8.2.0814-r100.ebuild b/app-editors/gvim/gvim-8.2.0814-r100.ebuild
deleted file mode 100644
index 249f42765281..000000000000
--- a/app-editors/gvim/gvim-8.2.0814-r100.ebuild
+++ /dev/null
@@ -1,378 +0,0 @@
-# Copyright 1999-2021 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 xdg-utils bash-completion-r1 prefix lua-single python-single-r1 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://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-fi
-
-DESCRIPTION="GUI version of the Vim text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="acl aqua cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-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? (
-		gtk? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
-		!gtk? (
-			gtk2? (
-				>=x11-libs/gtk+-2.6:2
-				x11-libs/libXft
-			)
-			!gtk2? (
-				motif? ( >=x11-libs/motif-2.3:0 )
-				!motif? (
-					neXt? ( x11-libs/neXtaw )
-					!neXt? ( x11-libs/libXaw )
-				)
-			)
-		)
-	)
-	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}
-	sys-devel/autoconf
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-# configure runs the Lua interpreter
-BDEPEND="lua? ( ${LUA_DEPS} )"
-
-# various failures (bugs #630042 and #682320)
-RESTRICT="test"
-
-S=${WORKDIR}/vim-${PV}
-
-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
-	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
-
-	# 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'
-
-	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 -e \
-		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -v 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.
-	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"
-
-	myconf=(
-		--with-features=huge
-		--disable-gpm
-		--with-gnome=no
-		$(use_enable sound canberra)
-		$(use_enable acl)
-		$(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)
-	)
-
-	# --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
-
-	if use lua; then
-		myconf+=(
-			--enable-luainterp
-			$(use_with lua_single_target_luajit luajit)
-			--with-lua-prefix="${EPREFIX}/usr"
-		)
-	fi
-
-	# gvim's GUI preference order is as follows:
-	# aqua                         CARBON (not tested)
-	# -aqua gtk                    GTK3
-	# -aqua -gtk gtk2              GTK2
-	# -aqua -gtk -gtk motif        MOTIF
-	# -aqua -gtk -gtk -motif neXt  NEXTAW
-	# -aqua -gtk -gtk -motif -neXt ATHENA
-	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use gtk; then
-		myconf+=( --enable-gtk3-check )
-		einfo "Building gvim with the gtk+-3 GUI"
-		myconf+=( --enable-gui=gtk3 )
-	elif use gtk2; then
-		myconf+=( --enable-gtk2-check )
-		einfo "Building gvim with the gtk+-2 GUI"
-		myconf+=( --enable-gui=gtk2 )
-	elif use motif; then
-		einfo "Building gvim with the MOTIF GUI"
-		myconf+=( --enable-gui=motif )
-	elif use neXt; then
-		einfo "Building gvim with the neXtaw GUI"
-		myconf+=( --enable-gui=nextaw )
-	else
-		einfo "Building gvim with the Athena GUI"
-		myconf+=( --enable-gui=athena )
-	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
-
-	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() {
-	einfo "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-8.2.3428-r1.ebuild b/app-editors/gvim/gvim-8.2.3428-r1.ebuild
deleted file mode 100644
index 84c10c91185f..000000000000
--- a/app-editors/gvim/gvim-8.2.3428-r1.ebuild
+++ /dev/null
@@ -1,380 +0,0 @@
-# Copyright 1999-2021 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 xdg-utils bash-completion-r1 prefix lua-single python-single-r1 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://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-fi
-
-DESCRIPTION="GUI version of the Vim text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="acl aqua crypt cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-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? (
-		gtk? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
-		!gtk? (
-			gtk2? (
-				>=x11-libs/gtk+-2.6:2
-				x11-libs/libXft
-			)
-			!gtk2? (
-				motif? ( >=x11-libs/motif-2.3:0 )
-				!motif? (
-					neXt? ( x11-libs/neXtaw )
-					!neXt? ( x11-libs/libXaw )
-				)
-			)
-		)
-	)
-	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}
-	sys-devel/autoconf
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-# configure runs the Lua interpreter
-BDEPEND="lua? ( ${LUA_DEPS} )"
-
-# various failures (bugs #630042 and #682320)
-RESTRICT="test"
-
-S=${WORKDIR}/vim-${PV}
-
-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
-	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
-
-	# 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'
-
-	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 -e \
-		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -v 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.
-	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"
-
-	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)
-	)
-
-	# --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
-
-	if use lua; then
-		myconf+=(
-			--enable-luainterp
-			$(use_with lua_single_target_luajit luajit)
-			--with-lua-prefix="${EPREFIX}/usr"
-		)
-	fi
-
-	# gvim's GUI preference order is as follows:
-	# aqua                         CARBON (not tested)
-	# -aqua gtk                    GTK3
-	# -aqua -gtk gtk2              GTK2
-	# -aqua -gtk -gtk motif        MOTIF
-	# -aqua -gtk -gtk -motif neXt  NEXTAW
-	# -aqua -gtk -gtk -motif -neXt ATHENA
-	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use gtk; then
-		myconf+=( --enable-gtk3-check )
-		einfo "Building gvim with the gtk+-3 GUI"
-		myconf+=( --enable-gui=gtk3 )
-	elif use gtk2; then
-		myconf+=( --enable-gtk2-check )
-		einfo "Building gvim with the gtk+-2 GUI"
-		myconf+=( --enable-gui=gtk2 )
-	elif use motif; then
-		einfo "Building gvim with the MOTIF GUI"
-		myconf+=( --enable-gui=motif )
-	elif use neXt; then
-		einfo "Building gvim with the neXtaw GUI"
-		myconf+=( --enable-gui=nextaw )
-	else
-		einfo "Building gvim with the Athena GUI"
-		myconf+=( --enable-gui=athena )
-	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
-
-	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() {
-	einfo "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-8.2.3567.ebuild b/app-editors/gvim/gvim-8.2.3567.ebuild
deleted file mode 100644
index a68b9011e15f..000000000000
--- a/app-editors/gvim/gvim-8.2.3567.ebuild
+++ /dev/null
@@ -1,383 +0,0 @@
-# Copyright 1999-2021 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 xdg-utils bash-completion-r1 prefix lua-single python-single-r1 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://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	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 gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-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? (
-		gtk? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
-		!gtk? (
-			gtk2? (
-				>=x11-libs/gtk+-2.6:2
-				x11-libs/libXft
-			)
-			!gtk2? (
-				motif? ( >=x11-libs/motif-2.3:0 )
-				!motif? (
-					neXt? ( x11-libs/neXtaw )
-					!neXt? ( x11-libs/libXaw )
-				)
-			)
-		)
-	)
-	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"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die
-	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
-
-	# 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'
-
-	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 -e \
-		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -v 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.
-	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"
-
-	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)
-	)
-
-	# --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
-
-	if use lua; then
-		myconf+=(
-			--enable-luainterp
-			$(use_with lua_single_target_luajit luajit)
-			--with-lua-prefix="${EPREFIX}/usr"
-		)
-	fi
-
-	# gvim's GUI preference order is as follows:
-	# aqua                         CARBON (not tested)
-	# -aqua gtk                    GTK3
-	# -aqua -gtk gtk2              GTK2
-	# -aqua -gtk -gtk motif        MOTIF
-	# -aqua -gtk -gtk -motif neXt  NEXTAW
-	# -aqua -gtk -gtk -motif -neXt ATHENA
-	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use gtk; then
-		myconf+=( --enable-gtk3-check )
-		einfo "Building gvim with the gtk+-3 GUI"
-		myconf+=( --enable-gui=gtk3 )
-	elif use gtk2; then
-		myconf+=( --enable-gtk2-check )
-		einfo "Building gvim with the gtk+-2 GUI"
-		myconf+=( --enable-gui=gtk2 )
-	elif use motif; then
-		einfo "Building gvim with the MOTIF GUI"
-		myconf+=( --enable-gui=motif )
-	elif use neXt; then
-		einfo "Building gvim with the neXtaw GUI"
-		myconf+=( --enable-gui=nextaw )
-	else
-		einfo "Building gvim with the Athena GUI"
-		myconf+=( --enable-gui=athena )
-	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
-
-	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() {
-	einfo "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-8.2.3582.ebuild b/app-editors/gvim/gvim-8.2.3582.ebuild
deleted file mode 100644
index a3183caf7daf..000000000000
--- a/app-editors/gvim/gvim-8.2.3582.ebuild
+++ /dev/null
@@ -1,383 +0,0 @@
-# Copyright 1999-2021 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 xdg-utils bash-completion-r1 prefix lua-single python-single-r1 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://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	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 gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-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? (
-		gtk? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
-		!gtk? (
-			gtk2? (
-				>=x11-libs/gtk+-2.6:2
-				x11-libs/libXft
-			)
-			!gtk2? (
-				motif? ( >=x11-libs/motif-2.3:0 )
-				!motif? (
-					neXt? ( x11-libs/neXtaw )
-					!neXt? ( x11-libs/libXaw )
-				)
-			)
-		)
-	)
-	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"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die
-	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
-
-	# 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'
-
-	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 -e \
-		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -v 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.
-	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"
-
-	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)
-	)
-
-	# --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
-
-	if use lua; then
-		myconf+=(
-			--enable-luainterp
-			$(use_with lua_single_target_luajit luajit)
-			--with-lua-prefix="${EPREFIX}/usr"
-		)
-	fi
-
-	# gvim's GUI preference order is as follows:
-	# aqua                         CARBON (not tested)
-	# -aqua gtk                    GTK3
-	# -aqua -gtk gtk2              GTK2
-	# -aqua -gtk -gtk motif        MOTIF
-	# -aqua -gtk -gtk -motif neXt  NEXTAW
-	# -aqua -gtk -gtk -motif -neXt ATHENA
-	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use gtk; then
-		myconf+=( --enable-gtk3-check )
-		einfo "Building gvim with the gtk+-3 GUI"
-		myconf+=( --enable-gui=gtk3 )
-	elif use gtk2; then
-		myconf+=( --enable-gtk2-check )
-		einfo "Building gvim with the gtk+-2 GUI"
-		myconf+=( --enable-gui=gtk2 )
-	elif use motif; then
-		einfo "Building gvim with the MOTIF GUI"
-		myconf+=( --enable-gui=motif )
-	elif use neXt; then
-		einfo "Building gvim with the neXtaw GUI"
-		myconf+=( --enable-gui=nextaw )
-	else
-		einfo "Building gvim with the Athena GUI"
-		myconf+=( --enable-gui=athena )
-	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
-
-	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() {
-	einfo "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-8.2.3669.ebuild b/app-editors/gvim/gvim-8.2.3669.ebuild
deleted file mode 100644
index a68b9011e15f..000000000000
--- a/app-editors/gvim/gvim-8.2.3669.ebuild
+++ /dev/null
@@ -1,383 +0,0 @@
-# Copyright 1999-2021 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 xdg-utils bash-completion-r1 prefix lua-single python-single-r1 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://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	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 gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-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? (
-		gtk? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
-		!gtk? (
-			gtk2? (
-				>=x11-libs/gtk+-2.6:2
-				x11-libs/libXft
-			)
-			!gtk2? (
-				motif? ( >=x11-libs/motif-2.3:0 )
-				!motif? (
-					neXt? ( x11-libs/neXtaw )
-					!neXt? ( x11-libs/libXaw )
-				)
-			)
-		)
-	)
-	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"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die
-	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
-
-	# 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'
-
-	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 -e \
-		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -v 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.
-	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"
-
-	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)
-	)
-
-	# --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
-
-	if use lua; then
-		myconf+=(
-			--enable-luainterp
-			$(use_with lua_single_target_luajit luajit)
-			--with-lua-prefix="${EPREFIX}/usr"
-		)
-	fi
-
-	# gvim's GUI preference order is as follows:
-	# aqua                         CARBON (not tested)
-	# -aqua gtk                    GTK3
-	# -aqua -gtk gtk2              GTK2
-	# -aqua -gtk -gtk motif        MOTIF
-	# -aqua -gtk -gtk -motif neXt  NEXTAW
-	# -aqua -gtk -gtk -motif -neXt ATHENA
-	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use gtk; then
-		myconf+=( --enable-gtk3-check )
-		einfo "Building gvim with the gtk+-3 GUI"
-		myconf+=( --enable-gui=gtk3 )
-	elif use gtk2; then
-		myconf+=( --enable-gtk2-check )
-		einfo "Building gvim with the gtk+-2 GUI"
-		myconf+=( --enable-gui=gtk2 )
-	elif use motif; then
-		einfo "Building gvim with the MOTIF GUI"
-		myconf+=( --enable-gui=motif )
-	elif use neXt; then
-		einfo "Building gvim with the neXtaw GUI"
-		myconf+=( --enable-gui=nextaw )
-	else
-		einfo "Building gvim with the Athena GUI"
-		myconf+=( --enable-gui=athena )
-	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
-
-	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() {
-	einfo "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-8.2.3741.ebuild b/app-editors/gvim/gvim-8.2.3741.ebuild
deleted file mode 100644
index a3183caf7daf..000000000000
--- a/app-editors/gvim/gvim-8.2.3741.ebuild
+++ /dev/null
@@ -1,383 +0,0 @@
-# Copyright 1999-2021 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 xdg-utils bash-completion-r1 prefix lua-single python-single-r1 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://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	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 gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-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? (
-		gtk? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
-		!gtk? (
-			gtk2? (
-				>=x11-libs/gtk+-2.6:2
-				x11-libs/libXft
-			)
-			!gtk2? (
-				motif? ( >=x11-libs/motif-2.3:0 )
-				!motif? (
-					neXt? ( x11-libs/neXtaw )
-					!neXt? ( x11-libs/libXaw )
-				)
-			)
-		)
-	)
-	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"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die
-	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
-
-	# 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'
-
-	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 -e \
-		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -v 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.
-	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"
-
-	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)
-	)
-
-	# --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
-
-	if use lua; then
-		myconf+=(
-			--enable-luainterp
-			$(use_with lua_single_target_luajit luajit)
-			--with-lua-prefix="${EPREFIX}/usr"
-		)
-	fi
-
-	# gvim's GUI preference order is as follows:
-	# aqua                         CARBON (not tested)
-	# -aqua gtk                    GTK3
-	# -aqua -gtk gtk2              GTK2
-	# -aqua -gtk -gtk motif        MOTIF
-	# -aqua -gtk -gtk -motif neXt  NEXTAW
-	# -aqua -gtk -gtk -motif -neXt ATHENA
-	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use gtk; then
-		myconf+=( --enable-gtk3-check )
-		einfo "Building gvim with the gtk+-3 GUI"
-		myconf+=( --enable-gui=gtk3 )
-	elif use gtk2; then
-		myconf+=( --enable-gtk2-check )
-		einfo "Building gvim with the gtk+-2 GUI"
-		myconf+=( --enable-gui=gtk2 )
-	elif use motif; then
-		einfo "Building gvim with the MOTIF GUI"
-		myconf+=( --enable-gui=motif )
-	elif use neXt; then
-		einfo "Building gvim with the neXtaw GUI"
-		myconf+=( --enable-gui=nextaw )
-	else
-		einfo "Building gvim with the Athena GUI"
-		myconf+=( --enable-gui=athena )
-	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
-
-	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() {
-	einfo "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-8.2.4285.ebuild b/app-editors/gvim/gvim-8.2.4285.ebuild
deleted file mode 100644
index 3600cac317cd..000000000000
--- a/app-editors/gvim/gvim-8.2.4285.ebuild
+++ /dev/null
@@ -1,383 +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 xdg-utils bash-completion-r1 prefix lua-single python-single-r1 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://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	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 gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-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? (
-		gtk? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
-		!gtk? (
-			gtk2? (
-				>=x11-libs/gtk+-2.6:2
-				x11-libs/libXft
-			)
-			!gtk2? (
-				motif? ( >=x11-libs/motif-2.3:0 )
-				!motif? (
-					neXt? ( x11-libs/neXtaw )
-					!neXt? ( x11-libs/libXaw )
-				)
-			)
-		)
-	)
-	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"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die
-	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
-
-	# 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'
-
-	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 -e \
-		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -v 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.
-	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"
-
-	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)
-	)
-
-	# --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
-
-	if use lua; then
-		myconf+=(
-			--enable-luainterp
-			$(use_with lua_single_target_luajit luajit)
-			--with-lua-prefix="${EPREFIX}/usr"
-		)
-	fi
-
-	# gvim's GUI preference order is as follows:
-	# aqua                         CARBON (not tested)
-	# -aqua gtk                    GTK3
-	# -aqua -gtk gtk2              GTK2
-	# -aqua -gtk -gtk motif        MOTIF
-	# -aqua -gtk -gtk -motif neXt  NEXTAW
-	# -aqua -gtk -gtk -motif -neXt ATHENA
-	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use gtk; then
-		myconf+=( --enable-gtk3-check )
-		einfo "Building gvim with the gtk+-3 GUI"
-		myconf+=( --enable-gui=gtk3 )
-	elif use gtk2; then
-		myconf+=( --enable-gtk2-check )
-		einfo "Building gvim with the gtk+-2 GUI"
-		myconf+=( --enable-gui=gtk2 )
-	elif use motif; then
-		einfo "Building gvim with the MOTIF GUI"
-		myconf+=( --enable-gui=motif )
-	elif use neXt; then
-		einfo "Building gvim with the neXtaw GUI"
-		myconf+=( --enable-gui=nextaw )
-	else
-		einfo "Building gvim with the Athena GUI"
-		myconf+=( --enable-gui=athena )
-	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
-
-	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() {
-	einfo "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-8.2.4328.ebuild b/app-editors/gvim/gvim-8.2.4328.ebuild
deleted file mode 100644
index 972ffe7c049e..000000000000
--- a/app-editors/gvim/gvim-8.2.4328.ebuild
+++ /dev/null
@@ -1,383 +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 xdg-utils bash-completion-r1 prefix lua-single python-single-r1 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://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	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 gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-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? (
-		gtk? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
-		!gtk? (
-			gtk2? (
-				>=x11-libs/gtk+-2.6:2
-				x11-libs/libXft
-			)
-			!gtk2? (
-				motif? ( >=x11-libs/motif-2.3:0 )
-				!motif? (
-					neXt? ( x11-libs/neXtaw )
-					!neXt? ( x11-libs/libXaw )
-				)
-			)
-		)
-	)
-	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"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die
-	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
-
-	# 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'
-
-	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 -e \
-		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -v 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.
-	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"
-
-	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)
-	)
-
-	# --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
-
-	if use lua; then
-		myconf+=(
-			--enable-luainterp
-			$(use_with lua_single_target_luajit luajit)
-			--with-lua-prefix="${EPREFIX}/usr"
-		)
-	fi
-
-	# gvim's GUI preference order is as follows:
-	# aqua                         CARBON (not tested)
-	# -aqua gtk                    GTK3
-	# -aqua -gtk gtk2              GTK2
-	# -aqua -gtk -gtk motif        MOTIF
-	# -aqua -gtk -gtk -motif neXt  NEXTAW
-	# -aqua -gtk -gtk -motif -neXt ATHENA
-	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use gtk; then
-		myconf+=( --enable-gtk3-check )
-		einfo "Building gvim with the gtk+-3 GUI"
-		myconf+=( --enable-gui=gtk3 )
-	elif use gtk2; then
-		myconf+=( --enable-gtk2-check )
-		einfo "Building gvim with the gtk+-2 GUI"
-		myconf+=( --enable-gui=gtk2 )
-	elif use motif; then
-		einfo "Building gvim with the MOTIF GUI"
-		myconf+=( --enable-gui=motif )
-	elif use neXt; then
-		einfo "Building gvim with the neXtaw GUI"
-		myconf+=( --enable-gui=nextaw )
-	else
-		einfo "Building gvim with the Athena GUI"
-		myconf+=( --enable-gui=athena )
-	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
-
-	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() {
-	einfo "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-8.2.4586.ebuild b/app-editors/gvim/gvim-8.2.4586.ebuild
index 3600cac317cd..c5b40c520097 100644
--- a/app-editors/gvim/gvim-8.2.4586.ebuild
+++ b/app-editors/gvim/gvim-8.2.4586.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+	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}
 
diff --git a/app-editors/gvim/gvim-8.2.3950.ebuild b/app-editors/gvim/gvim-8.2.5066.ebuild
index 3600cac317cd..2fe57d502981 100644
--- a/app-editors/gvim/gvim-8.2.3950.ebuild
+++ b/app-editors/gvim/gvim-8.2.5066.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # 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_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27"
 
 inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single python-single-r1 ruby-single
 
@@ -106,6 +106,8 @@ pkg_setup() {
 
 src_prepare() {
 	if [[ ${PV} != 9999* ]]; then
+		rm "${WORKDIR}"/patches/006-vim-8.0.0617-crosscompile.patch || di
+
 		# Gentoo patches to fix runtime issues, cross-compile errors, etc
 		eapply "${WORKDIR}"/patches/
 	fi
@@ -319,7 +321,7 @@ src_test() {
 # Call eselect vi update with --if-unset
 # to respect user's choice (bug 187449)
 eselect_vi_update() {
-	einfo "Calling eselect vi update..."
+	ebegin "Calling eselect vi update"
 	eselect vi update --if-unset
 	eend $?
 }
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index a68b9011e15f..2fe57d502981 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # 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_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27"
 
 inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single python-single-r1 ruby-single
 
@@ -106,6 +106,8 @@ pkg_setup() {
 
 src_prepare() {
 	if [[ ${PV} != 9999* ]]; then
+		rm "${WORKDIR}"/patches/006-vim-8.0.0617-crosscompile.patch || di
+
 		# Gentoo patches to fix runtime issues, cross-compile errors, etc
 		eapply "${WORKDIR}"/patches/
 	fi
@@ -319,7 +321,7 @@ src_test() {
 # Call eselect vi update with --if-unset
 # to respect user's choice (bug 187449)
 eselect_vi_update() {
-	einfo "Calling eselect vi update..."
+	ebegin "Calling eselect vi update"
 	eselect vi update --if-unset
 	eend $?
 }
diff --git a/app-editors/hexedit/Manifest b/app-editors/hexedit/Manifest
index 382bbdde2e58..e882b41ef61c 100644
--- a/app-editors/hexedit/Manifest
+++ b/app-editors/hexedit/Manifest
@@ -1,3 +1,5 @@
 DIST hexedit-1.5.tar.gz 30544 BLAKE2B d7292a70819826fddd63f99ee9d05073b8a59f51477390af91151146ee1f5a75333560829f0351fa9e158ef932c07a3582a3e822f42e645917a7fa321055d14e SHA512 9d8e5c8c0cda0af17ffeaf528e3dacd7fc2878dfc0755cb055dae5c56f05c961353c1d1723b05897314b49a44a6eb96de5d3a599c6b29967425507eea7cc7ca5
+DIST hexedit-1.6.tar.gz 31085 BLAKE2B e576de6aaed35449adbc430c95e8ba3a8ccfba587ef5c4d347d95b84c9764cb644323af23d46ff16429b93e0348c8d310afbad482219aa1b2c1b582332bd06fe SHA512 9783406f253a67fe048ec12306df1a601b7ba92cd7a0399ad2f103aed5a3164cd21ad7c1d547a4c55192cfb7da2b2517152015a4c3db402a9217548b435f602d
 EBUILD hexedit-1.5.ebuild 735 BLAKE2B ce7ae724f31b951a7a9e695274dbb82e3db4a517da61a35c69fe2dc20df6b8ba2f0f1658bf9a4d957bd309de42eaa9ee6312e2dbadc78ee59eccfd3951c1622a SHA512 34cc7032c292ed1aa1474afae9c524df3f532335f42c64d94e21ffc191c0d127b356b51b6940c7849b1e8b41d27c281d6474aa546607b0482a7b3657764744af
+EBUILD hexedit-1.6.ebuild 742 BLAKE2B 9aea766dfb83143edbfed9386543a3d22a87b3b51ffce305eb681860e3ce10a8bbb94841bd7c141369777ef11cf30e7ebd59034e7ee976d747d1ea1b4519e1cd SHA512 f444f0490ed304a0c7e4962295f269fe1ab6010cb248d67ebdb2ec23caa049153f0caa9f4dde09f7d1b274e95acf5331703bf97196e6c39fba36b9109a02ec19
 MISC metadata.xml 351 BLAKE2B 0c74729ae34fd37946be2b370ec986ea6f894cc13c642865030ad8857b65bb5900cf3b822e2c9b16bfc33df955e3d747622dddf6b5344a5edd867a236988135a SHA512 1878b5fb1fe6d7e0c6af3a433d9dfd8e9f365a4bf52d15ff5aa01e4f8153924b6379edee442d98f2c0282fd19f7141ffc77d0ce53e8dd1428e5ac90643f84c9e
diff --git a/app-editors/hexedit/hexedit-1.6.ebuild b/app-editors/hexedit/hexedit-1.6.ebuild
new file mode 100644
index 000000000000..7da44e6f5b51
--- /dev/null
+++ b/app-editors/hexedit/hexedit-1.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="View and edit files in hex or ASCII"
+HOMEPAGE="http://rigaux.org/hexedit.html"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+EGIT_REPO_URI="https://github.com/pixel/hexedit.git"
+else
+SRC_URI="https://github.com/pixel/hexedit/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="sys-libs/ncurses:="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	dobin hexedit
+	doman hexedit.1
+	dodoc Changes
+}
diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
index e4f51ffdaa4c..3cfdf9b7d673 100644
--- a/app-editors/kakoune/Manifest
+++ b/app-editors/kakoune/Manifest
@@ -1,3 +1,5 @@
+AUX kakoune-2021.11.08-gcc12.patch 1543 BLAKE2B 5ddac65c8143ea581e30df3f7d5685dc0319a683d1b64d4ab5c538a79d8ab404ee3ce82aaa8cab8b8f53c854d2727a8568c2616914ab14f46dd2aa9b4b9fec6c SHA512 4c09b60141dc47fedebe1040fee888bd594f964df08040b0edfa27448cd1219078e50618ba6c9538a48cd5acbd0d7ad08968c1649d2b97447bf4fb332df0181b
 DIST kakoune-2021.11.08.tar.bz2 538466 BLAKE2B 30cb80c971c065610a8b40d9df0af2d3c1650baa065f14c22557b3c22e3cd2832e227a3a167d10d3892579eee30a70b5e3b62ad502dac7bdbb1c252b71c66e99 SHA512 429e11ff51fce18394e0a8fc55cd58a346b91dbe41b842b96c31a984bc92ea67b186c9f819d2d3ee88422ba453347281b0416a5bc4b1e7816240b9aba688a7e5
+EBUILD kakoune-2021.11.08-r1.ebuild 814 BLAKE2B dda37f636a19dc45d4fa25076679e70afdde5c7d1d65b339baff06a99a66a73fc4c03457d31df1f509d829cd21b9185b2ffedf85a91d304f3a97e125fa8e40b5 SHA512 c4d1ee2d54551dd37a66f5cc7cd897c261e1a5ec8205ebe7e50810fed1ccf910051ffbe43f6b139b17ed24cf5029ebb43ce0acbf860702aa78183b1402254ef4
 EBUILD kakoune-2021.11.08.ebuild 769 BLAKE2B 4df909a0a7ededeee6bde50cd7402758959926c686225ba3729bd244549b1e411849867ab2609a0d59223ead319202fb66c813d37eb191312092ee4ce690e0e5 SHA512 68a63728ef642e07549e8ddc94a7ff054d29b5130155ec8ab3582452dee8cbc2c9ffc3a2cadc78b82a9ae1595d5a2f08f91192e74275dcfebdd06375b2fd1033
 MISC metadata.xml 512 BLAKE2B afa8631f092bca6c3307dcd610340b39e41da979781f0f1ac391e873ae063088599cfc96c99bc81cca0c1244905ced51e3736b1fc387d0d9fdb8233be2810427 SHA512 a7e4da11480bc3f8bd09253901d9528235ce9a4f00a418cd5f58c898244850cafe944d6a828e1b871a2d98faba179fd9f4ddab99695a6762a4a7a290f1311a2f
diff --git a/app-editors/kakoune/files/kakoune-2021.11.08-gcc12.patch b/app-editors/kakoune/files/kakoune-2021.11.08-gcc12.patch
new file mode 100644
index 000000000000..7f1101cdbf49
--- /dev/null
+++ b/app-editors/kakoune/files/kakoune-2021.11.08-gcc12.patch
@@ -0,0 +1,58 @@
+https://bugs.gentoo.org/840647
+https://github.com/mawww/kakoune/issues/4544
+https://github.com/mawww/kakoune/pull/4549
+https://github.com/mawww/kakoune/commit/d1ea2ffa600fd2a7b14e415b68ceedba3325c5db
+
+commit d1ea2ffa600fd2a7b14e415b68ceedba3325c5db
+Author: Tim Allen <screwtape@froup.com>
+Date:   Sat Feb 12 21:35:33 2022 +1100
+
+    Make Color::validate_alpha() a constexpr function.
+    
+    We call it from a constexpr constructor, so it needs to be constexpr itself.
+    
+    Fixes #4544.
+
+diff --git a/src/color.cc b/src/color.cc
+index b355b9cf..dfe2e955 100644
+--- a/src/color.cc
++++ b/src/color.cc
+@@ -34,13 +34,6 @@ bool is_color_name(StringView color)
+     return contains(color_names, color);
+ }
+ 
+-void Color::validate_alpha()
+-{
+-    static_assert(RGB == 17);
+-    if (a < RGB)
+-        throw runtime_error("Colors alpha must be > 16");
+-}
+-
+ Color str_to_color(StringView color)
+ {
+     auto it = find_if(color_names, [&](const char* c){ return color == c; });
+diff --git a/src/color.hh b/src/color.hh
+index 943678ed..85babd98 100644
+--- a/src/color.hh
++++ b/src/color.hh
+@@ -1,6 +1,7 @@
+ #ifndef color_hh_INCLUDED
+ #define color_hh_INCLUDED
+ 
++#include "exception.hh"
+ #include "hash.hh"
+ #include "meta.hh"
+ #include "assert.hh"
+@@ -55,7 +56,11 @@ struct Color
+     }
+ 
+ private:
+-    void validate_alpha();
++    constexpr void validate_alpha() {
++        static_assert(RGB == 17);
++        if (a < RGB)
++            throw runtime_error("Colors alpha must be > 16");
++    }
+ };
+ 
+ constexpr bool operator==(Color lhs, Color rhs)
diff --git a/app-editors/kakoune/kakoune-2021.11.08-r1.ebuild b/app-editors/kakoune/kakoune-2021.11.08-r1.ebuild
new file mode 100644
index 000000000000..37633ce21f75
--- /dev/null
+++ b/app-editors/kakoune/kakoune-2021.11.08-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Modal editor inspired by vim"
+HOMEPAGE="http://kakoune.org/ https://github.com/mawww/kakoune"
+SRC_URI="https://github.com/mawww/kakoune/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc12.patch
+)
+
+src_prepare() {
+	sed -i '/CXXFLAGS += -O3/d' src/Makefile || die
+	default
+}
+
+src_configure() {
+	tc-export CXX
+}
+
+src_compile() {
+	emake -C src all
+}
+
+src_test() {
+	emake -C src test
+}
+
+src_install() {
+	emake PREFIX="${D}"/usr docdir="${ED}/usr/share/doc/${PF}" install
+
+	rm "${ED}/usr/share/man/man1/kak.1.gz" || die
+	doman doc/kak.1
+}
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index 5301236334df..391eeafe68fe 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -1,5 +1,5 @@
-DIST mg-20210609.tar.gz 156850 BLAKE2B ed8061aa808a8570f24198fb32fa3d24d66decdd07dab871502456d734a8d7867f384122361294bda0155bc3fecea80983fd41c00a2ffe02d00e380bf94e2f43 SHA512 a17b470e5e192c1f62700c7b78b15c9403b25528a7d6603fda0b6e618196150329fe4889cedfc8dbf621053d45b78294ed5c2766604aaa4c3ddbaec545693043
 DIST mg-20220212.tar.gz 157828 BLAKE2B e3219efffef9c4da05965a0ed7a0f0bfdf5c34d607d25102a4d2ee9de6f9b9fd2da59050c6e56d1712875b2d129408200dde4c7305ffb2208c11b5d722b87270 SHA512 093736521e4bcaeff049594793474b9710e4cfe6db151032dc4413614566afce80db5b794dcf10082020dbb73f25742a0c7d49f45b6b4d2caa6865b20a9e574b
-EBUILD mg-20210609-r1.ebuild 1076 BLAKE2B e95ab621ef87cf6869a7ea5c16a2d13abeba717e683bfbce223be3c98f6debe22433842a754eb5732d596156faba388409e56d1ec0c7c3e748b455715b453ecc SHA512 6bc32e8cd88edee04db05e5ac2294879e6a7910511af007c5f07d547ede761a5d82b3faa87c387621900b42ddc43a0f3ffb57fa4902cfaa8f43ff867c2d9f15b
-EBUILD mg-20220212.ebuild 1034 BLAKE2B 08fbf88b5652e3b35eb504b2df112a90d3e761c2c3ed163a6f74ff200d796d4c8955776a3d5ef3c1da9b40aef2a7f4ca5518e877dbef14035528a0ee9cf6dbf2 SHA512 a6d212e955b2d4409a88b11812086c1d2a22ab4cc776e7606e99661c0f701e64dc7fdf4a86835bf363758a85dc2091c7c359e421d2fe36deea6f5666ba0b8e14
-MISC metadata.xml 619 BLAKE2B 746ed0d179b4fb8e40533411d3248b88c035a2f01ea6552af8e9bcf3d588a0e6a835ad12aa03a27052a7988646499538d991d05eb88c0125f3fc7d47e2ae217e SHA512 a1c066343bff1bd451d44850e8dd3f554fb330116a7e91b5a9c13f4c33e837018f81a9e77e1c9856651c877352aab68fe4f80f05a185996cce7eda91c45e6c8e
+DIST mg-20220614.tar.gz 157904 BLAKE2B 88141274b379c6117158f85d91d0d643709437f0292fe2f82569c33d85694b39f957e279e262839ef0ba2a7e81e8a9ad6512c621e68f42b0929805028898637a SHA512 bed455cda856e54fae28592ac0a520841d5d542880a7405dadf702d7407ac33ae7fb7b63880805a7e166e0e0a87c76b9fca1700c444f1b999a5af66732c69b65
+EBUILD mg-20220212.ebuild 1041 BLAKE2B 094d5fe311dc0f70b7c8263392e65ec43dbad838807eaf0c6675f789689d542da20831fb15a6a4575881cfc244f57f0eb0804096f322efb1a456fa9be0eb2e84 SHA512 2362878519045fb10dbeeeb6bdc27451e7173958b9cf22c9fcb9c4418fbd96eb6e0b53410f1a9cbe9f316c28906294bf17af9f0ced31f4cc1b2e152da508b0a9
+EBUILD mg-20220614.ebuild 1046 BLAKE2B 7af22f31ef51d1e69849a3b1717ca175ab5230442b5d28dfd591015cef13d22ddc5ed32b64395c9c85fbc1efc2f2e40c68d77ebd7f0af50b29f5727bef5e5ec6 SHA512 98863e7332a0d568c0b777ef38d8aeba989280c59c15bc9a66635722637d50cfc250b6e1bc3d5d5f1be158cc74dfdf4d931a7b51e29b0f934594e36c472e1564
+MISC metadata.xml 692 BLAKE2B 773199bfa6d52ed22a9c6567296e65e53263602562ae26d5ab33ab3f201edd8c4606d4bde7377b599a911f3f3b4dd2c9a5fbed9c5e499256d78ea7e89ff8d5c6 SHA512 1543f3ae91a1e2fb85e7b2e637ed886bcd5a62c4594d403ca79202eab594aff3c94e3d06117cca5cccbe828ff01bdce1683b96e76ecae084db8fa4547232ad9a
diff --git a/app-editors/mg/metadata.xml b/app-editors/mg/metadata.xml
index 7a6f27c8ff88..d00cadd0ef61 100644
--- a/app-editors/mg/metadata.xml
+++ b/app-editors/mg/metadata.xml
@@ -13,4 +13,7 @@
 
   This is a portable version of the Mg maintained by the OpenBSD team.
 </longdescription>
+<upstream>
+  <remote-id type="github">hboetes/mg</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-editors/mg/mg-20220212.ebuild b/app-editors/mg/mg-20220212.ebuild
index 3f416dd99ced..47a79e0e9dae 100644
--- a/app-editors/mg/mg-20220212.ebuild
+++ b/app-editors/mg/mg-20220212.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv sparc x86"
 IUSE="livecd"
 
 RDEPEND="
diff --git a/app-editors/mg/mg-20210609-r1.ebuild b/app-editors/mg/mg-20220614.ebuild
index 6bbdcd7a6250..7d529ea79741 100644
--- a/app-editors/mg/mg-20210609-r1.ebuild
+++ b/app-editors/mg/mg-20220614.ebuild
@@ -6,13 +6,12 @@ EAPI=8
 inherit toolchain-funcs
 
 DESCRIPTION="MicroGnuEmacs, a port from the BSDs"
-HOMEPAGE="https://homepage.boetes.org/software/mg/
-	https://github.com/hboetes/mg"
+HOMEPAGE="https://github.com/hboetes/mg"
 SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="livecd"
 
 RDEPEND="
diff --git a/app-editors/micro/Manifest b/app-editors/micro/Manifest
index 6fd2597361cf..4be301063a2b 100644
--- a/app-editors/micro/Manifest
+++ b/app-editors/micro/Manifest
@@ -89,6 +89,6 @@ DIST layeh.com%2Fgopher-luar%2F@v%2Fv1.0.7.mod 109 BLAKE2B 08629b072202d338d461a
 DIST layeh.com%2Fgopher-luar%2F@v%2Fv1.0.7.zip 36857 BLAKE2B c4ff2a1bbc2dc984fc24065f71b560cbdda220b78d88cff9ed5a91654984cd56c9e85b64a416c140e4b01bfda75734f7c77f882e3fb45a0227b3f47cc02781c8 SHA512 94b70a83a31acde7232223ca82d6588716b39d6463baf5f15d921a5bc24a7d9b98307b8d44d3bbc9a5a82f6e4111b2b9ba1c15ee313a3784a30d63fe5d198bd3
 DIST micro-2.0.10.tar.gz 814030 BLAKE2B 8becaf7caa167747443e1aa3af32e96588af275d2b921fa88fe9d55b4eec22622cf7a68d85d47834159042100414855c5bb3f8b9f7c8d934f762ec63f4d40435 SHA512 06796270a6d99578ac36f3313dffb6ba56c5e8963c6b59562b4ef9e65036ae2ed21ce602b39ee08d2f3c54c501089166fdecc5719a1ca535d84960b3b4b67f72
 DIST micro-2.0.9.tar.gz 811560 BLAKE2B 2e461593e71fda69a6f75e5adfaedd7bcf052b8bda9899f03a1e25e3db3bb8071bec80716d14a0ff7a381728871f0705076ef69e4de58f40499a7501343b4063 SHA512 5dbf81deb734618ec0a8ccaffc65f972d8da1d28b761c31bf3f5433c02ad6daa2360b1ea825c0a2cfce2f8d31d6481d468bbe29b42e1c96083c7a941fe42bc3a
-EBUILD micro-2.0.10.ebuild 5248 BLAKE2B 6ef6a47ba7d80321566d784d1f1d74117119fce6ada2b29bda1b28f61344d598d2f4dd5dfe45c61f9b8642213e950b72d4f42146503d0d476bb425c8bcece8a4 SHA512 369085f1d17b5a0986251906b7ee59aea064c97ef6b801226c974bf3d21ee720ba81581f1e7827b6a00dfd0dcd569b3185c6dc2db55672d6e6befd1c11af568a
+EBUILD micro-2.0.10.ebuild 5255 BLAKE2B da25e44da47e0e189c7fef0166a93b7f1fd81fa21bd2b4a2c5fa3cbf4d7b7f8c16214fbc8af560d3c74754630a8694af3ebb97f5fa119b3309f18f1202735105 SHA512 da2af84d80b73389a64638417fb11eb9eaaaa0b1d57a76a1053f9eb2853d71e2be750d11e29e1e777e4cfccbddb706f77943ee7da28aac009fafec44d69e317d
 EBUILD micro-2.0.9.ebuild 5086 BLAKE2B 9a7639739c02096aaad13dbf57f0a5b661e5d823ef9af9c8540c7850abfbb975f21566785bf77806e338e70852d256b25a158b1ecc7c450998b66a3e1553dd47 SHA512 85f8224d341ea91fa0a41c87856a69e555ec5685861d2d7fc75b0c57e6285d1e2e8677e6be5905f0a0f8cde43f293bff139b0ed4c3c062dc8a4eaea30ce6d3bb
 MISC metadata.xml 471 BLAKE2B f6487317798718fbf48883ece7a99354ffe1ff88a82d16545d9d27582c679a1c18b3cf9c4a2f39a84a329f3ea272250651e901f1ebea12c2522fab03d565284d SHA512 b3a71e979bdaed4948c196a53b69d9d43cf23bf266e7a03835a83bcbe942202e5c2a14de256574bc8462f94b3211523444bf7c3b5fc4fe2772afbaafaf3346b1
diff --git a/app-editors/micro/micro-2.0.10.ebuild b/app-editors/micro/micro-2.0.10.ebuild
index b81d3fe66bf9..1548a105d9d5 100644
--- a/app-editors/micro/micro-2.0.10.ebuild
+++ b/app-editors/micro/micro-2.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -105,7 +105,7 @@ SRC_URI="
 
 LICENSE="MIT Apache-2.0 BSD MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
 BDEPEND="dev-vcs/git"
 
diff --git a/app-editors/mousepad/Manifest b/app-editors/mousepad/Manifest
index e68065c18cfe..069990f3bd10 100644
--- a/app-editors/mousepad/Manifest
+++ b/app-editors/mousepad/Manifest
@@ -1,5 +1,3 @@
-DIST mousepad-0.5.8.tar.bz2 927756 BLAKE2B b0518cfbc72a4816765846dc55cedb13377047d39966ceb66d93943b6eed7191eb06c2d482f41e7356271a26f3e99a5a26d1f63b3e4ef490c777448f85dd7083 SHA512 6446927b564fe18c3127835e592d0248efa690c7b8fc2a7da92f237eb16184bd502c446a5b50aed8acd1d8233c22ee7e91c0b9ee512232f7d7a69c72f1dea9e9
 DIST mousepad-0.5.9.tar.bz2 953685 BLAKE2B f8db50048964c789600ce6d310f6b6a893d7d4406d55f0666b7e78bf3e54446d3ec56eb70a059da6fac367d7c3f3fc5861fb29dadf28aa9b0d5e2f62056f3dfb SHA512 915fa1c89d66f793c4dba7826b4934e286e940dbdd9c933bddeeaf76be79d2140cd0feb1dea2946989879ec354d57af36fd61517309ebd4915f18be4b9cf621f
-EBUILD mousepad-0.5.8.ebuild 870 BLAKE2B 6c7f7c5ee93f531233753a9076ac377e64cbfeaa00de2d2ff17e4660bc36013dd37657157c3920c1e945370be58db82ea342de007f6b96ade32959be39313fd6 SHA512 f17f2e243fffd6ea910f3449a9511aaebd4086a4cd118b0324a78e1bb47187e8a66f4833abc803c6a3db2084b10b7ffe1ecab9a1654f387bdeebbc1b792fb5ba
-EBUILD mousepad-0.5.9.ebuild 879 BLAKE2B 865c0a92bb70d41504dbdb96054fee945e363968ff42cca0c5ccbe0c8dce8d339d3bd7b348a8d66fdde8e5d266e8aafd145266c5a116812a04867a0a5939553b SHA512 caa46c5bd45c57b6e27bcc70cfca691c14d16eeb8e38d9531525a1a63bfe1b25d562c7daa02252e6faa32623f6d062c554b59acdaa8f09163674f798cddece2a
+EBUILD mousepad-0.5.9.ebuild 946 BLAKE2B 3ea45bef3fde8b9e30342276e0ae7c10f6d42c6a6b3d4a5c5fa6b047eb8f765782ff7c26afbc799c4ae2ae4805046df0db3a0acc970ba6b8444a43ed284adad6 SHA512 711b0e18c58a879021f423e7ef714761720b285e377522fa33fc8b25ba2f1eb58e66c2a243a3a1287e0eb1720900e4a269c0752283930d225a4ce0a5790075c0
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/app-editors/mousepad/mousepad-0.5.8.ebuild b/app-editors/mousepad/mousepad-0.5.8.ebuild
deleted file mode 100644
index 9f4db17d0951..000000000000
--- a/app-editors/mousepad/mousepad-0.5.8.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="GTK+-based editor for the Xfce Desktop Environment"
-HOMEPAGE="https://git.xfce.org/apps/mousepad/about/"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND=">=dev-libs/glib-2.52
-	>=x11-libs/gtk+-3.22:3
-	>=x11-libs/gtksourceview-4.0.0:4"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		--enable-gtksourceview4
-	)
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-editors/mousepad/mousepad-0.5.9.ebuild b/app-editors/mousepad/mousepad-0.5.9.ebuild
index 9c0844adba85..5cca94e36155 100644
--- a/app-editors/mousepad/mousepad-0.5.9.ebuild
+++ b/app-editors/mousepad/mousepad-0.5.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.52
@@ -34,6 +34,11 @@ src_configure() {
 	econf "${myconf[@]}"
 }
 
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
 pkg_postinst() {
 	gnome2_schemas_update
 	xdg_desktop_database_update
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 939e2f475e0f..edaa3c622e14 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,9 +1,7 @@
 AUX gentoo.nanorc 4206 BLAKE2B eacba1d5db1475aa53f177d9c04819ff2b81c5fa196365f65c75b1fbbcfa78f93d4537d33901a604753131a14978843ed588296dad37c626c125959e61f3650a SHA512 45afe49629f0fe232bae8a0ae8d3984b3add366b1f88e5859df7612ab0b47f4df8764c17e038bcb49b106b08bfc8a20356b6e62cb9cae9ac337adc37db97ffd0
-DIST nano-5.9.tar.gz 3093675 BLAKE2B d4fa2f0e64b6ab243a2b127ff894e900098f6261f5d46657ff3459cc0b51683a63fc5de54bd4545b47bc16c633b09142f8501b84a09df3e8123da5233a063766 SHA512 61bf4de300579bc6f0028a2237e105228d8657819c02f32c7ef8f84f9c54734df8fb9a9cddbce0f7721ebc5ac8ae4799c118291ae15480082f8b1317019a485d
 DIST nano-6.2.tar.gz 3146876 BLAKE2B be6dbc1f53890764184a701e97e792762600c892933830bfcb5c2c4eab19d659583fe797d7197c9045ea8912215aa5885a05f02c66194df17253d6788e0ba599 SHA512 5a59906664a88a03f215d8dba8f7e481fbaffc7bdf93c89ca997df7a8aba2cbb4d45ac84d11f03a796488b82b01ca75161a5ab49fd9115661575451b6ab018c4
 DIST nano-6.3.tar.xz 1581772 BLAKE2B 92ef2acac0dacebc0bf8364bfee928a8394d8e4323e622ad6ba9d35bebd18d3976ab0ca747f7c9b5597874775b44ba4b5560e7392606aa68736158c2bda62b92 SHA512 42279bee54f4d83a0dc06e93c2f385798c304a41e995461b018f5724010213761455563cb53e2411e12bc43c7245e289f4254c359717ca1b89a34d5af8b8c3f3
-EBUILD nano-5.9.ebuild 2284 BLAKE2B af8a47119587f66407d2b16815bdd79034d1ec7c84aa85739c32d9d1f0d0b9e4e15f7f149e4a84ce9f4dba02f83589546d26a4e5656366dc694878d27c4c2f67 SHA512 beec13ea4b555f016dbdd64312ad64c6cd73cba23e284d06e74aacf4d31cd9cda02f2521861c923bbf39d495e128a9171edad12ecc83aa3b21ba5d97cd46bc92
 EBUILD nano-6.2.ebuild 2349 BLAKE2B 53dc3860dd5366d797e3cae3943de67c960ebb626c932d91743897c67ba1bfd99280f9bf5ceb707cdc452b29cf15c2ec84dba2b38ee42297e655bd02d85954c4 SHA512 ab0772726974a97039bdd42bfc6d94b1b1e57f70b082e6bd8a37f88659d2382c031fc7cb8df7187ecbbb8a9129c0cf5f7aa5574c08bf6f16695ec49918eb5641
-EBUILD nano-6.3.ebuild 2357 BLAKE2B a04a268929814dfecdb6ceddcd0aa6b7118085719dc13525922311b3dc62529a66aae7ddf63d3d0b8cc0c5c3da2ccde009fd118a7b8c17008c753d38fbdbbb26 SHA512 283e6c687dad1d1730dad88f1993b88d11e076757af0b0bccec8e59caa4193b4c16474453c5b4f4b99445824d0e3a894dde653cce8059139027bc0a2bdac4682
+EBUILD nano-6.3.ebuild 2601 BLAKE2B f5c3d6099d58630b85666120c19cb35081c343dcf56dccef413ab320b13955a974b87dc2386352e34f51804a8e13d7b9cb51043586344da84c04ccae9f6df9aa SHA512 33fac004b01a9b4b44300b48fd549b141a2e3f6316990dce709e23efde3841f02ffbb36066cb1409b26b255554b4276dcc1f10a860409ad029878cb578f8a77d
 EBUILD nano-9999.ebuild 2350 BLAKE2B c158c4c173632d6b05ae33b0d4b56d308fffd04a39354d1d009819c2a04a7bc3648599b342d34f66dfb674453cd46b520da8be593e58a7dea3188420d81e1e6f SHA512 822a2a3fd233de2bbb2e176328ec5e2825a07078063cc90015ef9ace5513cbb68e324c9405b8c4adce1a7067828a6c5e1cae6a7d238e5b4693830bf5509cc0eb
-MISC metadata.xml 1643 BLAKE2B 0281963fbe6aff1bc6765b1c9964ac2a7e1237b4759c4ae34e83a9c79c86975d910a43edfec80f279ebf17beb58db2eeb430915a165ea252042900ecefa3c57e SHA512 8636fa9e9f1b2bbc72f3b7a4395a99a7158de48e6f10487f6b5d450e6c35226b0f4d4a68e5e995dd625065831a343070c4f227d1c4422a2140e09f9c003d8fdd
+MISC metadata.xml 1666 BLAKE2B ee53e5f23c192741ff6d59594105a9365fa8fddff9547dc7bbc14fe967d49c0d294bb56fa2e6d0c40d53dc64e8a031fea3294e62ca6ea2fc31dd028b00a423ee SHA512 58691db7bb106774da8b59db6afb199e2c61444a6feedbef09a22d6fef184512102f1fa4d7cfe7edf9171f3e7a542fac294eacc5eb1a3cb7de724b986b6884a0
diff --git a/app-editors/nano/metadata.xml b/app-editors/nano/metadata.xml
index 6ec35ae205da..c298b35286c5 100644
--- a/app-editors/nano/metadata.xml
+++ b/app-editors/nano/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-</maintainer>
-<longdescription>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<longdescription>
 GNU nano - an enhanced clone of the Pico text editor.
 
 The nano project was started because of a few "problems" with the
@@ -21,22 +21,22 @@ require a command line flag.  Yuck.
 nano aims to solve these problems by emulating the functionality of
 Pico as closely as possible while addressing the problems above and
 perhaps providing other extra functionality.
-</longdescription>
-<use>
- <flag name="justify">Enable justify/unjustify functions for text formatting.</flag>
- <flag name="debug">
-  Enable debug messages and assert warnings.  Note that these will all be sent
-  straight to stderr rather than some logging facility.
- </flag>
- <flag name="magic">
-  Add magic file support (sys-apps/file) to automatically detect appropriate syntax highlighting
- </flag>
- <flag name="minimal">
-  Disable all fancy features, including ones that otherwise have a dedicated
-  USE flag (such as spelling).
- </flag>
- <flag name="split-usr">
-  Enable this if /bin and /usr/bin are separate directories
- </flag>
-</use>
+	</longdescription>
+	<use>
+		<flag name="justify">Enable justify/unjustify functions for text formatting.</flag>
+		<flag name="debug">
+			Enable debug messages and assert warnings.  Note that these will all be sent
+			straight to stderr rather than some logging facility.
+		</flag>
+		<flag name="magic">
+			Add magic file support (sys-apps/file) to automatically detect appropriate syntax highlighting
+		</flag>
+		<flag name="minimal">
+			Disable all fancy features, including ones that otherwise have a dedicated
+			USE flag (such as spelling).
+		</flag>
+		<flag name="split-usr">
+			Enable this if /bin and /usr/bin are separate directories
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-editors/nano/nano-5.9.ebuild b/app-editors/nano/nano-5.9.ebuild
deleted file mode 100644
index 92f76e20465c..000000000000
--- a/app-editors/nano/nano-5.9.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git"
-	inherit git-r3 autotools
-else
-	MY_P="${PN}-${PV/_}"
-	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode"
-
-LIB_DEPEND="
-	>=sys-libs/ncurses-5.9-r1:=[unicode(+)?]
-	sys-libs/ncurses:=[static-libs(+)]
-	magic? ( sys-apps/file[static-libs(+)] )
-	nls? ( virtual/libintl )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	magic? ( !minimal )
-"
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	local myconf=(
-		--bindir="${EPREFIX}"/bin
-		--htmldir=/trash
-		$(use_enable !minimal color)
-		$(use_enable !minimal multibuffer)
-		$(use_enable !minimal nanorc)
-		$(use_enable magic libmagic)
-		$(use_enable spell speller)
-		$(use_enable justify)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable unicode utf8)
-		$(use_enable minimal tiny)
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	# don't use "${ED}" here or things break (#654534)
-	rm -r "${D}"/trash || die
-
-	dodoc doc/sample.nanorc
-	docinto html
-	dodoc doc/faq.html
-	insinto /etc
-	newins doc/sample.nanorc nanorc
-	if ! use minimal ; then
-		# Enable colorization by default.
-		sed -i \
-			-e '/^# include /s:# *::' \
-			"${ED}"/etc/nanorc || die
-
-		# Since nano-5.0 these are no longer being "enabled" by default
-		# (bug #736848)
-		local rcdir="/usr/share/nano"
-		mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
-		rmdir "${ED}"${rcdir}/extra || die
-	fi
-
-	use split-usr && dosym ../../bin/nano /usr/bin/nano
-}
diff --git a/app-editors/nano/nano-6.3.ebuild b/app-editors/nano/nano-6.3.ebuild
index 9bd57c68b191..ff0fcf25cd44 100644
--- a/app-editors/nano/nano-6.3.ebuild
+++ b/app-editors/nano/nano-6.3.ebuild
@@ -91,3 +91,12 @@ src_install() {
 
 	use split-usr && dosym ../../bin/nano /usr/bin/nano
 }
+
+pkg_postrm() {
+	local e
+	e=$(unset EDITOR; . "${EROOT}"/etc/profile &>/dev/null; echo "${EDITOR}")
+	if [[ ${e##*/} == nano ]]; then
+		ewarn "The EDITOR variable is still set to ${e}."
+		ewarn "You can update it with \"eselect editor\"."
+	fi
+}
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index b43d7638e37d..8584ee68b75a 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -1,14 +1,11 @@
 AUX neovim-0.4.4-cmake-darwin.patch 2599 BLAKE2B 7d5d5298f3b32385bcd17c582865f554edf8f1a164517dfd802590f8f7f85b3cbcce2ae7ffdd9163fa87b55000a582129b6fb93835decff135f0029c1f8cc681 SHA512 1b4f5b1baaecacb807c6c2d022dd17c887f4a6236c3d452fdc9e01c3e1a868ca395e727343bfe793bf9a667889e22413683e3a196d8aaa4f978514b91634c849
 AUX neovim-0.4.4-cmake-release-type.patch 627 BLAKE2B 87c6e6fd487b923ec4146f2cb38a9a30be00ffa7b9d0a41b43f17d4f79860e4f097b76e093af474dfe20538332a7c6f233ebd57d845a74d7a8aead9cae2fec76 SHA512 b236c0b703ec2763a1179149715fa241573803a27dcb05324e2f766f49aaf53dfe0efc62f1c10aa6d58333ce115835e852608778d9582689550fb537103f361a
 AUX neovim-0.4.4-cmake_lua_version.patch 419 BLAKE2B 73477d7fdc2705f2e93cd6dd355ea01fbfc232306e86a13097a1c069ea3248972be9d4da7b175c8c3c7e0fde7581d4ed9b431d73c119e9f8a63a7a15007aba31 SHA512 a1be27ebd18be34fede632f695bacf65699e9dd1a8b219120372b5e0c48691f595ba42725c4f795456b8018d668f471e3a042622a5f541af50c84a089d53c83c
+AUX neovim-9999-cmake_lua_version.patch 425 BLAKE2B bd4a2f9f92c5a625456905532b2e121478431267fcb8b7a59ce0e7a315b75f47795ba13686608143f618cef3c17c21c47ca50ae6c6cfaa568324fd515da57924 SHA512 5e4d51262e5098fd5fa596b5a1cb9cc8b49c1ad4b7ecdc333829d6f8745d082e199e4d68338c53bd09e7e57ae3235ad30ca4613eec8eb9fab14c61cad5ba502c
 AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a
-DIST neovim-0.5.1.tar.gz 10349190 BLAKE2B eb7e0c6a0742369c4a0fbc32a0f0e5d595f03470fb10287c39dde2f86db433a21798acee49d2cc363f18843950ef76d1376f5e52358d0b19a4b1e090c0d620a6 SHA512 a5a976c4998e821e0d9a9038d3f0c9e7c424a951f6bfc6d75898916d6a004ac668f31a34c3472fc4fca6b1d9652ac662b06780dd04dc6a77ecdc81564ec05709
-DIST neovim-0.6.0.tar.gz 10592213 BLAKE2B f0f4654b6ae37b29c903ec54175b7dc6742c9f8dadd3242119a0288df4e3262ff5d9cb7ccd41fd8b1431db828ddb806714ced62ef1893cb923cf84badd47e3d8 SHA512 c007d076fb89288fe0496fa243fc6f485b0b33120c96b0bf37d8fe6469c672eb641fefbc3f7262ec726e40910c44d37ff7efb1723c05ba920ff6ae512b1d43e6
-DIST neovim-0.6.1.tar.gz 10597584 BLAKE2B 3e2da61b768f5cae44e08f0ef7f386ce4b878b3248c9a7f7691f62dd732abfa59558467e190a5bcbb5f5007801b2003380296678fca42a0b46dde9a71ed496f4 SHA512 399489f6aaabec2a89b695b22dcd860149acaad723372cced0b4d2cdae464e2db5758372b9123cd0d2a683e0ea42b871935eb85e550cecce620d896691cfda53
 DIST neovim-0.7.0.tar.gz 10925354 BLAKE2B 0524d008ba1ebbe823406e94cfb048014b26bc394c686b2dd84bb7fae5a1f7f3acd42764b03b6efec10c0f25045c5838f624542b5125947e5f42d3b0d2ad1f84 SHA512 3597c54fb925a4d607bca9ba0fdb37df90ecb816da99f52baf46cc2ec79727a55048ba1d8d22c8e7d61f0e8e35546326b1d0d15c0a91de8bf5bc529c45fb1ce0
-EBUILD neovim-0.5.1.ebuild 2889 BLAKE2B fbf3f4d3ecb5effa3c0a22eaddefbd68adf1fcacb40306d8960871c78b3c05d374c429d87d2b3207f6e89efa7474b1a5efa6a69e9f81c61a775fbd2d6a046ea3 SHA512 12e9d1834653344fe598b1fe5acffd91f5bf32fefc06e4fd36c0d017c19ef374ae9d0d685043c516980116e185a9aa8ba1ee844f74840926adc798ae51977d44
-EBUILD neovim-0.6.0.ebuild 2928 BLAKE2B 32f7efda71fda938c0a278da9bfe7e54a870b536eb9a660b0f0f6ed72851b9b53147426a700948bfdebf8cc2a28b7343ad04014efb6c3d79000dd4ac3335dbeb SHA512 5eb55f224e87ea23461eaff00e93363a42e19b98e38f840e7d057c3eac36ba79c4717fcb543e623a85601bbe3de6e91a4761d04fa924fd1d585d9b896e01683b
-EBUILD neovim-0.6.1-r1.ebuild 3140 BLAKE2B 50493746f95e943d73de95ec5d55b0cee88718657a26cb1c6d2ba5a22a87b88b786d0b59affb2b836e7df562393b97e0daa6a7ed3e56687a92d141f538026e88 SHA512 60929e073e8b4b21809b43dad27af9e215eb9284867bb73f4c77a2658e87cf4bcbaf0934508ffd92e6e974d898c14c1e079edc06f24e18d2db0fe4000f99352c
-EBUILD neovim-0.7.0.ebuild 3142 BLAKE2B bd12e581ae38d989d4c61474879de9d3f252946a5ebad5336f3be5d80ab25c800377091efff34857f3b1217804f573fa414c1da6875534d11f703998ee88b755 SHA512 55176a8426145f61ff719075474cd63056d138b5f4b4ccb795561a61642bd3d668a6e981d50e9ced2752ea82cdec081c3d09b80dc14c7cff764697478aea1559
-EBUILD neovim-9999.ebuild 3142 BLAKE2B bd12e581ae38d989d4c61474879de9d3f252946a5ebad5336f3be5d80ab25c800377091efff34857f3b1217804f573fa414c1da6875534d11f703998ee88b755 SHA512 55176a8426145f61ff719075474cd63056d138b5f4b4ccb795561a61642bd3d668a6e981d50e9ced2752ea82cdec081c3d09b80dc14c7cff764697478aea1559
+DIST neovim-0.7.2.tar.gz 10933623 BLAKE2B c2db449a91f1685233da7125e3d4b49cb8fe26db5e498fd3a83340bd14842399474fcc7f2c78b88783195c6f7b0b8df196985b70387ed88972372a8866e2c721 SHA512 04d0fa5b23018531b70b53271821bf6944cde1bcec2210b99f5888e1339cd38f57feaa8e40874a3a504930e6614980947f31852185cbcd2ce106a0867896dd79
+EBUILD neovim-0.7.0.ebuild 3140 BLAKE2B 3b64420a63edd801b3a51fc23c2902e9aa57e3000dfda0979be57e7dbf61c690f0096e080dc6182f640a9400efbdfe99fcf3ae88468ff1081eff84d33e057fcb SHA512 69a13c372fa79a70b58419cd968f0ee325e73a00600fe17cdea8316d8062dc6b099e59db396fb99acefda62b0ef08ffdc2d9cd21b35ca18134ceba1766b2b7ba
+EBUILD neovim-0.7.2.ebuild 3096 BLAKE2B aae637597e01ed723877404fa32460b20f4282d2c30a9207d3d3e20c7ccc05e25444f93c8fd1e199019c9e52f061762eada0304a7b5d4a6cc27e2255f8a9e658 SHA512 2663d83ce2aa631dda3a2f2b9d48938bbbcafa76e926f5922f48def780347105cf5db89ec865cb71fcf8beec740aafe92ecc188719f3c33b8d081060d8af6839
+EBUILD neovim-9999.ebuild 3251 BLAKE2B 419d217b1b218bb6ce9303e9cc84e94bacc498498e479a9f910c64b98a45506b005105c24981bb2d59bc2365098f0c99927e7cace6602db9c3c6eaa057499ac7 SHA512 3925295d3e3bf5668a0dae0f9c8f420ff65b9c26104c57cce6d699a0385044ea29ec48d126ec6e53aeb250e36237eab7c9b0b2c20983b4c071b1676c343487c4
 MISC metadata.xml 536 BLAKE2B 48c85cdbe749584904a6719545308b55f130375464c55d6f458171707a2b72586bca6780b52bab3b379a2e0c471ec47026c1203edd4696fe38639f5718cc4896 SHA512 114c7fe41230c2aade3de44b37e51ae84a907b6fcb899732991f8013126214540f4b72e60b44c0993312ec8d7c8cc8c96eae8b9e0f78bd0d2cefb7497e5d16e8
diff --git a/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch b/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch
new file mode 100644
index 000000000000..d7e01275fb02
--- /dev/null
+++ b/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -384,7 +384,7 @@
+ option(PREFER_LUA "Prefer Lua over LuaJIT in the nvim executable." OFF)
+ 
+ if(PREFER_LUA)
+-  find_package(Lua 5.1 EXACT REQUIRED)
++  find_package(Lua ${PREFER_LUA} EXACT REQUIRED)
+   set(LUA_PREFERRED_INCLUDE_DIRS ${LUA_INCLUDE_DIR})
+   set(LUA_PREFERRED_LIBRARIES ${LUA_LIBRARIES})
+   # Passive (not REQUIRED): if LUAJIT_FOUND is not set, nvim-test is skipped.
diff --git a/app-editors/neovim/neovim-0.5.1.ebuild b/app-editors/neovim/neovim-0.5.1.ebuild
deleted file mode 100644
index 7256b3ebf29c..000000000000
--- a/app-editors/neovim/neovim-0.5.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} luajit )
-
-inherit cmake lua-single optfeature xdg
-
-DESCRIPTION="Vim-fork focused on extensibility and agility"
-HOMEPAGE="https://neovim.io"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~x64-macos"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+lto +nvimpager +tui"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-# Upstream say the test library needs LuaJIT
-# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377
-#REQUIRED_USE="test? ( lua_single_target_luajit )"
-#RESTRICT="!test? ( test )"
-
-# Upstream build scripts invoke the Lua interpreter
-BDEPEND="${LUA_DEPS}
-	dev-util/gperf
-	virtual/libiconv
-	virtual/libintl
-	virtual/pkgconfig
-"
-# TODO: add tests, dev-lua/busted has now got luajit support.
-# bug #584694
-DEPEND="${LUA_DEPS}
-	dev-lua/luv[${LUA_SINGLE_USEDEP}]
-	$(lua_gen_cond_dep '
-		dev-lua/lpeg[${LUA_USEDEP}]
-		dev-lua/mpack[${LUA_USEDEP}]
-	')
-	$(lua_gen_cond_dep '
-		dev-lua/LuaBitOp[${LUA_USEDEP}]
-	' lua5-{1,2})
-	dev-libs/libuv:0=
-	>=dev-libs/libvterm-0.1.2
-	dev-libs/msgpack:0=
-	dev-libs/tree-sitter:=
-	tui? (
-		dev-libs/libtermkey
-		>=dev-libs/unibilium-2.0.0:0=
-	)
-"
-RDEPEND="
-	${DEPEND}
-	app-eselect/eselect-vi
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch"
-	"${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch"
-	"${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch"
-)
-
-src_prepare() {
-	# use our system vim dir
-	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
-		-i src/nvim/globals.h || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Upstream default to LTO on non-debug builds
-	# Let's expose it as a USE flag because upstream
-	# have preferences for how we should use LTO
-	# if we want it on (not just -flto)
-	# ... but allow turning it off.
-	# TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now
-	local mycmakeargs=(
-		-DENABLE_LTO=$(usex lto)
-		-DFEAT_TUI=$(usex tui)
-		-DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)")
-		-DLUA_PRG="${ELUA}"
-		-DMIN_LOG_LEVEL=3
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
-	optfeature "Python plugin support" dev-python/pynvim
-	optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
-	optfeature "remote/nvr support" dev-python/neovim-remote
-}
diff --git a/app-editors/neovim/neovim-0.6.0.ebuild b/app-editors/neovim/neovim-0.6.0.ebuild
deleted file mode 100644
index 54ffbbed750b..000000000000
--- a/app-editors/neovim/neovim-0.6.0.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} luajit )
-
-inherit cmake lua-single optfeature xdg
-
-DESCRIPTION="Vim-fork focused on extensibility and agility"
-HOMEPAGE="https://neovim.io"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+lto +nvimpager test +tui"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-# Upstream say the test library needs LuaJIT
-# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377
-REQUIRED_USE="test? ( lua_single_target_luajit )"
-# TODO: Get tests running
-RESTRICT="!test? ( test ) test"
-
-# Upstream build scripts invoke the Lua interpreter
-BDEPEND="${LUA_DEPS}
-	dev-util/gperf
-	virtual/libiconv
-	virtual/libintl
-	virtual/pkgconfig
-"
-DEPEND="${LUA_DEPS}
-	dev-lua/luv[${LUA_SINGLE_USEDEP}]
-	$(lua_gen_cond_dep '
-		dev-lua/lpeg[${LUA_USEDEP}]
-		dev-lua/mpack[${LUA_USEDEP}]
-	')
-	$(lua_gen_cond_dep '
-		dev-lua/LuaBitOp[${LUA_USEDEP}]
-	' lua5-{1,2})
-	dev-libs/libuv:0=
-	>=dev-libs/libvterm-0.1.2
-	dev-libs/msgpack:0=
-	dev-libs/tree-sitter:=
-	tui? (
-		dev-libs/libtermkey
-		>=dev-libs/unibilium-2.0.0:0=
-	)
-"
-RDEPEND="
-	${DEPEND}
-	app-eselect/eselect-vi
-"
-BDEPEND="
-	test? (
-		$(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch"
-	"${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch"
-	"${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch"
-)
-
-src_prepare() {
-	# Use our system vim dir
-	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
-		-i src/nvim/globals.h || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Upstream default to LTO on non-debug builds
-	# Let's expose it as a USE flag because upstream
-	# have preferences for how we should use LTO
-	# if we want it on (not just -flto)
-	# ... but allow turning it off.
-	# TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now
-	local mycmakeargs=(
-		-DENABLE_LTO=$(usex lto)
-		-DFEAT_TUI=$(usex tui)
-		-DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)")
-		-DLUA_PRG="${ELUA}"
-		-DMIN_LOG_LEVEL=3
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
-	optfeature "Python plugin support" dev-python/pynvim
-	optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
-	optfeature "remote/nvr support" dev-python/neovim-remote
-}
diff --git a/app-editors/neovim/neovim-0.7.0.ebuild b/app-editors/neovim/neovim-0.7.0.ebuild
index f23e7434577b..0ba61a74485c 100644
--- a/app-editors/neovim/neovim-0.7.0.ebuild
+++ b/app-editors/neovim/neovim-0.7.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
 else
 	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~x64-macos"
 fi
 
 LICENSE="Apache-2.0 vim"
diff --git a/app-editors/neovim/neovim-0.6.1-r1.ebuild b/app-editors/neovim/neovim-0.7.2.ebuild
index b3ea1f81894c..a340a82ba6a5 100644
--- a/app-editors/neovim/neovim-0.6.1-r1.ebuild
+++ b/app-editors/neovim/neovim-0.7.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-{1..2} luajit )
 
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
 else
 	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
 fi
 
 LICENSE="Apache-2.0 vim"
@@ -39,7 +39,7 @@ BDEPEND="${LUA_DEPS}
 # Check https://github.com/neovim/neovim/blob/master/third-party/CMakeLists.txt for
 # new dependency bounds and so on on bumps (obviously adjust for right branch/tag).
 DEPEND="${LUA_DEPS}
-	>=dev-lua/luv-1.42.0[${LUA_SINGLE_USEDEP}]
+	>=dev-lua/luv-1.43.0[${LUA_SINGLE_USEDEP}]
 	$(lua_gen_cond_dep '
 		dev-lua/lpeg[${LUA_USEDEP}]
 		dev-lua/mpack[${LUA_USEDEP}]
@@ -47,10 +47,10 @@ DEPEND="${LUA_DEPS}
 	$(lua_gen_cond_dep '
 		dev-lua/LuaBitOp[${LUA_USEDEP}]
 	' lua5-{1,2})
-	>=dev-libs/libuv-1.42.0:=
+	>=dev-libs/libuv-1.44.1:=
 	>=dev-libs/libvterm-0.1.4
 	>=dev-libs/msgpack-3.0.0:=
-	>=dev-libs/tree-sitter-0.20.1:=
+	>=dev-libs/tree-sitter-0.20.6:=
 	tui? (
 		>=dev-libs/libtermkey-0.22
 		>=dev-libs/unibilium-2.0.0:0=
@@ -69,7 +69,6 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch"
 	"${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch"
-	"${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch"
 )
 
 src_prepare() {
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index f23e7434577b..4316da6d93cc 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -67,10 +67,14 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch"
 	"${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch"
 	"${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch"
 )
+if [[ ${PV} == 9999 ]]; then
+	PATCHES+=("${FILESDIR}/${PN}-9999-cmake_lua_version.patch")
+else
+	PATCHES+=("${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch")
+fi
 
 src_prepare() {
 	# Use our system vim dir
diff --git a/app-editors/notepadqq/Manifest b/app-editors/notepadqq/Manifest
index 4dc3ac986aaa..b7376d0c6b65 100644
--- a/app-editors/notepadqq/Manifest
+++ b/app-editors/notepadqq/Manifest
@@ -1,4 +1,4 @@
 DIST notepadqq-2.0.0_beta.tar.gz 4516680 BLAKE2B 9a16ab64134ab0d33a68cc528db6a50b8860c391130667a9213e3aa941e115b1e3acae5833ce4b8b52fc81aa8997c5389f5920cde86171cf5d960a7f58dbea99 SHA512 b2ae3493da1512f5f2e42ffc90529f3acfe81d75b7dd6e476f41b94e9b39e02c6fe355ea5ad40460d644ed76bca695d451721e19738c251c8ecb8acc0c0fb061
 EBUILD notepadqq-2.0.0_beta.ebuild 1121 BLAKE2B 521e4f052a7b1cc0c10804e25598e7234e1db2e73379b5e31f36501dc68c4aecd6a054b0d5377afe2b44f964fde4d786007339b682ffeaf25ae6418750d9d973 SHA512 2bd26abf0fd206e0ee721a7cec6d423a0f22c85c55007b32be3dea90a28d8050d4fa1c57abf3d64ac9e6bdbac0578d16417977fa32685ad18b199e8607c91114
 EBUILD notepadqq-9999.ebuild 1121 BLAKE2B 521e4f052a7b1cc0c10804e25598e7234e1db2e73379b5e31f36501dc68c4aecd6a054b0d5377afe2b44f964fde4d786007339b682ffeaf25ae6418750d9d973 SHA512 2bd26abf0fd206e0ee721a7cec6d423a0f22c85c55007b32be3dea90a28d8050d4fa1c57abf3d64ac9e6bdbac0578d16417977fa32685ad18b199e8607c91114
-MISC metadata.xml 346 BLAKE2B 8b4041da6a99ecedd20d910f706394b552a4debfe2c5a0181e164aa2d39e3e835d09a5918f097a45a0d43d253f18a0b496e608172f111a46d25c4295f19cb429 SHA512 c8049ba330c599b226b5651feaf1005ecce3f64e88a4e0f53657fb8a5806c16127d7157d81d04b930e4558414f3be8a5480ddf6d1bdbd838d28827bb90a3f12a
+MISC metadata.xml 257 BLAKE2B cbd76ac531ad96db53526a98b6728b96448b2a86b93a9ca3eb198ff409d37d4fb14076e037b67be60b5f220d9330c38011dddc09990cc616e48d8d30a9cf90d6 SHA512 03a72a002165d55e44e0e33054e54f4307f08fa3e81d8596ead1ca050c640b28ef6415eae2c053658605d23ed2e0f04ca5fcc163e9b94e147f43d839c43d23e6
diff --git a/app-editors/notepadqq/metadata.xml b/app-editors/notepadqq/metadata.xml
index 959a5e4986fb..2914b12afa9f 100644
--- a/app-editors/notepadqq/metadata.xml
+++ b/app-editors/notepadqq/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">notepadqq/notepadqq</remote-id>
   </upstream>
diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest
index 9ab73771d874..36667cd7cd08 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -1,3 +1,7 @@
 DIST okteta-0.26.7.tar.xz 983388 BLAKE2B abe5abb678c0cae7538ac5bdf68b3e9285c405996194e03dcb3f74c397124805496a67ee1b9b2d8c2676dc3fca7d743a012898056aef82f5f1a1e998ee36ef60 SHA512 829294e0ed8b01be940b215334d9291bba1af01fded05511be33a813e9d090bc06f0af90dfb49d45d44814ae38de7c9cb6427215ea076b8401a66734aa42ea25
+DIST okteta-0.26.8.tar.xz 980328 BLAKE2B f8cdc9246c24c922f3f5b7dd659d3d00c3db58682a7d00d4b5f19d84ec1b376d5a72b0ab548698f44bd34018897bc7aec30874a8bbdf37c1ee9832737519a51b SHA512 1e6cd6c0386573b13cc107ec735dc9319860cbb458b8fe72773a50005b3327cd0257b5d9fc5b3bee1cdaddc12accb9106b2ce566fdbbc1f698617a4ff4b5c5f6
+DIST okteta-0.26.9.tar.xz 990484 BLAKE2B 97430ed8a5c8dda422dfd43a91c04fe778581caf475c74b324a26d772777030d73ed799dafa6662b225258ae76c1c37bd38c7d3c97d89d28928106d10f84308a SHA512 cc98f7923a26de9548944ebc207284879607707f41065c847707ac5876c04d31926bb4edf82062cd4d6ade2df64d7a2363d8dfa711524574514ca0dd260b4a9f
 EBUILD okteta-0.26.7.ebuild 1759 BLAKE2B ee45723b1bc86ddacfb559b3dd178a7563e62e83150a1e3f61cabed62a34116744e4032ab6068653ccc0bb78c60262a3644d08c1e932afc82446cb15b1b1a9e5 SHA512 0843bdc737ed5a9bd214e49395b5468c7ae37230db3fd733d774d309722f778df7cd51b94f887544de083e53c50cdc697cbd7bc39ba660c4326eae6ae910a05c
+EBUILD okteta-0.26.8.ebuild 1762 BLAKE2B c5dd1eb6329f206be08bacea292fd3ff2b12da6a1dbfb8674c0cfb4117ee3bb299358fce6c6cba6a54a5b817594851678f5fdfb2fe7ce9b7fd529e47ea6e3cd3 SHA512 443435661b95a9604d6f0a78bc5922774db888a43038180a1c1373001d38a337fd6ea2fa54dfbccc8d3bb6957d327ab06568875471e72d8f6192d2de26337da5
+EBUILD okteta-0.26.9.ebuild 1760 BLAKE2B 2cb53768fe567cef703a5edd46d8031bb795e88b3ca30e362ae69a6f468449141ce189b7ac1704b4a6bcbbb816925058edd3ff40e912b437f88d51ba305fe435 SHA512 0efcc5f9b6b29d85e321b36d4f6f79f48bee9667f6a07ad502a3084f260f522907575f4b9608b590e7d9c00ae0dcf8aec9163e3e7faa8fc1d88715601d0383e3
 MISC metadata.xml 409 BLAKE2B efa27a2a8769a56200077d2d606e930a14fe7b8dad531386da39675c501ea7298939b6c197b668379430840b002c0a5ff34da592fcb2af18734649cb5d527f6c SHA512 0966b96a06e7315574724c75c6c3c680b6ea7da71278885ae65d214ca6a18a4b2d11b101221caa89ef5682d91f7a4cc7c2108f9741072cb12f97e95af0bcb09b
diff --git a/app-editors/okteta/okteta-0.26.8.ebuild b/app-editors/okteta/okteta-0.26.8.ebuild
new file mode 100644
index 000000000000..cf8171388a8d
--- /dev/null
+++ b/app-editors/okteta/okteta-0.26.8.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.82.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Hex editor by KDE"
+HOMEPAGE="https://apps.kde.org/okteta/ https://utils.kde.org/projects/okteta/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2 handbook? ( FDL-1.2 )"
+SLOT="5"
+IUSE="crypt"
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtscript-${QTMIN}:5[scripttools]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	crypt? ( >=app-crypt/qca-2.3.0:2 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DOMIT_EXAMPLES=ON
+		$(cmake_use_find_package crypt Qca-qt5)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	local myctestargs=( -j1 )
+
+	ecm_src_test
+}
diff --git a/app-editors/okteta/okteta-0.26.9.ebuild b/app-editors/okteta/okteta-0.26.9.ebuild
new file mode 100644
index 000000000000..15dde8a9410e
--- /dev/null
+++ b/app-editors/okteta/okteta-0.26.9.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.82.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Hex editor by KDE"
+HOMEPAGE="https://apps.kde.org/okteta/ https://utils.kde.org/projects/okteta/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+fi
+
+LICENSE="GPL-2 handbook? ( FDL-1.2 )"
+SLOT="5"
+IUSE="crypt"
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtscript-${QTMIN}:5[scripttools]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	crypt? ( >=app-crypt/qca-2.3.0:2 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DOMIT_EXAMPLES=ON
+		$(cmake_use_find_package crypt Qca-qt5)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	local myctestargs=( -j1 )
+
+	ecm_src_test
+}
diff --git a/app-editors/pluma/Manifest b/app-editors/pluma/Manifest
index 3ba663437f0f..382d93ab2371 100644
--- a/app-editors/pluma/Manifest
+++ b/app-editors/pluma/Manifest
@@ -1,3 +1,3 @@
 DIST pluma-1.24.2.tar.xz 3745160 BLAKE2B ed855b19f1ab80cb6ef9bc175eea3c2af386b1e45123bc0e3ad93d1964efb4822fe1b3d7490308357fcff96557bb6189f081a467f41a6907e76a1961de8f23d3 SHA512 588640744f8a0bec08d0c51c0309380a57cb6319c98124885e30d05e7dd8488ba7bd5acec1bf21fb0d6832626ae8925b24cd241202265af1a631a91313cdad2b
-EBUILD pluma-1.24.2.ebuild 1805 BLAKE2B 3143f95157950ac44cd2fc759aa1467c23f745dfffc1affee61543fbf6955ec5cf96f09792be8cf88e9ed8c164357c527a68535cc150b58a3f0d886eb342745f SHA512 86c44b7055b0844a907e408be08681892c184fb7e660bb0377abad4cec1ccbe3fdda548c5e96f1d81372452dfd15c2368b9ac9ef787e7b3a9e20990f64a82d4a
+EBUILD pluma-1.24.2.ebuild 1812 BLAKE2B a89aaf8cbc4c30f23469818719e0e11b3fd244c06345829a30aaf158bd91a765cdad65818c1fa96e63a652bb4d7bfd4fb3dcd2d0ee645be8486ed7061aaa9189 SHA512 da059b578bc39e8c2f02b523766f47e84407f9615dfffdf72ba34358d6dbcef0a2028ac1f86a6d0dfebacabda22b3e56cec8afb12808b235ae902481a9737b2f
 MISC metadata.xml 335 BLAKE2B 5a43dc64c90fc154ee0cb55c1eba79a20c612836229ee87e1594436db64d3ba5d877897ecfe4e2e1b52b75a8a3c336fe5338b203e9d134d14b531de4ca2c3eb5 SHA512 8a113126ce89a38ce4ec7468a7c45b162572ceb034911624ed9c5227dae4dedf33ffdfae0ace99ed18848b1e30b722e05b0715fe845b4ad0b6998e4d87476548
diff --git a/app-editors/pluma/pluma-1.24.2.ebuild b/app-editors/pluma/pluma-1.24.2.ebuild
index 40752f77003d..22ecdfa87638 100644
--- a/app-editors/pluma/pluma-1.24.2.ebuild
+++ b/app-editors/pluma/pluma-1.24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9,3_10} )
 inherit mate python-single-r1 virtualx
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 fi
 
 DESCRIPTION="Pluma text editor for the MATE desktop"
diff --git a/app-editors/qhexedit2/Manifest b/app-editors/qhexedit2/Manifest
index 305f2ad253f5..b3f676a72b4e 100644
--- a/app-editors/qhexedit2/Manifest
+++ b/app-editors/qhexedit2/Manifest
@@ -1,7 +1,12 @@
 AUX qhexedit2-0.8.4-setup.py.patch 596 BLAKE2B 15a801d87d9f690aa354162cb4966b1b691da95f7d64926f1b2ab66bd7d1db29b208cfab0f0bbe0f8fb272d67328f1a5ffd84ceb9d7af3d457ed6cd2a7d27ec0 SHA512 2cabb09c9c6e819a43d434a813ce9eb9614c72a3687758a35f338067d9e02add657ed1feee614486c9dbcbca823a848aedc69f9ab42aabd9ebe414b645b0d67e
+AUX qhexedit2-0.8.6-sip.patch 1134 BLAKE2B a64403e077b388f7c95ec5feada3d07e7e027732cd03ae9703fba43bcbc96bb434ea6bf2b8050620404fc7129850fe6affa5bed44a8b22000f7adee782f5683f SHA512 23143fbc94ec2eab8c89b41ff1e1a7e432828881c337e3cd56c3f84ed9639f1c2aea76c4826ac318956cc672d4b770d22613f45c6f4473bf25ad2469b680a71b
+AUX qhexedit2-0.8.6-sip5.patch 2295 BLAKE2B 8a689da202adf6169ed34eb7c7fc0c824451f05f5030fa457a7bdef4ec079c8df7b688a91855d7fc98b96f9e112c98e1805233af19b42fbd570eab6ed3fafa33 SHA512 0bc8a18085e9f928026ae852820b5a2cd6f8bea56f6193359d05c439fea3eb71a6baf3cf529d5f8ea95b6d0a1c28a460dedf1430e06f56486be108402c213daf
+AUX qhexedit2-0.8.9-fix-crash.patch 1437 BLAKE2B 8a58e4dc74de1fb5120ea7fc53df92f07d38023dede7bd4e778c7ad1de22ac981269d28fc80c1c61b7a1e448a812b4452b5a9494d486b71ff07e2e1cd07ffa24 SHA512 e8abff741616cbaf842942ff426b7ce6e43e88cd42f5c3ad282b7654ba727cacb2d3eb197656769ff1b9ff9a819a7ef61df594a686b2b339f0b67c8cfc8b55df
 AUX qhexedit2-0.8.9.patch 1135 BLAKE2B fb9c3c9a4fa01b6cba9b3ca12a1a1e82f1503663bb186835b56d2610145bf3c1e211ab31c705d55cc9f3e22312c566058b816c20a4a65c7d7a501bd05db3fb8f SHA512 934bd0422b539459b446fc6ea18806f9fe6f6e107822dc4a94150632fdef35b091ca309cb0a5b7eb96c325c4d71091314c89907ce6c6404e0a6d8ebd126c58c3
 DIST qhexedit2-0.8.6_p20190316.tar.gz 355512 BLAKE2B a7edc8d05a7788f3a3f2202762ca3dc436cafbde1b1216ff1bb342055600a2e9d53c27fe324380331b8182904545c698106129238065cd2416d244fdfa176446 SHA512 4ef288c8a220c308d38c41fee83fe962e213cdfa448445ef73c3d2fe1952b68f2096732e78d2aa0a87eddd3cf2f47bed3e77807e12d2b7616c1447b3bf1b0e7d
 DIST qhexedit2-0.8.9_p20210525.tar.gz 342178 BLAKE2B baffe5b5e1130476162f23a91420cc86675a162c39539c9f07685cecc82571817625202814006221f96b56e94c0325fd7a6d8f2294041b426054f809c9967bad SHA512 d8a5159433a1212085371473cc7a89c4888c6af6b1416a34e3ea9d1ef9ae19411af32bea2e2fb256a024d6f2d05c733d285314cfc17f37dae065d7407a9c0d2c
+EBUILD qhexedit2-0.8.6_p20190316-r2.ebuild 2284 BLAKE2B 0a3e943b1b04852de5e72c1ae34f4767ab04ac29c4e18e54148ea39201e367116fb99987b3d12228518b4f2013a37c29121a671c6decd32c24b0bd96cd1a9dc8 SHA512 4aca967f831c7774618f8e596e7b13b160e975b66ef23d4a1a9733a8fd6db0860ede6a1fb0b89d06270dcdcfda7bd7cd378fe9845a0632da5d7814eb3f2d3d3f
 EBUILD qhexedit2-0.8.6_p20190316.ebuild 1878 BLAKE2B deb3b0b20fd1681443e3e05fec6d35006966f94613e6397940f08220db939b5240924929aaa6095670c590f9bebdd6857a517b45855fb1f7081202248e3abe63 SHA512 1722f81744db0e01ed78ca3f2ae664510fd11a5fc42db897a8bf2defd8f432a0c06470e19a70b365b6c31f625f7b793d45d131c089b3368a13ef6b549694930a
+EBUILD qhexedit2-0.8.9_p20210525-r2.ebuild 2370 BLAKE2B fdf16a540f1585f8ed620a5f209e6594a0f6ff2993a2c9503e4959a798cb4f3c8952345c14957e7551b4e6d1109b76910240f13c1faa3f07cf78dac1d1e9db18 SHA512 783dd4e2ee8e6b9e2f1ec47e22e64a80003bfa73e0c024e6f1e1ff8c7c0b443b3016372cf37dd5d6f56ec18d3f5dce4381f280d84769f74030c19eb80532bb47
 EBUILD qhexedit2-0.8.9_p20210525.ebuild 1671 BLAKE2B e36e973b9137abda5736e5e9eba1c5f0a2396651315e86c4b6f91f499d5ccbcb2b64e9c552fc88503d62f8d28cdbbd80056680da8876b6e0a3cecfa17da68848 SHA512 d941ac5d83ccb9e1bee51a64397bb749416df4d7a363f88bf36c8108f565eee6d9399f3dc58266aeea0921137b8f8d4445041ce233ae154dba342b6c26dd0d26
-MISC metadata.xml 636 BLAKE2B a6f5b56c36f34d3906a135d7b2516bcbbfb47c13b01a98284b8a9d9e1de2cc2d46918459901c4c2b7984d7844c3d7b4fcc6631f0398b25a89e61be0edab80335 SHA512 2cce503a57e04e07b2160c1d3ae4118a7b73b059eab3defb2102b7da46cc39dae277ad01915240ca16349b8a094b1d4494f2267df2b8fb4bdd7d9a305ebadb8b
+MISC metadata.xml 877 BLAKE2B f7343c25b4643b468d75938b4af93a8e52e10ebb1bc774c3caada33d202d0ea938789bc9400584fc78098b05c7a029c9be781f37302ac8edf7cae40659f6d9a9 SHA512 897f7435ec755c6689192e762172fc02a10ea043d7ba2662eb88dd7db4856dbe82e95c3b7fed890ee6dd2f8b11a3dd77e25af4ec56b69cb7191c5805b31371b3
diff --git a/app-editors/qhexedit2/files/qhexedit2-0.8.6-sip.patch b/app-editors/qhexedit2/files/qhexedit2-0.8.6-sip.patch
new file mode 100644
index 000000000000..56ae97159030
--- /dev/null
+++ b/app-editors/qhexedit2/files/qhexedit2-0.8.6-sip.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/820473
+From bdb22d3542099d7e1933aaffa80e044375466914 Mon Sep 17 00:00:00 2001
+From: Huang Rui <vowstar@gmail.com>
+Date: Sat, 7 May 2022 14:49:35 +0800
+Subject: [PATCH] setup.py: fix pyqt_sip_dir on modern Linux distributions
+
+QtCore/QtCoremod.sip may be installed to:
+/usr/lib/python3.9/site-packages/PyQt5/bindings/QtCore/QtCoremod.sip
+See also: https://github.com/qgis/QGIS/blob/master/cmake/FindPyQt5.py
+
+Closes: https://bugs.gentoo.org/820473
+Signed-off-by: Huang Rui <vowstar@gmail.com>
+---
+ setup.py | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/setup.py b/setup.py
+index 1a0d912..1906a07 100644
+--- a/setup.py
++++ b/setup.py
+@@ -10,6 +10,14 @@
+ 
+ cfg = sipconfig.Configuration()
+ pyqt_sip_dir = cfg.default_sip_dir
++for p in (os.path.join(pyqt_sip_dir, "PyQt5"),
++          os.path.join(pyqt_sip_dir, "PyQt5-3"),
++          os.path.join(pyqt_sip_dir, "PyQt4"),
++          pyqt_sip_dir,
++          os.path.join(cfg.default_mod_dir, "PyQt5", "bindings")):
++    if os.path.exists(os.path.join(p, "QtCore", "QtCoremod.sip")):
++        pyqt_sip_dir = p
++        break
+ 
+ try:
+     import PyQt5
diff --git a/app-editors/qhexedit2/files/qhexedit2-0.8.6-sip5.patch b/app-editors/qhexedit2/files/qhexedit2-0.8.6-sip5.patch
new file mode 100644
index 000000000000..0cc134e32358
--- /dev/null
+++ b/app-editors/qhexedit2/files/qhexedit2-0.8.6-sip5.patch
@@ -0,0 +1,82 @@
+https://bugs.gentoo.org/820473
+https://bugs.gentoo.org/815133
+https://github.com/Simsys/qhexedit2/pull/137
+https://src.fedoraproject.org/rpms/qhexedit2/blob/rawhide/f/sip5.patch
+From ce17d35586de1b9fdc21e3f8450dd1d2b76d5bcc Mon Sep 17 00:00:00 2001
+From: Scott Talbert <swt@techie.net>
+Date: Mon, 18 Jan 2021 21:06:46 -0500
+Subject: [PATCH] Add support for building with sip 5
+
+---
+ project.py       | 29 +++++++++++++++++++++++++++++
+ pyproject.toml   | 14 ++++++++++++++
+ src/qhexedit.sip |  2 +-
+ 3 files changed, 44 insertions(+), 1 deletion(-)
+ create mode 100644 project.py
+ create mode 100644 pyproject.toml
+
+diff --git a/project.py b/project.py
+new file mode 100644
+index 0000000..c9ee67f
+--- /dev/null
++++ b/project.py
+@@ -0,0 +1,29 @@
++"""The build configuration file for QHexEdit, used by sip."""
++
++import os
++from os.path import abspath, join
++from sipbuild import Option
++from pyqtbuild import PyQtBindings, PyQtProject
++import PyQt5
++
++
++class QHexEditProject(PyQtProject):
++    """The QHexEdit Project class."""
++
++    def __init__(self):
++        super().__init__()
++        self.bindings_factories = [QHexEditBindings]
++
++    def update(self, tool):
++        """Allows SIP to find PyQt5 .sip files."""
++        super().update(tool)
++        self.sip_include_dirs.append(join(PyQt5.__path__[0], 'bindings'))
++
++
++class QHexEditBindings(PyQtBindings):
++    """The QHexEdit Bindings class."""
++
++    def __init__(self, project):
++        super().__init__(project, name='QHexEdit',
++                         sip_file='qhexedit.sip',
++                         qmake_QT=['widgets'])
+diff --git a/pyproject.toml b/pyproject.toml
+new file mode 100644
+index 0000000..b5edaa4
+--- /dev/null
++++ b/pyproject.toml
+@@ -0,0 +1,14 @@
++[build-system]
++requires = ["sip >=5, <7", "PyQt-builder >=1.1.0, <2", "PyQt5"]
++build-backend = "sipbuild.api"
++
++[tool.sip.metadata]
++name = "QHexEdit"
++version = "0.8.9"
++
++[tools.sip]
++abi-version = "12.8"
++project-factory = "pyqtbuild:PyQtProject"
++
++[tool.sip.project]
++sip-files-dir = "src"
+diff --git a/src/qhexedit.sip b/src/qhexedit.sip
+index f7db293..6d4ebae 100644
+--- a/src/qhexedit.sip
++++ b/src/qhexedit.sip
+@@ -1,4 +1,4 @@
+-%Module(name=qhexedit, version=1)
++%Module(name=qhexedit)
+ 
+ %Import QtCore/QtCoremod.sip
+ %Import QtGui/QtGuimod.sip
diff --git a/app-editors/qhexedit2/files/qhexedit2-0.8.9-fix-crash.patch b/app-editors/qhexedit2/files/qhexedit2-0.8.9-fix-crash.patch
new file mode 100644
index 000000000000..9c3099b06d28
--- /dev/null
+++ b/app-editors/qhexedit2/files/qhexedit2-0.8.9-fix-crash.patch
@@ -0,0 +1,37 @@
+https://github.com/Simsys/qhexedit2/pull/139
+From d314aab25eeab0db131fc87f20daf7c4ad587ee2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E8=AF=B7=E5=8F=AB=E6=88=91=E8=88=B9=E9=95=BF?=
+ <38233142+thinkSJ@users.noreply.github.com>
+Date: Sat, 13 Nov 2021 18:35:25 +0800
+Subject: [PATCH] Update qhexedit.cpp
+
+crashed when press ctrl alt keys....
+---
+ src/qhexedit.cpp | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/src/qhexedit.cpp b/src/qhexedit.cpp
+index d7e532c..4137192 100644
+--- a/src/qhexedit.cpp
++++ b/src/qhexedit.cpp
+@@ -766,11 +766,15 @@ void QHexEdit::keyPressEvent(QKeyEvent *event)
+             (QApplication::keyboardModifiers() == Qt::GroupSwitchModifier))
+         {
+             /* Hex and ascii input */
+-            int key;
+-            if (_editAreaIsAscii)
+-                key = (uchar)event->text().at(0).toLatin1();
+-            else
+-                key = int(event->text().at(0).toLower().toLatin1());
++            int key = 0;
++            QString text = event->text();
++            if (!text.isEmpty())
++            {
++                if (_editAreaIsAscii)
++                    key = (uchar)text.at(0).toLatin1();
++                else
++                    key = int(text.at(0).toLower().toLatin1());
++            }
+ 
+             if ((((key >= '0' && key <= '9') || (key >= 'a' && key <= 'f')) && _editAreaIsAscii == false)
+                 || (key >= ' ' && _editAreaIsAscii))
diff --git a/app-editors/qhexedit2/metadata.xml b/app-editors/qhexedit2/metadata.xml
index 7db8b420f3d9..f7e7eb3ae5ad 100644
--- a/app-editors/qhexedit2/metadata.xml
+++ b/app-editors/qhexedit2/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <!-- maintainer-needed -->
+    <maintainer type="person">
+            <email>vowstar@gmail.com</email>
+            <name>Huang Rui</name>
+    </maintainer>
+    <maintainer type="project">
+            <email>proxy-maint@gentoo.org</email>
+            <name>Proxy Maintainers</name>
+    </maintainer>
     <use>
         <flag name="gui">Install Qt5 hex editor</flag>
     </use>
diff --git a/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316-r2.ebuild b/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316-r2.ebuild
new file mode 100644
index 000000000000..094aed04481c
--- /dev/null
+++ b/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316-r2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-r1 qmake-utils
+
+EGIT_COMMIT="ba5af8616b3a6c916e718914225a483267c01356"
+DESCRIPTION="Hex editor library, Qt application written in C++ with Python bindings"
+HOMEPAGE="https://github.com/lancos/qhexedit2/"
+SRC_URI="https://github.com/lancos/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="doc +gui python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.8.4-setup.py.patch"
+	"${FILESDIR}/${PN}-0.8.6-sip5.patch" #820473
+)
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-python/PyQt5-5.15.6[gui,widgets,${PYTHON_USEDEP}]
+		')
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	python? (
+		$(python_gen_cond_dep '
+			>=dev-python/PyQt-builder-1.10[${PYTHON_USEDEP}]
+			>=dev-python/sip-5:=[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+src_prepare() {
+	default
+	sed -i -e '/^unix:DESTDIR/ d' -e "\$atarget.path = /usr/$(get_libdir)" \
+		-e "\$aINSTALLS += target" src/qhexedit.pro \
+		|| die "src/qhexedit.pro: sed failed"
+}
+
+src_configure() {
+	eqmake5 src/qhexedit.pro
+	if use gui; then
+		cd example || die "can't cd example"
+		eqmake5 qhexedit.pro
+	fi
+}
+
+src_compile() {
+	emake
+	use gui && emake -C example
+	if use python; then
+		export PATH="$(qt5_get_bindir):${PATH}"
+		python_build() {
+			pushd "${S}" || die
+			sip-build || die
+			popd || die
+		}
+		python_foreach_impl run_in_build_dir python_build
+	fi
+}
+
+src_test() {
+	cd test || die "can't cd test"
+	mkdir logs || die "can't create logs dir"
+	eqmake5 chunks.pro
+	emake
+	./chunks || die "test run failed"
+	grep -q "^NOK" logs/Summary.log && die "test failed"
+}
+
+src_install() {
+	doheader src/*.h
+	dolib.so libqhexedit.so*
+	if use python; then
+		python_install() {
+			pushd "${S}"/build || die
+			emake INSTALL_ROOT="${D}" install
+			popd || die
+		}
+		python_foreach_impl run_in_build_dir python_install
+	fi
+	if use gui; then
+		dobin example/qhexedit
+		insinto /usr/share/${PN}/
+		doins example/translations/*.qm
+	fi
+	if use doc; then
+		dodoc -r doc/html
+		dodoc doc/release.txt
+	fi
+}
diff --git a/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r2.ebuild b/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r2.ebuild
new file mode 100644
index 000000000000..731f3fb8d1af
--- /dev/null
+++ b/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-r1 qmake-utils
+
+EGIT_COMMIT="541139125be034b90b6811a84faa1413e357fd94"
+DESCRIPTION="Hex editor library, Qt application written in C++ with Python bindings"
+HOMEPAGE="https://github.com/Simsys/qhexedit2/"
+SRC_URI="https://github.com/Simsys/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~riscv x86"
+IUSE="doc +gui python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.8.4-setup.py.patch"
+	"${FILESDIR}/${PN}-0.8.6-sip.patch" #820473
+	"${FILESDIR}/${PN}-0.8.6-sip5.patch" #820473
+	"${FILESDIR}/${PN}-0.8.9-fix-crash.patch"
+)
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-python/PyQt5-5.15.6[gui,widgets,${PYTHON_USEDEP}]
+		')
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	python? (
+		$(python_gen_cond_dep '
+			>=dev-python/PyQt-builder-1.10[${PYTHON_USEDEP}]
+			>=dev-python/sip-5:=[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+src_prepare() {
+	default
+	sed -i -e '/^unix:DESTDIR/ d' -e "\$atarget.path = /usr/$(get_libdir)" \
+		-e "\$aINSTALLS += target" src/qhexedit.pro \
+		|| die "src/qhexedit.pro: sed failed"
+}
+
+src_configure() {
+	eqmake5 src/qhexedit.pro
+	if use gui; then
+		cd example || die "can't cd example"
+		eqmake5 qhexedit.pro
+	fi
+}
+
+src_compile() {
+	emake
+	use gui && emake -C example
+	if use python; then
+		export PATH="$(qt5_get_bindir):${PATH}"
+		python_build() {
+			pushd "${S}" || die
+			sip-build || die
+			popd || die
+		}
+		python_foreach_impl run_in_build_dir python_build
+	fi
+}
+
+src_test() {
+	cd test || die "can't cd test"
+	mkdir logs || die "can't create logs dir"
+	eqmake5 chunks.pro
+	emake
+	./chunks || die "test run failed"
+	grep -q "^NOK" logs/Summary.log && die "test failed"
+}
+
+src_install() {
+	doheader src/*.h
+	dolib.so libqhexedit.so*
+	if use python; then
+		python_install() {
+			pushd "${S}"/build || die
+			emake INSTALL_ROOT="${D}" install
+			popd || die
+		}
+		python_foreach_impl run_in_build_dir python_install
+	fi
+	if use gui; then
+		dobin example/qhexedit
+		insinto /usr/share/${PN}/
+		doins example/translations/*.qm
+	fi
+	if use doc; then
+		dodoc -r doc/html
+		dodoc doc/release.txt
+	fi
+}
diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest
index 99e68a4b9082..d2d62b0582c7 100644
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@@ -1,4 +1,6 @@
 DIST ReText-7.2.2.tar.gz 522652 BLAKE2B f9b19f985c1381eade324758c4dc6bf2e5f74bc3f5bfc27afa10462b7387f64a3e72edd5875aabf1831f1f0a942f395e43b124c172cac8cec4b9f19334661484 SHA512 68345b57b2c5446158ed3a6f97b5ead103ef1c99a3aea9cbc69ef7d0807fb64546f38ebde2969b94429eeed6450abb345fecc566dcf6e0767fe84c4e27348e53
+DIST ReText-7.2.3.tar.gz 527428 BLAKE2B 3c710769a881275d74018ba319b174020dda0b65da22ae926231af56901b56c31b3cff69119a9bb378cd218d7b793f002bb08bf1483cc1e55c95a4963cbe1598 SHA512 eb337866f5dfacad2f23435f09b550f4378df5bb261d6f79b1708fed9e7bd93e96e8f06f940cb7109fe02aa6df0592b151f11dfe13853799f0b1ac2c1065a0da
 EBUILD retext-7.2.2.ebuild 1976 BLAKE2B e50052619b4664d384b13993041fa78b0eeca5f2fc084662c42f3912249863c5e079a8d4041f4f44e4913d1b9c2f06653d589600837cb934c116529fa562c58c SHA512 df0c32f8d6afcef5207ce9edba6ad2008078f1556f370d7708e41980f00dddd148aa867747b632bf96cb9494521474a6639d708570c269faa0379423e6846dc4
-EBUILD retext-9999.ebuild 1978 BLAKE2B 2103f21e3e2fe6ca561bd0f7b2f6b4506205c77820d0af3a5648595bd79286dabfb53477eb48bce740bb4fdfcf4a7669770db50f74b12b33418007df37ebb1e4 SHA512 ef94587ec55d30254086a90cab157d31bdee07bbca4b1449e71f9d0d5877c3ff2256765ef731eb273b280eba6fd7fa0426e30ad016a552c1c0bfc6d7b27dcc48
+EBUILD retext-7.2.3.ebuild 2022 BLAKE2B 47b58eb7b230911f3daa28ad9240a750aef63710560eaf6ef4dd9c3f3f0cea01d9a5f62ae745cd4d36564e3ef0ddd3d9ebe071ada2ef52f5759cb424b5fe9c97 SHA512 e1043f16a139a9eaf93b32fcf08538a2280a7091b91dabbe76b944382bf5006f09befdf8655f7d58871073ddb28b763ac789319b42e7d4f18ed4469be222718a
+EBUILD retext-9999.ebuild 2022 BLAKE2B 47b58eb7b230911f3daa28ad9240a750aef63710560eaf6ef4dd9c3f3f0cea01d9a5f62ae745cd4d36564e3ef0ddd3d9ebe071ada2ef52f5759cb424b5fe9c97 SHA512 e1043f16a139a9eaf93b32fcf08538a2280a7091b91dabbe76b944382bf5006f09befdf8655f7d58871073ddb28b763ac789319b42e7d4f18ed4469be222718a
 MISC metadata.xml 298 BLAKE2B 82f3b1a76b71a731c76a61612a0e3a31634b08ab73d1ff9d57c9c68fdd68b0acf9387a5024772c9fe80d4f54d2134c591b17bc4c519d06b50491671042f4c635 SHA512 5e439ee1dae76ef108f8a5f28a5e4305181eacab14c9b239d5f3d4a6b25a25a59617eaa5d2df13b5fba8362d6b8f3af43af8fa9df22715867e170d29cf649c5c
diff --git a/app-editors/retext/retext-7.2.3.ebuild b/app-editors/retext/retext-7.2.3.ebuild
new file mode 100644
index 000000000000..214372f2d90a
--- /dev/null
+++ b/app-editors/retext/retext-7.2.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please don't add pypy support before testing if it's actually supported. The
+# old compat matrix is no longer accessible as of 2021-02-13 but stated back
+# in 2020-07-05 that PyQt5 was explicitly not supported.
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit distutils-r1 optfeature qmake-utils virtualx xdg
+
+MY_PN="ReText"
+MY_P="${MY_PN}-${PV/_/~}"
+
+DESCRIPTION="Simple editor for Markdown and reStructuredText"
+HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/retext-project/retext.git"
+else
+	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
+
+	KEYWORDS="~amd64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+	>=dev-python/markups-3.1.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/python-markdown-math[${PYTHON_USEDEP}]
+	dev-python/PyQt5[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools
+	test? ( dev-python/PyQt5[testlib,${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests unittest
+
+pkg_setup() {
+	# Needed for lrelease
+	export PATH="$(qt5_get_bindir):${PATH}"
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	eunittest || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "dictionary support" dev-python/pyenchant
+	# See https://bugs.gentoo.org/772197.
+	optfeature "rendering with webengine" dev-python/PyQtWebEngine
+
+	einfo "Starting with retext-7.0.4 the markdown-math plugin is installed."
+	einfo "Note that you can use different math delimiters, e.g. \(...\) for inline math."
+	einfo "For more details take a look at:"
+	einfo "https://github.com/mitya57/python-markdown-math#math-delimiters"
+}
diff --git a/app-editors/retext/retext-9999.ebuild b/app-editors/retext/retext-9999.ebuild
index ac4f08fb2467..214372f2d90a 100644
--- a/app-editors/retext/retext-9999.ebuild
+++ b/app-editors/retext/retext-9999.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # Please don't add pypy support before testing if it's actually supported. The
 # old compat matrix is no longer accessible as of 2021-02-13 but stated back
 # in 2020-07-05 that PyQt5 was explicitly not supported.
 PYTHON_COMPAT=( python3_{8,9,10} )
 
-inherit distutils-r1 optfeature virtualx xdg-utils
+inherit distutils-r1 optfeature qmake-utils virtualx xdg
 
 MY_PN="ReText"
 MY_P="${MY_PN}-${PV/_/~}"
@@ -40,19 +40,28 @@ RDEPEND="
 	dev-python/PyQt5[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-python/PyQt5[testlib,${PYTHON_USEDEP}] )"
+BDEPEND="
+	dev-qt/linguist-tools
+	test? ( dev-python/PyQt5[testlib,${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests unittest
+
+pkg_setup() {
+	# Needed for lrelease
+	export PATH="$(qt5_get_bindir):${PATH}"
+}
 
 src_test() {
 	virtx distutils-r1_src_test
 }
 
 python_test() {
-	esetup.py test
+	eunittest || die
 }
 
 pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
+	xdg_pkg_postinst
 
 	optfeature "dictionary support" dev-python/pyenchant
 	# See https://bugs.gentoo.org/772197.
@@ -63,8 +72,3 @@ pkg_postinst() {
 	einfo "For more details take a look at:"
 	einfo "https://github.com/mitya57/python-markdown-math#math-delimiters"
 }
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 95a18de46dc5..324c8ed0edf8 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -1,7 +1,7 @@
 DIST scite-5.1.1.tgz 3374717 BLAKE2B b7a45a86008eb592adacc8fde90cb637cc7cac821f339bb65920aaf912ee10d52badde3ed2e71118a7ce4690a0536b298c5fe5f673b886902ad4634b3a1ffaa6 SHA512 4d6c9b3ca4caed4fcb70a6b1c86a2ace13b023241f16d6faa01b3f692bcbfa14e0ce186bb08776ee0cf62768b2b77c4ffcae610ddbb6b04dcb7584fd8b3f27bb
 DIST scite-5.1.3.tgz 3427245 BLAKE2B ca765b61cb1fa96934c1e28d76a97cd7086a6c692ae33bb57591dfbc8637ffc94c4a3f20f9c6b55d11da8a76664f1d521f7e393bf6f31db55cbe02e0bf5052ba SHA512 ef86a18f739062598d3c7bf19bcd2f38ca012e890b9b4685c1f1b809e928762ab60d24c33a1f45ca33133ce5007e3a22a76e80222b121c9a4089d3c57aa0bc4c
 DIST scite-5.1.6.tgz 3436413 BLAKE2B 3bf578d750c844cebc187662d658556ba58934929872b74012b299e10f6057352d184542e37433e3e031fa566b28e91d51a5d00687c6a4df35301d8ceb75a795 SHA512 3983034e5a14d696a455375eb4ca922c458c9f74fd1d2e6c7b1735914a733978b65119b9370167227e50d20d4c6f636b96bb4d1d8eb8fe8ae1d7f7ca1c143e20
-EBUILD scite-5.1.1.ebuild 2897 BLAKE2B c86eaf29cdd5defec9555ac0a4314e3583c6445e4157b8d092d26971e97e67507dacf9b4fe64f951fe3adfcddb86bd28e4b913bce70bb2a707c0739564f76fd8 SHA512 8c0a33dac9495614ee71fe08c66f082499dfea67b820d2cf08ce49f6693f92d63c3ff967b22057eca1dd6f6b87f979bb08ac6f16080103b29625ab152ad03de1
-EBUILD scite-5.1.3.ebuild 2904 BLAKE2B fb2515644723a09e2045de3af4b1977b775c9eea63b66e583ed242e17742718bcbf627dda94127adb45c180a75495f55b3a957e8a2a954eec9ec4455c35df6b5 SHA512 c86bab69053b8d414f698b0ce7de42535c8d95c62700262e440460dbbd51700b85302443655b33d9cd33f0688ad3f5b8b2fee1a59459922a318ce7c7cc35553b
-EBUILD scite-5.1.6.ebuild 2907 BLAKE2B 716f27367b71ec292cbb74a3ed832ea5a8544d4e9af4ba1d6632a7fd76ab236551b4520daa831032bec9f0f3d736ef77058e0d629cab130a0267e250292516c9 SHA512 2fbc30e3a70d1e1cc0edf7ace8b1b252ba0be27c330985464eb11bc84bf25e9ebe8799daf76086e3e7e934310684783948f1993ec22339c2b4802817b1e0a102
+EBUILD scite-5.1.1.ebuild 2392 BLAKE2B 961960cb16d294c7c546aa3576551d47d2f08fc4305be47d70e18247a25ca8d86225cdd1d6f7d3c7e47c9a5dd5530e177a89cf29bb32600c64222f0cf5afc9d8 SHA512 2a5cf39d354c248ac1d743e1a9a01e77657cd681a2c41380c05699035ad6a2e7203baa5dfa8262955fa2209b0d381344759de3a16fa93e60eb1090b74e5abbe5
+EBUILD scite-5.1.3.ebuild 2399 BLAKE2B aa552326db18257573410f3759bec58c93fa6b331997c0475f459c698f41f685cde2d05e5c9ba88e70998566a45b6a18a52a128dc5d3ad00b429d9f7e9043221 SHA512 777e8ec73b35e14962728cbfa6ca7dbe1170ccab75c2abe0cb184580a9fffb2192df27fe853fd0f65018c9991dd33dfca059b086a64f85be4f2a7044fc024bd8
+EBUILD scite-5.1.6.ebuild 2402 BLAKE2B 86ec7a053d1f68d5d89e016e89ec2e454fd51ae721e5db9321f6b25b0f33330e43ece975f59ce083bf2f11eba8d1ed16f8ad2bcd0fdb1ac8e003b4548b197e6a SHA512 d7457b043d4bcee57b2004807c698ce2838ecbc798a731d068336cbf367b807650a47e8f8e571f3fc365140d29b899f0414dacd4edab13f921ac23539b525e0e
 MISC metadata.xml 477 BLAKE2B 6b4ee233530c91bd81cb7aaec6533f9d4f917765d372e8e84bed225da07b0db5e94f00d34644d9496a3d7321c8a16dc6e65b993263901ab8e58b65664f50458c SHA512 b7329399a31e6e514cebc509b048943a4cce7fca1affc7ac9f401420e885d51a7af6f60d61bc5405326c54a2d1207583f066e3b77ab4b08d00333b6ec43cdc0d
diff --git a/app-editors/scite/scite-5.1.1.ebuild b/app-editors/scite/scite-5.1.1.ebuild
index c3e280ecf802..55863b5a601e 100644
--- a/app-editors/scite/scite-5.1.1.ebuild
+++ b/app-editors/scite/scite-5.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,24 +36,6 @@ DOCS=("../README")
 
 S="${WORKDIR}/${PN}/gtk"
 
-pkg_pretend() {
-	if tc-is-clang ; then
-		# need c++17 features
-		[[ "${MERGE_TYPE}" != "binary" &&
-		$(clang-major-version) -lt 5 ]] &&
-		die "Sorry, SCiTE uses C++17 Features and needs >sys-devel/clang-5
-		($(clang-major-version))."
-
-	elif tc-is-gcc; then
-		# older gcc is not supported
-		[[ "${MERGE_TYPE}" != "binary" &&
-		$(gcc-major-version) -lt 7 ]] &&
-		die "Sorry, Scite uses C++17 Features, need >sys-devel/gcc-7."
-	else
-		die "Either gcc or clang should be configured for building scite"
-	fi
-}
-
 pkg_setup() {
 	use lua && lua-single_pkg_setup
 }
diff --git a/app-editors/scite/scite-5.1.3.ebuild b/app-editors/scite/scite-5.1.3.ebuild
index 3defc2beced6..56eaa7f3c945 100644
--- a/app-editors/scite/scite-5.1.3.ebuild
+++ b/app-editors/scite/scite-5.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,24 +36,6 @@ DOCS=("../README")
 
 S="${WORKDIR}/${PN}/gtk"
 
-pkg_pretend() {
-	if tc-is-clang ; then
-		# need c++17 features
-		[[ "${MERGE_TYPE}" != "binary" &&
-		$(clang-major-version) -lt 5 ]] &&
-		die "Sorry, SCiTE uses C++17 Features and needs >sys-devel/clang-5
-		($(clang-major-version))."
-
-	elif tc-is-gcc; then
-		# older gcc is not supported
-		[[ "${MERGE_TYPE}" != "binary" &&
-		$(gcc-major-version) -lt 7 ]] &&
-		die "Sorry, Scite uses C++17 Features, need >sys-devel/gcc-7."
-	else
-		die "Either gcc or clang should be configured for building scite"
-	fi
-}
-
 pkg_setup() {
 	use lua && lua-single_pkg_setup
 }
diff --git a/app-editors/scite/scite-5.1.6.ebuild b/app-editors/scite/scite-5.1.6.ebuild
index f04689f90329..f2887e4b0f91 100644
--- a/app-editors/scite/scite-5.1.6.ebuild
+++ b/app-editors/scite/scite-5.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,24 +36,6 @@ DOCS=("../README")
 
 S="${WORKDIR}/${PN}/gtk"
 
-pkg_pretend() {
-	if tc-is-clang ; then
-		# need c++17 features
-		[[ "${MERGE_TYPE}" != "binary" &&
-		$(clang-major-version) -lt 5 ]] &&
-		die "Sorry, SCiTE uses C++17 Features and needs >sys-devel/clang-5
-		($(clang-major-version))."
-
-	elif tc-is-gcc; then
-		# older gcc is not supported
-		[[ "${MERGE_TYPE}" != "binary" &&
-		$(gcc-major-version) -lt 7 ]] &&
-		die "Sorry, Scite uses C++17 Features, need >sys-devel/gcc-7."
-	else
-		die "Either gcc or clang should be configured for building scite"
-	fi
-}
-
 pkg_setup() {
 	use lua && lua-single_pkg_setup
 }
diff --git a/app-editors/vile/Manifest b/app-editors/vile/Manifest
index 2e165389872d..dc50fdb902ce 100644
--- a/app-editors/vile/Manifest
+++ b/app-editors/vile/Manifest
@@ -1,5 +1,5 @@
 DIST vile-9.8t.tgz 2352119 BLAKE2B fc1c75eba09e8be99945ba0d178fd150576d8108f906afb20dba265adaee9e5bea4869415d3ebceabf0b6b56c147add79e9c7e4fe34d7f4744930c3728e4a4a4 SHA512 4be4e37c7231395cae9236796073c2c3e428f1945283785a931c5d4cce94e0f970efa6634b0f9053679a00f4b4577704ea38ded2129e444b26ee9935a1c3d229
-DIST vile-9.8u.tgz 2375989 BLAKE2B 86e2bb01fab7c429233484493aa33c0b807f7babedf6e69f4c526a6677471ff8e43287114073d22ebb229a801ef003779ab587c9a17474519148e1f64d58460e SHA512 fad06c8e341feec7e9aed1e53cd9a1e7fe79fdeb050aba743ac4edfb6096db88c1ef63377d6ecbeddd0eb8ad46a323bcc55d09b1ff221a75cd74a3f991e3f24d
-EBUILD vile-9.8t-r1.ebuild 948 BLAKE2B 0c99c708ed8f5bfc397920e53fef20277f30b0633ccce14e2aec9eb50676a5c6aa587d5766427371fab4ed5d8da22294044b6ea18d7aa1c488104cdb18de0b0a SHA512 6dcfbdeaae7be136dcd46245ed67d8a3e3b14b1bc97174c7d51bc9d4b70a5d2a4f2ba23d62eac2decfaf78615762da92e3fcb77f65d6d780db19e73ac1fb045c
-EBUILD vile-9.8u-r1.ebuild 1066 BLAKE2B 474e0c34dddd521e0e8dc6a0c06d66e8897210b29b4e0951f516696911773bd9499c7adf43ae72555a447ccefafccd110c1e987bb5cbde74a5f39f503febad1b SHA512 567e9d07882b35e43887af3d7a9aeccae33d5811f8a2e8bcf52244f5bca8387a1c229e2f42d34bd40e4312a854f8fb4ab9c5c631b29c81598157f20a13b93a75
+DIST vile-9.8v.tgz 2405398 BLAKE2B cd8753c57ff95c9b420026128fd19b7c689c99500da7cae91d3160dded46aa101b0cae32daeaf0377d4d72a5e526e8e4f25422bbbff2cc5ecdef10b7f04c8b39 SHA512 b752f26148bd4411ab6b31697459a16d8168f79ffad6b3509d6cf5d40611176b833e56f4bac21fe18ecdd256be467ba96ea98149daceab671002df49508eb8d2
+EBUILD vile-9.8t-r2.ebuild 950 BLAKE2B 5d082c434b62bab766ee593d91ba0ce24e7752aef614200961574124805d762b40f6ccba501146a761a5c51f76af02604bbec7e8d9d28b63c6d71d18f82350ba SHA512 96666520c3e73d5af37a75cd448a49f87c17191746e89007e26605568b296c7b167b372f0d5545f7e9c6f23b436eae96a3f637e034c4ab1a485ec5f8e285dd9c
+EBUILD vile-9.8v.ebuild 1114 BLAKE2B 68a2af209f156fef9008379068fa5e8bfb606704ec0624a5367ead7c6a1c98faca8df7138d23f2d7e981487b3031e0894e39ab516e6352dcc2109e06525f503d SHA512 51183d1418065aa77c408cdfadbc3b42573a2ac093dde690256fd936e028fd121345e0482c27c39673eb4675423a9a7cc07ffed84868571d140b4124aac98730
 MISC metadata.xml 347 BLAKE2B 5546714e3c87c1f8380e655e16cf7915878127cbf23ba125010a023056f73e20acb3a268aec33c1829244b7d637f62c47003d98ce90ac127035853b8f2c68ca5 SHA512 a0f8b7dd3327440537748c2e2faaf268efd46b20cbddfb9cbb1ced71b04ed37fd7b65ab3d317d1bc260fdad7497f60e32d29d9313764cdb0896f7137c39fa2e5
diff --git a/app-editors/vile/vile-9.8t-r1.ebuild b/app-editors/vile/vile-9.8t-r2.ebuild
index 33ec3695241b..add73176aa2f 100644
--- a/app-editors/vile/vile-9.8t-r1.ebuild
+++ b/app-editors/vile/vile-9.8t-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ IUSE="perl"
 
 RDEPEND=">=sys-libs/ncurses-5.2:0=
 	virtual/libcrypt:=
-	perl? ( dev-lang/perl )"
+	perl? ( dev-lang/perl:= )"
 DEPEND="${RDEPEND}
 	sys-devel/flex
 	app-eselect/eselect-vi"
diff --git a/app-editors/vile/vile-9.8u-r1.ebuild b/app-editors/vile/vile-9.8v.ebuild
index 9766f07f55c8..60b94f7129b1 100644
--- a/app-editors/vile/vile-9.8u-r1.ebuild
+++ b/app-editors/vile/vile-9.8v.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+# Bump with app-editors/xvile
 
 DESCRIPTION="VI Like Emacs -- yet another full-featured vi clone"
 HOMEPAGE="https://invisible-island.net/vile/"
-SRC_URI="ftp://ftp.invisible-island.net/vile/current/${P}.tgz"
+SRC_URI="https://invisible-island.net/archives/vile/current/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="perl iconv"
 
-RDEPEND="app-eselect/eselect-vi
-	>=sys-libs/ncurses-5.2:0=
+RDEPEND=">=sys-libs/ncurses-5.2:=
 	virtual/libcrypt:=
 	iconv? ( virtual/libiconv )
-	perl? ( dev-lang/perl )"
+	perl? ( dev-lang/perl:= )"
 DEPEND="${RDEPEND}"
 BDEPEND="sys-devel/flex
 	virtual/pkgconfig"
+IDEPEND="app-eselect/eselect-vi"
 
 src_configure() {
 	econf \
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 7eda538bfaab..de68a38c881b 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -2,25 +2,9 @@ AUX gvim.svg 4584 BLAKE2B 53d896f90404df6b185d1f4404c22e6bd6035722beb61d2223a600
 AUX vimrc-r5 7337 BLAKE2B 3f28db016b3956b4c5e2833ff4440417d3ccdc446618a776119513549c0b9831d0eb4bfb9abf992e436508b95f0586f2b4fc30ddba7f2b595574a5c2ccc257c8 SHA512 b9cc07386b97e6042166b11cd6270d4c3134eb816ff396ad544cfb14b349d79b32b5a07b5995580aea607b7936eef0dfd5ab1dc7e158dea26afc0c944fae8e3c
 AUX xxd-completion 461 BLAKE2B 1f36c4877fffd68e951d80c1a64cd2d458d92555a99fd06e29513da8caa6c28c27e44131b2873258e3ff5a0ab232d66f75a8f051ccf7a4d940b3b0102e6967dd SHA512 fc92426ea657e86ff765aa5a60736cdc70db938156dd8946db0a30c54d3f557bd8af421f1713bd750e779ccacd73f8f290a12a5e71ed48259fe1e6dece2de19c
 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
-EBUILD vim-core-8.2.0814.ebuild 7300 BLAKE2B aa73cad9bed04545abbfa8924022ec5e9a796b0f02f838bd5284d2da95de34b7665d24078a94e35e9d04bafcc2fa33a923c96c9a087081cb4d690fed25a6c3f5 SHA512 09b438dece9441fde5509fdc1091deccb4c5c90b12a71036eb71cdd45c320f50bb6abc6746b04eedf640e101c30c0c84cda9dbf3727c55254c1a5c448283db7e
-EBUILD vim-core-8.2.3428.ebuild 7366 BLAKE2B c6a15417c64899f67f0b0d2f24e1aca6926567bf06aa0a3ad02b6d4e4e97b2a18a2519bd33a90812cbd74edee79771897d5c36a12e4e693279e5ba260f9f81a8 SHA512 9d7ba3b42a87e3b73a089e43befb8db1d6cf0319de605bcee5296feb83c516a32890409ed47caf20ede9593e1cf16f190f9c2d77a211f1398b0d71cdcad0047f
-EBUILD vim-core-8.2.3567.ebuild 7381 BLAKE2B ed3bedeec4219c8daf109f3aa0830c64f84f4e7f0de84a07c8d749da92b72e996c8c9e779ce6693b6b94b815bd3a253e18d0e3100a28e53c6ca9355fccc2e3fa SHA512 30ecb645eb1723cd1fa38aba6f08b0ca0b45ac4085ee811df08b899f1feacaf336b28851fa43bf95b2b062b530f00f2ef82d9ef732795b4cf4ad6e52c5a29fcb
-EBUILD vim-core-8.2.3582.ebuild 7373 BLAKE2B 6c783035fe60f08462e8047f0ef6373a532c1c9725857710a3ef1dd94cfc3b6c7da04f50e6b8c2a5ccc52e23a6c8723201a76ec6dfe72b8752e2dd8b1f647122 SHA512 0bc0a3a25c9dc412d28235ce1eb6472a8261e3803a2bf38d30d4d118d46b2943b1088a76c5fde23ce933ced9458d61c39e5cdbc59b67d1baa14c3e48727edef7
-EBUILD vim-core-8.2.3669.ebuild 7381 BLAKE2B ed3bedeec4219c8daf109f3aa0830c64f84f4e7f0de84a07c8d749da92b72e996c8c9e779ce6693b6b94b815bd3a253e18d0e3100a28e53c6ca9355fccc2e3fa SHA512 30ecb645eb1723cd1fa38aba6f08b0ca0b45ac4085ee811df08b899f1feacaf336b28851fa43bf95b2b062b530f00f2ef82d9ef732795b4cf4ad6e52c5a29fcb
-EBUILD vim-core-8.2.3741.ebuild 7373 BLAKE2B 6c783035fe60f08462e8047f0ef6373a532c1c9725857710a3ef1dd94cfc3b6c7da04f50e6b8c2a5ccc52e23a6c8723201a76ec6dfe72b8752e2dd8b1f647122 SHA512 0bc0a3a25c9dc412d28235ce1eb6472a8261e3803a2bf38d30d4d118d46b2943b1088a76c5fde23ce933ced9458d61c39e5cdbc59b67d1baa14c3e48727edef7
-EBUILD vim-core-8.2.3950.ebuild 7381 BLAKE2B ed3bedeec4219c8daf109f3aa0830c64f84f4e7f0de84a07c8d749da92b72e996c8c9e779ce6693b6b94b815bd3a253e18d0e3100a28e53c6ca9355fccc2e3fa SHA512 30ecb645eb1723cd1fa38aba6f08b0ca0b45ac4085ee811df08b899f1feacaf336b28851fa43bf95b2b062b530f00f2ef82d9ef732795b4cf4ad6e52c5a29fcb
-EBUILD vim-core-8.2.4285.ebuild 7381 BLAKE2B ed3bedeec4219c8daf109f3aa0830c64f84f4e7f0de84a07c8d749da92b72e996c8c9e779ce6693b6b94b815bd3a253e18d0e3100a28e53c6ca9355fccc2e3fa SHA512 30ecb645eb1723cd1fa38aba6f08b0ca0b45ac4085ee811df08b899f1feacaf336b28851fa43bf95b2b062b530f00f2ef82d9ef732795b4cf4ad6e52c5a29fcb
-EBUILD vim-core-8.2.4328-r1.ebuild 7140 BLAKE2B 093fc33e2b30e6f09f5d4b6482b178332fa06b7a4b93eb050f16c9b38d8dec2c478b1db65cd925600dd85bb145bb694ff0f3b436be0128d1f869a2b6f9e55979 SHA512 e38b568ed73d6ea120c597a62c622618125dfcbd614cb1b0c58d696ebf7d5ff4ea98ecc62d0c57b0ba156e172773aac172ab2d7a66ac45d96e045a384df0a331
-EBUILD vim-core-8.2.4586.ebuild 7153 BLAKE2B 86f27f567c709ba9d5bf346ff8c1828b91a91ae6bee368d497cc0b571e947a491c2e8568ca74403eccc5051142ed463123a6aec648968a9b8dce360697953e7b SHA512 f5f647d8cd0befbb915641c6deb461ce0720f74b89be3b7a6ece064281f3f8b6600bdc9c00160be1b9ee966483ac3acc1567c7641fb143c22cdad78849d733df
-EBUILD vim-core-9999.ebuild 7153 BLAKE2B 86f27f567c709ba9d5bf346ff8c1828b91a91ae6bee368d497cc0b571e947a491c2e8568ca74403eccc5051142ed463123a6aec648968a9b8dce360697953e7b SHA512 f5f647d8cd0befbb915641c6deb461ce0720f74b89be3b7a6ece064281f3f8b6600bdc9c00160be1b9ee966483ac3acc1567c7641fb143c22cdad78849d733df
+DIST vim-8.2.5066.tar.gz 16497942 BLAKE2B 613f009f6a03e28305763e471bf55b626f37bb8b0f01324d5a676f6682811e3c4a5c11442af839d06b7d94b3938f5a30306bac576eec5d3c76f4a135a3443bb3 SHA512 27fdd1e86b0488b974a9fd60523b31ba23b581cab4c9bd15aee9ae459e2f2d028d6887adf621ee88244b74d26697fc953b08b587a3a80b316d31b65fc588ce9e
+EBUILD vim-core-8.2.4586.ebuild 7145 BLAKE2B b80dc1b8ef8b8b8601445d66396d0e3ee4a13115552930cacf8de13be456cd54c474025a7e45de83926d691ba0c4850524e5a076ec6905a5cdcfc117185d6adb SHA512 86e425f416065660943f5ef7f34bad34e5fe97ae95c07d3c17f391abc99f0326515ac4718d10a2e8b6dccf3197397cd84fe78f3e4a5bc2b27be6107a1c3c14f5
+EBUILD vim-core-8.2.5066.ebuild 7223 BLAKE2B 6093be8f1623e297f7d2a68c606b6016395dc0a7b66039e8bed2eb72b822b5653e93de8c5c40bcc8d15185d1d0779115f825ed143e1e4fa8a5fc2ea09578be54 SHA512 998ca21a03d528e4f45cb90512be707ca1a90f44c18db2e5a8ef3a76d76f1a56f73454cfdaa500e5e4a75fe867ae1cf541c3f2320ddbcbb71aa628d49309c9e1
+EBUILD vim-core-9999.ebuild 7223 BLAKE2B 6093be8f1623e297f7d2a68c606b6016395dc0a7b66039e8bed2eb72b822b5653e93de8c5c40bcc8d15185d1d0779115f825ed143e1e4fa8a5fc2ea09578be54 SHA512 998ca21a03d528e4f45cb90512be707ca1a90f44c18db2e5a8ef3a76d76f1a56f73454cfdaa500e5e4a75fe867ae1cf541c3f2320ddbcbb71aa628d49309c9e1
 MISC metadata.xml 373 BLAKE2B ed379c0c7c1b4317edd219c1257015713213d1b19255435ad216273def371f59f88ea7f3e72caf99b6b8d53b7ace2691347c8b06e5961bc4e91ac34ae77d0622 SHA512 58485928380299dee5f390b2af01dd36f4d4ed2f30fc5d8e400f0bef18f00b62b060e865b3cd24292289264870ebe89397d19d8f068b402a5748f569eb75efe7
diff --git a/app-editors/vim-core/vim-core-8.2.0814.ebuild b/app-editors/vim-core/vim-core-8.2.0814.ebuild
deleted file mode 100644
index c017b523925e..000000000000
--- a/app-editors/vim-core/vim-core-8.2.0814.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VIM_VERSION="8.2"
-inherit estack 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://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 and gvim shared files"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="nls acl minimal"
-
-DEPEND="sys-devel/autoconf"
-# avoid icon file collision bug #673880
-RDEPEND="!!<app-editors/gvim-8.1.0648"
-PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
-
-S=${WORKDIR}/vim-${PV}
-
-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 -p failed"
-	export HOME="${T}"/home
-}
-
-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 "sed failed"
-
-	# See #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
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
-
-	# 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'
-
-	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"
-
-	# Remove src/auto/configure file.
-	rm -v src/auto/configure || die "rm configure 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
-
-	# Let Portage do the stripping. Some people like that.
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
-
-	econf \
-		--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) \
-		${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-r5 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.
-		eshopts_push -s extglob
-
-		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
-		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
-		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
-
-		local keep_colors="default"
-		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
-
-		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
-		# tinkering with the next line might make bad things happen ...
-		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
-		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
-
-		# Delete skip_defaults_vim config not supported by vim[minimal]
-		sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed"
-
-		eshopts_pop
-	fi
-
-	# Delete defaults.vim to avoid conflicts with one from vim.
-	# If defaults.vim already exists in files installed from vim,
-	# do not install defaults.vim.
-	if [[ -f "${vimfiles}/defaults.vim" ]]; then
-		rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
-	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-8.2.3428.ebuild b/app-editors/vim-core/vim-core-8.2.3428.ebuild
deleted file mode 100644
index a245749c90df..000000000000
--- a/app-editors/vim-core/vim-core-8.2.3428.ebuild
+++ /dev/null
@@ -1,237 +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 and app-editors/gvim
-
-VIM_VERSION="8.2"
-inherit estack 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://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
-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"
-
-BDEPEND="sys-devel/autoconf"
-# Avoid icon file collision, bug #673880
-RDEPEND="!!<app-editors/gvim-8.1.0648"
-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"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir -p failed"
-	export HOME="${T}"/home
-}
-
-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 "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
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
-
-	# 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'
-
-	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"
-
-	# Remove src/auto/configure file.
-	rm -v src/auto/configure || die "rm configure 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
-
-	# Let Portage do the stripping. Some people like that.
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
-
-	econf \
-		--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) \
-		${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-r5 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.
-		eshopts_push -s extglob
-
-		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
-		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
-		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
-
-		local keep_colors="default"
-		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
-
-		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
-		# tinkering with the next line might make bad things happen ...
-		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
-		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
-
-		# Delete skip_defaults_vim config not supported by vim[minimal]
-		sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed"
-
-		eshopts_pop
-	fi
-
-	# Delete defaults.vim to avoid conflicts with one from vim.
-	# If defaults.vim already exists in files installed from vim,
-	# do not install defaults.vim.
-	if [[ -f "${vimfiles}/defaults.vim" ]]; then
-		rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
-	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-8.2.3567.ebuild b/app-editors/vim-core/vim-core-8.2.3567.ebuild
deleted file mode 100644
index eda637ba36f0..000000000000
--- a/app-editors/vim-core/vim-core-8.2.3567.ebuild
+++ /dev/null
@@ -1,237 +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 and app-editors/gvim
-
-VIM_VERSION="8.2"
-inherit estack 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://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
-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"
-
-BDEPEND="sys-devel/autoconf"
-# Avoid icon file collision, bug #673880
-RDEPEND="!!<app-editors/gvim-8.1.0648"
-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"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir -p failed"
-	export HOME="${T}"/home
-}
-
-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 "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
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
-
-	# 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'
-
-	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"
-
-	# Remove src/auto/configure file.
-	rm -v src/auto/configure || die "rm configure 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
-
-	# Let Portage do the stripping. Some people like that.
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
-
-	econf \
-		--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) \
-		${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-r5 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.
-		eshopts_push -s extglob
-
-		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
-		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
-		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
-
-		local keep_colors="default"
-		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
-
-		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
-		# tinkering with the next line might make bad things happen ...
-		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
-		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
-
-		# Delete skip_defaults_vim config not supported by vim[minimal]
-		sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed"
-
-		eshopts_pop
-	fi
-
-	# Delete defaults.vim to avoid conflicts with one from vim.
-	# If defaults.vim already exists in files installed from vim,
-	# do not install defaults.vim.
-	if [[ -f "${vimfiles}/defaults.vim" ]]; then
-		rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
-	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-8.2.3582.ebuild b/app-editors/vim-core/vim-core-8.2.3582.ebuild
deleted file mode 100644
index 2396c7131d36..000000000000
--- a/app-editors/vim-core/vim-core-8.2.3582.ebuild
+++ /dev/null
@@ -1,237 +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 and app-editors/gvim
-
-VIM_VERSION="8.2"
-inherit estack 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://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
-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"
-
-BDEPEND="sys-devel/autoconf"
-# Avoid icon file collision, bug #673880
-RDEPEND="!!<app-editors/gvim-8.1.0648"
-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"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir -p failed"
-	export HOME="${T}"/home
-}
-
-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 "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
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
-
-	# 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'
-
-	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"
-
-	# Remove src/auto/configure file.
-	rm -v src/auto/configure || die "rm configure 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
-
-	# Let Portage do the stripping. Some people like that.
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
-
-	econf \
-		--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) \
-		${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-r5 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.
-		eshopts_push -s extglob
-
-		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
-		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
-		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
-
-		local keep_colors="default"
-		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
-
-		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
-		# tinkering with the next line might make bad things happen ...
-		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
-		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
-
-		# Delete skip_defaults_vim config not supported by vim[minimal]
-		sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed"
-
-		eshopts_pop
-	fi
-
-	# Delete defaults.vim to avoid conflicts with one from vim.
-	# If defaults.vim already exists in files installed from vim,
-	# do not install defaults.vim.
-	if [[ -f "${vimfiles}/defaults.vim" ]]; then
-		rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
-	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-8.2.3669.ebuild b/app-editors/vim-core/vim-core-8.2.3669.ebuild
deleted file mode 100644
index eda637ba36f0..000000000000
--- a/app-editors/vim-core/vim-core-8.2.3669.ebuild
+++ /dev/null
@@ -1,237 +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 and app-editors/gvim
-
-VIM_VERSION="8.2"
-inherit estack 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://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
-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"
-
-BDEPEND="sys-devel/autoconf"
-# Avoid icon file collision, bug #673880
-RDEPEND="!!<app-editors/gvim-8.1.0648"
-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"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir -p failed"
-	export HOME="${T}"/home
-}
-
-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 "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
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
-
-	# 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'
-
-	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"
-
-	# Remove src/auto/configure file.
-	rm -v src/auto/configure || die "rm configure 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
-
-	# Let Portage do the stripping. Some people like that.
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
-
-	econf \
-		--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) \
-		${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-r5 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.
-		eshopts_push -s extglob
-
-		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
-		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
-		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
-
-		local keep_colors="default"
-		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
-
-		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
-		# tinkering with the next line might make bad things happen ...
-		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
-		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
-
-		# Delete skip_defaults_vim config not supported by vim[minimal]
-		sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed"
-
-		eshopts_pop
-	fi
-
-	# Delete defaults.vim to avoid conflicts with one from vim.
-	# If defaults.vim already exists in files installed from vim,
-	# do not install defaults.vim.
-	if [[ -f "${vimfiles}/defaults.vim" ]]; then
-		rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
-	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-8.2.3741.ebuild b/app-editors/vim-core/vim-core-8.2.3741.ebuild
deleted file mode 100644
index 2396c7131d36..000000000000
--- a/app-editors/vim-core/vim-core-8.2.3741.ebuild
+++ /dev/null
@@ -1,237 +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 and app-editors/gvim
-
-VIM_VERSION="8.2"
-inherit estack 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://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
-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"
-
-BDEPEND="sys-devel/autoconf"
-# Avoid icon file collision, bug #673880
-RDEPEND="!!<app-editors/gvim-8.1.0648"
-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"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir -p failed"
-	export HOME="${T}"/home
-}
-
-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 "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
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
-
-	# 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'
-
-	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"
-
-	# Remove src/auto/configure file.
-	rm -v src/auto/configure || die "rm configure 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
-
-	# Let Portage do the stripping. Some people like that.
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
-
-	econf \
-		--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) \
-		${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-r5 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.
-		eshopts_push -s extglob
-
-		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
-		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
-		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
-
-		local keep_colors="default"
-		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
-
-		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
-		# tinkering with the next line might make bad things happen ...
-		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
-		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
-
-		# Delete skip_defaults_vim config not supported by vim[minimal]
-		sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed"
-
-		eshopts_pop
-	fi
-
-	# Delete defaults.vim to avoid conflicts with one from vim.
-	# If defaults.vim already exists in files installed from vim,
-	# do not install defaults.vim.
-	if [[ -f "${vimfiles}/defaults.vim" ]]; then
-		rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
-	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-8.2.3950.ebuild b/app-editors/vim-core/vim-core-8.2.3950.ebuild
deleted file mode 100644
index eda637ba36f0..000000000000
--- a/app-editors/vim-core/vim-core-8.2.3950.ebuild
+++ /dev/null
@@ -1,237 +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 and app-editors/gvim
-
-VIM_VERSION="8.2"
-inherit estack 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://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
-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"
-
-BDEPEND="sys-devel/autoconf"
-# Avoid icon file collision, bug #673880
-RDEPEND="!!<app-editors/gvim-8.1.0648"
-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"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir -p failed"
-	export HOME="${T}"/home
-}
-
-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 "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
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
-
-	# 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'
-
-	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"
-
-	# Remove src/auto/configure file.
-	rm -v src/auto/configure || die "rm configure 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
-
-	# Let Portage do the stripping. Some people like that.
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
-
-	econf \
-		--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) \
-		${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-r5 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.
-		eshopts_push -s extglob
-
-		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
-		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
-		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
-
-		local keep_colors="default"
-		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
-
-		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
-		# tinkering with the next line might make bad things happen ...
-		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
-		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
-
-		# Delete skip_defaults_vim config not supported by vim[minimal]
-		sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed"
-
-		eshopts_pop
-	fi
-
-	# Delete defaults.vim to avoid conflicts with one from vim.
-	# If defaults.vim already exists in files installed from vim,
-	# do not install defaults.vim.
-	if [[ -f "${vimfiles}/defaults.vim" ]]; then
-		rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
-	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-8.2.4285.ebuild b/app-editors/vim-core/vim-core-8.2.4285.ebuild
deleted file mode 100644
index eda637ba36f0..000000000000
--- a/app-editors/vim-core/vim-core-8.2.4285.ebuild
+++ /dev/null
@@ -1,237 +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 and app-editors/gvim
-
-VIM_VERSION="8.2"
-inherit estack 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://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
-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"
-
-BDEPEND="sys-devel/autoconf"
-# Avoid icon file collision, bug #673880
-RDEPEND="!!<app-editors/gvim-8.1.0648"
-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"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir -p failed"
-	export HOME="${T}"/home
-}
-
-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 "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
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
-
-	# 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'
-
-	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"
-
-	# Remove src/auto/configure file.
-	rm -v src/auto/configure || die "rm configure 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
-
-	# Let Portage do the stripping. Some people like that.
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
-
-	econf \
-		--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) \
-		${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-r5 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.
-		eshopts_push -s extglob
-
-		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
-		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
-		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
-
-		local keep_colors="default"
-		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
-
-		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
-		# tinkering with the next line might make bad things happen ...
-		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
-		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
-
-		# Delete skip_defaults_vim config not supported by vim[minimal]
-		sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed"
-
-		eshopts_pop
-	fi
-
-	# Delete defaults.vim to avoid conflicts with one from vim.
-	# If defaults.vim already exists in files installed from vim,
-	# do not install defaults.vim.
-	if [[ -f "${vimfiles}/defaults.vim" ]]; then
-		rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
-	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-8.2.4586.ebuild b/app-editors/vim-core/vim-core-8.2.4586.ebuild
index 1c7169a0e5f8..0d7a502efa63 100644
--- a/app-editors/vim-core/vim-core-8.2.4586.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.4586.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.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 ~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"
+	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}
 
diff --git a/app-editors/vim-core/vim-core-8.2.4328-r1.ebuild b/app-editors/vim-core/vim-core-8.2.5066.ebuild
index 995864198e71..3663d9c774fc 100644
--- a/app-editors/vim-core/vim-core-8.2.4328-r1.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.5066.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # Please bump with app-editors/vim and app-editors/gvim
 
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.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"
+	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}
 
@@ -44,6 +44,8 @@ pkg_setup() {
 
 src_prepare() {
 	if [[ ${PV} != 9999* ]] ; then
+		rm "${WORKDIR}"/patches/006-vim-8.0.0617-crosscompile.patch || die
+
 		# Gentoo patches to fix runtime issues, cross-compile errors, etc
 		eapply "${WORKDIR}"/patches
 	fi
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild
index 1c7169a0e5f8..3663d9c774fc 100644
--- a/app-editors/vim-core/vim-core-9999.ebuild
+++ b/app-editors/vim-core/vim-core-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # Please bump with app-editors/vim and app-editors/gvim
 
@@ -44,6 +44,8 @@ pkg_setup() {
 
 src_prepare() {
 	if [[ ${PV} != 9999* ]] ; then
+		rm "${WORKDIR}"/patches/006-vim-8.0.0617-crosscompile.patch || die
+
 		# Gentoo patches to fix runtime issues, cross-compile errors, etc
 		eapply "${WORKDIR}"/patches
 	fi
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 37f966c22cc2..ffe2f7d3f15f 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -1,24 +1,8 @@
 AUX vim-completion 1004 BLAKE2B dea4230a8d2a57fd1af18df4037504a44382a97ff672410e987cb287d802c964baa502da4d08f09cb8684307481fec503c1d8cae7f4f6e61500f1cb06033a2c4 SHA512 dccf663a93efdf2ec3be69f49e418a0ef66277e2fae6c12287adde772592e19f5130388a04242121846f1dae39f78b30780c99dc6fe1b847f4f08354bda3cc41
 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
-EBUILD vim-8.2.0814-r100.ebuild 9494 BLAKE2B 44da96503b443883ec7fd3ff04e16389e1213c3e52e279c0882b632bce766369e78eb6c695e1b1fe4e24af354c18cc74f1c70908e997fc93e1f28959fefbd45d SHA512 aea655d44c3872fc69b43ab0de621804da29f25ecab81b833c0cde093c729e4cb11e739445f1d4cf4f53e316e16406cb4f4d037bdb49fc196732da2dd7214c4b
-EBUILD vim-8.2.3428-r1.ebuild 10183 BLAKE2B 54064a0fe0670b36c498b06ecf2faa0fcbab9546a649725e453e8a447535f67910f4a367f9d456deb2d55b70f5e56d9fa405652ef344fd747c39952bfa4eb77f SHA512 8a06935224df9af297c741e60a4d035dc01663c375f4e20dfad61e9d3d8c7abb21538211864e3fb685d1287f8cd1b6633c4fff83ffd6fb174d15dfceff9f0a5b
-EBUILD vim-8.2.3567.ebuild 10263 BLAKE2B 4ea42fe51e86c59171caff73949b034c71ce423d42bd0963793f540f880b99617d81e133e50e023ab8e03859ab5e17d72fa1e8051dd0980cdfc5662258d93a57 SHA512 0cb1212338ec77b2348975477bd0ef195b3a312a2c1bed464d7a6c62f52a1b0cccc95e47d23aa780d9c3a5c580791e5b9689df90d9aa51eeacaa73c8b8ed5fa3
-EBUILD vim-8.2.3582.ebuild 10255 BLAKE2B 3ec921f6df09830f772a1838a31438fbd58d62b056d741683e94274e04de8817fd1901c8d2fec71867a6e11144dfbd796887bb97f5b8fb8a9ca8bf56c1a815a2 SHA512 ce2fe5a674d5ab3cb5fb7a11083d3aaf22b32f0acee737d90d8eb16b1dadf684143f448657ea05dce68343de9070b3a3cf393af326f824dfb818a2f6d77fbbba
-EBUILD vim-8.2.3669.ebuild 10263 BLAKE2B 4ea42fe51e86c59171caff73949b034c71ce423d42bd0963793f540f880b99617d81e133e50e023ab8e03859ab5e17d72fa1e8051dd0980cdfc5662258d93a57 SHA512 0cb1212338ec77b2348975477bd0ef195b3a312a2c1bed464d7a6c62f52a1b0cccc95e47d23aa780d9c3a5c580791e5b9689df90d9aa51eeacaa73c8b8ed5fa3
-EBUILD vim-8.2.3741.ebuild 10255 BLAKE2B 3ec921f6df09830f772a1838a31438fbd58d62b056d741683e94274e04de8817fd1901c8d2fec71867a6e11144dfbd796887bb97f5b8fb8a9ca8bf56c1a815a2 SHA512 ce2fe5a674d5ab3cb5fb7a11083d3aaf22b32f0acee737d90d8eb16b1dadf684143f448657ea05dce68343de9070b3a3cf393af326f824dfb818a2f6d77fbbba
-EBUILD vim-8.2.3950.ebuild 10263 BLAKE2B 4ea42fe51e86c59171caff73949b034c71ce423d42bd0963793f540f880b99617d81e133e50e023ab8e03859ab5e17d72fa1e8051dd0980cdfc5662258d93a57 SHA512 0cb1212338ec77b2348975477bd0ef195b3a312a2c1bed464d7a6c62f52a1b0cccc95e47d23aa780d9c3a5c580791e5b9689df90d9aa51eeacaa73c8b8ed5fa3
-EBUILD vim-8.2.4285.ebuild 10263 BLAKE2B 4ea42fe51e86c59171caff73949b034c71ce423d42bd0963793f540f880b99617d81e133e50e023ab8e03859ab5e17d72fa1e8051dd0980cdfc5662258d93a57 SHA512 0cb1212338ec77b2348975477bd0ef195b3a312a2c1bed464d7a6c62f52a1b0cccc95e47d23aa780d9c3a5c580791e5b9689df90d9aa51eeacaa73c8b8ed5fa3
-EBUILD vim-8.2.4328-r1.ebuild 10086 BLAKE2B 64dbea53a7d53118454df67162014d82d4e510e13b1eb4a6335b8ce01da028f25f959138787b390fc72c471f9a353711bae12f832d82be48a73e3f6f5464f16e SHA512 05a2464b7868dbb811d3bb8c0154dd48b8d3114f42a3e61294568f3dd9c547ae7de271cb4322f8bf36daac5be1c28f3c9477b68416181bb25cdb3b162af332b6
-EBUILD vim-8.2.4586.ebuild 10099 BLAKE2B 4ab25750ea3d261d2f634bae5292156373ba3bea919aa74003ca46e64cc874ecd0be3affbf0063c267853841677c8faaecd9c67482cde983759aedcf37272bdb SHA512 7b48b9fa701e4ebbbc4af8bfcbdbf26983dfd2248188c911a5e71545bcc6454e6f1e9e22fd08978eef0660b9d392648d2ab8301201f3292a9694644ae723b36c
-EBUILD vim-9999.ebuild 10099 BLAKE2B 4ab25750ea3d261d2f634bae5292156373ba3bea919aa74003ca46e64cc874ecd0be3affbf0063c267853841677c8faaecd9c67482cde983759aedcf37272bdb SHA512 7b48b9fa701e4ebbbc4af8bfcbdbf26983dfd2248188c911a5e71545bcc6454e6f1e9e22fd08978eef0660b9d392648d2ab8301201f3292a9694644ae723b36c
-MISC metadata.xml 951 BLAKE2B 10b867295bee9174e71d1df8a2a8a251c669fb2415893f2e90e361622520fa6b357a2098cb0184637a6f3078ed1873ed1d38f64be205d941de13040fb9f197e2 SHA512 683a03f6198c53c16874cfd8b50a265460a507afcb1bff104ce8932a9957cd4a3cc0cd6d0e494ea0757645162994c55a792d282fd6ad1278dd10659804d2f54c
+DIST vim-8.2.5066.tar.gz 16497942 BLAKE2B 613f009f6a03e28305763e471bf55b626f37bb8b0f01324d5a676f6682811e3c4a5c11442af839d06b7d94b3938f5a30306bac576eec5d3c76f4a135a3443bb3 SHA512 27fdd1e86b0488b974a9fd60523b31ba23b581cab4c9bd15aee9ae459e2f2d028d6887adf621ee88244b74d26697fc953b08b587a3a80b316d31b65fc588ce9e
+EBUILD vim-8.2.4586.ebuild 10091 BLAKE2B 9073b2cdbd5e910154e4f5ecf845d46b10407e1b363a05d98dd0e688071abfe5d67209efece7997f48197de5951f8a1369ca3b424cb44d69a1d532ff7167ee2b SHA512 3907db9b383f43378ce0c87c8abcbf64aa64212462be5873595a796a562af34e8875a5f38b9bc55363c94d0a9eae9ed9f58f386062ab2a73e1fa7dcee5479478
+EBUILD vim-8.2.5066.ebuild 10508 BLAKE2B 494cd178edbd39072180dc1b995820db78d1f1589e6f7697d927ad418fd551e0f6f752168e629f212776a67c9b84f3e3806008329bcc40e62325a144d6c359ad SHA512 8a318f4d1e5ac03d356bca7f8e2a79e9658f4bede8271f09dc4f6d813ebd51850dbf012bb6dfb92d6acec54e55e90da88fdbee59c59de012697eba58b8b99a37
+EBUILD vim-9999.ebuild 10508 BLAKE2B 494cd178edbd39072180dc1b995820db78d1f1589e6f7697d927ad418fd551e0f6f752168e629f212776a67c9b84f3e3806008329bcc40e62325a144d6c359ad SHA512 8a318f4d1e5ac03d356bca7f8e2a79e9658f4bede8271f09dc4f6d813ebd51850dbf012bb6dfb92d6acec54e55e90da88fdbee59c59de012697eba58b8b99a37
+MISC metadata.xml 891 BLAKE2B 00a55660fecbeca3df9b50e7400510fb92bbcdd42ba588725580c153d74a4731b31dd0ebaade4f60a4db88c695a7f60663773d63046c1b38aab0363520b8858d SHA512 76eebfe4d34eb609b29946b724ae450916eeab2573edf0f5aa87325f1e9abc8a2ca45d7abe3bfa9d996670d90e7cde17cb84662f69502a4b4a5b44b14b4c8890
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
-}
diff --git a/app-editors/vim/vim-8.2.4586.ebuild b/app-editors/vim/vim-8.2.4586.ebuild
index 62ce11b27b08..50bc75d86ded 100644
--- a/app-editors/vim/vim-8.2.4586.ebuild
+++ b/app-editors/vim/vim-8.2.4586.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999* ]] ; then
 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 ~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"
+	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"
diff --git a/app-editors/vim/vim-8.2.4328-r1.ebuild b/app-editors/vim/vim-8.2.5066.ebuild
index 8bcb756c1d46..0afdaaef7172 100644
--- a/app-editors/vim/vim-8.2.4328-r1.ebuild
+++ b/app-editors/vim/vim-8.2.5066.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # 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_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27"
 
 inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils
 
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999* ]] ; then
 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"
+	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"
@@ -80,6 +80,8 @@ pkg_setup() {
 
 src_prepare() {
 	if [[ ${PV} != 9999* ]] ; then
+		rm "${WORKDIR}"/patches/006-vim-8.0.0617-crosscompile.patch || die
+
 		# Gentoo patches to fix runtime issues, cross-compile errors, etc
 		eapply "${WORKDIR}"/patches/
 	fi
@@ -273,6 +275,10 @@ src_test() {
 	# 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.
@@ -287,7 +293,11 @@ src_test() {
 	# 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\)'
+	# - Test_fuzzy_completion_env
+	# Too sensitive to leaked environment variables.
+	# - Test_term_mouse_multiple_clicks_to_select_mode
+	# 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\)'
 
 	emake -j1 -C src/testdir nongui
 }
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index 62ce11b27b08..0afdaaef7172 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # Please bump with app-editors/vim-core and app-editors/gvim
 
@@ -9,7 +9,7 @@ VIM_VERSION="8.2"
 LUA_COMPAT=( lua5-1 luajit )
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27"
 
 inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils
 
@@ -80,6 +80,8 @@ pkg_setup() {
 
 src_prepare() {
 	if [[ ${PV} != 9999* ]] ; then
+		rm "${WORKDIR}"/patches/006-vim-8.0.0617-crosscompile.patch || die
+
 		# Gentoo patches to fix runtime issues, cross-compile errors, etc
 		eapply "${WORKDIR}"/patches/
 	fi
@@ -273,6 +275,10 @@ src_test() {
 	# 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.
@@ -287,7 +293,11 @@ src_test() {
 	# 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\)'
+	# - Test_fuzzy_completion_env
+	# Too sensitive to leaked environment variables.
+	# - Test_term_mouse_multiple_clicks_to_select_mode
+	# 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\)'
 
 	emake -j1 -C src/testdir nongui
 }
diff --git a/app-editors/vscode/Manifest b/app-editors/vscode/Manifest
index 620d3ae9615f..d798604e5fd7 100644
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@@ -2,16 +2,16 @@ AUX vscode-url-handler-wayland.desktop 351 BLAKE2B 8b1d295572865fb25beeb14d9762c
 AUX vscode-url-handler.desktop 291 BLAKE2B 364ce7de060a947d48486a639aed515f5b17e1720ac1eaee1aa4e13559047622e2897c0426aed792e3d8aed440771c6f5bb3e36873140401c951ec3b749cd661 SHA512 4607346645781f67daeb6cff2425924133537d620bf7dac9c2619cd5a1a29252e7ecf1a27f27e7bb917c413d462f129f9ae26f50ec8b531e5ac872bc8b96dd93
 AUX vscode-wayland.desktop 580 BLAKE2B fb70f6b28e975368550735f2dab8be6ccab9510481c794e6b44545a690224bc93b51cbc6beb809886eee1cde3648eb284374c87c0b74a1fcc3bdf0af0e700a9f SHA512 615cacda3121b4a839816722382c23bfa2cb162e2a772ba91bded9e161a92763bb536778ea8f716e4c6c46f4f6c289a9c922347523d278ba3714569eb64c0234
 AUX vscode.desktop 451 BLAKE2B 3c0cbe4a9bf71d47c3534bf6f7a265a04a0949b0bb86e060a0ecccb3b9f242ba9b46f1fc0dea37ff0d982ec88417da980b31b9658906a8f23c707e9b100183c6 SHA512 334b8c025c4a99e0f1390c56dd89e529c23b0ea3f6ec5a83105eb6acc4ff62b4d25419353d7bf4bb69dec611bd98778e7b8c728d2392827aa97690b5b91c7fb8
-DIST vscode-1.65.2-amd64.tar.gz 109564124 BLAKE2B 5b842253ed6438019de5f114f951651adc1773db93b408d3fec59b781ff32c0fb66f0e80ff0c02b6306ae46f541d55667f37d50ccf64709e810bf5e952af543e SHA512 1b5fd6c42966e66f963cb63a289414d3733cb64c051c36ad5a43481ccbd24996e99b58738b23be25a51890eb95593b7a2f224d61c3a21ea3195baed4f57cc761
-DIST vscode-1.65.2-arm.tar.gz 90793512 BLAKE2B 8e29cd51635408280a9f3e36cc7d8a0925feee6a2239352b9a44075454ae36d7b784be2ecf9eb310440e416511a0d38b801ae41bfae400edd06345f960d66b29 SHA512 9c10a9a6ed82d321228b41202ab1584d580596bea9aa9759db6500e41f1979d1e9e1fa3e3af4fd86bdbbd0844ec528a499dbeb2eee988bb87b549073f0d112de
-DIST vscode-1.65.2-arm64.tar.gz 104431396 BLAKE2B 17251a994ba15b9293b4bebbc8b34b8351bf5d15ea047d8789492839ab902d9802afcd94c6a805f26be505c9f05077c395c6a5c73a8f3614668c042400e3f4b0 SHA512 7365d8bec81bbd8bf72d6073cfd9034b8afca7309044863a921b190aadbb8fe16d5b58f98beab7d24d77c1077c60a1761a68a12e01ea974855608006973ec739
 DIST vscode-1.66.2-amd64.tar.gz 115605903 BLAKE2B db6161e5e387c58b63c86bdc6e1c2383cc977c4ff23f0e26894d7c176b3c0ff29d7dd60f18f535894030a8ca323b598bbe421e05c4ecdbfdaac57a9a378956e5 SHA512 cbf99e949a637f518f431d62b2119c13630d2be87a681892a7be40bcdc19f6fd1a4c9e9955a07d215aadce57a6acbf1ed5d146193119eeec78e2a7878d708619
 DIST vscode-1.66.2-arm.tar.gz 96713615 BLAKE2B cafc1575c81e27471f382d73a10ee3fa960bd5617536965e135acfad1ef227ef2ead9283085458595fdaa239ac4dec57b572fba44a3ad4b5eb125794491c22a7 SHA512 0ab6acd5f02d2201548de6082ab67fcb13f6157b775cd89fef33f493e61b092f4381a06248795572e893d7a6adcfe966c9ab246d587c7a3512385c728e5ec07c
 DIST vscode-1.66.2-arm64.tar.gz 110613144 BLAKE2B e2d3139f7779152a52e34c740f4c95c065fd004624c6e8628cd2562ee2791871e0ca0654f1e30c7c3effd67865560878c8d40773a106a30aef5358ebb28a1908 SHA512 f664c1a8fa72bb659fe30269d0207d79e1da406e7fb65bcc7385c07a06677d752583d9b5e04c185c571bb669b530f663dd8686a65f8a721a73fc9a2e02308869
-DIST vscode-1.67.0-amd64.tar.gz 115660810 BLAKE2B 38991593e43a08591028a708373816048d82b606cc8127c68a63664dfa9d42d4eb323e1d0ced0f9b362044e05b70e431f34686a8383f752dbe08d148967869fe SHA512 d35ddc1a5d5516b1200854a7b0b8d8b64abc3f42786fe16aa69c26ebb4e70fe6a299546b87093c5e2a8ec42db653eb5efc7ee782e3207ccad40b77c1ab5b8ccd
-DIST vscode-1.67.0-arm.tar.gz 96738850 BLAKE2B 2546f26add7560f466e0220cceb263e890993b7de7b52e337831bd0c0260c1dccec0f267899bfa7c73d7a8e0c02f40bd02639434a4d5093c233da34f92022fc8 SHA512 5178e34dbad5613e50330c1a39776037119fa3ba85b3771e4862c849c2a1e2b32655dbafe27a72dca35b9d6b2f29d0768ffed6ad4da11d257bb7015c148015e1
-DIST vscode-1.67.0-arm64.tar.gz 110641639 BLAKE2B f443ba2391105893d4e5175f6213d1dd1df1ad3b870bccf87f9854e1d8fe58da3a7acab6f52f1a177177f627534f48a3fcb01a1698da00854ed5918ec7c0baac SHA512 15e3dcc752980155b337bcf4c4e319843ee12a982f55167c1ab49105006a90856ed72abcc12a3d5368f90be33b4a8117543456e6dff07655cc5ef52ea5eb2e16
-EBUILD vscode-1.65.2.ebuild 3371 BLAKE2B 965d066b8ca1ebfd4001edd4af59756db9c796a4cd9b16a40c8dc0793efa8caaf4c18e156c1d4123a1e2f2a2dfc2fea0fba8773e42bae09f480fbc8c33311128 SHA512 6eb57628ac4c04b0f4d7750817227e6d8105f19f3f0cb1c9c483534cf6a7bc24c97de529d32c9a528a91837eaa3a838b13aa75d03dfa09ca2d8f1e2b28dfa53b
+DIST vscode-1.67.2-amd64.tar.gz 115658426 BLAKE2B 1c091323b6ac492ca4b0c0a959d19a931b3ecfedfaeafb1d99b107e02b1ee0bdc7beff4604aef5e68bfcb20ab6c3106e4e625b7a5f85befd3ada3186387859e2 SHA512 fc4120e1b93d417c257250bbd4b9a4f5e11844a7d52013c321f0872928f178e57b73e3781e4141b96ccd4067b1360a7024103a46933d6e8e2a87e608dbac1043
+DIST vscode-1.67.2-arm.tar.gz 96748623 BLAKE2B 46a97090d9d8eb8c8cdb91c6bb15392b01c3312ab6fba02e45cd217f03d4a80cc514efc7f57bf88fe413f84604cb9add5d48482d1f77baccbe9eddfc881b976b SHA512 c08630eb2c1b51e8e34a8ab5dec658de3b59f59df4635d539f79d689ec89d116d2c220c642eeade48995ee815c318c7345aa88fec2d9ea5e942cd7d72abcb16c
+DIST vscode-1.67.2-arm64.tar.gz 110649454 BLAKE2B 0ecb552ce956dc4d5aaaf5b1c8c26ad35857d4ac43b05d8eefaf7da95aad8352b16817eb2c4ec0285a8dda8859276f9f1fb93e41459d5479bfa44988e410d955 SHA512 a9a22fa1c722f6329f0de3a81b73edbd681678ccf6ba1b7fefaf8202ee2ee929e2ae8a160e0b928d5dc53d9c74789fa06d610a5bb1a6b4a8223718e48db9f1f9
+DIST vscode-1.68.1-amd64.tar.gz 116922965 BLAKE2B cb48e2589f0603b4594add3c5c28d6e8a1c3e6f53eb7e5139c6b1ac0aa9b742250c881f2d212219441db74bff94c05ae281a18b9e89be781a055acdf6adf5a2b SHA512 9945f0a6db93c9ee84a2729d5da18d6b41d370abecb3c1e78033889b9ee5093463c16403b93eefc703710783823458caf3f1c0ed4af297fa0dc49a903c3ec466
+DIST vscode-1.68.1-arm.tar.gz 97909261 BLAKE2B 248d573ffa0562ea62190fe5d04362baa6076cf3919b8f8df6ea09e0f0756b5d6de85f1e0ea2b472835ce77c3cf5883eb49dd1db2f81f727fc75164b4895942b SHA512 16f9d0c1817e893c15807f720af56bd33a1469e1494b72a7345d05a882a2c3ebc3395dc6d07d78a9effc045eba6e3f34317172937c34cc0f18036c8954ce5f92
+DIST vscode-1.68.1-arm64.tar.gz 111812916 BLAKE2B 64d442ee86ed41025775ebbde8fe675afd0fe1cac5d437e04ab5dc1c9fe3d9d0409d14fb8e2544e891c3fc0b6abe4dac3247b9d096585c1d2ff6ca1de0ede9e1 SHA512 1c16684bdd9f0980b7b6d2ee112987e21539a63a0bd635654edcd0404cc661b3d2c06c916fe63172ce107ca89f78ac58abd2be43a2f60b0f71a700a596b9b59f
 EBUILD vscode-1.66.2.ebuild 3454 BLAKE2B 23b031a450a72926262df56e00de3604b26651185fb94faf8c86dde4878a88cb92b4549ed715f251f4607e96caa58435e8ce934a23e1fcbd3e88ae59b45cbd83 SHA512 3bb3fba747cd024ec14630d1379921979bdf54eafb62193f8a701de46aa78c16c2952ca10b02c05cf97d79f2fd858035e5d28dc6ee85adc05647817c14903944
-EBUILD vscode-1.67.0.ebuild 3121 BLAKE2B 5afdf9f9b4e29cc308a4e3d56b079bcdf7f2f8d7e6b6f46c5881cad6d988cd759c6d0006ba73ba16c111f679de3388fc662caf6968d0e06c284e32406b011414 SHA512 02d74dab0a9df33f37744f95bc97ae824d5d60092f2c41f2b24018260ae31a8c649639a49ac268b931d2412f88c04e4975817add6f29ec86cbd558e2dd8ab233
+EBUILD vscode-1.67.2.ebuild 3121 BLAKE2B 5afdf9f9b4e29cc308a4e3d56b079bcdf7f2f8d7e6b6f46c5881cad6d988cd759c6d0006ba73ba16c111f679de3388fc662caf6968d0e06c284e32406b011414 SHA512 02d74dab0a9df33f37744f95bc97ae824d5d60092f2c41f2b24018260ae31a8c649639a49ac268b931d2412f88c04e4975817add6f29ec86cbd558e2dd8ab233
+EBUILD vscode-1.68.1.ebuild 3121 BLAKE2B 5afdf9f9b4e29cc308a4e3d56b079bcdf7f2f8d7e6b6f46c5881cad6d988cd759c6d0006ba73ba16c111f679de3388fc662caf6968d0e06c284e32406b011414 SHA512 02d74dab0a9df33f37744f95bc97ae824d5d60092f2c41f2b24018260ae31a8c649639a49ac268b931d2412f88c04e4975817add6f29ec86cbd558e2dd8ab233
 MISC metadata.xml 947 BLAKE2B d2c522407289299e1398799f6187e1c0d6621dfe29c1dd0e9d88281eafe44f4b4b3a0edad920268d220375f9330f0a62c015fb1e5085decf5ca5e485a92cc204 SHA512 6b27ac42f3d67203c46996388f6700c007a299557808505179cfa42deeb71098bf3a257f23c11835389fd7a59180f3536e420ed6cdb93b274d47e4c84a25f738
diff --git a/app-editors/vscode/vscode-1.67.0.ebuild b/app-editors/vscode/vscode-1.67.2.ebuild
index 8ab1bd247c0a..8ab1bd247c0a 100644
--- a/app-editors/vscode/vscode-1.67.0.ebuild
+++ b/app-editors/vscode/vscode-1.67.2.ebuild
diff --git a/app-editors/vscode/vscode-1.65.2.ebuild b/app-editors/vscode/vscode-1.68.1.ebuild
index 35897d4b8b0c..8ab1bd247c0a 100644
--- a/app-editors/vscode/vscode-1.65.2.ebuild
+++ b/app-editors/vscode/vscode-1.68.1.ebuild
@@ -68,17 +68,18 @@ RDEPEND="
 "
 
 QA_PREBUILT="
+	/opt/vscode/chrome_crashpad_handler
+	/opt/vscode/chrome-sandbox
 	/opt/vscode/code
 	/opt/vscode/libEGL.so
 	/opt/vscode/libffmpeg.so
 	/opt/vscode/libGLESv2.so
-	/opt/vscode/libvulkan.so*
-	/opt/vscode/chrome-sandbox
 	/opt/vscode/libvk_swiftshader.so
-	/opt/vscode/swiftshader/libEGL.so
-	/opt/vscode/swiftshader/libGLESv2.so
+	/opt/vscode/libvulkan.so*
 	/opt/vscode/resources/app/extensions/*
 	/opt/vscode/resources/app/node_modules.asar.unpacked/*
+	/opt/vscode/swiftshader/libEGL.so
+	/opt/vscode/swiftshader/libGLESv2.so
 "
 
 src_install() {
@@ -100,6 +101,7 @@ src_install() {
 	insinto "/opt/${PN}"
 	doins -r *
 	fperms +x /opt/${PN}/{,bin/}code
+	fperms +x /opt/${PN}/chrome_crashpad_handler
 	fperms 4711 /opt/${PN}/chrome-sandbox
 	fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass.sh
 	fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass-empty.sh
@@ -118,12 +120,4 @@ pkg_postinst() {
 	xdg_pkg_postinst
 	elog "You may want to install some additional utils, check in:"
 	elog "https://code.visualstudio.com/Docs/setup#_additional-tools"
-
-	if has_version -r ">=gui-libs/wlroots-0.15"; then
-		elog
-		elog "The wayland backend of vscode crashes with >=gui-libs/wlroots-0.15"
-		elog "This will be fixed upstream in a later release"
-		elog "Please run the xwayland version for now, on wlroots based DEs."
-		elog "For more information, see https://bugs.gentoo.org/834082"
-	fi
 }
diff --git a/app-editors/vscodium/Manifest b/app-editors/vscodium/Manifest
index a6143dd06858..528fc218df7b 100644
--- a/app-editors/vscodium/Manifest
+++ b/app-editors/vscodium/Manifest
@@ -2,15 +2,15 @@ AUX vscodium-url-handler-wayland.desktop 383 BLAKE2B c3e281318290826ce9451fe517b
 AUX vscodium-url-handler.desktop 315 BLAKE2B b514551e6256cb444f13bfda86a9e164ed926d8aedbfcb7de3a6b1c3d3c2e465c0ee158c74626814908a153c5f801434952865a708c89ffdf64bce24a83fcc20 SHA512 afcf89af009361b409330a223696013e1ee8973bc3b3068e778fb05c3355fed66063bd537a66685d6ad3578c2808532d4b9c5273a291c7d2f3a9c0b2f997f152
 AUX vscodium-wayland.desktop 609 BLAKE2B 1b25dc9e98b5a12a10f85001b9c5acc9325368a2310a7d1e2aad20e22ae07fb000aa495b694612032e999f431c8f8e47f60eb162d0c7487fcfef6e37249622d4 SHA512 1d371978a5780c8d37e6e1359ca029659055a8d80de0d672d6eb3f21b890db2b92e368fd244be7cf83ec30935271cb269f1b9aef1c7deaaae36c3d739221d8f2
 AUX vscodium.desktop 481 BLAKE2B 89f335edd1f7d0256f95eb96d335c2359d8fd984a29bdc3190218ea63ba9a19e64435eb50c7be818cf28243c8cdf9b385f8987f6917e52df565a4ca555a2a13b SHA512 234f79a5ea9b901b62fe0c094554de3b339a67e8f47ec4b3daa5c0653778b9f51d1ccd91e773b4ca27f27e30a5847d5a3172d0ed322ada4d47624028bd5d8c1b
-DIST vscodium-1.65.2-amd64.tar.gz 110791055 BLAKE2B c6685f78c786dd36ddb79adce5485670016dc5bf8e72550a0d6f39425237dbdf75c36612e053f74db0c7e92cbc7f21dcd641a1573e03741eed8ae7573d7e6608 SHA512 5a79be254d8fd21e22ca1b557bf11138948793518e761f20cfcc9a8a142e5ae14845989e4a2341f4594a03df0ab9b03e4df971123136c636e1b56bb310397f2c
-DIST vscodium-1.65.2-arm.tar.gz 93766888 BLAKE2B 23f1b4a5839b4d8ce35779ae7cd033cfa5ced68272fcb9783307d000ee58dd145d68e8f84e963a1a0dc33ccca81b47119f95cbe49ee788eac5921c9b6ad9071e SHA512 bfc20b5d3de19afb02c11c6dce5b06dec9d843ed7989e400a2d0d2a7f98289db2ae5e7c6262fd31b353eee4efb4f6455aeedffa44e0e7162be03d688ef42c0cb
-DIST vscodium-1.65.2-arm64.tar.gz 108364942 BLAKE2B 05fe48a28f9d97487190725e52ef719db7487e27ec537be185bcb8e4ab56137047261b1221b3cf3909ab07fd95e50135a29a57c802e51c35511718c1822fd49a SHA512 42a2bde4685aecff7b15e8315ef5edf05150e9f1228cd55a62693dc5a03ed5154e01353367c29357d652c82c561477b9d6bad34c0aacf7638b3e4597c31312cc
 DIST vscodium-1.66.2-amd64.tar.gz 115794879 BLAKE2B e398593547aa8814894365a2205f453e359dc75c8c8929ac783ecef5b30c8911cb426e41abda982485741fab42582f8245ab28f7534573496ea535886e5ac299 SHA512 6e6780cd5a16195dcbbd20806180e5bbba902edf37f733140c7959d95dbc4a8b71816959b31fa8b8eefdff50877d2678fb6d86fa5d111c6c6fbfa1486f4d1d8f
 DIST vscodium-1.66.2-arm.tar.gz 97607835 BLAKE2B 48106774775c021cfaa8beb4dc3762536023edf774a27627c9fb49d43b7857b5ffd8923e4286b5c256daa1bb8437a1ede25bf79cd25f859866635722f29d32f1 SHA512 d82975b69cc89ea320e50b76d3b01434efaa6d090ce97b6d4b87f345ef39b854872e80899b8dd921b7054a926fd7446b341666779db2e9afcdfb2c3a11f833ff
 DIST vscodium-1.66.2-arm64.tar.gz 113498556 BLAKE2B 3da540ec37cc73559f18d8dc975611a75c84a0d966224e36dc3182bc8f4fbd7a3628e1b789bf1480d861edc28bf7f29e6aa25f266848fd329c672d9f43d32887 SHA512 73adc6f1452738e3063abe16e09ceffc9c6a48d8b6f432df86bb51ce9cb8bd9b5bc134de4c5bca326b7af4a519191cefeb2a9138da2e5e09c09218d342eafe09
-DIST vscodium-1.67.0-amd64.tar.gz 115824232 BLAKE2B 6b32c329c83cf8acaf54cbc415789b595f2c9a4a778a91b29a995f1f065dad0e3167fbac4261ec45391465abce69800c2c8fe284ffc0bed138b7eb93e6cf0be5 SHA512 ade93db0ac0329f25fdf350b25631627a9399bb80c7cac72e3dd23af5ab988aa069a37e33dba91782c76b3852fdf1a2fd33d1b520e2a2905d8137ed280d1e7e2
-DIST vscodium-1.67.0-arm64.tar.gz 113531704 BLAKE2B 1fd734be914f7aeb177095ae8e5adce1ca00c5a8655e0b741e24c0a1168821c68ab3a48135a3980e515b7c646adcec098f5ea3ba5b549c2e43d99b99f8f20961 SHA512 ac6e56f87154ba92dc6b593b98a438c1d80b375344ee12426074e25e0af01ccdb635d55e876d8427e2a153f6e2c921b5d8ca4d1601395a05dd65914bfeaba59f
-EBUILD vscodium-1.65.2.ebuild 3236 BLAKE2B 3cb64418ae40ca572e8d00b29a83d2c51754648de49f4fba7939994675776e6510f536829689447cfc5d06e85718bfe686e83e57b6caebde16d62d702cc15bcb SHA512 823c050bb727ab3451af94acb155e408242ef1d4535d66470fde7d4b80f184bc3403671f00df49899b666404ac5ce42c6c80f1b8910f1d7edf2601e3b82f20ab
+DIST vscodium-1.67.2-amd64.tar.gz 115827064 BLAKE2B 3e50d13408d465425f4aab384380c7275d4c75da1b307c0054a3292c8a9ae25407b9ce5bb970b7625e3570a2db3ba59aad92c7284e67ea9e599f294d0940e0ff SHA512 83880081e3f5130da47958c50aa1c491a3b2afb62c4cec8b6cba4e8aeb6e15ba4268223e9995111ee9c61fcad35a6f4868aa2f594632a9eb2e143ceda2b04a49
+DIST vscodium-1.67.2-arm64.tar.gz 113531559 BLAKE2B 74a5a2dbbb3775861195beca0283f9623500a62d862d6c2a3cd2b7e76494b96900a6a8b0df29cac19e95793c153330268b77c22e712f42a302a4d44410d2fc62 SHA512 e046449572fef71f6e3e0bcacc1ff874ce09db57a28bbdabbe86ae2cef9d8f80146f8e7a8c85d7007d4012e47203ccd8c6ce22dc069d5a86418c3b54b46ff6c5
+DIST vscodium-1.68.1-amd64.tar.gz 116928237 BLAKE2B 82bb393fcb0f3d1ce63cee1ba927fd564d1bf2a8aa4283a518d8f40860e52d93d32b9e1e50bbc33b3ec53630a1cd1de457499f91d637b69043dcb818ef03e714 SHA512 f30c066d970530c462f027f3e94e06e4d62ca50e6093f3164f2a21b57d34c5a36823bea5f70f56beda87c27dcfc40f21ecd9d9da16353a78489246ef63419346
+DIST vscodium-1.68.1-arm.tar.gz 98741049 BLAKE2B 76dcb5c5fce1c80fdfe9b21aab389ca13d5983c278e2594bc7aae1588cff4227d316257198407f049e58461161a13533008c0181cfc31fd33bf01978c4379968 SHA512 06d1d7814a4d85c23caefd345fb42c40ef4488333f1fcd2edee65c296e11892e758ea5d197de51f2fb59dac98f9f8c108849c45bdc5dbcd8cd49afe2afad5805
+DIST vscodium-1.68.1-arm64.tar.gz 114632027 BLAKE2B 48cf6a5566817e0ae9a9b33f98a3eeb5385b303a200efc5704b8003e78c62e3865ce49fe425b9bb1a7deea9434c4cbb99550f0d73789c6123bb5ab307ef36fe9 SHA512 7c977a3aeef886583b48aa6882792811caee0661c73cbcc9cf3d98f7399dc7c7b3378be9e1848263211c2e71fbfab6b3a72debf92618c12781f0172522eff16f
 EBUILD vscodium-1.66.2.ebuild 3321 BLAKE2B 403e3548d2be58c998f72039fb32c7c4e64a5c6b79505b6c29c780b5bb81ce2c2b54abbae4b45891eaaa8c1532db5c3185f3d3c670b50feed6313460c32b1e52 SHA512 e3cfd41801a2301c4976a71e742c9c43c0f29bb00834f447b832fe40c88fce557e1bfce6c8a64890378e89ff835130fb44e5a35af1f34fd149842bd955420258
-EBUILD vscodium-1.67.0.ebuild 2860 BLAKE2B 116ee8922aad22e774f7927ec4c9bc9e27c05f86a58dac7f625f24d695038822b75ab6c5d6f4a2d66a63c0bf2d6b5bc0255b234af52901542e7640a7908c30f3 SHA512 860f0ec6528856383c821537f20b42acf25a6ae6ff4b1f86a9395e73e8cb51cbf62c4256ae01175e39d6901ddb1ad77ef42a37a3b6ff6191f8a8bd7e42b5831f
+EBUILD vscodium-1.67.2.ebuild 2860 BLAKE2B 116ee8922aad22e774f7927ec4c9bc9e27c05f86a58dac7f625f24d695038822b75ab6c5d6f4a2d66a63c0bf2d6b5bc0255b234af52901542e7640a7908c30f3 SHA512 860f0ec6528856383c821537f20b42acf25a6ae6ff4b1f86a9395e73e8cb51cbf62c4256ae01175e39d6901ddb1ad77ef42a37a3b6ff6191f8a8bd7e42b5831f
+EBUILD vscodium-1.68.1.ebuild 2986 BLAKE2B 27b3231f1622c4eb2bcdf77a9dc441e842c3fa66c9796c09b3f6b7fb7aaf203fd99f761f20ad039902a79810d4dcc9e6bcb33fb9093862858543c1831ca3338b SHA512 21e133441a2a29dd492f3c078ade823303417c2ca5b34ffe58a87cd29d98fd54f8dc31b8758b803aebb4563a05abfc707716b182ab429bb29f6174491edee8b9
 MISC metadata.xml 1191 BLAKE2B ac8f365247fc710ade8a690da2a409352c20a886ad96b529ab0fc3f200dda28c2c7ca62fa78a922689373fa483e0a789836b887c8fccf2729ca6aa4c0e06aefe SHA512 e5b56663a757cdfff13ddc25c5d4f118f22d194fb051ae0bbe3264a4721c196a8820db1bfbd5a992827d8c97a81edfc30a97ca9610961ee46684a253d186449c
diff --git a/app-editors/vscodium/vscodium-1.67.0.ebuild b/app-editors/vscodium/vscodium-1.67.2.ebuild
index 0c1ad7786d63..0c1ad7786d63 100644
--- a/app-editors/vscodium/vscodium-1.67.0.ebuild
+++ b/app-editors/vscodium/vscodium-1.67.2.ebuild
diff --git a/app-editors/vscodium/vscodium-1.65.2.ebuild b/app-editors/vscodium/vscodium-1.68.1.ebuild
index 906a2b847f99..2a4ae874205a 100644
--- a/app-editors/vscodium/vscodium-1.65.2.ebuild
+++ b/app-editors/vscodium/vscodium-1.68.1.ebuild
@@ -68,17 +68,18 @@ RDEPEND="
 "
 
 QA_PREBUILT="
+	/opt/vscodium/chrome_crashpad_handler
+	/opt/vscodium/chrome-sandbox
 	/opt/vscodium/codium
 	/opt/vscodium/libEGL.so
 	/opt/vscodium/libffmpeg.so
 	/opt/vscodium/libGLESv2.so
-	/opt/vscodium/libvulkan.so*
-	/opt/vscodium/chrome-sandbox
 	/opt/vscodium/libvk_swiftshader.so
-	/opt/vscodium/swiftshader/libEGL.so
-	/opt/vscodium/swiftshader/libGLESv2.so
+	/opt/vscodium/libvulkan.so*
 	/opt/vscodium/resources/app/extensions/*
 	/opt/vscodium/resources/app/node_modules.asar.unpacked/*
+	/opt/vscodium/swiftshader/libEGL.so
+	/opt/vscodium/swiftshader/libGLESv2.so
 "
 
 S="${WORKDIR}"
@@ -92,6 +93,7 @@ src_install() {
 	insinto "/opt/${PN}"
 	doins -r *
 	fperms +x /opt/${PN}/{,bin/}codium
+	fperms +x /opt/${PN}/chrome_crashpad_handler
 	fperms 4711 /opt/${PN}/chrome-sandbox
 	fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass.sh
 	fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass-empty.sh
@@ -110,12 +112,4 @@ pkg_postinst() {
 	xdg_pkg_postinst
 	elog "When compared to the regular VSCode, VSCodium has a few quirks"
 	elog "More information at: https://github.com/VSCodium/vscodium/blob/master/DOCS.md"
-
-	if has_version -r ">=gui-libs/wlroots-0.15"; then
-		elog
-		elog "The wayland backend of vscodium crashes with >=gui-libs/wlroots-0.15"
-		elog "This will be fixed upstream in a later release"
-		elog "Please run the xwayland version for now, on wlroots based DEs."
-		elog "For more information, see https://bugs.gentoo.org/834082"
-	fi
 }
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 692ea4d684a4..bf7a9d8bb66d 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -6,10 +6,12 @@ AUX xemacs-21.4.24-ncurses-tinfo.patch 538 BLAKE2B ef09bb366ebb79cd9bd3e089098ae
 AUX xemacs-21.4.24-strsignal.patch 4452 BLAKE2B f5f8d35a15f6c1aa59d6d31a8c4ed46b057f6af01ed8bb42cada466c6b95ba9633dbe8f0af5aa7a4779cc2c98bab42c629f4f16eb38aa558913a630a961110c5 SHA512 2858c5937f0a9f80f72f7f78f38ebd6abe9d65b79d44a817579c6346a46f20c42756291f399d464b4cc994dfc3ec9e2e1a32613d915f92f3c79ebf0f90cd7c64
 AUX xemacs-21.5.34-ar.patch 2238 BLAKE2B 2bcf0ebcec74fcf6c2c10755da8cf5975efd39e4c746f61bf70e914e44787aea27ba4aace239ae93e37865e959d6f832e208ad7700772d1e8da64f07d98791e1 SHA512 f297b854277fab85539ab70814bc0827345ad6e098138f55296d23935a6e5a23bc1d04bade23b4f5202735246ebe86ea82b0f3e4a50df5360761b6d922589d10
 AUX xemacs-21.5.34-as-needed.patch 921 BLAKE2B 18b67b2330cda62bb08fccdba8f71d0213f463aeb7e360b8b7f8cd791718cf89f44999858dea9b51a4c1f94b47b6774addd5a1ab9c36d65036f3890925847bb1 SHA512 3b55683346e6a0cac0b0b21ce21f3bc0ca4d2734307a20ce556cdea084e821d9c9be3c69db329ec1546bc249bfa5cae136e393e858bd53105db9152627514285
+AUX xemacs-21.5.34-autoloads-parallell-make.patch 8290 BLAKE2B c9bd81b499cd94a9551844922cbdf42f7df86a7b1812f3c18f782feb01c2e79fa9d2c4c7a6a115ac1deb8b661be6ac0190bfb8290bca89c83191a5956d82139b SHA512 b8230825ffccd146cd459a806fbeb096948dd8d0cc5ed0884b7441d49db21325e1bfc5c450b758ca1c200bfea4903d5e875d169567028616c54c5a56448bc59c
 AUX xemacs-21.5.34-configure-libc-version.patch 957 BLAKE2B ae69bc6a5d3858571fec40d65bd097c65909fdccb282dbc05fe7014e654f73736f742c68ac24b8118c209b05dc399e2d1cc6109f288ae049e48bfee140d71d1f SHA512 e41b6fd7601dbd59c775e62f390e17c194eab9360cce2ae3d03e1b5f4f7fc59080ecd76401eab5211c2f0ab4fea4baf9746e10675ba00f05115067008cce5a6f
 AUX xemacs-21.5.34-gcc5.patch 1194 BLAKE2B 1b042f7a7034fa7066279e91d96e6f1c2f962273b4aa26ca3a6bfb5cf737572d97c1d7f11dc87a15e44a2516e9112cb8f4ba8d916feb856bab15beeecce6cbe9 SHA512 276f3e10334c3809f625e69ea0d56585fd429e9aced65331bd1ca0ced467bcf526cee43925b4c4dc381723883348877782e1c234db00e60c3d74a78021a2330b
 AUX xemacs-21.5.34-glibc-macro.patch 1369 BLAKE2B cd03d4c6d3629ab186c60a869cd99483dec1192dddecb91466e72c83b3f2969a0f02ae34953da3511edc80bd17ed880168b98f661fab1a0642d4e2944cc0411c SHA512 6397267d99649f62a20a0a1f2bc380360ed7689691adde515421286b3bcad55dbb0cea246427e03f904fd829624060ad7ae66a67c63f16f3b3c1f88803022176
 AUX xemacs-21.5.34-ncurses-tinfo.patch 699 BLAKE2B 0978b118040b1399bb042efbdfa54968a701b37a5b2f505f4dd1af9971b38c0a52cbe8fb9272ecc19c030bfa79fe28d56df358484116eadf3db9396b7ce09d17 SHA512 814b01388e7eb5963307dd5cd136725dd6d0d206b1a4e8ffc2ca8dabdd0070a58122fb4faa943efead1fe70f6309819177870630e05e5c02b51dc5e2aa0bd765
+AUX xemacs-21.5.34-no-lock-on-finder-inf.patch 3946 BLAKE2B 195cb81df5ff7aecdb5f616178388a620d05e41975697df238928c2209a15652762aefb461eb681e3b6eb0f1736127d45101b6da478d2bb01d7b0735d0a94329 SHA512 754031e82c4c5236a3119973ee9d6635fc93a1d5b27eb4ae1ada2bf06ae45fbd306f00dc3bd8fbd1df9b855b1b031b24801bf1ba4c6f5e8f66903b151a3d0781
 AUX xemacs-21.5.34-process-test-qa.patch 501 BLAKE2B 11130d14b564181e35820acd99266e2fb8ba18b742f993ac6161d6b6cc04b8a14f92f4ddd8f21912e1521db88b8b6df0efa47df5dfd2cb1fe0bc20338d9553fa SHA512 03676ffa352871e278cf1cffb8bdc1e1c9052b49517d4009079734b5ff1de647e9808fb4c8a620ab9a8ec5dcbe02a454df0e11ef1f9e7867014c8fec830c90f5
 AUX xemacs-21.5.34-strsignal.patch 4675 BLAKE2B 09297a6e4979fdcf36fa7807072236ceebff1cfbee01c6d5034b93c0725833fbfe1da0488eb4e9d588ed0c49356835310989cdd2bfa819f5ad94a5a13378e4d2 SHA512 c5eb3a7e25b4ede9046b00b8d949fbdc07a430bec1095906888c3361a4b354ab6625353c168f3544a65c77226ae6f7762f07850a97087a0ac75b2556b1b661b2
 AUX xemacs.desktop 1061 BLAKE2B 47941fc8b380e08aad13e44fc1899ee73ef502dbbf5d8be4eaa23c301b5d25a8c334971a1d89f8cfa551dce909891edaac6a7df956c912396fc8cfb88a720a6b SHA512 6542fc7777af888ae711d386918e712e1d106635f70e65af77d1e809156baba9831fc4c8bd2cb7e7c6f9ab0ab18ddfb92709ac2909aa613471101454599bdb69
@@ -19,6 +21,6 @@ DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31
 EBUILD xemacs-21.4.24-r5.ebuild 7114 BLAKE2B 051a221c2973c4d54741e89ecd3152cc95b65ac63318099c98c73c16ce5ba43dc940331371ee88c79af6023c7c9ac8a4720d99483e5ce91688d0858a302a5fa7 SHA512 fefe0fb6d1c3f9ff66a50acdbe0e2c9769df01b5447a8e25fd9243733da728d16c9ac5d54539d40c0a0dc83cdc5c3e949d661c7c9b6c9aabe63cbbf78ff8f287
 EBUILD xemacs-21.4.24-r6.ebuild 7139 BLAKE2B a8e8c5c1cc41f60ebf88f454d7198936df70c47ccca00c5abd10a901d2e8a2c003699d336d0ce018385fe2cacea2cc0d53cce24c174293216f1b8beb6a2266c5 SHA512 c7c09d1195d6f5bf291b463700d1caa05fa3803ab8f7a4b29ed7cfdf2c1e2beccb24a14fc904992e66c0190d6fb70db936e348512f479cc5aec42b072bff6b49
 EBUILD xemacs-21.5.34-r8.ebuild 7339 BLAKE2B be0b1d94b9ab0e113c14d9563b82a4feb2c9fd7601597269efa608df7eba950b03dc6f5502c5b439962eac2fedd953285f4a45d7f212e5e34147a7530b66e4a8 SHA512 e44fcec4cf5eee02f3800c153f35295454f0d8c3f10cda3d30245518e7199f997908333a1d7f9f37ca79dd2264bd397b06cfac89e6be7f6ab0113beff7ae824f
-EBUILD xemacs-21.5.34-r9.ebuild 7233 BLAKE2B 9ff5ea0f933aaf5511d2d9cff98a316aa4b136d1d78fbf91b195409f17b8a1b7b7cdf72d57bdc8f0cc8a9d624db25dcd0e7927937bfbdc59cf0db85ea1e8251c SHA512 0456dc211ccc9fd19f3351c1108bc3064a86576aaef1943016676e898245102c520af7dcfe8eb211b82e081fae1f6e90c27390fd7e98e7d822be45a48edaf189
+EBUILD xemacs-21.5.34-r9.ebuild 7346 BLAKE2B 6516c9543c5381cd83964c7170f88db536c88cd0b7457250e33140949d9d77fbc93cb64e54344adee820c222554669702d4ba9591aa69594bf91bdccc1909673 SHA512 ae36bc78eb159759b05b3f367fc1a56b79a92c80bae1d3ba27d481b6475dd95549516a665f358d2ca787e7a50b1e09ecb09834c00a46ff0adec9a015e4954723
 EBUILD xemacs-21.5.9999.ebuild 7224 BLAKE2B d3907244a27a25b0def8ec0f47d82a54a7356632c5024d7e740ee8992bbc6da9a309a480599a10fda686731da78ae2fe23610b112e81575b2dda785adf23d60c SHA512 1bca46da3f9fe5749c7bc144899c005a982cf84d30692eb107be5298f92288308984ce31eeafda9887056f7ffd09bc06f4077c8e124a46b9ff46ad6fe42268c5
 MISC metadata.xml 683 BLAKE2B 060e4f7830a96404813a550debecf83c2de3993183d41638362ed01a3a6240bdd33a83c0db5e31a2f2e821046fb1c15199688271c27611689aac1bdf02bcde14 SHA512 176625d3c972766aaecd10125e69b4cdcbedff958b842b2ac2b6a39d728ec868b3311ef13f6854122063810c5125f48d73cd1e68083de5ddf3ef85f7f2b09cdc
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-autoloads-parallell-make.patch b/app-editors/xemacs/files/xemacs-21.5.34-autoloads-parallell-make.patch
new file mode 100644
index 000000000000..9a86046be992
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-autoloads-parallell-make.patch
@@ -0,0 +1,184 @@
+--- a/lisp/update-elc-2.el.orig	2022-06-16 21:58:48.748641021 +0200
++++ b/lisp/update-elc-2.el	2022-06-16 21:58:48.748641021 +0200
+@@ -137,37 +137,10 @@
+   (let ((dir (car command-line-args-left)))
+     ;; don't depend on being able to autoload `update-autoload-files'!
+     (load "autoload")
+-    (autoload 'cl-compile-time-init "cl-macs")
+     (load "bytecomp")
+     (load "byte-optimize")
+-    ;; #### the API used here is deprecated, convert to one with explicit
+-    ;; arguments when it is available
+-    ;; update-elc.el signals us to rebuild the autoloads when necessary.
+-    ;; in some cases it will rebuild the autoloads itself, but doing it this
+-    ;; way is slow, so we avoid it when possible.
+-    (when (file-exists-p (expand-file-name "REBUILD_AUTOLOADS"
+-					   invocation-directory))
+-      ;; if we were instructed to rebuild the autoloads, force the file
+-      ;; to be touched even w/o changes; otherwise, we won't ever stop
+-      ;; being told to rebuild them.
+-      (update-autoload-files dir "auto" nil t)
+-      (byte-recompile-file (expand-file-name "auto-autoloads.el" dir) 0)
+-      (when (featurep 'mule)
+-	(let ((muledir (expand-file-name "../lisp/mule" (file-truename dir))))
+-	  ;; force here just like above.
+-	  (update-autoload-files muledir "mule" nil t)
+-	  (byte-recompile-file (expand-file-name "auto-autoloads.el" dir) 0))))
+-    (when (featurep 'modules)
+-      (let* ((moddir (expand-file-name "../modules" (file-truename dir)))
+-	     (autofile (expand-file-name "auto-autoloads.el" moddir)))
+-	(update-autoload-files 
+-	 (delete (concat (file-name-as-directory moddir) ".")
+-		 (delete (concat (file-name-as-directory moddir) "..")
+-			 (directory-files moddir t nil nil 0)))
+-	 "modules" autofile)
+-	(byte-recompile-file autofile 0)))
+-    ;; now load the (perhaps newly rebuilt) autoloads; we were called with
+-    ;; -no-autoloads so they're not already loaded.
++    ;; now load the autoloads; we were called with -no-autoloads so they're not
++    ;; already loaded.
+     (load (expand-file-name "auto-autoloads" lisp-directory))
+     (when (featurep 'mule)
+       (load (expand-file-name "mule/auto-autoloads" lisp-directory)))
+@@ -175,6 +148,8 @@
+     ;; there may be dependencies between one .el and another (even across
+     ;; directories), and we don't want to load an out-of-date .elc while
+     ;; byte-compiling a file.
++    (when (featurep 'modules)
++      (load (expand-file-name "auto-autoloads" module-directory)))
+     (message "Removing old or spurious .elcs in directory tree `%s'..." dir)
+     (do-update-elc-2 dir nil nil)
+     (message "Removing old or spurious .elcs in directory tree `%s'...done"
+--- a/lisp/update-elc.el.orig	2022-06-16 21:58:48.748641021 +0200
++++ b/lisp/update-elc.el	2022-06-16 21:58:48.748641021 +0200
+@@ -54,8 +54,11 @@
+ (defvar update-elc-files-to-compile nil)
+ (defvar need-to-rebuild-autoloads nil)
+ (defvar need-to-rebuild-mule-autoloads nil)
++(defvar need-to-rebuild-module-autoloads nil)
+ (defvar need-to-recompile-autoloads nil)
+ (defvar need-to-recompile-mule-autoloads nil)
++(defvar need-to-recompile-module-autoloads nil)
++
+ (defvar exe-target nil)
+ (defvar dump-target nil)
+ (defvar dump-target-out-of-date-wrt-dump-files nil)
+@@ -84,10 +87,14 @@
+ 
+ (defvar source-lisp-mule (expand-file-name "mule" source-lisp))
+ (defvar source-directory (expand-file-name ".." source-lisp))
++(defconst module-directory (expand-file-name "modules" source-directory))
++
+ (defvar aa-lisp (expand-file-name "auto-autoloads.el" source-lisp))
+ (defvar aac-lisp (expand-file-name "auto-autoloads.elc" source-lisp))
+ (defvar aa-lisp-mule (expand-file-name "auto-autoloads.el" source-lisp-mule))
+ (defvar aac-lisp-mule (expand-file-name "auto-autoloads.elc" source-lisp-mule))
++(defvar aa-modules (expand-file-name "auto-autoloads.el" module-directory))
++(defvar aac-modules (expand-file-name "auto-autoloads.elc" module-directory))
+ 
+ (setq load-path (list source-lisp))
+ 
+@@ -130,7 +137,8 @@
+ 
+ (defvar lisp-files-ignored-when-checking-for-autoload-updating
+   '("custom-load.el"
+-    "auto-autoloads.el")
++    "auto-autoloads.el"
++    "finder-inf.el")
+   "Lisp files that should not trigger auto-autoloads rebuilding.")
+ 
+ (defun update-elc-chop-extension (file)
+@@ -270,6 +278,18 @@
+ 	  (setq all-files-in-dir (cdr all-files-in-dir))))
+       (setq dirs-to-check (cdr dirs-to-check))))
+ 
++  ;; Check for the module autoloads separately, given the need to run
++  ;; directory-files on subdirectories.
++  (let ((autoload-file
++        (expand-file-name "auto-autoloads.el" module-directory)))
++    (mapc
++     #'(lambda (full-dir)
++        (mapc #'(lambda (full-arg)
++                  (when (file-newer-than-file-p full-arg autoload-file)
++                    (setq need-to-rebuild-module-autoloads t)))
++              (directory-files full-dir t "\\.c$" nil t)))
++     (directory-files module-directory t nil t 'subdirs)))
++
+   (if dump-target-out-of-date-wrt-dump-files
+       (condition-case nil
+ 	  (write-region-internal
+@@ -297,6 +317,14 @@
+ 	  (file-newer-than-file-p aa-lisp-mule aac-lisp-mule))
+   (setq need-to-recompile-mule-autoloads t))
+ 
++(when (or need-to-rebuild-module-autoloads
++         ;; not necessary but ...  see comment above.
++         (eq (file-exists-p aa-modules) nil)
++         ;; no need to check for file-exists of .elc due to definition
++         ;; of file-newer-than-file-p
++         (file-newer-than-file-p aa-modules aac-modules))
++  (setq need-to-recompile-module-autoloads t))
++
+ (when (not (featurep 'mule))
+   ;; sorry charlie.
+   (setq need-to-rebuild-mule-autoloads nil
+@@ -318,15 +346,18 @@
+ 	(if need-to-rebuild-mule-autoloads
+ 	    (list "-f" "batch-update-directory-autoloads"
+ 		  "mule" source-lisp-mule))
++        (if need-to-rebuild-module-autoloads
++            (list "-f" "batch-update-directory-autoloads"
++                  "auto" module-directory))
+ 	(if need-to-recompile-autoloads
+ 	    (list "-f" "batch-byte-compile-one-file"
+ 		  aa-lisp))
+ 	(if need-to-recompile-mule-autoloads
+ 	    (list "-f" "batch-byte-compile-one-file"
+-		  aa-lisp-mule)))))
+-  (condition-case nil
+-      (delete-file (expand-file-name "src/REBUILD_AUTOLOADS" build-directory))
+-    (file-error nil))
++                  aa-lisp-mule))
++        (if need-to-recompile-module-autoloads
++            (list "-f" "batch-byte-compile-one-file"
++                  aa-modules)))))
+   (cond ((and (not update-elc-files-to-compile)
+ 	      (not need-to-rebuild-autoloads)
+ 	      (not need-to-rebuild-mule-autoloads)
+@@ -335,17 +366,25 @@
+ 	 ;; (1) Nothing to do at all.
+ 	 )
+ 	((not update-elc-files-to-compile)
+-	 ;; (2) We have no files to byte-compile, but we do need to
+-	 ;;     regenerate and compile the auto-autoloads file, so signal
+-	 ;;     update-elc-2 to do it.  This is much faster than loading
+-	 ;;     all the .el's and doing it here. (We only need to rebuild
+-	 ;;     the autoloads here when we have files to compile, since
+-	 ;;     they may depend on the updated autoloads.)
+-	 (condition-case nil
+-	     (write-region-internal
+-	      "foo" nil (expand-file-name "src/REBUILD_AUTOLOADS" build-directory))
+-	   (file-error nil))
+-	 )
++         ;; (2) We have no files to byte-compile, but we do need to regenerate
++         ;;     and compile the auto-autoloads file. Don't pass this on to
++         ;;     update-elc-2.el to do, since that gives dependency problems
++         ;;     with parallel builds (make -j and friends). Completely fine to
++         ;;     use the compiled Lisp infrastructure for this, though, since we
++         ;;     know it's up to date.
++         (setq command-line-args
++               (append
++                '("-l" "loadup-el.el" "run-temacs"
++                  "-batch" "-no-packages" "-no-autoloads"
++                  "-eval" "(setq stack-trace-on-error t)"
++                  "-eval" "(setq load-always-display-messages t)"
++                  "-l" "bytecomp.elc" "-l" "autoload.elc")
++                do-autoload-commands))
++         (write-sequence "\nNeed to regenerate auto-autoload files... "
++                         'external-debugging-output)
++         (let ((load-ignore-elc-files nil)
++               (purify-flag nil))
++           (load "loadup.el")))
+ 	(t
+ 	 (let ((bc-bootstrap
+ 		(mapcar #'(lambda (arg) 
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-no-lock-on-finder-inf.patch b/app-editors/xemacs/files/xemacs-21.5.34-no-lock-on-finder-inf.patch
new file mode 100644
index 000000000000..a37fc5e95fe0
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-no-lock-on-finder-inf.patch
@@ -0,0 +1,99 @@
+# HG changeset patch
+# User Aidan Kehoe <kehoea@parhasard.net>
+# Date 1656333099 -3600
+#      Mon Jun 27 13:31:39 2022 +0100
+# Node ID c6966a009d0dc3b546c9d843141c1fb5daa89b9e
+# Parent  16e37125d7ea85048e89197ce8fe83f44b00ccc5
+Don't create a lock file when generating finder-inf.el
+
+lisp/ChangeLog addition:
+
+2022-06-27  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* finder.el (finder-compile-keywords):
+	Don't use the save-buffer infrastructure when generating
+	finder-inf.el, since that leads to lock files, making parallel
+	builds less likely to work. Thank you Mats Lidell and the Gentoo
+	users!
+
+src/ChangeLog addition:
+
+2022-06-27  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* Makefile.in.in ($(LISP)/finder-inf.el):
+	Don't remove finder-inf.el before regenerating it, Lisp will
+	overwrite it.
+
+diff -r 16e37125d7ea -r c6966a009d0d lisp/finder.el
+--- a/lisp/finder.el	Sun Jun 26 19:14:02 2022 +0300
++++ b/lisp/finder.el	Mon Jun 27 13:31:39 2022 +0100
+@@ -151,7 +151,7 @@
+ arguments compiles from `load-path'."
+   (save-excursion
+     ;; XEmacs change
+-    (find-file (expand-file-name "finder-inf.el" lisp-directory))
++    (set-buffer (generate-new-buffer "finder-inf.el"))
+     (let ((processed nil)
+ 	  (directory-abbrev-alist
+ 	   (append
+@@ -160,11 +160,12 @@
+                                      "")))
+ 		    finder-abbreviate-directory-list)
+ 	    directory-abbrev-alist))
+-	  (using-load-path))
++	  using-load-path second-line-marker finder-scratch)
+       (or dirs (setq dirs load-path))
+       (setq using-load-path (equal dirs load-path))
+       (erase-buffer)
+       (insert ";;; finder-inf.el --- keyword-to-package mapping\n")
++      (setq second-line-marker (point-marker))
+       (insert ";; Keywords: help\n")
+       (insert ";;; Commentary:\n")
+       (insert ";; Don't edit this file.  It's generated by finder.el\n\n")
+@@ -180,7 +181,8 @@
+ 		(if (not finder-compile-keywords-quiet)
+ 		    (message "Processing %s ..." f))
+ 		(save-excursion
+-		  (set-buffer (get-buffer-create "*finder-scratch*"))
++		  (set-buffer (setq finder-scratch
++                                    (get-buffer-create "*finder-scratch*")))
+ 		  (buffer-disable-undo (current-buffer))
+ 		  (erase-buffer)
+ 		  (insert-file-contents (expand-file-name f d))
+@@ -210,10 +212,23 @@
+ 	    (directory-files d nil "^[^=].*\\.el$"))))
+        dirs)
+       (insert "))\n\n(provide 'finder-inf)\n\n;;; finder-inf.el ends here\n")
+-      (kill-buffer "*finder-scratch*")
++      (if finder-scratch (kill-buffer finder-scratch))
+       (unless noninteractive
+ 	(eval-current-buffer)) ; So we get the new keyword list immediately
+-      (basic-save-buffer))))
++      (goto-char (point-min))
++      (if (re-search-forward "[^\x00-\x7f]" nil t)
++          (progn
++            (goto-char (point-min))
++            (if (re-search-forward "[^\x00-\xff]" nil t)
++                (progn (goto-char second-line-marker)
++                       (insert ";;; -*- coding: escape-quoted -*-\n")
++                       (setq buffer-file-coding-system 'iso-8859-1-unix))
++              (goto-char second-line-marker)
++              (insert ";;; -*- coding: iso-8859-1 -*-\n")
++              (setq buffer-file-coding-system 'escape-quoted-unix)))
++        (setq buffer-file-coding-system 'no-conversion-unix))
++      (write-region (point-min) (point-max)
++                    (expand-file-name "finder-inf.el" lisp-directory)))))
+ 
+ (defun finder-compile-keywords-make-dist ()
+   "Regenerate `finder-inf.el' for the Emacs distribution."
+diff -r 16e37125d7ea -r c6966a009d0d src/Makefile.in.in
+--- a/src/Makefile.in.in	Sun Jun 26 19:14:02 2022 +0300
++++ b/src/Makefile.in.in	Mon Jun 27 13:31:39 2022 +0100
+@@ -590,7 +590,6 @@
+ 
+ $(LISP)/finder-inf.el: update-elc-2
+ 	@echo "Building finder database ..."
+-	$(RM) $(LISP)/finder-inf.el
+ 	$(XEMACS_BATCH)	-eval "(setq finder-compile-keywords-quiet t)" \
+ 		-eval "(setq lisp-directory \"$(LISP)\")" \
+ 		-l finder -f finder-compile-keywords
diff --git a/app-editors/xemacs/xemacs-21.5.34-r9.ebuild b/app-editors/xemacs/xemacs-21.5.34-r9.ebuild
index bba9dbfeb9b6..cbf425e1c83b 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r9.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r9.ebuild
@@ -67,6 +67,8 @@ src_prepare() {
 	eapply "${FILESDIR}/${P}-ar.patch"
 	eapply "${FILESDIR}/${P}-strsignal.patch"
 	eapply "${FILESDIR}/${P}-process-test-qa.patch"
+	eapply "${FILESDIR}/${P}-autoloads-parallell-make.patch"
+	eapply "${FILESDIR}/${P}-no-lock-on-finder-inf.patch"
 
 	eapply_user
 
diff --git a/app-editors/xvile/Manifest b/app-editors/xvile/Manifest
index 1db4f957c273..a649800ac636 100644
--- a/app-editors/xvile/Manifest
+++ b/app-editors/xvile/Manifest
@@ -1,3 +1,5 @@
 DIST vile-9.8t.tgz 2352119 BLAKE2B fc1c75eba09e8be99945ba0d178fd150576d8108f906afb20dba265adaee9e5bea4869415d3ebceabf0b6b56c147add79e9c7e4fe34d7f4744930c3728e4a4a4 SHA512 4be4e37c7231395cae9236796073c2c3e428f1945283785a931c5d4cce94e0f970efa6634b0f9053679a00f4b4577704ea38ded2129e444b26ee9935a1c3d229
-EBUILD xvile-9.8t-r1.ebuild 889 BLAKE2B 94cb5120f3470a33e4b15430f8b17bd59324669df9b3f57551cc2aa99a7c6b26a70fa4e302e4dc6eb1c306f9595e947273fe1cb9c33c10c6648b9aa48e23b00f SHA512 3960242eb7b1c87438d3ac788f17dacc64d683352d780933436b28dd6a3306646e9edbdaff430e34c3ed4d10c96234ea4338a1c713ebc6e38a529fd05a56ca8d
+DIST vile-9.8v.tgz 2405398 BLAKE2B cd8753c57ff95c9b420026128fd19b7c689c99500da7cae91d3160dded46aa101b0cae32daeaf0377d4d72a5e526e8e4f25422bbbff2cc5ecdef10b7f04c8b39 SHA512 b752f26148bd4411ab6b31697459a16d8168f79ffad6b3509d6cf5d40611176b833e56f4bac21fe18ecdd256be467ba96ea98149daceab671002df49508eb8d2
+EBUILD xvile-9.8t-r2.ebuild 891 BLAKE2B a76858f6c81c1071ffde27f70c634bfdda2700571cedd1b1a34480b03147fc2ca2e5f3bd1e5c13c83c74a1249592910643f9c90806f37ffb9db3bd32147fcdc0 SHA512 dc36fe03386f3f270152f671e68ade17c16d327a6ab558a44c706255be7fa7b12761d47df0d6be34082377865522d2795775a455e3f3b911756218db1eb03a46
+EBUILD xvile-9.8v.ebuild 1008 BLAKE2B d3e6e51e1436faf9dde210e90a96aaeec2270a97b5cc5913914397d594355654a0a62fb6c2ba82b67152d20e2cc139ff9c4f343bd4b276d44b79c460eed09c07 SHA512 017e1b87c2f1924d075e6baf0a04d56c27f154aea126b0081efcb0caff8dc80782002552c4a7497da093a3305c7626c98b268edae83a3197b84b102248972ae4
 MISC metadata.xml 347 BLAKE2B 5546714e3c87c1f8380e655e16cf7915878127cbf23ba125010a023056f73e20acb3a268aec33c1829244b7d637f62c47003d98ce90ac127035853b8f2c68ca5 SHA512 a0f8b7dd3327440537748c2e2faaf268efd46b20cbddfb9cbb1ced71b04ed37fd7b65ab3d317d1bc260fdad7497f60e32d29d9313764cdb0896f7137c39fa2e5
diff --git a/app-editors/xvile/xvile-9.8t-r1.ebuild b/app-editors/xvile/xvile-9.8t-r2.ebuild
index e665c73095c6..731637043fa1 100644
--- a/app-editors/xvile/xvile-9.8t-r1.ebuild
+++ b/app-editors/xvile/xvile-9.8t-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ppc ~riscv sparc x86"
 IUSE="perl"
 
-RDEPEND="perl? ( dev-lang/perl )
+RDEPEND="perl? ( dev-lang/perl:= )
 	~app-editors/vile-${PV}
 	virtual/libcrypt:=
 	>=x11-libs/libX11-1.0.0
diff --git a/app-editors/xvile/xvile-9.8v.ebuild b/app-editors/xvile/xvile-9.8v.ebuild
new file mode 100644
index 000000000000..b3a06afe19e8
--- /dev/null
+++ b/app-editors/xvile/xvile-9.8v.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Bump with app-editors/vile
+
+MY_P="${PN/x/}-${PV}"
+DESCRIPTION="VI Like Emacs -- yet another full-featured vi clone"
+HOMEPAGE="https://invisible-island.net/vile/"
+SRC_URI="https://invisible-island.net/archives/vile/current/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~riscv ~sparc ~x86"
+IUSE="perl"
+
+RDEPEND="~app-editors/vile-${PV}
+	virtual/libcrypt:=
+	>=x11-libs/libX11-1.0.0
+	>=x11-libs/libXt-1.0.0
+	>=x11-libs/libICE-1.0.0
+	>=x11-libs/libSM-1.0.0
+	>=x11-libs/libXaw-1.0.1
+	>=x11-libs/libXpm-3.5.4.2
+	perl? ( dev-lang/perl:= )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	sys-devel/flex"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/${MY_P}
+
+src_configure() {
+	econf \
+		--disable-stripping \
+		--with-ncurses \
+		--with-pkg-config \
+		--with-x \
+		$(use_with perl)
+}
+
+src_install() {
+	dobin xvile
+	dodoc CHANGES* README doc/*.doc
+	docinto html
+	dodoc doc/*.html
+}
diff --git a/app-editors/zile/Manifest b/app-editors/zile/Manifest
index 450aa63ff390..c8a7fc96ba43 100644
--- a/app-editors/zile/Manifest
+++ b/app-editors/zile/Manifest
@@ -1,5 +1,5 @@
 DIST zile-2.4.15.tar.gz 1490611 BLAKE2B 3744ab2459edf9b0dc9ca976c5f37625d06e0766e3a1fbb59112fe375af6f6cc5e8c068dcb127b338091f3130d32190ad4bc3a79eac7f9a4f87b46723d5a4a82 SHA512 e2a04c280ae0c0038e6ef18abec0be55063a472f77a511bf31459712be24659edcaa2d1c861d7c00bdab87a1881af03d14eb561047c386cbff5f90b13b1a2575
 DIST zile-2.6.2.tar.gz 1152751 BLAKE2B db51b534c8d76e1def91bbfe49cab501ff1bccd6fbeddd5622d8fca3695305c53e480eed1978e880621e09955e2b98519cfa02cf259006a08d1a8722122148ea SHA512 16d5cece403fc215d53b35c31fe6f743d53d7a01cdc7d101cabe6760173539c9c31e092b29c374f28a723708027f6de626fcfee302962848091f85078fa81761
 EBUILD zile-2.4.15.ebuild 1093 BLAKE2B 5f94a7c04aeaa447571d806bcf4029d3c6cbdda2d31dcfdbcea2810800c1aa2a7e3b097df3edf923e6e30b223ce450154f2e4923ee501ee7e4b663099b5c072c SHA512 ea016a21bf45f2e2cbfcc09fb23ff25b39d63f8e96b01dcf45f3636c11f24be6cb3130d0b429a6bec4d956e893985228b3757440a1eed5bb5d9c3746962bfd3d
-EBUILD zile-2.6.2-r2.ebuild 1157 BLAKE2B 834e21bf49f29776fb4a1b407bf1415b4fd9cd15f0df9a6d88a1c10efc65f36078247ab612012d8a4743222c048a851bab5a283eec17b0a1f5a042c007a5d4a3 SHA512 17e89de0f89ee58a6345cb2b402cfb7d8b9b194c9aaa703eaa7d316683979e68be96018e681bef74139161f21841b40bf310a89912fe7b23e2c6ed0c7a86511a
+EBUILD zile-2.6.2-r2.ebuild 1164 BLAKE2B cca8851edd92f7fdc8f09e5b4837d9c83081619132a69a5cf98501458f4609a90f7a224cc76df6c0213f2b8c55af8677346b60b3f5042b3e40b0acca3fbc2c9f SHA512 6e02aea7207398c1ec4c2f3e9a98c6df1e97e2fc79fdbea541a8f952f2b0a3c6efe3a11201b67cfc82f5791c647cd2e145ce3925e15c63d04c1b95a6c3090c45
 MISC metadata.xml 537 BLAKE2B 3a084218fac3dad29b7a80d6f707e7e8c769eb0e755a1a482814d67b0064c274fc80a50dac09cc6d04e963271fd526f34805dc9c49ffb6d5681dc6178ff43032 SHA512 d1de1757bd448535892b60dd6cc739c9b8cb92affd0c7a1cfffcddbcc1d18a1f17d054e751aa4362e26111e6e59206d086e3afb1552a2061503db6459ec34424
diff --git a/app-editors/zile/zile-2.6.2-r2.ebuild b/app-editors/zile/zile-2.6.2-r2.ebuild
index 096f834386b5..75aaf6867941 100644
--- a/app-editors/zile/zile-2.6.2-r2.ebuild
+++ b/app-editors/zile/zile-2.6.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/zile/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ppc ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="dev-libs/glib:2
 	dev-libs/libgee:0.8=