From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 893711384B4 for ; Sun, 22 Nov 2015 16:50:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AD37521C009; Sun, 22 Nov 2015 16:50:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B701621C004 for ; Sun, 22 Nov 2015 16:50:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E4B5634080E for ; Sun, 22 Nov 2015 16:50:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ACB1B1074 for ; Sun, 22 Nov 2015 16:50:24 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1448207627.5fe4b852ed90c8fc137386b5e0c8d3dff47f212e.kensington@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: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 5fe4b852ed90c8fc137386b5e0c8d3dff47f212e X-VCS-Branch: master Date: Sun, 22 Nov 2015 16:50:24 +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: 33652d98-79d1-48e2-a560-f17cb61085c9 X-Archives-Hash: 8af59c27e208b6aa4cf91a24ecfa3731 commit: 5fe4b852ed90c8fc137386b5e0c8d3dff47f212e Author: Andreas Sturmlechner gmail com> AuthorDate: Sun Nov 22 15:15:16 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sun Nov 22 15:53:47 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5fe4b852 kde5.eclass: Extend KDE_TEST=forceoptional functionality, simplify If KDE_TEST=forceoptional, it makes sense to disable test subdirs also outside KDE categories. No change for misc ebuilds using kde5.eclass. eclass/kde5.eclass | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 4253da9..ae5f394 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -455,6 +455,10 @@ kde5_src_prepare() { # only enable handbook when required if ! use_if_iuse handbook ; then comment_add_subdirectory ${KDE_DOC_DIR} + + if [[ ${KDE_HANDBOOK} = forceoptional ]] ; then + punt_bogus_dep KF5 DocTools + fi fi # enable only the requested translations @@ -488,21 +492,11 @@ kde5_src_prepare() { rm -rf po fi - # in frameworks, tests = manual tests so never - # build them + # in frameworks, tests = manual tests so never build them if [[ ${CATEGORY} = kde-frameworks ]]; then comment_add_subdirectory tests fi - if [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma || ${CATEGORY} = kde-apps ]] ; then - # only build unit tests when required - if ! use_if_iuse test ; then - comment_add_subdirectory autotests - comment_add_subdirectory test - comment_add_subdirectory tests - fi - fi - case ${KDE_PUNT_BOGUS_DEPS} in false) ;; *) @@ -515,15 +509,18 @@ kde5_src_prepare() { ;; esac - if [[ ${KDE_HANDBOOK} = forceoptional ]] ; then - if ! use_if_iuse handbook ; then - punt_bogus_dep KF5 DocTools - fi - fi - - if [[ ${KDE_TEST} = forceoptional ]] ; then - if ! use_if_iuse test ; then + # only build unit tests when required + if ! use_if_iuse test ; then + if [[ ${KDE_TEST} = forceoptional ]] ; then punt_bogus_dep Qt5 Test + # if forceoptional, also cover non-kde categories + comment_add_subdirectory autotests + comment_add_subdirectory test + comment_add_subdirectory tests + elif [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma || ${CATEGORY} = kde-apps ]] ; then + comment_add_subdirectory autotests + comment_add_subdirectory test + comment_add_subdirectory tests fi fi