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 D40CF158099 for ; Sat, 25 Nov 2023 23:34:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29E3A2BC02C; Sat, 25 Nov 2023 23:34:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 15E492BC02C for ; Sat, 25 Nov 2023 23:34:57 +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 5F46334081F for ; Sat, 25 Nov 2023 23:34:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ED14913E4 for ; Sat, 25 Nov 2023 23:34:54 +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: <1700954747.45e6c18e9550643b5dfe337f06a46910290cf0c4.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: 45e6c18e9550643b5dfe337f06a46910290cf0c4 X-VCS-Branch: master Date: Sat, 25 Nov 2023 23:34:54 +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: 2f4bf1d7-aa64-44f0-a4ad-92025b88d184 X-Archives-Hash: ea42c808c17214092f5149e38fabdab7 commit: 45e6c18e9550643b5dfe337f06a46910290cf0c4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Nov 19 12:28:03 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Nov 25 23:25:47 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=45e6c18e ecm.eclass: Use _KFSLOT to aptly configure KF5/KF6 based packages Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/ecm.eclass | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index 6b870688a1..6e194c97e2 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -87,26 +87,27 @@ fi # Will accept "true", "false", "optional", "forceoptional". If set to "false", # do nothing. # Otherwise, add "+handbook" to IUSE, add the appropriate dependency, and let -# KF5DocTools generate and install the handbook from docbook file(s) found in -# ECM_HANDBOOK_DIR. However if !handbook, disable build of ECM_HANDBOOK_DIR -# in CMakeLists.txt. -# If set to "optional", build with -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON -# when !handbook. In case package requires KF5KDELibs4Support, see next: -# If set to "forceoptional", remove a KF5DocTools dependency from the root -# CMakeLists.txt in addition to the above. +# KF${_KFSLOT}DocTools generate and install the handbook from docbook file(s) +# found in ECM_HANDBOOK_DIR. However if !handbook, disable build of +# ECM_HANDBOOK_DIR in CMakeLists.txt. +# If set to "optional", build with +# -DCMAKE_DISABLE_FIND_PACKAGE_KF${_KFSLOT}DocTools=ON when !handbook. In case +# package requires KF5KDELibs4Support, see next: +# If set to "forceoptional", remove a KF${_KFSLOT}DocTools dependency from the +# root CMakeLists.txt in addition to the above. : "${ECM_HANDBOOK:=false}" # @ECLASS_VARIABLE: ECM_HANDBOOK_DIR # @DESCRIPTION: # Specifies the directory containing the docbook file(s) relative to ${S} to -# be processed by KF5DocTools (kdoctools_install). +# be processed by KF${_KFSLOT}DocTools (kdoctools_install). : "${ECM_HANDBOOK_DIR:=doc}" # @ECLASS_VARIABLE: ECM_PO_DIRS # @DESCRIPTION: # Specifies directories of l10n files relative to ${S} to be processed by -# KF5I18n (ki18n_install). If IUSE nls exists and is disabled then disable -# build of these directories in CMakeLists.txt. +# KF${_KFSLOT}I18n (ki18n_install). If IUSE nls exists and is disabled then +# disable build of these directories in CMakeLists.txt. : "${ECM_PO_DIRS:="po poqm"}" # @ECLASS_VARIABLE: ECM_QTHELP @@ -128,14 +129,14 @@ fi # "forceoptional-recursive". # Default value is "false", except for CATEGORY=kde-frameworks where it is # set to "true". If set to "false", do nothing. -# For any other value, add "test" to IUSE and DEPEND on dev-qt/qttest:5. -# If set to "optional", build with -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=ON -# when USE=!test. -# If set to "forceoptional", punt Qt5Test dependency and ignore "autotests", +# For any other value, add "test" to IUSE and DEPEND on dev-qt/qtbase:6[test] +# (for KF5: dev-qt/qttest:5). If set to "optional", build with +# -DCMAKE_DISABLE_FIND_PACKAGE_Qt${_KFSLOT}Test=ON when USE=!test. If set +# to "forceoptional", punt Qt${_KFSLOT}Test dependency and ignore "autotests", # "test", "tests" subdirs from top-level CMakeLists.txt when USE=!test. -# If set to "forceoptional-recursive", punt Qt5Test dependencies and make -# autotest(s), unittest(s) and test(s) subdirs from *any* CMakeLists.txt in -# ${S} and below conditional on BUILD_TESTING when USE=!test. This is always +# If set to "forceoptional-recursive", punt Qt${_KFSLOT}Test dependencies and +# make autotest(s), unittest(s) and test(s) subdirs from *any* CMakeLists.txt +# in ${S} and below conditional on BUILD_TESTING when USE=!test. This is always # meant as a short-term fix and creates ${T}/${P}-tests-optional.patch to # refine and submit upstream. if [[ ${CATEGORY} = kde-frameworks ]]; then @@ -158,7 +159,10 @@ fi # @ECLASS_VARIABLE: _KFSLOT # @INTERNAL # @DESCRIPTION: -# KDE Frameworks and Qt slot dependency, implied by KFMIN version. +# KDE Frameworks and Qt main slot dependency, implied by KFMIN version, *not* +# necessarily the package's SLOT. This is being used throughout the eclass to +# depend on either :5 or :6 Qt/KF packages as well as setting correctly +# prefixed cmake args. : "${_KFSLOT:=5}" if [[ ${CATEGORY} == kde-frameworks ]]; then if [[ ${PV} != 5.9999 ]] && $(ver_test ${KFMIN} -ge 5.240); then @@ -489,7 +493,7 @@ ecm_src_prepare() { # always install unconditionally for kconfigwidgets - if you use # language X as system language, and there is a combobox with language # names, the translated language name for language Y is taken from - # /usr/share/locale/Y/kf5_entry.desktop + # /usr/share/locale/Y/kf${_KFSLOT}_entry.desktop [[ ${PN} != kconfigwidgets ]] && _ecm_strip_handbook_translations fi @@ -551,12 +555,12 @@ ecm_src_configure() { cmakeargs+=( -DBUILD_TESTING=OFF ) if [[ ${ECM_TEST} = optional ]] ; then - cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=ON ) + cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt${_KFSLOT}Test=ON ) fi fi if [[ ${ECM_HANDBOOK} = optional ]] ; then - cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=$(usex !handbook) ) + cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF${_KFSLOT}DocTools=$(usex !handbook) ) fi if in_iuse designer && [[ ${ECM_DESIGNERPLUGIN} = true ]]; then