From c392a18b6274c749f4bcd7bb29a0be2b751f6426 Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Fri, 4 Nov 2016 03:02:54 +1100 Subject: kde5.eclass: only set FRAMEWORKS_MINIMAL if undefined Unconditionally setting FRAMEWORKS_MINIMAL prevents it being overridden in an ebuild (or somewhere else...). --- eclass/kde5.eclass | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'eclass/kde5.eclass') diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index a8915d4d19bc..9ef7c1514878 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 -- cgit v1.2.3-65-gdbad