gentoo resync : 29.12.2022

5 files changed, 29 insertions, 10 deletions

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 5c18fb6f67fb..e2a79eb27bf2 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -2,10 +2,11 @@ AUX kicad-5.1.5-help.patch 4660 BLAKE2B c0521bea600748605dd581c34d63b6d084225d33
 AUX kicad-5.1.5-ldflags.patch 890 BLAKE2B 2c5436fccb50886faacd84102ba7bfefa84986a5d65ea70965d2f0ded81e746e544f774bdfc0c539114dbafa3de7340bc41ea5af7a5db8a54b706221cafee7ee SHA512 4fda20a73499df81614dd920d18767d901269375d17749982d2c51cf595c873531379ac8ef57b1fc7adc1f4f028907002135f2e0fccaf4ee753184298e7cf8fd
 AUX kicad-5.1.5-strict-aliasing.patch 916 BLAKE2B e17c085d09d5b028424d72036e6306aecf19300fa5ecc38e0a3b4f7668ed8e41aa7c66f5f6dc68f6a66905fea8947647de90788fe2ca5439703b3fe2010b287e SHA512 1000ea7dd6fef283d144ccd9d6193a68a399177e06b1f45cae5642f7c2854d16d3cf4d789f8444c6aa36028f23b7d66c6de7596ffef57c4ecdc28747fac84636
 AUX kicad-5.1.6-metainfo.patch 1740 BLAKE2B 26987940c5326d5fa27eb7a00bfec8af2bc7d4f61b937f4a12aaf08665c1d9a5d2816b154c76e954f80f7c8c620861e290988bafb3af071ae059bfb92113a2f2 SHA512 bf1b9d7adc23759e9b637f2d2f3d2843f1ef33a27c02f7e892a74a8743dfdcf635f918010f0bcc4a62ba0f7e939f89fa8c7786a761ffe709f670a0d6f63b3146
+AUX kicad-6.0.6-unitialized-variable-fix.patch 592 BLAKE2B b26757a1e9d4115616a721fdba7527cb72d489ae75976f9967f24cd12735b6f090a71bdb0c7d632d33ada0b3dc77f0d7f9370d02c34d83bd0afebb608621b85d SHA512 2f1e81132e87858f789833bd05fdda2309fc344c1535295c6308e3058bed85edbfd9900a0529e1489eb6f87bb27146a7dec2893a10d311c43b7117c00beba948
 AUX kicad-scripts-install-fix.patch 442 BLAKE2B 321ca8c5e846023696576daea00aa827ad88a4c3e82d120bd07392892b61d0e63892732f5469b1fe1472eac9584175acbc7aa611171f6fb9285017826156b30c SHA512 5abb158ec7e8a5ef8049797886e26febc018499dd7f5c8defdf9104b59371efa05cbec8e19e8fe22295e8e54c30095d347cccfa4c43db62b6ac4eb07bb8a080e
 DIST kicad-5.1.12.tar.bz2 18581842 BLAKE2B f04369fecded6fb07376efa209ddf5fcc693e73018ed728003529cdd0e6ef4a059c28106db1acf18834d938c3fbe4b9df5b5c8e0874989d35f74cf67414e6c76 SHA512 c0e5ad5b360ef788b427755aa71eeaec1a19b7520a00bb94fafba47e291f6ba067c598004efd515287800cd41f7da399d0389121e53e9669026c62f21b0a65ea
-DIST kicad-6.0.4.tar.gz 45068438 BLAKE2B d77a68de7baa472a05666159183d5d528461624dbe791f3e7b00dad6292c8134ec371c2c21cb56e01a76738dc239284188b1bee7202b8eb14cf932bb7c570169 SHA512 3134aee924bf0aab6f12a7e9663d081ec038a2ccb2e6854be8ad8b1f71b36a9f286938101adb4ca0fa56487eecffd42691bb8737113bcaffcc56a2f68f6a9908
-EBUILD kicad-5.1.12-r3.ebuild 4761 BLAKE2B 284b69c45c30f57275dee607d934030d97bc5c5491099db8eb13278524f61a61911ef540d805a4fc5d4f4361764c8268aa3f3a44004527962ce950cb2b873c2d SHA512 cd7faedd477a30d332b858aad0d1d2a4ef015642ec6a4165d2f03413954119ed4ce68fad6e1a6380d5be7a4a5fcdda6834ada1782137a7b1b7bdd7c0eab2aadd
-EBUILD kicad-6.0.4.ebuild 4367 BLAKE2B 198b6840fbb86a4c7b383140e14fe711549e2173f6c852b97344bedf31645c1a7ed018a8c093fa6637aab808395ba8b221149b3110a12dfc8b633274115fb303 SHA512 3341e6b7cca53ba4f5ebf39387c37eda9930181b2a50e41f0e7d7f1fa59bac8312cffdef7c2ccab60dc037a1e4334203359a8bb55953ca32a3bb9f4beda579f3
-EBUILD kicad-9999.ebuild 4289 BLAKE2B d24c59bc753b5f43a8910c4ba9c3b0ca581dc375f0569fa06ac91aaded39b0b49042f70bcaa588804d72b4622c51579261a3491f54005150a585fd4b9c488e4a SHA512 0c6245c921d40bd8a93788e9dd56c89fd9c950477f9cb5ff4b17070ce1b3212fe2f195c12b2cb921e972b710bef3463924af5091fc3e953e228d157e5dae1602
+DIST kicad-6.0.6.tar.gz 45086249 BLAKE2B fbf1f11cbf4838186e1ecb42127f7b182d3cd13b4af147211c85244d361cbf83387f5d102efdc80a63cfff36e343e6c4e07fef7f95dac4c6666844c5bc9d0ec2 SHA512 c472a6b81e3065e0499cad8467527d3531dc4d5861f50079ecb2ae6fccaf2c4d24fbeae8e9fe0cdde5ef548458fcef9615d6539426abe391a629dd539406065a
+EBUILD kicad-5.1.12-r3.ebuild 4878 BLAKE2B 46088b473674383cdea1d115b2cb4ecf330ddc97de3a682f3bac1a64caabeda609a5281424f797bad7915b28b66e317b5ef90303d61ed601a1e6b3d04363cc49 SHA512 c4027c46fad93d3b4666a997fc2565835aebe9d94e8cf16118ab8df5d484e5a0b9f217a849b0a0f33533e12ada6b1f622c39510bc3999ddcfd2366aa0a2e59ef
+EBUILD kicad-6.0.6.ebuild 4451 BLAKE2B 23d9aa7e34b9e70de5c137c5eccdd24a4c8e79a7d6eaa76e67766e769722f9fcff9c24426a1f6032ef762a923df0ac0a1c9d11e95e5a920378866dc71cd8e166 SHA512 1a907249ec0cbb006ce103999dc6a11c0f660167ebb0e8c6c8730e6e5b805bdda3cd08b96f550d57bd6b4cb0b8170e0313e30880a0cdd58d7119a3b3ad7a6ea8
+EBUILD kicad-9999.ebuild 4340 BLAKE2B f9d3fe50b5a477750824032145289c6bc09a59edc6a2a48b2297d8870701acadb6e5645a2bee8e4a4776a0fd2a62399e591b88a61f2981259bb50fa6e3f99719 SHA512 e42510ab53632121e177e92a030f6f4c081fd92af35501fb0c05088da5fbb86f22825cfdbd7961579ccaf6005cb865ccf5a54611589ad605e4d3efae9939e409
 MISC metadata.xml 1047 BLAKE2B 1ed5807dc4f194f6f66e6e0743fe186dd046128bfec2fd3e2a72919e4cf714b0ac6d1ba7da0764ce0b4202eb0a068e5c3e261dfcccf309198400e8be009b7845 SHA512 dc7b727047452b1398fe4029c3b7e70826074733be7c1f2c6c2d485948380da208561a738427d0a5f8a67dbec07593c529b4f8b6690b8a5de7b3bb291576ab59
diff --git a/sci-electronics/kicad/files/kicad-6.0.6-unitialized-variable-fix.patch b/sci-electronics/kicad/files/kicad-6.0.6-unitialized-variable-fix.patch
new file mode 100644
index 000000000000..cce508c1e888
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-6.0.6-unitialized-variable-fix.patch
@@ -0,0 +1,12 @@
+diff -Naur kicad-6.0.6/common/tool/tool_manager.cpp kicad-6.0.6-new/common/tool/tool_manager.cpp
+--- kicad-6.0.6/common/tool/tool_manager.cpp	2022-06-17 18:11:16.000000000 -0700
++++ kicad-6.0.6-new/common/tool/tool_manager.cpp	2022-06-20 00:17:13.548239632 -0700
+@@ -902,7 +902,7 @@
+         m_menuOwner = -1;
+ 
+         // Restore cursor settings
+-        for( auto cursorSetting : m_cursorSettings )
++        for( auto const& cursorSetting : m_cursorSettings )
+         {
+             auto it = m_toolIdIndex.find( cursorSetting.first );
+             wxASSERT( it != m_toolIdIndex.end() );
diff --git a/sci-electronics/kicad/kicad-5.1.12-r3.ebuild b/sci-electronics/kicad/kicad-5.1.12-r3.ebuild
index 34fef8a30277..2f202db0313a 100644
--- a/sci-electronics/kicad/kicad-5.1.12-r3.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.12-r3.ebuild
@@ -59,9 +59,14 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.1.5-ldflags.patch"
 )
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
 	use python && python-single-r1_pkg_setup
-	use openmp && tc-check-openmp
 	setup-wxwidgets
 	check-reqs_pkg_setup
 }
diff --git a/sci-electronics/kicad/kicad-6.0.4.ebuild b/sci-electronics/kicad/kicad-6.0.6.ebuild
index 37b4352cf709..c152b8099cd1 100644
--- a/sci-electronics/kicad/kicad-6.0.4.ebuild
+++ b/sci-electronics/kicad/kicad-6.0.6.ebuild
@@ -76,10 +76,11 @@ CHECKREQS_DISK_BUILD="900M"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-scripts-install-fix.patch"
+	"${FILESDIR}/${P}-unitialized-variable-fix.patch"
 )
 
 pkg_setup() {
-	use openmp && tc-check-openmp
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 
 	python-single-r1_pkg_setup
 	setup-wxwidgets
diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild
index 1e6d93af9eae..2105a3f3d542 100644
--- a/sci-electronics/kicad/kicad-9999.ebuild
+++ b/sci-electronics/kicad/kicad-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 WX_GTK_VER="3.0-gtk3"
 
 inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
@@ -21,7 +21,7 @@ else
 	S="${WORKDIR}/${PN}-${MY_PV}"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm64 ~x86"
+		KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 	fi
 fi
 
@@ -75,7 +75,7 @@ fi
 CHECKREQS_DISK_BUILD="900M"
 
 pkg_setup() {
-	use openmp && tc-check-openmp
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 
 	python-single-r1_pkg_setup
 	setup-wxwidgets
@@ -94,7 +94,7 @@ src_configure() {
 	xdg_environment_reset
 
 	local mycmakeargs=(
-		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PF}"
+		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
 
 		-DKICAD_SCRIPTING_WXPYTHON=ON