From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1283909-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 209CA1382C5
for <garchives@archives.gentoo.org>; Wed, 19 May 2021 15:38:53 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 7786BE0885;
Wed, 19 May 2021 15:38:52 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 54911E0885
for <gentoo-commits@lists.gentoo.org>; Wed, 19 May 2021 15:38:52 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 72E14340961
for <gentoo-commits@lists.gentoo.org>; Wed, 19 May 2021 15:38:50 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E95CA79D
for <gentoo-commits@lists.gentoo.org>; Wed, 19 May 2021 15:38:46 +0000 (UTC)
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" <ulm@gentoo.org>
Message-ID: <1621438660.99c1f4ba03299d96403fe1e8fe485ff70dac488e.ulm@gentoo>
Subject: [gentoo-commits] proj/pms:eapi-8 commit in: /
X-VCS-Repository: proj/pms
X-VCS-Files: pkg-mgr-commands.tex
X-VCS-Directories: /
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: 99c1f4ba03299d96403fe1e8fe485ff70dac488e
X-VCS-Branch: eapi-8
Date: Wed, 19 May 2021 15:38:46 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: f02e30a1-1134-4ec7-82e5-fab87b4277cf
X-Archives-Hash: 32f6566bd60217f6c684bf7f6a295ffa
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}