[gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/

[Andrew Ammerlaan]

commit:     b962e1f48e375231c1b9fdbd3271bd86436c5f5e
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 28 13:36:18 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Nov 28 13:36:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b962e1f4

sci-visualization/scidavis: enable py3.10

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 .../{scidavis-2.4.0-r1.ebuild => scidavis-2.4.0-r2.ebuild}        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sci-visualization/scidavis/scidavis-2.4.0-r1.ebuild b/sci-visualization/scidavis/scidavis-2.4.0-r2.ebuild
similarity index 90%
rename from sci-visualization/scidavis/scidavis-2.4.0-r1.ebuild
rename to sci-visualization/scidavis/scidavis-2.4.0-r2.ebuild
index 44611a1ad6bc..70fc6b255c6b 100644
--- a/sci-visualization/scidavis/scidavis-2.4.0-r1.ebuild
+++ b/sci-visualization/scidavis/scidavis-2.4.0-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DOCS_BUILDER="doxygen"
 DOCS_DEPEND="media-gfx/graphviz"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit python-single-r1 docs qmake-utils xdg
 
@@ -25,6 +25,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # compile with CONFIG+="test"
 RESTRICT="test"
 
+# We need to depend on a version of PyQt5 that depends on <sip-5:0. If PyQt5 is
+# built with sip:5 then we will get Syntax Error when running sip-4 for scidavis.
 RDEPEND="
 	dev-cpp/muParser
 	dev-qt/qtcore:5
@@ -43,9 +45,9 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/PyQt5[${PYTHON_USEDEP}]
+			<dev-python/PyQt5-5.15.5[${PYTHON_USEDEP}]
 			dev-python/PyQt5-sip[${PYTHON_USEDEP}]
-			<dev-python/sip-5[${PYTHON_USEDEP}]
+			<dev-python/sip-5:0[${PYTHON_USEDEP}]
 		')
 	)
 "