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

[Michael Palimaka]

commit:     67194017ffd27d29ad572da37fd089d0582ce969
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  8 17:40:44 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Mar  8 17:40:44 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=67194017

[eclass] Introduce ECM_MINIMAL.

It also restricts the live version requirement to frameworks/plasma.

 eclass/kde5-functions.eclass |  5 +++++
 eclass/kde5.eclass           | 12 +++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 24ee1b8..4e8dac9 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -23,6 +23,11 @@ case ${EAPI} in
        *) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
+# @ECLASS-VARIABLE: ECM_MINIMAL
+# @DESCRIPTION:
+# Minimal extra-cmake-modules version to require for the package.
+: ${ECM_MINIMAL:=1.7.0}
+
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimal Frameworks version to require for the package.

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 52cdd7c..9f6a106 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -107,27 +107,25 @@ fi
 case ${KDE_AUTODEPS} in
        false)  ;;
        *)
-               if [[ ${KDE_BUILD_TYPE} = live ]]; then
-                       ecm_version=9999
-               elif [[ ${CATEGORY} = kde-frameworks ]]; then
-                       ecm_version=1.$(get_version_component_range 2).0
-               else
-                       ecm_version=1.7.0
+               if [[ ${CATEGORY} = kde-frameworks ]]; then
+                       ECM_MINIMAL=1.$(get_version_component_range 2).0
                fi
 
                if [[ ${KDE_BUILD_TYPE} = live ]]; then
                        case ${CATEGORY} in
                                kde-frameworks)
+                                       ECM_MINIMAL=9999
                                        FRAMEWORKS_MINIMAL=9999
                                ;;
                                kde-plasma)
+                                       ECM_MINIMAL=9999
                                        FRAMEWORKS_MINIMAL=9999
                                ;;
                                *) ;;
                        esac
                fi
 
-               DEPEND+=" >=dev-libs/extra-cmake-modules-${ecm_version}"
+               DEPEND+=" >=dev-libs/extra-cmake-modules-${ECM_MINIMAL}"
                RDEPEND+=" >=kde-frameworks/kf-env-3"
                COMMONDEPEND+=" >=dev-qt/qtcore-${QT_MINIMAL}:5"