Gentoo Archives: gentoo-commits

From: "Andreas Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
Date: Tue, 30 Jun 2015 08:48:10
Message-Id: 1435654288.495e840be50677c74f7b67e315cf3701e472567a.dilfridge@gentoo
1 commit: 495e840be50677c74f7b67e315cf3701e472567a
2 Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jun 30 08:51:28 2015 +0000
4 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 30 08:51:28 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=495e840b
7
8 [eclass] prepare eclasses for no-akonadi branch
9
10 eclass/kde4-base.eclass | 4 ++++
11 eclass/kde4-meta.eclass | 2 +-
12 2 files changed, 5 insertions(+), 1 deletion(-)
13
14 diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
15 index 1915b6d..f46f2c4 100644
16 --- a/eclass/kde4-base.eclass
17 +++ b/eclass/kde4-base.eclass
18 @@ -430,6 +430,10 @@ _calculate_src_uri() {
19 # KDEPIM 4.4, special case
20 # TODO: Remove this part when KDEPIM 4.4 gets out of the tree
21 SRC_URI="mirror://kde/stable/kdepim-${PV}/src/${_kmname_pv}.tar.bz2" ;;
22 + 4.4.20*)
23 + # KDEPIM 4.4 no-akonadi branch, special case
24 + # TODO: Remove this part when KDEPIM 4.4 gets out of the tree
25 + SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${_kmname_pv}.tar.xz" ;;
26 4.?.[6-9]? | 4.??.[6-9]?)
27 # Unstable KDE SC releases
28 SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.xz" ;;
29
30 diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
31 index abc4d02..d22992c 100644
32 --- a/eclass/kde4-meta.eclass
33 +++ b/eclass/kde4-meta.eclass
34 @@ -182,7 +182,7 @@ kde4-meta_src_extract() {
35 else
36 local abort tarball tarfile f extractlist postfix
37
38 - if [[ ${PV} =~ 4.[47].[12345] ]]; then
39 + if [[ ${PV} =~ '4\.4\.[12].*' ]]; then
40 postfix="bz2"
41 KMTARPARAMS+=" --bzip2"
42 else