commit: 2d2bdb49ec5b099004dbd939e2709b198a678d84 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Sep 9 11:09:20 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Sep 9 16:39:26 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2d2bdb49
ecm.eclass: Drop supposedly obsolete dev-qt/qthelp crutch for Portage Bug: https://bugs.gentoo.org/836726 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> eclass/ecm.eclass | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index dfbc005701..9d79189127 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -235,10 +235,6 @@ case ${ECM_HANDBOOK} in ;; esac -# Unfortunately, Portage has no concept of BDEPEND=dev-qt/qthelp being broken -# by having only partially updated Qt dependencies, which means it will order -# dev-qt/qthelp revdeps in build queue before its own Qt dependencies, leaving -# qhelpgenerator broken. This is an attempt to help with that. Bug #836726 case ${ECM_QTHELP} in true) IUSE+=" doc" @@ -247,13 +243,7 @@ case ${ECM_QTHELP} in if [[ ${_KFSLOT} == 6 ]]; then BDEPEND+=" dev-qt/qttools:${_KFSLOT}[assistant]" else - BDEPEND+=" doc? ( - =dev-qt/qtcore-5.15.10*:5 - =dev-qt/qtgui-5.15.10*:5 - =dev-qt/qthelp-5.15.10*:5 - =dev-qt/qtsql-5.15.10*:5 - =dev-qt/qtwidgets-5.15.10*:5 - )" + BDEPEND+=" doc? ( dev-qt/qthelp:${_KFSLOT} )" fi ;; false) ;;
