diff options
| -rw-r--r-- | eclass/kde4-base.eclass | 10 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index a2587657a39..9ce3566b328 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -600,7 +600,7 @@ debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}" kde4-base_pkg_setup() { debug-print-function ${FUNCNAME} "$@" - if has kdeprefix ${IUSE//+} && use kdeprefix; then + if use_if_iuse kdeprefix; then eerror "Sorry, kdeprefix support has been removed." eerror "Please remove kdeprefix from your USE variable." die "kdeprefix support has been removed" @@ -682,7 +682,7 @@ kde4-base_src_prepare() { # Enable/disable handbooks for kde4-base packages # kde-l10n inherits kde4-base but is metpackage, so no check for doc # kdelibs inherits kde4-base but handle installing the handbook itself - if ! has kde4-meta ${INHERITED} && has handbook ${IUSE//+}; then + if ! has kde4-meta ${INHERITED} && in_iuse handbook; then if [[ ${KDEBASE} == kde-base ]]; then if [[ ${PN} != kde-l10n && ${PN} != kdepim-l10n && ${PN} != kdelibs ]] && use !handbook; then # documentation in kde4-functions @@ -760,11 +760,11 @@ kde4-base_src_configure() { # Build tests in src_test only, where we override this value local cmakeargs=(-DKDE4_BUILD_TESTS=OFF) - if has kdeenablefinal ${IUSE//+} && use kdeenablefinal; then + if use_if_iuse kdeenablefinal; then cmakeargs+=(-DKDE4_ENABLE_FINAL=ON) fi - if has debug ${IUSE//+} && use debug; then + if use_if_iuse debug; then # Set "real" debug mode CMAKE_BUILD_TYPE="Debugfull" else @@ -897,7 +897,7 @@ kde4-base_pkg_postinst() { buildsycoca if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then - if has kdeenablefinal ${IUSE//+} && use kdeenablefinal; then + if use_if_iuse kdeenablefinal; then echo ewarn "WARNING! you have kdeenable final useflag enabled." ewarn "This useflag needs to be enabled on ALL kde using packages and" 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' |