From 9cb3588f8f18b4dbbaa38d9d55cedccf54e34d6a Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Wed, 7 Aug 2019 00:19:18 +0200 Subject: [PATCH] kde5.eclass: Add KDE_DESIGNERPLUGIN handling for kde-frameworks/ Signed-off-by: Andreas Sturmlechner --- eclass/kde5.eclass | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index d49e0fbfdbfb..9f71e428c54f 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -206,7 +206,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 @@ -598,8 +602,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 -- 2.26.2