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 31940138334 for ; Tue, 6 Aug 2019 23:02:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 67A12E086B; Tue, 6 Aug 2019 23:02:44 +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 171F1E0849 for ; Tue, 6 Aug 2019 23:02:44 +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 04B4E3499FF for ; Tue, 6 Aug 2019 23:02:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3091B756 for ; Tue, 6 Aug 2019 23:02:40 +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: <1565130055.a29793b4443c7877ae6bb78ed406a957027d4422.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: a29793b4443c7877ae6bb78ed406a957027d4422 X-VCS-Branch: master Date: Tue, 6 Aug 2019 23:02:40 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6c540082-3017-4353-8b26-34d4d84a2011 X-Archives-Hash: 76cc522d47828b09df151a9046e797b9 commit: a29793b4443c7877ae6bb78ed406a957027d4422 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Aug 6 22:19:18 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Aug 6 22:20:55 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a29793b4 kde5.eclass: Add KDE_DESIGNERPLUGIN handling for kde-frameworks/ Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/kde5.eclass | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 1cb707be92..de87173824 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -211,7 +211,11 @@ case ${KDE_DESIGNERPLUGIN} in false) ;; *) IUSE+=" designer" - BDEPEND+=" designer? ( $(add_frameworks_dep kdesignerplugin) )" + if [[ ${CATEGORY} = kde-frameworks ]]; then + BDEPEND+=" designer? ( $(add_qt_dep designer) )" + else + BDEPEND+=" designer? ( $(add_frameworks_dep kdesignerplugin) )" + fi esac case ${KDE_EXAMPLES} in @@ -602,8 +606,12 @@ kde5_src_configure() { cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON ) fi - if in_iuse designer && ! use designer && [[ ${KDE_DESIGNERPLUGIN} != false ]] ; then - cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DesignerPlugin=ON ) + if in_iuse designer && [[ ${KDE_DESIGNERPLUGIN} != false ]] ; then + if [[ ${CATEGORY} = kde-frameworks ]]; then + cmakeargs+=( -DBUILD_DESIGNERPLUGIN=$(usex designer) ) + else + cmakeargs+=( $(cmake-utils_use_find_package designer KF5DesignerPlugin) ) + fi fi if [[ ${KDE_QTHELP} != false ]]; then