Skip to content

Commit d438435

Browse files
committed
ecm.eclass: Drop obsolete KF version quirks
ECM_PYTHON_BINDINGS was only used since KF6. Signed-off-by: Andreas Sturmlechner <[email protected]>
1 parent 1c0bae1 commit d438435

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

eclass/ecm.eclass

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@ fi
113113
# @ECLASS_VARIABLE: ECM_PYTHON_BINDINGS
114114
# @DESCRIPTION:
115115
# Default value is "false", which means do nothing.
116-
# If set to "off", pass -DBUILD_PYTHON_BINDINGS=OFF to mycmakeargs, and also
117-
# disable cmake finding Python3, PySide6 and Shiboken6 to make it quiet.
116+
# If set to "off", pass -DBUILD_PYTHON_BINDINGS=OFF to mycmakeargs.
118117
# No other value is implemented as python bindings are not supported in Gentoo.
119118
: "${ECM_PYTHON_BINDINGS:=false}"
120119

@@ -125,7 +124,9 @@ fi
125124
# If set to "true", add "doc" to IUSE, add the appropriate dependency, let
126125
# -DBUILD_QCH=ON generate and install Qt compressed help files when USE=doc.
127126
# If set to "false", do nothing.
128-
if [[ ${CATEGORY} = kde-frameworks ]] && ver_test -lt 6.15; then
127+
if [[ ${CATEGORY} = kde-frameworks && ${_KFSLOT} == 5 ]]; then
128+
# TODO: Implement KF 6.15 changes how API documentation is built. See also:
129+
# https://mail.kde.org/pipermail/distributions/2025-June/001595.html
129130
: "${ECM_QTHELP:=true}"
130131
fi
131132
: "${ECM_QTHELP:=false}"
@@ -562,12 +563,12 @@ ecm_src_prepare() {
562563

563564
# limit playing field of locale stripping to kde-*/ categories
564565
if [[ ${CATEGORY} = kde-* ]] ; then
565-
# TODO: cleanup after KF5 removal and pre-KF-6.16 cleanup:
566+
# TODO: cleanup after KF5 removal:
566567
# always install unconditionally for <kconfigwidgets-6.16 - if you use
567568
# language X as system language, and there is a combobox with language
568569
# names, the translated language name for language Y is taken from
569570
# /usr/share/locale/Y/kf${_KFSLOT}_entry.desktop
570-
if ! { [[ ${PN} == kconfigwidgets ]] && ver_test -lt 6.16; } ; then
571+
if ! [[ ${PN} == kconfigwidgets && ${_KFSLOT} == 5 ]]; then
571572
_ecm_strip_handbook_translations
572573
fi
573574
fi
@@ -644,9 +645,6 @@ ecm_src_configure() {
644645

645646
if [[ ${ECM_PYTHON_BINDINGS} == off ]]; then
646647
cmakeargs+=( -DBUILD_PYTHON_BINDINGS=OFF )
647-
if ver_test -lt 6.15; then
648-
cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_{Python3,PySide6,Shiboken6}=ON )
649-
fi
650648
fi
651649

652650
if [[ ${ECM_QTHELP} = true ]]; then

0 commit comments

Comments
 (0)