Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
Date: Thu, 29 Mar 2018 18:09:16
Message-Id: 1522346819.682611ba42bb94df5a2abe7e906d848d81e65956.asturm@gentoo
1 commit: 682611ba42bb94df5a2abe7e906d848d81e65956
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Mar 19 18:31:50 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 29 18:06:59 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=682611ba
7
8 kde5-functions.eclass: Raise QT_MINIMAL to 5.9.4
9
10 eclass/kde5-functions.eclass | 7 +------
11 1 file changed, 1 insertion(+), 6 deletions(-)
12
13 diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
14 index 1dfb1817cb..ea310f2b3d 100644
15 --- a/eclass/kde5-functions.eclass
16 +++ b/eclass/kde5-functions.eclass
17 @@ -38,9 +38,7 @@ case ${CATEGORY} in
18 [[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
19 ;;
20 kde-plasma)
21 - [[ ${PV} = 5.12* ]] && : ${QT_MINIMAL:=5.9.1}
22 if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.12* ]]; then
23 - : ${QT_MINIMAL:=5.9.1}
24 : ${FRAMEWORKS_MINIMAL:=9999}
25 fi
26 ;;
27 @@ -48,16 +46,13 @@ case ${CATEGORY} in
28 if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 18* ]]; then
29 : ${FRAMEWORKS_MINIMAL:=5.44.0}
30 fi
31 - if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 17.12* || ${PV} = 18* ]]; then
32 - : ${QT_MINIMAL:=5.9.1}
33 - fi
34 ;;
35 esac
36
37 # @ECLASS-VARIABLE: QT_MINIMAL
38 # @DESCRIPTION:
39 # Minimum version of Qt to require. This affects add_qt_dep.
40 -: ${QT_MINIMAL:=5.7.1}
41 +: ${QT_MINIMAL:=5.9.4}
42
43 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
44 # @DESCRIPTION: