Sync with portage [Sat Apr 12 23:39:38 MSK 2025].

2025-04-12 23:39:39 +03:00 · 2025-04-12 23:39:39 +03:00 · e2c6513563
commit e2c6513563
parent 37f421c900
24656 changed files with 83608 additions and 87580 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 30271 BLAKE2B 61107eb50236fc2abc259f8ec432dcf9fdd731da8ccf0ff97718598ebbed08a579abe58750fec5e160c43a53dadff56f1e06952506b07a576b85b69fce69b1db SHA512 df12bf0b38f21b03abb4b56e7389e613e9ba9f8e46ece079d00f3ae4116a10acad96487623ba650abfbb32deffe49edef485b097f1a409b87af9090c19cce804
-TIMESTAMP 2025-04-08T23:40:20Z
+MANIFEST Manifest.files.gz 30243 BLAKE2B 51123384fba728d179952101cb048c5fa581f985d4e2fc33996bddd634c99f1bba6286b5448f342a0c47cfeb5aee2faf2fcaf21f5c8c4673f7bc948a5ec44ef4 SHA512 c6a652ae97b4357f6d2abc18d1d2d6ecd64838ab68d84c504323761a83d1a295ad4a421782d716305a0e6efd6e036f478b539d8caa0ae3ef2beb01167b9b87ba
+TIMESTAMP 2025-04-12T20:12:20Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmf1s+RfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmf6ySRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDnhxAAkBQ6zg0mAfTsFzOcXQU7z7XFsIr4m7TG0W09RBvao/o3m6R9qGntkYnt
-zKfVOq0g0cbGou4IWHQIYnCiezXebYO4O/JBlTXGHlYq+vBvs37NB2nwzufXiwMR
-l/RIU/x7xtyfnybX5utE+ExuFo32x2YkzWpZnaYpjBCewCToIhI8IXdgiOt1zuLF
-Cum1giu2dWA67kR8qb4y9th4Aq1GJt66SwrEJfg1EqURowWWTGySZASOGI32ELDN
-Ff0f38rema1AGTMLbxE3bB6onuNPP568+9k+ePFg3M3ZDfLzRCcmzfgGue3bv0F1
-rIyCSoZXxT8ij5vx8kVslmW6TPGBya6DbqOgbVgp+m9XJucj5US70noQhd9znXB3
-BMw2OL7gtHky0cdAp26aV7QYH/mqY2+982wRaCcIXhOOxhhcO/f5TQeC/pssOoYK
-XechKcXNr25NZanI7IFh2WX2UTDUPyj14XTIx3dclpNliTsFOr2HLhBL2F/LFN+Y
-IJKtbbeCxxWmr6ixtXsqL/Ftfvrr9o05i5UDnMi3L7T6PabrQBPMIQfAAcOpozmn
-aFjWMPrCwQOpEzdmHZvWWLhH6+z5SWMU9ZmmcNNVw0MYpW69sXjad76I5NLu5/lV
-OkAn4Uo61O2fGs39frefoyGP/WxMeYfmXtz0FCn+3AlDkZKg+2U=
-=0tXD
+klDlpw//YGoFGWerGXjFVqz1vutEUlVrl9c+k+isG+teCm5wkVQorAs1dVT379+q
+onupUJnCb8ghgm36EPsq37RSUL9+X4dvRx0P74SPsJjhMK83r/s9aXVkb7ROIz+2
+E/x/uV1qzeZRpJ0kzo4svEEyUFpv9bbosYIkZ79aeH32O16rtIwqJ4koKfDcClRi
+gH0HMgUvDR+Hk47HiZaTNTMfC5xEHz/t9krUNm/qRRx7cLBy5fgMkskXzLXYguj0
+IqAURYtDMqYqfQDgHpRFQyfbUT7kYC7q4HIivg+09+bBRnlEg+6ESQ7IGw+nY7rI
+kLE2liQC8ol9hY49Vs7c21gJgQTIXvdfSkDXbTMa6MudeYfY24HWOiuKmoJ3FE3t
+EzOx9kNJUsLcJYKF5wrSxhfdIlS//5Q9C5vZ3DNWn+rjVyivJYLhSt9OOg0lhcXt
+8HQLyPfzc9/pF3QUdRP40pWKkWbQ/yCgdJwy/aiCrhDKIZc4XNc4BbwontQL+rxX
+DS1BdhfyWPf0EHov5vjAOReOroo+6rI9UYVXbwiNNWW6LWmVr6B5LXv/ODU2ILOi
+c3S9t8Snf0tui7GmsZyUmTESPCAviRJwDKx4s+KUdCr3XieF/nFEnXJeSDJLf9+/
+ADm0s2RqrNJmUmvteGH7r8IQSnKlG1FoTNjjQc3ezNtw2dtfN8E=
+=l/t/
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
--- a/app-accessibility/flite/Manifest
+++ b/app-accessibility/flite/Manifest
@ -2,6 +2,7 @@ AUX flite-1.4-audio-interface.patch 452 BLAKE2B c4d2a9f1368ee93802e004a1573ada68
 AUX flite-2.2-backport-pr30.patch 3504 BLAKE2B 71a9441d6465dbc6dc903a6b83a8224c7c7a91f21c5f5040d46beba56e812ff1de7e6b5427b7b0ebc6d9f8a3f077bf9457c7c99b9982435dd1c057287d2d4921 SHA512 5e4eb2cd57ed71bf46fd1b3a8e41dabb3ddb2accd28556bbcea945c0e8e3a31e6ac60005cc6121bc92ce02268b5057cc24529d5b6476e195c75dd67425f2cdb8
 AUX flite-2.2-backport-pr66.patch 2589 BLAKE2B e0a462e49cfb00cb208e7bca95d43b2d3c1b692799cf8649557a8ef583c8d3c168cd291869b5e3224bd73043b3d61cae901639f47fe37357d87daea328e3913d SHA512 9fee4800f5bdff334ca79ebad9f9fce60eb64d1a58d8b48fcdb49cf6c10f51d472e0533eafdf2ba7e9743da163b53620a8bbb536f8ebdc111af6113d4e205f88
 AUX flite-2.2-make-4.4.patch 2273 BLAKE2B f27c86987f481dca05f9838a571fc5a2992dd5a476adb68bd0cde33bd295d3e0f4a0c8140548f53de4f5fb6069149b29268a277e38962a915723d5eefd5972d8 SHA512 24da5c352ee3ab98e3bcdc803d35b6ab22fc51ccb69be53cea79d72a9e496be6136dea098d7ac6aa5a08f0e3754c3cfaca56873a6970fbf2543ffdbf8a45f465
+AUX flite-2.2-remove-const-cast.patch 4168 BLAKE2B 67e086a0c84cec86427efe2ff4d15c3ecc96ccf05c6025689bfda5f50dcdeb5c3537d11056a37fe25df189e51c4357405466d7d522e6f4e5cacb25719d1df822 SHA512 e0ec84736f12140028311098e1b17d4a5db39679392874f166ef2b150aef26fc2cd4b1a9f30c07993fc5a38f46de576bce65682f80fe92f25af4fb0ff777b6cc
 DIST cmu_indic_ben_rm.flitevox 8868578 BLAKE2B 2c916a142809999ed69a0cc6bf94ee11380f5a6d5362f347fac5c83ddd25861b7b42d2c4071c1646a26cb5bfef86552ed51d0f708b998c7e3d02fc2815df9445 SHA512 26b6bb62cd00a2c2f51abd04fc8917a2b44472abf99b09b156218fa90499056c96652a984ee9fac4820db513cd2fdba396c1ceb5d26a67e312505b73d1d2b3d1
 DIST cmu_indic_guj_ad.flitevox 11368818 BLAKE2B 972e01ab3e06d830435645eadc34bcefde9c3fdd4c302271847e2f66d5e179c88456ce80164ee1a8e2145b123af634a70929e6d9340e59189ea7e03e405c1a3e SHA512 e309cabdc2f8bd049c7b43e48a55898d1adeefbfedf2dc28785c57d9606030fd9c00769f88955d514e537f5ecdac49fd4297fb2cde5a575f2927a98b38b92829
 DIST cmu_indic_guj_dp.flitevox 10235186 BLAKE2B e609657306b1f8a99850b9d69ee6ad7d037f60537a7b5e63c8e9962001cf0c4b87771574f29570f8a58c7684d8b7293e54aba35e931c54c5a825ad59b8c6d595 SHA512 8ad73d24ebf6026daae701549b783441c522bbb0e2db958b139553446a8b488f068dc14c6136e3e98f564f27a4a62b086aa45d8dfb3cadd440d08db9e9faef3b
@ -36,4 +37,5 @@ DIST cmu_us_slt.flitevox 11156032 BLAKE2B 909d4d2adf94d5b40aee4b85aefaf1e8383718
 DIST flite-2.2.tar.gz 20233792 BLAKE2B c395c34d2739da523c4794da3a795f2febb7e9a26336c7688215f648c4aee03855c8ac7c9d3817efe3e3a41380a5e325aa8236d1b64af21f8100da3dbba2db23 SHA512 1ca2f4145651490ef8405fdb830a3b42e885020a7603d965f6a5581b01bed41047d396b38c2ceab138fc0b28d28078db17acd2b5a84c6444cb99d65c581afa72
 EBUILD flite-2.2-r1.ebuild 4543 BLAKE2B dba4178237fc2ba442da5b713840727c996fe31d92550c7dc3842726b16e041ce519326aa4cc850dc1406886ee2cc68241adefb70dd887e926dae95e53fc3572 SHA512 649b6ef5052bd497d053dc864c186ff811b2fe64c85ac541d652037767bb331efe4f273ee9b556fada1ccb121800bee35eda3e244a83641c9ac7670cb147a607
 EBUILD flite-2.2-r2.ebuild 4489 BLAKE2B f529ddcbe1df1a7d4433905e6f5e84f79e4e8ae778153c9af592dc0de384052e124041cc4d42d8ad2b28d7e43260156d1eaa50f8b07f702b72e9549dd2335ca3 SHA512 57ceaedd6e68ae54cf6af39c184aa164c2987f4d9c72ed825d6b7ee2d5411509f72f2000f6538c879b0e6e75e973ce86852c20be7716c3f3daae0cec960f274b
+EBUILD flite-2.2-r3.ebuild 4544 BLAKE2B acb15023852da0ad708ac0c03270bef09ef489d08a2807834ea7e57f91aba7fbb10ea6fdf1b79d7ec677c0a5081979101ea07d1d5a6b27aa76d2b150b6153c86 SHA512 0918f77716b69419fb7d66a5bf088fb698687116188496663321a6f26f30c07b5cd70f8bdc52480932d114e88395e235e027b1a3562cc062c4e857957e19a27b
 MISC metadata.xml 517 BLAKE2B e91b1a0a5e78284d318a97b13637c13666520a280afa818bb7bacabd73d0f8406a6da66899ea4607d1ef3c13f858242e2239eb176dfe24e859c391d16ebed018 SHA512 e9fcd43288f59205389fa9cd35be1da34f014bdbf078891b1f1c51154262562e6ff986a6367035d9ddbfa856c198ba96ed2240b085cdb12ecb746d6b67ad271f
--- a/app-accessibility/flite/files/flite-2.2-remove-const-cast.patch
+++ b/app-accessibility/flite/files/flite-2.2-remove-const-cast.patch
@ -0,0 +1,83 @@
+https://github.com/festvox/flite/pull/112
+
+From 4fcb01e726b867440fc918e820a8d27bd09f3bd4 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 2 Jul 2024 21:41:24 -0700
+Subject: [PATCH] Remove defining 'const' as nothing
+
+This is a hack to override constness of struct members
+however, with modern compiler like clang with fortified
+glibc ( 2.40+ ) headers this runs into compiler errors
+
+| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/flite/2.2/recipe-sysroot/usr/include/bits/stdlib.h:38:54: error: pass_object_size attribute only applies to constant pointer arguments
+|    38 |                  __fortify_clang_overload_arg (char *, __restrict, __resolved)))
+|       |                                                                    ^
+| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/flite/2.2/recipe-sysroot/usr/include/bits/stdlib.h:73:43: error: pass_object_size attribute only applies to constant pointer arguments
+|    73 |                  __fortify_clang_overload_arg (char *, ,__buf),
+|       |                                                         ^
+| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/flite/2.2/recipe-sysroot/usr/include/bits/stdlib.h:91:55: error: pass_object_size attribute only applies to constant pointer arguments
+|    91 | __NTH (wctomb (__fortify_clang_overload_arg (char *, ,__s), wchar_t __wchar))
+|       |                                                       ^
+| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/flite/2.2/recipe-sysroot/usr/include/bits/stdlib.h:129:71: error: pass_object_size attribute only applies to constant pointer arguments
+|   129 | __NTH (mbstowcs (__fortify_clang_overload_arg (wchar_t *, __restrict, __dst),
+|       |                                                                       ^
+| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/flite/2.2/recipe-sysroot/usr/include/bits/stdlib.h:159:68: error: pass_object_size attribute only applies to constant pointer arguments
+|   159 | __NTH (wcstombs (__fortify_clang_overload_arg (char *, __restrict, __dst),
+|       |                                                                    ^
+| 5 errors generated.
+|
+
+Therefore take this out, instead cast away the 'const' qualifier where needed ( equilly dangerous )
+however limited to just this file instead of apply to all headers including system headers
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ tools/find_sts_main.c | 11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/tools/find_sts_main.c b/tools/find_sts_main.c
+index 3c94449..a5bf8ef 100644
+--- a/tools/find_sts_main.c
+++ b/tools/find_sts_main.c
+@@ -41,9 +41,6 @@
+ #include <math.h>
+ #include <string.h>
+ 
+-/* To allow some normally const fields to manipulated during building */
+-#define const
+-
+ #include "cst_args.h"
+ #include "cst_wave.h"
+ #include "cst_track.h"
+@@ -132,16 +129,16 @@ cst_sts *find_sts(cst_wave *sig, cst_track *lpc)
+ 			lpc->frames[i],lpc->num_channels,
+ 			resd,
+ 			size);
+-	sts[i].size = size;
+	*(int *)(&sts[i].size) = size;
+ 	sts[i].frame = cst_alloc(unsigned short,lpc->num_channels-1);
+ 	for (j=1; j < lpc->num_channels; j++)
+-	    sts[i].frame[j-1] = (unsigned short)
+	    *(unsigned short *)(&sts[i].frame[j-1]) = (unsigned short)
+ 		(((lpc->frames[i][j]-lpc_min)/lpc_range)*65535);
+         if (cst_streq(residual_codec,"ulaw"))
+         {
+             sts[i].residual = cst_alloc(unsigned char,size);
+             for (j=0; j < size; j++)
+-                sts[i].residual[j] = cst_short_to_ulaw((short)resd[j]);
+                *(unsigned char *)(&sts[i].residual[j]) = cst_short_to_ulaw((short)resd[j]);
+         }
+         else if (cst_streq(residual_codec,"g721"))
+         {
+@@ -189,7 +186,7 @@ cst_sts *find_sts(cst_wave *sig, cst_track *lpc)
+             {
+                 sts[i].residual = cst_alloc(unsigned char,size);
+                 for (j=0; j < size; j++)
+-                    sts[i].residual[j] = cst_short_to_ulaw((short)resd[j]);
+                    *(unsigned char *)(&sts[i].residual[j]) = cst_short_to_ulaw((short)resd[j]);
+             } 
+             else /* Unvoiced frame */
+             {
+-- 
+2.45.2
+
--- a/app-accessibility/flite/flite-2.2-r3.ebuild
+++ b/app-accessibility/flite/flite-2.2-r3.ebuild
@ -0,0 +1,139 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal toolchain-funcs
+
+DESCRIPTION="Flite text to speech engine"
+HOMEPAGE="http://www.festvox.org/flite/ https://github.com/festvox/flite"
+SRC_URI="https://github.com/festvox/flite/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	voices? (
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_ben_rm.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_guj_ad.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_guj_dp.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_guj_kt.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_hin_ab.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_kan_plv.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_mar_aup.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_mar_slp.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_pan_amp.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_tam_sdr.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_tel_kpn.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_tel_sk.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_tel_ss.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_aew.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_ahw.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_aup.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_awb.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_axb.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_bdl.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_clb.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_eey.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_fem.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_gka.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_jmk.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_ksp.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_ljm.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_lnh.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_rms.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_rxr.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_slp.flitevox
+		http://www.festvox.org/${PN}/packed/${P}/voices/cmu_us_slt.flitevox
+	)"
+
+LICENSE="BSD freetts public-domain regexp-UofT BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="alsa oss pulseaudio test voices"
+REQUIRED_USE="test? ( alsa )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
+	!pulseaudio? ( alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4-audio-interface.patch
+	"${FILESDIR}"/${PN}-2.2-backport-pr30.patch
+	"${FILESDIR}"/${PN}-2.2-make-4.4.patch
+	"${FILESDIR}"/${PN}-2.2-backport-pr66.patch
+	"${FILESDIR}"/${PN}-2.2-remove-const-cast.patch
+)
+
+get_audio() {
+	if use pulseaudio; then
+		echo pulseaudio
+	elif use alsa; then
+		echo alsa
+	elif use oss; then
+		echo oss
+	else
+		echo none
+	fi
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use test && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use test && tc-check-openmp
+}
+
+src_unpack() {
+	for file in ${A}; do
+		case "${file}" in
+			*.flitevox)
+				cp -av "${DISTDIR}/${file}" "${WORKDIR}/" || die "Unable to copy ${file}"
+				;;
+			*)
+				unpack "${file}"
+				;;
+		esac
+	done
+}
+
+src_prepare() {
+	default
+	sed -i main/Makefile \
+		-e '/-rpath/s|$(LIBDIR)|$(INSTALLLIBDIR)|g' \
+		|| die
+	mv configure.{in,ac} || die
+	eautoreconf
+
+	# custom makefiles
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--enable-shared
+		--with-audio=$(get_audio)
+	)
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+multilib_src_install_all() {
+	dodoc ACKNOWLEDGEMENTS README.md
+
+	rm -rf "${D}"/usr/lib*/*.a
+
+	if use voices; then
+		insinto /usr/share/flite
+		doins "${WORKDIR}"/*.flitevox
+	fi
+}
+
+pkg_postinst() {
+	if [[ "$(get_audio)" = "none" ]]; then
+		ewarn "flite is built without audio support. Enable the"
+		ewarn "alsa, oss, or pulseaudio USE flags for audio support."
+	fi
+}
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -1,9 +1,7 @@
-DIST aws-cli-1.38.18.gh.tar.gz 2942596 BLAKE2B 263926ed648f37eca2b1376ad26ac25c5c6d82182c5a3ce0c3511c7b6ba2958db5e6a09c5d4e7fcc702515240b30e4cec952f9f3d47f7d7dcfe5b1078fd3217e SHA512 4cc5eb7e7e1f5c81b7cfe96c09b5996fb8d2148d7b8352a9bbafb9d162fb6b60b58450c7dc0fb717e779928c2d708fa4538cb4e2c6cf6fb33d5e52952d18472f
 DIST aws-cli-1.38.23.gh.tar.gz 2945172 BLAKE2B e60a7465a8f03e73244eee0e8993f35cdfd4210aa16fa63ad2b5813420b0401fd7a8589da68f61c18f4c4a3aef198ac05b1e2d48ba51d0300135ea3b1d54d547 SHA512 c3bf38d2cc3e7b1f783ca9424f64bcb9c1757874d47bc7d44e98f9c42f4e1841749ec0d8a984b249215aefe1e2c44f55ff76708fb8ac630ce5bd8375a230197b
 DIST aws-cli-1.38.28.gh.tar.gz 2949031 BLAKE2B be411308619abb7ff1f8abfae4ab4c6112b65e2536bca52202ac612f0159cef30f9a8776e0dc489d201542fd0688b9803eaacff617c726e9f859944548851497 SHA512 6134a58f4e980e13a4bca958df3c6b7c0b8401d1cdb64db7942bebbb583830e675b482d4ad9cea673110c11c06960558c3c846c6c6f2bb7e6c6a2c41acd00615
-DIST aws-cli-1.38.29.gh.tar.gz 2949237 BLAKE2B 2061ecc61cc25a0731c7af36016cd862f8283b3bee16af3b297f5f77f24b3dcc2c25b00bb35dde96dd10b3a76ba3cacf3465f378049ffd90c68ce34644e7d96d SHA512 f7bd4a674e538797e7fd35b967dd24e7aa51edecc5d053b5affba088407065e88aeefe9c19f043a720fbb761c69d2db3deea317e771fc043ab602f6ceb404cc9
-EBUILD awscli-1.38.18.ebuild 3124 BLAKE2B 035e52b252c6e82be66ce01b02bb77556580162f4679e628c77be32fd256544ddc06781caae30bb763f949425b2545930c7704ebc509dd72588838834818bfdb SHA512 6297f03f60237a835600d4c3206600f833d1b013221ca349636360822b5d5bdb65a06a612070838605e70ad23b4bfd948461a113f63e4de106e6f8d35fb8e677
-EBUILD awscli-1.38.23.ebuild 3131 BLAKE2B 8a61c4d672bc9bc67974d876f40ee63bd5c0c585be1325b849e84fde874754025abf8e865d1b23ffac3adacf23025902d5b1268dab87dbd622cf4485f959a4c0 SHA512 b59539df0de6cb7927d67e150c651c078cbf4f19415787abe6d8e27ef51c6c5a374f3df09aed35249bb9d00afb69ccc633fd070be45ee301c99ade2e454c30f0
+DIST aws-cli-1.38.33.gh.tar.gz 2918023 BLAKE2B 2e9539c86425b6b07594d3c8793d9935679afe3f244e79fa0e0db501f9e7809a61c352e3a00d6d8b3d4bddd63131d8b3c6f3690c2c62c34de3ed49b7bad15de9 SHA512 473c781d2cfd3957b5ab469d22c3a811766c4e1f2223db0c02d6e231cb673efa08913869945521b03ef6f2d7ad109e0ddda1b96f9bfa97a8b57e633e3ca7feaf
+EBUILD awscli-1.38.23.ebuild 3124 BLAKE2B 035e52b252c6e82be66ce01b02bb77556580162f4679e628c77be32fd256544ddc06781caae30bb763f949425b2545930c7704ebc509dd72588838834818bfdb SHA512 6297f03f60237a835600d4c3206600f833d1b013221ca349636360822b5d5bdb65a06a612070838605e70ad23b4bfd948461a113f63e4de106e6f8d35fb8e677
 EBUILD awscli-1.38.28.ebuild 3131 BLAKE2B 8a61c4d672bc9bc67974d876f40ee63bd5c0c585be1325b849e84fde874754025abf8e865d1b23ffac3adacf23025902d5b1268dab87dbd622cf4485f959a4c0 SHA512 b59539df0de6cb7927d67e150c651c078cbf4f19415787abe6d8e27ef51c6c5a374f3df09aed35249bb9d00afb69ccc633fd070be45ee301c99ade2e454c30f0
-EBUILD awscli-1.38.29.ebuild 3131 BLAKE2B 8a61c4d672bc9bc67974d876f40ee63bd5c0c585be1325b849e84fde874754025abf8e865d1b23ffac3adacf23025902d5b1268dab87dbd622cf4485f959a4c0 SHA512 b59539df0de6cb7927d67e150c651c078cbf4f19415787abe6d8e27ef51c6c5a374f3df09aed35249bb9d00afb69ccc633fd070be45ee301c99ade2e454c30f0
+EBUILD awscli-1.38.33.ebuild 3132 BLAKE2B 72b38a93f521cb8f104c35147b8e7bc7f61b21982343e0eef47c3ee7a96331b790995a1db4bbb701b2737a2d0d6d4750aa5e953762f054694b3ed3e46003c5b6 SHA512 41b3ae6c1b2801246abab21d344c11a9341614dc5c9d5b4e0088a19893fba0ef0708915316180a680c566dea41e63b57d14e5b3fe1321b246babbf015469ab0a
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
--- a/app-admin/awscli/awscli-1.38.18.ebuild
+++ b/app-admin/awscli/awscli-1.38.18.ebuild
@ -1,93 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 shell-completion
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
-
-# botocore is x.(y-1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.11.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=(
-		"${serial_tests[@]}"
-
-		# flaky (some ordering?)
-		tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
-	)
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-	newzshcomp bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
--- a/app-admin/awscli/awscli-1.38.23.ebuild
+++ b/app-admin/awscli/awscli-1.38.23.ebuild
@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"

 # botocore is x.(y-1).z
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(ver_cut 3-)"
--- a/app-admin/awscli/awscli-1.38.33.ebuild
+++ b/app-admin/awscli/awscli-1.38.33.ebuild
@ -52,7 +52,7 @@ src_prepare() {
 		-e 's:from botocore[.]vendored[.]:from :' \
 		{} + || die
 	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	sed -i -e 's:,<[=0-9.]*::' -e 's:==:>=:' setup.py || die
 	distutils-r1_src_prepare
 }

--- a/app-admin/sagan-rules/Manifest
+++ b/app-admin/sagan-rules/Manifest
@ -1,4 +1,4 @@
 DIST sagan-rules-20210208.tar.gz 461258 BLAKE2B bdb9cffa0c3e0a2750c86c32f75cb571cafa7ae51099ca79210a76134e599222b11520d45ea58ecbaebe7b32700d2935f089f69405fa7f3493d7bbb2f5d1abf6 SHA512 d6609c31e262c78b5ef609a602e406b79df80b27b8908b665598bfe18482461e0a5ebcdc4fe26e91be41eacd4e885c1ca28eaf6f4fe2b647726c7db9a09ce277
-EBUILD sagan-rules-20210208.ebuild 472 BLAKE2B 9eae95046d20e24bcb832064c47f543f211826951691245f52c3aeafca4f840b70606e90b25644d836e23d412a140da7d9ca01d7d302c41e1acb9ad2a8c07d0d SHA512 b20c1f81986d83f1591c394b5deb6c628e96215d61f76773408cc19f10f1c4996fd29b38098061a8f90d3af7bb09895480d905a7c3c68cc1cb86cd5d53a971b8
-EBUILD sagan-rules-99999999.ebuild 452 BLAKE2B 33ba9348ac0fe4151bc828adddf99d1915552c943258fe7f7f0e076e45185a36237fb797b00f94f32e2cc92e604af17c5f1f571507eeac242c15e034a9d4a429 SHA512 1b2b55fa49d519dbdf646d495f2b98a52c3c59571b9d5890dcf847a84e1427a11c37b8fd68b8a344d799e9db0a41cce94c0dbcb18be2b7094c12fa1df9a9d9ce
+EBUILD sagan-rules-20210208.ebuild 445 BLAKE2B e0154e9e6994e90ff56d93b747c4e9665a985e9793afb926c3095a460fef3fd777b93c0039d94e62be619939a4e0d5fab579f3007d4912df7657ba812805abb4 SHA512 2ab4ef4d10981e42708f215007e5afa9f47ea4c0a040dfce13f92790fdedf71d584c3bc2046b4d9983adb2cd59a53cce8aac9cdd7c4745e3a851ec9c28c2863d
+EBUILD sagan-rules-99999999.ebuild 425 BLAKE2B d7c831a33e5ad1f2548c64c636cf488fe7d7d57fbcb93146aea5432d78e084d0d81871ebd5abe203ae975fd5febc939661ad822ca36c97dfe8762fa21c6e2aac SHA512 1775536401b6ce52babe71516bb5338665543fa6126ee88230048b56bb6b3936f2f919b9981a234a7560c4c45d26c08d155c0652d6fa0f93bc77994e58b822b3
 MISC metadata.xml 256 BLAKE2B 70f4ec57ca7f9ef27a0b224b1d2d73adf19b065772efcac082f843301a531e8dddc2f3e4d51c215f7cd4a7047565f0568de31a7b5e8c670f867480af040f45ed SHA512 a2d26b6e81e5dbc0644f3993d74709d9032120e40e5d5f619a96c79ae61431ca17be9c770a6623233656463b7a375edd495803148f23c7e416f6a5fefa8eaa44
--- a/app-admin/sagan-rules/sagan-rules-20210208.ebuild
+++ b/app-admin/sagan-rules/sagan-rules-20210208.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=7
@ -12,8 +12,6 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"

-PDEPEND="app-admin/sagan"
-
 src_install() {
 	insinto /etc/sagan-rules
 	doins *.config
--- a/app-admin/sagan-rules/sagan-rules-99999999.ebuild
+++ b/app-admin/sagan-rules/sagan-rules-99999999.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=7
@ -13,8 +13,6 @@ HOMEPAGE="https://github.com/quadrantsec/sagan-rules"
 LICENSE="BSD"
 SLOT="0"

-PDEPEND="app-admin/sagan"
-
 src_install() {
 	insinto /etc/sagan-rules
 	doins *.config
--- a/app-admin/socklog/Manifest
+++ b/app-admin/socklog/Manifest
@ -1,5 +1,7 @@
 AUX socklog-2.1.0-headers.patch 925 BLAKE2B f1f283e27a1e4e260e5c9313304090a9b62d8f0f4854be19e1fcfcb8af764346c650cb28e610779020ff7183d16d32a0e61745addcdcec52031057398b8d3d94 SHA512 d522a421a592813992646d9d2679b26c7c70a87645e06705ba212b26decd6f7dd969b4a35f54732b0b383783956c1b9ab2fc3cd402f6f5ff1a941ef1863c1419
 AUX socklog-2.1.0-respect-ar-ranlib.patch 372 BLAKE2B 44d1c60100a6cc1a044cc7ab440ecb4d66f9bae8d0dae18a1e0e7b60848736439e9acf56dec6644e612ae7515749ca5b74b44a3dd86bdb33e12ff0dc50c41141 SHA512 862178c36bb87367436b59851bea30351c15cbef8c2a4d26b8a3d9cbb522eee3a4589add0b476d53f07869d0c7b833b6255727eda7430e02c9a37a7160167986
 DIST socklog-2.1.0.tar.gz 56942 BLAKE2B 4f88044bb075dc8e503956f0ddf50fd4e748bf090e62acd34701e716d1dd34a639590b319b4377de06d3b0305d865652abd303210745e355ae67f5dff41cb895 SHA512 920ce5e661a6a3d970fa77ee3c228d48699ea03530be2b43b7517458b25e31a0a7f352ece2d076c715b6d34dbb26b424b48eb0f55b9bcd0355b74d3e34c77ac7
+DIST socklog-2.1.1.tar.gz 59247 BLAKE2B 8f81dab66a2255fa0f6b502366fd22f85805c32d3050217e6af26a759d9eab902c79c4c7d7d65ab490563e8b880e4bbd7646f5b71db88d644fd04506a5c80b58 SHA512 d06ee512a651bcd61c79ebdfa94c2d933e3154c5268310f57dcf1e242d11021d7f9d82097e6b562b1f58242f627a4c0947b3a3aa4abb2295c1a2d80198282ed7
 EBUILD socklog-2.1.0-r1.ebuild 925 BLAKE2B 647cc0a86485992bf00a50f9ecc0c17babf031ff612f12df4d0237bada3c3c5fe4385bc4157d495cd4f59ac12f3e562fe6e059b41f73ef094520cafe06945f9b SHA512 4ae31d1c99c7586cb7a914339d2587a0197d4a907914c2c72a3fbc69e1c7f5284371a5b070199e300317ceb385190158a34f12999338dfa18f083c903c8fd963
+EBUILD socklog-2.1.1.ebuild 820 BLAKE2B 6eb2d99505869ca0c389bd77d4239c1f861f73f800d4b8cc645021b3595e696160abf7f810290af318a99b0dcc6889ab5bb0f45354e09de8b0b334236aa601c2 SHA512 833caa0bff1eaf902d14b9e63a0578d0288419e440b6a23fac6ae3ca77b1be9d206b87cccf75ba56784f682fa7a082e0020fadc4d86a3420bdcdd0d4fc869886
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
--- a/app-admin/socklog/socklog-2.1.1.ebuild
+++ b/app-admin/socklog/socklog-2.1.1.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Small secure replacement for syslogd with automatic log rotation"
+HOMEPAGE="http://smarden.org/socklog/"
+SRC_URI="http://smarden.org/socklog/${P}.tar.gz"
+S="${WORKDIR}/admin/${P}/src"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="static"
+
+src_configure() {
+	use static && append-ldflags -static
+	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS}" > conf-cc || die
+	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld || die
+	tc-export AR RANLIB
+}
+
+src_install() {
+	dobin tryto uncat socklog-check
+	dosbin socklog socklog-conf
+
+	cd .. || die
+	dodoc package/CHANGES
+	docinto html
+	dodoc doc/*.html
+
+	doman man/*
+}
--- a/app-arch/7zip/7zip-24.09.ebuild
+++ b/app-arch/7zip/7zip-24.09.ebuild
@ -17,7 +17,7 @@ S="${WORKDIR}"

 LICENSE="LGPL-2 BSD rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="uasm jwasm rar symlink"
 REQUIRED_USE="?? ( uasm jwasm )"

--- a/app-arch/7zip/Manifest
+++ b/app-arch/7zip/Manifest
@ -4,5 +4,5 @@ DIST 7z2408-src.tar.xz 1493700 BLAKE2B fd22a302044ca8655187573173fdc13ae93efaf90
 DIST 7z2409-linux-x64.tar.xz 1565344 BLAKE2B 4ded059fe85073405b4a1510378ed473bca6de2792d313fc3dcb77850dc2531b06866bb4d9de4d4dbc848be5a98b2e4cf5bbe191248f0ae53a279b48b586c169 SHA512 aebf18d861944e2b52d91434b1d59d80a5aadf3b2e80ab3d248357bcaf3c429442caf4ad3297057a559f2719cae9ce5b0aa391963570ffa75b6dcdf1f3c25603
 DIST 7z2409-src.tar.xz 1511288 BLAKE2B 5fcb39acc282b7dafbd1900eaf77e15e634adda5eff5d630b9d0821aa0d1e8569856cf99503ab7ffe69a82cec82a1a890772d6cff86cdb0af01dd462a94c0908 SHA512 461b702eb275655ebda70e128a5e184d15d2b0556f11ab1b409c0ff8a1e9c5d64761bdfb1685c5a0278534024a1e4ce46e4443d55cae373e487dc9ae180ef310
 EBUILD 7zip-24.08.ebuild 3021 BLAKE2B cb25e4abb650c622528ea0eed277f1f5b1419e46b5234a53b83120d6247842158c556190442f9ee792129e17b4915bd8b90daf32bcb07f3114687c28fae9d345 SHA512 dade7aa8de294f3c8a3ec209bdbb66b87e5f0a824166e2b5013d1d8bda0f14ecee7425db15874b67c274361b0fc047cfc90b0c9e122aa1183794286dec103c01
-EBUILD 7zip-24.09.ebuild 3168 BLAKE2B e6a7c290465bd4f1c029d9826b6f2370a8a016a38c978b29c2c256647a56b929b9bd72079ccd0b3c3cc9771d99b7faa36b47492a896521852659c75f1a24bf55 SHA512 870c914740ed4923d1ab06930c6c68feedec570be2637244e4a716aec861752a542025b1903141daefc7a500a5ffa3008900c746c9263ae69a05e4b94160a8e3
+EBUILD 7zip-24.09.ebuild 3174 BLAKE2B 35fe41d04a854982130c33fd44aee8771a27fd80194f6ec266c8ef9a8d7021513bd96fdd5b2274eca3c3ccff8ed4afb38fd91b3b4dd559d2ff0f59b3d536b6de SHA512 6a1d59eeeddf6ba8dde4102694cf2643ff6a9838a60a02ac9e61c7742670a005caebfcc90b31ea7e5415c08a855b2d6a98fbbaee7f18f0805b30a34f52a31a53
 MISC metadata.xml 1044 BLAKE2B 481810b40b8c6ff2a023318682484f2ebf7e92ec6ce921e73d6b92b5f671dadfc1355bef38574f8a1fd74ed1a8bef11b9ec3aa763b9489d994c7bc3f2bf86caa SHA512 b55539bdaac268bda1017d179cf77573848bc8dbcaba655c5163f3ff369e68034426f14565953aee30c9ba1cb7ed5a42e17745ea609dce53789ece38c5ade653
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@ -8,5 +8,5 @@ AUX bzip2-1.0.8-saneso.patch 463 BLAKE2B 83c5a905dbb3dd6481abe7ad7f57f9ce5c5cac8
 DIST bzip2-1.0.8.tar.gz 810029 BLAKE2B 22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
 DIST bzip2-1.0.8.tar.gz.sig 310 BLAKE2B 0d702dcb19f7738da9f05ee9d719f5cd3653540365e78db143404e599ea54bc6f9d5e6a38cdf5cdd3c6550243d34266343467c6b1db9d5d3c134f9353b00f395 SHA512 4a4a3fa0ec1c10a704b9870e8e629fd007cca55184423c6bfc3049a702fb41e4aeb73bfe9ca7442c27d32d278f1f34f27523a6be67d35b37896acdded12bf40d
 EBUILD bzip2-1.0.8-r5.ebuild 3584 BLAKE2B a9a088be6900b31459120ba10ab4fb36595366e134a3c6b0f2b0d2dd3698a60b554b7c05015b8f4b4fc18f1a181bf0d63af1a48f8f03e97fc4dc0b168bd37870 SHA512 726f188fcf746dd18d4ad952bace80eb2880f445ed4768ac2aaa84e3459b4e5db74c758601dd8b64d5356b857a34ed02970fd0a7b1d992bba7d03f57ec58c589
-EBUILD bzip2-9999.ebuild 1376 BLAKE2B 202a30ea06c988907676ac263b4cbe881403ec522e4d2a66df2b624f5143c2e8a03f0374e837239a5e60da5277278950cd9d3a5c16e9b9bf19aa72684f30f461 SHA512 35454863970218af9961a98ef35afe98f29308a191b546ea9599fdf25c915ff8d1fabee4fdb5fed9b763b27418057474e6e6edf2e4ecf39b9c5a2efd39c3716e
+EBUILD bzip2-9999.ebuild 1251 BLAKE2B d2547fd04d946b056f70808d28d2611fcaa60fd0f838c59c27b0a4abc62789474e414b526c352ee61a9aaef641a4093e5d37445ca9765a557e1bef8325aea5a6 SHA512 fab85f7682a3a4d2bfeaa4f19fca924e6cbc4610f17d5a8c56defa686f27f8370baf6406eceed98274cd14fb9f08f3ef9c636628ba2c71f13a68e59070daf0e6
 MISC metadata.xml 384 BLAKE2B e74083bed23efd0279d23ea4f9fc048a9a0c253d48757f74a6c0044f5ca6a6b4cb86908db25d42f304b72a8dbf4c3627371ad6ab69aeab9267e8eb21c2053898 SHA512 c358db6bdaabfa401452ceaa8f85298b75ae00e5f7f189768741b4c74ed123be79405c03c7b94707db29b7d60710c441d089c10fa511262ad5a88cd106fb54f4
--- a/app-arch/bzip2/bzip2-9999.ebuild
+++ b/app-arch/bzip2/bzip2-9999.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

-inherit meson-multilib usr-ldscript
+inherit meson-multilib

 DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
 HOMEPAGE="https://gitlab.com/bzip2/bzip2"
@ -33,14 +33,6 @@ multilib_src_configure() {
 	meson_src_configure
 }

-multilib_src_install() {
-	meson_src_install
-
-	if multilib_is_native_abi ; then
-		gen_usr_ldscript -a bz2
-	fi
-}
-
 multilib_src_install_all() {
 	dodir /bin
 	mv "${ED}"/usr/bin/bzip2 "${ED}"/bin/bzip2-reference || die
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@ -1,8 +1,8 @@
 AUX gzip-1.3.8-install-symlinks.patch 284 BLAKE2B f461a822371d56505aa3e436c4d611823dfe81ab72f9e1a2bd3547b8fbbae07d2108ac255a1a9dae604f9acb77744bda3a9eec2a575580558a4ca7042164c563 SHA512 4a20d61d48c456c4f5cca31b38e6f26460f781782c66ff4cd1b193eb1a48dd9fa88967989b2698b5e45a61d64c9ce3b87fba0f6b67bf507c5bb386a847f477fd
 DIST gzip-1.13.tar.xz 838248 BLAKE2B f0e3b4c28bafcd3b59b65ac2d71218dc58d81b52c6921c1be038757c99e99184178c5d0e9674caa5099713b8b64e8c85cf061f4abfa20b73b478288f121fb05d SHA512 e3d4d4aa4b2e53fdad980620307257c91dfbbc40bcec9baa8d4e85e8327f55e2ece552c9baf209df7b66a07103ab92d4954ac53c86c57fbde5e1dd461143f94c
 DIST gzip-1.13.tar.xz.sig 833 BLAKE2B 42e38fa7b3a6b6d21a18308cf662844ed84e1a142a945f3f3142db0a14212c0e642de514abb1307ec12ee7bb9644472cc3aed40582d9c266ab24808acbca0215 SHA512 f95e016f61f4a67cb4cec6cede2510af6bb5567d72bbd3d70210a6d5cf3ee5fea8f0cbf8f7b612fa52f2ecfd9dba050d9cd4494075ce5ac4abac7b74eaa7ccbc
-DIST gzip-1.13_p20250405.tar.xz 892960 BLAKE2B a3b52fbc4db6594ebc98d0f49d04f18073036bd2b29ac1aedb77ce124f8ac232e502450763d260d9d836066d21106b4770561f67dbe833bf43ed9b6c12987389 SHA512 8c439fbb15924eb38e421b04919fc2013e5a814445c83b665e4538f34f9b4b8c73dfe1910aba8c38ef98ee4bd57f01082798e6056802a12aa95d0c82e4a08412
-DIST gzip-1.13_p20250405.tar.xz.sig 833 BLAKE2B b47479ee151f093e6fa81abfe9587c887994562bb19631da9b3506a020ec8ccbc34eb79df29f61e4e441b46fb3e7b5e603357d75edf5d13973ca52737967f897 SHA512 162488d2085664514f8893128fbe6227860e8c8e152a979196c311f68706781c058fdada3fe659e41059aaaf281f0539b035f358e5e633d59e9c5634edbefadb
+DIST gzip-1.14.tar.xz 885748 BLAKE2B 32f7241bd9f3b7f73a59905a5bc9abf4e360e787f692cbb00ad28d48abee52744846d10c07ce2f7aaa3e66bc4b6ab9cd4f1b8e98854bb7d1ec010ae0d5146932 SHA512 82aef53188b3e69b51b7ddab5b8c44a11a5b73c0039b22a315a0c7d244694feab0146748add4265901eb1b4c0cee8a9eb69594995f098830d964091af97079c5
+DIST gzip-1.14.tar.xz.sig 833 BLAKE2B a13ade68035fe32d69c24a1b5791ae6d7163cbbbebda396b4c773f2dc82ea6c619a44c39adc53dcd8fff094962a1c2dddfabfc7ec2cf54561202ef9a2be325ae SHA512 a5abd09e3b7bda8d87e5af7d2bd943e6021272cb0b6aa05625ddfeae45838aede1ffd91d7e0cb4e170f7f3078035f735f8441bc15cc115c51d302e0a11be44cf
 EBUILD gzip-1.13-r1.ebuild 2489 BLAKE2B 68892a0077c4a49cbc6ebe30516d10c4272647511723fd0d29b54cf73a01ad2794d0726bcaa9de02f75cc1d24c9c4a68d04b25df5e5acf726b15d24f93f58848 SHA512 e6a1645c1e5eb9af502dc810adb92fd02c61366abb9a4f47142dab3b7ec84918525d5907b85d1aebbf21cb30cf8d3db70a850fe1fc6af9966741aff583c10949
-EBUILD gzip-1.13_p20250405.ebuild 2497 BLAKE2B d99ebb748cdce3fbbad670bc7d215925b53f8ac82021ce36a15a04952076e50d5913a08dcbd2733ca16fee15dfc7ad1ee2146ad28131cb71c5cc75f966227a6c SHA512 37de6b334001a21ab2bb99874b4a050074d5b14a9fd374d27bb8280ff503b55e387565bfe9f0297069ee8079d2bd6046e2fd5b068069c436864b55948796f9a7
+EBUILD gzip-1.14.ebuild 2497 BLAKE2B d99ebb748cdce3fbbad670bc7d215925b53f8ac82021ce36a15a04952076e50d5913a08dcbd2733ca16fee15dfc7ad1ee2146ad28131cb71c5cc75f966227a6c SHA512 37de6b334001a21ab2bb99874b4a050074d5b14a9fd374d27bb8280ff503b55e387565bfe9f0297069ee8079d2bd6046e2fd5b068069c436864b55948796f9a7
 MISC metadata.xml 479 BLAKE2B cdefe625a65bd3c5e40e813650884b2fc6c41e4d3456d3935d16472097d179a41b42c8b8bf1457bdd3aea29ea91eaa8f7534989385e77016c717871e07d38b8e SHA512 e57ec8f6ad9342c61a6eae56cb70893357ba7feb7ea79d6941ffcda5abaadac05dd2e7469743d3a24ef7dcc7cdb7d6ee02a7172e6462ccbdf9d674aa0cca845e
--- a/app-arch/gzip/gzip-1.13_p20250405.ebuild
+++ b/app-arch/gzip/gzip-1.13_p20250405.ebuild
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@ -1,8 +1,5 @@
 AUX libarchive-3.7.2-lrzip.patch 1095 BLAKE2B 011c61282f5ad91436e8155458695c5f0b9144e21ae856ba319927e6431d9730257d6e7f7ebcc916ad784e24b2f4ff2af75955aa0493ea3705fa8826f632f163 SHA512 71e3aefe7d3e5faa6cd47e350e52135d594184d957cf3e2d592e3770971ff3fed8886b7fe6c897c94efa15b3b9e9d15be05686178d201b422d4503e3878b704d
-DIST libarchive-3.7.8.tar.xz 5493312 BLAKE2B ba058b2fa2afbfe53127d6ffd0a7ab00d9e8faf62340ae2eb8871a0ca232c2de482dbff2c4eedf2c45d944eb555123d765c462818158046bb72951f6421d9ea0 SHA512 a2b6c8c337e75bcce73126c30a3b564dc586df973780d9c7d5a9eed693dbe3779bf762b64c49c47203c2768c92a4a7d2dc8c0445b1dc398eafd2d58b0ba5aae6
-DIST libarchive-3.7.8.tar.xz.asc 659 BLAKE2B 2050214592b0add7cbd758b815c4289a8760bfb2e5b5db581afdbe741d348252b73f99919641cacd908b586cf4f8fc30a591d88b869bd607adc837251d8fbd4e SHA512 3f1d70318f5e2369fa59e94f91bf8473630a448ded11e2ff3502657380221b9e11e849dc98ba0806c3110c7267cee251f7d681db27751e2a45a948f6ad558404
 DIST libarchive-3.7.9.tar.xz 5494688 BLAKE2B 7bcfb3fe8ffd9452f3d71cdc738144069594030278572ebba0bb247ad74fd68ec19822f281364878228ee311976e216614d4764e56c5fb7f98801695ab7aa7f4 SHA512 d8918445e2536eb29c2d6a6c8cd3671a8525be1619009a2e7c3a9c2a821b51939172dfccc25bfd62fec2a17fb01796b4f522b0ba72b31e3de9b9658c44c46345
 DIST libarchive-3.7.9.tar.xz.asc 659 BLAKE2B 1de2d5af2422c8220983d7e5aa76fae1fcf12c008e7a99ec193b82145a03506fddabc7d5b89efce609e3b807511ebf719fce2f81f2150ccc0a57b4248ad3c5cb SHA512 e60bf9b6c8c58a6fd8977df0ccdd375e42db03f99623412897711dfcbfa4fb4a5b8707e8643c30e25e8b2946df58d1367f67c6ef99223a2739dabbce387f83c5
-EBUILD libarchive-3.7.8.ebuild 4617 BLAKE2B 9761a010e5022a8157d152cc3437349200706431d97dd23504de7dab574a7cc6fde6c18725150a90e54250fc2d770c5c166b67aace6b476ffdc2ea6e074fe6ae SHA512 361c1ec0f48f01c604892d07bcb2fee0fcb7cd3e0d779f922c3b798a01da10ef9e0c75e3d73ca399d863bb90427ca28e89f2b0af6d32412cfee86769e7bfa338
-EBUILD libarchive-3.7.9.ebuild 4618 BLAKE2B 30d27b1c39e57f7bdf03764e5405a4ed2822e811b6230bd392e11d66a7cd672fcb8e881a79bf3b8d0d864eade6954045e10fb87d9525fea9c298b7d57440ec39 SHA512 4b6920d290de17444691db9c28285fcb8fc721b4f0b0e9758e8345ffbb9d4a90310c48f02ce7078c503189ab905bcbbce61721096b9d77451a2b26aa6a9d2044
+EBUILD libarchive-3.7.9.ebuild 4617 BLAKE2B 9761a010e5022a8157d152cc3437349200706431d97dd23504de7dab574a7cc6fde6c18725150a90e54250fc2d770c5c166b67aace6b476ffdc2ea6e074fe6ae SHA512 361c1ec0f48f01c604892d07bcb2fee0fcb7cd3e0d779f922c3b798a01da10ef9e0c75e3d73ca399d863bb90427ca28e89f2b0af6d32412cfee86769e7bfa338
 MISC metadata.xml 1224 BLAKE2B 538433528de5543ad8e912ce0d072340be3f6eeefe16320ef48b3c30a35ebdff4a32055edf89f36e4479ab1468c620871fcb5ba91bd66e81798093b4d0345949 SHA512 9f53d623a02334f675c06edea2829ce52e78d85e3894e684ae920a678eb47046393b7a93808c7e1761d30a69faa5986cd4922ae7ef8f1e2ef221de39869bd12b
--- a/app-arch/libarchive/libarchive-3.7.8.ebuild
+++ b/app-arch/libarchive/libarchive-3.7.8.ebuild
@ -1,173 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit libtool multilib-minimal toolchain-funcs verify-sig
-
-DESCRIPTION="Multi-format archive and compression library"
-HOMEPAGE="
-	https://www.libarchive.org/
-	https://github.com/libarchive/libarchive/
-"
-SRC_URI="
-	https://www.libarchive.de/downloads/${P}.tar.xz
-	verify-sig? ( https://www.libarchive.de/downloads/${P}.tar.xz.asc )
-"
-
-LICENSE="BSD BSD-2 BSD-4 public-domain"
-SLOT="0/13"
-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"
-IUSE="
-	acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle
-	static-libs test xattr +zstd
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	acl? ( virtual/acl:=[${MULTILIB_USEDEP}] )
-	blake2? ( app-crypt/libb2:=[${MULTILIB_USEDEP}] )
-	bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
-	expat? ( dev-libs/expat:=[${MULTILIB_USEDEP}] )
-	!expat? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] )
-	iconv? ( virtual/libiconv:=[${MULTILIB_USEDEP}] )
-	dev-libs/openssl:=[${MULTILIB_USEDEP}]
-	lz4? ( >=app-arch/lz4-0_p131:=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.2.5-r1:=[${MULTILIB_USEDEP}] )
-	lzo? ( >=dev-libs/lzo-2:=[${MULTILIB_USEDEP}] )
-	nettle? ( dev-libs/nettle:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	kernel_linux? (
-		virtual/os-headers
-		e2fsprogs? ( sys-fs/e2fsprogs[${MULTILIB_USEDEP}] )
-	)
-	test? (
-		app-arch/lrzip
-		app-arch/lz4
-		app-arch/lzip
-		app-arch/lzop
-		app-arch/xz-utils
-		app-arch/zstd
-		lzma? ( app-arch/xz-utils[extra-filters(+)] )
-	)
-"
-BDEPEND="
-	verify-sig? ( >=sec-keys/openpgp-keys-libarchive-20221209 )
-	elibc_musl? ( sys-libs/queue-standalone )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libarchive.org.asc
-
-# false positives (checks for libc-defined hash functions)
-QA_CONFIG_IMPL_DECL_SKIP=(
-	SHA256_Init SHA256_Update SHA256_Final
-	SHA384_Init SHA384_Update SHA384_Final
-	SHA512_Init SHA512_Update SHA512_Final
-)
-
-PATCHES=(
-	# https://github.com/libarchive/libarchive/issues/2069
-	# (we can simply update the command since we don't support old lrzip)
-	"${FILESDIR}/${PN}-3.7.2-lrzip.patch"
-)
-
-src_prepare() {
-	default
-
-	# Needed for flags to be respected w/ LTO
-	elibtoolize
-}
-
-multilib_src_configure() {
-	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
-
-	local myconf=(
-		$(use_enable acl)
-		$(use_enable static-libs static)
-		$(use_enable xattr)
-		$(use_with blake2 libb2)
-		$(use_with bzip2 bz2lib)
-		$(use_with expat)
-		$(use_with !expat xml2)
-		$(use_with iconv)
-		$(use_with lz4)
-		$(use_with lzma)
-		$(use_with lzo lzo2)
-		$(use_with nettle)
-		--with-zlib
-		$(use_with zstd)
-
-		# Windows-specific
-		--without-cng
-	)
-	if multilib_is_native_abi ; then
-		myconf+=(
-			--enable-bsdcat="$(tc-is-static-only && echo static || echo shared)"
-			--enable-bsdcpio="$(tc-is-static-only && echo static || echo shared)"
-			--enable-bsdtar="$(tc-is-static-only && echo static || echo shared)"
-			--enable-bsdunzip="$(tc-is-static-only && echo static || echo shared)"
-		)
-	else
-		myconf+=(
-			--disable-bsdcat
-			--disable-bsdcpio
-			--disable-bsdtar
-			--disable-bsdunzip
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		emake libarchive.la
-	fi
-}
-
-src_test() {
-	mkdir -p "${T}"/bin || die
-	# tests fail when lbzip2[symlink] is used in place of ref bunzip2
-	ln -s "${BROOT}/bin/bunzip2" "${T}"/bin || die
-	# workaround lrzip broken on 32-bit arches with >= 10 threads
-	# https://bugs.gentoo.org/927766
-	cat > "${T}"/bin/lrzip <<-EOF || die
-		#!/bin/sh
-		exec "$(type -P lrzip)" -p1 "\${@}"
-	EOF
-	chmod +x "${T}/bin/lrzip" || die
-	local -x PATH=${T}/bin:${PATH}
-	multilib-minimal_src_test
-}
-
-multilib_src_test() {
-	# sandbox is breaking long symlink behavior
-	local -x SANDBOX_ON=0
-	local -x LD_PRELOAD=
-	# some locales trigger different output that breaks tests
-	local -x LC_ALL=C.UTF-8
-	emake check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		emake DESTDIR="${D}" install
-	else
-		local install_targets=(
-			install-includeHEADERS
-			install-libLTLIBRARIES
-			install-pkgconfigDATA
-		)
-		emake DESTDIR="${D}" "${install_targets[@]}"
-	fi
-
-	# Libs.private: should be used from libarchive.pc instead
-	find "${ED}" -type f -name "*.la" -delete || die
-	# https://github.com/libarchive/libarchive/issues/1766
-	sed -e '/Requires\.private/s:iconv::' \
-		-i "${ED}/usr/$(get_libdir)/pkgconfig/libarchive.pc" || die
-}
--- a/app-arch/libarchive/libarchive-3.7.9.ebuild
+++ b/app-arch/libarchive/libarchive-3.7.9.ebuild
@ -16,7 +16,7 @@ SRC_URI="

 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
-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"
 IUSE="
 	acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle
 	static-libs test xattr +zstd
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@ -1,11 +1,8 @@
 DIST rarlinux-x32-701.tar.gz 739420 BLAKE2B 9550c74d2f9a5bbd821fc2d313a1aa3fdca1f88675056e42507e9b40f7c456e20e0834149e6a925abc88d04aa23d5ccecb0f6efa7ba2d21629f030531b9e84d2 SHA512 2d8488106ed8ed5a67a1de114414a7fe58ab8a139b4f5fd78d5f334e59339e192d51574e3d36fdc7e5d4068cc9e33ec03e4ef6c0907193b407167c616f1ab357
 DIST rarlinux-x64-701.tar.gz 730436 BLAKE2B 271b18f636250876adf924752298e283922c87d1ea71084ebd4263f5c8db189b093faf0b66362db781ad0fd9c6154a9a3a1e7d013c7c6cee56ad8fd7fb772fa7 SHA512 3effdc32f5dbad414d4a434b4ec430c0dc29fd6a758036395712f61c588067547c3919025545d27e9a7fef6ba8de1773f2dd9a7e20dfa2178b2b9f9bd2440ff9
-DIST rarlinux-x64-710.tar.gz 736548 BLAKE2B 14c0a65eb56f3eee969c62cd3af57d7996b124b14368e68675c5243938ce7886e6ad911f30014598f030d198a4804fd64425aea8981f2973b1510024465a9973 SHA512 325c1d5428c00c127c48eed4e846e91459f9023e2becfb875ec4f6ec2769d6be6552dbf020420ce7dfa6f6ec792bfda9b36ccc2429e1a5d13a5d1000ad2ecdf4
 DIST rarlinux-x64-711.tar.gz 738065 BLAKE2B f87d1e843bc17effa6d19a84a09368e6a5f0803b6a28cbef9d17a3f72ae530a145f60bff05dbf7cdce2b244f075151c4aa357ab0aad84d2e4029e3ac09becc45 SHA512 f779c16649d3d8767c9615c27a3f476dc6ad54fcffa875cf73a18c0e8a3e2796da8f7c61209d641c28123dbef97bdb87004ca9918fc407ea84bf9b86c0f82164
 DIST winrar-x64-701.exe 3912088 BLAKE2B 46d379c51d6c2eba1b632c3f4e6f56529a0218db3cf4d4a4e52de08103d1de15dd6974c5375885dd19d1a29279f664d6df49056f57c71d8d3858bb0266d4eb99 SHA512 61daee2ce82c3b8e79f7598a79d72e337220ced7607e3ed878a3059ac03257542147dbd377e902cc95f04324e2fb7c5e07d1410f0a1815d5a05c5320e5715ef6
-DIST winrar-x64-710.exe 3735040 BLAKE2B 7fc9de19df0b32538f8b978efe8300f4dbfb85833359ced1e16dcb1a6115a1299c26d83424266c85ef3d81dee3ca54d0094fe92a7d97fb91c93ce19a65007142 SHA512 0b1f516cea22df2c36c96dc97ab0b0ae1832c1feb20c8cbbf0c5c1c289c5941fbcef25e054bc78f09b9c9cb54d0bc22d5ea028810326824e1f91fb6ef73b4c96
 DIST winrar-x64-711.exe 3740048 BLAKE2B ed5dd0931bfbd7fbf76e0454e28e9f1c4ee16c0b9e294de9364132f93e8bce04c832556e0175bf8b433f43f1612ff12cc50239443179d290a70a8b29819ef8f6 SHA512 5de7e321f439540febcf2b4ec924f6f2b2d104c3532bf724e24929efc8973488279bb1a8ccedad03534878087495e1cb8af7d7bc0b50bf4f892b034a769ce557
 EBUILD rar-7.01.ebuild 2407 BLAKE2B 303485256398506a70d52acd1518a7ff00e71ef1ded8624f2a6f0d43e8ea70f9e0b3fbd69dd14609b18c5543a12bea85ae92b089d076cbaef446a3d9e242491f SHA512 556026c9e25581f74901ea9b8f40b10fa894c312bdfd6e5a7d3655ec199231f4d323b92bd9fcd3854a16fb0d17a5302951bfa1848cbbc69bf2e2913138874d96
-EBUILD rar-7.10.ebuild 2303 BLAKE2B 783cde878204b7ed2d50d99880128d6511e7b922d6c5d0e724cfef3ca143b1a70a827856dbe90af946f853c96729305d5ba79e30ed787cc023037a0ee0562221 SHA512 9f2ca94b887ec07399f40a27161deb33851e2a5d8ba91c9133f6cb899caaf304129928e110740906f57c78ad6ee2a224efe6b22ccfeb4768ab7905e787b5bc56
-EBUILD rar-7.11.ebuild 2304 BLAKE2B 9bfbf15ad44fe2edadaa569e924fc578df9011d213f9588b4b796a389d5f9ebaacfabf106c53895e0d7be8df231cf1592c973c56d1eb138d471bd62e5927a25d SHA512 005adb03ecb4727a0b20529e8a289c3df60a88bdb00abb331a07eb2358878cfee44b0eb615c00655f870e598e76c6aaf7025ccccba58264d573342011aeb4960
+EBUILD rar-7.11.ebuild 2303 BLAKE2B 783cde878204b7ed2d50d99880128d6511e7b922d6c5d0e724cfef3ca143b1a70a827856dbe90af946f853c96729305d5ba79e30ed787cc023037a0ee0562221 SHA512 9f2ca94b887ec07399f40a27161deb33851e2a5d8ba91c9133f6cb899caaf304129928e110740906f57c78ad6ee2a224efe6b22ccfeb4768ab7905e787b5bc56
 MISC metadata.xml 436 BLAKE2B 89434fe285ad2b7be02c6e0014bb0a8fd54772e899345cb1c6de1da1e7cf5396d490af746bad1af6449183a4970c70415178765d918488f047174e64c289ceee SHA512 c9d65d30420f8febc660ad83169a8ae95c11ffcc673ca0cbc16530367e441ff72636fdbe3948065270547cb043ab0e1114dd573e4bd8716089bd01f056a63ff6
--- a/app-arch/rar/rar-7.10.ebuild
+++ b/app-arch/rar/rar-7.10.ebuild
@ -1,120 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PV="${PV/./}"
-URI_AMD64="https://www.rarlab.com/rar/rarlinux-x64-${MY_PV}.tar.gz"
-URI_WIN64="https://www.rarlab.com/rar/winrar-x64-${MY_PV}.exe"
-
-inherit unpacker
-
-DESCRIPTION="RAR compressor/uncompressor"
-HOMEPAGE="https://www.rarlab.com/"
-SRC_URI="
-	all-sfx? (
-		${URI_AMD64}
-		${URI_WIN64}
-	)
-	amd64? ( ${URI_AMD64} )
-"
-S="${WORKDIR}/${PN}"
-
-LICENSE="BSD BSD-2 RAR"
-SLOT="0"
-KEYWORDS="-* amd64"
-IUSE="all-sfx"
-RESTRICT="bindist mirror"
-
-RDEPEND="sys-libs/glibc"
-BDEPEND="all-sfx? ( app-arch/unrar )"
-
-DOCS=( "acknow.txt" "rar.txt" "readme.txt" "whatsnew.txt" )
-
-QA_PREBUILT="
-	opt/rar/default.sfx
-	opt/rar/default-elf32.sfx
-	opt/rar/default-elf64.sfx
-	opt/rar/default-win32.sfx
-	opt/rar/default-win64.sfx
-	opt/rar/unrar
-	opt/rar/rar
-	opt/rar/WinCon.SFX
-	opt/rar/WinCon64.SFX
-	opt/rar/Zip.SFX
-	opt/rar/Zip64.SFX
-"
-
-src_unpack() {
-	local _file
-
-	for _file in ${A}; do
-		if [[ "${_file}" == rarli* ]]; then
-			if [[ "${_file}" =~ x64 ]]; then
-				if ! use amd64; then
-					continue
-				fi
-
-				unpack "${_file}"
-			elif [[ ! "${_file}" =~ x64 ]]; then
-				if ! use x86; then
-					continue
-				fi
-
-				unpack "${_file}"
-			else
-				die "Unknown SRC file '${_file}'!"
-			fi
-		fi
-	done
-
-	if use all-sfx ; then
-		mkdir sfx
-		cd sfx
-		for _file in ${A}; do
-			if [[ "${_file}" == rarli* ]]; then
-				unpack "${_file}"
-				if [[ "${_file}" =~ x64 ]]; then
-					mv rar/default.sfx default-elf64.sfx || die
-				else
-					mv rar/default.sfx default-elf32.sfx || die
-				fi
-			elif [[ "${_file}" == winrar* ]]; then
-				ln -s "${DISTDIR}"/${_file} w64.rar || die
-				# Use shipped unrar, as current version in tree segfaults
-				# Bug #932666
-				# unpack_rar ./w64.rar
-				"${S}"/unrar x ./w64.rar || die
-				mv Default.SFX default-win64.sfx || die
-				mv Default32.SFX default-win32.sfx || die
-			else
-				die "Unknown SFX file '${_file}'!"
-			fi
-		done
-	fi
-}
-
-src_compile() { :; }
-
-src_install() {
-	exeinto /opt/rar
-	doexe rar unrar
-
-	insinto /opt/rar
-	doins rarfiles.lst
-
-	if use all-sfx; then
-		doins "${WORKDIR}"/sfx/*.{sfx,SFX}
-	else
-		doins default.sfx
-	fi
-
-	dodir /opt/bin
-	dosym ../rar/rar /opt/bin/rar
-	dosym ../rar/unrar /opt/bin/unrar
-
-	docinto html
-	dodoc order.htm
-
-	einstalldocs
-}
--- a/app-arch/rar/rar-7.11.ebuild
+++ b/app-arch/rar/rar-7.11.ebuild
@ -22,7 +22,7 @@ S="${WORKDIR}/${PN}"

 LICENSE="BSD BSD-2 RAR"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE="all-sfx"
 RESTRICT="bindist mirror"

--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@ -1,13 +1,13 @@
 AUX borgmatic-1.7.14-systemd_service_bin_path.patch 604 BLAKE2B 534a545b5a8d65c6e46102a5e558c25444d82dd3679b81c0ba50c72dfec8ce8f935fdcb558ff61fec7bf30409b4b9809d76e7488554f4461c4b5eac035a60c07 SHA512 9b4c65b249a033f17b68c5209c0132bd94e310d46193a9a85090cb8520220705aacd91c19d713e11e6955c1e0b1e09823abcaf8164ab0f162ff9a62652bb7e56
 AUX borgmatic-1.9.3-no_test_coverage.patch 456 BLAKE2B 57964d3d23cd298181619aff5529d0574d70fe9ce002fedd7c9618ff36f89227acc9ba8719eedd0eff5b72f61a56d2de119f7c03d40164b7c01d93f95d6a0509 SHA512 9db6c1c51bfc44ad45891bbf65512fd243ceb8869f103f316f4817b4fae226863e0a02fdaa7ae7cb6ccffd187007b833c0ae671a881e4881b3dec29063cc6e8a
-DIST borgmatic-1.9.10.tar.gz 646658 BLAKE2B 8eec2cea8e1001c7d55aef6e267aa18a4db67e33c61a28fe072bbbe99df305672e0e6b4187f5ace470add162298f9facbd805924d486358bca41bfa02538f3c0 SHA512 0d15ce4a3b71ceebfb3185130a9dcdfb80a23111396a9d2f39cae2c69f3eaba54e4005ad13fcce6c728aaf1179fc44a85ab2db1efb3824c7a33743ebaed3a954
 DIST borgmatic-1.9.12.tar.gz 653984 BLAKE2B 62445bd2fa4a9ab93a4ef9035617dc57fd191e7df9a5709dc760424fe5fe8d9a6798b98563442739ddd3ce4c73947fadc0a259c21f56fe0ec214a2fd0e179e9b SHA512 26449ff7eae3d104ffee578f1211afc545141b4224c8c0888bad14e2251a9bbe2d8ec8b9e3c652a5a5881d49eca5df275e6ac6ad07661e0b64c2713147e71c30
 DIST borgmatic-1.9.13.tar.gz 655690 BLAKE2B b51706ffb56e3905298498fa71e7f949be43b968e2c62565657fde6a6e470253f4d50022b54327a9fd832288443491581a278f310219787041c2644bf8b721d6 SHA512 fe2cab08b1ba750349be6cb79e89dd3b99a964b21b6d91ee7adb955ff0c4b386e45d97c01a86232943e448053faaf88aa2dbeec654bed6ea9279639f8a3d79f3
 DIST borgmatic-1.9.14.tar.gz 656877 BLAKE2B 36f8dce1251b74d67f33aaed5f6ebe41ff1003bd261070724422842143eb84be8b38a884f19da9e2f74a784e4ce4adca6c8ddfb8600f833fea6777585feb0cd8 SHA512 f2d789fab2e7f017c22458a6df3408a4883444aaeac9a4bf258de3eb46b802451d964d39ed441fb01314ff5c9acfd29676e1aab1ba341afb908e458527253705
 DIST borgmatic-2.0.1.tar.gz 676807 BLAKE2B 677bfe347a43f6be1cb534bc0a8b9c2d7c0e5753970439dd06f0af3ef2b7e4ccab278dd9071b2830fa1b329aa87d217571f39b476cf65a960fe0e10a71500b36 SHA512 38d84ff22f2428145fb1bd4058c42493a1d7cba0e0e444faaf055f776756849ec298d83fdc169b3246f022652df8fe5305a1a1d7c688f9ab8e103477064641b1
-EBUILD borgmatic-1.9.10.ebuild 2065 BLAKE2B b09383e46c1caec4f77835b8fd699705b8b8706bf003ad393c34dcb495e86a4dad372c7e8b1969c7be8373c000afc063e2e9eaa096c23a5e80e6a1390e4b4c87 SHA512 8558b26eae3b7270e6fa12879bd2d85c31a3b7f6ac49c71234bdf0563795c55873b7cfb813ab2f1e76d97069d5ee109c283c2fd93c10cdb7f641c17081ad1b7d
+DIST borgmatic-2.0.2.tar.gz 675555 BLAKE2B 3c2c6af5c44c725c466178744ebd559e43c3fec8e989fcd2ab19b3d3b4832d66888e6a4a490ed2bf9727bed4013278be6e5f5aeb64984506e9a9ea8805a72312 SHA512 060188b557e36d8391e806c8e46e7e8c12deb7d00bd4fcb18dadf1d43e113ad3d8c6399f8dc418e03c5aee06ba6b5434102b4ce9151f480e732bab617dc23f58
 EBUILD borgmatic-1.9.12.ebuild 2065 BLAKE2B b09383e46c1caec4f77835b8fd699705b8b8706bf003ad393c34dcb495e86a4dad372c7e8b1969c7be8373c000afc063e2e9eaa096c23a5e80e6a1390e4b4c87 SHA512 8558b26eae3b7270e6fa12879bd2d85c31a3b7f6ac49c71234bdf0563795c55873b7cfb813ab2f1e76d97069d5ee109c283c2fd93c10cdb7f641c17081ad1b7d
 EBUILD borgmatic-1.9.13.ebuild 2065 BLAKE2B b09383e46c1caec4f77835b8fd699705b8b8706bf003ad393c34dcb495e86a4dad372c7e8b1969c7be8373c000afc063e2e9eaa096c23a5e80e6a1390e4b4c87 SHA512 8558b26eae3b7270e6fa12879bd2d85c31a3b7f6ac49c71234bdf0563795c55873b7cfb813ab2f1e76d97069d5ee109c283c2fd93c10cdb7f641c17081ad1b7d
 EBUILD borgmatic-1.9.14.ebuild 2066 BLAKE2B 8b9919cb20159e14340fc2c28c6b6a762dbaf1067d2a2c679c0888d7198b0caa283a95c1460c7e02c8dbc79d31d85b243bef2d320f1c9cc462e0219c6ebb0d74 SHA512 e59cae6a65f42c5db111da9376a793c40f5d4d7b9323f06bda5e5f95f604b1e94201c6fa20dd33349e403451b1388bc35c657c7111fe765cb0bff305db443d40
 EBUILD borgmatic-2.0.1.ebuild 2066 BLAKE2B 5f2e962060994f2e3d097fd66ae975b21e4f6ef32fc206294456f1ee6161583f618fd342bfb86705b144cdff32335b13261763b36998d13068050bb613fd31c6 SHA512 0c98db10c389f37c6d3a399dccc0fc29d20b409b5af96b2a8391df7faa43d9d7d186b27b7aed6c84fcba12d2f8d5b65f11e2b28bf174694ee28a4056a8ab80c4
+EBUILD borgmatic-2.0.2.ebuild 2066 BLAKE2B 5f2e962060994f2e3d097fd66ae975b21e4f6ef32fc206294456f1ee6161583f618fd342bfb86705b144cdff32335b13261763b36998d13068050bb613fd31c6 SHA512 0c98db10c389f37c6d3a399dccc0fc29d20b409b5af96b2a8391df7faa43d9d7d186b27b7aed6c84fcba12d2f8d5b65f11e2b28bf174694ee28a4056a8ab80c4
 MISC metadata.xml 461 BLAKE2B 700c5863d623abaa1a88f91ef5281c6d3d8c2ce8eeb5b15cadbbd93b1d50bfce5445cd2f133bbe998da36de9e2953ce154e1b8eb033d36f33bb88881e672aeb6 SHA512 e739f7ff60f69c3b4d5c72daeda65b9c042bf01d74ce6a60b2684e7e52eea5deaa946a2aa5f1dc84ae16f6eaf4bff8f46628f41ba55c394ff4fe70b5935663a2
--- a/app-backup/borgmatic/borgmatic-1.9.10.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.9.10.ebuild
@ -17,7 +17,7 @@ HOMEPAGE="

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
 IUSE="apprise"

 # borg is called as an external tool, hence no pythonic stuff
@ -68,11 +68,11 @@ pkg_postinst() {
 		elog "    ${PN} config generate"
 		elog
 		elog "Systemd users wishing to periodically run ${PN} can use the provided timer and service units."
-	elif ver_replacing -lt 1.9.0; then
-		ewarn "Please be warned that ${PN}-1.9.0 has introduced several breaking changes."
+	elif ver_replacing -lt 2.0.0; then
+		ewarn "Please be warned that ${PN}-2.0.0 has introduced several breaking changes."
 		ewarn "For details, please see"
 		ewarn
-		ewarn "	https://github.com/borgmatic-collective/borgmatic/releases/tag/1.9.0"
+		ewarn "	https://github.com/borgmatic-collective/borgmatic/releases/tag/2.0.0"
 		ewarn
 	fi
 }
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
--- a/app-containers/containerd/Manifest
+++ b/app-containers/containerd/Manifest
@ -2,6 +2,8 @@ AUX containerd.confd 124 BLAKE2B 25f72941a47374fa0de3a2dce3d8ca57420f013a0d7527e
 AUX containerd.initd 794 BLAKE2B 88a1976615e4e9d67c10ed3748aadd74ae13ef4cf004bb5b5d45216275715e3acffa8c0c98309d81298795ac007bde02d2f3afd466c7c54e58012a12f156198f SHA512 f31b088e988beb84ef029992255018561417c0e92803dffe35ec481515e1be79ba4611cc139bb5000b0ac79a437f1a6dec3516d6f9580d4b384f1e0f092d8370
 DIST containerd-2.0.2.tar.gz 10379986 BLAKE2B aee39f749f056965b899f6525bebe00d46b72b6c437efbd01ed890c5ae9c5d812464bc6d10e32aea20fd0c6df00d98cd30502dd73f9a27b0d8d143a5542976d9 SHA512 86eb24acfa5d4d87ae396f8888e2484693823fad897a29f1a5ada78e2318640927cfcff1e85415bfd6c66f5417e582203eb94976d52e3dd373997e6e2cbae354
 DIST containerd-2.0.3.tar.gz 10450757 BLAKE2B 5dec56a40dc2874fb0b6fd4d72704f6417858eefd983c8ec5dfb2c9ef8be1e9e309cff83395e03c2d5fef30ed5c0561329ffbcd3dfba91e40d8017f7a605771b SHA512 9528a65d9d9f13d15d861f7ce71ab483958020bda83947d18868b477204e9e2e33eccc69280502c54b2be9ce577724e3e2b1772229c99636099b04bac1079ac1
+DIST containerd-2.0.4.tar.gz 10450939 BLAKE2B f82ed40eab0f1d186f4fb04217b8f75a9da8e33b1140c0b5866dcc61e17fe1040f31ef09bdb07ad98a52def5e9eb12cfeb635e96b2c5f64fdb4d8cfb6c84b885 SHA512 f84e0cc0b82313df010b95989faf56e81ebfbbc321585b968c8c706917b91a9f0d895692fa5046f24f1c370de7a74b50daf83da617fe0595e5a8ff69ed658727
 EBUILD containerd-2.0.2.ebuild 2027 BLAKE2B c5f61abc5a565b4f43d1ceb583bc8d3697b8ee0554455851cdb255d38b13a471ce31e91e0af0c9891c990459f89b5ad902d451b98b17335bc55abf54801d9110 SHA512 54b1703470632c5669f321662199539bc2a0d3ba77a9452dce71c2b27f4fc0ed2f303d980d03e483e900521afe5fa9ba28df033c9054979c66556089e876ac50
 EBUILD containerd-2.0.3.ebuild 2030 BLAKE2B 3a641f74ed6a745c59c81f90e1c6867f4ee5537dd62dcf12688dd0173836a562d0e588afe053695860c9da2aaeda32a6f41313130abb6dec92f7a4f89dfab164 SHA512 1e05b0c4c4fc262fd40e67dd5bb1e67e66e9033148ed333f6522462e7c9453ada307eb5e3a883ba52f6c0022e810ddfe9544a6c32a2d3f8d871be80b68a53e48
+EBUILD containerd-2.0.4.ebuild 2030 BLAKE2B 3a641f74ed6a745c59c81f90e1c6867f4ee5537dd62dcf12688dd0173836a562d0e588afe053695860c9da2aaeda32a6f41313130abb6dec92f7a4f89dfab164 SHA512 1e05b0c4c4fc262fd40e67dd5bb1e67e66e9033148ed333f6522462e7c9453ada307eb5e3a883ba52f6c0022e810ddfe9544a6c32a2d3f8d871be80b68a53e48
 MISC metadata.xml 981 BLAKE2B 78f44dd46331f9159931ff289a5adfdc177cb5e0c1d12cf717fad4f227b15ae40f479f40554dc4855009342cb7d699aaa543a0fbcc962789fe100a1cc9b350c5 SHA512 a171a3fcd67d8b410148d3e99477ea69be7e84ba2a2d24739343bfde29b88f8f799530c3b1107829ebd52eb847b4f5c25e4d4701ea9a2bc196c761b0768906d1
--- a/app-containers/containerd/containerd-2.0.4.ebuild
+++ b/app-containers/containerd/containerd-2.0.4.ebuild
@ -0,0 +1,90 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd
+GIT_REVISION=06b99ca80cdbfbc6cc8bd567021738c9af2b36ce
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/"
+SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
+
+COMMON_DEPEND="
+	btrfs? ( sys-fs/btrfs-progs )
+	seccomp? ( sys-libs/libseccomp )
+"
+
+DEPEND="
+${COMMON_DEPEND}
+"
+
+# recommended minimum version of runc is found in script/setup/runc-version
+RDEPEND="
+	${COMMON_DEPEND}
+	>=app-containers/runc-1.2.5[apparmor?,seccomp?]
+"
+
+BDEPEND="
+	dev-go/go-md2man
+	virtual/pkgconfig
+"
+
+# tests require root or docker
+RESTRICT+="test"
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s/-s -w//" \
+		-e "s/-mod=readonly//" \
+		Makefile || die
+	sed -i \
+		-e "s:/usr/local:/usr:" \
+		containerd.service || die
+}
+
+src_compile() {
+	local options=(
+		$(usev apparmor)
+		$(usex btrfs "" "no_btrfs")
+		$(usex cri "" "no_cri")
+		$(usex device-mapper "" "no_devmapper")
+		$(usev seccomp)
+		$(usev selinux)
+	)
+
+	myemakeargs=(
+		BUILDTAGS="${options[*]}"
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
+		REVISION="${GIT_REVISION}"
+		VERSION=v${PV}
+	)
+
+	# race condition in man target https://bugs.gentoo.org/765100
+	# we need to explicitly specify GOFLAGS for "go run" to use vendor source
+	emake "${myemakeargs[@]}" man -j1 #nowarn
+	emake "${myemakeargs[@]}" all
+
+}
+
+src_install() {
+	rm bin/gen-manpages || die
+	dobin bin/*
+	doman man/*
+	newconfd "${FILESDIR}"/${PN}.confd "${PN}"
+	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
+	systemd_dounit containerd.service
+	keepdir /var/lib/containerd
+
+	# we already installed manpages, remove markdown source
+	# before installing docs directory
+	rm -r docs/man || die
+
+	local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
+	einstalldocs
+}
--- a/app-containers/docker-cli/Manifest
+++ b/app-containers/docker-cli/Manifest
@ -1,4 +1,7 @@
 DIST docker-cli-28.0.1-man.tar.xz 70360 BLAKE2B 395736a74b314530fbbd6bf4016f7f211a3ee4754179cde0d8edf16f489c3fd92565cf73033defb80fd8280e4ef1e2add15541102944401123cfb251b06492f9 SHA512 b72e4f35a80d72d18f701edcace46eb11fbcf1ba40a1ab8efa913edc74e265dafbdc58c7c0d442293d71ce2cfc952fcbed5afee5d5f3ba52d9d25741d5a12593
 DIST docker-cli-28.0.1.tar.gz 7413092 BLAKE2B 69075ba24eb7c46593d7c4ab80499b67994119af8096409f55eec9524173cb8d37263159cd834e3cfaf4e8d169b568232d400633b2d9b08112ced05c78338f92 SHA512 c3d7ca21b88c5f6925f6c99519a67581fd6c264cc96e6c0bc00751f87de6580a2d443cbe59b2e36771e37a78fe05ea054e292675e19bc4d73fcacfda047e0490
+DIST docker-cli-28.0.4-man.tar.xz 70440 BLAKE2B 676eeafda725c759074124e1ccef693d3f0232e2acf3c2b468d28f48e7228b36c885d690cf041bab775b8410e65c1c6f1403b712a869a5610a03ae788f175a0b SHA512 e36dccb3ea043b722993001ebc36180874b65df5fdd446c52ad2902812097a456ee5d1d432e4c5f5db553213c9956c1f2ef3d07e171760f1e29248f3a6dedf9f
+DIST docker-cli-28.0.4.tar.gz 7504883 BLAKE2B c975eff2bb4c0dd5430a67418804e8649c733a59ac6b2beb9f2a454a8e8839e12afbf61afccb1e3bd0cb2e38c51fbd59fee3de45490a02ec9ad074cd365ece2c SHA512 fd7562815686fece20a0ea95501612e049e90192305464b06770643ae864baa87b0fb87fddadeb4f9beb33352940cef63ffd24af8b989e309cd5be5f32eddf62
 EBUILD docker-cli-28.0.1.ebuild 1832 BLAKE2B 85bebab5b14169de260f3e2f2201121219d8939959984eaf1cf9a743a592d45a5a8db7a192d1e5e834645a5885b1404ab151ef1471f386acf203038187b9e7e0 SHA512 7f608e60d7e75e1c5b57e3be6b3c918b08ddc6b550fdf8433be5fb854ef9a2f755536a05319e10534b637ddcc0f248d28cb2e874f040e7959994f739f92c751c
+EBUILD docker-cli-28.0.4.ebuild 1992 BLAKE2B b36e10aa38645a2df0e3db684579e65f328254af4c457a69b03148a807a3e74286af4387b50145579de5e59473bf4beb53ca21a53928f452dd1ed910894292cb SHA512 792e69e2848504147385c9d2eeab9a4bbcd4caf3963ceb638ff2c8699ab31dc2d1e9df9742068ad30299742d664bcdebaa28b9ac2443af42cb553241ec4c787a
 MISC metadata.xml 398 BLAKE2B f9cd5360fa32f30edeeb2fe1df0ea50fd0b061bf882c66c65f18d15ba56995deac8c054419ddbf2d6436bf90f6fb729dda9560b3766b558d45498ae2c8de486c SHA512 4b2cf7c3b38df8382680539e1a8121f6f2f75cbe70f1f92c589fb40dd4c368f2f207cf3567ead5620714c323c0c196c318a4c5ab947d49092668dc2a3a8a6a53
--- a/app-containers/docker-cli/docker-cli-28.0.4.ebuild
+++ b/app-containers/docker-cli/docker-cli-28.0.4.ebuild
@ -0,0 +1,74 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 go-module
+MY_PV=${PV/_/-}
+
+# update this on every bump
+GIT_COMMIT=b8034c0ed70494a90c133461d145cd072d920d7c
+
+# To create the man pages tarball, run the following in the git source
+# directory:
+#git checkout ${PV}
+# make manpages
+# tar -acf ${P}-man.tar.xz man/man?
+
+DESCRIPTION="the command line binary for docker"
+HOMEPAGE="https://www.docker.com/"
+SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-man.tar.xz"
+S="${WORKDIR}/cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="hardened selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-docker )"
+
+RESTRICT="installsources strip test"
+
+src_unpack() {
+	default
+	cd "${S}"
+	ln -s vendor.mod go.mod
+	ln -s vendor.sum go.sum
+}
+
+src_prepare() {
+	default
+	sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
+}
+
+src_compile() {
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	CGO_CFLAGS+=" -I${ESYSROOT}/usr/include"
+	CGO_LDFLAGS+=" -L${ESYSROOT}/usr/$(get_libdir)"
+		emake \
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
+		VERSION="${PV}" \
+		GITCOMMIT="${GIT_COMMIT}" \
+		dynbinary
+}
+
+src_install() {
+	dobin build/docker
+	doman "${WORKDIR}"/man/man?/*
+	dobashcomp contrib/completion/bash/docker
+	bashcomp_alias docker dockerd
+	insinto /usr/share/fish/vendor_completions.d/
+	doins contrib/completion/fish/docker.fish
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/_*
+}
+
+pkg_postinst() {
+	has_version "app-containers/docker-buildx" && return
+	ewarn "the 'docker build' command is deprecated and will be removed in a"
+	ewarn "future release. If you need this functionality, install"
+	ewarn "app-containers/docker-buildx."
+}
--- a/app-containers/docker/Manifest
+++ b/app-containers/docker/Manifest
@ -1,3 +1,5 @@
 DIST docker-28.0.1.tar.gz 17553228 BLAKE2B 8c172d58fb75d307983ace06b509e86ed533729d75a27af114939cad9022980f692368249f6ef514912aa90f1fa09998fd658377e28d2e2577d53b6f745cf5db SHA512 58c77ae139e5d32c4c263fa14ec4457f50240a15cd7934b4d2576af0295bfb5b62abbeef0ba78815f9041a01dbe3a8b35351eaebea1f584f54ef0d4192734048
+DIST docker-28.0.4.tar.gz 17579330 BLAKE2B 3b1ecb6ddceea0fe772bd597bf6b3c4b5867b691e35bbb0b05ad6ab0c4dc79193dbde02cdcb45c607c0dd704aeaa9629deffb098a0d1533dd3f5e9fb882ef34f SHA512 dfa6bc18c7cecf82c80e45c6a615e0cccb866a993ad2b6c3134e0f0d5d069b5abb0b8201029019a5396353f666252b5fd36b6a34080723af46291d3fda1c2608
 EBUILD docker-28.0.1.ebuild 7939 BLAKE2B 95ec62a6c58810546178a1c73205b2a885dcea2afec1468db7f489b36541c4571b50c74706301efa20c1e4e256ec534b91bedb32331b4336996751fdd694452d SHA512 889a0d4e410a121e35c67b07f00ff949221939ee700ab4fef9303a24b51a8a854f89f8d0dce574388e12245a4d42ebcf3bcb61781e8770b45db37cbadd81b2d3
+EBUILD docker-28.0.4.ebuild 7942 BLAKE2B 68bd3ad9b9cfccab0e3243619043ed21d71c42e9dd4edafd6bacb51dbc98679300b5ce64849e8d468130855dcc1d1eb0dee657144e1c0ed6c77d913deb0e0660 SHA512 c95adb7ef068143368be79717d2a13bb7841323d069c5d4314def08fdd8b29c841268555aeec4d12da5b5e03c7dcebdb54526263d9b9a4e960134faaa6d25e11
 MISC metadata.xml 1102 BLAKE2B 948731b1e2f9474ab0067f2e88ad631152446bec327cfded22934da4ae8fe6c9572c382039c15cd845da9978d62fd5fb97fdb8a1bd66cf13c320f56668b07dfd SHA512 06fed86d03d7e1676583afd798bcf728e8866e8aa1f0daba61fbea1bd2f694d8ef370d68b3d72eff39c3df7e8d46469f16a07e15c8715b245e92eacc7444707f
--- a/app-containers/docker/docker-28.0.4.ebuild
+++ b/app-containers/docker/docker-28.0.4.ebuild
@ -0,0 +1,333 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+MY_PV=${PV/_/-}
+
+inherit go-module linux-info optfeature systemd toolchain-funcs udev
+
+GIT_COMMIT=6430e49a55babd9b8f4d08e70ecb2b68900770fe
+
+DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
+HOMEPAGE="https://www.docker.com/"
+SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/moby-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="apparmor btrfs +container-init cuda +overlay2 seccomp selinux systemd"
+
+DEPEND="
+	acct-group/docker
+	>=dev-db/sqlite-3.7.9:3
+	apparmor? ( sys-libs/libapparmor )
+	btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
+	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+	systemd? ( sys-apps/systemd )
+"
+
+# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies
+# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies
+RDEPEND="
+	${DEPEND}
+	>=net-firewall/iptables-1.4
+	sys-process/procps
+	>=dev-vcs/git-1.7
+	>=app-arch/xz-utils-4.9
+	>=app-containers/containerd-2.0.4[apparmor?,btrfs?,seccomp?]
+	>=app-containers/runc-1.2.5[apparmor?,seccomp?]
+	!app-containers/docker-proxy
+	!<app-containers/docker-cli-${PV}
+	container-init? ( >=sys-process/tini-0.19.0[static] )
+	cuda? ( app-containers/nvidia-container-toolkit )
+	selinux? ( sec-policy/selinux-docker )
+"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+BDEPEND="
+	dev-go/go-md2man
+	virtual/pkgconfig
+"
+# tests require running dockerd as root and downloading containers
+RESTRICT="installsources strip test"
+
+# https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552
+pkg_setup() {
+	# this is based on "contrib/check-config.sh" from upstream's sources
+	# required features.
+	CONFIG_CHECK="
+		~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+		~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
+		~KEYS
+		~VETH ~BRIDGE ~BRIDGE_NETFILTER
+		~IP_NF_FILTER ~IP_NF_RAW ~IP_NF_TARGET_MASQUERADE
+		~NETFILTER_XT_MATCH_ADDRTYPE
+		~NETFILTER_XT_MATCH_CONNTRACK
+		~NETFILTER_XT_MATCH_IPVS
+		~NETFILTER_XT_MARK
+		~IP_NF_NAT ~NF_NAT
+		~POSIX_MQUEUE
+	"
+	WARNING_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: is required for bind-mounting /dev/mqueue into containers"
+
+	if kernel_is lt 4 8; then
+		CONFIG_CHECK+="
+			~DEVPTS_MULTIPLE_INSTANCES
+		"
+	fi
+
+	if kernel_is le 5 1; then
+		CONFIG_CHECK+="
+			~NF_NAT_IPV4
+		"
+	fi
+
+	if kernel_is le 5 2; then
+		CONFIG_CHECK+="
+			~NF_NAT_NEEDED
+		"
+	fi
+
+	if kernel_is ge 4 15; then
+		CONFIG_CHECK+="
+			~CGROUP_BPF
+		"
+	fi
+
+	# optional features
+	CONFIG_CHECK+="
+		~USER_NS
+	"
+
+	if use seccomp; then
+		CONFIG_CHECK+="
+			~SECCOMP ~SECCOMP_FILTER
+		"
+	fi
+
+	CONFIG_CHECK+="
+		~CGROUP_PIDS
+	"
+
+	if kernel_is lt 6 1; then
+		CONFIG_CHECK+="
+			~MEMCG_SWAP
+			"
+	fi
+
+	if kernel_is le 5 8; then
+		CONFIG_CHECK+="
+			~MEMCG_SWAP_ENABLED
+		"
+	fi
+
+	CONFIG_CHECK+="
+		~!LEGACY_VSYSCALL_NATIVE
+		"
+	if kernel_is lt 5 19; then
+		CONFIG_CHECK+="
+			~LEGACY_VSYSCALL_EMULATE
+			"
+	fi
+	CONFIG_CHECK+="
+		~!LEGACY_VSYSCALL_NONE
+		"
+	WARNING_LEGACY_VSYSCALL_NONE="CONFIG_LEGACY_VSYSCALL_NONE enabled: \
+		Containers with <=glibc-2.13 will not work"
+
+	if kernel_is le 4 5; then
+		CONFIG_CHECK+="
+			~MEMCG_KMEM
+		"
+	fi
+
+	if kernel_is lt 5; then
+		CONFIG_CHECK+="
+			~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
+		"
+	fi
+
+	CONFIG_CHECK+="
+		~BLK_CGROUP ~BLK_DEV_THROTTLING
+		~CGROUP_PERF
+		~CGROUP_HUGETLB
+		~NET_CLS_CGROUP ~CGROUP_NET_PRIO
+		~CFS_BANDWIDTH ~FAIR_GROUP_SCHED
+		~IP_NF_TARGET_REDIRECT
+		~IP_VS
+		~IP_VS_NFCT
+		~IP_VS_PROTO_TCP
+		~IP_VS_PROTO_UDP
+		~IP_VS_RR
+		"
+
+	if use selinux; then
+		CONFIG_CHECK+="
+			~SECURITY_SELINUX
+			"
+	fi
+
+	if use apparmor; then
+		CONFIG_CHECK+="
+			~SECURITY_APPARMOR
+			"
+	fi
+
+	# if ! is_set EXT4_USE_FOR_EXT2; then
+	#	check_flags EXT3_FS EXT3_FS_XATTR EXT3_FS_POSIX_ACL EXT3_FS_SECURITY
+	#	if ! is_set EXT3_FS || ! is_set EXT3_FS_XATTR || ! is_set EXT3_FS_POSIX_ACL || ! is_set EXT3_FS_SECURITY; then
+	#		echo "    $(wrap_color '(enable these ext3 configs if you are using ext3 as backing filesystem)' bold black)"
+	#	fi
+	# fi
+
+	CONFIG_CHECK+="
+		~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+	"
+
+	# if ! is_set EXT4_FS || ! is_set EXT4_FS_POSIX_ACL || ! is_set EXT4_FS_SECURITY; then
+	#	if is_set EXT4_USE_FOR_EXT2; then
+	#		echo "    $(wrap_color 'enable these ext4 configs if you are using ext3 or ext4 as backing filesystem' bold black)"
+	#	else
+	#		echo "    $(wrap_color 'enable these ext4 configs if you are using ext4 as backing filesystem' bold black)"
+	#	fi
+	# fi
+
+	# network drivers
+	CONFIG_CHECK+="
+		~VXLAN ~BRIDGE_VLAN_FILTERING
+		~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH
+		~XFRM ~XFRM_USER ~XFRM_ALGO ~INET_ESP
+	"
+	if kernel_is le 5 3; then
+		CONFIG_CHECK+="
+			~INET_XFRM_MODE_TRANSPORT
+		"
+	fi
+
+	CONFIG_CHECK+="
+		~IPVLAN
+		"
+	CONFIG_CHECK+="
+		~MACVLAN ~DUMMY
+		"
+	CONFIG_CHECK+="
+		~NF_NAT_FTP ~NF_CONNTRACK_FTP ~NF_NAT_TFTP ~NF_CONNTRACK_TFTP
+	"
+
+	# storage drivers
+	if use btrfs; then
+		CONFIG_CHECK+="
+			~BTRFS_FS
+			~BTRFS_FS_POSIX_ACL
+		"
+	fi
+
+	CONFIG_CHECK+="
+		~OVERLAY_FS
+	"
+
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	default
+	cd "${S}"
+	[[ -f go.mod ]] || ln -s vendor.mod go.mod || die
+	[[ -f go.sum ]] || ln -s vendor.sum go.sum || die
+}
+
+src_compile() {
+	export DOCKER_GITCOMMIT="${GIT_COMMIT}"
+	export VERSION=${PV}
+	tc-export PKG_CONFIG
+
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	CGO_CFLAGS+=" -I${ESYSROOT}/usr/include"
+	CGO_LDFLAGS+=" -L${ESYSROOT}/usr/$(get_libdir)"
+
+	# let's set up some optional features :)
+	export DOCKER_BUILDTAGS=''
+	for gd in btrfs overlay2; do
+		if ! use $gd; then
+			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
+		fi
+	done
+
+	for tag in apparmor seccomp; do
+		if use $tag; then
+			DOCKER_BUILDTAGS+=" $tag"
+		fi
+	done
+
+	export AUTO_GOPATH=1
+	export EXCLUDE_AUTO_BUILDTAG_JOURNALD=$(usex systemd '' 'y')
+	export GO_MD2MAN=/usr/bin/go-md2man
+
+	# build binaries
+	./hack/make.sh dynbinary || die 'dynbinary failed'
+
+	# build man page
+	cd man || die
+	emake || die
+}
+
+src_install() {
+	dosym containerd /usr/bin/docker-containerd
+	dosym containerd-shim-runc-v2 /usr/bin/docker-containerd-shim
+	dosym runc /usr/bin/docker-runc
+	use container-init && dosym tini /usr/bin/docker-init
+	dobin bundles/dynbinary-daemon/dockerd
+	dobin bundles/dynbinary-daemon/docker-proxy
+	for f in dockerd-rootless-setuptool.sh dockerd-rootless.sh; do
+		dosym ../share/docker/contrib/${f} /usr/bin/${f}
+	done
+
+	newinitd contrib/init/openrc/docker.initd docker
+	newconfd contrib/init/openrc/docker.confd docker
+
+	systemd_dounit contrib/init/systemd/docker.{service,socket}
+
+	udev_dorules contrib/udev/*.rules
+
+	dodoc AUTHORS CONTRIBUTING.md NOTICE README.md
+	dodoc -r docs/*
+	doman man/man8/dockerd.8
+
+	# note: intentionally not using "doins" so that we preserve +x bits
+	dodir /usr/share/${PN}/contrib
+	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
+}
+
+pkg_postinst() {
+	udev_reload
+
+	elog
+	elog "To use Docker, the Docker daemon must be running as root. To automatically"
+	elog "start the Docker daemon at boot:"
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "  systemctl enable docker.service"
+	else
+		elog "  rc-update add docker default"
+	fi
+	elog
+	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
+	elog '  usermod -aG docker <youruser>'
+	elog
+
+	if has_version sys-fs/zfs; then
+		elog " ZFS storage driver is available"
+		elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info"
+		elog
+	fi
+
+	optfeature "rootless mode support" sys-apps/shadow
+	optfeature "rootless mode support" sys-apps/rootlesskit
+	optfeature_header "for rootless mode you also need a network stack"
+	optfeature "rootless mode network stack" app-containers/slirp4netns
+}
+
+pkg_postrm() {
+	udev_reload
+}
--- a/app-containers/runc/Manifest
+++ b/app-containers/runc/Manifest
@ -1,5 +1,7 @@
 DIST runc-1.2.4.tar.gz 2759394 BLAKE2B 02b282c9fbe7f82ad1d4297b9d2576ee99db7f4db193aa6b08b595d1a18f4a0cb41c5fddb8184ca389e77726c71f4b64b686b2ee1b8e8df97179669362c17ff7 SHA512 2a14bfe7759e0cefcf88fac9d756eb2cbed8a9ebf7b6eacb96855467ea151c278ae0d58735d2a5a2d3335fc54eae4625dfcdb641065df58ba10fd1faafbd3119
 DIST runc-1.2.5.tar.gz 2763738 BLAKE2B 446dd633d94f41957ba205b944320734ddf505e1bdc8f6f9d1002de8ecdd46368af19d788b8812cee87aaab1f8583d01e0c4d6fd0a56590a819588814bfb1841 SHA512 67dd870a24cfe896ead01f156eda6076b14bf287781734c2c4ab0e313d66f49bbf8d51705c5f0c24a604df311439c769a95cbfda12c7fa87ab2e6a31801a6984
+DIST runc-1.2.6.tar.gz 2763135 BLAKE2B d5e40e95f8c0069073d0010d120aca1828e585b103ecd671fca072138ef3528a316414cfac5ca725f45cb84f23ab4216d9e6f466beb118fb2813ab4be3a18e92 SHA512 9a89295e001914726dfc1040729301f62ad6b630943c65f7ade6ed460ef4a2f5f35cf40662730a9e8a6c6d0301a3c9959a85973097ceb8db05c043f9c1a86248
 EBUILD runc-1.2.4.ebuild 1642 BLAKE2B a332383da5ca8ef287b96ac24ed1b5c564a1a3157281201a9065f5a965c53090c58fc989def83de2f4a71c154491e5d5f2a750caa929f0600a1a37e273fb2400 SHA512 cb3ca6c54c5bff4bfb7d7c0ce2aae967de9bfca77589881ed11a454f154374ed2acb59b3d1b04c004b2d7bbea0eade0d8b4b152bc911ad490f33e8cfa6a92939
 EBUILD runc-1.2.5.ebuild 1643 BLAKE2B 97abf2f193ae9897ee877413bd115cfdc5c963095a95de248a5743bff81fcf2101964658231ee6d2bb0e48d01d39402321660421148cab9c05a90fa4d2ae4d78 SHA512 5caf76217aa864b800682866db1f4fac770a42e6e46cc9056dfcbfa963e4dd973c836b17a56b15886e37ab2ba4cdf9fb47cccbe7da76eb1aa0cf47c4d99598b0
+EBUILD runc-1.2.6.ebuild 1646 BLAKE2B 7141b5d5f79717191d881af1cbf8f4c315d15569a31abe1a42da0ac70639fe014d75a59bf235fef5716172e8bd628a85097f5c39262f47a84d442bebd1e501b9 SHA512 92b8f7e491e1e1650fe44568c48edde883895d1dad024a58e45487002ecf72362002d943ff331267801b0bda1eadbbf1956e2c5a27e1bcf91f7af303a8b5cf6f
 MISC metadata.xml 647 BLAKE2B 67dce497b4fa65db5146f9e017ec00795ad4ef5d63058d4c20bfc730f17e2fabfcd82b403bd06330f9a68ef2e344198514930493eeadef69eb2ee8a618e5e0fc SHA512 970d9753c81eb387a06fc24be8bfb3b056e9e7cbf568f99511bdcfd35f6a8cdfe21ea0103ea36b8fba7be733016493663c3a38452b05225de35af7e1c5b359dc
--- a/app-containers/runc/runc-1.2.6.ebuild
+++ b/app-containers/runc/runc-1.2.6.ebuild
@ -0,0 +1,71 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module linux-info
+
+# update on bump, look for commit ID on release tag.
+# https://github.com/opencontainers/runc
+RUNC_COMMIT=e89a29929c775025419ab0d218a43588b4c12b9a
+
+CONFIG_CHECK="~USER_NS"
+
+DESCRIPTION="runc container cli tools"
+HOMEPAGE="https://github.com/opencontainers/runc/"
+MY_PV="${PV/_/-}"
+SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="Apache-2.0 BSD-2 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="apparmor hardened +kmem +seccomp selinux test"
+
+COMMON_DEPEND="
+	apparmor? ( sys-libs/libapparmor )
+	seccomp? ( sys-libs/libseccomp )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!app-emulation/docker-runc
+	selinux? ( sec-policy/selinux-container )"
+BDEPEND="
+	dev-go/go-md2man
+	test? ( "${RDEPEND}" )"
+
+# tests need busybox binary, and portage namespace
+# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox
+# majority of tests pass
+RESTRICT+=" test"
+
+src_compile() {
+	# build up optional flags
+	local options=(
+		$(usev apparmor)
+		$(usev seccomp)
+		$(usex kmem '' 'nokmem')
+	)
+
+	myemakeargs=(
+		BUILDTAGS="${options[*]}"
+		COMMIT="${RUNC_COMMIT}"
+	)
+
+	emake "${myemakeargs[@]}" runc man
+}
+
+src_install() {
+	myemakeargs+=(
+		PREFIX="${ED}/usr"
+		BINDIR="${ED}/usr/bin"
+		MANDIR="${ED}/usr/share/man"
+	)
+	emake "${myemakeargs[@]}" install install-man install-bash
+
+	local DOCS=( README.md PRINCIPLES.md docs/. )
+	einstalldocs
+}
+
+src_test() {
+	emake "${myemakeargs[@]}" localunittest
+}
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@ -15,6 +15,6 @@ EBUILD certbot-3.1.0.ebuild 1572 BLAKE2B 92f7bef4a2b4eaa3251d20fd44b33544687acd4
 EBUILD certbot-3.2.0-r102.ebuild 7640 BLAKE2B b13e2e0ec0dec9d67fae17fd9ee01ab6390f694cc4b2990b96bfa387f8cb50aa6f0d4eff11d1c7a58f429e51c820c5f5b4fcf7869f0f42fe3b619815245a7abc SHA512 3001aa585e75e3a2dab59e1001e2b2740c486809bcaa09aa18c361120891c37c67365a41d7b628e21a0bf357544cf21fe930b9c1a0fc39cdd9e13cf0500ba123
 EBUILD certbot-3.2.0.ebuild 1572 BLAKE2B f70a02b18dfe12e3768ee98be8392c6d9d753dcb5a69f37aa488634748c7bf685abb6a5ffcbb8330f5b82808d6b9fcf7146c129c3b637134418710d9f65b9fac SHA512 4f0815c0a793bce1d2870480069dd67bcee5795638bb5b5cbf61334a019ea0cb31135df4f57c2488e67d23d928190f1f2d7d9ea6a54e59a8ec975eb46161b372
 EBUILD certbot-3.3.0-r2.ebuild 7428 BLAKE2B b4a2d16af5851faee75b1f71ea0d69427ff059a2424117d76eba0336e1a36ed03e703a363a6b619247e65ce3089b4a314df253f2ecfc6ec03ee2b40284132c9b SHA512 32872ea02cef79aa7d1602294833ecf46d25c2f5d50e88de60bc67ad8e101537733eeab773397bf79d39dc8268ad6a1ed69f3a078c658d1e15464f032db09fbc
-EBUILD certbot-4.0.0.ebuild 4665 BLAKE2B 80ee6ba67092ae15cd40e443e47d94a6f4a8135e4fd0f5c9a68a5ca4bfb2a8e7173bfbd76ff5ffae19738acabe21a6a75cf1b4732f91d5306012c8ae8f050e48 SHA512 a70920aada726f5f7f87564cc2ab47a78ccc8660ae028e2fc7d066ace22e9cd7b07b33e0c5be2f60a900d5f0bf74ab0206a8a0fa5aba3aa8038b055f5b8c26d7
-EBUILD certbot-9999.ebuild 4665 BLAKE2B 80ee6ba67092ae15cd40e443e47d94a6f4a8135e4fd0f5c9a68a5ca4bfb2a8e7173bfbd76ff5ffae19738acabe21a6a75cf1b4732f91d5306012c8ae8f050e48 SHA512 a70920aada726f5f7f87564cc2ab47a78ccc8660ae028e2fc7d066ace22e9cd7b07b33e0c5be2f60a900d5f0bf74ab0206a8a0fa5aba3aa8038b055f5b8c26d7
+EBUILD certbot-4.0.0-r1.ebuild 4700 BLAKE2B e66d07b211c7a81f729cc4d10fd40921ce6cfd677161a0171a900ccd59e2f9e5fc0e0ececf8e7dcd0cf0deb43abaad35218006ee10e2cfe23685b1eeecbb0871 SHA512 2ad367142312eb3e354e6a1b79f8b84036622932f677b84e57e52bd68c62f2007553b4cdae0c9f3402993fda236ac1b8c7b327586a87a75da4b6cb9432959989
+EBUILD certbot-9999.ebuild 4700 BLAKE2B e66d07b211c7a81f729cc4d10fd40921ce6cfd677161a0171a900ccd59e2f9e5fc0e0ececf8e7dcd0cf0deb43abaad35218006ee10e2cfe23685b1eeecbb0871 SHA512 2ad367142312eb3e354e6a1b79f8b84036622932f677b84e57e52bd68c62f2007553b4cdae0c9f3402993fda236ac1b8c7b327586a87a75da4b6cb9432959989
 MISC metadata.xml 1792 BLAKE2B c89e58193a94a26c3128ab8b15282a3c9c301a9c32fb64309c54a57361b01f63e707b4582e724244f85213187e7f0b57af380d3ef0e99ad6dbae9d684848b9ca SHA512 a3420355c14f6772a426d5ef63551883ea2c5754b83261c011601cbcc35ba65cbd444021eb613682030e82e35eb52013bf7cffb7502607605bb7bc6a84b37fdd
--- a/app-crypt/certbot/certbot-4.0.0-r1.ebuild
+++ b/app-crypt/certbot/certbot-4.0.0-r1.ebuild
@ -182,6 +182,7 @@ python_compile() {

 python_test() {
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# Argument required to change pytest rootdir.
-	epytest "${BUILD_DIR}"
+	# Change for pytest rootdir is required.
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	epytest
 }
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@ -182,6 +182,7 @@ python_compile() {

 python_test() {
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# Argument required to change pytest rootdir.
-	epytest "${BUILD_DIR}"
+	# Change for pytest rootdir is required.
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	epytest
 }
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
--- a/app-doc/python-docs/Manifest
+++ b/app-doc/python-docs/Manifest
@ -9,15 +9,17 @@ DIST python-3.13.2-docs-html.tar.bz2 10344279 BLAKE2B fd5e5e4d2352dc17b2d64ab38b
 DIST python-3.13.3-docs-html.tar.bz2 10354611 BLAKE2B 9c0fa4d9e56d98f674cc0d4b80189da11dd82956cc54ae6a00eea7d4c907381827b5b12210b79676ffe661ec9a7189dd04e422b09160e8be05fa8528bedc6128 SHA512 a297e0f39615cbcd76b4ccf94a4c7cb4bf02242dc6c0c51edc05e8d9c2423af4183cbf84f37824c8e1e7b5949f7b138bb807d40a71df75d6529aa16a260d6548
 DIST python-3.8.20-docs-html.tar.bz2 6727651 BLAKE2B ec11857b5bdfb4646a2762353db877a558cfc543563a7a9b0db100f675511c31450d16c30a986d39226a9b16be3ffd132863e396ef05165047ab73bf037bf2a6 SHA512 0a77f0240d6d495a5099d4a95e151f38517730815e6f3d9b82964cf60be95b8bdc960916d317e19bb8e14a9604217cd1fa85703996aec972004a6a93d4ffa6d0
 DIST python-3.9.21-docs-html.tar.bz2 6989677 BLAKE2B f23c4958fbfc2ec30b49c04530ae0d6e8bc5ca64dd99ecd61e1e7c841470197a1cce6050f47248b1f58a68ffdec24113f2d24514abfc788236fa3775a6e76306 SHA512 c033e851163dbaff410cbae947456878f6a19c02dc674f9fdce7d275b24508f003d85859fad8025769dd4ef7d7438170ec430d624afc630ce09954c06c4c4c66
+DIST python-3.9.22-docs-html.tar.bz2 7008222 BLAKE2B 19aed2ed4b3c42a78f62664ae710c2b6572972bd013b6c0941aa79c123e02c8f6dc76e8208c86dfe701ae5a4ccbfc4f203db895797771aa868366b434019f9f7 SHA512 052a146073ac94aed8910b07586583fcc07a1c083da6d99609e10805a003b6839ca72adaa27199b221de237c3ecd827c18a2eea571933b623744feeb5b8a764d
 EBUILD python-docs-2.7.18.ebuild 621 BLAKE2B b86fb829d4e4f79ceb3863e60b6d2a454d7062b66c9f5dd4d785dc82e86eca9d18dfc123b531479f2f859fb82f5e34a2305f4fcc54f3266070b61c64597c6b50 SHA512 8a5c489d4ef4af2f750b4f557ce9f658f9cbf45e04751d2a5f4ffd2a86d79044efc20a70ef5b5b6cb81ad488d449b3c009366a724e7ff6c7e85531c127d14851
 EBUILD python-docs-3.10.16.ebuild 621 BLAKE2B cf4d0e945e408f7293c653e2cf3450991b2f49dccfe35f98cf962692b1b40d95733b2da2e9aa78773d36362c948edcefaa1c605456dec5240bc5a13d48c91ae8 SHA512 da2052cc9badd6d68b7cd12dc525e79db03babd6733797f148abe71cab2f5d9a3e25edd4755c7e623d787b7df304cd5b4c6ab84d47cdf578207cbbc0fb62b9d2
-EBUILD python-docs-3.10.17.ebuild 629 BLAKE2B 35a8b14de16cee36731f74c64b1cf76c9e17052f552d74cbe6cc60f7d6529589a5e8e973612143eb841e74b75471d9ac8fdfb8f2019667757287ea6c33bf6760 SHA512 ed32148dfab9ef8cb5f7a121978e4deef25de3244874c43e967e12ae7e54a2fa3db4da726da356c06e3e7571e0878b6624bd9cb4a8ebb0e7121f5ac8a2ac4a40
+EBUILD python-docs-3.10.17.ebuild 622 BLAKE2B 253abdd644045b385bbcda44b36e49a66ec526c2d17b1f8f9c898b7d6e3c13908bbaac951f7c32c73e39bbc10d6c62f92c13f70daa59791743da8d873534001b SHA512 cfd5206ad58d3a25f4dfe9e5598c9fb92cc2634665cf8947f3da7ebb1e681c92daaa4a72dbac9fd227060554a3fdb56a42b01b8ceb136b1ec4dc547356f4a29f
 EBUILD python-docs-3.11.11.ebuild 621 BLAKE2B cf4d0e945e408f7293c653e2cf3450991b2f49dccfe35f98cf962692b1b40d95733b2da2e9aa78773d36362c948edcefaa1c605456dec5240bc5a13d48c91ae8 SHA512 da2052cc9badd6d68b7cd12dc525e79db03babd6733797f148abe71cab2f5d9a3e25edd4755c7e623d787b7df304cd5b4c6ab84d47cdf578207cbbc0fb62b9d2
-EBUILD python-docs-3.11.12.ebuild 629 BLAKE2B 35a8b14de16cee36731f74c64b1cf76c9e17052f552d74cbe6cc60f7d6529589a5e8e973612143eb841e74b75471d9ac8fdfb8f2019667757287ea6c33bf6760 SHA512 ed32148dfab9ef8cb5f7a121978e4deef25de3244874c43e967e12ae7e54a2fa3db4da726da356c06e3e7571e0878b6624bd9cb4a8ebb0e7121f5ac8a2ac4a40
-EBUILD python-docs-3.12.10.ebuild 629 BLAKE2B 90a946544e6d5de22a9e28c7ad402fa4b1a94cce9d8580055c32624993362faf83c0f825ef124038199f0695ba5d0e97229168ce4bcda4c25a7d54e94365cdb1 SHA512 b4b5af636325b684deb1053c45245c452e1889c10d02c6aa9cc123b9a0847f7a90ac3abb829435fd67c54d18985fa484c19dd4f4fcf26a1fce36b6ee87b9beae
+EBUILD python-docs-3.11.12.ebuild 625 BLAKE2B dc7a835200598762ef25fb8ba29774564f5063a03ec411622acc4bb8497ec3e56033a21c140795750351560e930a7f19fc6fd43ec85543cc91946a7afeb39efc SHA512 2341cd2ddfc011a68636819a236b8129e147dce9707278357f77e48c48581b5c7c94919b5723fe506e2e5b625bf12f2dc7c60f5a0b140c4b73a7c06cbb04a62f
+EBUILD python-docs-3.12.10.ebuild 623 BLAKE2B 0b8d193d85acd06e96f8734e344275237b00cd1221fde6d58b63c7e8541fba173d105d0288412287a3e21ff0e27e8d4f11fcbaa21b974f8f54be4777be6f69c0 SHA512 f40da73425a072a39ae08d32eebaa861c29e15ce8296fcba2f90f145f3225aa64356eb154642038d3c582ea0482328b3f933788c5d8792a72ea2d81e51d830cb
 EBUILD python-docs-3.12.9.ebuild 621 BLAKE2B f56290723f525f58c026a9f8cbe1de53c894841d6fa0c05a63cd675e496851b247995b81a8d512d605a1c5595a6eb6604b60749d92104ab9effcacd31f028297 SHA512 f02d594f9b9c5c757f6438f3226149ed6928dbb1f59346b4aa3bd4c1f932b1ad88f8f86207c6ec3cf1ab66aad2658640354e60cd55eb3672cb9190e92df18aa6
 EBUILD python-docs-3.13.2.ebuild 617 BLAKE2B f084514138bf0f24d0f2eace81dadcbf73a4a2a8f1e1330452b5e1cd0d4beace5b379dae4ad53cc393380835a55160cebe30c43d85e4a7e906382c38dfba5c0e SHA512 50f9b0e43e3e619510a738518ef74052eb92791481aacf59c1a7b5b74da692cab04f84eb0c0ea9316b7164708c3b2eba9a9b505b48ecd3317b12e223f833843d
-EBUILD python-docs-3.13.3.ebuild 625 BLAKE2B 57da933705c60a7014dcdb511c1d99a33edcf008e26bd03eed8ba4b33d0a85ea281958db3e3cf8d29dfa14492e6bf8042b8f961c007435a4aaa0bfe4c6a89b31 SHA512 171339f966073f3f231ffc64dc8b0d5ac4de226d5f580a94c6aec62d6f457b953f46825127ace5a1e4b882b85253add92014df99fc7ab25e86127a67623a38a7
+EBUILD python-docs-3.13.3.ebuild 619 BLAKE2B 06f7edd1ebf39dfab7b2dd07a9e5258621f762d7a7b211165ca75abec7b84508e4f266980b208549137b8ba9e55c4aa8611f53d33f72e0ee8a77609182b8c5ed SHA512 18aa441b1dd7c45c14352662ded51f1a1d47853557907a8ab2e85e28a6c8dafc8f8c990434800f0c660eb369cc044eb306dbdd30fd440334c73169ef6542ada5
 EBUILD python-docs-3.8.20.ebuild 621 BLAKE2B 5b5d4ee591a4de2257ddfde553faa19a45fd93e43f9cd133784d092cc556baf2d2b369e7432524ca32fd3094781f7045b5cd22c3f452b7642700a7006ba2733c SHA512 25aa0fd6ec22bf623026e8704e5a0d3c72aed1eb8d1232fe90835085cc1a5965148db5b1233de5bb41e3bcd8bc7f31e177f14da8a3ff0bbcb21021d642115958
 EBUILD python-docs-3.9.21.ebuild 621 BLAKE2B cf4d0e945e408f7293c653e2cf3450991b2f49dccfe35f98cf962692b1b40d95733b2da2e9aa78773d36362c948edcefaa1c605456dec5240bc5a13d48c91ae8 SHA512 da2052cc9badd6d68b7cd12dc525e79db03babd6733797f148abe71cab2f5d9a3e25edd4755c7e623d787b7df304cd5b4c6ab84d47cdf578207cbbc0fb62b9d2
+EBUILD python-docs-3.9.22.ebuild 622 BLAKE2B 253abdd644045b385bbcda44b36e49a66ec526c2d17b1f8f9c898b7d6e3c13908bbaac951f7c32c73e39bbc10d6c62f92c13f70daa59791743da8d873534001b SHA512 cfd5206ad58d3a25f4dfe9e5598c9fb92cc2634665cf8947f3da7ebb1e681c92daaa4a72dbac9fd227060554a3fdb56a42b01b8ceb136b1ec4dc547356f4a29f
 MISC metadata.xml 265 BLAKE2B 369a57fab1283b596588a82815bfe567fe7617b5c0cb17e97f6694beefdd1e932b0d9ffc1fcb23c6ef05b33d97b3c1d1bb3960618ffdf4924c4ebad262794282 SHA512 a682dac348f2d95b986749f4d33e5702c1e8f66cf2ff7a32a5c2a8d388ddbfde2919d97345028c2007415368d395c7cf657184be89f7def27c949f1af5c30170
--- a/app-doc/python-docs/python-docs-3.10.17.ebuild
+++ b/app-doc/python-docs/python-docs-3.10.17.ebuild
@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"

 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86"

 src_install() {
 	rm -r _sources || die
--- a/app-doc/python-docs/python-docs-3.11.12.ebuild
+++ b/app-doc/python-docs/python-docs-3.11.12.ebuild
@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"

 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 sparc ~x86"

 src_install() {
 	rm -r _sources || die
--- a/app-doc/python-docs/python-docs-3.12.10.ebuild
+++ b/app-doc/python-docs/python-docs-3.12.10.ebuild
@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"

 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86"

 src_install() {
 	rm -r _sources || die
--- a/app-doc/python-docs/python-docs-3.13.3.ebuild
+++ b/app-doc/python-docs/python-docs-3.13.3.ebuild
@ -11,7 +11,7 @@ S=${WORKDIR}/${MY_P}

 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86"

 src_install() {
 	rm -r _sources || die
--- a/app-doc/python-docs/python-docs-3.9.22.ebuild
+++ b/app-doc/python-docs/python-docs-3.9.22.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="HTML documentation for Python"
+HOMEPAGE="https://www.python.org/doc/"
+SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
+S="${WORKDIR}/python-${PV}-docs-html"
+
+LICENSE="PSF-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+
+src_install() {
+	rm -r _sources || die
+	docinto html
+	dodoc -r .
+
+	newenvd - 60python-docs-${SLOT} <<-EOF
+		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
+	EOF
+}
--- a/app-doc/single-unix-specification/Manifest
+++ b/app-doc/single-unix-specification/Manifest
@ -1,7 +1,7 @@
 DIST susv4-2018.tar.bz2 3352852 BLAKE2B 0f05f2dd6444d35b2d962651643eb8bd0520169c8670072fdb1ce2c671b3bdeed8e4d99dfacceba69f846c107c73c4a60f3f51e48c64499f40a9fa594ac877ba SHA512 2484d24d19b9731808c61219b61d63cdf4d8dff6498fb4655478b76808a583064a5cfbcfcf18f1d27c56e03a6b47cc6833f94483784ec29059bef063724c2567
 DIST susv4tc2.tar.bz2 3649434 BLAKE2B c09eb835badec0bf191da4caaa7b35ccedfb1512218d3ebb66d0301bbe6404a30df2e3c51838dcd9f91912f41ce3e39478d2c061ac2f075ef678ae20fcaf0ad6 SHA512 cc86b2b4860b1069cb8712ef7b5a9702510f48d6585b5414ff561f85677974c156d8cc95cf29dfdab360c13ecb884e19e2112fe5c6bc49666417c9a744a816ad
-DIST susv5-2025-01-02.tar.bz2 3505183 BLAKE2B 470d2959a57f792adb63d7fd150a3c6c6eea823f6600ccd4e5ed0780f057f833399573440346a74b577dc1edcb5cb8128bc9ff39a87c16644c4a3d72e7bacdb6 SHA512 4db5330e9ecc652cdcdef5a80e4d0637e79edab23c5261c553fde55a92975f388d4b69fdf5be5ff0d1c1bf2e95345c533980e88f04eef70c2911058466d24dce
+DIST susv5-2025-03-25.tar.bz2 3506412 BLAKE2B b2c0108a1d79c5c64db5cace485eeb4d77aaa9d8a98543d73c19567e2700a1e562a97f29337d7f79cc730d0158f2c4ee324eba222c40e20cedabe6c74bf63680 SHA512 5a3fc41b3c184903874e561bf8433ac88e95e067f0d26fc368f92a69e8080c5d3d00bb9a1d25dd58d6bca09d2b26c742976fa47464b13d2beb7416aeb14c51f5
 EBUILD single-unix-specification-4_p2.ebuild 515 BLAKE2B 53c211c41a973ecb54fa55b082f1ac0f2cafe1696b6efb444489cc527e3490986b157bbcf5d72328ef9437d03568e8ccb76817eb9fcb3a4b85bd6a0512219754 SHA512 fb64592ba6d7223a283198e885eba858a621125f1a513ac769c5e9c2ed90d72d428a45f61e710a8e56aad1aa64886ab27a398aa12496c6835ba44f4f4003d7c9
 EBUILD single-unix-specification-4_p2018.ebuild 550 BLAKE2B 23618291b742446e54c44bce19367bbc403e830e0c068356905c8463aa7595e7528cf9c621c87070931d88cb18964cccf8cd601ae0df69abf0f96da0e8191d02 SHA512 7cb00267e1a606b7e2d55a988e5ac457be63604dcb76ba551d3e833d2b0f9324d20d816f1e043ca4115b0776988fc7fe67135fe086414c06beb3c587a9f8d518
-EBUILD single-unix-specification-5-r1.ebuild 564 BLAKE2B 37f9ae4b86ec3d2a7f28c5661632754db65ebe70b2551f76d6b95b72a8b28abd0f24e8b999e2f3bcec0ddcc42b30bd3459bda4b6bfee44914f62c89a03119079 SHA512 4e4dde7fd3d0c43c87b59e26f1367b306eaf952e32490f9e6b5dc6fbde5681a929577113a3699a25ba7f168be59c4872d22c30f9381f6fd4609bd37afa7bf6e6
+EBUILD single-unix-specification-5-r2.ebuild 571 BLAKE2B f7b405c1140941bbea798652de0317bfc08297dec3c9d02c6118d7c4e739fd70f29ef5f2744f1354b0ca6956b4593089a0601b65ff94679770bf59c440bda8b2 SHA512 afd289d0f7d199caea21610525fa4cceff47ce9734d3dcee4314c05f0ff63aa5be352fa0bcb63135cf24050676f7770f6350035b671d7590f219f25247dceca9
 MISC metadata.xml 282 BLAKE2B 85c3312405ada57a85e03b06a59523c8d4069551f91e6b70f182d5af92ffc26b946c2987554001649eb41d605864a5cb3c172ebbb02f3c1a11ca1ed805889550 SHA512 5eac09aed8093684086d644c321b236d5da019a650ad322d33236b543bd5641edfc43cbdeee4654e093f9f6393eae034110ca51eb560b87a178fba74244d7fdb
--- a/app-doc/single-unix-specification/single-unix-specification-5-r2.ebuild
+++ b/app-doc/single-unix-specification/single-unix-specification-5-r2.ebuild
@ -6,12 +6,12 @@ EAPI=8
 DESCRIPTION="The Single UNIX Specification, Version 5, 2024 Edition"
 HOMEPAGE="https://publications.opengroup.org/"
 # Rename for bug #948039
-SRC_URI="https://pubs.opengroup.org/onlinepubs/9799919799/download/susv5.tar.bz2 -> susv5-2025-01-02.tar.bz2"
+SRC_URI="https://pubs.opengroup.org/onlinepubs/9799919799/download/susv5.tar.bz2 -> susv5-2025-03-25.tar.bz2"
 S="${WORKDIR}/susv5-html"

 LICENSE="sus4-copyright"
 SLOT="5"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 RESTRICT="mirror"

 src_install() {
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@ -15,18 +15,14 @@ DIST emacs-29.4.tar.xz 52210344 BLAKE2B 825fd2665b6427dbc3cb618b40df2f71fa6b0888
 DIST emacs-30.1.tar.xz 54978160 BLAKE2B ad502a2e15a04618f4766ec6e285739cb5bb6f19c5065c3aed03b3e50df590cee382a0331f382de6f13523f1362a4355f65961ce45504f7d33419ea6d04e326f SHA512 511a6a1d2a170a207913692e1349344b70a0b5202b8d1ae27dc7256e589c77ae9e35da16fc2a098bf9f1b8d0f60233f452ed8d6744b70b907f3484c42f2d7d7f
 EBUILD emacs-18.59-r15.ebuild 4499 BLAKE2B 8a6a25d16e06d108b6d2ac81c32bfcc6ee0a86685102fb53f63bf7eb98e570bbc1d6419bd6216a7bfe4eb652c151d5df4a9d9e58342005688f46b0a90b643057 SHA512 bd51c8ac4550370db9d35537aa516f8dd1a890565d70d837d3b2ef9e37978e9b7ff491bf4b5a17d9639aca033527eae8089464e88f4c096d771facd37d2289d9
 EBUILD emacs-26.3-r19.ebuild 11823 BLAKE2B 0ddb554f48e9f62d06cd6df2a840436d516b2ed1301cd639ce19584ea9350d7ec765cf249fcfa7a1e7ff139f135bcd96aaacd2e20d450aee126d0d7c02915ec1 SHA512 10475df4b0c9685f0f3f491ecc625524146af1e850e60425ebdad46c288f2f7be57f0c98e899086cb7ee3a405f25c3c79b03f0dc4deee9b24e560690e6426354
-EBUILD emacs-26.3-r22.ebuild 11738 BLAKE2B 887c8fd74ceecfbf7cdd677816fa0519f5988ea895c8c5a14271d5a2f1f62b97ef1d5405074559f90d8ac6a3a3ed1ea28b8ad432648159532b9084a80db6ac25 SHA512 45518f4f4661d8f25aaa3abd0e0e06e182fd6df93e91c34feace4d90949e43bbfab780c6f720375f6ed7a3023aa6049c87a354ab3a7bc55ba1c331d0773b42ae
-EBUILD emacs-26.3-r23.ebuild 11455 BLAKE2B 1c1dc19b7ad13ee5ebf7c246cd143a3c67b2ff2c102c4c591627525eea7bdfd7c7d9b3b8766bc2bc0b672a2d7428b516c2216efe0365c810c223912ab6508b2d SHA512 9dda5e4cbd2b71ec2681feb981b6924295f4bce0013f2155d5f1ceb090b4b3b4f4043135b16d952b7eb2ef6cfb9c16255c4f0cbd2ad178a7b9d1b8059545ab10
+EBUILD emacs-26.3-r23.ebuild 11448 BLAKE2B a9a7cefc50d27758095842f9d59074a5530ca75fbce2ca7ab39c9cb08a2d2431fce26866eb3e267f90fd95cbecebdd034d5852d328c5e6d2283157d1b8ddd68e SHA512 a29985f1e9e8b59339d38b7a64a781717a0fa85d3c7e47941f913f871fe4c2283deebe35b5dc77c9ac491db43bc616c612b2b57b4beed9081c17e206f4a7e7b8
 EBUILD emacs-27.2-r17.ebuild 14555 BLAKE2B ec5198f984a704f270f95c574405b9621d5a7d8028b56a41ed0f8871ca1980a32079d944f79648ac40713cefbf7efc233e972a386f48fd77c8f3af12d0500e72 SHA512 a3b046c085fb41bc3d7979992d67b92c4f9124e23a6f98f3417a179029b05311a4ce3a7d718009bbb76e121e533793988f8c6f567c24f0ba2b52fc9f932a2224
-EBUILD emacs-27.2-r20.ebuild 14391 BLAKE2B 97baf61fcbd2510fa87f49101c0030165a7479b001a7ed72feda59503d8ba39f72b3ebbd48a71bf5107ce660a941300e5ce2567877c2ad912d3a6f5298186471 SHA512 1ffb75689ca93360ef672ffd20f82305a85e59168b95d1621e000970013d49d1621c2f7fedf955e6da7924b7f0ecb0da3a986cd4f1c4260b23c323beed10ea6e
-EBUILD emacs-27.2-r21.ebuild 14108 BLAKE2B 16478451362b4eb090359d668477adb2a056e3f729a53d4637e43830bfa9fec73513b1442b23dba44142c9fc1653a1a352f68aff535efdde319759729df47096 SHA512 012431b4e2ef749d104e020a98327dd33f51f7e360f93739b5c32dda3fbc152f3589c509243da2605c753d05711d8cf9a006ff100ff6dafbf7dc9887688768e4
+EBUILD emacs-27.2-r21.ebuild 14101 BLAKE2B f609d312f45645e236b86027875a56a8c5fb22d37206894f5fd5cb839e4be78121caccc233e132947307036400edc2b07bbbe9e30c9a257a6547e82c24a85a02 SHA512 47dce909b275e2425f92243c7684d6be9a417c2a806e91ffaa8f98665188848ffc2641b4e37ab8669432ce2445bfecd0c74301c4ea728023fdea2a0427787115
 EBUILD emacs-28.2-r13.ebuild 17522 BLAKE2B df13974f748f4b0b9c59e857c40b00625b21a2e541814ed4de745bae9dbd7213fdc25bbea690ca70b57fd2a35a0f884b282ea7c1707c6e6fbd672f8e8845f239 SHA512 97a04f0c3e505c85471825f97f0955dbaa01b8702e40b9a15e83c276ea9ad90865c804b86f766a0bd393ea892e0b11e57b151e8ff8cdc79539954cbe3262c2d1
-EBUILD emacs-28.2-r16.ebuild 17901 BLAKE2B d83ac9040f929e7d8ac067ef83adb66cae938b88d9232c1af8da5a4c093e025b6b6c118779119908d4c3d8878cfaf0327d927f45b3cfa009a1424973b3442086 SHA512 aaad2d9c723db41752a4fe6d5e882e3d4942e9d0ba06e130e3485190bb52f639943054b8c8050eaba33f98c2656bb5fa8173aa139b1fa893e0bb17bd64384c5c
-EBUILD emacs-28.2-r17.ebuild 17618 BLAKE2B 8853fcdff1d87bc2b80d52dc9b5c6ce65fbd2f29ad54c2d4a23630d7df5bc08c5048a2fbebc49c951ed573eed7f30616c95f3440494fc91a021d996fc5b55360 SHA512 11c9e3bc728eaa13e1f9095bbc1716e768555634b85381fd43e309b23b57f158756e862aea7e8b7bf75bc577dd67c6fec66b2a7e73bdf740e9986970c987c297
-EBUILD emacs-29.4-r2.ebuild 20614 BLAKE2B 013cacfee11ac98d4f8365062b8b2ecfcca5f26c69541f98d88c1eba491e463466276f2f7a2a857c6e2dabd03c7e2432ff4f3eb9289ccd8c5a7e8231574358ec SHA512 1571887a9bd777ee56cdee530c21b0f1798e420010d40b976e6636b2dcfcae0495c5d648d262cfe18e95d7d6c0164b9e4946fa585f547e20ede43db066006a7a
-EBUILD emacs-29.4-r3.ebuild 20335 BLAKE2B 539450b46da289783b0e6948cd3b9e0e36ce8741d014165238e43624094e21dcf32380d09aad8b6ba854aa93071dc4df3438a0c4e5119fc5a70ec854e491ffcd SHA512 6294b69c4676a9eaa7b544cc71ca75e9b26a004f59f3b62823ba7e805d8e4a4f478d4853512a43716e3cb37c2e23b80aee196266d54ab7580c730eacef7115d2
+EBUILD emacs-28.2-r17.ebuild 17611 BLAKE2B e3671b748dded02b6e249f94311ef481b3d50fd9d8531fd8da279b97d18cba27bb6213e426f277c91dc5b390e9825c8584eca9bbc91f4c4a242af88c5a15cb01 SHA512 3847ec64d0414d60c463ae09c31c589ebeb864add3a5122b240ca9414aa0ee8f709a2e09db4127d952495db9df6be2303c2b9d0bfaf9625860d61a1618a48e5d
+EBUILD emacs-29.4-r3.ebuild 20328 BLAKE2B 7be6f012c6343858da177945fc3dccd5d2708d8557adb76caccedb07795734b479ef99ca8dc945c88f522d18b4f95f26aafe182a4b8a3ec212e2d12e2474bb60 SHA512 64751cc16b24c46d0d2c359298e633be962c2fadcb77aa3734e4f006cf7a57805a96d95d30fc67fff268274d79de97e2d91b5341717a2f04b6a0e7829946d24d
 EBUILD emacs-29.4.ebuild 20313 BLAKE2B 1bed634eb42caf03b67df68474bf7d8b02b0f2086e8bbe820dd82096b81630af01fa184201fbc6c7b3797ff125ccf45b5dd465eae64443854781e9588acbd4d3 SHA512 d0ba494964d39737ed536e7e00a33212f215820971a449401ca6b60d7dc51715ae39f7fe6910e5673d7eba62683a1cc7d7dc20ef50e5dc5bb71c334f70387261
-EBUILD emacs-30.1-r1.ebuild 19587 BLAKE2B 134538ef6b6d7bc837405b741293bd143e7fa7d9ebdc47d7cc6605a5cbee4bfeba8c6e4b242a77fe40764d886b6c513b50b31d1c031f4463fe000f9b1fa34ece SHA512 d8788ec10905ec0cdbf9041a3f9be8a2cc96d5e4fc50fea4cf14c89de20ba1aba0d77c3ec5490ac6dc16a3d3abc4de0f5c3c360eb5f3cf5253bf71fcaa49b048
+EBUILD emacs-30.1-r1.ebuild 19582 BLAKE2B 5a8b5e74801c37b4c66e2552f591ae006db2d1383f36527610c31bd02834195324648113b227953cfc845a57ded5acbd04f12e6479e7c90709e618068dbd82e7 SHA512 b6315ba693a1c711df5938e12bf280b7142bfec406b61f81e06fb4c2afac89a758e4075762d6eb9fabc8ecf9e743be3dc7ec80defb9652893a5cc1d040ee8b19
 EBUILD emacs-30.1.9999.ebuild 19435 BLAKE2B 39d7fd87b2fffde2843d143d6e5ad5176162e06679261621d27f41cc0708df0c344f264de4fae956b228560f32d89d155e50dc5bafcbeecf297107ab10789009 SHA512 e4411e8af1ca0ee8df44bde8b1c5ca06695dadc30ae781df998ba8b788778119cd591e20b960e11ab0761f2c626db542831af19d6f5c0f41a5ee8906aafb8de6
 EBUILD emacs-31.0.9999.ebuild 19294 BLAKE2B 30c8751009b7540b9b7733eb5b0dbf050b97f9cc5f798f6809d5fb92c97d6c0671763a107d4c50ee9b18aeb5ee3caaec628e24c6e1b19062c991af0c605b65dc SHA512 a1a707b2e3a1ddd00c6966ca56fb1eebd87f2ab96043c02d21bdd1f7ba8098735cb13f00825a6dadf395330cf380ad70c38a2f521a9ba32a672b41440dd3321b
 MISC metadata.xml 3434 BLAKE2B aaeef31ce265ae3b3c67ddfe01b3b41724b6fed7353e83f3efa1fe401944707391f3160d7cfea423802c67e78830387e210966f5fdc03a5a0a20b0e38f493b6d SHA512 2ad8128bfe05cbef0cdf19840e809918331c5e98976fb1af14127e0cb7adfba597ff83457a45079d1facd571953210c1650eb11b87d9bce2352e9ca865ebcc38
--- a/app-editors/emacs/emacs-26.3-r22.ebuild
+++ b/app-editors/emacs/emacs-26.3-r22.ebuild
@ -1,377 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools eapi9-pipestatus elisp-common flag-o-matic readme.gentoo-r1
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.xz
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-12.tar.xz"
-# FULL_VERSION keeps the full version number, which is needed in
-# order to determine some path information correctly for copy/move
-# operations later on
-FULL_VERSION="${PV%%_*}"
-S="${WORKDIR}/emacs-${FULL_VERSION}"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="26"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm zlib"
-
-RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
-	sys-libs/ncurses:0=
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	games? ( acct-group/gamestat )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	kerberos? ( virtual/krb5 )
-	lcms? ( media-libs/lcms:2 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	mailutils? ( net-mail/mailutils[clients] )
-	!mailutils? ( acct-group/mail net-libs/liblockfile )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	systemd? ( sys-apps/systemd )
-	valgrind? ( dev-debug/valgrind )
-	zlib? ( sys-libs/zlib )
-	gui? ( !aqua? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libxcb
-		x11-misc/xbitmaps
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( media-libs/libjpeg-turbo:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:= )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			x11-libs/libXrender
-			cairo? ( >=x11-libs/cairo-1.12.18[X] )
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? ( x11-libs/gtk+:3 )
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	) )"
-
-DEPEND="${RDEPEND}
-	gui? ( !aqua? ( x11-base/xorg-proto ) )"
-
-BDEPEND="virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-IDEPEND="app-eselect/eselect-emacs"
-
-RDEPEND+=" ${IDEPEND}"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-PATCHES=("${WORKDIR}/patch")
-
-# Suppress false positive QA warnings #898304
-QA_CONFIG_IMPL_DECL_SKIP=( malloc_{get,set}_state )
-
-src_prepare() {
-	default
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -pie					#526948
-	replace-flags "-O[3-9]" -O2			#839405
-
-	# We want floating-point arithmetic to be correct #933380
-	replace-flags -Ofast -O2
-	append-flags -fno-fast-math -ffp-contract=off
-
-	local myconf=(
-		--program-suffix="-${EMACS_SUFFIX}"
-		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX}
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX}
-		--localstatedir="${EPREFIX}"/var
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}"
-		--without-compress-install
-		--without-hesiod
-		--without-pop
-		--with-file-notification=$(usev inotify || usev gfile || echo no)
-		$(use_enable acl)
-		$(use_with dbus)
-		$(use_with dynamic-loading modules)
-		$(use_with games gameuser ":gamestat")
-		$(use_with gpm)
-		$(use_with kerberos) $(use_with kerberos kerberos5)
-		$(use_with lcms lcms2)
-		$(use_with libxml2 xml2)
-		$(use_with mailutils)
-		$(use_with selinux)
-		$(use_with ssl gnutls)
-		$(use_with systemd libsystemd)
-		$(use_with threads)
-		$(use_with wide-int)
-		$(use_with zlib)
-	)
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=( --with-sound=alsa )
-	else
-		myconf+=( --with-sound=$(usex sound oss no) )
-	fi
-
-	if ! use gui; then
-		einfo "Configuring to build without window system support"
-		myconf+=(
-			--without-x --without-ns
-		)
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
-		myconf+=(
-			--with-ns --disable-ns-self-contained
-			--without-x
-		)
-	else
-		myconf+=(
-			--with-x --without-ns
-			--without-gconf
-			$(use_with gsettings)
-			$(use_with toolkit-scroll-bars)
-			$(use_with gif)
-			$(use_with jpeg)
-			$(use_with png)
-			$(use_with svg rsvg)
-			$(use_with tiff)
-			$(use_with xpm)
-			$(use_with imagemagick)
-		)
-
-		if use xft; then
-			myconf+=(
-				--with-xft
-				$(use_with cairo)
-				$(use_with m17n-lib libotf)
-				$(use_with m17n-lib m17n-flt)
-			)
-		else
-			myconf+=(
-				--without-xft
-				--without-cairo
-				--without-libotf --without-m17n-flt
-			)
-			use cairo && ewarn \
-				"USE flag \"cairo\" has no effect if \"xft\" is not set."
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
-				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			myconf+=( --with-x-toolkit=gtk3 --without-xwidgets )
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=( --with-x-toolkit=motif )
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=( --with-x-toolkit=lucid $(use_with Xaw3d xaw3d) )
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=( --with-x-toolkit=no )
-		fi
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
-
-	# Disable sandbox when dumping. For the unbelievers, see bug #131505
-	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
-}
-
-src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
-	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
-
-	# dissuade Portage from removing our dir file #257260
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
-
-	# movemail must be setgid mail
-	if ! use mailutils; then
-		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-	fi
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-	rm -rf "${ED}"/usr/share/{applications,icons} || die
-	rm -rf "${ED}/usr/$(get_libdir)" || die
-	rm -rf "${ED}"/var || die
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
-
-	if use systemd; then
-		insinto /usr/lib/systemd/user
-		sed -e "/^##/d" \
-			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
-			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
-			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
-		pipestatus || die
-	fi
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		pipestatus || die "gzip .el pipeline failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
-	X
-	;;; ${EMACS_SUFFIX} site-lisp configuration
-	X
-	(when (string-equal emacs-version "${FULL_VERSION}")
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setenv "INFOPATH" (mapconcat #'identity (cdr p) ":"))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use gui && use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-	fi
-
-	local DOC_CONTENTS="You can set the version to be started by
-		/usr/bin/emacs through the Emacs eselect module, which also
-		redirects man and info pages. Therefore, several Emacs versions can
-		be installed at the same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from a previous major version of Emacs, then
-		it is strongly recommended that you use app-admin/emacs-updater
-		to rebuild all byte-compiled elisp files of the installed Emacs
-		packages."
-	if use gui; then
-		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-			machine would satisfy basic Emacs requirements under X11.
-			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-			for how to enable anti-aliased fonts."
-		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
-			symlink it into /Applications by yourself."
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# verify that the PM hasn't removed our Info directory index #257260
-	local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
-	[[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	# Force an update of the emacs symlink for the livecd/dvd,
-	# because some microemacs packages set it with USE=livecd.
-	# Otherwise, create it only when it is not yet set.
-	eselect --root="${ROOT}" emacs update $(usev !livecd ifunset)
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect --root="${ROOT}" emacs update ifunset
-}
--- a/app-editors/emacs/emacs-26.3-r23.ebuild
+++ b/app-editors/emacs/emacs-26.3-r23.ebuild
@ -17,7 +17,7 @@ S="${WORKDIR}/emacs-${FULL_VERSION}"

 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="26"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm zlib"

 RDEPEND=">=app-emacs/emacs-common-1.11[games?,gui?]
--- a/app-editors/emacs/emacs-27.2-r20.ebuild
+++ b/app-editors/emacs/emacs-27.2-r20.ebuild
@ -1,447 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools eapi9-pipestatus elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
-
-if [[ ${PV##*.} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
-	EGIT_BRANCH="emacs-27"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
-	S="${EGIT_CHECKOUT_DIR}"
-	SLOT="${PV%%.*}-vcs"
-else
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
-	S="${WORKDIR}/emacs-${FULL_VERSION}"
-	# PV can be in any of the following formats:
-	# 27.1                 released version (slot 27)
-	# 27.1_rc1             upstream release candidate (27)
-	# 27.0.9999            live ebuild (slot 27-vcs)
-	# 27.0.90              upstream prerelease snapshot (27-vcs)
-	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
-	if [[ ${PV} == *_pre* ]]; then
-		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-		S="${WORKDIR}/emacs"
-	elif [[ ${PV//[0-9]} != "." ]]; then
-		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
-	fi
-	# Patchset from proj/emacs-patches.git
-	SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-12.tar.xz"
-	PATCHES=("${WORKDIR}/patch")
-	SLOT="${PV%%.*}"
-	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm zlib"
-RESTRICT="test"
-
-RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
-	sys-libs/ncurses:0=
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	games? ( acct-group/gamestat )
-	gmp? ( dev-libs/gmp:0= )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	json? ( dev-libs/jansson:= )
-	kerberos? ( virtual/krb5 )
-	lcms? ( media-libs/lcms:2 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	mailutils? ( net-mail/mailutils[clients] )
-	!mailutils? ( acct-group/mail net-libs/liblockfile )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	systemd? ( sys-apps/systemd )
-	valgrind? ( dev-debug/valgrind )
-	zlib? ( sys-libs/zlib )
-	gui? ( !aqua? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libxcb
-		x11-misc/xbitmaps
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( media-libs/libjpeg-turbo:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:= )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXrender
-			cairo? ( >=x11-libs/cairo-1.12.18[X] )
-			!cairo? ( x11-libs/libXft )
-			harfbuzz? ( media-libs/harfbuzz:0= )
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? ( x11-libs/gtk+:3 )
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	) )"
-
-DEPEND="${RDEPEND}
-	gui? ( !aqua? ( x11-base/xorg-proto ) )"
-
-BDEPEND="sys-apps/texinfo
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-IDEPEND="app-eselect/eselect-emacs"
-
-RDEPEND+=" ${IDEPEND}"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-
-# Suppress false positive QA warnings #898304 #925449
-QA_CONFIG_IMPL_DECL_SKIP=( malloc_{get,set}_state statvfs64 )
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EGIT_BRANCH}"
-		einfo "Commit: ${EGIT_VERSION}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	default
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	replace-flags "-O[3-9]" -O2			#839405
-
-	# We want floating-point arithmetic to be correct #933380
-	replace-flags -Ofast -O2
-	append-flags -fno-fast-math -ffp-contract=off
-
-	local myconf=(
-		--program-suffix="-${EMACS_SUFFIX}"
-		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX}
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX}
-		--localstatedir="${EPREFIX}"/var
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}"
-		--without-compress-install
-		--without-hesiod
-		--without-pop
-		--with-file-notification=$(usev inotify || usev gfile || echo no)
-		--with-pdumper
-		$(use_enable acl)
-		$(use_with dbus)
-		$(use_with dynamic-loading modules)
-		$(use_with games gameuser ":gamestat")
-		$(use_with gmp libgmp)
-		$(use_with gpm)
-		$(use_with json)
-		$(use_with kerberos) $(use_with kerberos kerberos5)
-		$(use_with lcms lcms2)
-		$(use_with libxml2 xml2)
-		$(use_with mailutils)
-		$(use_with selinux)
-		$(use_with ssl gnutls)
-		$(use_with systemd libsystemd)
-		$(use_with threads)
-		$(use_with wide-int)
-		$(use_with zlib)
-	)
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=( --with-sound=alsa )
-	else
-		myconf+=( --with-sound=$(usex sound oss no) )
-	fi
-
-	if ! use gui; then
-		einfo "Configuring to build without window system support"
-		myconf+=(
-			--without-x --without-ns
-		)
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
-		myconf+=(
-			--with-ns --disable-ns-self-contained
-			--without-x
-		)
-	else
-		myconf+=(
-			--with-x --without-ns
-			--without-gconf
-			$(use_with gsettings)
-			$(use_with toolkit-scroll-bars)
-			$(use_with gif)
-			$(use_with jpeg)
-			$(use_with png)
-			$(use_with svg rsvg)
-			$(use_with tiff)
-			$(use_with xpm)
-			$(use_with imagemagick)
-		)
-
-		if use xft; then
-			myconf+=(
-				--with-xft
-				$(use_with cairo)
-				$(use_with harfbuzz)
-				$(use_with m17n-lib libotf)
-				$(use_with m17n-lib m17n-flt)
-			)
-		else
-			myconf+=(
-				--without-xft
-				--without-cairo
-				--without-libotf --without-m17n-flt
-			)
-			use cairo && ewarn \
-				"USE flag \"cairo\" has no effect if \"xft\" is not set."
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
-				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			myconf+=( --with-x-toolkit=gtk3 --without-xwidgets )
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=( --with-x-toolkit=motif )
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=( --with-x-toolkit=lucid $(use_with Xaw3d xaw3d) )
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=( --with-x-toolkit=no )
-		fi
-	fi
-
-	if tc-is-cross-compiler; then
-		# Configure a CBUILD directory when cross-compiling to make tools
-		mkdir -p "${S}-build" && pushd "${S}-build" >/dev/null || die
-		ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
-		popd >/dev/null || die
-		# Don't try to execute the binary for dumping during the build
-		myconf+=( --with-dumping=none )
-	elif use m68k; then
-		# Workaround for https://debbugs.gnu.org/44531
-		myconf+=( --with-dumping=unexec )
-	else
-		myconf+=( --with-dumping=pdumper )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
-
-	if tc-is-cross-compiler; then
-		# Build native tools for compiling lisp etc.
-		emake -C "${S}-build" src
-		emake lib	   # Cross-compile dependencies first for timestamps
-		# Save native build tools in the cross-directory
-		cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
-		# Specify the native Emacs to compile lisp
-		emake -C lisp all EMACS="${S}-build/src/emacs"
-	fi
-
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
-	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
-
-	# dissuade Portage from removing our dir file #257260
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
-
-	# movemail must be setgid mail
-	if ! use mailutils; then
-		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-	fi
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-	rm -rf "${ED}"/usr/share/{applications,icons} || die
-	rm -rf "${ED}/usr/$(get_libdir)" || die
-	rm -rf "${ED}"/var || die
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
-
-	if use systemd; then
-		insinto /usr/lib/systemd/user
-		sed -e "/^##/d" \
-			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
-			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
-			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
-		pipestatus || die
-	fi
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		pipestatus || die "gzip .el pipeline failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
-	X
-	;;; ${EMACS_SUFFIX} site-lisp configuration
-	X
-	(when (string-equal emacs-version "${FULL_VERSION}")
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setenv "INFOPATH" (mapconcat #'identity (cdr p) ":"))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use gui && use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-	fi
-
-	local DOC_CONTENTS="You can set the version to be started by
-		/usr/bin/emacs through the Emacs eselect module, which also
-		redirects man and info pages. Therefore, several Emacs versions can
-		be installed at the same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from a previous major version of Emacs, then
-		it is strongly recommended that you use app-admin/emacs-updater
-		to rebuild all byte-compiled elisp files of the installed Emacs
-		packages."
-	if use gui; then
-		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-			machine would satisfy basic Emacs requirements under X11.
-			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-			for how to enable anti-aliased fonts."
-		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
-			symlink it into /Applications by yourself."
-	fi
-	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
-		a portable dump file due to being cross-compiled.
-		To create this file at run time, execute the following command:
-		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
-		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# verify that the PM hasn't removed our Info directory index #257260
-	local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
-	[[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	# Force an update of the emacs symlink for the livecd/dvd,
-	# because some microemacs packages set it with USE=livecd.
-	# Otherwise, create it only when it is not yet set.
-	eselect --root="${ROOT}" emacs update $(usev !livecd ifunset)
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect --root="${ROOT}" emacs update ifunset
-}
--- a/app-editors/emacs/emacs-27.2-r21.ebuild
+++ b/app-editors/emacs/emacs-27.2-r21.ebuild
@ -36,7 +36,7 @@ else
 	PATCHES=("${WORKDIR}/patch")
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi

 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
--- a/app-editors/emacs/emacs-28.2-r16.ebuild
+++ b/app-editors/emacs/emacs-28.2-r16.ebuild
@ -1,558 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools eapi9-pipestatus elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
-
-if [[ ${PV##*.} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
-	EGIT_BRANCH="emacs-28"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
-	S="${EGIT_CHECKOUT_DIR}"
-	SLOT="${PV%%.*}-vcs"
-else
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
-	S="${WORKDIR}/emacs-${FULL_VERSION}"
-	# PV can be in any of the following formats:
-	# 27.1                 released version (slot 27)
-	# 27.1_rc1             upstream release candidate (27)
-	# 27.0.9999            live ebuild (slot 27-vcs)
-	# 27.0.90              upstream prerelease snapshot (27-vcs)
-	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
-	if [[ ${PV} == *_pre* ]]; then
-		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-		S="${WORKDIR}/emacs"
-	elif [[ ${PV//[0-9]} != "." ]]; then
-		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
-	fi
-	# Patchset from proj/emacs-patches.git
-	SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-11.tar.xz"
-	PATCHES=("${WORKDIR}/patch")
-	SLOT="${PV%%.*}"
-	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm zlib"
-
-RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
-	sys-libs/ncurses:0=
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	games? ( acct-group/gamestat )
-	gmp? ( dev-libs/gmp:0= )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	jit? (
-		sys-devel/gcc:=[jit(-)]
-		sys-libs/zlib
-	)
-	json? ( dev-libs/jansson:= )
-	kerberos? ( virtual/krb5 )
-	lcms? ( media-libs/lcms:2 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	mailutils? ( net-mail/mailutils[clients] )
-	!mailutils? ( acct-group/mail net-libs/liblockfile )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	systemd? ( sys-apps/systemd )
-	valgrind? ( dev-debug/valgrind )
-	zlib? ( sys-libs/zlib )
-	gui? ( !aqua? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libxcb
-		x11-misc/xbitmaps
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( media-libs/libjpeg-turbo:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:= )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXrender
-			cairo? ( >=x11-libs/cairo-1.12.18[X] )
-			!cairo? ( x11-libs/libXft )
-			harfbuzz? ( media-libs/harfbuzz:0= )
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? ( x11-libs/gtk+:3 )
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	) )"
-
-DEPEND="${RDEPEND}
-	gui? ( !aqua? ( x11-base/xorg-proto ) )"
-
-BDEPEND="sys-apps/texinfo
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-IDEPEND="app-eselect/eselect-emacs"
-
-RDEPEND+=" ${IDEPEND}"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-
-# Suppress false positive QA warnings #898304 #925449
-QA_CONFIG_IMPL_DECL_SKIP=( malloc_{get,set}_state statvfs64 )
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EGIT_BRANCH}"
-		einfo "Commit: ${EGIT_VERSION}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	if use jit; then
-		export NATIVE_FULL_AOT=1
-		find lisp -type f -name "*.elc" -delete || die
-
-		# These files ignore LDFLAGS. We assign the variable here, because
-		# for live ebuilds FULL_VERSION doesn't exist in global scope
-		QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
-
-		# The build system requires gcc for native compilation #874657
-		if ! tc-is-gcc; then
-			ewarn "Emacs must be built with gcc[jit] if USE=jit is enabled."
-			ewarn "Ignoring CC=$(tc-getCC) and forcing ${CHOST}-gcc"
-			export CC=${CHOST}-gcc AR=${CHOST}-gcc-ar NM=${CHOST}-gcc-nm \
-				RANLIB=${CHOST}-gcc-ranlib
-			tc-is-gcc || die "tc-is-gcc failed in spite of CC=${CC}"
-		fi
-
-		# gccjit doesn't play well with ccache or distcc #801580
-		# For now, work around the problem with an explicit LIBRARY_PATH
-		if has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc; then
-			export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \
-				| sed -n '/^libraries:/{s:^[^/]*::;p}')
-		fi
-	fi
-
-	default
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
-
-	# Tests that use bubblewrap don't work in the sandbox:
-	# "bwrap: setting up uid map: Permission denied"
-	# So, disrupt the search for the bwrap executable.
-	sed -i -e 's/(executable-find "bwrap")/nil/' test/src/emacs-tests.el \
-		test/lisp/emacs-lisp/bytecomp-tests.el || die
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	replace-flags "-O[3-9]" -O2			#839405
-
-	# We want floating-point arithmetic to be correct #933380
-	replace-flags -Ofast -O2
-	append-flags -fno-fast-math -ffp-contract=off
-
-	# Prevents e.g. tests interfering with running Emacs.
-	unset EMACS_SOCKET_NAME
-
-	local myconf=(
-		--program-suffix="-${EMACS_SUFFIX}"
-		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX}
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX}
-		--localstatedir="${EPREFIX}"/var
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}"
-		--without-compress-install
-		--without-hesiod
-		--without-pop
-		--with-file-notification=$(usev inotify || usev gfile || echo no)
-		--with-pdumper
-		$(use_enable acl)
-		$(use_with dbus)
-		$(use_with dynamic-loading modules)
-		$(use_with games gameuser ":gamestat")
-		$(use_with gmp libgmp)
-		$(use_with gpm)
-		$(use_with jit native-compilation)
-		$(use_with json)
-		$(use_with kerberos) $(use_with kerberos kerberos5)
-		$(use_with lcms lcms2)
-		$(use_with libxml2 xml2)
-		$(use_with mailutils)
-		$(use_with selinux)
-		$(use_with ssl gnutls)
-		$(use_with systemd libsystemd)
-		$(use_with threads)
-		$(use_with wide-int)
-	)
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=( --with-sound=alsa )
-	else
-		myconf+=( --with-sound=$(usex sound oss no) )
-	fi
-
-	if use jit; then
-		use zlib || ewarn \
-			"USE flag \"jit\" overrides \"-zlib\"; enabling zlib support."
-		myconf+=( --with-zlib )
-	else
-		myconf+=( $(use_with zlib) )
-	fi
-
-	if ! use gui; then
-		einfo "Configuring to build without window system support"
-		myconf+=(
-			--without-x --without-ns
-		)
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
-		myconf+=(
-			--with-ns --disable-ns-self-contained
-			--without-x
-		)
-	else
-		myconf+=(
-			--with-x --without-ns
-			--without-gconf
-			$(use_with gsettings)
-			$(use_with toolkit-scroll-bars)
-			$(use_with gif)
-			$(use_with jpeg)
-			$(use_with png)
-			$(use_with svg rsvg)
-			$(use_with tiff)
-			$(use_with xpm)
-			$(use_with imagemagick)
-		)
-
-		if use xft; then
-			myconf+=(
-				--with-xft
-				$(use_with cairo)
-				$(use_with harfbuzz)
-				$(use_with m17n-lib libotf)
-				$(use_with m17n-lib m17n-flt)
-			)
-		else
-			myconf+=(
-				--without-xft
-				--without-cairo
-				--without-libotf --without-m17n-flt
-			)
-			use cairo && ewarn \
-				"USE flag \"cairo\" has no effect if \"xft\" is not set."
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
-				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			myconf+=( --with-x-toolkit=gtk3 --without-xwidgets )
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=( --with-x-toolkit=motif )
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=( --with-x-toolkit=lucid $(use_with Xaw3d xaw3d) )
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=( --with-x-toolkit=no )
-		fi
-	fi
-
-	if tc-is-cross-compiler; then
-		# Configure a CBUILD directory when cross-compiling to make tools
-		mkdir -p "${S}-build" && pushd "${S}-build" >/dev/null || die
-		ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
-		popd >/dev/null || die
-		# Don't try to execute the binary for dumping during the build
-		myconf+=( --with-dumping=none )
-	elif use m68k; then
-		# Workaround for https://debbugs.gnu.org/44531
-		myconf+=( --with-dumping=unexec )
-	else
-		myconf+=( --with-dumping=pdumper )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
-	append-cppflags -DUSE_VALGRIND=$(usex valgrind)
-
-	if tc-is-cross-compiler; then
-		# Build native tools for compiling lisp etc.
-		emake -C "${S}-build" src
-		emake lib	   # Cross-compile dependencies first for timestamps
-		# Save native build tools in the cross-directory
-		cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
-		# Specify the native Emacs to compile lisp
-		emake -C lisp all EMACS="${S}-build/src/emacs"
-	fi
-
-	emake
-}
-
-src_test() {
-	# List .el test files with a comment above listing the exact
-	# subtests which caused failure. Elements should begin with a %.
-	# e.g. %lisp/gnus/mml-sec-tests.el.
-	local exclude_tests=(
-		# Reason: not yet known
-		# mml-secure-en-decrypt-{1,2,3,4}
-		# mml-secure-find-usable-keys-{1,2}
-		# mml-secure-key-checks
-		# mml-secure-select-preferred-keys-4
-		# mml-secure-sign-verify-1
-		%lisp/gnus/mml-sec-tests.el
-
-		# Reason: race condition
-		# Looks like it should be fixed in 29.x at least:
-		# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=55706
-		# files-tests-file-name-non-special-file-in-directory-p
-		%lisp/files-tests.el
-
-		# Reason: permission denied on /nonexistent
-		# (vc-*-bzr only fails if breezy is installed, as they
-		# try to access cache dirs under /nonexistent)
-		#
-		# rmail-undigest-test-multipart-mixed-digest
-		# rmail-undigest-test-rfc1153-less-strict-digest
-		# rmail-undigest-test-rfc1153-sloppy-digest
-		# rmail-undigest-test-rfc934-digest
-		# vc-test-bzr02-state
-		# vc-test-bzr05-rename-file
-		# vc-test-bzr06-version-diff
-		# vc-bzr-test-bug9781
-		%lisp/mail/undigest-tests.el
-		%lisp/vc/vc-tests.el
-		%lisp/vc/vc-bzr-tests.el
-
-		# Reason: some copyright years differ
-		%lisp/emacs-lisp/copyright-tests.el
-
-		# Reason: quoting issues (fixed in Emacs 29)
-		%lib-src/emacsclient-tests.el
-
-		# Reason: tries to access network
-		# internet-is-working
-		%src/process-tests.el
-	)
-	use elibc_musl && exclude_tests+=(
-			# Reason: newlocale(3) lenient locale validation #906012
-			# fns-tests-collate-strings
-			%src/fns-tests.el
-		)
-	use threads || exclude_tests+=(
-			%src/emacs-module-tests.el
-			%src/keyboard-tests.el
-			%src/thread-tests.el
-		)
-
-	# See test/README for possible options
-	emake \
-		EMACS_TEST_VERBOSE=1 \
-		EXCLUDE_TESTS="${exclude_tests[*]}" \
-		TERM=dumb \
-		TEST_BACKTRACE_LINE_LENGTH=nil \
-		check
-}
-
-src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
-	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die
-
-	# dissuade Portage from removing our dir file #257260
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
-
-	# movemail must be setgid mail
-	if ! use mailutils; then
-		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-	fi
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-	rm -rf "${ED}"/usr/share/{applications,icons} || die
-	rm -rf "${ED}/usr/$(get_libdir)/systemd" || die
-	rm -rf "${ED}"/var || die
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
-
-	if use systemd; then
-		insinto /usr/lib/systemd/user
-		sed -e "/^##/d" \
-			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
-			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
-			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
-		pipestatus || die
-	fi
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		pipestatus || die "gzip .el pipeline failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
-	X
-	;;; ${EMACS_SUFFIX} site-lisp configuration
-	X
-	(when (string-equal emacs-version "${FULL_VERSION}")
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setenv "INFOPATH" (mapconcat #'identity (cdr p) ":"))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use gui && use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-	fi
-
-	local DOC_CONTENTS="You can set the version to be started by
-		/usr/bin/emacs through the Emacs eselect module, which also
-		redirects man and info pages. Therefore, several Emacs versions can
-		be installed at the same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from a previous major version of Emacs, then
-		it is strongly recommended that you use app-admin/emacs-updater
-		to rebuild all byte-compiled elisp files of the installed Emacs
-		packages."
-	if use gui; then
-		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-			machine would satisfy basic Emacs requirements under X11.
-			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-			for how to enable anti-aliased fonts."
-		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
-			symlink it into /Applications by yourself."
-	fi
-	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
-		a portable dump file due to being cross-compiled.
-		To create this file at run time, execute the following command:
-		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
-		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# verify that the PM hasn't removed our Info directory index #257260
-	local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
-	[[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	# Force an update of the emacs symlink for the livecd/dvd,
-	# because some microemacs packages set it with USE=livecd.
-	# Otherwise, create it only when it is not yet set.
-	eselect --root="${ROOT}" emacs update $(usev !livecd ifunset)
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect --root="${ROOT}" emacs update ifunset
-}
--- a/app-editors/emacs/emacs-28.2-r17.ebuild
+++ b/app-editors/emacs/emacs-28.2-r17.ebuild
@ -36,7 +36,7 @@ else
 	PATCHES=("${WORKDIR}/patch")
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi

 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
--- a/app-editors/emacs/emacs-29.4-r2.ebuild
+++ b/app-editors/emacs/emacs-29.4-r2.ebuild
@ -1,648 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools eapi9-pipestatus elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
-
-if [[ ${PV##*.} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
-	EGIT_BRANCH="emacs-29"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
-	S="${EGIT_CHECKOUT_DIR}"
-	SLOT="${PV%%.*}-vcs"
-else
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
-	S="${WORKDIR}/emacs-${FULL_VERSION}"
-	# PV can be in any of the following formats:
-	# 27.1                 released version (slot 27)
-	# 27.1_rc1             upstream release candidate (27)
-	# 27.0.9999            live ebuild (slot 27-vcs)
-	# 27.0.90              upstream prerelease snapshot (27-vcs)
-	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
-	if [[ ${PV} == *_pre* ]]; then
-		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-		S="${WORKDIR}/emacs"
-	elif [[ ${PV//[0-9]} != "." ]]; then
-		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
-	fi
-	# Patchset from proj/emacs-patches.git
-	SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-4.tar.xz"
-	PATCHES=("${WORKDIR}/patch")
-	SLOT="${PV%%.*}"
-	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X Xaw3d xft +xpm zlib"
-
-X_DEPEND="x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libxcb
-	x11-libs/xcb-util
-	x11-misc/xbitmaps
-	xpm? ( x11-libs/libXpm )
-	xft? (
-		media-libs/fontconfig
-		media-libs/freetype
-		x11-libs/libXrender
-		cairo? ( >=x11-libs/cairo-1.12.18[X] )
-		!cairo? ( x11-libs/libXft )
-		harfbuzz? ( media-libs/harfbuzz:0= )
-		m17n-lib? (
-			>=dev-libs/libotf-0.9.4
-			>=dev-libs/m17n-lib-1.5.1
-		)
-	)
-	gtk? ( x11-libs/gtk+:3 )
-	!gtk? (
-		motif? (
-			>=x11-libs/motif-2.3:0
-			x11-libs/libXpm
-			x11-libs/libXmu
-			x11-libs/libXt
-		)
-		!motif? (
-			Xaw3d? (
-				x11-libs/libXaw3d
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!Xaw3d? ( athena? (
-				x11-libs/libXaw
-				x11-libs/libXmu
-				x11-libs/libXt
-			) )
-		)
-	)"
-
-RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
-	sys-libs/ncurses:0=
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	games? ( acct-group/gamestat )
-	gmp? ( dev-libs/gmp:0= )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	jit? (
-		sys-devel/gcc:=[jit(-)]
-		sys-libs/zlib
-	)
-	json? ( dev-libs/jansson:= )
-	kerberos? ( virtual/krb5 )
-	lcms? ( media-libs/lcms:2 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	mailutils? ( net-mail/mailutils[clients] )
-	!mailutils? ( acct-group/mail net-libs/liblockfile )
-	selinux? ( sys-libs/libselinux )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( net-libs/gnutls:0= )
-	systemd? ( sys-apps/systemd )
-	tree-sitter? ( dev-libs/tree-sitter:= )
-	valgrind? ( dev-debug/valgrind )
-	zlib? ( sys-libs/zlib )
-	gui? (
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( media-libs/libjpeg-turbo:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:= )
-		webp? ( media-libs/libwebp:0= )
-		imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] )
-		!aqua? (
-			gsettings? (
-				app-emacs/emacs-common[gsettings(-)]
-				>=dev-libs/glib-2.28.6
-			)
-			gtk? ( !X? (
-				media-libs/fontconfig
-				media-libs/freetype
-				>=x11-libs/cairo-1.12.18
-				x11-libs/gtk+:3
-				harfbuzz? ( media-libs/harfbuzz:0= )
-				m17n-lib? (
-					>=dev-libs/libotf-0.9.4
-					>=dev-libs/m17n-lib-1.5.1
-				)
-			) )
-			!gtk? ( ${X_DEPEND} )
-			X? ( ${X_DEPEND} )
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	gui? ( !aqua? (
-		!gtk? ( x11-base/xorg-proto )
-		X? ( x11-base/xorg-proto )
-	) )"
-
-BDEPEND="sys-apps/texinfo
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-IDEPEND="app-eselect/eselect-emacs"
-
-RDEPEND+=" ${IDEPEND}"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-
-# Suppress false positive QA warnings #898304 #925091
-QA_CONFIG_IMPL_DECL_SKIP=( malloc_{get,set}_state statvfs64 )
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EGIT_BRANCH}"
-		einfo "Commit: ${EGIT_VERSION}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	default
-
-	if use jit; then
-		find lisp -type f -name "*.elc" -delete || die
-
-		# These files ignore LDFLAGS. We assign the variable here, because
-		# for live ebuilds FULL_VERSION doesn't exist in global scope
-		QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
-
-		# The build system requires gcc for native compilation #874657
-		if ! tc-is-gcc; then
-			ewarn "Emacs must be built with gcc[jit] if USE=jit is enabled."
-			ewarn "Ignoring CC=$(tc-getCC) and forcing ${CHOST}-gcc"
-			export CC=${CHOST}-gcc AR=${CHOST}-gcc-ar NM=${CHOST}-gcc-nm \
-				RANLIB=${CHOST}-gcc-ranlib
-			tc-is-gcc || die "tc-is-gcc failed in spite of CC=${CC}"
-		fi
-
-		# gccjit doesn't play well with ccache or distcc #801580
-		# For now, work around the problem with an explicit LIBRARY_PATH
-		if has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc; then
-			export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \
-				| sed -n '/^libraries:/{s:^[^/]*::;p}')
-		fi
-	fi
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
-
-	# libseccomp is detected by configure but doesn't appear to have any
-	# effect on the installed image. Suppress it by supplying pkg-config
-	# with a wrong library name.
-	sed -i -e "/CHECK_MODULES/s/libseccomp/DiSaBlE&/" configure.ac || die
-
-	# Tests that use bubblewrap don't work in the sandbox:
-	# "bwrap: setting up uid map: Permission denied"
-	# So, disrupt the search for the bwrap executable.
-	sed -i -e 's/(executable-find "bwrap")/nil/' test/src/emacs-tests.el \
-		test/lisp/emacs-lisp/bytecomp-tests.el || die
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	replace-flags "-O[3-9]" -O2			#839405
-
-	# We want floating-point arithmetic to be correct #933380
-	replace-flags -Ofast -O2
-	append-flags -fno-fast-math -ffp-contract=off
-
-	# Prevents e.g. tests interfering with running Emacs.
-	unset EMACS_SOCKET_NAME
-
-	local myconf=(
-		--program-suffix="-${EMACS_SUFFIX}"
-		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX}
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX}
-		--localstatedir="${EPREFIX}"/var
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}"
-		--without-compress-install
-		--without-hesiod
-		--without-pop
-		--with-file-notification=$(usev inotify || usev gfile || echo no)
-		--with-pdumper
-		$(use_enable acl)
-		$(use_with dbus)
-		$(use_with dynamic-loading modules)
-		$(use_with games gameuser ":gamestat")
-		$(use_with gmp libgmp)
-		$(use_with gpm)
-		$(use_with jit native-compilation aot)
-		$(use_with json)
-		$(use_with kerberos) $(use_with kerberos kerberos5)
-		$(use_with lcms lcms2)
-		$(use_with libxml2 xml2)
-		$(use_with mailutils)
-		$(use_with selinux)
-		$(use_with sqlite sqlite3)
-		$(use_with ssl gnutls)
-		$(use_with systemd libsystemd)
-		$(use_with threads)
-		$(use_with tree-sitter)
-		$(use_with wide-int)
-	)
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=( --with-sound=alsa )
-	else
-		myconf+=( --with-sound=$(usex sound oss no) )
-	fi
-
-	if use jit; then
-		use zlib || ewarn \
-			"USE flag \"jit\" overrides \"-zlib\"; enabling zlib support."
-		myconf+=( --with-zlib )
-	else
-		myconf+=( $(use_with zlib) )
-	fi
-
-	# Emacs supports these window systems:
-	# X11, pure GTK (without X11), or Nextstep (Aqua/Cocoa).
-	# General GUI support is enabled by the "gui" USE flag, then
-	# the window system is selected as follows:
-	#   "aqua" -> Nextstep
-	#   "gtk -X" -> pure GTK
-	#   otherwise -> X11
-	# For X11 there is the further choice of toolkits GTK, Motif,
-	# Athena (Lucid), or no toolkit. They are enabled (in order of
-	# preference) with the "gtk", "motif", "Xaw3d", and "athena" flags.
-
-	if ! use gui; then
-		einfo "Configuring to build without window system support"
-		myconf+=(
-			--without-x --without-pgtk --without-ns
-		)
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
-		myconf+=(
-			--with-ns --disable-ns-self-contained
-			--without-x --without-pgtk
-		)
-	elif use gtk && ! use X; then
-		einfo "Configuring to build with pure GTK (without X11) support"
-		myconf+=(
-			--with-pgtk --without-x --without-ns
-			--with-toolkit-scroll-bars #836392
-			--without-gconf
-			--without-xwidgets
-			$(use_with gsettings)
-			$(use_with harfbuzz)
-			$(use_with m17n-lib libotf)
-			$(use_with m17n-lib m17n-flt)
-		)
-	else
-		# X11
-		myconf+=(
-			--with-x --without-pgtk --without-ns
-			--without-gconf
-			$(use_with gsettings)
-			$(use_with toolkit-scroll-bars)
-			$(use_with xpm)
-		)
-
-		if use xft; then
-			myconf+=(
-				--with-xft
-				$(use_with cairo)
-				$(use_with harfbuzz)
-				$(use_with m17n-lib libotf)
-				$(use_with m17n-lib m17n-flt)
-			)
-		else
-			myconf+=(
-				--without-xft
-				--without-cairo
-				--without-libotf --without-m17n-flt
-			)
-			use cairo && ewarn \
-				"USE flag \"cairo\" has no effect if \"xft\" is not set."
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
-				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			myconf+=( --with-x-toolkit=gtk3 --without-xwidgets )
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=( --with-x-toolkit=motif )
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=( --with-x-toolkit=lucid $(use_with Xaw3d xaw3d) )
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=( --with-x-toolkit=no )
-		fi
-	fi
-
-	if use gui; then
-		# Common flags recognised for all GUIs
-		myconf+=(
-			$(use_with gif)
-			$(use_with jpeg)
-			$(use_with png)
-			$(use_with svg rsvg)
-			$(use_with tiff)
-			$(use_with webp)
-			$(use_with imagemagick)
-		)
-	fi
-
-	if tc-is-cross-compiler; then
-		# Configure a CBUILD directory when cross-compiling to make tools
-		mkdir -p "${S}-build" && pushd "${S}-build" >/dev/null || die
-		ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
-		popd >/dev/null || die
-		# Don't try to execute the binary for dumping during the build
-		myconf+=( --with-dumping=none )
-	elif use m68k; then
-		# Workaround for https://debbugs.gnu.org/44531
-		myconf+=( --with-dumping=unexec )
-	else
-		myconf+=( --with-dumping=pdumper )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
-	append-cppflags -DUSE_VALGRIND=$(usex valgrind)
-
-	if tc-is-cross-compiler; then
-		# Build native tools for compiling lisp etc.
-		emake -C "${S}-build" src
-		emake lib	   # Cross-compile dependencies first for timestamps
-		# Save native build tools in the cross-directory
-		cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
-		# Specify the native Emacs to compile lisp
-		EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" )
-		emake "${EMACS_EMAKE_ARGS[@]}" actual-all
-	else
-		EMACS_EMAKE_ARGS=()
-		emake
-	fi
-}
-
-src_test() {
-	# List .el test files with a comment above listing the exact
-	# subtests which caused failure. Elements should begin with a %.
-	# e.g. %lisp/gnus/mml-sec-tests.el.
-	local exclude_tests=(
-		# Reason: permission denied on /nonexistent
-		# (vc-*-bzr only fails if breezy is installed, as they
-		# try to access cache dirs under /nonexistent)
-		#
-		# rmail-undigest-test-multipart-mixed-digest
-		# rmail-undigest-test-rfc1153-less-strict-digest
-		# rmail-undigest-test-rfc1153-sloppy-digest
-		# rmail-undigest-test-rfc934-digest
-		# vc-test-bzr02-state
-		# vc-test-bzr05-rename-file
-		# vc-test-bzr06-version-diff
-		# vc-bzr-test-bug9781
-		%lisp/mail/undigest-tests.el
-		%lisp/vc/vc-tests.el
-		%lisp/vc/vc-bzr-tests.el
-
-		# Reason: tries to access network
-		# internet-is-working
-		%src/process-tests.el
-
-		# Reason: fails with stable version of tree-sitter-json due to
-		# ast changes. Bug #922525
-		%src/treesit-tests.log
-
-		# Reason: test is not skipped if tree-sitter-tsx is not installed
-		# Bug #922525
-		%lisp/progmodes/typescript-ts-mode-tests.el
-	)
-	use elibc_musl && exclude_tests+=(
-			# Reason: newlocale(3) lenient locale validation #906012
-			# fns-tests-collate-strings
-			%src/fns-tests.el
-		)
-	use threads || exclude_tests+=(
-			%lisp/server-tests.el
-			%lisp/progmodes/eglot-tests.el
-			%src/emacs-module-tests.el
-			%src/keyboard-tests.el
-		)
-	use xpm || exclude_tests+=( %src/image-tests.el )
-
-	# Some tests hang with gnupg-2.2.42
-	local gpgver=$(best_version app-crypt/gnupg)
-	gpgver=${gpgver#*gnupg-}
-	[[ -n ${gpgver} ]] \
-		&& ver_test "${gpgver}" -ge 2.2.42 && ver_test "${gpgver}" -lt 2.3 \
-		&& exclude_tests+=(
-			%lisp/epg-tests.el
-			%lisp/gnus/mml-sec-tests.el
-		)
-
-	# Redirect GnuPG's sockets, in order not to exceed the 108 char limit
-	# for socket paths on Linux.
-	mkdir -p "${T}"/gpg || die
-	local f
-	for f in browser extra ssh; do
-		printf "%%Assuan%%\nsocket=%s\n" "${T}/gpg/S.${f}" \
-			> "test/lisp/gnus/mml-sec-resources/S.gpg-agent.${f}" || die
-	done
-
-	# See test/README for possible options
-	emake \
-		EMACS_TEST_VERBOSE=1 \
-		EXCLUDE_TESTS="${exclude_tests[*]}" \
-		TERM=dumb \
-		TEST_BACKTRACE_LINE_LENGTH=nil \
-		check
-}
-
-src_install() {
-	emake \
-		"${EMACS_EMAKE_ARGS[@]}" \
-		DESTDIR="${D}" \
-		NO_BIN_LINK=t \
-		BLESSMAIL_TARGET="" \
-		install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
-	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die
-
-	# dissuade Portage from removing our dir file #257260
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
-
-	# movemail must be setgid mail
-	if ! use mailutils; then
-		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-	fi
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-	rm -rf "${ED}"/usr/share/{applications,icons} || die
-	rm -rf "${ED}"/usr/share/glib-2.0 || die #911117
-	rm -rf "${ED}/usr/$(get_libdir)/systemd" || die
-	rm -rf "${ED}"/var || die
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
-
-	if use systemd; then
-		insinto /usr/lib/systemd/user
-		sed -e "/^##/d" \
-			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
-			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
-			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
-		pipestatus || die
-	fi
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		pipestatus || die "gzip .el pipeline failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
-	X
-	;;; ${EMACS_SUFFIX} site-lisp configuration
-	X
-	(when (string-equal emacs-version "${FULL_VERSION}")
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setenv "INFOPATH" (mapconcat #'identity (cdr p) ":"))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use gui && use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-	fi
-
-	local DOC_CONTENTS="You can set the version to be started by
-		/usr/bin/emacs through the Emacs eselect module, which also
-		redirects man and info pages. Therefore, several Emacs versions can
-		be installed at the same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from a previous major version of Emacs, then
-		it is strongly recommended that you use app-admin/emacs-updater
-		to rebuild all byte-compiled elisp files of the installed Emacs
-		packages."
-	if use gui; then
-		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-			machine would satisfy basic Emacs requirements under X11.
-			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-			for how to enable anti-aliased fonts."
-		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
-			symlink it into /Applications by yourself."
-	fi
-	if ! use mailutils; then
-		DOC_CONTENTS+="\\n\\nThe mailutils USE flag is disabled. If Emacs'
-		own e-mail features are going to be used as an e-mail client
-		(e.g. Rmail), you are strongly encouraged to enable it. If not,
-		Emacs will use its own implementation of movemail; which has
-		fewer features and is less secure. For more information see:
-		https://www.gnu.org/software/emacs/manual/html_node/emacs/Movemail.html"
-	fi
-	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
-		a portable dump file due to being cross-compiled.
-		To create this file at run time, execute the following command:
-		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
-		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# verify that the PM hasn't removed our Info directory index #257260
-	local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
-	[[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	# Force an update of the emacs symlink for the livecd/dvd,
-	# because some microemacs packages set it with USE=livecd.
-	# Otherwise, create it only when it is not yet set.
-	eselect --root="${ROOT}" emacs update $(usev !livecd ifunset)
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect --root="${ROOT}" emacs update ifunset
-}
--- a/app-editors/emacs/emacs-29.4-r3.ebuild
+++ b/app-editors/emacs/emacs-29.4-r3.ebuild
@ -36,7 +36,7 @@ else
 	PATCHES=("${WORKDIR}/patch")
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi

 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
--- a/app-editors/emacs/emacs-30.1-r1.ebuild
+++ b/app-editors/emacs/emacs-30.1-r1.ebuild
@ -33,7 +33,7 @@ else
 	fi
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi

 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
--- a/app-editors/featherpad/Manifest
+++ b/app-editors/featherpad/Manifest
@ -3,6 +3,6 @@ DIST featherpad-1.6.0.tar.gz 1099284 BLAKE2B 55df80a154582bc1644f22e323939dcdee7
 DIST featherpad-1.6.1.tar.gz 1102081 BLAKE2B 211bfad02b9caa656cb7be67e1c0d96ab7fbdd4a7c937341443f7dbd144b564a2186184b20667e97d68f72a515ad1357ad3f67d0f38fd3e6d21363e9e1f40e35 SHA512 a0a6836bdab775ac4a6105ab8d7178b2d6d968c3378f99e0a81b8a6d2b524abc2c56271826abd7572bef0f6e2d7ae12016b9c16b96794130aa2882480c828e2e
 EBUILD featherpad-1.5.2.ebuild 731 BLAKE2B 986372e387d402c070002a1896fee8288ea18b5657648d2c7d8fa47c0078b7eca398e2147dd42b32527f29342591744d56b45585c6ac2517786950eb9bba5c04 SHA512 e6409aff6a9e177138ea046163ab21587953dcddf7beefe73425c35d00643e3f3435a088c4285f0dcb46c6fe10efa3dc6292942a236fbb53189b0766bb065012
 EBUILD featherpad-1.6.0.ebuild 731 BLAKE2B 986372e387d402c070002a1896fee8288ea18b5657648d2c7d8fa47c0078b7eca398e2147dd42b32527f29342591744d56b45585c6ac2517786950eb9bba5c04 SHA512 e6409aff6a9e177138ea046163ab21587953dcddf7beefe73425c35d00643e3f3435a088c4285f0dcb46c6fe10efa3dc6292942a236fbb53189b0766bb065012
-EBUILD featherpad-1.6.1.ebuild 733 BLAKE2B a48824dbfcbd7b1412fea02a5917236b07059a09266c568fc49419a80055e43c2f2f7e6feb1f93eee14dcb6b8bdfbad8351ac3dcd49fb323e8e9829b4762af1a SHA512 974e0c125b98ad08be18938dc7743b516f27ebb096b9c3dd5a9f811ea6c44d6853255f29e38b983ad7eae720aa7075fbc7de293f4bbbfc68c464b80011a30384
+EBUILD featherpad-1.6.1.ebuild 731 BLAKE2B 986372e387d402c070002a1896fee8288ea18b5657648d2c7d8fa47c0078b7eca398e2147dd42b32527f29342591744d56b45585c6ac2517786950eb9bba5c04 SHA512 e6409aff6a9e177138ea046163ab21587953dcddf7beefe73425c35d00643e3f3435a088c4285f0dcb46c6fe10efa3dc6292942a236fbb53189b0766bb065012
 EBUILD featherpad-9999.ebuild 623 BLAKE2B a067a835d4958f5263bd8ecc61cc11e2a0e0075a9c017a23bf95bdf5754d4243930b07951a459c064b7fe21730237187d6b42b489b5e77c2f5f32e88a1d993e8 SHA512 4a2ee2876d2e18adf34bd6c2d45f79d88a4892b984dce6711030e1fdb71d897d940646a656fc59aeac14d15d464d7e0d45dfe97d96540d30c235ceb3457fd612
 MISC metadata.xml 940 BLAKE2B 7d24c11cd115ff1687eafc01966063fa7725918f03b9dfc6e0f55c32e99f78a2a0123cdf01b447c2c9defd5f9e92291a6a517f99ef1a6cb8ac533f0d5cdf3d6e SHA512 e405c9af3d902e48ef4db68513b79c4bf28d40a76f6fdb951cc3f1e311741b6fd46dad2c322c5d22aece2dc0ff4c46a5b4ce949c615881896b889604c3185e4a
--- a/app-editors/featherpad/featherpad-1.6.1.ebuild
+++ b/app-editors/featherpad/featherpad-1.6.1.ebuild
@ -12,7 +12,7 @@ S="${WORKDIR}/FeatherPad-${PV}"

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+X"

 RDEPEND="
--- a/app-editors/mousepad/Manifest
+++ b/app-editors/mousepad/Manifest
@ -2,6 +2,6 @@ DIST mousepad-0.6.3.tar.bz2 1428583 BLAKE2B 73a0eb0cfecaa88c6d3508034561206ff1a2
 DIST mousepad-0.6.4.tar.xz 461356 BLAKE2B 1c1c8d4faebc31655186008592321a53606d880b483543ded47994b802d6e4d94e63ae12066d3f1d0649869d5fd52da2a44682d811bc9cc74c100308e38a82df SHA512 3b118a881d89502f74224ddb45121e7e0b3f771ed4f609f4567c9bbaf04757b31de8c02cbbebcb22d69c7e588f53a3c0b88c145aace3061b9a08c7ce5ae6352c
 DIST mousepad-0.6.5.tar.xz 461276 BLAKE2B 9bf9e5256a43299814d33b4ec27caf96796d2e1735b26f01851d24c2be6fcd46a5e16eba439476edd1e5e856e0b63c62d5cd47f2c30b06a01eb98ba84726792a SHA512 cd71e40c6b33707bf9955b792f5af8b72698efdf44014177380465522b0a0e3078e4a16d3b70dff22acbdacb57745469ca4302c7f2ec752f76a8ce35a0d7ee06
 EBUILD mousepad-0.6.3.ebuild 1260 BLAKE2B 63cd9db299c6a28506cf4bab78caace6efed665a7429d7a963364947dcec2c2e08d6e531360f4a859e179e137c0c29466864056cbe78204133bedc4928ae8125 SHA512 615adcfad923c131c3bec885a44d4b808b24f9dd24c99d13f5bd9110fb4ef44d7a3c258a2b2dd36d8b18fec6993ad8184a52fae82f4bb1691c9c607b29b70ca0
-EBUILD mousepad-0.6.4.ebuild 1199 BLAKE2B d3ce9c61cb897ab75097c312234773e7e9d64640d9c412d76ead99b674f6e85ee1d7734025dd83323c880f785106e46aec1e8def96f1c67c09b5c35eb525ce4d SHA512 a4a777a18792d87e2ee89a6612a1ba5ddd860fad9ca0b89c6e87bead77eb6faf771b3f3be51f8166d2836c7231104e5b115a9912c938f8ae24a57987b93ade72
+EBUILD mousepad-0.6.4.ebuild 1193 BLAKE2B 89bbc3de43442a5fc7cdfb352c3d385041e5e73e5c9614faa8736ad11d004b73b2bfaf8249d49ca3cecb1bb640f251dbddcbe9c6a0abde7966a763f16d577f6e SHA512 a636d68472d536dd1eb0ba8d2b9efc74ee1697cc122a3a5d5476b458ce646199bc7c159da019f98f532cbea787f31754c7a1faaad67add318e4ab0e9df29d5d6
 EBUILD mousepad-0.6.5.ebuild 1199 BLAKE2B d3ce9c61cb897ab75097c312234773e7e9d64640d9c412d76ead99b674f6e85ee1d7734025dd83323c880f785106e46aec1e8def96f1c67c09b5c35eb525ce4d SHA512 a4a777a18792d87e2ee89a6612a1ba5ddd860fad9ca0b89c6e87bead77eb6faf771b3f3be51f8166d2836c7231104e5b115a9912c938f8ae24a57987b93ade72
 MISC metadata.xml 318 BLAKE2B 53e8d0080a2643b6d5191012a6c86316d926678a85190371ce498705fc142f83d1a325a935a75f8f29c19c878a677ba96a35d5e8702a23c4f1e7ec210dbeef3e SHA512 89a0b309c4a205b97627be6c0d3fb1a280d9c4dfd2107c09854ef6a912e38e0dc2da39e0768d5103b81b72bf84eed7b1014084c52ff9482f4acc13e8d1a3def3
--- a/app-editors/mousepad/mousepad-0.6.4.ebuild
+++ b/app-editors/mousepad/mousepad-0.6.4.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.xz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 IUSE="policykit spell +shortcuts"

 DEPEND="
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@ -1,16 +1,16 @@
 AUX code-open-in-new-window.desktop 350 BLAKE2B 4463126ed3ad417e777bac8532ef55414711422d2ba567e178e264992f9fd24befd38d2f09491f2d5550f8e877b59d724cbbcbbe76427ad6e568251e07450fb5 SHA512 d2f8009e3f58e9b1c94c3a7fa89835bc0a89d86837e7b27e4b8c09f3e06fa24cd09d92a5891553af8822dafec0afed31cb7053e720b102bcc2c2d6092b116027
 AUX code-url-handler.desktop 333 BLAKE2B f396595f67fa7aec966afb1f1910adf82d8be03e935e01a6c653e1708c9a06ff55425d1ff44726a073b8f20a64219b611cd0ce689e9e6249b9e9f13f82909680 SHA512 6c3fa263d1080bd09a304e877459eeb91fe2d2197f8a0b40bacb96c26c3037bdc3df24f6713c9f6e5bd1200801512707e8dff0dc71ac8b6bc5a9f5ece06de9b0
 AUX code.desktop 755 BLAKE2B cfdf0c610aed6269e9d1dc05a26bc80a1f8d3d513e1944d09322b4ead72902b4ccc12738bbc4934155155b93880e68272307325c6290a50f39d44d9a06bf0220 SHA512 50ad4872fa5c054b28cdf07a8d6915fa05fdf240a2919a54e9488c00f735e9ac69ca3f2276ddaf89b231c98cd9fc032512ded4c5d551f5118f3b7ed42b49d159
-DIST vscode-1.98.2-amd64.tar.gz 148578157 BLAKE2B c13b525807ec9ce8a6be69da73586f8b5b0cf85be4d5ed3220deaaa22a01bc42dd0a7159ae24627681b4d717a0f3857ab9380f17198cf7b0e167fa2704740efd SHA512 46240ae53acf0dc7c1aaec962d0232096d11a1afba864994c5b18e3178c7d04040c3c6191be043cf3821af07ded200e34eff1574ea060aaacc024fe898c0ce18
-DIST vscode-1.98.2-arm.tar.gz 138905893 BLAKE2B 48183b8a4c4c676b0108e19fec5118df566ec97dabfa5b3a3e57b55e74a77d02e5d43b33172c50fc9cd371e58d39d9df63708b5ed5b4b39353cdbd6a4c16a5d0 SHA512 3c819428d3a89203bb33e29f1ea72e2d35f887bee7f35dbd181803d585dfc30e732f0a8d83a4561b197b1920db742dc30070938109dcb00d0a81a7ddb70d1c49
-DIST vscode-1.98.2-arm64.tar.gz 149345789 BLAKE2B 2fffacfe0302dcfe530595895399a5fe50fbe6e52458f39fcf1ee26ccf5043dd5874676c272587ddbf1c4f546d986cc057579bdaa5d4c181de877f0cad9f58f2 SHA512 b71e8aeaf0a21550e909c433d2758336c31d52a3f548cbd0fb72778df8a165e26653fdd5384e174237d8a9b5dd7023499fb54a3d57c050daf07303ada3f10ee7
 DIST vscode-1.99.0-amd64.tar.gz 148553462 BLAKE2B 760766116dc08f7a2f4b9d3191e2c90815e5564f60f09434e4eae66b18ef7aad70cee2833a4f2c4fa8ffceae0a2752acc7902f1d716ed17181cfc28a995175ab SHA512 5bc902e10b8da7ff35764821affa5ead1be9a442f2cdc855797c265142860d3bba8943c8dad7023bfb4fe2fbff2d4fb2e62b5a1382ae53781840a53f7fcd91e4
 DIST vscode-1.99.0-arm.tar.gz 138858887 BLAKE2B 984130897a33d1ee72816f2330684b8372d6003fc49b08f837461a6837eb86457d28e6200c230605cbaabeae3ee4b3b6af40fca0c24bcd4cf1795122263d7888 SHA512 f7b9f14927fbcb5fbe97f2305fbb84a88766a8062ede2788a308ed55c27a4ca64347604accb586a147fb30fbd0734d3006742f87ddf1be4dc32fade5189d98cd
 DIST vscode-1.99.0-arm64.tar.gz 149320376 BLAKE2B 9ee60c135d5aa1c86d5e0bde41a0d901622460be68ee6a329da3f1a627687eda0121d87f12530b78cfbb33ccf04a74be42fdcaa46d570d42360dc15984b9b620 SHA512 57a66095b150e7fc194ff84347c35f77a16870ca6775bcf76b4165d9871550fd725ee038f3201146e831d749dcfb67736b700c227c2dadcdd017e90279a559bd
 DIST vscode-1.99.1-amd64.tar.gz 148537270 BLAKE2B e582f330eaa539cfbdd7f097468fa51bd4108e13a53c7e34cafec1980ecc100893332e480458a096fb96e13477132b139e36c7cc4068f3f6f4cf15486cc3befd SHA512 33bde94cc4a10b5fd475de341bc1890a5496752b6dd59fed7f948c490fa05cf011761093933ab58af4ce0498c39166e589a4faff0af58d83ecc968b431d7fa90
 DIST vscode-1.99.1-arm.tar.gz 138877466 BLAKE2B 056e4e756fb5d1aeadc840d7757d7970a0a8e0e02e65625977cfa963bcb8bd74a2855266f5e2917552b0d1f3828c04d2e7cec9106ce16d564a6036a3d14767ed SHA512 af16f773fb5ed0fb1f5285f081f7672f5c0041ca01a72fa344b857bb2ea7d85687a333ec1758a187eb863ea1e5182124cac68859e5a57ffcf240190d071a79af
 DIST vscode-1.99.1-arm64.tar.gz 149283095 BLAKE2B 5ce50cf9aef7b7f0b7593bcf666a877a57d5be133c1458e7e1ee61c58af3552f78aafff14d0ba72135d50b08cfd3fafecc81103ac877e761b5f42c2228ec61b6 SHA512 c0b66169b79428cd91f7e4484c47bc81378d0f652d5caa9147cb522e32659ee3c687b2601c8036302da2025fe76493c2d14a79d8c13d0ae62b781db40d300359
-EBUILD vscode-1.98.2.ebuild 3209 BLAKE2B 85c101cc8d9ac0a112bf05d3d3afa7da8199f591d5cf6a57e282d41f41de8847edf2b25332f2449ec02d26d73c041d06979c7c17f9bc89eef371ed442852e372 SHA512 54061161d63591821a564cee0eb3608cbdd4f02472c77bc61ed89b30390b429ba5528e2790598c8c9b415feeda5e3132a4d736be12df7e92e5fe55aa17524a76
+DIST vscode-1.99.2-amd64.tar.gz 148557070 BLAKE2B d335c1ffbd53dec4e00e39f005e6b59e705307763dd6d51aab7bcb7aa5e608db4ff3a407fcb1815454570a5baa100714d5f73d04c5ba99a9b8c63e55e04d792e SHA512 02a51b80ff9f4e6e980978e709b8d41f82a3a6732f70800033d7c6f88758cb09d40fc3aa68aa6385431787ee7bb33019824d9ef471034bae7716efbb861b2ec8
+DIST vscode-1.99.2-arm.tar.gz 138868652 BLAKE2B d72743eb87f3613203ba18153b59dab1b939314aec7f793d86466138f5bec6b5af5e69bc6e62404f96cc73f32fda6f1732d4136b5b0fcd3e33c528a9d850e612 SHA512 313a395821e4f3a61a472aad78a6916b6d157b835296a1d12a8db8fda4c4274bf2ac338869c532943006019e9be0c537199e76f0a83570e974e162f08bbe8e30
+DIST vscode-1.99.2-arm64.tar.gz 149311803 BLAKE2B 857775f75098c934aac9f5cda9eb06cae1a973a5e46dc5d38948ed84499cfd2bebca91c4a865fa043f1ee94e512bfb629091b882054a471e2a42e9102c8c69b7 SHA512 17e0628ac10cc176bddad67ff16a64b2b006b0400514bc615ac9420606df7f4948858d9eedbf1e7441a45f9b26e813d6dfb5923400c5ee61546d3a59b93fa0a6
 EBUILD vscode-1.99.0.ebuild 3209 BLAKE2B 85c101cc8d9ac0a112bf05d3d3afa7da8199f591d5cf6a57e282d41f41de8847edf2b25332f2449ec02d26d73c041d06979c7c17f9bc89eef371ed442852e372 SHA512 54061161d63591821a564cee0eb3608cbdd4f02472c77bc61ed89b30390b429ba5528e2790598c8c9b415feeda5e3132a4d736be12df7e92e5fe55aa17524a76
 EBUILD vscode-1.99.1.ebuild 3209 BLAKE2B 85c101cc8d9ac0a112bf05d3d3afa7da8199f591d5cf6a57e282d41f41de8847edf2b25332f2449ec02d26d73c041d06979c7c17f9bc89eef371ed442852e372 SHA512 54061161d63591821a564cee0eb3608cbdd4f02472c77bc61ed89b30390b429ba5528e2790598c8c9b415feeda5e3132a4d736be12df7e92e5fe55aa17524a76
+EBUILD vscode-1.99.2.ebuild 3209 BLAKE2B 85c101cc8d9ac0a112bf05d3d3afa7da8199f591d5cf6a57e282d41f41de8847edf2b25332f2449ec02d26d73c041d06979c7c17f9bc89eef371ed442852e372 SHA512 54061161d63591821a564cee0eb3608cbdd4f02472c77bc61ed89b30390b429ba5528e2790598c8c9b415feeda5e3132a4d736be12df7e92e5fe55aa17524a76
 MISC metadata.xml 1319 BLAKE2B 02076564e7b3b37433125cdcada4445311f03699bc7adb00f60af4f73f2fa9ebb90b805885198bd7cbdc54b779fa259d56c3142b30d595eaed278130081d8ca7 SHA512 d0922226274b1686ea14c8ca4e5835f6b30399bd71372bde4ac7e4eee4301ccca7fc32472d6ac0bd598b0459ebc33a59d346a21f5fa2d39cac4ed197682354e0
--- a/app-editors/vscode/vscode-1.99.2.ebuild
+++ b/app-editors/vscode/vscode-1.99.2.ebuild
--- a/app-editors/vscodium/Manifest
+++ b/app-editors/vscodium/Manifest
@ -9,6 +9,11 @@ DIST vscodium-1.99.02289-amd64.tar.gz 135627619 BLAKE2B 114f9a71e40667a729b5e268
 DIST vscodium-1.99.02289-arm.tar.gz 127945686 BLAKE2B 5b24a3bf4a18138db58ab34b6709df5ffbe6713058129b8485284a31ecbb1853fd66cb9c9443610e90b8bb8eb2a2e73b3f8b211135a1ac5cece6d9cc69064adf SHA512 ac934e8e664b0a8946eb27e248f66be330dd5e197b5d78e1f5615fe6b6b4c4504a3ee5b15df02c6d4e68644fe0daf08a92dee8af4709cbce1691560725b7826f
 DIST vscodium-1.99.02289-arm64.tar.gz 138216085 BLAKE2B 1d7f5ca0504cc007224375b332ebd055986d45695c2a6f94aea8d90608474b071ab1099b10a33d7010d6de6480e40ddfb2d4530174d339d85d6cb294489098da SHA512 c7f5376c70780253eb98e600bc236d219f11c8cbc5a0f4af08a842006239aa829a685ee855b8ae15a13e0d40ccb8bf60821a8c3b2cec207ebf0214f93f1a54c6
 DIST vscodium-1.99.02289-loong.tar.gz 140833908 BLAKE2B d7fce53afbe06e1b7efb1054e5a83820d06aaf95e460129e161c68a1a2bbbbf7e04fe7a8c1564ec37658f71e4d5ee0bf2c708b9b5b6314f05eb78b39bbaeeee1 SHA512 6d37821f722b706e3c4d0e0443e99dd691ebbf94f71e67157c82d30ce909158d31495c3ece8bb056f2923a31af70f1ee9c766cf7ac4f87469457e617da35308d
+DIST vscodium-1.99.12392-amd64.tar.gz 144114153 BLAKE2B f753850452e2d7b5a2f21170e1ea3c19be775b0ad98713329a9d57a3f8dbbdee4b1e1232fc6e47af9e7aaed9c4222f91b9412f0f4c8f3dfd874b702766465352 SHA512 f4a1e99ef26beb9dd06052727c97415bee1a0c6556d0463eaf1873b4ed881aaaa0311d18d1da75fbf0f6cef610e53d045a9edf834be07860604c9d20a0f0df10
+DIST vscodium-1.99.12392-arm.tar.gz 135827933 BLAKE2B 129912cdacc85ae55a28e991482194f32f0b470995e9b4a03870daa95ec24aa696b36843b6f81a48dc124d8c7ba67dfce02d33e7b5586b5382aca6a193cfc955 SHA512 63b1ec6e984ad06525d1de6ce6c17c4d2bf23408ed06f6fb66a09f1b9947284f05eefd933f03f7f09150cebcb280d66af0d947877196854a4ff9608c18030ba6
+DIST vscodium-1.99.12392-arm64.tar.gz 146250957 BLAKE2B 810d0d6339f8979cc17b2a6efa9be1792e6cb4cc6c73e95c2b34dd5afa19752bf0baf6dbf4e7713a37863a8fe76593bae9af4cb5c32e2341a6b0c6631ae83cd1 SHA512 279cbe6be66f3bf40ee5274a62796fbb24d4f92320e9c771192d10fa1fe8b1082abfccde5d43157ecd2681480849627a7aae2c42183760f854c90a5c26ba9325
+DIST vscodium-1.99.12392-loong.tar.gz 140834977 BLAKE2B 49cec44e7a7649c55b0e93536fe4618a3406d40517b072deb83f85e28a45df3a9b369cf6e8f9d0a797a455905f56f0ae416cff4352443d39746a10c19946cdfe SHA512 68669ed860c242c8d13d47d1794fa44039fb4128784fb47d2a644024a5d448885d2e12d74522e9bb3bba45947d366db6f4bc9b8bf04f56198a7f0f57f111d870
 EBUILD vscodium-1.98.2.25072.ebuild 3112 BLAKE2B f29aaf3d218fc4da3950985570aee905a9ae6e3d0d0fd0b1f7af270497893407813a2b2295f40fddb92766865747e072cf59ae697d6a2c41a80ddf0762ecfcf3 SHA512 29de6bc03b2ad244f6350af7173e4e19049124b99df0355e0d060b8a11160f6a9d92abf901e3910811c69847e156c777b8d40b4704475f95ef6c0aaa04ea22bc
 EBUILD vscodium-1.99.02289.ebuild 3112 BLAKE2B f29aaf3d218fc4da3950985570aee905a9ae6e3d0d0fd0b1f7af270497893407813a2b2295f40fddb92766865747e072cf59ae697d6a2c41a80ddf0762ecfcf3 SHA512 29de6bc03b2ad244f6350af7173e4e19049124b99df0355e0d060b8a11160f6a9d92abf901e3910811c69847e156c777b8d40b4704475f95ef6c0aaa04ea22bc
+EBUILD vscodium-1.99.12392.ebuild 3112 BLAKE2B f29aaf3d218fc4da3950985570aee905a9ae6e3d0d0fd0b1f7af270497893407813a2b2295f40fddb92766865747e072cf59ae697d6a2c41a80ddf0762ecfcf3 SHA512 29de6bc03b2ad244f6350af7173e4e19049124b99df0355e0d060b8a11160f6a9d92abf901e3910811c69847e156c777b8d40b4704475f95ef6c0aaa04ea22bc
 MISC metadata.xml 1563 BLAKE2B 63d5132bcea2c419facf49b2d644bf1f58f44da333adb8270aedaaa289563ff5d116a0700df1306bdf1e7d2628f72959b8f18540486d3ce56bfe67adb925d8fe SHA512 ea75764cc70ac6a9452600a106de3784baaa9f84fa5b1021cea2be073636fb0fc8c6904a7db2a560ccb2bba491d76125e5996e0aac28ea11cd039ae16972e595
--- a/app-editors/vscodium/vscodium-1.99.12392.ebuild
+++ b/app-editors/vscodium/vscodium-1.99.12392.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"
+}
--- a/app-editors/zed/Manifest
+++ b/app-editors/zed/Manifest
@ -1,4 +1,3 @@
-DIST alacritty-5e78d20c709cb1ab8d44ca7a8702cc26d779227c.gh.tar.gz 1647703 BLAKE2B c217eecfef23cc8a5c9724b635f459994b5b6ac5393e98538b1738af49531e962c99e95baf1a823953ced5eabf5df5764b1cc54b3d928249cfde6991cf1dcec2 SHA512 5534e9e33adad42276ccac485cc228d0922ac80e0b9fa99d536baae2d8163eb3796d10b88c845132f8a220461e2d35fbb9e19f99b0b0a10d9a61c1d12b403500
 DIST alacritty-828457c9ff1f7ea0a0469337cc8a37ee3a1b0590.gh.tar.gz 1648143 BLAKE2B c3d7c72dd994ca62b1d5746ddf8f8a11a71cb59a7bfe36770b5b757889f0f1660ad628826a78d3a297ce937845c6a157062720a07bdc0cccf0547aacfa07f415 SHA512 6c2a67b4bed4b0c76217021fb90be4b00b89419ddd227166c062f09fa6cbfe85987f4bb2aa6bb8745560ee2acb47cbdd7ea248e486c4168ff5e611c9c3166bc4
 DIST async-pipe-rs-82d00a04211cf4e1236029aa03e6b6ce2a74c553.gh.tar.gz 5575 BLAKE2B bbad7d35213afb7dc3eda1f72555cb5a61bc61acfa1b91771a528773c468629831f62bd26f9bdb345bcf94950892a294ce71cecc8552660cda5c28de6906764a SHA512 86b13e6acbc1d04fd386b10be1e8f1f917f0ad12a702e9709526f798ef45ee389f4e14bb4ff16d0f1b14b278c76b75b5bf925581af402b350dc933a96b019460
 DIST async-stripe-3672dd4efb7181aa597bf580bf5a2f5d23db6735.gh.tar.gz 1057821 BLAKE2B 93218011a1f75acedfb9d4cd65fb3016b4a604926de173b4ce3839a562ec1483c3a7aa2b4c5f77fe50ac648eb9dfb076d19a7c736426136fd5e0f0d3f80d9541 SHA512 6d7765423294ab80aea5c7889bdfe20fab5384ed7ea9d54fde8208879a07b62425e71e77ed0fb182c59ef473f693181a7ed99925753bf6e672b4a729c6454700
@ -8,11 +7,14 @@ DIST cosmic-text-542b20ca4376a3b5de5fa629db1a4ace44e18e0c.gh.tar.gz 180043 BLAKE
 DIST cpal-fd8bc2fd39f1f5fdee5a0690656caff9a26d9d50.gh.tar.gz 120253 BLAKE2B e40b9097384b66454b3250a5fdea79c1db3453d08c96bf83a7f8c2aedd361bbd23e3a74ac9b542e284f642605b03180b5ecf6c104772b9fedf79c26709f42d4d SHA512 8bcc10b1e6d278034c2f999bbb858b2d681862c9d4170febde4ab0026a32dae8894fbe7a029c5c6f444ab7bb02b1afea33947919f571c64400642efa334a5452
 DIST dap-types-bfd4af084bbaa5f344e6925370d7642e41d0b5b8.gh.tar.gz 75085 BLAKE2B d6f8d97ba47519d08c7ddbf9b1e488fb195c3fc3161870e46287b1564ae5adcc652686d5b6ce1beb55589661cc55d06835716650278c9378f5705f262c1fa948 SHA512 ed0b8969f9d4116b1a83a3d89f790c4e8351e5c759a95e30f57f8b144e23d6d9737730c0e0f88a3b5e0a62c12428c543024e9f184029767975d2b94870155480
 DIST font-kit-40391b7c0041d8a8572af2afa3de32ae088f0120.gh.tar.gz 1289463 BLAKE2B f35f28341ad40c77434f2765fa6ab546a3b1eeb950dd3f92ac90676f0005167aa84772d62852c45e2c24511f5e79cc8eff7844e5382bb21212c8f08cedd890fd SHA512 c6848000f0ba629b9b001618f06511882832f0334095606c7d6d4929f56a9d78fbe2db04411732619aafbc128cdaf44e7a6d32d351d0577b439cf2e0fa343682
+DIST font-kit-5474cfad4b719a72ec8ed2cb7327b2b01fd10568.gh.tar.gz 1289459 BLAKE2B 1d2ad876cf50b33bcb6370a21233d2ac0ba352bedb65638df714c3fa51c483dac307dd44044b670d278966c8bf0c3d1037e989fdeeac7472bfe055718b88216c SHA512 cca26152c19408b42c638bd1f8f64d4048799cc0a51dd3ed2a44da8e8f92dd9b9dd5bbc31ca6ac37fbd809af61f539e5d7f5ab6144bbdbfb3703e62f3c3f1d61
 DIST git2-rs-a3b90cb3756c1bb63e2317bf9cfa57838178de5c.gh.tar.gz 257303 BLAKE2B 0104bde155d4a8bbb99bd0632cee0d6df29c8091296fd85bec146b2983005f02552d74022ff1f0ec30c57f175eeffeffe9ec5596f1561ac83264b9126b9e7d66 SHA512 3f8bb1c8dd65de41b9ecc061a4eef67d70194f1c40bb3c74832ce4d3a4e20b37c3a7279606a2602394fff49524596ea9fda3694dce602b9e951ca8bba3c44162
+DIST livekit-rust-sdks-80bb8f4c9112789f7c24cc98d8423010977806a6.gh.tar.gz 6248687 BLAKE2B 9f3d1957490cec12cf0864f68164d2a614a2f617d15762fb2937dee9ceba093d5c7331dba214f883f933ba2a518082a4d15d2e547d67a7f8327882605a61f594 SHA512 14d3ec4a073c2fdecdc08984950c4bcf0da2efd1f9bcc1ab8c260cb8a2654ceb6dd76814090a61984cb06c4e46667cd056f47ae8ceea2094335e1bbd1e400c71
 DIST livekit-rust-sdks-811ceae29fabee455f110c56cd66b3f49a7e5003.gh.tar.gz 6266800 BLAKE2B 2fe47ce962213ba34b7709e35154d67a1648f1d0f2d84b50fa8f33ad58cebfd696ed7bee63a971dff0a280a613e961dcd65a7ee6c092c3e8c303765e025d1599 SHA512 263be325b1315bb323b2cdf66c8f481e7cdaaa62fa5efc3171de0934b203a2693cdf70dc7d9b75ac6d51ac0ce80878b199bcab27bb242a2dafb1c48e32de47be
 DIST lsp-types-1fff0dd12e2071c5667327394cfec163d2a466ab.gh.tar.gz 70193 BLAKE2B 859cb326f358cb22f5ac63999808a2508ac78c461ca664b5f24b315473c1602e51c771b26edfdc5c09935d77ca0f7ed67745f953ba4e2acb4b78a7a89367f8d1 SHA512 71677cf3a0a3c21417a8d70f505523805c4703789f95902262d09e9da26e21321b11e833e321e482daaec3c2629eb4fa64aa4f8dfff27b08490b82250b96341e
+DIST notify-bbb9ea5ae52b253e095737847e367c30653a2e96.gh.tar.gz 104977 BLAKE2B 9ac63358c0a7dcbb683e55cf240b48e25b6f076c6d5371c271c551d836188749e9705f78725e08ab314068255e45866bd315247713894637661a07869b56d455 SHA512 e7032771aa7ffb3d65c559ffdf9ff1f39558f5c269b5c1242dced7aef5e3388b366c8bbbd89f80c649ab7d93b38ba8314d0d35205ce699f2166a908504c541a3
 DIST nvim-rs-69500bae73b8b3f02a05b7bee621a0d0e633da6c.gh.tar.gz 47933 BLAKE2B 4fbb0f1bd14fcbc708a52357c03574e7fe864f4a33fd7202f13bdbc1527ecc4f14377994c2d1bab9806ca921cab9a6287abd91e70802bfba4526f12b71587238 SHA512 ff75686616e5e2fc2a8629c5a03922f5a97963da42054bfe2c1c8f54edccf7b2a0f1d624460e4f51a04ee6c228b174c7308a68ff504ea5efe10df0edacbb53de
-DIST oo7-9d5d5fcd7e4e0add9b420ffb58f67661b0b37568.gh.tar.gz 111786 BLAKE2B ee432f892a55a205b7eea8adadb2540e9f365bec1aff3d81ddaf9ca9e7924645ddd36abcd4d3004bec49ab340e76b81c891e1aaf81ed689d27d19a4dcd620d3c SHA512 f1e7dbdfef0e786663d5086faa4ea46db0e7aa09e731d805a566d31429f0d216224ce1c2c49038a923f2434a6f8275ec2a6c6ade32bbd36efca78e47eab0aa64
+DIST nvim-rs-764dd270c642f77f10f3e19d05cc178a6cbe69f3.gh.tar.gz 49979 BLAKE2B 63c2e181cdce292349f07375d5b23e30f0a4de1f872040d3a572f228147d9812bf94ab9799889d89ec0fb5de2fb8a46a8a92af392d65fb221dc91d1954dbcb20 SHA512 1d62d2bd4385dfb15e4aa52d5b823472011ea29a5faf6cc51a01b5c281502aaea78ea103838a4af15f8c36da2d26964f5fad5645cd033c761691d7bf8d2c1fb6
 DIST python-environment-tools-1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0.gh.tar.gz 1480973 BLAKE2B 72d44efb454a6be24c9e6b5ec7a0d4fb80becc930b53cf6e148136829006cf74e816e0198b17a0fdde0f6bb7206a3ab0150192b41f022fb5b57db253022c4d12 SHA512 5b885f19a9be4deeb2f13b2a25c700df6ee2e45430643d5d9f00473c16b2fc2001caaf5c69502a20f752a52bed79b19120d31efd64701be2aa21ff08a5c8c137
 DIST reqwest-fd110f6998da16bbca97b6dddda9be7827c50e29.gh.tar.gz 222254 BLAKE2B 59d486fa9e4dbe67e1b45efbeb39f17d9010aa97fe57467f66cefc231291197dfa6a5e8ca313faf3d727b1bcbffba79fbca141efc190db1c2928f13727241f9a SHA512 f4e486682469a97dd2db9e594ef053e10abcad80afd93e86d288a5e364518a15ed6446e2cac43abd9040207c34a5a52f3c1ff1a4190604d914dbd278bc7d5a67
 DIST tree-sitter-git-commit-88309716a69dd13ab83443721ba6e0b491d37ee9.gh.tar.gz 73789 BLAKE2B 0c87bac702bc3b88b9846944a8880b619be6aff3206a339da7a74ed81ca64c033ddf9a0c13a8320b6897dc6de225c8568661cb29a82cf445c8b6818c904f2395 SHA512 53141c8a98a22e031c44d158dbe0cbb7a6f41bc7e762b9b22c86db3e861f7b43771d136f958f6c207f621ba074e15a4fc37aae29ec7c4a6468a2a7ceae67eaf2
@ -21,17 +23,19 @@ DIST tree-sitter-go-work-acb0617bf7f4fda02c6217676cc64acb89536dc7.gh.tar.gz 1641
 DIST tree-sitter-heex-1dd45142fbb05562e35b2040c6129c9bca346592.gh.tar.gz 33900 BLAKE2B 2e7bbd467a4e457211d032492daa180824d9aaf582c0ae132eeb46ddb6016b80aea289e9922542bc9744f4e16c1e5d8d4d3ebc1da4e39a87e9f9eec61e0a2ab3 SHA512 6fb1c269e648231c5453d6dea9c6b6a9f6109328bacd5fc509a4707f41c06ae3d753f7635deea7588f86df1fa7cf630ab6c9051b8d29d359b25e83be07c0b6f5
 DIST tree-sitter-markdown-9a23c1a96c0513d8fc6520972beedd419a973539.gh.tar.gz 418620 BLAKE2B 42c4a9029311aaff11932e6ee426494eb833e9b353763dd45f49fcdb94b297eef65e148e789681d628d80e6985516e8d622eb6e4744814cfa44ff53bea9260b5 SHA512 f1bc7c18bd0d72addb4e73a6e55f057cd6e104a3fb5c970d5036708e69e682d7288e6c14a7040c3f5213e18d798a503fca703c28f89627999e13269749300209
 DIST tree-sitter-yaml-baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a.gh.tar.gz 145319 BLAKE2B ab84051fd4a487f54295b112e1f03ac85b8399d98dd727297960ea240ffe8faa8fc8363353a56adaa411accc57b56d1ef16a5ed612e143637ba9682fa49b332c SHA512 d9e143449cdbe2b092faeeef82d0c9029c7b7c473539db91d22511a71d35740eb3d054a62b20cd9f178e2d1f52d3dddae91fbd5fc5516cf1a047f1a6b9e3b2de
+DIST webrtc-b99fd2c-6-linux-arm64-release.zip 115706228 BLAKE2B 61a92092beb2680364e10f7d44b83382de1495af8f18decedb7e76fd54a997726c364615b45c5ccb228e3c4e2977da9ee2ae96a696d6d3b4701cf3079c60d15b SHA512 36f8de22f1660508bbfe0cdf468b259c3924668d7c366c4f1b484c94fe6607d059aef15c3a893dd1ede6137e4518e9faf4ff0056c003534175abcbab52fd7ffa
+DIST webrtc-b99fd2c-6-linux-x64-release.zip 100706879 BLAKE2B 2f1b8bc05172bbfdaaea9580a5254797f94614060aa4159d322ea38667426025ac2e846a7c6fa4253950d84653559672fe78a8b19ddea6f66dd8560e1737cb0c SHA512 92a45c3c5d89fa5f2e1b5bd70b1e09ce9c7aefbdf8cf8d0e25347708955f4d8aa8c0d9ec4a857cacf6096603f59a8f08729a4088410756048288e263be84a952
 DIST webrtc-dac8015-6-linux-arm64-release.zip 110506896 BLAKE2B 53f6f7607286a51837bab0da1f170d7e17588e7139f1b762e1a270d2e249ad23fefa11a4f240d0302b1e9ea69d7e58e1998a48d1772bea26ab71511336d2980a SHA512 120770d5cc00d31217234437d839d9fc9c06e19cdec1126bf42c115aa658983a5960071999572acdfb74e5d71d6ca808d4055c3723ca190dc3289e01757b88cc
 DIST webrtc-dac8015-6-linux-x64-release.zip 95509348 BLAKE2B a843a9438d94ec09345244c69ffa84de23643133c3c1119622dcbf56d08652dc09295f505a80b879b3ef64fabc370353d20c3ab8b2627ccd8bd26c6ec7f1a76e SHA512 f88de80dbc1da6618950aaaf733a0dee3bb7c7a923535b7f988e5f8d48fc1c1b501e7bf1d6d354b957e840bf648bfe979dca5a6f50a307636b58c71a94b7fe46
 DIST xim-rs-d50d461764c2213655cd9cf65a0ea94c70d3c4fd.gh.tar.gz 47427 BLAKE2B e5b4d059573a97fd400421ca06e5dd322bb4f61a75edcf8264e4b1a10cd4c3358ed0973022d97d619a4bd675ab4066e7122c42625c163da19cc938a8214ddd6b SHA512 3766382de39ad7e6ac7bfb7a583be9eb47dbb8a6190c53ac726f83cbd27a15b2ea4b166fd52e3b0bf393cedfb553a429684a8be7ed3a50e69376c5ae615c6d8e
 DIST xkbcommon-rs-fcbb4612185cc129ceeff51d22f7fb51810a03b2.gh.tar.gz 58121 BLAKE2B f45a05820f40039f57c341d2c6cf3f375bfa4356e5f679a9f6fc6fdd764f1214375356ca3c7216e762735049f37b39d520c778732639365975a90369b38edb94 SHA512 513edf39326231f938747f3d5f195df89540cdf0e37867c2346378fb2bb7f0030bb83ea0422e4ca44a026a8eafa94ef6c4c07af3974e56a2c77b18e0ef9197fe
-DIST zed-0.173.8-crates.tar.xz 105781268 BLAKE2B 26ff8b1a6c567391b7c1456cf79933a15df096fcb9a48aa28d5e2f3dd14d52d139e6a3c71ba14846d2bd036e72bc3d5c6e1733c12b179a1823c9580e5abe1026 SHA512 78dda7d4a74da881bc145bf404091588e9c88311c196b29c07d138ae5d354f396fe824eb547e2fc1b3d05906dcef767a56e6f72c5126443122e3ed482a71b06e
-DIST zed-0.173.8.tar.gz 13710072 BLAKE2B 78b9e1cbe2eea13fb290d273c7e7a6aaf4354619b5b9bfec20417becfd794d1767b1cd6115a3e614723599a9b0573a7bb56ec815c8a4740e730fdd7c07f523fc SHA512 3b2b9a502cfc1a49979acd1058a68ab0283d57d697d793c4dd18fb1e0a0352ed12ec3204e138f8e866f1e4ea5fbcedce6580af41f0c403ff56b622ca7cade6d0
 DIST zed-0.175.5-crates.tar.xz 106296404 BLAKE2B ad9617aae948ebcfa8998d939ecf1fbacead59180335c9385a5c5ccc2fb84b1037debb9afc5afe227d9ecaa3b6ede0a0f47b75c785cba9c863ae0a18f42792b3 SHA512 b28d5ac7ae4d8de5d36c79928ed509c66555d1c90c34623ec3d582d13b8ced2ec35e6ff257823fa684c8c4838c30b064abaf9cebecb9e0e267ee0e8c0fff0e0e
 DIST zed-0.175.5.tar.gz 13720176 BLAKE2B 9738014779ae2998f2abe9fefc155f29d2003a156f8af8966b3329c6ca68560295b06e9e1e6bb6010f05439e1b3a22404140c882521a0f5d67ef25cd02d96913 SHA512 d97510617cf5baf2ad7686daf7450b3cf7d15c2f675ea20638746dfc79cf9ccfac460204e9b810b13308304eb8f65d26e0129617c419aef71e9ae7e350dafa56
 DIST zed-0.179.2-crates.tar.xz 115485988 BLAKE2B 6ac876984964236d936dd727fdfb4a18e7a0be9d2ff2c8b02dc04b4a077e4203bd05160fdec3ed75a857a9928a533708f06bc06f45f275fddb14a8cf81bda504 SHA512 49e115a1382447d61204ce29c4b93143ab8e61ff9ea251494be65ccc8bf896522f9b8518a22b9329d77c8ccad8bfabf9772a9c032f4bc0a1154607184518ce5d
 DIST zed-0.179.2.tar.gz 14067632 BLAKE2B cd99d9d2629bf6621ebebea20eae1d9fe94b177c72ec81e3e84010336fd4fe0a3c3ccff254cbc0ba562cdd76da0bbf3573c803d7198e2b127df742333bf7b5aa SHA512 7b57dadb392e3b2f3a85094a59c9befc7503d241c732c15cdc2b382aa2a2e301ad1a7c834ddd2a9d358b02cda8a0ffb3e24af163f9b21f5ed4c1bb02b447e478
-EBUILD zed-0.173.8.ebuild 12722 BLAKE2B 9017833eee8c8f3c62716fa1a08291f8fdaf78ff376ceb5e007310c681d8bd32b299479ffe5350dbb56eace043c68f6244ca6357ef8ac643f5c31516799750e6 SHA512 39a9ed13b41108d8076a55cb5f569ac2e27431a66ab64caa40f17ffb949eabf6a507b8431ffa730b6115ec5d548849a3f35603ac3cc44edda474cac98254d9c4
+DIST zed-0.181.5-crates.tar.xz 116473092 BLAKE2B 2e567e9cf5cd5488e4eacb674c699b8615e126617196595e1d51119658db770c7127ae7395106e0a4cdba51696e4096f095c4f511beb1f48090c864163be6473 SHA512 094d55f8e7281b41fd1c65f31ed8e4b107c98903f79e4377127e24fa2eacb3afad3f559ce790b1caba597fa149b21af43a64ad7ca657761531ddce971baf1eb3
+DIST zed-0.181.5.tar.gz 14206921 BLAKE2B 2ad921f0a944de9dd1428730258b37da5820efa62037fe5296adbd40c7f85b7459e8a9b69c4a3018e0552406be98d218bc75bd6570f5993f1cc618b4c23f5c97 SHA512 45bc1b282e6a6e8c8756932a9ae381038a23e3302ced527dfc9fde9469bea2b53fef1c575ffa481c9f0434426e40ca6be6d9239014d57cc7da53120b2f576e21
 EBUILD zed-0.175.5.ebuild 12560 BLAKE2B ad00302f1dcf2250e31b53fdaa78ff34ab237753692320ca1bb84cf0df193f1c901dddc2271d17b839f2430e5b488c2b840bc08c517b49249b4399cd26f301b8 SHA512 15202afa76c970f09c9fad5817eb52219fd7c8fb3084fbc059fdcf4c7b4f1e000a6f40af3fae2516b260165e77a677a948935de57c4bca8667309f7f15168a19
 EBUILD zed-0.179.2.ebuild 12627 BLAKE2B d00d5e83bc21e38fe52f42169feeff18d66d4667e20e4066453e1322f318486c71dd22ff68062d8320a9b912a6c28364de415395323dd50e6ea66486043fe4e9 SHA512 6ec4d0847dd2b32d0e463931289bdd62d04a107f82fae7d04ed1f973685dd8a6f594adb2f330037271a58efe33fd50c0da5cd846ade67f17d5beddaf03a9a217
+EBUILD zed-0.181.5.ebuild 13234 BLAKE2B e5e50514da01a7095a6016492b8898a307485c77fc3ff22849c54156b605896436732959c8900890cc0f7c133d4f0b8e0b43bc3b007944e5e27312cb11bc420a SHA512 99e8443f1afb3db9b0b257861614e251210060736519b1650333f66e04b55097e8cbd9a8ad02d9f98e48bc4b5ccdb85706640b02c0b5bbdb087b7513abb1bedd
 MISC metadata.xml 575 BLAKE2B 3793593f06424fd3986e23cd148b663bfcbf5c1dc0f76847a3991bbdde8badfdc863d0994ba1b59fc0e886243ded4e4421da4b4bf6d2951887801f78b0d6d290 SHA512 b0660a1a36d59dea6b9a6e25a239f0484e1cbf98a6569dd17d6bae1145f12d7e3ac2609bbce32627bf7ca6161581cd82c087d7deb17dd662c23bd81db6465a02
--- a/app-editors/zed/zed-0.181.5.ebuild
+++ b/app-editors/zed/zed-0.181.5.ebuild
@ -1,7 +1,7 @@
 # Copyright 2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-# Autogenerated by pycargoebuild 0.13.5
+# Autogenerated by pycargoebuild 0.14.0

 EAPI=8

@ -9,26 +9,25 @@ CRATES="
 "

 declare -A GIT_CRATES=(
-	[alacritty_terminal]='https://github.com/alacritty/alacritty;5e78d20c709cb1ab8d44ca7a8702cc26d779227c;alacritty-%commit%/alacritty_terminal'
+	[alacritty_terminal]='https://github.com/zed-industries/alacritty;828457c9ff1f7ea0a0469337cc8a37ee3a1b0590;alacritty-%commit%/alacritty_terminal'
 	[async-pipe]='https://github.com/zed-industries/async-pipe-rs;82d00a04211cf4e1236029aa03e6b6ce2a74c553;async-pipe-rs-%commit%'
 	[async-stripe]='https://github.com/zed-industries/async-stripe;3672dd4efb7181aa597bf580bf5a2f5d23db6735;async-stripe-%commit%'
 	[async-tls]='https://github.com/zed-industries/async-tls;1e759a4b5e370f87dc15e40756ac4f8815b61d9d;async-tls-%commit%'
 	[blade-graphics]='https://github.com/kvark/blade;b16f5c7bd873c7126f48c82c39e7ae64602ae74f;blade-%commit%/blade-graphics'
 	[blade-macros]='https://github.com/kvark/blade;b16f5c7bd873c7126f48c82c39e7ae64602ae74f;blade-%commit%/blade-macros'
 	[blade-util]='https://github.com/kvark/blade;b16f5c7bd873c7126f48c82c39e7ae64602ae74f;blade-%commit%/blade-util'
-	[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;811ceae29fabee455f110c56cd66b3f49a7e5003;livekit-rust-sdks-%commit%/libwebrtc'
-	[livekit-api]='https://github.com/zed-industries/livekit-rust-sdks;811ceae29fabee455f110c56cd66b3f49a7e5003;livekit-rust-sdks-%commit%/livekit-api'
-	[livekit-protocol]='https://github.com/zed-industries/livekit-rust-sdks;811ceae29fabee455f110c56cd66b3f49a7e5003;livekit-rust-sdks-%commit%/livekit-protocol'
-	[livekit-runtime]='https://github.com/zed-industries/livekit-rust-sdks;811ceae29fabee455f110c56cd66b3f49a7e5003;livekit-rust-sdks-%commit%/livekit-runtime'
-	[livekit]='https://github.com/zed-industries/livekit-rust-sdks;811ceae29fabee455f110c56cd66b3f49a7e5003;livekit-rust-sdks-%commit%/livekit'
+	[dap-types]='https://github.com/zed-industries/dap-types;bfd4af084bbaa5f344e6925370d7642e41d0b5b8;dap-types-%commit%/dap-types'
+	[font-kit]='https://github.com/zed-industries/font-kit;5474cfad4b719a72ec8ed2cb7327b2b01fd10568;font-kit-%commit%'
+	[libwebrtc]='https://github.com/zed-industries/livekit-rust-sdks;80bb8f4c9112789f7c24cc98d8423010977806a6;livekit-rust-sdks-%commit%/libwebrtc'
+	[livekit-api]='https://github.com/zed-industries/livekit-rust-sdks;80bb8f4c9112789f7c24cc98d8423010977806a6;livekit-rust-sdks-%commit%/livekit-api'
+	[livekit-protocol]='https://github.com/zed-industries/livekit-rust-sdks;80bb8f4c9112789f7c24cc98d8423010977806a6;livekit-rust-sdks-%commit%/livekit-protocol'
+	[livekit-runtime]='https://github.com/zed-industries/livekit-rust-sdks;80bb8f4c9112789f7c24cc98d8423010977806a6;livekit-rust-sdks-%commit%/livekit-runtime'
+	[livekit]='https://github.com/zed-industries/livekit-rust-sdks;80bb8f4c9112789f7c24cc98d8423010977806a6;livekit-rust-sdks-%commit%/livekit'
 	[lsp-types]='https://github.com/zed-industries/lsp-types;1fff0dd12e2071c5667327394cfec163d2a466ab;lsp-types-%commit%'
-	[nvim-rs]='https://github.com/KillTheMule/nvim-rs;69500bae73b8b3f02a05b7bee621a0d0e633da6c;nvim-rs-%commit%'
-	[oo7]='https://github.com/zed-industries/oo7;9d5d5fcd7e4e0add9b420ffb58f67661b0b37568;oo7-%commit%/client'
+	[notify-types]='https://github.com/zed-industries/notify;bbb9ea5ae52b253e095737847e367c30653a2e96;notify-%commit%/notify-types'
+	[notify]='https://github.com/zed-industries/notify;bbb9ea5ae52b253e095737847e367c30653a2e96;notify-%commit%/notify'
+	[nvim-rs]='https://github.com/KillTheMule/nvim-rs;764dd270c642f77f10f3e19d05cc178a6cbe69f3;nvim-rs-%commit%'
 	[pet-conda]='https://github.com/microsoft/python-environment-tools;1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0;python-environment-tools-%commit%/crates/pet-conda'
 	[pet-core]='https://github.com/microsoft/python-environment-tools;1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0;python-environment-tools-%commit%/crates/pet-core'
 	[pet-env-var-path]='https://github.com/microsoft/python-environment-tools;1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0;python-environment-tools-%commit%/crates/pet-env-var-path'
@ -60,25 +59,24 @@ declare -A GIT_CRATES=(
 	[tree-sitter-heex]='https://github.com/zed-industries/tree-sitter-heex;1dd45142fbb05562e35b2040c6129c9bca346592;tree-sitter-heex-%commit%'
 	[tree-sitter-md]='https://github.com/tree-sitter-grammars/tree-sitter-markdown;9a23c1a96c0513d8fc6520972beedd419a973539;tree-sitter-markdown-%commit%'
 	[tree-sitter-yaml]='https://github.com/zed-industries/tree-sitter-yaml;baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a;tree-sitter-yaml-%commit%'
-	[webrtc-sys-build]='https://github.com/zed-industries/livekit-rust-sdks;811ceae29fabee455f110c56cd66b3f49a7e5003;livekit-rust-sdks-%commit%/webrtc-sys/build'
-	[webrtc-sys]='https://github.com/zed-industries/livekit-rust-sdks;811ceae29fabee455f110c56cd66b3f49a7e5003;livekit-rust-sdks-%commit%/webrtc-sys'
+	[webrtc-sys-build]='https://github.com/zed-industries/livekit-rust-sdks;80bb8f4c9112789f7c24cc98d8423010977806a6;livekit-rust-sdks-%commit%/webrtc-sys/build'
+	[webrtc-sys]='https://github.com/zed-industries/livekit-rust-sdks;80bb8f4c9112789f7c24cc98d8423010977806a6;livekit-rust-sdks-%commit%/webrtc-sys'
 	[xim-ctext]='https://github.com/XDeme1/xim-rs;d50d461764c2213655cd9cf65a0ea94c70d3c4fd;xim-rs-%commit%/xim-ctext'
 	[xim-parser]='https://github.com/XDeme1/xim-rs;d50d461764c2213655cd9cf65a0ea94c70d3c4fd;xim-rs-%commit%/xim-parser'
 	[xim]='https://github.com/XDeme1/xim-rs;d50d461764c2213655cd9cf65a0ea94c70d3c4fd;xim-rs-%commit%'
-	[xkbcommon]='https://github.com/ConradIrwin/xkbcommon-rs;fcbb4612185cc129ceeff51d22f7fb51810a03b2;xkbcommon-rs-%commit%'
 )

-LLVM_COMPAT=( {18..19} )
-RUST_MIN_VER="1.81.0"
+LLVM_COMPAT=( 19 )
+RUST_MIN_VER="1.85.0"
 RUST_NEEDS_LLVM=1
-WEBRTC_COMMIT="dac8015-6"
+WEBRTC_COMMIT="b99fd2c-6"

 inherit cargo check-reqs desktop flag-o-matic llvm-r1 toolchain-funcs xdg

 DESCRIPTION="The fast, collaborative code editor"
 HOMEPAGE="https://zed.dev https://github.com/zed-industries/zed"
 SRC_URI="
-	https://github.com/zed-industries/zed/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/zed-industries/zed/archive/refs/tags/v${PV/_/-}.tar.gz -> ${P}.tar.gz
 	https://gitlab.com/api/v4/projects/35204985/packages/generic/${PN}/${PV}/${P}-crates.tar.xz
 	amd64? (
 		https://github.com/livekit/rust-sdks/releases/download/webrtc-${WEBRTC_COMMIT}/webrtc-linux-x64-release.zip ->
@ -90,14 +88,15 @@ SRC_URI="
 	)
 	${CARGO_CRATE_URIS}"

+S="${WORKDIR}/${PN}-${PV/_/-}"
 LICENSE="GPL-3+"
 # Dependent crate licenses
 LICENSE+="
 	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD CC0-1.0 ISC
-	LGPL-3 MIT MPL-2.0 Unicode-3.0 ZLIB
+	LGPL-3 MIT MPL-2.0 UoI-NCSA openssl Unicode-3.0 ZLIB
 "
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="gles"
 CHECKREQS_DISK_BUILD="9G"
 CHECKREQS_MEMORY="16G"
@ -114,7 +113,12 @@ DEPEND="
 	dev-libs/wayland-protocols
 	dev-util/wayland-scanner
 	dev-util/vulkan-tools
-	media-fonts/noto
+	|| (
+		media-fonts/dejavu
+		media-fonts/cantarell
+		media-fonts/noto
+		media-fonts/ubuntu-font-family
+	)
 	media-libs/alsa-lib
 	media-libs/fontconfig
 	media-libs/vulkan-loader[X]
@ -148,8 +152,6 @@ pkg_setup() {
 	strip-unsupported-flags
 	# flags from upstream
 	export RUSTFLAGS="${RUSTFLAGS} -C symbol-mangling-version=v0 --cfg tokio_unstable -C link-arg=-fuse-ld=mold -C link-args=-Wl,--disable-new-dtags,-rpath,\$ORIGIN/../lib"
-	# linking error with llvm-18
-	export RUSTFLAGS="${RUSTFLAGS} -C link-args=-Wl,-z,nostart-stop-gc"
 	# fix error in livekit-rust-sdks
 	export RUSTFLAGS="${RUSTFLAGS} -A unexpected_cfgs"
 	if use gles; then
@ -164,7 +166,11 @@ src_prepare() {

 	export APP_CLI="zedit"
 	export APP_ICON="zed"
-	export APP_ID="dev.zed.Zed"
+	if [[ "${PV}" == *pre ]]; then
+		export APP_ID="dev.zed.Zed-Preview"
+	else
+		export APP_ID="dev.zed.Zed"
+	fi
 	export APP_NAME="Zed"
 	export APP_ARGS="%U"
 	export DO_STARTUP_NOTIFY="true"
@ -179,8 +185,16 @@ src_prepare() {
 	local ASYNC_TLS_GIT="git = \"https://github.com/zed-industries/async-tls\", rev = \"${ASYNC_TLS_COMMIT}\""
 	local ASYNC_TLS_PATH="path = \"${WORKDIR}/async-tls-${ASYNC_TLS_COMMIT}\""

+	local NOTIFY_COMMIT="bbb9ea5ae52b253e095737847e367c30653a2e96"
+	local NOTIFY_GIT="notify = { git = \"https://github.com/zed-industries/notify.git\", rev = \"${NOTIFY_COMMIT}\""
+	local NOTIFY_PATH="notify = \\{ path = \"${WORKDIR}/notify-${NOTIFY_COMMIT}/notify\""
+	local NOTIFY_TYPES_GIT="notify-types = { git = \"https://github.com/zed-industries/notify.git\", rev = \"${NOTIFY_COMMIT}\""
+	local NOTIFY_TYPES_PATH="notify-types = \\{ path = \"${WORKDIR}/notify-${NOTIFY_COMMIT}/notify-types\""
+
 	sed -e "s#${CPAL_GIT}#${CPAL_PATH}#" \
 		-e "s#${ASYNC_TLS_GIT}#${ASYNC_TLS_PATH}#" \
+		-e "s#${NOTIFY_GIT}#${NOTIFY_PATH}#" \
+		-e "s#${NOTIFY_TYPES_GIT}#${NOTIFY_TYPES_PATH}#" \
 		-i "${S}/Cargo.toml" || die "Cargo fetch workaround failed"
 }

--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/consult/Manifest
+++ b/app-emacs/consult/Manifest
@ -1,7 +1,9 @@
 AUX 50consult-gentoo.el 82 BLAKE2B 3443827f490db8caacfe842cc7f1d1315f3889dec007210f451909576a76139f70ac5795346a7a1b11befccd3152874fd3c86ad7a20c0fbf84f793f8deb595cd SHA512 dd2ba1149c847d95d6c54265bc03de36e198dfecedc10336f6879fb3a1fc9d92e2c6de190d4f9aaab6c3d15f268fb80e082b49b6e96165697ff786333a50a601
 DIST consult-2.0.gh.tar.gz 110667 BLAKE2B e697c8b71beefd7e09a5f8368e913852448f2aa8717283929c87a8a0dcaa92af56ab68ba9c919044afbe0306cacc2d999ff7a0f38a29bc46af510aaf9f81766c SHA512 71b6951d8b429fdc54ca1a2b77adfc6be5cd92be22f70d6c01e7333c3de43754176aa8e1caa3913e2bfca84aee2440a48d8545bb2c9818c73dfe8816924549f4
 DIST consult-2.1.gh.tar.gz 110227 BLAKE2B df90780e4cf2ac15c104a93b90ed51febdfc11a4c3e2f436d3dc8a8d6ab6393eb1dc90092406f20ca5391c546899f8b3b9bf5e7c4f84447b2614f9b8f735f52d SHA512 36c90ebde64b2401a77af2f7dc2d5735edc46f882748f5e1ae1de4ca7aba18af5cceeb691ec0be1507a8b001c557dce5b43c9805ba8abdba31833ba9c6738377
+DIST consult-2.2.gh.tar.gz 110953 BLAKE2B d08f2905fffd815722d68653f26fefa127fc23c7dab21a4e0606553e0e1739b3ad8f0eb9efe317997fd2980c861c9cc64917a3a4480bc8afb49adc3134396fcb SHA512 12a94de605b30ae1c80b1af8363a5d973001f3ae6374882f2b695148d89cdc4143ade5997c20bd86ee32e18a70c4b70170333687a1ca931473c75a541e13398f
 EBUILD consult-2.0.ebuild 647 BLAKE2B 713319c38dccd4d3fb5eeb95143df8e1ed8ec18a081d302a80a559fb5508db24339fa8986c1a3391957fa22487b0f0f0c3c0bad7de99a1373411ed4962f441ba SHA512 1cc18fd1120221fafafb0409e306d5f4484c6d9f34c56dca2449ae28678b872bba6d7a7cabdb866ffec3743c12eea73b22932429b445b8f5e0c29ffee27cd337
 EBUILD consult-2.1.ebuild 648 BLAKE2B fd7556312ffc60e33116243f391de9ead616c85358888bde6115b86a4b3497923e9b41abd3f9656458b44c10aef8c80a7d18790c983d77b62c61a6c4691334dd SHA512 9cd2cb6a6f94266ed1e9f2e9a4aabe3152e13a2a5b48795838e39b60c526470c3b04019ebd61a3abb6b9b0e921f975f344d3799a039948738808ecc5d50bf6c6
+EBUILD consult-2.2.ebuild 648 BLAKE2B fd7556312ffc60e33116243f391de9ead616c85358888bde6115b86a4b3497923e9b41abd3f9656458b44c10aef8c80a7d18790c983d77b62c61a6c4691334dd SHA512 9cd2cb6a6f94266ed1e9f2e9a4aabe3152e13a2a5b48795838e39b60c526470c3b04019ebd61a3abb6b9b0e921f975f344d3799a039948738808ecc5d50bf6c6
 EBUILD consult-9999.ebuild 648 BLAKE2B fd7556312ffc60e33116243f391de9ead616c85358888bde6115b86a4b3497923e9b41abd3f9656458b44c10aef8c80a7d18790c983d77b62c61a6c4691334dd SHA512 9cd2cb6a6f94266ed1e9f2e9a4aabe3152e13a2a5b48795838e39b60c526470c3b04019ebd61a3abb6b9b0e921f975f344d3799a039948738808ecc5d50bf6c6
 MISC metadata.xml 1405 BLAKE2B b61aec6a2d62bda9664dc5ca77d935c8bc4d6b82ed3991fdb81637a1f8250d4493a53eae446c4513d81f34d46394db63dc1915cce4d5bb21e74a3cdb451d4b18 SHA512 e8ce0aeebf5810ee02a043b5be7dc30a1f7e02f9bf587c836d234cad6884cc433519993ccc432eea7f928a37010b8c67658eeb6b54673dac92706550aac5c68c
--- a/app-emacs/consult/consult-2.2.ebuild
+++ b/app-emacs/consult/consult-2.2.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="28.1"
+
+inherit elisp
+
+DESCRIPTION="Consulting complete-read for GNU Emacs"
+HOMEPAGE="https://github.com/minad/consult/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/minad/${PN}"
+else
+	SRC_URI="https://github.com/minad/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	>=app-emacs/compat-30.0.2.0
+"
+BDEPEND="
+	${RDEPEND}
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
--- a/app-emacs/emacs-common/Manifest
+++ b/app-emacs/emacs-common/Manifest
@ -1,5 +1,3 @@
-DIST emacs-common-1.10.tar.xz 61800 BLAKE2B 9dd25f45bf0db308417a6c35d87e3b8c6a7dd2f11de57ab2e6fcf81646aa5d5b54b76a78142de0e175df3ba4dce4f404f4774cb0a0d64c41e484de4ea4da6e6a SHA512 a9a9142394261b34ba625e48eaac489f713cef52df3ca801c2445759bf27d6335b4e7162305f314203d3efcd89f6e65a635595ffc0ad6e6082b735c5f8283b82
 DIST emacs-common-1.11.tar.xz 64480 BLAKE2B 776f1ecc656b6d0765617f1d9176e5c855a7a85b24bcd4563e846bbde1d4cd842ac928518d4e0e1254d1161b3848b6beffb87612bf82247b9862351ebdd17636 SHA512 e7e627562f637778e2391ae8b188cd045021cf5b6f32f68e1927868382be59f8cf3d878b62c6e03d6047b0b00a7ec9e44e78189c105e63629f6b672c9fdb09e4
-EBUILD emacs-common-1.10.ebuild 3173 BLAKE2B 6f138d9cd998501ab08be276bb57c09d73691f7304f0d841fd8f7775d488b56057cde60107e1befcade81ef3e25ee25c10dea01259b14a156cab159d1aabd187 SHA512 c82676bcda825fc306b527c7aa75c2011b0c01e9d410c07af2dbbaf56ff4160d800b9625e994d7813c90392c5288c52c9334436a39fdeae033a9f7265895868b
-EBUILD emacs-common-1.11.ebuild 3450 BLAKE2B 6b3bc5717a17b025f32d683824327db7f440f98fef81a6fc0060b38c3eae399c83507f027b540013663d776f9f53dc30e54ffc25f5e63d3c7636a60168d3ce66 SHA512 e0fd227dd227c977967595d7cf0dce6e35cc5508246378162cf007c79ddd8cfaf455421af68b31265bbf5c46b9691f40ecc84893baa5c9a9e5c282918f51e4b8
+EBUILD emacs-common-1.11.ebuild 3575 BLAKE2B 2c443b42d85295756cc54e356ec7a5a65e279287a78a5b39f3942877bba4fb003023ed925dffecfa057d9f51c1d82af0e5bafd70b2e2c16004799622d89cae58 SHA512 5c17432e30c8b76d98e64556b35d88286b88419588941bfc79d71ea412f1f454e200e374b39a534c18d4e72226b5e5e034ddbff4501f50dd1ebd193e0a6dd4c4
 MISC metadata.xml 535 BLAKE2B 6c6c5bb8ce0585a2bcd37f80f6426f1e4304715f142a36d186643f9f69054fc49f889847d1d76d34537152dc9d8310a066bce1ea40b2ff7c30ee4c2dcf3b185b SHA512 0a200530dc27ea2a6ca1860d70964027d9bc748b19459639f3a946ffc4f83c965d339683a1ceb1f9cb03212a1877dc1ca51a2a1dfd1c8c9fc814aff67ad177c1
--- a/app-emacs/emacs-common/emacs-common-1.10.ebuild
+++ b/app-emacs/emacs-common/emacs-common-1.10.ebuild
@ -1,111 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common desktop eapi9-pipestatus gnome2-utils readme.gentoo-r1
-
-DESCRIPTION="Common files needed by all GNU Emacs versions"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="games gsettings gui"
-
-DEPEND="games? ( acct-group/gamestat )"
-RDEPEND="${DEPEND}"
-PDEPEND=">=app-editors/emacs-23.1:*"
-IDEPEND="gui? ( gsettings? ( dev-libs/glib ) )"
-
-src_install() {
-	insinto "${SITELISP}"
-	sed -e "s:@libdir@:$(get_libdir):g" subdirs.el.in | newins - subdirs.el
-	pipestatus || die
-	newins site-gentoo.el{,.orig}
-
-	keepdir /etc/emacs
-	insinto /etc/emacs
-	doins site-start.el
-
-	if use games; then
-		keepdir /var/games/emacs
-		fowners 0:gamestat /var/games/emacs
-		fperms g+w /var/games/emacs
-	fi
-
-	if use gui; then
-		local i
-		domenu emacs.desktop emacsclient.desktop
-
-		pushd icons >/dev/null || die
-		newicon sink.png emacs-sink.png
-		newicon emacs25_48.png emacs.png
-		for i in 16 24 32 48 128; do
-			[[ ${i} -le 48 ]] && newicon -s ${i} emacs22_${i}.png emacs22.png
-			newicon -s ${i} emacs23_${i}.png emacs23.png
-			newicon -s ${i} emacs25_${i}.png emacs.png
-		done
-		doicon -s scalable emacs23.svg
-		newicon -s scalable emacs25.svg emacs.svg
-		popd >/dev/null || die
-
-		if use gsettings; then
-			insinto /usr/share/glib-2.0/schemas
-			doins org.gnu.emacs.defaults.gschema.xml
-		fi
-	fi
-
-	DOC_CONTENTS="All site initialisation for Gentoo-installed packages is
-		added to ${SITELISP}/site-gentoo.el. In order for this site
-		initialisation to be loaded for all users automatically, a default
-		site startup file /etc/emacs/site-start.el is installed. You are
-		responsible for maintenance of this file.
-		\n\nAlternatively, individual users can add the following command:
-		\n\n(require 'site-gentoo)
-		\n\nto their ~/.emacs initialisation files, or, for greater
-		flexibility, users may load single package-specific initialisation
-		files from the ${SITELISP}/site-gentoo.d/ directory."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# make sure that site-gentoo.el exists since site-start.el requires it
-	if [[ ! -f ${ED}${SITELISP}/site-gentoo.el ]]; then		#554518
-		mv "${ED}${SITELISP}"/site-gentoo.el{.orig,} || die
-	fi
-	if [[ -d ${EROOT}${SITELISP} ]]; then
-		elisp-site-regen
-		cp "${EROOT}${SITELISP}/site-gentoo.el" "${ED}${SITELISP}/" || die
-	fi
-
-	if use games; then
-		local f
-		for f in /var/games/emacs/{snake,tetris}-scores; do
-			if [[ -e ${EROOT}${f} ]]; then
-				cp "${EROOT}${f}" "${ED}${f}" || die
-			fi
-			touch "${ED}${f}" || die
-			chgrp gamestat "${ED}${f}" || die
-			chmod g+w "${ED}${f}" || die
-		done
-	fi
-}
-
-pkg_postinst() {
-	if use gui; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-		use gsettings && gnome2_schemas_update
-	fi
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	if use gui; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-		use gsettings && gnome2_schemas_update
-	fi
-}
--- a/app-emacs/emacs-common/emacs-common-1.11.ebuild
+++ b/app-emacs/emacs-common/emacs-common-1.11.ebuild
@ -13,7 +13,7 @@ if [[ ${PV##*.} = 9999 ]]; then
 	S="${EGIT_CHECKOUT_DIR}"
 else
 	SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi

 DESCRIPTION="Common files needed by all GNU Emacs versions"
@ -56,7 +56,9 @@ src_install() {
 	doexe emacs-wrapper.sh
 	elisp-site-file-install "${SITEFILE}"

-	insinto /usr/lib/systemd/user
+	# don't use systemd_douserunit because it would require inheriting
+	# three eclasses (systemd pulls toolchain-funcs and multilib)
+	insinto "/usr/lib/systemd/user"
 	doins emacs.service

 	if use games; then
--- a/app-emacs/emacs-daemon/Manifest
+++ b/app-emacs/emacs-daemon/Manifest
@ -1,7 +1,3 @@
-DIST emacs-daemon-0.22.tar.xz 5276 BLAKE2B a866b14951df94e1d382253dcb7045beb800c9dd754f7eed40eadecde43fd583bb2bc20ad9ccc9f87174b06aadbb26f7875deaf36d9bb5325f98ffa58fded8c7 SHA512 f013cd00d3a24ca348bf718dd20dec7bea89107c0a27c921d6b58595b611991830604fc658d57681708218fbee1dae6dd0b277a2a9da67639e3553e0fd133094
-DIST emacs-daemon-0.23.tar.xz 4876 BLAKE2B 95fd9fc2b038dd60d4fc889674f4f1c3e5c0f8894a0161a0ea626835e91d500766e7fb50f8efafd70b0a45129626968147009c218b55ca0df6c6da50b8cb99dc SHA512 90f4b5b22df17106173de6116f45d902613b60b4b837293ea5f7843ad4967f68f9920cb301ef1edc50c6c831941be487b456ac8c1bc41ae41a55c6e1ea135343
 DIST emacs-daemon-0.25.tar.xz 4612 BLAKE2B d2207b69b2a6d13b95095dc2f4d89c93e291dd8475379454314a4d1daad0ae8414fb3081a17350e536ce2320a002fb32fd6f239b91280726aac9cdc636ece682 SHA512 66a9d4ab89f3c27727ceb3d6e689b7a59ce7c10afbb0e4f29011aee499a6c6299887dcb0c92998e424068ae1b12d56ad74d0fe2583059eca9130bb57b7d44a14
-EBUILD emacs-daemon-0.22-r1.ebuild 1606 BLAKE2B 1d521e7d5177e864bcc365e7fe978ea4380b68380d69e542c7b1801723657dee2780b2e2441d6b5831712b550e0763f36878b913cc0acb3e42a5d1f5d9df994c SHA512 e3f1fac107add3017b522e446f22c81910cb67e05bb4008d061d371a7e7336942fef33fbd426e13ac0dda94701f1cb4fb16cf860d57c36121948dd3414c62ef0
-EBUILD emacs-daemon-0.23-r1.ebuild 1729 BLAKE2B 2f419a867078299890ee24b488a87792e210e16b763e98fd5a10c3bce88f6c3b8b8f7cce1b526342cad12ba49de679a1682ad54aa4ce159bbf30c0b874d9bb9a SHA512 b65ae5bf0e79f6f9289e5deedaafc8351bf22d602dab17575ed1d7c56259b3d8f984e699e5e0a129f1d67415315c35369fdd4d6a62fc89b2bac851210dc34197
-EBUILD emacs-daemon-0.25.ebuild 1788 BLAKE2B 598229a553654d2716aa8f0ec7474fade7f4262883015fde132cf7aad4278fec73fd6872f9ef020bb56f79855f6e84b6b60a17c368c1f09471c9caec2b6c53dd SHA512 4de08a0ec193611b5d64af7ed4fbb2adf2da6c1eb3d1f3fa24e46fb0faad5e54cb1913746c528f22fcc92d88f3c26018aaae46ff35bd561ca636a4819de10132
+EBUILD emacs-daemon-0.25.ebuild 1782 BLAKE2B dcf2f583a852b22a93e0d5377d629a82e15a551cccc810ea3662bcd9a32c9ed71caecc6d8d6189b330849729d7e1d82ffc64c124de6b352decab5fbdc0e8189b SHA512 6e9de5481e5e9899f102c8906e8aff89fa35e116e290677179a2240e77a04812b1dc55397a59777da0adcbdefe27402ee14b8fd49346b5aca34acbff426a70ed
 MISC metadata.xml 362 BLAKE2B 59c9e3025bdd347e4812d6485bda2b731a1b0adf2eec16aefdd6b0d3379a949cd99c637febfcab0c6314c457eafe0727a986196e4499aa29dbd297a6a0458d66 SHA512 5882c9372b62c44189426a1ea3ac975e29b70fc5b5d30a3f024edced82d9406e118e9acee91b1353c76eb65f19008e4bb1475f859509c933be48c03aa701394b
--- a/app-emacs/emacs-daemon/emacs-daemon-0.22-r1.ebuild
+++ b/app-emacs/emacs-daemon/emacs-daemon-0.22-r1.ebuild
@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="Gentoo support for Emacs running as a server in the background"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
-
-SITEFILE="10${PN}-gentoo.el"
-
-pkg_setup() {
-	local has_daemon has_gtk line
-	has_daemon=$(${EMACS} ${EMACSFLAGS} --eval "(princ (fboundp 'daemonp))")
-	has_gtk=$(${EMACS} ${EMACSFLAGS} --eval "(princ (featurep 'gtk))")
-
-	if [[ ${has_daemon} != t ]]; then
-		while read line; do ewarn "${line}"; done <<-EOF
-		Your current Emacs version does not support running as a daemon which
-		is required for ${CATEGORY}/${PN}.
-		Use "eselect emacs" to select an Emacs version >= 23.
-		EOF
-	elif [[ ${has_gtk} == t ]]; then
-		while read line; do ewarn "${line}"; done <<-EOF
-		Your current Emacs is compiled with GTK+. There is a long-standing bug
-		in GTK+ that prevents Emacs from recovering from X disconnects:
-		<https://bugzilla.gnome.org/show_bug.cgi?id=85715>
-		If you run Emacs as a daemon, then it is strongly recommended that you
-		compile it with the Lucid or the Motif toolkit instead, i.e. with
-		USE="athena Xaw3d -gtk -motif" or USE="motif -gtk -athena -Xaw3d".
-		EOF
-	fi
-}
-
-src_compile() { :; }
-
-src_install() {
-	newinitd emacs.rc emacs
-	newconfd emacs.conf emacs
-	exeinto /usr/libexec/emacs
-	doexe emacs-wrapper.sh emacs-stop.sh
-	elisp-site-file-install "${SITEFILE}"
-	dodoc README ChangeLog
-}
--- a/app-emacs/emacs-daemon/emacs-daemon-0.23-r1.ebuild
+++ b/app-emacs/emacs-daemon/emacs-daemon-0.23-r1.ebuild
@ -1,56 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="Gentoo support for Emacs running as a server in the background"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
-
-SITEFILE="10${PN}-gentoo.el"
-
-pkg_setup() {
-	local has_daemon has_gtk line
-	has_daemon=$(${EMACS} ${EMACSFLAGS} --eval "(princ (fboundp 'daemonp))")
-	has_gtk=$(${EMACS} ${EMACSFLAGS} --eval "(princ (featurep 'gtk))")
-
-	if [[ ${has_daemon} != t ]]; then
-		while read line; do ewarn "${line}"; done <<-EOF
-		Your current Emacs version does not support running as a daemon which
-		is required for ${CATEGORY}/${PN}.
-		Use "eselect emacs" to select an Emacs version >= 23.
-		EOF
-	elif [[ ${has_gtk} == t ]]; then
-		while read line; do ewarn "${line}"; done <<-EOF
-		Your current Emacs is compiled with GTK+. There is a long-standing bug
-		in GTK+ that prevents Emacs from recovering from X disconnects:
-		<https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
-		<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
-		If you run Emacs as a daemon, then it is strongly recommended that you
-		compile it with the Lucid or the Motif toolkit instead, i.e. with
-		USE="athena Xaw3d -gtk -motif" or USE="motif -gtk -athena -Xaw3d".
-		EOF
-	fi
-}
-
-src_prepare() {
-	sed -i '/checkpath/s/"${USER}"/0/' emacs.rc || die
-	default
-}
-
-src_compile() { :; }
-
-src_install() {
-	newinitd emacs.rc emacs
-	newconfd emacs.conf emacs
-	exeinto /usr/libexec/emacs
-	doexe emacs-wrapper.sh
-	elisp-site-file-install "${SITEFILE}"
-	dodoc README ChangeLog
-}
--- a/app-emacs/emacs-daemon/emacs-daemon-0.25.ebuild
+++ b/app-emacs/emacs-daemon/emacs-daemon-0.25.ebuild
@ -13,7 +13,7 @@ if [[ ${PV##*.} = 9999 ]]; then
 	S="${EGIT_CHECKOUT_DIR}"
 else
 	SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
 fi

 DESCRIPTION="Gentoo support for Emacs running as a server in the background"
--- a/app-emacs/emacsql/Manifest
+++ b/app-emacs/emacsql/Manifest
@ -1,7 +1,9 @@
 DIST emacsql-4.0.3.tar.gz 2398435 BLAKE2B 3c66b922b63a1265660e59cf0319583f98bb6d51347fb6abd76e12d1ff0d9bb92501fb1e35bb4cbe83f8338d6b03e25d3a0536e78998f252ad210d80971e701a SHA512 a8ea07ddae35f993bfd9b19f4d0964ae3128d362e1e377e917a715d5c1dfb0c2dda0fd7ad17664f0e7e70342deeb780f99c5cd66be9b80aff46dd11a91c20984
 DIST emacsql-4.1.0.tar.gz 32308 BLAKE2B b5022c9312057949fe243ae696860da26060ccd2df0103fa6298c9613135e0b4bd246eb57c276d33ee39d348230a5648e70f077feb0b97e07c06af5778d5905d SHA512 a43c5dd1bdca451b91a4a0dbf771b138cb55ee69a950e37507d109b3dbe5522a01ba57e2ac6ec8678dbb21c002fb72bf69068f014883bac660d1a824a4eecafc
 DIST emacsql-4.2.0.tar.gz 32330 BLAKE2B d52ce56b1cfee6ab570efcfbe79ee6001f925637d36214471a842089cb741bc71c2ce1f2afadfab0d88fc585d0d601f7ff44ed535dcd71f117e21339794bfe74 SHA512 7a60e7524d5d939ea18e9dd00d372420b79efb6d26aa6403427c51c19be0a3526bba3054cf5b73a0ff1d54100dcdf5eb3e4330a2b90b175cffa8cedb05366ae5
+DIST emacsql-4.3.0.tar.gz 31823 BLAKE2B efe6b21e5e39eacdf80bcfc8e920366e227f127dcd5f7060c9b0f8ca34a2fbc0887d6c700607813cc631da1487114d7b14864d779a8a8bde7de2e03a99324305 SHA512 a8cbe557d05c9d1dd7d54e0feb602e658fa426e7abab084bf286e42365479e11101ef4bfdfeb29760fe1f2d01a957d6d5408052694dea690033fc26b52d5528f
 EBUILD emacsql-4.0.3.ebuild 1448 BLAKE2B d5b819dede266c70ddb11ac1daf3f4a47bf2336cdb9ee3bebc5e3e41fd2fe1812f03ea08e4c1c69cb083461adf7ef90afb019a6b3db16424676c5ccadb4fcafc SHA512 4512ec40fc51cd914334c9bbb3aa0338d48f809c5cb357a29507016cc85faa3346ea49a12ed5831e6774b2353c60c6f52789af3b7159b929e9f2a448b2febc81
 EBUILD emacsql-4.1.0.ebuild 1383 BLAKE2B bb23bfbc6b3fbb01e1fcfe3edf3e6854358fca18ae6fd6829a1d82c9f93dab32b70864a89029e02ab96f3c8b2de504eca853f45658dba75a32d30dd9a6cdf4f6 SHA512 34b80e586b5a09b2cb8554a509ef93807c169d416f78a0770d0296a671e6c0bbe001a7185777d376d6b57a4a8d51d9c8317f103d3560654e3c76008a0f0d377a
 EBUILD emacsql-4.2.0.ebuild 1002 BLAKE2B 971b6970c453b937f2ee61ee9ac7321f67249f1e87b1b7658f7d7cebb93dde1f6b87a07e47468b675004d75a7ba171e5ebfdfde66b2e058dd9e988f8c8a31b19 SHA512 a0b6ba0dd96d7164d33033a2b04996608850efad8e11435b90430cb3a0ad7c5771fda520410895f66a63ba31a61c5fbe367c1c315a6e3f116ddfb1811e466d8a
+EBUILD emacsql-4.3.0.ebuild 1002 BLAKE2B 971b6970c453b937f2ee61ee9ac7321f67249f1e87b1b7658f7d7cebb93dde1f6b87a07e47468b675004d75a7ba171e5ebfdfde66b2e058dd9e988f8c8a31b19 SHA512 a0b6ba0dd96d7164d33033a2b04996608850efad8e11435b90430cb3a0ad7c5771fda520410895f66a63ba31a61c5fbe367c1c315a6e3f116ddfb1811e466d8a
 MISC metadata.xml 465 BLAKE2B af917169cbf09b171ca8d04b1f39df6ad2f6ab2ba8ef6196723c6041983beef0cc1f6cbc149d481b9a444dc9095ff343888630d2fa762e63c1f84d180421e1fa SHA512 b3783f583f4ee7a6ae736925a2ce3195722e27c549554af773df3dd68360932e322d9e6e30a979bb2af134b12944bd48d5c2832349cee2e58b554ae87325e303
--- a/app-emacs/emacsql/emacsql-4.3.0.ebuild
+++ b/app-emacs/emacsql/emacsql-4.3.0.ebuild
@ -0,0 +1,62 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="A high-level Emacs Lisp RDBMS front-end"
+HOMEPAGE="https://github.com/magit/emacsql"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/magit/${PN}.git"
+else
+	SRC_URI="
+		https://github.com/magit/${PN}/archive/refs/tags/v${PV}.tar.gz
+			-> ${P}.tar.gz
+	"
+
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Unlicense"
+SLOT="0"
+# TODO(arsen): postgres-pg using app-emacs/pg (unpackaged as of yet)
+IUSE="postgres mysql"
+
+RDEPEND="
+	${DEPEND}
+	postgres? (
+		dev-db/postgresql
+	)
+	mysql? (
+		virtual/mysql
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	default
+
+	# Not packaged.
+	rm emacsql-pg.el || die
+
+	local -A backends=(
+		[postgres]=psql
+		[mysql]=mysql
+	)
+
+	for useflag in "${!backends[@]}"; do
+		if ! use "${useflag}"; then
+			rm emacsql-"${backends[${useflag}]}".el || die
+		fi
+	done
+}
--- a/app-emacs/forge/Manifest
+++ b/app-emacs/forge/Manifest
@ -1,7 +1,9 @@
 AUX 50forge-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST forge-0.4.7.tar.gz 134302 BLAKE2B 5797a8908cc25a49a40611ca3eda43e55cc9c8c45e8e747877e1345e62194efef07deac49e3524c19ea17e0f24787ef3459e8ca3360ab66cf136cd203bb52515 SHA512 261e1992ab30f931f24caa418a18c08076936f77e71d6ba3c22d959ee5260de717d43532aed910c43d8147fb520028d3ffb3a8cfceb9d2878fea39dd5d5539e7
 DIST forge-0.4.8.tar.gz 134969 BLAKE2B 136defcc7833c049889c4997ec1f2fd192629d655ab6a3ec532220f0652eb588846a7131d552a5c3e2fa15d9d114137361360ee0fe3dae45e4dedce21514e9a6 SHA512 84b9894bd6a5728cca00f2be1ea974758ac53f3454311feb303b4658fd9cf007bb1c65774a555e3b5a9cb5f5cc4877c13f092aff3d7527d7a7eac2d58a510bad
+DIST forge-0.5.0.tar.gz 142364 BLAKE2B dc94ec1893f558615903fd9d0a782f034a418556bc249fc2e8d6171263cdecf2b1c803091efd93b8f52eff698c95423c5a1d5b25de8a578bef67616bd24eab85 SHA512 274a0503f546bc3039b0f646c4924760b08412c67516e7816d91adf9dfa90dfacd64e4b532656af2ce170182e197db2f45ce6aae99ddf5eecfa283aa3df2bb50
 EBUILD forge-0.4.7.ebuild 893 BLAKE2B 1d4320cbae23a40739b67df526f732ce24defbb17408c7cdbac212487c3331276a03403a7dd6932c91fb3727a7f24c658706910fed956238d05f55c318afcfb7 SHA512 56ebbfa985b973e2ca2368b34e38bc996828ed15ba5e7b504b69b1327657fa9add8311694e4008966b099232289c8f7aa52b2d63a3decb4643e1d05cfcde5f01
 EBUILD forge-0.4.8.ebuild 893 BLAKE2B 1d4320cbae23a40739b67df526f732ce24defbb17408c7cdbac212487c3331276a03403a7dd6932c91fb3727a7f24c658706910fed956238d05f55c318afcfb7 SHA512 56ebbfa985b973e2ca2368b34e38bc996828ed15ba5e7b504b69b1327657fa9add8311694e4008966b099232289c8f7aa52b2d63a3decb4643e1d05cfcde5f01
+EBUILD forge-0.5.0.ebuild 893 BLAKE2B 1d4320cbae23a40739b67df526f732ce24defbb17408c7cdbac212487c3331276a03403a7dd6932c91fb3727a7f24c658706910fed956238d05f55c318afcfb7 SHA512 56ebbfa985b973e2ca2368b34e38bc996828ed15ba5e7b504b69b1327657fa9add8311694e4008966b099232289c8f7aa52b2d63a3decb4643e1d05cfcde5f01
 EBUILD forge-9999.ebuild 876 BLAKE2B 1578241c54104e9da9fde5135d4a3b3e9d59ffc9a5e3b32459b5ea6c7e1758ee4dc6ebad60552af0822e3c593e92cf03c5c2b2a8522f3e0e6b32759290e6a409 SHA512 ffd3bf6179dc43edf96f000d01424de6fb61c5f46c1f596ae57ac3b476fefcdcfdd26f6daf37005cf9f8d86b33f1adf6275491192cbc9eb31d9e76c8cc674a44
 MISC metadata.xml 569 BLAKE2B 80cea93ab6574a8c39810a3fe59151c95e90a00f235352011174868554d9b89effb34601ee5ae51b37c25d3da87cf77c045dd0d35bf6e31298e16a2e7d850bd7 SHA512 d6412b328aa1813da6173404c169af3e2b52c71251b74bbb2ea59969be8073071c319bc4286c31882133931ab9bdb5ad30cb5da47c6698661f21c367e01a1287
--- a/app-emacs/forge/forge-0.5.0.ebuild
+++ b/app-emacs/forge/forge-0.5.0.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="29.1"
+
+inherit elisp
+
+DESCRIPTION="Work with Git forges from the comfort of Magit"
+HOMEPAGE="https://magit.vc/
+	https://github.com/magit/forge/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/magit/${PN}.git"
+else
+	SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+S="${WORKDIR}/${P}/lisp"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	>=app-emacs/compat-30.0.1.0
+	>=app-emacs/ghub-4.1.1
+	>=app-emacs/magit-4.1.3
+	>=app-emacs/transient-0.7.6
+	app-emacs/closql
+	app-emacs/dash
+	app-emacs/emacsql
+	app-emacs/llama
+	app-emacs/markdown-mode
+	app-emacs/yaml
+"
+BDEPEND="
+	${RDEPEND}
+	sys-apps/texinfo
+"
+
+DOCS=( ../README.org )
+ELISP_TEXINFO="../docs/*.texi"
+SITEFILE="50${PN}-gentoo.el"
--- a/app-emacs/ghub/Manifest
+++ b/app-emacs/ghub/Manifest
@ -1,8 +1,8 @@
 AUX 50ghub-gentoo.el 124 BLAKE2B 84170098bd01bb9f165eaf06f7cb21c56d2caaf964d2658520311757845d053072a7704fcb90cce2a2dfbd2385f357d2e7569061ebe0ca41b575efd752d29fd8 SHA512 596c7e75560f3734b57525bdfb42f3985fb49ab4d86637231361f6673d2431c0a6e73f91f58f003f9027f1143b9be3f4330ef2e1ff6c627ca6057256f4afbfca
-DIST ghub-4.2.0.tar.gz 61058 BLAKE2B 055edcd4deaa068874ca896027bd752fac099a355f0b19be6bae75c8b1eaffe43206e5ab92cddaa35103040d2eb5533034bccff494e7c364382c164d5f6a1735 SHA512 530a19bbbd3d7dfb9f1289f0a1273f08f741f87a4009db0ffc08a4ec1fa7f1d1c3468692277f494334d21b869730d10abf7005f7cfeb50b76df9ab4a3f3d7328
 DIST ghub-4.2.1.tar.gz 61132 BLAKE2B 238c66d08bb50ad81c67ff2032a73fa5c0881fe1862f334703889b332cd1daeec477a57742c2955013daee440b38fae6fd2ba40549583b56e5f49bc6313b6251 SHA512 25bd86eeea0ad9923df519f34d69473b08a8534b1a7edaa12513d692711b37d8116e842b565c02ee4eab021bccebbfd569f764e82263a167d83de5b803a15bd9
 DIST ghub-4.2.2.tar.gz 61372 BLAKE2B 69e6f6a6dbe0af07c5846629084724408070aea12a98e73aae7d16b845800dd944cbbba3085015c3b6cbebfa02a71634a8c15399adccb00d228f4d4733a352a7 SHA512 2ca9ccaffb31c64fe5325602cb29db569081ef1db45ef7e84bc1fb7605cad2ebc3d3e15c35bb4f09f8255019df41eb4ae14e55b8dec298f3d2416ae7fca034d0
-EBUILD ghub-4.2.0.ebuild 783 BLAKE2B 1b43f2572a4fb3b565c4b3f22ada9a0072136f6ac4ba0349d98c6429e72b5a154ab1b5bd3a65c4c6369df9a54fd1581074476f123de9fbb7d1f5c603a4e3ae65 SHA512 ff3e06ed05d8f36cca2e37082f452c780b6ef79b29f4cb8d8fba626ce7140cea280b16ca0174ca50dcf846333aea0fd8221f5d6e5f45587e59443e08f18480e6
+DIST ghub-4.3.0.tar.gz 61655 BLAKE2B b4cfdf795eb561e7149c05a05982118d6ed98edad6086545e6a8982666069b1c678405fc33ba1104d3107baad25da9782927cd501f3ba64cfd016126854e5f38 SHA512 303bb639e86e92b11b676868e85a1fc9f00899cecd55cc10438c7829ea1c48ea37a2459845d79210618655f961e868d1f629babf5a7ca42d41c89849f6dee30f
 EBUILD ghub-4.2.1.ebuild 813 BLAKE2B 86c6872c28aced3731aeadd42b2c3f38af7e2ee930b54ca4d0e31937afc60718d1c22c8d59537d902ca15ff2a3e055687a82a29c2e4665143fc1e20281cef366 SHA512 d93f11040bacf13f664f67fe02aee7ae78074da977acfa470985ae238db5259fea93344394a78a17c9fbd51664a16543ae90d60f6275a90d7fd6847e3d30dd5b
 EBUILD ghub-4.2.2.ebuild 815 BLAKE2B 66042a40c4fc0d4484f9c473e0a8e9cd8b8f08ab1edcd398b157aceb11cce767d22cba52cb198d0481887e5a8f849a95b4587c4221c521f05b271556c1211a62 SHA512 39b194938cb3a2b2d90feab7a7a17fe69282a0c2dc1188e54d5e9fd8b1c4457ad55256eb3d871b610db80b8410128f23a54eac9d9ab14918d7b933e25434bb9e
+EBUILD ghub-4.3.0.ebuild 815 BLAKE2B 66042a40c4fc0d4484f9c473e0a8e9cd8b8f08ab1edcd398b157aceb11cce767d22cba52cb198d0481887e5a8f849a95b4587c4221c521f05b271556c1211a62 SHA512 39b194938cb3a2b2d90feab7a7a17fe69282a0c2dc1188e54d5e9fd8b1c4457ad55256eb3d871b610db80b8410128f23a54eac9d9ab14918d7b933e25434bb9e
 MISC metadata.xml 1297 BLAKE2B 76a67936c0754ffeba3ca47551417bea6a0996c5197977b2dce2c73bf7acbe421f0c7ac0f8415b529f1ee3109868bc5306d7e714a58f3faec549ddd575cc82b1 SHA512 8cb4ebebcce9526416253b528bd8e2865311a796f10cc176b7d87d0fd06b573a9d7dc094cf3c2ccb916eccffb69dd5a164ad64c8f0310727147bea3804aa79de
--- a/app-emacs/ghub/ghub-4.3.0.ebuild
+++ b/app-emacs/ghub/ghub-4.3.0.ebuild
@ -3,6 +3,8 @@

 EAPI=8

+NEED_EMACS="29.1"
+
 inherit elisp

 DESCRIPTION="Minuscule client library for the Git forge APIs"
@ -17,27 +19,28 @@ else
 	SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"

-	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi

 LICENSE="GPL-3+"
 SLOT="0"

-DOCS=( README.org )
-ELISP_TEXINFO="docs/ghub.texi"
-SITEFILE="50${PN}-gentoo.el"
-
 RDEPEND="
-	>=app-emacs/compat-30.0.0.0
-	>=app-emacs/treepy-0.1.2
+	>=app-emacs/compat-30.0.2.0
+	app-emacs/llama
+	app-emacs/treepy
 "
 BDEPEND="
 	${RDEPEND}
 	sys-apps/texinfo
 "

+DOCS=( README.org )
+ELISP_TEXINFO="docs/ghub.texi"
+SITEFILE="50${PN}-gentoo.el"
+
 src_prepare() {
-	mv lisp/*.el . || die
+	mv ./lisp/*.el . || die

 	elisp_src_prepare
 }
--- a/app-emacs/jinx/Manifest
+++ b/app-emacs/jinx/Manifest
@ -1,6 +1,8 @@
 AUX 50jinx-gentoo.el 124 BLAKE2B f4246148c20179c2c4785befcafd49f862c3217861f00a5b7b4406db4f32872cf532d584c1ae7efb325df79667cc5b5498d368565444eb229b545d9d1e860d82 SHA512 e9281cb1c20d6dbc7f9afad1522ccf7498e72a91a907f2ec567fa23f6b9ce0844176fa7480f29188f294de59c3a921b75be5657967995c5a90f7e28c0f3a9fb4
 DIST jinx-1.12.tar.gz 36050 BLAKE2B 978259fb5e36ba86b97e035b2d128e19ef961146fa71a139bdbcf978cb360ca56fdf76bb43b1e9dfaf47c8acbf9082982f4e90e5c2e65adcea969787f61c8a44 SHA512 7336965a2fe3fb8c9e8f1ae6c4e7cd05a9bafda7476f1264b8bb584d8f3f81dca7085a5cc5befe686d56e2e43945e5b04c53ef8028886b2a46d0fa52afac8ee4
 DIST jinx-2.0.tar.gz 36458 BLAKE2B aa9ba5b6cdb96a1764cc84e0f1f51b1058e872d68b5613b416241930b1d65bb81f9d32f6de3527f6b8dec3e587fe0d57f4b295e87746ba12c30f117288b0e4c1 SHA512 da34d1f055f108f5abb3984978841b7bd9e19d4ded88c8e37192cb6a523ad04910ab5e9875aceb2cf6c7eb6486fc6166eaf5fb21f47cf0bcdfb943646f555a5a
+DIST jinx-2.1.tar.gz 36669 BLAKE2B ca88c0e5c05c5bf554d129db0794fed4c794f535c2d420ed1692dd3378102aa41ce4c4f0322d84d235b0c66961db85f05f23f7f5a1376f46511a33a2d6fb5b21 SHA512 3f49c771629c5d6bab5130d3b2fa6a6237fe2a09292610838af8da519733957fc8ea603939e983d54e2e15bfc0cf0d736e8a45e5a86d5cdfaa2f8eb2d621f98b
 EBUILD jinx-1.12.ebuild 1049 BLAKE2B 13bbdd8a275201e506edb58c21382a7aa8bbb0120be26daa85ce57dcb4d1ca4addfa1e5af69adb9cc3759fa192c67ae17580f2687e98f5ca295db051ee07547c SHA512 a7ffd2575f9f292538921ba513458a9899081843cf4003938de32470fed7197473b130875b29871bbf9c20f0b7bc574efdb09885b716b1f0b57e22550175a013
 EBUILD jinx-2.0.ebuild 1050 BLAKE2B d989f1298e972bd3ff7f47aebf74a3f25b22f0c77f669d73750d65ea3f493b5db979057a9a31aaaadfff695e833a51addcfada520a45dac6d2363cf8c4e21c55 SHA512 6c5f0957541d4db8fe7742653289bc06197677062883128e0713c2e363b3c1706371a3b12d83bcd106c42133e777ef66f453ca141563a773811953fc3a8185e3
+EBUILD jinx-2.1.ebuild 1050 BLAKE2B d989f1298e972bd3ff7f47aebf74a3f25b22f0c77f669d73750d65ea3f493b5db979057a9a31aaaadfff695e833a51addcfada520a45dac6d2363cf8c4e21c55 SHA512 6c5f0957541d4db8fe7742653289bc06197677062883128e0713c2e363b3c1706371a3b12d83bcd106c42133e777ef66f453ca141563a773811953fc3a8185e3
 MISC metadata.xml 568 BLAKE2B fae3a1f251834e444db4a7dc9ebe1825760671a2c025da8a82fe5ca606a2c6590030e909d5e4b6efdff4d498d3f4b6c4efd193193c9b43572dff64996a38a44c SHA512 61b2c882ec4a170d5f672664943260a01f21b5698ee735ec0a29b0f7051d7c62c2a2b96f1cf04fdd3fe17e79b752ff79e0b1a6f514f84efb8e91eb548f619da4
--- a/app-emacs/jinx/jinx-2.1.ebuild
+++ b/app-emacs/jinx/jinx-2.1.ebuild
@ -0,0 +1,55 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=28.1
+
+inherit edo elisp toolchain-funcs
+
+DESCRIPTION="Enchanted Spell Checker for GNU Emacs"
+HOMEPAGE="https://github.com/minad/jinx"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/minad/${PN}.git"
+else
+	SRC_URI="https://github.com/minad/${PN}/archive/refs/tags/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	app-text/enchant:2
+	>=app-emacs/compat-29.1.4.0
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+ELISP_TEXINFO="${PN}.texi"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	edo $(tc-getCC) -fPIC -Wall -Wextra -shared \
+		$($(tc-getPKG_CONFIG) --cflags --libs enchant-2) \
+		${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o jinx-mod.so jinx-mod.c
+	elisp-org-export-to texinfo README.org
+	elisp_src_compile
+}
+
+src_install() {
+	elisp-make-autoload-file
+	elisp_src_install
+
+	elisp-modules-install "${PN}" jinx-mod.so
+	doinfo jinx.info
+}
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@ -2,8 +2,10 @@ AUX 50magit-gentoo.el 77 BLAKE2B 85c942a0eeb84d6d45931a318108dff2006fc38e9e9eac3
 DIST magit-4.2.0.tar.gz 673702 BLAKE2B 436a2cbe88ffb6a4940eeb8b7f9ab9c1535942df6a35dab5cd4de9052bb5f9d2fa70abc61f26688c792de19a4d9a22c87d90d98515b3ea4a32356f6f163a7980 SHA512 e5488f759e3cd2c72966a31142f90bee2e3c8bb10bd4a77db69899a13cafb68222656331d7b8ac8a042b431994af03f0f0ce04658e967a07d4f3c3440da2e0d9
 DIST magit-4.3.0.tar.gz 682985 BLAKE2B 3db67a54c8e25e3948c58375909d68c105af15a37c5f9c717ed7304952c3c8e5e5fd2bc71f8e328c11334bbcdcaa969bcb1756d4dd28b4ac90da70da6be4af29 SHA512 f885c3e8ed12d7b6b1191071d11df1ad6e34f52296e93079cbee1f3b428ef95b3996ffae93f2ae124ae3d3507f473447171e278cb2199c5f9132a3bfca7af9ec
 DIST magit-4.3.1.tar.gz 684940 BLAKE2B 68c95f301ec17ef7dafc85d2ba3e158152f45cfb23a7908de753898a0d487eeb9ab102a61a98f08dba2cf06a785767612f719eba8da153398812e0eb7a84fa91 SHA512 f09f63966e2d337bf7d03ca474a7d57a8c118bc12de0e360c1cab455b59893386c15b5a278cbcf9d0afbed4468d16794d100f380dde40db00f19642340d6b33c
+DIST magit-4.3.2.tar.gz 685799 BLAKE2B 8b996548d022467f28ed1cda5cb4b766ca56d354a5a125b876c2cc0dc8d8ecc1be15e5f72feb04775460eb2705f33566957e9b1fea1f8a561a5447d1fffb853a SHA512 c6d09618af4f553ecfb471151cb8f51561bacfc8f313c369d5cdef894ebb778a415f083f31383590d65602cc0b50d105cde346a91dd2dd08690707beed39dd45
 EBUILD magit-4.2.0.ebuild 973 BLAKE2B 860472fdaab283227c2dc02f9e804f26e3110529c67c48a421fd5905e8867f1e71966d756fd78602f07ed024f602b4164a3e465a37d242ad4427c636744e5cc3 SHA512 fcc91e0c4d91495f1751f158cc75bf9966522becf3e50e4558e939cd7a6dbc2d1a7c1b8cd95eaca85ad4eccbae7112b05451346360103426a7e63025202de515
 EBUILD magit-4.3.0.ebuild 959 BLAKE2B 1d13ce15577201f5b5090ee9fc51dd38a244613ff14f39c2cb6b459c6297bb356a255f558978fd97a69f8eeafabae2c293848de1769d720fc222fcd922d3dc67 SHA512 7642c5aac172112b2fb73a6233393087d2a63524ac7ec04e8e0a6c1f2aa531c00b83bbed0e237f4eec539b798d04569d62f6156f6afddd6e726e9cb3355be75c
 EBUILD magit-4.3.1.ebuild 961 BLAKE2B 9476adcb9b8bfed03af73f786b07feb417192728d04dad5800154a0188469f7f8813f2bd4963d770062b2bc250298aab1ef80907f896adc2bec7f8d166667862 SHA512 4eeeb88660798adfdf3a0eaad07f409365aa726a9e5f8d02230ff70b97643f72690962425f466c93574b1cfaf39d494bbde0c6a877c49e54afa09d7c1dbfcf2d
+EBUILD magit-4.3.2.ebuild 961 BLAKE2B 9476adcb9b8bfed03af73f786b07feb417192728d04dad5800154a0188469f7f8813f2bd4963d770062b2bc250298aab1ef80907f896adc2bec7f8d166667862 SHA512 4eeeb88660798adfdf3a0eaad07f409365aa726a9e5f8d02230ff70b97643f72690962425f466c93574b1cfaf39d494bbde0c6a877c49e54afa09d7c1dbfcf2d
 EBUILD magit-9999.ebuild 975 BLAKE2B 1fe6fb5b2344c55f27f731753f1c0358f8b72a63a826b7058660e3540cfaedb32a99b861e626fa1e6374b0c8071fd3359041bbb5e46746fc468f25adbb0bba11 SHA512 f184ef42cd821ea293c56b27a083a5c23c5bdd7fd26ff96c1aa09ec8509420a22bc499fea8ad44583781188961d4ea7942db9705069c572a7b7d2989709314eb
 MISC metadata.xml 909 BLAKE2B d3ae2a06f0201a00c5b64b8357838bd26be22900d681448c3ff1df413a8ab7b345513d8ab76e138b7f1614a94f473717bf9dfbcac89cbcb13093b396c06f5b3e SHA512 f2c28423543b241737ee910a33e0bbf2eb668aadd18176e30d06b05f8a5d591a3933c129314d956a566ce49bbb5f84096da46a45d3dd1fd67efa2e0d8a6c70ab
--- a/app-emacs/magit/magit-4.3.2.ebuild
+++ b/app-emacs/magit/magit-4.3.2.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="A Git porcelain inside Emacs"
+HOMEPAGE="https://magit.vc/
+	https://github.com/magit/magit/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+S="${WORKDIR}/${P}/lisp"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	>=app-emacs/compat-30.0.2.0
+	>=app-emacs/dash-2.19.1
+	>=app-emacs/transient-0.7.7
+	>=app-emacs/with-editor-3.4.2
+	app-emacs/llama
+"
+BDEPEND="
+	${RDEPEND}
+	sys-apps/texinfo
+"
+RDEPEND+="
+	>=dev-vcs/git-2.44.2
+"
+
+DOCS=( ../README.md ../docs/AUTHORS.md ../docs/RelNotes )
+ELISP_TEXINFO="../docs/*.texi"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	default
+
+	echo "(setq ${PN}-version \"${PV}\")" > "./${PN}-version.el" || die
+}
--- a/app-emacs/osm/Manifest
+++ b/app-emacs/osm/Manifest
@ -1,5 +1,7 @@
 AUX 50osm-gentoo.el 67 BLAKE2B 0486bd17d60abb53433943335ed7584a0ab6f3b2a1dcdf23174e6f790f95044d4000d5b37a3b1c2549337268b5b296c6528e68e061ad75aaae8bf3ff141069f8 SHA512 b4aed2a5c285c94489371fa297a44d7bd3ac6172199cea0218d0469cf4c2d36b819ada8f3da6b0a95c44f729e4d77f5051826081137c0f68cd58829705ccc50e
 DIST osm-1.6.tar.gz 35738 BLAKE2B 295123c96a9f116959809405f08f72239c084e26796b727b0819eabba0c34eb847305c3460c9cf69da23098b4a25691a939a1821a3acd1e0cc0a6e6c29f2c51f SHA512 0130924d392149bbf31f69e7188543bb83fafab29f06d70be331dcc58c9b53fc7b8fc945ac1c37b6b69ff612872233a2e5f000a6116d883dac17698472adc6c9
+DIST osm-1.7.tar.gz 35741 BLAKE2B b2e49975d5a859180b10024a9ea7a6ed1d2bc795263d6be1b8957087e27cb86d767ee9eff76530874697ce6c583963e6bcf32bf03d80abe5c8b593b9363789e3 SHA512 dc121a31afa1c352e6f9e67e25af2dd4dfab824aa20c5321b8a6ad7abfa8cd884c5bd841d3385c99b0a3992704471943989881f1f64496a7bb889095c9912765
 EBUILD osm-1.6.ebuild 754 BLAKE2B fc911ac0a9ce80b6b8b35b63e849ff36ac88c9f6eaa7628c76ee7eb00306d15d3123ff655d9348dccdb7868f3b4fef16663052821cea27876c30a0a85fe39063 SHA512 dc290ca32d29f370dfa050f94dd0bc809f78ba5972ecf21758e9ec910eda9c2bcaae112aaac9ddc304705b210e89dfe668258c444658a5f0891e574118e0f8b3
+EBUILD osm-1.7.ebuild 755 BLAKE2B 348738d13b80e6db5965c4c66dfac10aeab0168fa9e7c708e981594efc14b2c52f62ac9170496ddcff9565c851f5f3bfa4ef1cfa4ddff09168e05053bf475808 SHA512 7ed6198e49ac3aa804d15addde6a0620b9a6f3bb48576de053980faedf77f1d01207ec52b35a207e2aac25505e768eb8dfe4664fe44f666d1b33a6be7946239c
 EBUILD osm-9999.ebuild 755 BLAKE2B 348738d13b80e6db5965c4c66dfac10aeab0168fa9e7c708e981594efc14b2c52f62ac9170496ddcff9565c851f5f3bfa4ef1cfa4ddff09168e05053bf475808 SHA512 7ed6198e49ac3aa804d15addde6a0620b9a6f3bb48576de053980faedf77f1d01207ec52b35a207e2aac25505e768eb8dfe4664fe44f666d1b33a6be7946239c
 MISC metadata.xml 1007 BLAKE2B f28de509f2c4d32cbc67695ed97d2e4231baaa56e29a55993bb6b6c85323bbab51ba6ea398d6b0f562cb93975c6c09a5962f7f504509c4a6dcf19a6efca08750 SHA512 8ea20302c01493f320e2ad72e2a3530088a9a7d8db5a72c33286f31e82ba4a60e1dcaf6c4a11ded416ad864c27bb42d3833aeda58b261ea054ab71cb5fd26736
--- a/app-emacs/osm/osm-1.7.ebuild
+++ b/app-emacs/osm/osm-1.7.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="28.1"
+
+inherit elisp
+
+DESCRIPTION="OpenStreetMap tile-based viewer for GNU Emacs"
+HOMEPAGE="https://github.com/minad/osm/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/minad/${PN}"
+else
+	SRC_URI="https://github.com/minad/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+BDEPEND="
+	>=app-editors/emacs-${NEED_EMACS}:*[jpeg,json(+),libxml2,png,svg]
+	>=app-emacs/compat-30.0.2.0
+"
+RDEPEND="
+	${BDEPEND}
+	net-misc/curl[ssl]
+"
+
+DOCS=( README.org )
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
--- a/app-emacs/transient/Manifest
+++ b/app-emacs/transient/Manifest
@ -1,8 +1,10 @@
 DIST transient-0.8.4.tar.gz 159360 BLAKE2B eee6d277278f2e02ce7ef2dffe8cb6dd84d2239fc7e209b995c446ba356aaff42cbbc0b805d98bd7bd246fd30028a7b15e95a49c9eae7914916c2bc9eec2256f SHA512 79930beb74700025fe1381e5e718b1d0b4ca83bda25cf64e056f56dacca8d02a52bef0a557863f55f106f3faf851fc62c7323077e7de3e6bfa7c4131ebd883e0
 DIST transient-0.8.5.tar.gz 160355 BLAKE2B 7e8f7a30ec854f7d7cb0ad81f3407567e1ab2b819b982c57c50da0d714050c6907a17946e11e7d3664388a1fde435b20bf2d417d1c92a56b0ff05fe8490b3317 SHA512 e57c0ae76da1406ec7f441475dc331581201b2d21f8dd58932326a9c046fd76f24399c55f7181dec023fa042ddf1fcc9d793650c2845eacb685c9baa79623472
 DIST transient-0.8.6.tar.gz 160700 BLAKE2B 4d7102079b56fc8ac8a77e40c8bcbce8312729a29bcfec63b7e55558f4f7c6ba113afbac9ce246305b2322b4cc930c6efa0d1b342da1f17c4a18e9622f59d26f SHA512 25c25d95bc6d438b4f80952eddef9cd0fabc360ff1e449bb259046cc7612c84932621fb326121492fda851317411c3df9524079874b10425ec53c0f7e004728c
+DIST transient-0.8.7.tar.gz 160616 BLAKE2B ebfcf579fd409b95557cad61890e87fa665c1890e1222e647197abfa2ebbc704b0437e4f64bba0ab7ce416124b298f1e85d9c9e8cade591be35e8530d47a1798 SHA512 bf4c5c16ce6b47faaf2355889f4709db6e29ec78d002e147a9fdf2e872494b3f07ed748db0541a18e31310519aacf66f4cdce10272d1c4c21397b56d41145913
 EBUILD transient-0.8.4.ebuild 819 BLAKE2B b87096327bbb2962384fd3e147eaa43ac97368c904aaab710305252e4963caf0d45b83999779f2c15eb9626c69b67886e630153277032a45334eab8ede2c6be3 SHA512 2172d2bae6a87c9d02b077767f423f8778d9b4dbebbc55bec6183d637d54b48f0aa88ec4cd07b3a3aa05636dd56eb7a306397f92e3cc8b57d9b3807c80e7fb1c
 EBUILD transient-0.8.5.ebuild 822 BLAKE2B 75d24cdcd5db56e6e600f17a1be732e80024d07ceae9290278c48333f9829f079bfa9dad762d95a11da080f7a265379e902e7dd8ff8d2eeb4e807697074ba134 SHA512 d6f022e066103cc0ea0e528adbeb0f668082cdc34bb5b9d0533751419ec4eb6eda54852fc4027cd270760942befb9b01748f5c6c2d5ac29d9fa857dd6df9b833
 EBUILD transient-0.8.6.ebuild 818 BLAKE2B de6cdf37b5e66776fd8107a1bd163760cd14489577a16fe419b4cf4a71d7a9ed971a088e04c41c45b393c4f3caf4cd4db0b3e8470e53d8566b56de5bab992a9b SHA512 6c422451ff895a0037b641665814c1d5e130bab396676bb1f4f62eb85b94df92b9e23b38139507f292001bcc8517f8d560c355ea24449b9624115f6b0e05580b
+EBUILD transient-0.8.7.ebuild 818 BLAKE2B de6cdf37b5e66776fd8107a1bd163760cd14489577a16fe419b4cf4a71d7a9ed971a088e04c41c45b393c4f3caf4cd4db0b3e8470e53d8566b56de5bab992a9b SHA512 6c422451ff895a0037b641665814c1d5e130bab396676bb1f4f62eb85b94df92b9e23b38139507f292001bcc8517f8d560c355ea24449b9624115f6b0e05580b
 EBUILD transient-9999.ebuild 822 BLAKE2B 75d24cdcd5db56e6e600f17a1be732e80024d07ceae9290278c48333f9829f079bfa9dad762d95a11da080f7a265379e902e7dd8ff8d2eeb4e807697074ba134 SHA512 d6f022e066103cc0ea0e528adbeb0f668082cdc34bb5b9d0533751419ec4eb6eda54852fc4027cd270760942befb9b01748f5c6c2d5ac29d9fa857dd6df9b833
 MISC metadata.xml 1434 BLAKE2B 6f7f91e2cd8c87559f15552d6fbe920e5262a50f21919a096af55df037726eb380a774cfba8be73b588ba9aa2c39da5caf6ad64a31106b843c6bd308fe7aa40e SHA512 3316d9ac21d2a2aa0a5824f2c8ded736ad1bfcd7319a9c4cb8b02f0ffec5f440820bfe48e4f4d4264fbc3864bd7959875f1396285b6a7eb2ad3333a6a062a14f
--- a/app-emacs/transient/transient-0.8.7.ebuild
+++ b/app-emacs/transient/transient-0.8.7.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Transient commands abstraction for GNU Emacs"
+HOMEPAGE="https://magit.vc/manual/transient/
+	https://github.com/magit/transient/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/magit/${PN}"
+else
+	SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	>=app-emacs/compat-30.0.2.0
+"
+BDEPEND="
+	${RDEPEND}
+	sys-apps/texinfo
+"
+
+DOCS=( CHANGELOG README.org "docs/${PN}.org" )
+ELISP_TEXINFO="docs/${PN}.texi"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	mv ./lisp/*.el . || die
+
+	elisp_src_prepare
+}
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/Show more
+++ b/Show more