kde*.eclass: Drop var KDE_SCM

No consumers and provided only git as option, which won't change anytime
soon.

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index bd3fa08b2576e7ea9ca68acd6b22e9ad699d6309..a1a83c29737624c333b53853ac13d0bb1cb508b7 100644 (file)
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -92,17 +92,6 @@ fi
 
 debug-print "${ECLASS}: ${KDEBASE} ebuild recognized"
 
-# @ECLASS-VARIABLE: KDE_SCM
-# @DESCRIPTION:
-# SCM to use if KDE_BUILD_TYPE is determined to be "live".
-# Currently, only git is supported.
-: ${KDE_SCM:=git}
-
-case ${KDE_SCM} in
-       git) ;;
-       *) die "KDE_SCM: ${KDE_SCM} is not supported" ;;
-esac
-
 # @FUNCTION: _check_gcc_version
 # @INTERNAL
 # @DESCRIPTION:

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 07d6c26a264cf279a10f609672e70110c0695570..03be801c0605ad07d79729c14df8bcb736bc717e 100644 (file)
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -38,9 +38,7 @@ case ${EAPI} in
 esac
 
 if [[ ${KDE_BUILD_TYPE} = live ]]; then
-       case ${KDE_SCM} in
-               git) inherit git-r3 ;;
-       esac
+       inherit git-r3
 fi
 
 if [[ -v KDE_GCC_MINIMAL ]]; then
@@ -394,40 +392,36 @@ _calculate_live_repo() {
 
        SRC_URI=""
 
-       case ${KDE_SCM} in
-               git)
-                       # @ECLASS-VARIABLE: EGIT_MIRROR
-                       # @DESCRIPTION:
-                       # This variable allows easy overriding of default kde mirror service
-                       # (anongit) with anything else you might want to use.
-                       EGIT_MIRROR=${EGIT_MIRROR:=https://anongit.kde.org}
-
-                       local _kmname
-
-                       # @ECLASS-VARIABLE: EGIT_REPONAME
-                       # @DESCRIPTION:
-                       # This variable allows overriding of default repository
-                       # name. Specify only if this differ from PN and KMNAME.
-                       if [[ -n ${EGIT_REPONAME} ]]; then
-                               # the repository and kmname different
-                               _kmname=${EGIT_REPONAME}
-                       elif [[ -n ${KMNAME} ]]; then
-                               _kmname=${KMNAME}
-                       else
-                               _kmname=${PN}
-                       fi
+       # @ECLASS-VARIABLE: EGIT_MIRROR
+       # @DESCRIPTION:
+       # This variable allows easy overriding of default kde mirror service
+       # (anongit) with anything else you might want to use.
+       EGIT_MIRROR=${EGIT_MIRROR:=https://anongit.kde.org}
 
-                       if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps ]]; then
-                               EGIT_BRANCH="Applications/$(ver_cut 1-2)"
-                       fi
+       local _kmname
 
-                       if [[ ${PV} != 9999 && ${CATEGORY} = kde-plasma ]]; then
-                               EGIT_BRANCH="Plasma/$(ver_cut 1-2)"
-                       fi
+       # @ECLASS-VARIABLE: EGIT_REPONAME
+       # @DESCRIPTION:
+       # This variable allows overriding of default repository
+       # name. Specify only if this differ from PN and KMNAME.
+       if [[ -n ${EGIT_REPONAME} ]]; then
+               # the repository and kmname different
+               _kmname=${EGIT_REPONAME}
+       elif [[ -n ${KMNAME} ]]; then
+               _kmname=${KMNAME}
+       else
+               _kmname=${PN}
+       fi
 
-                       EGIT_REPO_URI="${EGIT_MIRROR}/${_kmname}"
-                       ;;
-       esac
+       if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps ]]; then
+               EGIT_BRANCH="Applications/$(ver_cut 1-2)"
+       fi
+
+       if [[ ${PV} != 9999 && ${CATEGORY} = kde-plasma ]]; then
+               EGIT_BRANCH="Plasma/$(ver_cut 1-2)"
+       fi
+
+       EGIT_REPO_URI="${EGIT_MIRROR}/${_kmname}"
 }
 
 case ${KDE_BUILD_TYPE} in
@@ -493,11 +487,7 @@ kde5_src_unpack() {
        debug-print-function ${FUNCNAME} "$@"
 
        if [[ ${KDE_BUILD_TYPE} = live ]]; then
-               case ${KDE_SCM} in
-                       git)
-                               git-r3_src_unpack
-                               ;;
-               esac
+               git-r3_src_unpack
        else
                default
        fi