From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-946759-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 5D5C4139694
for <garchives@archives.gentoo.org>; Sat, 29 Apr 2017 09:43:00 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id A2E27E0C63;
Sat, 29 Apr 2017 09:42:59 +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 7BA53E0C63
for <gentoo-commits@lists.gentoo.org>; Sat, 29 Apr 2017 09:42:59 +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 46551341777
for <gentoo-commits@lists.gentoo.org>; Sat, 29 Apr 2017 09:42:58 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 1604273F3
for <gentoo-commits@lists.gentoo.org>; Sat, 29 Apr 2017 09:42:56 +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: <1493458288.98e6b139c9616c1191ee85e96f134a20806f7c4d.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: 98e6b139c9616c1191ee85e96f134a20806f7c4d
X-VCS-Branch: master
Date: Sat, 29 Apr 2017 09:42:56 +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: 9547472a-24cf-4aff-8b61-7e9ff59a51d6
X-Archives-Hash: f3c98dfa0c7e4a660ee2b8660ca473f0
commit: 98e6b139c9616c1191ee85e96f134a20806f7c4d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 28 20:16:25 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 29 09:31:28 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=98e6b139
kde5-functions.eclass: Fix minimum version requirements
- Plasma 5.8 stable branch should not require Qt-5.7.1
- Plasma 5.10 already requires KF-5.34
eclass/kde5-functions.eclass | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index f138d83aa0..d187f54283 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -35,10 +35,13 @@ case ${CATEGORY} in
[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999}
;;
kde-plasma)
- if ! [[ $(get_version_component_range 2) -le 8 && $(get_version_component_range 3) -lt 50 ]]; then
+ if [[ $(get_version_component_range 2) -ge 9 ]]; then
: ${QT_MINIMAL:=5.7.1}
fi
- if [[ ${KDE_BUILD_TYPE} = live ]]; then
+ if ! [[ $(get_version_component_range 2) -le 9 && $(get_version_component_range 3) -lt 50 ]]; then
+ : ${FRAMEWORKS_MINIMAL:=5.34.0}
+ fi
+ if [[ ${KDE_BUILD_TYPE} = live && $(get_version_component_range 2) -ne 8 ]]; then
: ${FRAMEWORKS_MINIMAL:=9999}
: ${QT_MINIMAL:=5.7.1}
fi