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 960B01382C5 for ; Mon, 2 Apr 2018 07:39:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9BBF5E0CBC; Mon, 2 Apr 2018 07:39:12 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 61A34E0CBC for ; Mon, 2 Apr 2018 07:39:12 +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 055A833BEE0 for ; Mon, 2 Apr 2018 07:39:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6AEF4263 for ; Mon, 2 Apr 2018 07:39:08 +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: <1522344920.02a0c1ab2cd8fde0313adc17a73831912dde6d8b.ulm@gentoo> Subject: [gentoo-commits] proj/pms:master commit in: / X-VCS-Repository: proj/pms X-VCS-Files: dependencies.tex X-VCS-Directories: / X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 02a0c1ab2cd8fde0313adc17a73831912dde6d8b X-VCS-Branch: master Date: Mon, 2 Apr 2018 07:39:08 +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: c5d9aeaa-3b62-4b1f-b4d5-9fa18aef09a3 X-Archives-Hash: f86d375f324a4071e0f6dd607fd93f11 commit: 02a0c1ab2cd8fde0313adc17a73831912dde6d8b Author: Ulrich Müller gentoo org> AuthorDate: Wed Nov 1 16:37:29 2017 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Thu Mar 29 17:35:20 2018 +0000 URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=02a0c1ab dependencies.tex: Describe similar dep groups only once. Any-of, exactly-one-of, and at-most-one-of groups have similar format, so there is no need to repeat the same description three times. dependencies.tex | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/dependencies.tex b/dependencies.tex index 093a30b..f019348 100644 --- a/dependencies.tex +++ b/dependencies.tex @@ -70,18 +70,11 @@ be surrounded on both sides by whitespace, except at the start and end of the st of (a dependency item of any kind followed by whitespace), followed by a close parenthesis. More formally: \t{any-of} \t{::=} \t{'||' whitespace '(' whitespace (item whitespace)+ ')'}. Permitted in \t{DEPEND}, \t{RDEPEND}, \t{PDEPEND}, \t{LICENSE}, \t{REQUIRED_USE}. -\item An exactly-one-of group, which consists of the string \t{\textasciicircum\textasciicircum}, - followed by whitespace, followed by an open parenthesis, followed by whitespace, followed by - one or more of (a dependency item of any kind followed by whitespace), followed by a close - parenthesis. More formally: \t{exactly-one-of} \t{::=} \t{'\textasciicircum\textasciicircum' - whitespace '(' whitespace (item whitespace)+ ')'}. - Permitted in \t{REQUIRED_USE}. -\item \featurelabel{at-most-one-of} An at-most-one-of group, which consists of the string \t{??}, - followed by whitespace, followed by an open parenthesis, followed by whitespace, followed by - one or more of (a dependency item of any kind followed by whitespace), followed by a close - parenthesis. More formally: \t{at-most-one-of} \t{::=} \t{'??'\ whitespace '(' whitespace - (item whitespace)+ ')'}. Permitted in \t{REQUIRED_USE} in EAPIs listed in - table~\ref{tab:at-most-one-of-table} as supporting \t{REQUIRED_USE ??}\ groups. +\item An exactly-one-of group, which has the same format as the any-of group, but begins with the + string \t{\textasciicircum\textasciicircum} instead. Permitted in \t{REQUIRED_USE}. +\item \featurelabel{at-most-one-of} An at-most-one-of group, which has the same format as the + any-of group, but begins with the string \t{??}\ instead. Permitted in \t{REQUIRED_USE} in + EAPIs listed in table~\ref{tab:at-most-one-of-table} as supporting \t{REQUIRED_USE ??}\ groups. \item A use-conditional group, which consists of an optional exclamation mark, followed by a use flag name, followed by a question mark, followed by whitespace, followed by an open parenthesis, followed by whitespace, followed by one or more of (a dependency item