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 6DE6B138334 for ; Wed, 6 Feb 2019 19:14:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 528EEE0A59; Wed, 6 Feb 2019 19:14:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2C6F8E0A59 for ; Wed, 6 Feb 2019 19:14:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DC9E1335D5C for ; Wed, 6 Feb 2019 19:14:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 29529523 for ; Wed, 6 Feb 2019 19:14:46 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1549480236.b40e8d4d8fbad08d9e7f2dfe0545f89f1e4afac3.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde5-functions.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b40e8d4d8fbad08d9e7f2dfe0545f89f1e4afac3 X-VCS-Branch: master Date: Wed, 6 Feb 2019 19:14:46 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 03f72b32-144d-4085-9c1b-8405145c64a7 X-Archives-Hash: e03689d89bd1360d506e079dcf838f59 commit: b40e8d4d8fbad08d9e7f2dfe0545f89f1e4afac3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Feb 6 19:10:36 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Feb 6 19:10:36 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b40e8d4d kde5-functions: Raise FRAMEWORKS_MINIMAL to 5.54.0 Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/kde5-functions.eclass | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index 6ad74bd966..2abcfbbbef 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -36,21 +36,15 @@ export KDE_BUILD_TYPE case ${CATEGORY} in kde-frameworks) [[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999} - [[ ${PV} = 5.52.0* ]] && : ${QT_MINIMAL:=5.9.4} ;; kde-plasma) - if [[ ${PV} = 5.14.90 || ${PV} = 5.15.49* ]]; then - : ${FRAMEWORKS_MINIMAL:=5.54.0} - fi + [[ ${PV} = 5.14.5 ]] && : ${FRAMEWORKS_MINIMAL:=5.52.0} if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.??.49* ]]; then : ${FRAMEWORKS_MINIMAL:=9999} fi ;; kde-apps) [[ ${PV} = 18.08.3* ]] && : ${QT_MINIMAL:=5.9.4} - if [[ ${KDE_BUILD_TYPE} = live && ${PV} != ??.??.49* ]]; then - : ${FRAMEWORKS_MINIMAL:=5.54.0} - fi ;; esac @@ -62,7 +56,7 @@ esac # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL # @DESCRIPTION: # Minimum version of Frameworks to require. This affects add_frameworks_dep. -: ${FRAMEWORKS_MINIMAL:=5.52.0} +: ${FRAMEWORKS_MINIMAL:=5.54.0} # @ECLASS-VARIABLE: PLASMA_MINIMAL # @DESCRIPTION: