gentoo auto-resync : 08:02:2025 - 00:11:30

19 files changed, 341 insertions, 16 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 53f3dd38c33e..bbb4c1d68d0f 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index 54cb88764ee5..ad0dce90b035 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -3,5 +3,5 @@ DIST gedit-plugins-48.0.tar.xz 883240 BLAKE2B 0bd97d6d0fa6f052f4f82d546b1a44cc72
 DIST gedit-plugins-48.1.tar.xz 881140 BLAKE2B 7deef6710c7d1e235877eb7c866ae4e041f6ccf28aafea1ba4220e70eb48ae5f562d870a390aa10e96789f63240b2c0cd81596a8f1c4970a69c8ae2132d320d3 SHA512 acd8646cb7713d00c0c2f61da1bfd69f25501b42935710bf59cea342b1766480c3b9414b78fea4682d69b77d3c23920eb1c36674c5918a020a50dde627a679ef
 EBUILD gedit-plugins-46.0-r1.ebuild 2449 BLAKE2B f6ccc760259087de82fb2a5b78f7ee13cf2f04ac7a57edd42077baf3f79a67629c59f052c5c60e39e03585d4042bf5520b50a2948e8fd87ad57f279632ad408e SHA512 0f01edf032cb739769e95ad8ae7da692b3a90807ddff2d63eb8c7371b021f345067131755e9b104382f523838030a6011ceec8f1dfbfa43dce5cfb738ba6080b
 EBUILD gedit-plugins-48.0.ebuild 2326 BLAKE2B a646db05329fb0167baecce8b0025e6f45a4fb049ee8f6e5e6c8cf87b385b7cf5eed4bc01313112d066320574994d5e78855759d9b3a26c9c8f2d14dccba8766 SHA512 36fb32418908f71615ea9a084179764f3e909eebeab269c8415086211aab3697fad939139b1b8229cb9a41ba3dd1e7f5627147af5838a64e95a7b9451c7a3f92
-EBUILD gedit-plugins-48.1.ebuild 2342 BLAKE2B ae89c5ebc66e3bdc6849a3e34f77cbff308bdeddfbfdc0c191a3bd619ecf0b01ab6d9714f3958c82881c944195fadee9225bff18a33fa645680e5e908cd0d421 SHA512 dfdf7bbeeefeb7bc0f63ed014ce7bb01447f1b3265e7a60b46d3cdd7518246879045565323f5e1f7b2197c2a7c0145f6fcb99013b65f1597bf15ef25410c6da2
+EBUILD gedit-plugins-48.1.ebuild 2354 BLAKE2B 29dce7a000a6436e5c994244dc1d731859df80d36126e5002733a05b5d2655a77c4760dc9294a338e9eec1dab35facfc11c91c6ce4f4281c2015b8c0387ffb05 SHA512 2a850d6e4902a456ad4dfc628239e90fee007ff7ce1d70e50d99987ac19c421d1e3ad11357de4bd58f6c4947b6965af2afffd3c787194ff60d458658b945f396
 MISC metadata.xml 596 BLAKE2B cf545e591c160fc584c5c2b1e3f5fa6a47922a958f981daa5c85f3f6c8f7eaed2a520d6265241998dfe211098f70c75a0fdfff033e55e892e5775b678ea9ef5b SHA512 0a3b9e748bc2d22ea16a694f8ebd6196d05e6652f552523bfe6fa60f1c69ab50110692cda7a59239c8f6946c06d3139a4225f1744e0dd40ccbdef3e8b396f692
diff --git a/app-editors/gedit-plugins/gedit-plugins-48.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-48.1.ebuild
index eaed075be285..98717454d23e 100644
--- a/app-editors/gedit-plugins/gedit-plugins-48.1.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-48.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/World/gedit/gedit/-/blob/master/plugins/list-
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~loong ~riscv"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
 
 IUSE="charmap +python terminal vala"
 REQUIRED_USE="
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 45eef50f6120..e86fab5dc872 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -3,5 +3,5 @@ DIST gedit-48.0.tar.xz 2889116 BLAKE2B 64c982fa67359fe65fb29192b9e1b479b3eb2fa2c
 DIST gedit-48.1.tar.xz 2813580 BLAKE2B bdccd05c131f1bf5baae06f471d89717f9da39281d042c0c542a49549a161285636e6f8cc7d4e2f18274d81bc7935df8675a406a6ccdcc7199e91a07e8cfaafe SHA512 63517f12b986e4ac901432f5875d6de78c8161cf4f55450466e67be60708eb0e0d67d4b434a45820a18094c803c8e0d413e85bf6a971e159f3fc8a7e5c128f2c
 EBUILD gedit-46.2.ebuild 1737 BLAKE2B 48ee9084fb599cd56c6abf1977758ad9fb68ccf32cdba6e2d2ea2d434654d4c75ff9301db422082fea38208d96757b6284b4aec2d5bfb74c19f187ffe0dedd34 SHA512 3f63208dbd196022bf59e9ed5b34560bc079eb44f99ed375906e2318997cd97edaa07065cea7f5930738f677d542120e6ef52ab9c5703e4597a5f98673062054
 EBUILD gedit-48.0.ebuild 1718 BLAKE2B db7e58f4d23737acd75b89c3afb6769f42479b1140b7e0de4db7635b00129cf24da799d64b2837c69898a07c379b805e107d3697773c9809755cb479a3365e0d SHA512 632052b28ba02318f946ee87455948ab369228882d860f4758ff8310917546b9d4e13290844d692baf1b4fb723a42d192f7a3dce8e5fd13cac2d0a83c860b0cd
-EBUILD gedit-48.1.ebuild 1732 BLAKE2B 3239d50b755f18d3eb9c0f7fe21433c7354a0dbbdbaade48875f120baf53dddae747e57e20e6c3edc5730eaf8487d38b30b55f8dad0196fab63e2dcb341105ec SHA512 abceab791c8ab45705a24451fcb7b1505e74037a64a104ecf45382158773bde7073215bb73a0203b9b963897e117c6735d063e53b1fbeb29ff5ae6ca4cac1b02
+EBUILD gedit-48.1.ebuild 1749 BLAKE2B 6d614cceff810fcd9690cf66d9a53a8e8e39c0b0d958eaa88cd2e3ffc45aee5ff226fccba04679ab2cc14c989b4853e13aad69ee98dde1c6dbb9286b0292c473 SHA512 5df2220a4458cfdba74dd29931eec0c6028c96270ae80cd16bd2f414842189408af50295e613f75a808519bdccab2eb03c39d4e567aa8fc9560301e6c1c7258d
 MISC metadata.xml 346 BLAKE2B 59226b3220bd9b1770fad0f5acf3b1888a57a3496f9e0a6eb0eb09c12b7a5aa461961753dd8a5a6f01db1cdb97af5b28d6a8d1d632b60f499f86e0864e29264f SHA512 3e1d83ad67b85a681b85f8fece9d6c2c3eab2f2f726447230dc1f2399a21cba211d97e11d8c06d0d1b1803fafe67be4b32c04b39c5f8586a421c525624f6697d
diff --git a/app-editors/gedit/gedit-48.1.ebuild b/app-editors/gedit/gedit-48.1.ebuild
index 262b610dc7a5..1af0d0e1b9f0 100644
--- a/app-editors/gedit/gedit-48.1.ebuild
+++ b/app-editors/gedit/gedit-48.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gedit-text-editor.org/"
 
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~loong ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 
 IUSE="+python gtk-doc"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-editors/ghostwriter/Manifest b/app-editors/ghostwriter/Manifest
index 47d811efbe34..4eea493e1b3c 100644
--- a/app-editors/ghostwriter/Manifest
+++ b/app-editors/ghostwriter/Manifest
@@ -1,6 +1,8 @@
 AUX ghostwriter-24.08.2-fix-segfault.patch 5449 BLAKE2B 3b32fd32811137dee4169074e8f1e39cc7217d55b2725b84277dc987b06e62c85985486cc2275845530f117bd11a5ec52a2e14593cc630f45bcc24c3032f11e2 SHA512 5dd50e158e0dfc6feabf0680ca4a62909abd751ebba351901e0a69f8a3be04d807242cbee3e6bc722ca21eb257c43fc07e048f58bc9fca1e94d4ec2b8f138d29
 DIST ghostwriter-24.08.3.tar.xz 2708104 BLAKE2B f64343a2911410791f2b748a543b0c6355ddfd488d18120152adb021c2b01d1887a120b1febc00ccfbdd6f2ce2bf716a4a3b7e56338962924b61c53fbee0498c SHA512 1cb28738674687dddee0155b4b16ef436d79ab10aef653d7bb083fd76820f02e4c5d48f04d22dcd16d44d1893abf37ce4bdf3bbb1897d978cc199b89259103d9
 DIST ghostwriter-24.12.1.tar.xz 2709712 BLAKE2B dc04912628dbcdaf86f65212f6a3336e30f9c718e43649637402f1eaa2a4ba9d834028cad5aa771f7d4b17115d49473c327d4879c2de0026cbd5838a3d8b84d0 SHA512 589e09dd4969dcb25966b7c865010bb1458ee740357b89a1993a56562570643d3d2056a6a4e490715561d00525af189a71ea10c4abeee013d5a19a7ff72cd80c
+DIST ghostwriter-24.12.2.tar.xz 2709628 BLAKE2B e719417243253a0215db89a4bc8e5db2fdbda6a3fd426bcb7a8bb1b690bcc59409105d07a30f79c3c5b5b3fe5a3ba035c61925c4a68f0cf10371b15916ec790d SHA512 5bec0b521a067d7c46f5dbc8a93c7cd6fd7131ef93bde4d81915438ba8a5d8f8791410e13fc4c690891a203b8a0234285d8baf6d2bce6116040eeb7f2da6cf47
 EBUILD ghostwriter-24.08.3.ebuild 965 BLAKE2B 6bd2e42555641a7bf58c7b96ad2ae957b6461b960b0c9b348f340e683e8ebab767d9630d7ac77567a68efc13c1cde6a6a28ba6b283b4615a3ac9d8a51c66157b SHA512 037eb4da35001bdd29add5c590fcac3c5af8b57c5748b37f152e312177eee763a3d44a0e7de69c4947cc655f506f75116ee385cc59127f15beac753ff6ed7047
 EBUILD ghostwriter-24.12.1.ebuild 894 BLAKE2B 9181979af61a12a18ac338c9993d5f80b4ee3542a565a932265cf43ed45d9dbe0b63ae991bf0c94bba5d42cabf6c4603cd753b49471825b4902bb11a6a16cdb5 SHA512 758ae24247891841101fa8a158c2074e3099dd6b721f371d55ce3ce20761eff36e6a441d60ef892bb2e55cd5973074914683541ffaeb7195c498cbee9e83f30a
+EBUILD ghostwriter-24.12.2.ebuild 894 BLAKE2B 9181979af61a12a18ac338c9993d5f80b4ee3542a565a932265cf43ed45d9dbe0b63ae991bf0c94bba5d42cabf6c4603cd753b49471825b4902bb11a6a16cdb5 SHA512 758ae24247891841101fa8a158c2074e3099dd6b721f371d55ce3ce20761eff36e6a441d60ef892bb2e55cd5973074914683541ffaeb7195c498cbee9e83f30a
 MISC metadata.xml 380 BLAKE2B 8c20dfd3208e20d12c1c1fc2f6b75ac80c88175865f269859f5fd903dacec1371af3b6e77ebb905271ad58dc4a266dd7679ded9117c02767676bb7644e3ce060 SHA512 4af810107c31548de0663061ef865b124a7a0828e7955ee31bbb71c1e0cabf0420d494dca2e7c7ee2dd4adbb87c203a62b57e843757a3534ac6f97fb2a4b3d65
diff --git a/app-editors/ghostwriter/ghostwriter-24.12.2.ebuild b/app-editors/ghostwriter/ghostwriter-24.12.2.ebuild
new file mode 100644
index 000000000000..eafb0008acb8
--- /dev/null
+++ b/app-editors/ghostwriter/ghostwriter-24.12.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_CATEGORY="office"
+ECM_HANDBOOK="optional"
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Cross-platform, aesthetic, distraction-free markdown editor"
+HOMEPAGE="https://ghostwriter.kde.org/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RDEPEND="
+	app-text/hunspell:=
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=dev-qt/qtwebchannel-${QTMIN}:6
+	>=dev-qt/qtwebengine-${QTMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/sonnet-${KFMIN}:6
+	virtual/opengl
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
+"
+BDEPEND="
+	>=dev-qt/qttools-${QTMIN}:6[linguist]
+	virtual/pkgconfig
+"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index f6181d1461a1..1b40bf88fd1a 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -8,6 +8,6 @@ DIST vim-9.1.0794.tar.gz 18235753 BLAKE2B 6ab377e6e0661ff8d4f0de2526b29b1c58c128
 EBUILD gvim-9.0.2167.ebuild 9708 BLAKE2B e77101879fb3855544df6a9d8be09eb4aec3e3ac3b74645b510291e7ea505839462b3184e96cf32820c1f1f4f063bd4cf060b2b87fa772ec1360b82aba697444 SHA512 6b3b42b9a3080464de66e75fe1919e3decf0788e0308e02a589aa38c81e3cc98ac0f923c411cc103aa3ae4aeb43a321bb8ce5c2bcc13e120597d4282e286bb3d
 EBUILD gvim-9.1.0366.ebuild 9708 BLAKE2B fa829390eef0b056421483792e4e45eb299a892a40e373f184826d2a048d845bed9aed795116cc9f797c89c40be16c80c930a6ac976dc8fefbb065a53a8aca06 SHA512 60364bbc66abf530169410753de2dea34162d203708dea8a1355142671b20e09616fb3d777a4fbfa43c7dd8bfd895ab8637ecb38bea02d2e3e978b85c8995b5c
 EBUILD gvim-9.1.0470.ebuild 9715 BLAKE2B 4f5d1d5abd758395b0d8c53dbbcff40cb08796425401ab5738ce1c4c00bf9cd4634980ef96321f0d91ca534998d1d76d152c1fbd166dd12eb1fecd7012727364 SHA512 aaf95a75d77ea61510b8b8c62980194ec0593c2049910bb606fadb5fbf35c512d872eca2c80d0db79a1aac0589050fe897f94c877aaf2d648cfed1b30e41c23e
-EBUILD gvim-9.1.0794.ebuild 9715 BLAKE2B b29936c038655af6bf959eb2614f2f098e620a75cb87530719e5f9449635d5059b6d28dba9eae2ce6e73d6c022893461f33313a7663d06969b9bc9a834837196 SHA512 8d690e4af2e3a412e355b308893bfa139a00423a7f7be88666673b7b1a618b56370e0f7f8c9c4118655f1f81b16b0e868c146ad777a512e00244ce0f4d7bef8a
+EBUILD gvim-9.1.0794.ebuild 9708 BLAKE2B 5c6d1cb1ea6bf4237696c70af66f9abeb0dff37afc2ef0303e003b363f883d8f17299b0dfcd5bf3ee8140f45e58fb104e2272d2ccdf9d4f78676717eb2975fc3 SHA512 8b138f0d3e0e03db46e7bc2fb925f93dca4d39e246868c47ec2c2714edaf2f8aaa0224b9bdb3cf76ba80230ab5cbe3f8b7865d79f2ce06fe51d71bec43af950a
 EBUILD gvim-9999.ebuild 9742 BLAKE2B 3b595b3f12c1286e0b4d0f3ff113bd188a2d6e1eb18099123d545f16299e60d5aeb1fd5bd10fb1e0e13a77a1f9fea1bfc9b0559bb4e9da8e2568401435677ead SHA512 0f3293d01aacc1e27419bde81d4b372f1f0206c9706671b75510b40ffedf80f15987583d57d1207f6ef8d62a6a9cfe8ba4446195fd4c309dcc2f43a9e2d43c7b
 MISC metadata.xml 938 BLAKE2B 14b5a8f0a77608a07d2d8241cf4b48b4b418f905e688962f995495ccd2dc649d1ab2ab14076042d814e8a33df21557f2a76f78e9df5e8eb810f361a5c0930fa5 SHA512 3e6cb69512c6a02fb56e78c7d1f4e5223ba15ce0036df81dc536dd3b4c16bb76bb37f403a767473a2a2a8fa55e075e9f5142f6b7a0037d282569841a1032293f
diff --git a/app-editors/gvim/gvim-9.1.0794.ebuild b/app-editors/gvim/gvim-9.1.0794.ebuild
index c5c7b1f28b38..4812832cddaa 100644
--- a/app-editors/gvim/gvim-9.1.0794.ebuild
+++ b/app-editors/gvim/gvim-9.1.0794.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://git.sr.ht/~xxc3nsoredxx/vim-patches/refs/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 S="${WORKDIR}"/vim-${PV}
 
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 47999d78e49e..5789f25610c8 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -12,6 +12,6 @@ EBUILD vim-core-9.0.2167.ebuild 6817 BLAKE2B fe7bd045e25dd83d2539a299867c87d2638
 EBUILD vim-core-9.1.0366-r1.ebuild 6817 BLAKE2B 5bc996ffa6736298ae92e5f99cbc8cd6faeab6024dbce028edc99962ad10a7a17a6bdfb5ac8024d3dd001cabcefec3ffcbc42a50913c565d85ed118df1a21a20 SHA512 37934fdd2baca7f6bf831e63da76a8473bccc8f1f01a3390a82684c1a428ef96aa2cc704b244c9e427e10edeae6a0e3718f890b2223e46955270c4bdbd6dd9e1
 EBUILD vim-core-9.1.0366.ebuild 6825 BLAKE2B d7d5f94b1e3de2b01637f5d88fbaab865a734233051f1325ce0c00c0c5d3be3cab13f53a8d4de807c03ace978f4add2572b5af1b3178ea3a37c21dd42c5efe34 SHA512 41a3903fabe8f19d4761026395970cf9daa46fb06bf451a04c6ee9691488fbe24e93ae8f39f0c0e242652d7ccfa0a7b2cb8abefaa8a2d5bbb2caf572758f2e5e
 EBUILD vim-core-9.1.0470.ebuild 6825 BLAKE2B 541b2927de847c92ace00ed6044ea17734c6598b9cba7dd4dd01b584456e970fcbad8f70d401ef9dfe51d8fe445a729b006fc263780b5d06d7c2c9395ff6eac9 SHA512 7faf61f3c788635ce5a45d3c2126432d799dcb36b5e99cf02e2ae5c00c8a24f3a1eddb0896564f6689df9527726b958a559a2ca78ebcfc336535dd69de737784
-EBUILD vim-core-9.1.0794.ebuild 6825 BLAKE2B 541b2927de847c92ace00ed6044ea17734c6598b9cba7dd4dd01b584456e970fcbad8f70d401ef9dfe51d8fe445a729b006fc263780b5d06d7c2c9395ff6eac9 SHA512 7faf61f3c788635ce5a45d3c2126432d799dcb36b5e99cf02e2ae5c00c8a24f3a1eddb0896564f6689df9527726b958a559a2ca78ebcfc336535dd69de737784
+EBUILD vim-core-9.1.0794.ebuild 6818 BLAKE2B dda0c3a49b7061f0b61d03c9cc2f5fdb133a7124011026f99d338db0d3d76da60994d33188fbfc468914981b5760c42bc8528893e4e0ca94ab0bcd2cbc7efbde SHA512 be2e125b7262ba3b29f6416c97fa16e8849b1fb48b017953aa4e5a2367c64e48d6029eb914afee0426b17331253ab306c64b33a135b5e5a794f7c1592f1317c8
 EBUILD vim-core-9999.ebuild 6787 BLAKE2B ee2f83545712a4cbae9415418f56051205d9000c345d82d6439793e44e5c5da55660ea1aca4ce3b4059997bf35c8fb3aa189094949e6a878dba3c79cd91deefb SHA512 8ae40d5c23872aecb2acf313cfd629d95b73f7069a5fbbde5c9b444ac5bd5e5120e98fda4c610d34b59ed4cffe9ffdf9292626884d5345105834ec3d09e92ee4
 MISC metadata.xml 634 BLAKE2B 3f1b64411e3535e9d5f1541e104f3616be4793999c526dd87f478cc948ac4c564bd68a6477ca713cd2e73f775098a835dc071d66ba35d2a0abc9572e1107c2ce SHA512 b472d227fb1e3c97b0ede3ea67beb4969ef3ced95d040eef6f3ff35d4a669dddf5ad4db22bd1dd3178c4f2ea76b4ec49ad780b5c94c14324da5fd57607d4d32e
diff --git a/app-editors/vim-core/vim-core-9.1.0794.ebuild b/app-editors/vim-core/vim-core-9.1.0794.ebuild
index 11172cbf29b4..44626cc641a9 100644
--- a/app-editors/vim-core/vim-core-9.1.0794.ebuild
+++ b/app-editors/vim-core/vim-core-9.1.0794.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://git.sr.ht/~xxc3nsoredxx/vim-patches/refs/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 S="${WORKDIR}/vim-${PV}"
 
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 976d76759f62..e21d82d97d94 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -7,6 +7,6 @@ DIST vim-9.1.0794.tar.gz 18235753 BLAKE2B 6ab377e6e0661ff8d4f0de2526b29b1c58c128
 EBUILD vim-9.0.2167.ebuild 10701 BLAKE2B 2413e85a184601ddea1fdb5dc957721d14aadc85102d0c3adfb940b584b373b4866ab05141aa615da7fd26bd9cba3bf9b630d93e8b6aa961caad59b0e92b8bb7 SHA512 fd3a75397c75edcf98afca5c36d2a1fb4f32473225940307d931d03f6d593ea8cd5f713c44c7e66ecb1ebeba4cc14d8b6793ce28070a90c286e2695de5834289
 EBUILD vim-9.1.0366.ebuild 10701 BLAKE2B 62d478da83e4a3f57a04d3013a132099c742f5e32dc5922ac1ea1db4bc5aea6a730bfee4ee4894ba02171f808d29b73f1add64ce06b5f6b9003cea48afd0d211 SHA512 8e57ef49ef946346196438fb6faf4c1f8c61f6c3d1d3f0649c3f7d6ef69228628eb5e85c36a21106777789785f755b3e999c548fcacb791dbfac6963428f4904
 EBUILD vim-9.1.0470.ebuild 10709 BLAKE2B 267aeed5f60dbfbacf7b048447c319c2c15ac09ad12043f0148670bf67b972257618b59c3b5485917e4bf302cb440507536c18de52ca630b10001db24eb6ba8e SHA512 05dc71407504942a08f48067e248c84a99234447e224fdb1ab4a1c767bbd5685ff05c376a514a88db1b358fb16c3c7ace829a7ec5b2de2c58db7a61df78a2680
-EBUILD vim-9.1.0794.ebuild 10709 BLAKE2B 1ad38c71a7ad99bd91ab6df573c9923728b9235e23f1c0f54d69eee70ecc44a34b130f0063edcd025345ba000caf10c1503bad780cd332506295eb0b075daf13 SHA512 6cea92c86cbb93ff6fb52d6eb54252b16b3cb3f26fde520871ec6c98e7df371a722c31dce2228e26cf84ad6f779f9ec05591d9a7c256c6babdd93e204353e095
+EBUILD vim-9.1.0794.ebuild 10702 BLAKE2B 0c3822f5c86d00ae77cc6f1a096c1920635d7188ae82dd05f7e71e4dfc48be6bc70b976a2e0063371faece24a6e938343206b5b92b5f1d0f36c39a78fd806b94 SHA512 7fe532e79eab21da7a5654699f20bb2225513c5a22d659647afa87105738c2509dc0be0eb9beae0fab4f9d01cb710fa06e1f0b46035ec4841e094e43651b0d4b
 EBUILD vim-9999.ebuild 10734 BLAKE2B 49e1cc446b4c26470e23d3511a6e051c475c7a7dce5db37381ea09258a3006d60e536b857d44dd98d337d4006b38020e1b0b012fda3dbd34692869fc6d333dc0 SHA512 adbb618a06a2c857d604641ae7fc4394cc4ad090d4341b80fa9f81f7a0e396d9e29b1775ec7c100776b726000d3427d763f13136d99144e4c397b2881106d52c
 MISC metadata.xml 1164 BLAKE2B 39fb0d92234f77f68213d7185ca6c4f9145cca22f8a4c27f8bafeec464232b493bfea9f853ba0d5cd613885728ac0b10f1e11a16910af8fcd211a3a338904264 SHA512 d89a143dc214c3397c2a299b18e3499dc7797a39fbaa731dee2887c9f62b367f1d3f79b7f76b7014ad31caf8ef3bd612c9881b2f72a6b79142684f222483b157
diff --git a/app-editors/vim/vim-9.1.0794.ebuild b/app-editors/vim/vim-9.1.0794.ebuild
index 80ea5b2aeb1a..9ea9fe31a46b 100644
--- a/app-editors/vim/vim-9.1.0794.ebuild
+++ b/app-editors/vim/vim-9.1.0794.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://git.sr.ht/~xxc3nsoredxx/vim-patches/refs/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/vscode/Manifest b/app-editors/vscode/Manifest
index 0b6bd760a8c7..b131efdf8678 100644
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@@ -4,5 +4,9 @@ AUX code.desktop 755 BLAKE2B cfdf0c610aed6269e9d1dc05a26bc80a1f8d3d513e1944d0932
 DIST vscode-1.96.4-amd64.tar.gz 149442416 BLAKE2B 50003ff1b0bc04f53040d6b3119826bb92a9318dfa54d42ce326f2b9e6d00f8c0e57f3a0119d994ae7a5b773964c488115f70b0ce6d95840d206fc5397bc6e24 SHA512 67b25bb6f130aaaa74bfc98d9636ead3db03ad09827e71848a578b87ad90de940b6379d0d71acc6c8305ddabb47f3826ee12ee9eb17e51fd7b8b5112e70ac461
 DIST vscode-1.96.4-arm.tar.gz 133502392 BLAKE2B 5c01b9c40332cc39f66de17b37623d26b92a9fae797526caef472274e8c5d6c5f84dc52e110cea4a0288ae229634748fa1d0b1992ac5c57fb8a27b9a00cbf205 SHA512 1233dcdcabe640be59ddd9f3d6da1d34ccff165406dc2139b387708f5b95c941b1bb9e7506e3ae50af164ee9192d6f33cb99248f52eac5082bf352c508a31673
 DIST vscode-1.96.4-arm64.tar.gz 145445086 BLAKE2B 4caddcccb57e9e8623cbcf03f4fb9dfb6c9cf2a4456f655346cf0ddc264a9e96a99a768695080f382972c4e876651c334405f23dadcccbe412e866ccd6b15631 SHA512 fb987dfd85c529be46c7a76d4a44c4a3aa0a4e6a0a9df2cfa5e4984d4849cbfbf772dff6b410957fab92f560a56bea499309d14b682d293ac8e9dfb56c601e71
+DIST vscode-1.97.0-amd64.tar.gz 150727110 BLAKE2B 6203cafb733a251618830d46901bc5be50c137e575ec0955141d1bfaad778d9e2fe01d45866e0d3bcfeb7759f869544fa64ef09eecc2980a2e10a10df9f14e2e SHA512 518dbc3d17455c0096f8b21b47549c429745c818cfc938711cb6af1f325ea126ab7c9b80e3cb1e43f596854c4ddbecf2279e7cbe6b8e0bf692569800956ebf73
+DIST vscode-1.97.0-arm.tar.gz 134802622 BLAKE2B 82668537dfac9347f2ea0ee63838c7973a6636c968cec3a00ab59f67e6177c272fd5790c8e0e888fefee3ba52cde14705c4debf8ce248809a51044fabd378603 SHA512 9b7b7b10b711355cc3f3034161190984aa2d164438d15d584f00d13559d8ddb3cac0d3dde208c694553997c17cc26510c89c96366d9d156a9f4918b594b633ca
+DIST vscode-1.97.0-arm64.tar.gz 146745694 BLAKE2B b5a63442a9894949cdd92aee42fc7a8532b7d798d47d0d1aa37fd60a78b9e51aef8bab216c75ad9be0aa25f5efc0635de8abc40fc09b33557de3d82ae2e7fd65 SHA512 43b432617d6fe5c586c1af68e6bf49587c6196868e9bb1d6b0782a95f489ef23745ce7b3e6516f9464ecfd602f5fc77b102bce511f123eb6bb3bdca9987a305f
 EBUILD vscode-1.96.4.ebuild 3209 BLAKE2B 85c101cc8d9ac0a112bf05d3d3afa7da8199f591d5cf6a57e282d41f41de8847edf2b25332f2449ec02d26d73c041d06979c7c17f9bc89eef371ed442852e372 SHA512 54061161d63591821a564cee0eb3608cbdd4f02472c77bc61ed89b30390b429ba5528e2790598c8c9b415feeda5e3132a4d736be12df7e92e5fe55aa17524a76
+EBUILD vscode-1.97.0.ebuild 3209 BLAKE2B 85c101cc8d9ac0a112bf05d3d3afa7da8199f591d5cf6a57e282d41f41de8847edf2b25332f2449ec02d26d73c041d06979c7c17f9bc89eef371ed442852e372 SHA512 54061161d63591821a564cee0eb3608cbdd4f02472c77bc61ed89b30390b429ba5528e2790598c8c9b415feeda5e3132a4d736be12df7e92e5fe55aa17524a76
 MISC metadata.xml 1319 BLAKE2B 02076564e7b3b37433125cdcada4445311f03699bc7adb00f60af4f73f2fa9ebb90b805885198bd7cbdc54b779fa259d56c3142b30d595eaed278130081d8ca7 SHA512 d0922226274b1686ea14c8ca4e5835f6b30399bd71372bde4ac7e4eee4301ccca7fc32472d6ac0bd598b0459ebc33a59d346a21f5fa2d39cac4ed197682354e0
diff --git a/app-editors/vscode/vscode-1.97.0.ebuild b/app-editors/vscode/vscode-1.97.0.ebuild
new file mode 100644
index 000000000000..04f694acb893
--- /dev/null
+++ b/app-editors/vscode/vscode-1.97.0.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop pax-utils xdg optfeature
+
+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}"
+
+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"
+IUSE="egl kerberos wayland"
+RESTRICT="mirror strip bindist"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	app-crypt/libsecret[crypt]
+	app-misc/ca-certificates
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/libglvnd
+	media-libs/mesa
+	net-misc/curl
+	sys-apps/dbus
+	sys-libs/zlib
+	sys-process/lsof
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon
+	x11-libs/libxkbfile
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/pango
+	x11-misc/xdg-utils
+	kerberos? ( app-crypt/mit-krb5 )
+"
+
+QA_PREBUILT="*"
+
+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/ThirdPartyNotices.txt || die
+
+	# Disable update server
+	sed -e "/updateUrl/d" -i ./resources/app/product.json || die
+
+	if ! use kerberos; then
+		rm -r ./resources/app/node_modules/kerberos || die
+	fi
+
+	# Install
+	pax-mark m code
+	mkdir -p "${ED}/opt/${PN}" || die
+	cp -r . "${ED}/opt/${PN}" || die
+	fperms 4711 /opt/${PN}/chrome-sandbox
+
+	dosym -r "/opt/${PN}/bin/code" "usr/bin/vscode"
+	dosym -r "/opt/${PN}/bin/code" "usr/bin/code"
+
+	local EXEC_EXTRA_FLAGS=()
+	if use wayland; then
+		EXEC_EXTRA_FLAGS+=( "--ozone-platform-hint=auto" "--enable-wayland-ime" )
+	fi
+	if use egl; then
+		EXEC_EXTRA_FLAGS+=( "--use-gl=egl" )
+	fi
+
+	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
+		"${FILESDIR}/code-url-handler.desktop" \
+		> "${T}/code-url-handler.desktop" || die
+
+	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
+		"${FILESDIR}/code.desktop" \
+		> "${T}/code.desktop" || die
+
+	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
+		"${FILESDIR}/code-open-in-new-window.desktop" \
+		> "${T}/code-open-in-new-window.desktop" || die
+
+	domenu "${T}/code.desktop"
+	domenu "${T}/code-url-handler.desktop"
+	domenu "${T}/code-open-in-new-window.desktop"
+	newicon "resources/app/resources/linux/code.png" "vscode.png"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "desktop notifications" x11-libs/libnotify
+	optfeature "keyring support inside vscode" "virtual/secret-service"
+	optfeature "Live Share" dev-libs/icu
+}
diff --git a/app-editors/vscodium/Manifest b/app-editors/vscodium/Manifest
index 86b631fa033a..39f749fb5db5 100644
--- a/app-editors/vscodium/Manifest
+++ b/app-editors/vscodium/Manifest
@@ -5,5 +5,10 @@ DIST vscodium-1.96.4.25017-amd64.tar.gz 136744379 BLAKE2B 026a3ddb4fd9e8e7fc5fc0
 DIST vscodium-1.96.4.25017-arm.tar.gz 122803904 BLAKE2B 4cbdb76f6506a2027b62de42d9c78104498dc29318a7c1dc5c0dcfd7c04b22f3f054b14a0394dea06f05b5d682c55ef6c54f0e45e8225f62de3b3920d61d997a SHA512 cb57aa02b7a888ff1b66708ce714bd4b53c48f665398c6ae26745c35017cfd823bb2ab499d03ca390c6d37ac98b650ea57d38420faa5efa0f48c2b8478afad61
 DIST vscodium-1.96.4.25017-arm64.tar.gz 134709728 BLAKE2B c490f8ce89a8978c6a1b7a6d770e34190348558f52c30d0389a632a110ca9ce8e59e495755684258737725249f61cf4a9aa54cec0358106975c34ceccb79d1eb SHA512 bbd7b3f10d72336d8ad130d7ad575590eb9c8c74d48f61c0f77e73676c923ff8d7892cb44fb730ecc1850b53676bf1ad22c43333b1a609b56204cfdea06322b9
 DIST vscodium-1.96.4.25017-loong.tar.gz 142672651 BLAKE2B 5d176dcbd52fb9bc3aa8d5c1295ae7b94f8ea8f1b552de5a0e88af8d06a513d1fbb63be4cbe6fc76ca57b7bce41e24f18b10101c96efa50d3ea644df8a7f50bd SHA512 6ab8eee14fa371580e34b022096742b9aba3cfdd679c78d73ad92d27d6dc67d51d85baeebc2dcd6ab544fb290ea699442961fe66069d8baa6d3ae2c6b7e172d4
+DIST vscodium-1.97.0.25037-amd64.tar.gz 138068498 BLAKE2B 142d339a9292c075964e18976d92402f390d56a2bd8dcf1feeaf14957faafaca13c6f648c2e73cdc7b32bfeb3c45213c78dcc14490dfca44091f275770b7b4c5 SHA512 09832babf28639abe6a7765baf308f60497d3bc82c41ca493971d592a3cd82f69b54235097ad80530290decd1d6c999018a0b928d188b5d24a8adf5926c62b83
+DIST vscodium-1.97.0.25037-arm.tar.gz 124135009 BLAKE2B 67fbf730f5d33f475f6d77e2b0cd8a8816660ff3b280e327743df0260b787e3d6c57e802cfb78c6b024ed271804051c6340b9653466d34ffa2889ecdcabc691d SHA512 40d53483e796a30f0f3736a08badd6880e6b3b531be5b65a667fb6db778df2e2d53a603bd15d3d7680ef2059ecdcf7efc290f47e7cbab52a24ebc21044a100e1
+DIST vscodium-1.97.0.25037-arm64.tar.gz 136046506 BLAKE2B e924139fd325a50a691add5c6f7966bc886b7b843d71d2dcc60d02ec46102d4945920c518a9bf1e1cc726aa88dadcbcaed1f47b7ffb5ac7f0e655d91c1e8c491 SHA512 85cd536eccc9b95de184b0ccf582a206016f44a75f068c42b344d8f96e5ad47662fafda991f9e3cb5f55b9ddea1e31fe19416609ac83f029b9b02e8efa5abc1a
+DIST vscodium-1.97.0.25037-loong.tar.gz 144013678 BLAKE2B 1258eb5e0c5e0c83bfbcf288188249062eabb2f9488866aa016381dab5779f0dea8c4727ea6c04c2e46bcf717c328a881615a711d3e7f7088948b38b1dc35024 SHA512 03d7361dc20fbb2b52da4a5be0d3b5bdbc8786837b67cb7fcae50148c73b538b58504a3be634020faf99c690113f72740bbdf4f5f5d3b53f262a3e482aca3ab9
 EBUILD vscodium-1.96.4.25017.ebuild 3112 BLAKE2B f29aaf3d218fc4da3950985570aee905a9ae6e3d0d0fd0b1f7af270497893407813a2b2295f40fddb92766865747e072cf59ae697d6a2c41a80ddf0762ecfcf3 SHA512 29de6bc03b2ad244f6350af7173e4e19049124b99df0355e0d060b8a11160f6a9d92abf901e3910811c69847e156c777b8d40b4704475f95ef6c0aaa04ea22bc
+EBUILD vscodium-1.97.0.25037.ebuild 3112 BLAKE2B f29aaf3d218fc4da3950985570aee905a9ae6e3d0d0fd0b1f7af270497893407813a2b2295f40fddb92766865747e072cf59ae697d6a2c41a80ddf0762ecfcf3 SHA512 29de6bc03b2ad244f6350af7173e4e19049124b99df0355e0d060b8a11160f6a9d92abf901e3910811c69847e156c777b8d40b4704475f95ef6c0aaa04ea22bc
 MISC metadata.xml 1563 BLAKE2B 63d5132bcea2c419facf49b2d644bf1f58f44da333adb8270aedaaa289563ff5d116a0700df1306bdf1e7d2628f72959b8f18540486d3ce56bfe67adb925d8fe SHA512 ea75764cc70ac6a9452600a106de3784baaa9f84fa5b1021cea2be073636fb0fc8c6904a7db2a560ccb2bba491d76125e5996e0aac28ea11cd039ae16972e595
diff --git a/app-editors/vscodium/vscodium-1.97.0.25037.ebuild b/app-editors/vscodium/vscodium-1.97.0.25037.ebuild
new file mode 100644
index 000000000000..6d99fa43b043
--- /dev/null
+++ b/app-editors/vscodium/vscodium-1.97.0.25037.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop pax-utils xdg optfeature
+
+# Usage: arch_src_uri <gentoo arch> <upstream arch>
+arch_src_uri() {
+	echo "${1}? (
+		https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-${2}-${PV}.tar.gz
+			-> ${P}-${1}.tar.gz
+	)"
+}
+
+DESCRIPTION="A community-driven, freely-licensed binary distribution of Microsoft's VSCode"
+HOMEPAGE="https://vscodium.com/"
+SRC_URI="
+	$(arch_src_uri amd64 x64)
+	$(arch_src_uri arm armhf)
+	$(arch_src_uri arm64 arm64)
+	$(arch_src_uri loong loong64)
+"
+S="${WORKDIR}"
+
+LICENSE="
+	Apache-2.0
+	BSD
+	BSD-1
+	BSD-2
+	BSD-4
+	CC-BY-4.0
+	ISC
+	LGPL-2.1+
+	MIT
+	MPL-2.0
+	openssl
+	PYTHON
+	TextMate-bundle
+	Unlicense
+	UoI-NCSA
+	W3C
+"
+SLOT="0"
+KEYWORDS="-* amd64 ~arm ~arm64 ~loong"
+IUSE="egl kerberos wayland"
+RESTRICT="strip bindist"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	app-crypt/libsecret[crypt]
+	app-misc/ca-certificates
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/libglvnd
+	media-libs/mesa
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/zlib
+	sys-process/lsof
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon
+	x11-libs/libxkbfile
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/pango
+	x11-misc/xdg-utils
+	kerberos? ( app-crypt/mit-krb5 )
+"
+
+QA_PREBUILT="*"
+
+src_install() {
+	# Cleanup license file - it exists only in amd64 tarball
+	rm -f "${S}/resources/app/LICENSE.txt" || die
+
+	if ! use kerberos; then
+		rm -rf "${S}/resources/app/node_modules.asar.unpacked/kerberos" || die
+	fi
+
+	# Install
+	pax-mark m codium
+	mkdir -p "${ED}/opt/${PN}" || die
+	cp -r . "${ED}/opt/${PN}" || die
+	fperms 4711 /opt/${PN}/chrome-sandbox
+
+	dosym -r "/opt/${PN}/bin/codium" "usr/bin/vscodium"
+	dosym -r "/opt/${PN}/bin/codium" "usr/bin/codium"
+
+	local EXEC_EXTRA_FLAGS=()
+	if use wayland; then
+		EXEC_EXTRA_FLAGS+=( "--ozone-platform-hint=auto" )
+	fi
+	if use egl; then
+		EXEC_EXTRA_FLAGS+=( "--use-gl=egl" )
+	fi
+
+	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
+		"${FILESDIR}/codium-url-handler.desktop" \
+		> "${T}/codium-url-handler.desktop" || die
+
+	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
+		"${FILESDIR}/codium.desktop" \
+		> "${T}/codium.desktop" || die
+
+	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
+		"${FILESDIR}/codium-open-in-new-window.desktop" \
+		> "${T}/codium-open-in-new-window.desktop" || die
+
+	domenu "${T}/codium.desktop"
+	domenu "${T}/codium-url-handler.desktop"
+	domenu "${T}/codium-open-in-new-window.desktop"
+	newicon "resources/app/resources/linux/code.png" "vscodium.png"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	elog "When compared to the regular VSCode, VSCodium has a few quirks"
+	elog "More information at: https://github.com/VSCodium/vscodium/blob/master/docs/index.md"
+	optfeature "desktop notifications" x11-libs/libnotify
+	optfeature "keyring support inside vscode" "virtual/secret-service"
+}
diff --git a/app-editors/zed/Manifest b/app-editors/zed/Manifest
index b64329773ecc..9bcb73915d47 100644
--- a/app-editors/zed/Manifest
+++ b/app-editors/zed/Manifest
@@ -7,6 +7,7 @@ DIST blade-e142a3a5e678eb6a13e642ad8401b1f3aa38e969.gh.tar.gz 3304563 BLAKE2B 11
 DIST cosmic-text-542b20ca4376a3b5de5fa629db1a4ace44e18e0c.gh.tar.gz 180043 BLAKE2B 44f4429467d7e54c5348d564ae565c8e8759ccc482045ecc9fe4e3ca6c03c45f6537902e7d8867b557e0b0d1017f03b4e24f63e48a51b774e576da42439c7bb1 SHA512 7a31d1816debbbc892fd16b7b84994569fb046dfcf7f68a1be47885d4a01194f4a849d6d2e91dd534be7c39a0339108711b7017eebc15cd64b63014b5a5b57f0
 DIST cpal-fd8bc2fd39f1f5fdee5a0690656caff9a26d9d50.gh.tar.gz 120253 BLAKE2B e40b9097384b66454b3250a5fdea79c1db3453d08c96bf83a7f8c2aedd361bbd23e3a74ac9b542e284f642605b03180b5ecf6c104772b9fedf79c26709f42d4d SHA512 8bcc10b1e6d278034c2f999bbb858b2d681862c9d4170febde4ab0026a32dae8894fbe7a029c5c6f444ab7bb02b1afea33947919f571c64400642efa334a5452
 DIST font-kit-40391b7c0041d8a8572af2afa3de32ae088f0120.gh.tar.gz 1289463 BLAKE2B f35f28341ad40c77434f2765fa6ab546a3b1eeb950dd3f92ac90676f0005167aa84772d62852c45e2c24511f5e79cc8eff7844e5382bb21212c8f08cedd890fd SHA512 c6848000f0ba629b9b001618f06511882832f0334095606c7d6d4929f56a9d78fbe2db04411732619aafbc128cdaf44e7a6d32d351d0577b439cf2e0fa343682
+DIST git2-rs-a3b90cb3756c1bb63e2317bf9cfa57838178de5c.gh.tar.gz 257303 BLAKE2B 0104bde155d4a8bbb99bd0632cee0d6df29c8091296fd85bec146b2983005f02552d74022ff1f0ec30c57f175eeffeffe9ec5596f1561ac83264b9126b9e7d66 SHA512 3f8bb1c8dd65de41b9ecc061a4eef67d70194f1c40bb3c74832ce4d3a4e20b37c3a7279606a2602394fff49524596ea9fda3694dce602b9e951ca8bba3c44162
 DIST livekit-rust-sdks-060964da10574cd9bf06463a53bf6e0769c5c45e.gh.tar.gz 6266797 BLAKE2B 57669579275548c764ac54c251e67c51b327b6d07a1d6381e84ee8b47323b58f541f51ac187f1cbbe70e43763dc3c93f787339fd88eee2215caf7ad092a04bac SHA512 217b9646c5266b4c4e6bc22490c5b9408496641da932e924fc2835a91224412edd374cb8f691d41d1cf82cead4dbdc067f34497e53bf66c7bffb535c5c6a7734
 DIST lsp-types-72357d6f6d212bdffba3b5ef4b31d8ca856058e7.gh.tar.gz 70057 BLAKE2B 56e987fb62ee832ce6049a58a9caec08293d8a104aec43cbd4800e19f11a0b01980b231b54b7b3845b265caf7c35fb987844f6dcdbf3370a8bfe64869d25a6f6 SHA512 3df8105950ca1d0b04e02b78aae90849937691e5d5edd00d24dcdb2dd06a53cb97e6fee09611d28289d53dde9f556ca722e4dc804ab398c095b1e144c7227300
 DIST nvim-rs-69500bae73b8b3f02a05b7bee621a0d0e633da6c.gh.tar.gz 47933 BLAKE2B 4fbb0f1bd14fcbc708a52357c03574e7fe864f4a33fd7202f13bdbc1527ecc4f14377994c2d1bab9806ca921cab9a6287abd91e70802bfba4526f12b71587238 SHA512 ff75686616e5e2fc2a8629c5a03922f5a97963da42054bfe2c1c8f54edccf7b2a0f1d624460e4f51a04ee6c228b174c7308a68ff504ea5efe10df0edacbb53de
@@ -28,9 +29,9 @@ DIST zed-0.165.4-crates.tar.xz 100617284 BLAKE2B 2ae775115768befa1509f57a3c6177b
 DIST zed-0.165.4.tar.gz 13286399 BLAKE2B 971ae47f9344d8fd07dbd0237a61a04b62f848f5f5eb84542e1d5e86ddae07603387c48af1e6068a94d3dea910a0234102f63a64f59b88d482398f4ed69346b5 SHA512 ab55422f05eeac551a485be147ee0336bdd790ac51ff21c719c1f432735e695be0e25f747bf2ba92e0f06bce520aa328f867300647d9828ce282bec87f61fe07
 DIST zed-0.168.2-crates.tar.xz 102307616 BLAKE2B 07c3b4270cdb230c1821dcdbcf8d2412e22bcd83d0bcad8d920cb8a24fb7759c94ef631ae3aa043b9fe7435c36fdd4737dcfe88b4cf8e754c91901b2061c6fc3 SHA512 e0e347725001e6d30af3e19556ba698c058572550da928efb6cb8ad2525c25cb2a8234a0ae3bc6a7c3ad9abdeb9b84336b82e11fb0574ce1e3ef02a8b641d850
 DIST zed-0.168.2.tar.gz 13487508 BLAKE2B 7e9f8a73eb461f852d85f9596f3db1af0ce56c5c994c413a90b270d5b2b5bb2e994f78853a17b5579ba9905f761cec11d56c67a686643ca5ae4a36dcd83cfb5f SHA512 c7a1c93e044879209dd19b00dba7e046b13175ed82a4968c1aabe1f1605a61605cb4d8d7906a186c61c6129d59a58e14dd2f336263b301f8b59d3e9f7b332f1b
-DIST zed-0.171.3-crates.tar.xz 102307728 BLAKE2B d0eb6c2af519b0ffa02ec8100d32ae451f0268b9048eb0f47b27fcceb3a68f9837adccf9bcf628f93b9217cca8927911be068ad26c8d405e7e8f5cab80005e04 SHA512 d1e46b754af188793fb91c4772ade052e2635a91061f3ec5046b71b5faa92ccbffbe69a6be27787b1ec73c5a1a604082aa80b43dac25f9f35322157b6b58cb07
-DIST zed-0.171.3.tar.gz 13569223 BLAKE2B faa1b6645aae26b3111f68a075a9cbe0d60a774343d222b0a65959b4b49ee74a281b89e1159388ebfe0b1767ee46707f494b0d66361936021c7eaf449e1c30c8 SHA512 d605807449f474b85be486f7f255cc0cd97253e791d3921058481de002f45bdb0438be86d6789ebc2622ab1e82ba43248a92c2461ed7a04417c21302ad9856f7
+DIST zed-0.172.8-crates.tar.xz 101309808 BLAKE2B 98770d79f4cddda7c8215760a4856b42107414d50c0b28499e8dab334e36d7f1629034875f396cf3e342ccac562bf71d6be61e360f57388badca594fe691fcb0 SHA512 3b549b155ed160350852f71281f966a35900089f85fd05190d15bbdd9a257c124aa313ad1ddedc0c5f644d0f64f49d8c86091aebb0f897e5a51640bfe48d9007
+DIST zed-0.172.8.tar.gz 13619615 BLAKE2B 5cb194a6e234ac8273e81f2ec6991cea9956d7094940a0c3d932d6e4a7ae599dc48a82e7a60be182612b789dbb35e0b31690c76798dfe45751b5de680cfa5aa4 SHA512 c45ac9722a4db274b6a856442f8351ecd1955e07deb2e9efa250e9748ae7b10c8c69f53c6297d21790e74fa065e70e2731010c8dec74fea13a0bd6ae61a2cb04
 EBUILD zed-0.165.4.ebuild 9509 BLAKE2B 12979687e47d1b8df2affa08f32cc4cb118578477e5946649654dacbd763149194ea14e5ef250b82dd374bfa777d1308c78a2c6774403626a79ba21e1c7210cd SHA512 665ebb2c035faa9c5219bc057d45fe6e102f39d84649d67d2e0403949604fcd114128a5c57192fbc28a749fd583ab163121b7ca5f4a9715e9fd0d40539c51ce2
 EBUILD zed-0.168.2.ebuild 11505 BLAKE2B 1b614242968c757bdece760f455d25e8b34502098d31523689fc36918b8228e9d85d60292af85f502338dc69d2139f2f9347bd1082deeabe8bccd54c5c92a538 SHA512 5592cafac8272ce0b21526041803b3100218f3133dcf937866b9fd3ccd987b5636ae3d7bd62963a4818b530c69c662cee00f27d0c95f617dfc92b8fde49d8fbe
-EBUILD zed-0.171.3.ebuild 11911 BLAKE2B 01ec7b0a23c12c37edb146110f266ed49417260214e422fd152f8b922e0dd4bded2f58288b23ac394170eff9d114f92eb7a6de1be2df450e3ee68677db817d73 SHA512 5c18b2bc2c605bbea4f63a93d3fb8fbce1530a895e32b4bef2ff7ad4a1eb89449c2290bc905846bbb7ecdb1816b0d2027bd88586b740282d271953f8ca6ae571
+EBUILD zed-0.172.8.ebuild 12140 BLAKE2B 52fb899a51506d44ddf5998b1f34fac55718512b85ff5fb190f5f8e38ee3fd3cd1a3b3b37af2f7b6e94c745503e7f5ee3a9125e70ea1bf3454dd02142064616f SHA512 212d6b79ca5692cc0ee627ba56ef7ca6707144d2952d64ff68049baf0dd7feacd5f0ba9ab57bbfff7e2871207233afcfe1ea10d5b241b1d697a1412662cc8d15
 MISC metadata.xml 575 BLAKE2B 3793593f06424fd3986e23cd148b663bfcbf5c1dc0f76847a3991bbdde8badfdc863d0994ba1b59fc0e886243ded4e4421da4b4bf6d2951887801f78b0d6d290 SHA512 b0660a1a36d59dea6b9a6e25a239f0484e1cbf98a6569dd17d6bae1145f12d7e3ac2609bbce32627bf7ca6161581cd82c087d7deb17dd662c23bd81db6465a02
diff --git a/app-editors/zed/zed-0.171.3.ebuild b/app-editors/zed/zed-0.172.8.ebuild
index 0801c69a8767..6a96d8111b74 100644
--- a/app-editors/zed/zed-0.171.3.ebuild
+++ b/app-editors/zed/zed-0.172.8.ebuild
@@ -18,6 +18,8 @@ declare -A GIT_CRATES=(
 	[cosmic-text]='https://github.com/pop-os/cosmic-text;542b20ca4376a3b5de5fa629db1a4ace44e18e0c;cosmic-text-%commit%'
 	[cpal]='https://github.com/zed-industries/cpal;fd8bc2fd39f1f5fdee5a0690656caff9a26d9d50;cpal-%commit%'
 	[font-kit]='https://github.com/zed-industries/font-kit;40391b7c0041d8a8572af2afa3de32ae088f0120;font-kit-%commit%'
+	[git2]='https://github.com/rust-lang/git2-rs;a3b90cb3756c1bb63e2317bf9cfa57838178de5c;git2-rs-%commit%'
+	[libgit2-sys]='https://github.com/rust-lang/git2-rs;a3b90cb3756c1bb63e2317bf9cfa57838178de5c;git2-rs-%commit%/libgit2-sys'
 	[libwebrtc]='https://github.com/zed-industries/livekit-rust-sdks;060964da10574cd9bf06463a53bf6e0769c5c45e;livekit-rust-sdks-%commit%/libwebrtc'
 	[livekit-api]='https://github.com/zed-industries/livekit-rust-sdks;060964da10574cd9bf06463a53bf6e0769c5c45e;livekit-rust-sdks-%commit%/livekit-api'
 	[livekit-protocol]='https://github.com/zed-industries/livekit-rust-sdks;060964da10574cd9bf06463a53bf6e0769c5c45e;livekit-rust-sdks-%commit%/livekit-protocol'