From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 71A791384C0 for ; Sun, 30 Aug 2015 19:03:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A11BA1434F; Sun, 30 Aug 2015 19:03:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F098F14344 for ; Sun, 30 Aug 2015 19:03:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E62EF3409A6 for ; Sun, 30 Aug 2015 19:03:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F040718C for ; Sun, 30 Aug 2015 19:03:31 +0000 (UTC) From: "Ulrich Müller" 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" Message-ID: <1440961053.e92aac1181b9217f5fad4adba82ac2f56b9c340e.ulm@gentoo> Subject: [gentoo-commits] proj/pms:eapi-6 commit in: / X-VCS-Repository: proj/pms X-VCS-Files: eapi-differences.tex pkg-mgr-commands.tex X-VCS-Directories: / X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: e92aac1181b9217f5fad4adba82ac2f56b9c340e X-VCS-Branch: eapi-6 Date: Sun, 30 Aug 2015 19:03:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0efcc811-a497-4089-8c32-2541307ef800 X-Archives-Hash: 8c946ab614f464d74b9690a6be128a2b commit: e92aac1181b9217f5fad4adba82ac2f56b9c340e Author: Ulrich Müller gentoo org> AuthorDate: Mon Feb 16 19:47:42 2015 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sun Aug 30 18:57:33 2015 +0000 URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=e92aac11 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 980cbd8..b3035e3 100644 --- a/eapi-differences.tex +++ b/eapi-differences.tex @@ -184,7 +184,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 \\ @@ -336,6 +336,7 @@ EAPI 6 is EAPI 5 with the following changes: \item \t{die} and \t{assert} called with \t{-n} respect \t{nonfatal}, \featureref{nonfatal-die}. \item \t{eapply} support, \featureref{eapply}. \item \t{eapply\_user} support, \featureref{eapply-user}. +\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 048be14..fd85070 100644 --- a/pkg-mgr-commands.tex +++ b/pkg-mgr-commands.tex @@ -201,6 +201,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 @@ -214,15 +220,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}