From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1482041-garchives=archives.gentoo.org@lists.gentoo.org>
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) server-digest SHA256)
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 26C0015800F
for <garchives@archives.gentoo.org>; Sun, 29 Jan 2023 17:01:06 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 4A257E0817;
Sun, 29 Jan 2023 17:01:05 +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) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 2DE9DE0817
for <gentoo-commits@lists.gentoo.org>; Sun, 29 Jan 2023 17:01:05 +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 EA72D335CF4
for <gentoo-commits@lists.gentoo.org>; Sun, 29 Jan 2023 17:01:03 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 2D10B88C
for <gentoo-commits@lists.gentoo.org>; Sun, 29 Jan 2023 17:01:02 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
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" <asturm@gentoo.org>
Message-ID: <1675011635.7d6756c8422726fb75d2bdca762975e06561c54b.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: 7d6756c8422726fb75d2bdca762975e06561c54b
X-VCS-Branch: master
Date: Sun, 29 Jan 2023 17:01:02 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: c9363185-14f5-4b05-a0a2-6357ac5aa595
X-Archives-Hash: fbb0d4c30111ebecbc9d8103cbb33f53
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) ;;