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

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

commit:     99c1f4ba03299d96403fe1e8fe485ff70dac488e
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon May 17 19:30:41 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed May 19 15:37:40 2021 +0000
URL:        https://gitweb.gentoo.org/proj/pms.git/commit/?id=99c1f4ba

Split the econf options table because it has become too wide

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 pkg-mgr-commands.tex | 48 ++++++++++++++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex
index b8ba853..46507b7 100644
--- a/pkg-mgr-commands.tex
+++ b/pkg-mgr-commands.tex
@@ -319,18 +319,18 @@ commands once the current phase function has returned.
     \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
+        table~\ref{tab:econf-options-1} 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
-        table~\ref{tab:econf-options-table} as using it. This option will only be passed if the
+        table~\ref{tab:econf-options-1} as using it. This option will only be passed if the
         string \t{-{}-docdir} occurs in the output of \t{configure -{}-help}.
     \item \t{-{}-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
+        listed in table~\ref{tab:econf-options-1} as using it. This option will only be passed
         if the string \t{-{}-htmldir} occurs in the output of \t{configure -{}-help}.
     \item \t{-{}-with-sysroot} must be \t{\$\{ESYSROOT:-/\}}, if the EAPI is listed in
-        table~\ref{tab:econf-options-table} as using it. This option will only be passed if the
+        table~\ref{tab:econf-options-1} as using it. This option will only be passed if the
         string \t{-{}-with-sysroot} occurs in the output of \t{configure -{}-help}.
     \item \t{-{}-build} must be the value of the \t{CBUILD} environment variable. This option will
         only be passed if \t{CBUILD} is non-empty.
@@ -339,36 +339,48 @@ commands once the current phase function has returned.
         only be passed if \t{CTARGET} is non-empty.
     \item \t{-{}-libdir} must be set according to algorithm~\ref{alg:econf-libdir}.
     \item \t{-{}-disable-dependency-tracking}, if the EAPI is listed in
-        table~\ref{tab:econf-options-table} as using it. This option will only be passed if the
+        table~\ref{tab:econf-options-2} as using it. This option will only be passed if the
         string \t{-{}-disable-dependency-tracking} occurs in the output of \t{configure -{}-help}.
-    \item \t{-{}-disable-silent-rules}, if the EAPI is listed in table~\ref{tab:econf-options-table}
+    \item \t{-{}-disable-silent-rules}, if the EAPI is listed in table~\ref{tab:econf-options-2}
         as using it. This option will only be passed if the string \t{-{}-disable-silent-rules}
         occurs in the output of \t{configure -{}-help}.
-    \item \t{-{}-disable-static}, if the EAPI is listed in table~\ref{tab:econf-options-table}
+    \item \t{-{}-disable-static}, if the EAPI is listed in table~\ref{tab:econf-options-2}
         as using it. This option will only be passed if the string \t{-{}-disable-static} occurs
         in the output of \t{configure -{}-help}.
     \end{itemize}
 
     \ChangeWhenAddingAnEAPI{8}
     \begin{centertable}{Extra \t{econf} arguments for EAPIs}
-        \label{tab:econf-options-table}
-        \begin{tabular}{llllllll}
+        \label{tab:econf-options-1}
+        \begin{tabular}{lllll}
           \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{-{}-disable-static}} &
           \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  & No  & No  \\
-          4                 & Yes & No  & No  & No  & No  & No  & No  \\
-          5                 & Yes & Yes & No  & No  & No  & No  & No  \\
-          6                 & Yes & Yes & No  & No  & Yes & Yes & No  \\
-          7                 & Yes & Yes & No  & No  & Yes & Yes & Yes \\
-          8                 & Yes & Yes & Yes & Yes & Yes & Yes & Yes \\
+          0, 1, 2, 3, 4, 5  & No  & No  & No  & No  \\
+          6                 & No  & Yes & Yes & No  \\
+          7                 & No  & Yes & Yes & Yes \\
+          8                 & Yes & Yes & Yes & Yes \\
+          \bottomrule
+        \end{tabular}
+        % Don't start a new table environment, or the two parts may end up on different pages
+        \vspace{\floatsep}
+        \caption{Extra \t{econf} arguments for EAPIs (continued)}
+        \label{tab:econf-options-2}
+        \begin{tabular}{llll}
+          \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{-{}-disable-static}} \\
+          \midrule
+          0, 1, 2, 3        & No  & No  & No  \\
+          4                 & Yes & No  & No  \\
+          5, 6, 7           & Yes & Yes & No  \\
+          8                 & Yes & Yes & Yes \\
           \bottomrule
         \end{tabular}
     \end{centertable}