[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/

["Sam James" <sam@gentoo.org>]

commit:     691d5e8641e51ba68c12d524604daecba34d6a92
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 22:46:39 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 22:50:55 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=691d5e86

sci-electronics/kicad: depend on :0 for opencascade

This avoids tolerating the old slotted versions.

Closes: https://bugs.gentoo.org/833301
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../kicad/{kicad-5.1.12-r2.ebuild => kicad-5.1.12-r3.ebuild}          | 4 ++--
 sci-electronics/kicad/{kicad-6.0.2.ebuild => kicad-6.0.2-r1.ebuild}   | 3 ++-
 sci-electronics/kicad/kicad-9999.ebuild                               | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/sci-electronics/kicad/kicad-5.1.12-r2.ebuild b/sci-electronics/kicad/kicad-5.1.12-r3.ebuild
similarity index 97%
rename from sci-electronics/kicad/kicad-5.1.12-r2.ebuild
rename to sci-electronics/kicad/kicad-5.1.12-r3.ebuild
index 943fd0124280..34fef8a30277 100644
--- a/sci-electronics/kicad/kicad-5.1.12-r2.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.12-r3.ebuild
@@ -21,7 +21,7 @@ IUSE="doc examples github +ngspice +occ openmp +python"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
-
+# Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301
 COMMON_DEPEND="
 	>=dev-libs/boost-1.61:=[context,nls,threads(+)]
 	media-libs/freeglut
@@ -35,7 +35,7 @@ COMMON_DEPEND="
 	ngspice? (
 		>sci-electronics/ngspice-27[shared]
 	)
-	occ? ( <sci-libs/opencascade-7.5.3:=[vtk(+)] )
+	occ? ( <sci-libs/opencascade-7.5.3:0=[vtk(+)] )
 	python? (
 		$(python_gen_cond_dep '
 			>=dev-libs/boost-1.61:=[context,nls,threads(+),python,${PYTHON_USEDEP}]

diff --git a/sci-electronics/kicad/kicad-6.0.2.ebuild b/sci-electronics/kicad/kicad-6.0.2-r1.ebuild
similarity index 97%
rename from sci-electronics/kicad/kicad-6.0.2.ebuild
rename to sci-electronics/kicad/kicad-6.0.2-r1.ebuild
index 4d73adf1a0c4..2d3156fe68e9 100644
--- a/sci-electronics/kicad/kicad-6.0.2.ebuild
+++ b/sci-electronics/kicad/kicad-6.0.2-r1.ebuild
@@ -34,6 +34,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # Contains bundled pybind but it's patched for wx
 # See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
+# Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301
 COMMON_DEPEND="
 	!sci-electronics/kicad-i18n
 	>=dev-libs/boost-1.61:=[context,nls]
@@ -56,7 +57,7 @@ COMMON_DEPEND="
 		sys-devel/gettext
 	)
 	occ? (
-		>=sci-libs/opencascade-7.3.0:=
+		>=sci-libs/opencascade-7.3.0:0=
 	)
 "
 DEPEND="${COMMON_DEPEND}"

diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild
index 129d19372060..9ca55665856a 100644
--- a/sci-electronics/kicad/kicad-9999.ebuild
+++ b/sci-electronics/kicad/kicad-9999.ebuild
@@ -34,6 +34,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # Contains bundled pybind but it's patched for wx
 # See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
+# Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301
 COMMON_DEPEND="
 	!sci-electronics/kicad-i18n
 	>=dev-libs/boost-1.61:=[context,nls]
@@ -56,7 +57,7 @@ COMMON_DEPEND="
 		sys-devel/gettext
 	)
 	occ? (
-		>=sci-libs/opencascade-7.3.0:=
+		>=sci-libs/opencascade-7.3.0:0=
 	)
 "
 DEPEND="${COMMON_DEPEND}"