From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F27D2158015 for ; Thu, 21 Dec 2023 19:46:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 248212BC013; Thu, 21 Dec 2023 19:46:33 +0000 (UTC) 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 pigeon.gentoo.org (Postfix) with ESMTPS id 03B582BC013 for ; Thu, 21 Dec 2023 19:46:33 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CAF81342FFA for ; Thu, 21 Dec 2023 19:46:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6B4659C4 for ; Thu, 21 Dec 2023 19:46:30 +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: <1703187978.56fcf96992b41d422c4f7913a5aafbfe370ffcd0.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/emacs/emacs-29.1-r6.ebuild app-editors/emacs/emacs-29.1.90.ebuild app-editors/emacs/emacs-29.1.9999.ebuild app-editors/emacs/emacs-30.0.9999.ebuild X-VCS-Directories: app-editors/emacs/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 56fcf96992b41d422c4f7913a5aafbfe370ffcd0 X-VCS-Branch: master Date: Thu, 21 Dec 2023 19:46:30 +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: bf63508a-b62c-4d64-85ad-3c17cb401182 X-Archives-Hash: 3552467e235c8f145f2c95364f04c8a4 commit: 56fcf96992b41d422c4f7913a5aafbfe370ffcd0 Author: Ulrich Müller gentoo org> AuthorDate: Thu Dec 21 19:46:18 2023 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Thu Dec 21 19:46:18 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56fcf969 app-editors/emacs: Use socket redirection Instead of moving whole directories around. Signed-off-by: Ulrich Müller gentoo.org> app-editors/emacs/emacs-29.1-r6.ebuild | 14 +++++++++----- app-editors/emacs/emacs-29.1.90.ebuild | 14 +++++++++----- app-editors/emacs/emacs-29.1.9999.ebuild | 14 +++++++++----- app-editors/emacs/emacs-30.0.9999.ebuild | 14 +++++++++----- 4 files changed, 36 insertions(+), 20 deletions(-) diff --git a/app-editors/emacs/emacs-29.1-r6.ebuild b/app-editors/emacs/emacs-29.1-r6.ebuild index c15027e0bbea..908264ce6bd4 100644 --- a/app-editors/emacs/emacs-29.1-r6.ebuild +++ b/app-editors/emacs/emacs-29.1-r6.ebuild @@ -213,11 +213,6 @@ src_prepare() { sed -i -e 's/(executable-find "bwrap")/nil/' test/src/emacs-tests.el \ test/lisp/emacs-lisp/bytecomp-tests.el || die - # Tests use this dir as GNUPGHOME. Move to shorter path, in order - # not to exceed the 108 char limit for GnuPG's sockets on Linux. - mv test/lisp/gnus/mml-sec-resources "${T}"/gnupg || die - ln -s "${T}"/gnupg test/lisp/gnus/mml-sec-resources || die - AT_M4DIR=m4 eautoreconf } @@ -442,6 +437,15 @@ src_test() { ) use xpm || exclude_tests+=( %src/image-tests.el ) + # Redirect GnuPG's sockets, in order not to exceed the 108 char limit + # for socket paths on Linux. + mkdir "${T}"/gnupg || 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 + done + # See test/README for possible options emake \ EMACS_TEST_VERBOSE=1 \ diff --git a/app-editors/emacs/emacs-29.1.90.ebuild b/app-editors/emacs/emacs-29.1.90.ebuild index 8a58f10bc90e..f5d1a6e3a2cc 100644 --- a/app-editors/emacs/emacs-29.1.90.ebuild +++ b/app-editors/emacs/emacs-29.1.90.ebuild @@ -210,11 +210,6 @@ src_prepare() { sed -i -e 's/(executable-find "bwrap")/nil/' test/src/emacs-tests.el \ test/lisp/emacs-lisp/bytecomp-tests.el || die - # Tests use this dir as GNUPGHOME. Move to shorter path, in order - # not to exceed the 108 char limit for GnuPG's sockets on Linux. - mv test/lisp/gnus/mml-sec-resources "${T}"/gnupg || die - ln -s "${T}"/gnupg test/lisp/gnus/mml-sec-resources || die - AT_M4DIR=m4 eautoreconf } @@ -439,6 +434,15 @@ src_test() { ) use xpm || exclude_tests+=( %src/image-tests.el ) + # Redirect GnuPG's sockets, in order not to exceed the 108 char limit + # for socket paths on Linux. + mkdir "${T}"/gnupg || 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 + done + # See test/README for possible options emake \ EMACS_TEST_VERBOSE=1 \ diff --git a/app-editors/emacs/emacs-29.1.9999.ebuild b/app-editors/emacs/emacs-29.1.9999.ebuild index 8a58f10bc90e..f5d1a6e3a2cc 100644 --- a/app-editors/emacs/emacs-29.1.9999.ebuild +++ b/app-editors/emacs/emacs-29.1.9999.ebuild @@ -210,11 +210,6 @@ src_prepare() { sed -i -e 's/(executable-find "bwrap")/nil/' test/src/emacs-tests.el \ test/lisp/emacs-lisp/bytecomp-tests.el || die - # Tests use this dir as GNUPGHOME. Move to shorter path, in order - # not to exceed the 108 char limit for GnuPG's sockets on Linux. - mv test/lisp/gnus/mml-sec-resources "${T}"/gnupg || die - ln -s "${T}"/gnupg test/lisp/gnus/mml-sec-resources || die - AT_M4DIR=m4 eautoreconf } @@ -439,6 +434,15 @@ src_test() { ) use xpm || exclude_tests+=( %src/image-tests.el ) + # Redirect GnuPG's sockets, in order not to exceed the 108 char limit + # for socket paths on Linux. + mkdir "${T}"/gnupg || 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 + done + # See test/README for possible options emake \ EMACS_TEST_VERBOSE=1 \ diff --git a/app-editors/emacs/emacs-30.0.9999.ebuild b/app-editors/emacs/emacs-30.0.9999.ebuild index 02c7ef6e61da..3ed93bd2fb38 100644 --- a/app-editors/emacs/emacs-30.0.9999.ebuild +++ b/app-editors/emacs/emacs-30.0.9999.ebuild @@ -211,11 +211,6 @@ src_prepare() { sed -i -e 's/(executable-find "bwrap")/nil/' test/src/emacs-tests.el \ test/lisp/emacs-lisp/bytecomp-tests.el || die - # Tests use this dir as GNUPGHOME. Move to shorter path, in order - # not to exceed the 108 char limit for GnuPG's sockets on Linux. - mv test/lisp/gnus/mml-sec-resources "${T}"/gnupg || die - ln -s "${T}"/gnupg test/lisp/gnus/mml-sec-resources || die - AT_M4DIR=m4 eautoreconf } @@ -441,6 +436,15 @@ src_test() { ) use xpm || exclude_tests+=( %src/image-tests.el ) + # Redirect GnuPG's sockets, in order not to exceed the 108 char limit + # for socket paths on Linux. + mkdir "${T}"/gnupg || 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 + done + # See test/README for possible options emake \ EMACS_TEST_VERBOSE=1 \