diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2016-11-04 03:02:54 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2016-11-04 03:07:16 +1100 |
| commit | 040cef12f24e64267d5c60bd0b2fbcc5a3280cec (patch) | |
| tree | b096c243f9e737e60dfa299ed80ee6a750d5b3ac | |
| parent | kde-plasma/kwrited: Update blocker/description (diff) | |
| download | kde-040cef12.tar.gz kde-040cef12.tar.bz2 kde-040cef12.zip | |
kde5.eclass: only set FRAMEWORKS_MINIMAL if undefined
Unconditionally setting FRAMEWORKS_MINIMAL prevents it being overridden in an
ebuild (or somewhere else...).
| -rw-r--r-- | eclass/kde5.eclass | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index a8915d4d19..9ef7c15148 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -145,10 +145,11 @@ case ${KDE_AUTODEPS} in if [[ ${KDE_BUILD_TYPE} = live ]]; then case ${CATEGORY} in kde-frameworks) - FRAMEWORKS_MINIMAL=9999 + : ${FRAMEWORKS_MINIMAL:=9999} ;; kde-plasma) - FRAMEWORKS_MINIMAL=9999 + + : ${FRAMEWORKS_MINIMAL:=9999} ;; *) ;; esac @@ -156,14 +157,14 @@ case ${KDE_AUTODEPS} in if [[ ${CATEGORY} = kde-plasma && ${FRAMEWORKS_MINIMAL} != 9999 ]]; then if ! [[ $(get_version_component_range 2) -le 8 && $(get_version_component_range 3) -lt 50 ]]; then - FRAMEWORKS_MINIMAL=5.27.0 + : ${FRAMEWORKS_MINIMAL:=5.27.0} fi fi if [[ ${CATEGORY} = kde-apps ]]; then local vcr2=$((10#$(get_version_component_range 2))) if ! [[ $(get_version_component_range 1) -le 16 && ${vcr2} -lt 9 ]]; then - FRAMEWORKS_MINIMAL=5.28.0 + : ${FRAMEWORKS_MINIMAL:=5.28.0} fi unset vcr2 fi |