From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-844891-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 691DA1384B4 for <garchives@archives.gentoo.org>; Sun, 8 Nov 2015 19:37:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 77D2421C011; Sun, 8 Nov 2015 19:36:59 +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 20B17E085C for <gentoo-commits@lists.gentoo.org>; Sun, 8 Nov 2015 19:36:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CD67434069A for <gentoo-commits@lists.gentoo.org>; Sun, 8 Nov 2015 19:36:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F03D022CF for <gentoo-commits@lists.gentoo.org>; Sun, 8 Nov 2015 19:36:52 +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: <1447010960.6ce8e8258e0d05965b32c927025d9afc308a61cd.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: 6ce8e8258e0d05965b32c927025d9afc308a61cd X-VCS-Branch: eapi-6 Date: Sun, 8 Nov 2015 19:36:52 +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-Archives-Salt: c83059d3-9b94-4d2d-94ca-e2b5aa58093c X-Archives-Hash: c183cce162928b1f018cd17f24a2c02e commit: 6ce8e8258e0d05965b32c927025d9afc308a61cd Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Mon Feb 16 19:47:42 2015 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Sun Nov 8 19:29:20 2015 +0000 URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=6ce8e825 EAPI 6: econf adds --docdir and --htmldir. 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 df05c41..2b079d0 100644 --- a/eapi-differences.tex +++ b/eapi-differences.tex @@ -180,7 +180,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 \\ @@ -331,6 +331,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 2266660..816ce00 100644 --- a/pkg-mgr-commands.tex +++ b/pkg-mgr-commands.tex @@ -238,6 +238,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 @@ -251,15 +257,18 @@ current phase function has returned. \ChangeWhenAddingAnEAPI{6} \begin{centertable}{Extra \t{econf} arguments for EAPIs} \label{tab:econf-options-table} - \begin{tabular}{lll} + \begin{tabular}{lllll} \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}