gentoo auto-resync : 24:03:2025 - 00:31:53

10 files changed, 11 insertions, 278 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 3a3da75992e0..37b2ca37e43b 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index c8d9b9fc0bf3..e2bb4b229ec5 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -15,19 +15,19 @@ 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 11739 BLAKE2B 09a7449386939a3f7b84690ddd91bb0077f36a4215ae1a7a85187856d0f80f6f3dd251c6fe88e6ad0cfd4b735d579dfa86f659ede061da499faa8ef6bcf2c35a SHA512 2c5451382e7c72414819160748e438624cbbe40d70a9bfae3631ea7e1cc35a807f4df65732401297dffb8e036464bd08263c7500444e98ca269f0ed85585bb8f
+EBUILD emacs-26.3-r22.ebuild 11738 BLAKE2B 887c8fd74ceecfbf7cdd677816fa0519f5988ea895c8c5a14271d5a2f1f62b97ef1d5405074559f90d8ac6a3a3ed1ea28b8ad432648159532b9084a80db6ac25 SHA512 45518f4f4661d8f25aaa3abd0e0e06e182fd6df93e91c34feace4d90949e43bbfab780c6f720375f6ed7a3023aa6049c87a354ab3a7bc55ba1c331d0773b42ae
 EBUILD emacs-26.3-r23.ebuild 11455 BLAKE2B 1c1dc19b7ad13ee5ebf7c246cd143a3c67b2ff2c102c4c591627525eea7bdfd7c7d9b3b8766bc2bc0b672a2d7428b516c2216efe0365c810c223912ab6508b2d SHA512 9dda5e4cbd2b71ec2681feb981b6924295f4bce0013f2155d5f1ceb090b4b3b4f4043135b16d952b7eb2ef6cfb9c16255c4f0cbd2ad178a7b9d1b8059545ab10
 EBUILD emacs-27.2-r17.ebuild 14555 BLAKE2B ec5198f984a704f270f95c574405b9621d5a7d8028b56a41ed0f8871ca1980a32079d944f79648ac40713cefbf7efc233e972a386f48fd77c8f3af12d0500e72 SHA512 a3b046c085fb41bc3d7979992d67b92c4f9124e23a6f98f3417a179029b05311a4ce3a7d718009bbb76e121e533793988f8c6f567c24f0ba2b52fc9f932a2224
-EBUILD emacs-27.2-r20.ebuild 14392 BLAKE2B 0ad701ee8a2ede1e7d973d8bdfa939e2cf0fd151144233fced3b1cda423f32bcb7aafea378d9697212dee2159d425003cf601ba9804efef4696fdd8f640b694d SHA512 bae6365e61843ef38c65ca6fc91bf4b93cffd9baa16574a89c64da593396a4bfe5b9d9f1558084f60238b103cbf9606de184a8aa6549fd04ed79f2fba9a5a3b4
+EBUILD emacs-27.2-r20.ebuild 14391 BLAKE2B 97baf61fcbd2510fa87f49101c0030165a7479b001a7ed72feda59503d8ba39f72b3ebbd48a71bf5107ce660a941300e5ce2567877c2ad912d3a6f5298186471 SHA512 1ffb75689ca93360ef672ffd20f82305a85e59168b95d1621e000970013d49d1621c2f7fedf955e6da7924b7f0ecb0da3a986cd4f1c4260b23c323beed10ea6e
 EBUILD emacs-27.2-r21.ebuild 14108 BLAKE2B 16478451362b4eb090359d668477adb2a056e3f729a53d4637e43830bfa9fec73513b1442b23dba44142c9fc1653a1a352f68aff535efdde319759729df47096 SHA512 012431b4e2ef749d104e020a98327dd33f51f7e360f93739b5c32dda3fbc152f3589c509243da2605c753d05711d8cf9a006ff100ff6dafbf7dc9887688768e4
 EBUILD emacs-28.2-r13.ebuild 17522 BLAKE2B df13974f748f4b0b9c59e857c40b00625b21a2e541814ed4de745bae9dbd7213fdc25bbea690ca70b57fd2a35a0f884b282ea7c1707c6e6fbd672f8e8845f239 SHA512 97a04f0c3e505c85471825f97f0955dbaa01b8702e40b9a15e83c276ea9ad90865c804b86f766a0bd393ea892e0b11e57b151e8ff8cdc79539954cbe3262c2d1
-EBUILD emacs-28.2-r16.ebuild 17902 BLAKE2B 912f38ded00db7f1983daa0f560f34ec8a216924576804bbd75ec0948656a4d2905dd5dc6ecd3fe7278a3f0faf88f276c6963ebe4cfb5cd1e28a6e91f156c4f6 SHA512 58ae5d63a935ab305b370dde75fa8ea923398ac3278e9f466921aacb716911a93dc0f648e2bc2a042567ef4149d57989803e69f9c4545c46ed0a9b4caa43536a
+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 20615 BLAKE2B 0d1f0089f8c3ec8eeac8f981d8bf2e67f2536c604322ad73cf04ee419c7d6a393406576a001d2f63a1eae22457faa89b8ff141e4755db8153d7d237c11e13adf SHA512 4575420e96128d26babc913d8832a607e5015a27804ef6e81b30e274491979a0459b4edb03a3428c4989d592869577abade6f0b863cffb127fd45a3a5693ff34
+EBUILD emacs-29.4-r2.ebuild 20614 BLAKE2B 013cacfee11ac98d4f8365062b8b2ecfcca5f26c69541f98d88c1eba491e463466276f2f7a2a857c6e2dabd03c7e2432ff4f3eb9289ccd8c5a7e8231574358ec SHA512 1571887a9bd777ee56cdee530c21b0f1798e420010d40b976e6636b2dcfcae0495c5d648d262cfe18e95d7d6c0164b9e4946fa585f547e20ede43db066006a7a
 EBUILD emacs-29.4-r3.ebuild 20335 BLAKE2B 539450b46da289783b0e6948cd3b9e0e36ce8741d014165238e43624094e21dcf32380d09aad8b6ba854aa93071dc4df3438a0c4e5119fc5a70ec854e491ffcd SHA512 6294b69c4676a9eaa7b544cc71ca75e9b26a004f59f3b62823ba7e805d8e4a4f478d4853512a43716e3cb37c2e23b80aee196266d54ab7580c730eacef7115d2
 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.9999.ebuild 19435 BLAKE2B 39d7fd87b2fffde2843d143d6e5ad5176162e06679261621d27f41cc0708df0c344f264de4fae956b228560f32d89d155e50dc5bafcbeecf297107ab10789009 SHA512 e4411e8af1ca0ee8df44bde8b1c5ca06695dadc30ae781df998ba8b788778119cd591e20b960e11ab0761f2c626db542831af19d6f5c0f41a5ee8906aafb8de6
 EBUILD emacs-30.1.ebuild 19873 BLAKE2B 9523f49a91d7e36eb6f40a8e73b66f023613881a7f5528334423f92e7cdd3b7622feae3a3205503f83fb6a385eee32003f0d3c6893aa10642c480ee42ddc39a0 SHA512 678e9717c26187b9a6cbd30434e17f5ec74124c9c0d30ddb217b07cae45e826b28d1b5c643552007b053ab83fa5408083e2a1e569517b1328c2a9f4dbb93954f
-EBUILD emacs-31.0.9999.ebuild 19415 BLAKE2B a437c3555a294d6d07577b6574e871ae37c508d8c5b12bbe7da5542359996b6f1b54512fd0f1deff4569d5a40e1e13c3b1860ebd61aa9c17dcc1d0e672371f89 SHA512 d5d7989e358f097f6e040ebac0286ee8696b8a6d64eb8b8f7c4e98422078b59f7f20241f14dc91bbd706746c34b16d84eceb4f4496a912c93038a9beb6f36301
+EBUILD emacs-31.0.9999.ebuild 19294 BLAKE2B 30c8751009b7540b9b7733eb5b0dbf050b97f9cc5f798f6809d5fb92c97d6c0671763a107d4c50ee9b18aeb5ee3caaec628e24c6e1b19062c991af0c605b65dc SHA512 a1a707b2e3a1ddd00c6966ca56fb1eebd87f2ab96043c02d21bdd1f7ba8098735cb13f00825a6dadf395330cf380ad70c38a2f521a9ba32a672b41440dd3321b
 MISC metadata.xml 3434 BLAKE2B aaeef31ce265ae3b3c67ddfe01b3b41724b6fed7353e83f3efa1fe401944707391f3160d7cfea423802c67e78830387e210966f5fdc03a5a0a20b0e38f493b6d SHA512 2ad8128bfe05cbef0cdf19840e809918331c5e98976fb1af14127e0cb7adfba597ff83457a45079d1facd571953210c1650eb11b87d9bce2352e9ca865ebcc38
diff --git a/app-editors/emacs/emacs-26.3-r22.ebuild b/app-editors/emacs/emacs-26.3-r22.ebuild
index 4c43c90288a3..ea58d7c52287 100644
--- a/app-editors/emacs/emacs-26.3-r22.ebuild
+++ b/app-editors/emacs/emacs-26.3-r22.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[games?,gui(-)?]
diff --git a/app-editors/emacs/emacs-27.2-r20.ebuild b/app-editors/emacs/emacs-27.2-r20.ebuild
index 4ac4586780fd..febdebdf830b 100644
--- a/app-editors/emacs/emacs-27.2-r20.ebuild
+++ b/app-editors/emacs/emacs-27.2-r20.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"
diff --git a/app-editors/emacs/emacs-28.2-r16.ebuild b/app-editors/emacs/emacs-28.2-r16.ebuild
index 46c8fa03b7aa..6ce00610900a 100644
--- a/app-editors/emacs/emacs-28.2-r16.ebuild
+++ b/app-editors/emacs/emacs-28.2-r16.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"
diff --git a/app-editors/emacs/emacs-29.4-r2.ebuild b/app-editors/emacs/emacs-29.4-r2.ebuild
index 9aee5d3795e7..0d18f8814f7c 100644
--- a/app-editors/emacs/emacs-29.4-r2.ebuild
+++ b/app-editors/emacs/emacs-29.4-r2.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"
diff --git a/app-editors/emacs/emacs-31.0.9999.ebuild b/app-editors/emacs/emacs-31.0.9999.ebuild
index 04a7d9a6a228..ca9ff8677e41 100644
--- a/app-editors/emacs/emacs-31.0.9999.ebuild
+++ b/app-editors/emacs/emacs-31.0.9999.ebuild
@@ -202,9 +202,6 @@ src_prepare() {
 		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.
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index a4758852e85f..c993c3f1cf59 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -13,7 +13,6 @@ DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cf
 DIST xemacs-21.5.35-info-handle-compress.patch.xz 7852 BLAKE2B 61b8d3a7d63d76311cdbb10153101ea8546ff5e4c8d6345750e44b7e80dfe7afb280dfa847097163fcb92888e5abd837c1a932170a3c362de7a523fc019269f5 SHA512 6c83a4b739075c6da88ba56b84b8521ceb1f34dc71ea51b7fbdb992b459794a3f479ea7db5df777d6497291e2eed8e33809edf5d7572822007f599cdd57955f8
 DIST xemacs-21.5.35-ootags-boolint.patch.xz 7660 BLAKE2B 9567cebeea7828dd7a207e627c4a21d49ef129ea7cf92defde67c068aab6694d0c7f70d90648b9177cea8b6ea3fc3734e1f65f1821b5e4c820df507bb6d6835b SHA512 f43656a5e4c9781e2250fca7f8750bbc131223f4a252dfdfc6315e06ac578974877ac0bbc695f957ade5a7960c4257b090ee34199965110da28851e58986e985
 DIST xemacs-21.5.35.tar.gz 16403617 BLAKE2B efab8d3d984ec2223913b09ff1abc9f2df187fb5b8c2ccf99fcfc60c86369f4411cffd48b03532d53329bd5b3d3149271a445da4c0a3cd7bdc2834021b1297b3 SHA512 e592af6ffbb6f95299039de28f59ee770bf62f54a15b1358b9d1059ed25dcb410c01dcf6e88c1d2196d54f0c6902f309d709fe003accee82e516023fa4363019
-EBUILD xemacs-21.5.35-r6.ebuild 7534 BLAKE2B 9b36a46f43c215389dcc77bea0f3fe27c6d0da75756223eb15ea02750af002631da51d9153a1fd64744c7f5d3a8fc45a022378d9877e428a7e848d9ce223bac1 SHA512 71b6bcec57277e36a9b5689fe98a1c23d37e73141d9cc73e9641520cbe3dfd1651bd8413168f8fa88597a467c505c77c189a5e530711fd6852f96940c49f7046
-EBUILD xemacs-21.5.35-r8.ebuild 7647 BLAKE2B 1f4f62680511c26e40551a7345f35985d09f8cfec3ef410a5f38e1c41e5dbb3c49d55cd3f380434bdbf6e908f8c27c83330859b428ceca81ee189fa92b9b78d7 SHA512 d5b1c0e49020bd6ea1361acab2199d77d6556b39a385337d032b03c359f934dc2376f2e14affdc3ef659f870dfea4ff8d34bf421a5a6679b4ebcf9a29da74124
+EBUILD xemacs-21.5.35-r8.ebuild 7641 BLAKE2B 6cd3ad31cb3a76bdc00c1e61294232b21d0082077ca73657db7074d301d5dbb3762ceb8ea470439c4bc5f8b1fae547f1ac9b7dea72265c9836d2bd2da8b45885 SHA512 6dd0313828785b31ce84a047c0840cea0d731ca622592673781ad72181063da0cd48379f14707edec614a11e34ce9374e4ee8fe82188330c5ca5ef44d6e889a3
 EBUILD xemacs-21.5.9999.ebuild 7039 BLAKE2B 3401ac584e443e62e755e64d86b0a0dd4027bec6f807b6a82469da457f42cb95c7ef392bdd609af3e502bc6d8dbd00786eb78fa3710395782ae2f420f2d54e5c SHA512 3e36df884d4548189fa486408dd6990ef0913e4bcd47f2d2f2ca1d1022e882e277108c555a793326787b10809bd38fee282d9f5d6b007e6cf8c24da507a1b722
 MISC metadata.xml 493 BLAKE2B c7a32db428883c28b8ddf1aab3e899d2ce022a7b61eed05dd16a6152bf5f525e5e32a90ff4c8362b5dc49f5a262f0f21bd29425f9bc16ba5d1d1fcd9b3b85de2 SHA512 55a343e9e8713b1167034409dce6f5729d1818ef20aa4164980d0f25e7d929d3bb7772968fbad30cd01973eb7d6a3bafc491b60070a3ab41238fe032e4e2170d
diff --git a/app-editors/xemacs/xemacs-21.5.35-r6.ebuild b/app-editors/xemacs/xemacs-21.5.35-r6.ebuild
deleted file mode 100644
index 99c86bee5d66..000000000000
--- a/app-editors/xemacs/xemacs-21.5.35-r6.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: xemacs currently does not work with position independent code
-# so the build forces the use of the -no-pie option
-
-EAPI=8
-
-inherit flag-o-matic xdg-utils desktop autotools
-
-DESCRIPTION="highly customizable open source text editor and application development system"
-HOMEPAGE="https://www.xemacs.org/"
-
-SRC_URI="http://ftp.xemacs.org/pub/xemacs/xemacs-$(ver_cut 1-2)/${P}.tar.gz
-	https://dev.gentoo.org/~matsl/${P}-ootags-boolint.patch.xz
-	https://dev.gentoo.org/~matsl/${P}-info-handle-compress.patch.xz
-	neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-IUSE="alsa debug gif gpm pop postgres ldap xface nas X jpeg tiff png motif xft xim athena neXt Xaw3d gdbm berkdb +bignum"
-
-X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
-
-RDEPEND="
-	berkdb? ( >=sys-libs/db-4:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3:=[berkdb(+)] )
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/openssl-0.9.6:0=
-	>=media-libs/audiofile-0.2.3
-	gpm? ( >=sys-libs/gpm-1.19.6 )
-	postgres? ( dev-db/postgresql:= )
-	ldap? ( net-nds/openldap:= )
-	alsa? ( media-libs/alsa-lib )
-	nas? ( media-libs/nas )
-	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
-	motif? ( >=x11-libs/motif-2.3:0[xft=] )
-	athena? ( x11-libs/libXaw )
-	Xaw3d? ( x11-libs/libXaw3d[unicode(+)] )
-	xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 )
-	neXt? ( x11-libs/neXtaw )
-	xface? ( media-libs/compface )
-	tiff? ( media-libs/tiff:= )
-	png? ( >=media-libs/libpng-1.2:0 )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	>=sys-libs/ncurses-5.2:=
-	>=app-eselect/eselect-emacs-1.15
-	bignum? ( dev-libs/openssl )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-BDEPEND="sys-apps/texinfo"
-
-PDEPEND="app-xemacs/xemacs-base
-	app-xemacs/mule-base"
-
-src_unpack() {
-	default_src_unpack
-}
-
-src_prepare() {
-	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
-	find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
-	eapply "${FILESDIR}/${P}-configure.patch"
-	eapply "${FILESDIR}/${P}-mule-tests.patch"
-	eapply "${FILESDIR}/${P}-configure-libc-version.patch"
-	eapply "${FILESDIR}/${P}-which.patch"
-	eapply "${FILESDIR}/${P}-misalignment.patch"
-	eapply "${FILESDIR}/${P}-va_args.patch"
-	eapply "${FILESDIR}/${P}-linker-flags.patch"
-	eapply "${WORKDIR}/${P}-ootags-boolint.patch"
-	eapply "${FILESDIR}/${P}-unknown-command-test.patch"
-	eapply "${WORKDIR}/${P}-info-handle-compress.patch"
-
-	eapply_user
-
-	eautoconf
-
-	# Some binaries and man pages are installed under suffixed names
-	# to avoid collions with their GNU Emacs counterparts (see below).
-	# Fix internal filename references.
-	sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
-	sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
-	sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die
-}
-
-src_configure() {
-	local myconf=""
-
-	# bug #639642
-	test-flags -no-pie >/dev/null && append-flags -no-pie
-	filter-flags -pie
-
-	if use X; then
-
-		myconf="${myconf} --with-widgets=athena"
-		myconf="${myconf} --with-dialogs=athena"
-		myconf="${myconf} --with-menubars=lucid"
-		myconf="${myconf} --with-scrollbars=lucid"
-		if use motif ; then
-			myconf="--with-widgets=motif"
-			myconf="${myconf} --with-dialogs=motif"
-			myconf="${myconf} --with-scrollbars=motif"
-			myconf="${myconf} --with-menubars=lucid"
-		fi
-		if use athena or use Xaw3d ; then
-			myconf="--with-scrollbars=athena"
-		fi
-
-		if use Xaw3d; then
-			myconf="${myconf} --with-athena=3d"
-		elif use neXt; then
-			myconf="${myconf} --with-athena=next"
-		else
-			myconf="${myconf} --with-athena=xaw"
-		fi
-
-		myconf="${myconf} $(use_with tiff )"
-		myconf="${myconf} $(use_with png )"
-		myconf="${myconf} $(use_with jpeg )"
-		myconf="${myconf} $(use_with xface )"
-
-		use xft && myconf="${myconf} --with-xft=emacs,tabs,menubars,gauges" ||
-			myconf="${myconf} --with-xft=no"
-
-	else
-		myconf="${myconf}
-			--without-x
-			--without-xpm
-			--without-dragndrop
-			--with-xft=no
-			--with-gif=no"
-	fi
-
-	if use xim ; then
-		if use motif ; then
-			myconf="${myconf} --with-xim=motif"
-		else
-		myconf="${myconf} --with-xim=xlib"
-		fi
-	else
-	  myconf="${myconf} --with-xim=no"
-	fi
-
-	myconf="${myconf} --without-wnn"
-
-	# This determines the type of sounds we are playing
-	local soundconf="native"
-
-	# This determines how these sounds should be played
-	use nas	&& soundconf="${soundconf},nas"
-	use alsa && soundconf="${soundconf},alsa"
-
-	myconf="${myconf} --with-sound=${soundconf}"
-
-	if use gdbm || use berkdb ; then
-		use gdbm   && mydb="gdbm"
-		use berkdb && mydb="${mydb},berkdb"
-
-		myconf="${myconf} --with-database=${mydb}"
-	else
-		myconf="${myconf} --without-database"
-	fi
-
-	if use debug ; then
-		myconf="${myconf} --with-debug"
-		# bug #924339
-		append-flags -fno-strict-aliasing
-	else
-		myconf="${myconf} --with-optimization --with-cflags-debugging="
-	fi
-
-	use bignum && myconf="${myconf} --with-bignum=openssl" ||
-		myconf="${myconf} --with-bignum=no"
-
-	econf ${myconf} \
-		$(use_with gif ) \
-		$(use_with gpm ) \
-		$(use_with postgres postgresql ) \
-		$(use_with ldap ) \
-		$(use_with pop ) \
-		--prefix=/usr \
-		--with-mule \
-		--with-unicode-internal \
-		--without-canna \
-		--with-ncurses \
-		--with-msw=no \
-		--with-mail-locking=flock \
-		--with-site-lisp=yes \
-		--with-site-modules=yes \
-		--enable-option-checking=no \
-		--with-last-packages=/usr/lib/xemacs
-}
-
-src_compile() {
-	emake EMACSLOADPATH="${S}"/lisp
-}
-
-src_install() {
-	emake prefix="${ED}"/usr \
-		mandir="${ED}"/usr/share/man/man1 \
-		infodir="${ED}"/usr/share/info \
-		libdir="${ED}"/usr/$(get_libdir) \
-		datadir="${ED}"/usr/share \
-		install
-
-	# Rename some applications installed in bin so that it is clear
-	# which application installed them and so that conflicting
-	# packages (emacs) can't clobber the actual applications.
-	# Addresses bug #62991.
-	for i in b2m ctags etags gnuclient gnudoit gnuattach; do
-		mv "${ED}"/usr/bin/${i} "${ED}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
-	done
-
-	# rename man pages
-	for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
-		mv "${ED}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
-	done
-
-	# install base packages directories
-	dodir /usr/lib/xemacs/xemacs-packages/
-	dodir /usr/lib/xemacs/site-packages/
-	dodir /usr/lib/xemacs/site-modules/
-	dodir /usr/lib/xemacs/site-lisp/
-	dodir /usr/lib/xemacs/mule-packages
-
-	# remove extraneous info files
-	cd "${ED}"/usr/share/info
-	rm -f dir info.info texinfo* termcap* standards*
-
-	cd "${S}"
-	dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README*
-
-	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
-
-	domenu "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_postinst() {
-	eselect emacs update ifunset
-	eselect gnuclient update ifunset
-	xdg_desktop_database_update
-
-	einfo "If you are upgrading from XEmacs 21.4 you should note the following"
-	einfo "incompatibilities:"
-	einfo "- Mule-UCS is no longer supported due to proper UTF-8 support in XEmacs 21.5"
-	einfo "- The X resource class has changed from Emacs to XEmacs,"
-	einfo "  settings in your .Xdefaults file should be updated accordingly."
-
-	if use xft;
-	then
-	  einfo "You have enabled Xft font support. Xft requires font names to be provided"
-	  einfo "in a different way, so you may need to adjust your .Xdefaults accordingly."
-	fi
-}
-
-pkg_postrm() {
-	eselect emacs update ifunset
-	eselect gnuclient update ifunset
-	xdg_desktop_database_update
-}
diff --git a/app-editors/xemacs/xemacs-21.5.35-r8.ebuild b/app-editors/xemacs/xemacs-21.5.35-r8.ebuild
index abd1600b2156..4dc04a198c3a 100644
--- a/app-editors/xemacs/xemacs-21.5.35-r8.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.35-r8.ebuild
@@ -18,7 +18,7 @@ SRC_URI="http://ftp.xemacs.org/pub/xemacs/xemacs-$(ver_cut 1-2)/${P}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 IUSE="alsa debug gif gpm pop postgres ldap xface nas X jpeg tiff png motif xft xim athena neXt Xaw3d gdbm berkdb +bignum"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"