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

["Ulrich Müller" <ulm@gentoo.org>]

commit:     84d97fc24115d490216d17faaf97f16f13e86c29
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 18 11:21:19 2015 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 11:21:19 2015 +0000
URL:        https://gitweb.gentoo.org/proj/pms.git/commit/?id=84d97fc2

Merge branch 'master' into eapi-6

 dependencies.tex     | 4 ++--
 eapi-cheatsheet.tex  | 8 ++++----
 eapi-differences.tex | 8 ++++----
 pkg-mgr-commands.tex | 4 ++--
 pms.cls              | 3 +++
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --cc eapi-differences.tex
index b5fc01e,04e5f83..d37d4ce
--- a/eapi-differences.tex
+++ b/eapi-differences.tex
@@@ -41,81 -40,73 +41,81 @@@ of this document for a complete table o
  \bottomrule
  \endlastfoot
  
 +\t{package*} and \t{use*} dirs & \compactfeatureref{profile-file-dirs} &
 +    No & No & No & No & Yes \\
 +
  Stable use masking/forcing & \compactfeatureref{stablemask} &
 -    No & No & No & No & No & Yes \\
 +    No & No & No & Yes & Yes \\
  
  \t{IUSE} defaults & \compactfeatureref{iuse-defaults} &
 -    No & Yes & Yes & Yes & Yes & Yes \\
 +    * & Yes & Yes & Yes & Yes \\
  
  \t{REQUIRED\_USE} & \compactfeatureref{required-use} &
 -    No & No & No & No & Yes & Yes \\
 +    No & No & Yes & Yes & Yes \\
  
  \t{PROPERTIES} & \compactfeatureref{properties} &
 -    Optionally & Optionally & Optionally & Optionally & Yes & Yes \\
 +    Optionally & Optionally & Yes & Yes & Yes \\
  
  \t{RDEPEND=DEPEND} & \compactfeatureref{rdepend-depend} &
 -    Yes & Yes & Yes & Yes & No & No \\
 +    Yes & Yes & No & No & No \\
  
  \t{DEFINED\_PHASES} & \compactfeatureref{defined-phases} &
 -    Optionally & Optionally & Optionally & Optionally & Yes & Yes \\
 +    Optionally & Optionally & Yes & Yes & Yes \\
  
  \t{??\ ( )} groups & \compactfeatureref{at-most-one-of} &
 -    No & No & No & No & No & Yes \\
 +    No & No & No & Yes & Yes \\
  
  \t{SRC\_URI} arrows & \compactfeatureref{src-uri-arrows} &
 -    No & No & Yes & Yes & Yes & Yes \\
 +    * & Yes & Yes & Yes & Yes \\
  
  Slot dependencies & \compactfeatureref{slot-deps} &
 -    No & Named & Named & Named & Named & Named and Operator \\
 +    * & Named & Named & Named and Operator & Named and Operator \\
  
  Sub-slots & \compactfeatureref{sub-slot} &
 -    No & No & No & No & No & Yes \\
 +    No & No & No & Yes & Yes \\
  
  Use dependencies & \compactfeatureref{use-deps} &
 -    No & No & 2-style & 2-style & 4-style & 4-style \\
 +    * & 2-style & 4-style & 4-style & 4-style \\
  
- \t{!} blockers & \compactfeatureref{bang-strength} &
+ \t{!}\ blockers & \compactfeatureref{bang-strength} &
 -    Unspecified & Unspecified & Weak & Weak & Weak & Weak \\
 +    * & Weak & Weak & Weak & Weak \\
  
- \t{!!} blockers & \compactfeatureref{bang-strength} &
+ \t{!!}\ blockers & \compactfeatureref{bang-strength} &
 -    Forbidden & Forbidden & Strong & Strong & Strong & Strong \\
 +    * & Strong & Strong & Strong & Strong \\
  
  \t{S} to \t{WORKDIR} fallback & \compactfeatureref{s-workdir-fallback} &
 -    Always & Always & Always & Always & Conditional & Conditional \\
 +    Always & Always & Conditional & Conditional & Conditional \\
  
  \t{pkg\_pretend} & \compactfeatureref{pkg-pretend} &
 -    No & No & No & No & Yes & Yes \\
 +    No & No & Yes & Yes & Yes \\
  
  \t{src\_prepare} & \compactfeatureref{src-prepare} &
 -    No & No & Yes & Yes & Yes & Yes \\
 +    * & Yes & Yes & Yes & Yes \\
 +
 +\t{src\_prepare} style & \compactfeatureref{src-prepare} &
 +    * & no-op & no-op & no-op & 6 \\
  
  \t{src\_configure} & \compactfeatureref{src-configure} &
 -    No & No & Yes & Yes & Yes & Yes \\
 +    * & Yes & Yes & Yes & Yes \\
  
  \t{src\_compile} style & \compactfeatureref{src-compile} &
 -    0 & 1 & 2 & 2 & 2 & 2 \\
 +    * & 2 & 2 & 2 & 2 \\
  
  Parallel tests & \compactfeatureref{parallel-tests} &
 -    No & No & No & No & No & Yes \\
 +    No & No & No & Yes & Yes \\
  
  \t{src\_install} style & \compactfeatureref{src-install} &
 -    no-op & no-op & no-op & no-op & 4 & 4 \\
 +    no-op & no-op & 4 & 4 & 6 \\
  
  \t{pkg\_info} & \compactfeatureref{pkg-info} &
 -    Installed & Installed & Installed & Installed & Both & Both \\
 +    Installed & Installed & Both & Both & Both \\
  
  \t{default\_} phase functions & \compactfeatureref{default-phase-funcs} &
 -    None & None &
 -    \t{pkg\_nofetch}, \t{src\_unpack}, \t{src\_prepare}, \t{src\_configure}, \t{src\_compile}, \t{src\_test} &
 -    \t{pkg\_nofetch}, \t{src\_unpack}, \t{src\_prepare}, \t{src\_configure}, \t{src\_compile}, \t{src\_test} &
 +    * &
 +    \t{pkg\_nofetch}, \t{src\_unpack}, \t{src\_prepare}, \t{src\_configure},
 +        \t{src\_compile}, \t{src\_test} &
 +    \t{pkg\_nofetch}, \t{src\_unpack}, \t{src\_prepare}, \t{src\_configure},
 +        \t{src\_compile}, \t{src\_install}, \t{src\_test} &
      \t{pkg\_nofetch}, \t{src\_unpack}, \t{src\_prepare}, \t{src\_configure},
          \t{src\_compile}, \t{src\_install}, \t{src\_test} &
      \t{pkg\_nofetch}, \t{src\_unpack}, \t{src\_prepare}, \t{src\_configure},
diff --cc pkg-mgr-commands.tex
index 26bb4e4,83fbd68..22623a7
--- a/pkg-mgr-commands.tex
+++ b/pkg-mgr-commands.tex
@@@ -712,12 -646,11 +712,12 @@@ in table~\ref{tab:compression-table} a
  
  \subsubsection{Use List Functions}
  These functions provide behaviour based upon set or unset use flags. Ebuilds must not run any of
- these commands once the current phase function has returned. Ebuilds must not run any of these
- functions in global scope.
+ these commands once the current phase function has returned. It is an error if an ebuild calls any
+ of these functions in global scope.
  
 -If any of these functions is called with a flag value that is not included in \t{IUSE\_EFFECTIVE},
 -either behaviour is undefined or it is an error as decided by table~\ref{tab:use-list-strictness}.
 +Unless otherwise noted, if any of these functions is called with a flag value that is not included
 +in \t{IUSE\_EFFECTIVE}, either behaviour is undefined or it is an error as decided by
 +table~\ref{tab:use-list-strictness}.
  
  \begin{description}
  \item[use] Returns shell true (0) if the first argument (a \t{USE} flag name) is enabled, false