sci-electronics/kicad: 6+ always needs Python

See: https://gitlab.com/kicad/code/kicad/-/commit/f274a00c089e0e9fbe0c495ed047138405b5798f
See: https://gitlab.com/kicad/code/kicad/-/merge_requests/796
Signed-off-by: Sam James <sam@gentoo.org>

2 files changed, 48 insertions, 58 deletions

diff --git a/sci-electronics/kicad/kicad-6.0.0.ebuild b/sci-electronics/kicad/kicad-6.0.0.ebuild
index 87a5fb43e652..be4d85dce48d 100644
--- a/sci-electronics/kicad/kicad-6.0.0.ebuild
+++ b/sci-electronics/kicad/kicad-6.0.0.ebuild
@@ -28,11 +28,9 @@ fi
 
 LICENSE="GPL-2+ GPL-3+ Boost-1.0"
 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}"
 
 COMMON_DEPEND="
 	>=dev-libs/boost-1.61:=[context,nls]
@@ -43,26 +41,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}
-	)
 "
-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 +69,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 +89,15 @@ 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
+		-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=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 +105,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 +136,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..be4d85dce48d 100644
--- a/sci-electronics/kicad/kicad-9999.ebuild
+++ b/sci-electronics/kicad/kicad-9999.ebuild
@@ -28,11 +28,9 @@ fi
 
 LICENSE="GPL-2+ GPL-3+ Boost-1.0"
 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}"
 
 COMMON_DEPEND="
 	>=dev-libs/boost-1.61:=[context,nls]
@@ -43,26 +41,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}
-	)
 "
-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 +69,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 +89,15 @@ 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
+		-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=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 +105,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 +136,8 @@ src_test() {
 
 src_install() {
 	cmake_src_install
-	use python && python_optimize
+	python_optimize
+
 	if use doc ; then
 		dodoc uncrustify.cfg
 		cd Documentation || die