Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Mon, 25 Jul 2016 21:06:27
Message-Id: 1469480766.e8ab1548802b6e545e76d24b610cbb5245f3276a.johu@gentoo
1 commit: e8ab1548802b6e545e76d24b610cbb5245f3276a
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jul 25 21:05:43 2016 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 25 21:06:06 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8ab1548
7
8 kde5.eclass: Raise Qt min version
9
10 eclass/kde5.eclass | 12 +-----------
11 1 file changed, 1 insertion(+), 11 deletions(-)
12
13 diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
14 index 206f203..d3ff130 100644
15 --- a/eclass/kde5.eclass
16 +++ b/eclass/kde5.eclass
17 @@ -36,7 +36,7 @@ EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_
18 # @ECLASS-VARIABLE: QT_MINIMAL
19 # @DESCRIPTION:
20 # Minimal Qt version to require for the package.
21 -: ${QT_MINIMAL:=5.5.1}
22 +: ${QT_MINIMAL:=5.6.1}
23
24 # @ECLASS-VARIABLE: KDE_AUTODEPS
25 # @DESCRIPTION:
26 @@ -158,16 +158,6 @@ case ${KDE_AUTODEPS} in
27 RDEPEND+=" >=kde-frameworks/kf-env-3"
28 COMMONDEPEND+=" $(add_qt_dep qtcore)"
29
30 - if [[ ${CATEGORY} = kde-plasma ]]; then
31 - if [[ $(get_version_component_range 2) -eq 6 && $(get_version_component_range 3) -ge 5 ]]; then
32 - QT_MINIMAL=5.6.1
33 - fi
34 - if [[ $(get_version_component_range 2) -ge 7 || ${PV} = 9999 ]]; then
35 - QT_MINIMAL=5.6.1
36 - FRAMEWORKS_MINIMAL=5.23.0
37 - fi
38 - fi
39 -
40 if [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma && ${PN} != polkit-kde-agent ]]; then
41 RDEPEND+="
42 !kde-apps/kde4-l10n[-minimal(+)]