commit: 243c9589272a0348b6ade7f1bcdf2e2837491e11 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Sun May 16 12:05:17 2021 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Mon May 17 21:21:00 2021 +0000 URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=243c9589
EAPI 8: useq, hasv and hasq are banned Bug: https://bugs.gentoo.org/199722 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> eapi-differences.tex | 11 +++++++++++ pkg-mgr-commands.tex | 37 ++++++++++++++++++++++++++++++------- 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/eapi-differences.tex b/eapi-differences.tex index 5319bf0..913935d 100644 --- a/eapi-differences.tex +++ b/eapi-differences.tex @@ -233,6 +233,15 @@ Most utilities die & \compactfeatureref{die-on-failure} & \t{libopts} & \compactfeatureref{banned-commands} & Yes & Yes & Yes & Banned & Banned \\ +\t{useq} & \compactfeatureref{banned-commands} & + Yes & Yes & Yes & Yes & Banned \\ + +\t{hasv} & \compactfeatureref{banned-commands} & + Yes & Yes & Yes & Yes & Banned \\ + +\t{hasq} & \compactfeatureref{banned-commands} & + Yes & Yes & Yes & Yes & Banned \\ + Query command options & \compactfeatureref{pm-query-options} & None & \t{-{}-host-root} & \t{-{}-host-root} & \t{-b}, \t{-d}, \t{-r} & \t{-b}, \t{-d}, \t{-r} \\ @@ -499,6 +508,8 @@ EAPI 8 is EAPI 7 with the following changes: \item \t{IDEPEND}, \featureref{idepend}. \item Different \t{src_prepare} implementation, \featureref{src-prepare-8}. \item \t{PROPERTIES}, \t{RESTRICT} accumulated across eclasses, \featureref{accumulate-vars}. +\item \t{useq} banned, \featureref{banned-commands}. +\item \t{hasv} and \t{hasq} banned, \featureref{banned-commands}. \end{compactitem} \ChangeWhenAddingAnEAPI{8} diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex index f401472..d535e00 100644 --- a/pkg-mgr-commands.tex +++ b/pkg-mgr-commands.tex @@ -55,7 +55,7 @@ called, the package manager must abort the build process indicating an error. \ChangeWhenAddingAnEAPI{8} \begin{centertable}{Banned commands} - \label{tab:banned-commands-table} + \label{tab:banned-commands-1} \begin{tabular}{lllllll} \toprule \multicolumn{1}{c}{\textbf{EAPI}} & @@ -74,6 +74,23 @@ called, the package manager must abort the build process indicating an error. 7, 8 & Yes & Yes & Yes & Yes & Yes & Yes \\ \bottomrule \end{tabular} + % Don't start a new table environment, or the two parts may end up on different pages + \vspace{\floatsep} + \caption{Banned commands (continued)} + \label{tab:banned-commands-2} + \begin{tabular}{llll} + \toprule + \multicolumn{1}{c}{\textbf{EAPI}} & + \multicolumn{3}{c}{\textbf{Command banned?}} \\ + \multicolumn{1}{c}{} & + \multicolumn{1}{c}{\textbf{\t{useq}}} & + \multicolumn{1}{c}{\textbf{\t{hasv}}} & + \multicolumn{1}{c}{\textbf{\t{hasq}}} \\ + \midrule + 0, 1, 2, 3, 4, 5, 6, 7 & No & No & No \\ + 8 & Yes & Yes & Yes \\ + \bottomrule + \end{tabular} \end{centertable} \subsection{Sandbox commands} @@ -387,7 +404,7 @@ commands once the current phase function has returned. \item[einstall] A shortcut for the command given in listing~\ref{lst:einstall}. Any arguments given to \t{einstall} are passed verbatim to \t{emake}, as shown. Failure behaviour is EAPI dependent as per section~\ref{sec:failure-behaviour}. - In EAPIs listed in table~\ref{tab:banned-commands-table}, this command is banned as per + In EAPIs listed in table~\ref{tab:banned-commands-1}, this command is banned as per section~\ref{sec:banned-commands}. The variable \t{ED} is defined as in table~\ref{tab:defined-vars} and depends on the use of an @@ -465,7 +482,7 @@ the current phase function has returned. \item[dohard] Takes two parameters. Creates a hardlink from the second to the first. Both paths are relative to the staging directory including the offset-prefix \t{ED} in offset-prefix aware EAPIs, or just the staging directory \t{D} in offset-prefix agnostic EAPIs. In EAPIs listed - in table~\ref{tab:banned-commands-table}, this command is banned as per + in table~\ref{tab:banned-commands-1}, this command is banned as per section~\ref{sec:banned-commands}. \item[doheader] \featurelabel{doheader} Installs the given header files into \t{/usr/include/}, @@ -493,7 +510,7 @@ the current phase function has returned. offset-prefix. \end{compactdesc} - In EAPIs listed in table~\ref{tab:banned-commands-table}, this command is banned as per + In EAPIs listed in table~\ref{tab:banned-commands-1}, this command is banned as per section~\ref{sec:banned-commands}. Failure behaviour is EAPI dependent as per section~\ref{sec:failure-behaviour}. @@ -524,7 +541,7 @@ the current phase function has returned. \item[dolib] As for \t{dolib.a} except that the default install mode can be overriden with the \t{install} options set by the most recent \t{libopts} call. In EAPIs listed - in table~\ref{tab:banned-commands-table}, this command is banned as per + in table~\ref{tab:banned-commands-1}, this command is banned as per section~\ref{sec:banned-commands}. \begin{algorithm} @@ -732,7 +749,7 @@ function has returned. \item[exeopts] As \t{insopts}, for \t{doexe} et al. \item[libopts] As \t{insopts}, for \t{dolib} et al. - In EAPIs listed in table~\ref{tab:banned-commands-table}, this command is banned as + In EAPIs listed in table~\ref{tab:banned-commands-1}, this command is banned as per section~\ref{sec:banned-commands}. \end{description} @@ -841,6 +858,8 @@ table~\ref{tab:use-list-strictness}. \item[usev] The same as \t{use}, but also prints the flag name if the condition is met. \item[useq] Deprecated synonym for \t{use}. + In EAPIs listed in table~\ref{tab:banned-commands-2}, this command is banned as per + section~\ref{sec:banned-commands}. \item[use_with] \featurelabel{use-with} Has one-, two-, and three-argument forms. The first argument is a USE flag name, the second a \t{configure} option name (\t{\$\{opt\}}), defaulting to the same as the first argument if not provided, and the third is a string value @@ -915,7 +934,11 @@ These functions check whitespace-separated lists for a particular value. \item[has] Returns shell true (0) if the first argument (a word) is found in the list of subsequent arguments, false otherwise. Guaranteed quiet. \item[hasv] The same as \t{has}, but also prints the first argument if found. + In EAPIs listed in table~\ref{tab:banned-commands-2}, this command is banned as per + section~\ref{sec:banned-commands}. \item[hasq] Deprecated synonym for \t{has}. + In EAPIs listed in table~\ref{tab:banned-commands-2}, this command is banned as per + section~\ref{sec:banned-commands}. \end{description} \subsection{Version manipulation and comparison commands} @@ -1010,7 +1033,7 @@ has returned. agnostic EAPIs) a file which exists, then \t{sed} is run with the current expression on that file. Otherwise, the current expression is set to the text of the argument. The initial value of the expression is \t{s:\$\{ED\}::g} in offset-prefix aware EAPIs and \t{s:\$\{D\}::g} in - offset-prefix agnostic EAPIs. In EAPIs listed in table~\ref{tab:banned-commands-table}, this + offset-prefix agnostic EAPIs. In EAPIs listed in table~\ref{tab:banned-commands-1}, this command is banned as per section~\ref{sec:banned-commands}. \item[unpack] Unpacks one or more source archives, in order, into the current directory.
