gentoo resync : 31.05.2021

47 files changed, 356 insertions, 555 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 92acf7afdbfd..200923fc6e52 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 8d9942e1a384..c10f70ff4f3b 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -9,13 +9,13 @@ DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.1.tar.xz 43752012 BLAKE2B 433fbf234c711954269e7e10348abbd4a2bc4c357a59164c625a5ccee2de85a149636c70ad3fad3c09dbbd24900badfd2c0c645017bb33ab3e25d3decff72057 SHA512 dfb26531d2c19cf9fb56505f03d799654b45e5f9528e777900e8280ed2c1d21e04c52f510528e31e015977c471ae63164cedee6174b7439ebcf479a21fc18064
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156 SHA512 0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9
-EBUILD emacs-18.59-r13.ebuild 4370 BLAKE2B eda9ea6895a647fb6576737cd1f45f528ac1fbc09aa45ad8c90d9b77130aac4f56f209808cf405c3a696afbf22fa919e5cb4ab0420925fdf971e0038fd868502 SHA512 c00ea63528ffe15ee6a40dc559d9736eed3aaaaa2a23237158a4a41386369e28dc7303d39146d82e640b8d601376d842de475fe892ce9e1eb453215bee66f796
-EBUILD emacs-23.4-r20.ebuild 11072 BLAKE2B 560f125213e52175a0dff8437cad8278436e3d36a534b72dfb6031423f0403b1ec3f803a5ea68f96f0d9a7c0cd56fbcdd01afb30e29e8092751b3c7d1888a00d SHA512 c5420af73f2aa01ec6c914a965a1d15169caad80cd949768109b85e0fb925135653eced075990413f03c139f0ead04162e3ed91681b1a17834ec95a7d9630dcd
-EBUILD emacs-24.5-r10.ebuild 10823 BLAKE2B a21968356333216b290d4ad3fc356261a0a924038c9c243a02c1ff286b252f2409344a9b377aa5b1ddad24c373bb81c71392da898f5dbd3e07c1e0749bcf707c SHA512 bc787ceccdb0386b8b233d12ef18be3d14d68e74dd33a07c1e6f41c89dca48ef5c5d0c1c082c28fde172ddf65c439e77da61f30fae6074086641a64a6ebe5a9d
-EBUILD emacs-25.3-r9.ebuild 11134 BLAKE2B 04c984fe3403dcc86a4aad93632f12a9f596dbd44b621c59f79073f90c4ca0740a036280ca3d7f4da15d813ac465915e55d3dfb8619f1fb4cca31d3d07f53b56 SHA512 03842263b26c437355e7ff0582b69daf39ff7ea4d9d56d2f66e255b6a1d6cdf6abf7fa2cca31229cffb1afa3fe3624db96925452ee500d97a72573d8ad270698
-EBUILD emacs-26.3-r4.ebuild 11815 BLAKE2B d47062336ca215fec5657dea95739751405f66b32f864ea2c72db58b81f01392d8f903c32701ac2ac308f77e854cb9d959fe558ad20387c66ddfb22334aa113d SHA512 eb768c3ded1a9a1303666e49868321b7341e152d109a068eea1b465dc344fcd87a2fbeb2e3c2fc244f7a2c9dec74650bb3e272ca1fb43fd1e5a229c5f4c443bc
-EBUILD emacs-27.1-r4.ebuild 14346 BLAKE2B 455210831d874ae10846d7872bafb5606275fb42c42074990f2b904c197b5e2948e98a5659537070b43df7935e357d226f89e75d4ed7bf2f01aab17f1282ec9e SHA512 b8389386ec5b510c044a138a256d44d6b4dc2de79aa490a86ee86039c6fb2b7d811e8d417e7f0b77d89693221721961555b27bb208ca00ce03d800c1c2e7455c
-EBUILD emacs-27.2.9999.ebuild 14310 BLAKE2B 80f0e564e88e59debc29f728776d22ca86f4b26733c6806c918f653da3b114794a7cebdc8d136fc00dfc50d94ebb0c4ad4763af874d52c3ba2322ff531a3b70a SHA512 d3f4b7be206b7dc430f536c9e59681be77adcd70885ce7c914eb96a65209ab6dcf7e338206c1f75c7ac6fc45f74aacf2eac502912b22e0b2592c76ff8d6e897f
-EBUILD emacs-27.2.ebuild 14311 BLAKE2B bb7104a2b5ecf0ed7a19d18d107607bf426f2d065b9895c45a2e20ea55243eb4e8fbfe06ce12848c4ba57a05bb8a30f37d8c7f6ed274980f447a6eb8c0d804c3 SHA512 3a0e3b915b413cd0c4b83bfb6d7a73e3dfebfbf87eae343607d956abaf42658947fe41263fc29ba13471ff60f160dfdace0ac75b5d218957365c501a29275d46
-EBUILD emacs-28.0.9999.ebuild 14196 BLAKE2B a45dd87886e1df006c1cc3e4301f03f3df30debe414fbe5c47fde4ecadb59ec5e4720e8eafee2053527dfca015dd73c526540f12cf666300c44644b2905058c4 SHA512 05ffce7d2b738d300ff9b393e52115b8327f7616bd946e87ed9d132b7fdfa965f8d231df5819a2f11eca6b46b1dea0ea09df6429eff872966568242fa39a30ef
+EBUILD emacs-18.59-r13.ebuild 4380 BLAKE2B 455969fb936c99bd04f5f5e85116e86edeb38b7bf29ba4765c6ef2333c756b612d57c57914b1571f9cf3222bb4d751e551c8e48d3ce2735799d0bcd30d8d9e4e SHA512 8f0c2e4ec5d73099619f78c734e6a048b9404b94a090ecb4babe7933caf55b92f632da7aa0f2b6ebf2862ce7a2d017b4cfd360be8c9b05617bc01ea2cdbcd2bc
+EBUILD emacs-23.4-r20.ebuild 11080 BLAKE2B 6306ed041c826846f116f40bb2b98f3be3d8f1ddfc1506083125ee2214ea8ceb3d5ed9d036c247f45ddd6e7326e6f9c5de93752890a05f272f67708d25291509 SHA512 679adade4cfe01cc2bf9936ed2bc657344019618109b74048575c53d135482afe4bcef637f85779a8bf92c152000e1e9432576704319f394c2281fcd83ad3d53
+EBUILD emacs-24.5-r10.ebuild 10831 BLAKE2B 87325c00c3115e3b3c8c0c6722538382a5bb0913e66bf17dfd4aa90447859c475e4189d6ef9f9dd5281c08200d3c6a0017a5df5d0b9f2046cd5b1a807ef5d975 SHA512 5480f9ec1d7c96cceabb2be9842561a24fb687adad5846a317c5c63a653707c6f6ea704853257aeb893ad0c91280199abbb6b821cfd2a073c2ca92cdd948d294
+EBUILD emacs-25.3-r9.ebuild 11142 BLAKE2B 2eb2fe9e84133d53d874e66b05fe8f98c5460fb47fca1f9aaae8a869742e1ce711cf0817fdfa03d9820b44ecbb2bf055cd23743acefeee6466a5c805fa01b53f SHA512 579a75ccbc660faf0ecfe2d28e339e50e1d24412ecb36b47c5d6196b66d615feecdf12557dd9973d8a79124681ca982ee248e17dce39836cd33bc15b6da520cd
+EBUILD emacs-26.3-r4.ebuild 11785 BLAKE2B 807bbd1eda823268087003da546d68b5837c4984736e85db519e8ab02924b366a34e8df9d08dcfc0da8b7996c2d4a82a0abe305ceab26eb3783c895e6894c8c7 SHA512 2fb3a6622224509586aaea43dfde63d07e1d568baaa4d808e4285b5466f369fd34a21c56519b0a15e131cfd48f6cd046010eb62cdc6c3ac8e238f3ba4c1a22c5
+EBUILD emacs-27.1-r4.ebuild 14334 BLAKE2B c524e15aa87eebb1eacb52368fc11b17c429a10c83509e883cea3fada349d7a63e7947b1f3c050641ed65fabfbad2ebe965ec19f96b062ddc62162d344bc044a SHA512 7238304e452cf3bae3930c25726fb92a8b76c35155c35793a69aae08b23b7066b34cbb1ae18bd385388ec07170da14008cd89397bd9483a9033f4feaf1632baa
+EBUILD emacs-27.2.9999.ebuild 14298 BLAKE2B 5649b3f948225639e73f6b4570f6facf9e81f57476354604c78a178be8f146d0e9325d98f3eb52689d2e02ba522ffe690e33e9c610b6e99584704a2f140b805e SHA512 e22fe0e2da09c9823bcedb148060a56d5b481826fe98f09a6112b3b27d65778e0db12a748e7ec42805345729a0ed0bc0ea46a7878e12588cf4cf999d69f6746b
+EBUILD emacs-27.2.ebuild 14298 BLAKE2B 1cada5fb6ffebce53611b2e8c6a9c45157effeecca3656922730f5c4cae651678e21b2f5bb61ac5c6784f7d9c98035ef31bcba557c6522246c5ca2e13613f879 SHA512 562d087a9c44fa65250ff8e660217965ac2f2ca12c8bb0ebc124c8991bde0e9208551b3477adbce5158d47a56986b15825c9a0fa1204df6047a6134b09b74cae
+EBUILD emacs-28.0.9999.ebuild 14185 BLAKE2B 76d5f0f59a0cc1fd4399e7aad1544d26d5abc0473ee01e7541a633fa743b2be880c8a81212fc37845bad64292851fdda8ec67833760316d8d2c7980d0c7fd37e SHA512 8e3b7413a3d8224a3b8642546f2d47afd5bf3c0404caa60deb97c20d6c4178fec990785b51df5a1f6ba0d5d156161195cd818ba3df7fc8e92fa8802d32ca129d
 MISC metadata.xml 3129 BLAKE2B d0bfee8c1d5de0496d4b7bb5fff30f8b5c19911ccdf40d8bf34c990c57a61f6a6b68528e2a393174b190c59ffa1ff657c0d5dd6b9ff1d15e59641ae2b7da749c SHA512 1e37638584eefe022ffb08951adce160d6342aa90e92cfb0481689b662ff6a04a9327bb8c03fbc302315a17c4918d082ee076caadea34a2c461957f079da2279
diff --git a/app-editors/emacs/emacs-18.59-r13.ebuild b/app-editors/emacs/emacs-18.59-r13.ebuild
index 8b1d8fc4bd28..105fc78984d1 100644
--- a/app-editors/emacs/emacs-18.59-r13.ebuild
+++ b/app-editors/emacs/emacs-18.59-r13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,7 +34,7 @@ BDEPEND="app-eselect/eselect-emacs
 RDEPEND="${RDEPEND}
 	app-eselect/eselect-emacs"
 
-PATCHES="../patch"
+PATCHES=("${WORKDIR}/patch")
 
 src_prepare() {
 	default
diff --git a/app-editors/emacs/emacs-23.4-r20.ebuild b/app-editors/emacs/emacs-23.4-r20.ebuild
index f46ce1b68c8a..834facf26043 100644
--- a/app-editors/emacs/emacs-23.4-r20.ebuild
+++ b/app-editors/emacs/emacs-23.4-r20.ebuild
@@ -90,10 +90,10 @@ SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 # operations later on
 FULL_VERSION="${PV%%_*}"
 S="${WORKDIR}/emacs-${FULL_VERSION}"
+PATCHES=("${WORKDIR}/patch")
 
 src_prepare() {
-	eapply ../patch
-	eapply_user
+	default
 
 	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
 		|| die "unable to sed ctags.1"
diff --git a/app-editors/emacs/emacs-24.5-r10.ebuild b/app-editors/emacs/emacs-24.5-r10.ebuild
index c9d98111c2be..5720b4449dcb 100644
--- a/app-editors/emacs/emacs-24.5-r10.ebuild
+++ b/app-editors/emacs/emacs-24.5-r10.ebuild
@@ -97,10 +97,10 @@ SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 # operations later on
 FULL_VERSION="${PV%%_*}"
 S="${WORKDIR}/emacs-${FULL_VERSION}"
+PATCHES=("${WORKDIR}/patch")
 
 src_prepare() {
-	eapply ../patch
-	eapply_user
+	default
 
 	# Fix filename reference in redirected man page
 	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
diff --git a/app-editors/emacs/emacs-25.3-r9.ebuild b/app-editors/emacs/emacs-25.3-r9.ebuild
index b7a2c457507d..0995daeae65c 100644
--- a/app-editors/emacs/emacs-25.3-r9.ebuild
+++ b/app-editors/emacs/emacs-25.3-r9.ebuild
@@ -100,10 +100,10 @@ SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 # operations later on
 FULL_VERSION="${PV%%_*}"
 S="${WORKDIR}/emacs-${FULL_VERSION}"
+PATCHES=("${WORKDIR}/patch")
 
 src_prepare() {
-	eapply ../patch
-	eapply_user
+	default
 
 	# Fix filename reference in redirected man page
 	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
diff --git a/app-editors/emacs/emacs-26.3-r4.ebuild b/app-editors/emacs/emacs-26.3-r4.ebuild
index 4dc17e9bd912..17aae4994de7 100644
--- a/app-editors/emacs/emacs-26.3-r4.ebuild
+++ b/app-editors/emacs/emacs-26.3-r4.ebuild
@@ -110,8 +110,7 @@ FULL_VERSION="${PV%%_*}"
 S="${WORKDIR}/emacs-${FULL_VERSION}"
 
 src_prepare() {
-	#eapply ../patch
-	eapply_user
+	default
 
 	# Fix filename reference in redirected man page
 	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
@@ -263,7 +262,7 @@ src_install() {
 
 	# avoid collision between slots, see bug #169033 e.g.
 	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-	rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die
+	rm -rf "${ED}"/usr/share/{applications,icons} || die
 	rm -rf "${ED}/usr/$(get_libdir)" || die
 	rm -rf "${ED}"/var || die
 
diff --git a/app-editors/emacs/emacs-27.1-r4.ebuild b/app-editors/emacs/emacs-27.1-r4.ebuild
index a296afd19d0b..e465593dcfc0 100644
--- a/app-editors/emacs/emacs-27.1-r4.ebuild
+++ b/app-editors/emacs/emacs-27.1-r4.ebuild
@@ -150,7 +150,7 @@ src_prepare() {
 			|| die "Upstream version number changed to ${FULL_VERSION}"
 	fi
 
-	eapply_user
+	default
 
 	# Fix filename reference in redirected man page
 	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
@@ -326,7 +326,7 @@ src_install() {
 
 	# avoid collision between slots, see bug #169033 e.g.
 	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-	rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die
+	rm -rf "${ED}"/usr/share/{applications,icons} || die
 	rm -rf "${ED}/usr/$(get_libdir)" || die
 	rm -rf "${ED}"/var || die
 
diff --git a/app-editors/emacs/emacs-27.2.9999.ebuild b/app-editors/emacs/emacs-27.2.9999.ebuild
index d565c8aad9a9..7089e4a9a735 100644
--- a/app-editors/emacs/emacs-27.2.9999.ebuild
+++ b/app-editors/emacs/emacs-27.2.9999.ebuild
@@ -149,7 +149,7 @@ src_prepare() {
 			|| die "Upstream version number changed to ${FULL_VERSION}"
 	fi
 
-	eapply_user
+	default
 
 	# Fix filename reference in redirected man page
 	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
@@ -325,7 +325,7 @@ src_install() {
 
 	# avoid collision between slots, see bug #169033 e.g.
 	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-	rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die
+	rm -rf "${ED}"/usr/share/{applications,icons} || die
 	rm -rf "${ED}/usr/$(get_libdir)" || die
 	rm -rf "${ED}"/var || die
 
diff --git a/app-editors/emacs/emacs-27.2.ebuild b/app-editors/emacs/emacs-27.2.ebuild
index 45899a7477ff..b170f83ea59e 100644
--- a/app-editors/emacs/emacs-27.2.ebuild
+++ b/app-editors/emacs/emacs-27.2.ebuild
@@ -33,7 +33,7 @@ else
 	fi
 	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 ~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"
@@ -149,7 +149,7 @@ src_prepare() {
 			|| die "Upstream version number changed to ${FULL_VERSION}"
 	fi
 
-	eapply_user
+	default
 
 	# Fix filename reference in redirected man page
 	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
@@ -325,7 +325,7 @@ src_install() {
 
 	# avoid collision between slots, see bug #169033 e.g.
 	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-	rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die
+	rm -rf "${ED}"/usr/share/{applications,icons} || die
 	rm -rf "${ED}/usr/$(get_libdir)" || die
 	rm -rf "${ED}"/var || die
 
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild
index e37d8033beab..aeefea10ed81 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@@ -145,7 +145,7 @@ src_prepare() {
 	# for live ebuilds FULL_VERSION doesn't exist in global scope
 	use jit && QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
 
-	eapply_user
+	default
 
 	# Fix filename reference in redirected man page
 	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
@@ -300,7 +300,7 @@ src_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
+	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.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
@@ -315,7 +315,7 @@ src_install() {
 
 	# avoid collision between slots, see bug #169033 e.g.
 	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-	rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die
+	rm -rf "${ED}"/usr/share/{applications,icons} || die
 	rm -rf "${ED}/usr/$(get_libdir)/systemd" || die
 	rm -rf "${ED}"/var || die
 
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index 015a4f60b708..08670fe3744c 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,7 +1,3 @@
-DIST gedit-plugins-3.38.1.tar.xz 957616 BLAKE2B 9cf5fe5343b513bd841add5d4e85f8fe2e8f62524af7c124bdfc41b81e653a41d1a7417f8cc06f764cca730927f471598cae914a1581c5cd3712b89c464a075d SHA512 d5cc3e82ac6a488f5ab06eaf4eb5ad32bdbe50b74f2f215e114b5cb3bb0a089da00caa3815d6638a679c1c902983a0754a16ef88e15ff88d8321a247288ad237
-DIST gedit-plugins-40.0.tar.xz 950560 BLAKE2B 783803dd4913a2b384a714c7564f18686b6ecf7da2f10d421322b6421e9b10271f97dcbf819e3212c97a0e4ba2b54dcb12ba5efc392396caafe705844e2cd407 SHA512 660e82dc1a1187262afd921196074dd2808a400b5acbc88ab36f522c50f1b9d221ff1821c2e8c0c066c7556862779e8d277f52a758070c59b17e6b53791ff39d
 DIST gedit-plugins-40.1.tar.xz 951024 BLAKE2B 8a5fa07d6b9a5848e66de995c05f389b288e7863fa506476fd82157dc203e472b8ac8b8bdd15b09513e5d819fc58ce4d1077e62e6c5b90f93b14775052bf2737 SHA512 71649d157ac5591e4dd317c44ae167c98fb59e253c45f8c1ff8ef397a9e3f0bb968f0ef2486f9021354269e77defb9e5e305f1538f69818480a250966143c7a3
-EBUILD gedit-plugins-3.38.1.ebuild 2720 BLAKE2B f90c19d1c5ab039c3ec9797a643db60bc449dbe61710fa32c98bcf3961742adea05d21f1c824da5ffd27133f71b3c9e1f8e2949d068f4ce2f5aece114d8662db SHA512 432e71c98caf77e46e87080685f96e580a410ab9016922539e762a0ce18142dcc2cb5e532d7ed57042eece3d095cf1b3801cf0f5f2b6d7f05bf5a05b4e37d5f3
-EBUILD gedit-plugins-40.0.ebuild 2715 BLAKE2B a155f67ecead8da85a437a06b49a411bf41052ee5af4d2457b23cdd14459502b0caa8162d13e3f48929d51915824f989ca14bc426965d97a0f82013ffa1ee4de SHA512 91eabb78e3860d8d4ae91ce92428bbc692e5f4be3befb689b4300bbcf83cf430223edcff3a3166925e2b34fc059a86aa06b873e74a6dc0ae1af29e44220e120b
-EBUILD gedit-plugins-40.1.ebuild 2715 BLAKE2B a155f67ecead8da85a437a06b49a411bf41052ee5af4d2457b23cdd14459502b0caa8162d13e3f48929d51915824f989ca14bc426965d97a0f82013ffa1ee4de SHA512 91eabb78e3860d8d4ae91ce92428bbc692e5f4be3befb689b4300bbcf83cf430223edcff3a3166925e2b34fc059a86aa06b873e74a6dc0ae1af29e44220e120b
+EBUILD gedit-plugins-40.1.ebuild 2713 BLAKE2B 4f49a0f7cab96c1a74b932270dd944622d729d0960796711fcb3ee63e02535eb1ed942b86e549034a08248b3fe5718a5125768e1db664e6ab34babe9a08375b2 SHA512 b1397ebf9a587d12985bc980055462f66f0dd852a07de0c97589ca0f9e3b93023440433d647d08d778cb6912295984f112b317c99b51fc3d56445c744d398041
 MISC metadata.xml 480 BLAKE2B 5584c44a255c0d13a2b93342a860388799ab1f86565bb8325a5a37e839ef01c2030b2d45ef491fc420bbbe5c113b6d9ad169352138ea09067d93e23d0bf200bf SHA512 9162def76b0460099da66501b6c0dcad1daf1f5e9e85d5cb19c6076aaafd946dc6d4d92965c66ccbbb19b13b48e9e957f65b7f33abd15e28678b7d8da258fac3
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.38.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.38.1.ebuild
deleted file mode 100644
index 710d8c041c40..000000000000
--- a/app-editors/gedit-plugins/gedit-plugins-3.38.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="xml"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
-
-DESCRIPTION="Collection of extra plugins for the gedit Text Editor"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-SLOT="0"
-
-IUSE="charmap git +python terminal vala"
-REQUIRED_USE="
-	charmap? ( python )
-	git? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	terminal? ( python )
-"
-
-RDEPEND="
-	>=dev-libs/libpeas-1.14.1[gtk]
-	>=app-editors/gedit-3.38
-
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-3.9:3
-	>=x11-libs/gtksourceview-4.0.2:4
-
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=app-editors/gedit-3.36[python,${PYTHON_SINGLE_USEDEP}]
-			dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
-			>=dev-python/dbus-python-0.82[${PYTHON_MULTI_USEDEP}]
-			dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
-		')
-		>=x11-libs/gtk+-3.9:3[introspection]
-		>=x11-libs/gtksourceview-4.0.2:4[introspection]
-		x11-libs/pango[introspection]
-		x11-libs/gdk-pixbuf:2[introspection]
-	)
-	charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] )
-	git? ( >=dev-libs/libgit2-glib-0.0.6[python] )
-	terminal? ( >=x11-libs/vte-0.52:2.91[introspection] )
-" # vte-0.52+ for feed_child API compatibility
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dplugin_bookmarks=true
-		$(meson_use python plugin_bracketcompletion)
-		$(meson_use charmap plugin_charmap)
-		$(meson_use python plugin_codecomment)
-		$(meson_use python plugin_colorpicker)
-		$(meson_use python plugin_colorschemer)
-		$(meson_use python plugin_commander)
-		-Dplugin_drawspaces=true
-		$(meson_use vala plugin_findinfiles)
-		$(meson_use git plugin_git)
-		$(meson_use python plugin_joinlines)
-		$(meson_use python plugin_multiedit)
-		$(meson_use python plugin_sessionsaver)
-		$(meson_use python plugin_smartspaces)
-		$(meson_use python plugin_synctex)
-		$(meson_use terminal plugin_terminal)
-		$(meson_use python plugin_textsize)
-		$(meson_use python plugin_translate)
-		-Dplugin_wordcompletion=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	use python && python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-editors/gedit-plugins/gedit-plugins-40.0.ebuild b/app-editors/gedit-plugins/gedit-plugins-40.0.ebuild
deleted file mode 100644
index 615262ea716c..000000000000
--- a/app-editors/gedit-plugins/gedit-plugins-40.0.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="xml"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
-
-DESCRIPTION="Collection of extra plugins for the gedit Text Editor"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-IUSE="charmap git +python terminal vala"
-REQUIRED_USE="
-	charmap? ( python )
-	git? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	terminal? ( python )
-"
-
-RDEPEND="
-	>=dev-libs/libpeas-1.14.1[gtk]
-	>=app-editors/gedit-40.0
-
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-3.9:3
-	>=x11-libs/gtksourceview-4.0.2:4
-
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			app-editors/gedit[python,${PYTHON_SINGLE_USEDEP}]
-			dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
-			>=dev-python/dbus-python-0.82[${PYTHON_MULTI_USEDEP}]
-			dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
-		')
-		>=x11-libs/gtk+-3.9:3[introspection]
-		>=x11-libs/gtksourceview-4.0.2:4[introspection]
-		x11-libs/pango[introspection]
-		x11-libs/gdk-pixbuf:2[introspection]
-	)
-	charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] )
-	git? ( >=dev-libs/libgit2-glib-0.0.6[python] )
-	terminal? ( >=x11-libs/vte-0.52:2.91[introspection] )
-" # vte-0.52+ for feed_child API compatibility
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dplugin_bookmarks=true
-		$(meson_use python plugin_bracketcompletion)
-		$(meson_use charmap plugin_charmap)
-		$(meson_use python plugin_codecomment)
-		$(meson_use python plugin_colorpicker)
-		$(meson_use python plugin_colorschemer)
-		$(meson_use python plugin_commander)
-		-Dplugin_drawspaces=true
-		$(meson_use vala plugin_findinfiles)
-		$(meson_use git plugin_git)
-		$(meson_use python plugin_joinlines)
-		$(meson_use python plugin_multiedit)
-		$(meson_use python plugin_sessionsaver)
-		$(meson_use python plugin_smartspaces)
-		$(meson_use python plugin_synctex)
-		$(meson_use terminal plugin_terminal)
-		$(meson_use python plugin_textsize)
-		$(meson_use python plugin_translate)
-		-Dplugin_wordcompletion=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	use python && python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-editors/gedit-plugins/gedit-plugins-40.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-40.1.ebuild
index 615262ea716c..a9af27aa40eb 100644
--- a/app-editors/gedit-plugins/gedit-plugins-40.1.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-40.1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Collection of extra plugins for the gedit Text Editor"
 HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 
 IUSE="charmap git +python terminal vala"
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 16640e3dde94..dc7194a64ef3 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,10 +1,6 @@
 AUX 3.38-make-gspell-optional.patch 1896 BLAKE2B 51c05e9a45aeb7586ba37cc0a3c01baebedf4cf1bbd7971b89e4b14c55941fdeb824405f6ab6c9035b9b9d6fcac7ab8cf80270bd7d52f880b3f628140f74b0e4 SHA512 857955914028623ccb3f41b91e3a1d895901e7810764085fdd7daa40f455582dbf999cffede29519ba8097f09bbb02999a969bbff406d2822fcb4fd2feb82275
 AUX 3.38-make-python-optional.patch 2255 BLAKE2B 25b50cfab045ab54c3d9e0ba5043ec6b839cffc31df3ebfd43dd438880c45d2d6eac0bea583209960d946591d3348070ec99e0b0056a5807a47eb84ddfec6363 SHA512 ad39c6f6ce36b19760bf726aedca158866158a4f2bb2479f752eab0eb2af7e4e425797bb20e301dbfdd58ac83bd824335499f99a6b4091c0835091848cc5de50
 AUX restore-overlay-scrollbars.patch 968 BLAKE2B b73f3fe61ba10c377b491fd00ccac333b772c415c49bbca472d60a87852473e4c73d5de327d83dc1756f188458564f5529555c69843b79274db83209faa4611e SHA512 37a6e3be8e62ede716ac3666f4ad5f2f12e2a49c5d4d15db91b2b3aaa27217b04e50bc80ed128da1b9f64d56a240c0d916d5b8335f1fec4db296f038951cca1e
-DIST gedit-3.38.1.tar.xz 6861368 BLAKE2B 3b202dbb7df8e91b58bd345fcaa309546af07bce60dc4638a3c344996d6c04ef7fe8a4824360c0f55970b759f9d7e2929c207992a9c80ad686d39e94ff741b7a SHA512 cd52cbcece3b007692294ab01b95fae7deb744b08a44da2d3cafa82a86d94c104abcdd4dcbe10630e0d633c8cc3c75f5e5dc6c8452a8c4bc2e6bb3c0de7d5547
-DIST gedit-40.0.tar.xz 6852672 BLAKE2B 80af344cb6e848338f0c5921ff15e1d3e8566967756fbb832767c5d39914915f1c746c78c45e22d534dd8fc02c7e214e793b5a315ce2357e2afb3ca97312e45e SHA512 b1f6fc4f4894c3ada8e85b81df2fca6870acf725074b56b2c85b1c8f04e004f193e8fad3ac0c641bd0df6a704604ec054e130c60f0480c1abf62a91cb181429e
 DIST gedit-40.1.tar.xz 6850264 BLAKE2B 2baabac1254d56bf4c6a663012f88505c8f3cfcdd8fd8e020e05d807f727f71cf9088c398702f559e40ba7db31d3a9d135c1148f8a8b178c9107aa2675265910 SHA512 ac4cd2864af63625dbdb5c55fcc5e7ea403d84d7cc25d9f1c121f544ef1cf686ab9b7c0d50ef73b4bf24e573cdf528622a49d82f675b0c1673c46f691b79ac09
-EBUILD gedit-3.38.1.ebuild 2270 BLAKE2B 69d117a04236aa8643c992c683412290991609ebf9131035fdbb2c2c84a8e4157d868e47243794cebe91513051638fe04b76c741de8acbfbfe9196c7ce379a8e SHA512 5fa553b145169481336968982b42cc3b51ca703aef3de7e833ff8f31d9255ed049d8975ba888a4b3ee21fd72114d3309a230436b89206fb32a270b06c0c18d18
-EBUILD gedit-40.0.ebuild 2272 BLAKE2B 5f3998439f2d0badfc1a65a65e3162869e17ddd17046fe43100931cf6eb4ba06139c44693f607c3569033c256d80bfccb46efce3cbb7fbe28351df112a578401 SHA512 f4acbc22dbf93d5b9f27acbc4365861805fae54339029b7b05a6917191526671e501a2ff9512db384156b15d614aba5ec69693a46a59b3976783e5b64a8f024c
-EBUILD gedit-40.1.ebuild 2272 BLAKE2B 5f3998439f2d0badfc1a65a65e3162869e17ddd17046fe43100931cf6eb4ba06139c44693f607c3569033c256d80bfccb46efce3cbb7fbe28351df112a578401 SHA512 f4acbc22dbf93d5b9f27acbc4365861805fae54339029b7b05a6917191526671e501a2ff9512db384156b15d614aba5ec69693a46a59b3976783e5b64a8f024c
+EBUILD gedit-40.1.ebuild 2270 BLAKE2B bf7a66b16e75dd44165ddd9c11be3621f7f8533d005ff73c5027267b56a4bb52c664d13e11f7b594bc1c59be045016019307dd78f59b7bbaee9e10d830d30a2e SHA512 dcd72286738424b24da6721a55f875131f343674ae2c306460352da986521079d9ef3e8245c4a8cb22e365b0ecf2d6ad841aa61f41e4ff037a8390747e56b5c9
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-editors/gedit/gedit-3.38.1.ebuild b/app-editors/gedit/gedit-3.38.1.ebuild
deleted file mode 100644
index 570c7cf25780..000000000000
--- a/app-editors/gedit/gedit-3.38.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-VALA_MIN_API_VERSION="0.26"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
-
-DESCRIPTION="A text editor for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="+python gtk-doc spell"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-DEPEND="
-	>=dev-libs/glib-2.64:2
-	>=dev-libs/libpeas-1.14.1[gtk]
-	>=dev-libs/gobject-introspection-1.54:=
-	>=x11-libs/gtk+-3.22.0:3[introspection]
-	>=x11-libs/gtksourceview-4.0.2:4[introspection]
-	gui-libs/tepl:5
-
-	spell? ( >=app-text/gspell-0.2.5:0= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pycairo[${PYTHON_USEDEP}]
-			>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
-			dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	x11-themes/adwaita-icon-theme
-	gnome-base/gsettings-desktop-schemas
-	gnome-base/gvfs
-"
-BDEPEND="
-	$(vala_depend)
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1 )
-	dev-util/itstool
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
-"
-PATCHES=(
-	# Don't force off overlay scrollbars for dubious reasons that GNOME designers heavily
-	# disagree with; those wanting them off in general would set that globally for gtk
-	"${FILESDIR}"/restore-overlay-scrollbars.patch
-	# Make gspell and python optional
-	"${FILESDIR}"/3.38-make-gspell-optional.patch
-	"${FILESDIR}"/3.38-make-python-optional.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use python)
-		$(meson_use gtk-doc gtk_doc)
-		-Duser_documentation=true
-		$(meson_feature spell)
-	)
-	meson_src_configure
-}
-
-# Only appdata and desktop file validation in v3.32.2
-src_test() { :; }
-
-src_install() {
-	meson_src_install
-	if use python; then
-		python_optimize
-		python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-editors/gedit/gedit-40.0.ebuild b/app-editors/gedit/gedit-40.0.ebuild
deleted file mode 100644
index 8a7d0429c49e..000000000000
--- a/app-editors/gedit/gedit-40.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-VALA_MIN_API_VERSION="0.26"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
-
-DESCRIPTION="A text editor for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="+python gtk-doc spell"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="
-	>=dev-libs/glib-2.64:2
-	>=dev-libs/libpeas-1.14.1[gtk]
-	>=dev-libs/gobject-introspection-1.54:=
-	>=x11-libs/gtk+-3.22.0:3[introspection]
-	>=x11-libs/gtksourceview-4.0.2:4[introspection]
-	gui-libs/tepl:6
-
-	spell? ( >=app-text/gspell-0.2.5:0= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pycairo[${PYTHON_USEDEP}]
-			>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
-			dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	x11-themes/adwaita-icon-theme
-	gnome-base/gsettings-desktop-schemas
-	gnome-base/gvfs
-"
-BDEPEND="
-	$(vala_depend)
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1 )
-	dev-util/itstool
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
-"
-PATCHES=(
-	# Don't force off overlay scrollbars for dubious reasons that GNOME designers heavily
-	# disagree with; those wanting them off in general would set that globally for gtk
-	"${FILESDIR}"/restore-overlay-scrollbars.patch
-	# Make gspell and python optional
-	"${FILESDIR}"/3.38-make-gspell-optional.patch
-	"${FILESDIR}"/3.38-make-python-optional.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use python)
-		$(meson_use gtk-doc gtk_doc)
-		-Duser_documentation=true
-		$(meson_feature spell)
-	)
-	meson_src_configure
-}
-
-# Only appdata and desktop file validation in v3.32.2
-src_test() { :; }
-
-src_install() {
-	meson_src_install
-	if use python; then
-		python_optimize
-		python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-editors/gedit/gedit-40.1.ebuild b/app-editors/gedit/gedit-40.1.ebuild
index 8a7d0429c49e..415abe4e1829 100644
--- a/app-editors/gedit/gedit-40.1.ebuild
+++ b/app-editors/gedit/gedit-40.1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 IUSE="+python gtk-doc spell"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.64:2
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index ff5abca6739f..4feae2c3a48b 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -2,6 +2,6 @@ AUX gvim-completion 1219 BLAKE2B 8a8d8ac5b42be0103da00ecda3445f24993df0b2762310d
 AUX gvimrc-r1 990 BLAKE2B 5fc0b805458aff22485e3e180ca8c32a62f2cfe49572edffa5725d2cfc4ed9a7bded20c1a5cd1f19f41e0849e3ca08be4798ff23edd66a92bcbb31aee16c433a SHA512 f6538550f1ecadcccf74a6bbd5a6a0b71d18a234a854d1a0179144125555c42280000df9523e7c3d5a8b449f421af7bafcca1034951f085279cee0dd1160808a
 DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15 SHA512 00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b
 DIST vim-8.2.0814.tar.gz 14953478 BLAKE2B fd4155ec749bd9a705e8114ff7f8cc321182c9286733ff2f665e265ec0af830f9e70c730b8d0215f6db1f73a8e2f878d22932a72c8dbfe921591be7adcdaab00 SHA512 4ddd9e2d30719f931cadd1a4de5700736f641f4b074378d9ea1462a90b81975ce8e8c3ca2e3a1e15ac0288824eef5b0f0a3e31482f7637c450c6d7e52c8f40d2
-EBUILD gvim-8.2.0814-r100.ebuild 10546 BLAKE2B 841485b310036388cb0cb7ab307d38c52ab198864b8c3cc87961383c9db4255c84b9dd114a5646f17c53549bf6e8e982d1b730168b53d308477cd59afa70c111 SHA512 15a4fdd6a2323e36b282cb5015af08d9db10ece57748d4c80384c029b3c88b601a7886ef2bbedc838dcac5c7adcfdc77db7628506ac09cde973430f209de2fd0
-EBUILD gvim-9999.ebuild 10547 BLAKE2B 6abec7c8cccb5fd62fe8db99ed9b2e14faeaf51c568fc44d2bf8bc1e8d6500419f2941d8f10a37bb5b687c44072bcc1a779315dcd4b97230b498d15927942057 SHA512 ced89d9e42b23607c01ee2e27a87ced1398b7431d6bcb05c743b1c0b6a780239083b94b898fb57053a1adfa84d6962c248c5abd7668f7eb02888be0aa2fda277
+EBUILD gvim-8.2.0814-r100.ebuild 10548 BLAKE2B 97622d1ec117107f2576a4b7f75097c3b4711402c3affbf433b2b317048b74697a0fb2b795f2ce6e388cf26885af9b972b68d7f0f73db5110a2bb9a43061ed4f SHA512 654432cab7092fadfabf35996a1ccd807eb76becdd8ed5eb95a5e153e8a6dd342debbd7fd28398bb9e83b4fbe87fa89995a619d4044a1a6300213c04f48325d6
+EBUILD gvim-9999.ebuild 10549 BLAKE2B c7ab38cb377298b8a74ea21bd19e1f29f0e304fcf02d46046b49a7443d6c0d795f71fd46fff3b142cb97b12e198537844a007e133ece4bbe479cc7ffe6503306 SHA512 5d8dcd41a8df4d9a58d4fb4d7fba11848a910cfc6d1fbcbcc83c47f5177f1ecf860b0fc4bfbf3b550e3c9203624ef982d3059870b57af8e2c02b5b4cfd32219b
 MISC metadata.xml 633 BLAKE2B 5ecbefdb3a4a116a9e56113621970dd581f27dd42f8b6ed4fd445cb675bec4729bbce076a0d20de3dd329e00723f51d64df9a7b62658fa8f1348982aa8b8628d SHA512 bca6784d9746a7d98aaec2e3469b8bb3057802b869181c79622d16cfd31b06ca8c9dd89cb147f11c1f709fda2312973e7e115efea257a781905fb3a789b0cfce
diff --git a/app-editors/gvim/gvim-8.2.0814-r100.ebuild b/app-editors/gvim/gvim-8.2.0814-r100.ebuild
index 82416af61adb..249f42765281 100644
--- a/app-editors/gvim/gvim-8.2.0814-r100.ebuild
+++ b/app-editors/gvim/gvim-8.2.0814-r100.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 VIM_VERSION="8.2"
 LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE="threads(+)"
 USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index 9806a30cdc9e..ecd0b5e0dd0f 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 VIM_VERSION="8.2"
 LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE="threads(+)"
 USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index ab1be72bba35..d2905b682bd5 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -1,5 +1,5 @@
 DIST mg-20200723.tar.gz 152271 BLAKE2B 5fcbe2699da60c68a0c464bb337741d7797e9da3e2ab148a821aed46f661e5f5efbe7ceb14b153dcdd51185d22d0a2b2c7ad3525fc531192ecc0c0697e483b77 SHA512 8e481cf4981b93dba95b3b318f44dda15e580962216d452ce2fddcd19b86e4686673ba84d092bfaa540533b227428bd3bc9e6becda69be881d930937b0ea7add
 DIST mg-20210314.tar.gz 152749 BLAKE2B eec9740db1a543025450746913c1b07f0646f370906665122c7f5dd1ecc46b5cab102bd29aa51afb13972f4f17118ea20c33bb619e8dc4bc8982f8423ed189d6 SHA512 816b1bf8aec97dd790b0d5bf8836d46cb87f60d0bda94c2aecce4f8a6b8599ab2e90805fa6b129c9e40b54b340e33a47fec97c60e1b59b7706aa357d58b0e3f6
 EBUILD mg-20200723.ebuild 1039 BLAKE2B eef7dd1ed4645c2cd557e702673fb57076beb717e4230147431d98d719d684415f83f90bce40b1a9c433c3084b4278740753c704dad7ce8a98ac768cb9e09157 SHA512 2ef7301ccbb7ef1d067759ff9932584864ca36a62ba1ce66ffbf35c2d6118040d77f42d6947a55c86d62251191dbe29d272a6d54e6c36a9632a37f197e246bad
-EBUILD mg-20210314.ebuild 1044 BLAKE2B bcdd18dfbdef4e09f9ced625ce21a8a391428942f74ab42c3a2f126449fb87da1e53c51643f06610ddc0250182d698c6b8ff4ea90763fa109475dd7c4240666d SHA512 e9ea391a0f88264c7d688c503f0972d00e4d489960b2c14b470d362dec6137f71ca7ac8fcca07f1610182524c28978fa1b4589c7d4bd8e46a3b9f4690495e180
+EBUILD mg-20210314.ebuild 1040 BLAKE2B e5e218edc7f2414dc21ff56b39083385e4073539cda5223e6e72e54c200e2df0eef25db36b798f111cf6f1bf6b8b21ff97a8a9ab0c47422a2a5b13e212a09ca6 SHA512 65bc91cf9a5314b8a16b249fdbceb71fa1427038d0447be0eda9bf24519acbe58a31931655e065fc0339584664e55d3508b20dbe653a8142329ba49faff19f16
 MISC metadata.xml 618 BLAKE2B d6aa73580d4aebe2a43f227c56df586058260eb53bc7b09e3cd9355526bcb32bad3c92c2ba20aaa8da9e96634d43b1385921e2f9ef77168e3089eed64b9e7d45 SHA512 a61abb9ef37a2e1d8e04d3476b2ba85e66f1e6287bb81c3d2ba71c7b1022c8e025fbe4f1b46dcef27d38b5f28a75e569608e7b9d5e9b504c8d405680cd764a4d
diff --git a/app-editors/mg/mg-20210314.ebuild b/app-editors/mg/mg-20210314.ebuild
index 20816904f732..2520421b3aff 100644
--- a/app-editors/mg/mg-20210314.ebuild
+++ b/app-editors/mg/mg-20210314.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ~ppc64 sparc ~x86"
 IUSE="livecd"
 
 RDEPEND="sys-libs/ncurses:0
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 83f2e14427f5..8ed14144feb0 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -3,6 +3,6 @@ AUX neovim-0.4.4-cmake-release-type.patch 627 BLAKE2B 87c6e6fd487b923ec4146f2cb3
 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
-EBUILD neovim-0.4.4-r100.ebuild 2809 BLAKE2B c19dd29a3cb54b2a40b211f250108ff7eb53da0eca3521139a04eda96a43ff4b597223430d16a33e20ff9c48637cb480d0c172f2afb53ca1463cefb62d796f76 SHA512 b2380f420bd48d9ef12e25ec75f794ad3f4821996b5503301a28ce5c9066236642dd3086b6ef4a702f59856ffa903306dc3a0a1f540ab8b636c0f5ac47578d5f
-EBUILD neovim-9999.ebuild 2779 BLAKE2B a629bad5945a0054fc56eb28c759e80c39ff44735bc0ef48edf50238fa6a891789324303c8fb27709efe71056763b987a12c907c62736b197b59c9fd55afb2fb SHA512 87f6afbf6d9ca151a8019761f53d9bd9137ecc0943adc7a875ed019134dc772794f64419fd959198ecbb1ea81a978368e92d20f4015d96be7c24fc030a5f25bd
+EBUILD neovim-0.4.4-r100.ebuild 2829 BLAKE2B 4240747e0040650db867b7e7752a588eadae4d5aba7146dda222e0e7ba6238da121d32d5c037a846d28f5485a9360f2d648a17442903c903e37aa77196d37cce SHA512 2bc0c0c595634cf481443696aaef782dc2d295d09f9e6d456adaff3b2bc9e324b4caec201f79a6d30f257626f0f3f64f1843ee426f85114baa9f5760a5cb49a9
+EBUILD neovim-9999.ebuild 2799 BLAKE2B dd528fa20828c83689b655cf416428d4d27e46b81f060199751dec78b3066d48ab2b31198d0d6c6d7a0e493474be54373621a1b17ca0a7006a800b9e96cab2e3 SHA512 d6d62476fc74ea77ee41b3a77ff9946fe3d47bebcaa0a6824f188ed5c0d7c1733c0e09926a7ecf54cf53cc08afd5a7333eb43fbb29a9b32f905d7d7c19d82561
 MISC metadata.xml 535 BLAKE2B 7cebdc1b7adafafdcc2fe266f8696ad0dff927e8a9383ee34ac66e2c8910d3863d1f7603f2a82dec75f586ab22814d7268475ae3ce02fc3dca12a665e1e8ce5e SHA512 71fcf593a1b9587e6af0e30e851fb17e8552568a4e8bd38341c150ada7dbf72f962250f3306403c0be2d334932f63fe183850efe1c67d515ba79577cdf7aa561
diff --git a/app-editors/neovim/neovim-0.4.4-r100.ebuild b/app-editors/neovim/neovim-0.4.4-r100.ebuild
index 6f725bc078da..f97ec4ad27ed 100644
--- a/app-editors/neovim/neovim-0.4.4-r100.ebuild
+++ b/app-editors/neovim/neovim-0.4.4-r100.ebuild
@@ -87,6 +87,7 @@ src_configure() {
 		-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
 }
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index 0663ee9e4715..d8873b59f067 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -86,6 +86,7 @@ src_configure() {
 		-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
 }
diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest
index 348a52fb7830..f5351c493b52 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -1,5 +1,3 @@
-DIST okteta-0.26.5.tar.xz 971940 BLAKE2B 44313d9603b15e9b9c4355b34d3d3b778c6530de7bfb2ab2589716c5123a5c66116d1cc8aa8197fb55135fb4dd6eca89155ec3c5f18b14e5f88c664f2197de4b SHA512 9a4934f8f4508bd858f8ed13f02174b211453ec5b38aa0fcc62d1173e3a0e0101754d23f53ce4bddcfe9106eeaed687f1141d2a1a65efc3ea8478e5d1840dc09
 DIST okteta-0.26.6.tar.xz 975720 BLAKE2B e9eaf258e9285dfcbf41cd0fcd3fa31e01a9d3b57b7d5c305d644aaeba2588351d0e212c7a6df7f06ab54da47728a916169dc2670772d445f5d34427fbf18946 SHA512 f489ddf1be6fe369b564b11cf8234c7a291b63101a00fb43163a1019609d1152735750946b2bd876080eff1697903ba02ada1ea641293a59f31d5edf34604b1a
-EBUILD okteta-0.26.5.ebuild 1748 BLAKE2B b233026aab3756a5e9dd27120abc2ee34dbcab2160eae4cebf0a2ef64569191b2c125be3f14e6de119d4944d8f7128ef511ed04dae1ab7225d7bbb4ff2a247a9 SHA512 5524e291de5f5245b44e1fea7a62ce4533ed01e8d383f500e3d9f74b5c3ecf114033a0d86b760e0b92c74f7bedd688e209b28b8af1ac827e8ee7f7f28ef2d916
-EBUILD okteta-0.26.6.ebuild 1748 BLAKE2B b39a080802a1ca418f9a0bb7a888dae1b5c4c0cdb76972fe2613e1643e235600cbaa042cd52b8421825a07a5c6ddbef873545fd68e0668683ddf8fc7b1f1a0ef SHA512 404a8b13be4f7d85824b42e593ae8d1bf0b23e14f3ef232b63e490beda8da4a36709add239239f2ab6aa02162e5a4c0b898938ac98f867b905ffc1432fd7b9ce
+EBUILD okteta-0.26.6.ebuild 1746 BLAKE2B f20997eeb8d4bb595bab379934a01a8f063aa331d3b4a531072a70aa7bbaa019e75c7c85f92ef89f3aeb15af9d312aedd3a6eea45cf333db0cc2db4af58e7d9e SHA512 b6164ab89b51e212f6786ed2f77f381436b396941bd14134171542c8636fcbd213443d8b7941725310ae397e4f4006076d75dd744c88967a268534eb4510393e
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/app-editors/okteta/okteta-0.26.5.ebuild b/app-editors/okteta/okteta-0.26.5.ebuild
deleted file mode 100644
index e30d370eff35..000000000000
--- a/app-editors/okteta/okteta-0.26.5.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.74.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Hex editor by KDE"
-HOMEPAGE="https://apps.kde.org/en/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 x86"
-fi
-
-LICENSE="GPL-2 handbook? ( FDL-1.2 )"
-SLOT="5"
-IUSE="crypt"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5[scripttools]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	crypt? ( >=app-crypt/qca-2.3.0:2 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DOMIT_EXAMPLES=ON
-		$(cmake_use_find_package crypt Qca-qt5)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	local myctestargs=( -j1 )
-
-	ecm_src_test
-}
diff --git a/app-editors/okteta/okteta-0.26.6.ebuild b/app-editors/okteta/okteta-0.26.6.ebuild
index cd007322781c..0374acdcbe03 100644
--- a/app-editors/okteta/okteta-0.26.6.ebuild
+++ b/app-editors/okteta/okteta-0.26.6.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 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="GPL-2 handbook? ( FDL-1.2 )"
diff --git a/app-editors/pyvim/Manifest b/app-editors/pyvim/Manifest
index bbdd38098637..b200e307d727 100644
--- a/app-editors/pyvim/Manifest
+++ b/app-editors/pyvim/Manifest
@@ -1,3 +1,3 @@
 DIST pyvim-3.0.2.tar.gz 35227 BLAKE2B 8edc2218b3a0f2ba922531b75f65a5273ad9a2697f72ecf994cf7d2406c6311c3f28b22b6adb1243150a90db74962256ceaa7cf47ec99c2388299742451d6efb SHA512 da961342ba52e5beca44a607cbb923953388e8674409db9ca2b152017eeedce84f92e42a9f6d0e5019c5c4d88d82f4a987cb378f311cf84a169cefa54dc5efce
-EBUILD pyvim-3.0.2.ebuild 841 BLAKE2B a89ff0e37418d8074590bdc466043814495da8ff8a9afa098d41d81d481b775455ace75ed545fcfa2f8d7d65410a548c5ee362fe7a40e610a10548f50b19c2d3 SHA512 1a951ab19f8eea020cf65a27bf2916b0aa77c0350be1f71c5145f07d48c18d539bf9cef68cdb354afb9450f882c5c4ab844016866a6a1a96cf261885d52ec2bc
+EBUILD pyvim-3.0.2.ebuild 844 BLAKE2B bc26e36c80766ccef0ba23182d13ec76043629c942e08513c1327153583d09a9d87c9142aefcf53f374c3738f213c8322bfe297f6cde5a7e9cfac1977cdf3c7a SHA512 2c1c96163032704aacaa6414f3946328af026eec8d7a0d86ec289266b2b5c5eefc03c5d927c88927d2bb11ae25b1a2bbd407b808c76333aa8dcd50fffb312170
 MISC metadata.xml 489 BLAKE2B c68a02d61b1c1e6f577c4fa415ce88e93cb4fad16418800dbdb5121baba72f521f18c1d253089835b7b99ff94e6f095051974dfadc5c55b6dc33a52ac6b25b58 SHA512 8ad8692c0a2e47b5135497d49c4a5676607e429a5281b7bfc3f9f0ba6e77195020218f1a444cfd587deee7a7cd2cd6f56ff28d66392f14b5b48203097b08680a
diff --git a/app-editors/pyvim/pyvim-3.0.2.ebuild b/app-editors/pyvim/pyvim-3.0.2.ebuild
index fdc003c833ad..cd50a4a019fe 100644
--- a/app-editors/pyvim/pyvim-3.0.2.ebuild
+++ b/app-editors/pyvim/pyvim-3.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
@@ -17,12 +17,13 @@ KEYWORDS="amd64 x86"
 
 RDEPEND="
 	app-eselect/eselect-vi
-	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/docopt[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
+	dev-python/prompt_toolkit[${PYTHON_USEDEP}]
 	dev-python/pyflakes[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/prompt_toolkit[${PYTHON_USEDEP}]"
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
 
 eselect_vi_update() {
 	einfo "Calling eselect vi update..."
diff --git a/app-editors/sublime-text/Manifest b/app-editors/sublime-text/Manifest
index bf0ea0158cdc..065f45b588f3 100644
--- a/app-editors/sublime-text/Manifest
+++ b/app-editors/sublime-text/Manifest
@@ -1,4 +1,8 @@
+AUX sublime-text-4_p4107-remove-deprecated-key-onlyshowin-from-launcher.patch 977 BLAKE2B 8972db660afc42e30114a655656dfbf818cfe6f04fbb143f590f84fde4c74a431be222f375ac0796775d3851e60aeeaad43a7cb6bd9526c27d3e692516d6289e SHA512 76e3d96fe8645e097cd6d500eded2af738a7d912c20157e0a5d4397cb99642f7d31a9703e5f818c2e9e0ac97a5db89281872db20a3f5924e53f17ef493516a8f
+AUX sublime-text-4_p4107-set-explicit-startupwmclass-in-launcher.patch 800 BLAKE2B 45d22985df0232a6065917be5a7352732273b6b48e5f3de015039bd3214ac1491fd07035ab7eabff30182c8796ec4f34a799a2a38011a5bf31bc4f78de27bb54 SHA512 d03f679f8d20f26575f6568b8652cc6316d1ddc5ee4e5c2ce6ae1dffddaeb4476c48d88e5162c165707e7bf699fda8e61d73bea83171d0fa66e5434deef85a48
 DIST sublime_text_3_build_3211_x32.tar.bz2 13806489 BLAKE2B 1e07df2fc9fb9fb60a6fbfe27a3d657ff80ef46ae91967fa384cfc84bfdc2b5952aea8dbfd9ff015f669b148c1a302cbe01521a72b584abccd51efdab51ac0d8 SHA512 4d19947459046407316382d187ea6fa4cff9b7d3e7ae3c46667d691b6ca425a1f1dfc8599a26cf61b970290a58924a3b605e111ff2802ed124683872c1802803
 DIST sublime_text_3_build_3211_x64.tar.bz2 13677324 BLAKE2B e2ac54c1e8ab90c0fcefb4baf225b02d13a3405e846f08163773ed52c6278f8e89a7b13c15e6c2d6241139d58be9c2c5a1201abb04a3cd68efdffc723075c5af SHA512 a6a068119eff95c5360e9ccbe1d845e7a93e4ad13b3659073752a7bd0e87f4691555820185514875649e677a4e8702e2338f74f5584fc80f69c16b323685d6f1
+DIST sublime_text_build_4107_x64.tar.xz 17096632 BLAKE2B 37c1839ef1edecb1f3017e4d99d2b8b0bf5c0aa1490495fe19a48cf38bb436e94913572a4dd5ad5f84e6b5445b6a9a2df35fec607beb0b520471b2dde7ef63fd SHA512 552051b34c612aa6ff53ef6275488467061221715de054dc1e657519c82899e24df1a9f8000086b68c5c1c6e0c98341c641f19a2d97c880efb25aa93ad82f8aa
 EBUILD sublime-text-3_p3211-r1.ebuild 1645 BLAKE2B 5bdf8d1fdae1df2bc59937e2bd2382385aad77fb60a99e3ea4830239adc027f2c09663c9bec3b795d5f633d3625b2ff5a17b328b46986968e99e45ceeb71e515 SHA512 339364d412f075d97ae576e75dfc50a021fdbf2953a0a6de78f45b97d1db21f335a43a2373631b2a42becd8877b4003fc06b4669f3b092f86df0ff09b3c11f2d
+EBUILD sublime-text-4_p4107.ebuild 2055 BLAKE2B 71fc79523f06b4e66ad3469bd9b62aadc13f2ad66eb2028d80fd69ac358df2a303d71375d0cd406ef3460a299b9f467cbf4917a54a3c58c1a859b656d31408d0 SHA512 b871dbe20734510f84b2b0c421c27552f33786ef1e7f8715ba9bc34ec0eb20a02456f2d668b458cf591ff86f24c91f256c5aff0165a2be94549c749fcdf0d90c
 MISC metadata.xml 215 BLAKE2B e5b704d936932650ad333b6ee575d0f6fb54f7b01e62f59912a5d88c8a76bfff888e9de639a9a4d6ec5882a3e9a57874eb89935bb3d1a3c3a79a4b1f58b944fb SHA512 d803656f1527d3fc8a2b3474c0ff52d86170950b70057a65ab412ce1adc926545393fe1cfb71731d573f057de2145edd90d642c644ef26222a2b413cd8922d47
diff --git a/app-editors/sublime-text/files/sublime-text-4_p4107-remove-deprecated-key-onlyshowin-from-launcher.patch b/app-editors/sublime-text/files/sublime-text-4_p4107-remove-deprecated-key-onlyshowin-from-launcher.patch
new file mode 100644
index 000000000000..04dfad334e2d
--- /dev/null
+++ b/app-editors/sublime-text/files/sublime-text-4_p4107-remove-deprecated-key-onlyshowin-from-launcher.patch
@@ -0,0 +1,31 @@
+From 9df21c9ec00ac34174b443cc7cd8c4053b98eb00 Mon Sep 17 00:00:00 2001
+From: webstrand <webstrand@gmail.com>
+Date: Thu, 27 May 2021 17:08:03 -0400
+Subject: [PATCH 1/2] remove deprecated key OnlyShowIn from launcher
+
+Silences a QA notice that the key "OnlyShowIn" in group
+"Desktop Action new-file" and "Desktop Action new-window" is deprecated.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=66712 No replacement or
+alternative is provided, the key is simply ignored.
+---
+ sublime_text.desktop | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/sublime_text.desktop b/sublime_text.desktop
+index 7407709..b171254 100644
+--- a/sublime_text.desktop
++++ b/sublime_text.desktop
+@@ -15,9 +15,7 @@ Actions=new-window;new-file;
+ [Desktop Action new-window]
+ Name=New Window
+ Exec=/opt/sublime_text/sublime_text --launch-or-new-window
+-OnlyShowIn=Unity;
+ 
+ [Desktop Action new-file]
+ Name=New File
+ Exec=/opt/sublime_text/sublime_text --command new_file
+-OnlyShowIn=Unity;
+-- 
+2.31.1
+
diff --git a/app-editors/sublime-text/files/sublime-text-4_p4107-set-explicit-startupwmclass-in-launcher.patch b/app-editors/sublime-text/files/sublime-text-4_p4107-set-explicit-startupwmclass-in-launcher.patch
new file mode 100644
index 000000000000..09e835b587a7
--- /dev/null
+++ b/app-editors/sublime-text/files/sublime-text-4_p4107-set-explicit-startupwmclass-in-launcher.patch
@@ -0,0 +1,27 @@
+From 0eff5450cba9514559eefd8c79e98fb6b8134b68 Mon Sep 17 00:00:00 2001
+From: webstrand <webstrand@gmail.com>
+Date: Thu, 27 May 2021 17:09:21 -0400
+Subject: [PATCH 2/2] Set explicit StartupWMClass in launcher
+
+Otherwise startup notification and grouping implicitly use the name of
+the .desktop file to match against the actual WM_CLASS of windows
+belonging to the application.
+---
+ sublime_text.desktop | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/sublime_text.desktop b/sublime_text.desktop
+index b171254..5c812a9 100644
+--- a/sublime_text.desktop
++++ b/sublime_text.desktop
+@@ -10,6 +10,7 @@ MimeType=text/plain;
+ Icon=sublime-text
+ Categories=TextEditor;Development;
+ StartupNotify=true
++StartupWMClass=Sublime_text
+ Actions=new-window;new-file;
+ 
+ [Desktop Action new-window]
+-- 
+2.31.1
+
diff --git a/app-editors/sublime-text/sublime-text-4_p4107.ebuild b/app-editors/sublime-text/sublime-text-4_p4107.ebuild
new file mode 100644
index 000000000000..cd603261aae8
--- /dev/null
+++ b/app-editors/sublime-text/sublime-text-4_p4107.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg-utils wrapper
+
+# 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 )"
+
+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="*"
+S="${WORKDIR}/${MY_PN}"
+
+# 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_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	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/texworks/Manifest b/app-editors/texworks/Manifest
index a57dfb990e32..716d4d6be276 100644
--- a/app-editors/texworks/Manifest
+++ b/app-editors/texworks/Manifest
@@ -2,6 +2,6 @@ AUX qt5.15-support.patch 632 BLAKE2B c2e4f3801231a08ecccde92d84b1836c62d44f2ae63
 AUX texworks-0.6.5-cmake_lua_version.patch 219 BLAKE2B c09494099363fa26e4110c23b0e1c06caf44cb0040578bfa33457741fdc8fe4698a2f4000a6dc6da4cd19dca6039c251cd1b875a27dc41abfea03b5cb79c341a SHA512 66ccbbcf313596c674833b36f222c8aa8bde541dfd58a706814aef3eaeec50247bec954a4f7137dfda31df9cd7b15163200592acb8433ed252d961ebf2b9ea32
 DIST texworks-0.6.5.tar.gz 12140935 BLAKE2B 660606fe2e53d5f2a53e80792efbee368f5f2f402ab974761efc6e11a6f2233fd04672dcc3bf0155a070162616c1d5a9c7313825890e6fb0c6c4dc7af2c62d29 SHA512 d97bb7c3ad7bbb402be80556027ef19076dae91bb9449df2b45d54e89b492e32b8d6f109d1bda9388424af6218866d84a8c296c9bc2ef644cf2fac0d4b24939e
 DIST texworks-0.6.6.tar.gz 12385550 BLAKE2B 241a9e4649e489964c62bd44ca310ffa7d67ebcb6187568dbf5e5b7916d81e3d846f0492a22e35d2c8a57d182d32d129600570e3836c671ae723c236f82d6bd8 SHA512 65300dfbe4e0e2f3b387c868e343f6caeff4602b47afee5a02cce82e0e23b74fe559b4b54fb65d778748de56f38581305a9b3a53d743c957b7dc14ecce4546d1
-EBUILD texworks-0.6.5-r100.ebuild 1699 BLAKE2B 458e239d6971c1935652e86492283c181b6a2cf9551dfb1d2f20285fca135a816831e59a4f4939d7e7ba46d591091f73f02669c00ec08ca4adaec4a618215820 SHA512 5d5ecfda46878edbee8709471250c925aa04492f4d9b7e6edbb2d99a64c233dc740713f5c2163e46d653b1b9ab34761d8f003ab87f0947e9c19ebcddf58c2497
-EBUILD texworks-0.6.6.ebuild 1665 BLAKE2B 95742344886e75c3e5d605a623b65cb3f71f50ac2d0226888e92899376eacd1feebff1ad9bd10fdcb90122bc3cff763419e45840cd043a8352d6a175054497ef SHA512 b3c751560c0fa366ed0ce6a028893071a56b7aa94a1eadfcf0fc22239f692e6d91a8a9e1e36688d9fe40b77547f104691af80214b067ac0ad53011dd8ac7b287
+EBUILD texworks-0.6.5-r100.ebuild 1699 BLAKE2B 4c5e32db95f5f25d2477a6e6461691297bf79bbdbc88926a205dbdf23065b2eb961c7496bf081dfcb939be5c005b399bc6cbb25cf0e1b97d7a6f32eea13e6966 SHA512 440ce105881899a7914b02d71071f9db891ee9504b9e86df11848c5eb57a8599ab43d04cbefbba9ff3e3a908c8c8d09056e2ddb9873361b7f6b41fddd7e8a5d7
+EBUILD texworks-0.6.6.ebuild 1665 BLAKE2B c0c32ff923a3385600a5309b2a03583d125f4032a77c50f7d53859da9b6d0d41b564ef623d734a1dbdf140205901863dea89be5bba3c465c4fe1f6100a533891 SHA512 3faf4be679d1b49612b6d253b8117e1db2759ff89a8d488aacd7d57425fd3af52a8e2e73800e51cd7a34272106b04b6830b3fd71b314b4e431dd4daefc0f7f93
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/app-editors/texworks/texworks-0.6.5-r100.ebuild b/app-editors/texworks/texworks-0.6.5-r100.ebuild
index 1628e0d54dd2..96988d112350 100644
--- a/app-editors/texworks/texworks-0.6.5-r100.ebuild
+++ b/app-editors/texworks/texworks-0.6.5-r100.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit lua-single python-single-r1 cmake virtualx xdg-utils
 
diff --git a/app-editors/texworks/texworks-0.6.6.ebuild b/app-editors/texworks/texworks-0.6.6.ebuild
index f130e1a29fa8..c8e354eb858d 100644
--- a/app-editors/texworks/texworks-0.6.6.ebuild
+++ b/app-editors/texworks/texworks-0.6.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit lua-single python-single-r1 cmake virtualx xdg-utils
 
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index cfc25a18e024..5ea0f5de8ab1 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -1,6 +1,6 @@
 AUX vim-completion 1004 BLAKE2B dea4230a8d2a57fd1af18df4037504a44382a97ff672410e987cb287d802c964baa502da4d08f09cb8684307481fec503c1d8cae7f4f6e61500f1cb06033a2c4 SHA512 dccf663a93efdf2ec3be69f49e418a0ef66277e2fae6c12287adde772592e19f5130388a04242121846f1dae39f78b30780c99dc6fe1b847f4f08354bda3cc41
 DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15 SHA512 00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b
 DIST vim-8.2.0814.tar.gz 14953478 BLAKE2B fd4155ec749bd9a705e8114ff7f8cc321182c9286733ff2f665e265ec0af830f9e70c730b8d0215f6db1f73a8e2f878d22932a72c8dbfe921591be7adcdaab00 SHA512 4ddd9e2d30719f931cadd1a4de5700736f641f4b074378d9ea1462a90b81975ce8e8c3ca2e3a1e15ac0288824eef5b0f0a3e31482f7637c450c6d7e52c8f40d2
-EBUILD vim-8.2.0814-r100.ebuild 9223 BLAKE2B dc3b85e2dffc39d20efea2956dd46ba29b09a9c6c924107570e3ebfeef05bfaa46afc85ca02d5d9774e91cde54acc977aa71971629755b26359789f90db579a1 SHA512 85d57df732a0479558628b858e71f5a1ee358ad29309f2cee9b2174ba7f2573d052e289fe694413e80a335c3a54cc4307b265bdb52f7e4b9cfa3af67fadb2e48
-EBUILD vim-9999.ebuild 9230 BLAKE2B cb29f9b4648b19b7623d730b9965635dc6daafab8230992d2e5e68af737fd23d0599ab6d3536555a95a4d74efb970b4721b869f2398d458e2fde7842752fe59b SHA512 0ff11ebe2f291e53d4fb24601038f8d2d54586bcbc0129430c211db130c9ae57fef8afb50766362f1f947bf6f3bb5d863301def641201fad48d485d7bc1f20fa
+EBUILD vim-8.2.0814-r100.ebuild 9223 BLAKE2B eb24d5485452a3bf515dd947f2a71ca945e581e93abd1b736dc1055b64eb89450fc40aa703b7f8276cd328d2b865b085b16b3baa24417c0ea629c6fb3b6fa978 SHA512 839949391f4250c80e62587b78b14be394ee5f1db6bd30046597303bf0b475b436e9f9f313ab5e687cf7a82a7cc1706b7ec0f28ec5f45233ab1fe8ef11372ef5
+EBUILD vim-9999.ebuild 9230 BLAKE2B 11fcd309559250e68b0ea9ddbe6309e9668afcbde293f5c2e4097a7cd3ed0abc559a1d4a2a1f9ce4bfd8b1bc04a1686cef901a6b2865124bb3ea0e1d7555d9dd SHA512 2ee8e6a42f84503c83be45f3ad2439dfdd6750a380a46bb2dd57737bf4e6e078528b958c964a0ac3362ffa09cc9b349094494b6aad7a1b2931253e4295586caf
 MISC metadata.xml 807 BLAKE2B e876f33c06a0bb165a43a7c50ff9bbfa0513e43287f54dbcee396af736034e4cefba8831226b47cc8a334599632a94344623ae2343f0162dbbcd511f749d524a SHA512 a7801a4483b08944c01848593354322c406a929296075617736755c0b62852b76c30467cee2c360ea211521274f2019b495309bffb5a3285d73940aac45e4a53
diff --git a/app-editors/vim/vim-8.2.0814-r100.ebuild b/app-editors/vim/vim-8.2.0814-r100.ebuild
index bf724c58b5bb..085e62c4a3f7 100644
--- a/app-editors/vim/vim-8.2.0814-r100.ebuild
+++ b/app-editors/vim/vim-8.2.0814-r100.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 VIM_VERSION="8.2"
 LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE="threads(+)"
 USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index b104aab29b57..fd00866b78b5 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 VIM_VERSION="8.2"
 LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE="threads(+)"
 USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
diff --git a/app-editors/vscode/Manifest b/app-editors/vscode/Manifest
new file mode 100644
index 000000000000..2b4fda8bc9c0
--- /dev/null
+++ b/app-editors/vscode/Manifest
@@ -0,0 +1,7 @@
+AUX vscode-url-handler.desktop 298 BLAKE2B dc2faeb3b41de07abe24caa54769f784aaa1ce716afe21b84b75a31668fc8821fc74c8084e37acf31ea055969e26c76ecbca6ee5eb873bfbb01fbf5b350e1907 SHA512 1f36ac5dbe3ac21dee7df517c2d8fdb47b8c7ce20d9579b664f256729f21f4575e2181f4873e38db6dfe96c516dc1717f6ad82d1cbff2dbf00af6afc4ecbce5e
+AUX vscode.desktop 458 BLAKE2B 98bb17607ad9d8f82e0cbbd032718481cfc3d5118de6f15d8fe8e5efee7da64a98f02c59a3e840b016fdabf6ce8b45e14fa0cc2a3e50f0138a970fb9fb4fb8c4 SHA512 d1de63ee86180bfbce1e5d439ba4bda1cb12c4e3d98e6158be9cbd3cca82307400fa137636b4f355ab96b68f364c5af0d85c336652f9004ae535224e1d70c0ba
+DIST vscode-1.56.2-amd64.tar.gz 104824843 BLAKE2B 608cc74daad0534a91d3c6200827b82efa0c2a9634c3cd9f031d4744a35f25c5201a7310011d6dfe57f761845e79574d068678a4500650c47d8404d2bd810f4d SHA512 35ef320b92a66d05a8c2b61a81978d659245f37ef0b2f05002083386a265a232ed163dcc06ddee9bc2bc8f1205fa80e7841268bf66fdddcabe4a8ed35fb50a35
+DIST vscode-1.56.2-arm.tar.gz 95395040 BLAKE2B e948f09a97a39f898276fe4bbc9f7f35fa96b833732a48058e402aaa0246790d79c5422f5e209c842b94c6c46d19b657cdeefa9caa1e255331f81e91e0760c69 SHA512 4486d030d2d611aa0d29a156ba5c2beb2bd0ab1950684c7bdea44460fb05f3a18b62419c346d99a84cd71bb595f7802dab10730b40600879e442ee3181129e6f
+DIST vscode-1.56.2-arm64.tar.gz 110174990 BLAKE2B 3b512136911b3ca431fbf71951655490c85f1c7cc707c6ddea3fd4d41b956fbf33dd8264e279d1d6e69564506aefcd9588397665133a3a34997d916605c9aa73 SHA512 bc3fb6b78e33286486411aa78b538693c371b309e86a84ee7361a2fd78d2d8e0dd4e9dd761f9278ced4e3a31a532e2534cdde001635935dfda92dfab85eb9e51
+EBUILD vscode-1.56.2.ebuild 2498 BLAKE2B 6f0b4c2d4c6c9fc109fe05611d54bc953436e183cdcbd3f3fd4cba200ef35dcd60310a87d27a9282daab5bf738803f5c47ab9b64e4ad994673d815df469a1299 SHA512 e53bb2318c995aff9bc38444f4a09e726a6373b3737828b61c58dd638619a8ec877e754001ddc11a1bf8d869814bd0af098205a1199c967fbb79bed193767867
+MISC metadata.xml 946 BLAKE2B 7c5b479e70b6b44c5614a30db4c1aac3ecf8ba399a01d9028888719fc76fb33f083ed248c853ce086a4124c40532254dc4a1fe19c196ca3720a75daecca27442 SHA512 0ddadafbf6dd1eb77e70669eeaff7ce22da48ee801b257ca6447ac16f8c22090510fdf84f432fc3a631d50dece3bd90a46f6a570faee8a5daab06a361d858050
diff --git a/app-editors/vscode/files/vscode-url-handler.desktop b/app-editors/vscode/files/vscode-url-handler.desktop
new file mode 100644
index 000000000000..ec5bb1732c38
--- /dev/null
+++ b/app-editors/vscode/files/vscode-url-handler.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Visual Studio Code - URL Handler
+Comment=Editing evolved
+GenericName=Code Editor
+Exec=/usr/bin/vscode --open-url %U
+Icon=vscode
+Type=Application
+NoDisplay=true
+StartupNotify=true
+Categories=Utility;TextEditor;Development;IDE;
+MimeType=x-scheme-handler/vscode;
+Keywords=vscode;
diff --git a/app-editors/vscode/files/vscode.desktop b/app-editors/vscode/files/vscode.desktop
new file mode 100644
index 000000000000..317112739991
--- /dev/null
+++ b/app-editors/vscode/files/vscode.desktop
@@ -0,0 +1,18 @@
+[Desktop Entry]
+Name=Visual Studio Code
+Comment=Editing evolved
+GenericName=Code Editor
+Exec=/usr/bin/vscode --unity-launch %F
+Icon=vscode
+Type=Application
+StartupNotify=false
+StartupWMClass=Code
+Categories=Utility;TextEditor;Development;IDE;
+MimeType=text/plain;inode/directory;application/x-code-workspace;
+Actions=new-empty-window;
+Keywords=vscode;
+
+[Desktop Action new-empty-window]
+Name=New Empty Window
+Exec=/usr/bin/vscode --new-window %F
+Icon=vscode
diff --git a/app-editors/vscode/metadata.xml b/app-editors/vscode/metadata.xml
new file mode 100644
index 000000000000..9aea48978a99
--- /dev/null
+++ b/app-editors/vscode/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>adel.ks@zegrapher.com</email>
+		<name>Adel KARA SLIMANE</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Visual Studio Code is a lightweight but powerful source code editor which
+		runs on your desktop and is available for Windows, macOS and Linux. It
+		comes with built-in support for JavaScript, TypeScript and Node.js and has
+		a rich ecosystem of extensions for other languages (such as C++, C#, Java,
+		Python, PHP, Go) and runtimes (such as .NET and Unity).
+	</longdescription>
+	<upstream>
+		<remote-id type="github">microsoft/vscode</remote-id>
+		<bugs-to>https://github.com/microsoft/vscode/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/app-editors/vscode/vscode-1.56.2.ebuild b/app-editors/vscode/vscode-1.56.2.ebuild
new file mode 100644
index 000000000000..044c01c33002
--- /dev/null
+++ b/app-editors/vscode/vscode-1.56.2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils xdg
+
+DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
+HOMEPAGE="https://code.visualstudio.com"
+SRC_URI="
+	amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz )
+	arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz )
+	arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz )
+"
+S="${WORKDIR}"
+
+RESTRICT="mirror strip bindist"
+
+LICENSE="
+	Apache-2.0
+	BSD
+	BSD-1
+	BSD-2
+	BSD-4
+	CC-BY-4.0
+	ISC
+	LGPL-2.1+
+	Microsoft-vscode
+	MIT
+	MPL-2.0
+	openssl
+	PYTHON
+	TextMate-bundle
+	Unlicense
+	UoI-NCSA
+	W3C
+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk
+	app-crypt/libsecret[crypt]
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/libpng:0/16
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/libnotify
+	x11-libs/libxkbcommon
+	x11-libs/libxkbfile
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/pango
+"
+
+QA_PREBUILT="
+	/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/resources/app/extensions/*
+	/opt/vscode/resources/app/node_modules.asar.unpacked/*
+"
+
+src_install() {
+	if use amd64; then
+		cd "${WORKDIR}/VSCode-linux-x64" || die
+	elif use arm; then
+		cd "${WORKDIR}/VSCode-linux-armhf" || die
+	elif use arm64; then
+		cd "${WORKDIR}/VSCode-linux-arm64" || die
+	else
+		die "Visual Studio Code only supports amd64, arm and arm64"
+	fi
+
+	# Cleanup
+	rm -r ./resources/app/LICENSES.chromium.html ./resources/app/LICENSE.rtf ./resources/app/licenses || die
+
+	# Install
+	pax-mark m code
+	insinto "/opt/${PN}"
+	doins -r *
+	fperms +x /opt/${PN}/{,bin/}code
+	fperms +x /opt/${PN}/chrome-sandbox
+	fperms -R +x /opt/${PN}/resources/app/out/vs/base/node
+	fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg
+	dosym "../../opt/${PN}/bin/code" "usr/bin/vscode"
+	domenu "${FILESDIR}/vscode.desktop"
+	domenu "${FILESDIR}/vscode-url-handler.desktop"
+	newicon "resources/app/resources/linux/code.png" "vscode.png"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	elog "You may want to install some additional utils, check in:"
+	elog "https://code.visualstudio.com/Docs/setup#_additional-tools"
+}