gentoo auto-resync : 04:10:2022 - 19:18:10

3 files changed, 56 insertions, 29 deletions

diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index f8881f43d5ed..a3521ac945bb 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -16,5 +16,5 @@ DIST VTKLargeDataFiles-9.1.0.tar.gz 247504557 BLAKE2B a05892347a1a5cf5cb0df3f1c1
 DIST vtkDocHtml-9.0.3.tar.gz 132650096 BLAKE2B 45fc1a6942df3e79e500a552c3b3cda2099b9451191559d471e3a2e785a8c52b2c6273cfd2cc4a3f3f65582e607d9414475f58d243fde96a4f985bed479e53db SHA512 9b5fef43f3c2b92aa1fe6a9ba9458d6677874b09b167654db7f26df6feffdc34ed1a8fb4e59d64b75625063a774af77fe57f275903602a5f7daa74e1a2e71800
 DIST vtkDocHtml-9.1.0.tar.gz 152767166 BLAKE2B 9163b6b1bf55810a310ca8bc211e067827b1f9907efd2a378363d8e6296d4bf07b25371b66c00cab3576fb06f0cb63fdf2ffea044033e2c42e9087819a3736ba SHA512 036daba5eb6503b5eb3e9323a4ab3ea0f27c09d8fef411dd2ed154c24d5a37d9f19d57db07576c8af404bfdb7178e95b137a3c27bfedb3f9cb72c04f717da80a
 EBUILD vtk-9.0.3-r5.ebuild 14400 BLAKE2B 0d63f7c28132d1486ac3b14b680d7cf730ec1f4572105870fa3d52096982a9dbe4d05b3955b9f4d0114dae5668698a398619bc38bd27fe02e22ca90e2a2f0e1d SHA512 146892890bf9b28dd2d5a00e3ac406814439d87ab4803014a56fce3281b124c48b02e19492a56aa474a4f0f175e39355dc17f437a23603901b04db1cf88c117b
-EBUILD vtk-9.1.0-r2.ebuild 16580 BLAKE2B 5b53521c60a8e8a8f9909aa9c8dbea45992ebc94f395d7fcd30a0974c9a5f2c3b453b85d0213ae7695c02eac446a757da6452284313b47096b7c11c142b3c477 SHA512 9d3668029d6b7170e80deb3e83d5482c696a273171bc724116e20d604bff0eb6e50efe08954ba920f6a10ddb0e34fb430b2c3ddd1ef330c1b09fb425da1dfe35
-MISC metadata.xml 1349 BLAKE2B 778c471328fddbece653650c6a54b002dc9a48f5de3eb391bd0a84c9e0720ab1b2715b8013af55e60aac11a244090fc6e1d152c57a2c7f16b0b5306043e71731 SHA512 f55cac1ad724a7440bae4e7c364d3869ba25e4668463d0757ca8eb14469b539471c2bd31bb2e874c3a7982df490d9fc1c43c8d854dd4c511d0bde43ec0dc4a0c
+EBUILD vtk-9.1.0-r3.ebuild 16967 BLAKE2B 45a5a6d1ac21808f1f39d9ef22952aff2d182a502224b191ebd5254473d46183e3252620dab7fd6df1d64009fee0aeac0e32b5089ca227b9f6833b59a36af2cf SHA512 eee6cddf9fd356da4395a958ee573d4fc787733dea4cc94d0640541e54a756c20c996d8b70843fbd8fd17df09ad4848a80d70f08467da6e4760cfa5f6a6ddd1d
+MISC metadata.xml 1409 BLAKE2B 407cfa7130b30494604614c5633f2c9ba93ceaa9c05b0b786c7548e8518db55f9b165462e19d926ddbf2eda437a2285fd0ad5110898828ad0fd720bd14dadd28 SHA512 d2d2bc2c4807bd22c4c49ee79e48665cc156b8eed5ea8e38aab2c660b97f220f3b63db1c13aaf045c73fee5fa6cfad268d23321aea66a6c7d432fa85c5ba1e56
diff --git a/sci-libs/vtk/metadata.xml b/sci-libs/vtk/metadata.xml
index 50a77432780d..b4654dc0d664 100644
--- a/sci-libs/vtk/metadata.xml
+++ b/sci-libs/vtk/metadata.xml
@@ -23,6 +23,7 @@
     <flag name="kits">Build kits in addition to modules</flag>
     <flag name="offscreen">Offscreen rendering through OSMesa</flag>
     <flag name="pegtl">Use pegtl to build parsers</flag>
+    <flag name="qt6">Use Qt6 packages instead of Qt5</flag>
     <flag name="rendering">Building Redering modules</flag>
     <flag name="tbb">Use <pkg>dev-cpp/tbb</pkg> to handle smp support</flag>
     <flag name="views">Building Views modules</flag>
diff --git a/sci-libs/vtk/vtk-9.1.0-r2.ebuild b/sci-libs/vtk/vtk-9.1.0-r3.ebuild
index e9034c50bbb0..7b1132e4e548 100644
--- a/sci-libs/vtk/vtk-9.1.0-r2.ebuild
+++ b/sci-libs/vtk/vtk-9.1.0-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # TODO:
 # - add USE flag for remote modules? Those modules can be downloaded
@@ -37,21 +37,26 @@ S="${WORKDIR}/VTK-${PV}"
 
 LICENSE="BSD LGPL-2"
 SLOT="0/${MY_PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+# ~arm64 #864791
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 # TODO: Like to simplifiy these. Mostly the flags related to Groups, plus
 # maybe some flags related to Kits and a few other needed flags.
 IUSE="all-modules +boost cuda debug doc examples +ffmpeg +gdal imaging java
-	mpi mysql odbc openmp postgres python qt5 +rendering tbb test +threads
+	mpi mysql odbc openmp postgres python qt5 qt6 +rendering tbb test +threads
 	tk video_cards_nvidia views web"
 
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
-	all-modules? ( boost ffmpeg gdal imaging mysql odbc postgres qt5 rendering views )
+	all-modules? (
+		boost ffmpeg gdal imaging mysql odbc postgres rendering views
+		|| ( qt5 qt6 )
+	)
 	cuda? ( video_cards_nvidia )
 	java? ( rendering )
 	python? ( ${PYTHON_REQUIRED_USE} )
 	qt5? ( rendering )
+	qt6? ( rendering )
 	tk? ( rendering python )
 	web? ( python )
 "
@@ -64,13 +69,16 @@ RDEPEND="
 	dev-libs/expat
 	dev-libs/icu:=
 	dev-libs/jsoncpp:=
+	>=dev-libs/libfmt-8.1.1:=
 	dev-libs/libxml2:2
+	dev-libs/libzip:=
 	dev-libs/pugixml
 	media-libs/freetype
 	media-libs/libogg
 	media-libs/libpng:=
 	media-libs/libtheora
 	media-libs/tiff
+	>=sci-libs/cgnslib-4.1.1:=[hdf5,mpi=]
 	sci-libs/hdf5:=[mpi=]
 	sci-libs/netcdf:=[mpi=]
 	sys-libs/zlib
@@ -97,6 +105,11 @@ RDEPEND="
 		dev-qt/qtsql:5
 		dev-qt/qtwidgets:5
 	)
+	qt6? (
+		dev-qt/qtbase:6[gui,opengl,sql,widgets]
+		dev-qt/qtdeclarative:6[opengl]
+		dev-qt/qtshadertools:6
+	)
 	rendering? (
 		media-libs/freeglut
 		media-libs/glew:=
@@ -152,8 +165,6 @@ DOCS=( CONTRIBUTING.md README.md )
 
 # based on default settings
 CHECKREQS_DISK_BUILD="4G"
-# we want the EAPI 8 default
-CMAKE_BUILD_TYPE=RelWithDebInfo
 
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && has openmp && tc-check-openmp
@@ -180,6 +191,10 @@ pkg_pretend() {
 		CHECKREQS_DISK_BUILD="14G"
 	fi
 
+	if use qt6 && use qt5; then
+		ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!"
+	fi
+
 	check-reqs_pkg_setup
 }
 
@@ -205,6 +220,10 @@ pkg_setup() {
 		CHECKREQS_DISK_BUILD="14G"
 	fi
 
+	if use qt6 && use qt5; then
+		ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!"
+	fi
+
 	check-reqs_pkg_setup
 
 	use java && java-pkg-opt-2_pkg_setup
@@ -220,11 +239,9 @@ src_prepare() {
 	#	diy2, exodusII, fides, h5part, kissfft, loguru, verdict, vpic,
 	#	vtkm, xdmf{2,3}, zfp
 	# Note: libharu is omitted: vtk needs an updated version (2.4.0)
-	# Note: fmt is ommited, >=libfmt-8.1.0 needed
-	# Note: cgns is ommited, >=cgnslib-4.1 needed
 	# Note: no valid mpi4py target found with system library
-	# TODO: cgns (4.1), cli11 (::guru), exprtk, ioss, libfmt (8.1.0)
-	local -a DROPS=( doubleconversion eigen expat freetype hdf5 jpeg jsoncpp
+	# TODO: cli11 (::guru), exprtk, ioss
+	local -a DROPS=( cgns doubleconversion eigen expat fmt freetype hdf5 jpeg jsoncpp
 		libxml2 lz4 lzma netcdf ogg pegtl png pugixml sqlite theora tiff utf8
 		zlib )
 	use rendering && DROPS+=( gl2ps glew libproj )
@@ -281,7 +298,6 @@ src_configure() {
 		-DVTK_ENABLE_REMOTE_MODULES=OFF
 
 		-DVTK_GROUP_ENABLE_Imaging=$(usex imaging "YES" "DONT_WANT")
-		-DVTK_GROUP_ENABLE_Qt=$(usex qt5 "YES" "DONT_WANT")
 		-DVTK_GROUP_ENABLE_Rendering=$(usex rendering "YES" "DONT_WANT")
 		-DVTK_GROUP_ENABLE_StandAlone="YES"
 		-DVTK_GROUP_ENABLE_Views=$(usex views "YES" "DONT_WANT")
@@ -289,17 +305,13 @@ src_configure() {
 
 		-DVTK_INSTALL_SDK=ON
 
-		-DVTK_MODULE_ENABLE_VTK_vtkm="WANT"
 		-DVTK_MODULE_ENABLE_VTK_IOGeoJSON="WANT"
 		-DVTK_MODULE_ENABLE_VTK_IOOggTheora="WANT"
+		-DVTK_MODULE_ENABLE_VTK_fmt="YES"
+		-DVTK_MODULE_ENABLE_VTK_vtkm="WANT"
 
-		# TODO: update one cgnslib-4.1.1 is packaged
-		-DVTK_MODULE_USE_EXTERNAL_VTK_cgns=OFF
 		# not packaged in Gentoo
 		-DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
-		# TODO: update once libfmt-8.1.0 has been packaged
-		-DVTK_MODULE_USE_EXTERNAL_VTK_fmt=OFF
-		# not pacakged in Gentoo
 		-DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
 
 		-DVTK_RELOCATABLE_INSTALL=ON
@@ -459,11 +471,33 @@ src_configure() {
 		)
 	fi
 
-	if use qt5; then
+	if use qt5 && use qt6; then
+		# prefer Qt5: https://wiki.gentoo.org/wiki/Project:qt/Policies
 		mycmakeargs+=(
-			-DVTK_MODULE_ENABLE_VTK_GUISupportQt="WANT"
+			-DCMAKE_INSTALL_QMLDIR="/usr/$(get_libdir)/qt5/qml"
 			-DVTK_QT_VERSION="5"
 		)
+	else
+		if use qt5; then
+			mycmakeargs+=(
+				-DCMAKE_INSTALL_QMLDIR="/usr/$(get_libdir)/qt5/qml"
+				-DVTK_QT_VERSION="5"
+			)
+		elif use qt6; then
+			mycmakeargs+=(
+				-DCMAKE_INSTALL_QMLDIR="/usr/$(get_libdir)/qt6/qml"
+				-DVTK_QT_VERSION="6"
+			)
+		else
+			mycmakeargs+=( -DVTK_GROUP_ENABLE_Qt="DONT_WANT" )
+		fi
+	fi
+
+	if use qt5 || use qt6; then
+		mycmakeargs+=(
+			-DVTK_GROUP_ENABLE_Qt:STRING="YES"
+			-DVTK_MODULE_ENABLE_VTK_GUISupportQt="WANT"
+		)
 		if use mysql || use postgres; then
 			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_GUISupportQtSQL="WANT" )
 		fi
@@ -572,14 +606,6 @@ src_install() {
 
 	use python && python_optimize
 
-	# environment
-#	cat >> "${T}"/40${PN} <<- EOF || die
-#		VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data
-#		VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}
-#		VTKHOME=${EPREFIX}/usr
-#		EOF
-#	doenvd "${T}"/40${PN}
-
 	use web && webapp_src_install
 
 	# Temporary!