From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C71A7158094 for ; Sun, 25 Sep 2022 18:27:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6728C2BC0E6; Sun, 25 Sep 2022 18:23:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 33E672BC0E3 for ; Sun, 25 Sep 2022 18:23:37 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Cc: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-dev] [PATCH 13/15] unpacker.eclass: Support lbzip2 as parallel bz2 decompressor Date: Sun, 25 Sep 2022 20:23:15 +0200 Message-Id: <20220925182317.1559529-14-mgorny@gentoo.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220925182317.1559529-1-mgorny@gentoo.org> References: <20220925182317.1559529-1-mgorny@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Archives-Salt: c14bfd05-a287-4e36-86e4-21d0a3eac4ba X-Archives-Hash: 29d269c1ead7e72dcb24da336f9e6b38 Signed-off-by: Michał Górny --- eclass/unpacker.eclass | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/eclass/unpacker.eclass b/eclass/unpacker.eclass index d96b56609869..370f00a83bba 100644 --- a/eclass/unpacker.eclass +++ b/eclass/unpacker.eclass @@ -30,7 +30,8 @@ inherit multiprocessing toolchain-funcs # @DEFAULT_UNSET # @DESCRIPTION: # Utility to use to decompress bzip2 files. Will dynamically pick between -# `pbzip2` and `bzip2`. Make sure your choice accepts the "-dc" options. +# `lbzip2`, `pbzip2` and `bzip2`. Make sure your choice accepts the "-dc" +# options. # Note: this is meant for users to set, not ebuilds. # @ECLASS_VARIABLE: UNPACKER_LZIP @@ -387,7 +388,9 @@ unpack_lha() { _unpacker_get_decompressor() { case ${1} in *.bz2|*.tbz|*.tbz2) - local bzcmd=${PORTAGE_BZIP2_COMMAND:-$(type -P pbzip2 || type -P bzip2)} + local bzcmd=${PORTAGE_BZIP2_COMMAND:-$( + type -P lbzip2 || type -P pbzip2 || type -P bzip2 + )} local bzuncmd=${PORTAGE_BUNZIP2_COMMAND:-${bzcmd} -d} : ${UNPACKER_BZ2:=${bzuncmd}} echo "${UNPACKER_BZ2} -c" -- 2.37.3