gentoo auto-resync : 21:11:2024 - 03:03:00

25 files changed, 318 insertions, 126 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 1f4e691e8047..19eead41910e 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index f5acda2a5b42..ee1eb22a183e 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -9,23 +9,21 @@ DIST emacs-27.2.tar.xz 44624480 BLAKE2B 245ea96004b90f81ac74de74521cbbe086caf117
 DIST emacs-28.2-patches-8.tar.xz 10504 BLAKE2B fe21b417a79f6f22ac594168aaa786359d13509011992ab958a268764e520b5c2b2270415f118013de8672280bb4c2acb645ab014b8d26ab6f634778a91b90bb SHA512 9c8fc7c4a76fe4c9d742c4e3343b31f9b696483c1774388e23f7db92f5e78bfed3871e344899996bcba142dc782f6a13b6a3df9684c977b86225afaa97a0bab8
 DIST emacs-28.2-patches-9.tar.xz 10792 BLAKE2B 3755959c1bcaa8d375cc8fc617483143bc5db47dc27233c2db7164c1ef4edb9868e445eb1825623c5d6cb6c33c4141ac8c76f939fd00ea6e8d5c4f3e51b8fee7 SHA512 512568b27e177477e22f514462fc4ec3e19828333513f5e2acdf19fcb07594857b8b1934be3643e5d5ce34b2ca51a20cec99d772e1ca3e0295f75181f091e5ef
 DIST emacs-28.2.tar.xz 47722600 BLAKE2B a7e4990658b5e7306510f8dded93aaf0b82cdd9306df8b786526d038c3249ef9579287075f2235eb01a71ae1699db555254f137b86ab2d2305b45895053df552 SHA512 a7cec7e3e82367815a1442f69af54102dbfc434069810a9dec5938a6660cb8b076e6f1fb0bfff9695b15603dbbe05eb9c7dfd92e90cf40fc4d1e5746bce83bd8
-DIST emacs-29.3-patches-4.tar.xz 3376 BLAKE2B 966aef4036b48d11cbd0e901f78afb5c1d6eb0e12dc88c0b3e18cc093f19d268b15d760d281719f12e106daaa82f61b4bb32e23d4041d9636f0832653b914506 SHA512 22cf97583c659c0bde0a6f9beb9b5ea783eb3cfe777e0c84d0784ae2f1652e7de284d77f240a832902d12f6d73a309e55c34552e0de449595212e59afde39088
-DIST emacs-29.3.tar.xz 52203168 BLAKE2B 73651c52e508d5341f66659bbaf98e839040239198cb66f62239f489a961794adf837d9a14e9b605f059b7b612803e0ce5998ec47100ba545db642baacdb55ec SHA512 efaecfc46a0b88f61de477d92c08ee592b8838e6c34724151a3b1502efa7ebd4d4837733c694807e6de1ba4b8d37d2ec382c6bb2ed000b67ad8f0e11c7df2a6b
 DIST emacs-29.4-patches-3.tar.xz 2364 BLAKE2B bf0d044ad0b12eeea1b87d76f143f3a542857eff6b29685abb2b37efd0105580cba2f4ca49655b4da6e13d3997e6c26f2966e597f66753b5321f6aa09f8c563d SHA512 4c6321a63a3f917f9644d464c74925fad0942caeb57966b2a5a0ed171eeb8987230b7039b2829f96526d205b4ad97fcc94f991ecdf7296d8dee355eb14d4df36
 DIST emacs-29.4.tar.xz 52210344 BLAKE2B 825fd2665b6427dbc3cb618b40df2f71fa6b08883bdd07be6d8acf0039df2aeebd294e679e98f4c64a9dd9bdad93589fc7c176cf3860d4fb823fce23f7f2b3cd SHA512 66b38081cb01d2c46ff7beefb45986cc225b4c922c30712ad0d456c6cae5507176ed99418c8f26948c5375c8afde4e4b2507d23ed997dbb5392d12150a121d80
 DIST emacs-30.0.91.tar.xz 54782188 BLAKE2B 9ef6f6bcca6b33fb9f70530ff1bb2ff8d56d88d201b8a9267d503e75f23efdb6e9707353495d1c504fbdd26a6a260d39cf98077188f41d65118af21e02715069 SHA512 43dd5d21dab16d88c1ca2e430a11dad1e4a7e173f217f5762aea0b6e68b526c6486a9e2856622c1f9aa06553192d2d0fa04454115f1e77e221b14b6b03dc31b6
 DIST emacs-30.0.92.tar.xz 54813380 BLAKE2B adb5eb9e9b8f6eb059688d28730276db07ac82878bc56c98f68c790053d7d7803c16e7898dc2497464d2394c6778e917104df7f0ca869c48decc5c4e41feac1a SHA512 d5cf786733986d8233379859eb15d382c69e71737b790a8732d66818361e1632c9137c26a14534ad14baa4f38bfdc5e4e3e0d94017cfe54586693067e5ff7d05
-EBUILD emacs-18.59-r15.ebuild 4452 BLAKE2B 054147542f5dcdb5fb86d07194e231ff00babde084c417a648516753cf276e0e65a4da3f78c0154bf31d3f410c4afcdf9ccbeaa2a1275c29fd01aacc15fd6d70 SHA512 c1c377cd37bec24c0b845123f109d69de113c22ce85eac9a9efd4b063f7c2c2f07666f7dbf93cf2c9c89d1b15290ba63f1e83e446a245e27c2d8a4b6ef15c9e2
+EBUILD emacs-18.59-r15.ebuild 4463 BLAKE2B 3267a4c5911926609cde01416dcc7cb21f50f3c2faaa7a9ee946d1547fecad96f0b7e41036d1ec661571a67565ce477c66d321be100a6d29e18066f939e0e9c3 SHA512 0f027571450d78913531cd91af1cb0091543fd35df3ab86a07b981d5cf7deaffe705279abfd59b59dafade81758b867f7365411ce1276bcd2c142e2daabb1bde
 EBUILD emacs-26.3-r19.ebuild 11823 BLAKE2B 0ddb554f48e9f62d06cd6df2a840436d516b2ed1301cd639ce19584ea9350d7ec765cf249fcfa7a1e7ff139f135bcd96aaacd2e20d450aee126d0d7c02915ec1 SHA512 10475df4b0c9685f0f3f491ecc625524146af1e850e60425ebdad46c288f2f7be57f0c98e899086cb7ee3a405f25c3c79b03f0dc4deee9b24e560690e6426354
-EBUILD emacs-26.3-r20.ebuild 11832 BLAKE2B 1a5360e5822b1a44d08a16dd882106580dc644b652c4935bd2b5679e9615af936b43e7c3e2323021c5736e2d018888e7779d3668aca382c95f09278541f92ce0 SHA512 b65df06886a735bda7f028b8f997a05ed0eecf29fbdd53032085224fcb92f9af768e0af74f0634b01ceae292e542869b9362c71f12bc1c99e3d4ca600b506ae9
+EBUILD emacs-26.3-r21.ebuild 11812 BLAKE2B 61162c30a1be148b81b4fd1cc8329e6efab0fde20f8c4c1896f2ae4a1694d0567789509a9d4445859ead2e81dbe215e1c7d0a5bb7543cf8d9ce864578de792a1 SHA512 3f44f01ddb72b987e7d88705dada66d2486a012128d012e1f9a21d26cf9f2777841b8cd0101a3d475f8b90d735dc5c0ef0bedaa7d7d1e8c7173e1ef7cc739e0b
 EBUILD emacs-27.2-r17.ebuild 14555 BLAKE2B ec5198f984a704f270f95c574405b9621d5a7d8028b56a41ed0f8871ca1980a32079d944f79648ac40713cefbf7efc233e972a386f48fd77c8f3af12d0500e72 SHA512 a3b046c085fb41bc3d7979992d67b92c4f9124e23a6f98f3417a179029b05311a4ce3a7d718009bbb76e121e533793988f8c6f567c24f0ba2b52fc9f932a2224
-EBUILD emacs-27.2-r18.ebuild 14563 BLAKE2B c446cd0871a3fffc4474acf0567904ae07005b99ed72984a4ed95ad599f1df82527568913dc5ec7a735d671e81864cfa86097649ef346e1fd9522d790e1ef0c2 SHA512 b6dd2356e3be5a92547a78456bd409c022c1c2d99848fac0a5210adde9b7637d13248d68ba6eaa8bb0fbce8f1f82303792de2aefb47a9e1ba478516d0317f9b6
+EBUILD emacs-27.2-r19.ebuild 14543 BLAKE2B 12428ddedc93efbb747ef77260c062d7c7494ed6dcc0f362cb2c74488b995bd811895aae0a08e5ca967e37a571ec8c2c38b58f35d3ea8101792ba06eec08fce5 SHA512 917b47f5326034fcb033181c1e9faba712b9aa0553ee2677682eec2f7ef8dd57ccf1775b99305a768aea61b6b2714659afa1e6393a51f3b7abf535d6bfea924e
 EBUILD emacs-28.2-r13.ebuild 17522 BLAKE2B df13974f748f4b0b9c59e857c40b00625b21a2e541814ed4de745bae9dbd7213fdc25bbea690ca70b57fd2a35a0f884b282ea7c1707c6e6fbd672f8e8845f239 SHA512 97a04f0c3e505c85471825f97f0955dbaa01b8702e40b9a15e83c276ea9ad90865c804b86f766a0bd393ea892e0b11e57b151e8ff8cdc79539954cbe3262c2d1
-EBUILD emacs-28.2-r14.ebuild 17530 BLAKE2B 5f9ec381b66fd62f5e2cb9ed41b6e3d06604a26ea55d27e4a46a6feb4b0b5933a0accb70923eb2eed2ef7523a09bc287930946f1ecb3f071c7c7d083c67ff08b SHA512 015eb42b1dad4bab6bf542f4702dae29454acb2009fefddd7b29a107a26bb6b20a67da1eb3e13377ac24b0f37a965d4205cdc9b5fb982706f53fcb2db327b2c3
-EBUILD emacs-29.3-r3.ebuild 20263 BLAKE2B 8f032628862d78b46174a8159a12f19a7dcbd843e488d702f6a233801829c87bb4288c43a0b59f0a4bffd9b17e930008d94d271e16999e2527c6b930d52b8d22 SHA512 a23634b49af2323cc603a131859c1ddd15995610c729e19a5e4e5cb2b441a42b812a9893448ca21324e4a07f162efc15e71c885d749ac6124b7f5927896f28bc
+EBUILD emacs-28.2-r15.ebuild 17510 BLAKE2B 2a1c77c820d7b2f49457f036d50d3f680460d5d9b129a1ab89e9bf43bdc2069d58a1297241ec71a15e4d64046c1997a034cd1ada75a799e994567d596b21e1c0 SHA512 6158fce05396eba07e8f9f688d38553f70cacfdd80a813f8f3186172d398b5af38fd5101f733bd1b1b82abdc0aa3d563a364090a963caa25c7278067b1487e65
+EBUILD emacs-29.4-r1.ebuild 20301 BLAKE2B d6719d2a5914e01b8ac04bb6ee2e33ec43341b1c7ea5cf40f57909d7a49ddfc6ef6df521d54e7eb35c5292f06cb90fbe6378a6b843d9680d063fbea6aedfccc5 SHA512 3ace46b503fc4216130bc1f7d540a12f0b6bf891898e1e793f018b32040f75b3d06db0aafd63feca9c4e3add68a9673a10eb87642de586598a207e63f3c560cf
 EBUILD emacs-29.4.ebuild 20313 BLAKE2B 1bed634eb42caf03b67df68474bf7d8b02b0f2086e8bbe820dd82096b81630af01fa184201fbc6c7b3797ff125ccf45b5dd465eae64443854781e9588acbd4d3 SHA512 d0ba494964d39737ed536e7e00a33212f215820971a449401ca6b60d7dc51715ae39f7fe6910e5673d7eba62683a1cc7d7dc20ef50e5dc5bb71c334f70387261
-EBUILD emacs-30.0.91.ebuild 19912 BLAKE2B 10e286ce3b148b00a141a2e7fcda409b4d435d086d9fc36d70e7fe80297622de7bf4f71f1c0891d5568d1b1eab84ac43be7e445465b84131628eedb27cfbab2b SHA512 974d515f958201512ab3970fc85f0e52970906e1c75879fee6eb65cd5b0f03abedc9a085bd86ffdd2f56e2fed0fe7fce5e16c706bce9c1c94318947a8f896b6d
-EBUILD emacs-30.0.92.ebuild 19912 BLAKE2B 10e286ce3b148b00a141a2e7fcda409b4d435d086d9fc36d70e7fe80297622de7bf4f71f1c0891d5568d1b1eab84ac43be7e445465b84131628eedb27cfbab2b SHA512 974d515f958201512ab3970fc85f0e52970906e1c75879fee6eb65cd5b0f03abedc9a085bd86ffdd2f56e2fed0fe7fce5e16c706bce9c1c94318947a8f896b6d
-EBUILD emacs-30.0.9999-r1.ebuild 19912 BLAKE2B 10e286ce3b148b00a141a2e7fcda409b4d435d086d9fc36d70e7fe80297622de7bf4f71f1c0891d5568d1b1eab84ac43be7e445465b84131628eedb27cfbab2b SHA512 974d515f958201512ab3970fc85f0e52970906e1c75879fee6eb65cd5b0f03abedc9a085bd86ffdd2f56e2fed0fe7fce5e16c706bce9c1c94318947a8f896b6d
-EBUILD emacs-31.0.9999.ebuild 19910 BLAKE2B 818482ea630b65111461e2ff1c68d803edfa020cab07e22c1e872f905b00619484df13cafe267d504e7712fb51d1bc323b7b11d4f61ae820bca572358ae883d3 SHA512 0ffc027a1dabcea82b5d525e0fa151fd98ee57a48c8208d576ecc7ced8a955fbc4d1bd932f9909bf1faaac35dc60988b0e70c09cd52919eadd4eba26df30a253
+EBUILD emacs-30.0.91.ebuild 19892 BLAKE2B d59ab355a228cfaff91fd28a31231676a0f476c4df2918f746360c4e69c38c2d424ba13d7ab4555992bdd710a2b891a7590b14d6581b20eb7689cff21b2dc228 SHA512 6ed79226d999922bc00ad1a3f7d562f0fbd76b9f93d664eb1aa2724e2b5dbeaafa433bdfdeb6bb4e23151d8eb4053145b540d6a455f3640e0ab7e1703012601d
+EBUILD emacs-30.0.92.ebuild 19892 BLAKE2B d59ab355a228cfaff91fd28a31231676a0f476c4df2918f746360c4e69c38c2d424ba13d7ab4555992bdd710a2b891a7590b14d6581b20eb7689cff21b2dc228 SHA512 6ed79226d999922bc00ad1a3f7d562f0fbd76b9f93d664eb1aa2724e2b5dbeaafa433bdfdeb6bb4e23151d8eb4053145b540d6a455f3640e0ab7e1703012601d
+EBUILD emacs-30.0.9999-r1.ebuild 19892 BLAKE2B d59ab355a228cfaff91fd28a31231676a0f476c4df2918f746360c4e69c38c2d424ba13d7ab4555992bdd710a2b891a7590b14d6581b20eb7689cff21b2dc228 SHA512 6ed79226d999922bc00ad1a3f7d562f0fbd76b9f93d664eb1aa2724e2b5dbeaafa433bdfdeb6bb4e23151d8eb4053145b540d6a455f3640e0ab7e1703012601d
+EBUILD emacs-31.0.9999.ebuild 19890 BLAKE2B 9df237ff137e4e1d6b42b206f8b10abd9a4ae6fbae6548e9df7ef8402fc1870d7d2f3cf154d16e9dc43e1391da4f17537979e4448b59e025e6658382c5192226 SHA512 a1ab7e8ac5443e0b04c727c7f0472317236ffc9e310a4498372ce25588b2d7fa3457ba94c87ca42662a81132e03e4005cc4edc8caf001738bcd5493d872f0d74
 MISC metadata.xml 3434 BLAKE2B aaeef31ce265ae3b3c67ddfe01b3b41724b6fed7353e83f3efa1fe401944707391f3160d7cfea423802c67e78830387e210966f5fdc03a5a0a20b0e38f493b6d SHA512 2ad8128bfe05cbef0cdf19840e809918331c5e98976fb1af14127e0cb7adfba597ff83457a45079d1facd571953210c1650eb11b87d9bce2352e9ca865ebcc38
diff --git a/app-editors/emacs/emacs-18.59-r15.ebuild b/app-editors/emacs/emacs-18.59-r15.ebuild
index 87944772b4c2..7e73a99d9984 100644
--- a/app-editors/emacs/emacs-18.59-r15.ebuild
+++ b/app-editors/emacs/emacs-18.59-r15.ebuild
@@ -80,8 +80,8 @@ src_configure() {
 	# all those missing prototypes.
 	strip-flags
 	filter-flags -finline-functions -fpie -flto
-	append-flags -fno-strict-aliasing -Wno-implicit -Wno-return-type \
-		-Wno-return-mismatch
+	append-flags -std=gnu17 -fno-strict-aliasing -Wno-implicit \
+		-Wno-return-type -Wno-return-mismatch
 	append-ldflags $(test-flags -no-pie)	#639562
 	replace-flags -O[3-9] -O2
 }
diff --git a/app-editors/emacs/emacs-26.3-r20.ebuild b/app-editors/emacs/emacs-26.3-r21.ebuild
index d88bee4ca93d..a0ed4c9895fa 100644
--- a/app-editors/emacs/emacs-26.3-r20.ebuild
+++ b/app-editors/emacs/emacs-26.3-r21.ebuild
@@ -299,7 +299,7 @@ src_install() {
 	X
 	;;; ${EMACS_SUFFIX} site-lisp configuration
 	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	(when (string-equal emacs-version "${FULL_VERSION}")
 	Y  (setq find-function-C-source-directory
 	Y	"${EPREFIX}${cdir}")
 	X  (let ((path (getenv "INFOPATH"))
diff --git a/app-editors/emacs/emacs-27.2-r18.ebuild b/app-editors/emacs/emacs-27.2-r19.ebuild
index fa4fb7f27cbb..7b92be2c5fa7 100644
--- a/app-editors/emacs/emacs-27.2-r18.ebuild
+++ b/app-editors/emacs/emacs-27.2-r19.ebuild
@@ -367,7 +367,7 @@ src_install() {
 	X
 	;;; ${EMACS_SUFFIX} site-lisp configuration
 	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	(when (string-equal emacs-version "${FULL_VERSION}")
 	Y  (setq find-function-C-source-directory
 	Y	"${EPREFIX}${cdir}")
 	X  (let ((path (getenv "INFOPATH"))
diff --git a/app-editors/emacs/emacs-28.2-r14.ebuild b/app-editors/emacs/emacs-28.2-r15.ebuild
index 7fe1a7298698..55534cd81160 100644
--- a/app-editors/emacs/emacs-28.2-r14.ebuild
+++ b/app-editors/emacs/emacs-28.2-r15.ebuild
@@ -463,7 +463,7 @@ src_install() {
 	X
 	;;; ${EMACS_SUFFIX} site-lisp configuration
 	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	(when (string-equal emacs-version "${FULL_VERSION}")
 	Y  (setq find-function-C-source-directory
 	Y	"${EPREFIX}${cdir}")
 	X  (let ((path (getenv "INFOPATH"))
diff --git a/app-editors/emacs/emacs-29.3-r3.ebuild b/app-editors/emacs/emacs-29.4-r1.ebuild
index b38be4ee9a2d..2ff9989a9764 100644
--- a/app-editors/emacs/emacs-29.3-r3.ebuild
+++ b/app-editors/emacs/emacs-29.4-r1.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-4.tar.xz"
+	SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-3.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"
@@ -216,8 +216,10 @@ src_prepare() {
 }
 
 src_configure() {
+	replace-flags "-O[3-9]" -O2			#839405
+
 	# We want floating-point arithmetic to be correct #933380
-	replace-flags -Ofast -O3
+	replace-flags -Ofast -O2
 	append-flags -fno-fast-math -ffp-contract=off
 
 	local myconf
@@ -468,6 +470,7 @@ src_test() {
 	emake \
 		EMACS_TEST_VERBOSE=1 \
 		EXCLUDE_TESTS="${exclude_tests[*]}" \
+		TERM=dumb \
 		TEST_BACKTRACE_LINE_LENGTH=nil \
 		check
 }
@@ -538,7 +541,7 @@ src_install() {
 	X
 	;;; ${EMACS_SUFFIX} site-lisp configuration
 	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	(when (string-equal emacs-version "${FULL_VERSION}")
 	Y  (setq find-function-C-source-directory
 	Y	"${EPREFIX}${cdir}")
 	X  (let ((path (getenv "INFOPATH"))
diff --git a/app-editors/emacs/emacs-30.0.91.ebuild b/app-editors/emacs/emacs-30.0.91.ebuild
index 3c000ffedb94..7058569f30e2 100644
--- a/app-editors/emacs/emacs-30.0.91.ebuild
+++ b/app-editors/emacs/emacs-30.0.91.ebuild
@@ -528,7 +528,7 @@ src_install() {
 	X
 	;;; ${EMACS_SUFFIX} site-lisp configuration
 	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	(when (string-equal emacs-version "${FULL_VERSION}")
 	Y  (setq find-function-C-source-directory
 	Y	"${EPREFIX}${cdir}")
 	X  (let ((path (getenv "INFOPATH"))
diff --git a/app-editors/emacs/emacs-30.0.92.ebuild b/app-editors/emacs/emacs-30.0.92.ebuild
index 3c000ffedb94..7058569f30e2 100644
--- a/app-editors/emacs/emacs-30.0.92.ebuild
+++ b/app-editors/emacs/emacs-30.0.92.ebuild
@@ -528,7 +528,7 @@ src_install() {
 	X
 	;;; ${EMACS_SUFFIX} site-lisp configuration
 	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	(when (string-equal emacs-version "${FULL_VERSION}")
 	Y  (setq find-function-C-source-directory
 	Y	"${EPREFIX}${cdir}")
 	X  (let ((path (getenv "INFOPATH"))
diff --git a/app-editors/emacs/emacs-30.0.9999-r1.ebuild b/app-editors/emacs/emacs-30.0.9999-r1.ebuild
index 3c000ffedb94..7058569f30e2 100644
--- a/app-editors/emacs/emacs-30.0.9999-r1.ebuild
+++ b/app-editors/emacs/emacs-30.0.9999-r1.ebuild
@@ -528,7 +528,7 @@ src_install() {
 	X
 	;;; ${EMACS_SUFFIX} site-lisp configuration
 	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	(when (string-equal emacs-version "${FULL_VERSION}")
 	Y  (setq find-function-C-source-directory
 	Y	"${EPREFIX}${cdir}")
 	X  (let ((path (getenv "INFOPATH"))
diff --git a/app-editors/emacs/emacs-31.0.9999.ebuild b/app-editors/emacs/emacs-31.0.9999.ebuild
index 33390f3a6274..22cbd35f4139 100644
--- a/app-editors/emacs/emacs-31.0.9999.ebuild
+++ b/app-editors/emacs/emacs-31.0.9999.ebuild
@@ -528,7 +528,7 @@ src_install() {
 	X
 	;;; ${EMACS_SUFFIX} site-lisp configuration
 	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	(when (string-equal emacs-version "${FULL_VERSION}")
 	Y  (setq find-function-C-source-directory
 	Y	"${EPREFIX}${cdir}")
 	X  (let ((path (getenv "INFOPATH"))
diff --git a/app-editors/ersatz-emacs/Manifest b/app-editors/ersatz-emacs/Manifest
index 19f665466373..6b5a2462bd47 100644
--- a/app-editors/ersatz-emacs/Manifest
+++ b/app-editors/ersatz-emacs/Manifest
@@ -1,4 +1,4 @@
 AUX ersatz-emacs-20060515-gentoo.patch 987 BLAKE2B d179aefe21c91d8d207ac6278334a2b2c7de91a46443981099be9926e75f047a688bf18cf290236b00b4a1be8581abb6142e56d53d5f252f5425789b9debbfe7 SHA512 3d411fcd237e320a32663abeeb5030748e9fc678aaecc51d004a538ae0163b447107b8068fe2f17ce4220f78865aee59251810b9ec7044a829bb415cd78f7b2d
 DIST ersatz-emacs-20060515.tar.gz 45581 BLAKE2B 641cad2f5a873b0c70743a6f60ffc31615bb8789d5c6a100a67aaa82c59e7a83d35023eb596303ef0160e3ff561c89e5814b685a7a650aa4625326e86ec4fdf3 SHA512 c30ede63ebb44076762aa430a73c73d3fa3bcd0e3d0016162aab31347257124479f464a1003012f7418e807abfd3c613c81f5196ccf65b0cb3f939b7ad5c989d
-EBUILD ersatz-emacs-20060515-r1.ebuild 1083 BLAKE2B 4827a7f6f4409c5b0e9233b906152a8cce63b7a48c1d3cb3a94cf1dbb1c277606734958b4d20d5c549711abd3af5a3a2d427a8eb52d6a1201ae2db99d5a476a4 SHA512 523511f0243ef0773d4fa84e6a4cbe3abb303360c2fd57cfad355263644732907e83d6cb62c4d1ed72a7c46091758b9d3bda6cf4397e20c2a0e23b5f9366edc4
+EBUILD ersatz-emacs-20060515-r1.ebuild 1094 BLAKE2B 5d90ab64d2a0ff17ac370bbe567cd6f3961ac6c09070d7c86b216822be29504f17100f261799500015b3b9eb5efa3691d6b97db9e1c7c3c57a746c472bba0aad SHA512 85cdc9290da94939eea2476bda8102fe8fa097b545245f2cd54fcf17aee7da6875a6103b4f0768de0f32f77b3fb845ed1110400b23c0fa8f5c3c141835092dc8
 MISC metadata.xml 611 BLAKE2B fa7ab3d538319a9ca4b8f355ff202472adbe8668bd618a93032381ddbd8ee1513fd9c50231fe2b55128b2f995f537873a5fdfe509bb7422e04fa6d67be2f2157 SHA512 caac3475d53909181223de001b6498fe6a88e93d65f31f186f5e9278fbabf0b87b493607896d11507e5bc0f90bf8a87f45a875611ddcf3735b48ab6410447e1d
diff --git a/app-editors/ersatz-emacs/ersatz-emacs-20060515-r1.ebuild b/app-editors/ersatz-emacs/ersatz-emacs-20060515-r1.ebuild
index 185a4109cb00..4f113c8ee114 100644
--- a/app-editors/ersatz-emacs/ersatz-emacs-20060515-r1.ebuild
+++ b/app-editors/ersatz-emacs/ersatz-emacs-20060515-r1.ebuild
@@ -29,7 +29,7 @@ src_prepare() {
 
 src_compile() {
 	emake CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} -Wall" \
+		CFLAGS="${CFLAGS} -std=gnu17 -Wall" \
 		LFLAGS="${LDFLAGS} $("$(tc-getPKG_CONFIG)" --libs ncurses)"
 }
 
diff --git a/app-editors/jedit/Manifest b/app-editors/jedit/Manifest
index 25366828d0ac..001c19b27de4 100644
--- a/app-editors/jedit/Manifest
+++ b/app-editors/jedit/Manifest
@@ -2,5 +2,5 @@ AUX jedit-5.6.0-skip-failing-test.patch 1183 BLAKE2B 0822a2a339b161cd6e66487b450
 DIST jedit5.6.0source.tar.bz2 2572329 BLAKE2B d9815feef6fb03cb4a15e7101383944776ca593884de6965aaa3e74a411f8915d0542ab62be8e4551e04dd410c1da4ebedfb8a2c2869d33eb205100d6bd84352 SHA512 89e65998ea49b5b3da4f1daad001d7cf763e196e7110b604e99e3fad038ca126cf108a471ee611ef76b5491b91d618f47cdc24b270cabccb6a80858a37720af7
 DIST jedit5.7.0source.tar.bz2 2633539 BLAKE2B f8f0ee0b8c568ab64b9812049601c6692f60346bf8f70217fd82f27daedcdfdc95f8157adeca38ba36bd7c9e3d7a29bed2506f951e3e0b0ade1cd9a53a89e669 SHA512 6f5ab4b7f4fe467400686ac9100c462b8c40912036e0a5735ec5dbece569b0eb36f8ac1d9a0d93065baafc48da4e0a00b7440c31584ca1835f164b31b2400625
 EBUILD jedit-5.6.0-r1.ebuild 3353 BLAKE2B b9136a0d5cc57abf302edb07c4b5db9bea16c634ca80a92550b6a2c970fb4e7464bb8eb58ee7c38b39a8d8620c2b2d2f84fe96973e06665f5ad5aa2229ea6374 SHA512 359555e68ac11662c034a65a98da3efbaf52b2a03097fb500ad897f9037ed140625259b12bf51fcd671721029107c28c3231e266538d45f46cd3c0ef80f823e2
-EBUILD jedit-5.7.0.ebuild 3392 BLAKE2B 519d794b8b3461d75e258a9b4d26f1f4449e94ab66960158f8ae947caada01b4739f75d8649140f72dfdeeb6d81a1275cf608322bb33e5d0ae117de87bf1fba8 SHA512 9bdd300b7c4e8300e2338a134993cef8cd63de2bd8152add18950ab6a0bb4166ca2e1191c9a9c818c4b579f5ed1d6673cb442fec5c7ecf3bce0c68e3d441d040
+EBUILD jedit-5.7.0.ebuild 3391 BLAKE2B 0d0f76307b724368cf1a8e05cd51a1b8b177f2626d486f9c94a3c4d5956f59706eac05920a2abf16aa1b459bee3e198556cb9e8d3898ed88125bc458426d5d22 SHA512 d6f3a90f26758f861534567a77f35b24845fb14a828ca2bb24211ff82d097128d805685fe3080886b00d1f6cf447203b9c884869fbe5b99684da84d40bc3be92
 MISC metadata.xml 312 BLAKE2B 32456a81e027512746733dea293a638db960ecebb97e045e82bef5630ac064d59ee5b880ade0513d15619c49c52686b9b2e5b69c7e270c578a506465a40d5db3 SHA512 90c844a5041ab91cacc279bc0a404d42c188311bd71cd643d52dc8f586e4fca101d09236407e6a3701ef18816d5f01ad2194f5446d47c6670aaa1a33edada63b
diff --git a/app-editors/jedit/jedit-5.7.0.ebuild b/app-editors/jedit/jedit-5.7.0.ebuild
index 98656ecd09d4..ca40b64e7eae 100644
--- a/app-editors/jedit/jedit-5.7.0.ebuild
+++ b/app-editors/jedit/jedit-5.7.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/jEdit"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ppc64"
 
 BDEPEND="
 	app-text/docbook-xsl-stylesheets:0
diff --git a/app-editors/jove/Manifest b/app-editors/jove/Manifest
index a40cacba461f..8e932f131916 100644
--- a/app-editors/jove/Manifest
+++ b/app-editors/jove/Manifest
@@ -1,5 +1,4 @@
-DIST jove-4.17.3.7.tar.gz 490070 BLAKE2B bfe95cc8f78993438839b93ebf37567940449e3914dd1963728ee82dc601c371318a34ea0d5d13d9d4dccaf9c4750874c5e0d3af22dcb2421595dca2da7cafdf SHA512 90bd597bb4be3a4589f77ee331cee4fa2784264221fe6247c2535ae34c5689c08f55c2b2919bff34af5631b73b12883dab54df9770b4157ae801079a23222d9a
+AUX jove-4.17.5.3-bool.patch 253 BLAKE2B 4f5eba330d939eaa401b3a5ab0b0888fcde29525e45c782e764e9544cc41bdb9be6ecc11698324b5e79f1ae7bd5f214338b67037de7cff38dc26c4dc95d14d70 SHA512 f3cef3494a766c8d05b355f96baa4ef9e2b3d7b92b6e5f2e7b9636b08e88342590f05ccafd33a0d97c787c248c35920252a17e4378c164fa50197ec0dbfae2e8
 DIST jove-4.17.5.3.tar.gz 548835 BLAKE2B 12b1f16d82e84cc2d099e2f45f5a42e2d1e811e5a9685c7ee162280ef49ecef8f7955a98679b60c49bbeaa30e3a430b1d6fc969270bee02862ff284a932829d9 SHA512 f91bdf3145ad243cfe8a4d9aca497a3d2cc58711488fa6b845d0d5e70dece6939046743aae1f18fd2614d75420bb747b00e61bb60b13ff35b26409068df40127
-EBUILD jove-4.17.3.7.ebuild 1050 BLAKE2B f52d1af7cbf97b318602a594561c4f3417d3b0c8da52de167e5ed2909ef48cd87ca5d2fa635b9360d1245e2f23a29f3e698ba6fc3c1f5fd1b1d1c372eb8b5147 SHA512 140792ed656cd1dbaf4b4002e9132826b653069ad228fbc20b4b3cabf38320bce058309b628b27ecec8cb8674fcbb16ec2fe57176bce412398b9b2465fffaf61
-EBUILD jove-4.17.5.3.ebuild 1136 BLAKE2B 202dbf5e87e04a2bacdca2338cbd2c34153c716314c52b4184178684293035219ffed3224839c417ee74afff713cf1ac6b9409fa8eba50f09c460b71eb95b1de SHA512 17f0d8d9eb17d7df4b267e743953c91f20695d71d2ac0624e339004c0d806d0f0d17ba960b66385e8f5f56f23dfe80dbcba64038d2d64014cc907e6d8f18ea06
+EBUILD jove-4.17.5.3.ebuild 1190 BLAKE2B 59ee726800b9f6ee1c24da9c8a7b0022d5207a7113fa01eadb0c3a470f240d509e4602818b4caefa59d3fa340995dbf703466afdf193ee75cc121638c6b614d0 SHA512 5cb4325c9444f9cd0d080176af1ae206bf920db77ed6ced2c7715b0d87a1dc3eecb6a95db6ab45037531bf152bb2f2f04cf8ced84bdbbe24ecc5f46e6705fc1d
 MISC metadata.xml 699 BLAKE2B f58432fb99a67fe08f90f5cecc6271fec8d82d62d4599b8c52e0b25c35a011de753161186647901750c10e1058b0415f70f52f718a6603eb4f1b7ccb60c4533a SHA512 b55cc9d99c4de16ffcd3164a43c1d9af179080a4954ac9061bb7d6dd0acd167c15504d9232bf548b9343863c207359768da80e97d894fe183e05ccf934cb4537
diff --git a/app-editors/jove/files/jove-4.17.5.3-bool.patch b/app-editors/jove/files/jove-4.17.5.3-bool.patch
new file mode 100644
index 000000000000..901344b5c0e5
--- /dev/null
+++ b/app-editors/jove/files/jove-4.17.5.3-bool.patch
@@ -0,0 +1,14 @@
+--- jove-4.17.5.3/jove.h
++++ jove-4.17.5.3/jove.h
+@@ -148,7 +148,12 @@
+ 
+ #define private		static
+ 
++#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
++# include <stdbool.h>
++#else
+ typedef int	bool;
++#endif
++
+ #define NO		0
+ #define YES		1
diff --git a/app-editors/jove/jove-4.17.3.7.ebuild b/app-editors/jove/jove-4.17.3.7.ebuild
deleted file mode 100644
index 3c41a1a75685..000000000000
--- a/app-editors/jove/jove-4.17.3.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Jonathan's Own Version of Emacs, a light emacs-like editor without LISP bindings"
-HOMEPAGE="https://github.com/jonmacs/jove"
-SRC_URI="https://github.com/jonmacs/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="JOVE"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_compile() {
-	tc-export CC
-
-	emake \
-		JOVEHOME="${EPREFIX}/usr" \
-		JMANDIR="${EPREFIX}/usr/share/man/man1" \
-		OPTFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		SYSDEFS="-DLinux" \
-		TERMCAPLIB="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
-
-	if use doc; then
-		# Full manual (*not* man page)
-		emake doc/jove.man
-	fi
-}
-
-src_install() {
-	emake \
-		JOVEHOME="${EPREFIX}/usr" \
-		JMANDIR="${EPREFIX}/usr/share/man/man1" \
-		DESTDIR="${D}" \
-		install
-	keepdir /var/lib/jove/preserve
-
-	dodoc README
-	if use doc; then
-		dodoc doc/jove.man
-	fi
-}
diff --git a/app-editors/jove/jove-4.17.5.3.ebuild b/app-editors/jove/jove-4.17.5.3.ebuild
index 45d502a5e15a..429130f10619 100644
--- a/app-editors/jove/jove-4.17.5.3.ebuild
+++ b/app-editors/jove/jove-4.17.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,6 +18,8 @@ RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/${P}-bool.patch )
+
 src_compile() {
 	tc-export CC
 
@@ -25,7 +27,7 @@ src_compile() {
 		JOVEHOME="${EPREFIX}/usr" \
 		JMANDIR="${EPREFIX}/usr/share/man/man1" \
 		JDOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
-		OPTFLAGS="${CFLAGS}" \
+		OPTFLAGS="-std=gnu17 ${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
 		LDLIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)" \
 		SYSDEFS="-DLinux" \
diff --git a/app-editors/jupp/Manifest b/app-editors/jupp/Manifest
index 7796f2c2b1a3..635377b5cdd4 100644
--- a/app-editors/jupp/Manifest
+++ b/app-editors/jupp/Manifest
@@ -1,5 +1,3 @@
-DIST joe-3.1jupp40.tgz 503318 BLAKE2B 34452784f145f81158dc6a9223a365cd04fce2f3a669f99bf5571e8f33ecf8ff34d7f8495f6c6803ab1e734890c95d9fe9f88be38738b2b2111a9512db2f7872 SHA512 d61b7b9c5cc5c17925ef27f8f7942bc4e4d283e49b02f4962a7e3c5d3122868aadffe108f884164ae61e86776584374a2b5220c313a323efb9d3820268402ead
 DIST joe-3.1jupp41.tgz 505002 BLAKE2B 4b354bb2643896b68dc6f270ee7a030703e168b9e8b98ab537878a53b00faad6809ff48eb9c24fa68a0d6e436222f745eef69290e803c1fcace5e6ca0278a6c9 SHA512 9a07946984b64fff4ad8174f9fa437073543cd6af357caf9674571ed787709b3cc2b16fd571d7b8b50b8bb9c7e7bf49dff010d162b76324818be130ab37e06cf
-EBUILD jupp-3.1_p40.ebuild 650 BLAKE2B bd62a9e485d8b17baf7ac7a91bb945d3fa791a4f21b2cfba23fbe3c1907a0c1d3b46126be869ef4d384c9ed2791d33bb8851c3ef8673797121f240d9a2cc02ee SHA512 9d7172bb82fcbea8700e2bdbe4076097f6a6d230b3d2fad4938b0f61e19b6f3f72cb070c24a873c2c13a6a088e4a406df7d3f9f1ba4e154be6358fabd610d46d
-EBUILD jupp-3.1_p41.ebuild 622 BLAKE2B fac6a4c1634b4c89dea756caf9dc71ad4807d8bd3b0c903681bd16dbde09eeea0c45994f99520f79815668d008939fedef158a22a6e8709cb577c2a1d380a0d0 SHA512 271982e5a08628303fc6fc8fa740d6b6a2ec896b907061d48acc6fecd44bc5e264cc34022046866b669649646c7e9d7c1b7a3bb0379a157bc2debbbfa79bbd06
+EBUILD jupp-3.1_p41.ebuild 653 BLAKE2B f93fded1fa2c615d7174ffcf6ca6d46ab6c2b41942faa89fc17bb141b23fe165baebdd226feb810cccd3528a85696a7263d28a2835adb7b1d34b2c83fe4675a4 SHA512 cce4fe5a3cc0e42d389c92b3e24deac610e8d25e96654e97bd40214ea2f8674d5c3157efb74cbed343be3e6b6c90f708397296705b251346d67d208c5b887ff0
 MISC metadata.xml 252 BLAKE2B 21a1d67ef5a4d07f5f6ae18274ef15ee1ed5503ec38a59df3d0e78c501210f5865b893bb15648fcbc7cf027685995eedd94e757d446e3dd192c21f9170b7caa8 SHA512 27750f0c61daeb5558917bf1281981fc68ee903f55a63dc5806b8bfb63b31dde20d2fb9b2b434d089a73ba5f14cbfbfa7adfc98c7ede5f2102ea9d397575420e
diff --git a/app-editors/jupp/jupp-3.1_p40.ebuild b/app-editors/jupp/jupp-3.1_p40.ebuild
deleted file mode 100644
index d8bdab27bf57..000000000000
--- a/app-editors/jupp/jupp-3.1_p40.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Portable version of Joe's Own Editor"
-HOMEPAGE="https://www.mirbsd.org/jupp.htm"
-SRC_URI="https://www.mirbsd.org/MirOS/dist/${PN}/joe-${PV/_p/${PN}}.tgz"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ncurses"
-
-RDEPEND="ncurses? ( sys-libs/ncurses:0= )
-	!app-editors/joe"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-DOCS="HINTS INFO LIST NEWS README TODO"
-
-src_prepare() {
-	default
-	chmod +x configure || die
-}
-
-src_configure() {
-	econf \
-		--enable-search_libs \
-		--enable-termcap \
-		$(use_enable ncurses curses)
-}
diff --git a/app-editors/jupp/jupp-3.1_p41.ebuild b/app-editors/jupp/jupp-3.1_p41.ebuild
index 3e6e016b519c..99cece2e2ee0 100644
--- a/app-editors/jupp/jupp-3.1_p41.ebuild
+++ b/app-editors/jupp/jupp-3.1_p41.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DESCRIPTION="Portable version of Joe's Own Editor"
 HOMEPAGE="http://www.mirbsd.org/jupp.htm"
-SRC_URI="http://www.mirbsd.org/MirOS/dist/${PN}/joe-${PV/_p/"${PN}"}.tgz"
+SRC_URI="http://www.mirbsd.org/MirOS/dist/${PN}/joe-${PV/_p/jupp}.tgz"
 S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-1"
@@ -24,5 +24,6 @@ src_configure() {
 	econf \
 		--enable-search_libs \
 		--enable-termcap \
-		$(use_enable ncurses curses)
+		$(use_enable ncurses curses) \
+		CFLAGS="-std=gnu17 ${CFLAGS}"
 }
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index dce1b58b2b72..1cf93618ea65 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -7,7 +7,9 @@ AUX xemacs-21.5.35-va_args.patch 6881 BLAKE2B b618059e55889aa06e0cb125aef0d95d1e
 AUX xemacs-21.5.35-which.patch 751 BLAKE2B 4235c084089e391c7b7a3447f0252f98686796065c04a5a993f898f6c97c95c2253a0f89e9c069e2c011e391fd8293277e05c2e7c3690e02d6c6277dcb0d6383 SHA512 210bfb3bc763f544b04d09f35b6735aefb8ebeb4ddadbdb75ad3fae0de4f8ae9fff0c0b99a1b3d57fc159db8898f6490585c8c8dfb651c70691a2ba811f32914
 AUX xemacs.desktop 1061 BLAKE2B 47941fc8b380e08aad13e44fc1899ee73ef502dbbf5d8be4eaa23c301b5d25a8c334971a1d89f8cfa551dce909891edaac6a7df956c912396fc8cfb88a720a6b SHA512 6542fc7777af888ae711d386918e712e1d106635f70e65af77d1e809156baba9831fc4c8bd2cb7e7c6f9ab0ab18ddfb92709ac2909aa613471101454599bdb69
 DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cfa208a8a1eaf30e2fc2543b953c9a9582c3d55bd5b37e746f45c03ebfc408a0d965606e45d5f4adb9148dea SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566
+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-r4.ebuild 7331 BLAKE2B 2bc9214122d11f5d0ce53b1d82c331db8f74b453a9fc76a8500114b43e97f7064c03d990c91cdf9dc4ae524b97cdd92a07dcdb7dc623203375288a4ebc094021 SHA512 77b4a153cfd77bc899227f33767c385aa1c4a341a1ae694428268a1ecaaad623cf124a1524be0b5c4f6f1916d2af025acf3719aba5ad8767b5e90f454405be25
-EBUILD xemacs-21.5.9999.ebuild 7118 BLAKE2B f95ce674de0c7db7342615467dd3d6c48ae65c4fd17a8f9307678df413c561f7229e4250e6b4c44989bb52530f4410f7ccc1a34c237ed75b968caa9a9171947d SHA512 9c407c07bb357455a043dad3bf3f269720b33f4960f799a95f055b6adc20cf3c823f1b2c6c1fdc12af9f66d315481ca34603e5814c6138b228000d78e06db983
+EBUILD xemacs-21.5.35-r5.ebuild 7367 BLAKE2B 232a142f132ac53cb69a5608f0c34b32813ce4302146b608245de69a04a69d40fc5b968c42614c317a5e8e462f9f9883681866ab863e1114b67b6c23675477e0 SHA512 7488dd0ee2a7907db26bb1c641104a853d72c57b6565ed80597fea6ec3e25d3e0d80cbdfcf0cd35219ec3d60157bc4b7aebf3e8edf8bed81e916209c76949e83
+EBUILD xemacs-21.5.9999.ebuild 7041 BLAKE2B 8ee6f12653b7070e3a67490ade1b27d63fb8f1cf260539a2d695b475c792b5334fe94b956760568247534d5e2c0a09ff21e27902c4c07b422aeb69711527a48a SHA512 18c72224b2a2d8fcb1f3d81e78677775f63011d5bd556bf5b9e3fe3a7e4744ff5cf4ba3446af11ef83c677a04ec9704caef31c0565300157f364f471ef4af566
 MISC metadata.xml 595 BLAKE2B 4fa756c7f689dea03bc705403e7b9364c002b3193e85f76359da86f8286920cd746145f97d7bc31df57753f2cdc5be9546507601683223c9d662cf15460305d4 SHA512 776bb6127cb34bd65356c47839860b29b71ee8ccd5f29c100c1ebe0aa9b59c169d9bc825bad150483643123ee2ebd2a26b765f9ecf925176a2bbb95754843af5
diff --git a/app-editors/xemacs/xemacs-21.5.35-r5.ebuild b/app-editors/xemacs/xemacs-21.5.35-r5.ebuild
new file mode 100644
index 000000000000..b96d774099ab
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.5.35-r5.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2024 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
+	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_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.9999.ebuild b/app-editors/xemacs/xemacs-21.5.9999.ebuild
index 8ce245bf3a87..43b49b662f80 100644
--- a/app-editors/xemacs/xemacs-21.5.9999.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.9999.ebuild
@@ -17,7 +17,7 @@ EHG_REPO_URI="https://foss.heptapod.net/xemacs/xemacs"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="alsa debug gif gpm pop postgres ldap xface nas dnd X jpeg tiff png motif xft xim athena neXt Xaw3d gdbm berkdb +bignum"
+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"
 
@@ -33,7 +33,6 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	nas? ( media-libs/nas )
 	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
-	dnd? ( x11-libs/dnd )
 	motif? ( >=x11-libs/motif-2.3:0[xft=] )
 	athena? ( x11-libs/libXaw )
 	Xaw3d? ( x11-libs/libXaw3d[unicode(+)] )
@@ -110,8 +109,6 @@ src_configure() {
 			myconf="${myconf} --with-athena=xaw"
 		fi
 
-		use dnd && myconf="${myconf} --with-dragndrop"
-
 		myconf="${myconf} $(use_with tiff )"
 		myconf="${myconf} $(use_with png )"
 		myconf="${myconf} $(use_with jpeg )"