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, 12 May 2018 14:02:19
Message-Id: 1526133675.764f495d5fd70325f9e907b04f84af29151cbcc1.asturm@gentoo
1 commit: 764f495d5fd70325f9e907b04f84af29151cbcc1
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 12 12:36:59 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat May 12 14:01:15 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=764f495d
7
8 kde5-functions.eclass: Raise QT_MINIMAL to 5.9.4
9
10 But avoid unnecessary non-dynlibs rebuilds in Plasma and Frameworks.
11
12 eclass/kde5-functions.eclass | 15 +++++++--------
13 1 file changed, 7 insertions(+), 8 deletions(-)
14
15 diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
16 index f9b00431bcc..aab79b0ba9c 100644
17 --- a/eclass/kde5-functions.eclass
18 +++ b/eclass/kde5-functions.eclass
19 @@ -34,30 +34,29 @@ export KDE_BUILD_TYPE
20
21 case ${CATEGORY} in
22 kde-frameworks)
23 - [[ ${PV} = 5.45* ]] && : ${QT_MINIMAL:=5.9.4}
24 + [[ ${PV} = 5.43* ]] && : ${QT_MINIMAL:=5.7.1}
25 [[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
26 ;;
27 kde-plasma)
28 - [[ ${PV} = 5.12* ]] && : ${QT_MINIMAL:=5.9.1}
29 - if [[ ${KDE_BUILD_TYPE} = live ]]; then
30 - : ${QT_MINIMAL:=5.9.1}
31 + [[ ${PV} = 5.11.5* ]] && : ${QT_MINIMAL:=5.7.1}
32 + [[ ${PV} = 5.12.5* ]] && : ${QT_MINIMAL:=5.9.1}
33 + if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.12* ]]; then
34 : ${FRAMEWORKS_MINIMAL:=9999}
35 + : ${QT_MINIMAL:=5.10.1}
36 fi
37 ;;
38 kde-apps)
39 + [[ ${PV} = 17.12.3* ]] && : ${QT_MINIMAL:=5.9.1}
40 if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 18.04* ]]; then
41 : ${FRAMEWORKS_MINIMAL:=5.44.0}
42 fi
43 - if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 17.12* ]]; then
44 - : ${QT_MINIMAL:=5.9.1}
45 - fi
46 ;;
47 esac
48
49 # @ECLASS-VARIABLE: QT_MINIMAL
50 # @DESCRIPTION:
51 # Minimum version of Qt to require. This affects add_qt_dep.
52 -: ${QT_MINIMAL:=5.7.1}
53 +: ${QT_MINIMAL:=5.9.4}
54
55 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
56 # @DESCRIPTION: