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-0005yy-7y 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 C55BDE079C; 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 8F16EE078C 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 005B764C58 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 BD5AAE5429 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: <1337249835.e212a0dca3c72979d06015e7802c12f037e26d02.ulm@gentoo> Subject: [gentoo-commits] proj/pms:eapi-5 commit in: / X-VCS-Repository: proj/pms X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Mueller X-VCS-Revision: e212a0dca3c72979d06015e7802c12f037e26d02 X-VCS-Branch: eapi-5 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: a2adb5ad-5265-408e-b1a3-927829a5a57d X-Archives-Hash: d3142564388674effc50d51ae554eece commit: e212a0dca3c72979d06015e7802c12f037e26d02 Author: Ulrich M=C3=BCller gentoo org> AuthorDate: Thu May 17 10:17:15 2012 +0000 Commit: Ulrich Mueller gentoo org> CommitDate: Thu May 17 10:17:15 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/pms.git;a=3Dc= ommit;h=3De212a0dc Merge branch 'master' into eapi-5 Conflicts: ebuild-vars.tex ebuild-vars.tex | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --cc ebuild-vars.tex index 559291d,29b9dfa..a4586bf --- a/ebuild-vars.tex +++ b/ebuild-vars.tex @@@ -133,12 -129,13 +133,13 @@@ once. The assignment must not be preced with optional whitespace (spaces or tabs) followed by a \t{\#} characte= r, 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 p= arsing its first non-blank -and non-comment line, using the above regular expression. If it matches= , the EAPI is the substring +The package manager must determine the EAPI of an ebuild by parsing its= first non-blank and - non-comment line, using above regular expression. If a recognised EAPI = has been determined such, - then the package manager must make sure that the \t{EAPI} value obtaine= d by sourcing the ebuild ++non-comment line, using the above regular expression. If it matches, th= e 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 obtain= ed 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