gentoo resync : 12.05.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
committer: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
commit: 752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree: 330d16e6362a49cbed8875a777fe641a43376cd3 /app-editors
parent: 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)
68 files changed, 535 insertions, 680 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 3da914b4f2e0..60ac5e3d0b4b 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/diakonos/Manifest b/app-editors/diakonos/Manifest
index cb714ed68a15..7735274ad268 100644
--- a/app-editors/diakonos/Manifest
+++ b/app-editors/diakonos/Manifest
@@ -1,5 +1,3 @@
-DIST diakonos-0.9.4.tar.gz 126301 BLAKE2B 197d32968053fe8b68f7e9909619f9be6548d1a32545d32c7cd4a9501f2df2635178ce681e6f77e9a1e0ea7f22fe80eed116239a1df655f3e3567e435d29dbad SHA512 c4737fa1de42549745b606bd881fbe7cff1e46517084142c10fe2a7076f25a6f7418d7aefbc569e3647bbdd04a185f07866021c24161f1675f11ecddde5d654c
 DIST diakonos-0.9.7.tar.gz 129807 BLAKE2B 26c3a72a00e1d41b4a7b2916b37024658d7607ac657d4f71a12b939830578d7939a4f9f4c3886693eae9eeaf91bfe1abe055be7bcc7681619448e298acb5c546 SHA512 ec23d93ed6871d18b6a91e02bc6916ac667ca773be5f093a68fffa5c9cbe89b123e80b18762c8649620eda23b1b9ba582a5236eb9eaefc0e22a411390cd30c73
-EBUILD diakonos-0.9.4-r1.ebuild 795 BLAKE2B ab75013e06ee65ec7493a04689da76c174a90766e97bedbd8e36e4a1b3294fb10bf5648733a3342542bc17d09de4ec73605cbda523354f08d0265db03d1ac1c2 SHA512 974b67588bf1f32773c6b659cbe6c486e71d882db45bc3ee67b679dcc5a33c462a4660b2edd3b856a508b17c5f228e7cbfd763b8b6d29e5260acb799b07446aa
 EBUILD diakonos-0.9.7.ebuild 795 BLAKE2B e818d9af178dad754f3bfa06a543240e66cf71dee7183049e075d189df1e170bfc0baf5d2c3a9b511448d65b68056c1df3c235f234d1b09df1ec9b87acf1e8b7 SHA512 a02d102000107297691526bac6238e8e22e3f0eb7d7b64bfcc1fde7f5fe893994a99a8e177c367a749b60099989e1dfcee77de14b743a241c23fed846aa2eb99
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-editors/diakonos/diakonos-0.9.4-r1.ebuild b/app-editors/diakonos/diakonos-0.9.4-r1.ebuild
deleted file mode 100644
index 081eff7e66f0..000000000000
--- a/app-editors/diakonos/diakonos-0.9.4-r1.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
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-inherit ruby-ng
-
-DESCRIPTION="A Linux editor for the masses"
-HOMEPAGE="https://git.sr.ht/~pistos/diakonos"
-SRC_URI="https://github.com/Pistos/diakonos/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="doc test"
-
-ruby_add_rdepend "dev-ruby/curses"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )
-	test? ( dev-ruby/bacon )"
-
-each_ruby_test() {
-	${RUBY} -S bacon -Ilib spec/*.rb spec/*/*.rb || die
-}
-
-each_ruby_install() {
-	${RUBY} install.rb --dest-dir "${D}" --doc-dir /usr/share/doc/${PF} || die "install failed"
-}
-
-all_ruby_install() {
-	if use doc; then
-		rake docs || die
-		dodoc -r doc/*
-	fi
-}
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index aacacfde890a..9c484e4fcfef 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -6,20 +6,18 @@ DIST emacs-24.5-patches-5.tar.xz 14796 BLAKE2B 3e097f9cdf96a8b0255ce69770f79259a
 DIST emacs-24.5.tar.xz 39759804 BLAKE2B aec253528038686822d1f8ed9a52dff276789ef7744053fc9b6176fceba4d4d8684fe979cf97e756b3feaf734d2377baef81f5efaa5450930a4e94d9f3bca355 SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677
 DIST emacs-25.3-patches-3.tar.xz 2828 BLAKE2B 9a367a545d889d2edf0ee95edb856a7367ec6c10ae6c6fe6b2b452f548184a2a721eb72c448f303a639d5210366c11cf64af33fa322496ff1fd6f7a7e995a154 SHA512 fd65b768be3e3b7b6e280324ff5dd9f790a1279775defea370be5a2555fd64c134c004723e0722331e32117901281dfa2ca2ba42ee4fb33037a3eb83617e222b
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
-DIST emacs-26.3-patches-1.tar.xz 1076 BLAKE2B 1218c9a69deae0e3a55e061bd0cd2ab2b7099c86ebe861cc0b3c61a6d7a0756dce13553c861c41a9d2943b5ae78f3c607f099663e90b504d349d2a0be0f34682 SHA512 0e989e760e08675fdedb2cfca39ce63255dd092af38e0dd7febebb54aba10f5a186e1d360edecec3a4dd0ccc480dcc4430b3b9a73bdc84f8dc977591c3da395e
 DIST emacs-26.3-patches-2.tar.xz 1780 BLAKE2B f5dc9d041ea8a07549a817a2b18f84c8a75dce1d53e8de7c6751d48e71e27ee5a3626688252e079917b50473d6b3963f191383050799d199223cdd594be24dbe SHA512 33c91a138e2c9ba3146e66dc03cf05a4baef48019b1ca5c487a56b15f561bf208d58b0f2dc7d250682b86437dce1ce5b050887c4a5ef44194c46fbb7a7346d16
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 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-23.4-r21.ebuild 11065 BLAKE2B ec01f02640ccef8349bef30f81c23284652937e7635c853a34cf20116d2ebf651c629c7635a2b47072a025e645b344c0ad24f93b569341298856c42e8e096c07 SHA512 fdc01a8ca90039a86c06cac189b06d3370f218f5fe3cdc0cb614cde2fb9f4ec565264df1b96204613b7a767e5088550135899f1292737646152ab660c67d718c
-EBUILD emacs-24.5-r11.ebuild 10769 BLAKE2B a0a3d436beb7bbd90fd21fcdfe80a85aa55974d45e67f10fc542e1b794cffecba000934efc36f19c0ed520d0778c5940db4b332a455c2128e3e61a55504192e2 SHA512 74559d08251892179749c3f6a183554fd9cb9e15a6b09da95980faa8a722d352260d4b6d449b10ee04466ebc8447859720d05d9201dfdc97d72443c2dbc5aa59
-EBUILD emacs-25.3-r11.ebuild 11079 BLAKE2B 4f96040e5e3db0522b413c152b4ad8b083317e85da312afbcc348ea1082c109befdcc2f6356df4ae57d286327c65d9819f23c8795ee748175e5bdc7023a7ad7a SHA512 1b591288b60f533de6c4c2d40aac5b7eca48f1657cdc50207623ed12a88fc75d903a2fa240e6b697442b9b7f0b762097dc544f97fa15772cf06611930e4f1904
-EBUILD emacs-26.3-r6.ebuild 11825 BLAKE2B 1df12880101fce336ded064f8e91840b9f1a66b213367f46503c0ec19fcd1db45f0fedfe0db895141d44a8d2bfcc506c8683dda949429b5910b8cad360d241c7 SHA512 0608d4f489447e4545c2510a446293cd34a4164e2f6348b143a158df78dc6e362d166cda25177d86daac52fb31c7a85d1519de9b8583b1a2b4fe8782bca4c785
-EBUILD emacs-26.3-r7.ebuild 11775 BLAKE2B 4b12ed82f48ca1397153daaa99014fcb55be56a3ae4606283d828a8ac28dc753eb69092b19d3b17a4fa87a0ac60b982fda2ceeba907cbd5f022ca2bb67254d50 SHA512 0c827b5b93c930ade6e903584be9ccde1a771678f5ca3be845cacfc6bdfd663312b0fd99d5b4b2aa5218a74c69ad3bfffa0bbecb014e218057d94b8d96d4cbdb
-EBUILD emacs-27.2-r5.ebuild 14454 BLAKE2B 0d90b85d520db45e5015962752a4a7c7323b562038514ce0f74845c3a5795e48fe76a70b3723c9c08fa476fe275f3ffa1cc6571ebeaa00407f93b7add3f52db2 SHA512 c1816726913c7337e8cc5977470b5bfad8d6a26661ed7b0c8f09087682c800501b47779bf8c8e7bbfedf9ea56d50d45afde2c60d2dd0d877a1fea4ecb99dfd73
-EBUILD emacs-28.1.9999.ebuild 14940 BLAKE2B cc5cb28a781d569b9470f143cb37967bd62ff3a56a3d2c4bef5c87cf7913feeb9e312012d4e98df4f72f89085677bae1361d261597eb55df6bc531dc38f3914c SHA512 d3ee13a6a401c231d902c195296aece6fddd069dc2928e86d46eb146ddf4aa8726537b2f2ecdfd326f058ddce06b0dab208b6342cd704d8266525e62b8c80081
-EBUILD emacs-28.1.ebuild 14942 BLAKE2B ce48131159096bc351b0a59a5ae9f7b02c98f49e948da1463b9f6ec0d551ba6107a69a93740bc9a73de60e40f1f811be1c5c3946069177610fd5dbf3de5bc4e8 SHA512 72bc3720e0bd15e32208633d6c3adc0b5ede4fe5279f4d1301bca8ef6cade76e9f639d924112549b7a174db880b21d7d97b93b11c150dcb6636ece68a226f794
-EBUILD emacs-29.0.9999.ebuild 16422 BLAKE2B 6d2d230685c3208a9900b8de13e02075647eec8d47aa041e54d52dbe1d732e11cb7ad51543d60b489ebbfedd114369792823f75eda0e563a4467d466eddc0eff SHA512 b20a86aa22c929674aa6f1749ad7d9cf0eebd5467b36db86d882bf6296ae5f135416a9d0ad61b4eb6066e22d0cbaaca67fae42fd713a2425f8020df0949649f1
+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-28.1.9999.ebuild 14795 BLAKE2B 8f6313b9dc044f3a275b948b2d198b281a4422e36c6aa787b494cc13194cc1b6c26d816a275843dfdc9bd45b540b8cfc0e67f62cc0f10f4cfc1cc23e2c3dff6d SHA512 ee41220d8407d12b77ee6bfea0bad06992d8573e9b1e91a8ca8cf7e9d066b3ed07d89a84cd6d4591fec63770c79892b8b2ae069d7471b8684765c8bc1d9d2c79
+EBUILD emacs-28.1.ebuild 14954 BLAKE2B 2e41f1659fc11bf58ef1af36e707ecf7dec8214db204aae7daf7558da1c8659a3702c1505d8381a06387844345eba9c7567b82b864cd6c27f7afce1744b9dbd1 SHA512 3637eebb94593365bf811efd36f61d61266c9363b4f80569b4ab8770453240ad709aed906a9bc02e7482b83f252591cf2083b9123184219080d24d5d63fe96c8
+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-23.4-r21.ebuild b/app-editors/emacs/emacs-23.4-r21.ebuild
index e491036d0785..697eed5582e2 100644
--- a/app-editors/emacs/emacs-23.4-r21.ebuild
+++ b/app-editors/emacs/emacs-23.4-r21.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
@@ -32,7 +32,7 @@ RDEPEND="acct-group/mail
 		x11-misc/xbitmaps
 		gconf? ( >=gnome-base/gconf-2.26.2 )
 		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
+		jpeg? ( media-libs/libjpeg-turbo:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
 		tiff? ( media-libs/tiff:0 )
@@ -112,7 +112,6 @@ src_prepare() {
 			|| die "unable to sed configure.in"
 	fi
 
-	mv configure.in configure.ac || die
 	eautoreconf
 	touch src/stamp-h.in || die
 }
diff --git a/app-editors/emacs/emacs-24.5-r11.ebuild b/app-editors/emacs/emacs-24.5-r11.ebuild
index 2324de08efdf..1ae3f49b3d60 100644
--- a/app-editors/emacs/emacs-24.5-r11.ebuild
+++ b/app-editors/emacs/emacs-24.5-r11.ebuild
@@ -40,7 +40,7 @@ RDEPEND="acct-group/mail
 		x11-misc/xbitmaps
 		gsettings? ( >=dev-libs/glib-2.28.6 )
 		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
+		jpeg? ( media-libs/libjpeg-turbo:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
 		tiff? ( media-libs/tiff:0 )
diff --git a/app-editors/emacs/emacs-25.3-r11.ebuild b/app-editors/emacs/emacs-25.3-r11.ebuild
index 41e239215c92..8d376484b764 100644
--- a/app-editors/emacs/emacs-25.3-r11.ebuild
+++ b/app-editors/emacs/emacs-25.3-r11.ebuild
@@ -42,7 +42,7 @@ RDEPEND="acct-group/mail
 		x11-misc/xbitmaps
 		gsettings? ( >=dev-libs/glib-2.28.6 )
 		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
+		jpeg? ( media-libs/libjpeg-turbo:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
 		tiff? ( media-libs/tiff:0 )
diff --git a/app-editors/emacs/emacs-26.3-r6.ebuild b/app-editors/emacs/emacs-26.3-r6.ebuild
deleted file mode 100644
index d196a1b19509..000000000000
--- a/app-editors/emacs/emacs-26.3-r6.ebuild
+++ /dev/null
@@ -1,376 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools elisp-common flag-o-matic readme.gentoo-r1
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.xz
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="26"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
-
-RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
-	sys-libs/ncurses:0=
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	games? ( acct-group/gamestat )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	kerberos? ( virtual/krb5 )
-	lcms? ( media-libs/lcms:2 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	mailutils? ( net-mail/mailutils[clients] )
-	!mailutils? ( acct-group/mail net-libs/liblockfile )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	systemd? ( sys-apps/systemd )
-	zlib? ( sys-libs/zlib )
-	gui? ( !aqua? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libxcb
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			x11-libs/libXrender
-			cairo? ( >=x11-libs/cairo-1.12.18 )
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			x11-libs/gtk+:3
-			xwidgets? (
-				net-libs/webkit-gtk:4=
-				x11-libs/libXcomposite
-			)
-		)
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	) )"
-
-DEPEND="${RDEPEND}
-	gui? ( !aqua? ( x11-base/xorg-proto ) )"
-
-BDEPEND="virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-IDEPEND="app-eselect/eselect-emacs"
-
-RDEPEND+=" ${IDEPEND}"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-# FULL_VERSION keeps the full version number, which is needed in
-# order to determine some path information correctly for copy/move
-# operations later on
-FULL_VERSION="${PV%%_*}"
-S="${WORKDIR}/emacs-${FULL_VERSION}"
-PATCHES=("${WORKDIR}/patch")
-
-src_prepare() {
-	default
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
-
-	#AT_M4DIR=m4 eautoreconf
-}
-
-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
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if ! use gui; then
-		einfo "Configuring to build without window system support"
-		myconf+=" --without-x --without-ns"
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with cairo)"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-cairo"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use cairo && ewarn \
-				"USE flag \"cairo\" has no effect if \"xft\" is not set."
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
-				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-		! use gtk && use xwidgets && ewarn \
-			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--without-compress-install \
-		--without-hesiod \
-		--without-pop \
-		--with-file-notification=$(usev inotify || usev gfile || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with dynamic-loading modules) \
-		$(use_with games gameuser ":gamestat") \
-		$(use_with gpm) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with lcms lcms2) \
-		$(use_with libxml2 xml2) \
-		$(use_with mailutils) \
-		$(use_with selinux) \
-		$(use_with ssl gnutls) \
-		$(use_with systemd libsystemd) \
-		$(use_with threads) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	# Disable sandbox when dumping. For the unbelievers, see bug #131505
-	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
-}
-
-src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
-	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# movemail must be setgid mail
-	if ! use mailutils; then
-		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-	fi
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-	rm -rf "${ED}"/usr/share/{applications,icons} || die
-	rm -rf "${ED}/usr/$(get_libdir)" || die
-	rm -rf "${ED}"/var || die
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
-
-	if use systemd; then
-		insinto /usr/lib/systemd/user
-		sed -e "/^##/d" \
-			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
-			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
-			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
-		assert
-	fi
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
-	X
-	;;; ${EMACS_SUFFIX} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use gui && use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-	fi
-
-	local DOC_CONTENTS="You can set the version to be started by
-		/usr/bin/emacs through the Emacs eselect module, which also
-		redirects man and info pages. Therefore, several Emacs versions can
-		be installed at the same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from a previous major version of Emacs, then
-		it is strongly recommended that you use app-admin/emacs-updater
-		to rebuild all byte-compiled elisp files of the installed Emacs
-		packages."
-	if use gui; then
-		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-			machine would satisfy basic Emacs requirements under X11.
-			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-			for how to enable anti-aliased fonts."
-		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
-			symlink it into /Applications by yourself."
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d ${ED}/usr/share/info ]]; then
-		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-26.3-r7.ebuild b/app-editors/emacs/emacs-26.3-r7.ebuild
index 144c1f63fbbc..493f4237b43a 100644
--- a/app-editors/emacs/emacs-26.3-r7.ebuild
+++ b/app-editors/emacs/emacs-26.3-r7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="26"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
 
 RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
@@ -44,7 +44,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 		x11-misc/xbitmaps
 		gsettings? ( >=dev-libs/glib-2.28.6 )
 		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
+		jpeg? ( media-libs/libjpeg-turbo:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
 		tiff? ( media-libs/tiff:0 )
diff --git a/app-editors/emacs/emacs-27.2-r5.ebuild b/app-editors/emacs/emacs-27.2-r5.ebuild
index c5f1133679ba..50165a4c30ce 100644
--- a/app-editors/emacs/emacs-27.2-r5.ebuild
+++ b/app-editors/emacs/emacs-27.2-r5.ebuild
@@ -77,7 +77,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 		x11-misc/xbitmaps
 		gsettings? ( >=dev-libs/glib-2.28.6 )
 		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
+		jpeg? ( media-libs/libjpeg-turbo:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
 		tiff? ( media-libs/tiff:0 )
diff --git a/app-editors/emacs/emacs-28.1.9999.ebuild b/app-editors/emacs/emacs-28.1.9999.ebuild
index 4c1a544cb35f..fb9a507f39e2 100644
--- a/app-editors/emacs/emacs-28.1.9999.ebuild
+++ b/app-editors/emacs/emacs-28.1.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
+inherit autotools elisp-common readme.gentoo-r1 toolchain-funcs
 
 if [[ ${PV##*.} = 9999 ]]; then
 	inherit git-r3
@@ -75,7 +75,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 		x11-misc/xbitmaps
 		gsettings? ( >=dev-libs/glib-2.28.6 )
 		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
+		jpeg? ( media-libs/libjpeg-turbo:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
 		tiff? ( media-libs/tiff:0 )
@@ -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/emacs/emacs-28.1.ebuild b/app-editors/emacs/emacs-28.1.ebuild
index 135fab7e795b..d304d33f2d1f 100644
--- a/app-editors/emacs/emacs-28.1.ebuild
+++ b/app-editors/emacs/emacs-28.1.ebuild
@@ -75,7 +75,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 		x11-misc/xbitmaps
 		gsettings? ( >=dev-libs/glib-2.28.6 )
 		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
+		jpeg? ( media-libs/libjpeg-turbo:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
 		tiff? ( media-libs/tiff:0 )
diff --git a/app-editors/emacs/emacs-29.0.9999.ebuild b/app-editors/emacs/emacs-29.0.9999.ebuild
index 0de26a675244..18990e39f457 100644
--- a/app-editors/emacs/emacs-29.0.9999.ebuild
+++ b/app-editors/emacs/emacs-29.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
+inherit autotools elisp-common readme.gentoo-r1 toolchain-funcs
 
 if [[ ${PV##*.} = 9999 ]]; then
 	inherit git-r3
@@ -116,7 +116,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 	zlib? ( sys-libs/zlib )
 	gui? (
 		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
+		jpeg? ( media-libs/libjpeg-turbo:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
 		tiff? ( media-libs/tiff:0 )
@@ -191,15 +191,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/fe/Manifest b/app-editors/fe/Manifest
index 9de04d08258f..1fc607891ff2 100644
--- a/app-editors/fe/Manifest
+++ b/app-editors/fe/Manifest
@@ -1,6 +1,6 @@
 AUX fe-1.8-makefile.patch 370 BLAKE2B f0bfc2c97e30ce35a904394a871b275043ee479392997117f1886cebf57fb1fe9f056fdb0bd94f4130837323fc2c20e94aeb575ad0d0f3a80af7199e2fbd3759 SHA512 09820543f98e166a9692788d0b42f29b6ee60852f0e6197af86b4b8da31c902ff9c8be59e925af21e50241d5ef6e629195190dda6a1d0317e601abb4135e1238
 AUX fe-2.0-ar.patch 502 BLAKE2B 4c3beea491ddb03a3adf5923c8fbdc0279ac9e6899216af71018af425f7caa33faa47ec6bc89b6a409d5370ffa0553fe9e7ca744a2ee238c36d2ceac378a1c3f SHA512 1c5ede0c9570f31ba3c42fd43f2c77170dce957a8376f02adaa2b82687e3daef9c8e0a941377de915be968d10e6fa34274b433eba396273cfe20ed1868dbd17b
-AUX fe-2.0-ncurses.patch 784 BLAKE2B 90af3d2e4a402314b8d18bf817e84c7ca2b8f1d0da05d36d8971e31a8e293c016f6217f89d2575c4e3ecd5bab699bc3dd1a29118f7bfc174fa1e547a38be7650 SHA512 aedf564b7083536261d9b90dc3c8b9e247b98e5845c50259f27fe665661245f2454c3a1e3294815e32bb378f4959010ac0d181c9e8d56acbbbfa657a7b58ff3a
+AUX fe-2.0-ncurses.patch 784 BLAKE2B e298339bde148b8392651f6ece4fecde819c36592da3c6dc90ddb1d9b7e11e754462a5e207b735c5cfec67f9fc0283e0115b771de460ad95b9f0170b3e02f934 SHA512 5602d10c173e1bafa8d4d7ae734f70431c1f265c8ee399302d50061bf1a6024a7a0ceb30c5d7cd516f4f5a154e9f34cbe46fd479129034c5cd515d24a2c43bb3
 DIST fe-2.0.tar.gz 237890 BLAKE2B 9fb2ad310016b52ebc807854c942c248b75a9e543aa919ccee0a1963d9a12b23ad9cbc4df884422654e2efb0b97ba2d590ac2d70be48dec3a19e7a455de5c168 SHA512 6967362b8ff9ce91e0480dfa8538e3d13b43748283423923a4ba19efc76fbe007975318d9fde758f9c9f0b8bd084ff49e45bfd5b9773a79ee85a2153646e0143
-EBUILD fe-2.0-r1.ebuild 1006 BLAKE2B 6c4b9f34dac0228a75987fca1c3eb01fa185a7166cf08c01d4a8999bb59ff1d2571e250ce9aa85917e23fd3e6d7bdc2d47a147fe0a265f8d30b59d2bf510290b SHA512 e8b77d1b60eabb7fc923a57c5918bf8cb22b3ad51d21c6882280a1a075888ecdc03193dfcea941f64f89c3c91ebd600b78421de4fdce80d8507b5d6907b909a1
+EBUILD fe-2.0-r1.ebuild 977 BLAKE2B e6dda87aba1dcbddb3ce7635eb0766532c9e5a81b84389e5b29a96f4fd67a86377e3ed49132a52224159fc9667906c5579ef716e249ed309d4697ecd1e2f869b SHA512 ece8327b5ed9dbc53090dad2a8063eb122f008e23605a9aa6f38b6d3bdbd485967bed2b78ab923a1300dc88c7b7dcb1e0be0bbd4d822738267efcf89430adde6
 MISC metadata.xml 1260 BLAKE2B 50776c6064961af6dea0d9ff8435b5a8e246ae7b1a03f1b9181bd9b6b8cc66d0fd0426df3f323672f3e2b2014a7caf08f0a55da783565a870a16e2cff220b70f SHA512 84d731be9b361299802a4924278e5d7e3288075f7cdc3b8d1f8c78fd11a8f7bf9be58c89b5e5718a11e7c52b7aba1949db6a9f6b9a4cc278428dd292734aeff7
diff --git a/app-editors/fe/fe-2.0-r1.ebuild b/app-editors/fe/fe-2.0-r1.ebuild
index 4fd949e78973..9df4b0b4567a 100644
--- a/app-editors/fe/fe-2.0-r1.ebuild
+++ b/app-editors/fe/fe-2.0-r1.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
@@ -26,7 +26,6 @@ PATCHES=(
 )
 
 src_prepare() {
-	mv configure.{in,ac} || die
 	default
 	AT_NOEAUTOHEADER=yes eautoreconf
 }
diff --git a/app-editors/fe/files/fe-2.0-ncurses.patch b/app-editors/fe/files/fe-2.0-ncurses.patch
index 8eef06db6454..dfe720b02e6e 100644
--- a/app-editors/fe/files/fe-2.0-ncurses.patch
+++ b/app-editors/fe/files/fe-2.0-ncurses.patch
@@ -1,7 +1,7 @@
 https://bugs.gentoo.org/818415
 
---- fe-2.0/configure.ac
-+++ fe-2.0/configure.ac
+--- fe-2.0/configure.in
++++ fe-2.0/configure.in
 @@ -55,19 +55,6 @@
  AC_CHECK_FUNCS(strdup)
  AC_CHECK_FUNCS(strndup)
diff --git a/app-editors/ghex/Manifest b/app-editors/ghex/Manifest
index 3787468dfd63..486b00a37bb7 100644
--- a/app-editors/ghex/Manifest
+++ b/app-editors/ghex/Manifest
@@ -1,6 +1,10 @@
 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
 EBUILD ghex-9999.ebuild 1133 BLAKE2B 292942cc63824ecc03559a0fa8cf8151fa28996cf9ee167fe76df7d8a65209917b93ab23d99e0232de494140448d0e5db59f3ebda252e9efddd8ff547fde5173 SHA512 3b18ffc6c3ac5ea2db326e140bba172ca95809a4412f508e56a39f4e2d30315331cc31c205f137d414a3900e56ff88c971d12ec85f318804ef470454cc66f1df
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-editors/ghex/ghex-42.1.ebuild b/app-editors/ghex/ghex-42.1.ebuild
new file mode 100644
index 000000000000..b9a8b8490096
--- /dev/null
+++ b/app-editors/ghex/ghex-42.1.ebuild
@@ -0,0 +1,60 @@
+# 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
new file mode 100644
index 000000000000..60b2aa480d88
--- /dev/null
+++ b/app-editors/ghex/ghex-42.2.ebuild
@@ -0,0 +1,60 @@
+# 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 ~ppc ~ppc64 ~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/ghostwriter/Manifest b/app-editors/ghostwriter/Manifest
index b9fd2c6041dc..4c64019c0c8e 100644
--- a/app-editors/ghostwriter/Manifest
+++ b/app-editors/ghostwriter/Manifest
@@ -2,6 +2,8 @@ AUX ghostwriter-1.8.1-appdata-path.patch 811 BLAKE2B d3feb82a74d27484c56e5f05818
 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
-EBUILD ghostwriter-2.0.2.ebuild 1126 BLAKE2B e6ae7c5933fb26f4be5fb1c344c8774c4e1e552a8e8dada8736229c8f3ea88ff10e0cceaf758d4dc2a7417f6af873b8ac2c743bc30b2b94369f9676b3c24bb65 SHA512 590d0f06cd83e40913c5cb532e150382a82b0651a156431b8564820ea103e637920888abb6f671364950568b7198a113b3604e774c3d4908d9a536ba0000c2a4
+EBUILD ghostwriter-2.0.2.ebuild 1125 BLAKE2B baa0bb57907e8eedff6c2bdea151181ffeaf0a7ad923bb30f6cd671a2e9bea2d0361af3a0678d197325c60f7a8660443e379c74b77fcf30043316adb92075bcf SHA512 86c1c610cc58b226218f3665ac0bca122e3e41051659808a3154ec60b493e3d2dcc010a8a243058f547bedddbf5bebb2b997d975e1bea5bc98104c38a2a33bf7
+EBUILD ghostwriter-2.1.2.ebuild 875 BLAKE2B a1c8f1bdddd51f7bbfc2e42e0ca16df365e3a8faa8a1c53bc4925e80bf8c45cd43b4f9d444890b09ea041e6fd26640612557724df1b958a4bd7af0b9f758af72 SHA512 65754af8280fb663605e67cfe3b82f5e2e869e155dc5ca04c6be61d5d3d0ebb14257ec3da6df791b567194a8f6c0567dd5368484cb059762212d30f11c0307b9
 MISC metadata.xml 608 BLAKE2B 9ed4995ed4884fb0bed607208afdd5122bd86f08aa1c5a94f3dad2f7c111e54e94413f1f1a298aa974f6626026e8cfb42789b4f0992690ee769ecce8630f6e72 SHA512 082f086394ef9a7a37162852090ff0e022f87bcbd18991a2ba6fb862d8690a23fc5d1a2cee090a1401a530bd3580fdc126a04c61ed7e627f6d558f8e6a1f49d6
diff --git a/app-editors/ghostwriter/ghostwriter-2.0.2.ebuild b/app-editors/ghostwriter/ghostwriter-2.0.2.ebuild
index 9f9908a37a0f..995a75551972 100644
--- a/app-editors/ghostwriter/ghostwriter-2.0.2.ebuild
+++ b/app-editors/ghostwriter/ghostwriter-2.0.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=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wereturtle/ghostwriter/archive/refs/tags/${PV}.tar.g
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 BDEPEND="dev-qt/linguist-tools:5"
diff --git a/app-editors/ghostwriter/ghostwriter-2.1.2.ebuild b/app-editors/ghostwriter/ghostwriter-2.1.2.ebuild
new file mode 100644
index 000000000000..5c1c71d26b2e
--- /dev/null
+++ b/app-editors/ghostwriter/ghostwriter-2.1.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils xdg
+
+DESCRIPTION="Cross-platform, aesthetic, distraction-free markdown editor"
+HOMEPAGE="https://wereturtle.github.io/ghostwriter/"
+SRC_URI="https://github.com/wereturtle/ghostwriter/archive/refs/tags/${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
+	virtual/opengl
+"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( CREDITS.md README.md )
+
+src_configure() {
+	eqmake5 \
+		CONFIG+=$(usex debug debug release) \
+		PREFIX="${EPREFIX}"/usr
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
diff --git a/app-editors/gnome-latex/Manifest b/app-editors/gnome-latex/Manifest
index f3459dacc41a..b5c63a9e2c57 100644
--- a/app-editors/gnome-latex/Manifest
+++ b/app-editors/gnome-latex/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-latex-3.38.0.tar.xz 1094376 BLAKE2B 0c02996dbac48c3859d33a0d504a64462e306d346ca22397820231fa8fe7ce2aa621a1435a02d78ea424fc8e9f5b7ac6e3e60180d8212c170d52eb4baee3b94a SHA512 c42cc1ff2c59afe4d995e9f13d9a858e2297827d5f9359cecd969d305224fc4b4d0306e0ab6aa1d9b7fc92acc25e597319299afe176cff1903f734fbc2ddf29b
+DIST gnome-latex-3.40.0.tar.xz 1050088 BLAKE2B bd8764450ee122599fd96a7e889291805fc09d854d77aa4e7d3b01709cda8bf0c38327d05de6117a19f325ca6a61ab42e014d27b941ed8e40f0bfd963dd65680 SHA512 822d86eac81994593e71428f1c893ce7d6970bb8e98349c8ad9cc6a113e3fdb49209f1bc7f19fb8d5a22da98d7650a822c8f8ab1f5aa096e6ea0cbaf74dfafca
 EBUILD gnome-latex-3.38.0.ebuild 1133 BLAKE2B a94f6595a5a076d4329b2e686617c276d5de6cc480250c206d752502f92cd16b825b0f5690ea1dd65069485be78e9c592e96b9f035e478d6a8d67cbc7983ac94 SHA512 eaeb0721f8e13a60738b831ae94cd1aa067e4c33aa5dfdb570526810d2157166557d9affb4870268b4e8f4cab09a4160150c25089c6b1baddf555420c6080abc
+EBUILD gnome-latex-3.40.0.ebuild 1130 BLAKE2B d892607128dfb1c69f2e201a4db1ebc95ccd38dd8d875a23839ef4915d391bccfb9a8ddcb6672b78675e9519a226cebf1349300f3a0f07f0c01bcccea795b432 SHA512 75bfd8e46a2f341f82ad7a5f53b1c78147d2d8341d47c6897b8c6fb92d9d81600ff4c5e973701da704fc03790d888d979a8a2afafce7216dce085383bb517702
 MISC metadata.xml 465 BLAKE2B a26c9cc411d697492d945046338c0f37c5a41dc750cb28237cb527db1d55716323f9c6520ffc4d86e838e05b9aabe42101985362fb130d6941082ea3e3af297e SHA512 e01b512e26c05fad079c5cec65df8ed58cadb60b230c87a89de128caad648d243b46c1dc6eea64c21c2e0e319edcbde3a952dece428035db04176c8e144706a7
diff --git a/app-editors/gnome-latex/gnome-latex-3.40.0.ebuild b/app-editors/gnome-latex/gnome-latex-3.40.0.ebuild
new file mode 100644
index 000000000000..1f9a45676081
--- /dev/null
+++ b/app-editors/gnome-latex/gnome-latex-3.40.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2
+
+DESCRIPTION="Integrated LaTeX environment for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/GNOME-LaTeX https://gitlab.gnome.org/swilmet/gnome-latex"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="+introspection +latexmk rubber"
+
+DEPEND="
+	>=app-text/gspell-1.8:0=
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libgee-0.10:0.8=
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/gtksourceview-4.0:4
+	>=gui-libs/amtk-5.2:5
+	>=gui-libs/tepl-6.0.1:6
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
+	gnome-base/dconf
+"
+RDEPEND="${DEPEND}
+	virtual/latex-base
+	x11-themes/hicolor-icon-theme
+	latexmk? ( dev-tex/latexmk )
+	rubber? ( dev-tex/rubber )
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.50.1
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		--enable-dconf_migration \
+		--enable-vala=no
+}
diff --git a/app-editors/gnome-text-editor/Manifest b/app-editors/gnome-text-editor/Manifest
index 0cdd51afb406..9e0ee8bb095f 100644
--- a/app-editors/gnome-text-editor/Manifest
+++ b/app-editors/gnome-text-editor/Manifest
@@ -1,4 +1,6 @@
 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
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
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
new file mode 100644
index 000000000000..979bb30ca006
--- /dev/null
+++ b/app-editors/gnome-text-editor/gnome-text-editor-42.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="A simple text editor for the GNOME desktop"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-text-editor"
+SRC_URI="mirror://gnome/sources/gnome-text-editor/42/gnome-text-editor-${PV/_/.}.tar.xz"
+S="${WORKDIR}/gnome-text-editor-${PV/_/.}"
+
+LICENSE="GPL-3+ CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="spell"
+
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=dev-libs/glib-2.69:2
+	>=gui-libs/gtk-4.6:4
+	>=gui-libs/gtksourceview-5.4.1:5
+	gui-libs/libadwaita:1
+	dev-libs/libpcre
+	spell? (
+		>=app-text/enchant-2.2.0:2
+		dev-libs/icu:=
+	)
+"
+RDEPEND="${DEPEND}
+	gnome-base/gsettings-desktop-schemas
+"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.21
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature spell enchant)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-editors/lpe/Manifest b/app-editors/lpe/Manifest
index f23aff2f9498..09246aae7550 100644
--- a/app-editors/lpe/Manifest
+++ b/app-editors/lpe/Manifest
@@ -1,7 +1,3 @@
-AUX lpe-1.2.6.13-fno-common.patch 603 BLAKE2B 1c78bf5d7e049d101c890dda5d22833de0489a381ec071760745c53bf8ef72a552010fa1340ba02b262fe67af38d4f858ae472d34e3ff8a55b6325dbfb55beb4 SHA512 6a2ddbc03ca09cbd499f6b471c2eb76db4a78294467e9e73365fd99a3f4a5af3d6d539cf2fbc77261cb57a9aa6751199e6ef19a252e6caf12502a9ad9f136876
-AUX lpe-1.2.6.13-make-382.patch 797 BLAKE2B 548091708e01e3baf9d52eaa7f8638d870f10060b858162ea19d8bb70062ca7883fa16c431c839e939dcfc1917c8b7c675180aaff47424dde326f74866885649 SHA512 442b5dbfb11b002f86d2a67cef1c4f57a5ac6e3965cc0618f0bd7058d14ea79ed4f108c40f25cf94ff6edefa8655d5a46c2bcc2552c60c66322e194117e5ca11
 DIST lpe-1.2.8_p20210401.tar.gz 840016 BLAKE2B 81fa0b1c3f9a7164eb219692a2e7bc092d0ee09c9de15f6fd2a4f66cc486be5b744eaa2fb0569a9f44f45d6a19159c55286be76d9ae0f4947f5b7c749e84a8fb SHA512 0b40f2f3fc1241e07291dfdbfcf2466cf5dedc1c91bf36c4f36c8af792ce718be2ad66884b049e25d7b9f9e796d60ce25ca42b37610d26894cd1dc6b74e51157
-DIST lpe_1.2.6.13-0.1.tar.gz 600523 BLAKE2B 8866aff63276d5e39ed48b4d9e8b9a23d541c13e196815c29586df83f8c6b5895a8dde8fb16b0929bffc49416907d74d48fdbc5ce736a855f2d2daad6472fb96 SHA512 f02769baca396285fe8f98c934f6274185d2bf8b08f3b007cbfa4e6aadb455abfb7cab13d53a3d1fa71ea0c29c4222784dcbc9a7508501c7d1839671503758ed
-EBUILD lpe-1.2.6.13.ebuild 1269 BLAKE2B 4f7a1a3d6518c184ba76f39b4dc427430eb8450feb3a91e736f81448afdfab2e59b6dd3c8f0bff2c7f08b1d4c76c42046e6fba0a5e72865d9314afc8c53c3ea7 SHA512 261ffa5abdecf4d522cfb25eb83333af1770a6d919ec9d99717dbf440bf600500c5b9653ccb18a373f29f3cb4c737f20e464fb6b3be17536c56209a1de910ba7
 EBUILD lpe-1.2.8_p20210401.ebuild 1604 BLAKE2B bc4bf2bc00a5d96d2e3f276907cf56c5c9e4656b810b0298c1d3f52f3832172f03020600a573890ad3f08703abf6ac212ecfc86091a871ca92b5d730cfeacd4d SHA512 60523fd8e2ea5d497c23596d1b9306543de211461e879386ea66b5298f4a9e1b86e4180504b013acc5c6c75dfc876a3cef754cfc53a5ba06cfe2aed4dd18f00b
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-editors/lpe/files/lpe-1.2.6.13-fno-common.patch b/app-editors/lpe/files/lpe-1.2.6.13-fno-common.patch
deleted file mode 100644
index 2cc68157ed53..000000000000
--- a/app-editors/lpe/files/lpe-1.2.6.13-fno-common.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://bugs.gentoo.org/707188
---- a/src/cfg.c
-+++ b/src/cfg.c
-@@ -22,6 +22,7 @@
- #include <string.h>
- #endif
- 
-+extern char *LPE_CONFIG_FILE;
- int cfg_errno;
- 
- void
---- a/src/lpe.c
-+++ b/src/lpe.c
-@@ -25,6 +25,7 @@
- #include "strfuncs.h"
- #include "exports.h"
- 
-+char *LPE_CONFIG_FILE;
- /* A flag indicating a desire to quit the editor.  This is set whenever a
-  * command should cause an exit.
-  */
---- a/src/options.h
-+++ b/src/options.h
-@@ -38,6 +38,6 @@
- /*
-  * Other things that are used in some places...
-  */
--char *LPE_CONFIG_FILE;
-+extern char *LPE_CONFIG_FILE;
- 
- #endif /* LPE_OPTIONS_H */
diff --git a/app-editors/lpe/files/lpe-1.2.6.13-make-382.patch b/app-editors/lpe/files/lpe-1.2.6.13-make-382.patch
deleted file mode 100644
index 2e93042570aa..000000000000
--- a/app-editors/lpe/files/lpe-1.2.6.13-make-382.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://bugs.gentoo.org/335324
---- a/intl/Makefile.in
-+++ b/intl/Makefile.in
-@@ -202,12 +202,12 @@
- # The dependency for intlh.inst is different in gettext and all other
- # packages.  Because we cannot you GNU make features we have to solve
- # the problem while rewriting Makefile.in.
--@GT_YES@intlh.inst: intlh.inst.in ../config.status
--@GT_YES@	cd .. \
--@GT_YES@	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
--@GT_YES@	  $(SHELL) ./config.status
--@GT_NO@.PHONY: intlh.inst
--@GT_NO@intlh.inst:
-+intlh.inst: intlh.inst.in ../config.status
-+	cd .. \
-+	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
-+	  $(SHELL) ./config.status
-+.PHONY: intlh.inst
-+intlh.inst:
- 
- # Tell versions [3.59,3.63) of GNU make not to export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/app-editors/lpe/lpe-1.2.6.13.ebuild b/app-editors/lpe/lpe-1.2.6.13.ebuild
deleted file mode 100644
index 4a9bb25d8011..000000000000
--- a/app-editors/lpe/lpe-1.2.6.13.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="a lightweight programmers editor"
-HOMEPAGE="https://packages.qa.debian.org/l/lpe.html"
-SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}-0.1.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~x86-linux"
-IUSE="nls"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/slang"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-make-382.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-)
-
-src_prepare() {
-	default
-
-	# You should add PKG_CHECK_MODULES(NCURSES, ncurses) to configure.in and
-	# replace -lncurses in src/Makefile.am with $(NCURSES_LIBS)
-	# That is, if you need eautoreconf
-	sed -i \
-		-e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs-only-l ncurses):" \
-		src/Makefile.in || die
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	emake \
-		libdir="${ED}/usr/$(get_libdir)" \
-		prefix="${ED}/usr" \
-		datadir="${ED}/usr/share" \
-		mandir="${ED}/usr/share/man" \
-		infodir="${ED}/usr/share/info" \
-		docdir="${ED}/usr/share/doc/${PF}" \
-		exdir="${ED}/usr/share/doc/${PF}/examples" \
-		install
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 7a0b039e8818..939e2f475e0f 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,9 +1,9 @@
 AUX gentoo.nanorc 4206 BLAKE2B eacba1d5db1475aa53f177d9c04819ff2b81c5fa196365f65c75b1fbbcfa78f93d4537d33901a604753131a14978843ed588296dad37c626c125959e61f3650a SHA512 45afe49629f0fe232bae8a0ae8d3984b3add366b1f88e5859df7612ab0b47f4df8764c17e038bcb49b106b08bfc8a20356b6e62cb9cae9ac337adc37db97ffd0
 DIST nano-5.9.tar.gz 3093675 BLAKE2B d4fa2f0e64b6ab243a2b127ff894e900098f6261f5d46657ff3459cc0b51683a63fc5de54bd4545b47bc16c633b09142f8501b84a09df3e8123da5233a063766 SHA512 61bf4de300579bc6f0028a2237e105228d8657819c02f32c7ef8f84f9c54734df8fb9a9cddbce0f7721ebc5ac8ae4799c118291ae15480082f8b1317019a485d
-DIST nano-6.1.tar.gz 3146292 BLAKE2B ade773182d12b6d6452c23896e564a097d850630c87b0af622fe7766931aa2e5ef5e9d868e521e46e029851cdd428cd60b6c3e95bdb28df0733cba8b432f202a SHA512 e034c9d7c96bf6d7ac22a2188fccf87693dd5d19ddbcfb907f817544fb2ddfce2ee9331842d885870718617ea4fd0c9151f62b3e8dc52a486cec9a30e84539c0
 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.1.ebuild 2350 BLAKE2B 5d47d56bd321834d4b3f1415284b97263e644b9e3d077df18b3d875eb199fa53292061c3a44fb10423c430d3e15d9a43126c2b4299aabf4ee99df0fb6d206ab8 SHA512 b7a42524a544c06899d3ad6ea381d97f018aeb311f8965f0f7223cc5d58c5638c75b526c841435e1f4f0f18de0da559e3e525343c31369a961e90d5309f762fb
-EBUILD nano-6.2.ebuild 2350 BLAKE2B 5d47d56bd321834d4b3f1415284b97263e644b9e3d077df18b3d875eb199fa53292061c3a44fb10423c430d3e15d9a43126c2b4299aabf4ee99df0fb6d206ab8 SHA512 b7a42524a544c06899d3ad6ea381d97f018aeb311f8965f0f7223cc5d58c5638c75b526c841435e1f4f0f18de0da559e3e525343c31369a961e90d5309f762fb
-EBUILD nano-9999.ebuild 2350 BLAKE2B e18e223af668f1aa380d084842f625c53576e23a782c3c3230c8a76df2fb4170df55d338c15dd05a42bfaaeeac8d22e3e071477d8ea85e13ba5ffc986803f6bc SHA512 e0b7d9bb52f980ce56ac3cb14f6d8f844491633d2dd1619ec35008c75df36d2a80a22100c22b7a6bd14ead7d5262c142a46887943877e291bf7c5218c8e2838c
+EBUILD nano-6.2.ebuild 2349 BLAKE2B 53dc3860dd5366d797e3cae3943de67c960ebb626c932d91743897c67ba1bfd99280f9bf5ceb707cdc452b29cf15c2ec84dba2b38ee42297e655bd02d85954c4 SHA512 ab0772726974a97039bdd42bfc6d94b1b1e57f70b082e6bd8a37f88659d2382c031fc7cb8df7187ecbbb8a9129c0cf5f7aa5574c08bf6f16695ec49918eb5641
+EBUILD nano-6.3.ebuild 2357 BLAKE2B a04a268929814dfecdb6ceddcd0aa6b7118085719dc13525922311b3dc62529a66aae7ddf63d3d0b8cc0c5c3da2ccde009fd118a7b8c17008c753d38fbdbbb26 SHA512 283e6c687dad1d1730dad88f1993b88d11e076757af0b0bccec8e59caa4193b4c16474453c5b4f4b99445824d0e3a894dde653cce8059139027bc0a2bdac4682
+EBUILD nano-9999.ebuild 2350 BLAKE2B c158c4c173632d6b05ae33b0d4b56d308fffd04a39354d1d009819c2a04a7bc3648599b342d34f66dfb674453cd46b520da8be593e58a7dea3188420d81e1e6f SHA512 822a2a3fd233de2bbb2e176328ec5e2825a07078063cc90015ef9ace5513cbb68e324c9405b8c4adce1a7067828a6c5e1cae6a7d238e5b4693830bf5509cc0eb
 MISC metadata.xml 1643 BLAKE2B 0281963fbe6aff1bc6765b1c9964ac2a7e1237b4759c4ae34e83a9c79c86975d910a43edfec80f279ebf17beb58db2eeb430915a165ea252042900ecefa3c57e SHA512 8636fa9e9f1b2bbc72f3b7a4395a99a7158de48e6f10487f6b5d450e6c35226b0f4d4a68e5e995dd625065831a343070c4f227d1c4422a2140e09f9c003d8fdd
diff --git a/app-editors/nano/nano-6.2.ebuild b/app-editors/nano/nano-6.2.ebuild
index 71abe2ce7b3e..c76f1abb21ba 100644
--- a/app-editors/nano/nano-6.2.ebuild
+++ b/app-editors/nano/nano-6.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 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"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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"
diff --git a/app-editors/nano/nano-6.1.ebuild b/app-editors/nano/nano-6.3.ebuild
index 71abe2ce7b3e..9bd57c68b191 100644
--- a/app-editors/nano/nano-6.1.ebuild
+++ b/app-editors/nano/nano-6.3.ebuild
@@ -9,8 +9,8 @@ if [[ ${PV} == "9999" ]] ; then
 	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"
+	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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"
diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild
index ad20434b2ed1..25ad3e614940 100644
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-9999.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
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	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"
+	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz"
 	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
 
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 8e735218b8df..b43d7638e37d 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -2,13 +2,13 @@ AUX neovim-0.4.4-cmake-darwin.patch 2599 BLAKE2B 7d5d5298f3b32385bcd17c582865f55
 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 sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a
-DIST neovim-0.4.4.tar.gz 9558246 BLAKE2B b1d44898bb1e1ab40a7e1d7fb4448076c991ebe1a0956674548de82fe7a931d9eaffbf35ba03cf9c88466dcd628a55f1d7bf9e7a13f3dad74424d6d653ded60c SHA512 ca5c2fe1784ac7b0d2117948ba2e9ae5d94e36d22ff9e0967047e1e03e605537672d85543897af335103215ad462c86962f25267d352a77d61bc3d1cafb3c183
 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
-EBUILD neovim-0.4.4-r101.ebuild 2830 BLAKE2B a9aa517c7409e373bf510aa9d4adbaa627b561ee309c08d67941c3f497edc5471d50055406aaca2ca903952975813d74f5eb5f7caba09846522dbb25a8bb3cec SHA512 23db154a68cbeb0f15771a0d196a517cde5b7979440896c145c9cda4176e5ca2040b5222fdbee62fd6d97cf58e52ed143edaf9da25ac1a4a8a43acad8190edff
+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-9999.ebuild 3142 BLAKE2B 6e913a187ac672eb84d3c7de98574962f71f82f7efbf8736302eb431ecf489f93c1b00cb223a4494e744aa5c242e71172e9a519326f13d691c7b405a0b769108 SHA512 7dac921fc021a8259ec12e8f80c18aeac1e195fe7b4cfc6f0cd394fdc24727f55e03d321c28a4841871bd411cd80016fae5720963e63f3f33d5be57ec38cf78c
+EBUILD neovim-0.7.0.ebuild 3142 BLAKE2B bd12e581ae38d989d4c61474879de9d3f252946a5ebad5336f3be5d80ab25c800377091efff34857f3b1217804f573fa414c1da6875534d11f703998ee88b755 SHA512 55176a8426145f61ff719075474cd63056d138b5f4b4ccb795561a61642bd3d668a6e981d50e9ced2752ea82cdec081c3d09b80dc14c7cff764697478aea1559
+EBUILD neovim-9999.ebuild 3142 BLAKE2B bd12e581ae38d989d4c61474879de9d3f252946a5ebad5336f3be5d80ab25c800377091efff34857f3b1217804f573fa414c1da6875534d11f703998ee88b755 SHA512 55176a8426145f61ff719075474cd63056d138b5f4b4ccb795561a61642bd3d668a6e981d50e9ced2752ea82cdec081c3d09b80dc14c7cff764697478aea1559
 MISC metadata.xml 536 BLAKE2B 48c85cdbe749584904a6719545308b55f130375464c55d6f458171707a2b72586bca6780b52bab3b379a2e0c471ec47026c1203edd4696fe38639f5718cc4896 SHA512 114c7fe41230c2aade3de44b37e51ae84a907b6fcb899732991f8013126214540f4b72e60b44c0993312ec8d7c8cc8c96eae8b9e0f78bd0d2cefb7497e5d16e8
diff --git a/app-editors/neovim/neovim-0.4.4-r101.ebuild b/app-editors/neovim/neovim-0.7.0.ebuild
index cbfbcb50f493..f23e7434577b 100644
--- a/app-editors/neovim/neovim-0.4.4-r101.ebuild
+++ b/app-editors/neovim/neovim-0.7.0.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 LUA_COMPAT=( lua5-{1..2} luajit )
 
@@ -15,30 +15,31 @@ 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 x86 ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
 fi
 
 LICENSE="Apache-2.0 vim"
 SLOT="0"
-IUSE="+lto +nvimpager +tui"
+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 )"
-#RESTRICT="!test? ( test )"
+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
+	>=dev-util/gperf-3.1
 	virtual/libiconv
 	virtual/libintl
 	virtual/pkgconfig
 "
-# TODO: add tests, dev-lua/busted has now got luajit support.
-# bug #584694
+# 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[${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}]
@@ -46,14 +47,12 @@ DEPEND="${LUA_DEPS}
 	$(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=
-	!kernel_Darwin? (
-		net-libs/libnsl:=
-	)
+	>=dev-libs/libuv-1.44.1:=
+	>=dev-libs/libvterm-0.1.4
+	>=dev-libs/msgpack-3.0.0:=
+	>=dev-libs/tree-sitter-0.20.6:=
 	tui? (
-		dev-libs/libtermkey
+		>=dev-libs/libtermkey-0.22
 		>=dev-libs/unibilium-2.0.0:0=
 	)
 "
@@ -61,6 +60,11 @@ 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"
@@ -69,7 +73,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	# use our system vim dir
+	# Use our system vim dir
 	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
 		-i src/nvim/globals.h || die
 
@@ -82,6 +86,7 @@ src_configure() {
 	# 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)
@@ -107,6 +112,7 @@ src_install() {
 
 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
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index 69b26947a582..f23e7434577b 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-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
 
 LUA_COMPAT=( lua5-{1..2} luajit )
 
@@ -47,10 +47,10 @@ DEPEND="${LUA_DEPS}
 	$(lua_gen_cond_dep '
 		dev-lua/LuaBitOp[${LUA_USEDEP}]
 	' lua5-{1,2})
-	>=dev-libs/libuv-1.43.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=
diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest
index 2786e250f339..9ab73771d874 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -1,3 +1,3 @@
 DIST okteta-0.26.7.tar.xz 983388 BLAKE2B abe5abb678c0cae7538ac5bdf68b3e9285c405996194e03dcb3f74c397124805496a67ee1b9b2d8c2676dc3fca7d743a012898056aef82f5f1a1e998ee36ef60 SHA512 829294e0ed8b01be940b215334d9291bba1af01fded05511be33a813e9d090bc06f0af90dfb49d45d44814ae38de7c9cb6427215ea076b8401a66734aa42ea25
-EBUILD okteta-0.26.7.ebuild 1760 BLAKE2B 2cb53768fe567cef703a5edd46d8031bb795e88b3ca30e362ae69a6f468449141ce189b7ac1704b4a6bcbbb816925058edd3ff40e912b437f88d51ba305fe435 SHA512 0efcc5f9b6b29d85e321b36d4f6f79f48bee9667f6a07ad502a3084f260f522907575f4b9608b590e7d9c00ae0dcf8aec9163e3e7faa8fc1d88715601d0383e3
+EBUILD okteta-0.26.7.ebuild 1759 BLAKE2B ee45723b1bc86ddacfb559b3dd178a7563e62e83150a1e3f61cabed62a34116744e4032ab6068653ccc0bb78c60262a3644d08c1e932afc82446cb15b1b1a9e5 SHA512 0843bdc737ed5a9bd214e49395b5468c7ae37230db3fd733d774d309722f778df7cd51b94f887544de083e53c50cdc697cbd7bc39ba660c4326eae6ae910a05c
 MISC metadata.xml 409 BLAKE2B efa27a2a8769a56200077d2d606e930a14fe7b8dad531386da39675c501ea7298939b6c197b668379430840b002c0a5ff34da592fcb2af18734649cb5d527f6c SHA512 0966b96a06e7315574724c75c6c3c680b6ea7da71278885ae65d214ca6a18a4b2d11b101221caa89ef5682d91f7a4cc7c2108f9741072cb12f97e95af0bcb09b
diff --git a/app-editors/okteta/okteta-0.26.7.ebuild b/app-editors/okteta/okteta-0.26.7.ebuild
index 15dde8a9410e..486db94692b3 100644
--- a/app-editors/okteta/okteta-0.26.7.ebuild
+++ b/app-editors/okteta/okteta-0.26.7.ebuild
@@ -16,7 +16,7 @@ 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"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2 handbook? ( FDL-1.2 )"
diff --git a/app-editors/qhexedit2/Manifest b/app-editors/qhexedit2/Manifest
index e29548c120fe..305f2ad253f5 100644
--- a/app-editors/qhexedit2/Manifest
+++ b/app-editors/qhexedit2/Manifest
@@ -1,4 +1,7 @@
 AUX qhexedit2-0.8.4-setup.py.patch 596 BLAKE2B 15a801d87d9f690aa354162cb4966b1b691da95f7d64926f1b2ab66bd7d1db29b208cfab0f0bbe0f8fb272d67328f1a5ffd84ceb9d7af3d457ed6cd2a7d27ec0 SHA512 2cabb09c9c6e819a43d434a813ce9eb9614c72a3687758a35f338067d9e02add657ed1feee614486c9dbcbca823a848aedc69f9ab42aabd9ebe414b645b0d67e
+AUX qhexedit2-0.8.9.patch 1135 BLAKE2B fb9c3c9a4fa01b6cba9b3ca12a1a1e82f1503663bb186835b56d2610145bf3c1e211ab31c705d55cc9f3e22312c566058b816c20a4a65c7d7a501bd05db3fb8f SHA512 934bd0422b539459b446fc6ea18806f9fe6f6e107822dc4a94150632fdef35b091ca309cb0a5b7eb96c325c4d71091314c89907ce6c6404e0a6d8ebd126c58c3
 DIST qhexedit2-0.8.6_p20190316.tar.gz 355512 BLAKE2B a7edc8d05a7788f3a3f2202762ca3dc436cafbde1b1216ff1bb342055600a2e9d53c27fe324380331b8182904545c698106129238065cd2416d244fdfa176446 SHA512 4ef288c8a220c308d38c41fee83fe962e213cdfa448445ef73c3d2fe1952b68f2096732e78d2aa0a87eddd3cf2f47bed3e77807e12d2b7616c1447b3bf1b0e7d
-EBUILD qhexedit2-0.8.6_p20190316.ebuild 1878 BLAKE2B 30755598bd0d16eed9bd853ededc9807bf7b344ff209a179f9da712cff3881b34d14a106f07fb53061a0b9f1abb40ddd7bb6814e88877e09b7320e3cc18b5372 SHA512 73ba1483c4f3a4a30b0048d8f9884044259d26ebe067029e4ec62f6676248bf8528ba9e59bc7f46497b145906bb50e032de6a9a52bf8c78e427f29b6b6ddd32e
+DIST qhexedit2-0.8.9_p20210525.tar.gz 342178 BLAKE2B baffe5b5e1130476162f23a91420cc86675a162c39539c9f07685cecc82571817625202814006221f96b56e94c0325fd7a6d8f2294041b426054f809c9967bad SHA512 d8a5159433a1212085371473cc7a89c4888c6af6b1416a34e3ea9d1ef9ae19411af32bea2e2fb256a024d6f2d05c733d285314cfc17f37dae065d7407a9c0d2c
+EBUILD qhexedit2-0.8.6_p20190316.ebuild 1878 BLAKE2B deb3b0b20fd1681443e3e05fec6d35006966f94613e6397940f08220db939b5240924929aaa6095670c590f9bebdd6857a517b45855fb1f7081202248e3abe63 SHA512 1722f81744db0e01ed78ca3f2ae664510fd11a5fc42db897a8bf2defd8f432a0c06470e19a70b365b6c31f625f7b793d45d131c089b3368a13ef6b549694930a
+EBUILD qhexedit2-0.8.9_p20210525.ebuild 1671 BLAKE2B e36e973b9137abda5736e5e9eba1c5f0a2396651315e86c4b6f91f499d5ccbcb2b64e9c552fc88503d62f8d28cdbbd80056680da8876b6e0a3cecfa17da68848 SHA512 d941ac5d83ccb9e1bee51a64397bb749416df4d7a363f88bf36c8108f565eee6d9399f3dc58266aeea0921137b8f8d4445041ce233ae154dba342b6c26dd0d26
 MISC metadata.xml 636 BLAKE2B a6f5b56c36f34d3906a135d7b2516bcbbfb47c13b01a98284b8a9d9e1de2cc2d46918459901c4c2b7984d7844c3d7b4fcc6631f0398b25a89e61be0edab80335 SHA512 2cce503a57e04e07b2160c1d3ae4118a7b73b059eab3defb2102b7da46cc39dae277ad01915240ca16349b8a094b1d4494f2267df2b8fb4bdd7d9a305ebadb8b
diff --git a/app-editors/qhexedit2/files/qhexedit2-0.8.9.patch b/app-editors/qhexedit2/files/qhexedit2-0.8.9.patch
new file mode 100644
index 000000000000..cabbd77ac843
--- /dev/null
+++ b/app-editors/qhexedit2/files/qhexedit2-0.8.9.patch
@@ -0,0 +1,36 @@
+diff --git a/setup.py b/setup.py
+index 1a0d912..646c359 100644
+--- a/setup.py
++++ b/setup.py
+@@ -98,7 +98,7 @@ if cfg.qt_framework:
+                                       lib + ".framework", "Headers")]
+ else:
+     if PyQt_Version == 'PyQt5':
+-        for qt_inc_dir in ('/usr/include/qt', '/usr/include/x86_64-linux-gnu/qt5'):
++        for qt_inc_dir in ('/usr/include/qt', '/usr/include/qt5'):
+             include_dirs.append(qt_inc_dir)
+             include_dirs += [os.path.join(qt_inc_dir, lib) for lib in qt_libs]
+         libraries = ["Qt5" + lib[2:] for lib in qt_libs]
+diff --git a/src/qhexedit.pro b/src/qhexedit.pro
+index 2a94016..55d7bc2 100644
+--- a/src/qhexedit.pro
++++ b/src/qhexedit.pro
+@@ -23,5 +23,7 @@ Release:TARGET = qhexedit
+ Debug:TARGET = qhexeditd
+ 
+ 
+-unix:DESTDIR = /usr/lib
+ win32:DESTDIR = ../lib
++
++target.path = /usr/lib64
++INSTALLS += target
+diff --git a/src/qhexedit.sip b/src/qhexedit.sip
+index 082621e..a7ef4e7 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/qhexedit2-0.8.6_p20190316.ebuild b/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316.ebuild
index a1d8c2148607..c5e05a60e67c 100644
--- a/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316.ebuild
+++ b/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 DISTUTILS_OPTIONAL=1
 
diff --git a/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525.ebuild b/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525.ebuild
new file mode 100644
index 000000000000..0818ddefb0cb
--- /dev/null
+++ b/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+#DISTUTILS_OPTIONAL=1
+#DISTUTILS_USE_PEP517=p
+
+inherit distutils-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.9.patch" )
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	python? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+		)
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+src_configure() {
+	eqmake5 src/qhexedit.pro
+	if use gui; then
+		cd example || die "can't cd example"
+		eqmake5 qhexedit.pro
+	fi
+}
+
+src_compile() {
+	default
+	use python && distutils-r1_src_compile
+	use gui && emake -C example
+}
+
+python_compile() {
+	use python && distutils-r1_python_compile build_ext
+}
+
+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*
+	use python && distutils-r1_src_install
+	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/vim-core/Manifest b/app-editors/vim-core/Manifest
index 15d433548184..7eda538bfaab 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -21,6 +21,6 @@ EBUILD vim-core-8.2.3741.ebuild 7373 BLAKE2B 6c783035fe60f08462e8047f0ef6373a532
 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 7146 BLAKE2B a8bf436cf36628d415159028f71bf456c02a3871e345cc08d1cf4be133041d18700af2b97c8fbd333948adaa6a615d47a48d3864a62ea6812fbbe58eb003a5f0 SHA512 dd82509a8a805383eb3311a46f0cbed3440e2cc20f401b34550de6f8cc5245763e9e45fc38a7c8872e06faa1deb037c56364c6d5e406fa85999382137f1c2575
-EBUILD vim-core-9999.ebuild 7146 BLAKE2B a8bf436cf36628d415159028f71bf456c02a3871e345cc08d1cf4be133041d18700af2b97c8fbd333948adaa6a615d47a48d3864a62ea6812fbbe58eb003a5f0 SHA512 dd82509a8a805383eb3311a46f0cbed3440e2cc20f401b34550de6f8cc5245763e9e45fc38a7c8872e06faa1deb037c56364c6d5e406fa85999382137f1c2575
+EBUILD vim-core-8.2.4586.ebuild 7153 BLAKE2B 86f27f567c709ba9d5bf346ff8c1828b91a91ae6bee368d497cc0b571e947a491c2e8568ca74403eccc5051142ed463123a6aec648968a9b8dce360697953e7b SHA512 f5f647d8cd0befbb915641c6deb461ce0720f74b89be3b7a6ece064281f3f8b6600bdc9c00160be1b9ee966483ac3acc1567c7641fb143c22cdad78849d733df
+EBUILD vim-core-9999.ebuild 7153 BLAKE2B 86f27f567c709ba9d5bf346ff8c1828b91a91ae6bee368d497cc0b571e947a491c2e8568ca74403eccc5051142ed463123a6aec648968a9b8dce360697953e7b SHA512 f5f647d8cd0befbb915641c6deb461ce0720f74b89be3b7a6ece064281f3f8b6600bdc9c00160be1b9ee966483ac3acc1567c7641fb143c22cdad78849d733df
 MISC metadata.xml 373 BLAKE2B ed379c0c7c1b4317edd219c1257015713213d1b19255435ad216273def371f59f88ea7f3e72caf99b6b8d53b7ace2691347c8b06e5961bc4e91ac34ae77d0622 SHA512 58485928380299dee5f390b2af01dd36f4d4ed2f30fc5d8e400f0bef18f00b62b060e865b3cd24292289264870ebe89397d19d8f068b402a5748f569eb75efe7
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 37b1be63841c..1c7169a0e5f8 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 ~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-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild
index 37b1be63841c..1c7169a0e5f8 100644
--- a/app-editors/vim-core/vim-core-9999.ebuild
+++ b/app-editors/vim-core/vim-core-9999.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 ~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/Manifest b/app-editors/vim/Manifest
index 5b35642505ac..37f966c22cc2 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -10,15 +10,15 @@ DIST vim-8.2.3950.tar.gz 15865929 BLAKE2B e713895f847194845c1a794fc796e97678b116
 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 9496 BLAKE2B 77b6188e1c207b82cb341659ad28b8179bfef3d431126caeaa8eb32500b927d9e63caf606e63890597d47959ec5ed29af40c3e8c0130486c90ce2016515cd742 SHA512 da1b4a8c8e07d5dee976d36a523788f74aa7bbf10b99bc2f7e3dfe66a93bde46999c39f10466b9a3f72fef927743fe63f16883874dfdcc31fa8d1a5b0606e393
-EBUILD vim-8.2.3428-r1.ebuild 10185 BLAKE2B 2db77b2dae20412a5e2ea1d2a0192b49312619518114ae9de7dd1436d24f4f0ce8f86e49b125605396e8128050f46d69fa539c8194838a784418356cd1cb0a80 SHA512 f58dcfe5f137f712f205691f67302fad5e4e72a5836cc5e64713b26a1a44ee1d4ed4862f8bb17938a1639e27edc25605efd7d3d2cbd1bc92fd95cde294664fcd
-EBUILD vim-8.2.3567.ebuild 10265 BLAKE2B 2da9c389b03afe7e2226c9dc06f7fb2699b61eb6c2d0698ad774366a28a237dbffc6cbd205f6b257ff6d1e4d504e0ae04faa85734abe3202575c0a7e2af6d3d7 SHA512 dcc3de6e12314c094e740fab48c3345291803a98bab460c890971811a0ab1c4ba323e331450b6af2e2ecba40a2e7778e62f004e5f615ddc741fe6f122d3b9b70
-EBUILD vim-8.2.3582.ebuild 10257 BLAKE2B d33c9e872586b4e9ad4cdae08ef20a2dc5aefbfbad33b6ac262daac88c0ca522d9ec35da43143dc5208915a1e95caff5ffeb750c5349c52440c32145b51c7a84 SHA512 2531fa382b1ea8632767cfb4aad8cecbe6137763eb89189ed58ebdc6958fa28a41a188e2be2ed7b8b18214ed1602930075dcc09b79fda082511641a153cb8d38
-EBUILD vim-8.2.3669.ebuild 10265 BLAKE2B 2da9c389b03afe7e2226c9dc06f7fb2699b61eb6c2d0698ad774366a28a237dbffc6cbd205f6b257ff6d1e4d504e0ae04faa85734abe3202575c0a7e2af6d3d7 SHA512 dcc3de6e12314c094e740fab48c3345291803a98bab460c890971811a0ab1c4ba323e331450b6af2e2ecba40a2e7778e62f004e5f615ddc741fe6f122d3b9b70
-EBUILD vim-8.2.3741.ebuild 10257 BLAKE2B d33c9e872586b4e9ad4cdae08ef20a2dc5aefbfbad33b6ac262daac88c0ca522d9ec35da43143dc5208915a1e95caff5ffeb750c5349c52440c32145b51c7a84 SHA512 2531fa382b1ea8632767cfb4aad8cecbe6137763eb89189ed58ebdc6958fa28a41a188e2be2ed7b8b18214ed1602930075dcc09b79fda082511641a153cb8d38
-EBUILD vim-8.2.3950.ebuild 10265 BLAKE2B 2da9c389b03afe7e2226c9dc06f7fb2699b61eb6c2d0698ad774366a28a237dbffc6cbd205f6b257ff6d1e4d504e0ae04faa85734abe3202575c0a7e2af6d3d7 SHA512 dcc3de6e12314c094e740fab48c3345291803a98bab460c890971811a0ab1c4ba323e331450b6af2e2ecba40a2e7778e62f004e5f615ddc741fe6f122d3b9b70
-EBUILD vim-8.2.4285.ebuild 10265 BLAKE2B 2da9c389b03afe7e2226c9dc06f7fb2699b61eb6c2d0698ad774366a28a237dbffc6cbd205f6b257ff6d1e4d504e0ae04faa85734abe3202575c0a7e2af6d3d7 SHA512 dcc3de6e12314c094e740fab48c3345291803a98bab460c890971811a0ab1c4ba323e331450b6af2e2ecba40a2e7778e62f004e5f615ddc741fe6f122d3b9b70
-EBUILD vim-8.2.4328-r1.ebuild 10088 BLAKE2B eff32a51d283241fa1fe756e85fbe3a942e22767b3a0a90529a1723467a5b0a91e04519ceee963b32dcd83dbbfa4878fc0e7ac92ad1a12eed1a2893df4e97c93 SHA512 9069af977387576132b2db142611ece7feb1f0424977dc1953e313cd50602d0d17d4822c4b65839382bb6c93d30e66c0882823fbffeda14c4d208bfa41bab947
-EBUILD vim-8.2.4586.ebuild 10094 BLAKE2B 525197248b7938f4c79481cc3fa4a5920119e7c966a36b8d7d436e4f08aa8611e5c02c67ffdc182e662263348afd936c39f7ea7d508325c5e7ae0085f7cd4975 SHA512 d0187a2b5294cd1acc36f4324fb16199fecc7e3e02a8ea6d798d8b7b0233caa987f97a284df344b944235e06e3cecb39d66938e98241f71561bf4cc2d12494d9
-EBUILD vim-9999.ebuild 10094 BLAKE2B 525197248b7938f4c79481cc3fa4a5920119e7c966a36b8d7d436e4f08aa8611e5c02c67ffdc182e662263348afd936c39f7ea7d508325c5e7ae0085f7cd4975 SHA512 d0187a2b5294cd1acc36f4324fb16199fecc7e3e02a8ea6d798d8b7b0233caa987f97a284df344b944235e06e3cecb39d66938e98241f71561bf4cc2d12494d9
+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
diff --git a/app-editors/vim/vim-8.2.0814-r100.ebuild b/app-editors/vim/vim-8.2.0814-r100.ebuild
index b0ae7e31e182..d11b9a85892f 100644
--- a/app-editors/vim/vim-8.2.0814-r100.ebuild
+++ b/app-editors/vim/vim-8.2.0814-r100.ebuild
@@ -280,7 +280,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/vim/vim-8.2.3428-r1.ebuild b/app-editors/vim/vim-8.2.3428-r1.ebuild
index 376604185e2d..6496dc770195 100644
--- a/app-editors/vim/vim-8.2.3428-r1.ebuild
+++ b/app-editors/vim/vim-8.2.3428-r1.ebuild
@@ -292,7 +292,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/vim/vim-8.2.3567.ebuild b/app-editors/vim/vim-8.2.3567.ebuild
index 2b7c3b0992cc..44b4345ad6e7 100644
--- a/app-editors/vim/vim-8.2.3567.ebuild
+++ b/app-editors/vim/vim-8.2.3567.ebuild
@@ -294,7 +294,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/vim/vim-8.2.3582.ebuild b/app-editors/vim/vim-8.2.3582.ebuild
index 53e69aee9488..dd9ebf6b23de 100644
--- a/app-editors/vim/vim-8.2.3582.ebuild
+++ b/app-editors/vim/vim-8.2.3582.ebuild
@@ -294,7 +294,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/vim/vim-8.2.3669.ebuild b/app-editors/vim/vim-8.2.3669.ebuild
index 2b7c3b0992cc..44b4345ad6e7 100644
--- a/app-editors/vim/vim-8.2.3669.ebuild
+++ b/app-editors/vim/vim-8.2.3669.ebuild
@@ -294,7 +294,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/vim/vim-8.2.3741.ebuild b/app-editors/vim/vim-8.2.3741.ebuild
index 53e69aee9488..dd9ebf6b23de 100644
--- a/app-editors/vim/vim-8.2.3741.ebuild
+++ b/app-editors/vim/vim-8.2.3741.ebuild
@@ -294,7 +294,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/vim/vim-8.2.3950.ebuild b/app-editors/vim/vim-8.2.3950.ebuild
index 2b7c3b0992cc..44b4345ad6e7 100644
--- a/app-editors/vim/vim-8.2.3950.ebuild
+++ b/app-editors/vim/vim-8.2.3950.ebuild
@@ -294,7 +294,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/vim/vim-8.2.4285.ebuild b/app-editors/vim/vim-8.2.4285.ebuild
index 2b7c3b0992cc..44b4345ad6e7 100644
--- a/app-editors/vim/vim-8.2.4285.ebuild
+++ b/app-editors/vim/vim-8.2.4285.ebuild
@@ -294,7 +294,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/vim/vim-8.2.4328-r1.ebuild b/app-editors/vim/vim-8.2.4328-r1.ebuild
index f63872a37305..8bcb756c1d46 100644
--- a/app-editors/vim/vim-8.2.4328-r1.ebuild
+++ b/app-editors/vim/vim-8.2.4328-r1.ebuild
@@ -295,7 +295,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/vim/vim-8.2.4586.ebuild b/app-editors/vim/vim-8.2.4586.ebuild
index 5d9a0aae046a..62ce11b27b08 100644
--- a/app-editors/vim/vim-8.2.4586.ebuild
+++ b/app-editors/vim/vim-8.2.4586.ebuild
@@ -7,7 +7,7 @@ EAPI=7
 
 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"
 
@@ -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"
@@ -295,7 +295,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/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index 5d9a0aae046a..62ce11b27b08 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=7
 
 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"
 
@@ -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"
@@ -295,7 +295,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/vscode/Manifest b/app-editors/vscode/Manifest
index d41edfe8396b..620d3ae9615f 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.64.2-amd64.tar.gz 112392185 BLAKE2B cc59dfc54167cc49b607d0131d81cdc922c120f06d40820cd13818bd280f40e55dc3ee5ec94284c48f91ac09904b1be1b3caa6c7380835745eafba3a860e36d8 SHA512 def09100c9b4a8ea772925fd89b9f26ea88835b27ddea203235bdfa13e28b1ed43ce0fccc8c799bd2b767998f7b9190856aae663c9a2e7e3226e43fb3b1bc8a7
-DIST vscode-1.64.2-arm.tar.gz 93473664 BLAKE2B c0f9df18d1750182385f7c2fa2fed2be93480406a5516597984d3f0ff488ad6cf98dcfab56f94b2a73badda2a5c1546a6ea7af6d245e15cc2e5ce3b522081866 SHA512 7f89a4f12951ced50d84a852aa8eecb52aba25d3aa549b656e35bec1a04f9f89eb5cdde1d5c04bfb072c469cfba8ea948a13470773b969d731d085d7812fdf91
-DIST vscode-1.64.2-arm64.tar.gz 107090187 BLAKE2B 15587ce30f15c393f78d5ea554da51557bb5d3392655c82476100451881d5dae3bb034e05d5e5e26aed2236b9199edd927a3af064a00d0ec82a7b24a6c501c6d SHA512 54f16d98c43f940d8cf989f2db90c161cdf84733788eca55fb0413279d291a4b2bb82a3f5fa7d0b01d5d265f32c3b5273fc131f4bd6a33b841f3bb1773d9f6c7
 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
-EBUILD vscode-1.64.2.ebuild 3038 BLAKE2B fc4a05b861e3f704872c17a476c6d2d3012717a9b4e677c3dad731b360bebbfddb836a4ea4953e3bcd98bf8b58a3935c13aba38b395a4308f3597f211c30618a SHA512 04829aa5fa4dd456fcb5a69f71f7a214f6645d83cd04152b94a466eb8b3d0b5db45f8fbc2ed18c4abf43b3fe2405c7bd521d46c0a72a0e1d42ee70989176ac5d
+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
 EBUILD vscode-1.66.2.ebuild 3454 BLAKE2B 23b031a450a72926262df56e00de3604b26651185fb94faf8c86dde4878a88cb92b4549ed715f251f4607e96caa58435e8ce934a23e1fcbd3e88ae59b45cbd83 SHA512 3bb3fba747cd024ec14630d1379921979bdf54eafb62193f8a701de46aa78c16c2952ca10b02c05cf97d79f2fd858035e5d28dc6ee85adc05647817c14903944
+EBUILD vscode-1.67.0.ebuild 3121 BLAKE2B 5afdf9f9b4e29cc308a4e3d56b079bcdf7f2f8d7e6b6f46c5881cad6d988cd759c6d0006ba73ba16c111f679de3388fc662caf6968d0e06c284e32406b011414 SHA512 02d74dab0a9df33f37744f95bc97ae824d5d60092f2c41f2b24018260ae31a8c649639a49ac268b931d2412f88c04e4975817add6f29ec86cbd558e2dd8ab233
 MISC metadata.xml 947 BLAKE2B d2c522407289299e1398799f6187e1c0d6621dfe29c1dd0e9d88281eafe44f4b4b3a0edad920268d220375f9330f0a62c015fb1e5085decf5ca5e485a92cc204 SHA512 6b27ac42f3d67203c46996388f6700c007a299557808505179cfa42deeb71098bf3a257f23c11835389fd7a59180f3536e420ed6cdb93b274d47e4c84a25f738
diff --git a/app-editors/vscode/vscode-1.64.2.ebuild b/app-editors/vscode/vscode-1.67.0.ebuild
index 55a4d92b3c0b..8ab1bd247c0a 100644
--- a/app-editors/vscode/vscode-1.64.2.ebuild
+++ b/app-editors/vscode/vscode-1.67.0.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
diff --git a/app-editors/vscodium/Manifest b/app-editors/vscodium/Manifest
index f61338a7dac2..a6143dd06858 100644
--- a/app-editors/vscodium/Manifest
+++ b/app-editors/vscodium/Manifest
@@ -2,16 +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.64.2-amd64.tar.gz 113590369 BLAKE2B 0e222e126d099e4af446c1c229f1ef7967b6836b6f4e85a440adc768b3bd7662a710e23d4f3da61ed9a45adf328805876fe20012e94f97a9fd92cbc89704f425 SHA512 45c7a22c499abbdae8305e241533f99ecc48d504c73ba1a43a669ba8aafad8aac60e1383e45882ff4dff7a97b232c172e0b3d89def00e85fc1d37e209d80f162
-DIST vscodium-1.64.2-arm.tar.gz 96564908 BLAKE2B 5e8b974e179639231cfba996ff9a4d0203e597f1be0b58766f9f532516e4a8d0eca390a90f2366f5db66a8d12b64f72f301490f07d01ec6b5c66516ad26695f5 SHA512 b2e986ca7ebc021bd147a0c9fb3cd46833f5b65e01ec07bf26d577cca35a6998666409ab7c0bad5351de3c5d7e5e9c91d029d6b05e149261397d183ac06d57ea
-DIST vscodium-1.64.2-arm64.tar.gz 111168123 BLAKE2B 015163f9129e95cce5cb4df255cfa4bd69271362ba3782ed234e982ec849490cc4e15f8e8ed1dd1d942fb908026d93010f21a902b3c10b036e2a926d82893dc9 SHA512 7507080e2ac7bd4649fd87a52480900de229fe3c93df26d381ca34b472ddaa38852b5b8d14f06d4c9ee07d8f2fb3381b63c9c25b7e384d0da090e10a31f77df1
 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
-EBUILD vscodium-1.64.2.ebuild 2901 BLAKE2B 13b3ac36b9b9718201e74637cb1ff6be3cebdd358106e129e4cf2bfd97f59f3c5a88011305b3de65d4dd8a037dde51491bf4d128007cb2cf0b9625b47032e6c1 SHA512 ba4029c8d718905c2ec6ca88cf1e5e39ffc0292688775898fc736b6e84ca957d89895b6195bc1d89a63f40bbc3fd132a53c8ae880c044abc822e2cc80daf7324
+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
 EBUILD vscodium-1.66.2.ebuild 3321 BLAKE2B 403e3548d2be58c998f72039fb32c7c4e64a5c6b79505b6c29c780b5bb81ce2c2b54abbae4b45891eaaa8c1532db5c3185f3d3c670b50feed6313460c32b1e52 SHA512 e3cfd41801a2301c4976a71e742c9c43c0f29bb00834f447b832fe40c88fce557e1bfce6c8a64890378e89ff835130fb44e5a35af1f34fd149842bd955420258
+EBUILD vscodium-1.67.0.ebuild 2860 BLAKE2B 116ee8922aad22e774f7927ec4c9bc9e27c05f86a58dac7f625f24d695038822b75ab6c5d6f4a2d66a63c0bf2d6b5bc0255b234af52901542e7640a7908c30f3 SHA512 860f0ec6528856383c821537f20b42acf25a6ae6ff4b1f86a9395e73e8cb51cbf62c4256ae01175e39d6901ddb1ad77ef42a37a3b6ff6191f8a8bd7e42b5831f
 MISC metadata.xml 1191 BLAKE2B ac8f365247fc710ade8a690da2a409352c20a886ad96b529ab0fc3f200dda28c2c7ca62fa78a922689373fa483e0a789836b887c8fccf2729ca6aa4c0e06aefe SHA512 e5b56663a757cdfff13ddc25c5d4f118f22d194fb051ae0bbe3264a4721c196a8820db1bfbd5a992827d8c97a81edfc30a97ca9610961ee46684a253d186449c
diff --git a/app-editors/vscodium/vscodium-1.64.2.ebuild b/app-editors/vscodium/vscodium-1.67.0.ebuild
index bcd5b8fdae5d..0c1ad7786d63 100644
--- a/app-editors/vscodium/vscodium-1.64.2.ebuild
+++ b/app-editors/vscodium/vscodium-1.67.0.ebuild
@@ -9,7 +9,6 @@ DESCRIPTION="A community-driven, freely-licensed binary distribution of Microsof
 HOMEPAGE="https://vscodium.com/"
 SRC_URI="
 	amd64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz -> ${P}-amd64.tar.gz )
-	arm? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-armhf-${PV}.tar.gz -> ${P}-arm.tar.gz )
 	arm64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-arm64-${PV}.tar.gz -> ${P}-arm64.tar.gz )
 "
 
@@ -34,7 +33,7 @@ LICENSE="
 	W3C
 "
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64"
+KEYWORDS="-* ~amd64 ~arm64"
 IUSE=""
 
 RDEPEND="
@@ -68,17 +67,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 +92,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
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index bdd3428b48d0..692ea4d684a4 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -16,9 +16,9 @@ AUX xemacs.desktop 1061 BLAKE2B 47941fc8b380e08aad13e44fc1899ee73ef502dbbf5d8be4
 DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cfa208a8a1eaf30e2fc2543b953c9a9582c3d55bd5b37e746f45c03ebfc408a0d965606e45d5f4adb9148dea SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566
 DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e5436f6951c801f5a169592b160669d0f6b9dc8f10b6b79889a3210de977ed78a5cea826c02e425495364745ef9e10 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
 DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
-EBUILD xemacs-21.4.24-r5.ebuild 7100 BLAKE2B fc97b2c21a462aec173566002cf359400a8bbe2a9bd89aced81e2dfeb976504c285c547ef297ccc208a97b33cf6b182512847b882e947fc55cc0977f5e3a4683 SHA512 a6e0685614c85a3b8a15d42dc63f7572f05705adedcb7c40654c19bf0e99c7527e02c0f432888d564e8a33be939c1f8ace9afd6e2be04260e0741939704b14f1
-EBUILD xemacs-21.4.24-r6.ebuild 7125 BLAKE2B d55c2f8794c77d4e63d87ebf54235c17db9c8757f328f54ae52bb719ea633aeced8be84101b2d8c7df45267be3fac77022695e9a5500edae37a9b2b7b3517f91 SHA512 18cd08f620a2ea69b342c06aaa30cfc2e7b2721c0b65112b56071ac4d7d79d2c56800ac11245b61f911af99da4ad9d770f2bf2ca70cedd19b6710db8bd9a5596
-EBUILD xemacs-21.5.34-r8.ebuild 7325 BLAKE2B 700d5570cfce62735d320b1dcec6ba6f95c2629b6e600ee10ef5dba01584f687f8571d55af24e14d6b385ea611055b7c7ac57ad49e64108758a66bec2e24c43a SHA512 dc733c1f1f87b087710814f60fd0678a6fb539d76b39c3703c2cb31de6aab2e375e29853ce1f6dcb73ee26c9e5b5fc456726157ea977327e31848625f58118f8
-EBUILD xemacs-21.5.34-r9.ebuild 7219 BLAKE2B bb1c0946b059fb890d28ea2fce3ec175d5a85e662bac0c35caba615e32fae8a1bcb5811404a68c4e0b43c30b4622d1d189000c90f4eff72b5030893d496b5341 SHA512 a43e5517273245629785caf4f8393b89d7ec539a6c7e029b894d317a8082d4db58348197aa7fee3dae021f097efd5d3a1a4f45eb162fc10fb67a9470abd8ebac
-EBUILD xemacs-21.5.9999.ebuild 7210 BLAKE2B e0934ecd0ae85019ada5c29aa444bcd122160ab8a9621311fe5ee76ae576edb70a6520b08aeec5297165cfcd786a42ca9b90c4a02647bb06fe3ce167af39a438 SHA512 5a36af701e613e37f03a24d861aa4677ac1fded17ba9af75c1f2ee41cf5702485dcda0e87ef89de02fecfd631749d2332ec47f80f2eb1d52780c5d8e41de38b3
+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.9999.ebuild 7224 BLAKE2B d3907244a27a25b0def8ec0f47d82a54a7356632c5024d7e740ee8992bbc6da9a309a480599a10fda686731da78ae2fe23610b112e81575b2dda785adf23d60c SHA512 1bca46da3f9fe5749c7bc144899c005a982cf84d30692eb107be5298f92288308984ce31eeafda9887056f7ffd09bc06f4077c8e124a46b9ff46ad6fe42268c5
 MISC metadata.xml 683 BLAKE2B 060e4f7830a96404813a550debecf83c2de3993183d41638362ed01a3a6240bdd33a83c0db5e31a2f2e821046fb1c15199688271c27611689aac1bdf02bcde14 SHA512 176625d3c972766aaecd10125e69b4cdcbedff958b842b2ac2b6a39d728ec868b3311ef13f6854122063810c5125f48d73cd1e68083de5ddf3ef85f7f2b09cdc
diff --git a/app-editors/xemacs/xemacs-21.4.24-r5.ebuild b/app-editors/xemacs/xemacs-21.4.24-r5.ebuild
index 2f9a674f7c59..9f4b8ce418b4 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r5.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r5.ebuild
@@ -10,7 +10,7 @@ WANT_AUTOCONF="2.1"
 inherit autotools flag-o-matic toolchain-funcs xdg-utils desktop
 
 DESCRIPTION="highly customizable open source text editor and application development system"
-HOMEPAGE="http://www.xemacs.org/"
+HOMEPAGE="https://www.xemacs.org/"
 SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 	http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
 
@@ -40,7 +40,7 @@ RDEPEND="
 	xface? ( media-libs/compface )
 	tiff? ( media-libs/tiff:0 )
 	png? ( >=media-libs/libpng-1.2:0 )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:0= )
 	!amd64? ( freewnn? ( app-i18n/freewnn ) )
 	>=sys-libs/ncurses-5.2:=
 	>=app-eselect/eselect-emacs-1.15"
diff --git a/app-editors/xemacs/xemacs-21.4.24-r6.ebuild b/app-editors/xemacs/xemacs-21.4.24-r6.ebuild
index 5944c3fd65be..fe5170beba18 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r6.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r6.ebuild
@@ -10,7 +10,7 @@ WANT_AUTOCONF="2.1"
 inherit autotools flag-o-matic toolchain-funcs xdg-utils desktop
 
 DESCRIPTION="highly customizable open source text editor and application development system"
-HOMEPAGE="http://www.xemacs.org/"
+HOMEPAGE="https://www.xemacs.org/"
 SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 	neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )"
 
@@ -40,7 +40,7 @@ RDEPEND="
 	xface? ( media-libs/compface )
 	tiff? ( media-libs/tiff:0 )
 	png? ( >=media-libs/libpng-1.2:0 )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:0= )
 	!amd64? ( freewnn? ( app-i18n/freewnn ) )
 	>=sys-libs/ncurses-5.2:=
 	>=app-eselect/eselect-emacs-1.15"
diff --git a/app-editors/xemacs/xemacs-21.5.34-r8.ebuild b/app-editors/xemacs/xemacs-21.5.34-r8.ebuild
index bef802bacbd6..61aff25cd403 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r8.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r8.ebuild
@@ -9,7 +9,7 @@ EAPI=7
 inherit autotools flag-o-matic xdg-utils desktop
 
 DESCRIPTION="highly customizable open source text editor and application development system"
-HOMEPAGE="http://www.xemacs.org/"
+HOMEPAGE="https://www.xemacs.org/"
 SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
 	http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
 
@@ -41,7 +41,7 @@ RDEPEND="
 	xface? ( media-libs/compface )
 	tiff? ( media-libs/tiff:0 )
 	png? ( >=media-libs/libpng-1.2:0 )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:0= )
 	freewnn? ( app-i18n/freewnn )
 	>=sys-libs/ncurses-5.2:=
 	>=app-eselect/eselect-emacs-1.15"
diff --git a/app-editors/xemacs/xemacs-21.5.34-r9.ebuild b/app-editors/xemacs/xemacs-21.5.34-r9.ebuild
index e204ae47e03b..bba9dbfeb9b6 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r9.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r9.ebuild
@@ -9,7 +9,7 @@ EAPI=8
 inherit flag-o-matic xdg-utils desktop
 
 DESCRIPTION="highly customizable open source text editor and application development system"
-HOMEPAGE="http://www.xemacs.org/"
+HOMEPAGE="https://www.xemacs.org/"
 SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
 	neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )"
 
@@ -41,7 +41,7 @@ RDEPEND="
 	xface? ( media-libs/compface )
 	tiff? ( media-libs/tiff:0 )
 	png? ( >=media-libs/libpng-1.2:0 )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:0= )
 	freewnn? ( app-i18n/freewnn )
 	>=sys-libs/ncurses-5.2:=
 	>=app-eselect/eselect-emacs-1.15"
diff --git a/app-editors/xemacs/xemacs-21.5.9999.ebuild b/app-editors/xemacs/xemacs-21.5.9999.ebuild
index 53538cb13840..646022402db0 100644
--- a/app-editors/xemacs/xemacs-21.5.9999.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.9999.ebuild
@@ -9,7 +9,7 @@ EAPI=7
 inherit flag-o-matic xdg-utils desktop
 
 DESCRIPTION="highly customizable open source text editor and application development system"
-HOMEPAGE="http://www.xemacs.org/"
+HOMEPAGE="https://www.xemacs.org/"
 SRC_URI="neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )"
 
 inherit mercurial
@@ -42,7 +42,7 @@ RDEPEND="
 	xface? ( media-libs/compface )
 	tiff? ( media-libs/tiff:0 )
 	png? ( >=media-libs/libpng-1.2:0 )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:0= )
 	freewnn? ( app-i18n/freewnn )
 	>=sys-libs/ncurses-5.2:=
 	>=app-eselect/eselect-emacs-1.15"
author	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
committer	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
commit	752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree	330d16e6362a49cbed8875a777fe641a43376cd3 /app-editors
parent	0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)