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

[Michał Górny]

commit:     04425199142505b734e05f53d44cc55354e079b9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 29 13:41:52 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Sep 29 13:41:52 2017 +0000
URL:        https://gitweb.gentoo.org/proj/pms.git/commit/?id=04425199

domo installs to /usr in EAPI 7.

 eapi-differences.tex |  8 ++++++++
 pkg-mgr-commands.tex | 25 ++++++++++++++++++++-----
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/eapi-differences.tex b/eapi-differences.tex
index 3e06916..d9b5558 100644
--- a/eapi-differences.tex
+++ b/eapi-differences.tex
@@ -41,6 +41,13 @@ of this document for a complete table of previous EAPIs.
 \bottomrule
 \endlastfoot
 
+\t{domo} install path & \compactfeatureref{domo-path} &
+    \t{\$\{DESTTREE\}\slash share\slash locale} &
+    \t{\$\{DESTTREE\}\slash share\slash locale} &
+    \t{\$\{DESTTREE\}\slash share\slash locale} &
+    \t{\$\{DESTTREE\}\slash share\slash locale} &
+    \t{/usr\slash share\slash locale} \\
+
 \t{PORTDIR} & \compactfeatureref{portdir} &
     Yes & Yes & Yes & Yes & No \\
 
@@ -439,6 +446,7 @@ EAPI 7 is EAPI 6 with the following changes:
 \item \t{INSDESTTREE} removed, \featureref{insdesttree}.
 \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}.
 \end{compactitem}
 
 \ChangeWhenAddingAnEAPI{7}

diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex
index 8ab8175..bfc3e99 100644
--- a/pkg-mgr-commands.tex
+++ b/pkg-mgr-commands.tex
@@ -542,11 +542,12 @@ can be extended or reduced (see below). The options that can be passed to \t{doh
     the empty string. In EAPIs specified by table~\ref{tab:doman-table}, the \t{-i18n} option takes
     precedence over the language code in the filename.
 
-\item[domo] Installs the given \t{.mo} files with file mode \t{0644} into the appropriate
-    subdirectory of \t{DESTTREE\slash share\slash locale}, generated by taking the basename of the
-    file, removing the \t{.*} suffix, and appending \t{/LC_MESSAGES}\@. The name of the installed
-    files is the package name with \t{.mo} appended. Failure behaviour is EAPI dependent as per
-    section~\ref{sec:failure-behaviour}.
+\item[domo] \featurelabel{domo-path} Installs the given \t{.mo} files with file mode \t{0644} into
+    the appropriate subdirectory of the locale tree, generated by taking the basename of the file,
+    removing the \t{.*} suffix, and appending \t{/LC_MESSAGES}\@. The name of the installed files is
+    the package name with \t{.mo} appended. Failure behaviour is EAPI dependent as per
+    section~\ref{sec:failure-behaviour}. The locale tree location is EAPI dependent as per
+    table~\ref{tab:domo-path}.
 
 \item[dosbin] As \t{dobin}, but installs to \t{DESTTREE/sbin}.
 
@@ -666,6 +667,20 @@ can be extended or reduced (see below). The options that can be passed to \t{doh
     \end{tabular}
 \end{centertable}
 
+\ChangeWhenAddingAnEAPI{7}
+\begin{centertable}{EAPI-dependent install path for \t{domo} command}
+    \label{tab:domo-path}
+    \begin{tabular}{ll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{destination path}} \\
+      \midrule
+      0, 1, 2, 3, 4, 5, 6 & \t{\$\{DESTTREE\}\slash share\slash locale} \\
+      7                   & \t{/usr/share/locale} \\
+      \bottomrule
+    \end{tabular}
+\end{centertable}
+
 \subsubsection{Commands affecting install destinations}
 The following commands are used to set the various destination trees, all relative to \t{\$\{ED\}} in
 offset-prefix aware EAPIs and relative to \t{\$\{D\}} in offset-prefix agnostic EAPIs, used by the