From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E1862158245 for ; Thu, 5 Dec 2024 18:02:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9D9BAE09C2; Thu, 5 Dec 2024 18:01:57 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 262D0E09BC for ; Thu, 5 Dec 2024 18:01:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B76E3335D21 for ; Thu, 5 Dec 2024 18:01:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B8D9D1F41 for ; Thu, 5 Dec 2024 18:01:46 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1733421673.75887977d4a15efbb1db01f860ca0b86df0dd205.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/vtk/vtk-9.3.1.ebuild X-VCS-Directories: sci-libs/vtk/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 75887977d4a15efbb1db01f860ca0b86df0dd205 X-VCS-Branch: master Date: Thu, 5 Dec 2024 18:01:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 01b1e04f-0ada-44d9-9d41-12832fd5b7ac X-Archives-Hash: c6432ea71b35f600b8fa78395330f707 commit: 75887977d4a15efbb1db01f860ca0b86df0dd205 Author: Paul Zander gmail com> AuthorDate: Thu Dec 5 12:15:04 2024 +0000 Commit: Sam James gentoo org> CommitDate: Thu Dec 5 18:01:13 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75887977 sci-libs/vtk: 9.3.1 drop qt5 support Signed-off-by: Paul Zander gmail.com> Signed-off-by: Sam James gentoo.org> sci-libs/vtk/vtk-9.3.1.ebuild | 51 ++++++++++++------------------------------- 1 file changed, 14 insertions(+), 37 deletions(-) diff --git a/sci-libs/vtk/vtk-9.3.1.ebuild b/sci-libs/vtk/vtk-9.3.1.ebuild index 021947ed01bc..895bd1487f9e 100644 --- a/sci-libs/vtk/vtk-9.3.1.ebuild +++ b/sci-libs/vtk/vtk-9.3.1.ebuild @@ -42,7 +42,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" # TODO: Like to simplify these. Mostly the flags related to Groups. IUSE="all-modules boost +cgns cuda debug doc examples ffmpeg +freetype gdal gles2-only imaging java las +logging minimal mpi mysql +netcdf odbc opencascade openmp openvdb pdal postgres - python qt5 qt6 +rendering sdl tbb test +threads tk video_cards_nvidia +views vtkm web" + python qt6 +rendering sdl tbb test +threads tk video_cards_nvidia +views vtkm web" RESTRICT="!test? ( test )" @@ -56,7 +56,6 @@ REQUIRED_USE=" minimal? ( !rendering ) !minimal? ( cgns netcdf rendering ) python? ( ${PYTHON_REQUIRED_USE} ) - qt5? ( rendering ) qt6? ( rendering ) sdl? ( rendering ) tk? ( python rendering ) @@ -111,20 +110,11 @@ RDEPEND=" $(python_gen_cond_dep 'mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )') $(python_gen_cond_dep 'rendering? ( dev-python/matplotlib[${PYTHON_USEDEP}] )') ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtopengl:5 - dev-qt/qtquickcontrols2:5 - dev-qt/qtsql:5 - dev-qt/qtwidgets:5 - ) qt6? ( - !qt5? ( - dev-qt/qtbase:6[gui,opengl,sql,widgets] - dev-qt/qtdeclarative:6[opengl] - dev-qt/qtshadertools:6 - x11-libs/libxkbcommon - ) + dev-qt/qtbase:6[gui,opengl,sql,widgets] + dev-qt/qtdeclarative:6[opengl] + dev-qt/qtshadertools:6 + x11-libs/libxkbcommon ) sdl? ( media-libs/libsdl2 ) rendering? ( @@ -231,8 +221,6 @@ pkg_pretend() { ewarn "See bug #820593" fi - use qt6 && use qt5 && ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!" - vtk_check_reqs } @@ -245,8 +233,6 @@ pkg_setup() { ewarn "See bug #820593" fi - use qt6 && use qt5 && ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!" - vtk_check_reqs use java && java-pkg-opt-2_pkg_setup @@ -570,32 +556,23 @@ src_configure() { use rendering && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_PythonContext2D="YES" ) fi - if use qt5; then - # prefer Qt5: https://wiki.gentoo.org/wiki/Project:qt/Policies - mycmakeargs+=( - -DCMAKE_INSTALL_QMLDIR="${EPREFIX}/usr/$(get_libdir)/qt5/qml" - -DVTK_QT_VERSION="5" - ) - has_version "dev-qt/qtopengl:5[gles2-only]" || use gles2-only && mycmakeargs+=( - # Force using EGL & GLES - -DVTK_OPENGL_HAS_EGL=ON - -DVTK_OPENGL_USE_GLES=ON - ) - elif use qt6; then + if use qt6; then mycmakeargs+=( -DCMAKE_INSTALL_QMLDIR="${EPFREIX}/usr/$(get_libdir)/qt6/qml" -DVTK_QT_VERSION="6" ) - has_version "dev-qt/qtbase:6[gles2-only]" || use gles2-only && mycmakeargs+=( - # Force using EGL & GLES - -DVTK_OPENGL_HAS_EGL=ON - -DVTK_OPENGL_USE_GLES=ON - ) + if has_version "dev-qt/qtbase:6[gles2-only]" || use gles2-only; then + mycmakeargs+=( + # Force using EGL & GLES + -DVTK_OPENGL_HAS_EGL=ON + -DVTK_OPENGL_USE_GLES=ON + ) + fi else mycmakeargs+=( -DVTK_GROUP_ENABLE_Qt="NO" ) fi - if use qt5 || use qt6; then + if use qt6; then mycmakeargs+=( -DVTK_GROUP_ENABLE_Qt:STRING="YES" -DVTK_MODULE_ENABLE_VTK_GUISupportQt="YES"