commit:     7d6756c8422726fb75d2bdca762975e06561c54b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 22:10:49 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 17:00:35 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7d6756c8

ecm.eclass: Drop Qt 5.15.7 from ECM_QTHELP Portage bug workaround

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

 eclass/ecm.eclass | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index fdcb92cf96..25e8493ecc 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -235,22 +235,13 @@ case ${ECM_QTHELP} in
                if [[ ${_KFSLOT} == 6 ]]; then
                        BDEPEND+=" dev-qt/qttools:${_KFSLOT}[doc]"
                else
-                       BDEPEND+=" doc? ( || (
-                               (
-                                       =dev-qt/qtcore-5.15.8*:5
-                                       =dev-qt/qtgui-5.15.8*:5
-                                       =dev-qt/qthelp-5.15.8*:5
-                                       =dev-qt/qtsql-5.15.8*:5
-                                       =dev-qt/qtwidgets-5.15.8*:5
-                               )
-                               (
-                                       =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
-                               )
-                       ) )"
+                       BDEPEND+=" doc? (
+                               =dev-qt/qtcore-5.15.8*:5
+                               =dev-qt/qtgui-5.15.8*:5
+                               =dev-qt/qthelp-5.15.8*:5
+                               =dev-qt/qtsql-5.15.8*:5
+                               =dev-qt/qtwidgets-5.15.8*:5
+                       )"
                fi
                ;;
        false) ;;

Reply via email to