diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-06-16 21:58:51 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-07-03 19:30:56 +0200 |
| commit | 3cca528b88b3c2e9bea7a060e7fcfcca8274eb0b (patch) | |
| tree | 268fd7d54ed0faab9e9892b18accefa12613fb01 | |
| parent | sys-kernel/gentoo-sources: Linux patch 4.9.111 (diff) | |
| download | gentoo-3cca528b.tar.gz gentoo-3cca528b.tar.bz2 gentoo-3cca528b.zip | |
kde5.eclass: Drop use_if_iuse
| -rw-r--r-- | eclass/kde5.eclass | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index b1a8b064b9bb..47988cc5d427 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -506,12 +506,12 @@ kde5_src_prepare() { cmake-utils_src_prepare # only build examples when required - if ! use_if_iuse examples || ! use examples ; then + if ! (in_iuse examples && use examples) ; then cmake_comment_add_subdirectory examples fi # only enable handbook when required - if ! use_if_iuse handbook ; then + if in_iuse handbook && ! use handbook ; then cmake_comment_add_subdirectory ${KDE_DOC_DIR} if [[ ${KDE_HANDBOOK} = forceoptional ]] ; then @@ -571,7 +571,7 @@ kde5_src_prepare() { fi # only build unit tests when required - if ! use_if_iuse test ; then + if ! (in_iuse test && use test) ; then if [[ ${KDE_TEST} = forceoptional ]] ; then punt_bogus_dep Qt5 Test # if forceoptional, also cover non-kde categories @@ -615,7 +615,7 @@ kde5_src_configure() { debug-print-function ${FUNCNAME} "$@" # we rely on cmake-utils.eclass to append -DNDEBUG too - if ! use_if_iuse debug; then + if in_iuse debug && ! use debug; then append-cppflags -DQT_NO_DEBUG fi @@ -629,11 +629,11 @@ kde5_src_configure() { fi fi - if ! use_if_iuse handbook && [[ ${KDE_HANDBOOK} = optional ]] ; then + if in_iuse handbook && ! use handbook && [[ ${KDE_HANDBOOK} = optional ]] ; then cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON ) fi - if ! use_if_iuse designer && [[ ${KDE_DESIGNERPLUGIN} != false ]] ; then + if in_iuse designer && ! use designer && [[ ${KDE_DESIGNERPLUGIN} != false ]] ; then cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DesignerPlugin=ON ) fi |