Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sat, 08 Sep 2018 12:09:22
Message-Id: 1536408227.d591a645f34290fb1c24ebcc7b128fcce567ba9d.asturm@gentoo
1 commit: d591a645f34290fb1c24ebcc7b128fcce567ba9d
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 8 11:53:31 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 8 12:03:47 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d591a645
7
8 kde5-functions.eclass: Sync with kde overlay
9
10 QT_MINIMAL=5.11.1 default for kde-plasma/* ~arch
11 FRAMEWORKS_MINIMAL=5.49.0 default for kde-apps/* ~arch
12 Keep stable minimums to avoid metadata regeneration.
13
14 eclass/kde5-functions.eclass | 10 +++++++---
15 1 file changed, 7 insertions(+), 3 deletions(-)
16
17 diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
18 index 7631be4de39..8994bf8d973 100644
19 --- a/eclass/kde5-functions.eclass
20 +++ b/eclass/kde5-functions.eclass
21 @@ -37,15 +37,19 @@ case ${CATEGORY} in
22 [[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
23 ;;
24 kde-plasma)
25 - [[ ${PV} = 5.13* ]] && : ${QT_MINIMAL:=5.11.1}
26 if [[ ${PV} = 5.12.5* ]]; then
27 : ${FRAMEWORKS_MINIMAL:=5.43.0}
28 : ${QT_MINIMAL:=5.9.1}
29 fi
30 - if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.12* ]]; then
31 + [[ ${PV} = 5.12* ]] && : ${QT_MINIMAL:=5.9.4}
32 + if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.??.49* ]]; then
33 : ${FRAMEWORKS_MINIMAL:=9999}
34 - : ${QT_MINIMAL:=5.11.1}
35 fi
36 + : ${QT_MINIMAL:=5.11.1}
37 + ;;
38 + kde-apps)
39 + [[ ${PV} = 18.04.3 ]] && : ${FRAMEWORKS_MINIMAL:=5.46.0}
40 + : ${FRAMEWORKS_MINIMAL:=5.49.0}
41 ;;
42 esac