commit: 686e6a2a736c9fd1668ab5591e401fdf9deeeb27 Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org> AuthorDate: Sat Mar 9 18:44:42 2024 +0000 Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org> CommitDate: Sun Mar 10 12:16:25 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=686e6a2a
sci-physics/root: add support for Qt6 Closes: https://bugs.gentoo.org/918966 Co-authored-by: Rafal Lalik <rafallalik <AT> gmail.com> Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org> .../root/{root-6.28.12.ebuild => root-6.28.12-r1.ebuild} | 16 ++++++++++------ .../root/{root-6.30.04.ebuild => root-6.30.04-r1.ebuild} | 16 ++++++++++------ sci-physics/root/root-6.30.9999.ebuild | 16 ++++++++++------ sci-physics/root/root-9999.ebuild | 16 ++++++++++------ 4 files changed, 40 insertions(+), 24 deletions(-) diff --git a/sci-physics/root/root-6.28.12.ebuild b/sci-physics/root/root-6.28.12-r1.ebuild similarity index 96% rename from sci-physics/root/root-6.28.12.ebuild rename to sci-physics/root/root-6.28.12-r1.ebuild index 5f5e960bd68f..769d352883bb 100644 --- a/sci-physics/root/root-6.28.12.ebuild +++ b/sci-physics/root/root-6.28.12-r1.ebuild @@ -15,8 +15,8 @@ HOMEPAGE="https://root.cern"; LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" IUSE="+X aqua +asimage cuda cudnn +davix debug +examples fits fftw fortran - +gdml graphviz +gsl http jupyter libcxx +minuit mpi mysql odbc +opengl - oracle postgres pythia6 pythia8 +python qt5 R +roofit +root7 shadow + +gdml graphviz +gsl +http jupyter libcxx +minuit mpi mysql odbc +opengl + oracle postgres pythia6 pythia8 +python qt5 qt6 R +roofit +root7 shadow sqlite +ssl +tbb test +tmva +unuran uring vc +xml xrootd" if [[ ${PV} =~ "9999" ]] ; then @@ -40,11 +40,12 @@ PROPERTIES="test_network" REQUIRED_USE=" cuda? ( tmva ) cudnn? ( cuda ) - !X? ( !asimage !opengl !qt5 ) + !X? ( !asimage !opengl !qt5 !qt6 ) davix? ( ssl xml ) jupyter? ( python ) python? ( ${PYTHON_REQUIRED_USE} ) - qt5? ( root7 ) + qt5? ( root7 http ) + qt6? ( root7 http ) roofit? ( minuit ) tmva? ( gsl python ) uring? ( root7 ) @@ -78,9 +79,12 @@ CDEPEND=" ) qt5? ( dev-qt/qtcore:5 - dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) + qt6? ( + dev-qt/qtbase:6 + dev-qt/qtwebengine:6[widgets] + ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) @@ -278,7 +282,7 @@ src_configure() { -Dpythia6=$(usex pythia6) -Dpythia8=$(usex pythia8) -Dqt5web=$(usex qt5) - -Dqt6web=OFF + -Dqt6web=$(usex qt6) -Dr=$(usex R) -Droofit=$(usex roofit) -Droofit_multiprocess=OFF diff --git a/sci-physics/root/root-6.30.04.ebuild b/sci-physics/root/root-6.30.04-r1.ebuild similarity index 96% rename from sci-physics/root/root-6.30.04.ebuild rename to sci-physics/root/root-6.30.04-r1.ebuild index 5f5e960bd68f..769d352883bb 100644 --- a/sci-physics/root/root-6.30.04.ebuild +++ b/sci-physics/root/root-6.30.04-r1.ebuild @@ -15,8 +15,8 @@ HOMEPAGE="https://root.cern"; LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" IUSE="+X aqua +asimage cuda cudnn +davix debug +examples fits fftw fortran - +gdml graphviz +gsl http jupyter libcxx +minuit mpi mysql odbc +opengl - oracle postgres pythia6 pythia8 +python qt5 R +roofit +root7 shadow + +gdml graphviz +gsl +http jupyter libcxx +minuit mpi mysql odbc +opengl + oracle postgres pythia6 pythia8 +python qt5 qt6 R +roofit +root7 shadow sqlite +ssl +tbb test +tmva +unuran uring vc +xml xrootd" if [[ ${PV} =~ "9999" ]] ; then @@ -40,11 +40,12 @@ PROPERTIES="test_network" REQUIRED_USE=" cuda? ( tmva ) cudnn? ( cuda ) - !X? ( !asimage !opengl !qt5 ) + !X? ( !asimage !opengl !qt5 !qt6 ) davix? ( ssl xml ) jupyter? ( python ) python? ( ${PYTHON_REQUIRED_USE} ) - qt5? ( root7 ) + qt5? ( root7 http ) + qt6? ( root7 http ) roofit? ( minuit ) tmva? ( gsl python ) uring? ( root7 ) @@ -78,9 +79,12 @@ CDEPEND=" ) qt5? ( dev-qt/qtcore:5 - dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) + qt6? ( + dev-qt/qtbase:6 + dev-qt/qtwebengine:6[widgets] + ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) @@ -278,7 +282,7 @@ src_configure() { -Dpythia6=$(usex pythia6) -Dpythia8=$(usex pythia8) -Dqt5web=$(usex qt5) - -Dqt6web=OFF + -Dqt6web=$(usex qt6) -Dr=$(usex R) -Droofit=$(usex roofit) -Droofit_multiprocess=OFF diff --git a/sci-physics/root/root-6.30.9999.ebuild b/sci-physics/root/root-6.30.9999.ebuild index 5f5e960bd68f..769d352883bb 100644 --- a/sci-physics/root/root-6.30.9999.ebuild +++ b/sci-physics/root/root-6.30.9999.ebuild @@ -15,8 +15,8 @@ HOMEPAGE="https://root.cern"; LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" IUSE="+X aqua +asimage cuda cudnn +davix debug +examples fits fftw fortran - +gdml graphviz +gsl http jupyter libcxx +minuit mpi mysql odbc +opengl - oracle postgres pythia6 pythia8 +python qt5 R +roofit +root7 shadow + +gdml graphviz +gsl +http jupyter libcxx +minuit mpi mysql odbc +opengl + oracle postgres pythia6 pythia8 +python qt5 qt6 R +roofit +root7 shadow sqlite +ssl +tbb test +tmva +unuran uring vc +xml xrootd" if [[ ${PV} =~ "9999" ]] ; then @@ -40,11 +40,12 @@ PROPERTIES="test_network" REQUIRED_USE=" cuda? ( tmva ) cudnn? ( cuda ) - !X? ( !asimage !opengl !qt5 ) + !X? ( !asimage !opengl !qt5 !qt6 ) davix? ( ssl xml ) jupyter? ( python ) python? ( ${PYTHON_REQUIRED_USE} ) - qt5? ( root7 ) + qt5? ( root7 http ) + qt6? ( root7 http ) roofit? ( minuit ) tmva? ( gsl python ) uring? ( root7 ) @@ -78,9 +79,12 @@ CDEPEND=" ) qt5? ( dev-qt/qtcore:5 - dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) + qt6? ( + dev-qt/qtbase:6 + dev-qt/qtwebengine:6[widgets] + ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) @@ -278,7 +282,7 @@ src_configure() { -Dpythia6=$(usex pythia6) -Dpythia8=$(usex pythia8) -Dqt5web=$(usex qt5) - -Dqt6web=OFF + -Dqt6web=$(usex qt6) -Dr=$(usex R) -Droofit=$(usex roofit) -Droofit_multiprocess=OFF diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild index 5f5e960bd68f..769d352883bb 100644 --- a/sci-physics/root/root-9999.ebuild +++ b/sci-physics/root/root-9999.ebuild @@ -15,8 +15,8 @@ HOMEPAGE="https://root.cern"; LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" IUSE="+X aqua +asimage cuda cudnn +davix debug +examples fits fftw fortran - +gdml graphviz +gsl http jupyter libcxx +minuit mpi mysql odbc +opengl - oracle postgres pythia6 pythia8 +python qt5 R +roofit +root7 shadow + +gdml graphviz +gsl +http jupyter libcxx +minuit mpi mysql odbc +opengl + oracle postgres pythia6 pythia8 +python qt5 qt6 R +roofit +root7 shadow sqlite +ssl +tbb test +tmva +unuran uring vc +xml xrootd" if [[ ${PV} =~ "9999" ]] ; then @@ -40,11 +40,12 @@ PROPERTIES="test_network" REQUIRED_USE=" cuda? ( tmva ) cudnn? ( cuda ) - !X? ( !asimage !opengl !qt5 ) + !X? ( !asimage !opengl !qt5 !qt6 ) davix? ( ssl xml ) jupyter? ( python ) python? ( ${PYTHON_REQUIRED_USE} ) - qt5? ( root7 ) + qt5? ( root7 http ) + qt6? ( root7 http ) roofit? ( minuit ) tmva? ( gsl python ) uring? ( root7 ) @@ -78,9 +79,12 @@ CDEPEND=" ) qt5? ( dev-qt/qtcore:5 - dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) + qt6? ( + dev-qt/qtbase:6 + dev-qt/qtwebengine:6[widgets] + ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) @@ -278,7 +282,7 @@ src_configure() { -Dpythia6=$(usex pythia6) -Dpythia8=$(usex pythia8) -Dqt5web=$(usex qt5) - -Dqt6web=OFF + -Dqt6web=$(usex qt6) -Dr=$(usex R) -Droofit=$(usex roofit) -Droofit_multiprocess=OFF
