kde5.eclass: Drop use_if_iuse

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index b1a8b064b9bb760d9e5a7ad927e368b45740f53a..47988cc5d4279cccaa681910bb4e3b0766dd357d 100644 (file)
--- 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