diff options
author | Ulrich Müller <ulm@gentoo.org> | 2023-03-29 09:18:52 +0200 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2023-03-29 09:43:12 +0200 |
commit | 41dbc24e37e4df06f6f5e99fee16554dac7bcad3 (patch) | |
tree | 35c058821523f68188c8e2ae60de4b27e921e2d4 | |
parent | app-crypt/heimdal: fix otp dependency on berkdb (diff) | |
download | gentoo-41dbc24e37e4df06f6f5e99fee16554dac7bcad3.tar.gz gentoo-41dbc24e37e4df06f6f5e99fee16554dac7bcad3.tar.bz2 gentoo-41dbc24e37e4df06f6f5e99fee16554dac7bcad3.zip |
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 <ulm@gentoo.org>
-rw-r--r-- | app-editors/emacs/emacs-25.3-r18.ebuild (renamed from app-editors/emacs/emacs-25.3-r17.ebuild) | 3 | ||||
-rw-r--r-- | app-editors/emacs/emacs-26.3-r15.ebuild (renamed from app-editors/emacs/emacs-26.3-r14.ebuild) | 3 | ||||
-rw-r--r-- | app-editors/emacs/emacs-27.2-r13.ebuild (renamed from app-editors/emacs/emacs-27.2-r12.ebuild) | 3 | ||||
-rw-r--r-- | app-editors/emacs/emacs-28.2-r8.ebuild (renamed from app-editors/emacs/emacs-28.2-r7.ebuild) | 3 | ||||
-rw-r--r-- | app-editors/emacs/emacs-28.3_rc1-r2.ebuild (renamed from app-editors/emacs/emacs-28.3_rc1-r1.ebuild) | 3 | ||||
-rw-r--r-- | app-editors/emacs/emacs-29.0.9999-r1.ebuild | 3 | ||||
-rw-r--r-- | 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 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 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 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 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 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 |