gentoo auto-resync : 01:11:2024 - 03:04:33

16 files changed, 4 insertions, 2244 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 18ea107e97d9..b185f67f3122 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/bluefish/Manifest b/app-editors/bluefish/Manifest
index d77fc61a7f55..24dd3b7fb9b7 100644
--- a/app-editors/bluefish/Manifest
+++ b/app-editors/bluefish/Manifest
@@ -1,9 +1,4 @@
 AUX bluefish-2.2.9-charmap_configure.patch 728 BLAKE2B fc7231ab28c0d0c4480e48f965d26ee18ae5819e412488ab8a5e30e3cee6925b73daa72fa178cdf204e00d1074121ddc57fd4c5795ccc6335460409a245bca5c SHA512 46482a73b6d374cdd5881e9ed7a79199c85cb436cc700950c09541a94d61fc4f200613a34575e74d013409f0e42a7c1df4ed25ed65880f25cbebd926d47c6889
-AUX bluefish-2.2.9-fix-incompatible-pointer.patch 871 BLAKE2B 4c13a20687994474ae45f0704722f06446f778ee11dc99ae3b29379aca550f6fb1cd9499e1cf24b445363f9f7d8d8a35e91b673d04dd0ebb5481dd6de9241034 SHA512 3c89c37f8f747bcc82b513570bd3a99b916f8f02e95f57fd6dd9a7453cf673d94d116f550982261c25eac781d3ee1fdc63177397048d0dbe7dc8a33a211c4e69
-DIST bluefish-2.2.12.tar.bz2 4180228 BLAKE2B 9e05a4618c37951da6a669e9bd4e0dd7e9993ea764dd467f875039b28cdc6d71ae70d1a87df7f0c63f850ebbff6ceeb8550d1d036bab32b7435f362d5b137147 SHA512 f0eb6496d371db8a9b4aee33ddf67e5e87bcc86ff283704cac115be7f00609b1ccbd47ff2d8f8b0bc30f234a339069cc1f7cb1f8809d97f94f0b0e09e4f16754
-DIST bluefish-2.2.13.tar.bz2 4254294 BLAKE2B 7d830fa19cfeaac56c7823760e789b32306d74156a8c106a2ba847c2ecc535a47eae59a76594afea1c013bd2f8d40107cd02f46b0871e69d6db9307fae77a606 SHA512 959a260f32c7e90ad5b3acc52eaa4a1cc979c7a41d2fa8e3b1f9bd139232c1af940bdc92c84d00b30c53389e25b2b92188cde569bc39bdda5208e1ebec20eb68
 DIST bluefish-2.2.15.tar.bz2 4762151 BLAKE2B 18ea676f0853435203f119788082057dde499ce65a9ba3ac5e3a79c6cde26b6dd88694542d966f5c88d10b4aeaf8ae9ce016427491bed4a188037cf8685b59bf SHA512 86c31eba1bbc954d1dd39c5db8b9a276e6893e97130b259ee7eb3c32dd98510ce9d95b2d8f0922ac361fa7bc645e4e6251a97fc7da61cdcfaaf29f84b7ea38c7
-EBUILD bluefish-2.2.12-r2.ebuild 2510 BLAKE2B 406b47f0e5843fc50ee38e7ee946f460a08a5d2d5d71ead121836d8042bcbcab0c44ce427f048ff1098a2fad5ba6d7f09c5e1340ffdfb0afa35352420c7d2ead SHA512 c557393ab341698073ede167cabc11ee93387f78b7c8c98711a4b05f274b779953af46854e30fcaeeb7f1788b24482295db865afd70d29f7e9eed3cf8c1428f4
-EBUILD bluefish-2.2.13.ebuild 2459 BLAKE2B e6d056201be363d3ddd535eb22edc61f6479cac1d63380847f0756306f919de773ae24736fe82d605f9189036969084171ee7313870cf3290831fb7328f05d9e SHA512 46cf3434866f9fc1fee1ce765a47c42f7f819cf18428f0d16c9276a593588521166ffd841b0096a8708d0a7dce35a61b3902a5bfb4fb42e282c4736f72c32d86
 EBUILD bluefish-2.2.15.ebuild 2459 BLAKE2B 28173a22ea3e1da450d4c8470a1843560dddf1e6fac934a7df4329da643ab44901fadcfd1cc5577e7b8a695024a771d4c92e3de3cdeb55e697c292ce151e9add SHA512 26674bb779e44f3c7eab029bee9c4be18ae9ec64aa7cfc3436f2d05ca4f8b9354b0f1ed8e3c2e711256b1235148d49f80660b4c50e864f364076805eb681a0e0
 MISC metadata.xml 333 BLAKE2B 5a5f339d26d78d99050d8324891a3d6ef97af31e3e6a397e763cc2e7561f892e43856e38fefe72be28db1962a4da153b0ebde42db6a53074bdf6b9c13eb74d87 SHA512 144b48f78b13ad3f07868b3171db5935431befd92821a6b70b6e626943996bcc4219ff27808b9062b2da4b5ff1c86dcb1c3778757b0b2a905c5bea3e90dcf152
diff --git a/app-editors/bluefish/bluefish-2.2.12-r2.ebuild b/app-editors/bluefish/bluefish-2.2.12-r2.ebuild
deleted file mode 100644
index 90d910bb6cdb..000000000000
--- a/app-editors/bluefish/bluefish-2.2.12-r2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-MY_P=${P/_/-}
-inherit autotools python-single-r1 xdg
-
-DESCRIPTION="GTK HTML editor for the experienced web designer or programmer"
-HOMEPAGE="https://bluefish.openoffice.nl/"
-SRC_URI="https://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3+"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~riscv ~sparc x86"
-SLOT="0"
-IUSE="gucharmap nls python spell"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="sys-libs/zlib
-	x11-libs/gtk+:3
-	gucharmap? ( gnome-extra/gucharmap:2.90 )
-	python? ( ${PYTHON_DEPS} )
-	spell? ( app-text/enchant:2 )"
-DEPEND="${RDEPEND}
-	x11-libs/pango"
-BDEPEND=">=dev-libs/glib-2.24:2
-	dev-libs/libxml2:2
-	virtual/pkgconfig
-	nls? (
-		dev-util/intltool
-		sys-devel/gettext
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-# there actually is just some broken manpage checkup -> not bother
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.9-charmap_configure.patch"
-	"${FILESDIR}/${PN}-2.2.9-fix-incompatible-pointer.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# eautoreconf seems to no longer kill translation files.
-	eautoreconf
-	sed -i 's:gzip -n $< -c:gzip -n -c $<:' data/bflib/Makefile.* || die "Cannot fix makefile"
-}
-
-src_configure() {
-	CONFIG_SHELL="${BROOT}/bin/bash" econf \
-		--disable-update-databases \
-		--disable-xml-catalog-update \
-		--with-freedesktop_org-appdata="${EPREFIX}"/usr/share/metainfo \
-		--without-gtk2 \
-		$(use_with gucharmap charmap) \
-		$(use_enable nls) \
-		$(use_enable spell spell-check) \
-		$(use_enable python)
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	einfo "Adding XML catalog entries..."
-	"${EPREFIX}"/usr/bin/xmlcatalog  --noout \
-		--add 'public' 'Bluefish/DTD/Bflang' 'bflang.dtd' \
-		--add 'system' 'http://bluefish.openoffice.nl/DTD/bflang.dtd' 'bflang.dtd' \
-		--add 'rewriteURI' 'http://bluefish.openoffice.nl/DTD' '/usr/share/xml/bluefish-unstable' \
-		"${EROOT}"/etc/xml/catalog \
-		|| ewarn "Failed to add XML catalog entries."
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-
-	einfo "Removing XML catalog entries..."
-	"${EPREFIX}"/usr/bin/xmlcatalog  --noout \
-		--del 'Bluefish/DTD/Bflang' \
-		--del 'http://bluefish.openoffice.nl/DTD/bflang.dtd' \
-		--del 'http://bluefish.openoffice.nl/DTD' \
-		"${EROOT}"/etc/xml/catalog \
-		|| ewarn "Failed to remove XML catalog entries."
-}
diff --git a/app-editors/bluefish/bluefish-2.2.13.ebuild b/app-editors/bluefish/bluefish-2.2.13.ebuild
deleted file mode 100644
index 946b7cba4f3b..000000000000
--- a/app-editors/bluefish/bluefish-2.2.13.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-MY_P=${P/_/-}
-inherit autotools python-single-r1 xdg
-
-DESCRIPTION="GTK HTML editor for the experienced web designer or programmer"
-HOMEPAGE="https://bluefish.openoffice.nl/"
-SRC_URI="https://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3+"
-KEYWORDS="~alpha amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-SLOT="0"
-IUSE="gucharmap nls python spell"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="sys-libs/zlib
-	x11-libs/gtk+:3
-	gucharmap? ( gnome-extra/gucharmap:2.90 )
-	python? ( ${PYTHON_DEPS} )
-	spell? ( app-text/enchant:2 )"
-DEPEND="${RDEPEND}
-	x11-libs/pango"
-BDEPEND=">=dev-libs/glib-2.24:2
-	dev-libs/libxml2:2
-	virtual/pkgconfig
-	nls? (
-		dev-util/intltool
-		sys-devel/gettext
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-# there actually is just some broken manpage checkup -> not bother
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.9-charmap_configure.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# eautoreconf seems to no longer kill translation files.
-	eautoreconf
-	sed -i 's:gzip -n $< -c:gzip -n -c $<:' data/bflib/Makefile.* || die "Cannot fix makefile"
-}
-
-src_configure() {
-	CONFIG_SHELL="${BROOT}/bin/bash" econf \
-		--disable-update-databases \
-		--disable-xml-catalog-update \
-		--with-freedesktop_org-appdata="${EPREFIX}"/usr/share/metainfo \
-		--without-gtk2 \
-		$(use_with gucharmap charmap) \
-		$(use_enable nls) \
-		$(use_enable spell spell-check) \
-		$(use_enable python)
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	einfo "Adding XML catalog entries..."
-	"${EPREFIX}"/usr/bin/xmlcatalog  --noout \
-		--add 'public' 'Bluefish/DTD/Bflang' 'bflang.dtd' \
-		--add 'system' 'http://bluefish.openoffice.nl/DTD/bflang.dtd' 'bflang.dtd' \
-		--add 'rewriteURI' 'http://bluefish.openoffice.nl/DTD' '/usr/share/xml/bluefish-unstable' \
-		"${EROOT}"/etc/xml/catalog \
-		|| ewarn "Failed to add XML catalog entries."
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-
-	einfo "Removing XML catalog entries..."
-	"${EPREFIX}"/usr/bin/xmlcatalog  --noout \
-		--del 'Bluefish/DTD/Bflang' \
-		--del 'http://bluefish.openoffice.nl/DTD/bflang.dtd' \
-		--del 'http://bluefish.openoffice.nl/DTD' \
-		"${EROOT}"/etc/xml/catalog \
-		|| ewarn "Failed to remove XML catalog entries."
-}
diff --git a/app-editors/bluefish/files/bluefish-2.2.9-fix-incompatible-pointer.patch b/app-editors/bluefish/files/bluefish-2.2.9-fix-incompatible-pointer.patch
deleted file mode 100644
index 7cf8900d4f9f..000000000000
--- a/app-editors/bluefish/files/bluefish-2.2.9-fix-incompatible-pointer.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Clang16 will not allow to assign incompatible pointer types by default.
-Therefore we need to and const to the third parameter of this function
-to match the pointer XmlHashScanner this function is later assigned to.
-
-Bug: https://bugs.gentoo.org/882207
-Patch has been sent to upstream here: https://sourceforge.net/p/bluefish/tickets/66/
- 
-Pascal Jäger <pascal.jaeger@leimstift.de> (2022-12-07)
-
---- a/src/plugin_infbrowser/infb_dtd.c
-+++ b/src/plugin_infbrowser/infb_dtd.c
-@@ -80,7 +80,7 @@ static gchar *infb_dtd_str_content(xmlElementContentPtr ct,gchar *sofar) {
- 	return ret;
- }
- 
--static void infb_dtd_element_to_group(void *payload, void *data, xmlChar *name) {
-+static void infb_dtd_element_to_group(void *payload, void *data,const xmlChar *name) {
- 	xmlElementPtr el = (xmlElementPtr)payload;
- 	switch(name[0]) {
- 		case 'a':case 'b':case 'c':case 'd':case 'e':
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 1e8d25e07ed2..975b4a397a36 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,15 +1,11 @@
 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-8.tar.xz 7404 BLAKE2B 507533497028958c797ded16343bc381c933660c5d0c9734ed41215f87ff72bad4e828a7237839eb4efdfee67be4fef943fc770d62f1426ad255909e068c01d6 SHA512 3ea0797c746eb48a893cbb77783d91d1c93260755473d0216ef19cf0811be3253664b7ccb664e20593bb95cd7f68e5f284e865349303b29581150fdb694ddf39
 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-9.tar.xz 14560 BLAKE2B f82ba15bcf4a8c962836150daa59325bea13b51bb32d8271a411bd9bfb32f05245b2b84645e1d73447f14b88432d36e70971c94c730dc1d4e976302ecb9a833f SHA512 01887429273f9b4bad9e4e1320d2e6b7fda636a59dd1b548e79c8956432e24eadfa0dbc6377f40c486eed5fd987c416221106d25ca6ff6be0fbd29c801a17b85
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156 SHA512 0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9
-DIST emacs-28.2-patches-7.tar.xz 9768 BLAKE2B 6ab0a30cfdb1d54ce1b977fc7dcbcd65499eaabeca0abfbefe76fe9825d4c33de46c76e82451ebfb7a380cba8fe1607171898147b56c17fd7618bc3ebe4aeb45 SHA512 567b7f85b8e40f8c58252c0632cdb460cc912248fa871eaccaef8df8dad546a3d4c94126db6d53d23375c764b8f6bd9842296292bee46a108a309c4a53aa24d7
 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.3-patches-2.tar.xz 2304 BLAKE2B 1005194bc2ed6d9be0cadcf449f4f82c1bcda178e6126f27f8ea0c359344bcf6a9368226a6eaf9d4b655a0c59ed6beecc3130b4409c84bb3ed19911ba22d9e80 SHA512 67250b08cf0b1d4f8279987cea19da0838f520c98ae91b16200c8bf5b5e2a171ffdb7c06a266c6f220ec8466a9264af55529dc150b002588937597e328a581d2
 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
@@ -17,13 +13,9 @@ DIST emacs-29.4.tar.xz 52210344 BLAKE2B 825fd2665b6427dbc3cb618b40df2f71fa6b0888
 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-26.3-r18.ebuild 11787 BLAKE2B bfb95fe441cf2810a9681054f9f35a487b762d9d3391b2a0664aa4c31514977e5213c6665e98c62fa5e6d1f53d85e057ffe7c3627c7f2697aae8d6c11eda4505 SHA512 670084f3a91a891f62ee7da60a1d57313ace855a5e0d372dfb417dc213c2eb31c9f847855d3e2781b5e2e35e10f8b073f72620f530ee6a6255e55a20f069391f
 EBUILD emacs-26.3-r19.ebuild 11823 BLAKE2B 0ddb554f48e9f62d06cd6df2a840436d516b2ed1301cd639ce19584ea9350d7ec765cf249fcfa7a1e7ff139f135bcd96aaacd2e20d450aee126d0d7c02915ec1 SHA512 10475df4b0c9685f0f3f491ecc625524146af1e850e60425ebdad46c288f2f7be57f0c98e899086cb7ee3a405f25c3c79b03f0dc4deee9b24e560690e6426354
-EBUILD emacs-27.2-r16.ebuild 14514 BLAKE2B b7e992f8a289613348c803c8361761241306bea9e7f5d2849fa672b2603c7e23023e4d2a342addfeac437769ff482f254c9b2a5a58e5879e5e645b3209b371c4 SHA512 b23b8c9f72e0fdf18478035bc16d6c9c02144ee8bb7a7e1adbc62973ab4686b601da1704e4c7ab1ec48fc266dc5983fa6b937b4cca31088506d039301b85bee7
 EBUILD emacs-27.2-r17.ebuild 14555 BLAKE2B ec5198f984a704f270f95c574405b9621d5a7d8028b56a41ed0f8871ca1980a32079d944f79648ac40713cefbf7efc233e972a386f48fd77c8f3af12d0500e72 SHA512 a3b046c085fb41bc3d7979992d67b92c4f9124e23a6f98f3417a179029b05311a4ce3a7d718009bbb76e121e533793988f8c6f567c24f0ba2b52fc9f932a2224
-EBUILD emacs-28.2-r12.ebuild 17468 BLAKE2B 71e91e197da1d14dd1b219440b6f46d1af88d1ce60e0fbd591ea4df0cc7d8c01b127bd5bd7cd3109dbaad4741ab775e0b856ccfe4d8cf95913cd042b98ce314a SHA512 68a71dc0a0b3bdbacc9ddc423738ca85e2df74235881ded03cc3b59cb4ca01708e48d302b70bb52965d4ea0f90051f63ab3bebfcee4e4962a4f6cd7851cc7745
 EBUILD emacs-28.2-r13.ebuild 17522 BLAKE2B df13974f748f4b0b9c59e857c40b00625b21a2e541814ed4de745bae9dbd7213fdc25bbea690ca70b57fd2a35a0f884b282ea7c1707c6e6fbd672f8e8845f239 SHA512 97a04f0c3e505c85471825f97f0955dbaa01b8702e40b9a15e83c276ea9ad90865c804b86f766a0bd393ea892e0b11e57b151e8ff8cdc79539954cbe3262c2d1
-EBUILD emacs-29.3-r2.ebuild 20259 BLAKE2B d2f6bbdc2e388ff6a01c08729fc2f0ced620bb95daa81166cc136cad679ce33ba71ebe9c30b407b41e9a739240b350562f52e0edf0f96d4252e2fb3eb561cfdc SHA512 4cb907654d61a99abc35eb45ca6db3bd1f0210d3f5673a5cc798bca292b754fe85634dc793a881fcea14beabed464c90d704f088fdad34d698c98617200de5df
 EBUILD emacs-29.3-r3.ebuild 20263 BLAKE2B 8f032628862d78b46174a8159a12f19a7dcbd843e488d702f6a233801829c87bb4288c43a0b59f0a4bffd9b17e930008d94d271e16999e2527c6b930d52b8d22 SHA512 a23634b49af2323cc603a131859c1ddd15995610c729e19a5e4e5cb2b441a42b812a9893448ca21324e4a07f162efc15e71c885d749ac6124b7f5927896f28bc
 EBUILD emacs-29.4.ebuild 20313 BLAKE2B 1bed634eb42caf03b67df68474bf7d8b02b0f2086e8bbe820dd82096b81630af01fa184201fbc6c7b3797ff125ccf45b5dd465eae64443854781e9588acbd4d3 SHA512 d0ba494964d39737ed536e7e00a33212f215820971a449401ca6b60d7dc51715ae39f7fe6910e5673d7eba62683a1cc7d7dc20ef50e5dc5bb71c334f70387261
 EBUILD emacs-30.0.91.ebuild 19912 BLAKE2B 10e286ce3b148b00a141a2e7fcda409b4d435d086d9fc36d70e7fe80297622de7bf4f71f1c0891d5568d1b1eab84ac43be7e445465b84131628eedb27cfbab2b SHA512 974d515f958201512ab3970fc85f0e52970906e1c75879fee6eb65cd5b0f03abedc9a085bd86ffdd2f56e2fed0fe7fce5e16c706bce9c1c94318947a8f896b6d
diff --git a/app-editors/emacs/emacs-26.3-r18.ebuild b/app-editors/emacs/emacs-26.3-r18.ebuild
deleted file mode 100644
index c5236bfa6e76..000000000000
--- a/app-editors/emacs/emacs-26.3-r18.ebuild
+++ /dev/null
@@ -1,369 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools 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-8.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_{set,get}_state MIN )
-
-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
-
-	# We want floating-point arithmetic to be correct #933380
-	append-flags -fno-fast-math -ffp-contract=off
-
-	local myconf
-
-	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)"
-	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"
-		myconf+=" --without-x"
-	else
-		myconf+=" --with-x --without-ns"
-		myconf+=" --without-gconf"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with cairo)"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-cairo"
-			myconf+=" --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 \
-		--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) \
-		${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
-		assert
-	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
-		assert "gzip .el 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-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-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
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-27.2-r16.ebuild b/app-editors/emacs/emacs-27.2-r16.ebuild
deleted file mode 100644
index b78252ea516d..000000000000
--- a/app-editors/emacs/emacs-27.2-r16.ebuild
+++ /dev/null
@@ -1,441 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools 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-9.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_set_state malloc_get_state MIN
-	statvfs64 re_set_syntax re_compile_pattern re_search re_match
-)
-
-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() {
-	# We want floating-point arithmetic to be correct #933380
-	replace-flags -Ofast -O3
-	append-flags -fno-fast-math -ffp-contract=off
-
-	local myconf
-
-	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)"
-	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"
-		myconf+=" --without-x"
-	else
-		myconf+=" --with-x --without-ns"
-		myconf+=" --without-gconf"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with cairo)"
-			myconf+=" $(use_with harfbuzz)"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-cairo"
-			myconf+=" --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 \
-		--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) \
-		${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
-		assert
-	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
-		assert "gzip .el 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-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-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
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-28.2-r12.ebuild b/app-editors/emacs/emacs-28.2-r12.ebuild
deleted file mode 100644
index 8549d9fba405..000000000000
--- a/app-editors/emacs/emacs-28.2-r12.ebuild
+++ /dev/null
@@ -1,536 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools 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-7.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_set_state malloc_get_state MIN
-	statvfs64 re_set_syntax re_compile_pattern re_search re_match
-)
-
-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/.*"
-
-		# gccjit doesn't play well with ccache or distcc #801580
-		# For now, work around the problem with an explicit LIBRARY_PATH
-		has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \
-			&& export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \
-				| sed -n '/^libraries:/{s:^[^/]*::;p}')
-	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() {
-	# We want floating-point arithmetic to be correct #933380
-	replace-flags -Ofast -O3
-	append-flags -fno-fast-math -ffp-contract=off
-
-	local myconf
-
-	# Prevents e.g. tests interfering with running Emacs.
-	unset EMACS_SOCKET_NAME
-
-	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)"
-	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"
-		myconf+=" --without-x"
-	else
-		myconf+=" --with-x --without-ns"
-		myconf+=" --without-gconf"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with cairo)"
-			myconf+=" $(use_with harfbuzz)"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-cairo"
-			myconf+=" --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 \
-		--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) \
-		${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 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[*]}" \
-		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
-		assert
-	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
-		assert "gzip .el 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-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-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
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-29.3-r2.ebuild b/app-editors/emacs/emacs-29.3-r2.ebuild
deleted file mode 100644
index 1aadd5af2cdc..000000000000
--- a/app-editors/emacs/emacs-29.3-r2.ebuild
+++ /dev/null
@@ -1,622 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools 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-2.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 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_set_state malloc_get_state MIN static_assert alignof
-	statvfs64 re_set_syntax re_compile_pattern re_search re_match
-)
-
-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/.*"
-
-		# gccjit doesn't play well with ccache or distcc #801580
-		# For now, work around the problem with an explicit LIBRARY_PATH
-		has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \
-			&& export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \
-				| sed -n '/^libraries:/{s:^[^/]*::;p}')
-	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() {
-	# We want floating-point arithmetic to be correct #933380
-	replace-flags -Ofast -O3
-	append-flags -fno-fast-math -ffp-contract=off
-
-	local myconf
-
-	# Prevents e.g. tests interfering with running Emacs.
-	unset EMACS_SOCKET_NAME
-
-	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)"
-	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"
-		myconf+=" --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"
-		myconf+=" --with-toolkit-scroll-bars" #836392
-		myconf+=" --without-gconf"
-		myconf+=" --without-xwidgets"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with harfbuzz)"
-		myconf+=" $(use_with m17n-lib libotf)"
-		myconf+=" $(use_with m17n-lib m17n-flt)"
-	else
-		# X11
-		myconf+=" --with-x --without-pgtk --without-ns"
-		myconf+=" --without-gconf"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with xpm)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with cairo)"
-			myconf+=" $(use_with harfbuzz)"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-cairo"
-			myconf+=" --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)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with webp)"
-		myconf+=" $(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 \
-		--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) \
-		${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 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[*]}" \
-		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
-		assert
-	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
-		assert "gzip .el 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-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-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
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/ghostwriter/Manifest b/app-editors/ghostwriter/Manifest
index 9ac050ef954f..a0c57e459a08 100644
--- a/app-editors/ghostwriter/Manifest
+++ b/app-editors/ghostwriter/Manifest
@@ -1,8 +1,6 @@
 AUX ghostwriter-24.05.2-bogusdep.patch 2424 BLAKE2B 3eab745fa57599a15cabd044aade883b017099ff748d20f64fb56385715b018fe68ce8459c59a61a8b41beba7bb13cb9fcc891fa126f3382fc6a729c5993994e SHA512 9a22fdb40742fb8500e2522bb5b1d3af9c3bdeab9f68e05a29ab3c3505044d5f7247101d7352eba5a6668b8a432f5fec3c3a1dc0040b9c190528679faa636b46
-DIST ghostwriter-24.05.2.tar.xz 3634856 BLAKE2B 3a57c5487c09fc4e425f39826eeef343e71c2e064518c4c5ea71526aa30ad753a87a744c7c55aff109e03a8df86a1c941bd3877c1655ad1047382656e17effeb SHA512 0769bf857c7ab8a67eedaf48029ee0586e8d4394fc77c7bfe21a4d39b58579938371178bbe32c743e0b38305ca1602d824ce5cda18b5be49a28c258f52f10ce3
 DIST ghostwriter-24.08.1.tar.xz 2707204 BLAKE2B 160899adb79cd549577a0ca84b619fd994742a3e320038dc1d830f8b90b0c381df10bfaab76680ce685a6315a4ad4be7406c429b05280125637ea324b0114958 SHA512 cc5438555dae815be42ba69ff74720002e809090cfebdecd0c69d509dc8675ce65cef54fe0292b3bd63365b83cd0f360151c78f5b0abcebc354397c9ef423e8d
 DIST ghostwriter-24.08.2.tar.xz 2707632 BLAKE2B 479d3ddeeb920ff2a2f72e52a0c5b099592b671561e44a622a78f34e55b8a648bfc138901f5dc02a597f2e143399a05b3e187a93ebd1235671326f39e7bb80b2 SHA512 556a79cd7784aa2f409031b19961d64dae8a26be32efee4ff8734c3a6b5305dab8988584eefd03976e24943f6dbaa79a85b2904354e1aa2c636b1e84edfa4266
-EBUILD ghostwriter-24.05.2.ebuild 974 BLAKE2B 1330235f33506fa5eed13910cbdd90ba0141e0af659c3782299629030912316b0b35ca9c7a6fb49ec3fc2fd1daab849c682c285c0ee35d0abeb90c845bf915f6 SHA512 65db0e424d3c34e540644d9dc09a12a22a3e3dac97b193e268e4fcb42ee72331d22026f4cd22141ed50a9c3a4b08afc1e827968b5dfd7a672d29aa4723cc02a9
 EBUILD ghostwriter-24.08.1.ebuild 892 BLAKE2B 9a2d67a7aded298e93bbf950076d4461b3b495ef1a18a901437bde02bdfb23226574e0b01e744faca70ee23583140f902cad0966319d276c916011510dd70dc1 SHA512 fec041f18e1a2435173c564938acc3c22df944f539f29476e23440607b8df35b25759f38050c3e21662125e28dd602eea252b9adae052ae099b0f6810b84108b
 EBUILD ghostwriter-24.08.2.ebuild 894 BLAKE2B 9d6ab71c9b3e3f6fab4f11bb0e9f3bb8e3c04e1b7610b76e144600f2e374a7ff77b3d014c7b1dd1466e45e55770621e9ad694f959e698486e58e80e1f9c054b2 SHA512 0e364e2fe40a02158060a244033eaeace703858a595858c824fe2dc17b67df15810c361f64abd004c35a57f32069f1279ba262a9e8219eee7371c6fb60e30719
 MISC metadata.xml 380 BLAKE2B 8c20dfd3208e20d12c1c1fc2f6b75ac80c88175865f269859f5fd903dacec1371af3b6e77ebb905271ad58dc4a266dd7679ded9117c02767676bb7644e3ce060 SHA512 4af810107c31548de0663061ef865b124a7a0828e7955ee31bbb71c1e0cabf0420d494dca2e7c7ee2dd4adbb87c203a62b57e843757a3534ac6f97fb2a4b3d65
diff --git a/app-editors/ghostwriter/ghostwriter-24.05.2.ebuild b/app-editors/ghostwriter/ghostwriter-24.05.2.ebuild
deleted file mode 100644
index dbf9b31d630f..000000000000
--- a/app-editors/ghostwriter/ghostwriter-24.05.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_CATEGORY="office"
-ECM_HANDBOOK="optional"
-KFMIN=6.3.0
-QTMIN=6.6.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Cross-platform, aesthetic, distraction-free markdown editor"
-HOMEPAGE="https://ghostwriter.kde.org/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm64"
-IUSE=""
-
-RDEPEND="
-	app-text/hunspell:=
-	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=dev-qt/qtwebchannel-${QTMIN}:6
-	>=dev-qt/qtwebengine-${QTMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/sonnet-${KFMIN}:6
-	virtual/opengl
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
-"
-BDEPEND="
-	>=dev-qt/qttools-${QTMIN}:6[linguist]
-	virtual/pkgconfig
-"
-
-DOCS=( CHANGELOG.md README.md )
-
-PATCHES=( "${FILESDIR}/${P}-bogusdep.patch" ) # in 24.08, bugs 936578 and 937708
diff --git a/app-editors/joe/Manifest b/app-editors/joe/Manifest
index e08d34e79a64..5b4d261ee28b 100644
--- a/app-editors/joe/Manifest
+++ b/app-editors/joe/Manifest
@@ -3,5 +3,5 @@ AUX joe-4.6-c99.patch 1427 BLAKE2B 0092531265346574f1bbfbe8a3d45515ec5ac817794cf
 AUX joe-4.6-db.patch 392 BLAKE2B 8ca4d25a1e1be76b87e581720903064f4a54b928c6c7a91991d6ae6227df00e4b13c6c9fa3ac47563f5924c5e9aa18a86f1cb471155d8ca8fccc67e151f7bada SHA512 47eeffc203879ae7a644ef3875bda41c7bd776a51fcf7f6e9d4a30a5e5f0209d1067b516efcd5faac3ecf2fb204e0105eb9cc453df5c853413a613cfdb6e4fc6
 AUX joe-4.6-prototypes.patch 10006 BLAKE2B cf9845339aa30b99223412a9e2c6407bbbd2bb6eb5ce630d3a7e93bc084ee8bffdee97e15ce17765b6a5de9fcc02453b4962126043fe021cf17e6c062b13108f SHA512 9ccd53de36e813c79dbd1c76e43c7f9b756243455e0faf7eb98e8ebeada30256393475270a9858c6f319f28b4fe56f320e81c7898e41cf8b4ade1c22000e6884
 DIST joe-4.6.tar.gz 1895046 BLAKE2B fbf53d3b5b066cb32bb26b08d7d314a3bb89ac5ae22db498cdf3597bf8cb322bd9aa05543debd47ac7380a33982c388e13f38c60747503494c582393ae8eb13d SHA512 3dd64a994fb3d352a12bf027ef16d57d14ac2577fd63fb6b6e25cae46052befaa7c15dc029bff2f8c3275df90f0343bd46313601055d97277ea4540e109fbe82
-EBUILD joe-4.6-r2.ebuild 1484 BLAKE2B 78f53f8389ba29b156ef47eb79718e2123bd45e2ad4402fc049a7f42b1fa55c9048a1102904972aa4c66144fb1d31474c9691bd97f303e14cd37a4d9161ccba2 SHA512 b214ddb0095b0df519f3d7a9a6cbaca5a6c4e1d21b1e89ba15ff6daef911fac73e07dfc6fe30477912b83b605a3978ce7d212a1091a9eb8be206448eab5ed068
+EBUILD joe-4.6-r2.ebuild 1491 BLAKE2B ca3f219c4634d6bb5d1fab85468f62d7f590cf502f974d13bb482ff39cb3293cd3e697762d17387230f4cafd95585aa7294d1d8a53386840decb64be40e13378 SHA512 16bea7a95f84f9fb871b0c3f2b8308e4d79d6d7444ac41439917370b95ad8b2b5febc0fd5097b5afd1b626467e8d6d2a11771fa21df56df6443d9d2c0e4af13e
 MISC metadata.xml 904 BLAKE2B 687b43b7f2d927f5b239ce63ddbcedac0d602cb0a1f51a108c99c5227f6cc9501f357e1e6dd407ecd231bfd6d4ec0acb513b495a86ea7dcb52a0e735cd87012a SHA512 1d9066383090e2fd69955899c9c8e35e58d60f35d3b7e7d29c7cc5184c23f39bd24df5cd59efb9321aa2a8af453849366c8a931c369c9683f9b1aacc2030ad24
diff --git a/app-editors/joe/joe-4.6-r2.ebuild b/app-editors/joe/joe-4.6-r2.ebuild
index 4b4fc874e8d5..7abb1e87c5a4 100644
--- a/app-editors/joe/joe-4.6-r2.ebuild
+++ b/app-editors/joe/joe-4.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/joe-editor/${P}.tar.gz"
 
 LICENSE="GPL-1+ CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="xterm"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2:0="
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index d91bc6aa492f..3c4dc202cf32 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -17,7 +17,7 @@ DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e54
 DIST xemacs-21.5.35.tar.gz 16403617 BLAKE2B efab8d3d984ec2223913b09ff1abc9f2df187fb5b8c2ccf99fcfc60c86369f4411cffd48b03532d53329bd5b3d3149271a445da4c0a3cd7bdc2834021b1297b3 SHA512 e592af6ffbb6f95299039de28f59ee770bf62f54a15b1358b9d1059ed25dcb410c01dcf6e88c1d2196d54f0c6902f309d709fe003accee82e516023fa4363019
 EBUILD xemacs-21.4.24-r10.ebuild 6951 BLAKE2B e7d0bda0f6b5e6531dfc565488487af3e1ac32b248b59bf1b93583edaeaa0ec0d9b9ef98b731d7e94a117fb2ccd138d96f607864a6b4bcc396e26570162d43e7 SHA512 061948f75a2be2b72472956d5801974db916c78938ae3b13a9840368c886c3e433fe327cfae46dd3082cf7190c738a446697a7efedd8f31e9cd15a725fc2ffb2
 EBUILD xemacs-21.4.24-r9.ebuild 6923 BLAKE2B bc99795d5ace91260f2d26e1e16b2aa16cf9f9f33996e9a9c0d49a172bec5c40816c09b7ebbc6cc013c4276d57bf8dc3c7c099097b3307f2731154cdb3f8c9e6 SHA512 ac3cbdc9087d4bdcfa0ecb591729ea0f5fa084f350d93a37f5283dba5ed56d77555e9bc706f3d43b2abc21e5020e4b8564657c92f36730c073e283ef1288ef5e
-EBUILD xemacs-21.5.35-r4.ebuild 7337 BLAKE2B 518eb2c9d2f4e3868e4cd1e54145efa1c525293faf610a4e36f7302dce2b3620e53a4dfaafa20e56e0ff2e173589aa07b549708132202655a538eef7a09c569d SHA512 fc792bda41aa4c582f494eba35c88657bd8e3bcd10c08d2a31ec2210f189811c70f3468d48eea7916ce972c6230d462f9099c874e3ca29847bc04b6344f64cc9
+EBUILD xemacs-21.5.35-r4.ebuild 7332 BLAKE2B 4a5a79718ea8c81706fd7c8267f3bb81afb1acd83fcd13c64fc7bdbbf34840548fd672cdbba47c80c162f67daa73ec7e45ac02bec4c892fa46456cac2a0f8c55 SHA512 178850dc0b9f4949071447dcff60bd3c88bcdf85b24bb3824407c624b7824bb86c7482f13dfc2e1202aeb86efec824e6022a3bc51f81b694df295fcf146d10da
 EBUILD xemacs-21.5.35.ebuild 7025 BLAKE2B 695f2221402c2461116746c81f07811929274b53892fe87f6200d2c93ba4f9209cbd77e702eb7ad922c8115a96ee8afffbd657d6698dc0b452aa854041a22bf6 SHA512 d4a51870a73d2c9dcbb73f69e3dcb982443442e0be66c0a35bd2c0730e8813b8ebd2dfcffdb68221d2f24d078f47d6fe7e593157a4b1cda32887f1c88259f206
 EBUILD xemacs-21.5.9999.ebuild 7118 BLAKE2B f95ce674de0c7db7342615467dd3d6c48ae65c4fd17a8f9307678df413c561f7229e4250e6b4c44989bb52530f4410f7ccc1a34c237ed75b968caa9a9171947d SHA512 9c407c07bb357455a043dad3bf3f269720b33f4960f799a95f055b6adc20cf3c823f1b2c6c1fdc12af9f66d315481ca34603e5814c6138b228000d78e06db983
 MISC metadata.xml 756 BLAKE2B 1237bb18a737c4473990bd73a4a1fdd5788c743867b1f7c6d963f6acd21a7133fbe5b1c0921556a5152ab7f3116e635a6c6087dad15b5d2430a2d742c63a1a05 SHA512 65c0a9a02a9d11bde55cae161344803177203f4868f508c970d87fc7ea7b4f552f63d2e70ad2b1829efb8ff2ca641e1717672976f681ec56ad51dec2eebc8464
diff --git a/app-editors/xemacs/xemacs-21.5.35-r4.ebuild b/app-editors/xemacs/xemacs-21.5.35-r4.ebuild
index 766ac26ff39b..a3893f00a878 100644
--- a/app-editors/xemacs/xemacs-21.5.35-r4.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.35-r4.ebuild
@@ -16,7 +16,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 dnd 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"