diff options
Diffstat (limited to 'eclass/kde4-meta.eclass')
| -rw-r--r-- | eclass/kde4-meta.eclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 942c06673c3..b6657a307ce 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -289,7 +289,7 @@ kde4-meta_create_extractlists() { # Add default handbook locations # FIXME - legacy code - remove when 4.4.5 is gone or preferrably port 4.4.5. - if [[ $(get_kde_version) < 4.5 ]] && has handbook ${IUSE//+} && use handbook && [[ -z ${KMNOMODULE} ]]; then + if [[ $(get_kde_version) < 4.5 ]] && use_if_iuse handbook && [[ -z ${KMNOMODULE} ]]; then # We use the basename of $KMMODULE because $KMMODULE can contain # the path to the module subdirectory. KMEXTRA_NONFATAL+=" @@ -346,7 +346,7 @@ kde4-meta_create_extractlists() { KMEXTRACTONLY+=" kdepim-version.h" fi - if has kontact ${IUSE//+} && use kontact; then + if use_if_iuse kontact; then KMEXTRA+=" kontact/plugins/${PLUGINNAME:-${PN}}/" fi @@ -588,7 +588,7 @@ kde4-meta_change_cmakelists() { -e 's/if[[:space:]]*([[:space:]]*[[:alnum:]]*_FOUND[[:space:]]*)[[:space:]]*$/if(1) # &/' \ -i CMakeLists.txt || die "failed to disable hardcoded checks" # Disable broken or redundant build logic - if ( has kontact ${IUSE//+} && use kontact ) || [[ ${PN} = kontact ]]; then + if use_if_iuse kontact || [[ ${PN} = kontact ]]; then sed -e 's/if[[:space:]]*([[:space:]]*BUILD_.*)[[:space:]]*$/if(1) # &/' \ -e 's/if[[:space:]]*([[:space:]]*[[:alnum:]]*_FOUND[[:space:]]*)[[:space:]]*$/if(1) # &/' \ -i kontact/plugins/CMakeLists.txt || die 'failed to override build logic' |