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

[Andreas Sturmlechner]

commit:     f584e341d9ab77da5b0363cf70ed3dd749093dab
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  9 22:43:35 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 07:35:18 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f584e341

kde5*.eclass: Drop kde-apps-17.11* quirks

 eclass/kde5-functions.eclass | 2 +-
 eclass/kde5.eclass           | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index f2e835725e..19f0a856d8 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -46,7 +46,7 @@ case ${CATEGORY} in
                fi
                ;;
        kde-apps)
-               if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 17.12* || ${PV} = 
17.11* ]]; then
+               if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 17.12* ]]; then
                        : ${QT_MINIMAL:=5.9.1}
                fi
                ;;

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 2d7a5a332b..7ef21b7ad6 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -224,7 +224,7 @@ case ${KDE_DESIGNERPLUGIN} in
        *)
                IUSE+=" designer"
                DEPEND+=" designer? ( $(add_frameworks_dep kdesignerplugin) )"
-               [[ ${PV} = 9999 || ${PV} = 17.12* || ${PV} = 17.11* ]] || \
+               [[ ${PV} = 17.08* ]] && \
                        DEPEND+=" designer? ( $(add_qt_dep designer) )"
                ;;
 esac
@@ -630,10 +630,10 @@ kde5_src_configure() {
        fi
 
        if ! use_if_iuse designer && [[ ${KDE_DESIGNERPLUGIN} != false ]] ; then
-               if [[ ${PV} = 9999 || ${PV} = 17.12* || ${PV} = 17.11* ]]; then
-                       cmakeargs+=( 
-DCMAKE_DISABLE_FIND_PACKAGE_KF5DesignerPlugin=ON )
-               else
+               if [[ ${PV} = 17.08* ]]; then
                        cmakeargs+=( 
-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON )
+               else
+                       cmakeargs+=( 
-DCMAKE_DISABLE_FIND_PACKAGE_KF5DesignerPlugin=ON )
                fi
        fi