Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 13/15] unpacker.eclass: Support lbzip2 as parallel bz2 decompressor
Date: Sun, 25 Sep 2022 18:27:06
Message-Id: 20220925182317.1559529-14-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH 00/15] unpacker.eclass: Tests, bugfixes and GPKG support by "Michał Górny"
1 Signed-off-by: Michał Górny <mgorny@g.o>
2 ---
3 eclass/unpacker.eclass | 7 +++++--
4 1 file changed, 5 insertions(+), 2 deletions(-)
5
6 diff --git a/eclass/unpacker.eclass b/eclass/unpacker.eclass
7 index d96b56609869..370f00a83bba 100644
8 --- a/eclass/unpacker.eclass
9 +++ b/eclass/unpacker.eclass
10 @@ -30,7 +30,8 @@ inherit multiprocessing toolchain-funcs
11 # @DEFAULT_UNSET
12 # @DESCRIPTION:
13 # Utility to use to decompress bzip2 files. Will dynamically pick between
14 -# `pbzip2` and `bzip2`. Make sure your choice accepts the "-dc" options.
15 +# `lbzip2`, `pbzip2` and `bzip2`. Make sure your choice accepts the "-dc"
16 +# options.
17 # Note: this is meant for users to set, not ebuilds.
18
19 # @ECLASS_VARIABLE: UNPACKER_LZIP
20 @@ -387,7 +388,9 @@ unpack_lha() {
21 _unpacker_get_decompressor() {
22 case ${1} in
23 *.bz2|*.tbz|*.tbz2)
24 - local bzcmd=${PORTAGE_BZIP2_COMMAND:-$(type -P pbzip2 || type -P bzip2)}
25 + local bzcmd=${PORTAGE_BZIP2_COMMAND:-$(
26 + type -P lbzip2 || type -P pbzip2 || type -P bzip2
27 + )}
28 local bzuncmd=${PORTAGE_BUNZIP2_COMMAND:-${bzcmd} -d}
29 : ${UNPACKER_BZ2:=${bzuncmd}}
30 echo "${UNPACKER_BZ2} -c"
31 --
32 2.37.3