[gentoo-commits] proj/kde:master commit in: eclass/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     6f9549ca8ae59e7c6d38d686ce356f04f91e9318
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 18 20:29:29 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:41:41 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6f9549ca

*.eclass: @ECLASS-VARIABLE renamed to @ECLASS_VARIABLE

Bug: https://bugs.gentoo.org/835396
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass   | 22 +++++++++++-----------
 eclass/ecm.eclass     | 28 ++++++++++++++--------------
 eclass/kde.org.eclass | 20 ++++++++++----------
 3 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index f0a59a2ac4..29f973794b 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -28,7 +28,7 @@ _CMAKE_ECLASS=1
 
 inherit flag-o-matic multiprocessing ninja-utils toolchain-funcs xdg-utils
 
-# @ECLASS-VARIABLE: BUILD_DIR
+# @ECLASS_VARIABLE: BUILD_DIR
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # Build directory where all cmake processed files should be generated.
@@ -38,13 +38,13 @@ inherit flag-o-matic multiprocessing ninja-utils toolchain-funcs xdg-utils
 [[ ${EAPI} == 7 ]] && : ${BUILD_DIR:=${WORKDIR}/${P}_build}
 # EAPI-8: set inside _cmake_check_build_dir
 
-# @ECLASS-VARIABLE: CMAKE_BINARY
+# @ECLASS_VARIABLE: CMAKE_BINARY
 # @DESCRIPTION:
 # Eclass can use different cmake binary than the one provided in by system.
 : ${CMAKE_BINARY:=cmake}
 
 [[ ${EAPI} == 7 ]] && : ${CMAKE_BUILD_TYPE:=Gentoo}
-# @ECLASS-VARIABLE: CMAKE_BUILD_TYPE
+# @ECLASS_VARIABLE: CMAKE_BUILD_TYPE
 # @DESCRIPTION:
 # Set to override default CMAKE_BUILD_TYPE. Only useful for packages
 # known to make use of "if (CMAKE_BUILD_TYPE MATCHES xxx)".
@@ -57,12 +57,12 @@ inherit flag-o-matic multiprocessing ninja-utils toolchain-funcs xdg-utils
 # In EAPI 7, the default was non-standard build type of Gentoo.
 : ${CMAKE_BUILD_TYPE:=RelWithDebInfo}
 
-# @ECLASS-VARIABLE: CMAKE_IN_SOURCE_BUILD
+# @ECLASS_VARIABLE: CMAKE_IN_SOURCE_BUILD
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # Set to enable in-source build.
 
-# @ECLASS-VARIABLE: CMAKE_MAKEFILE_GENERATOR
+# @ECLASS_VARIABLE: CMAKE_MAKEFILE_GENERATOR
 # @PRE_INHERIT
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -71,7 +71,7 @@ inherit flag-o-matic multiprocessing ninja-utils toolchain-funcs xdg-utils
 # The default is set to "ninja".
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 
-# @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES_LIST
+# @ECLASS_VARIABLE: CMAKE_REMOVE_MODULES_LIST
 # @PRE_INHERIT
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -90,25 +90,25 @@ else
 	fi
 fi
 
-# @ECLASS-VARIABLE: CMAKE_USE_DIR
+# @ECLASS_VARIABLE: CMAKE_USE_DIR
 # @DESCRIPTION:
 # Sets the directory where we are working with cmake, for example when
 # application uses autotools and only one plugin needs to be done by cmake.
 # By default it uses current working directory (in EAPI-7: ${S}).
 
-# @ECLASS-VARIABLE: CMAKE_VERBOSE
+# @ECLASS_VARIABLE: CMAKE_VERBOSE
 # @DESCRIPTION:
 # Set to OFF to disable verbose messages during compilation
 : ${CMAKE_VERBOSE:=ON}
 
-# @ECLASS-VARIABLE: CMAKE_WARN_UNUSED_CLI
+# @ECLASS_VARIABLE: CMAKE_WARN_UNUSED_CLI
 # @DESCRIPTION:
 # Warn about variables that are declared on the command line
 # but not used. Might give false-positives.
 # "no" to disable (default) or anything else to enable.
 : ${CMAKE_WARN_UNUSED_CLI:=yes}
 
-# @ECLASS-VARIABLE: CMAKE_EXTRA_CACHE_FILE
+# @ECLASS_VARIABLE: CMAKE_EXTRA_CACHE_FILE
 # @USER_VARIABLE
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -116,7 +116,7 @@ fi
 # for econf and is needed to pass TRY_RUN results when cross-compiling.
 # Should be set by user in a per-package basis in /etc/portage/package.env.
 
-# @ECLASS-VARIABLE: CMAKE_QA_SRC_DIR_READONLY
+# @ECLASS_VARIABLE: CMAKE_QA_SRC_DIR_READONLY
 # @USER_VARIABLE
 # @DEFAULT_UNSET
 # @DESCRIPTION:

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index a0ba4090ce..042280b77f 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -29,7 +29,7 @@ esac
 if [[ -z ${_ECM_ECLASS} ]]; then
 _ECM_ECLASS=1
 
-# @ECLASS-VARIABLE: VIRTUALX_REQUIRED
+# @ECLASS_VARIABLE: VIRTUALX_REQUIRED
 # @DESCRIPTION:
 # For proper description see virtualx.eclass manpage.
 # Here we redefine default value to be manual, if your package needs virtualx
@@ -38,7 +38,7 @@ _ECM_ECLASS=1
 
 inherit cmake flag-o-matic toolchain-funcs virtualx
 
-# @ECLASS-VARIABLE: ECM_NONGUI
+# @ECLASS_VARIABLE: ECM_NONGUI
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # By default, for all CATEGORIES except kde-frameworks, assume we are building
@@ -54,31 +54,31 @@ if [[ ${ECM_NONGUI} = false ]] ; then
 	inherit xdg
 fi
 
-# @ECLASS-VARIABLE: ECM_KDEINSTALLDIRS
+# @ECLASS_VARIABLE: ECM_KDEINSTALLDIRS
 # @DESCRIPTION:
 # Assume the package is using KDEInstallDirs macro and switch
 # KDE_INSTALL_USE_QT_SYS_PATHS to ON. If set to "false", do nothing.
 : ${ECM_KDEINSTALLDIRS:=true}
 
-# @ECLASS-VARIABLE: ECM_DEBUG
+# @ECLASS_VARIABLE: ECM_DEBUG
 # @DESCRIPTION:
 # Add "debug" to IUSE. If !debug, add -DQT_NO_DEBUG to CPPFLAGS. If set to
 # "false", do nothing.
 : ${ECM_DEBUG:=true}
 
-# @ECLASS-VARIABLE: ECM_DESIGNERPLUGIN
+# @ECLASS_VARIABLE: ECM_DESIGNERPLUGIN
 # @DESCRIPTION:
 # If set to "true", add "designer" to IUSE to toggle build of designer plugins
 # and add the necessary BDEPEND. If set to "false", do nothing.
 : ${ECM_DESIGNERPLUGIN:=false}
 
-# @ECLASS-VARIABLE: ECM_EXAMPLES
+# @ECLASS_VARIABLE: ECM_EXAMPLES
 # @DESCRIPTION:
 # By default unconditionally ignore a top-level examples subdirectory.
 # If set to "true", add "examples" to IUSE to toggle adding that subdirectory.
 : ${ECM_EXAMPLES:=false}
 
-# @ECLASS-VARIABLE: ECM_HANDBOOK
+# @ECLASS_VARIABLE: ECM_HANDBOOK
 # @DESCRIPTION:
 # Will accept "true", "false", "optional", "forceoptional". If set to "false",
 # do nothing.
@@ -92,20 +92,20 @@ fi
 # CMakeLists.txt in addition to the above.
 : ${ECM_HANDBOOK:=false}
 
-# @ECLASS-VARIABLE: ECM_HANDBOOK_DIR
+# @ECLASS_VARIABLE: ECM_HANDBOOK_DIR
 # @DESCRIPTION:
 # Specifies the directory containing the docbook file(s) relative to ${S} to
 # be processed by KF5DocTools (kdoctools_install).
 : ${ECM_HANDBOOK_DIR:=doc}
 
-# @ECLASS-VARIABLE: ECM_PO_DIRS
+# @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.
 : ${ECM_PO_DIRS:="po poqm"}
 
-# @ECLASS-VARIABLE: ECM_QTHELP
+# @ECLASS_VARIABLE: ECM_QTHELP
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # Default value for all CATEGORIES except kde-frameworks is "false".
@@ -117,7 +117,7 @@ if [[ ${CATEGORY} = kde-frameworks ]]; then
 fi
 : ${ECM_QTHELP:=false}
 
-# @ECLASS-VARIABLE: ECM_TEST
+# @ECLASS_VARIABLE: ECM_TEST
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # Will accept "true", "false", "optional", "forceoptional",
@@ -139,7 +139,7 @@ if [[ ${CATEGORY} = kde-frameworks ]]; then
 fi
 : ${ECM_TEST:=false}
 
-# @ECLASS-VARIABLE: KFMIN
+# @ECLASS_VARIABLE: KFMIN
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # Minimum version of Frameworks to require. Default value for kde-frameworks
@@ -151,7 +151,7 @@ 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.
@@ -255,7 +255,7 @@ DEPEND+=" ${COMMONDEPEND}"
 RDEPEND+=" ${COMMONDEPEND}"
 unset COMMONDEPEND
 
-# @ECLASS-VARIABLE: KDE_GCC_MINIMAL
+# @ECLASS_VARIABLE: KDE_GCC_MINIMAL
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # Minimum version of active GCC to require. This is checked in

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 2ddde6a865..e4bde18bfb 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -23,7 +23,7 @@ esac
 if [[ -z ${_KDE_ORG_ECLASS} ]]; then
 _KDE_ORG_ECLASS=1
 
-# @ECLASS-VARIABLE: KDE_BUILD_TYPE
+# @ECLASS_VARIABLE: KDE_BUILD_TYPE
 # @DESCRIPTION:
 # If PV matches "*9999*", this is automatically set to "live".
 # Otherwise, this is automatically set to "release".
@@ -37,7 +37,7 @@ if [[ ${KDE_BUILD_TYPE} == live ]]; then
 	inherit git-r3
 fi
 
-# @ECLASS-VARIABLE: KDE_ORG_CATEGORIES
+# @ECLASS_VARIABLE: KDE_ORG_CATEGORIES
 # @INTERNAL
 # @DESCRIPTION:
 # Map of ${CATEGORY}=<upstream category> key-value pairs.
@@ -79,14 +79,14 @@ declare -A KDE_ORG_CATEGORIES=(
 )
 readonly KDE_ORG_CATEGORIES
 
-# @ECLASS-VARIABLE: KDE_ORG_CATEGORY
+# @ECLASS_VARIABLE: KDE_ORG_CATEGORY
 # @PRE_INHERIT
 # @DESCRIPTION:
 # If unset, default value is mapped from ${CATEGORY} to corresponding upstream
 # category on invent.kde.org, with "kde" as fallback value.
 : ${KDE_ORG_CATEGORY:=${KDE_ORG_CATEGORIES[${CATEGORY}]:-kde}}
 
-# @ECLASS-VARIABLE: KDE_ORG_COMMIT
+# @ECLASS_VARIABLE: KDE_ORG_COMMIT
 # @PRE_INHERIT
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -94,14 +94,14 @@ readonly KDE_ORG_CATEGORIES
 # invent.kde.org repository identified by KDE_ORG_CATEGORY and KDE_ORG_NAME
 # at the desired COMMIT ID.
 
-# @ECLASS-VARIABLE: KDE_ORG_NAME
+# @ECLASS_VARIABLE: KDE_ORG_NAME
 # @PRE_INHERIT
 # @DESCRIPTION:
 # If unset, default value is set to ${PN}.
 # Name of the package as hosted on kde.org mirrors.
 : ${KDE_ORG_NAME:=$PN}
 
-# @ECLASS-VARIABLE: KDE_GEAR
+# @ECLASS_VARIABLE: KDE_GEAR
 # @PRE_INHERIT
 # @DESCRIPTION:
 # Mark package is being part of KDE Gear release schedule.
@@ -113,7 +113,7 @@ if [[ ${CATEGORY} == kde-apps ]]; then
 	KDE_GEAR=true
 fi
 
-# @ECLASS-VARIABLE: KDE_SELINUX_MODULE
+# @ECLASS_VARIABLE: KDE_SELINUX_MODULE
 # @PRE_INHERIT
 # @DESCRIPTION:
 # If set to "none", do nothing.
@@ -129,7 +129,7 @@ case ${KDE_SELINUX_MODULE} in
 		;;
 esac
 
-# @ECLASS-VARIABLE: KDE_UNRELEASED
+# @ECLASS_VARIABLE: KDE_UNRELEASED
 # @INTERNAL
 # @DESCRIPTION:
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
@@ -248,7 +248,7 @@ _kde.org_calculate_live_repo() {
 
 	SRC_URI=""
 
-	# @ECLASS-VARIABLE: EGIT_MIRROR
+	# @ECLASS_VARIABLE: EGIT_MIRROR
 	# @DESCRIPTION:
 	# This variable allows easy overriding of default kde mirror service
 	# (anongit) with anything else you might want to use.
@@ -266,7 +266,7 @@ _kde.org_calculate_live_repo() {
 		EGIT_BRANCH="Plasma/$(ver_cut 1-2)"
 	fi
 
-	# @ECLASS-VARIABLE: EGIT_REPONAME
+	# @ECLASS_VARIABLE: EGIT_REPONAME
 	# @DESCRIPTION:
 	# This variable allows overriding of default repository
 	# name. Specify only if this differs from PN and KDE_ORG_NAME.