gentoo auto-resync : 26:04:2023 - 06:14:16

3 files changed, 3 insertions, 102 deletions

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 0de5bbe32ee4..0d7dc18314fe 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,15 +1,14 @@
 AUX kicad-6.0.6-unitialized-variable-fix.patch 592 BLAKE2B b26757a1e9d4115616a721fdba7527cb72d489ae75976f9967f24cd12735b6f090a71bdb0c7d632d33ada0b3dc77f0d7f9370d02c34d83bd0afebb608621b85d SHA512 2f1e81132e87858f789833bd05fdda2309fc344c1535295c6308e3058bed85edbfd9900a0529e1489eb6f87bb27146a7dec2893a10d311c43b7117c00beba948
 AUX kicad-6.0.9-gcc-13.patch 1094 BLAKE2B 6b09be7cfcc6895fd6d744c8755959c501ce7dfab1a4759cd1999d2dd172273f36c4091554743109a1a52c8ea98896ee04795070eda943a24669e73e94319177 SHA512 fd2924c8f8faea50da3defaedd3d4b6f89654d18a108c07e5e38277d70397856e493e33601bc632ceca5a62981501f136bbbba0462a68b421db72d0aa9dd55e2
 AUX kicad-7.0.0-werror.patch 682 BLAKE2B 268cf848679ffb5b5aa2389a6392986f908c64861fb6908a864ae41d788f8ac10a21d30b7a20b98409cad7f57191958f9d95d448be7c8070806c585c03d7ce8a SHA512 c30b9a080cc74687b44fb5e547d746c4e3298096e9ffa1bf5a7a2b477efb8d05db8adad7255d6b92eb2c00f739e4fcd79b9c198b3122265d26edc1db5cb4ee5e
-AUX kicad-7.0.0-wxwidgets-version.patch 3627 BLAKE2B 7a0382db010a9ec07069c16d1f87c5763fc8372f2c4be35384d8349cb03e4096d09a9020a2fc2155082ea8a44267f83cdc52d32972cff320e7ec038307ac81d0 SHA512 62a48794fcf609d2a844d23e66715afa4eaae31fe227c965cf368dcad47fbd41557527720218cf3bc25822612ce277a67609b057f5e0dc852cdd5de104bf1b10
 AUX kicad-scripts-install-fix.patch 442 BLAKE2B 321ca8c5e846023696576daea00aa827ad88a4c3e82d120bd07392892b61d0e63892732f5469b1fe1472eac9584175acbc7aa611171f6fb9285017826156b30c SHA512 5abb158ec7e8a5ef8049797886e26febc018499dd7f5c8defdf9104b59371efa05cbec8e19e8fe22295e8e54c30095d347cccfa4c43db62b6ac4eb07bb8a080e
 DIST kicad-6.0.11.tar.bz2 34083016 BLAKE2B 85662dd57eb5f28498317b1554e703efdebaa470f749ca239b2caeae4c366005a7c9bb1d1ba6375ed80d277efabf09b56d3e7e1e82bf93462b4ba5405445157e SHA512 9827be9f2c18be1ab3bc5a1a3bd3d6297bc69b561e43b0f9010cb49009c3e87f1d320034411ecc0a2277b5686923a3d4bcc507278590814309d10de14463266d
 DIST kicad-6.0.9.tar.bz2 34045371 BLAKE2B 797f1d10a5405751bc51ec9579c5c50c21b56761c8b59ae99e8a52e50a787f1271053eb4d36e5c2483adee277764ea75300dd50c62a2addeb540e748bf8b93fe SHA512 015335de5d9bbd4acdff8dd7da85847ea0b666d3d4dd0d4c9e7b731cc516cb3575ade231e742a089cc5591ef9e4059f2bedc83677fa85220b9e6cb8ef5776305
-DIST kicad-7.0.0.tar.bz2 42583715 BLAKE2B 24fefe73bce6254bb47fdf21e8a82b7752e3f58cb3ea61220f0cf008c6570a4378f15bad54b81cc9257ec223bdb6128ccfd33f356e738b112c7b0e9481257255 SHA512 cb6f4cf6eee9a583d3a622bf8e48e5b604b047df0d742081cff1e5e387cf97cc1cd3f03fb58a17b44c47085634b95eea642bd1a6805e80807dbe0473c8d19d96
 DIST kicad-7.0.1.tar.bz2 42744121 BLAKE2B cb6005be531027e02c5c3fa03be54dff00720aa9c36d12d1e619e041da05e5b4efd048be4e01021cf225a35cd638a162f4b620b65ec117027092a5bf650cb1ec SHA512 6b3f32073a0667c745be54fccf1660cc81b560ad7613eb2355956b48567d7e82ce6926ab04d374fe88dcaa1220357997f5f4621e6d635effcd3d698e45a37516
+DIST kicad-7.0.2.tar.bz2 42844186 BLAKE2B 136d68b3174cde74db96b1197c62da1fb4e54f628f73a6e0ea092c713b529863d9e443b6631a0ecbb55e2d299a7b78b8218d05e605f8ae8f5972915147ec140f SHA512 04d7e39815f9e87b8646f25fb7e1b82bcf2bc63e26e078f3175c37a2c2e0a2bb7771e70e4698dbfc496f112a733668bdc746eefd1a9c4c76d0b36696738026a4
 EBUILD kicad-6.0.11.ebuild 4399 BLAKE2B 1ca4411dd01828e1371ef52167dfcaed6889af78d7df6643945a2a91d70d4180e428fff13dd5caea20f274df175b8abd826e4621eead75be994a21072bfc12ab SHA512 bdb215a6d0f2f9e4e91c463110ef0e83593c70f78d331f2277c655192ca12aa7985c3e2990dacfcddf26034e29521c7d018b4d93abb107272b32b5ed6eeccdb6
 EBUILD kicad-6.0.9-r1.ebuild 4427 BLAKE2B 6645e57532a9635b0e97ba4cc92c676fa0a7ecf8380812552c598f88b5354d30f138dbef8f4aaec084ba21eadc2ee48874554fd55041522205522626e1908a23 SHA512 8e8d77a85e05ea0a759b8d726b533b84cd01fd86b37de3cb57085684e6c59d43d13447e4e8f45a2ac3bed164705f0282d6b5d6c941faaa414f062643913f8d6d
-EBUILD kicad-7.0.0-r1.ebuild 4290 BLAKE2B 13650af670f2d65468abb762c629752c0092d53f390de03302d4c1cf2fc3244f06c41b6573d5c1f611d5c7de4c8379fc41b819e6ae78230e34f666aa1809bb5d SHA512 17ed8e4091350cb33fe5152523cf8fddd051fbc9527c3002dd0c3279eb25117051a41950f01240963ed71c8f7348d0ae967ea15290432aa6c6d4f187079f8566
 EBUILD kicad-7.0.1.ebuild 4203 BLAKE2B 1064d6734730d7fcaeb15ea16b9c71670c046d41c3310461c12a54eb0938ff7be592c26a7fd05363847a9436c8ee0b2e720e4eec80502a1aa8ca955760b33e8e SHA512 47d9cdc5515689d0c02a1e005eb613cf977510cf3f22f6fadcc6977f70d2e7f1c28a6ccfa2b76c5af5d01a2f3995d42ad2f49a4085ea832cfa60fc0f0a0465c8
+EBUILD kicad-7.0.2.ebuild 4204 BLAKE2B 02bddb5c564879a0d4961224ddb7b6d979859cb3400bb171b21f8ea8f4b3ab9fb3a75409958c87fea09c6e3b059740ffb1321872cacab2a25e57471f5bcc441b SHA512 e2d31146181217e6983ed5867efefd36802e461b7d4f63ee7cefd83b403bcd6aff8379e019a46277bf891b82572bc674d28882ad86b14ae64bbbf8609f9f203a
 EBUILD kicad-9999.ebuild 4204 BLAKE2B 02bddb5c564879a0d4961224ddb7b6d979859cb3400bb171b21f8ea8f4b3ab9fb3a75409958c87fea09c6e3b059740ffb1321872cacab2a25e57471f5bcc441b SHA512 e2d31146181217e6983ed5867efefd36802e461b7d4f63ee7cefd83b403bcd6aff8379e019a46277bf891b82572bc674d28882ad86b14ae64bbbf8609f9f203a
 MISC metadata.xml 922 BLAKE2B bfdb3ce1ee74c7b6f2da1a5fbe7835e2114af83b594edabab7b7674000462ee6963acee3bb1f384bed0b4a36b0529aebdab801fe3a482b23e742d9186e7684b2 SHA512 575659f3c5d0fc74469ff14f8abaf58776f1d0ffdd16b85e9f617d3e956d2d0c1c7f70aeebf02aa5c7afadcea0e0a589e6fb16f160b398482524fa7ce592ba4e
diff --git a/sci-electronics/kicad/files/kicad-7.0.0-wxwidgets-version.patch b/sci-electronics/kicad/files/kicad-7.0.0-wxwidgets-version.patch
deleted file mode 100644
index 9ef12e97b573..000000000000
--- a/sci-electronics/kicad/files/kicad-7.0.0-wxwidgets-version.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From b536580119c59fde78e38d8d6388f2540ecb6cf9 Mon Sep 17 00:00:00 2001
-From: Ian McInerney <ian.s.mcinerney@ieee.org>
-Date: Mon, 13 Feb 2023 21:24:26 +0000
-Subject: [PATCH] Support subrelease field in wxWidgets cmake detection
-
-Sometimes wxWidgets increments the subrelease to a non-zero value, and
-since wxPython will report a subrelease, we must ensure we can get the
-subrelease from the wx library properly, otherwise configure will fail
-thinking the library isn't the same version as that used by wxPython.
-
-Fixes: https://gitlab.com/kicad/code/kicad/-/issues/13887
---- a/cmake/FindwxWidgets.cmake
-+++ b/cmake/FindwxWidgets.cmake
-@@ -926,8 +926,17 @@ if(wxWidgets_FOUND)
-     "\\2" wxWidgets_VERSION_MINOR "${_wx_version_h}" )
-   string(REGEX REPLACE "^(.*\n)?#define +wxRELEASE_NUMBER +([0-9]+).*"
-     "\\2" wxWidgets_VERSION_PATCH "${_wx_version_h}" )
--  set(wxWidgets_VERSION_STRING
--    "${wxWidgets_VERSION_MAJOR}.${wxWidgets_VERSION_MINOR}.${wxWidgets_VERSION_PATCH}" )
-+  string(REGEX REPLACE "^(.*\n)?#define +wxSUBRELEASE_NUMBER +([0-9]+).*"
-+    "\\2" wxWidgets_VERSION_SUBRELEASE "${_wx_version_h}" )
-+
-+  if( ${wxWidgets_VERSION_SUBRELEASE} GREATER 0 )
-+    set(wxWidgets_VERSION_STRING
-+      "${wxWidgets_VERSION_MAJOR}.${wxWidgets_VERSION_MINOR}.${wxWidgets_VERSION_PATCH}.${wxWidgets_VERSION_SUBRELEASE}" )
-+  else()
-+    set(wxWidgets_VERSION_STRING
-+      "${wxWidgets_VERSION_MAJOR}.${wxWidgets_VERSION_MINOR}.${wxWidgets_VERSION_PATCH}" )
-+  endif()
-+
-   DBG_MSG("wxWidgets_VERSION_STRING:    ${wxWidgets_VERSION_STRING}")
- endif()
- 
--- 
-From 1e8cc6855d6a8fc1f9dfc933224c3a10fb759f9c Mon Sep 17 00:00:00 2001
-From: Ian McInerney <ian.s.mcinerney@ieee.org>
-Date: Tue, 14 Feb 2023 00:18:56 +0000
-Subject: [PATCH] Relax wxPython version mismatch check to major.minor
-
-The previous version check failed when the version was even slightly
-different, including on the revision field. Theoretically the ABI of the
-wx minor versions in use should be the same, so this might work. On the
-other hand, with wxPython it could break as well. YOLO.
---- a/scripting/python_scripting.cpp
-+++ b/scripting/python_scripting.cpp
-@@ -50,6 +50,7 @@
- #include <kiplatform/environment.h>
- 
- #include <wx/app.h>
-+#include <wx/regex.h>
- #include <wx/utils.h>
- 
- #include <config.h>
-@@ -128,7 +129,39 @@ except:
-                                            wxVI.GetMajor(), wxVI.GetMinor(), wxVI.GetMicro() );
-         version = version.Mid( idx + 10 );
- 
--        if( wxVersion.Cmp( version ) != 0 )
-+        int wxPy_major = 0;
-+        int wxPy_minor = 0;
-+        int wxPy_micro = 0;
-+        int wxPy_rev   = 0;
-+
-+        // Compile a regex to extract the wxPython version
-+        wxRegEx re( "([0-9]+)\\.([0-9]+)\\.?([0-9]+)?\\.?([0-9]+)?" );
-+        wxASSERT( re.IsValid() );
-+
-+        if( re.Matches( version ) )
-+        {
-+            wxString v = re.GetMatch( version, 1 );
-+
-+            if( !v.IsEmpty() )
-+                v.ToInt( &wxPy_major );
-+
-+            v = re.GetMatch( version, 2 );
-+
-+            if( !v.IsEmpty() )
-+                v.ToInt( &wxPy_minor );
-+
-+            v = re.GetMatch( version, 3 );
-+
-+            if( !v.IsEmpty() )
-+                v.ToInt( &wxPy_micro );
-+
-+            v = re.GetMatch( version, 4 );
-+
-+            if( !v.IsEmpty() )
-+                v.ToInt( &wxPy_rev );
-+        }
-+
-+        if( ( wxVI.GetMajor() != wxPy_major ) || ( wxVI.GetMinor() != wxPy_minor ) )
-         {
-             wxString msg = wxT( "The wxPython library was compiled against wxWidgets %s but KiCad is "
-                                 "using %s.  Python plugins will not be available." );
--- 
diff --git a/sci-electronics/kicad/kicad-7.0.0-r1.ebuild b/sci-electronics/kicad/kicad-7.0.2.ebuild
index a6db98a4f37a..b017e4c3fe9d 100644
--- a/sci-electronics/kicad/kicad-7.0.0-r1.ebuild
+++ b/sci-electronics/kicad/kicad-7.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 WX_GTK_VER="3.2-gtk3"
 
 inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
@@ -75,9 +75,6 @@ fi
 CHECKREQS_DISK_BUILD="900M"
 
 PATCHES=(
-	# https://bugs.gentoo.org/895188
-	"${FILESDIR}"/${PN}-7.0.0-wxwidgets-version.patch
-
 	"${FILESDIR}"/${PN}-7.0.0-werror.patch
 )