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

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

[Ulrich Müller]

commit:     2d27ac8b848a4d4cd46be0c24b8c1f38b5e37941
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 18:07:10 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 24 18:07:10 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/emacs.git/commit/?id=2d27ac8b

app-emacs/emacs-common: Sync from Gentoo repository

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

 app-emacs/emacs-common/emacs-common-9999.ebuild | 24 ++++++++++++++++--------
 app-emacs/emacs-common/metadata.xml             |  8 +++++++-
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/app-emacs/emacs-common/emacs-common-9999.ebuild b/app-emacs/emacs-common/emacs-common-9999.ebuild
index bb0b926..61306a4 100644
--- a/app-emacs/emacs-common/emacs-common-9999.ebuild
+++ b/app-emacs/emacs-common/emacs-common-9999.ebuild
@@ -1,27 +1,28 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/emacs-tools.git"
 EGIT_BRANCH="${PN}"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
 
-inherit elisp-common desktop xdg-utils readme.gentoo-r1 git-r3
+inherit elisp-common desktop gnome2-utils xdg-utils readme.gentoo-r1 git-r3
 
 DESCRIPTION="Common files needed by all GNU Emacs versions"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="games gui"
+IUSE="games gsettings gui"
 
-RDEPEND="games? ( acct-group/gamestat )"
-DEPEND="${RDEPEND}"
+DEPEND="games? ( acct-group/gamestat )"
+RDEPEND="!=app-editors/emacs-29.1_rc1-r0
+	${DEPEND}
+	gui? ( gsettings? ( dev-libs/glib ) )"
 PDEPEND=">=app-editors/emacs-23.1:*"
 
-S="${WORKDIR}/${PN}"
-
 src_install() {
 	insinto "${SITELISP}"
 	sed -e "s:@libdir@:$(get_libdir):g" subdirs.el.in | newins - subdirs.el
@@ -53,6 +54,11 @@ src_install() {
 		doicon -s scalable emacs23.svg
 		newicon -s scalable emacs25.svg emacs.svg
 		popd
+
+		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
@@ -95,6 +101,7 @@ pkg_postinst() {
 	if use gui; then
 		xdg_desktop_database_update
 		xdg_icon_cache_update
+		use gsettings && gnome2_schemas_update
 	fi
 	readme.gentoo_print_elog
 }
@@ -103,5 +110,6 @@ 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/metadata.xml b/app-emacs/emacs-common/metadata.xml
index 57ea14e..8c804e6 100644
--- a/app-emacs/emacs-common/metadata.xml
+++ b/app-emacs/emacs-common/metadata.xml
@@ -5,7 +5,13 @@
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
+<stabilize-allarches/>
 <use>
-  <flag name='games'>Support shared score files for games</flag>
+  <flag name="games">Support shared score files for games</flag>
+  <flag name="gsettings">Install schema file for gsettings
+  (<pkg>dev-libs/glib</pkg>)</flag>
 </use>
+<upstream>
+  <remote-id type="gentoo">proj/emacs-tools</remote-id>
+</upstream>
 </pkgmetadata>

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

[Ulrich Müller]

commit:     8f02ef0989623ec2cfb3726f833cc2cbbd77ade0
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 14 17:46:45 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 14 17:46:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/emacs.git/commit/?id=8f02ef09

app-emacs/emacs-common: Sync from Gentoo repository

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

 app-emacs/emacs-common/emacs-common-9999.ebuild | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/app-emacs/emacs-common/emacs-common-9999.ebuild b/app-emacs/emacs-common/emacs-common-9999.ebuild
index 61306a4..2349bac 100644
--- a/app-emacs/emacs-common/emacs-common-9999.ebuild
+++ b/app-emacs/emacs-common/emacs-common-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/emacs-tools.git"
 EGIT_BRANCH="${PN}"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
 
-inherit elisp-common desktop gnome2-utils xdg-utils readme.gentoo-r1 git-r3
+inherit elisp-common desktop eapi9-pipestatus gnome2-utils xdg-utils readme.gentoo-r1 git-r3
 
 DESCRIPTION="Common files needed by all GNU Emacs versions"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
@@ -18,15 +18,14 @@ SLOT="0"
 IUSE="games gsettings gui"
 
 DEPEND="games? ( acct-group/gamestat )"
-RDEPEND="!=app-editors/emacs-29.1_rc1-r0
-	${DEPEND}
-	gui? ( gsettings? ( dev-libs/glib ) )"
+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
-	assert
+	pipestatus || die
 	newins site-gentoo.el{,.orig}
 
 	keepdir /etc/emacs

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

[Ulrich Müller]

commit:     de80c9fcb1c2d67c6bb3f0019b08a6ed014c92e6
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  7 18:34:37 2025 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Mar  7 18:34:37 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/emacs.git/commit/?id=de80c9fc

app-emacs/emacs-common: Install user initd file

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

 app-emacs/emacs-common/emacs-common-9999.ebuild | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/app-emacs/emacs-common/emacs-common-9999.ebuild b/app-emacs/emacs-common/emacs-common-9999.ebuild
index 2349bac..6db48eb 100644
--- a/app-emacs/emacs-common/emacs-common-9999.ebuild
+++ b/app-emacs/emacs-common/emacs-common-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -32,6 +32,10 @@ src_install() {
 	insinto /etc/emacs
 	doins site-start.el
 
+	exeinto /etc/user/init.d
+	sed -e "s,/usr/bin/emacs,${EPREFIX}&," emacs.initd | newexe - emacs
+	pipestatus || die
+
 	if use games; then
 		keepdir /var/games/emacs
 		fowners 0:gamestat /var/games/emacs
@@ -66,10 +70,25 @@ src_install() {
 		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\n\t(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."
+
+	[[ -d /run/openrc ]] && DOC_CONTENTS+="\n\n\nTo have OpenRC
+		(version 0.60 or later) automatically start Emacs as a daemon in
+		your user session, login as normal user and execute the command:
+		\n\n\t$ rc-update --user add emacs default
+		\n\nThis will add emacs to the default runlevel in
+		~/.config/rc/runlevels/.
+		\n\nIf you want to start your user's Emacs daemon at system startup
+		and have it persist between login sessions, do the following in
+		addition (as the superuser):
+		\n\n\t# ln -s user /etc/init.d/user.<user>
+		\n\t# rc-service user.<user> start
+		\n\t# rc-update add user.<user> default
+		\n\nSee OpenRC's user guide for the full documentation."
+
 	readme.gentoo_create_doc
 }
 

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

[Ulrich Müller]

commit:     77074b4b1f0c2b8ea900a40f814879576a96cd0b
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  8 06:29:20 2025 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Mar  8 06:29:20 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/emacs.git/commit/?id=77074b4b

app-emacs/emacs-common: Use upstream README files

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

 app-emacs/emacs-common/emacs-common-9999.ebuild | 28 ++++---------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/app-emacs/emacs-common/emacs-common-9999.ebuild b/app-emacs/emacs-common/emacs-common-9999.ebuild
index 6db48eb..99ccf3a 100644
--- a/app-emacs/emacs-common/emacs-common-9999.ebuild
+++ b/app-emacs/emacs-common/emacs-common-9999.ebuild
@@ -64,31 +64,11 @@ src_install() {
 		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\t(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."
-
-	[[ -d /run/openrc ]] && DOC_CONTENTS+="\n\n\nTo have OpenRC
-		(version 0.60 or later) automatically start Emacs as a daemon in
-		your user session, login as normal user and execute the command:
-		\n\n\t$ rc-update --user add emacs default
-		\n\nThis will add emacs to the default runlevel in
-		~/.config/rc/runlevels/.
-		\n\nIf you want to start your user's Emacs daemon at system startup
-		and have it persist between login sessions, do the following in
-		addition (as the superuser):
-		\n\n\t# ln -s user /etc/init.d/user.<user>
-		\n\t# rc-service user.<user> start
-		\n\t# rc-update add user.<user> default
-		\n\nSee OpenRC's user guide for the full documentation."
+	dodoc README.daemon
 
+	local DOC_CONTENTS DISABLE_AUTOFORMATTING=1
+	DOC_CONTENTS=$(sed -e "s:@SITELISP@:${EPREFIX}${SITELISP}:g" \
+		README.gentoo.in) || die
 	readme.gentoo_create_doc
 }
 

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

[Ulrich Müller]

commit:     6b15a9884b67446433dc43d989e494ab618e49bc
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  8 07:42:55 2025 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Mar  8 07:42:55 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/emacs.git/commit/?id=6b15a988

app-emacs/emacs-common: Silence pushd and popd

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

 app-emacs/emacs-common/emacs-common-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emacs/emacs-common/emacs-common-9999.ebuild b/app-emacs/emacs-common/emacs-common-9999.ebuild
index fbe59bc..85e78f0 100644
--- a/app-emacs/emacs-common/emacs-common-9999.ebuild
+++ b/app-emacs/emacs-common/emacs-common-9999.ebuild
@@ -46,7 +46,7 @@ src_install() {
 		local i
 		domenu emacs.desktop emacsclient.desktop
 
-		pushd icons || die
+		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
@@ -56,7 +56,7 @@ src_install() {
 		done
 		doicon -s scalable emacs23.svg
 		newicon -s scalable emacs25.svg emacs.svg
-		popd
+		popd >/dev/null || die
 
 		if use gsettings; then
 			insinto /usr/share/glib-2.0/schemas

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

[Ulrich Müller]

commit:     6dc53faadc3b6adc1bebbb251eb0ad3fa535c747
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  8 07:40:16 2025 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Mar  8 07:40:16 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/emacs.git/commit/?id=6dc53faa

app-emacs/emacs-common: Drop redundant inherit

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

 app-emacs/emacs-common/emacs-common-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emacs/emacs-common/emacs-common-9999.ebuild b/app-emacs/emacs-common/emacs-common-9999.ebuild
index 99ccf3a..fbe59bc 100644
--- a/app-emacs/emacs-common/emacs-common-9999.ebuild
+++ b/app-emacs/emacs-common/emacs-common-9999.ebuild
@@ -7,7 +7,7 @@ EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/emacs-tools.git"
 EGIT_BRANCH="${PN}"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
 
-inherit elisp-common desktop eapi9-pipestatus gnome2-utils xdg-utils readme.gentoo-r1 git-r3
+inherit elisp-common desktop eapi9-pipestatus gnome2-utils readme.gentoo-r1 git-r3
 
 DESCRIPTION="Common files needed by all GNU Emacs versions"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"

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

[Ulrich Müller]

commit:     54693d493bd010d3af14b8e139265cdd1458c6a6
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  9 20:36:46 2025 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Mar  9 20:50:54 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/emacs.git/commit/?id=54693d49

app-emacs/emacs-common: Update for "upstream" package changes

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

 app-emacs/emacs-common/emacs-common-9999.ebuild | 34 ++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/app-emacs/emacs-common/emacs-common-9999.ebuild b/app-emacs/emacs-common/emacs-common-9999.ebuild
index 85e78f0..a0126ba 100644
--- a/app-emacs/emacs-common/emacs-common-9999.ebuild
+++ b/app-emacs/emacs-common/emacs-common-9999.ebuild
@@ -13,18 +13,31 @@ DESCRIPTION="Common files needed by all GNU Emacs versions"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
 S="${WORKDIR}/${PN}"
 
-LICENSE="GPL-3+"
+LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
 IUSE="games gsettings gui"
 
 DEPEND="games? ( acct-group/gamestat )"
-RDEPEND="${DEPEND}"
-PDEPEND=">=app-editors/emacs-23.1:*"
+RDEPEND="
+	!<app-emacs/emacs-daemon-0.24
+	${DEPEND}"
+PDEPEND=">=app-editors/emacs-26.1:*"
 IDEPEND="gui? ( gsettings? ( dev-libs/glib ) )"
 
+SITEFILE="10${PN}-gentoo.el"
+
+src_prepare() {
+	default
+	if [[ -n ${EPREFIX} ]]; then
+		sed -i -E -e "s,/(bin|sbin|usr)/,${EPREFIX}&," \
+			subdirs.el.in emacs.initd emacs.service \
+			emacs.desktop emacsclient.desktop || die
+	fi
+}
+
 src_install() {
 	insinto "${SITELISP}"
-	sed -e "s:@libdir@:$(get_libdir):g" subdirs.el.in | newins - subdirs.el
+	sed "s,@libdir@,$(get_libdir),g" subdirs.el.in | newins - subdirs.el
 	pipestatus || die
 	newins site-gentoo.el{,.orig}
 
@@ -33,8 +46,13 @@ src_install() {
 	doins site-start.el
 
 	exeinto /etc/user/init.d
-	sed -e "s,/usr/bin/emacs,${EPREFIX}&," emacs.initd | newexe - emacs
-	pipestatus || die
+	newexe emacs.initd emacs
+	exeinto /usr/libexec/emacs
+	doexe emacs-wrapper.sh
+	elisp-site-file-install "${SITEFILE}"
+
+	insinto /usr/lib/systemd/user
+	doins emacs.service
 
 	if use games; then
 		keepdir /var/games/emacs
@@ -67,7 +85,7 @@ src_install() {
 	dodoc README.daemon
 
 	local DOC_CONTENTS DISABLE_AUTOFORMATTING=1
-	DOC_CONTENTS=$(sed -e "s:@SITELISP@:${EPREFIX}${SITELISP}:g" \
+	DOC_CONTENTS=$(sed "s,@SITELISP@,${EPREFIX}${SITELISP},g" \
 		README.gentoo.in) || die
 	readme.gentoo_create_doc
 }
@@ -96,6 +114,7 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
+	elisp-site-regen
 	if use gui; then
 		xdg_desktop_database_update
 		xdg_icon_cache_update
@@ -105,6 +124,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
+	elisp-site-regen
 	if use gui; then
 		xdg_desktop_database_update
 		xdg_icon_cache_update