app-editors/emacs-vcs: Fix order of Info-directory-list.

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 <ulm@gentoo.org>

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 5d69c80a079da68b140125673235c5ac76bf364f..cbdccc89439d9ff42e2067f47486dd111f088a51 100644 (file)
--- 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 9880970c3fc90b885e541211dee289069d735d5a..3ca4a8cc86ad84b6a657dcf08f682158f5059e9d 100644 (file)
--- 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 baa5e8dff5e06a5f7b5377ff21d4a27f2920a736..8b8852bab94b23cc09613d08b58aec8a06288c81 100644 (file)
--- 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)))