From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 15864138359 for ; Sun, 20 Sep 2020 12:06:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 52C97E08C8; Sun, 20 Sep 2020 12:06:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3AC38E08C8 for ; Sun, 20 Sep 2020 12:06:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 19A54340B0B for ; Sun, 20 Sep 2020 12:06:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 94F3A342 for ; Sun, 20 Sep 2020 12:06:30 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1600600531.61ba5fa8fd86062875c384b1100c897bd69a8925.asturm@gentoo> Subject: [gentoo-commits] proj/kde-sunset:master commit in: eclass/ X-VCS-Repository: proj/kde-sunset X-VCS-Files: eclass/kde4-base.eclass eclass/kde4-meta.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 61ba5fa8fd86062875c384b1100c897bd69a8925 X-VCS-Branch: master Date: Sun, 20 Sep 2020 12:06:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2fbbc171-83c7-443b-869f-ab530cd4f381 X-Archives-Hash: dc2ae78dd062a74cde345931fa856b0a commit: 61ba5fa8fd86062875c384b1100c897bd69a8925 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Sep 20 11:15:31 2020 +0000 Commit: Andreas Sturmlechner gentoo 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 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'