commit: 61ba5fa8fd86062875c384b1100c897bd69a8925
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 11:15:31 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 11:15:31 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=61ba5fa8
kde4-base.eclass, kde4-meta.eclass: Drop use of use_if_iuse
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
eclass/kde4-base.eclass | 2 +-
eclass/kde4-meta.eclass | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index b13eb71a..32da6eeb 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -779,7 +779,7 @@ kde4-base_src_configure() {
# Build tests in src_test only, where we override this value
local cmakeargs=(-DKDE4_BUILD_TESTS=OFF)
- if use_if_iuse debug; then
+ if in_iuse debug && use debug; then
# Set "real" debug mode
CMAKE_KDE_BUILD_TYPE="Debugfull"
else
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index 7b67a63c..e6543231 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -253,7 +253,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 ]] && use_if_iuse handbook && [[ -z
${KMNOMODULE} ]]; then
+ if [[ $(get_kde_version) < 4.5 ]] && in_iuse handbook && use handbook
&& [[ -z ${KMNOMODULE} ]]; then
# We use the basename of $KMMODULE because $KMMODULE can contain
# the path to the module subdirectory.
KMEXTRA_NONFATAL+="
@@ -302,7 +302,7 @@ kde4-meta_create_extractlists() {
CTestCustom.cmake
kdepim-version.h.cmake
kdepim-version.h"
- if use_if_iuse kontact; then
+ if in_iuse kontact && use kontact; then
KMEXTRA+="
kontact/plugins/${PLUGINNAME:-${PN}}/"
fi
@@ -528,7 +528,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 use_if_iuse kontact || [[ ${PN} = kontact ]]; then
+ if in_iuse kontact && use 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'
