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 1642D15801B for ; Sat, 8 Apr 2023 13:39:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 51D61E07F6; Sat, 8 Apr 2023 13:39:08 +0000 (UTC) Received: from smtp.gentoo.org (mail.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3825FE07F6 for ; Sat, 8 Apr 2023 13:39:08 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6BB603410A9 for ; Sat, 8 Apr 2023 13:39:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A82FA8C9 for ; Sat, 8 Apr 2023 13:39:05 +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: <1680961110.67c3e2d94b37c393f635bb64a86e646272531160.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/ecm.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 67c3e2d94b37c393f635bb64a86e646272531160 X-VCS-Branch: master Date: Sat, 8 Apr 2023 13:39:05 +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: 4fce0eed-f1fc-4f89-bb8c-07be0003eb60 X-Archives-Hash: 02d48e3989e8eafcf63bb3e834c7f2d4 commit: 67c3e2d94b37c393f635bb64a86e646272531160 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Apr 8 13:38:30 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Apr 8 13:38:30 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=67c3e2d9 ecm.eclass: Add Qt 5.15.9 to ECM_QTHELP Portage bug workaround Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/ecm.eclass | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index 139be799fe..80019b0ed7 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -235,13 +235,22 @@ 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 - )" + BDEPEND+=" doc? ( || ( + ( + =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.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) ;;