Sync with KDE overlay.

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index c607795038a5bd7f1f779a7f78a9c8ccac2ca0ec..7d86ffddc5791f1a455b8ac4fff080ae0128299e 100644 (file)
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1473 2014/12/25 23:35:18 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1474 2014/12/26 11:42:21 kensington Exp $
+
+  26 Dec 2014; Michael Palimaka <kensington@gentoo.org> kde4-base.eclass:
+  Sync with KDE overlay.
 
   25 Dec 2014; Gilles Dartiguelongue <eva@gentoo.org> waf-utils.eclass:
   Reflect reality of the status of waf-utils eclass maintenance as announced

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index ddd466db76cc4a38f822de81715c72701ec6f76d..e4f98f64a9953046ba43c2f4de6e6ab0f4eeeab0 100644 (file)
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.145 2014/12/09 18:38:57 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.146 2014/12/26 11:42:21 kensington Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -474,8 +474,8 @@ _calculate_src_uri() {
                        ;;
                kdevelop|kdevelop-php*|kdevplatform)
                        case ${KDEVELOP_VERSION} in
-                               4.[123].[6-9]*) SRC_URI="mirror://kde/unstable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.bz2" ;;
-                               *) SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.bz2" ;;
+                               4.[123].[6-9]*) SRC_URI="mirror://kde/unstable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz" ;;
+                               *) SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz" ;;
                        esac
                        ;;
        esac
@@ -577,7 +577,7 @@ _calculate_live_repo() {
                        fi
 
                        # default branching
-                       [[ ${PV} != 4.9999* && ${KDEBASE} == kde-base ]] && \
+                       [[ ${PV} != 4.9999* && ${PV} != 9999 && ${KDEBASE} == kde-base ]] && \
                                EGIT_BRANCH="KDE/$(get_kde_version)"
 
                        # default repo uri