From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1690241-garchives=archives.gentoo.org@lists.gentoo.org>
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 2DEDA158042
for <garchives@archives.gentoo.org>; Fri, 15 Nov 2024 21:37:48 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 58F8CE093D;
Fri, 15 Nov 2024 21:37:47 +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 43307E093D
for <gentoo-commits@lists.gentoo.org>; Fri, 15 Nov 2024 21:37:47 +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 876FF343021
for <gentoo-commits@lists.gentoo.org>; Fri, 15 Nov 2024 21:37:46 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 2AEDB156C
for <gentoo-commits@lists.gentoo.org>; Fri, 15 Nov 2024 21:37:45 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
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" <asturm@gentoo.org>
Message-ID: <1731706504.4f010ce671199685d51a86f173424bf63e82f01e.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: 4f010ce671199685d51a86f173424bf63e82f01e
X-VCS-Branch: master
Date: Fri, 15 Nov 2024 21:37:45 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 39ce3fd9-6fb3-4617-b8a9-ddd54aee739c
X-Archives-Hash: 044f36e199657d9c2c79b1d1d82c6fc1
commit: 4f010ce671199685d51a86f173424bf63e82f01e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 15 21:35:04 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 15 21:35:04 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4f010ce6
ecm.eclass: Drop checks for _FRAMEWORKS_KDE_ORG_ECLASS in global scope
Other eclass' guard variables are not accessible in global scope.
This (mostly) reverts commit 5f34bb1bd9f2349f3ab3bfd09522b7fbb12c4042.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
eclass/ecm.eclass | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index a75f362665..cd5c9971ad 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 release groups except KDE Frameworks, assume we are
-# building a GUI application. Add dependency on kde-frameworks/breeze-icons or
+# By default, for all CATEGORIES 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 [[ -n ${_FRAMEWORKS_KDE_ORG_ECLASS} ]] ; then
+if [[ ${CATEGORY} = kde-frameworks ]] ; then
: "${ECM_NONGUI:=true}"
fi
: "${ECM_NONGUI:=false}"
@@ -119,11 +119,11 @@ fi
# @ECLASS_VARIABLE: ECM_QTHELP
# @DEFAULT_UNSET
# @DESCRIPTION:
-# Default value for all release groups except KDE Frameworks is "false".
+# Default value for all CATEGORIES 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 [[ -n ${_FRAMEWORKS_KDE_ORG_ECLASS} ]]; then
+if [[ ${CATEGORY} = kde-frameworks ]]; 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 KDE Frameworks where it is set to
-# "true". If set to "false", do nothing.
+# 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. 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 [[ -n ${_FRAMEWORKS_KDE_ORG_ECLASS} ]]; then
+if [[ ${CATEGORY} = kde-frameworks ]]; 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 [[ -n ${_FRAMEWORKS_KDE_ORG_ECLASS} ]]; then
+if [[ ${CATEGORY} = kde-frameworks ]]; 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 [[ -n ${_FRAMEWORKS_KDE_ORG_ECLASS} ]]; then
+if [[ ${CATEGORY} == kde-frameworks ]]; then
ver_test ${KFMIN} -ge 5.240 && _KFSLOT=6
else
if [[ ${KFMIN/.*} == 6 ]] || $(ver_test ${KFMIN} -ge 5.240); then