From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1004254-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 91CA71382C5
for <garchives@archives.gentoo.org>; Sun, 18 Feb 2018 13:36:24 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 290EFE0CA5;
Sun, 18 Feb 2018 13:36:23 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(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 EB4CFE0CA2
for <gentoo-commits@lists.gentoo.org>; Sun, 18 Feb 2018 13:36:22 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 14A91335C4D
for <gentoo-commits@lists.gentoo.org>; Sun, 18 Feb 2018 13:36:22 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 28124232
for <gentoo-commits@lists.gentoo.org>; Sun, 18 Feb 2018 13:36:19 +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: <1518960954.0ce5b9ac6aea99547c18bb914a92381c4f093d31.ulm@gentoo>
Subject: [gentoo-commits] proj/pms:eapi-7 commit in: /
X-VCS-Repository: proj/pms
X-VCS-Files: eapi-differences.tex pkg-mgr-commands.tex
X-VCS-Directories: /
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: 0ce5b9ac6aea99547c18bb914a92381c4f093d31
X-VCS-Branch: eapi-7
Date: Sun, 18 Feb 2018 13:36:19 +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-Archives-Salt: 5998de28-db30-4548-bfd6-ecb433f7b11f
X-Archives-Hash: 72957f52887e4bdd40a7b7f54d018552
commit: 0ce5b9ac6aea99547c18bb914a92381c4f093d31
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 23 20:53:59 2017 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 18 13:35:54 2018 +0000
URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=0ce5b9ac
EAPI 7 drops --host-root in favor of -b, -d, and -r
Bug: https://bugs.gentoo.org/317337
eapi-differences.tex | 8 +++++---
pkg-mgr-commands.tex | 30 ++++++++++++++++++++----------
2 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/eapi-differences.tex b/eapi-differences.tex
index 989784c..df8ef98 100644
--- a/eapi-differences.tex
+++ b/eapi-differences.tex
@@ -215,8 +215,8 @@ Most utilities die & \compactfeatureref{die-on-failure} &
\t{einstall} & \compactfeatureref{banned-commands} &
Yes & Yes & Yes & Banned & Banned \\
-Option \t{-{}-host-root} & \compactfeatureref{host-root-option} &
- No & No & Yes & Yes & Yes \\
+Query command options & \compactfeatureref{pm-query-options} &
+ None & None & \t{-{}-host-root} & \t{-{}-host-root} & \t{-b}, \t{-d}, \t{-r} \\
\t{die -n} & \compactfeatureref{nonfatal-die} &
No & No & No & Yes & Yes \\
@@ -381,7 +381,7 @@ EAPI 5 is EAPI 4 with the following changes:
\item \t{USE} is calculated differently, \featureref{profile-iuse-inject}.
\item \t{find} is guaranteed to be GNU, \featureref{gnu-find}.
\item \t{best_version} and \t{has_version} support the \t{-{}-host-root} option,
- \featureref{host-root-option}.
+ \featureref{pm-query-options}.
\item \t{econf} adds \t{-{}-disable-silent-rules}, \featureref{econf-options}.
\item \t{doheader} and \t{newheader} support, \featureref{doheader}.
\item \t{new*} can read from standard input, \featureref{newfoo-stdin}.
@@ -435,6 +435,8 @@ EAPI 7 is EAPI 6 with the following changes:
\item \t{econf} adds \t{-{}-with-sysroot}, \featureref{econf-options}.
\item \t{BDEPEND}, \featureref{bdepend}.
\item \t{BROOT}, \featureref{broot}.
+\item \t{best_version} and \t{has_version} support \t{-b}, \t{-d} and \t{-r} options instead of
+ \t{-{}-host-root}, \featureref{pm-query-options}.
\end{compactitem}
\ChangeWhenAddingAnEAPI{7}
diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex
index 56df22d..16b3aa4 100644
--- a/pkg-mgr-commands.tex
+++ b/pkg-mgr-commands.tex
@@ -82,27 +82,37 @@ These commands are used to extract information about the system. Ebuilds must no
these commands in parallel with any other package manager command. Ebuilds must not run any of
these commands once the current phase function has returned.
-\featurelabel{host-root-option} In EAPIs listed in table~\ref{tab:foo-version-host-root-table} as
-supporting option \t{-{}-host-root}, this flag as the first argument will cause the query to apply
-to the host root instead of \t{ROOT}.
+\featurelabel{pm-query-options} In EAPIs listed in table~\ref{tab:pm-query-options} as supporting
+option \t{-{}-host-root}, this flag as the first argument will cause the query to apply to the
+host root. Otherwise, it applies to \t{ROOT}.
+
+In EAPIs listed in table~\ref{tab:pm-query-options} as supporting options \t{-b}, \t{-d} and \t{-r},
+these mutually exclusive flags as the first argument will cause the query to apply to locations
+targetted by \t{BDEPEND}, \t{DEPEND} and \t{RDEPEND}, respectively. When none of these options
+are given, \t{-r} is assumed.
+
\begin{description}
\item[has_version] Takes exactly one package dependency specification as an argument. Returns
- true if a package matching the specification is installed in \t{ROOT}, and false otherwise.
+ true if a package matching the specification is installed, and false otherwise.
\item[best_version] Takes exactly one package dependency specification as an argument. If a
matching package is installed, prints the category, package name and version of the highest
matching version; otherwise, prints an empty string. The exit code is unspecified.
\end{description}
\ChangeWhenAddingAnEAPI{7}
-\begin{centertable}{EAPIs supporting \t{-{}-host-root} for \t{*_version} commands}
- \label{tab:foo-version-host-root-table}
- \begin{tabular}{ll}
+\begin{centertable}{Package manager query command options supported by EAPIs}
+ \label{tab:pm-query-options}
+ \begin{tabular}{lllll}
\toprule
\multicolumn{1}{c}{\textbf{EAPI}} &
- \multicolumn{1}{c}{\textbf{\t{*_version} supports \t{-{}-host-root}?}} \\
+ \multicolumn{1}{c}{\textbf{\t{-{}-host-root}?}} &
+ \multicolumn{1}{c}{\textbf{\t{-b}?}} &
+ \multicolumn{1}{c}{\textbf{\t{-d}?}} &
+ \multicolumn{1}{c}{\textbf{\t{-r}?}} \\
\midrule
- 0, 1, 2, 3, 4 & No \\
- 5, 6 & Yes \\
+ 0, 1, 2, 3, 4 & No & No & No & No \\
+ 5, 6 & Yes & No & No & No \\
+ 7 & No & Yes & Yes & Yes \\
\bottomrule
\end{tabular}
\end{centertable}