commit: aba5a1ae1687bb6b6ec277581242d30c56038949 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Sun Nov 29 23:00:32 2015 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Mon Oct 9 17:06:22 2017 +0000 URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=aba5a1ae
EAPI 7 supports a directory for package.mask. Bug: https://bugs.gentoo.org/282296 eapi-differences.tex | 4 ++++ tree-layout.tex | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/eapi-differences.tex b/eapi-differences.tex index 4c3ee67..0b41d71 100644 --- a/eapi-differences.tex +++ b/eapi-differences.tex @@ -41,6 +41,9 @@ of this document for a complete table of previous EAPIs. \bottomrule \endlastfoot +\t{package.mask} directory & \compactfeatureref{package-mask-dir} & + No & No & No & No & Yes \\ + Stable use masking/forcing & \compactfeatureref{stablemask} & No & No & Yes & Yes & Yes \\ @@ -373,6 +376,7 @@ EAPI 6 is EAPI 5 with the following changes: EAPI 7 is EAPI 6 with the following changes: \begin{compactitem} +\item \t{profiles/package.mask} can be a directory, \featureref{package-mask-dir}. \item \t{dohtml} banned, \featureref{banned-commands}. \end{compactitem} diff --git a/tree-layout.tex b/tree-layout.tex index 1c23357..d09feef 100644 --- a/tree-layout.tex +++ b/tree-layout.tex @@ -107,6 +107,12 @@ manager must ignore any files in this directory that it does not recognise. Contains a list, one entry per line, of package dependency specifications (using the directory's EAPI). Any package version matching one of these is considered to be masked, and will not be installed regardless of profile unless it is unmasked by the user configuration. + + \featurelabel{package-mask-dir} For EAPIs listed in table~\ref{tab:package-mask-dir} as + supporting it, \t{package.mask} can be a directory instead of a regular file. Files contained + in that directory, unless their name begins with a dot, will be concatenated in order of their + filename in the POSIX locale and the result will be processed as if it were a single file. + Any subdirectories will be ignored. \item[profiles.desc] Described below in section~\ref{sec:profiles.desc}. \item[repo_name] Contains, on a single line, the name of this repository. The repository name must conform to section~\ref{sec:repository-names}. @@ -123,6 +129,20 @@ manager must ignore any files in this directory that it does not recognise. \item[updates/] This directory is described in section~\ref{sec:updates-dir}. \end{description} +\ChangeWhenAddingAnEAPI{7} +\begin{centertable}{EAPIs supporting a directory for \t{package.mask}} + \label{tab:package-mask-dir} + \begin{tabular}{ll} + \toprule + \multicolumn{1}{c}{\textbf{EAPI}} & + \multicolumn{1}{c}{\textbf{\t{package.mask} can be a directory?}} \\ + \midrule + 0, 1, 2, 3, 4, 5, 6 & No \\ + 7 & Yes \\ + \bottomrule + \end{tabular} +\end{centertable} + \subsection{The profiles.desc file} \label{sec:profiles.desc} \t{profiles.desc} is a line-based file, with the standard commenting
