diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2017-12-09 23:43:35 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-12-14 08:35:18 +0100 |
| commit | f584e341d9ab77da5b0363cf70ed3dd749093dab (patch) | |
| tree | 2d854a5c1b78bf3ae04859ecacae77bb87484a24 | |
| parent | 23204b1c038364eb66e70f6f8e42876409b5037a (diff) | |
| download | kde-f584e341d9ab77da5b0363cf70ed3dd749093dab.tar.gz kde-f584e341d9ab77da5b0363cf70ed3dd749093dab.tar.bz2 kde-f584e341d9ab77da5b0363cf70ed3dd749093dab.zip | |
kde5*.eclass: Drop kde-apps-17.11* quirks
| -rw-r--r-- | eclass/kde5-functions.eclass | 2 | ||||
| -rw-r--r-- | eclass/kde5.eclass | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index f2e835725e5..19f0a856d8b 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 2d7a5a332bc..7ef21b7ad68 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 |