Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/pms:eapi-7 commit in: /
Date: Thu, 28 Sep 2017 20:53:25
Message-Id: 1506631449.215d9515b8f283888782e9c631c4246c16c9b049.mgorny@gentoo
1 commit: 215d9515b8f283888782e9c631c4246c16c9b049
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 17 21:39:27 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 28 20:44:09 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=215d9515
7
8 EAPI 7 has BROOT
9
10 Bug: https://bugs.gentoo.org/317337
11
12 eapi-differences.tex | 4 ++++
13 ebuild-env-vars.tex | 33 +++++++++++++++++++++------------
14 2 files changed, 25 insertions(+), 12 deletions(-)
15
16 diff --git a/eapi-differences.tex b/eapi-differences.tex
17 index 9205125..af28b7a 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{BROOT} & \compactfeatureref{broot} &
25 + No & No & No & No & Yes \\
26 +
27 \t{BDEPEND} & \compactfeatureref{bdepend} &
28 No & No & No & No & Yes \\
29
30 @@ -413,6 +416,7 @@ EAPI 7 is EAPI 6 with the following changes:
31 \item \t{SYSROOT} and \t{ESYSROOT} added, \featureref{sysroot}.
32 \item \t{econf} adds \t{-{}-with-sysroot}, \featureref{econf-options}.
33 \item \t{BDEPEND}, \featureref{bdepend}.
34 +\item \t{BROOT}, \featureref{broot}.
35 \end{compactitem}
36
37 \ChangeWhenAddingAnEAPI{7}
38
39 diff --git a/ebuild-env-vars.tex b/ebuild-env-vars.tex
40 index e24a065..e91f36e 100644
41 --- a/ebuild-env-vars.tex
42 +++ b/ebuild-env-vars.tex
43 @@ -144,6 +144,13 @@ variable.
44 for convenience. See also the \t{EPREFIX} variable. Only for EAPIs listed
45 in table~\ref{tab:offset-env-vars-table} as supporting \t{ESYSROOT}. The presence of a trailing
46 slash EAPI-dependent as listed in table~\ref{tab:trailing-slash}. \\
47 +\t{BROOT} &
48 + \t{src_*} &
49 + No &
50 + \featurelabel{broot} The absolute path to the root directory containing build dependencies
51 + satisfied by BDEPEND, typically executable build tools. This includes any applicable offset
52 + prefix. Only for EAPIs listed in table~\ref{tab:offset-env-vars-table} as supporting \t{BROOT}.
53 + The presence of a trailing slash EAPI-dependent as listed in table~\ref{tab:trailing-slash}. \\
54 \t{T} &
55 All &
56 Partially\footnote{Consistent and preserved across a single connected sequence of install or
57 @@ -253,19 +260,20 @@ variable.
58 \ChangeWhenAddingAnEAPI{7}
59 \begin{centertable}{EAPIs supporting various added env variables}
60 \label{tab:added-env-vars-table}
61 - \begin{tabular}{llllll}
62 + \begin{tabular}{lllllll}
63 \toprule
64 \multicolumn{1}{c}{\textbf{EAPI}} &
65 \multicolumn{1}{c}{\textbf{\t{MERGE_TYPE}?}} &
66 \multicolumn{1}{P{6em}}{\textbf{\t{REPLACING_VERSIONS}?}} &
67 \multicolumn{1}{P{6em}}{\textbf{\t{REPLACED_BY_VERSION}?}} &
68 \multicolumn{1}{P{6em}}{\textbf{\t{EBUILD_PHASE_FUNC}?}} &
69 - \multicolumn{1}{P{6em}}{\textbf{\t{SYSROOT}?}} \\
70 + \multicolumn{1}{P{6em}}{\textbf{\t{SYSROOT}?}} &
71 + \multicolumn{1}{P{6em}}{\textbf{\t{BROOT}?}} \\
72 \midrule
73 - 0, 1, 2, 3 & No & No & No & No & No \\
74 - 4 & Yes & Yes & Yes & No & No \\
75 - 5, 6 & Yes & Yes & Yes & Yes & No \\
76 - 7 & Yes & Yes & Yes & Yes & Yes \\
77 + 0, 1, 2, 3 & No & No & No & No & No & No \\
78 + 4 & Yes & Yes & Yes & No & No & No \\
79 + 5, 6 & Yes & Yes & Yes & Yes & No & No \\
80 + 7 & Yes & Yes & Yes & Yes & Yes & Yes \\
81 \bottomrule
82 \end{tabular}
83 \end{centertable}
84 @@ -288,7 +296,7 @@ variable.
85 \ChangeWhenAddingAnEAPI{7}
86 \begin{centertable}{EAPIs supporting offset-prefix env variables}
87 \label{tab:offset-env-vars-table}
88 - \begin{tabular}{lllll}
89 + \begin{tabular}{llllll}
90 \toprule
91 \multicolumn{1}{c}{\textbf{EAPI}} &
92 \multicolumn{1}{c}{\textbf{\t{EPREFIX}?}} &
93 @@ -460,17 +468,18 @@ If the path specifies the system root directory, it will be empty.
94 \ChangeWhenAddingAnEAPI{7}
95 \begin{centertable}{Variables that always or never end with a trailing slash}
96 \label{tab:trailing-slash}
97 - \begin{tabular}{llll}
98 + \begin{tabular}{lllll}
99 \toprule
100 \multicolumn{1}{c}{\textbf{EAPI}} &
101 - \multicolumn{3}{c}{\textbf{Ends with a trailing slash?}} \\
102 + \multicolumn{4}{c}{\textbf{Ends with a trailing slash?}} \\
103 &
104 \t{ROOT}, \t{EROOT} &
105 \t{D}, \t{ED} &
106 - \t{SYSROOT}, \t{ESYSROOT} \\
107 + \t{SYSROOT}, \t{ESYSROOT} &
108 + \t{BROOT} \\
109 \midrule
110 - 0, 1, 2, 3, 4, 5, 6 & always & always & n/a \\
111 - 7 & never & never & never \\
112 + 0, 1, 2, 3, 4, 5, 6 & always & always & n/a & n/a \\
113 + 7 & never & never & never & never \\
114 \bottomrule
115 \end{tabular}
116 \end{centertable}