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

["Matthias Maier" <tamiko@gentoo.org>]

commit:     d79140eadceb7e842bd66cac8190e2aea0c4cec8
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  1 23:59:25 2023 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sat Dec  2 18:41:32 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d79140ea

sci-visualization/paraview: add 5.12.0_rc1; fix version extraction logic

 - add 5.12.0_rc1
 - fix version extraction logic
 - remove old comment

Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 sci-visualization/paraview/Manifest                          |  1 +
 sci-visualization/paraview/paraview-5.11.1.ebuild            | 12 +++++-------
 .../{paraview-5.11.1.ebuild => paraview-5.12.0_rc1.ebuild}   | 12 +++++-------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 748ff935c1c0..807206bbd0bd 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1 +1,2 @@
 DIST ParaView-v5.11.1.tar.xz 79847556 BLAKE2B efef5e519a82ef1c0a7d532578778f6a95f07ebd72ebefd0cbdcff0bfc3af1773601cd102ff81f45f302fcaa4bb6ec7ee68f7dec77f5d4e137c2842fbbb54e11 SHA512 d0e666b49f49e41dba23e23d454a9462f018bd6d832628b0029e8d54760f0439ca97841a26da3126c5144780fc01dc25234a6624fb35346a98d35cbe0e0c98ca
+DIST ParaView-v5.12.0-RC1.tar.xz 128908020 BLAKE2B 3222ac21f733559b9f5c7e8c1009a19c0e462e2622805db7d61b683f25d70fc40cf096d699afde6dab9e23c102e3df9251a718d3ecbaac7a56db01c898270cd9 SHA512 1c6a052081e274a120563c5ffc73dadf4e02be237cc0c213a22d0b93a9865713c83992a3fc0cc1c52742b0753546b5b983a3f650989e8a472ac2f7e90383de92

diff --git a/sci-visualization/paraview/paraview-5.11.1.ebuild b/sci-visualization/paraview/paraview-5.11.1.ebuild
index 14339e04a447..65d00b57a5b0 100644
--- a/sci-visualization/paraview/paraview-5.11.1.ebuild
+++ b/sci-visualization/paraview/paraview-5.11.1.ebuild
@@ -7,9 +7,11 @@ PYTHON_COMPAT=( python3_{9..11} )
 DOCS_BUILDER="doxygen"
 inherit cmake flag-o-matic desktop docs python-single-r1 qmake-utils toolchain-funcs xdg
 
-MAIN_PV=$(ver_cut 0-1)
-MAJOR_PV=$(ver_cut 1-2)
-MY_P="ParaView-v${PV}"
+MAJOR_PV="$(ver_cut 1-2)"
+MINOR_PV="$(ver_cut 3)"
+RC_PV="$(ver_cut 4-5)"
+RC_PV="${RC_PV:+-${RC_PV^^}}"
+MY_P="ParaView-v${MAJOR_PV}.${MINOR_PV}${RC_PV}"
 
 DESCRIPTION="Powerful scientific data visualization application"
 HOMEPAGE="https://www.paraview.org"
@@ -30,10 +32,6 @@ REQUIRED_USE="
 	qt5? ( sqlite )
 	?? ( offscreen qt5 )"
 
-# TODO: Verify that these two are not needed any more for the catalyst
-# module:
-#  - dev-python/PyQt5
-#  - dev-qt/qtgui:5[-gles2-only]
 RDEPEND="
 	app-arch/lz4
 	dev-libs/expat

diff --git a/sci-visualization/paraview/paraview-5.11.1.ebuild b/sci-visualization/paraview/paraview-5.12.0_rc1.ebuild
similarity index 96%
copy from sci-visualization/paraview/paraview-5.11.1.ebuild
copy to sci-visualization/paraview/paraview-5.12.0_rc1.ebuild
index 14339e04a447..65d00b57a5b0 100644
--- a/sci-visualization/paraview/paraview-5.11.1.ebuild
+++ b/sci-visualization/paraview/paraview-5.12.0_rc1.ebuild
@@ -7,9 +7,11 @@ PYTHON_COMPAT=( python3_{9..11} )
 DOCS_BUILDER="doxygen"
 inherit cmake flag-o-matic desktop docs python-single-r1 qmake-utils toolchain-funcs xdg
 
-MAIN_PV=$(ver_cut 0-1)
-MAJOR_PV=$(ver_cut 1-2)
-MY_P="ParaView-v${PV}"
+MAJOR_PV="$(ver_cut 1-2)"
+MINOR_PV="$(ver_cut 3)"
+RC_PV="$(ver_cut 4-5)"
+RC_PV="${RC_PV:+-${RC_PV^^}}"
+MY_P="ParaView-v${MAJOR_PV}.${MINOR_PV}${RC_PV}"
 
 DESCRIPTION="Powerful scientific data visualization application"
 HOMEPAGE="https://www.paraview.org"
@@ -30,10 +32,6 @@ REQUIRED_USE="
 	qt5? ( sqlite )
 	?? ( offscreen qt5 )"
 
-# TODO: Verify that these two are not needed any more for the catalyst
-# module:
-#  - dev-python/PyQt5
-#  - dev-qt/qtgui:5[-gles2-only]
 RDEPEND="
 	app-arch/lz4
 	dev-libs/expat