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

[Andreas Sturmlechner]

commit:     d591a645f34290fb1c24ebcc7b128fcce567ba9d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  8 11:53:31 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep  8 12:03:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d591a645

kde5-functions.eclass: Sync with kde overlay

QT_MINIMAL=5.11.1 default for kde-plasma/* ~arch
FRAMEWORKS_MINIMAL=5.49.0 default for kde-apps/* ~arch
Keep stable minimums to avoid metadata regeneration.

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

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 7631be4de39..8994bf8d973 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -37,15 +37,19 @@ case ${CATEGORY} in
                [[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
                ;;
        kde-plasma)
-               [[ ${PV} = 5.13* ]] && : ${QT_MINIMAL:=5.11.1}
                if [[ ${PV} = 5.12.5* ]]; then
                        : ${FRAMEWORKS_MINIMAL:=5.43.0}
                        : ${QT_MINIMAL:=5.9.1}
                fi
-               if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.12* ]]; then
+               [[ ${PV} = 5.12* ]] && : ${QT_MINIMAL:=5.9.4}
+               if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.??.49* ]]; then
                        : ${FRAMEWORKS_MINIMAL:=9999}
-                       : ${QT_MINIMAL:=5.11.1}
                fi
+               : ${QT_MINIMAL:=5.11.1}
+               ;;
+       kde-apps)
+               [[ ${PV} = 18.04.3 ]] && : ${FRAMEWORKS_MINIMAL:=5.46.0}
+               : ${FRAMEWORKS_MINIMAL:=5.49.0}
                ;;
 esac