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 7F4D8158089 for ; Sat, 9 Sep 2023 17:49:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BC5292BC024; Sat, 9 Sep 2023 17:49:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 A40302BC024 for ; Sat, 9 Sep 2023 17:49:39 +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 E2893335C56 for ; Sat, 9 Sep 2023 17:49:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6E93F106D for ; Sat, 9 Sep 2023 17:49:37 +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: <1694277566.2d2bdb49ec5b099004dbd939e2709b198a678d84.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: 2d2bdb49ec5b099004dbd939e2709b198a678d84 X-VCS-Branch: master Date: Sat, 9 Sep 2023 17:49:37 +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: 6bca13b0-9f02-441a-a220-a91734c991b4 X-Archives-Hash: 6fd81128303f2fd7fbc9e8079972a4e6 commit: 2d2bdb49ec5b099004dbd939e2709b198a678d84 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Sep 9 11:09:20 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Sep 9 16:39:26 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2d2bdb49 ecm.eclass: Drop supposedly obsolete dev-qt/qthelp crutch for Portage Bug: https://bugs.gentoo.org/836726 Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/ecm.eclass | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index dfbc005701..9d79189127 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -235,10 +235,6 @@ 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" @@ -247,13 +243,7 @@ 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 - )" + BDEPEND+=" doc? ( dev-qt/qthelp:${_KFSLOT} )" fi ;; false) ;;