| 1 |
commit: 14086fdb73293887bbbaae89e1f8e93fbc7b1bcd |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 11 08:21:40 2018 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 11 08:21:40 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=14086fdb |
| 7 |
|
| 8 |
kde*.eclass: Drop var KDE_SCM |
| 9 |
|
| 10 |
No consumers and provided only git as option, which won't change anytime |
| 11 |
soon. |
| 12 |
|
| 13 |
eclass/kde5-functions.eclass | 11 ------- |
| 14 |
eclass/kde5.eclass | 68 +++++++++++++++++++------------------------- |
| 15 |
2 files changed, 29 insertions(+), 50 deletions(-) |
| 16 |
|
| 17 |
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass |
| 18 |
index f9b315a28c..ba16df3b66 100644 |
| 19 |
--- a/eclass/kde5-functions.eclass |
| 20 |
+++ b/eclass/kde5-functions.eclass |
| 21 |
@@ -83,17 +83,6 @@ fi |
| 22 |
|
| 23 |
debug-print "${ECLASS}: ${KDEBASE} ebuild recognized" |
| 24 |
|
| 25 |
-# @ECLASS-VARIABLE: KDE_SCM |
| 26 |
-# @DESCRIPTION: |
| 27 |
-# SCM to use if KDE_BUILD_TYPE is determined to be "live". |
| 28 |
-# Currently, only git is supported. |
| 29 |
-: ${KDE_SCM:=git} |
| 30 |
- |
| 31 |
-case ${KDE_SCM} in |
| 32 |
- git) ;; |
| 33 |
- *) die "KDE_SCM: ${KDE_SCM} is not supported" ;; |
| 34 |
-esac |
| 35 |
- |
| 36 |
# @FUNCTION: _check_gcc_version |
| 37 |
# @INTERNAL |
| 38 |
# @DESCRIPTION: |
| 39 |
|
| 40 |
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass |
| 41 |
index 23fa95704c..780789ec14 100644 |
| 42 |
--- a/eclass/kde5.eclass |
| 43 |
+++ b/eclass/kde5.eclass |
| 44 |
@@ -38,9 +38,7 @@ case ${EAPI} in |
| 45 |
esac |
| 46 |
|
| 47 |
if [[ ${KDE_BUILD_TYPE} = live ]]; then |
| 48 |
- case ${KDE_SCM} in |
| 49 |
- git) inherit git-r3 ;; |
| 50 |
- esac |
| 51 |
+ inherit git-r3 |
| 52 |
fi |
| 53 |
|
| 54 |
if [[ -v KDE_GCC_MINIMAL ]]; then |
| 55 |
@@ -391,40 +389,36 @@ _calculate_live_repo() { |
| 56 |
|
| 57 |
SRC_URI="" |
| 58 |
|
| 59 |
- case ${KDE_SCM} in |
| 60 |
- git) |
| 61 |
- # @ECLASS-VARIABLE: EGIT_MIRROR |
| 62 |
- # @DESCRIPTION: |
| 63 |
- # This variable allows easy overriding of default kde mirror service |
| 64 |
- # (anongit) with anything else you might want to use. |
| 65 |
- EGIT_MIRROR=${EGIT_MIRROR:=https://anongit.kde.org} |
| 66 |
- |
| 67 |
- local _kmname |
| 68 |
- |
| 69 |
- # @ECLASS-VARIABLE: EGIT_REPONAME |
| 70 |
- # @DESCRIPTION: |
| 71 |
- # This variable allows overriding of default repository |
| 72 |
- # name. Specify only if this differ from PN and KMNAME. |
| 73 |
- if [[ -n ${EGIT_REPONAME} ]]; then |
| 74 |
- # the repository and kmname different |
| 75 |
- _kmname=${EGIT_REPONAME} |
| 76 |
- elif [[ -n ${KMNAME} ]]; then |
| 77 |
- _kmname=${KMNAME} |
| 78 |
- else |
| 79 |
- _kmname=${PN} |
| 80 |
- fi |
| 81 |
+ # @ECLASS-VARIABLE: EGIT_MIRROR |
| 82 |
+ # @DESCRIPTION: |
| 83 |
+ # This variable allows easy overriding of default kde mirror service |
| 84 |
+ # (anongit) with anything else you might want to use. |
| 85 |
+ EGIT_MIRROR=${EGIT_MIRROR:=https://anongit.kde.org} |
| 86 |
|
| 87 |
- if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps ]]; then |
| 88 |
- EGIT_BRANCH="Applications/$(ver_cut 1-2)" |
| 89 |
- fi |
| 90 |
+ local _kmname |
| 91 |
|
| 92 |
- if [[ ${PV} != 9999 && ${CATEGORY} = kde-plasma ]]; then |
| 93 |
- EGIT_BRANCH="Plasma/$(ver_cut 1-2)" |
| 94 |
- fi |
| 95 |
+ # @ECLASS-VARIABLE: EGIT_REPONAME |
| 96 |
+ # @DESCRIPTION: |
| 97 |
+ # This variable allows overriding of default repository |
| 98 |
+ # name. Specify only if this differ from PN and KMNAME. |
| 99 |
+ if [[ -n ${EGIT_REPONAME} ]]; then |
| 100 |
+ # the repository and kmname different |
| 101 |
+ _kmname=${EGIT_REPONAME} |
| 102 |
+ elif [[ -n ${KMNAME} ]]; then |
| 103 |
+ _kmname=${KMNAME} |
| 104 |
+ else |
| 105 |
+ _kmname=${PN} |
| 106 |
+ fi |
| 107 |
|
| 108 |
- EGIT_REPO_URI="${EGIT_MIRROR}/${_kmname}" |
| 109 |
- ;; |
| 110 |
- esac |
| 111 |
+ if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps ]]; then |
| 112 |
+ EGIT_BRANCH="Applications/$(ver_cut 1-2)" |
| 113 |
+ fi |
| 114 |
+ |
| 115 |
+ if [[ ${PV} != 9999 && ${CATEGORY} = kde-plasma ]]; then |
| 116 |
+ EGIT_BRANCH="Plasma/$(ver_cut 1-2)" |
| 117 |
+ fi |
| 118 |
+ |
| 119 |
+ EGIT_REPO_URI="${EGIT_MIRROR}/${_kmname}" |
| 120 |
} |
| 121 |
|
| 122 |
case ${KDE_BUILD_TYPE} in |
| 123 |
@@ -490,11 +484,7 @@ kde5_src_unpack() { |
| 124 |
debug-print-function ${FUNCNAME} "$@" |
| 125 |
|
| 126 |
if [[ ${KDE_BUILD_TYPE} = live ]]; then |
| 127 |
- case ${KDE_SCM} in |
| 128 |
- git) |
| 129 |
- git-r3_src_unpack |
| 130 |
- ;; |
| 131 |
- esac |
| 132 |
+ git-r3_src_unpack |
| 133 |
else |
| 134 |
default |
| 135 |
fi |
Archives