Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Mon, 02 May 2016 17:18:26
Message-Id: 1462209495.28b338093a6c63a91ae650184e2acbbf3aedb107.johu@gentoo
1 commit: 28b338093a6c63a91ae650184e2acbbf3aedb107
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Mon May 2 17:17:19 2016 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Mon May 2 17:18:15 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28b33809
7
8 kde4-meta.eclass: Support tar.gz snapshot from git
9
10 Signed-off-by: Johannes Huber <johu <AT> gentoo.org>
11
12 eclass/kde4-meta.eclass | 8 +++++++-
13 1 file changed, 7 insertions(+), 1 deletion(-)
14
15 diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
16 index df7dfa4..ba7114d 100644
17 --- a/eclass/kde4-meta.eclass
18 +++ b/eclass/kde4-meta.eclass
19 @@ -1,4 +1,4 @@
20 -# Copyright 1999-2015 Gentoo Foundation
21 +# Copyright 1999-2016 Gentoo Foundation
22 # Distributed under the terms of the GNU General Public License v2
23 # $Id$
24 #
25 @@ -185,6 +185,9 @@ kde4-meta_src_extract() {
26 if [[ ${PV} =~ 4.4.11 ]]; then
27 postfix="bz2"
28 KMTARPARAMS+=" --bzip2"
29 + elif [[ ${PV} =~ _pre ]]; then
30 + postfix="gz"
31 + KMTARPARAMS+=" --gz"
32 else
33 postfix="xz"
34 KMTARPARAMS+=" --xz"
35 @@ -198,6 +201,9 @@ kde4-meta_src_extract() {
36 # Detect real toplevel dir from tarball name - it will be used upon extraction
37 # and in _list_needed_subdirectories
38 topdir="${tarball%.tar.*}/"
39 + if [[ ${topdir} =~ _pre ]]; then
40 + topdir="${topdir%-$PV*}/"
41 + fi
42
43 ebegin "Unpacking parts of ${tarball} to ${WORKDIR}"