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 0797F139695 for ; Sat, 8 Jul 2017 16:48:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 126FB2340D6; Sat, 8 Jul 2017 16:48:49 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E12892340D4 for ; Sat, 8 Jul 2017 16:48:48 +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 A357E341B30 for ; Sat, 8 Jul 2017 16:48:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 866087499 for ; Sat, 8 Jul 2017 16:48:45 +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: <1499532502.a28709efa9b879c54517fe302980260ec9c7848c.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: a28709efa9b879c54517fe302980260ec9c7848c X-VCS-Branch: master Date: Sat, 8 Jul 2017 16:48:45 +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: d0138d27-9d49-4b08-8cb8-a6f8e7d94e35 X-Archives-Hash: f2c27dcb92251dc17251a345ec1a23dc commit: a28709efa9b879c54517fe302980260ec9c7848c Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jul 8 14:57:46 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jul 8 16:48:22 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a28709ef kde5.eclass: Fix KDE_QTHELP, switch USE=qthelp -> doc eclass/kde5.eclass | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index e5e5fb2400..b4cfadc9df 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -82,10 +82,13 @@ EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_ # @ECLASS-VARIABLE: KDE_QTHELP # @DESCRIPTION: # If set to "false", do nothing. -# Otherwise, add "+qthelp" to IUSE, add the appropriate dependency, and -# generate and install Qt compressed help files. -# If set to "optional", config with -DBUILD_QCH=ON when USE=qthelp. -: ${KDE_QTHELP:=false} +# Otherwise, add "doc" to IUSE, add the appropriate dependency, generate +# and install Qt compressed help files with -DBUILD_QCH=ON when USE=doc. +if [[ ${CATEGORY} = kde-frameworks && ( $(get_version_component_range 2) -ge 36 || ${KDE_BUILD_TYPE} = live ) ]]; then + : ${KDE_QTHELP:=true} +else + : ${KDE_QTHELP:=false} +fi # @ECLASS-VARIABLE: KDE_TEST # @DESCRIPTION: @@ -152,8 +155,6 @@ SLOT=5 if [[ ${CATEGORY} = kde-frameworks ]]; then KDE_SUBSLOT=true - [[ $(get_version_component_range 2) -ge 36 || ${KDE_BUILD_TYPE} = live ]] && \ - KDE_QTHELP=true fi case ${KDE_SUBSLOT} in @@ -236,9 +237,9 @@ esac case ${KDE_QTHELP} in false) ;; *) - IUSE+=" +qthelp" - COMMONDEPEND+=" qthelp? ( $(add_qt_dep qt-docs) )" - DEPEND+=" qthelp? ( + IUSE+=" doc" + COMMONDEPEND+=" doc? ( $(add_qt_dep qt-docs) )" + DEPEND+=" doc? ( $(add_qt_dep qthelp) >=app-doc/doxygen-1.8.13-r1 )" @@ -669,8 +670,8 @@ kde5_src_configure() { cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON ) fi - if use_if_iuse qthelp ; then - cmakeargs+=( -DBUILD_QCH=ON ) + if [[ ${KDE_QTHELP} != false ]]; then + cmakeargs+=( -DBUILD_QCH=$(usex doc) ) fi # install mkspecs in the same directory as qt stuff