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 51577138334 for ; Sat, 16 Jun 2018 20:25:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 21847E0839; Sat, 16 Jun 2018 20:25:56 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 DC441E0839 for ; Sat, 16 Jun 2018 20:25:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 42787335C36 for ; Sat, 16 Jun 2018 20:25:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A94A12CB for ; Sat, 16 Jun 2018 20:25:52 +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: <1529179131.58787fc6fa717c89deb23e538a8e6344559b0821.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde5.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 58787fc6fa717c89deb23e538a8e6344559b0821 X-VCS-Branch: master Date: Sat, 16 Jun 2018 20:25:52 +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-Archives-Salt: 5bef1338-5526-4183-9c68-cb508b1005be X-Archives-Hash: 6e0c5ede58dd6633c2ad751c5630e3fe commit: 58787fc6fa717c89deb23e538a8e6344559b0821 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jun 16 19:58:51 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jun 16 19:58:51 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=58787fc6 kde5.eclass: Drop use_if_iuse (implicit use of eutils.eclass) eclass/kde5.eclass | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 6aa25e69b2..7f27ac6925 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -510,12 +510,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 @@ -575,7 +575,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 @@ -619,7 +619,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 @@ -633,11 +633,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