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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C4E4C158042 for ; Fri, 15 Nov 2024 21:08:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F206AE0938; Fri, 15 Nov 2024 21:08:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 D4E0AE0938 for ; Fri, 15 Nov 2024 21:08:29 +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 F1ED834301E for ; Fri, 15 Nov 2024 21:08:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 51E1C1E89 for ; Fri, 15 Nov 2024 21:08:26 +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: <1731704768.5f34bb1bd9f2349f3ab3bfd09522b7fbb12c4042.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: 5f34bb1bd9f2349f3ab3bfd09522b7fbb12c4042 X-VCS-Branch: master Date: Fri, 15 Nov 2024 21:08:26 +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: 7884132c-4710-4c14-b336-2b0882291216 X-Archives-Hash: bbac269ad78cbfd67cae5f4a5b90cb79 commit: 5f34bb1bd9f2349f3ab3bfd09522b7fbb12c4042 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Nov 10 20:16:57 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Nov 15 21:06:08 2024 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5f34bb1b ecm.eclass: CATEGORY=kde-frameworks -> -n _FRAMEWORKS_KDE_ORG_ECLASS Not all Frameworks packages are always in kde-frameworks category - sometimes they are moving - but they all inherit frameworks.kde.org.eclass. Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/ecm.eclass | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index 9a2019e5f4..a75f362665 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -45,11 +45,11 @@ fi # @ECLASS_VARIABLE: ECM_NONGUI # @DEFAULT_UNSET # @DESCRIPTION: -# By default, for all CATEGORIES except kde-frameworks, assume we are building -# a GUI application. Add dependency on kde-frameworks/breeze-icons or +# By default, for all release groups except KDE Frameworks, assume we are +# building a GUI application. Add dependency on kde-frameworks/breeze-icons or # kde-frameworks/oxygen-icons and run the xdg.eclass routines for pkg_preinst, # pkg_postinst and pkg_postrm. If set to "true", do nothing. -if [[ ${CATEGORY} = kde-frameworks ]] ; then +if [[ -n ${_FRAMEWORKS_KDE_ORG_ECLASS} ]] ; then : "${ECM_NONGUI:=true}" fi : "${ECM_NONGUI:=false}" @@ -119,11 +119,11 @@ fi # @ECLASS_VARIABLE: ECM_QTHELP # @DEFAULT_UNSET # @DESCRIPTION: -# Default value for all CATEGORIES except kde-frameworks is "false". +# Default value for all release groups except KDE Frameworks is "false". # If set to "true", add "doc" to IUSE, add the appropriate dependency, let # -DBUILD_QCH=ON generate and install Qt compressed help files when USE=doc. # If set to "false", do nothing. -if [[ ${CATEGORY} = kde-frameworks ]]; then +if [[ -n ${_FRAMEWORKS_KDE_ORG_ECLASS} ]]; then : "${ECM_QTHELP:=true}" fi : "${ECM_QTHELP:=false}" @@ -142,8 +142,8 @@ fi # @DESCRIPTION: # Will accept "true", "false", "forceoptional", and "forceoptional-recursive". # For KF5-based ebuilds, additionally accepts "optional". -# Default value is "false", except for CATEGORY=kde-frameworks where it is -# set to "true". If set to "false", do nothing. +# Default value is "false", except for KDE Frameworks where it is set to +# "true". If set to "false", do nothing. # For any other value, add "test" to IUSE. If set to "forceoptional", ignore # "autotests", "test", "tests" subdirs from top-level CMakeLists.txt when # USE=!test. If set to "forceoptional-recursive", make autotest(s), unittest(s) @@ -155,7 +155,7 @@ fi # dependency if set to "forceoptional*" with USE=!test. # If set to "optional", build with -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=ON # when USE=!test. -if [[ ${CATEGORY} = kde-frameworks ]]; then +if [[ -n ${_FRAMEWORKS_KDE_ORG_ECLASS} ]]; then : "${ECM_TEST:=true}" fi : "${ECM_TEST:=false}" @@ -168,7 +168,7 @@ fi # is ${PV} and 5.116.0 baseline for everything else. # If set to >=5.240, KF6/Qt6 is assumed thus SLOT=6 dependencies added and # -DQT_MAJOR_VERSION=6 added to cmake args. -if [[ ${CATEGORY} = kde-frameworks ]]; then +if [[ -n ${_FRAMEWORKS_KDE_ORG_ECLASS} ]]; then : "${KFMIN:=$(ver_cut 1-2)}" fi : "${KFMIN:=5.116.0}" @@ -181,7 +181,7 @@ fi # 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 [[ -n ${_FRAMEWORKS_KDE_ORG_ECLASS} ]]; then ver_test ${KFMIN} -ge 5.240 && _KFSLOT=6 else if [[ ${KFMIN/.*} == 6 ]] || $(ver_test ${KFMIN} -ge 5.240); then @@ -572,7 +572,7 @@ ecm_src_prepare() { fi # in frameworks, tests = manual tests so never build them - if [[ ${CATEGORY} = kde-frameworks ]] && [[ ${PN} != extra-cmake-modules ]]; then + if [[ -n ${_FRAMEWORKS_KDE_ORG_ECLASS} ]] && [[ ${PN} != extra-cmake-modules ]]; then cmake_comment_add_subdirectory tests fi }