From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D2F4813877A for ; Mon, 18 Aug 2014 17:56:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7AE94E0BC7; Mon, 18 Aug 2014 17:56:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 054CCE0BC6 for ; Mon, 18 Aug 2014 17:56:15 +0000 (UTC) Received: from pomiot.lan (77-253-136-53.adsl.inetia.pl [77.253.136.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id 76E35340173; Mon, 18 Aug 2014 17:56:14 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-portage-dev@lists.gentoo.org Cc: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-portage-dev] [PATCH 09/13] Add tentative EAPI6 .txz unpack support Date: Mon, 18 Aug 2014 19:56:48 +0200 Message-Id: <1408384612-14713-10-git-send-email-mgorny@gentoo.org> X-Mailer: git-send-email 2.0.4 In-Reply-To: <1408384612-14713-1-git-send-email-mgorny@gentoo.org> References: <1408384612-14713-1-git-send-email-mgorny@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org X-Archives-Salt: 318ee097-2938-4f17-a7c1-42d56ec5d190 X-Archives-Hash: e15c98f6547dae95dac3b1db2b4c9756 Support unpacking .txz-suffixed archives. --- bin/eapi.sh | 4 ++++ bin/phase-helpers.sh | 13 +++++++++++++ 2 files changed, 17 insertions(+) diff --git a/bin/eapi.sh b/bin/eapi.sh index fa57999..878f8e7 100644 --- a/bin/eapi.sh +++ b/bin/eapi.sh @@ -118,6 +118,10 @@ ___eapi_unpack_supports_xz() { [[ ! ${1-${EAPI}} =~ ^(0|1|2)$ ]] } +___eapi_unpack_supports_txz() { + [[ ! ${1-${EAPI}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-hdepend|5-progress)$ ]] +} + ___eapi_econf_passes_--disable-dependency-tracking() { [[ ! ${1-${EAPI}} =~ ^(0|1|2|3)$ ]] } diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index 49b5547..0be79fd 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -456,6 +456,19 @@ unpack() { __vecho "unpack ${x}: file format not recognized. Ignoring." fi ;; + txz) + if ___eapi_unpack_is_case_sensitive && \ + [[ " txz " != *" ${suffix} "* ]] ; then + eqawarn "QA Notice: unpack called with" \ + "suffix '${suffix}' which is unofficially supported" \ + "with EAPI '${EAPI}'. Instead use 'txz'." + fi + if ___eapi_supports_txz; then + tar xoJf "$srcdir$x" || die "$myfail" + else + __vecho "unpack ${x}: file format not recognized. Ignoring." + fi + ;; *) __vecho "unpack ${x}: file format not recognized. Ignoring." ;; -- 2.0.4