diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-11-30 01:22:10 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-11-30 01:22:10 +0000 |
| commit | f616ce4660c92a3fcb4f05663c2ab47c9defa0c3 (patch) | |
| tree | 66ba5228853030737ae2dd9c9894b96266213246 /eclass/ecm.eclass | |
| parent | 1bfb8c3d7e00e7ff828008510f5a7568c81d8889 (diff) | |
gentoo auto-resync : 30:11:2022 - 01:22:10
Diffstat (limited to 'eclass/ecm.eclass')
| -rw-r--r-- | eclass/ecm.eclass | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index 47992dbc86ca..c2d91a2cb851 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -218,13 +218,32 @@ 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" COMMONDEPEND+=" doc? ( dev-qt/qt-docs:${KFSLOT} )" BDEPEND+=" doc? ( >=app-doc/doxygen-1.8.13-r1 - dev-qt/qthelp:${KFSLOT} + || ( + ( + =dev-qt/qtcore-5.15.7*:5 + =dev-qt/qtgui-5.15.7*:5 + =dev-qt/qthelp-5.15.7*:5 + =dev-qt/qtsql-5.15.7*:5 + =dev-qt/qtwidgets-5.15.7*:5 + ) + ( + =dev-qt/qtcore-5.15.5*:5 + =dev-qt/qtgui-5.15.5*:5 + =dev-qt/qthelp-5.15.5*:5 + =dev-qt/qtsql-5.15.5*:5 + =dev-qt/qtwidgets-5.15.5*:5 + ) + ) )" ;; false) ;; |