[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     3dbfa804e5ce912d16939b42a9957d8c3ad33bf6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 20 14:02:52 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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