From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-984815-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 361E51396D9
for <garchives@archives.gentoo.org>; Sat, 18 Nov 2017 23:20:16 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 34DBDE0E62;
Sat, 18 Nov 2017 23:20:15 +0000 (UTC)
Received: from smtp.gentoo.org (dev.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 10710E0E62
for <gentoo-commits@lists.gentoo.org>; Sat, 18 Nov 2017 23:20:14 +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 4F8FF33BF55
for <gentoo-commits@lists.gentoo.org>; Sat, 18 Nov 2017 23:20:13 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id CD3B99F79
for <gentoo-commits@lists.gentoo.org>; Sat, 18 Nov 2017 23:20:08 +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: <1511047160.b51b99feae822d3a89b38d22828f39ec364142d6.asturm@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
X-VCS-Repository: proj/kde
X-VCS-Files: eclass/kde5.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: b51b99feae822d3a89b38d22828f39ec364142d6
X-VCS-Branch: master
Date: Sat, 18 Nov 2017 23:20:08 +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: 1083a55c-9f0e-4fb7-bc0e-0e5b21a17f39
X-Archives-Hash: 425b6c726efb794f38f0c39dd92f0d83
commit: b51b99feae822d3a89b38d22828f39ec364142d6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 18 22:59:44 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 18 23:19:20 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b51b99fe
kde5.eclass: Fix KDE_DESIGNERPLUGIN for 17.11
eclass/kde5.eclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 67ac4ac165..58bc990feb 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -226,7 +226,7 @@ case ${KDE_DESIGNERPLUGIN} in
*)
IUSE+=" designer"
DEPEND+=" designer? ( $(add_frameworks_dep kdesignerplugin) )"
- [[ ${PV} = 9999 || ${PV} = 17.12* ]] || \
+ [[ ${PV} = 9999 || ${PV} = 17.12* || ${PV} = 17.11* ]] || \
DEPEND+=" designer? ( $(add_qt_dep designer) )"
;;
esac
@@ -632,7 +632,7 @@ kde5_src_configure() {
fi
if ! use_if_iuse designer && [[ ${KDE_DESIGNERPLUGIN} != false ]] ; then
- if [[ ${PV} = 9999 || ${PV} = 17.12* ]]; then
+ if [[ ${PV} = 9999 || ${PV} = 17.12* || ${PV} = 17.11* ]]; then
cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DesignerPlugin=ON )
else
cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON )