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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7E283158020 for ; Sun, 11 Dec 2022 21:24:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D8F8CE08C4; Sun, 11 Dec 2022 21:24:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C1E2BE089C for ; Sun, 11 Dec 2022 21:24:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 123223411DF for ; Sun, 11 Dec 2022 21:24:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E887472B for ; Sun, 11 Dec 2022 21:24:33 +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: <1670793864.cbe952b4c0118d5d180810e3c16031f895f06428.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/ecm.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: cbe952b4c0118d5d180810e3c16031f895f06428 X-VCS-Branch: master Date: Sun, 11 Dec 2022 21:24:33 +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: 9b84aedc-3cec-4c45-aecb-98dd5e5f63ee X-Archives-Hash: 4bfa62515ab2fa9a46852d9efa80f083 commit: cbe952b4c0118d5d180810e3c16031f895f06428 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Dec 11 18:50:30 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Dec 11 21:24:24 2022 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=cbe952b4 ecm.eclass: Initial support for Qt6-based consumers Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/ecm.eclass | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index 61d41d43ee..1827f07b1d 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -151,11 +151,12 @@ if [[ ${CATEGORY} = kde-frameworks ]]; then fi : ${KFMIN:=5.82.0} -# @ECLASS_VARIABLE: KFSLOT +# @ECLASS_VARIABLE: _KFSLOT # @INTERNAL # @DESCRIPTION: # KDE Frameworks and Qt slot dependency, implied by KFMIN version. -: ${KFSLOT:=5} +: ${_KFSLOT:=5} +[[ ${KFMIN/.*} == 6 ]] && _KFSLOT=6 case ${ECM_NONGUI} in true) ;; @@ -186,7 +187,11 @@ esac case ${ECM_DESIGNERPLUGIN} in true) IUSE+=" designer" - BDEPEND+=" designer? ( dev-qt/designer:${KFSLOT} )" + if [[ ${_KFSLOT} == 6 ]]; then + BDEPEND+=" designer? ( dev-qt/qttools:${_KFSLOT}[designer] )" + else + BDEPEND+=" designer? ( dev-qt/designer:${_KFSLOT} )" + fi ;; false) ;; *) @@ -209,7 +214,7 @@ esac case ${ECM_HANDBOOK} in true|optional|forceoptional) IUSE+=" +handbook" - BDEPEND+=" handbook? ( >=kde-frameworks/kdoctools-${KFMIN}:${KFSLOT} )" + BDEPEND+=" handbook? ( >=kde-frameworks/kdoctools-${KFMIN}:${_KFSLOT} )" ;; false) ;; *) @@ -225,17 +230,19 @@ esac case ${ECM_QTHELP} in true) IUSE+=" doc" - COMMONDEPEND+=" doc? ( dev-qt/qt-docs:${KFSLOT} )" - BDEPEND+=" doc? ( - >=app-doc/doxygen-1.8.13-r1 - ( + COMMONDEPEND+=" doc? ( dev-qt/qt-docs:${_KFSLOT} )" + BDEPEND+=" doc? ( >=app-doc/doxygen-1.8.13-r1 )" + if [[ ${_KFSLOT} == 6 ]]; then + BDEPEND+=" dev-qt/qttools:${_KFSLOT}[doc]" + else + BDEPEND+=" doc? ( =dev-qt/qtcore-5.15.7*:5 =dev-qt/qtgui-5.15.7*:5 =dev-qt/qthelp-5.15.7*:5 =dev-qt/qtsql-5.15.7*:5 =dev-qt/qtwidgets-5.15.7*:5 - ) - )" + )" + fi ;; false) ;; *) @@ -247,7 +254,11 @@ esac case ${ECM_TEST} in true|optional|forceoptional|forceoptional-recursive) IUSE+=" test" - DEPEND+=" test? ( dev-qt/qttest:${KFSLOT} )" + if [[ ${_KFSLOT} == 6 ]]; then + DEPEND+=" test? ( dev-qt/qtbase:${_KFSLOT}[test] )" + else + DEPEND+=" test? ( dev-qt/qttest:${_KFSLOT} )" + fi RESTRICT+=" !test? ( test )" ;; false) ;; @@ -258,11 +269,15 @@ case ${ECM_TEST} in esac BDEPEND+=" - >=kde-frameworks/extra-cmake-modules-${KFMIN}:${KFSLOT} + >=kde-frameworks/extra-cmake-modules-${KFMIN}:${_KFSLOT} dev-libs/libpcre2:* " RDEPEND+=" >=kde-frameworks/kf-env-4" -COMMONDEPEND+=" dev-qt/qtcore:${KFSLOT}" +if [[ ${_KFSLOT} == 6 ]]; then + COMMONDEPEND+=" dev-qt/qtbase:${_KFSLOT}" +else + COMMONDEPEND+=" dev-qt/qtcore:${_KFSLOT}" +fi DEPEND+=" ${COMMONDEPEND}" RDEPEND+=" ${COMMONDEPEND}"