summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
Diffstat (limited to 'eclass')
-rw-r--r--eclass/Manifest.gzbin39145 -> 39150 bytes
-rw-r--r--eclass/ecm.eclass12
2 files changed, 1 insertions, 11 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index e98fbe309997..abd2a7c91235 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
Binary files differ
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 6c15154bad98..76e20b0e3148 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -222,23 +222,13 @@ 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/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
- )
+ dev-qt/qthelp:${KFSLOT}
)"
;;
false) ;;