diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2015-03-09 04:40:44 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-03-09 04:40:44 +1100 |
| commit | 67194017ffd27d29ad572da37fd089d0582ce969 (patch) | |
| tree | 14c4e215655c982a31536206d875b7b66338a2b6 | |
| parent | 952cb0a07619aa523b10ce9518afdeb7c7d1d480 (diff) | |
| download | kde-67194017ffd27d29ad572da37fd089d0582ce969.tar.gz kde-67194017ffd27d29ad572da37fd089d0582ce969.tar.bz2 kde-67194017ffd27d29ad572da37fd089d0582ce969.zip | |
[eclass] Introduce ECM_MINIMAL.
It also restricts the live version requirement to frameworks/plasma.
| -rw-r--r-- | eclass/kde5-functions.eclass | 5 | ||||
| -rw-r--r-- | eclass/kde5.eclass | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index 24ee1b89c6d..4e8dac9a2cb 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 52cdd7c39f2..9f6a106332e 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" |