[gentoo-commits] proj/pms:eapi-5 commit in: /

["Ulrich Mueller" <ulm@gentoo.org>]

commit:     e212a0dca3c72979d06015e7802c12f037e26d02
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu May 17 10:17:15 2012 +0000
Commit:     Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu May 17 10:17:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms.git;a=commit;h=e212a0dc

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{\#} character, and the line containing
  the assignment statement must match the following regular expression:
  \begin{verbatim}
- ^[ \t]*EAPI=(['"]?)([A-Za-z0-9+_.-]*)\1[ \t]*(#.*)?$
+ ^[ \t]*EAPI=(['"]?)([A-Za-z0-9+_.-]*)\1[ \t]*([ \t]#.*)?$
  \end{verbatim}
  
 -The package manager may optionally determine the EAPI of an ebuild by parsing 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 obtained by sourcing the ebuild
++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 obtained 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.