[gentoo-commits] repo/gentoo:master commit in: eclass/

[Johannes Huber]

commit:     e8ab1548802b6e545e76d24b610cbb5245f3276a
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 25 21:05:43 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Jul 25 21:06:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8ab1548

kde5.eclass: Raise Qt min version

 eclass/kde5.eclass | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 206f203..d3ff130 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -36,7 +36,7 @@ EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare 
src_configure src_compile src_
 # @ECLASS-VARIABLE: QT_MINIMAL
 # @DESCRIPTION:
 # Minimal Qt version to require for the package.
-: ${QT_MINIMAL:=5.5.1}
+: ${QT_MINIMAL:=5.6.1}
 
 # @ECLASS-VARIABLE: KDE_AUTODEPS
 # @DESCRIPTION:
@@ -158,16 +158,6 @@ case ${KDE_AUTODEPS} in
                RDEPEND+=" >=kde-frameworks/kf-env-3"
                COMMONDEPEND+=" $(add_qt_dep qtcore)"
 
-               if [[ ${CATEGORY} = kde-plasma ]]; then
-                       if [[ $(get_version_component_range 2) -eq 6 && 
$(get_version_component_range 3) -ge 5 ]]; then
-                               QT_MINIMAL=5.6.1
-                       fi
-                       if [[ $(get_version_component_range 2) -ge 7 || ${PV} = 
9999 ]]; then
-                               QT_MINIMAL=5.6.1
-                               FRAMEWORKS_MINIMAL=5.23.0
-                       fi
-               fi
-
                if [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma 
&& ${PN} != polkit-kde-agent ]]; then
                        RDEPEND+="
                                !kde-apps/kde4-l10n[-minimal(+)]