From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F12EC1584AD for ; Sun, 13 Apr 2025 08:23:37 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id DD1AE34308D for ; Sun, 13 Apr 2025 08:23:37 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id D918B1104B0; Sun, 13 Apr 2025 08:23:36 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id D00C51104B0 for ; Sun, 13 Apr 2025 08:23:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7824F34308C for ; Sun, 13 Apr 2025 08:23:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CD093F80 for ; Sun, 13 Apr 2025 08:23:34 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1744532575.3efe3c53bb9f55479924307869171b68904cae28.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emacs/emacs-daemon/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emacs/emacs-daemon/emacs-daemon-0.25.ebuild X-VCS-Directories: app-emacs/emacs-daemon/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 3efe3c53bb9f55479924307869171b68904cae28 X-VCS-Branch: master Date: Sun, 13 Apr 2025 08:23:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2ac1d1e5-f9c0-40a2-84fe-9fd563400f5e X-Archives-Hash: 128bc9aeb78149a94ab22a3cb5c5266b commit: 3efe3c53bb9f55479924307869171b68904cae28 Author: Ulrich Müller gentoo org> AuthorDate: Sun Apr 13 08:15:28 2025 +0000 Commit: Ulrich Müller gentoo 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 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