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 B2D521389E2 for ; Thu, 4 Dec 2014 14:01:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A27D9E08C1; Thu, 4 Dec 2014 14:01:52 +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 DCF59E08AA for ; Thu, 4 Dec 2014 14:01:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 923B634064C for ; Thu, 4 Dec 2014 14:01:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0212BB8F8 for ; Thu, 4 Dec 2014 14:01:47 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1417701695.daa65a336102050396482f08c77524fe99e48c9f.mgorny@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/eapi.sh bin/phase-helpers.sh X-VCS-Directories: bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: daa65a336102050396482f08c77524fe99e48c9f X-VCS-Branch: master Date: Thu, 4 Dec 2014 14:01:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 92543a76-5b50-4e80-975a-cae6b3e28a70 X-Archives-Hash: 5d9efeb0f0f67983ca5bf5b8f92cf32b commit: daa65a336102050396482f08c77524fe99e48c9f Author: Michał Górny gentoo org> AuthorDate: Mon Aug 18 08:13:45 2014 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Dec 4 14:01:35 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=daa65a33 Add tentative EAPI6 .txz unpack support 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 f4b64ee..182a872 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -492,6 +492,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 + __unpack_tar "xz -d" || return 1 + else + __vecho "unpack ${x}: file format not recognized. Ignoring." + fi + ;; *) __vecho "unpack ${x}: file format not recognized. Ignoring." ;;