[gentoo-commits] repo/gentoo:master commit in: eclass/

[Andreas Sturmlechner]

commit:     318a792bdc040f949e14bcfe80f72bd5935f66ac
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 28 20:16:25 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May  1 08:02:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=318a792b

kde5-functions.eclass: Fix minimum version requirements

- Plasma 5.8 stable branch should not require Qt-5.7.1
- Plasma 5.10 already requires KF-5.34

 eclass/kde5-functions.eclass | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index ba4abbd4490..574716299ec 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -35,10 +35,13 @@ case ${CATEGORY} in
                [[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
                ;;
        kde-plasma)
-               if ! [[ $(get_version_component_range 2) -le 8 && 
$(get_version_component_range 3) -lt 50 ]]; then
+               if [[ $(get_version_component_range 2) -ge 9 ]]; then
                        : ${QT_MINIMAL:=5.7.1}
                fi
-               if [[ ${KDE_BUILD_TYPE} = live ]]; then
+               if ! [[ $(get_version_component_range 2) -le 9 && 
$(get_version_component_range 3) -lt 50 ]]; then
+                       : ${FRAMEWORKS_MINIMAL:=5.34.0}
+               fi
+               if [[ ${KDE_BUILD_TYPE} = live && $(get_version_component_range 
2) -ne 8 ]]; then
                        : ${FRAMEWORKS_MINIMAL:=9999}
                        : ${QT_MINIMAL:=5.7.1}
                fi