From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1010941-garchives=archives.gentoo.org@lists.gentoo.org>
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 359C41382C5
for <garchives@archives.gentoo.org>; Mon, 19 Mar 2018 19:38:20 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 4C248E0959;
Mon, 19 Mar 2018 19:38:19 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.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 27D19E0959
for <gentoo-commits@lists.gentoo.org>; Mon, 19 Mar 2018 19:38:19 +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 ECD46335C09
for <gentoo-commits@lists.gentoo.org>; Mon, 19 Mar 2018 19:38:17 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 7938B25A
for <gentoo-commits@lists.gentoo.org>; Mon, 19 Mar 2018 19:38:16 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
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" <asturm@gentoo.org>
Message-ID: <1521483685.63f180e63d83badb265fb9c8586f85f87502ec73.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: 63f180e63d83badb265fb9c8586f85f87502ec73
X-VCS-Branch: master
Date: Mon, 19 Mar 2018 19:38:16 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 405b2ecb-7b83-43f9-9aac-ccbd8dbe46d8
X-Archives-Hash: db864cb377c323ec5545631c53c47bb2
commit: 63f180e63d83badb265fb9c8586f85f87502ec73
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 19 18:21:25 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 19 18:21:25 2018 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=63f180e6
kde5-functions.eclass: Avoid 5.12 stable branch depend on KF-9999
eclass/kde5-functions.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 46d2c4974a..69971b4e4c 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -39,7 +39,7 @@ case ${CATEGORY} in
;;
kde-plasma)
[[ ${PV} = 5.12* ]] && : ${QT_MINIMAL:=5.9.1}
- if [[ ${KDE_BUILD_TYPE} = live ]]; then
+ if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.12* ]]; then
: ${QT_MINIMAL:=5.9.1}
: ${FRAMEWORKS_MINIMAL:=9999}
fi