Update the eclass to support all lzip variants in ::gentoo.  The more,
the merrier!

Signed-off-by: Michał Górny <[email protected]>
---
 eclass/unpacker.eclass | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/eclass/unpacker.eclass b/eclass/unpacker.eclass
index 4c0641d59ce1..750ecac9991c 100644
--- a/eclass/unpacker.eclass
+++ b/eclass/unpacker.eclass
@@ -38,7 +38,8 @@ inherit toolchain-funcs
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # Utility to use to decompress lzip files.  Will dynamically pick between
-# `plzip`, `pdlzip` and `lzip`.  Make sure your choice accepts the "-dc" 
options.
+# `plzip`, `lunzip`, `lzip`, `clzip` and `pdlzip`.  Make sure your choice
+# accepts the "-dc" options.
 # Note: this is meant for users to set, not ebuilds.
 
 # for internal use only (unpack_pdv and unpack_makeself)
@@ -403,7 +404,10 @@ _unpacker() {
        *.lzma|*.xz|*.txz)
                comp="xz -dc" ;;
        *.lz)
-               : ${UNPACKER_LZIP:=$(type -P plzip || type -P pdlzip || type -P 
lzip)}
+               : ${UNPACKER_LZIP:=$(
+                       type -P plzip || type -P lunzip || type -P lzip ||
+                       type -P clzip || type -P pdlzip
+               )}
                comp="${UNPACKER_LZIP} -dc" ;;
        *.zst)
                comp="zstd -dfc" ;;
@@ -518,7 +522,14 @@ unpacker_src_uri_depends() {
                *.zip)
                        d="app-arch/unzip" ;;
                *.lz)
-                       d="|| ( app-arch/plzip app-arch/pdlzip app-arch/lzip )" 
;;
+                       d="
+                               || (
+                                       app-arch/plzip
+                                       app-arch/lunzip
+                                       app-arch/lzip
+                                       app-arch/clzip
+                                       app-arch/pdlzip
+                               )" ;;
                *.zst)
                        d="app-arch/zstd" ;;
                *.LHA|*.LHa|*.lha|*.lzh)
-- 
2.35.1


Reply via email to