Gentoo Archives: gentoo-portage-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-portage-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-portage-dev] [PATCH 09/13] Add tentative EAPI6 .txz unpack support
Date: Mon, 18 Aug 2014 17:56:48
Message-Id: 1408384612-14713-10-git-send-email-mgorny@gentoo.org
In Reply to: [gentoo-portage-dev] [PATCHES] Initial EAPI6 patch set for review by "Michał Górny"
1 Support unpacking .txz-suffixed archives.
2 ---
3 bin/eapi.sh | 4 ++++
4 bin/phase-helpers.sh | 13 +++++++++++++
5 2 files changed, 17 insertions(+)
6
7 diff --git a/bin/eapi.sh b/bin/eapi.sh
8 index fa57999..878f8e7 100644
9 --- a/bin/eapi.sh
10 +++ b/bin/eapi.sh
11 @@ -118,6 +118,10 @@ ___eapi_unpack_supports_xz() {
12 [[ ! ${1-${EAPI}} =~ ^(0|1|2)$ ]]
13 }
14
15 +___eapi_unpack_supports_txz() {
16 + [[ ! ${1-${EAPI}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-hdepend|5-progress)$ ]]
17 +}
18 +
19 ___eapi_econf_passes_--disable-dependency-tracking() {
20 [[ ! ${1-${EAPI}} =~ ^(0|1|2|3)$ ]]
21 }
22 diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
23 index 49b5547..0be79fd 100644
24 --- a/bin/phase-helpers.sh
25 +++ b/bin/phase-helpers.sh
26 @@ -456,6 +456,19 @@ unpack() {
27 __vecho "unpack ${x}: file format not recognized. Ignoring."
28 fi
29 ;;
30 + txz)
31 + if ___eapi_unpack_is_case_sensitive && \
32 + [[ " txz " != *" ${suffix} "* ]] ; then
33 + eqawarn "QA Notice: unpack called with" \
34 + "suffix '${suffix}' which is unofficially supported" \
35 + "with EAPI '${EAPI}'. Instead use 'txz'."
36 + fi
37 + if ___eapi_supports_txz; then
38 + tar xoJf "$srcdir$x" || die "$myfail"
39 + else
40 + __vecho "unpack ${x}: file format not recognized. Ignoring."
41 + fi
42 + ;;
43 *)
44 __vecho "unpack ${x}: file format not recognized. Ignoring."
45 ;;
46 --
47 2.0.4