| 1 |
Update the eclass to support all lzip variants in ::gentoo. The more, |
| 2 |
the merrier! |
| 3 |
|
| 4 |
Signed-off-by: Michał Górny <mgorny@g.o> |
| 5 |
--- |
| 6 |
eclass/unpacker.eclass | 17 ++++++++++++++--- |
| 7 |
1 file changed, 14 insertions(+), 3 deletions(-) |
| 8 |
|
| 9 |
diff --git a/eclass/unpacker.eclass b/eclass/unpacker.eclass |
| 10 |
index 4c0641d59ce1..750ecac9991c 100644 |
| 11 |
--- a/eclass/unpacker.eclass |
| 12 |
+++ b/eclass/unpacker.eclass |
| 13 |
@@ -38,7 +38,8 @@ inherit toolchain-funcs |
| 14 |
# @DEFAULT_UNSET |
| 15 |
# @DESCRIPTION: |
| 16 |
# Utility to use to decompress lzip files. Will dynamically pick between |
| 17 |
-# `plzip`, `pdlzip` and `lzip`. Make sure your choice accepts the "-dc" options. |
| 18 |
+# `plzip`, `lunzip`, `lzip`, `clzip` and `pdlzip`. Make sure your choice |
| 19 |
+# accepts the "-dc" options. |
| 20 |
# Note: this is meant for users to set, not ebuilds. |
| 21 |
|
| 22 |
# for internal use only (unpack_pdv and unpack_makeself) |
| 23 |
@@ -403,7 +404,10 @@ _unpacker() { |
| 24 |
*.lzma|*.xz|*.txz) |
| 25 |
comp="xz -dc" ;; |
| 26 |
*.lz) |
| 27 |
- : ${UNPACKER_LZIP:=$(type -P plzip || type -P pdlzip || type -P lzip)} |
| 28 |
+ : ${UNPACKER_LZIP:=$( |
| 29 |
+ type -P plzip || type -P lunzip || type -P lzip || |
| 30 |
+ type -P clzip || type -P pdlzip |
| 31 |
+ )} |
| 32 |
comp="${UNPACKER_LZIP} -dc" ;; |
| 33 |
*.zst) |
| 34 |
comp="zstd -dfc" ;; |
| 35 |
@@ -518,7 +522,14 @@ unpacker_src_uri_depends() { |
| 36 |
*.zip) |
| 37 |
d="app-arch/unzip" ;; |
| 38 |
*.lz) |
| 39 |
- d="|| ( app-arch/plzip app-arch/pdlzip app-arch/lzip )" ;; |
| 40 |
+ d=" |
| 41 |
+ || ( |
| 42 |
+ app-arch/plzip |
| 43 |
+ app-arch/lunzip |
| 44 |
+ app-arch/lzip |
| 45 |
+ app-arch/clzip |
| 46 |
+ app-arch/pdlzip |
| 47 |
+ )" ;; |
| 48 |
*.zst) |
| 49 |
d="app-arch/zstd" ;; |
| 50 |
*.LHA|*.LHa|*.lha|*.lzh) |
| 51 |
-- |
| 52 |
2.35.1 |
Archives