From d8d30f0460a1b4e35decad59f0f10bc40027c0d9 Mon Sep 17 00:00:00 2001 From: Stephan Hageboeck Date: Fri, 8 May 2026 13:24:00 +0200 Subject: [PATCH] sci-physics/root: Update live ebuild - Drop dependency on vc, as it's removed from upstream - Update use flags and build options - Remove a sed command to patch a file. The affected file disappeared upstream. - Enable running test suite in live ebuild Some tests still require upstream fixes, so they remain restricted. Closes: https://github.com/gentoo/gentoo/pull/4620 Signed-off-by: Stephan Hageboeck Signed-off-by: Guilherme Amadio --- sci-physics/root/root-9999.ebuild | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild index f71ab13b5881e..96ab9dcf85265 100644 --- a/sci-physics/root/root-9999.ebuild +++ b/sci-physics/root/root-9999.ebuild @@ -16,7 +16,7 @@ LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" IUSE="+X aqua cuda cudnn davix debug +examples fits fftw fortran +gdml graphviz +gsl +http jupyter libcxx +minuit mpi +opengl pythia8 +python qt6 R +roofit - +root7 shadow sqlite +ssl +tbb test +tmva +unuran uring vc +xml xrootd" + +root7 shadow sqlite +ssl +tbb test +tmva +unuran uring +xml xrootd" if [[ ${PV} =~ "9999" ]] ; then inherit git-r3 @@ -104,7 +104,6 @@ CDEPEND=" ') ) uring? ( sys-libs/liburing:= ) - vc? ( >=dev-libs/vc-1.4.4:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) " @@ -145,9 +144,6 @@ src_prepare() { sed -i "/CLING_BUILD_PLUGINS/d" interpreter/CMakeLists.txt || die - # CSS should use local images - sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed" - eapply_user } @@ -217,7 +213,6 @@ src_configure() { -Dbuiltin_pcre=OFF -Dbuiltin_tbb=OFF -Dbuiltin_unuran=OFF - -Dbuiltin_vc=OFF -Dbuiltin_vdt=OFF -Dbuiltin_veccore=OFF -Dbuiltin_xrootd=OFF @@ -231,7 +226,6 @@ src_configure() { -Dclad=OFF -Dcocoa=$(usex aqua) -Dcuda=$(usex cuda) - -Dcudnn=$(usex cudnn) -Ddaos=OFF # not in gentoo -Ddataframe=ON -Ddavix=$(usex davix) @@ -260,7 +254,6 @@ src_configure() { -Droot7=$(usex root7) -Drootbench=OFF -Droottest=$(usex test) - -Drpath=OFF -Druntime_cxxmodules=ON -Dshadowpw=$(usex shadow) -Dspectrum=ON @@ -271,13 +264,13 @@ src_configure() { -Dtesting=$(usex test) -Dtmva=$(usex tmva) -Dtmva-cpu=$(usex tmva) + -Dtmva-cudnn=$(usex cudnn) -Dtmva-gpu=$(usex cuda) -Dtmva-pymva=$(usex tmva) -Dtmva-rmva=$(usex R) -Dtmva-sofie=OFF -Dunuran=$(usex unuran) -During=$(usex uring) - -Dvc=$(usex vc) -Dvdt=OFF -Dveccore=OFF -Dvecgeom=OFF @@ -291,6 +284,20 @@ src_configure() { CMAKE_BUILD_TYPE=$(usex debug RelWithDebInfo Release) cmake_src_configure } +src_test() { + CMAKE_SKIP_TESTS=( + tutorial-machine_learning-TMVA_CNN_Classification # cuda broken + tutorial-machine_learning-TMVA_RNN_Classification # cuda broken + ) + + if use cuda; then + cuda_add_sandbox -w + nvidia-smi > /dev/null || die GPU access seems to have failed + fi + + cmake_src_test +} + src_install() { cmake_src_install