From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5E9E213832E for ; Mon, 25 Jul 2016 21:11:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 95C7821C012; Mon, 25 Jul 2016 21:11:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 47C5C21C012 for ; Mon, 25 Jul 2016 21:11:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 50452340C6F for ; Mon, 25 Jul 2016 21:11:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 969507D6 for ; Mon, 25 Jul 2016 21:11:39 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1469481077.22cfc0f311acbdcd33f88bbace07bf8dc11e386e.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde5.eclass X-VCS-Directories: eclass/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 22cfc0f311acbdcd33f88bbace07bf8dc11e386e X-VCS-Branch: master Date: Mon, 25 Jul 2016 21:11:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 97d1f755-00cb-4fc2-90cc-643f1640dc49 X-Archives-Hash: 99e068d779ee8238382d4ccd5fb37dee commit: 22cfc0f311acbdcd33f88bbace07bf8dc11e386e Author: Johannes Huber gentoo org> AuthorDate: Mon Jul 25 21:11:17 2016 +0000 Commit: Johannes Huber gentoo org> CommitDate: Mon Jul 25 21:11:17 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=22cfc0f3 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 a4e3768..613f724 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -36,7 +36,7 @@ EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure 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: @@ -168,16 +168,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+=" !