gentoo auto-resync : 19:02:2025 - 00:15:15

3 files changed, 27 insertions, 2 deletions

diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 0af411deb382..86468fc4ed9a 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -4,9 +4,10 @@ AUX wxpython-4.2.0-no-attrdict.patch 363 BLAKE2B 2ab3735103574959e069ecd647dc003
 AUX wxpython-4.2.0-no-webkit.patch 1285 BLAKE2B 19fdee2293da214b8ae318b2670298b34b745cfefd3938be1f22c810cb1bc4273d628aa34cf427c1023d90739784d8e5c8d381e6084689876bdc336a86a3d0db SHA512 fbe6825f266443b9dec68786e26d6e3842d4dec3b9927420ecaca45a834798c8ef83a95398ea498db386e7d1c659a6a3779a5b62867296cc7244401b06db9586
 AUX wxpython-4.2.1-doxygen-1.9.7.patch 1870 BLAKE2B 383266a9dcd1dd87c6772b082964b2819b07eafe23cac785b78284fb5052e00f3a259616aecd4f8697edae59540ff1b1df3a4353749d0895b02dfb89f50e2974 SHA512 11dea33fcba746c8709984021b1d3eb283754fd8b11ae9ab27f40ac2841967e05ca156e4da7adf205cef890379d6257fdf577488d3bb568b423ec42cb20cbf60
 AUX wxpython-4.2.1-integer-division-for-randint.patch 939 BLAKE2B 4386cab3372bd8fe56979f2bdfc25bfb0d6ebc4aa80568f0bcda8c0a36a31deff454fba9e4452c62401f5c2f5a7bc94370d16aad557b00ff176fc5d4139a5ce1 SHA512 0686f0f50cd2222709cdbd336186b3bec7d5d5293bcb9dcc24c6682863ff31f94c89fd38da154373dea6eccee376cc2437ada6eaf015c1be7467f96e95b717c3
+AUX wxpython-4.2.1-sip-6.10.0.patch 851 BLAKE2B d5f87190b9a107422349c204a0998eb1fead809846946f0210c7eab6f2dda8ef06062e223c2c5c108fe6acf06b8b555c862c934444688a21f649f67c1e54ecdb SHA512 444e7f7ce562d44e621a1768f7fcae027cdcfcedd2a0c04bb885824c28212f9dbda89cf2ef36d84b80fefb0e60047ffbcffc3477338273babe96f0f61ae1ab6d
 AUX wxpython-4.2.1-x86-time.patch 1920 BLAKE2B 82d82530740b3618edac30d8d13bb1418444312ca6d82f98fd4102468b246f1f9f0510144fe07fd6597f1f5394213849ce3d195d6a94b0c0b66e308d98f54b58 SHA512 596f784a5b1b49c8f7aa2dad044f9abf03a7bdda4feb77a4e50e2573edb1b5c57996711583c92e09dbc7b29eb07a2aa152a27b379af9fb4123414f75d14737e8
 DIST wxPython-4.2.0.tar.gz 70958238 BLAKE2B 2e8e34c4f5d1992983bfe4e09bb56ee5619b139b9b3b5f05dee48ecdf6971cf9fe1b0fb22aec685904eb44db6f50a4ba132a08aa91930d809040da828efa097e SHA512 9ec937a024efb2916403c84382a66004f0c2bb07471246b7de517778309ce459e929eeb59e261f538d3fa077c950628de62e49a3760fbd03ab9ff2114c6f354f
 DIST wxPython-4.2.1.tar.gz 73724359 BLAKE2B d9569ea172c7279e0b2cfcb3cdcd5d1faab5324e2648c9b0f8c8b838fb2355dc6af28c4593e5dd0cfa02573133bf15a58a6ffa9711d854925a9cada0985dc7f8 SHA512 ee9ab8effb3c71de004c3d61ec583b9980c6b75fe9bb04cf2c76025ea70afc206bc3073c44d1c83c7ba604afed9fd38c01b9ef506617ba279a4ac58e3cf34438
 EBUILD wxpython-4.2.0.ebuild 3924 BLAKE2B 5f72d886f806375ee130a7170f239bf406961760cfd30e00e5fb3ca9d1eca9c1971e058046612636b3a574ff48f8fbc48e5a8c6044cf518ccdf3aa57871ad530 SHA512 936f595d4adeabd48c040dafd371b98a30927c73f955ff4fb29de9ea210fc67a3efd51686389e791f2ed6a384f59b8c45eab57f2e01c42d52f716e97110bd07d
-EBUILD wxpython-4.2.1-r2.ebuild 3977 BLAKE2B 35a7ee91a9ce2304762ee88020d09eac88fe69e4e679a92e9cf18da974b70c6610ce870700c5212c20cf504fb7698c30cc69f82b1e9285c65ece296d86276816 SHA512 64ba39ed8a51d0b05c7e7d2a38cc89932396ff7769b97bfe544ce90d8300c2507a4c9e2237b881a64ecb46ed938729a905d8f973d43ca6fd9b7284be34ace881
+EBUILD wxpython-4.2.1-r2.ebuild 4021 BLAKE2B d5ae34fe1dc137b1e0075091c25ab8a91dad8a4069b954b589b5732ae69bced4cd22f346ece9b84e5733505058b8f79ae9a5d60d98a9fdd96bf8726879003ed0 SHA512 e8f79de70a1808130b8c4963e3f18a458ae2841585065c9ab9a845438deb160b274fa0a734a2e4e24ae814d0f0c6405a4469f3004aebb770ed188e35e0d21f83
 MISC metadata.xml 491 BLAKE2B ffa0cccf66f484c856fb30249bd0ccc3b0da2f3ee8e3c3a0df1782bc58e4867ff99d9711f1784b44b439f2a8bcf297c1082b49a941823f046c7f2c7977a77629 SHA512 a2f5908a276a8f9c512cb59c8d17873398c91b21977371ab724e669f3b6c032d53510fbcd183a5dc340279fc522289e617b8c313c0d825ca70d0d2a5d74f8cfa
diff --git a/dev-python/wxpython/files/wxpython-4.2.1-sip-6.10.0.patch b/dev-python/wxpython/files/wxpython-4.2.1-sip-6.10.0.patch
new file mode 100644
index 000000000000..5d6751d7a8d4
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-4.2.1-sip-6.10.0.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/949510#c4
+https://github.com/wxWidgets/Phoenix/commit/de9aa4be5bb49adf82991c7582ea3c42ed505bf7.patch
+
+From de9aa4be5bb49adf82991c7582ea3c42ed505bf7 Mon Sep 17 00:00:00 2001
+From: Scott Talbert <swt@techie.net>
+Date: Sun, 9 Feb 2025 17:50:08 -0500
+Subject: [PATCH] Update SIP ABI version to 12.14
+
+We haven't supported 12.8 since before we upgraded to SIP 6.6+.
+However, SIP has not been correctly generating the correct module
+version until very recently, so generating 12.8 doesn't actually compile
+with current wxPython.
+--- a/buildtools/config.py
++++ b/buildtools/config.py
+@@ -88,7 +88,7 @@ class Configuration(object):
+     PKGDIR = 'wx'
+     # The name of the top-level package
+ 
+-    SIP_ABI = '12.8'
++    SIP_ABI = '12.14'
+     SIP_TRACE = False
+ 
+     # ---------------------------------------------------------------
diff --git a/dev-python/wxpython/wxpython-4.2.1-r2.ebuild b/dev-python/wxpython/wxpython-4.2.1-r2.ebuild
index ec62390a1579..0a82fba9a074 100644
--- a/dev-python/wxpython/wxpython-4.2.1-r2.ebuild
+++ b/dev-python/wxpython/wxpython-4.2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -60,6 +60,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.2.1-integer-division-for-randint.patch"
 	"${FILESDIR}/${PN}-4.2.1-x86-time.patch"
 	"${FILESDIR}/${PN}-4.2.1-doxygen-1.9.7.patch"
+	"${FILESDIR}/${PN}-4.2.1-sip-6.10.0.patch"
 )
 
 python_prepare_all() {