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 3A07E1396D0 for ; Sun, 20 Aug 2017 14:03:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C54A1FC019; Sun, 20 Aug 2017 14:03:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 4C6361FC019 for ; Sun, 20 Aug 2017 14:03:36 +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 3E8A4341874 for ; Sun, 20 Aug 2017 14:03:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E06577C67 for ; Sun, 20 Aug 2017 14:03:33 +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: <1503237772.3dbfa804e5ce912d16939b42a9957d8c3ad33bf6.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: 3dbfa804e5ce912d16939b42a9957d8c3ad33bf6 X-VCS-Branch: master Date: Sun, 20 Aug 2017 14:03:33 +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: 12f814f9-6622-456f-97d2-6cefef918437 X-Archives-Hash: e699854336abd336cdf677c583f1e0ae commit: 3dbfa804e5ce912d16939b42a9957d8c3ad33bf6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Aug 20 14:02:52 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Aug 20 14:02:52 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3dbfa804 kde5.eclass: Fix KDE_DESIGNERPLUGIN for >=kde-apps-17.12 eclass/kde5.eclass | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index f26aac839b..ac14a699f7 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -209,10 +209,9 @@ case ${KDE_DESIGNERPLUGIN} in false) ;; *) IUSE+=" designer" - DEPEND+=" designer? ( - $(add_frameworks_dep kdesignerplugin) - $(add_qt_dep designer) - )" + DEPEND+=" designer? ( $(add_frameworks_dep kdesignerplugin) )" + [[ ${PV} = 9999 || ${PV} = 17.12* ]] || \ + DEPEND+=" designer? ( $(add_qt_dep designer) )" ;; esac @@ -614,7 +613,11 @@ kde5_src_configure() { fi if ! use_if_iuse designer && [[ ${KDE_DESIGNERPLUGIN} != false ]] ; then - cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON ) + if [[ ${PV} = 9999 || ${PV} = 17.12* ]]; then + cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DesignerPlugin=ON ) + else + cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON ) + fi fi if [[ ${KDE_QTHELP} != false ]]; then