gentoo auto-resync : 07:06:2024 - 00:08:01

25 files changed, 394 insertions, 40 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 31abddb8f1e4..50863b9c468f 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index e5947154a73c..bd419d20c9d4 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -10,7 +10,7 @@ DIST emacs-29.3-patches-2.tar.xz 2304 BLAKE2B 1005194bc2ed6d9be0cadcf449f4f82c1b
 DIST emacs-29.3.tar.xz 52203168 BLAKE2B 73651c52e508d5341f66659bbaf98e839040239198cb66f62239f489a961794adf837d9a14e9b605f059b7b612803e0ce5998ec47100ba545db642baacdb55ec SHA512 efaecfc46a0b88f61de477d92c08ee592b8838e6c34724151a3b1502efa7ebd4d4837733c694807e6de1ba4b8d37d2ec382c6bb2ed000b67ad8f0e11c7df2a6b
 EBUILD emacs-18.59-r15.ebuild 4452 BLAKE2B 054147542f5dcdb5fb86d07194e231ff00babde084c417a648516753cf276e0e65a4da3f78c0154bf31d3f410c4afcdf9ccbeaa2a1275c29fd01aacc15fd6d70 SHA512 c1c377cd37bec24c0b845123f109d69de113c22ce85eac9a9efd4b063f7c2c2f07666f7dbf93cf2c9c89d1b15290ba63f1e83e446a245e27c2d8a4b6ef15c9e2
 EBUILD emacs-26.3-r18.ebuild 12058 BLAKE2B e3e6e94f87433dfe6383df3b274516e362a7a5c57a37039e6c6fcb48dcaeec259b158dd65f78634456bdfc666a06e4631c041b8cd4bbed4e9f44ac93b9ce593c SHA512 b0b38e72cd26d8a4e55bd01e8024ed00b58f2d53394fc71816ac6bf12862f090b73c7ebcc15932152daf9ce0eed15b07764069cab0b587c988003e96271d68f3
-EBUILD emacs-27.2-r16.ebuild 14702 BLAKE2B 65f7b1e1846061f82558d871aee918d4ccc27509de3934a8191635a5ec4d24344372910032025f7d60c593f6334b53ad3ebd7e9215021203f2d879acd04a4afb SHA512 c03ba14861609aa0e2575a592c523d5cbf3a2814d4282163b010efdd0bd8caa6ebc9d1aed4196af2d689fefe54b82fe6de942ad42151eeb871d2ee4ac785a64a
+EBUILD emacs-27.2-r16.ebuild 14715 BLAKE2B d1b23b16eb5ad44008e9acb0fd724dd60d99707018438d9180130096864e3cf340a44fce209ed360fc1d126df1d913ce6db97081e1ab2116038346acedc6314b SHA512 b0643ae76f3feadaef083e1c9c1933953b3c43fb0d968a4da11cac4e924dea6c5edd5f5ec948f021a9ce0808d283c00522de776a62a40dca8e1371337433fe03
 EBUILD emacs-28.2-r12.ebuild 17669 BLAKE2B 48a6250876577f34dcaee56fc5466aa003922abc7cf36d1c149cb5a9c7bd7d0b4718b7adc963228ed8987779968bd203602622c12c9433bdde3ae89b0a752c6c SHA512 9774289bfe30b4b759b503ff016f953fe28ea6cfba44bfec8af1264ae2471c2a697f5a225c93b06de07e96305340afd7cef5db89a7639c642311b74539f89f83
 EBUILD emacs-29.3-r2.ebuild 20499 BLAKE2B 519b8f3e80403f98e2d633ecc00ed876328bfa8544d1b13da0b456d2a1928c4b8d7aca315d18daa9c86d4e98ff9d411a9a77bd30bcb69c27cfb0fb7007fe558f SHA512 7e467e8d4e3256e5e47ad630583d815e78f0ba927ec0396cd5f2aa58219bc8443a81cb2f7e625054f0ec7b84077d0222111e8ad1b88be12618d7c7a8a8cbab36
 EBUILD emacs-29.3.9999.ebuild 20086 BLAKE2B 790ee8c13297c57050d81f1a19b311f45d4cf937c896ef1eba6a03c1250dc636111a9fa29d3b68a6e3ff2b37818de4ef2ebb769ef04bdc66082c6512a10eaf9d SHA512 1cec36a0438b7d9d78325e2f0ef809fa0d0dee99f6c2a5f75fc163f38c9d6bc2935e824c33f0deac2484d64d56207cf3eae5a173425a4047fb55c3a988371481
diff --git a/app-editors/emacs/emacs-27.2-r16.ebuild b/app-editors/emacs/emacs-27.2-r16.ebuild
index 811b5cfa5e5b..8606abac7305 100644
--- a/app-editors/emacs/emacs-27.2-r16.ebuild
+++ b/app-editors/emacs/emacs-27.2-r16.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools elisp-common readme.gentoo-r1 toolchain-funcs
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
 
 if [[ ${PV##*.} = 9999 ]]; then
 	inherit git-r3
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index eaee6f788444..a54ba0e3908a 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -4,6 +4,6 @@ DIST vim-9.0.2092-patches.tar.xz 2640 BLAKE2B 3a4b2bc57712de3b92b0e8d9b2d428e4d5
 DIST vim-9.0.2167.tar.gz 17405049 BLAKE2B 496c8f9672bc4ecce743a145bc2b671bf09034b2875e728406b318c8b12e2d8d4ee3423ce94f8749679f07d36f229954f7ef0b12ce7bc4d71ccf6637ce2d6029 SHA512 6a9a785b1915dc167210b0da4d5e4401c71ee49b3554c8a22566378658ddcc3493562897ea39035852399cc5ffb55a73355ab13390c27a4d00ffd76bcd10ddf0
 DIST vim-9.1.0366.tar.gz 17861209 BLAKE2B 8771f5ef6a966c1b5992a437dd6cf1de9525458f61a4cd8fa53737a7bde29a4da101668639a301288a266ee8b3911857d1ba5b4e88870b60473eb1eaa608d7a5 SHA512 11be2a6e349c7b6d26fc1943c35ea18c662baa4f30ae76936eefb30e0b4d988bfcaedf7ecd2c3903f64e23c75957f55b9bb4073e0f38c7eb10ef0ee0dc652ddb
 EBUILD gvim-9.0.2167.ebuild 9887 BLAKE2B e5834640a338b28612d8185b0364f3b47eebf4293fca9e14b1ee0c0689263fcce5a9bc19b5eaa3f11ad4ff0f68ba85c9be847f63b0a29e947cf4b44a41c3f5e2 SHA512 3bffa18e082cf43f2d3593b1c722ef0124dc11a45b3631f50dbb0581ad8904b5474c11884a1e5da39f1b255841cc22a4bfe6d69f0215451ec5a31fd2414c7641
-EBUILD gvim-9.1.0366.ebuild 9894 BLAKE2B 3dc13abdf322638135338af0838fa1ea21c4e5c58956dddd8b8b58d033088f14158e18e88fb8633454b7eca30a2af0b0b2d55c5a4e4d31a49085752bb48fe532 SHA512 0cdbe263de561bbfd00c7deef08d848983ffe51e676871bea776fc84e067bef5bb533f51532e479714694600ef1f70e3f684bd9a857df4172a7c9ad882001cfd
-EBUILD gvim-9999.ebuild 9864 BLAKE2B 31a0ebf5740b43640d0d32cc16aef518e883e2d219c6bba0d3ae7d86ed105159d9200daeb3387204de45b551640d7c0bd675e42403b59ecbcd566e544cf2ed26 SHA512 b9885b03cad1b17b58f4381041caa489f7ab72d6c1efca7904503533de850f27f20fb28302ff30bfc8a78c2a3c754d7798ede0dfa60ff950b22bc0e48f31d73f
+EBUILD gvim-9.1.0366.ebuild 9892 BLAKE2B 2ebb686e156e42f174ff2e277692c73e085a2dbadcac777872f57a9fb6dbfe67d3a2692aea41cdf85de78b2ee85ad80645352ec446095bca2b4eaafa6aa08030 SHA512 3475b358ccd3938330f1f7762c0e7e75f4384428bbec47a8e10817158178099a5efd20f8a4361cb8897c769da2d947bdb9ffd346c1a7d4de888faa2ff8ed58fd
+EBUILD gvim-9999.ebuild 9894 BLAKE2B 3dc13abdf322638135338af0838fa1ea21c4e5c58956dddd8b8b58d033088f14158e18e88fb8633454b7eca30a2af0b0b2d55c5a4e4d31a49085752bb48fe532 SHA512 0cdbe263de561bbfd00c7deef08d848983ffe51e676871bea776fc84e067bef5bb533f51532e479714694600ef1f70e3f684bd9a857df4172a7c9ad882001cfd
 MISC metadata.xml 938 BLAKE2B 14b5a8f0a77608a07d2d8241cf4b48b4b418f905e688962f995495ccd2dc649d1ab2ab14076042d814e8a33df21557f2a76f78e9df5e8eb810f361a5c0930fa5 SHA512 3e6cb69512c6a02fb56e78c7d1f4e5223ba15ce0036df81dc536dd3b4c16bb76bb37f403a767473a2a2a8fa55e075e9f5142f6b7a0037d282569841a1032293f
diff --git a/app-editors/gvim/gvim-9.1.0366.ebuild b/app-editors/gvim/gvim-9.1.0366.ebuild
index 826999e81017..244a84e2210f 100644
--- a/app-editors/gvim/gvim-9.1.0366.ebuild
+++ b/app-editors/gvim/gvim-9.1.0366.ebuild
@@ -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 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 S="${WORKDIR}"/vim-${PV}
 
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index 9f2b67d6fdc0..826999e81017 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -5,13 +5,13 @@ EAPI=8
 
 # Please bump with app-editors/vim-core and app-editors/vim
 
-VIM_VERSION="9.0"
-VIM_PATCHES_VERSION="9.0.1000"
+VIM_VERSION="9.1"
+VIM_PATCHES_VERSION="9.0.2092"
 
 LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32"
 
 inherit bash-completion-r1 flag-o-matic lua-single prefix python-single-r1 ruby-single toolchain-funcs vim-doc xdg-utils
 
@@ -21,7 +21,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2"
+		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 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 S="${WORKDIR}"/vim-${PV}
@@ -70,7 +70,8 @@ RDEPEND="
 	sound? ( media-libs/libcanberra )
 	tcl? ( dev-lang/tcl:0= )
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
 # configure runs the Lua interpreter
 BDEPEND="
 	dev-build/autoconf
@@ -83,7 +84,7 @@ PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
 if [[ ${PV} != 9999* ]]; then
 	# Gentoo patches to fix runtime issues, cross-compile errors, etc
 	PATCHES=(
-		"${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches"
+		"${WORKDIR}/vim-${VIM_PATCHES_VERSION}-patches"
 	)
 fi
 
@@ -117,9 +118,9 @@ src_prepare() {
 
 	# Read vimrc and gvimrc from /etc/vim
 	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
+		>> "${S}"/src/feature.h || die "echo failed"
 	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
+		>> "${S}"/src/feature.h || die "echo failed"
 
 	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
 	# Hopefully this pattern won't break for a while at least.
@@ -137,7 +138,7 @@ src_prepare() {
 	# which isn't even in the source file being invalid, we'll do some trickery
 	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
 	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
+		echo >> "$c" || die "echo failed"
 	done
 
 	# Try to avoid sandbox problems. Bug #114475.
@@ -260,7 +261,7 @@ src_configure() {
 	fi
 
 	econf \
-		--with-modified-by=Gentoo-${PVR} \
+		--with-modified-by="Gentoo-${PVR} (RIP Bram)" \
 		--with-vim-name=gvim \
 		--with-x \
 		"${myconf[@]}"
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index cabc31096146..481fde15a969 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -2,6 +2,6 @@ AUX gentoo.nanorc-r1 5357 BLAKE2B 8da48323666faf816b86b7b85b23d2415b4740a14efdd2
 DIST nano-7.2.tar.xz 1608444 BLAKE2B c7e3b18383e9f2f9db1f6059c875ddd164d730ea0e5b363e66fb8e5f30e8598ba49a5afd8eea3a55e295f1e43fb136019f60cc9154ae276c5d589002c0e5298a SHA512 a6dfa70edab62e439a9a998ca214f2415d57dbdc01766ad2e4b14048836557a32755f8b09de13c6a89023f215b61d2854017b389eae8d097ca6f3ba73ce2f583
 DIST nano-8.0.tar.xz 1666272 BLAKE2B ba36182da059a3ee4c1fc60a200dee26f47cc6b1441b7ff665b82871f2f8fcac054f6adf82966d353234141bf9c521518da8fa967aca28307bccf43e015ddaea SHA512 86c484428b8805768fd580d0f62aa32ce8f588f4beedcdd35a4014506b562928c7a2fa6487aa0d853b4c9c1639a4d186f46b4e96721568ff81191d5098403ca8
 EBUILD nano-7.2-r1.ebuild 2599 BLAKE2B 4934a6b4d3309bd83bd79a3ccf7207a160b3efae8d1e86bb7fa7fef052d5a8bcbe4be0b1a968dd34b4dd07ebf9fe9c54c12c35a90e851712c3d3add11a2acae6 SHA512 3adef16020d52f0258ae2ba365a470af1ebb16b8020422d06dccee19b0ef6929bff33275f040f221312513ad5b87042ccb26669aa90c67a1c8a689b11db3e585
-EBUILD nano-8.0.ebuild 2680 BLAKE2B d9e6a8ab7360b08e88ffc8475af7517c4613f610a63771e4d37b9ed4d75ac64d73426ba5ffe1c3f73c2bd97b65e69c811e63b12b2dad052aeac5fa54bae5f42b SHA512 7150bf1b1a29bb754ce21dd630d0d552a3630f61683ae0c8f5f54f4d8bfe8fa90bd1b4857586cf5f0799b9c6a6d937787b7a544b485bc95964a3cd8d3b485a99
+EBUILD nano-8.0.ebuild 2678 BLAKE2B 95fe68d2a7197f27ef4fab88d3c19a7a5c618c39722286c393a362db2aa9faa49356c598c26e536fbb98e15c606e153956f3c95f9341b9d818c003332069ef9c SHA512 f7f2d77a476b874da27476a0030dd1343587bae8eff7c139b8cd1bf6e690fe0d67a251fc60b2ec4f77f5d474691f581ce0f7693f0b313eb530894658bf163ed8
 EBUILD nano-9999.ebuild 2680 BLAKE2B d9e6a8ab7360b08e88ffc8475af7517c4613f610a63771e4d37b9ed4d75ac64d73426ba5ffe1c3f73c2bd97b65e69c811e63b12b2dad052aeac5fa54bae5f42b SHA512 7150bf1b1a29bb754ce21dd630d0d552a3630f61683ae0c8f5f54f4d8bfe8fa90bd1b4857586cf5f0799b9c6a6d937787b7a544b485bc95964a3cd8d3b485a99
 MISC metadata.xml 1580 BLAKE2B 5977013d57a99580adaf6df69a926972f430ceaec8f19f5d6ea060c5b5d066b9ac3e2fd1ca59def8266f39143b35340c6571651c90e5ef7050ec93cb58d588e3 SHA512 1533be592588e8f33c67072d14432cee0267f23d5a67626b21aa6ea8027fdce754fcd7c731645d5af7033c128b5b09af7140e15d8d5dc4e357ffa73a0428a865
diff --git a/app-editors/nano/nano-8.0.ebuild b/app-editors/nano/nano-8.0.ebuild
index e66a301a6c4b..b78f117bc24d 100644
--- a/app-editors/nano/nano-8.0.ebuild
+++ b/app-editors/nano/nano-8.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/pluma-plugins/Manifest b/app-editors/pluma-plugins/Manifest
index 6a50c6329456..ec14b9666901 100644
--- a/app-editors/pluma-plugins/Manifest
+++ b/app-editors/pluma-plugins/Manifest
@@ -1,3 +1,4 @@
 DIST pluma-plugins-1.26.0.tar.xz 505652 BLAKE2B 09d34a3205796aab0b94b6e4d1c44b9902091b46511735b74a9cc1d1bee8a28352bf673ea7788eb4522e1dd0614a0399471aa8a076fd50f70bf1cf66e80326ad SHA512 ee59d52e0f879a5adf745c4be4a274f5c5b5403d7a9485236879e6e6db1c8f743de74be379fe84d2da73efe3eeb63bfa089a28f73762a6f0ceee0dbbbc464fa4
-EBUILD pluma-plugins-1.26.0-r1.ebuild 1613 BLAKE2B 968514482a0ec4220a3bab8c24d83cb0e2f6a81592588d879bad453386e2887eea1bced7ec3649af7c4e521d466e2d5ffab017ef7c537d301c8b4f1eb5cafd4f SHA512 ca207b7d2375b7e2525c8b0aea6a1f0323d89b0a73a36f9b61806c09ad36accb751bff86a9cf1a44125e206d810c6e0223d6f549f23e0c63b7f84eb2595981c1
-MISC metadata.xml 483 BLAKE2B 390bb7bc8ccac4b663d86a84444b96d369a5d3d367e63157dec3f658056b5287874084b31a15275488225e78215459025ebd676e25879d5a763f577c5433bc12 SHA512 fe7d517524868b61ff87ee5a076c3c55822cbffaf0575983aed49eed6657c90e3f3c7fd09ae81b5f2290b686e843ab37ee959ba50e94ee363cbad2788ee4fb5f
+EBUILD pluma-plugins-1.26.0-r2.ebuild 1704 BLAKE2B 678619e9d326f9500128b418ffe093bf06b0ea6930bfabaf99d7cdbaaaee5e7f83afdbda9e9b1ef1d42bbd94c154bf2034886988a5d79a3fde93a02109b37294 SHA512 d35be169e20027c14b757190306db94d72eb8e56edd9a4bdb15b7a67da906d18a0717ca09f3bd92132796056e759e5b078a525539b1e1a5d602d06afdbb84c80
+EBUILD pluma-plugins-1.26.0-r3.ebuild 1512 BLAKE2B 6357fa25fbd7cfa13bc26089e4d8fc59e2fb6c7aeefb66521825bc1b37ba038b836347ff08b9d7b60c75158819b91d9fda188f3b554bfb66d988bda31e909d00 SHA512 ff0c8a418ed0fb5ec541b84f10af2b285aeda6b11d953247ab6389d3f4e417898bebb5ecb1189a21ad713d4d97d16eee4c2c4a44064ac77771d86a0d17ea08b6
+MISC metadata.xml 571 BLAKE2B 527516d6ec3736452ed6f9e0a3e3546a1c5cb197d55e4b167e047b91157751f98c10f9d303067ca1979603ed12477dad117012c6cc04f3923c72a6cbde582e5d SHA512 27642f95842c3fae78411096f7ef1e9c7a800444b8abeb4be8d2333a209dd59d55294c39bce3371d53002d530bdfbb34564b00282f86bf39f1b531935f1e285b
diff --git a/app-editors/pluma-plugins/metadata.xml b/app-editors/pluma-plugins/metadata.xml
index 694df975ee24..724f7d707ba9 100644
--- a/app-editors/pluma-plugins/metadata.xml
+++ b/app-editors/pluma-plugins/metadata.xml
@@ -9,4 +9,7 @@
 	<flag name="synctex">Enable synctex support for pdflatex</flag>
 	<flag name="terminal">Embed a terminal in the bottom pane</flag>
 </use>
+<upstream>
+	<remote-id type="github">mate-desktop/pluma-plugins</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-editors/pluma-plugins/pluma-plugins-1.26.0-r1.ebuild b/app-editors/pluma-plugins/pluma-plugins-1.26.0-r2.ebuild
index 1969a87f5e98..0c6a11fbb5eb 100644
--- a/app-editors/pluma-plugins/pluma-plugins-1.26.0-r1.ebuild
+++ b/app-editors/pluma-plugins/pluma-plugins-1.26.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,7 @@ REQUIRED_USE="
 
 RDEPEND="
 	>=dev-libs/libpeas-1.14.1:0[gtk]
-	>=app-editors/gedit-40.0
+	>=app-editors/pluma-1.25.3
 
 	>=dev-libs/glib-2.32:2
 	>=x11-libs/gtk+-3.9:3
@@ -38,7 +38,7 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			app-editors/gedit[python,${PYTHON_SINGLE_USEDEP}]
+			app-editors/pluma[${PYTHON_SINGLE_USEDEP}]
 			dev-libs/libpeas:0[python,${PYTHON_SINGLE_USEDEP}]
 			>=dev-python/dbus-python-0.82[${PYTHON_USEDEP}]
 			dev-python/pycairo[${PYTHON_USEDEP}]
@@ -65,6 +65,14 @@ pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
+src_configure() {
+	local myeconfargs=(
+		$(use_enable python)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
 src_install() {
 	mate_src_install
 	use python && python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
diff --git a/app-editors/pluma-plugins/pluma-plugins-1.26.0-r3.ebuild b/app-editors/pluma-plugins/pluma-plugins-1.26.0-r3.ebuild
new file mode 100644
index 000000000000..cf3247965042
--- /dev/null
+++ b/app-editors/pluma-plugins/pluma-plugins-1.26.0-r3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MATE_LA_PUNT="yes"
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit mate python-single-r1
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A set of plugins for Pluma, the MATE text editor."
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
+SLOT="0"
+
+IUSE="+python"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	>=dev-libs/libpeas-1.14.1:0[gtk]
+	>=app-editors/pluma-1.25.3
+
+	>=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/pluma[${PYTHON_SINGLE_USEDEP}]
+			dev-libs/libpeas:0[python,${PYTHON_SINGLE_USEDEP}]
+			>=dev-python/dbus-python-0.82[${PYTHON_USEDEP}]
+			dev-python/pycairo[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+			>=dev-python/dbus-python-0.82[${PYTHON_USEDEP}]
+			>=x11-libs/vte-0.52:2.91[introspection]
+		')
+		>=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]
+
+	)"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable python)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	mate_src_install
+	use python && python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
+}
diff --git a/app-editors/qxmledit/Manifest b/app-editors/qxmledit/Manifest
index 7e7bba98263b..1450a9656631 100644
--- a/app-editors/qxmledit/Manifest
+++ b/app-editors/qxmledit/Manifest
@@ -1,5 +1,5 @@
 DIST qxmledit-0.9.12-src.tgz 22582822 BLAKE2B 66cf57e8cd1cbf712c28e55ee39685ea907216ff397b9f6ad5307e768bbd22a16b1f32dbbd309ae186479c35bd57d0aa1a1d5b4e174d1230c3b52f844be7e9f7 SHA512 996f1a656c6191950eb18bd3df13574f6bd85ad58132b5662cce5b6538fe81597359d3a7f69cff5c252c2efceb749ee079bed7165b3c142d33e0c4cb500231cc
 DIST qxmledit-0.9.18-src.tgz 19725693 BLAKE2B f895a0981efcbf5071a38b7b02ad0063f0aa55b31c8329ad9b39167b853cc5d1ab4c2f0e75a48c4354a1808a96e7987c55063fc4b7c3f1012173d28d8e301eb2 SHA512 1122021d27561309c70946862a67ea2ba1045038b1ec8469ae61c7c9a67b13689179078ae3a0dd6222d30e3c30cd35a15ba6f4ef27273bbe87d26ec5a215c65c
 EBUILD qxmledit-0.9.12.ebuild 1518 BLAKE2B 30f0503c622d640e7b38b374df52c56b131e61dca90f02d42f50162031423acb3288ded195e740e8179b958edb5fd50cca8d1f212b45fd0a9ebed169be4d23ba SHA512 d6ccc1d2838196c97c21877cfa3a53a6399e98eac8cd6e6751a1f02b5598cad6f13aed08b2f413445dde272405883bde4b00841684d9f8cdfa4dbf0cc4c8f09c
-EBUILD qxmledit-0.9.18-r1.ebuild 1433 BLAKE2B a2418fdfe5c9290241f7919f295662c1fabd49485208aa5d631a4d8e35ff0838c0c4803f7f345deeaa147b6fb780a433b9f7fdb7474264ad804b52a2cee8f9b3 SHA512 0950569d397a8fc74631a64a07196a26a1aa3f21b0fca603355074d670cf745ad93ff59d64446a226c6e4d2cb5ab839064ec771fa97f92b9eaaa3105f9e16580
+EBUILD qxmledit-0.9.18-r1.ebuild 1431 BLAKE2B 64ca2cc29fc69d028dc0a63fbfdd240442885a02116ff2a7c970b82059b263ea119f30c5c15c4b6361e7e894e1418013d73e75d899ee123a5e047c8030a882f1 SHA512 e0153fe41398f9625162b226b07f726a1c3742dbbf6ce51019ab980d17eb72026f79896d863ce543f1287984594a4310478325c7dbd2d4d48b9775ccbcef25d5
 MISC metadata.xml 676 BLAKE2B 0fa5b0403387461c361a2a4483ac1b185aeceb8ff66808b7722bbe32b3e933fd6340e6b8c7da2216f546ac7d4ba7de0e96f232e23069f7ba8d9dd4ca435947af SHA512 9ed12b2d5c1645fc9c547c089819f57825880195feceb0ff0cf28ac70b118ebf0ceaf28d898322f66d34b2d5549cda049721fea275600569ac25101e3555ace4
diff --git a/app-editors/qxmledit/qxmledit-0.9.18-r1.ebuild b/app-editors/qxmledit/qxmledit-0.9.18-r1.ebuild
index e97a2ee618a1..7ffe8a368b2e 100644
--- a/app-editors/qxmledit/qxmledit-0.9.18-r1.ebuild
+++ b/app-editors/qxmledit/qxmledit-0.9.18-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}-src.tgz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 DEPEND="
 	dev-qt/qtconcurrent:5
diff --git a/app-editors/tea/Manifest b/app-editors/tea/Manifest
index bfb17bb5080a..b8f5b1c21b48 100644
--- a/app-editors/tea/Manifest
+++ b/app-editors/tea/Manifest
@@ -7,5 +7,5 @@ DIST tea-qt-62.4.0.tar.gz 676565 BLAKE2B 2dbeeb37142bcc6d5a8434e21380e316f49f614
 EBUILD tea-47.0.0.ebuild 1243 BLAKE2B d3526f6247021d043cce9c7b96cade90f6abbe00b50f988fab2e40908f72e101825cc636749d06f5f583d4305e7a93d1dc22d243edaf99ca85e4caa7410dad67 SHA512 ce9fcddf4d71ada0ffac805f227817294bcb07f7a4db8cfa72df1be1546ab72c1803ddbf02f89f45eab6bc25d9b4f6f02a0b433cd5c756e67b9fc20bc249f644
 EBUILD tea-62.1.1.ebuild 1768 BLAKE2B e345264da56ced359707ddb7c1f086a1f29ddaa8e04e3ee24774a1de4e25d2fbc4460b2ec4843bd41e3174a4d4f054b3fb6698cee43706a22ec5d635361287b6 SHA512 773766d84b08e35d0e67f60e2dd5dccfe935d2ca6f6b806cb72747fde3ee22f2dac331ba239b2cc7d30e597daff73b7ed2e9593ea87ce19a09abf31436b1272b
 EBUILD tea-62.2.1.ebuild 1847 BLAKE2B 3c52b14a8cdfa02120bb225df52c4372da6a10a0c1d0f92cbaa4355e974d065aa8306f0b51a6ce9be903cc454db3bf5c383b9ff8084d0498b51fa89c9aae4e8b SHA512 39f77b69c5d491051f1a0f8831f0aee6244c970addcd1f2adb829951de15066e7011850e591d11e12d234f6b4740eb0389fb220e2f230c91e657f94403a218ae
-EBUILD tea-62.4.0.ebuild 1849 BLAKE2B 40e38f5ae7e8490a190fc594a5cbe91cf85b364172847fa7da53cda4721c89a443e5383f7e411add941dc0afb7dafee8aed4d74aaa49bd6bfef153f04441444e SHA512 021d7bd0c45c67efc966fac3007b84146a2edbe2ea8d9af0fcb42ba165e2fd85fa4aaf32bc31db6e1625c62740a0f412efc6ae2d9d15be54640c6280d7c7d643
+EBUILD tea-62.4.0.ebuild 1847 BLAKE2B 3c52b14a8cdfa02120bb225df52c4372da6a10a0c1d0f92cbaa4355e974d065aa8306f0b51a6ce9be903cc454db3bf5c383b9ff8084d0498b51fa89c9aae4e8b SHA512 39f77b69c5d491051f1a0f8831f0aee6244c970addcd1f2adb829951de15066e7011850e591d11e12d234f6b4740eb0389fb220e2f230c91e657f94403a218ae
 MISC metadata.xml 740 BLAKE2B abd89e29be11fe7b2ff997e76d586c87c3d62c8163a0ada25d1602ee06b52c715ba66e7b29b9e2866f843b65c0fede4ab232e2216fbc42bc52ce0ace88a130a6 SHA512 d77724665597f5896fb91745720f6c9b2f76d1797d5f2f31f295f7e60bbbc28123d15f43d3e4ccb57dfeebaa337e6c6bfc35842ac27a0251bed85897b6fa2d49
diff --git a/app-editors/tea/tea-62.4.0.ebuild b/app-editors/tea/tea-62.4.0.ebuild
index 1446a58cb925..d966ed1501ae 100644
--- a/app-editors/tea/tea-62.4.0.ebuild
+++ b/app-editors/tea/tea-62.4.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="aspell djvu qt6 pdf"
 
 RESTRICT="test" # no tests
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 7e1d74c69a7e..b5633afa08d9 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -7,7 +7,7 @@ DIST vim-9.0.2167.tar.gz 17405049 BLAKE2B 496c8f9672bc4ecce743a145bc2b671bf09034
 DIST vim-9.1.0366.tar.gz 17861209 BLAKE2B 8771f5ef6a966c1b5992a437dd6cf1de9525458f61a4cd8fa53737a7bde29a4da101668639a301288a266ee8b3911857d1ba5b4e88870b60473eb1eaa608d7a5 SHA512 11be2a6e349c7b6d26fc1943c35ea18c662baa4f30ae76936eefb30e0b4d988bfcaedf7ecd2c3903f64e23c75957f55b9bb4073e0f38c7eb10ef0ee0dc652ddb
 EBUILD vim-core-9.0.2167-r1.ebuild 6831 BLAKE2B 01e1e660c4d95ac5f5924517f61dd4fbccb5f9b5181fdad746b5408ae7585eaef1ab8d89e0418550fe6b477edeae36454fcd55fc56a99d129c9695cf30fe5ad3 SHA512 d9c2e925d2fec4e45cbb0ece1857f55d0c4a4d18474bd5008e45522c94afbaf8f98dd4f2d94c79c7098c338317b1bf7ec158695b5faad74c4a4ff052490f41d3
 EBUILD vim-core-9.0.2167.ebuild 6823 BLAKE2B 974a975f63108cc482fecf483d409ee7be1c253d6f92fd84b506b3857c8a6f97a44e4b616a1c39bf8372fb0a62ab773e79726c5bf15d4191d98b45cc12144e49 SHA512 737eeef845c896aa3ae374910c7c04785401b7436a6edd171c2c0b350515a8869b33630d59a1c52beec80f83711f341be1b68e678d8d24665f90ce357dfcc4c9
-EBUILD vim-core-9.1.0366-r1.ebuild 6831 BLAKE2B bbd21d28d7f4697aa8562960f94b21551b702d3480bfadeab5ae187db5c73af12131b409dabc38b3c3b31c06a90d26f6fe9abcc25cb6332d2856c444b24bca5b SHA512 37db3fd8e3574a42f9b06c34ccdf7eae8c5afac15c0043e1665bacd87d2feb061eae3a17b214f58183dcc2299c065d9be017a94ecec0c0d5bb573092767e2950
+EBUILD vim-core-9.1.0366-r1.ebuild 6829 BLAKE2B d23cf6cd2dc5d564fb48f4c33502c7c42211c12da36e51f6f4f9a0e3ff4cf5a5cac539d8ed9d11b33badee31ad0b85a2754570cf81883f65f03f8fb28384661a SHA512 a75b15dc7db326012e9555eaf5f95593be5fa3ecb922cc846c3892e9febb856452f813a31a7a78b3b121c8661734e6fada455747ccc11a3dc2cd4afed6af6d48
 EBUILD vim-core-9.1.0366.ebuild 6831 BLAKE2B 07597fc638c99f2d3730b888f1aeaea7df7d451658143ca978725de68d34c5346173f938e4b6096d430597a2623b05a49719da78b9c9d25d1f542e2a28b10aeb SHA512 b60277d5d5e7edb7edbed65f98ebad8334dc0b09ee6e9e073af6b6346fb3883127bc5e1b89d0991cfe71e1c716732487caa6396bcbf6aa01825022dfe150d319
 EBUILD vim-core-9999.ebuild 6793 BLAKE2B 2ac9acdd6249cbe1fb1174bfa85bc33b066d7d2203d1857270ee1ce07411b60fd40f9becaa37d9508fa48bf7757f7dc541d1f4f6385f8abd816e6c832bbcdf89 SHA512 9ec9a32793fe40b602406d23b12a0cddb2046de858da16732a28b5e70cf4ce78cec8ab6bf6c5c39241cc5dac243775d91b36dff9a8d6f93d0d2c5adef49c8188
 MISC metadata.xml 634 BLAKE2B 3f1b64411e3535e9d5f1541e104f3616be4793999c526dd87f478cc948ac4c564bd68a6477ca713cd2e73f775098a835dc071d66ba35d2a0abc9572e1107c2ce SHA512 b472d227fb1e3c97b0ede3ea67beb4969ef3ced95d040eef6f3ff35d4a669dddf5ad4db22bd1dd3178c4f2ea76b4ec49ad780b5c94c14324da5fd57607d4d32e
diff --git a/app-editors/vim-core/vim-core-9.1.0366-r1.ebuild b/app-editors/vim-core/vim-core-9.1.0366-r1.ebuild
index 759cb04d314d..f92d631c179a 100644
--- a/app-editors/vim-core/vim-core-9.1.0366-r1.ebuild
+++ b/app-editors/vim-core/vim-core-9.1.0366-r1.ebuild
@@ -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 ~ia64 ~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 ~ia64 ~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 fc79b6a2e6a1..5a0e8bd585a4 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -3,6 +3,6 @@ DIST vim-9.0.2092-patches.tar.xz 2640 BLAKE2B 3a4b2bc57712de3b92b0e8d9b2d428e4d5
 DIST vim-9.0.2167.tar.gz 17405049 BLAKE2B 496c8f9672bc4ecce743a145bc2b671bf09034b2875e728406b318c8b12e2d8d4ee3423ce94f8749679f07d36f229954f7ef0b12ce7bc4d71ccf6637ce2d6029 SHA512 6a9a785b1915dc167210b0da4d5e4401c71ee49b3554c8a22566378658ddcc3493562897ea39035852399cc5ffb55a73355ab13390c27a4d00ffd76bcd10ddf0
 DIST vim-9.1.0366.tar.gz 17861209 BLAKE2B 8771f5ef6a966c1b5992a437dd6cf1de9525458f61a4cd8fa53737a7bde29a4da101668639a301288a266ee8b3911857d1ba5b4e88870b60473eb1eaa608d7a5 SHA512 11be2a6e349c7b6d26fc1943c35ea18c662baa4f30ae76936eefb30e0b4d988bfcaedf7ecd2c3903f64e23c75957f55b9bb4073e0f38c7eb10ef0ee0dc652ddb
 EBUILD vim-9.0.2167.ebuild 10707 BLAKE2B 27a0169d443a594d198a1f039fa83db1adca666b6f9185cef9e31aa87003c48c7f1bf78c0610237584b68bba15525b82d0b5a32b8002ce94e1cc482e35436c57 SHA512 a24b5a9bbceee61249b02d94601b97499867b2d32cb5b0198004e887df5871dd77a45eabb26e62f51abe6885659b2397cf596da018776e29d24aa4cba8557659
-EBUILD vim-9.1.0366.ebuild 10715 BLAKE2B 81e76e538c195d00cdd1439449bedf61009fc94d41d777f29d0eb4db8343c268a0138d09d755b2f0839be23ee7338f2c8d0f3dc1d95adbd28e43db8620be4e50 SHA512 584a3c1302fbf26c19b9c8c9f9408d4ba7eb89b1dbdb1b7212d2b8f3cf1b82cf375800e522555a0f3138517bf98ef7d201f4f7c146fc657e18ae4d2ec7fd2a1e
-EBUILD vim-9999.ebuild 10684 BLAKE2B ffa7c0bad1bb7f2d500652513a4d0328bdd8530d9894d695be48b2e9d178b5185933162faa56ee3d56fecff46c5b80cf431cb95dc2545cb4fb0d0e58849af333 SHA512 a84a17b3f22530fa2868ff70949e8f42871b04a4dbaf1a34065313a25ce0f7b043ab35c847ba6a84975e6e9e3ee282076ed9b44fcef5445bfaf0cf63f4a08a1d
+EBUILD vim-9.1.0366.ebuild 10713 BLAKE2B 246d44a7c917a531620e9c4680441eedaaef7b656e9c73f313017345c0de86a4b59c86cc33bdbd9b7776d8851e37f4f32cbd942524c5734d356a8015aaf622df SHA512 fd6a92134a453b091e5d4753e25314fb2c324b5803853bbd44da3f9d0827cde9fd2f4d3dea8f286b34d0dbad071f3040f736939ae75d7d6a65159a50bf1f9145
+EBUILD vim-9999.ebuild 10715 BLAKE2B 81e76e538c195d00cdd1439449bedf61009fc94d41d777f29d0eb4db8343c268a0138d09d755b2f0839be23ee7338f2c8d0f3dc1d95adbd28e43db8620be4e50 SHA512 584a3c1302fbf26c19b9c8c9f9408d4ba7eb89b1dbdb1b7212d2b8f3cf1b82cf375800e522555a0f3138517bf98ef7d201f4f7c146fc657e18ae4d2ec7fd2a1e
 MISC metadata.xml 1164 BLAKE2B 39fb0d92234f77f68213d7185ca6c4f9145cca22f8a4c27f8bafeec464232b493bfea9f853ba0d5cd613885728ac0b10f1e11a16910af8fcd211a3a338904264 SHA512 d89a143dc214c3397c2a299b18e3499dc7797a39fbaa731dee2887c9f62b367f1d3f79b7f76b7014ad31caf8ef3bd612c9881b2f72a6b79142684f222483b157
diff --git a/app-editors/vim/vim-9.1.0366.ebuild b/app-editors/vim/vim-9.1.0366.ebuild
index 91f87fbcb9a3..044d4ff18a97 100644
--- a/app-editors/vim/vim-9.1.0366.ebuild
+++ b/app-editors/vim/vim-9.1.0366.ebuild
@@ -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 ~ia64 ~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 ~ia64 ~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/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index 850c5dab10c6..91f87fbcb9a3 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -5,13 +5,13 @@ EAPI=8
 
 # Please bump with app-editors/vim-core and app-editors/gvim
 
-VIM_VERSION="9.0"
-VIM_PATCHES_VERSION="9.0.1000"
+VIM_VERSION="9.1"
+VIM_PATCHES_VERSION="9.0.2092"
 
 LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32"
 
 inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single toolchain-funcs desktop xdg-utils
 
@@ -20,8 +20,8 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/vim/vim.git"
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+		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 ~ia64 ~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"
@@ -72,7 +72,7 @@ PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
 if [[ ${PV} != 9999* ]]; then
 	# Gentoo patches to fix runtime issues, cross-compile errors, etc
 	PATCHES=(
-		"${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches"
+		"${WORKDIR}/vim-${VIM_PATCHES_VERSION}-patches"
 	)
 fi
 
@@ -266,7 +266,7 @@ src_configure() {
 	fi
 
 	econf \
-		--with-modified-by=Gentoo-${PVR} \
+		--with-modified-by="Gentoo-${PVR} (RIP Bram)" \
 		"${myconf[@]}"
 }
 
diff --git a/app-editors/vscode/Manifest b/app-editors/vscode/Manifest
index 3b05853fc1c3..e95948f1f827 100644
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@@ -6,6 +6,10 @@ DIST vscode-1.89.0-arm64.tar.gz 139462657 BLAKE2B b0873b26f8d49d5c1be9cc0d71e7f8
 DIST vscode-1.89.1-amd64.tar.gz 143147679 BLAKE2B 1b6e33d02e6b65ac91710276d0ffcffb636f645c9a21bad2057c20855dd621702d5cebaabfcf7be02632d41d1bbaa89fe5270326be4237d7d69de04a343bc655 SHA512 09ff935fbb56a8c63d6a18a2cae482dc45e1f34f524260591f4e5859f6a6297a789291b856e3c644af9255a64a92815b0217f8dda237fc00e445f822e1adf531
 DIST vscode-1.89.1-arm.tar.gz 128552384 BLAKE2B 3f26d82a44d7a68588205c2ee2b7523ffd992860deaa7863322e8dbfbc886062ee3fa4530a647d655c4eaf8b1b22c5b981436fd658c9005e9fcfd7aacc159b6b SHA512 fe63cf0315e382b80367bfd8bdc8fc75f11f734b38f8413fa3ad2da25e9402fd52fb1f48cf2faa13d702bb6d8ea8e82e5ca5dbb4aaf8819d35d6a442c8e01d0f
 DIST vscode-1.89.1-arm64.tar.gz 139443388 BLAKE2B 4a88f080b631688a969160b002d47b1846d2bd6d80360f6f3bbbf3d6c2620abd29aa431ba15e4414beb009445f9342f2d6f57c39678490b362b68c53a793f8fc SHA512 ebd1176aea7cb5ecf260324c40353b4af274c19c4b09f665fe7eec7e83bf163609503d986f75f50681ecb2ef2996c41988a794b2c526a1f865ef87c1313bab30
+DIST vscode-1.90.0-amd64.tar.gz 143930997 BLAKE2B cc855974d718f32536ff663c4ee25479810154aa1820384ebdfd1bd2ad0958b2b54a160a7167f602535f621a061bf6d77495a28a06ae51f052e959ffae58ecf3 SHA512 4ba8513a14e9a579154fc7300ef3766e025fcd3faa21fc0806abe6d7ce5983984a7bd6bb157746e2e8e5de877cf537ebbea1b1c692489a1560fdccdef255f3c1
+DIST vscode-1.90.0-arm.tar.gz 128877927 BLAKE2B 2a7869239c6743c750d43bc0b7a9d11788854e9e30116e9df341d0ed919292dde6e5a1cb12d9796872f26b3891ef36402117834ee23c935ad2651d897c878582 SHA512 2603ab8e2a36ae04f7e31dca4f1413d514625df2b8a9a193dc88c0b6d0776a532bc850f987e220ac9b49576f9e45e341fe02d708e6f74566219adb0de9386e8c
+DIST vscode-1.90.0-arm64.tar.gz 140685043 BLAKE2B 7433f4b5562eb942013abc58c8bc1161694d0f21cebd307f9811fcf513926cfad44bf02caba38ea24c471c311b3c497ec59c487cfdc4ad29ddb22402f640df5e SHA512 cd41d8856f0979c7e9850abb3106c8fdac42946090a2e66f657f5a65cec002df0b84c9e6ee7d1f4ae302a2d29963bdc6f80d8c6978de3b4469a2b3e367227df7
 EBUILD vscode-1.89.0.ebuild 3012 BLAKE2B 09ac5d69e996582233513c089c1d485d2a23d125b9a6d9e4d242f73d5060762cb0dea4d24acf7ce75aed56861e4cc4c2c0bcafdc09bad2079b9cc9a5384ecc49 SHA512 ab6b99212c99b3d511be8368bdc4d1d19479eea191c70d9ed9389220035029b837695c20ab0c2332e29d3fb6b76b7439985b6117fc01f8a8c6ed8a4181d0d0e6
 EBUILD vscode-1.89.1.ebuild 3012 BLAKE2B 09ac5d69e996582233513c089c1d485d2a23d125b9a6d9e4d242f73d5060762cb0dea4d24acf7ce75aed56861e4cc4c2c0bcafdc09bad2079b9cc9a5384ecc49 SHA512 ab6b99212c99b3d511be8368bdc4d1d19479eea191c70d9ed9389220035029b837695c20ab0c2332e29d3fb6b76b7439985b6117fc01f8a8c6ed8a4181d0d0e6
+EBUILD vscode-1.90.0.ebuild 3012 BLAKE2B 09ac5d69e996582233513c089c1d485d2a23d125b9a6d9e4d242f73d5060762cb0dea4d24acf7ce75aed56861e4cc4c2c0bcafdc09bad2079b9cc9a5384ecc49 SHA512 ab6b99212c99b3d511be8368bdc4d1d19479eea191c70d9ed9389220035029b837695c20ab0c2332e29d3fb6b76b7439985b6117fc01f8a8c6ed8a4181d0d0e6
 MISC metadata.xml 1319 BLAKE2B 02076564e7b3b37433125cdcada4445311f03699bc7adb00f60af4f73f2fa9ebb90b805885198bd7cbdc54b779fa259d56c3142b30d595eaed278130081d8ca7 SHA512 d0922226274b1686ea14c8ca4e5835f6b30399bd71372bde4ac7e4eee4301ccca7fc32472d6ac0bd598b0459ebc33a59d346a21f5fa2d39cac4ed197682354e0
diff --git a/app-editors/vscode/vscode-1.90.0.ebuild b/app-editors/vscode/vscode-1.90.0.ebuild
new file mode 100644
index 000000000000..f803279f6a02
--- /dev/null
+++ b/app-editors/vscode/vscode-1.90.0.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2024 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/libcanberra[gtk3]
+	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.asar.unpacked/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
+
+	domenu "${T}/code.desktop"
+	domenu "${T}/code-url-handler.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"
+}
diff --git a/app-editors/vscodium/Manifest b/app-editors/vscodium/Manifest
index c11a08319add..6ddc0d6ca03c 100644
--- a/app-editors/vscodium/Manifest
+++ b/app-editors/vscodium/Manifest
@@ -3,5 +3,9 @@ AUX vscodium.desktop 519 BLAKE2B 9bb65cb1b0618deba7db401f314f00611970eb34a82988f
 DIST vscodium-1.89.0.24127-amd64.tar.gz 129588745 BLAKE2B 2a372e364921e8e0376b21c04613b8db8bd58deb92382a27bf77e160ec981681774d922c40b64356ac49069cd51f8f02472539f5b94f1d67172f1b7da076796f SHA512 e271cfa60971d19ef7925a3cf398a515cf8a57dbafbd91f67278b0e80dc28a7289424af6aaa91f5cffa813c1efa5c823d907ee7834059d3cd30c667208a68fbd
 DIST vscodium-1.89.0.24127-arm.tar.gz 118486655 BLAKE2B c1d00399e9b2625ca6b388d4eba4e75359d94e2241d89170f4a20a8e823a3397c62f352171197e97b6cf7d266c39472117522d813f9eee566731167f9279900a SHA512 e74ae9b9ca35635fb87b470cf87793964384431b58c6748104eb4d483e39ba4c990547feb30acaf65ed05ac63d5f8cc9df197bb274e1042cbc92b16e3d0b9a40
 DIST vscodium-1.89.0.24127-arm64.tar.gz 129311961 BLAKE2B 0669a35ca2b8e3e2295f11834b88e13cafe68ef067d2740cca763fe9b801265cb2c8ebe9485c2bca9240d219e4dacb0d426ea4fbb5ed4bb8ecb8ab3a7b13bf37 SHA512 a731be7cb5ee77300e0c0cdbedbbb4dbf5bc381f87853b6e7929465abbbae397fbacb9fb71e2d411606cf690bf704598aff09d94f2592aefef6da6be9a109ee4
+DIST vscodium-1.89.1.24130-amd64.tar.gz 129589433 BLAKE2B 02e189604bf0648bf7c6ac6d4db48ed85214a4b1d704d5a0329cfbc31566756bead943534368052147c5131cf48ba8f485e7b62abcfe7cb479b64b869d78efc2 SHA512 0898504c6814d0d050377c54b4196a6a811c7763647863e8f13fa249166d18e5e62c627d78df3d1cafeb28fa83114e9b7c4aaab8209cc6df0451de5ae6f381f7
+DIST vscodium-1.89.1.24130-arm.tar.gz 118486356 BLAKE2B 07095524231691876678b69c417fefba37ae360b853040f0b84d9271062e6ad1e5618ea1d5ac5fa075792e1b220906ba81754ceff50e5b2bc44767d27271e091 SHA512 4429d789da85961acc381c561f09bbb9d96ec02e5a4d614822e4db612ba9bdc1ecb9b2fac186bc900031c3d9fe73c754201a8a232434120953808af07dc1408e
+DIST vscodium-1.89.1.24130-arm64.tar.gz 129314458 BLAKE2B 38e9d8ab765d726217a5b980f89d54d961d5a2d819b918a3354db789bd56e7c5b6c2ee04fa43fd73e234b4c5a13e8a37ce600d69352cba7c21ce76ce509e2bf9 SHA512 0b89ebfc53c6c7f8dea3af0299898b421e08701877ee0a739b72071a82f55d886e122ba63d3abbb1219b93a9af6853b1722cd42cd287c22379724b223f646227
 EBUILD vscodium-1.89.0.24127.ebuild 2901 BLAKE2B f58c59d519e804d8c682e6aaa07b64b26e5e8238c5a59677eff7fb18de196079d70b0694cfec4b44b21d9a0cfccce7bba8eff83c87f7827fce4ff9a485f1a8fc SHA512 7a82d3a00c419052661ee089d8ec2e2c7df838d7d1f1f8e2ec58afcc388e65a871238a03480e1937575a0b1bf0636b72bb8144c47a2dec23def9c6d8da6cd6f1
+EBUILD vscodium-1.89.1.24130.ebuild 2901 BLAKE2B f58c59d519e804d8c682e6aaa07b64b26e5e8238c5a59677eff7fb18de196079d70b0694cfec4b44b21d9a0cfccce7bba8eff83c87f7827fce4ff9a485f1a8fc SHA512 7a82d3a00c419052661ee089d8ec2e2c7df838d7d1f1f8e2ec58afcc388e65a871238a03480e1937575a0b1bf0636b72bb8144c47a2dec23def9c6d8da6cd6f1
 MISC metadata.xml 1563 BLAKE2B 63d5132bcea2c419facf49b2d644bf1f58f44da333adb8270aedaaa289563ff5d116a0700df1306bdf1e7d2628f72959b8f18540486d3ce56bfe67adb925d8fe SHA512 ea75764cc70ac6a9452600a106de3784baaa9f84fa5b1021cea2be073636fb0fc8c6904a7db2a560ccb2bba491d76125e5996e0aac28ea11cd039ae16972e595
diff --git a/app-editors/vscodium/vscodium-1.89.1.24130.ebuild b/app-editors/vscodium/vscodium-1.89.1.24130.ebuild
new file mode 100644
index 000000000000..e22d9d5645b8
--- /dev/null
+++ b/app-editors/vscodium/vscodium-1.89.1.24130.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2024 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)
+"
+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"
+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/libcanberra[gtk3]
+	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}/vscodium-url-handler.desktop" \
+		> "${T}/vscodium-url-handler.desktop" || die
+
+	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
+		"${FILESDIR}/vscodium.desktop" \
+		> "${T}/vscodium.desktop" || die
+
+	domenu "${T}/vscodium.desktop"
+	domenu "${T}/vscodium-url-handler.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.md"
+	optfeature "desktop notifications" x11-libs/libnotify
+	optfeature "keyring support inside vscode" "virtual/secret-service"
+}