From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1645961-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 14FF915817D
	for <garchives@archives.gentoo.org>; Sun, 23 Jun 2024 11:09:20 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 58713E2A95;
	Sun, 23 Jun 2024 11:09:19 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
	(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 3759FE2A95
	for <gentoo-commits@lists.gentoo.org>; Sun, 23 Jun 2024 11:09:19 +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 47897342FA3
	for <gentoo-commits@lists.gentoo.org>; Sun, 23 Jun 2024 11:09:18 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id A1C801C65
	for <gentoo-commits@lists.gentoo.org>; Sun, 23 Jun 2024 11:09:16 +0000 (UTC)
From: "David Seifert" <soap@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, "David Seifert" <soap@gentoo.org>
Message-ID: <1719140945.ddd27285d37ae7e9ebc54367d1144079ae967529.soap@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/wxpython/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-python/wxpython/wxpython-4.2.1-r2.ebuild
X-VCS-Directories: dev-python/wxpython/
X-VCS-Committer: soap
X-VCS-Committer-Name: David Seifert
X-VCS-Revision: ddd27285d37ae7e9ebc54367d1144079ae967529
X-VCS-Branch: master
Date: Sun, 23 Jun 2024 11:09:16 +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: 167d38fd-3085-464d-9710-acc5b7c6147c
X-Archives-Hash: f66cb167efae328db35925ca7932c00a

commit:     ddd27285d37ae7e9ebc54367d1144079ae967529
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 23 11:09:05 2024 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jun 23 11:09:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddd27285

dev-python/wxpython: fix building against >=sip-6.8.4

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-python/wxpython/wxpython-4.2.1-r2.ebuild | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dev-python/wxpython/wxpython-4.2.1-r2.ebuild b/dev-python/wxpython/wxpython-4.2.1-r2.ebuild
index ffdc1114156b..ec62390a1579 100644
--- a/dev-python/wxpython/wxpython-4.2.1-r2.ebuild
+++ b/dev-python/wxpython/wxpython-4.2.1-r2.ebuild
@@ -67,6 +67,13 @@ python_prepare_all() {
 		eapply "${FILESDIR}/${PN}-4.2.0-no-webkit.patch"
 	fi
 
+	# sip assumes unconditional C99 support since 6.8.4
+	# which breaks when trying to use "sip/siplib/bool.cpp"
+	# https://github.com/Python-SIP/sip/commit/29fb3df49ff37df7aab9d5666fd72de95ac9e7f8
+	if has_version ">=dev-python/sip-6.8.4"; then
+		sed -i '\|sip/siplib/bool\.cpp|d' wscript || die
+	fi
+
 	distutils-r1_python_prepare_all
 }