From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1124901-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BD0D8138334 for <garchives@archives.gentoo.org>; Sat, 23 Nov 2019 22:26:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B8D02E07D8; Sat, 23 Nov 2019 22:25:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 964D9E07D8 for <gentoo-commits@lists.gentoo.org>; Sat, 23 Nov 2019 22:25:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6BB3D34D285 for <gentoo-commits@lists.gentoo.org>; Sat, 23 Nov 2019 22:25:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4C26A8B9 for <gentoo-commits@lists.gentoo.org>; Sat, 23 Nov 2019 22:25:56 +0000 (UTC) From: "Ulrich Müller" <ulm@gentoo.org> 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" <ulm@gentoo.org> Message-ID: <1574547944.0bfe3c636cf3576b659ce3fe3f9bb7e303b7b3ac.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/emacs-vcs/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/emacs-vcs/emacs-vcs-26.3.9999.ebuild app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild X-VCS-Directories: app-editors/emacs-vcs/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 0bfe3c636cf3576b659ce3fe3f9bb7e303b7b3ac X-VCS-Branch: master Date: Sat, 23 Nov 2019 22:25:56 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 617e5449-5fda-41db-95e3-8750f4d2dad2 X-Archives-Hash: 229bf858fdcc21a93c2d5d2d9461b977 commit: 0bfe3c636cf3576b659ce3fe3f9bb7e303b7b3ac Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Sat Nov 23 22:21:26 2019 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Sat Nov 23 22:25:44 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bfe3c63 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 <AT> gentoo.org> 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 5d69c80a079..cbdccc89439 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 9880970c3fc..3ca4a8cc86a 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 baa5e8dff5e..8b8852bab94 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)))