[gentoo-commits] proj/pms:eapi-8 commit in: /

["Ulrich Müller" <ulm@gentoo.org>]

commit:     156001d89c113202522b9faf0cb68b3e7dbe27f9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 24 09:46:26 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu May 27 19:15:25 2021 +0000
URL:        https://gitweb.gentoo.org/proj/pms.git/commit/?id=156001d8

EAPI 8 has econf passing --datarootdir

Bug: https://bugs.gentoo.org/651958
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 eapi-differences.tex |  3 ++-
 pkg-mgr-commands.tex | 17 +++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/eapi-differences.tex b/eapi-differences.tex
index a2a74b8..32f4a66 100644
--- a/eapi-differences.tex
+++ b/eapi-differences.tex
@@ -272,7 +272,7 @@ Output commands use stdout & \compactfeatureref{output-no-stdout} &
     disable dependency tracking, disable silent rules &
     disable dependency tracking, disable silent rules, docdir, htmldir &
     disable dependency tracking, disable silent rules, docdir, htmldir, with sysroot &
-    disable dependency tracking, disable silent rules, docdir, htmldir, with sysroot \\
+    disable dependency tracking, disable silent rules, datarootdir, docdir, htmldir, with sysroot \\
 
 \t{dodoc -r} & \compactfeatureref{dodoc} &
     * & Yes & Yes & Yes & Yes \\
@@ -514,6 +514,7 @@ EAPI 8 is EAPI 7 with the following changes:
 \item \t{PROPERTIES} and \t{RESTRICT} accumulated across eclasses, \featureref{accumulate-vars}.
 \item \t{useq} banned, \featureref{banned-commands}.
 \item \t{hasv} and \t{hasq} banned, \featureref{banned-commands}.
+\item \t{econf} adds \t{-{}-datarootdir}, \featureref{econf-options}.
 \end{compactitem}
 
 \ChangeWhenAddingAnEAPI{8}

diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex
index c56e592..7909bdd 100644
--- a/pkg-mgr-commands.tex
+++ b/pkg-mgr-commands.tex
@@ -312,6 +312,9 @@ commands once the current phase function has returned.
     \item \t{-{}-mandir} must be \t{\$\{EPREFIX\}/usr/share/man}
     \item \t{-{}-infodir} must be \t{\$\{EPREFIX\}/usr/share/info}
     \item \t{-{}-datadir} must be \t{\$\{EPREFIX\}/usr/share}
+    \item \t{-{}-datarootdir} must be \t{\$\{EPREFIX\}/usr/share}, 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{-{}-datarootdir} occurs in the output of \t{configure -{}-help}.
     \item \t{-{}-sysconfdir} must be \t{\$\{EPREFIX\}/etc}
     \item \t{-{}-localstatedir} must be \t{\$\{EPREFIX\}/var/lib}
     \item \t{-{}-docdir} must be \t{\$\{EPREFIX\}/usr/share/doc/\$\{PF\}}, if the EAPI is listed in
@@ -340,20 +343,22 @@ commands once the current phase function has returned.
     \ChangeWhenAddingAnEAPI{8}
     \begin{centertable}{Extra \t{econf} arguments for EAPIs}
         \label{tab:econf-options-table}
-        \begin{tabular}{llllll}
+        \begin{tabular}{lllllll}
           \toprule
           \multicolumn{1}{c}{\textbf{EAPI}} &
           \multicolumn{1}{P{9em}}{\textbf{-{}-disable-dependency-tracking}} &
           \multicolumn{1}{P{5em}}{\textbf{-{}-disable-silent-rules}} &
+          \multicolumn{1}{c}{\textbf{-{}-datarootdir}} &
           \multicolumn{1}{c}{\textbf{-{}-docdir}} &
           \multicolumn{1}{c}{\textbf{-{}-htmldir}} &
           \multicolumn{1}{c}{\textbf{-{}-with-sysroot}} \\
           \midrule
-          0, 1, 2, 3        & No  & No  & No  & No  & No  \\
-          4                 & Yes & No  & No  & No  & No  \\
-          5                 & Yes & Yes & No  & No  & No  \\
-          6                 & Yes & Yes & Yes & Yes & No  \\
-          7, 8              & Yes & Yes & Yes & Yes & Yes \\
+          0, 1, 2, 3        & No  & No  & No  & No  & No  & No  \\
+          4                 & Yes & No  & No  & No  & No  & No  \\
+          5                 & Yes & Yes & No  & No  & No  & No  \\
+          6                 & Yes & Yes & No  & Yes & Yes & No  \\
+          7                 & Yes & Yes & No  & Yes & Yes & Yes \\
+          8                 & Yes & Yes & Yes & Yes & Yes & Yes \\
           \bottomrule
         \end{tabular}
     \end{centertable}