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

[Ulrich Müller]

commit:     220bee760b19a566079c964b66bce74c660733de
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 16 15:51:12 2015 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 18:57:33 2015 +0000
URL:        https://gitweb.gentoo.org/proj/pms.git/commit/?id=220bee76

EAPI 6 has get_libdir.

See bug 463586.

 eapi-differences.tex |  4 ++++
 pkg-mgr-commands.tex | 31 +++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/eapi-differences.tex b/eapi-differences.tex
index 452349e..b5fc01e 100644
--- a/eapi-differences.tex
+++ b/eapi-differences.tex
@@ -237,6 +237,9 @@ Controllable compression & \compactfeatureref{docompress} &
 \t{einstalldocs} & \compactfeatureref{einstalldocs} &
     No & No & No & No & Yes \\
 
+\t{get\_libdir} & \compactfeatureref{get-libdir} &
+    No & No & No & No & Yes \\
+
 File mtimes preserved & \compactfeatureref{mtime-preserve} &
     Undefined & Yes & Yes & Yes & Yes \\
 
@@ -358,6 +361,7 @@ EAPI 6 is EAPI 5 with the following changes:
 \item \t{unpack} supports \t{.txz}, \featureref{unpack-extensions}.
 \item \t{unpack} matches filename extensions case-insensitively, \featureref{unpack-ignore-case}.
 \item \t{einstalldocs} support, \featureref{einstalldocs}.
+\item \t{get\_libdir} support, \featureref{get-libdir}.
 \end{compactitem}
 
 \ChangeWhenAddingAnEAPI{6}

diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex
index 49b078a..77cf338 100644
--- a/pkg-mgr-commands.tex
+++ b/pkg-mgr-commands.tex
@@ -898,6 +898,10 @@ has returned.
     Algorithm~\ref{alg:einstalldocs}. If called using \t{nonfatal} and any of the called commands
     returns a non-zero exit status, returns immediately with the same exit status. Only available
     in EAPIs listed in table~\ref{tab:einstalldocs} as supporting \t{einstalldocs}.
+
+\item[get\_libdir] \featurelabel{get-libdir} Prints the libdir name obtained according to
+    Algorithm~\ref{alg:get-libdir}. Only available in EAPIs listed in table~\ref{tab:get-libdir}
+    as supporting \t{get\_libdir}.
 \end{description}
 
 \begin{algorithm}
@@ -928,6 +932,20 @@ has returned.
 \end{algorithmic}
 \end{algorithm}
 
+\begin{algorithm}
+\caption{\t{get\_libdir} logic} \label{alg:get-libdir}
+\begin{algorithmic}[1]
+\STATE let libdir=lib
+\IF{the ABI environment variable is set}
+    \STATE let libvar=LIBDIR\_\$ABI
+    \IF{the environment variable named by libvar is set}
+        \STATE let libdir=the value of the variable named by libvar
+    \ENDIF
+\ENDIF
+\STATE print the value of libdir
+\end{algorithmic}
+\end{algorithm}
+
 \ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs supporting the \t{default} function}
     \label{tab:default-function-table}
@@ -956,6 +974,19 @@ has returned.
     \end{tabular}
 \end{centertable}
 
+\begin{centertable}{EAPIs supporting \t{get\_libdir}}
+    \label{tab:get-libdir}
+    \begin{tabular}{ l l }
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{Supports \t{get\_libdir}?}} \\
+      \midrule
+      0, 1, 2, 3, 4, 5  & No  \\
+      6                 & Yes \\
+      \bottomrule
+    \end{tabular}
+\end{centertable}
+
 \subsubsection{Debug Commands}
 The following commands are available for debugging. Normally all of these commands should be no ops;
 a package manager may provide a special debug mode where these commands instead do something.