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

[Ulrich Müller]

commit:     73a1a862fd41115cbd000a2f62ac94ead1c421f1
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 29 03:17:43 2017 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 24 12:55:24 2018 +0000
URL:        https://gitweb.gentoo.org/proj/pms.git/commit/?id=73a1a862

EAPI 7 removes PORTDIR and ECLASSDIR.

Bug: https://bugs.gentoo.org/373349
Bug: https://bugs.gentoo.org/373351

 eapi-differences.tex |  8 ++++++++
 ebuild-env-vars.tex  | 17 +++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/eapi-differences.tex b/eapi-differences.tex
index 326774d..f87e448 100644
--- a/eapi-differences.tex
+++ b/eapi-differences.tex
@@ -149,6 +149,12 @@ Parallel tests & \compactfeatureref{parallel-tests} &
 \t{AA} & \compactfeatureref{aa} &
     Yes & No & No & No & No \\
 
+\t{PORTDIR} & \compactfeatureref{portdir} &
+    Yes & Yes & Yes & Yes & No \\
+
+\t{ECLASSDIR} & \compactfeatureref{eclassdir} &
+    Yes & Yes & Yes & Yes & No \\
+
 \t{KV} & \compactfeatureref{kv} &
     Yes & No & No & No & No \\
 
@@ -401,6 +407,8 @@ EAPI 7 is EAPI 6 with the following changes:
     being matched, \featureref{empty-dep-groups}.
 \item \t{||=} dependency groups, \featureref{binding-any-of}.
 \item Automatic enforcing of \t{REQUIRED_USE}, \featureref{auto-req-use}.
+\item \t{PORTDIR} is gone, \featureref{portdir}.
+\item \t{ECLASSDIR} is gone, \featureref{eclassdir}.
 \end{compactitem}
 
 \ChangeWhenAddingAnEAPI{7}

diff --git a/ebuild-env-vars.tex b/ebuild-env-vars.tex
index 4545272..0258d1a 100644
--- a/ebuild-env-vars.tex
+++ b/ebuild-env-vars.tex
@@ -110,11 +110,13 @@ variable.
 \t{PORTDIR} &
     \t{src_*} &
     No &
-    The full path to the master repository's base directory. \\
+    \featurelabel{portdir} The full path to the master repository's base directory. Only for EAPIs
+    listed in table~\ref{tab:removed-env-vars-table} as supporting \t{PORTDIR}. \\
 \t{ECLASSDIR} &
     \t{src_*} &
     No &
-    The full path to the master repository's eclass directory. \\
+    \featurelabel{eclassdir} The full path to the master repository's eclass directory. Only for
+    EAPIs listed in table~\ref{tab:removed-env-vars-table} as supporting \t{ECLASSDIR}. \\
 \t{ROOT} &
    \t{pkg_*} &
    No &
@@ -253,14 +255,17 @@ variable.
 \ChangeWhenAddingAnEAPI{7}
 \begin{centertable}{EAPIs supporting various removed env variables}
     \label{tab:removed-env-vars-table}
-    \begin{tabular}{lll}
+    \begin{tabular}{lllll}
       \toprule
       \multicolumn{1}{c}{\textbf{EAPI}} &
       \multicolumn{1}{c}{\textbf{\t{AA}?}} &
-      \multicolumn{1}{c}{\textbf{\t{KV}?}} \\
+      \multicolumn{1}{c}{\textbf{\t{KV}?}} &
+      \multicolumn{1}{c}{\textbf{\t{PORTDIR}?}} &
+      \multicolumn{1}{c}{\textbf{\t{ECLASSDIR}?}} \\
       \midrule
-      0, 1, 2, 3        & Yes & Yes \\
-      4, 5, 6, 7        & No  & No  \\
+      0, 1, 2, 3        & Yes & Yes & Yes & Yes \\
+      4, 5, 6           & No  & No  & Yes & Yes \\
+      7                 & No  & No  & No  & No  \\
       \bottomrule
     \end{tabular}
 \end{centertable}