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 4C25615802F for ; Wed, 29 Mar 2023 09:39:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 50F572BC02F; Wed, 29 Mar 2023 07:45:20 +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 222FE2BC02F for ; Wed, 29 Mar 2023 07:45:20 +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 087C8335D55 for ; Wed, 29 Mar 2023 07:45:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3C1838E5 for ; Wed, 29 Mar 2023 07:45:17 +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: <1680075792.41dbc24e37e4df06f6f5e99fee16554dac7bcad3.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-25.3-r17.ebuild app-editors/emacs/emacs-25.3-r18.ebuild app-editors/emacs/emacs-26.3-r14.ebuild app-editors/emacs/emacs-26.3-r15.ebuild app-editors/emacs/emacs-27.2-r12.ebuild app-editors/emacs/emacs-27.2-r13.ebuild app-editors/emacs/emacs-28.2-r7.ebuild app-editors/emacs/emacs-28.2-r8.ebuild app-editors/emacs/emacs-28.3_rc1-r1.ebuild app-editors/emacs/emacs-28.3_rc1-r2.ebuild app-editors/emacs/emacs-29.0.9999-r1.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: 41dbc24e37e4df06f6f5e99fee16554dac7bcad3 X-VCS-Branch: master Date: Wed, 29 Mar 2023 07:45:17 +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: dcb6b970-3c57-4bd5-bdbb-4c77913817d5 X-Archives-Hash: 489359965065a9fc4b1796fa8106fafa commit: 41dbc24e37e4df06f6f5e99fee16554dac7bcad3 Author: Ulrich Müller gentoo org> AuthorDate: Wed Mar 29 07:18:52 2023 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Wed Mar 29 07:43:12 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41dbc24e app-editors/emacs: Avoid string-join in site-init file This fixes a void-function error in Emacs versions < 29. Signed-off-by: Ulrich Müller gentoo.org> app-editors/emacs/{emacs-25.3-r17.ebuild => emacs-25.3-r18.ebuild} | 3 +-- app-editors/emacs/{emacs-26.3-r14.ebuild => emacs-26.3-r15.ebuild} | 3 +-- app-editors/emacs/{emacs-27.2-r12.ebuild => emacs-27.2-r13.ebuild} | 3 +-- app-editors/emacs/{emacs-28.2-r7.ebuild => emacs-28.2-r8.ebuild} | 3 +-- .../emacs/{emacs-28.3_rc1-r1.ebuild => emacs-28.3_rc1-r2.ebuild} | 3 +-- app-editors/emacs/emacs-29.0.9999-r1.ebuild | 3 +-- app-editors/emacs/emacs-30.0.9999.ebuild | 3 +-- 7 files changed, 7 insertions(+), 14 deletions(-) diff --git a/app-editors/emacs/emacs-25.3-r17.ebuild b/app-editors/emacs/emacs-25.3-r18.ebuild similarity index 99% rename from app-editors/emacs/emacs-25.3-r17.ebuild rename to app-editors/emacs/emacs-25.3-r18.ebuild index bba808a9aa66..9ef093a00061 100644 --- a/app-editors/emacs/emacs-25.3-r17.ebuild +++ b/app-editors/emacs/emacs-25.3-r18.ebuild @@ -293,8 +293,7 @@ src_install() { X (while (and (cdr q) (not (string-match re (cadr q)))) X (setq q (cdr q))) X (setcdr q (cons dir (delete dir (cdr q)))) - X (setenv "INFOPATH" - X (string-join (prune-directory-list (cdr p)) ":")))))) + X (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":")))))) EOF elisp-site-file-install "${T}/${SITEFILE}" || die diff --git a/app-editors/emacs/emacs-26.3-r14.ebuild b/app-editors/emacs/emacs-26.3-r15.ebuild similarity index 99% rename from app-editors/emacs/emacs-26.3-r14.ebuild rename to app-editors/emacs/emacs-26.3-r15.ebuild index 8a42cdd8d361..318b29e758af 100644 --- a/app-editors/emacs/emacs-26.3-r14.ebuild +++ b/app-editors/emacs/emacs-26.3-r15.ebuild @@ -314,8 +314,7 @@ src_install() { X (while (and (cdr q) (not (string-match re (cadr q)))) X (setq q (cdr q))) X (setcdr q (cons dir (delete dir (cdr q)))) - X (setenv "INFOPATH" - X (string-join (prune-directory-list (cdr p)) ":")))))) + X (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":")))))) EOF elisp-site-file-install "${T}/${SITEFILE}" || die diff --git a/app-editors/emacs/emacs-27.2-r12.ebuild b/app-editors/emacs/emacs-27.2-r13.ebuild similarity index 99% rename from app-editors/emacs/emacs-27.2-r12.ebuild rename to app-editors/emacs/emacs-27.2-r13.ebuild index 8aa6265b68e2..ef2604780cb9 100644 --- a/app-editors/emacs/emacs-27.2-r12.ebuild +++ b/app-editors/emacs/emacs-27.2-r13.ebuild @@ -372,8 +372,7 @@ src_install() { X (while (and (cdr q) (not (string-match re (cadr q)))) X (setq q (cdr q))) X (setcdr q (cons dir (delete dir (cdr q)))) - X (setenv "INFOPATH" - X (string-join (prune-directory-list (cdr p)) ":")))))) + X (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":")))))) EOF elisp-site-file-install "${T}/${SITEFILE}" || die diff --git a/app-editors/emacs/emacs-28.2-r7.ebuild b/app-editors/emacs/emacs-28.2-r8.ebuild similarity index 99% rename from app-editors/emacs/emacs-28.2-r7.ebuild rename to app-editors/emacs/emacs-28.2-r8.ebuild index 38cb0d9bafd8..c24ba748a523 100644 --- a/app-editors/emacs/emacs-28.2-r7.ebuild +++ b/app-editors/emacs/emacs-28.2-r8.ebuild @@ -451,8 +451,7 @@ src_install() { X (while (and (cdr q) (not (string-match re (cadr q)))) X (setq q (cdr q))) X (setcdr q (cons dir (delete dir (cdr q)))) - X (setenv "INFOPATH" - X (string-join (prune-directory-list (cdr p)) ":")))))) + X (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":")))))) EOF elisp-site-file-install "${T}/${SITEFILE}" || die diff --git a/app-editors/emacs/emacs-28.3_rc1-r1.ebuild b/app-editors/emacs/emacs-28.3_rc1-r2.ebuild similarity index 99% rename from app-editors/emacs/emacs-28.3_rc1-r1.ebuild rename to app-editors/emacs/emacs-28.3_rc1-r2.ebuild index fa4e3b7069be..ab904936acb6 100644 --- a/app-editors/emacs/emacs-28.3_rc1-r1.ebuild +++ b/app-editors/emacs/emacs-28.3_rc1-r2.ebuild @@ -468,8 +468,7 @@ src_install() { X (while (and (cdr q) (not (string-match re (cadr q)))) X (setq q (cdr q))) X (setcdr q (cons dir (delete dir (cdr q)))) - X (setenv "INFOPATH" - X (string-join (prune-directory-list (cdr p)) ":")))))) + X (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":")))))) EOF elisp-site-file-install "${T}/${SITEFILE}" || die diff --git a/app-editors/emacs/emacs-29.0.9999-r1.ebuild b/app-editors/emacs/emacs-29.0.9999-r1.ebuild index a7ec45f53dd7..1d73792abc64 100644 --- a/app-editors/emacs/emacs-29.0.9999-r1.ebuild +++ b/app-editors/emacs/emacs-29.0.9999-r1.ebuild @@ -498,8 +498,7 @@ src_install() { X (while (and (cdr q) (not (string-match re (cadr q)))) X (setq q (cdr q))) X (setcdr q (cons dir (delete dir (cdr q)))) - X (setenv "INFOPATH" - X (string-join (prune-directory-list (cdr p)) ":")))))) + X (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":")))))) EOF elisp-site-file-install "${T}/${SITEFILE}" || die diff --git a/app-editors/emacs/emacs-30.0.9999.ebuild b/app-editors/emacs/emacs-30.0.9999.ebuild index 28e579c21b1a..eb6ca29d5da6 100644 --- a/app-editors/emacs/emacs-30.0.9999.ebuild +++ b/app-editors/emacs/emacs-30.0.9999.ebuild @@ -498,8 +498,7 @@ src_install() { X (while (and (cdr q) (not (string-match re (cadr q)))) X (setq q (cdr q))) X (setcdr q (cons dir (delete dir (cdr q)))) - X (setenv "INFOPATH" - X (string-join (prune-directory-list (cdr p)) ":")))))) + X (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":")))))) EOF elisp-site-file-install "${T}/${SITEFILE}" || die