app-editors/emacs: 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.

No revision bump because this is mostly a cosmetic change and doesn't
affect functionality.

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/emacs-23.4-r18.ebuild b/app-editors/emacs/emacs-23.4-r18.ebuild
index 7fa200d71b1cf0ae503e84551f7c5d78c30055be..8227d4b3a6710618dd09cb2ea6e7be6893d0fa1d 100644 (file)
--- a/app-editors/emacs/emacs-23.4-r18.ebuild
+++ b/app-editors/emacs/emacs-23.4-r18.ebuild
@@ -287,9 +287,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/emacs-24.5-r7.ebuild b/app-editors/emacs/emacs-24.5-r7.ebuild
index 7a8a310132f83e6bb501405b6902e3e475be8348..2c6b9d7dc04a2095d4d6736fcf273b7731b89710 100644 (file)
--- a/app-editors/emacs/emacs-24.5-r7.ebuild
+++ b/app-editors/emacs/emacs-24.5-r7.ebuild
@@ -282,9 +282,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/emacs-25.3-r6.ebuild b/app-editors/emacs/emacs-25.3-r6.ebuild
index 8825e18aa7e97f413f8a50823ee5d937e0d2a1a3..726d3e818c2debc51c6af99304be8c42cb3232af 100644 (file)
--- a/app-editors/emacs/emacs-25.3-r6.ebuild
+++ b/app-editors/emacs/emacs-25.3-r6.ebuild
@@ -290,9 +290,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/emacs-26.2.ebuild b/app-editors/emacs/emacs-26.2.ebuild
index 457aade942a717079ab2708fcda41ffea89f6a95..960bddd23123d5878ea50bfb395ff1c33775840a 100644 (file)
--- a/app-editors/emacs/emacs-26.2.ebuild
+++ b/app-editors/emacs/emacs-26.2.ebuild
@@ -307,9 +307,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/emacs-26.3-r1.ebuild b/app-editors/emacs/emacs-26.3-r1.ebuild
index 3630a7dbf9ad49a24385100298a8e1482314401b..f591e8b3e31611013121ee553dc9cca15248ba40 100644 (file)
--- a/app-editors/emacs/emacs-26.3-r1.ebuild
+++ b/app-editors/emacs/emacs-26.3-r1.ebuild
@@ -316,9 +316,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)))