[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Hüttel]

commit:     495e840be50677c74f7b67e315cf3701e472567a
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 30 08:51:28 2015 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jun 30 08:51:28 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=495e840b

[eclass] prepare eclasses for no-akonadi branch

 eclass/kde4-base.eclass | 4 ++++
 eclass/kde4-meta.eclass | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 1915b6d..f46f2c4 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -430,6 +430,10 @@ _calculate_src_uri() {
                                        # KDEPIM 4.4, special case
                                        # TODO: Remove this part when KDEPIM 
4.4 gets out of the tree
                                        
SRC_URI="mirror://kde/stable/kdepim-${PV}/src/${_kmname_pv}.tar.bz2" ;;
+                               4.4.20*)
+                                       # KDEPIM 4.4 no-akonadi branch, special 
case
+                                       # TODO: Remove this part when KDEPIM 
4.4 gets out of the tree
+                                       
SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${_kmname_pv}.tar.xz"; ;;
                                4.?.[6-9]? | 4.??.[6-9]?)
                                        # Unstable KDE SC releases
                                        
SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.xz" ;;

diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index abc4d02..d22992c 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -182,7 +182,7 @@ kde4-meta_src_extract() {
        else
                local abort tarball tarfile f extractlist postfix
 
-               if [[ ${PV} =~ 4.[47].[12345] ]]; then
+               if [[ ${PV} =~ '4\.4\.[12].*' ]]; then
                        postfix="bz2"
                        KMTARPARAMS+=" --bzip2"
                else