diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
| commit | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch) | |
| tree | 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /eclass/ecm.eclass | |
| parent | b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff) | |
gentoo resync : 15.12.2019
Diffstat (limited to 'eclass/ecm.eclass')
| -rw-r--r-- | eclass/ecm.eclass | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index 06c2e9f83ea9..1616df9aab57 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -27,8 +27,8 @@ # - Rename vars and function names as needed, see kde5.eclass PORTING comments # - Instead of FRAMEWORKS_MINIMAL, define KFMIN in ebuilds and use it for deps -if [[ -z ${_ECM_UTILS_ECLASS} ]]; then -_ECM_UTILS_ECLASS=1 +if [[ -z ${_ECM_ECLASS} ]]; then +_ECM_ECLASS=1 # @ECLASS-VARIABLE: VIRTUALX_REQUIRED # @DESCRIPTION: @@ -152,10 +152,15 @@ fi : ${ECM_TEST:=false} # @ECLASS-VARIABLE: KFMIN +# @DEFAULT_UNSET # @DESCRIPTION: -# Minimum version of Frameworks to require. The default value is not going to -# be changed unless we also bump EAPI, which usually implies (rev-)bumping. +# Minimum version of Frameworks to require. Default value for kde-frameworks +# is ${PV} and 5.64.0 baseline for everything else. This is not going to be +# changed unless we also bump EAPI, which usually implies (rev-)bumping. # Version will later be used to differentiate between KF5/Qt5 and KF6/Qt6. +if [[ ${CATEGORY} = kde-frameworks ]]; then + : ${KFMIN:=$(ver_cut 1-2)} +fi : ${KFMIN:=5.64.0} # @ECLASS-VARIABLE: KFSLOT @@ -524,7 +529,7 @@ ecm_src_configure() { # TODO: drop after KDE Applications 19.08.3 removal if in_iuse designer && [[ ${KDE_DESIGNERPLUGIN} != false ]] ; then - cmakeargs+=( $(cmake-utils_use_find_package designer KF5DesignerPlugin) ) + cmakeargs+=( $(cmake_use_find_package designer KF5DesignerPlugin) ) fi if [[ ${ECM_QTHELP} = true ]]; then |