1 |
From: Ulrich Müller <ulm@g.o> |
2 |
|
3 |
Bug: https://bugs.gentoo.org/282296 |
4 |
--- |
5 |
eapi-differences.tex | 4 ++++ |
6 |
tree-layout.tex | 20 ++++++++++++++++++++ |
7 |
2 files changed, 24 insertions(+) |
8 |
|
9 |
diff --git a/eapi-differences.tex b/eapi-differences.tex |
10 |
index d6e270a..9d7ec60 100644 |
11 |
--- a/eapi-differences.tex |
12 |
+++ b/eapi-differences.tex |
13 |
@@ -41,6 +41,9 @@ of this document for a complete table of previous EAPIs. |
14 |
\bottomrule |
15 |
\endlastfoot |
16 |
|
17 |
+\t{package.mask} directory & \compactfeatureref{package-mask-dir} & |
18 |
+ No & No & No & No & Yes \\ |
19 |
+ |
20 |
Stable use masking/forcing & \compactfeatureref{stablemask} & |
21 |
No & No & Yes & Yes & Yes \\ |
22 |
|
23 |
@@ -373,6 +376,7 @@ EAPI 6 is EAPI 5 with the following changes: |
24 |
EAPI 7 is EAPI 6 with the following changes: |
25 |
|
26 |
\begin{compactitem} |
27 |
+\item \t{profiles/package.mask} can be a directory, \featureref{package-mask-dir}. |
28 |
\item \t{dohtml} banned, \featureref{banned-commands}. |
29 |
\end{compactitem} |
30 |
|
31 |
diff --git a/tree-layout.tex b/tree-layout.tex |
32 |
index 1c23357..d09feef 100644 |
33 |
--- a/tree-layout.tex |
34 |
+++ b/tree-layout.tex |
35 |
@@ -107,6 +107,12 @@ manager must ignore any files in this directory that it does not recognise. |
36 |
Contains a list, one entry per line, of package dependency specifications (using the directory's |
37 |
EAPI). Any package version matching one of these is considered to be masked, and will not be |
38 |
installed regardless of profile unless it is unmasked by the user configuration. |
39 |
+ |
40 |
+ \featurelabel{package-mask-dir} For EAPIs listed in table~\ref{tab:package-mask-dir} as |
41 |
+ supporting it, \t{package.mask} can be a directory instead of a regular file. Files contained |
42 |
+ in that directory, unless their name begins with a dot, will be concatenated in order of their |
43 |
+ filename in the POSIX locale and the result will be processed as if it were a single file. |
44 |
+ Any subdirectories will be ignored. |
45 |
\item[profiles.desc] Described below in section~\ref{sec:profiles.desc}. |
46 |
\item[repo_name] Contains, on a single line, the name of this repository. The repository name must |
47 |
conform to section~\ref{sec:repository-names}. |
48 |
@@ -123,6 +129,20 @@ manager must ignore any files in this directory that it does not recognise. |
49 |
\item[updates/] This directory is described in section~\ref{sec:updates-dir}. |
50 |
\end{description} |
51 |
|
52 |
+\ChangeWhenAddingAnEAPI{7} |
53 |
+\begin{centertable}{EAPIs supporting a directory for \t{package.mask}} |
54 |
+ \label{tab:package-mask-dir} |
55 |
+ \begin{tabular}{ll} |
56 |
+ \toprule |
57 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
58 |
+ \multicolumn{1}{c}{\textbf{\t{package.mask} can be a directory?}} \\ |
59 |
+ \midrule |
60 |
+ 0, 1, 2, 3, 4, 5, 6 & No \\ |
61 |
+ 7 & Yes \\ |
62 |
+ \bottomrule |
63 |
+ \end{tabular} |
64 |
+\end{centertable} |
65 |
+ |
66 |
\subsection{The profiles.desc file} |
67 |
\label{sec:profiles.desc} |
68 |
\t{profiles.desc} is a line-based file, with the standard commenting |
69 |
-- |
70 |
2.14.2 |