From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 651091396D0 for ; Mon, 9 Oct 2017 17:31:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7EB7DE0DEE; Mon, 9 Oct 2017 17:31:15 +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 4AEBFE0DEE for ; Mon, 9 Oct 2017 17:31:15 +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 D475A33FE60 for ; Mon, 9 Oct 2017 17:31:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 917D990A9 for ; Mon, 9 Oct 2017 17:31:10 +0000 (UTC) From: "Ulrich Müller" 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" Message-ID: <1507569394.92a5b7554ec1eee656e61aff7ed85486ff177a17.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: 92a5b7554ec1eee656e61aff7ed85486ff177a17 X-VCS-Branch: eapi-7 Date: Mon, 9 Oct 2017 17:31:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 79637cda-e07a-4a5b-a9df-d91bf666b424 X-Archives-Hash: b80a3c22daf217e49f70523f47f71f38 commit: 92a5b7554ec1eee656e61aff7ed85486ff177a17 Author: James Le Cuirot gentoo org> AuthorDate: Sat Sep 23 20:53:59 2017 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Mon Oct 9 17:16:34 2017 +0000 URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=92a5b755 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 d6eab8d..8028471 100644 --- a/eapi-differences.tex +++ b/eapi-differences.tex @@ -202,8 +202,8 @@ Most utilities die & \compactfeatureref{die-on-failure} & \t{dohtml} & \compactfeatureref{banned-commands} & Yes & Yes & Yes & Yes & Banned \\ -Option \t{-{}-host-root} & \compactfeatureref{host-root-option} & - No & No & Yes & Yes & Yes \\ +PM query options & \compactfeatureref{pm-query-options} & + No & No & \t{-{}-host-root} & \t{-{}-host-root} & \t{-b}, \t{-d}, \t{-r} \\ \t{die -n} & \compactfeatureref{nonfatal-die} & No & No & No & Yes & Yes \\ @@ -368,7 +368,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}. @@ -417,6 +417,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} drops the \t{-{}-host-root} option in favor of the + \t{-b}, \t{-d}, and \t{-r} options, \featureref{pm-query-options}. \end{compactitem} \ChangeWhenAddingAnEAPI{7} diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex index 96b9df4..d86b88b 100644 --- a/pkg-mgr-commands.tex +++ b/pkg-mgr-commands.tex @@ -84,27 +84,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-table} +as supporting options \t{-b}, \t{-d}, and \t{-r}, these 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. + +In EAPIs listed in table~\ref{tab:pm-query-options-table} 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}. + \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-table} + \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}