gentoo resync : 04.01.2022

28 files changed, 332 insertions, 50 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 3a17ffb3f8c1..dd1be0901d13 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 6dd00e81ca93..1d00bbde260c 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -15,7 +15,7 @@ EBUILD emacs-23.4-r21.ebuild 11065 BLAKE2B ec01f02640ccef8349bef30f81c2328465293
 EBUILD emacs-24.5-r11.ebuild 10816 BLAKE2B 9968d323497774e9f864ff9f41e54b2cea4ed471836e9644ac675728cc83b955ddcf93d0a94af359beb722da5ec5d7c4e267a732fadc592fc00d740692ed65df SHA512 417cdbef740b8b6b122446547e87e527355208c3894fe88720114b9ec8ae22ce62cf44de5a571997601fa6cb17b208633c18a6017838386285302322ec3c8ea4
 EBUILD emacs-25.3-r11.ebuild 11126 BLAKE2B 094e3beb2f13d6f9b16b29b0758eac7aec05e5dd90d90b202fb36c0d8c247487d19cc8614c9c938b81598c0f97ef43f846dc14e3160b06f10d2608b5a517ba58 SHA512 2de603b0688d3648908b86ce0c7737e8f8e31500a07fe84c57a19d53e0b3d8039a949d88ea097d40074ab1eae0780cba164a3e8e03ae94a94e1d90298360cf6a
 EBUILD emacs-26.3-r6.ebuild 11825 BLAKE2B 1df12880101fce336ded064f8e91840b9f1a66b213367f46503c0ec19fcd1db45f0fedfe0db895141d44a8d2bfcc506c8683dda949429b5910b8cad360d241c7 SHA512 0608d4f489447e4545c2510a446293cd34a4164e2f6348b143a158df78dc6e362d166cda25177d86daac52fb31c7a85d1519de9b8583b1a2b4fe8782bca4c785
-EBUILD emacs-27.2-r5.ebuild 14417 BLAKE2B caf2f97a6ee109d0bb460f076408a10bde808758d7b19a6d0641f3aa73996681b4eab5b99e8bdec4127dab08eae848da8a3358a1e8a8a9086199d78793987335 SHA512 bb9411a6d90dac795b446ad86a5b586ed4aa8140534860ecaece4a738b7c7d801ec0b42c1e4a0793483be5a070a040aa0af484eed63ee561743b6a8e3361e04c
+EBUILD emacs-27.2-r5.ebuild 14528 BLAKE2B e38deb5d4f19d64279e151ed9a09e3b21010ca6347e9bc898297d048a84e5e2e00639094790e4383c16ab51af98b4e805f7018a3caa2cd6976fd5cfc44dc5cdc SHA512 5f61316ede791cdf52d6952c63da7a458311df49080f1502619477a0453112cbc08f8f2e8eebfa2586775655b50cb0cae1a951b2c47b038cbe54978fc99948e5
 EBUILD emacs-27.2.9999.ebuild 14285 BLAKE2B 87ca6c37fccc5e6d24111d6167920d28de47dbd3a77bc50003c0c3a89f6e654c1f51a05b9dbf4a1a200e4f40fd1cb4cab30f3c2f53d3aefe6e676b175db7cb84 SHA512 c2b9c90534fa1a9d67d7f50044b94c6136e572d9cbda836fd9a046434ee65d3e64e5b88a123496a4bbeb487156d66e2960461f82a71d0c59f3229273c3616af9
 EBUILD emacs-28.0.9999-r1.ebuild 14452 BLAKE2B 68d57670ac0d6b470e259fc709b2f3e855db9c2dbe64ea5d65a383eebe2e4f82b2fc13dce1fc8a6119e5189843d1337ffc5cd73425c46c20478f45e0aef9364e SHA512 b365d7c1a75a95ec3e9b6341c204436ebb67de08ff6514fca960c32ed2da1db460fd0641dd4492b02ea8d2abe47dbe39c30a92f60c06aa0edda3cd6fec529cff
 EBUILD emacs-29.0.9999.ebuild 14450 BLAKE2B 64ccaa69ef1ef032c58f1d54b1f8f5c45ea6e7d443792e19b440541e1fda9c167ba6d7863f33fd648289cd53864c817cba5af0322c00512b48e732fb81252218 SHA512 71a8bef26f44970ae7dcb63ae1dfdbba2f0bfaed6a31e5311a6197447afe3511b66a927c1f449ced7213a88ff9000d1cc4c46578c157c3379c50d0e2e3e193e1
diff --git a/app-editors/emacs/emacs-27.2-r5.ebuild b/app-editors/emacs/emacs-27.2-r5.ebuild
index e2efcba31d59..d6c4a74eb424 100644
--- a/app-editors/emacs/emacs-27.2-r5.ebuild
+++ b/app-editors/emacs/emacs-27.2-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,7 +36,7 @@ else
 	PATCHES=("${WORKDIR}/patch")
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	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 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
@@ -259,6 +259,9 @@ src_configure() {
 		popd >/dev/null || die
 		# Don't try to execute the binary for dumping during the build
 		myconf+=" --with-dumping=none"
+	elif use m68k; then
+		# Workaround for https://debbugs.gnu.org/44531
+		myconf+=" --with-dumping=unexec"
 	else
 		myconf+=" --with-dumping=pdumper"
 	fi
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index fc93b9bcfdf2..586b460ee22e 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -12,6 +12,6 @@ EBUILD gvim-8.2.3428-r1.ebuild 10626 BLAKE2B 21872f8aebfe15e9b94620f3a36298a78c5
 EBUILD gvim-8.2.3567.ebuild 10699 BLAKE2B 461bfc24a1267cb1037ef273d4c9d88556f518cb81ef8dbda78c417a5d0cd419e2e8760529f7be782d456757de954bf847cf19f01157f0d05d4d588a139b2895 SHA512 f51a04503239d7ec680391577a82a0f27039a2d096cf6850e2af90fb20f9b905cdc865faed74c5b8cf76b77fd9b1107b07a19d6b7ae139d2a0036d61c62ce439
 EBUILD gvim-8.2.3582.ebuild 10692 BLAKE2B 1f6f50d88e1985c917dfe7dbab0c9d71bec007bc8d057ad4b6c670f975a6e8b92ad4bec7447210c2eae43f8c039487bfc61a5fc161a3b6be11ac6c2751ae2440 SHA512 ecf615e9997ef893479928855634c9ad61eefccb334312229dd3d2079f50ad676c3c94769b8cdb798d1b760cc5420f1e30e011fdfa0b9eba4f8f9ed07e04600b
 EBUILD gvim-8.2.3669.ebuild 10699 BLAKE2B 461bfc24a1267cb1037ef273d4c9d88556f518cb81ef8dbda78c417a5d0cd419e2e8760529f7be782d456757de954bf847cf19f01157f0d05d4d588a139b2895 SHA512 f51a04503239d7ec680391577a82a0f27039a2d096cf6850e2af90fb20f9b905cdc865faed74c5b8cf76b77fd9b1107b07a19d6b7ae139d2a0036d61c62ce439
-EBUILD gvim-8.2.3741.ebuild 10693 BLAKE2B 876ae241b36b12bf98f5a5dec2ad18a1d712902ae814d36879385a99d94380b7cbd6c7f8fc4453eaafdb8299abfa45c967018ac611a4162a94c70336bbd7098d SHA512 451c1fbdaa966c36117ea6e4cb62d75fa770271c104498a178a41b38e9af0150644ca7dedf08483dba959f13de1239e2bd0687781fc74fce77b104a1d1ed30ea
+EBUILD gvim-8.2.3741.ebuild 10692 BLAKE2B 1f6f50d88e1985c917dfe7dbab0c9d71bec007bc8d057ad4b6c670f975a6e8b92ad4bec7447210c2eae43f8c039487bfc61a5fc161a3b6be11ac6c2751ae2440 SHA512 ecf615e9997ef893479928855634c9ad61eefccb334312229dd3d2079f50ad676c3c94769b8cdb798d1b760cc5420f1e30e011fdfa0b9eba4f8f9ed07e04600b
 EBUILD gvim-9999.ebuild 10699 BLAKE2B 461bfc24a1267cb1037ef273d4c9d88556f518cb81ef8dbda78c417a5d0cd419e2e8760529f7be782d456757de954bf847cf19f01157f0d05d4d588a139b2895 SHA512 f51a04503239d7ec680391577a82a0f27039a2d096cf6850e2af90fb20f9b905cdc865faed74c5b8cf76b77fd9b1107b07a19d6b7ae139d2a0036d61c62ce439
 MISC metadata.xml 717 BLAKE2B dd4eae2fc90d0a00452dd91391acb2e15538a956af6a2a423427dd4835292fb17c43d805bb32d119d3743a00a524e2216befdc32831339241d7285871798e7f7 SHA512 b0cc1bae40d3cfb51bcab00ea245688d68410c17220a3f3c80793b6fb62abb007251c2ee2abd7612ed507462a3c77de48f3ceaf622a75c54436298fd43b7df10
diff --git a/app-editors/gvim/gvim-8.2.3741.ebuild b/app-editors/gvim/gvim-8.2.3741.ebuild
index 3d582f441ac2..a3183caf7daf 100644
--- a/app-editors/gvim/gvim-8.2.3741.ebuild
+++ b/app-editors/gvim/gvim-8.2.3741.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 fi
 S="${WORKDIR}"/vim-${PV}
 
diff --git a/app-editors/jedit/Manifest b/app-editors/jedit/Manifest
index 1673508d5353..9cab301d346e 100644
--- a/app-editors/jedit/Manifest
+++ b/app-editors/jedit/Manifest
@@ -1,5 +1,5 @@
 AUX jedit-5.4.0-build-xml.patch 332 BLAKE2B 47bf100efa8d99ebebe9765df2c59f4bb4dfbed1922bab1dd7e5802c69c9ef3a124b065385df693159382b876a52fcfb3433c10177adf2c15653dd5fd314fb0b SHA512 6ea6e327f48a677063f0eb282baa1fff289b18b8f6e4106b7336ec2906a0652c24198f702cdaff283f48600e287a6e6525f562e5247af110a0ee60f3340e029c
 DIST jedit5.4.0source.tar.bz2 2535992 BLAKE2B 1560f680437e89cea789f2b0540225b0cbf92bc22f975c6d1850a7b3aa06a2b95d61a254fd0d4c0e7da916ee9de3a095ab5190ae5df3ad27e55c2f0ccef57db2 SHA512 2120370c54f8bd415f90b979c42bfca6101f76ba33f0ec6a8172adeb33173ba9c73cbd7f06b5dc8c12aa3eedf51f007752cdbf0c7423d77a1ac591beb5493112
-EBUILD jedit-5.4.0-r1.ebuild 2949 BLAKE2B 9f2400e0dc2d7f2c901e7cab8c70b2b223b0435edcccb52e808496338c94d60210ef6ed4ec9333e596945da01e886bde10afd9387212ccc0d5e309a367d5ccfc SHA512 368f5911801102a12d7f99fb67be150b42708f1748e8fbe88566a67ac340371905fb19cde9efd174746a4850009027faea9c4023f6e09f043591051ff53dd6cf
-EBUILD jedit-5.4.0.ebuild 2426 BLAKE2B fdc9dda4f7cae91b136494b4a231717c4cae4c01737a6489031350bfb8dd70335f3e7f76602bbfc8d282e2ef1906ca9269fac51a4e98543b424622d02f329e35 SHA512 ab9371eca6ca6fc632964e549b45ba012bf069eaf06c4e88920e82d8a752b69c0770f2a27515d9764f1232f42c7e3d97c4b57b09ff12cdf7ce0b3222b888bcf6
+EBUILD jedit-5.4.0-r1.ebuild 3166 BLAKE2B 5590fd9ecc292e3b376e8a9c40b3ab052fefe7da9cfd632a90749ed1748fbed75302dd8cce7236a24496cce1d95e48983050de5cfe0e09560eb327748170c759 SHA512 3ed37bbb6443cf77ea90408b6d99bf7f5921a33e049682c841c5fffee4b5dda429e3d11479805a125ca92e224d2becf723f33c51e1d203b5cb3bd562a054df82
+EBUILD jedit-5.4.0-r2.ebuild 3169 BLAKE2B 1238d003d5e9b0b0d84ea7f9a4382ba1a3a701d7f57d7154f908cab34bef386bea20c6a1b473d6b791b45607f5686fa06663faf40ec59fd429a9a82f3c4d665f SHA512 1d6ba2a59b10c21920da1b846d6bceddb41cdc8c10fdffeb68b364c5c48171149d1d8c73b4626bfbea7bea4a0c35580f58b4e6391bc2da7c82abc64d22124b85
 MISC metadata.xml 312 BLAKE2B 32456a81e027512746733dea293a638db960ecebb97e045e82bef5630ac064d59ee5b880ade0513d15619c49c52686b9b2e5b69c7e270c578a506465a40d5db3 SHA512 90c844a5041ab91cacc279bc0a404d42c188311bd71cd643d52dc8f586e4fca101d09236407e6a3701ef18816d5f01ad2194f5446d47c6670aaa1a33edada63b
diff --git a/app-editors/jedit/jedit-5.4.0-r1.ebuild b/app-editors/jedit/jedit-5.4.0-r1.ebuild
index ace3b3f58bd4..991fc2326e7a 100644
--- a/app-editors/jedit/jedit-5.4.0-r1.ebuild
+++ b/app-editors/jedit/jedit-5.4.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=6
@@ -11,9 +11,14 @@ HOMEPAGE="http://www.jedit.org"
 SRC_URI="mirror://sourceforge/${PN}/${PN}${PV}source.tar.bz2"
 
 LICENSE="BSD GPL-2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 SLOT="0"
 
+# Same failure with 5.4.0.ebuild:
+# See reports at /var/tmp/portage/app-editors/jedit-5.4.0/work/jEdit/build/test/reports/index.html
+# "Failure" "No tests found in org.jedit.io.Native2ASCIIEncodingTest"
+RESTRICT="test"
+
 CP_DEPEND="dev-java/jsr305:0"
 
 # Restricting to java 1.8 as it fails to compile with newer java versions, https://bugs.gentoo.org/828559
diff --git a/app-editors/jedit/jedit-5.4.0.ebuild b/app-editors/jedit/jedit-5.4.0-r2.ebuild
index a54681fbf162..1394e4d5154d 100644
--- a/app-editors/jedit/jedit-5.4.0.ebuild
+++ b/app-editors/jedit/jedit-5.4.0-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 JAVA_PKG_IUSE="doc test"
 inherit desktop java-pkg-2 java-ant-2 xdg-utils
@@ -11,18 +11,29 @@ HOMEPAGE="http://www.jedit.org"
 SRC_URI="mirror://sourceforge/${PN}/${PN}${PV}source.tar.bz2"
 
 LICENSE="BSD GPL-2"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 SLOT="0"
 
+# Same failure with 5.4.0.ebuild:
+# See reports at /var/tmp/portage/app-editors/jedit-5.4.0/work/jEdit/build/test/reports/index.html
+# "Failure" "No tests found in org.jedit.io.Native2ASCIIEncodingTest"
+RESTRICT="test"
+
 CP_DEPEND="dev-java/jsr305:0"
 
+# Restricting to java 1.8 as it fails to compile with newer java versions, https://bugs.gentoo.org/828559
+#init:
+#     [echo] Buildfile for jedit (/var/tmp/portage/app-editors/jedit-5.4.0/work/jEdit/build.xml)
+#Class org.apache.tools.ant.types.resources.selectors.Not loaded from parent loader (parentFirst)
+#Class org.apache.tools.ant.taskdefs.condition.Equals loaded from parent loader (parentFirst)
+#     [fail] failing due to Java 1.8 is needed for jEdit to build, please install it and rerun (found Java version: '11')
 RDEPEND="
 	${CP_DEPEND}
-	>=virtual/jre-1.8"
+	virtual/jre:1.8"
 
 DEPEND="
 	${CP_DEPEND}
-	>=virtual/jdk-1.8
+	virtual/jdk:1.8
 	dev-java/ant-contrib:0
 	dev-java/ant-apache-bsf:0
 	dev-java/bsh:0
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index e1c5996ac5a9..50498c3439e2 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -1,5 +1,5 @@
 DIST mg-20210314.tar.gz 152749 BLAKE2B eec9740db1a543025450746913c1b07f0646f370906665122c7f5dd1ecc46b5cab102bd29aa51afb13972f4f17118ea20c33bb619e8dc4bc8982f8423ed189d6 SHA512 816b1bf8aec97dd790b0d5bf8836d46cb87f60d0bda94c2aecce4f8a6b8599ab2e90805fa6b129c9e40b54b340e33a47fec97c60e1b59b7706aa357d58b0e3f6
 DIST mg-20210609.tar.gz 156850 BLAKE2B ed8061aa808a8570f24198fb32fa3d24d66decdd07dab871502456d734a8d7867f384122361294bda0155bc3fecea80983fd41c00a2ffe02d00e380bf94e2f43 SHA512 a17b470e5e192c1f62700c7b78b15c9403b25528a7d6603fda0b6e618196150329fe4889cedfc8dbf621053d45b78294ed5c2766604aaa4c3ddbaec545693043
-EBUILD mg-20210314-r1.ebuild 1047 BLAKE2B 58927b004dd4d86b0b265c81c4143c3f5c89f40d68c8f97af75696885c2cfa1aa2a6d4e1f72507b30a424466e7da47ac88b66d9d0d17652f8e47f9cbf791122c SHA512 77ccf850b2e25689630b8b04a3bd075f8dd1c2852a4a5a64a18b846443ca4822045986e4798bc21a45512d8ba456b4ced44a0af6a6a047a117a0133c4a06f90b
-EBUILD mg-20210609-r1.ebuild 1094 BLAKE2B f2f70b7cec2df275771132ba314dd5d63816c67f01b8b3f3b28fa695b38f8d97feca7a832a67cd8a6b5ac4214d6ab56a123c815b8f88e07f9b4b4e3b5683c43c SHA512 ff08db9441685c02dc8428e3fc64b3c525c063df07709bb1c5c251d670f0a7bd7377fcafc938f41f3023c4980953a0c22a64e2dca9f0a1885862786a2b7aa369
+EBUILD mg-20210314-r1.ebuild 1038 BLAKE2B f4c2c48a27eacc4609ba665f1d6683628fd7f42bea4d5013c2b6a4cec45aee51d78c1d98f681c99559e0f085af5adfff5b11023e59a46895ad85d65ad2517dcf SHA512 12580025fe9cb63602ae518d1b814eacfea8dc83244c3f23d8ffdf454f93158db81ec4adfef5375c4004cc1df749a1d6a82dd75b9a520b7810670d02b20c60e7
+EBUILD mg-20210609-r1.ebuild 1076 BLAKE2B e95ab621ef87cf6869a7ea5c16a2d13abeba717e683bfbce223be3c98f6debe22433842a754eb5732d596156faba388409e56d1ec0c7c3e748b455715b453ecc SHA512 6bc32e8cd88edee04db05e5ac2294879e6a7910511af007c5f07d547ede761a5d82b3faa87c387621900b42ddc43a0f3ffb57fa4902cfaa8f43ff867c2d9f15b
 MISC metadata.xml 619 BLAKE2B 746ed0d179b4fb8e40533411d3248b88c035a2f01ea6552af8e9bcf3d588a0e6a835ad12aa03a27052a7988646499538d991d05eb88c0125f3fc7d47e2ae217e SHA512 a1c066343bff1bd451d44850e8dd3f554fb330116a7e91b5a9c13f4c33e837018f81a9e77e1c9856651c877352aab68fe4f80f05a185996cce7eda91c45e6c8e
diff --git a/app-editors/mg/mg-20210314-r1.ebuild b/app-editors/mg/mg-20210314-r1.ebuild
index 59dc39a0a994..97f5a75b4174 100644
--- a/app-editors/mg/mg-20210314-r1.ebuild
+++ b/app-editors/mg/mg-20210314-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=7
@@ -14,10 +14,11 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ~ppc64 sparc x86"
 IUSE="livecd"
 
-RDEPEND="sys-libs/ncurses:0=
-	!elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="
+	sys-libs/ncurses:0=
+	>=dev-libs/libbsd-0.7.0"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	# fix path to tutorial in man page
diff --git a/app-editors/mg/mg-20210609-r1.ebuild b/app-editors/mg/mg-20210609-r1.ebuild
index 662d780e5fbf..6bbdcd7a6250 100644
--- a/app-editors/mg/mg-20210609-r1.ebuild
+++ b/app-editors/mg/mg-20210609-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
@@ -15,8 +15,9 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ~ppc64 ~riscv sparc x86"
 IUSE="livecd"
 
-RDEPEND="sys-libs/ncurses:0=
-	!elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )"
+RDEPEND="
+	sys-libs/ncurses:0=
+	>=dev-libs/libbsd-0.7.0"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 55c3d02b4671..a2349ffab6d4 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -5,8 +5,10 @@ AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07f
 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
-EBUILD neovim-0.4.4-r101.ebuild 2831 BLAKE2B a40b6c9e26029ad0576b02980b2110ea5c4d4472d412f316d70124b4780cd1d63268c7e86f4115674697605b1af1171a8da43a985dcf629f5376a6e0377525a9 SHA512 f368803117ef4db403ea11dfba1c626bfc638e1ef278ec77e38de69043045632ed0aa2d40356ea8bc7a2ce74fef1086a879afc4da6cadcd820b5585ec1cd57ec
-EBUILD neovim-0.5.1.ebuild 2890 BLAKE2B 4846f2f10df0bb426fa17997788aea4d99b14366dc5bd807c6add6bcb4ce36c1c8e71089652aaba3c5ff0dbaaa2950ba4418636eda80af15f846c0098ccdfd30 SHA512 2ee50871ce59b81f718ef071c1bbcf952c71183ccbb4a80f77e900629c958c6f71cc383d246f22b94d006388e29fe8a5dc640a96917c9c1667a151604aaa8632
+DIST neovim-0.6.1.tar.gz 10597584 BLAKE2B 3e2da61b768f5cae44e08f0ef7f386ce4b878b3248c9a7f7691f62dd732abfa59558467e190a5bcbb5f5007801b2003380296678fca42a0b46dde9a71ed496f4 SHA512 399489f6aaabec2a89b695b22dcd860149acaad723372cced0b4d2cdae464e2db5758372b9123cd0d2a683e0ea42b871935eb85e550cecce620d896691cfda53
+EBUILD neovim-0.4.4-r101.ebuild 2830 BLAKE2B a9aa517c7409e373bf510aa9d4adbaa627b561ee309c08d67941c3f497edc5471d50055406aaca2ca903952975813d74f5eb5f7caba09846522dbb25a8bb3cec SHA512 23db154a68cbeb0f15771a0d196a517cde5b7979440896c145c9cda4176e5ca2040b5222fdbee62fd6d97cf58e52ed143edaf9da25ac1a4a8a43acad8190edff
+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.ebuild 2928 BLAKE2B 0b8b20183821a493d0a62cb5ee725795d3f014660ba8213d62dd5ae44be7d5d4dcac77951a885e98cb29f5eabaf7e89cdb4791d6fc04c96feb47c814f5c1377f SHA512 43cc3b307c40da7dae3771d938c1737b20eebd15682704d03305745ca7c908d5761ba534cd1accdc9539c005a33db081ab707b51b371fe54af736ded22ac66c3
 EBUILD neovim-9999.ebuild 2928 BLAKE2B 32f7efda71fda938c0a278da9bfe7e54a870b536eb9a660b0f0f6ed72851b9b53147426a700948bfdebf8cc2a28b7343ad04014efb6c3d79000dd4ac3335dbeb SHA512 5eb55f224e87ea23461eaff00e93363a42e19b98e38f840e7d057c3eac36ba79c4717fcb543e623a85601bbe3de6e91a4761d04fa924fd1d585d9b896e01683b
 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.4.4-r101.ebuild
index a87ddc4c40e5..cbfbcb50f493 100644
--- a/app-editors/neovim/neovim-0.4.4-r101.ebuild
+++ b/app-editors/neovim/neovim-0.4.4-r101.ebuild
@@ -7,7 +7,7 @@ LUA_COMPAT=( lua5-{1..2} luajit )
 
 inherit cmake lua-single optfeature xdg
 
-DESCRIPTION="Vim-fork focused on extensibility and agility."
+DESCRIPTION="Vim-fork focused on extensibility and agility"
 HOMEPAGE="https://neovim.io"
 
 if [[ ${PV} == 9999 ]]; then
diff --git a/app-editors/neovim/neovim-0.5.1.ebuild b/app-editors/neovim/neovim-0.5.1.ebuild
index f75cc58cc162..7256b3ebf29c 100644
--- a/app-editors/neovim/neovim-0.5.1.ebuild
+++ b/app-editors/neovim/neovim-0.5.1.ebuild
@@ -7,7 +7,7 @@ LUA_COMPAT=( lua5-{1..2} luajit )
 
 inherit cmake lua-single optfeature xdg
 
-DESCRIPTION="Vim-fork focused on extensibility and agility."
+DESCRIPTION="Vim-fork focused on extensibility and agility"
 HOMEPAGE="https://neovim.io"
 
 if [[ ${PV} == 9999 ]]; then
diff --git a/app-editors/neovim/neovim-0.6.1.ebuild b/app-editors/neovim/neovim-0.6.1.ebuild
new file mode 100644
index 000000000000..2583a834c2fb
--- /dev/null
+++ b/app-editors/neovim/neovim-0.6.1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} luajit )
+
+inherit cmake lua-single optfeature xdg
+
+DESCRIPTION="Vim-fork focused on extensibility and agility"
+HOMEPAGE="https://neovim.io"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
+else
+	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+fi
+
+LICENSE="Apache-2.0 vim"
+SLOT="0"
+IUSE="+lto +nvimpager test +tui"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+# Upstream say the test library needs LuaJIT
+# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377
+REQUIRED_USE="test? ( lua_single_target_luajit )"
+# TODO: Get tests running
+RESTRICT="!test? ( test ) test"
+
+# Upstream build scripts invoke the Lua interpreter
+BDEPEND="${LUA_DEPS}
+	dev-util/gperf
+	virtual/libiconv
+	virtual/libintl
+	virtual/pkgconfig
+"
+DEPEND="${LUA_DEPS}
+	dev-lua/luv[${LUA_SINGLE_USEDEP}]
+	$(lua_gen_cond_dep '
+		dev-lua/lpeg[${LUA_USEDEP}]
+		dev-lua/mpack[${LUA_USEDEP}]
+	')
+	$(lua_gen_cond_dep '
+		dev-lua/LuaBitOp[${LUA_USEDEP}]
+	' lua5-{1,2})
+	dev-libs/libuv:0=
+	>=dev-libs/libvterm-0.1.2
+	dev-libs/msgpack:0=
+	dev-libs/tree-sitter:=
+	tui? (
+		dev-libs/libtermkey
+		>=dev-libs/unibilium-2.0.0:0=
+	)
+"
+RDEPEND="
+	${DEPEND}
+	app-eselect/eselect-vi
+"
+BDEPEND="
+	test? (
+		$(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch"
+	"${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch"
+	"${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch"
+)
+
+src_prepare() {
+	# Use our system vim dir
+	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
+		-i src/nvim/globals.h || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Upstream default to LTO on non-debug builds
+	# Let's expose it as a USE flag because upstream
+	# have preferences for how we should use LTO
+	# if we want it on (not just -flto)
+	# ... but allow turning it off.
+	# TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now
+	local mycmakeargs=(
+		-DENABLE_LTO=$(usex lto)
+		-DFEAT_TUI=$(usex tui)
+		-DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)")
+		-DLUA_PRG="${ELUA}"
+		-DMIN_LOG_LEVEL=3
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# install a default configuration file
+	insinto /etc/vim
+	doins "${FILESDIR}"/sysinit.vim
+
+	# conditionally install a symlink for nvimpager
+	if use nvimpager; then
+		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
+	optfeature "Python plugin support" dev-python/pynvim
+	optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
+	optfeature "remote/nvr support" dev-python/neovim-remote
+}
diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest
index 12ea2f2c4d1e..1ff95567f4d1 100644
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@@ -1,6 +1,8 @@
 DIST ReText-7.1.0.tar.gz 484989 BLAKE2B 74f07218cba1d76d011e5347c65ec03ef84da29119c177f35cca206cb269ae4755fdb85448562a378d2ab610930d23b4eccb62a39807409c6e80a68102be2034 SHA512 92333f31f7a57440d642246ed30156384285bb44640a0d6e7654e82749681893eaef3cb16e41fa2d7b618aa59f1ea8cb07d431736b00f35cb9130d7294e3d105
 DIST ReText-7.2.1.tar.gz 522364 BLAKE2B 6334fd6dc1c625378426e408a0d4ad6bb9c02dcba18fcfa566d61ce006a44c34327686a8eb756f2195620e644e096b9393a7cfa73229aa0dab7d29ddf715edaa SHA512 1a375acb40792e3cae9f955a75ebac7c30c9e5cc719477989b28d8d7f06e18ad14d98f1a600a5b6d050b3276ef22bd46b5f1f07af90d561cca500674ff461604
+DIST ReText-7.2.2.tar.gz 522652 BLAKE2B f9b19f985c1381eade324758c4dc6bf2e5f74bc3f5bfc27afa10462b7387f64a3e72edd5875aabf1831f1f0a942f395e43b124c172cac8cec4b9f19334661484 SHA512 68345b57b2c5446158ed3a6f97b5ead103ef1c99a3aea9cbc69ef7d0807fb64546f38ebde2969b94429eeed6450abb345fecc566dcf6e0767fe84c4e27348e53
 EBUILD retext-7.1.0.ebuild 1817 BLAKE2B 2d9d2f42c16af2849031e8f43f73d9848268dc9b82f7a863d9b0b1679d9cc52f4d45ec836b637daef785abf0a26f90e621fe1fb85fdc17a0315f81acc74cf477 SHA512 a1160568d324e1a5d240f27d01a978e412ec8f49832dc1661be049f3608a0407ddb152ec1d1a0ef79b274010ba7e1168a0afd747203bd561f37345acdc8431c6
 EBUILD retext-7.2.1.ebuild 1978 BLAKE2B 61abf35246d654bb60de706c6275f4b463c8d60c3af04201f7846b2d916ff2633d421d5d38419ce1aceb90689109b64100ca9554cda225dbb3c9676db0e70184 SHA512 e0feaa922eb61bf68b049f3b56ad5e7324ca0ece7e48d081c952cc64b0d12e31b26fe3d0212bdb0d28e9aa10daa7f76dcb4d9292b804dfb2eeb0d1ed46c5a21c
-EBUILD retext-9999.ebuild 1973 BLAKE2B a83f2e5da937ad51bb882b004313a649081e2bf7d19096521e6e62a9fab7dca755c511fc121a9293d0cf0d705c01ea0c31fc739eb500e7998ed677c9f08e29e7 SHA512 cad0fa71050cbd4446bfadbf1cae5575e154f1927db8e4147fb8065dfc57f4761da4d1325dc53cd3097043e635043d59c254ae567d86bcb86a27ec27263a0d7f
+EBUILD retext-7.2.2.ebuild 1978 BLAKE2B 2103f21e3e2fe6ca561bd0f7b2f6b4506205c77820d0af3a5648595bd79286dabfb53477eb48bce740bb4fdfcf4a7669770db50f74b12b33418007df37ebb1e4 SHA512 ef94587ec55d30254086a90cab157d31bdee07bbca4b1449e71f9d0d5877c3ff2256765ef731eb273b280eba6fd7fa0426e30ad016a552c1c0bfc6d7b27dcc48
+EBUILD retext-9999.ebuild 1978 BLAKE2B 2103f21e3e2fe6ca561bd0f7b2f6b4506205c77820d0af3a5648595bd79286dabfb53477eb48bce740bb4fdfcf4a7669770db50f74b12b33418007df37ebb1e4 SHA512 ef94587ec55d30254086a90cab157d31bdee07bbca4b1449e71f9d0d5877c3ff2256765ef731eb273b280eba6fd7fa0426e30ad016a552c1c0bfc6d7b27dcc48
 MISC metadata.xml 298 BLAKE2B 82f3b1a76b71a731c76a61612a0e3a31634b08ab73d1ff9d57c9c68fdd68b0acf9387a5024772c9fe80d4f54d2134c591b17bc4c519d06b50491671042f4c635 SHA512 5e439ee1dae76ef108f8a5f28a5e4305181eacab14c9b239d5f3d4a6b25a25a59617eaa5d2df13b5fba8362d6b8f3af43af8fa9df22715867e170d29cf649c5c
diff --git a/app-editors/retext/retext-7.2.2.ebuild b/app-editors/retext/retext-7.2.2.ebuild
new file mode 100644
index 000000000000..ac4f08fb2467
--- /dev/null
+++ b/app-editors/retext/retext-7.2.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Please don't add pypy support before testing if it's actually supported. The
+# old compat matrix is no longer accessible as of 2021-02-13 but stated back
+# in 2020-07-05 that PyQt5 was explicitly not supported.
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit distutils-r1 optfeature virtualx xdg-utils
+
+MY_PN="ReText"
+MY_P="${MY_PN}-${PV/_/~}"
+
+DESCRIPTION="Simple editor for Markdown and reStructuredText"
+HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/retext-project/retext.git"
+else
+	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
+
+	KEYWORDS="~amd64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+	>=dev-python/markups-3.1.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/python-markdown-math[${PYTHON_USEDEP}]
+	dev-python/PyQt5[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-python/PyQt5[testlib,${PYTHON_USEDEP}] )"
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	optfeature "dictionary support" dev-python/pyenchant
+	# See https://bugs.gentoo.org/772197.
+	optfeature "rendering with webengine" dev-python/PyQtWebEngine
+
+	einfo "Starting with retext-7.0.4 the markdown-math plugin is installed."
+	einfo "Note that you can use different math delimiters, e.g. \(...\) for inline math."
+	einfo "For more details take a look at:"
+	einfo "https://github.com/mitya57/python-markdown-math#math-delimiters"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-editors/retext/retext-9999.ebuild b/app-editors/retext/retext-9999.ebuild
index 13399224b736..ac4f08fb2467 100644
--- a/app-editors/retext/retext-9999.ebuild
+++ b/app-editors/retext/retext-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=7
@@ -6,7 +6,7 @@ EAPI=7
 # Please don't add pypy support before testing if it's actually supported. The
 # old compat matrix is no longer accessible as of 2021-02-13 but stated back
 # in 2020-07-05 that PyQt5 was explicitly not supported.
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit distutils-r1 optfeature virtualx xdg-utils
 
@@ -16,14 +16,14 @@ MY_P="${MY_PN}-${PV/_/~}"
 DESCRIPTION="Simple editor for Markdown and reStructuredText"
 HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki"
 
-if [[ ${PV} == *9999 ]]
-	then
-		inherit git-r3
-		EGIT_REPO_URI="https://github.com/retext-project/retext.git"
-	else
-		SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-		KEYWORDS="~amd64 ~x86"
-		S="${WORKDIR}/${MY_P}"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/retext-project/retext.git"
+else
+	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
+
+	KEYWORDS="~amd64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/app-editors/sublime-text/Manifest b/app-editors/sublime-text/Manifest
index 3dc5f0ec5183..d6ebda25d566 100644
--- a/app-editors/sublime-text/Manifest
+++ b/app-editors/sublime-text/Manifest
@@ -5,8 +5,10 @@ DIST sublime_text_3_build_3211_x64.tar.bz2 13677324 BLAKE2B e2ac54c1e8ab90c0fcef
 DIST sublime_text_build_4107_x64.tar.xz 17096632 BLAKE2B 37c1839ef1edecb1f3017e4d99d2b8b0bf5c0aa1490495fe19a48cf38bb436e94913572a4dd5ad5f84e6b5445b6a9a2df35fec607beb0b520471b2dde7ef63fd SHA512 552051b34c612aa6ff53ef6275488467061221715de054dc1e657519c82899e24df1a9f8000086b68c5c1c6e0c98341c641f19a2d97c880efb25aa93ad82f8aa
 DIST sublime_text_build_4113_x64.tar.xz 17105200 BLAKE2B 6a23e9eb7ec5b7b5dfef2ef496e0b7fcf053be3349c8318e85373bc9c3d4d69da3e4e94971ae83832aa254c175a58062a33ffb14d2103c1cdb6888c1223f28ed SHA512 f0e5e8e28754c21bf5c9fc3e50502d22d72fec4819c68d8444cb341aa7ee4d6bc43edfda594fba3c446c2b252bd7a65340dd7a407d81f875971c219bb2236479
 DIST sublime_text_build_4121_x64.tar.xz 17181776 BLAKE2B a8404a15af67934ba5c2c038d2259e454a505592f53007f665a596554dd13e5c09729577520052290df7bf393ddbcb33321d1624679c4af3bcf5a07ac038f6a5 SHA512 809ef4acabe1e52918b2e7c6057623380b1c7ba5bf0298aa59ec06b49d258fe37fd7177a79bdc840cbc4228a7944cfa67847c3bf3b1b26b3c171815f80c59103
+DIST sublime_text_build_4126_x64.tar.xz 17313756 BLAKE2B 16a036e15b920f72b47a6425540efcbc5ac5c44d3f3c79fa0a106128857f6fa6775a244d6497c814448a3f42cfe1515546b372475b22b47364a759ad0412bfdc SHA512 1f7a1543e68e67bd507f2f4b65f53085c96796287521878011e183df26579cd593c333d53b5ee9bc5adb41dd5344c62875fea869d11962ba80a39dfb63a80652
 EBUILD sublime-text-3_p3211-r1.ebuild 1645 BLAKE2B 5bdf8d1fdae1df2bc59937e2bd2382385aad77fb60a99e3ea4830239adc027f2c09663c9bec3b795d5f633d3625b2ff5a17b328b46986968e99e45ceeb71e515 SHA512 339364d412f075d97ae576e75dfc50a021fdbf2953a0a6de78f45b97d1db21f335a43a2373631b2a42becd8877b4003fc06b4669f3b092f86df0ff09b3c11f2d
 EBUILD sublime-text-4_p4107.ebuild 2055 BLAKE2B 71fc79523f06b4e66ad3469bd9b62aadc13f2ad66eb2028d80fd69ac358df2a303d71375d0cd406ef3460a299b9f467cbf4917a54a3c58c1a859b656d31408d0 SHA512 b871dbe20734510f84b2b0c421c27552f33786ef1e7f8715ba9bc34ec0eb20a02456f2d668b458cf591ff86f24c91f256c5aff0165a2be94549c749fcdf0d90c
 EBUILD sublime-text-4_p4113.ebuild 1944 BLAKE2B 6ea2f6b0705c7a0f3ae083deb217c7421b75f809f34051e04807f235f2c41cb5f7acbc0e1b7f5859cdacd5fefc3e78b447861456b1a57f796518f9e8ca250634 SHA512 ac4e7c50496ee6e67366f83e6fadb78c8284cb1db640258f9249db0e108fe50eda02081c63e08488548d75ca12882646594f5515c35e30fbe9888e74c6b18426
 EBUILD sublime-text-4_p4121.ebuild 1944 BLAKE2B 0171c665702901ba22d1dc536a55157d4112cdfcb04fdffa561298e0fb75850a847b54387966e9910d5fa3a2da42b22c8caf5a55d1794fb88ac5eb6eaa59d71c SHA512 56ac4d5d09d1100557a170266ac42cf3603f122d709b58fb200a397d171c5222cd6d73271d72f4c24ca664e3a5966743faff56fb6d5f1a5984472023d12e5147
+EBUILD sublime-text-4_p4126.ebuild 1944 BLAKE2B 0171c665702901ba22d1dc536a55157d4112cdfcb04fdffa561298e0fb75850a847b54387966e9910d5fa3a2da42b22c8caf5a55d1794fb88ac5eb6eaa59d71c SHA512 56ac4d5d09d1100557a170266ac42cf3603f122d709b58fb200a397d171c5222cd6d73271d72f4c24ca664e3a5966743faff56fb6d5f1a5984472023d12e5147
 MISC metadata.xml 245 BLAKE2B 4ac08132cfdd18d0ef2c38470da5045bca296f4975a8fa1e7094c1f6f524ebf02103d487ae7d6d0bb1c912d46eb207a74a417bbdc10bc92499331112f15392e6 SHA512 fa5b2d519f191de35a1f8719e8ba7ea346c54173c797e152df2aeefda32dfb0e0741ff171b87e1ee835c1d5383f424b8bb276d597bdf2fe911525bd5719cab9d
diff --git a/app-editors/sublime-text/sublime-text-4_p4126.ebuild b/app-editors/sublime-text/sublime-text-4_p4126.ebuild
new file mode 100644
index 000000000000..67a825bdb8e4
--- /dev/null
+++ b/app-editors/sublime-text/sublime-text-4_p4126.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop wrapper xdg
+
+# get the major version from PV
+MY_PV=$(ver_cut 3)
+MY_PN=${PN/-/_}
+
+DESCRIPTION="Sophisticated text editor for code, markup and prose"
+HOMEPAGE="https://www.sublimetext.com"
+SRC_URI="
+	amd64? ( https://download.sublimetext.com/sublime_text_build_${MY_PV}_x64.tar.xz )"
+S="${WORKDIR}/${MY_PN}"
+
+LICENSE="Sublime"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="dbus"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	dbus? ( sys-apps/dbus )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4_p4107-remove-deprecated-key-onlyshowin-from-launcher.patch
+	"${FILESDIR}"/${PN}-4_p4107-set-explicit-startupwmclass-in-launcher.patch
+)
+
+QA_PREBUILT="*"
+
+# Sublime bundles the kitchen sink, which includes python and other assorted
+# modules. Do not try to unbundle these because you are guaranteed to fail.
+
+src_install() {
+	insinto /opt/${MY_PN}
+	doins -r Packages Lib Icon # /Icon is used at runtime by the application
+	doins changelog.txt libcrypto.so.1.1 libssl.so.1.1 sublime_text.desktop
+
+	# sublime_merge looks for /opt/sublime_text/sublime_text
+	exeinto /opt/${MY_PN}
+	doexe crash_reporter plugin_host-3.3 plugin_host-3.8 sublime_text
+
+	# sublime-text sets its WM_CLASS based on its argv[0]. A wrapper script is
+	# used instead of a symlink to preserve a consistent WM_CLASS regardless of
+	# how the application is launched. This causes the WM_CLASS to be
+	# "sublime_text" which matches the .desktop entry.
+	make_wrapper subl "/opt/${MY_PN}/sublime_text --fwdargv0 \"\$0\""
+	domenu sublime_text.desktop
+
+	local size
+	for size in 16 32 48 128 256; do
+		doicon --size ${size} Icon/${size}x${size}/${PN}.png
+	done
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog 'Sublime Text 4'"'"'s window class changes from WM_CLASS="subl" to'
+	elog 'WM_CLASS="sublime_text" matching other distributions.'
+}
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 98fd0c1ba2aa..f9dfc684f5e6 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -13,6 +13,6 @@ EBUILD vim-core-8.2.3428.ebuild 7230 BLAKE2B 03d7b91e062a4b33dbfd7226f90fc60f4f3
 EBUILD vim-core-8.2.3567.ebuild 7245 BLAKE2B f2e57ff7b63e54789c2bfbb4cf4929e301f363424cd06bea9c8b7f4b519630e324961b078672123ef8499fa5418386c7c1e15e0b588f35e98190c979ebe59378 SHA512 669e5a657f4abbdf3261a068501c4bfe5492fd81fdc021cd409249a47c46babd327b0c122b19747f08161c028b45671967896f8b26ad1f94ebb6f866eeb5e8b6
 EBUILD vim-core-8.2.3582.ebuild 7237 BLAKE2B 57401e1c87a3382822347e140eae2411526842a5b16689c862f13d34ddef830b234d3acccf6e6850a13b20a3c3e30c323e4c2b787a353ff4fd91521ee4259a3c SHA512 1d8fc9df2432fea0c46acdf38e12653326a88a505f870f34e4e3d3bbc5f82ec4063a5721e048e9ab523f097dc3c826347ff988e965951cce670f9b0efbc7bea2
 EBUILD vim-core-8.2.3669.ebuild 7245 BLAKE2B f2e57ff7b63e54789c2bfbb4cf4929e301f363424cd06bea9c8b7f4b519630e324961b078672123ef8499fa5418386c7c1e15e0b588f35e98190c979ebe59378 SHA512 669e5a657f4abbdf3261a068501c4bfe5492fd81fdc021cd409249a47c46babd327b0c122b19747f08161c028b45671967896f8b26ad1f94ebb6f866eeb5e8b6
-EBUILD vim-core-8.2.3741.ebuild 7239 BLAKE2B 95918cb01596b2e7828bec37785c074a2760eb21b1ed6c7d3d1970f3f047c01d9f347448eb77908053dfce66f8a4cc682ef1e2a341638122be37d4092651aa3f SHA512 63446db3e48041716a8f001fd1fc79f7a28a21ec216205deda9508250e5b177bbb010f0c9f78898936538d8a5345aa48e6f311c41537f25fc3eba872364bd0fe
+EBUILD vim-core-8.2.3741.ebuild 7238 BLAKE2B 6387c2f1e4e7f671accfb8d666fe271f19e3bb911df0fcc80fa64a51758824975cad1775612e1f65ffb67a4e9460354075037d4bb0141626d261ecc424f3472f SHA512 d48fc415b5b63fb6db38197b207c7670a9178eaf65a46bbca4a627c4e0c786af4ced0bc920a3931a263a2c49ee98df52aa5871624b8c3c607661435af616bd95
 EBUILD vim-core-9999.ebuild 7245 BLAKE2B f2e57ff7b63e54789c2bfbb4cf4929e301f363424cd06bea9c8b7f4b519630e324961b078672123ef8499fa5418386c7c1e15e0b588f35e98190c979ebe59378 SHA512 669e5a657f4abbdf3261a068501c4bfe5492fd81fdc021cd409249a47c46babd327b0c122b19747f08161c028b45671967896f8b26ad1f94ebb6f866eeb5e8b6
 MISC metadata.xml 373 BLAKE2B ed379c0c7c1b4317edd219c1257015713213d1b19255435ad216273def371f59f88ea7f3e72caf99b6b8d53b7ace2691347c8b06e5961bc4e91ac34ae77d0622 SHA512 58485928380299dee5f390b2af01dd36f4d4ed2f30fc5d8e400f0bef18f00b62b060e865b3cd24292289264870ebe89397d19d8f068b402a5748f569eb75efe7
diff --git a/app-editors/vim-core/vim-core-8.2.3741.ebuild b/app-editors/vim-core/vim-core-8.2.3741.ebuild
index 1cb320266849..7c85269220f9 100644
--- a/app-editors/vim-core/vim-core-8.2.3741.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.3741.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 ~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 fb17228b2d0d..71e8c78d859d 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -11,6 +11,6 @@ EBUILD vim-8.2.3428-r1.ebuild 10129 BLAKE2B 90c5110d69abc6e14bed2dab61fc8c944c47
 EBUILD vim-8.2.3567.ebuild 10209 BLAKE2B cd5cbbe715055703c3f650b20466d9454867089a73a58a0f65847bc4cbb9ba4471cf36faa1c13eb217046166227aab61675631c7168a99747d64d44d6050d59f SHA512 c94c183c4bc885f1c6e2e7670758f78448e0e85539b6b458c2f967f62553bb176e8abe627f59b77288c9c6c5b7e0487fc2ac452e4d3de6fcc5fcda1154c5da96
 EBUILD vim-8.2.3582.ebuild 10201 BLAKE2B 19b74948c229fed51d4a5d668f97b2f3320c274aaec01658e5b3fdab11d244bdcca10df3cd14760e01f380c4058ebf53937fb0da84cd739d4c6f6f9cbcdefb02 SHA512 833011e1b757031021804b6c36911358f508b9318c82030c260be99efc631dabb6c6cd5c71695d9c448c44475354d3106a50825dca98e41bdb58045048690f18
 EBUILD vim-8.2.3669.ebuild 10209 BLAKE2B cd5cbbe715055703c3f650b20466d9454867089a73a58a0f65847bc4cbb9ba4471cf36faa1c13eb217046166227aab61675631c7168a99747d64d44d6050d59f SHA512 c94c183c4bc885f1c6e2e7670758f78448e0e85539b6b458c2f967f62553bb176e8abe627f59b77288c9c6c5b7e0487fc2ac452e4d3de6fcc5fcda1154c5da96
-EBUILD vim-8.2.3741.ebuild 10203 BLAKE2B fa801f0e62f16b2eb924f095e3f8109471ac23206b40ccf5b6ac47409e50e6fd77dc43a831f8877d4c1c48a515f3092836a11c64c7afb915aeb2a8597f9726d1 SHA512 fd65db89a334d9eef8a357f67db9ab2e729755f0104386e7b0f6fda9ee64550fc91b41b43c4ecd6d263a9d975146ce12d3591e963d11c60a61ebe38d259621d4
+EBUILD vim-8.2.3741.ebuild 10202 BLAKE2B 8f855db41b0b8ea7629de3145cb09f99771c549a27317dfe7c1c7085dff821d393a90230178175b8ec5b5821522842e92098764885f9f844a6ee533d879ea55f SHA512 72bf491c8e4336eb1ced1b789aaccf4569ae81f3127edd1089a660aa2603adf75d29c2690d14ef9af332e5de822846a3deac840cf2bbdd065fb46d747ef13701
 EBUILD vim-9999.ebuild 10209 BLAKE2B cd5cbbe715055703c3f650b20466d9454867089a73a58a0f65847bc4cbb9ba4471cf36faa1c13eb217046166227aab61675631c7168a99747d64d44d6050d59f SHA512 c94c183c4bc885f1c6e2e7670758f78448e0e85539b6b458c2f967f62553bb176e8abe627f59b77288c9c6c5b7e0487fc2ac452e4d3de6fcc5fcda1154c5da96
 MISC metadata.xml 951 BLAKE2B 10b867295bee9174e71d1df8a2a8a251c669fb2415893f2e90e361622520fa6b357a2098cb0184637a6f3078ed1873ed1d38f64be205d941de13040fb9f197e2 SHA512 683a03f6198c53c16874cfd8b50a265460a507afcb1bff104ce8932a9957cd4a3cc0cd6d0e494ea0757645162994c55a792d282fd6ad1278dd10659804d2f54c
diff --git a/app-editors/vim/vim-8.2.3741.ebuild b/app-editors/vim/vim-8.2.3741.ebuild
index f24458bbda25..cf406ca4b069 100644
--- a/app-editors/vim/vim-8.2.3741.ebuild
+++ b/app-editors/vim/vim-8.2.3741.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/vscode/Manifest b/app-editors/vscode/Manifest
index f02efe89e5cb..86404f9acde3 100644
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@@ -8,10 +8,10 @@ DIST vscode-1.61.2-arm64.tar.gz 108043274 BLAKE2B f512c85102b3e3858a5ba8f2a63ec9
 DIST vscode-1.62.3-amd64.tar.gz 113702793 BLAKE2B 0d5b79c0379bfc39f8ab356d6ae760d2b3bb32c41b308e5f78d824a8198201f1ea1c61034e2207bd674d00b1d5b52e75dbab07d2d7053adb17e9b64a4a47fd0c SHA512 5d69e7fda01c381b3a068a73f5506aee78f299b2a9a48fce46100d5f6d1f4558c4c0abbe17c8507e85711409052fdf9d590b12c0534e6e5cfe002f766df69c50
 DIST vscode-1.62.3-arm.tar.gz 94730175 BLAKE2B 176d2f39b1b8bc945b7fb03e4db834846a35afafe024a774326b15a1e083c06d08e4a7ac8c38233299869f7c02eed16e89335012202acb888cb0034042ec12ca SHA512 130471b46794e1fd202fb83b891577e1f6bd29b72637e4efb5822e33a5578a848b236fc6c8a4652841e7b28f29cc9ffca718a3ddfda3d78cceef9b04087861a5
 DIST vscode-1.62.3-arm64.tar.gz 108316120 BLAKE2B def07c01b4371b6e3ea1c47a45eb5763922fee650b83c3c9d9527d1323c602494b0e200543cbf527dbddb040ff786d88df5fac3d678d200d2a8768c7c3e0d135 SHA512 f1c91bdcef8f249bd4c81ec36ed5e0222eb1e6848206e33c3c7533a9805d594c8d64515317646f78a4d4b7cd7d89f05d499c5c82789c9b8ac3fbdb4451519ecd
-DIST vscode-1.63.1-amd64.tar.gz 113723133 BLAKE2B 98d5e8376e1926dea3e289243685f881497926f8bc413d0fd312684fb6d0f692890bc8212a62086c9b0178c436e8cbc0179657387753b4f30490c88805525a80 SHA512 be18f648db935497c2ce8f43fa54aeb775fcaa4348e0d561071d380a7fd373c4ad5a05f53ba4b33a44facf90e37b256818388c6ec8dfb6142658aaacb98fc1c7
-DIST vscode-1.63.1-arm.tar.gz 94749732 BLAKE2B 65942830c0b66c25a104cbf3e758b7074a06e6995a59ed30fd3d944ac74f5ffd2cb1075fb17977aeb85196e292e646920912c804ae426916bd8a3431c5b6d788 SHA512 30a539f31c3e4d5598151533ad5e53e25c142a392a5ded51c5b386244a19b149eed03d28f772cdd4bce7366c25d3131f5c1db168589cdecf0e059ebd5c88493d
-DIST vscode-1.63.1-arm64.tar.gz 108342012 BLAKE2B b1c0bb6f3034f6fa1c662048e2ed55e2cd59b251c034133e80f0b7cb2e8418287f8fdac2f52f9e2cad469cc604128e82de44a3eb8a580372c0c31c8d48ed1471 SHA512 f0c71e17f2258919de1e7d9ec782df38fd5245276b0b5f2d79f71e6041d6f0939edee5efc04fcb120f9ca25165750a454b450cf083ae9ed296bc17a107564401
+DIST vscode-1.63.2-amd64.tar.gz 113730849 BLAKE2B 8be0b450356db61d072be9ee7c932b32b70493617f56ebc82948264f78a3a32363f6c183d26aa4f4d06b4475a6b95d69441a0fca64185fcfaa01d19c05b252bc SHA512 c7f2b80d2fd7a4b420d248d6b9e325f77b460dce3e1d1748b63c18dd6983243601d967f65ffc72c79c0d7615c9e228fcfffa86d456a4ee27d3d027dec644eceb
+DIST vscode-1.63.2-arm.tar.gz 94756805 BLAKE2B 75502ca42e3720f79fa8da3a33843655d8db6c9ef12403cd9be119e93e4ce07b8b70f9b7d5dfeea53eb3d7b3fecb3e1b4e282cfaad2e4830e3b1ea396a20b2dc SHA512 3fb9673a481642d5c2317bdaa7e45efb9d26152e52a4bedd26a7a17fcfbbe5c4f772d8a6680c2c39dafc6a15a1510910e846cc8f67ee0dff6d590fb7d58c77f7
+DIST vscode-1.63.2-arm64.tar.gz 108337529 BLAKE2B 8234fa92b1eac1b3a7c3297c50f730b73a2a4b0795868d91adc8898fff61e9f44780dbd94edf8c3ec6c9f3ec33b085e6855f6104ad9b927867d96412ec5bc038 SHA512 b474d54c75e62418e19f980e2a658ad82ffcba5927418f88123a7c12e6a19525c67260461764de56655fe1d964415b6de209628cdc264da41b2c2c9576815d03
 EBUILD vscode-1.61.2.ebuild 3037 BLAKE2B 5f538f6e379ee8092b77f0c9384b3dceac812c5cda15e43d52490bd5ce1a4251502d3f8690292e4d146d3fc6f14721bf14c404555ba9f655e6cb21c6a05394d2 SHA512 f5732bd74dfea9254c64ae1e6f1b991540302953b6e5bc6d72159d9341ad94645ed899bc6b54482cae49d12e82bf76475caa6196ffcdd8103bcdd375bf1c54ba
 EBUILD vscode-1.62.3.ebuild 3037 BLAKE2B 5f538f6e379ee8092b77f0c9384b3dceac812c5cda15e43d52490bd5ce1a4251502d3f8690292e4d146d3fc6f14721bf14c404555ba9f655e6cb21c6a05394d2 SHA512 f5732bd74dfea9254c64ae1e6f1b991540302953b6e5bc6d72159d9341ad94645ed899bc6b54482cae49d12e82bf76475caa6196ffcdd8103bcdd375bf1c54ba
-EBUILD vscode-1.63.1.ebuild 3037 BLAKE2B 20cbcbd66b851538ded81989f63dc4e4a233d68dd2ad9381aedd92a13d894ebe90748952bc37867b8a60ff44c6a77ff1b3075140c823c6c6f47377e27b654579 SHA512 29e31a6f95beb7974b0751b74a6b06932283742ac771bcd36efa8da4bbf49167b7b6dffacac5b82bf3e3687ab34f0f59272c05a4d9343da6aa1ff2751892cdd6
+EBUILD vscode-1.63.2.ebuild 3037 BLAKE2B 20cbcbd66b851538ded81989f63dc4e4a233d68dd2ad9381aedd92a13d894ebe90748952bc37867b8a60ff44c6a77ff1b3075140c823c6c6f47377e27b654579 SHA512 29e31a6f95beb7974b0751b74a6b06932283742ac771bcd36efa8da4bbf49167b7b6dffacac5b82bf3e3687ab34f0f59272c05a4d9343da6aa1ff2751892cdd6
 MISC metadata.xml 947 BLAKE2B d2c522407289299e1398799f6187e1c0d6621dfe29c1dd0e9d88281eafe44f4b4b3a0edad920268d220375f9330f0a62c015fb1e5085decf5ca5e485a92cc204 SHA512 6b27ac42f3d67203c46996388f6700c007a299557808505179cfa42deeb71098bf3a257f23c11835389fd7a59180f3536e420ed6cdb93b274d47e4c84a25f738
diff --git a/app-editors/vscode/vscode-1.63.1.ebuild b/app-editors/vscode/vscode-1.63.2.ebuild
index 45c99d4302b6..45c99d4302b6 100644
--- a/app-editors/vscode/vscode-1.63.1.ebuild
+++ b/app-editors/vscode/vscode-1.63.2.ebuild
diff --git a/app-editors/vscodium/Manifest b/app-editors/vscodium/Manifest
index 01b0b6cb5a29..f7e5a49c423c 100644
--- a/app-editors/vscodium/Manifest
+++ b/app-editors/vscodium/Manifest
@@ -8,10 +8,10 @@ DIST vscodium-1.61.2-arm64.tar.gz 112085871 BLAKE2B 47c58659d6e4e9a468b014c9d0a8
 DIST vscodium-1.62.3-amd64.tar.gz 114303440 BLAKE2B d2c1c1a3a1a2dfe211db339adae44fd81c20747812a204d8c4d805ebe7ab3267d2041dc50c40b5e548a5ae003d830e841549ae71c688c107e57689fd7f773519 SHA512 f672dd4296a1ed9f0505e93ee5735663effc0fb51746d3ff70e90894fc0806ab2eec13e191190a9bf2c19464aa420f6c9d8d664e685df145b18faebb8870d2b2
 DIST vscodium-1.62.3-arm.tar.gz 97823307 BLAKE2B bcbf8c696eb959962cd66e1d02222585e945b4eff2ed4fccf781bd0d3da23810dfe9e30f68be7baacd7f495c3ef8d1f43ee58aee7cb4f8817228c14b01423e7a SHA512 8d69e0046b0b9a1c268bdeeda051ef2ef5e09106eadeb96735cd7c09af069ef4652b06dab2b549817f539607f286a79a679ec46cd1cdd28e778cee3b85b7e89c
 DIST vscodium-1.62.3-arm64.tar.gz 112387259 BLAKE2B cc063392c4531269c0fbcbbda2896d23d2a781f8d56c9462885b1cbc5f81005bd22d94616853c29298105f46a517cb76520e2677d6599ca948c0018b32c1e2aa SHA512 e1a9183377a1e16ddbb7a14e70fa5b97b27a31fa52da6f142bf2e37af2a316d1e08d05270d7e77b672cda97bacdacf893264718e46f231eefeb367c16c8f5b3f
-DIST vscodium-1.63.1-amd64.tar.gz 114321651 BLAKE2B 8196a69fdc2fc1185f057a2bb373cc4ecdc41c267cc1bf19442c03b45a2ed1997a5836075655673f05a5962840babd2cae968556f2ca79f3dedba90b760f7dd5 SHA512 5bf87e6cbeeeffcc14c9935cd2c55830395d2edcce7541fdf4d0bbd1b167e95efd4679fcec65422bacbeb9f0548c76a4fe4130251cc0666fd1cd75740222f97e
-DIST vscodium-1.63.1-arm.tar.gz 97849537 BLAKE2B f011fb9eddbc6750dc971f8885c3c5501afd74793b11e0330c2efb7693bf9914a4da06fe595d7c87a69dbdbb91a38e32f7e48b6dd8a89e79300eaa0ff5121b98 SHA512 d0aa3a0e0b8e3a42d27b487d2d8cde85118527cf39a78733a8eda4caf0bc67a8ed97bc736add6ab38ae77c81335a21261f8db7fe89311b50bbe52bfe5a4db60d
-DIST vscodium-1.63.1-arm64.tar.gz 112411313 BLAKE2B ddb2fdfdb82b164287f51fd26c4feef9f69e363419bfc234f330a12c85bb82283d347452ad2336040be8c02c32419ce71d497f7f20b1e27a5a1a80a3b95a972f SHA512 32c1714536ecb9952f9441f73d08614d4b38431bcba50116d2c0dd3b952ec23df123f4de91808f03a03f2de932322da941b3e1f24ff896bbc48a44caa06dd89f
+DIST vscodium-1.63.2-amd64.tar.gz 114325091 BLAKE2B 2d05da02b67c52ec151611ef159f6c1f26f920c990e770630fbf59614f2f7982b3157855abc802b876ed49f513dc87ea387c39078c78375a59fdee0c276786be SHA512 13d309ac1427db6e924d667eb4f66c690f2bf26ae1dc307c22d76aceef5e1a997d57dd0f6458b40b7e0c88babe7bd3fe85b0efc2849aa672e8dc006cb09bc337
+DIST vscodium-1.63.2-arm.tar.gz 97849895 BLAKE2B eae617edfe6bddeb4b4795c668006ffa299dca2cb22d92d1611a51e599993ad0435dd975faa408e169bec4fe0fc87c19702850de6dee2bee9c5339211e2afa7a SHA512 8f24876638f6b784fe08e53682e076c3fdfeee73971ab2f9657de5827d8bff86bea83c48e5d5e571e1a08fd184bc8b4937e90b51eb9679799f5c76868d43704e
+DIST vscodium-1.63.2-arm64.tar.gz 112417892 BLAKE2B 08c44c7dfa75c11f548e1b29b621352a6054f8caed33d8456fcfe722b41283a4986167ff507055f284cb3202508754752412af005fcd8bd4fc405a7d124664f1 SHA512 cbf44d86ced1b48e1d5d17b8c77713e8c9a2bfc6cf8a4029b12ee382c42fc8ebd9cd2d79daf4042de23c96f47e08241c1b93e1f9eba0a0a962d8212c3b84ebe6
 EBUILD vscodium-1.61.2.ebuild 2900 BLAKE2B 21acec4fc5e5e888996c6eb17d296454d133142127de85e365bca9817c008b32a5390c704695ad2d886fa701f5671a87c14fe401ab63dfac151c05acd42cabf6 SHA512 9c24c1dd25e1505aa6a47ec6f0a28d9ac20f49b80c76399175fdecf9074ce5075da11f7f171dd38d3f87d82723d1fd525e07f9b027a2e7ad5221d0820610d09f
 EBUILD vscodium-1.62.3.ebuild 2900 BLAKE2B 21acec4fc5e5e888996c6eb17d296454d133142127de85e365bca9817c008b32a5390c704695ad2d886fa701f5671a87c14fe401ab63dfac151c05acd42cabf6 SHA512 9c24c1dd25e1505aa6a47ec6f0a28d9ac20f49b80c76399175fdecf9074ce5075da11f7f171dd38d3f87d82723d1fd525e07f9b027a2e7ad5221d0820610d09f
-EBUILD vscodium-1.63.1.ebuild 2900 BLAKE2B 2674e6374578edec493eca8c5d3547ad89d54e0c1f42d6dfbedcb33b4875a69fd4d8e7929e9091d1208432fb119927f154cc6f769bd086b968d729f3a04dbed2 SHA512 742fa5b2d8d48af98435e30249d2368f344c754c1c5fbabc0ed41a7307df223f67e60fa62058d81593534bc52594ecf29b5bbf4ecc45a5cb93833d5e94db38e5
+EBUILD vscodium-1.63.2.ebuild 2900 BLAKE2B 2674e6374578edec493eca8c5d3547ad89d54e0c1f42d6dfbedcb33b4875a69fd4d8e7929e9091d1208432fb119927f154cc6f769bd086b968d729f3a04dbed2 SHA512 742fa5b2d8d48af98435e30249d2368f344c754c1c5fbabc0ed41a7307df223f67e60fa62058d81593534bc52594ecf29b5bbf4ecc45a5cb93833d5e94db38e5
 MISC metadata.xml 1191 BLAKE2B ac8f365247fc710ade8a690da2a409352c20a886ad96b529ab0fc3f200dda28c2c7ca62fa78a922689373fa483e0a789836b887c8fccf2729ca6aa4c0e06aefe SHA512 e5b56663a757cdfff13ddc25c5d4f118f22d194fb051ae0bbe3264a4721c196a8820db1bfbd5a992827d8c97a81edfc30a97ca9610961ee46684a253d186449c
diff --git a/app-editors/vscodium/vscodium-1.63.1.ebuild b/app-editors/vscodium/vscodium-1.63.2.ebuild
index b604e95ff9b6..b604e95ff9b6 100644
--- a/app-editors/vscodium/vscodium-1.63.1.ebuild
+++ b/app-editors/vscodium/vscodium-1.63.2.ebuild