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

[Ulrich Müller]

commit:     5cadb75c92dcd146c598497e0a601a77476bfee3
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 25 08:40:24 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 25 08:42:33 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cadb75c

app-editors/emacs: Shorten socket paths for gnupg

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

 app-editors/emacs/emacs-29.2-r1.ebuild   | 8 ++++----
 app-editors/emacs/emacs-29.2.9999.ebuild | 8 ++++----
 app-editors/emacs/emacs-30.0.9999.ebuild | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app-editors/emacs/emacs-29.2-r1.ebuild 
b/app-editors/emacs/emacs-29.2-r1.ebuild
index 0c5599307ee4..e6d111a23c30 100644
--- a/app-editors/emacs/emacs-29.2-r1.ebuild
+++ b/app-editors/emacs/emacs-29.2-r1.ebuild
@@ -452,11 +452,11 @@ src_test() {
 
        # Redirect GnuPG's sockets, in order not to exceed the 108 char limit
        # for socket paths on Linux.
-       mkdir "${T}"/gnupg || die
+       mkdir "${T}"/gpg || die
        local f
-       for f in S.gpg-agent{,.browser,.extra,.ssh}; do
-               printf "%%Assuan%%\nsocket=%s\n" "${T}/gnupg/${f}" \
-                       > "test/lisp/gnus/mml-sec-resources/${f}" || die
+       for f in browser extra ssh; do
+               printf "%%Assuan%%\nsocket=%s\n" "${T}/gpg/S.${f}" \
+                       > "test/lisp/gnus/mml-sec-resources/S.gpg-agent.${f}" 
|| die
        done
 
        # See test/README for possible options

diff --git a/app-editors/emacs/emacs-29.2.9999.ebuild 
b/app-editors/emacs/emacs-29.2.9999.ebuild
index e478453357b9..61a66215f0bc 100644
--- a/app-editors/emacs/emacs-29.2.9999.ebuild
+++ b/app-editors/emacs/emacs-29.2.9999.ebuild
@@ -449,11 +449,11 @@ src_test() {
 
        # Redirect GnuPG's sockets, in order not to exceed the 108 char limit
        # for socket paths on Linux.
-       mkdir "${T}"/gnupg || die
+       mkdir "${T}"/gpg || die
        local f
-       for f in S.gpg-agent{,.browser,.extra,.ssh}; do
-               printf "%%Assuan%%\nsocket=%s\n" "${T}/gnupg/${f}" \
-                       > "test/lisp/gnus/mml-sec-resources/${f}" || die
+       for f in browser extra ssh; do
+               printf "%%Assuan%%\nsocket=%s\n" "${T}/gpg/S.${f}" \
+                       > "test/lisp/gnus/mml-sec-resources/S.gpg-agent.${f}" 
|| die
        done
 
        # See test/README for possible options

diff --git a/app-editors/emacs/emacs-30.0.9999.ebuild 
b/app-editors/emacs/emacs-30.0.9999.ebuild
index f1c545bffd0b..89bb695cbae2 100644
--- a/app-editors/emacs/emacs-30.0.9999.ebuild
+++ b/app-editors/emacs/emacs-30.0.9999.ebuild
@@ -451,11 +451,11 @@ src_test() {
 
        # Redirect GnuPG's sockets, in order not to exceed the 108 char limit
        # for socket paths on Linux.
-       mkdir "${T}"/gnupg || die
+       mkdir "${T}"/gpg || die
        local f
-       for f in S.gpg-agent{,.browser,.extra,.ssh}; do
-               printf "%%Assuan%%\nsocket=%s\n" "${T}/gnupg/${f}" \
-                       > "test/lisp/gnus/mml-sec-resources/${f}" || die
+       for f in browser extra ssh; do
+               printf "%%Assuan%%\nsocket=%s\n" "${T}/gpg/S.${f}" \
+                       > "test/lisp/gnus/mml-sec-resources/S.gpg-agent.${f}" 
|| die
        done
 
        # See test/README for possible options