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