[gentoo-commits] repo/gentoo:master commit in: app-emacs/emacs-daemon/

[Ulrich Müller]

commit:     3efe3c53bb9f55479924307869171b68904cae28
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 13 08:15:28 2025 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 13 08:22:55 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3efe3c53

app-emacs/emacs-daemon: Drop check for daemonp

Call elisp-check-emacs-version instead, because all versions since
Emacs 23 define the daemonp function.

Inherit elisp-common instead of elisp because we don't need any of the
exported phase functions.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 app-emacs/emacs-daemon/emacs-daemon-0.25.ebuild | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/app-emacs/emacs-daemon/emacs-daemon-0.25.ebuild 
b/app-emacs/emacs-daemon/emacs-daemon-0.25.ebuild
index 2012abb23611..81213c25aaa4 100644
--- a/app-emacs/emacs-daemon/emacs-daemon-0.25.ebuild
+++ b/app-emacs/emacs-daemon/emacs-daemon-0.25.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit elisp
+inherit elisp-common
 
 if [[ ${PV##*.} = 9999 ]]; then
        inherit git-r3
@@ -22,20 +22,17 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs";
 LICENSE="GPL-2+"
 SLOT="0"
 
-RDEPEND=">=app-emacs/emacs-common-1.11"
+BDEPEND=">=app-editors/emacs-${NEED_EMACS}:*"
+RDEPEND="${BDEPEND}
+       >=app-emacs/emacs-common-1.11"
 
 pkg_setup() {
-       local has_daemon has_gtk line
-       has_daemon=$(${EMACS} ${EMACSFLAGS} --eval "(princ (fboundp 'daemonp))")
+       elisp-check-emacs-version
+
+       local has_gtk line
        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
+       if [[ ${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:
@@ -48,8 +45,6 @@ pkg_setup() {
        fi
 }
 
-src_compile() { :; }
-
 src_install() {
        newinitd emacs.rc emacs
        newconfd emacs.conf emacs