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

[Johannes Huber]

commit:     3dd1550fd37950fe0fb98753289d2684d907acad
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Jul 31 20:55:31 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jul 31 21:36:37 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3dd1550f

[eclass] Fix KDE_SCM=svn

 eclass/kde4-base.eclass |  5 +++++
 eclass/kde5.eclass      | 18 +++++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index d715c89..26c54c9 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -489,6 +489,11 @@ _calculate_live_repo() {
                                *)
                                        # branch
                                        
branch_prefix="branches/KDE/$(get_kde_version)"
+
+                                       if [[ ${PV} == ??.??.49.9999 && 
${CATEGORY} = kde-apps ]]; then
+                                               
branch_prefix="branches/Applications/$(get_kde_version)"
+                                       fi
+
                                        # @ECLASS-VARIABLE: ESVN_PROJECT_SUFFIX
                                        # @DESCRIPTION
                                        # Suffix appended to ESVN_PROJECT 
depending on fetched branch.

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 9698ef9..affd1c6 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -276,13 +276,25 @@ _calculate_live_repo() {
                        # (anonsvn) with anything else you might want to use.
                        
ESVN_MIRROR=${ESVN_MIRROR:=svn://anonsvn.kde.org/home/kde}
 
-                       local branch_prefix="KDE"
+                       local branch_prefix="trunk/KDE"
+
+                       if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps 
]]; then
+                               
branch_prefix="branches/Applications/$(get_version_component_range 1-2)"
+                       fi
+
+                       if [[ ${PV} != 9999 && ${CATEGORY} = kde-plasma ]]; then
+                               
branch_prefix="branches/plasma/$(get_version_component_range 1-2)"
+                       fi
+
+                       local _kmname
 
                        if [[ -n ${KMNAME} ]]; then
-                               branch_prefix="${KMNAME}"
+                               _kmname=${KMNAME}
+                       else
+                               _kmname=${PN}
                        fi
 
-                       
ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${branch_prefix}/${PN}"
+                       
ESVN_REPO_URI="${ESVN_MIRROR}/${branch_prefix}/${_kmname}"
                        ;;
                git)
                        # @ECLASS-VARIABLE: EGIT_MIRROR