commit:     5f34bb1bd9f2349f3ab3bfd09522b7fbb12c4042
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 20:16:57 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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
 }

Reply via email to