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

["Ulrich Müller" <ulm@gentoo.org>]

commit:     7b8f42d01a9f2e2771aa14b3cc72b25504440272
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 16 15:13:33 2015 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 16 16:08:29 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/pms.git;a=commit;h=7b8f42d0

EAPI 6 unpack supports txz.

See bug 458102.

---
 eapi-differences.tex |  6 +++++-
 pkg-mgr-commands.tex | 26 ++++++++++++++------------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/eapi-differences.tex b/eapi-differences.tex
index 83689df..adc5003 100644
--- a/eapi-differences.tex
+++ b/eapi-differences.tex
@@ -204,9 +204,12 @@ Controllable compression & \compactfeatureref{docompress} &
 \t{usex} & \compactfeatureref{usex} &
     No & No & No & Yes & Yes \\
 
-\t{unpack} support for \t{xz}? & \compactfeatureref{unpack-extensions} &
+\t{unpack} support for \t{xz} & \compactfeatureref{unpack-extensions} &
     No & Yes & Yes & Yes & Yes \\
 
+\t{unpack} support for \t{txz} & \compactfeatureref{unpack-extensions} &
+    No & No & No & No & Yes \\
+
 \t{default} function & \compactfeatureref{default-func} &
     * & Yes & Yes & Yes & Yes \\
 
@@ -320,6 +323,7 @@ EAPI 6 is EAPI 5 with the following changes:
 \item \t{failglob} is enabled in global scope, \featureref{failglob}.
 \item \t{einstall} banned, \featureref{banned-commands}.
 \item \t{die} and \t{assert} called with \t{-n} respect \t{nonfatal}, \featureref{nonfatal-die}.
+\item \t{unpack} supports \t{.txz}, \featureref{unpack-extensions}.
 \end{compactitem}
 
 \ChangeWhenAddingAnEAPI{6}

diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex
index bf7fa6a..3aeb587 100644
--- a/pkg-mgr-commands.tex
+++ b/pkg-mgr-commands.tex
@@ -829,27 +829,29 @@ has returned.
     \item lzma-compressed tar files (\t{*.tar.lzma}). Ebuilds must ensure that LZMA Utils and
         GNU tar are installed.
     \item xz-compressed files (\t{*.xz}). Ebuilds must ensure that XZ Utils is installed. Only for
-        EAPIs listed in table~\ref{tab:unpack-extensions-table} as supporting xz.
-    \item xz-compressed tar files (\t{*.tar.xz}). Ebuilds must ensure that XZ Utils and GNU tar are
-        installed. Only for EAPIs listed in table~\ref{tab:unpack-extensions-table} as supporting xz.
+        EAPIs listed in table~\ref{tab:unpack-extensions-table} as supporting \t{.xz}.
+    \item xz-compressed tar files (\t{*.tar.xz, *.txz}). Ebuilds must ensure that XZ Utils and
+        GNU tar are installed. Only for EAPIs listed in table~\ref{tab:unpack-extensions-table} as
+        supporting \t{.tar.xz} or \t{.txz}.
     \end{itemize}
     It is up to the ebuild to ensure that the relevant external utilities are available, whether by
     being in the system set or via dependencies.
 
 \ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{\t{unpack} extensions for EAPIs} \label{tab:unpack-extensions-table}
-    \begin{tabular}{ l l }
+    \begin{tabular}{ l l l }
         \toprule
             \multicolumn{1}{c}{\textbf{EAPI}} &
-            \multicolumn{1}{c}{\textbf{\t{.xz} and \t{.tar.xz}?}} \\
+            \multicolumn{1}{c}{\textbf{\t{.xz} and \t{.tar.xz}?}} &
+            \multicolumn{1}{c}{\textbf{\t{.txz}?}} \\
             \midrule
-    \t{0} & No \\
-    \t{1} & No \\
-    \t{2} & No \\
-    \t{3} & Yes \\
-    \t{4} & Yes \\
-    \t{5} & Yes \\
-    \t{6} & Yes \\
+    \t{0} & No & No \\
+    \t{1} & No & No \\
+    \t{2} & No & No \\
+    \t{3} & Yes & No \\
+    \t{4} & Yes & No \\
+    \t{5} & Yes & No \\
+    \t{6} & Yes & Yes \\
     \bottomrule
     \end{tabular}
 \end{centertable}