Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sat, 14 Sep 2019 14:59:41
Message-Id: 1568472747.9cb3588f8f18b4dbbaa38d9d55cedccf54e34d6a.asturm@gentoo
1 commit: 9cb3588f8f18b4dbbaa38d9d55cedccf54e34d6a
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 6 22:19:18 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 14 14:52:27 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cb3588f
7
8 kde5.eclass: Add KDE_DESIGNERPLUGIN handling for kde-frameworks/
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 eclass/kde5.eclass | 14 +++++++++++---
13 1 file changed, 11 insertions(+), 3 deletions(-)
14
15 diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
16 index d49e0fbfdbf..9f71e428c54 100644
17 --- a/eclass/kde5.eclass
18 +++ b/eclass/kde5.eclass
19 @@ -206,7 +206,11 @@ case ${KDE_DESIGNERPLUGIN} in
20 false) ;;
21 *)
22 IUSE+=" designer"
23 - BDEPEND+=" designer? ( $(add_frameworks_dep kdesignerplugin) )"
24 + if [[ ${CATEGORY} = kde-frameworks ]]; then
25 + BDEPEND+=" designer? ( $(add_qt_dep designer) )"
26 + else
27 + BDEPEND+=" designer? ( $(add_frameworks_dep kdesignerplugin) )"
28 + fi
29 esac
30
31 case ${KDE_EXAMPLES} in
32 @@ -598,8 +602,12 @@ kde5_src_configure() {
33 cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON )
34 fi
35
36 - if in_iuse designer && ! use designer && [[ ${KDE_DESIGNERPLUGIN} != false ]] ; then
37 - cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DesignerPlugin=ON )
38 + if in_iuse designer && [[ ${KDE_DESIGNERPLUGIN} != false ]] ; then
39 + if [[ ${CATEGORY} = kde-frameworks ]]; then
40 + cmakeargs+=( -DBUILD_DESIGNERPLUGIN=$(usex designer) )
41 + else
42 + cmakeargs+=( $(cmake-utils_use_find_package designer KF5DesignerPlugin) )
43 + fi
44 fi
45
46 if [[ ${KDE_QTHELP} != false ]]; then