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 1312C138A1A for ; Mon, 16 Feb 2015 19:44:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C6E21E09C2; Mon, 16 Feb 2015 19:44:22 +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 09B31E09C2 for ; Mon, 16 Feb 2015 19:44:21 +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 CE7F8340762 for ; Mon, 16 Feb 2015 19:44:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4A87711E71 for ; Mon, 16 Feb 2015 19:44:19 +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: <1424116062.bb47f71393579bea6ed1c95e74d6ad2f9f99e378.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: bb47f71393579bea6ed1c95e74d6ad2f9f99e378 X-VCS-Branch: eapi-6 Date: Mon, 16 Feb 2015 19:44:19 +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: 6897b704-4c2b-4529-8c88-1d50bf226177 X-Archives-Hash: a3bf49c7e7963b8eae82c422f273863d commit: bb47f71393579bea6ed1c95e74d6ad2f9f99e378 Author: Ulrich Müller gentoo org> AuthorDate: Mon Feb 16 19:47:42 2015 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Mon Feb 16 19:47:42 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/pms.git;a=commit;h=bb47f713 EAPI 6: econf adds --docdir and --htmldir. See bug 468202. --- eapi-differences.tex | 3 ++- pkg-mgr-commands.tex | 26 +++++++++++++++++--------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/eapi-differences.tex b/eapi-differences.tex index d29da60..89d8a43 100644 --- a/eapi-differences.tex +++ b/eapi-differences.tex @@ -172,7 +172,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 \\ @@ -332,6 +332,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}. \item \t{unpack} supports absolute and relative paths, \featureref{unpack-absolute}. \item \t{unpack} supports \t{.txz}, \featureref{unpack-extensions}. \item \t{unpack} matches filename extensions case-insensitively, \featureref{unpack-ignore-case}. diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex index ef65d0c..bde471c 100644 --- a/pkg-mgr-commands.tex +++ b/pkg-mgr-commands.tex @@ -176,6 +176,12 @@ 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 @@ -188,19 +194,21 @@ 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-silent-rules}?} & + \multicolumn{1}{c}{\textbf{-{}-docdir}?} & + \multicolumn{1}{c}{\textbf{-{}-htmldir}?} \\ \midrule - \t{0} & No & No \\ - \t{1} & No & No \\ - \t{2} & No & No \\ - \t{3} & No & No \\ - \t{4} & Yes & No \\ - \t{5} & Yes & Yes \\ - \t{6} & Yes & Yes \\ + \t{0} & No & No & No & No \\ + \t{1} & No & No & No & No \\ + \t{2} & No & No & No & No \\ + \t{3} & No & No & No & No \\ + \t{4} & Yes & No & No & No \\ + \t{5} & Yes & Yes & No & No \\ + \t{6} & Yes & Yes & Yes & Yes \\ \bottomrule \end{tabular} \end{centertable}