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: Thu, 11 Oct 2018 18:36:02
Message-Id: 1539282909.a435b84e9f90cf1e583aa0fe0ab0af6baef649cd.asturm@gentoo
1 commit: a435b84e9f90cf1e583aa0fe0ab0af6baef649cd
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 11 17:14:23 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 11 18:35:09 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a435b84e
7
8 kde5-functions.eclass: Raise FRAMEWORKS_MINIMAL to 5.50.0
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 eclass/kde5-functions.eclass | 8 +++++---
13 1 file changed, 5 insertions(+), 3 deletions(-)
14
15 diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
16 index 33c3a24408a..245d2e27a2e 100644
17 --- a/eclass/kde5-functions.eclass
18 +++ b/eclass/kde5-functions.eclass
19 @@ -41,7 +41,10 @@ case ${CATEGORY} in
20 : ${FRAMEWORKS_MINIMAL:=5.43.0}
21 : ${QT_MINIMAL:=5.9.1}
22 fi
23 - [[ ${PV} = 5.12* ]] && : ${QT_MINIMAL:=5.9.4}
24 + if [[ ${PV} = 5.12* || ${PV} = 5.13.5 ]]; then
25 + : ${FRAMEWORKS_MINIMAL:=5.46.0}
26 + : ${QT_MINIMAL:=5.9.4}
27 + fi
28 if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.??.49* ]]; then
29 : ${FRAMEWORKS_MINIMAL:=9999}
30 fi
31 @@ -49,7 +52,6 @@ case ${CATEGORY} in
32 ;;
33 kde-apps)
34 [[ ${PV} = 18.04.3 ]] && : ${FRAMEWORKS_MINIMAL:=5.46.0}
35 - : ${FRAMEWORKS_MINIMAL:=5.50.0}
36 ;;
37 esac
38
39 @@ -61,7 +63,7 @@ esac
40 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
41 # @DESCRIPTION:
42 # Minimum version of Frameworks to require. This affects add_frameworks_dep.
43 -: ${FRAMEWORKS_MINIMAL:=5.46.0}
44 +: ${FRAMEWORKS_MINIMAL:=5.50.0}
45
46 # @ECLASS-VARIABLE: PLASMA_MINIMAL
47 # @DESCRIPTION: