From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1444089-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))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 2BD27158094
for <garchives@archives.gentoo.org>; Thu, 6 Oct 2022 16:15:49 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 55C47E0794;
Thu, 6 Oct 2022 16:15:48 +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 3D70FE0794
for <gentoo-commits@lists.gentoo.org>; Thu, 6 Oct 2022 16:15:48 +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 683AC335DB7
for <gentoo-commits@lists.gentoo.org>; Thu, 6 Oct 2022 16:15:47 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 0082255B
for <gentoo-commits@lists.gentoo.org>; Thu, 6 Oct 2022 16:15:45 +0000 (UTC)
From: "Sam James" <sam@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, "Sam James" <sam@gentoo.org>
Message-ID: <1665072926.b9bfff99769df96416c910d095b414c76386bd02.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
X-VCS-Directories: dev-qt/qtwebengine/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: b9bfff99769df96416c910d095b414c76386bd02
X-VCS-Branch: master
Date: Thu, 6 Oct 2022 16:15:45 +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: 10ddf610-c4da-4ae1-9e70-ac22ca327874
X-Archives-Hash: bf0f1f0394b19783270c0743d698f955
commit: b9bfff99769df96416c910d095b414c76386bd02
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 6 16:14:26 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 6 16:15:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9bfff99
dev-qt/qtwebengine: fix has_version default-libcxx test for Clang
We moved the flag to sys-devel/clang-common to prepare for proper
config file support (which is backported to 15.0.2, although it's
going to be better in 16.x).
Go for the hack for now, but keep the bug open as we want to
switch to the proper link test from the LLVM ebuilds.
Bug: https://bugs.gentoo.org/875641
Bug: https://bugs.gentoo.org/875563
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
index b1d2486b0259..2e0e639465d3 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
@@ -200,8 +200,10 @@ src_prepare() {
fi
# src/3rdparty/gn fails with libc++ due to passing of `-static-libstdc++`
- if tc-is-clang && has_version 'sys-devel/clang[default-libcxx]'; then
- eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
+ if tc-is-clang ; then
+ if has_version 'sys-devel/clang[default-libcxx(-)]' || has_version 'sys-devel/clang-common[default-libcxx(-)]' ; then
+ eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
+ fi
fi
if use system-ffmpeg && has_version '>=media-video/ffmpeg-5'; then