From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-841122-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 4D3FF13888F
	for <garchives@archives.gentoo.org>; Sun, 18 Oct 2015 11:25:01 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id E92B921C07C;
	Sun, 18 Oct 2015 11:25:00 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 7197A21C07C
	for <gentoo-commits@lists.gentoo.org>; Sun, 18 Oct 2015 11:25:00 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 0BAB7340686
	for <gentoo-commits@lists.gentoo.org>; Sun, 18 Oct 2015 11:24:53 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 2AB9E129D
	for <gentoo-commits@lists.gentoo.org>; Sun, 18 Oct 2015 11:24:50 +0000 (UTC)
From: "Ulrich Müller" <ulm@gentoo.org>
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" <ulm@gentoo.org>
Message-ID: <1445167279.84d97fc24115d490216d17faaf97f16f13e86c29.ulm@gentoo>
Subject: [gentoo-commits] proj/pms:eapi-6 commit in: /
X-VCS-Repository: proj/pms
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: 84d97fc24115d490216d17faaf97f16f13e86c29
X-VCS-Branch: eapi-6
Date: Sun, 18 Oct 2015 11:24:50 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 255a1204-6fd4-4b6f-9daf-86b93f31bab2
X-Archives-Hash: fe6ee29e74ffcb2814b59cc2f2b7a6a0

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