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 9AFD4138206 for ; Sun, 31 Dec 2017 18:01:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5E29E081E; Sun, 31 Dec 2017 18:01:26 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 B4ABAE081E for ; Sun, 31 Dec 2017 18:01:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 04F8C335C0C for ; Sun, 31 Dec 2017 18:01:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C27A4145 for ; Sun, 31 Dec 2017 18:01:24 +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: <1514741541.b9c899f4f9e0225b7b5d200950e1ed5a1f49822f.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: b9c899f4f9e0225b7b5d200950e1ed5a1f49822f X-VCS-Branch: master Date: Sun, 31 Dec 2017 18:01:24 +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: a1b6c14d-47c4-4e26-b9e8-b7cafe0fed65 X-Archives-Hash: 57f76a6cb5471d70d8a549205f4356e4 commit: b9c899f4f9e0225b7b5d200950e1ed5a1f49822f Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Dec 31 17:32:21 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Dec 31 17:32:21 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b9c899f4 kde5-functions.eclass: Fix FRAMEWORKS_MINIMAL for Plasma 5.12 branch eclass/kde5-functions.eclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index 19f0a856d8..d531908079 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -37,8 +37,9 @@ case ${CATEGORY} in [[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999} ;; kde-plasma) - if [[ ${PV} = 5.12* ]]; then + if [[ ${PV} = 5.12* || ${PV} = 5.11.95 ]]; then : ${QT_MINIMAL:=5.9.1} + : ${FRAMEWORKS_MINIMAL:=5.42.0} fi if [[ ${KDE_BUILD_TYPE} = live ]]; then : ${QT_MINIMAL:=5.9.1}