From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SUxiR-0005yz-7z for garchives@archives.gentoo.org; Thu, 17 May 2012 10:13:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E3F8EE078C; Thu, 17 May 2012 10:13:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B8FACE078C for ; Thu, 17 May 2012 10:13:43 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 304F91B4051 for ; Thu, 17 May 2012 10:13:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id EE6FEE542F for ; Thu, 17 May 2012 10:13:41 +0000 (UTC) From: "Ulrich Mueller" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Mueller" Message-ID: <1336943714.86fae0e02d7b21f085ef0a3d4308b6be29332d48.ulm@gentoo> Subject: [gentoo-commits] proj/pms:master commit in: / X-VCS-Repository: proj/pms X-VCS-Files: ebuild-vars.tex X-VCS-Directories: / X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Mueller X-VCS-Revision: 86fae0e02d7b21f085ef0a3d4308b6be29332d48 X-VCS-Branch: master Date: Thu, 17 May 2012 10:13:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: b9ed02a4-4dc1-4870-8605-477a78b47ed9 X-Archives-Hash: 69dfdaf2c1efc5e7ee8c485bd7bd4f63 commit: 86fae0e02d7b21f085ef0a3d4308b6be29332d48 Author: David Leverton googlemail com> AuthorDate: Sun May 13 19:11:39 2012 +0000 Commit: Ulrich Mueller gentoo org> CommitDate: Sun May 13 21:15:14 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/pms.git;a=3Dc= ommit;h=3D86fae0e0 Clarify wording for EAPI parsing. Clarify wording. Require a space before the trailing comment. --- ebuild-vars.tex | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ebuild-vars.tex b/ebuild-vars.tex index f3b72bf..29b9dfa 100644 --- a/ebuild-vars.tex +++ b/ebuild-vars.tex @@ -129,14 +129,15 @@ once. The assignment must not be preceded by any li= nes other than blank lines or with optional whitespace (spaces or tabs) followed by a \t{\#} character= , and the line containing the assignment statement must match the following regular expression: \begin{verbatim} -^[ \t]*EAPI=3D(['"]?)([A-Za-z0-9+_.-]*)\1[ \t]*(#.*)?$ +^[ \t]*EAPI=3D(['"]?)([A-Za-z0-9+_.-]*)\1[ \t]*([ \t]#.*)?$ \end{verbatim} =20 The package manager may optionally determine the EAPI of an ebuild by pa= rsing its first non-blank -and non-comment line, using above regular expression. If a recognised EA= PI has been determined -such, then the package manager must make sure that the \t{EAPI} value ob= tained by sourcing the -ebuild with bash is identical to the EAPI obtained by parsing. The ebuil= d must be treated as -invalid if these values are different. +and non-comment line, using the above regular expression. If it matches,= the EAPI is the substring +matched by the capturing parentheses (\t{0} if empty), otherwise it is \= t{0}. For a recognised +EAPI, the package manager must make sure that the \t{EAPI} value obtaine= d by sourcing the ebuild +with bash is identical to the EAPI obtained by parsing. The ebuild must = be treated as invalid if +these values are different. =20 \subsection{\t{RDEPEND} value} \label{sec:rdepend-depend}