commit: ac4641f77bcc8e7265771b765a7205796938394d
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 16 19:47:42 2015 +0000
Commit: git@oystercatcher mirror+tproxy <git <AT> oystercatcher <DOT>
gentoo <DOT> org>
CommitDate: Thu Feb 19 08:17:29 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/pms.git;a=commit;h=ac4641f7
EAPI 6: econf adds --docdir and --htmldir.
See bug 468202.
---
eapi-differences.tex | 3 ++-
pkg-mgr-commands.tex | 21 +++++++++++++++------
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/eapi-differences.tex b/eapi-differences.tex
index 7e4cd09..12c05b4 100644
--- a/eapi-differences.tex
+++ b/eapi-differences.tex
@@ -175,7 +175,7 @@ Option \t{-{}-host-root} &
\compactfeatureref{host-root-option} &
\t{econf} arguments & \compactfeatureref{econf-options} &
& & disable dependency tracking &
disable dependency tracking, disable silent rules &
- disable dependency tracking, disable silent rules \\
+ disable dependency tracking, disable silent rules, docdir, htmldir \\
\t{dodoc -r} & \compactfeatureref{dodoc} &
No & No & Yes & Yes & Yes \\
@@ -324,6 +324,7 @@ EAPI 6 is EAPI 5 with the following changes:
\item \t{failglob} is enabled in global scope, \featureref{failglob}.
\item \t{einstall} banned, \featureref{banned-commands}.
\item \t{die} and \t{assert} called with \t{-n} respect \t{nonfatal},
\featureref{nonfatal-die}.
+\item \t{econf} adds \t{-{}-docdir} and \t{-{}-htmldir},
\featureref{econf-options}.
\end{compactitem}
\ChangeWhenAddingAnEAPI{6}
diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex
index bf688f9..3ac8169 100644
--- a/pkg-mgr-commands.tex
+++ b/pkg-mgr-commands.tex
@@ -164,6 +164,12 @@ current phase function has returned.
\item -{}-datadir must be \t{\$\{EPREFIX\}/usr/share}
\item -{}-sysconfdir must be \t{\$\{EPREFIX\}/etc}
\item -{}-localstatedir must be \t{\$\{EPREFIX\}/var/lib}
+ \item -{}-docdir must be \t{\$\{EPREFIX\}/usr/share/doc/\$\{PF\}}, if the
EAPI is listed in
+ table \ref{tab:econf-options-table} as using it. This option will only
be passed if the
+ string \t{-{}-docdir} occurs in the output of \t{configure -{}-help}.
+ \item -{}-htmldir must be \t{\$\{EPREFIX\}/usr/share/doc/\$\{PF\}/html},
if the EAPI is listed
+ in table \ref{tab:econf-options-table} as using it. This option will
only be passed if the
+ string \t{-{}-htmldir} occurs in the output of \t{configure -{}-help}.
\item -{}-host must be the value of the \t{CHOST} environment variable.
\item -{}-libdir must be set according to Algorithm~\ref{alg:econf-libdir}.
\item -{}-disable-dependency-tracking, if the EAPI is listed in
@@ -177,15 +183,18 @@ current phase function has returned.
\ChangeWhenAddingAnEAPI{6}
\begin{centertable}{Extra \t{econf} arguments for EAPIs}
\label{tab:econf-options-table}
- \begin{tabular}{ l l l }
+ \begin{tabular}{ l l l l l }
\toprule
\multicolumn{1}{c}{\textbf{EAPI}} &
- \multicolumn{1}{c}{\textbf{-{}-disable-dependency-tracking?}} &
- \multicolumn{1}{c}{\textbf{-{}-disable-silent-rules?}} \\
+ \multicolumn{1}{c}{\textbf{-{}-disable-dependency-tracking}} &
+ \multicolumn{1}{c}{\textbf{-{}-disable-silent-rules}} &
+ \multicolumn{1}{c}{\textbf{-{}-docdir}} &
+ \multicolumn{1}{c}{\textbf{-{}-htmldir}} \\
\midrule
- 0, 1, 2, 3 & No & No \\
- 4 & Yes & No \\
- 5, 6 & Yes & Yes \\
+ 0, 1, 2, 3 & No & No & No & No \\
+ 4 & Yes & No & No & No \\
+ 5 & Yes & Yes & No & No \\
+ 6 & Yes & Yes & Yes & Yes \\
\bottomrule
\end{tabular}
\end{centertable}
