Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
Date: Wed, 02 Mar 2016 13:39:10
Message-Id: 1456877948.3bb4a6ac957e45757ed2077b9d003dd5cc9810c6.kensington@gentoo
1 commit: 3bb4a6ac957e45757ed2077b9d003dd5cc9810c6
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Wed Mar 2 00:19:08 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 2 00:19:08 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3bb4a6ac
7
8 kde5.eclass: Drop KDE_SCM=svn support
9
10 It's not used by any kf5 based ebuild anymore.
11
12 eclass/kde5-functions.eclass | 2 +-
13 eclass/kde5.eclass | 31 -------------------------------
14 2 files changed, 1 insertion(+), 32 deletions(-)
15
16 diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
17 index ffdac91..ea894ad 100644
18 --- a/eclass/kde5-functions.eclass
19 +++ b/eclass/kde5-functions.eclass
20 @@ -63,7 +63,7 @@ debug-print "${ECLASS}: ${KDEBASE} ebuild recognized"
21 : ${KDE_SCM:=git}
22
23 case ${KDE_SCM} in
24 - svn|git) ;;
25 + git) ;;
26 *) die "KDE_SCM: ${KDE_SCM} is not supported" ;;
27 esac
28
29
30 diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
31 index c8d4b5e..7d764b2 100644
32 --- a/eclass/kde5.eclass
33 +++ b/eclass/kde5.eclass
34 @@ -23,7 +23,6 @@ inherit cmake-utils eutils flag-o-matic gnome2-utils kde5-functions versionator
35
36 if [[ ${KDE_BUILD_TYPE} = live ]]; then
37 case ${KDE_SCM} in
38 - svn) inherit subversion ;;
39 git) inherit git-r3 ;;
40 esac
41 fi
42 @@ -331,33 +330,6 @@ _calculate_live_repo() {
43 SRC_URI=""
44
45 case ${KDE_SCM} in
46 - svn)
47 - # @ECLASS-VARIABLE: ESVN_MIRROR
48 - # @DESCRIPTION:
49 - # This variable allows easy overriding of default kde mirror service
50 - # (anonsvn) with anything else you might want to use.
51 - ESVN_MIRROR=${ESVN_MIRROR:=svn://anonsvn.kde.org/home/kde}
52 -
53 - local branch_prefix="trunk/KDE"
54 -
55 - if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps ]]; then
56 - branch_prefix="branches/Applications/$(get_version_component_range 1-2)"
57 - fi
58 -
59 - if [[ ${PV} != 9999 && ${CATEGORY} = kde-plasma ]]; then
60 - branch_prefix="branches/plasma/$(get_version_component_range 1-2)"
61 - fi
62 -
63 - local _kmname
64 -
65 - if [[ -n ${KMNAME} ]]; then
66 - _kmname=${KMNAME}
67 - else
68 - _kmname=${PN}
69 - fi
70 -
71 - ESVN_REPO_URI="${ESVN_MIRROR}/${branch_prefix}/${_kmname}"
72 - ;;
73 git)
74 # @ECLASS-VARIABLE: EGIT_MIRROR
75 # @DESCRIPTION:
76 @@ -458,9 +430,6 @@ kde5_src_unpack() {
77
78 if [[ ${KDE_BUILD_TYPE} = live ]]; then
79 case ${KDE_SCM} in
80 - svn)
81 - subversion_src_unpack
82 - ;;
83 git)
84 git-r3_src_unpack
85 ;;