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 E00FF138335 for ; Sun, 14 Jul 2019 10:14:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8810EE0882; Sun, 14 Jul 2019 10:14:27 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 67116E086F for ; Sun, 14 Jul 2019 10:14:27 +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 F3BDE347A01 for ; Sun, 14 Jul 2019 10:14:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3E4406F1 for ; Sun, 14 Jul 2019 10:14:23 +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: <1563096790.5a0b95930b0b22f2d04e572c88dd770717189d7d.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: 5a0b95930b0b22f2d04e572c88dd770717189d7d X-VCS-Branch: master Date: Sun, 14 Jul 2019 10:14:23 +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: 4a4d82c8-0bb8-4a2a-8006-626ba37042e9 X-Archives-Hash: 118645a84ff8341244c23c66fd57ede5 commit: 5a0b95930b0b22f2d04e572c88dd770717189d7d Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jul 14 09:33:10 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jul 14 09:33:10 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5a0b9593 kde5-functions.eclass: Raise kde-apps FRAMEWORKS_MINIMAL to 5.60.0 Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/kde5-functions.eclass | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index 4b3d5532f7..3ee2b7590e 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -36,12 +36,17 @@ export KDE_BUILD_TYPE case ${CATEGORY} in kde-frameworks) [[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999} - [[ ${PV} = 5.57* || ${PV} = 5.59* ]] && : ${QT_MINIMAL:=5.11.1} ;; kde-plasma) - [[ ${PV} = 5.15.5 ]] && : ${QT_MINIMAL:=5.11.1} - [[ ${PV} = 5.16* ]] && : ${FRAMEWORKS_MINIMAL:=5.58.0} + if [[ ${PV} = 5.15.5 ]]; then + : ${FRAMEWORKS_MINIMAL:=5.57.0} + : ${QT_MINIMAL:=5.11.1} + fi [[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999} + : ${FRAMEWORKS_MINIMAL:=5.60.0} + ;; + kde-apps) + [[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=5.60.0} ;; esac