Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/pms:eapi-6 commit in: /
Date: Thu, 02 Apr 2015 16:11:03
Message-Id: 1427990884.549b3b0d3e9fceffd1739ef70e14672481da0c89.ulm@gentoo
1 commit: 549b3b0d3e9fceffd1739ef70e14672481da0c89
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Mar 23 18:38:37 2015 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 2 16:08:04 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=549b3b0d
7
8 EAPI 6 has eapply_user.
9
10 See bug 475288.
11
12 eapi-differences.tex | 4 ++++
13 pkg-mgr-commands.tex | 14 ++++++++++----
14 2 files changed, 14 insertions(+), 4 deletions(-)
15
16 diff --git a/eapi-differences.tex b/eapi-differences.tex
17 index 1a2073d..2fe534e 100644
18 --- a/eapi-differences.tex
19 +++ b/eapi-differences.tex
20 @@ -175,6 +175,9 @@ Option \t{-{}-host-root} & \compactfeatureref{host-root-option} &
21 \t{eapply} & \compactfeatureref{eapply} &
22 No & No & No & No & Yes \\
23
24 +\t{eapply\_user} & \compactfeatureref{eapply-user} &
25 + No & No & No & No & Yes \\
26 +
27 \t{econf} arguments & \compactfeatureref{econf-options} &
28 & & disable dependency tracking &
29 disable dependency tracking, disable silent rules &
30 @@ -328,6 +331,7 @@ EAPI 6 is EAPI 5 with the following changes:
31 \item \t{einstall} banned, \featureref{banned-commands}.
32 \item \t{die} and \t{assert} called with \t{-n} respect \t{nonfatal}, \featureref{nonfatal-die}.
33 \item \t{eapply} support, \featureref{eapply}.
34 +\item \t{eapply\_user} support, \featureref{eapply-user}.
35 \end{compactitem}
36
37 \ChangeWhenAddingAnEAPI{6}
38
39 diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex
40 index f36e4c3..e903ecb 100644
41 --- a/pkg-mgr-commands.tex
42 +++ b/pkg-mgr-commands.tex
43 @@ -150,6 +150,11 @@ Ebuilds must not run any of these commands once the current phase function has r
44 \begin{description}
45 \item[eapply] \featurelabel{eapply}
46 Only available in EAPIs listed in table~\ref{tab:patch-commands} as supporting \t{eapply}.
47 +
48 +\item[eapply\_user] \featurelabel{eapply-user} Takes no arguments. For package managers supporting
49 + it, applies user-provided patches to the source tree in the current working directory. Exact
50 + behaviour is implementation defined and beyond the scope of this specification. Only available
51 + in EAPIs listed in table~\ref{tab:patch-commands} as supporting \t{eapply\_user}.
52 \end{description}
53
54 \begin{algorithm}
55 @@ -162,13 +167,14 @@ Ebuilds must not run any of these commands once the current phase function has r
56 \ChangeWhenAddingAnEAPI{6}
57 \begin{centertable}{Patch commands for EAPIs}
58 \label{tab:patch-commands}
59 - \begin{tabular}{ l l }
60 + \begin{tabular}{ l l l }
61 \toprule
62 \multicolumn{1}{c}{\textbf{EAPI}} &
63 - \multicolumn{1}{c}{\textbf{\t{eapply}?}} \\
64 + \multicolumn{1}{c}{\textbf{\t{eapply}?}} &
65 + \multicolumn{1}{c}{\textbf{\t{eapply\_user}?}} \\
66 \midrule
67 - 0, 1, 2, 3, 4, 5 & No \\
68 - 6 & Yes \\
69 + 0, 1, 2, 3, 4, 5 & No & No \\
70 + 6 & Yes & Yes \\
71 \bottomrule
72 \end{tabular}
73 \end{centertable}