From 0bfe3c636cf3576b659ce3fe3f9bb7e303b7b3ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20M=C3=BCller?= Date: Sat, 23 Nov 2019 23:21:26 +0100 Subject: [PATCH] app-editors/emacs-vcs: Fix order of Info-directory-list. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some packages like gcc and binutils install their Info files in funny locations outside of /usr/share/info (but still under /usr/share). Adjust the sorting algorithm, in order to keep the current Emacs version above them in the main Info menu. Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Ulrich Müller --- app-editors/emacs-vcs/emacs-vcs-26.3.9999.ebuild | 4 ++-- app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild | 4 ++-- app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app-editors/emacs-vcs/emacs-vcs-26.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.3.9999.ebuild index 5d69c80a079da..cbdccc89439d9 100644 --- a/app-editors/emacs-vcs/emacs-vcs-26.3.9999.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-26.3.9999.ebuild @@ -339,9 +339,9 @@ src_install () { Y "${EPREFIX}${cdir}") X (let ((path (getenv "INFOPATH")) X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}") - X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>")) + X (re "\\\\\`${EPREFIX}/usr/share\\\\>")) X (and path - X ;; move Emacs Info dir before anything else in /usr/share/info + X ;; move Emacs Info dir before anything else in /usr/share X (let* ((p (cons nil (split-string path ":" t))) (q p)) X (while (and (cdr q) (not (string-match re (cadr q)))) X (setq q (cdr q))) diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild index 9880970c3fc90..3ca4a8cc86ad8 100644 --- a/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild @@ -337,9 +337,9 @@ src_install () { Y "${EPREFIX}${cdir}") X (let ((path (getenv "INFOPATH")) X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}") - X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>")) + X (re "\\\\\`${EPREFIX}/usr/share\\\\>")) X (and path - X ;; move Emacs Info dir before anything else in /usr/share/info + X ;; move Emacs Info dir before anything else in /usr/share X (let* ((p (cons nil (split-string path ":" t))) (q p)) X (while (and (cdr q) (not (string-match re (cadr q)))) X (setq q (cdr q))) diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild index baa5e8dff5e06..8b8852bab94b2 100644 --- a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild @@ -347,9 +347,9 @@ src_install () { Y "${EPREFIX}${cdir}") X (let ((path (getenv "INFOPATH")) X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}") - X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>")) + X (re "\\\\\`${EPREFIX}/usr/share\\\\>")) X (and path - X ;; move Emacs Info dir before anything else in /usr/share/info + X ;; move Emacs Info dir before anything else in /usr/share X (let* ((p (cons nil (split-string path ":" t))) (q p)) X (while (and (cdr q) (not (string-match re (cadr q)))) X (setq q (cdr q)))