[gentoo-commits] proj/emacs-tools:emacs-common commit in: /

[gentoo-commits] proj/emacs-tools:emacs-common commit in: /

[Ulrich Müller]

commit:     8c612c1ee8e4a1a28550c730fd20ccb1f2ce600d
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 22 08:02:37 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 22 08:02:37 2021 +0000
URL:        https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=8c612c1e

Version 1.8 released

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

 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index b553c7c..4c24309 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2021-03-22  Ulrich Müller  <ulm@gentoo.org>
+
+	* Version 1.8 released. This is identical to 1.7 except for the
+	name change.
+
 2021-03-14  Ulrich Müller  <ulm@gentoo.org>
 
 	* Makefile (PN): Package renamed to emacs-common.

[gentoo-commits] proj/emacs-tools:emacs-common commit in: /

[Ulrich Müller]

commit:     d7bc8c00fac04f63873d825bc9399682f3893169
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 15:21:57 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 24 15:21:57 2023 +0000
URL:        https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=d7bc8c00

Add schema file for gsettings

* org.gnu.emacs.defaults.gschema.xml: New file, from upstream
Git repository. Bug 911117.
* Makefile (GSCHEMAFILES, DISTFILES): Add it.

Bug: https://bugs.gentoo.org/911117
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 ChangeLog                          |  6 +++++
 Makefile                           |  5 ++--
 org.gnu.emacs.defaults.gschema.xml | 51 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4c24309..78ee271 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-07-24  Ulrich Müller  <ulm@gentoo.org>
+
+	* org.gnu.emacs.defaults.gschema.xml: New file, from upstream
+	Git repository. Bug 911117.
+	* Makefile (GSCHEMAFILES, DISTFILES): Add it.
+
 2021-03-22  Ulrich Müller  <ulm@gentoo.org>
 
 	* Version 1.8 released. This is identical to 1.7 except for the

diff --git a/Makefile b/Makefile
index c64289d..65da9b7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2007-2021 Gentoo Authors
+# Copyright 2007-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2 or later
 
 PN = emacs-common
@@ -13,8 +13,9 @@ ICONFILES = sink.png \
 	emacs23_128.png emacs23.svg \
 	emacs25_16.png emacs25_24.png emacs25_32.png emacs25_48.png \
 	emacs25_128.png emacs25.svg
+GSCHEMAFILES = org.gnu.emacs.defaults.gschema.xml
 DISTFILES = site-start.el site-gentoo.el subdirs.el.in $(DESKTOPFILES) \
-	$(addprefix icons/,COPYRIGHT.icons $(ICONFILES))
+	$(addprefix icons/,COPYRIGHT.icons $(ICONFILES)) $(GSCHEMAFILES)
 
 
 .PHONY: all dist clean $(DESKTOPFILES)

diff --git a/org.gnu.emacs.defaults.gschema.xml b/org.gnu.emacs.defaults.gschema.xml
new file mode 100644
index 0000000..7c700ac
--- /dev/null
+++ b/org.gnu.emacs.defaults.gschema.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019-2020 Free Software Foundation, Inc. -->
+<schemalist>
+
+  <schema id="org.gnu.emacs.defaults">
+
+    <key name='alpha'                    type='s'><default>''</default></key>
+    <key name='auto-raise-lower'         type='s'><default>''</default></key>
+    <key name='auto-lower'               type='s'><default>''</default></key>
+    <key name='auto-raise'               type='s'><default>''</default></key>
+    <key name='background'               type='s'><default>''</default></key>
+    <key name='background-mode'          type='s'><default>''</default></key>
+    <key name='bitmap-icon'              type='s'><default>''</default></key>
+    <key name='border-color'             type='s'><default>''</default></key>
+    <key name='border-width'             type='s'><default>''</default></key>
+    <key name='buffer-predicate'         type='s'><default>''</default></key>
+    <key name='cursor-blink'             type='s'><default>''</default></key>
+    <key name='cursor-type'              type='s'><default>''</default></key>
+    <key name='cursor-color'             type='s'><default>''</default></key>
+    <key name='font'                     type='s'><default>''</default></key>
+    <key name='font-backend'             type='s'><default>''</default></key>
+    <key name='foreground'               type='s'><default>''</default></key>
+    <key name='fullscreen'               type='s'><default>''</default></key>
+    <key name='horizontal-scroll-bars'   type='s'><default>''</default></key>
+    <key name='icon-name'                type='s'><default>''</default></key>
+    <key name='inhibit-double-buffering' type='s'><default>''</default></key>
+    <key name='internal-border'          type='s'><default>''</default></key>
+    <key name='internal-border-width'    type='s'><default>''</default></key>
+    <key name='left-fringe'              type='s'><default>''</default></key>
+    <key name='line-spacing'             type='s'><default>''</default></key>
+    <key name='menu-bar'                 type='s'><default>''</default></key>
+    <key name='minibuffer'               type='s'><default>''</default></key>
+    <key name='name'                     type='s'><default>''</default></key>
+    <key name='pointer-color'            type='s'><default>''</default></key>
+    <key name='reverse-video'            type='s'><default>''</default></key>
+    <key name='right-fringe'             type='s'><default>''</default></key>
+    <key name='screen-gamma'             type='s'><default>''</default></key>
+    <key name='scroll-bar'               type='s'><default>''</default></key>
+    <key name='scroll-bar-background'    type='s'><default>''</default></key>
+    <key name='scroll-bar-foreground'    type='s'><default>''</default></key>
+    <key name='scroll-bar-height'        type='s'><default>''</default></key>
+    <key name='scroll-bar-width'         type='s'><default>''</default></key>
+    <key name='scroll-bars'              type='s'><default>''</default></key>
+    <key name='title'                    type='s'><default>''</default></key>
+    <key name='tool-bar'                 type='s'><default>''</default></key>
+    <key name='vertical-scroll-bars'     type='s'><default>''</default></key>
+    <key name='wait-for-w-m'             type='s'><default>''</default></key>
+
+  </schema>
+
+</schemalist>

[gentoo-commits] proj/emacs-tools:emacs-common commit in: /

[Ulrich Müller]

commit:     2f76995f97bec0fa5d1ece35b1bc131f4de20062
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 15:22:48 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 24 15:22:48 2023 +0000
URL:        https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=2f76995f

Version 1.9 released

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

 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 78ee271..9e4ede9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2023-07-24  Ulrich Müller  <ulm@gentoo.org>
 
+	* Version 1.9 released.
+
 	* org.gnu.emacs.defaults.gschema.xml: New file, from upstream
 	Git repository. Bug 911117.
 	* Makefile (GSCHEMAFILES, DISTFILES): Add it.

[gentoo-commits] proj/emacs-tools:emacs-common commit in: /

[Ulrich Müller]

commit:     a401b91919650e7d27d0277ff6aa6a66249111be
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 12 16:18:57 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 12 16:18:57 2023 +0000
URL:        https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=a401b919

Enable lexical binding

* site-start.el:
* site-gentoo.el:
* subdirs.el.in: Enable lexical binding.

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

 ChangeLog      | 6 ++++++
 site-gentoo.el | 2 +-
 site-start.el  | 2 +-
 subdirs.el.in  | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9e4ede9..bab40f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-09-12  Ulrich Müller  <ulm@gentoo.org>
+
+	* site-start.el:
+	* site-gentoo.el:
+	* subdirs.el.in: Enable lexical binding.
+
 2023-07-24  Ulrich Müller  <ulm@gentoo.org>
 
 	* Version 1.9 released.

diff --git a/site-gentoo.el b/site-gentoo.el
index 9a40311..2df5dd0 100644
--- a/site-gentoo.el
+++ b/site-gentoo.el
@@ -1,4 +1,4 @@
-;;; site-gentoo.el --- site initialisation for Gentoo-installed packages
+;;; site-gentoo.el --- Gentoo site initialisation  -*- lexical-binding: t; -*-
 
 ;;; Commentary:
 ;; Automatically generated by elisp-common.eclass

diff --git a/site-start.el b/site-start.el
index 0ec3785..314ede5 100644
--- a/site-start.el
+++ b/site-start.el
@@ -1,4 +1,4 @@
-;;; site-start.el			-*- no-byte-compile: t -*-
+;;; site-start.el  -*- lexical-binding: t; no-byte-compile: t; -*-
 
 ;;; Commentary:
 ;; This is the site startup file for GNU Emacs. It is loaded before

diff --git a/subdirs.el.in b/subdirs.el.in
index 3432bf0..81e0e1b 100644
--- a/subdirs.el.in
+++ b/subdirs.el.in
@@ -1,4 +1,4 @@
-;; -*- no-byte-compile: t -*-
+;; -*- lexical-binding: t; no-byte-compile: t; -*-
 (when (fboundp 'normal-top-level-add-subdirs-to-load-path)
   (normal-top-level-add-subdirs-to-load-path)
   ;; We install dynamic modules in a more FHS compliant location,

[gentoo-commits] proj/emacs-tools:emacs-common commit in: /

[Ulrich Müller]

commit:     4d9be8c40ded03641692bcf0d843473e73dd5304
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 12 16:18:57 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 12 16:18:57 2023 +0000
URL:        https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=4d9be8c4

Enable lexical binding

* site-start.el:
* site-gentoo.el:
* subdirs.el.in: Enable lexical binding.

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

 ChangeLog      | 6 ++++++
 site-gentoo.el | 2 +-
 site-start.el  | 2 +-
 subdirs.el.in  | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9e4ede9..bab40f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-09-12  Ulrich Müller  <ulm@gentoo.org>
+
+	* site-start.el:
+	* site-gentoo.el:
+	* subdirs.el.in: Enable lexical binding.
+
 2023-07-24  Ulrich Müller  <ulm@gentoo.org>
 
 	* Version 1.9 released.

diff --git a/site-gentoo.el b/site-gentoo.el
index 9a40311..427c491 100644
--- a/site-gentoo.el
+++ b/site-gentoo.el
@@ -1,4 +1,4 @@
-;;; site-gentoo.el --- site initialisation for Gentoo-installed packages
+;;; site-gentoo.el --- Gentoo site initialisation  -*-lexical-binding:t-*-
 
 ;;; Commentary:
 ;; Automatically generated by elisp-common.eclass

diff --git a/site-start.el b/site-start.el
index 0ec3785..314ede5 100644
--- a/site-start.el
+++ b/site-start.el
@@ -1,4 +1,4 @@
-;;; site-start.el			-*- no-byte-compile: t -*-
+;;; site-start.el  -*- lexical-binding: t; no-byte-compile: t; -*-
 
 ;;; Commentary:
 ;; This is the site startup file for GNU Emacs. It is loaded before

diff --git a/subdirs.el.in b/subdirs.el.in
index 3432bf0..81e0e1b 100644
--- a/subdirs.el.in
+++ b/subdirs.el.in
@@ -1,4 +1,4 @@
-;; -*- no-byte-compile: t -*-
+;; -*- lexical-binding: t; no-byte-compile: t; -*-
 (when (fboundp 'normal-top-level-add-subdirs-to-load-path)
   (normal-top-level-add-subdirs-to-load-path)
   ;; We install dynamic modules in a more FHS compliant location,

[gentoo-commits] proj/emacs-tools:emacs-common commit in: /

[Ulrich Müller]

commit:     1a2b4a6eb61dc1bbff2347c23a7a999f6eac4407
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun May  5 12:37:52 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun May  5 12:37:52 2024 +0000
URL:        https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=1a2b4a6e

Version 1.10 released

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

 ChangeLog | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index bab40f8..7c9bb9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2024-05-05  Ulrich Müller  <ulm@gentoo.org>
+
+	* Version 1.10 released.
+
 2023-09-12  Ulrich Müller  <ulm@gentoo.org>
 
 	* site-start.el:

[gentoo-commits] proj/emacs-tools:emacs-common commit in: /

[Ulrich Müller]

commit:     751ea76c2e36179d01ceccaf13fae8d788fb3da9
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  7 06:17:35 2025 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Mar  7 06:17:35 2025 +0000
URL:        https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=751ea76c

Update MimeType in emacsclient.desktop

* emacsclient.desktop (MimeType): Add org-protocol, from Emacs 30.
Bug 950674.

Bug: https://bugs.gentoo.org/950674
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 ChangeLog           | 5 +++++
 emacsclient.desktop | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 7c9bb9a..565945f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2025-03-07  Ulrich Müller  <ulm@gentoo.org>
+
+	* emacsclient.desktop (MimeType): Add org-protocol, from Emacs 30.
+	Bug 950674.
+
 2024-05-05  Ulrich Müller  <ulm@gentoo.org>
 
 	* Version 1.10 released.

diff --git a/emacsclient.desktop b/emacsclient.desktop
index cc03ba0..70968bc 100644
--- a/emacsclient.desktop
+++ b/emacsclient.desktop
@@ -11,4 +11,4 @@ Icon=emacs
 TryExec=/usr/bin/emacsclient
 Exec=/usr/bin/emacsclient %F
 Terminal=false
-MimeType=text/css;text/english;text/html;text/plain;text/x-c;text/x-chdr;text/x-csrc;text/x-c++;text/x-c++hdr;text/x-c++src;text/x-java;text/x-makefile;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;
+MimeType=text/css;text/english;text/html;text/plain;text/x-c;text/x-chdr;text/x-csrc;text/x-c++;text/x-c++hdr;text/x-c++src;text/x-java;text/x-makefile;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;x-scheme-handler/org-protocol;

[gentoo-commits] proj/emacs-tools:emacs-common commit in: /

[Ulrich Müller]

commit:     ee79082103da7e8090136b6ef4867bff7ddf5521
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  7 17:12:24 2025 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Mar  7 17:12:24 2025 +0000
URL:        https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=ee790821

Add user initd file for OpenRC

* emacs.initd: New file. Merged version of the user initd file
attached to bug 950671 and emacs.rc from the emacs-daemon package.
Thanks to Anna (navi) Figueiredo Gomes.
* Makefile (DISTFILES): Add it.

Bug: https://bugs.gentoo.org/950671
Signed-off-by: Anna (navi) Figueiredo Gomes <navi <AT> vlhl.dev>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 ChangeLog   |  5 +++++
 Makefile    |  7 ++++---
 emacs.initd | 29 +++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 565945f..53d2f73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2025-03-07  Ulrich Müller  <ulm@gentoo.org>
 
+	* emacs.initd: New file. Merged version of the user initd file
+	attached to bug 950671 and emacs.rc from the emacs-daemon package.
+	Thanks to Anna (navi) Figueiredo Gomes.
+	* Makefile (DISTFILES): Add it.
+
 	* emacsclient.desktop (MimeType): Add org-protocol, from Emacs 30.
 	Bug 950674.
 

diff --git a/Makefile b/Makefile
index 65da9b7..9a4fbac 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2007-2023 Gentoo Authors
+# Copyright 2007-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2 or later
 
 PN = emacs-common
@@ -14,8 +14,9 @@ ICONFILES = sink.png \
 	emacs25_16.png emacs25_24.png emacs25_32.png emacs25_48.png \
 	emacs25_128.png emacs25.svg
 GSCHEMAFILES = org.gnu.emacs.defaults.gschema.xml
-DISTFILES = site-start.el site-gentoo.el subdirs.el.in $(DESKTOPFILES) \
-	$(addprefix icons/,COPYRIGHT.icons $(ICONFILES)) $(GSCHEMAFILES)
+DISTFILES = site-start.el site-gentoo.el subdirs.el.in emacs.initd \
+	$(DESKTOPFILES) $(addprefix icons/,COPYRIGHT.icons $(ICONFILES)) \
+	$(GSCHEMAFILES)
 
 
 .PHONY: all dist clean $(DESKTOPFILES)

diff --git a/emacs.initd b/emacs.initd
new file mode 100644
index 0000000..f71b4c2
--- /dev/null
+++ b/emacs.initd
@@ -0,0 +1,29 @@
+#!/sbin/openrc-run
+# Copyright 2008-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2 or later
+
+: ${EMACS:=/usr/bin/emacs}
+
+description="Start an Emacs server running in the background"
+
+supervisor=supervise-daemon
+command="${EMACS}"
+command_args="${EMACS_OPTS}"
+command_args_foreground="--fg-daemon"
+
+depend() {
+    after dbus
+}
+
+start_pre() {
+    # EMACS could be a microemacs variant that ignores the -batch option
+    # and would therefore hang, waiting for user interaction.
+    # Redirecting stdin and unsetting TERM and DISPLAY will cause most
+    # of them to exit with an error.
+    local has_daemon=$(unset TERM DISPLAY; ${EMACS} -batch -q --no-site-file \
+        --eval "(princ (fboundp 'daemonp))" </dev/null)
+    if [ "${has_daemon}" != t ]; then
+        eerror "${EMACS} does not support running as a daemon"
+        return 1
+    fi
+}

[gentoo-commits] proj/emacs-tools:emacs-common commit in: /

[Ulrich Müller]

commit:     0801b39bb55a53d63803577850c11ee931248ec2
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  7 20:26:56 2025 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Mar  7 20:26:56 2025 +0000
URL:        https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=0801b39b

Add README files

* README.gentoo.in: New file, from DOC_CONTENTS of the ebuild.
* README.daemon: New file, copied from emacs-daemon and updated.
* Makefile (DISTFILES): Add them.

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

 ChangeLog        |  4 ++++
 Makefile         |  7 +++---
 README.daemon    | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.gentoo.in | 16 +++++++++++++
 4 files changed, 97 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 53d2f73..9bd5053 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2025-03-07  Ulrich Müller  <ulm@gentoo.org>
 
+	* README.gentoo.in: New file, from DOC_CONTENTS of the ebuild.
+	* README.daemon: New file, copied from emacs-daemon and updated.
+	* Makefile (DISTFILES): Add them.
+
 	* emacs.initd: New file. Merged version of the user initd file
 	attached to bug 950671 and emacs.rc from the emacs-daemon package.
 	Thanks to Anna (navi) Figueiredo Gomes.

diff --git a/Makefile b/Makefile
index 9a4fbac..af7986f 100644
--- a/Makefile
+++ b/Makefile
@@ -14,9 +14,10 @@ ICONFILES = sink.png \
 	emacs25_16.png emacs25_24.png emacs25_32.png emacs25_48.png \
 	emacs25_128.png emacs25.svg
 GSCHEMAFILES = org.gnu.emacs.defaults.gschema.xml
-DISTFILES = site-start.el site-gentoo.el subdirs.el.in emacs.initd \
-	$(DESKTOPFILES) $(addprefix icons/,COPYRIGHT.icons $(ICONFILES)) \
-	$(GSCHEMAFILES)
+DISTFILES = README.gentoo.in README.daemon \
+	site-start.el site-gentoo.el subdirs.el.in emacs.initd \
+	$(DESKTOPFILES) $(GSCHEMAFILES) \
+	$(addprefix icons/,COPYRIGHT.icons $(ICONFILES)) \
 
 
 .PHONY: all dist clean $(DESKTOPFILES)

diff --git a/README.daemon b/README.daemon
new file mode 100644
index 0000000..5234023
--- /dev/null
+++ b/README.daemon
@@ -0,0 +1,73 @@
+User guide for the Emacs daemon init script
+===========================================
+
+GNU Emacs version 23 or later supports running as a daemon, to which
+a user can connect through the emacsclient program. This can be done
+either in the current terminal with ``emacsclient -t``, or by creating
+a new graphical client frame (i.e. opening a new X window) with
+``emacsclient -c``.
+
+Every user who wants to connect to an Emacs server must have an own
+instance of the daemonized GNU Emacs.
+
+OpenRC version 0.60 or later supports this via "user services" and
+user init scripts in the ``/etc/user/init.d/`` directory. In order to
+automatically start Emacs as a daemon in your user session, login as
+normal user and execute the command::
+
+   $ rc-update --user add emacs default
+
+This will add the ``/etc/user/init.d/emacs`` init script to the
+default runlevel in ``~/.config/rc/runlevels/``.
+
+To get all benefits of the daemon setup, you should set the ``EDITOR``
+environment variable to ``emacsclient``, so that programs calling an
+external editor will use the existing Emacs process. Also file
+associations in your desktop system should call emacsclient.
+When closing a session or frame, no contents is lost; you may simply
+reconnect to the Emacs server.
+
+Launching the Emacs daemon at system startup
+--------------------------------------------
+
+If you want to launch your user's Emacs daemon at system startup and
+have it persist between login sessions, you must multiplex OpenRC's
+user system service: As the superuser, create a symbolic link (do not
+copy the script, or you will miss eventual updates!) in the
+``/etc/init.d/`` directory::
+
+   # ln -s user /etc/init.d/user.<username>
+
+where <username> is your user's login name. The service can then be
+started manually using::
+
+   # rc-service user.<username> start
+
+or it may be added to the boot sequence (and will run with the user's
+privileges)::
+
+   # rc-update add user.<username> default
+
+See OpenRC's ``user-guide.md`` for a more complete guide how to
+configure user services at the OpenRC side.
+
+Note: Running of an Emacs daemon process for a user was previously
+supported by the app-emacs/emacs-daemon package which launched it as
+a regular OpenRC service (as user services did not yet exist).
+This method still works but may be discontinued in the future.
+
+Authors
+-------
+
+| Ulrich Müller <ulm@gentoo.org>
+| Christian Faulhammer <fauli@gentoo.org>
+
+| Copyright 2008-2025 Gentoo Authors
+| Distributed under the terms of the GNU General Public License v2 or later
+
+
+.. Local Variables:
+.. mode: rst
+.. fill-column: 70
+.. indent-tabs-mode: nil
+.. End:

diff --git a/README.gentoo.in b/README.gentoo.in
new file mode 100644
index 0000000..da7266d
--- /dev/null
+++ b/README.gentoo.in
@@ -0,0 +1,16 @@
+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.
+
+Alternatively, individual users can add the following command:
+
+   (require 'site-gentoo)
+
+to their ~/.emacs initialisation files, or, for greater flexibility,
+users may load single package-specific initialisation files from the
+@SITELISP@/site-gentoo.d/ directory.
+
+See README.daemon for documentation of the Emacs daemon init script.

[gentoo-commits] proj/emacs-tools:emacs-common commit in: /

[Ulrich Müller]

commit:     8a6231977d20218e2fb3446eb943cd7cd02c9ea9
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  7 20:26:56 2025 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Mar  8 08:18:14 2025 +0000
URL:        https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=8a623197

Add README files

* README.gentoo.in: New file, from DOC_CONTENTS of the ebuild.
* README.daemon: New file, copied from emacs-daemon and updated.
* Makefile (DISTFILES): Add them.

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

 ChangeLog        |  4 +++
 Makefile         |  7 +++--
 README.daemon    | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.gentoo.in | 16 +++++++++++
 4 files changed, 109 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 53d2f73..9bd5053 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2025-03-07  Ulrich Müller  <ulm@gentoo.org>
 
+	* README.gentoo.in: New file, from DOC_CONTENTS of the ebuild.
+	* README.daemon: New file, copied from emacs-daemon and updated.
+	* Makefile (DISTFILES): Add them.
+
 	* emacs.initd: New file. Merged version of the user initd file
 	attached to bug 950671 and emacs.rc from the emacs-daemon package.
 	Thanks to Anna (navi) Figueiredo Gomes.

diff --git a/Makefile b/Makefile
index 9a4fbac..af7986f 100644
--- a/Makefile
+++ b/Makefile
@@ -14,9 +14,10 @@ ICONFILES = sink.png \
 	emacs25_16.png emacs25_24.png emacs25_32.png emacs25_48.png \
 	emacs25_128.png emacs25.svg
 GSCHEMAFILES = org.gnu.emacs.defaults.gschema.xml
-DISTFILES = site-start.el site-gentoo.el subdirs.el.in emacs.initd \
-	$(DESKTOPFILES) $(addprefix icons/,COPYRIGHT.icons $(ICONFILES)) \
-	$(GSCHEMAFILES)
+DISTFILES = README.gentoo.in README.daemon \
+	site-start.el site-gentoo.el subdirs.el.in emacs.initd \
+	$(DESKTOPFILES) $(GSCHEMAFILES) \
+	$(addprefix icons/,COPYRIGHT.icons $(ICONFILES)) \
 
 
 .PHONY: all dist clean $(DESKTOPFILES)

diff --git a/README.daemon b/README.daemon
new file mode 100644
index 0000000..2c3df60
--- /dev/null
+++ b/README.daemon
@@ -0,0 +1,85 @@
+User guide for the Emacs daemon init script
+===========================================
+
+GNU Emacs version 23 or later supports running as a daemon, to which
+a user can connect through the emacsclient program. This can be done
+either in the current terminal with ``emacsclient -t``, or by creating
+a new graphical client frame (i.e. opening a new X window) with
+``emacsclient -c``.
+
+Every user who wants to connect to an Emacs server must have an own
+instance of the daemonized GNU Emacs.
+
+OpenRC version 0.60 or later supports this via "user services" and
+user init scripts in the ``/etc/user/init.d/`` directory. In order to
+automatically start Emacs as a daemon in your user session, login as
+normal user and execute the command::
+
+   $ rc-update --user add emacs default
+
+This will add the ``/etc/user/init.d/emacs`` init script to the
+default runlevel in ``~/.config/rc/runlevels/``.
+
+To get all benefits of the daemon setup, you should set the ``EDITOR``
+environment variable to ``emacsclient``, so that programs calling an
+external editor will use the existing Emacs process. Also file
+associations in your desktop system should call emacsclient.
+When closing a session or frame, no contents is lost; you may simply
+reconnect to the Emacs server.
+
+Further customization can be done by placing an ``emacs``
+configuration file into ``/etc/user/conf.d/``, or users can add
+individual configuration files in their ``~/.config/rc/conf.d/``
+directory. The following variables can the configured:
+
+``EMACS``
+   Absolute path to the emacs binary; ``/usr/bin/emacs`` by default.
+
+``EMACS_OPTS``
+   Options to pass to Emacs (in addition to ``--fg-daemon`` which is
+   always passed); empty by default.
+
+Launching the Emacs daemon at system startup
+--------------------------------------------
+
+If you want to launch your user's Emacs daemon at system startup and
+have it persist between login sessions, you must multiplex OpenRC's
+user system service: As the superuser, create a symbolic link (do not
+copy the script, or you will miss eventual updates!) in the
+``/etc/init.d/`` directory::
+
+   # ln -s user /etc/init.d/user.<username>
+
+where <username> is your user's login name. The service can then be
+started manually using::
+
+   # rc-service user.<username> start
+
+or it may be added to the boot sequence (and will run with the user's
+privileges)::
+
+   # rc-update add user.<username> default
+
+See OpenRC's ``user-guide.md`` for a more complete guide how to
+configure user services at the OpenRC side.
+
+Note: Running of an Emacs daemon process for a user was previously
+supported by the app-emacs/emacs-daemon package which launched it as
+a regular OpenRC service (as user services did not yet exist).
+This method still works but may be discontinued in the future.
+
+Authors
+-------
+
+| Ulrich Müller <ulm@gentoo.org>
+| Christian Faulhammer <fauli@gentoo.org>
+
+| Copyright 2008-2025 Gentoo Authors
+| Distributed under the terms of the GNU General Public License v2 or later
+
+
+.. Local Variables:
+.. mode: rst
+.. fill-column: 70
+.. indent-tabs-mode: nil
+.. End:

diff --git a/README.gentoo.in b/README.gentoo.in
new file mode 100644
index 0000000..da7266d
--- /dev/null
+++ b/README.gentoo.in
@@ -0,0 +1,16 @@
+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.
+
+Alternatively, individual users can add the following command:
+
+   (require 'site-gentoo)
+
+to their ~/.emacs initialisation files, or, for greater flexibility,
+users may load single package-specific initialisation files from the
+@SITELISP@/site-gentoo.d/ directory.
+
+See README.daemon for documentation of the Emacs daemon init script.

[gentoo-commits] proj/emacs-tools:emacs-common commit in: /

[Ulrich Müller]

commit:     d9e20255fe735c71236babd672d462e827fee2e1
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  7 20:26:56 2025 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Mar  8 08:38:58 2025 +0000
URL:        https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=d9e20255

Add README files

* README.gentoo.in: New file, from DOC_CONTENTS of the ebuild.
* README.daemon: New file, copied from emacs-daemon and updated.
* Makefile (DISTFILES): Add them.

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

 ChangeLog        |  4 +++
 Makefile         |  7 +++--
 README.daemon    | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.gentoo.in | 16 +++++++++++
 4 files changed, 109 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 53d2f73..9bd5053 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2025-03-07  Ulrich Müller  <ulm@gentoo.org>
 
+	* README.gentoo.in: New file, from DOC_CONTENTS of the ebuild.
+	* README.daemon: New file, copied from emacs-daemon and updated.
+	* Makefile (DISTFILES): Add them.
+
 	* emacs.initd: New file. Merged version of the user initd file
 	attached to bug 950671 and emacs.rc from the emacs-daemon package.
 	Thanks to Anna (navi) Figueiredo Gomes.

diff --git a/Makefile b/Makefile
index 9a4fbac..af7986f 100644
--- a/Makefile
+++ b/Makefile
@@ -14,9 +14,10 @@ ICONFILES = sink.png \
 	emacs25_16.png emacs25_24.png emacs25_32.png emacs25_48.png \
 	emacs25_128.png emacs25.svg
 GSCHEMAFILES = org.gnu.emacs.defaults.gschema.xml
-DISTFILES = site-start.el site-gentoo.el subdirs.el.in emacs.initd \
-	$(DESKTOPFILES) $(addprefix icons/,COPYRIGHT.icons $(ICONFILES)) \
-	$(GSCHEMAFILES)
+DISTFILES = README.gentoo.in README.daemon \
+	site-start.el site-gentoo.el subdirs.el.in emacs.initd \
+	$(DESKTOPFILES) $(GSCHEMAFILES) \
+	$(addprefix icons/,COPYRIGHT.icons $(ICONFILES)) \
 
 
 .PHONY: all dist clean $(DESKTOPFILES)

diff --git a/README.daemon b/README.daemon
new file mode 100644
index 0000000..12de931
--- /dev/null
+++ b/README.daemon
@@ -0,0 +1,85 @@
+User guide for the Emacs daemon init script
+===========================================
+
+GNU Emacs version 23 or later supports running as a daemon, to which
+a user can connect through the emacsclient program. This can be done
+either in the current terminal with ``emacsclient -t``, or by creating
+a new graphical client frame (i.e. opening a new X window) with
+``emacsclient -c``.
+
+Every user who wants to connect to an Emacs server must have an own
+instance of the daemonized GNU Emacs.
+
+OpenRC version 0.60 or later supports this via *user services* and
+user init scripts in the ``/etc/user/init.d/`` directory. In order to
+automatically start Emacs as a daemon in your user session, login as
+normal user and execute the command::
+
+   $ rc-update --user add emacs default
+
+This will add the ``/etc/user/init.d/emacs`` init script to the
+default runlevel in ``~/.config/rc/runlevels/``.
+
+To get all benefits of the daemon setup, you should set the ``EDITOR``
+environment variable to ``emacsclient``, so that programs calling an
+external editor will use the existing Emacs process. Also file
+associations in your desktop system should call emacsclient.
+When closing a session or frame, no contents is lost; you may simply
+reconnect to the Emacs server.
+
+Further customization can be done by placing an ``emacs``
+configuration file into ``/etc/user/conf.d/``, or users can add
+individual configuration files in their ``~/.config/rc/conf.d/``
+directory. The following variables can the configured:
+
+``EMACS``
+   Absolute path to the emacs binary; ``/usr/bin/emacs`` by default.
+
+``EMACS_OPTS``
+   Options to pass to Emacs (in addition to ``--fg-daemon`` which is
+   always passed); empty by default.
+
+Launching the Emacs daemon at system startup
+--------------------------------------------
+
+If you want to launch your user's Emacs daemon at system startup and
+have it persist between login sessions, you must multiplex OpenRC's
+user system service: As the superuser, create a symbolic link (do not
+copy the script, or you will miss eventual updates!) in the
+``/etc/init.d/`` directory::
+
+   # ln -s user /etc/init.d/user.<username>
+
+where *<username>* is your user's login name. The service can then be
+started manually using::
+
+   # rc-service user.<username> start
+
+or it may be added to the boot sequence (and will run with the user's
+privileges)::
+
+   # rc-update add user.<username> default
+
+See OpenRC's ``user-guide.md`` for a more complete guide how to
+configure user services at the OpenRC side.
+
+Note: Running of an Emacs daemon process for a user was previously
+supported by the app-emacs/emacs-daemon package which launched it as
+a regular OpenRC service (as user services did not yet exist).
+This method still works but may be discontinued in the future.
+
+Authors
+-------
+
+| Ulrich Müller <ulm@gentoo.org>
+| Christian Faulhammer <fauli@gentoo.org>
+
+| Copyright 2008-2025 Gentoo Authors
+| Distributed under the terms of the GNU General Public License v2 or later
+
+
+.. Local Variables:
+.. mode: rst
+.. fill-column: 70
+.. indent-tabs-mode: nil
+.. End:

diff --git a/README.gentoo.in b/README.gentoo.in
new file mode 100644
index 0000000..da7266d
--- /dev/null
+++ b/README.gentoo.in
@@ -0,0 +1,16 @@
+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.
+
+Alternatively, individual users can add the following command:
+
+   (require 'site-gentoo)
+
+to their ~/.emacs initialisation files, or, for greater flexibility,
+users may load single package-specific initialisation files from the
+@SITELISP@/site-gentoo.d/ directory.
+
+See README.daemon for documentation of the Emacs daemon init script.

[gentoo-commits] proj/emacs-tools:emacs-common commit in: /

[Ulrich Müller]

commit:     158b106b7059dcad54429113907a94943fa24156
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  7 20:26:56 2025 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Mar  8 08:44:43 2025 +0000
URL:        https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=158b106b

Add README files

* README.gentoo.in: New file, from DOC_CONTENTS of the ebuild.
* README.daemon: New file, copied from emacs-daemon and updated.
* Makefile (DISTFILES): Add them.

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

 ChangeLog        |  4 +++
 Makefile         |  7 +++--
 README.daemon    | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.gentoo.in | 16 +++++++++++
 4 files changed, 111 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 53d2f73..9bd5053 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2025-03-07  Ulrich Müller  <ulm@gentoo.org>
 
+	* README.gentoo.in: New file, from DOC_CONTENTS of the ebuild.
+	* README.daemon: New file, copied from emacs-daemon and updated.
+	* Makefile (DISTFILES): Add them.
+
 	* emacs.initd: New file. Merged version of the user initd file
 	attached to bug 950671 and emacs.rc from the emacs-daemon package.
 	Thanks to Anna (navi) Figueiredo Gomes.

diff --git a/Makefile b/Makefile
index 9a4fbac..af7986f 100644
--- a/Makefile
+++ b/Makefile
@@ -14,9 +14,10 @@ ICONFILES = sink.png \
 	emacs25_16.png emacs25_24.png emacs25_32.png emacs25_48.png \
 	emacs25_128.png emacs25.svg
 GSCHEMAFILES = org.gnu.emacs.defaults.gschema.xml
-DISTFILES = site-start.el site-gentoo.el subdirs.el.in emacs.initd \
-	$(DESKTOPFILES) $(addprefix icons/,COPYRIGHT.icons $(ICONFILES)) \
-	$(GSCHEMAFILES)
+DISTFILES = README.gentoo.in README.daemon \
+	site-start.el site-gentoo.el subdirs.el.in emacs.initd \
+	$(DESKTOPFILES) $(GSCHEMAFILES) \
+	$(addprefix icons/,COPYRIGHT.icons $(ICONFILES)) \
 
 
 .PHONY: all dist clean $(DESKTOPFILES)

diff --git a/README.daemon b/README.daemon
new file mode 100644
index 0000000..12201dc
--- /dev/null
+++ b/README.daemon
@@ -0,0 +1,87 @@
+User guide for the Emacs daemon init script
+===========================================
+
+GNU Emacs version 23 or later supports running as a daemon, to which
+a user can connect through the emacsclient program. This can be done
+either in the current terminal with ``emacsclient -t``, or by creating
+a new graphical client frame (i.e. opening a new X window) with
+``emacsclient -c``.
+
+Every user who wants to connect to an Emacs server must have an own
+instance of the daemonized GNU Emacs.
+
+OpenRC version 0.60 or later supports this via *user services* and
+user init scripts in the ``/etc/user/init.d/`` directory. In order to
+automatically start Emacs as a daemon in your user session, login as
+normal user and execute the command::
+
+   $ rc-update --user add emacs default
+
+This will add the ``/etc/user/init.d/emacs`` init script to the
+default runlevel in ``~/.config/rc/runlevels/``.
+
+To get all benefits of the daemon setup, you should set the ``EDITOR``
+environment variable to ``emacsclient``, so that programs calling an
+external editor will use the existing Emacs process. Also file
+associations in your desktop system should call emacsclient.
+When closing a session or frame, no contents is lost; you may simply
+reconnect to the Emacs server.
+
+Further customization can be done by placing an ``emacs``
+configuration file into ``/etc/user/conf.d/``, or users can add
+individual configuration files in their ``~/.config/rc/conf.d/``
+directory. The following variables can the configured:
+
+``EMACS``
+   Absolute path to the emacs binary; ``/usr/bin/emacs`` by default.
+
+``EMACS_OPTS``
+   Options to pass to Emacs (in addition to ``--fg-daemon`` which is
+   always passed); empty by default.
+
+Launching the Emacs daemon at system startup
+--------------------------------------------
+
+If you want to launch your user's Emacs daemon at system startup and
+have it persist between login sessions, you must multiplex OpenRC's
+user system service: As the superuser, create a symbolic link (do not
+copy the script, or you will miss eventual updates!) in the
+``/etc/init.d/`` directory::
+
+   # ln -s user /etc/init.d/user.<username>
+
+where *<username>* is your user's login name. The service can then be
+started manually using::
+
+   # rc-service user.<username> start
+
+or it may be added to the boot sequence (and will run with the user's
+privileges)::
+
+   # rc-update add user.<username> default
+
+See the `OpenRC user guide`__ for a more complete guide how to
+configure user services at the OpenRC side.
+
+__ https://github.com/OpenRC/openrc/blob/master/user-guide.md
+
+Note: Running of an Emacs daemon process for a user was previously
+supported by the app-emacs/emacs-daemon package which launched it as
+a regular OpenRC service (as user services did not yet exist).
+This method still works but may be discontinued in the future.
+
+Authors
+-------
+
+| Ulrich Müller <ulm@gentoo.org>
+| Christian Faulhammer <fauli@gentoo.org>
+
+| Copyright 2008-2025 Gentoo Authors
+| Distributed under the terms of the GNU General Public License v2 or later
+
+
+.. Local Variables:
+.. mode: rst
+.. fill-column: 70
+.. indent-tabs-mode: nil
+.. End:

diff --git a/README.gentoo.in b/README.gentoo.in
new file mode 100644
index 0000000..da7266d
--- /dev/null
+++ b/README.gentoo.in
@@ -0,0 +1,16 @@
+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.
+
+Alternatively, individual users can add the following command:
+
+   (require 'site-gentoo)
+
+to their ~/.emacs initialisation files, or, for greater flexibility,
+users may load single package-specific initialisation files from the
+@SITELISP@/site-gentoo.d/ directory.
+
+See README.daemon for documentation of the Emacs daemon init script.

[gentoo-commits] proj/emacs-tools:emacs-common commit in: /

[Ulrich Müller]

commit:     9773351c4e099abde6cce1cb9841cdd6594fe01b
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  7 20:26:56 2025 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Mar  8 16:30:56 2025 +0000
URL:        https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=9773351c

Add README files

* README.gentoo.in: New file, from DOC_CONTENTS of the ebuild.
* README.daemon: New file, copied from emacs-daemon and updated.
* Makefile (DISTFILES): Add them.

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

 ChangeLog        |  4 +++
 Makefile         |  3 +-
 README.daemon    | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.gentoo.in | 16 +++++++++++
 4 files changed, 109 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 53d2f73..9bd5053 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2025-03-07  Ulrich Müller  <ulm@gentoo.org>
 
+	* README.gentoo.in: New file, from DOC_CONTENTS of the ebuild.
+	* README.daemon: New file, copied from emacs-daemon and updated.
+	* Makefile (DISTFILES): Add them.
+
 	* emacs.initd: New file. Merged version of the user initd file
 	attached to bug 950671 and emacs.rc from the emacs-daemon package.
 	Thanks to Anna (navi) Figueiredo Gomes.

diff --git a/Makefile b/Makefile
index 9a4fbac..76a2498 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,8 @@ ICONFILES = sink.png \
 	emacs25_16.png emacs25_24.png emacs25_32.png emacs25_48.png \
 	emacs25_128.png emacs25.svg
 GSCHEMAFILES = org.gnu.emacs.defaults.gschema.xml
-DISTFILES = site-start.el site-gentoo.el subdirs.el.in emacs.initd \
+DISTFILES = README.gentoo.in README.daemon \
+	site-start.el site-gentoo.el subdirs.el.in emacs.initd \
 	$(DESKTOPFILES) $(addprefix icons/,COPYRIGHT.icons $(ICONFILES)) \
 	$(GSCHEMAFILES)
 

diff --git a/README.daemon b/README.daemon
new file mode 100644
index 0000000..12201dc
--- /dev/null
+++ b/README.daemon
@@ -0,0 +1,87 @@
+User guide for the Emacs daemon init script
+===========================================
+
+GNU Emacs version 23 or later supports running as a daemon, to which
+a user can connect through the emacsclient program. This can be done
+either in the current terminal with ``emacsclient -t``, or by creating
+a new graphical client frame (i.e. opening a new X window) with
+``emacsclient -c``.
+
+Every user who wants to connect to an Emacs server must have an own
+instance of the daemonized GNU Emacs.
+
+OpenRC version 0.60 or later supports this via *user services* and
+user init scripts in the ``/etc/user/init.d/`` directory. In order to
+automatically start Emacs as a daemon in your user session, login as
+normal user and execute the command::
+
+   $ rc-update --user add emacs default
+
+This will add the ``/etc/user/init.d/emacs`` init script to the
+default runlevel in ``~/.config/rc/runlevels/``.
+
+To get all benefits of the daemon setup, you should set the ``EDITOR``
+environment variable to ``emacsclient``, so that programs calling an
+external editor will use the existing Emacs process. Also file
+associations in your desktop system should call emacsclient.
+When closing a session or frame, no contents is lost; you may simply
+reconnect to the Emacs server.
+
+Further customization can be done by placing an ``emacs``
+configuration file into ``/etc/user/conf.d/``, or users can add
+individual configuration files in their ``~/.config/rc/conf.d/``
+directory. The following variables can the configured:
+
+``EMACS``
+   Absolute path to the emacs binary; ``/usr/bin/emacs`` by default.
+
+``EMACS_OPTS``
+   Options to pass to Emacs (in addition to ``--fg-daemon`` which is
+   always passed); empty by default.
+
+Launching the Emacs daemon at system startup
+--------------------------------------------
+
+If you want to launch your user's Emacs daemon at system startup and
+have it persist between login sessions, you must multiplex OpenRC's
+user system service: As the superuser, create a symbolic link (do not
+copy the script, or you will miss eventual updates!) in the
+``/etc/init.d/`` directory::
+
+   # ln -s user /etc/init.d/user.<username>
+
+where *<username>* is your user's login name. The service can then be
+started manually using::
+
+   # rc-service user.<username> start
+
+or it may be added to the boot sequence (and will run with the user's
+privileges)::
+
+   # rc-update add user.<username> default
+
+See the `OpenRC user guide`__ for a more complete guide how to
+configure user services at the OpenRC side.
+
+__ https://github.com/OpenRC/openrc/blob/master/user-guide.md
+
+Note: Running of an Emacs daemon process for a user was previously
+supported by the app-emacs/emacs-daemon package which launched it as
+a regular OpenRC service (as user services did not yet exist).
+This method still works but may be discontinued in the future.
+
+Authors
+-------
+
+| Ulrich Müller <ulm@gentoo.org>
+| Christian Faulhammer <fauli@gentoo.org>
+
+| Copyright 2008-2025 Gentoo Authors
+| Distributed under the terms of the GNU General Public License v2 or later
+
+
+.. Local Variables:
+.. mode: rst
+.. fill-column: 70
+.. indent-tabs-mode: nil
+.. End:

diff --git a/README.gentoo.in b/README.gentoo.in
new file mode 100644
index 0000000..da7266d
--- /dev/null
+++ b/README.gentoo.in
@@ -0,0 +1,16 @@
+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.
+
+Alternatively, individual users can add the following command:
+
+   (require 'site-gentoo)
+
+to their ~/.emacs initialisation files, or, for greater flexibility,
+users may load single package-specific initialisation files from the
+@SITELISP@/site-gentoo.d/ directory.
+
+See README.daemon for documentation of the Emacs daemon init script.

[gentoo-commits] proj/emacs-tools:emacs-common commit in: /

[Ulrich Müller]

commit:     2c344606b3f5f99dddc7b4885165f22e3fd45a58
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  8 16:35:38 2025 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Mar  8 16:35:38 2025 +0000
URL:        https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=2c344606

Quote ":" command argument in init script

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

 emacs.initd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emacs.initd b/emacs.initd
index f71b4c2..38ac455 100644
--- a/emacs.initd
+++ b/emacs.initd
@@ -2,7 +2,7 @@
 # Copyright 2008-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2 or later
 
-: ${EMACS:=/usr/bin/emacs}
+: "${EMACS:=/usr/bin/emacs}"
 
 description="Start an Emacs server running in the background"
 

[gentoo-commits] proj/emacs-tools:emacs-common commit in: /

[Ulrich Müller]

commit:     88623eaf009738afd30693093a3b1d9abf00a858
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  9 19:44:38 2025 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Mar  9 19:44:38 2025 +0000
URL:        https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=88623eaf

Add wrapper script for Emacs daemon

* emacs-wrapper.sh: New file, moved here from emacs-daemon.
* 10emacs-common-gentoo.el: Ditto. Simplified.
* Makefile (DISTFILES): Add them.
* emacs.initd (EMACS_START, EMACS_SIGNAL_TIMEOUT): New variables.
* README.daemon: Document them.

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

 10emacs-common-gentoo.el | 3 +++
 ChangeLog                | 8 ++++++++
 Makefile                 | 3 ++-
 README.daemon            | 9 +++++++++
 emacs-wrapper.sh         | 3 +++
 emacs.initd              | 7 ++++++-
 6 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/10emacs-common-gentoo.el b/10emacs-common-gentoo.el
new file mode 100644
index 0000000..b23135e
--- /dev/null
+++ b/10emacs-common-gentoo.el
@@ -0,0 +1,3 @@
+(if (daemonp)
+    ;; Restart the server if signal SIGUSR1 is received
+    (define-key special-event-map [sigusr1] #'server-start))

diff --git a/ChangeLog b/ChangeLog
index 9bd5053..dabba3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2025-03-09  Ulrich Müller  <ulm@gentoo.org>
+
+	* emacs-wrapper.sh: New file, moved here from emacs-daemon.
+	* 10emacs-common-gentoo.el: Ditto. Simplified.
+	* Makefile (DISTFILES): Add them.
+	* emacs.initd (EMACS_START, EMACS_SIGNAL_TIMEOUT): New variables.
+	* README.daemon: Document them.
+
 2025-03-07  Ulrich Müller  <ulm@gentoo.org>
 
 	* README.gentoo.in: New file, from DOC_CONTENTS of the ebuild.

diff --git a/Makefile b/Makefile
index 76a2498..bedfc9f 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,8 @@ ICONFILES = sink.png \
 	emacs25_128.png emacs25.svg
 GSCHEMAFILES = org.gnu.emacs.defaults.gschema.xml
 DISTFILES = README.gentoo.in README.daemon \
-	site-start.el site-gentoo.el subdirs.el.in emacs.initd \
+	site-start.el site-gentoo.el subdirs.el.in 10emacs-common-gentoo.el \
+	emacs.initd emacs-wrapper.sh \
 	$(DESKTOPFILES) $(addprefix icons/,COPYRIGHT.icons $(ICONFILES)) \
 	$(GSCHEMAFILES)
 

diff --git a/README.daemon b/README.daemon
index 12201dc..a7a9e49 100644
--- a/README.daemon
+++ b/README.daemon
@@ -39,6 +39,15 @@ directory. The following variables can the configured:
    Options to pass to Emacs (in addition to ``--fg-daemon`` which is
    always passed); empty by default.
 
+``EMACS_START``
+   Wrapper script for starting Emacs. This executes a login shell,
+   in order to read the user's profile (bug #246460);
+   ``/usr/libexec/emacs/emacs-wrapper.sh`` by default.
+
+``EMACS_SIGNAL_TIMEOUT``
+   Retry specification for stopping the daemon; ``TERM/30/KILL/5``
+   by default. See start-stop-daemon(8) for documentation.
+
 Launching the Emacs daemon at system startup
 --------------------------------------------
 

diff --git a/emacs-wrapper.sh b/emacs-wrapper.sh
new file mode 100644
index 0000000..22c8cd9
--- /dev/null
+++ b/emacs-wrapper.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+# Start Emacs with a login shell wrapper to read the user's profile
+exec -l "${SHELL}" -c "exec \"${EMACS}\" $*"

diff --git a/emacs.initd b/emacs.initd
index 38ac455..2a7c145 100644
--- a/emacs.initd
+++ b/emacs.initd
@@ -3,13 +3,16 @@
 # Distributed under the terms of the GNU General Public License v2 or later
 
 : "${EMACS:=/usr/bin/emacs}"
+: "${EMACS_START:=/usr/libexec/emacs/emacs-wrapper.sh}"
+: "${EMACS_SIGNAL_TIMEOUT:=TERM/30/KILL/5}"
 
 description="Start an Emacs server running in the background"
 
 supervisor=supervise-daemon
-command="${EMACS}"
+command="${EMACS_START}"
 command_args="${EMACS_OPTS}"
 command_args_foreground="--fg-daemon"
+retry="${EMACS_SIGNAL_TIMEOUT}"
 
 depend() {
     after dbus
@@ -26,4 +29,6 @@ start_pre() {
         eerror "${EMACS} does not support running as a daemon"
         return 1
     fi
+
+    export EMACS
 }

[gentoo-commits] proj/emacs-tools:emacs-common commit in: /

[Ulrich Müller]

commit:     071286eb7bfc3f4466f2f96bdcbcf69e314fa578
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  9 20:21:18 2025 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Mar  9 20:21:18 2025 +0000
URL:        https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=071286eb

Add user unit file for systemd

* emacs.service: New file. User unit file for systemd, copied
from Emacs 30.1.
* Makefile (DISTFILES): Add it.

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

 ChangeLog     |  4 ++++
 Makefile      |  2 +-
 emacs.service | 19 +++++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index dabba3c..c07710f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2025-03-09  Ulrich Müller  <ulm@gentoo.org>
 
+	* emacs.service: New file. User unit file for systemd, copied
+	from Emacs 30.1.
+	* Makefile (DISTFILES): Add it.
+
 	* emacs-wrapper.sh: New file, moved here from emacs-daemon.
 	* 10emacs-common-gentoo.el: Ditto. Simplified.
 	* Makefile (DISTFILES): Add them.

diff --git a/Makefile b/Makefile
index bedfc9f..3385d1f 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ ICONFILES = sink.png \
 GSCHEMAFILES = org.gnu.emacs.defaults.gschema.xml
 DISTFILES = README.gentoo.in README.daemon \
 	site-start.el site-gentoo.el subdirs.el.in 10emacs-common-gentoo.el \
-	emacs.initd emacs-wrapper.sh \
+	emacs.initd emacs-wrapper.sh emacs.service \
 	$(DESKTOPFILES) $(addprefix icons/,COPYRIGHT.icons $(ICONFILES)) \
 	$(GSCHEMAFILES)
 

diff --git a/emacs.service b/emacs.service
new file mode 100644
index 0000000..bb2e181
--- /dev/null
+++ b/emacs.service
@@ -0,0 +1,19 @@
+[Unit]
+Description=Emacs text editor
+Documentation=info:emacs man:emacs(1) https://gnu.org/software/emacs/
+
+[Service]
+Type=notify
+ExecStart=/usr/bin/emacs --fg-daemon
+
+# Emacs will exit with status 15 after having received SIGTERM, which
+# is the default "KillSignal" value systemd uses to stop services.
+SuccessExitStatus=15
+
+# The location of the SSH auth socket varies by distribution, and some
+# set it from PAM, so don't override by default.
+# Environment=SSH_AUTH_SOCK=%t/keyring/ssh
+Restart=on-failure
+
+[Install]
+WantedBy=default.target