EAPI 3 supports pkg_info on non-installed packages

2 files changed, 24 insertions, 25 deletions

diff --git a/eapi-differences.tex b/eapi-differences.tex
index d304ca1..05269d9 100644
--- a/eapi-differences.tex
+++ b/eapi-differences.tex
@@ -160,15 +160,8 @@ Use dependencies & table~\ref{tab:use-deps-table} & No & No &
     \IFKDEBUILDCOLOUR{User option} \\
 }{}
 
-\IFANYKDEBUILDELSE{
-    \IFKDEBUILDCOLOUR{\t{pkg\_info}} &
-    \IFKDEBUILDCOLOUR{table~\ref{tab:pkg-info-table}} &
-    \IFKDEBUILDCOLOUR{Installed} &
-    \IFKDEBUILDCOLOUR{Installed} &
-    \IFKDEBUILDCOLOUR{Both} &
-    \IFKDEBUILDCOLOUR{Installed} &
-    \IFKDEBUILDCOLOUR{Installed} \\
-}{}
+\t{pkg\_info} & table~\ref{tab:pkg-info-table} & Installed & Installed &
+    \IFANYKDEBUILDELSE{\IFKDEBUILDCOLOUR{Both} &}{} Installed & Both \\
 
 \t{default\_} phase functions & table~\ref{tab:default-phase-function-table} & None & None &
     \IFANYKDEBUILDELSE{\IFKDEBUILDCOLOUR{None} &}{}
@@ -265,7 +258,7 @@ EAPI 1 is EAPI 0 with the following changes:
     \item Ranged dependencies, table~\ref{tab:range-deps-table}.
     \item Use dependencies, table~\ref{tab:use-deps-table}.
     \item \t{src\_test} mandatory, table~\ref{tab:test-required-table}.
-    \item \t{pkg\_info} can run on uninstalled packages, table~\ref{tab:pkg-info-table}.
+    \item \t{pkg\_info} can run on non-installed packages, table~\ref{tab:pkg-info-table}.
     \item \t{dohard}, \t{dohtml}, \t{dosed} banned, table~\ref{tab:banned-commands-table}.
     \item \t{dosym} will not do \t{dodir}, table~\ref{tab:dosym-table}.
     \end{compactitem}
@@ -306,6 +299,7 @@ EAPI 3 is EAPI 2 with the following changes:
 \item \t{dohard}, \t{dosed} banned, table~\ref{tab:banned-commands-table}.
 \item \t{unpack} supports \t{.xz} and \t{.tar.xz}, table~\ref{tab:unpack-extensions-table}.
 \item \t{econf} adds \t{-{}-disable-dependency-tracking}, table~\ref{tab:econf-options-table}.
+\item \t{pkg\_info} can run on non-installed packages, table~\ref{tab:pkg-info-table}.
 \end{compactitem}
 
 % vim: set filetype=tex fileencoding=utf8 et tw=100 spell spelllang=en :
diff --git a/ebuild-functions.tex b/ebuild-functions.tex
index b72a6f9..951ef34 100644
--- a/ebuild-functions.tex
+++ b/ebuild-functions.tex
@@ -419,38 +419,43 @@ fully installed. It is the only ebuild function which may be interactive and pro
 \subsection{pkg\_info}
 \label{sec:pkg-info-function}
 
-\IFKDEBUILDELSE
-{
-    The \t{pkg\_info} function may be called by the package manager when displaying information about an
-    installed package. In EAPIs listed in table~\ref{tab:pkg-info-table} as supporting \t{pkg\_info} on
-    uninstalled packages, it may also be called by the package manager when displaying information
-    about an uninstalled package. In this case, ebuild authors should note that dependencies may not be
-    installed.
-}{
-    The \t{pkg\_info} function may be called by the package manager when displaying information about an
-    installed package.
-}
+The \t{pkg\_info} function may be called by the package manager when displaying information about an
+installed package. In EAPIs listed in table~\ref{tab:pkg-info-table} as supporting \t{pkg\_info} on
+non-installed packages, it may also be called by the package manager when displaying information
+about a non-installed package. In this case, ebuild authors should note that dependencies may not be
+installed.
 
 \t{pkg\_info} must not write to the filesystem.
 
+\begin{centertable}{EAPIs supporting \t{pkg\_info} on non-installed packages} \label{tab:pkg-info-table}
 \IFKDEBUILDELSE
 {
-    \begin{centertable}{EAPIs supporting \t{pkg\_info} on uninstalled packages} \label{tab:pkg-info-table}
     \begin{tabular}{ l l }
         \toprule
         \multicolumn{1}{c}{\textbf{EAPI}} &
-        \multicolumn{1}{c}{\textbf{Supports \t{pkg\_info} on uninstalled packages?}} \\
+        \multicolumn{1}{c}{\textbf{Supports \t{pkg\_info} on non-installed packages?}} \\
         \midrule
     \t{0} & No \\
     \t{1} & No \\
     \t{kdebuild-1} & Yes \\
     \t{2} & No \\
-    \t{3} & No \\
+    \t{3} & Yes \\
     \bottomrule
     \end{tabular}
-    \end{centertable}
 }{
+    \begin{tabular}{ l l }
+        \toprule
+        \multicolumn{1}{c}{\textbf{EAPI}} &
+        \multicolumn{1}{c}{\textbf{Supports \t{pkg\_info} on non-installed packages?}} \\
+        \midrule
+    \t{0} & No \\
+    \t{1} & No \\
+    \t{2} & No \\
+    \t{3} & Yes \\
+    \bottomrule
+    \end{tabular}
 }
+\end{centertable}
 
 \subsection{pkg\_nofetch}
 \label{sec:pkg-nofetch-function}