From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 21341158009 for ; Sat, 17 Jun 2023 20:37:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5FF48E088F; Sat, 17 Jun 2023 20:37:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4AB3FE088F for ; Sat, 17 Jun 2023 20:37:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6E2AA335DAD for ; Sat, 17 Jun 2023 20:37:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E3326A66 for ; Sat, 17 Jun 2023 20:37:52 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1687034249.3295a12234dc319f8ae3af1181ed5e868716d3e0.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/ecm.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 3295a12234dc319f8ae3af1181ed5e868716d3e0 X-VCS-Branch: master Date: Sat, 17 Jun 2023 20:37:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 22f52c98-3788-41e9-876b-ea2568b6cf2b X-Archives-Hash: 4fcf86924b5d632f7d74b71fb8faebcd commit: 3295a12234dc319f8ae3af1181ed5e868716d3e0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jun 17 20:36:52 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jun 17 20:37:29 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3295a122 ecm.eclass: Add Qt 5.15.10 to ECM_QTHELP Portage bug workaround Closes: https://bugs.gentoo.org/908715 Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/ecm.eclass | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index ae7e44706b0e..af9fadcf4733 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -232,12 +232,21 @@ case ${ECM_QTHELP} in COMMONDEPEND+=" doc? ( dev-qt/qt-docs:${KFSLOT} )" BDEPEND+=" doc? ( >=app-doc/doxygen-1.8.13-r1 - ( - =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 + || ( + ( + =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 + ) ) )" ;;