8 files changed, 7 insertions, 228 deletions
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index da5bef7ee80f..a204213ad9f6 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/emacs-common/Manifest b/app-emacs/emacs-common/Manifest
index 25f8bd4acc11..9fc82d4f266a 100644
--- a/app-emacs/emacs-common/Manifest
+++ b/app-emacs/emacs-common/Manifest
@@ -1,5 +1,3 @@
-DIST emacs-common-1.10.tar.xz 61800 BLAKE2B 9dd25f45bf0db308417a6c35d87e3b8c6a7dd2f11de57ab2e6fcf81646aa5d5b54b76a78142de0e175df3ba4dce4f404f4774cb0a0d64c41e484de4ea4da6e6a SHA512 a9a9142394261b34ba625e48eaac489f713cef52df3ca801c2445759bf27d6335b4e7162305f314203d3efcd89f6e65a635595ffc0ad6e6082b735c5f8283b82
 DIST emacs-common-1.11.tar.xz 64480 BLAKE2B 776f1ecc656b6d0765617f1d9176e5c855a7a85b24bcd4563e846bbde1d4cd842ac928518d4e0e1254d1161b3848b6beffb87612bf82247b9862351ebdd17636 SHA512 e7e627562f637778e2391ae8b188cd045021cf5b6f32f68e1927868382be59f8cf3d878b62c6e03d6047b0b00a7ec9e44e78189c105e63629f6b672c9fdb09e4
-EBUILD emacs-common-1.10.ebuild 3173 BLAKE2B 6f138d9cd998501ab08be276bb57c09d73691f7304f0d841fd8f7775d488b56057cde60107e1befcade81ef3e25ee25c10dea01259b14a156cab159d1aabd187 SHA512 c82676bcda825fc306b527c7aa75c2011b0c01e9d410c07af2dbbaf56ff4160d800b9625e994d7813c90392c5288c52c9334436a39fdeae033a9f7265895868b
-EBUILD emacs-common-1.11.ebuild 3450 BLAKE2B 6b3bc5717a17b025f32d683824327db7f440f98fef81a6fc0060b38c3eae399c83507f027b540013663d776f9f53dc30e54ffc25f5e63d3c7636a60168d3ce66 SHA512 e0fd227dd227c977967595d7cf0dce6e35cc5508246378162cf007c79ddd8cfaf455421af68b31265bbf5c46b9691f40ecc84893baa5c9a9e5c282918f51e4b8
+EBUILD emacs-common-1.11.ebuild 3575 BLAKE2B 2c443b42d85295756cc54e356ec7a5a65e279287a78a5b39f3942877bba4fb003023ed925dffecfa057d9f51c1d82af0e5bafd70b2e2c16004799622d89cae58 SHA512 5c17432e30c8b76d98e64556b35d88286b88419588941bfc79d71ea412f1f454e200e374b39a534c18d4e72226b5e5e034ddbff4501f50dd1ebd193e0a6dd4c4
 MISC metadata.xml 535 BLAKE2B 6c6c5bb8ce0585a2bcd37f80f6426f1e4304715f142a36d186643f9f69054fc49f889847d1d76d34537152dc9d8310a066bce1ea40b2ff7c30ee4c2dcf3b185b SHA512 0a200530dc27ea2a6ca1860d70964027d9bc748b19459639f3a946ffc4f83c965d339683a1ceb1f9cb03212a1877dc1ca51a2a1dfd1c8c9fc814aff67ad177c1
diff --git a/app-emacs/emacs-common/emacs-common-1.10.ebuild b/app-emacs/emacs-common/emacs-common-1.10.ebuild
deleted file mode 100644
index e943b4f025c9..000000000000
--- a/app-emacs/emacs-common/emacs-common-1.10.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common desktop eapi9-pipestatus gnome2-utils readme.gentoo-r1
-
-DESCRIPTION="Common files needed by all GNU Emacs versions"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="games gsettings gui"
-
-DEPEND="games? ( acct-group/gamestat )"
-RDEPEND="${DEPEND}"
-PDEPEND=">=app-editors/emacs-23.1:*"
-IDEPEND="gui? ( gsettings? ( dev-libs/glib ) )"
-
-src_install() {
-	insinto "${SITELISP}"
-	sed -e "s:@libdir@:$(get_libdir):g" subdirs.el.in | newins - subdirs.el
-	pipestatus || die
-	newins site-gentoo.el{,.orig}
-
-	keepdir /etc/emacs
-	insinto /etc/emacs
-	doins site-start.el
-
-	if use games; then
-		keepdir /var/games/emacs
-		fowners 0:gamestat /var/games/emacs
-		fperms g+w /var/games/emacs
-	fi
-
-	if use gui; then
-		local i
-		domenu emacs.desktop emacsclient.desktop
-
-		pushd icons >/dev/null || die
-		newicon sink.png emacs-sink.png
-		newicon emacs25_48.png emacs.png
-		for i in 16 24 32 48 128; do
-			[[ ${i} -le 48 ]] && newicon -s ${i} emacs22_${i}.png emacs22.png
-			newicon -s ${i} emacs23_${i}.png emacs23.png
-			newicon -s ${i} emacs25_${i}.png emacs.png
-		done
-		doicon -s scalable emacs23.svg
-		newicon -s scalable emacs25.svg emacs.svg
-		popd >/dev/null || die
-
-		if use gsettings; then
-			insinto /usr/share/glib-2.0/schemas
-			doins org.gnu.emacs.defaults.gschema.xml
-		fi
-	fi
-
-	DOC_CONTENTS="All site initialisation for Gentoo-installed packages is
-		added to ${SITELISP}/site-gentoo.el. In order for this site
-		initialisation to be loaded for all users automatically, a default
-		site startup file /etc/emacs/site-start.el is installed. You are
-		responsible for maintenance of this file.
-		\n\nAlternatively, individual users can add the following command:
-		\n\n(require 'site-gentoo)
-		\n\nto their ~/.emacs initialisation files, or, for greater
-		flexibility, users may load single package-specific initialisation
-		files from the ${SITELISP}/site-gentoo.d/ directory."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# make sure that site-gentoo.el exists since site-start.el requires it
-	if [[ ! -f ${ED}${SITELISP}/site-gentoo.el ]]; then		#554518
-		mv "${ED}${SITELISP}"/site-gentoo.el{.orig,} || die
-	fi
-	if [[ -d ${EROOT}${SITELISP} ]]; then
-		elisp-site-regen
-		cp "${EROOT}${SITELISP}/site-gentoo.el" "${ED}${SITELISP}/" || die
-	fi
-
-	if use games; then
-		local f
-		for f in /var/games/emacs/{snake,tetris}-scores; do
-			if [[ -e ${EROOT}${f} ]]; then
-				cp "${EROOT}${f}" "${ED}${f}" || die
-			fi
-			touch "${ED}${f}" || die
-			chgrp gamestat "${ED}${f}" || die
-			chmod g+w "${ED}${f}" || die
-		done
-	fi
-}
-
-pkg_postinst() {
-	if use gui; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-		use gsettings && gnome2_schemas_update
-	fi
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	if use gui; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-		use gsettings && gnome2_schemas_update
-	fi
-}
diff --git a/app-emacs/emacs-common/emacs-common-1.11.ebuild b/app-emacs/emacs-common/emacs-common-1.11.ebuild
index 6405ae24223f..d6aed2a2db25 100644
--- a/app-emacs/emacs-common/emacs-common-1.11.ebuild
+++ b/app-emacs/emacs-common/emacs-common-1.11.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV##*.} = 9999 ]]; then
 	S="${EGIT_CHECKOUT_DIR}"
 else
 	SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 DESCRIPTION="Common files needed by all GNU Emacs versions"
@@ -56,7 +56,9 @@ src_install() {
 	doexe emacs-wrapper.sh
 	elisp-site-file-install "${SITEFILE}"
 
-	insinto /usr/lib/systemd/user
+	# don't use systemd_douserunit because it would require inheriting
+	# three eclasses (systemd pulls toolchain-funcs and multilib)
+	insinto "/usr/lib/systemd/user"
 	doins emacs.service
 
 	if use games; then
diff --git a/app-emacs/emacs-daemon/Manifest b/app-emacs/emacs-daemon/Manifest
index 716cac19551a..8dce4a1313d9 100644
--- a/app-emacs/emacs-daemon/Manifest
+++ b/app-emacs/emacs-daemon/Manifest
@@ -1,7 +1,3 @@
-DIST emacs-daemon-0.22.tar.xz 5276 BLAKE2B a866b14951df94e1d382253dcb7045beb800c9dd754f7eed40eadecde43fd583bb2bc20ad9ccc9f87174b06aadbb26f7875deaf36d9bb5325f98ffa58fded8c7 SHA512 f013cd00d3a24ca348bf718dd20dec7bea89107c0a27c921d6b58595b611991830604fc658d57681708218fbee1dae6dd0b277a2a9da67639e3553e0fd133094
-DIST emacs-daemon-0.23.tar.xz 4876 BLAKE2B 95fd9fc2b038dd60d4fc889674f4f1c3e5c0f8894a0161a0ea626835e91d500766e7fb50f8efafd70b0a45129626968147009c218b55ca0df6c6da50b8cb99dc SHA512 90f4b5b22df17106173de6116f45d902613b60b4b837293ea5f7843ad4967f68f9920cb301ef1edc50c6c831941be487b456ac8c1bc41ae41a55c6e1ea135343
 DIST emacs-daemon-0.25.tar.xz 4612 BLAKE2B d2207b69b2a6d13b95095dc2f4d89c93e291dd8475379454314a4d1daad0ae8414fb3081a17350e536ce2320a002fb32fd6f239b91280726aac9cdc636ece682 SHA512 66a9d4ab89f3c27727ceb3d6e689b7a59ce7c10afbb0e4f29011aee499a6c6299887dcb0c92998e424068ae1b12d56ad74d0fe2583059eca9130bb57b7d44a14
-EBUILD emacs-daemon-0.22-r1.ebuild 1606 BLAKE2B 1d521e7d5177e864bcc365e7fe978ea4380b68380d69e542c7b1801723657dee2780b2e2441d6b5831712b550e0763f36878b913cc0acb3e42a5d1f5d9df994c SHA512 e3f1fac107add3017b522e446f22c81910cb67e05bb4008d061d371a7e7336942fef33fbd426e13ac0dda94701f1cb4fb16cf860d57c36121948dd3414c62ef0
-EBUILD emacs-daemon-0.23-r1.ebuild 1729 BLAKE2B 2f419a867078299890ee24b488a87792e210e16b763e98fd5a10c3bce88f6c3b8b8f7cce1b526342cad12ba49de679a1682ad54aa4ce159bbf30c0b874d9bb9a SHA512 b65ae5bf0e79f6f9289e5deedaafc8351bf22d602dab17575ed1d7c56259b3d8f984e699e5e0a129f1d67415315c35369fdd4d6a62fc89b2bac851210dc34197
-EBUILD emacs-daemon-0.25.ebuild 1788 BLAKE2B 598229a553654d2716aa8f0ec7474fade7f4262883015fde132cf7aad4278fec73fd6872f9ef020bb56f79855f6e84b6b60a17c368c1f09471c9caec2b6c53dd SHA512 4de08a0ec193611b5d64af7ed4fbb2adf2da6c1eb3d1f3fa24e46fb0faad5e54cb1913746c528f22fcc92d88f3c26018aaae46ff35bd561ca636a4819de10132
+EBUILD emacs-daemon-0.25.ebuild 1782 BLAKE2B dcf2f583a852b22a93e0d5377d629a82e15a551cccc810ea3662bcd9a32c9ed71caecc6d8d6189b330849729d7e1d82ffc64c124de6b352decab5fbdc0e8189b SHA512 6e9de5481e5e9899f102c8906e8aff89fa35e116e290677179a2240e77a04812b1dc55397a59777da0adcbdefe27402ee14b8fd49346b5aca34acbff426a70ed
 MISC metadata.xml 362 BLAKE2B 59c9e3025bdd347e4812d6485bda2b731a1b0adf2eec16aefdd6b0d3379a949cd99c637febfcab0c6314c457eafe0727a986196e4499aa29dbd297a6a0458d66 SHA512 5882c9372b62c44189426a1ea3ac975e29b70fc5b5d30a3f024edced82d9406e118e9acee91b1353c76eb65f19008e4bb1475f859509c933be48c03aa701394b
diff --git a/app-emacs/emacs-daemon/emacs-daemon-0.22-r1.ebuild b/app-emacs/emacs-daemon/emacs-daemon-0.22-r1.ebuild
deleted file mode 100644
index 003d4036ad4d..000000000000
--- a/app-emacs/emacs-daemon/emacs-daemon-0.22-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="Gentoo support for Emacs running as a server in the background"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
-
-SITEFILE="10${PN}-gentoo.el"
-
-pkg_setup() {
-	local has_daemon has_gtk line
-	has_daemon=$(${EMACS} ${EMACSFLAGS} --eval "(princ (fboundp 'daemonp))")
-	has_gtk=$(${EMACS} ${EMACSFLAGS} --eval "(princ (featurep 'gtk))")
-
-	if [[ ${has_daemon} != t ]]; then
-		while read line; do ewarn "${line}"; done <<-EOF
-		Your current Emacs version does not support running as a daemon which
-		is required for ${CATEGORY}/${PN}.
-		Use "eselect emacs" to select an Emacs version >= 23.
-		EOF
-	elif [[ ${has_gtk} == t ]]; then
-		while read line; do ewarn "${line}"; done <<-EOF
-		Your current Emacs is compiled with GTK+. There is a long-standing bug
-		in GTK+ that prevents Emacs from recovering from X disconnects:
-		<https://bugzilla.gnome.org/show_bug.cgi?id=85715>
-		If you run Emacs as a daemon, then it is strongly recommended that you
-		compile it with the Lucid or the Motif toolkit instead, i.e. with
-		USE="athena Xaw3d -gtk -motif" or USE="motif -gtk -athena -Xaw3d".
-		EOF
-	fi
-}
-
-src_compile() { :; }
-
-src_install() {
-	newinitd emacs.rc emacs
-	newconfd emacs.conf emacs
-	exeinto /usr/libexec/emacs
-	doexe emacs-wrapper.sh emacs-stop.sh
-	elisp-site-file-install "${SITEFILE}"
-	dodoc README ChangeLog
-}
diff --git a/app-emacs/emacs-daemon/emacs-daemon-0.23-r1.ebuild b/app-emacs/emacs-daemon/emacs-daemon-0.23-r1.ebuild
deleted file mode 100644
index e35deec75864..000000000000
--- a/app-emacs/emacs-daemon/emacs-daemon-0.23-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="Gentoo support for Emacs running as a server in the background"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
-
-SITEFILE="10${PN}-gentoo.el"
-
-pkg_setup() {
-	local has_daemon has_gtk line
-	has_daemon=$(${EMACS} ${EMACSFLAGS} --eval "(princ (fboundp 'daemonp))")
-	has_gtk=$(${EMACS} ${EMACSFLAGS} --eval "(princ (featurep 'gtk))")
-
-	if [[ ${has_daemon} != t ]]; then
-		while read line; do ewarn "${line}"; done <<-EOF
-		Your current Emacs version does not support running as a daemon which
-		is required for ${CATEGORY}/${PN}.
-		Use "eselect emacs" to select an Emacs version >= 23.
-		EOF
-	elif [[ ${has_gtk} == t ]]; then
-		while read line; do ewarn "${line}"; done <<-EOF
-		Your current Emacs is compiled with GTK+. There is a long-standing bug
-		in GTK+ that prevents Emacs from recovering from X disconnects:
-		<https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
-		<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
-		If you run Emacs as a daemon, then it is strongly recommended that you
-		compile it with the Lucid or the Motif toolkit instead, i.e. with
-		USE="athena Xaw3d -gtk -motif" or USE="motif -gtk -athena -Xaw3d".
-		EOF
-	fi
-}
-
-src_prepare() {
-	sed -i '/checkpath/s/"${USER}"/0/' emacs.rc || die
-	default
-}
-
-src_compile() { :; }
-
-src_install() {
-	newinitd emacs.rc emacs
-	newconfd emacs.conf emacs
-	exeinto /usr/libexec/emacs
-	doexe emacs-wrapper.sh
-	elisp-site-file-install "${SITEFILE}"
-	dodoc README ChangeLog
-}
diff --git a/app-emacs/emacs-daemon/emacs-daemon-0.25.ebuild b/app-emacs/emacs-daemon/emacs-daemon-0.25.ebuild
index fdda794a5706..2012abb23611 100644
--- a/app-emacs/emacs-daemon/emacs-daemon-0.25.ebuild
+++ b/app-emacs/emacs-daemon/emacs-daemon-0.25.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV##*.} = 9999 ]]; then
 	S="${EGIT_CHECKOUT_DIR}"
 else
 	SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
 fi
 
 DESCRIPTION="Gentoo support for Emacs running as a server in the background"