[gentoo-pms] [PATCH 22/28] EAPI 7 bans dolib and libopts.

[Michał Górny]

Bug: https://bugs.gentoo.org/630416
---
 eapi-differences.tex |  7 +++++++
 pkg-mgr-commands.tex | 22 ++++++++++++++--------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/eapi-differences.tex b/eapi-differences.tex
index d9b5558..70eadb5 100644
--- a/eapi-differences.tex
+++ b/eapi-differences.tex
@@ -224,6 +224,12 @@ Most utilities die & \compactfeatureref{die-on-failure} &
 \t{dohtml} & \compactfeatureref{banned-commands} &
     Yes & Yes & Yes & Yes & Banned \\
 
+\t{dolib} & \compactfeatureref{banned-commands} &
+    Yes & Yes & Yes & Yes & Banned \\
+
+\t{libopts} & \compactfeatureref{banned-commands} &
+    Yes & Yes & Yes & Yes & Banned \\
+
 PM query options & \compactfeatureref{pm-query-options} &
     No & No & \t{-{}-host-root} & \t{-{}-host-root} & \t{-b}, \t{-d}, \t{-r} \\
 
@@ -447,6 +453,7 @@ EAPI 7 is EAPI 6 with the following changes:
 \item \t{PORTDIR} removed, \featureref{portdir}.
 \item \t{ECLASSDIR} removed, \featureref{eclassdir}.
 \item \t{domo} installs to \t{/usr/share/locale}, ignoring \t{into}, \featureref{domo-path}.
+\item \t{dolib} and \t{libopts} banned, \featureref{banned-commands}.
 \end{compactitem}
 
 \ChangeWhenAddingAnEAPI{7}
diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex
index ae9a615..f3849fc 100644
--- a/pkg-mgr-commands.tex
+++ b/pkg-mgr-commands.tex
@@ -50,20 +50,22 @@ called, the package manager must abort the build process indicating an error.
 \ChangeWhenAddingAnEAPI{7}
 \begin{centertable}{Banned commands}
     \label{tab:banned-commands-table}
-    \begin{tabular}{lllll}
+    \begin{tabular}{lllllll}
       \toprule
       \multicolumn{1}{c}{\textbf{EAPI}} &
-      \multicolumn{4}{c}{\textbf{Command banned?}} \\
+      \multicolumn{6}{c}{\textbf{Command banned?}} \\
       \multicolumn{1}{c}{} &
       \multicolumn{1}{c}{\textbf{\t{dohard}}} &
       \multicolumn{1}{c}{\textbf{\t{dosed}}} &
       \multicolumn{1}{c}{\textbf{\t{einstall}}} &
-      \multicolumn{1}{c}{\textbf{\t{dohtml}}} \\
+      \multicolumn{1}{c}{\textbf{\t{dohtml}}} &
+      \multicolumn{1}{c}{\textbf{\t{dolib}}} &
+      \multicolumn{1}{c}{\textbf{\t{libopts}}} \\
       \midrule
-      0, 1, 2, 3        & No  & No  & No  & No  \\
-      4, 5              & Yes & Yes & No  & No  \\
-      6                 & Yes & Yes & Yes & No  \\
-      7                 & Yes & Yes & Yes & Yes \\
+      0, 1, 2, 3        & No  & No  & No  & No  & No  & No  \\
+      4, 5              & Yes & Yes & No  & No  & No  & No  \\
+      6                 & Yes & Yes & Yes & No  & No  & No  \\
+      7                 & Yes & Yes & Yes & Yes & Yes & Yes \\
       \bottomrule
     \end{tabular}
 \end{centertable}
@@ -503,7 +505,9 @@ can be extended or reduced (see below). The options that can be passed to \t{doh
 \item[dolib.so] As for \t{dolib.a} except each file is installed with mode \t{0755}.
 
 \item[dolib] As for \t{dolib.a} except that the default install mode can be overriden with
-    the \t{install} options set by the most recent \t{libopts} call.
+    the \t{install} options set by the most recent \t{libopts} call. In EAPIs listed
+    in table~\ref{tab:banned-commands-table}, this command is banned as per
+    section~\ref{sec:banned-commands}.
 
 \begin{algorithm}
 \caption{Determining the library directory} \label{alg:ebuild-libdir}
@@ -714,6 +718,8 @@ has returned.
 \item[exeopts] Sets the options passed by \t{doexe} et al.\ to the \t{install} command.
 
 \item[libopts] Sets the options passed by \t{dolib} et al.\ to the \t{install} command.
+    In EAPIs listed in table~\ref{tab:banned-commands-table}, this command is banned as
+    per section~\ref{sec:banned-commands}.
 
 \end{description}
 
-- 
2.14.2