commit:     0ad1e01237a766fdb531d735bfbec1cc0fc20793
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 11:51:58 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 24 11:51:58 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0ad1e012

ecm.eclass: Drop Qt 5.15.9 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 c0d46ce0e0..dfbc005701 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -247,22 +247,13 @@ 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
-                               )
-                               (
-                                       =dev-qt/qtcore-5.15.9*:5
-                                       =dev-qt/qtgui-5.15.9*:5
-                                       =dev-qt/qthelp-5.15.9*:5
-                                       =dev-qt/qtsql-5.15.9*:5
-                                       =dev-qt/qtwidgets-5.15.9*:5
-                               )
-                       ) )"
+                       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
+                       )"
                fi
                ;;
        false) ;;

Reply via email to