gentoo resync : 04.01.2022

3 files changed, 59 insertions, 67 deletions

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 8e499e83c3aa..44f58c8e4810 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -3,8 +3,8 @@ AUX kicad-5.1.5-ldflags.patch 890 BLAKE2B 2c5436fccb50886faacd84102ba7bfefa84986
 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
 DIST kicad-5.1.12.tar.bz2 18581842 BLAKE2B f04369fecded6fb07376efa209ddf5fcc693e73018ed728003529cdd0e6ef4a059c28106db1acf18834d938c3fbe4b9df5b5c8e0874989d35f74cf67414e6c76 SHA512 c0e5ad5b360ef788b427755aa71eeaec1a19b7520a00bb94fafba47e291f6ba067c598004efd515287800cd41f7da399d0389121e53e9669026c62f21b0a65ea
-DIST kicad-6.0.0_rc1.tar.gz 44783434 BLAKE2B c19cc17666c00210f844970d8b0aad3d929470544d641f94bdfd9e521f6c954fec6098885606f72ffb75a074794358cb6632fea03fa4196dbfbcf6d6fe077c5e SHA512 75a91ea111776f879b6cee14d09bcf9caa3cdc6d8220b2b89727e4f9d57db242b6c1b4c1235035f5bb8356c8bbc3cd9b9d6d80b2529c290a3fa57d90ba4dc632
+DIST kicad-6.0.0.tar.gz 45037889 BLAKE2B 4ea4075cd8e860ed19ee051be3567400c57f8c1b51550d2da80525ef65cc0b6c0951bac8c306c4fc19bddd824e2b727f416817ea4006a67f949dbf70df673a37 SHA512 1cadf59cfa85c5bbeb86f968ced896eff16c330e498497bf58826a58a59dfb83989422d660f7230d7921eeeda709d1ff10b50d4f842a36e50d44bf9017360b50
 EBUILD kicad-5.1.12.ebuild 5198 BLAKE2B 3293a0a9b260c3a3bf635045a98977ae58b899402cb43e80c9d754df5d9d82859cefc6d56946e877ca10e32d1cde28b747c2fad43c52ae6e7997c8e510963abc SHA512 38c96f65d3f05610fefd77915d55619b86ebe5c508952138b28ac4da60dd3e98bb279a6d172d4b73466361aec16036cf96ff19af23a0555599e71c8c4e60bfc7
-EBUILD kicad-6.0.0_rc1.ebuild 4395 BLAKE2B 7827d84b8a2fe37d91458cd53c49d539f6b2407381d6101a7f385b849ce53ec2c36adf54c92cc63a6205908c2776e26748309edd7dc3d78e77189212178385ac SHA512 bf0608a016fb4265ca3f8f45c89adb9b4169979afbfa47d14d14e61656aadf6b2eb3b892d1d92e0175bc0c036d791cc7540f2d64bb1bdfdfc1479aa0b04dca98
-EBUILD kicad-9999.ebuild 4397 BLAKE2B 20c4d324b9b78cbef54e39025f6a773f73339d4d0ce6fc55b37b1b3afd0bbfdff246e9a8d861da3282cbdf4daa904832f794876dd38d9545961686302efe7260 SHA512 d9a6e62cd04e0742625e6296622684ee2b2ace558f40923349529cc95aa0167ee57df298aa7d70415748abe9284278f2bdfa42765a89a59848dc3be69a1f96a2
+EBUILD kicad-6.0.0.ebuild 4142 BLAKE2B 26ba3819428682a21221f9d588006cb8a08c51e9e928c2d23b9062d4a58aeff6a1588a787eba43b11bd3dda86d984ba177f5722386b84dbd6821e069a26e5477 SHA512 e78589c80532537a0cf4389d6641483fd49365cca16e102f45452f5268bb424b6d7c410653ae9254802c4e2bf2415e7c1c8eaaf5ff0e12f6b4fff34466e0d8a1
+EBUILD kicad-9999.ebuild 4142 BLAKE2B 26ba3819428682a21221f9d588006cb8a08c51e9e928c2d23b9062d4a58aeff6a1588a787eba43b11bd3dda86d984ba177f5722386b84dbd6821e069a26e5477 SHA512 e78589c80532537a0cf4389d6641483fd49365cca16e102f45452f5268bb424b6d7c410653ae9254802c4e2bf2415e7c1c8eaaf5ff0e12f6b4fff34466e0d8a1
 MISC metadata.xml 1100 BLAKE2B 0d7d4f0b90b243776a069fb7783f15a2cbedff807decfdae4dd0c3dbf1d75316a30e8e49c2b6c33b263dc47c7bd47606c628c14f7f5f1ee77eb0d2f0955ff239 SHA512 0b2978d4e5eee2e207133293822e3f6438a0554162ae972da88267d58fb9005ad0b3f69ab3f0228cca8976f93564a56c9b7ef32b94a54bb008144a6699888f53
diff --git a/sci-electronics/kicad/kicad-6.0.0_rc1.ebuild b/sci-electronics/kicad/kicad-6.0.0.ebuild
index 87a5fb43e652..8840070ef1e9 100644
--- a/sci-electronics/kicad/kicad-6.0.0_rc1.ebuild
+++ b/sci-electronics/kicad/kicad-6.0.0.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8,9} )
-
 WX_GTK_VER="3.0-gtk3"
 
 inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
@@ -26,14 +25,15 @@ else
 	fi
 fi
 
-LICENSE="GPL-2+ GPL-3+ Boost-1.0"
+# BSD for bundled pybind
+LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
 SLOT="0"
-IUSE="doc examples +ngspice openmp +python occ +pcm"
+IUSE="doc examples +ngspice openmp +occ +pcm"
 
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+# Contains bundled pybind but it's patched for wx
+# See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
 COMMON_DEPEND="
 	>=dev-libs/boost-1.61:=[context,nls]
 	media-libs/freeglut
@@ -43,26 +43,24 @@ COMMON_DEPEND="
 	>=x11-libs/cairo-1.8.8:=
 	>=x11-libs/pixman-0.30
 	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	$(python_gen_cond_dep '
+		>=dev-libs/boost-1.61:=[context,nls,python,${PYTHON_USEDEP}]
+		dev-python/wxpython:4.0[${PYTHON_USEDEP}]
+	')
+	${PYTHON_DEPS}
 	ngspice? (
 		>sci-electronics/ngspice-27[shared]
 	)
 	occ? (
-		>=sci-libs/opencascade-6.8.0:=
-	)
-	python? (
-		$(python_gen_cond_dep '
-			>=dev-libs/boost-1.61:=[context,nls,python,${PYTHON_MULTI_USEDEP}]
-			dev-python/wxpython:4.0[${PYTHON_MULTI_USEDEP}]
-		')
-		${PYTHON_DEPS}
+		>=sci-libs/opencascade-7.3.0:=
 	)
 "
-DEPEND="${COMMON_DEPEND}
-	python? ( >=dev-lang/swig-3.0:0 )"
+DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
 	sci-electronics/electronics-menu
 "
-BDEPEND="doc? ( app-doc/doxygen )"
+BDEPEND=">=dev-lang/swig-3.0
+	doc? ( app-doc/doxygen )"
 
 if [[ ${PV} == 9999 ]] ; then
 	# x11-misc-util/macros only required on live ebuilds
@@ -73,8 +71,9 @@ CHECKREQS_DISK_BUILD="800M"
 CAS_VERSION=7.5.3
 
 pkg_setup() {
-	use python && python-single-r1_pkg_setup
 	use openmp && tc-check-openmp
+
+	python-single-r1_pkg_setup
 	setup-wxwidgets
 	check-reqs_pkg_setup
 }
@@ -92,13 +91,14 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PF}"
-		-DKICAD_HELP="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
-		-DKICAD_SCRIPTING="$(usex python)"
-		-DKICAD_SCRIPTING_MODULES="$(usex python)"
-		-DKICAD_SCRIPTING_WXPYTHON="$(usex python)"
-		-DKICAD_SCRIPTING_WXPYTHON_PHOENIX="$(usex python)"
-		-DKICAD_SCRIPTING_PYTHON3="$(usex python)"
-		-DKICAD_SCRIPTING_ACTION_MENU="$(usex python)"
+
+		-DKICAD_SCRIPTING_WXPYTHON=ON
+
+		-DPYTHON_DEST="$(python_get_sitedir)"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+
 		-DKICAD_SPICE="$(usex ngspice)"
 		-DKICAD_PCM="$(usex pcm)"
 
@@ -106,15 +106,11 @@ src_configure() {
 		-DKICAD_INSTALL_DEMOS="$(usex examples)"
 		-DCMAKE_SKIP_RPATH="ON"
 	)
-	use python && mycmakeargs+=(
-		-DPYTHON_DEST="$(python_get_sitedir)"
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-	)
+
 	local OCC_P=$(best_version sci-libs/opencascade)
 	OCC_P=${OCC_P#sci-libs/}
 	OCC_P=${OCC_P%-r*}
+
 	use occ && mycmakeargs+=(
 		-DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P}
 		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P}
@@ -141,7 +137,8 @@ src_test() {
 
 src_install() {
 	cmake_src_install
-	use python && python_optimize
+	python_optimize
+
 	if use doc ; then
 		dodoc uncrustify.cfg
 		cd Documentation || die
diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild
index 67d0c512c106..8840070ef1e9 100644
--- a/sci-electronics/kicad/kicad-9999.ebuild
+++ b/sci-electronics/kicad/kicad-9999.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8,9} )
-
 WX_GTK_VER="3.0-gtk3"
 
 inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
@@ -26,14 +25,15 @@ else
 	fi
 fi
 
-LICENSE="GPL-2+ GPL-3+ Boost-1.0"
+# BSD for bundled pybind
+LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
 SLOT="0"
-IUSE="doc examples +ngspice openmp +python occ +pcm"
+IUSE="doc examples +ngspice openmp +occ +pcm"
 
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+# Contains bundled pybind but it's patched for wx
+# See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
 COMMON_DEPEND="
 	>=dev-libs/boost-1.61:=[context,nls]
 	media-libs/freeglut
@@ -43,26 +43,24 @@ COMMON_DEPEND="
 	>=x11-libs/cairo-1.8.8:=
 	>=x11-libs/pixman-0.30
 	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	$(python_gen_cond_dep '
+		>=dev-libs/boost-1.61:=[context,nls,python,${PYTHON_USEDEP}]
+		dev-python/wxpython:4.0[${PYTHON_USEDEP}]
+	')
+	${PYTHON_DEPS}
 	ngspice? (
 		>sci-electronics/ngspice-27[shared]
 	)
 	occ? (
-		>=sci-libs/opencascade-6.8.0:=
-	)
-	python? (
-		$(python_gen_cond_dep '
-			>=dev-libs/boost-1.61:=[context,nls,python,${PYTHON_MULTI_USEDEP}]
-			dev-python/wxpython:4.0[${PYTHON_MULTI_USEDEP}]
-		')
-		${PYTHON_DEPS}
+		>=sci-libs/opencascade-7.3.0:=
 	)
 "
-DEPEND="${COMMON_DEPEND}
-	python? ( >=dev-lang/swig-3.0:0 )"
+DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
 	sci-electronics/electronics-menu
 "
-BDEPEND="doc? ( app-doc/doxygen )"
+BDEPEND=">=dev-lang/swig-3.0
+	doc? ( app-doc/doxygen )"
 
 if [[ ${PV} == 9999 ]] ; then
 	# x11-misc-util/macros only required on live ebuilds
@@ -73,8 +71,9 @@ CHECKREQS_DISK_BUILD="800M"
 CAS_VERSION=7.5.3
 
 pkg_setup() {
-	use python && python-single-r1_pkg_setup
 	use openmp && tc-check-openmp
+
+	python-single-r1_pkg_setup
 	setup-wxwidgets
 	check-reqs_pkg_setup
 }
@@ -92,13 +91,14 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PF}"
-		-DKICAD_HELP="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
-		-DKICAD_SCRIPTING="$(usex python)"
-		-DKICAD_SCRIPTING_MODULES="$(usex python)"
-		-DKICAD_SCRIPTING_WXPYTHON="$(usex python)"
-		-DKICAD_SCRIPTING_WXPYTHON_PHOENIX="$(usex python)"
-		-DKICAD_SCRIPTING_PYTHON3="$(usex python)"
-		-DKICAD_SCRIPTING_ACTION_MENU="$(usex python)"
+
+		-DKICAD_SCRIPTING_WXPYTHON=ON
+
+		-DPYTHON_DEST="$(python_get_sitedir)"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+
 		-DKICAD_SPICE="$(usex ngspice)"
 		-DKICAD_PCM="$(usex pcm)"
 
@@ -106,12 +106,6 @@ src_configure() {
 		-DKICAD_INSTALL_DEMOS="$(usex examples)"
 		-DCMAKE_SKIP_RPATH="ON"
 	)
-	use python && mycmakeargs+=(
-		-DPYTHON_DEST="$(python_get_sitedir)"
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-	)
 
 	local OCC_P=$(best_version sci-libs/opencascade)
 	OCC_P=${OCC_P#sci-libs/}
@@ -143,7 +137,8 @@ src_test() {
 
 src_install() {
 	cmake_src_install
-	use python && python_optimize
+	python_optimize
+
 	if use doc ; then
 		dodoc uncrustify.cfg
 		cd Documentation || die