Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
Date: Fri, 31 Jul 2015 21:55:32
Message-Id: 1438378597.3dd1550fd37950fe0fb98753289d2684d907acad.johu@gentoo
1 commit: 3dd1550fd37950fe0fb98753289d2684d907acad
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Fri Jul 31 20:55:31 2015 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 31 21:36:37 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3dd1550f
7
8 [eclass] Fix KDE_SCM=svn
9
10 eclass/kde4-base.eclass | 5 +++++
11 eclass/kde5.eclass | 18 +++++++++++++++---
12 2 files changed, 20 insertions(+), 3 deletions(-)
13
14 diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
15 index d715c89..26c54c9 100644
16 --- a/eclass/kde4-base.eclass
17 +++ b/eclass/kde4-base.eclass
18 @@ -489,6 +489,11 @@ _calculate_live_repo() {
19 *)
20 # branch
21 branch_prefix="branches/KDE/$(get_kde_version)"
22 +
23 + if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps ]]; then
24 + branch_prefix="branches/Applications/$(get_kde_version)"
25 + fi
26 +
27 # @ECLASS-VARIABLE: ESVN_PROJECT_SUFFIX
28 # @DESCRIPTION
29 # Suffix appended to ESVN_PROJECT depending on fetched branch.
30
31 diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
32 index 9698ef9..affd1c6 100644
33 --- a/eclass/kde5.eclass
34 +++ b/eclass/kde5.eclass
35 @@ -276,13 +276,25 @@ _calculate_live_repo() {
36 # (anonsvn) with anything else you might want to use.
37 ESVN_MIRROR=${ESVN_MIRROR:=svn://anonsvn.kde.org/home/kde}
38
39 - local branch_prefix="KDE"
40 + local branch_prefix="trunk/KDE"
41 +
42 + if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps ]]; then
43 + branch_prefix="branches/Applications/$(get_version_component_range 1-2)"
44 + fi
45 +
46 + if [[ ${PV} != 9999 && ${CATEGORY} = kde-plasma ]]; then
47 + branch_prefix="branches/plasma/$(get_version_component_range 1-2)"
48 + fi
49 +
50 + local _kmname
51
52 if [[ -n ${KMNAME} ]]; then
53 - branch_prefix="${KMNAME}"
54 + _kmname=${KMNAME}
55 + else
56 + _kmname=${PN}
57 fi
58
59 - ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${branch_prefix}/${PN}"
60 + ESVN_REPO_URI="${ESVN_MIRROR}/${branch_prefix}/${_kmname}"
61 ;;
62 git)
63 # @ECLASS-VARIABLE: EGIT_MIRROR