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 EA8551384B4 for ; Wed, 4 Nov 2015 17:23:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8428221C001; Wed, 4 Nov 2015 17:23:35 +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 28BF821C001 for ; Wed, 4 Nov 2015 17:23:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 397BD34069F for ; Wed, 4 Nov 2015 17:23:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0B6A9200E for ; Wed, 4 Nov 2015 17:23:32 +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: <1446657774.a987517f8c83ba8028d8dae005f11b0466a32a55.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: a987517f8c83ba8028d8dae005f11b0466a32a55 X-VCS-Branch: master Date: Wed, 4 Nov 2015 17:23:32 +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: 9a2259bd-252d-449f-8249-c8f0ff6b9685 X-Archives-Hash: 1b0d849049c4424b8c2aa69e7e55cedb commit: a987517f8c83ba8028d8dae005f11b0466a32a55 Author: Michael Palimaka gentoo org> AuthorDate: Wed Nov 4 17:20:02 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed Nov 4 17:22:54 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a987517f kde5.eclass: introduce "forceoptional" value for KDE_HANDBOOK eclass/kde5.eclass | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 315779f..4ddcea7 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -80,6 +80,8 @@ fi # If set to "false", do nothing. # Otherwise, add "+handbook" to IUSE, add the appropriate dependency, and # generate and install KDE handbook. +# If set to "forceoptional", remove a KF5DocTools dependency from the root +# CMakeLists.txt in addition to the above. : ${KDE_HANDBOOK:=false} # @ECLASS-VARIABLE: KDE_DOC_DIR @@ -471,7 +473,7 @@ kde5_src_prepare() { popd > /dev/null || die fi - if [[ ${KDE_HANDBOOK} = true && -d ${KDE_DOC_DIR} && ${CATEGORY} != kde-apps ]] ; then + if [[ ${KDE_HANDBOOK} != false && -d ${KDE_DOC_DIR} && ${CATEGORY} != kde-apps ]] ; then pushd ${KDE_DOC_DIR} > /dev/null || die for lang in *; do if ! has ${lang} ${LINGUAS} ; then @@ -511,6 +513,12 @@ kde5_src_prepare() { ;; esac + if [[ ${KDE_HANDBOOK} = forceoptional ]] ; then + if ! use_if_iuse handbook ; then + punt_bogus_dep KF5 DocTools + fi + fi + cmake-utils_src_prepare }