9 files changed, 599 insertions, 73 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index f3aba85295d8..157d6b8c26a8 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/sublime-text/Manifest b/app-editors/sublime-text/Manifest
index bbb7c750225f..b85b266381f1 100644
--- a/app-editors/sublime-text/Manifest
+++ b/app-editors/sublime-text/Manifest
@@ -1,9 +1,7 @@
 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_build_4169_x64.tar.xz 16572760 BLAKE2B 1760e6a763b58e24c7360bb0068704b820b0ba91169c1e80b9b46ca728eaedd04bd2bca75d602b24034fff895c093131d30209c48c3e7b1c56941da7cf1d3296 SHA512 6764363f8f92f65532d64ba014023e28b18f40dc62a1b114239b59360257d445494f9a2f57580174b5f4994c8fa06cd8f562c9419cfda92324c9ebf25d15e576
-DIST sublime_text_build_4180_x64.tar.xz 15767020 BLAKE2B 44850b6fffd959361f80f43508b7c9767a5f87a52c9d124cd68dd6eb975c362ca56815c6264f96ca02d836f6184038972539462c6dd8f314430042420dae5b99 SHA512 a115a352311a964268a1460710c562a7843b52c14c452745edb8706ac726e97b867931659b1a3286d44cb19b880f42f00af5bffe88aaa7916181a690e8324e1a
 DIST sublime_text_build_4189_x64.tar.xz 16156292 BLAKE2B e8d4f6d2b8c9e9a2dddafbe83501ce83e4a0b9ff0b4fb7f8e3aef812b963ee2f588c3191af74e0dddc8f62f9f321e13df915a5d499e34ca9847f80b2469cb540 SHA512 7413f9655367ef57285f8e79b42947e1cb1c316baed6e89c6e3cea9c76d4c8f819684ce383e4c97ba8d369608dbe264445e6e21ebb42961fd282298db90d2b49
-EBUILD sublime-text-4_p4169.ebuild 1973 BLAKE2B 1ace2993d791a5fdf0950136fe43df9c6d9342bf4243009c2cca61366e265a1b586bccab6d5984c14b46f99b838dad85b28e40a9aae3864b7107d15d77f97c98 SHA512 1bdd591cb304bb63e43903c75b01602ff193d2681e915f4fcd40996552365abffa7f7483ad408465588fd413c07f187eeee0fc50fd816b9df671f15014b31d8d
-EBUILD sublime-text-4_p4180.ebuild 1973 BLAKE2B 7bc4e81e71485121779c6baf48c45171718152bea23f301cbf365c4796d27e8b20c3dfb18553080f27cf8c1162e3521fc33cc187e3be4eedcafcf8fc30c80d5c SHA512 ae8384d87a4f97eab0e32f530183bb798fc2c007b04d9adb898d23f977ccfec4322b7560ccea3318af40002c6f8fa18e6c6651d21268d13ac0c746b5c54d668e
+DIST sublime_text_build_4192_x64.tar.xz 16157072 BLAKE2B c073c7fd6ea287be784ef6e97acaa254dffe68440282e61b75dbb3edf4c40ac1a095d8dff183fd5e5de10871e2c5148c5f583957f6e8745da8f36b1f9495b1c2 SHA512 083bf22aef7425cd30164bd3f3a420bbea3c7be3c9702f221c9075d4ddbe9d4b271efc2f491cbfa9d61ec7d41e30e26b8ad38e7dfcc5509d3bade16296cdb88c
 EBUILD sublime-text-4_p4189.ebuild 1973 BLAKE2B 7bc4e81e71485121779c6baf48c45171718152bea23f301cbf365c4796d27e8b20c3dfb18553080f27cf8c1162e3521fc33cc187e3be4eedcafcf8fc30c80d5c SHA512 ae8384d87a4f97eab0e32f530183bb798fc2c007b04d9adb898d23f977ccfec4322b7560ccea3318af40002c6f8fa18e6c6651d21268d13ac0c746b5c54d668e
+EBUILD sublime-text-4_p4192.ebuild 1973 BLAKE2B b0576cf98d2285f420046488f78aa4f06be8f527dc1dc50179afa2ad8f3f6ecb7f8b5f89439afc090febaee5fabdddeefd7a831b31a16c52a1fb451c10222e0e SHA512 b7d00272974290799beef1cf2ec274f58acb78f12ff7360ec8d251bd876aa1ab9c4d2e99a373a7df4fd02d2afbe634d0ccd27ab26d3cce0bbab90f3cc9a18d27
 MISC metadata.xml 245 BLAKE2B 4ac08132cfdd18d0ef2c38470da5045bca296f4975a8fa1e7094c1f6f524ebf02103d487ae7d6d0bb1c912d46eb207a74a417bbdc10bc92499331112f15392e6 SHA512 fa5b2d519f191de35a1f8719e8ba7ea346c54173c797e152df2aeefda32dfb0e0741ff171b87e1ee835c1d5383f424b8bb276d597bdf2fe911525bd5719cab9d
diff --git a/app-editors/sublime-text/sublime-text-4_p4180.ebuild b/app-editors/sublime-text/sublime-text-4_p4180.ebuild
deleted file mode 100644
index 589ab913df08..000000000000
--- a/app-editors/sublime-text/sublime-text-4_p4180.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop wrapper xdg
-
-# get the major version from PV
-MY_PV=$(ver_cut 3)
-MY_PN=${PN/-/_}
-
-DESCRIPTION="Sophisticated text editor for code, markup and prose"
-HOMEPAGE="https://www.sublimetext.com"
-SRC_URI="
-	amd64? ( https://download.sublimetext.com/sublime_text_build_${MY_PV}_x64.tar.xz )"
-S="${WORKDIR}/${MY_PN}"
-
-LICENSE="Sublime"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="dbus"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	dev-libs/glib:2
-	sys-libs/glibc
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	dbus? ( sys-apps/dbus )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4_p4107-remove-deprecated-key-onlyshowin-from-launcher.patch
-	"${FILESDIR}"/${PN}-4_p4107-set-explicit-startupwmclass-in-launcher.patch
-)
-
-QA_PREBUILT="*"
-
-# Sublime bundles the kitchen sink, which includes python and other assorted
-# modules. Do not try to unbundle these because you are guaranteed to fail.
-
-src_install() {
-	insinto /opt/${MY_PN}
-	doins -r Packages Lib Icon # /Icon is used at runtime by the application
-	doins changelog.txt libcrypto.so.1.1 libssl.so.1.1 libsqlite3.so sublime_text.desktop
-
-	# sublime_merge looks for /opt/sublime_text/sublime_text
-	exeinto /opt/${MY_PN}
-	doexe crash_handler plugin_host-3.3 plugin_host-3.8 sublime_text
-
-	# sublime-text sets its WM_CLASS based on its argv[0]. A wrapper script is
-	# used instead of a symlink to preserve a consistent WM_CLASS regardless of
-	# how the application is launched. This causes the WM_CLASS to be
-	# "sublime_text" which matches the .desktop entry.
-	make_wrapper subl "/opt/${MY_PN}/sublime_text --fwdargv0 \"\$0\""
-	domenu sublime_text.desktop
-
-	local size
-	for size in 16 32 48 128 256; do
-		doicon --size ${size} Icon/${size}x${size}/${PN}.png
-	done
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog 'Sublime Text 4'"'"'s window class changes from WM_CLASS="subl" to'
-	elog 'WM_CLASS="sublime_text" matching other distributions.'
-}
diff --git a/app-editors/sublime-text/sublime-text-4_p4169.ebuild b/app-editors/sublime-text/sublime-text-4_p4192.ebuild
index fdb6b4c6c4bb..d88a341fb94c 100644
--- a/app-editors/sublime-text/sublime-text-4_p4169.ebuild
+++ b/app-editors/sublime-text/sublime-text-4_p4192.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/app-editors/vscodium/Manifest b/app-editors/vscodium/Manifest
index 146d75695912..ab3733333155 100644
--- a/app-editors/vscodium/Manifest
+++ b/app-editors/vscodium/Manifest
@@ -5,5 +5,10 @@ DIST vscodium-1.96.2.24355-amd64.tar.gz 136733609 BLAKE2B 1033f3a58725c7ec0b1264
 DIST vscodium-1.96.2.24355-arm.tar.gz 122782157 BLAKE2B ab20f464ebb9406d68643998d9e5d6aa29ca1482705f763d1c24458b0295e9bc7ef1022ed41e59e507e5b6032425e9d69c2cefcf45e40359747a669ab5de9c4f SHA512 bdedec06c3cfd9954754706c3b69da8cb8e8cbfe17517816964aba8475a6fcc2ebba248f8310ad098ca73323e7057d2d2263dfd719b44177eb8566fc1c65c0bd
 DIST vscodium-1.96.2.24355-arm64.tar.gz 134688898 BLAKE2B 873c01669c79f754ad5ca892afc0f09cba5c2423aad107ca99fc8197469921dc94e97df3d5c773635c497e7c67b43a71361cfd6fd05f16c41ef148b0ca3ac511 SHA512 cd2802cc250fc5cdfd41df7244c7629ace31c219f5ca132030b0a506b62b154c409cc44629212026e927fd83d54a60ade25e0df0572262f1c3358db4873e3700
 DIST vscodium-1.96.2.24355-loong.tar.gz 142669704 BLAKE2B 7241b0855e39d947b9fbb2797171db916dd95beed4799abe9335344d3ac9869daf0fc2d050dd242ae9a391042a0c1e8f7c64e6d42c5260a11155137c35f0477f SHA512 ff0f0706a111f896c7411808d2a4c2c93fde60f8bd9ccb40936f5ac0a6a7dc1e6159ce19c4f1956d2de94b71574133e29bcd329065f78d0c8c58adc9ea464e07
+DIST vscodium-1.96.4.25017-amd64.tar.gz 136744379 BLAKE2B 026a3ddb4fd9e8e7fc5fc0d6f6f4ddae1d9eb082d24774bbc87d298a93aa767b0eaf504ef11a703119888e93389dd279c399e31862fcd95de7b8ce33e5f9485f SHA512 77fbf2841669b3b0c37514cce22e4d9263febc3df242248a87d68284ef3b6fcc93e8d9d6066ae25fce71b85d7b0cd38ae15ce62ea311f141f18da0a8b7b7019f
+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
 EBUILD vscodium-1.96.2.24355.ebuild 3112 BLAKE2B 5214458a53a16447e9b0bf13a3898589ce72ac9f6063b8804379b04a7156037d4c7ffa4754437eb3ef13f02e588027caa3c1a458ccba082e6cd13f4def60c1c4 SHA512 e129777775416e59194a1bf7ceab25c5b2dc07ad2a2878b2df0e4f22b6ad0477313d579346b4a6036fc01a222db73f64b18e24636ce4723d5406e431c59d55ba
+EBUILD vscodium-1.96.4.25017.ebuild 3112 BLAKE2B f29aaf3d218fc4da3950985570aee905a9ae6e3d0d0fd0b1f7af270497893407813a2b2295f40fddb92766865747e072cf59ae697d6a2c41a80ddf0762ecfcf3 SHA512 29de6bc03b2ad244f6350af7173e4e19049124b99df0355e0d060b8a11160f6a9d92abf901e3910811c69847e156c777b8d40b4704475f95ef6c0aaa04ea22bc
 MISC metadata.xml 1563 BLAKE2B 63d5132bcea2c419facf49b2d644bf1f58f44da333adb8270aedaaa289563ff5d116a0700df1306bdf1e7d2628f72959b8f18540486d3ce56bfe67adb925d8fe SHA512 ea75764cc70ac6a9452600a106de3784baaa9f84fa5b1021cea2be073636fb0fc8c6904a7db2a560ccb2bba491d76125e5996e0aac28ea11cd039ae16972e595
diff --git a/app-editors/vscodium/vscodium-1.96.4.25017.ebuild b/app-editors/vscodium/vscodium-1.96.4.25017.ebuild
new file mode 100644
index 000000000000..6d99fa43b043
--- /dev/null
+++ b/app-editors/vscodium/vscodium-1.96.4.25017.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/xemacs/Manifest b/app-editors/xemacs/Manifest
index 4561f6c22adc..20125e61738c 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -1,3 +1,4 @@
+AUX xemacs-21.5.35-batch-segfault.patch 5755 BLAKE2B 87e5099a8ad9810188eae487931e82d4cb473215963bb9869161ba02f9270c444cb2a6f22eff2d5cecb8101379157a9f3edca2cbbb2c5655bfe16f54cfa28c60 SHA512 7c4a001b408d66a69b4f92483a7f3ab53dd4eddf2da8fbe25b9b6dfad9ae2a699ecd94c7eb13980ff3b399211a6551e0541243ae88236fbb47156a7e43fa88ec
 AUX xemacs-21.5.35-configure-libc-version.patch 2169 BLAKE2B c3c6e7717971217f5a141ea6904193761a943d0656158f863c054f09858518f96975782dcb67a3bf0f4ef2bc29cc0b656198a28623043a1cbeb78bea0c6d2c1c SHA512 b386a92a474012e5583bc4fff7a958e1ae81aee90fc4c095c49e637bf4e35e8dfb90ea2ab1cd91190739ac975f5994f4465db56b150d0017dedff3ab3dd84a66
 AUX xemacs-21.5.35-configure.patch 1305 BLAKE2B 3625857381ed9113dcf92cfc89f70fb70d0a64267b7b2e006f3c3c495995ef1d5edd3c8ba63863b9ca678a83bebfe49febb0d6a67ad8e770bfa07feece0a598a SHA512 5556a8e8e9940177aa674e9d47f1bc00f8af90467c2d7bcdbd8820f0723de3b945eb9491961c041bbd7c66b39228e1996f3212931e8e2823c5f83e125ceb2fc9
 AUX xemacs-21.5.35-linker-flags.patch 1078 BLAKE2B 32678544c488c2b272503d79f0fed1783c1674b8fe5fd3e9ff6a25a782db561e9a59b1adc9adf2a627894b9b09458c087e670609c88f76d9927bfe1af68a963c SHA512 58b3b055fe1915ef72041832ec930edf7d365a7907d7603ba627379f0736ad7119e8c8ff1fa6b5d46b770760325ea5fd3484e5decb0d47f42ba5095571d46cfb
@@ -12,5 +13,6 @@ DIST xemacs-21.5.35-info-handle-compress.patch.xz 7852 BLAKE2B 61b8d3a7d63d76311
 DIST xemacs-21.5.35-ootags-boolint.patch.xz 7660 BLAKE2B 9567cebeea7828dd7a207e627c4a21d49ef129ea7cf92defde67c068aab6694d0c7f70d90648b9177cea8b6ea3fc3734e1f65f1821b5e4c820df507bb6d6835b SHA512 f43656a5e4c9781e2250fca7f8750bbc131223f4a252dfdfc6315e06ac578974877ac0bbc695f957ade5a7960c4257b090ee34199965110da28851e58986e985
 DIST xemacs-21.5.35.tar.gz 16403617 BLAKE2B efab8d3d984ec2223913b09ff1abc9f2df187fb5b8c2ccf99fcfc60c86369f4411cffd48b03532d53329bd5b3d3149271a445da4c0a3cd7bdc2834021b1297b3 SHA512 e592af6ffbb6f95299039de28f59ee770bf62f54a15b1358b9d1059ed25dcb410c01dcf6e88c1d2196d54f0c6902f309d709fe003accee82e516023fa4363019
 EBUILD xemacs-21.5.35-r6.ebuild 7534 BLAKE2B 9b36a46f43c215389dcc77bea0f3fe27c6d0da75756223eb15ea02750af002631da51d9153a1fd64744c7f5d3a8fc45a022378d9877e428a7e848d9ce223bac1 SHA512 71b6bcec57277e36a9b5689fe98a1c23d37e73141d9cc73e9641520cbe3dfd1651bd8413168f8fa88597a467c505c77c189a5e530711fd6852f96940c49f7046
+EBUILD xemacs-21.5.35-r7.ebuild 7588 BLAKE2B 25c7077f33650fe3b4ec6e435d2c831d51ecc90f933af768a234d8495be06d2e0b8f2cfa958dc6fa62b20e3695fbb36a3e926854ff98bca6d1459300dbb417eb SHA512 fd9d556957a257f01c0494134468d745b42f047b6e4a4241bbb404d06f016dbdc36a049f8ac571ee3c88a725724a21e7d3f1b01bdc88f1425f0155507d068c9f
 EBUILD xemacs-21.5.9999.ebuild 7039 BLAKE2B 3401ac584e443e62e755e64d86b0a0dd4027bec6f807b6a82469da457f42cb95c7ef392bdd609af3e502bc6d8dbd00786eb78fa3710395782ae2f420f2d54e5c SHA512 3e36df884d4548189fa486408dd6990ef0913e4bcd47f2d2f2ca1d1022e882e277108c555a793326787b10809bd38fee282d9f5d6b007e6cf8c24da507a1b722
 MISC metadata.xml 493 BLAKE2B c7a32db428883c28b8ddf1aab3e899d2ce022a7b61eed05dd16a6152bf5f525e5e32a90ff4c8362b5dc49f5a262f0f21bd29425f9bc16ba5d1d1fcd9b3b85de2 SHA512 55a343e9e8713b1167034409dce6f5729d1818ef20aa4164980d0f25e7d929d3bb7772968fbad30cd01973eb7d6a3bafc491b60070a3ab41238fe032e4e2170d
diff --git a/app-editors/xemacs/files/xemacs-21.5.35-batch-segfault.patch b/app-editors/xemacs/files/xemacs-21.5.35-batch-segfault.patch
new file mode 100644
index 000000000000..5341bea1fa56
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.35-batch-segfault.patch
@@ -0,0 +1,191 @@
+Don't segfault when calling #'center-to-window-pos and friends, -batch
+Patch backported from master branch
+https://foss.heptapod.net/xemacs/xemacs/-/issues/6
+
+commit 578daa839db83c84fc7ebbc4bf809ff66fd492f5
+Author: Aidan Kehoe <kehoea@parhasard.net>
+Date:   Tue Jan 21 16:15:47 2025 +0000
+
+    Don't segfault when calling #'center-to-window-pos and friends, -batch
+
+--- xemacs-21.5.35/src/indent.c
++++ xemacs-21.5.35/src/indent.c
+@@ -642,6 +642,15 @@ Bytebpos
+ vmotion (struct window *w, Bytebpos orig, Charcount vtarget,
+          Charcount *ret_vpos)
+ {
++  if (!redisplayable_window_p (w))
++    {
++      if (ret_vpos)
++	{
++	  *ret_vpos = 0;
++	}
++      return orig;
++    }
++
+   return vmotion_1 (w, orig, vtarget, ret_vpos, NULL);
+ }
+ 
+@@ -671,6 +680,11 @@ vertical_motion_1 (Lisp_Object lines, Li
+ 
+   w = XWINDOW (window);
+ 
++  if (!redisplayable_window_p (w))
++    {
++      return Qzero;
++    }
++
+   orig = selected ? BYTE_BUF_PT (XBUFFER (w->buffer))
+                   : marker_byte_position (w->pointm[CURRENT_DISP]);
+ 
+--- xemacs-21.5.35/src/window.c
++++ xemacs-21.5.35/src/window.c
+@@ -402,6 +402,12 @@ allocate_window (void)
+   return obj;
+ }
+ #undef INIT_DISP_VARIABLE
++
++Boolint
++redisplayable_window_p (struct window *w)
++{
++  return !FRAME_STREAM_P (XFRAME (WINDOW_FRAME (w)));
++}
+ 
+ /************************************************************************/
+ /*                        Window mirror structure                       */
+@@ -1491,11 +1497,19 @@ POS defaults to point in WINDOW's buffer
+        (pos, window, partially))
+ {
+   struct window *w = decode_window (window);
+-  Bytebpos top = marker_byte_position (w->start[CURRENT_DISP]);
+-  struct buffer *buf = XBUFFER (w->buffer);
+-  Bytebpos posint = get_buffer_pos_byte (buf, pos,
+-                                         GB_ALLOW_PAST_ACCESSIBLE |
+-                                         GB_ALLOW_NIL | GB_NO_ERROR_IF_BAD);
++  Bytebpos top, posint;
++  struct buffer *buf;
++
++  if (!redisplayable_window_p (w))
++    {
++      return Qnil;
++    }
++
++  top = marker_byte_position (w->start[CURRENT_DISP]);
++  buf = XBUFFER (w->buffer);
++  posint = get_buffer_pos_byte (buf, pos,
++				GB_ALLOW_PAST_ACCESSIBLE | GB_ALLOW_NIL
++				| GB_NO_ERROR_IF_BAD);
+ 
+   if (posint < top || posint > BYTE_BUF_ZV (buf))
+     return Qnil;
+@@ -1659,6 +1673,12 @@ is non-nil, do not include space occupie
+   line_start_cache_dynarr *cache;
+ 
+   window = wrap_window (w);
++
++  if (!redisplayable_window_p (w))
++    {
++      return Qzero;
++    }
++
+   start  = marker_byte_position (w->start[CURRENT_DISP]);
+   hlimit = WINDOW_TEXT_HEIGHT (w);
+   eobuf  = BYTE_BUF_ZV (XBUFFER (w->buffer));
+@@ -1903,11 +1923,11 @@ e.g. if the window's current buffer has
+   struct window *w = decode_window (window);
+   Bytebpos eoll;
+ 
+-  if (NILP (guarantee) || in_display)
++  if (NILP (guarantee) || !redisplayable_window_p (w) || in_display)
+     {
+       struct buffer *b = window_display_buffer (w);
+ 
+-      if (in_display || 
++      if (in_display || !redisplayable_window_p (w) ||
+           (BUFFER_LIVE_P (b) && EQ (wrap_buffer (b), window_buffer (w))))
+         {
+           return Fmarker_position (w->end_pos[CURRENT_DISP]);
+@@ -3341,7 +3361,7 @@ value is reasonable when this function i
+      window start is outside the visible portion (as might happen when
+      the display is not current, due to typeahead). */
+   if (start_pos >= BYTE_BUF_BEGV (b) && start_pos <= BYTE_BUF_ZV (b)
+-      && !MINI_WINDOW_P (w))
++      && !MINI_WINDOW_P (w) && redisplayable_window_p (w))
+     {
+       Bytebpos new_start
+         = start_with_line_at_pixpos
+@@ -4628,6 +4648,11 @@ window_scroll (Lisp_Object window, Lisp_
+   struct display_line* dl;
+   Boolint unchain_point = 0;
+   struct gcpro gcpro1;
++
++  if (!redisplayable_window_p (w))
++    {
++      return;
++    }
+   
+   if (selected)
+     point = b->point_marker;
+@@ -5127,6 +5152,11 @@ If WINDOW is nil, the selected window is
+   Bytebpos opoint = BYTE_BUF_PT (b);
+   Bytebpos startp;
+ 
++  if (!redisplayable_window_p (w))
++    {
++      return Qnil; 
++    }
++
+   if (NILP (n))
+     startp = start_with_line_at_pixpos (w, opoint, window_half_pixpos (w));
+   else
+@@ -5491,14 +5521,20 @@ get_current_pixel_pos (Lisp_Object windo
+     {
+       int first_line, i;
+       Bytebpos point;
++      struct buffer *buf;
+ 
+       if (NILP (pos))
+         {
+           pos = Fwindow_point (wrap_window (*w));
+         }
+ 
+-      point = get_buffer_pos_byte (window_display_buffer (*w), pos,
+-                                   GB_NO_ERROR_IF_BAD);
++      buf = window_display_buffer (*w);
++      if (buf == NULL)
++	{
++	  return 0;
++	}
++
++      point = get_buffer_pos_byte (buf, pos, GB_NO_ERROR_IF_BAD);
+ 
+       /* If the window has a modeline, ignore it for our purposes, POS can't
+          be over it. Start examining the display lines from 1. */
+@@ -5552,7 +5588,7 @@ a new frame, use the following instead:
+ */
+        (window, pos))
+ {
+-  struct window* w;
++  struct window *w = decode_window (window);
+   struct display_line *dl;
+   struct rune* rb;
+ 
+@@ -5575,7 +5611,7 @@ use the following instead:
+ */
+        (window, pos))
+ {
+-  struct window* w;
++  struct window *w = decode_window (window);
+   struct display_line *dl;
+   struct rune* rb;
+ 
+--- xemacs-21.5.35/src/window.h
++++ xemacs-21.5.35/src/window.h
+@@ -152,6 +152,7 @@ int buffer_window_mru (struct window *w)
+ void check_frame_size (struct frame *frame, int *cols, int *rows);
+ int frame_pixsize_valid_p (struct frame *frame, int width, int height);
+ struct window *decode_window (Lisp_Object window);
++Boolint redisplayable_window_p (struct window *w);
+ struct window *find_window_by_pixel_pos (int pix_x, int pix_y, Lisp_Object win);
+ 
+ void free_window_mirror (struct window_mirror *mir);
diff --git a/app-editors/xemacs/xemacs-21.5.35-r7.ebuild b/app-editors/xemacs/xemacs-21.5.35-r7.ebuild
new file mode 100644
index 000000000000..e0cc1c23695a
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.5.35-r7.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Note: xemacs currently does not work with position independent code
+# so the build forces the use of the -no-pie option
+
+EAPI=8
+
+inherit flag-o-matic xdg-utils desktop autotools
+
+DESCRIPTION="highly customizable open source text editor and application development system"
+HOMEPAGE="https://www.xemacs.org/"
+
+SRC_URI="http://ftp.xemacs.org/pub/xemacs/xemacs-$(ver_cut 1-2)/${P}.tar.gz
+	https://dev.gentoo.org/~matsl/${P}-ootags-boolint.patch.xz
+	https://dev.gentoo.org/~matsl/${P}-info-handle-compress.patch.xz
+	neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="alsa debug gif gpm pop postgres ldap xface nas X jpeg tiff png motif xft xim athena neXt Xaw3d gdbm berkdb +bignum"
+
+X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
+
+RDEPEND="
+	berkdb? ( >=sys-libs/db-4:= )
+	gdbm? ( >=sys-libs/gdbm-1.8.3:=[berkdb(+)] )
+	>=sys-libs/zlib-1.1.4
+	>=dev-libs/openssl-0.9.6:0=
+	>=media-libs/audiofile-0.2.3
+	gpm? ( >=sys-libs/gpm-1.19.6 )
+	postgres? ( dev-db/postgresql:= )
+	ldap? ( net-nds/openldap:= )
+	alsa? ( media-libs/alsa-lib )
+	nas? ( media-libs/nas )
+	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
+	motif? ( >=x11-libs/motif-2.3:0[xft=] )
+	athena? ( x11-libs/libXaw )
+	Xaw3d? ( x11-libs/libXaw3d[unicode(+)] )
+	xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 )
+	neXt? ( x11-libs/neXtaw )
+	xface? ( media-libs/compface )
+	tiff? ( media-libs/tiff:= )
+	png? ( >=media-libs/libpng-1.2:0 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	>=sys-libs/ncurses-5.2:=
+	>=app-eselect/eselect-emacs-1.15
+	bignum? ( dev-libs/openssl )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+BDEPEND="sys-apps/texinfo"
+
+PDEPEND="app-xemacs/xemacs-base
+	app-xemacs/mule-base"
+
+src_unpack() {
+	default_src_unpack
+}
+
+src_prepare() {
+	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
+	find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
+	eapply "${FILESDIR}/${P}-configure.patch"
+	eapply "${FILESDIR}/${P}-mule-tests.patch"
+	eapply "${FILESDIR}/${P}-configure-libc-version.patch"
+	eapply "${FILESDIR}/${P}-which.patch"
+	eapply "${FILESDIR}/${P}-misalignment.patch"
+	eapply "${FILESDIR}/${P}-va_args.patch"
+	eapply "${FILESDIR}/${P}-linker-flags.patch"
+	eapply "${WORKDIR}/${P}-ootags-boolint.patch"
+	eapply "${FILESDIR}/${P}-unknown-command-test.patch"
+	eapply "${WORKDIR}/${P}-info-handle-compress.patch"
+	eapply "${FILESDIR}/${P}-batch-segfault.patch"
+
+	eapply_user
+
+	eautoconf
+
+	# Some binaries and man pages are installed under suffixed names
+	# to avoid collions with their GNU Emacs counterparts (see below).
+	# Fix internal filename references.
+	sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
+	sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
+	sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die
+}
+
+src_configure() {
+	local myconf=""
+
+	# bug #639642
+	test-flags -no-pie >/dev/null && append-flags -no-pie
+	filter-flags -pie
+
+	if use X; then
+
+		myconf="${myconf} --with-widgets=athena"
+		myconf="${myconf} --with-dialogs=athena"
+		myconf="${myconf} --with-menubars=lucid"
+		myconf="${myconf} --with-scrollbars=lucid"
+		if use motif ; then
+			myconf="--with-widgets=motif"
+			myconf="${myconf} --with-dialogs=motif"
+			myconf="${myconf} --with-scrollbars=motif"
+			myconf="${myconf} --with-menubars=lucid"
+		fi
+		if use athena or use Xaw3d ; then
+			myconf="--with-scrollbars=athena"
+		fi
+
+		if use Xaw3d; then
+			myconf="${myconf} --with-athena=3d"
+		elif use neXt; then
+			myconf="${myconf} --with-athena=next"
+		else
+			myconf="${myconf} --with-athena=xaw"
+		fi
+
+		myconf="${myconf} $(use_with tiff )"
+		myconf="${myconf} $(use_with png )"
+		myconf="${myconf} $(use_with jpeg )"
+		myconf="${myconf} $(use_with xface )"
+
+		use xft && myconf="${myconf} --with-xft=emacs,tabs,menubars,gauges" ||
+			myconf="${myconf} --with-xft=no"
+
+	else
+		myconf="${myconf}
+			--without-x
+			--without-xpm
+			--without-dragndrop
+			--with-xft=no
+			--with-gif=no"
+	fi
+
+	if use xim ; then
+		if use motif ; then
+			myconf="${myconf} --with-xim=motif"
+		else
+		myconf="${myconf} --with-xim=xlib"
+		fi
+	else
+	  myconf="${myconf} --with-xim=no"
+	fi
+
+	myconf="${myconf} --without-wnn"
+
+	# This determines the type of sounds we are playing
+	local soundconf="native"
+
+	# This determines how these sounds should be played
+	use nas	&& soundconf="${soundconf},nas"
+	use alsa && soundconf="${soundconf},alsa"
+
+	myconf="${myconf} --with-sound=${soundconf}"
+
+	if use gdbm || use berkdb ; then
+		use gdbm   && mydb="gdbm"
+		use berkdb && mydb="${mydb},berkdb"
+
+		myconf="${myconf} --with-database=${mydb}"
+	else
+		myconf="${myconf} --without-database"
+	fi
+
+	if use debug ; then
+		myconf="${myconf} --with-debug"
+		# bug #924339
+		append-flags -fno-strict-aliasing
+	else
+		myconf="${myconf} --with-optimization --with-cflags-debugging="
+	fi
+
+	use bignum && myconf="${myconf} --with-bignum=openssl" ||
+		myconf="${myconf} --with-bignum=no"
+
+	econf ${myconf} \
+		$(use_with gif ) \
+		$(use_with gpm ) \
+		$(use_with postgres postgresql ) \
+		$(use_with ldap ) \
+		$(use_with pop ) \
+		--prefix=/usr \
+		--with-mule \
+		--with-unicode-internal \
+		--without-canna \
+		--with-ncurses \
+		--with-msw=no \
+		--with-mail-locking=flock \
+		--with-site-lisp=yes \
+		--with-site-modules=yes \
+		--enable-option-checking=no \
+		--with-last-packages=/usr/lib/xemacs
+}
+
+src_compile() {
+	emake EMACSLOADPATH="${S}"/lisp
+}
+
+src_install() {
+	emake prefix="${ED}"/usr \
+		mandir="${ED}"/usr/share/man/man1 \
+		infodir="${ED}"/usr/share/info \
+		libdir="${ED}"/usr/$(get_libdir) \
+		datadir="${ED}"/usr/share \
+		install
+
+	# Rename some applications installed in bin so that it is clear
+	# which application installed them and so that conflicting
+	# packages (emacs) can't clobber the actual applications.
+	# Addresses bug #62991.
+	for i in b2m ctags etags gnuclient gnudoit gnuattach; do
+		mv "${ED}"/usr/bin/${i} "${ED}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
+	done
+
+	# rename man pages
+	for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
+		mv "${ED}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
+	done
+
+	# install base packages directories
+	dodir /usr/lib/xemacs/xemacs-packages/
+	dodir /usr/lib/xemacs/site-packages/
+	dodir /usr/lib/xemacs/site-modules/
+	dodir /usr/lib/xemacs/site-lisp/
+	dodir /usr/lib/xemacs/mule-packages
+
+	# remove extraneous info files
+	cd "${ED}"/usr/share/info
+	rm -f dir info.info texinfo* termcap* standards*
+
+	cd "${S}"
+	dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README*
+
+	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
+
+	domenu "${FILESDIR}"/${PN}.desktop
+}
+
+pkg_postinst() {
+	eselect emacs update ifunset
+	eselect gnuclient update ifunset
+	xdg_desktop_database_update
+
+	einfo "If you are upgrading from XEmacs 21.4 you should note the following"
+	einfo "incompatibilities:"
+	einfo "- Mule-UCS is no longer supported due to proper UTF-8 support in XEmacs 21.5"
+	einfo "- The X resource class has changed from Emacs to XEmacs,"
+	einfo "  settings in your .Xdefaults file should be updated accordingly."
+
+	if use xft;
+	then
+	  einfo "You have enabled Xft font support. Xft requires font names to be provided"
+	  einfo "in a different way, so you may need to adjust your .Xdefaults accordingly."
+	fi
+}
+
+pkg_postrm() {
+	eselect emacs update ifunset
+	eselect gnuclient update ifunset
+	xdg_desktop_database_update
+}