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

[Andreas Sturmlechner]

commit:     a8e2d266582bcc9c91e3a45ac4aa41859a3f4a13
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 29 15:38:48 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 29 18:44:22 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a8e2d266

ecm.eclass: Introduce ecm_punt_kf_module and ecm_punt_qt_module

Upstream has begun replacing

	find_package(Qt5 ...)

with

	find_package(Qt${QT_MAJOR_VERSION}) ...)

for optional build with Qt6 - this breaks existing ecm_punt_bogus_dep()
regexps. There is no known usage of ecm_punt_bogus_dep with anything
else than Qt5 or KF5, so simply replace it with two public functions
fixed on Qt* and KF* module removal.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/ecm.eclass | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index baece9e6e6..9903eeef3e 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -312,6 +312,56 @@ _ecm_strip_handbook_translations() {
 	done
 }
 
+# @FUNCTION: _ecm_punt_kfqt_module
+# @USAGE: <prefix> <dependency>
+# @INTERNAL
+# @DESCRIPTION:
+# Removes a specified dependency from a find_package call with multiple
+# components.
+_ecm_punt_kfqt_module() {
+	local prefix=${1}
+	local dep=${2}
+
+	[[ ! -e "CMakeLists.txt" ]] && return
+
+	# FIXME: dep=WebKit will result in 'Widgets' over 'WebKitWidgets' (no regression)
+	pcregrep -Mni "(?s)find_package\s*\(\s*${prefix}(\d+|\\$\{\w*\})[^)]*?${dep}.*?\)" \
+		CMakeLists.txt > "${T}/bogus${dep}"
+
+	# pcregrep returns non-zero on no matches/error
+	[[ $? -ne 0 ]] && return
+
+	local length=$(wc -l "${T}/bogus${dep}" | cut -d " " -f 1)
+	local first=$(head -n 1 "${T}/bogus${dep}" | cut -d ":" -f 1)
+	local last=$(( length + first - 1))
+
+	# FIXME: may leave empty find_package($prefix) behind (no regression, non-trivial)
+	sed -e "${first},${last}s/${dep}//" -i CMakeLists.txt || die
+
+	if [[ ${length} -eq 1 ]] ; then
+		sed -e "/find_package\s*(\s*${prefix}\([0-9]|\${[A-Z0-9_]*}\)\(\s\+\(REQUIRED\|CONFIG\|COMPONENTS\|\${[A-Z0-9_]*}\)\)\+\s*)/Is/^/# removed by ecm.eclass - /" \
+			-i CMakeLists.txt || die
+	fi
+}
+
+# @FUNCTION: ecm_punt_kf_module
+# @USAGE: <modulename>
+# @DESCRIPTION:
+# Removes a Frameworks (KF - matching any single-digit version)
+# module from a find_package call with multiple components.
+ecm_punt_kf_module() {
+	_ecm_punt_kfqt_module kf ${1}
+}
+
+# @FUNCTION: ecm_punt_qt_module
+# @USAGE: <modulename>
+# @DESCRIPTION:
+# Removes a Qt (matching any single-digit version) module from a
+# find_package call with multiple components.
+ecm_punt_qt_module() {
+	_ecm_punt_kfqt_module qt ${1}
+}
+
 # @FUNCTION: ecm_punt_bogus_dep
 # @USAGE: <prefix> <dependency>
 # @DESCRIPTION: