gentoo auto-resync : 26:02:2025 - 19:26:07

7 files changed, 32 insertions, 16 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 96dc9105f068..064d41e047f9 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 161c640197bb..31513bdf9c68 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,27 +1,28 @@
 DIST emacs-18.59-patches-15.tar.xz 34104 BLAKE2B 9d14004d5188ec0ffe11099ae1beb431adfe159d220fc1b6f1d0be67da19b88911b66a206386beee9498bdcaa48e40a185755734cad2d60927c79bc8ddf0fa7d SHA512 c82cd8e81acf63addd137716a60191b916ee9ac9f8176661be1e8dd0f347f63f8ca8bf9d4d225141499dcbf4c20444eb6526cc3a3912a2d4136fb2bd295e2c26
 DIST emacs-18.59.tar.gz 2962652 BLAKE2B d617636daff41e672af2dcda26ec24b2495cf0a3e6373561ee26a2a922b7252c074dd6b79289d771853a4720c60f084f5726b904bf65989718173232ac874b0b SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33
-DIST emacs-26.3-patches-11.tar.xz 9760 BLAKE2B 0c104211d437cbabd2017b402587b51324e23942afe5fc2a7cab051a05d70476cc5d79a9c91d72442cfa212c74165f13de024f71817ee3b21ef990012b5598f3 SHA512 127db386c2ecdea973e6a7ec883ab86ce5b326c16987fc5eb7db1bc130db09319a972b9eac1798dcc4fa53e07406f112093d1eea9f5350d57a4373f961e373da
+DIST emacs-26.3-patches-12.tar.xz 13984 BLAKE2B e91785d9b41e396a4d823b913238deda9c37b38155d48125ce6ee674b9fc6779ae57439292fcd074db3f99ccf77263a4554dcd334d7b20fb81517634ce79edca SHA512 15bc05ba27dd77d0925476735ed344864f9e5c2a65e3ef468ff2af6fbd55086cf3d78fa1cd435e568c170ef5a34528e5ef297e9a570a0ed17de3aa6c3690a57c
 DIST emacs-26.3-patches-9.tar.xz 8168 BLAKE2B 5108fddebe75c188ad2f43e5b92c7b6f3f16645c64eafbbe850539918eac9cebb05e60e4343da62c695c068f51637e91762cb7d49536bb21ca82ef1144295b17 SHA512 9d3006b9d274606bb22b5b614d7c9d111b582e6cca3f83d0b71e5ae1aaba88ac702b756556ee7abd5b09c7964fdcc24d766661a2006c7f77f12d9f66a1ae2d6d
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.2-patches-10.tar.xz 15260 BLAKE2B 7e5771013e3912e0c3115d819be673399e5dc07b7fb4d8567b8666099049552ce539cfac92cc90762e517deaf6e7c46cbbbd207a4d9ac631ea8ea78cf93442ff SHA512 36f1410b70ff1a972d23919add6153497f1142bef654ac601149da7014eb1cf6bd05029877cc3262f572682b5d99b11d67cae24154b76d6e742e3ebd448865a3
-DIST emacs-27.2-patches-11.tar.xz 15552 BLAKE2B 42a23064268229adc6e90ba3342cd222698966b93dc39b75bebe0ebfc75142ebdc51c24a44a108dc7e96937fbcb763fb186da5444b27ac92b708004bc97cbb6e SHA512 688bc846ea999d56dedf06228c53e71df28048307bff8aa03207fe8b4ed5faa815ee975d3e2be65bfe0dedf972364dca625f7cb2cba2cf1812ae1dc735bb0bb4
+DIST emacs-27.2-patches-12.tar.xz 19632 BLAKE2B 280062e8361e63eecb4a2a33ff7d8c5ea9ce1d63dce7dce13a3e2f05ac60781722acecb7cebafaf88159d979810a8d8c742e43a9d9eb87ce126023dcd0827c8d SHA512 a7746631a3ec2f93a1cdd4bb7811d8655b43359c0b281e36b82415cdc6cdd776f94d642c652fdafdbc3452a8bc990d43d8e478f9d35cf221e98c03991ddc3146
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156 SHA512 0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9
-DIST emacs-28.2-patches-10.tar.xz 10992 BLAKE2B 324a28b3d74340dcafbca36af8550fe012b876651236fa9bbf7a1a8fca7da04d51260d4f7a5f065ec3de18adfaca9782cdc3e9b723c8910890c361315de5de97 SHA512 9892005b051bb092a1f3a8522ac2d29300b991cba22a281184d537388e73629c3db02be181bb9e4a7d98bfd2a405a222c334e018898109997804b6c087e3def6
+DIST emacs-28.2-patches-11.tar.xz 15056 BLAKE2B 7ae6c7a62a60ce9407b7e9a925a2f8097f17af2e1696036d7bc2b02e0e4b6d7b7e64b3f92d4d04775db962993f0a41e98eec83908e314157e9e072f6cb484892 SHA512 47e200deef2ee7154683e5efcf6b657b35391874deb1c13b7abb66b7a0e0065d1d5a720b618c2282a5059c03b0570766efdc2bb0d08bd329f855078a85928a3b
 DIST emacs-28.2-patches-8.tar.xz 10504 BLAKE2B fe21b417a79f6f22ac594168aaa786359d13509011992ab958a268764e520b5c2b2270415f118013de8672280bb4c2acb645ab014b8d26ab6f634778a91b90bb SHA512 9c8fc7c4a76fe4c9d742c4e3343b31f9b696483c1774388e23f7db92f5e78bfed3871e344899996bcba142dc782f6a13b6a3df9684c977b86225afaa97a0bab8
 DIST emacs-28.2.tar.xz 47722600 BLAKE2B a7e4990658b5e7306510f8dded93aaf0b82cdd9306df8b786526d038c3249ef9579287075f2235eb01a71ae1699db555254f137b86ab2d2305b45895053df552 SHA512 a7cec7e3e82367815a1442f69af54102dbfc434069810a9dec5938a6660cb8b076e6f1fb0bfff9695b15603dbbe05eb9c7dfd92e90cf40fc4d1e5746bce83bd8
 DIST emacs-29.4-patches-3.tar.xz 2364 BLAKE2B bf0d044ad0b12eeea1b87d76f143f3a542857eff6b29685abb2b37efd0105580cba2f4ca49655b4da6e13d3997e6c26f2966e597f66753b5321f6aa09f8c563d SHA512 4c6321a63a3f917f9644d464c74925fad0942caeb57966b2a5a0ed171eeb8987230b7039b2829f96526d205b4ad97fcc94f991ecdf7296d8dee355eb14d4df36
+DIST emacs-29.4-patches-4.tar.xz 6872 BLAKE2B ad701863650ac7ccd7bd77e73083c62e71b64c547ad05a1b7cc4384f9636a82d1218a5cfae11d8404e0d59c13632a975caa48851b004b9ad55d7f04fa2500f9d SHA512 659edf90ec73e424a635399155413c0c98e45a33d83c353c0e029333761354fa3008ed0b586c64e0b8afe5f5dd85bdeb3b3bfc731afd6869d24d653af5e1c8bf
 DIST emacs-29.4.tar.xz 52210344 BLAKE2B 825fd2665b6427dbc3cb618b40df2f71fa6b08883bdd07be6d8acf0039df2aeebd294e679e98f4c64a9dd9bdad93589fc7c176cf3860d4fb823fce23f7f2b3cd SHA512 66b38081cb01d2c46ff7beefb45986cc225b4c922c30712ad0d456c6cae5507176ed99418c8f26948c5375c8afde4e4b2507d23ed997dbb5392d12150a121d80
 DIST emacs-30.1.tar.xz 54978160 BLAKE2B ad502a2e15a04618f4766ec6e285739cb5bb6f19c5065c3aed03b3e50df590cee382a0331f382de6f13523f1362a4355f65961ce45504f7d33419ea6d04e326f SHA512 511a6a1d2a170a207913692e1349344b70a0b5202b8d1ae27dc7256e589c77ae9e35da16fc2a098bf9f1b8d0f60233f452ed8d6744b70b907f3484c42f2d7d7f
 EBUILD emacs-18.59-r15.ebuild 4497 BLAKE2B 21a6196ab04e75817c273796559a56747ae16ad914285a692e7fd3c3f9087573402e99aada6fe1cda72c0036f30839c637db87da3974957b6d567ab9739bcae2 SHA512 971e5e2d3c361f605d044c47528093df26aa120d01a2f3351a7c601f0bba6f57cebf3c6193f9cd14fe4c657e189561612dd9d26f1c54a29412bcfcc5a7c1b965
 EBUILD emacs-26.3-r19.ebuild 11823 BLAKE2B 0ddb554f48e9f62d06cd6df2a840436d516b2ed1301cd639ce19584ea9350d7ec765cf249fcfa7a1e7ff139f135bcd96aaacd2e20d450aee126d0d7c02915ec1 SHA512 10475df4b0c9685f0f3f491ecc625524146af1e850e60425ebdad46c288f2f7be57f0c98e899086cb7ee3a405f25c3c79b03f0dc4deee9b24e560690e6426354
-EBUILD emacs-26.3-r21.ebuild 11743 BLAKE2B d7ab3b40724ec14f676cf0a8c8cf87b6d00bd1f8bb8b881366d5634deabdb9fa6906c872021119ee76f44969249fd21d2f9e106d911dbe64d10bcbf64a9c4dd2 SHA512 f3f00d41dd29263b59ea0bc05107758b3360f25d032b37ed4a9afc1dbb921e9130490af89b43e9293822b618ad13cc59c317b83064f95e16b7e2d192dd7d93fc
+EBUILD emacs-26.3-r22.ebuild 11741 BLAKE2B 3aeff092463c9de99bd5700529833b944ac88daa0045af9ff0785e6be74cc7be4e38642d4b861fdd127839ca3b7caebb2a728f5d4f8e6f41a25baad3d3ee1866 SHA512 54df057925ab30d6f01ae1916c283203c5ed7bf40fa0077ffb3c47051eb63d39819dead33ffb6bf82676ff07257f4107ccf1b0e1d1ba9c189bbdd64cacfcaf5e
 EBUILD emacs-27.2-r17.ebuild 14555 BLAKE2B ec5198f984a704f270f95c574405b9621d5a7d8028b56a41ed0f8871ca1980a32079d944f79648ac40713cefbf7efc233e972a386f48fd77c8f3af12d0500e72 SHA512 a3b046c085fb41bc3d7979992d67b92c4f9124e23a6f98f3417a179029b05311a4ce3a7d718009bbb76e121e533793988f8c6f567c24f0ba2b52fc9f932a2224
-EBUILD emacs-27.2-r19.ebuild 14396 BLAKE2B 1a9f2febaeffdbc63b36eb9bd345b7052c13df6eb62087f6f0f32036d1832d94f9bb65f7431949f7309af1d9af0b5c9bb699c86dcb9d2801dcc5cb0774c0276e SHA512 e0560e467b27d88eaac27854aca27a737b0f7750020d173b2abc3e9d0f2e951aea64903fe5a135062f48700081f96e83e1a31d18e61445da80fbb5f095c92d89
+EBUILD emacs-27.2-r20.ebuild 14394 BLAKE2B 477192c1a04b9b5c04c3fa30c2976ef2d3911e694f5573fc0f4f579a624fda0ae3a1a9b827eba97910bef7b182c643aebdf32fc43dcd3919fdc249cdc0be10d2 SHA512 9107d139d955ae4882a4a13154c901a18be18df00ebe36e7b608d948ab97da892fef2cb0fa5a08daa85701b5a8c17ff0e0070026f794cf7b769fe77c89673bff
 EBUILD emacs-28.2-r13.ebuild 17522 BLAKE2B df13974f748f4b0b9c59e857c40b00625b21a2e541814ed4de745bae9dbd7213fdc25bbea690ca70b57fd2a35a0f884b282ea7c1707c6e6fbd672f8e8845f239 SHA512 97a04f0c3e505c85471825f97f0955dbaa01b8702e40b9a15e83c276ea9ad90865c804b86f766a0bd393ea892e0b11e57b151e8ff8cdc79539954cbe3262c2d1
-EBUILD emacs-28.2-r15.ebuild 17754 BLAKE2B 7eec37eec6a1b95017a658ef97dd4de48b9c60c7da08356dc74024b7d0e8cf593781614b180c764290c449654bf9674e5cbea72a2df9c4e4fd5fbf34b1c0f2a0 SHA512 0db2ef3952490296244fbc916fd415cd8fc0a8d9816800deaa6ff1c7fdcd3ebe20108c0288e5120f87633c6fa13ea00f363feee3c9826c5de255dceb19e6482b
-EBUILD emacs-29.4-r1.ebuild 20467 BLAKE2B f6447e33a787e5a708942a676cbe0bcaf6cde4492a6b569d0e882e4cf17218b388a7f5feadbbaac6ff2fff5ed9684bca584a765b721fdde7464c03691e8a0cae SHA512 3a8eb627298a7fa802599becbb06f8a6d18d8f0a091333e46cc4de733bebf4743bc6e07b52be8090a08133ef67cc87797da4387fee698d3810ec5496c44e9c01
+EBUILD emacs-28.2-r16.ebuild 17904 BLAKE2B 8366cae2ac716f90f3bb71250e0586f254c73d16cf1d02842ac02e47c8c5ecd3e6fbb0706f7df78813beffb6a636d8c2b212e9520d7831a9aa4557c4a571ed37 SHA512 aea4dee0ce7137b2953e2c678d53edcc41c095300c508e7ea0f866372833f0c3597758bc0bb1c9c168f91405b67ce39f6b3770b651692621d29667798876ef45
+EBUILD emacs-29.4-r2.ebuild 20617 BLAKE2B d1f63cef95c42faa26196ba9ddf30dbcfd5fcb39fc073cff3691a259e0104aaff881e276892c574e434cd430f500e3938c8047c7dccdfcb572caf8a943ae796e SHA512 ab1c0097823374ef717f591c4f544a0c5ba9b841a9392a490d63293d8eac393af4ee059c0172125dd36d5e84145912479cf8265b2f25a937c645782d9d905e79
 EBUILD emacs-29.4.ebuild 20313 BLAKE2B 1bed634eb42caf03b67df68474bf7d8b02b0f2086e8bbe820dd82096b81630af01fa184201fbc6c7b3797ff125ccf45b5dd465eae64443854781e9588acbd4d3 SHA512 d0ba494964d39737ed536e7e00a33212f215820971a449401ca6b60d7dc51715ae39f7fe6910e5673d7eba62683a1cc7d7dc20ef50e5dc5bb71c334f70387261
 EBUILD emacs-30.1.9999.ebuild 19721 BLAKE2B d733e8dfe2d50c378d9623318511261b3126ded86343e394b45c42f5ca7367c38f3c59951ad780f801cd8112e17a28bb5b3f79eb3f1d1efef91cd3faf18c04d7 SHA512 1fd1b140211aa5b9caf181818318f8a5b8e6b1230b1503f6ba47e7dac92e9d3cc1e1adec27d47f8a15c7ae2b9bc708db43dae7c2220c265008380c0f04fd594d
-EBUILD emacs-30.1.ebuild 19721 BLAKE2B d733e8dfe2d50c378d9623318511261b3126ded86343e394b45c42f5ca7367c38f3c59951ad780f801cd8112e17a28bb5b3f79eb3f1d1efef91cd3faf18c04d7 SHA512 1fd1b140211aa5b9caf181818318f8a5b8e6b1230b1503f6ba47e7dac92e9d3cc1e1adec27d47f8a15c7ae2b9bc708db43dae7c2220c265008380c0f04fd594d
+EBUILD emacs-30.1.ebuild 19873 BLAKE2B 9523f49a91d7e36eb6f40a8e73b66f023613881a7f5528334423f92e7cdd3b7622feae3a3205503f83fb6a385eee32003f0d3c6893aa10642c480ee42ddc39a0 SHA512 678e9717c26187b9a6cbd30434e17f5ec74124c9c0d30ddb217b07cae45e826b28d1b5c643552007b053ab83fa5408083e2a1e569517b1328c2a9f4dbb93954f
 EBUILD emacs-31.0.9999.ebuild 19719 BLAKE2B 02ca89e7f39c627f25cee7e7dbf71e5bf809d6373068fc8e07d205ec66558b6296dcc9c1f87ca5201b65cb07423b8eca6f4028bdd9f974a08f851b33c6309f57 SHA512 3fd7ffe69635347ab061764b55fab6d4093a7f5389899257e24fbbb28ecf8219ab521348017f39aa344d3ba09eb39c903a1bb3ecac559de0d4f7d382f529d5bc
 MISC metadata.xml 3434 BLAKE2B aaeef31ce265ae3b3c67ddfe01b3b41724b6fed7353e83f3efa1fe401944707391f3160d7cfea423802c67e78830387e210966f5fdc03a5a0a20b0e38f493b6d SHA512 2ad8128bfe05cbef0cdf19840e809918331c5e98976fb1af14127e0cb7adfba597ff83457a45079d1facd571953210c1650eb11b87d9bce2352e9ca865ebcc38
diff --git a/app-editors/emacs/emacs-26.3-r21.ebuild b/app-editors/emacs/emacs-26.3-r22.ebuild
index 82972fedc9c9..1e036d5f03ce 100644
--- a/app-editors/emacs/emacs-26.3-r21.ebuild
+++ b/app-editors/emacs/emacs-26.3-r22.ebuild
@@ -8,7 +8,7 @@ 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-11.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
@@ -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[games?,gui(-)?]
diff --git a/app-editors/emacs/emacs-27.2-r19.ebuild b/app-editors/emacs/emacs-27.2-r20.ebuild
index cef1c23feabf..5381d37a7144 100644
--- a/app-editors/emacs/emacs-27.2-r19.ebuild
+++ b/app-editors/emacs/emacs-27.2-r20.ebuild
@@ -32,11 +32,11 @@ else
 		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"
+	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"
+	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"
diff --git a/app-editors/emacs/emacs-28.2-r15.ebuild b/app-editors/emacs/emacs-28.2-r16.ebuild
index a086bdaa4926..9406902d7352 100644
--- a/app-editors/emacs/emacs-28.2-r15.ebuild
+++ b/app-editors/emacs/emacs-28.2-r16.ebuild
@@ -32,11 +32,11 @@ else
 		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-10.tar.xz"
+	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"
+	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"
@@ -405,6 +405,11 @@ src_test() {
 		# 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
diff --git a/app-editors/emacs/emacs-29.4-r1.ebuild b/app-editors/emacs/emacs-29.4-r2.ebuild
index 17fbf8c994e9..702be89e6722 100644
--- a/app-editors/emacs/emacs-29.4-r1.ebuild
+++ b/app-editors/emacs/emacs-29.4-r2.ebuild
@@ -32,11 +32,11 @@ else
 		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-3.tar.xz"
+	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"
+	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"
@@ -460,6 +460,11 @@ src_test() {
 		# 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
diff --git a/app-editors/emacs/emacs-30.1.ebuild b/app-editors/emacs/emacs-30.1.ebuild
index c41918367fa9..37393a545f4a 100644
--- a/app-editors/emacs/emacs-30.1.ebuild
+++ b/app-editors/emacs/emacs-30.1.ebuild
@@ -449,6 +449,11 @@ src_test() {
 		# 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+=(
 			%lisp/progmodes/eglot-tests.el
 			%src/emacs-module-tests.el