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: Tue, 03 Mar 2015 06:18:43
Message-Id: 1424243489.8b257070f3a88d91a64faa0f588957a5dc137e97.ulm@gentoo
1 commit: 8b257070f3a88d91a64faa0f588957a5dc137e97
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 18 07:11:29 2015 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 18 07:11:29 2015 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/pms.git;a=commit;h=8b257070
7
8 Whitespace: Split some very long lines.
9
10 ---
11 dependencies.tex | 28 +++++++++++++++++-----------
12 ebuild-env-commands.tex | 6 +++---
13 names.tex | 12 ++++++++----
14 3 files changed, 28 insertions(+), 18 deletions(-)
15
16 diff --git a/dependencies.tex b/dependencies.tex
17 index 2444fcd..b5cfcfa 100644
18 --- a/dependencies.tex
19 +++ b/dependencies.tex
20 @@ -4,17 +4,22 @@
21 \section{Dependency Classes}
22 \label{sec:dependency-classes}
23
24 -\begin{centertable}{Dependency classes required to be satisfied for a particular phase function} \label{tab:phase-function-dependency-classes}
25 +\begin{centertable}{Dependency classes required to be satisfied for a particular phase function}
26 + \label{tab:phase-function-dependency-classes}
27 \begin{tabular}{ p{0.2\textwidth} p{0.7\textwidth} }
28 - \toprule
29 - \multicolumn{1}{c}{\textbf{Phase function}} &
30 - \multicolumn{1}{c}{\textbf{Satisfied dependency classes}} \\
31 - \midrule
32 - \t{pkg\_pretend}, \t{pkg\_setup}, \t{pkg\_info}, \t{pkg\_nofetch} & None (ebuilds can rely only on the packages in the system set) \\
33 - \t{src\_unpack}, \t{src\_prepare}, \t{src\_configure}, \t{src\_compile}, \t{src\_test}, \t{src\_install} & \t{DEPEND} \\
34 - \t{pkg\_preinst}, \t{pkg\_postinst}, \t{pkg\_prerm}, \t{pkg\_postrm} & \t{RDEPEND} (unless the particular dependency results in a circular dependency, in which case it may be installed later) \\
35 - \t{pkg\_config} & \t{RDEPEND}, \t{PDEPEND} \\
36 - \bottomrule
37 + \toprule
38 + \multicolumn{1}{c}{\textbf{Phase function}} &
39 + \multicolumn{1}{c}{\textbf{Satisfied dependency classes}} \\
40 + \midrule
41 + \t{pkg\_pretend}, \t{pkg\_setup}, \t{pkg\_info}, \t{pkg\_nofetch} &
42 + None (ebuilds can rely only on the packages in the system set) \\
43 + \t{src\_unpack}, \t{src\_prepare}, \t{src\_configure}, \t{src\_compile}, \t{src\_test},
44 + \t{src\_install} & \t{DEPEND} \\
45 + \t{pkg\_preinst}, \t{pkg\_postinst}, \t{pkg\_prerm}, \t{pkg\_postrm} &
46 + \t{RDEPEND} (unless the particular dependency results in a circular dependency, in which
47 + case it may be installed later) \\
48 + \t{pkg\_config} & \t{RDEPEND}, \t{PDEPEND} \\
49 + \bottomrule
50 \end{tabular}
51 \end{centertable}
52
53 @@ -30,7 +35,8 @@ There are three classes of dependencies supported by ebuilds:
54 the package manager finishes the batch of installs.
55 \end{compactitem}
56
57 -Table~\ref{tab:phase-function-dependency-classes} lists dependencies which must be satisfied before a particular phase function is executed.
58 +Table~\ref{tab:phase-function-dependency-classes} lists dependencies which must be satisfied before
59 +a particular phase function is executed.
60
61 In addition, \t{SRC\_URI}, \t{HOMEPAGE}, \t{RESTRICT}, \t{PROPERTIES}, \t{LICENSE} and
62 \t{REQUIRED\_USE} use dependency-style specifications to specify their values.
63
64 diff --git a/ebuild-env-commands.tex b/ebuild-env-commands.tex
65 index 70b69b2..7d3c33b 100644
66 --- a/ebuild-env-commands.tex
67 +++ b/ebuild-env-commands.tex
68 @@ -23,9 +23,9 @@ dependencies must be used to ensure their presence.
69
70 The following commands must always be available in the ebuild environment:
71 \begin{compactitem}
72 -\item All builtin commands in GNU bash, version 3.2\footnote{The
73 - required bash version was retroactively updated from 3.0 to 3.2 in
74 - November 2009 (see \url{http://www.gentoo.org/proj/en/council/meeting-logs/20091109.txt}).\label{fn:bash3.2}}.
75 +\item All builtin commands in GNU bash, version 3.2\footnote{The required bash version was
76 + retroactively updated from 3.0 to 3.2 in November 2009
77 + (see \url{http://www.gentoo.org/proj/en/council/meeting-logs/20091109.txt}).\label{fn:bash3.2}}.
78 \item \t{sed} must be available, and must support all forms of invocations valid for GNU sed
79 version 4 or later.
80 \item \t{patch} must be available, and must support all inputs valid for GNU patch.
81
82 diff --git a/names.tex b/names.tex
83 index 447be9a..e64a828 100644
84 --- a/names.tex
85 +++ b/names.tex
86 @@ -87,7 +87,8 @@ from which it was invoked.
87 \begin{algorithm}
88 \caption{Version comparison logic for numeric components} \label{alg:version-comparison-numeric}
89 \begin{algorithmic}[1]
90 - \STATE define the notations $An_k$ and $Bn_k$ to mean the $k$\textsuperscript{th} numeric component of $A$ and $B$ respectively, using $0$-based indexing
91 + \STATE define the notations $An_k$ and $Bn_k$ to mean the $k$\textsuperscript{th} numeric
92 + component of $A$ and $B$ respectively, using $0$-based indexing
93 \IF{$An_0>Bn_0$ using integer comparison}
94 \RETURN $A>B$
95 \ELSIF{$An_0<Bn_0$ using integer comparison}
96 @@ -107,7 +108,8 @@ from which it was invoked.
97 \end{algorithm}
98
99 \begin{algorithm}
100 -\caption{Version comparison logic for each numeric component after the first} \label{alg:version-comparison-numeric-nonfirst}
101 +\caption{Version comparison logic for each numeric component after the first}
102 +\label{alg:version-comparison-numeric-nonfirst}
103 \begin{algorithmic}[1]
104 \IF{either $An_i$ or $Bn_i$ has a leading \t{0}}
105 \STATE let $An'_i$ be $An_i$ with any trailing \t{0}s removed
106 @@ -143,7 +145,8 @@ from which it was invoked.
107 \begin{algorithm}
108 \caption{Version comparison logic for suffixes} \label{alg:version-comparison-suffix}
109 \begin{algorithmic}[1]
110 - \STATE define the notations $As_k$ and $Bs_k$ to mean the $k$\textsuperscript{th} suffix of $A$ and $B$ respectively, using $0$-based indexing
111 + \STATE define the notations $As_k$ and $Bs_k$ to mean the $k$\textsuperscript{th} suffix of $A$
112 + and $B$ respectively, using $0$-based indexing
113 \STATE let $Asn$ be the number of suffixes of $A$
114 \STATE let $Bsn$ be the number of suffixes of $B$
115 \FORALL{$i$ such that $i\geq0$ and $i<Asn$ and $i<Bsn$, in ascending order}
116 @@ -176,7 +179,8 @@ from which it was invoked.
117 \ELSIF{$As'_i<Bs'_i$, using integer comparison}
118 \RETURN $A<B$
119 \ENDIF
120 - \ELSIF{the type of $As_i$ is greater than the type of $Bs_i$ using the ordering $\mbox{\t{\_alpha}}<\mbox{\t{\_beta}}<\mbox{\t{\_pre}}<\mbox{\t{\_rc}}<\mbox{\t{\_p}}$}
121 + \ELSIF{the type of $As_i$ is greater than the type of $Bs_i$ using the ordering
122 + $\mbox{\t{\_alpha}}<\mbox{\t{\_beta}}<\mbox{\t{\_pre}}<\mbox{\t{\_rc}}<\mbox{\t{\_p}}$}
123 \RETURN $A>B$
124 \ELSE
125 \RETURN $A<B$