From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 A5B011396D0 for ; Sun, 1 Oct 2017 07:11:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A1C2AE0C03; Sun, 1 Oct 2017 07:11:54 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 76F6BE0C03 for ; Sun, 1 Oct 2017 07:11:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 10C1E341768 for ; Sun, 1 Oct 2017 07:11:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 687879085 for ; Sun, 1 Oct 2017 07:11:51 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1506841895.92d5586a5522db487b6dab304dc3fc3a113daaeb.mgorny@gentoo> Subject: [gentoo-commits] proj/pms:eapi-7 commit in: / X-VCS-Repository: proj/pms X-VCS-Files: dependencies.tex X-VCS-Directories: / X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 92d5586a5522db487b6dab304dc3fc3a113daaeb X-VCS-Branch: eapi-7 Date: Sun, 1 Oct 2017 07:11:51 +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: 67ef45ce-8ee3-4ca5-9c19-ca5f8d04ca43 X-Archives-Hash: e417d3208d4ae7eb0d5b14a72aae856e commit: 92d5586a5522db487b6dab304dc3fc3a113daaeb Author: Michał Górny gentoo org> AuthorDate: Sat Sep 30 23:06:39 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Oct 1 07:11:35 2017 +0000 URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=92d5586a [WIP] EAPI 7 bans all-of groups in REQUIRED_USE. Reword the allowed variable list for the all-of group to account for additional restrictions of EAPI 7. The use in REQUIRED_USE is banned explicitly as it leads to ambiguity in automatic solver actions. The use in SRC_URI becomes meaningless given that it is only permitted inside any-of, and any-of is not permitted there. [TODO: add label & update eapi-differences] Bug: https://bugs.gentoo.org/632000 dependencies.tex | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dependencies.tex b/dependencies.tex index fd142bb..dca4a21 100644 --- a/dependencies.tex +++ b/dependencies.tex @@ -87,8 +87,9 @@ be surrounded on both sides by whitespace, except at the start and end of the st \item An all-of group, which consists of an open parenthesis, followed by whitespace, followed by zero or more of (a dependency item of any kind followed by whitespace), followed by a close parenthesis. More formally: - \t{all-of} \t{::=} \t{'(' whitespace (item whitespace)* ')'}. Permitted in all specification - style variables. Permitted inside groups listed in table~\ref{tab:depend-nesting}. + \t{all-of} \t{::=} \t{'(' whitespace (item whitespace)* ')'}. Permitted in variables listed + in table~\ref{tab:depend-group-variables}. Permitted inside groups listed + in table~\ref{tab:depend-nesting}. \item An any-of group, which consists of the string \t{||}, followed by whitespace, followed by an open parenthesis, followed by whitespace, followed by zero or more of (a dependency item of any kind followed by whitespace), followed by a close parenthesis. @@ -188,6 +189,21 @@ In particular, note that whitespace is not optional. \end{tabular} \end{centertable} +\ChangeWhenAddingAnEAPI{7} +\begin{centertable}{EAPI-specific group use restrictions} + \label{tab:depend-group-variables} + \begin{tabular}{ll} + \toprule + \multicolumn{1}{c}{\textbf{EAPI}} & + \multicolumn{1}{c}{\textbf{all-of}} \\ + & \multicolumn{1}{c}{\textbf{permitted inside}} \\ + \midrule + 0, 1, 2, 3, 4, 5, 6 & all specification style variables \\ + 7 & \t{DEPEND}, \t{RDEPEND}, \t{PDEPEND}, \t{LICENSE} \\ + \bottomrule + \end{tabular} +\end{centertable} + \subsection{All-of dependency specifications} In an all-of group, all of the child elements must be matched.