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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1DAF6158015 for ; Tue, 5 Dec 2023 12:16:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 629242BC01A; Tue, 5 Dec 2023 12:16:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 445A42BC01A for ; Tue, 5 Dec 2023 12:16:37 +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 83B0533BDC5 for ; Tue, 5 Dec 2023 12:16:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E6F67AC2 for ; Tue, 5 Dec 2023 12:16:34 +0000 (UTC) From: "Guilherme Amadio" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Guilherme Amadio" Message-ID: <1701778585.62416df0db8bdd34182c6ef5d626ba33e7b91a97.amadio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-physics/root/metadata.xml sci-physics/root/root-6.28.10-r1.ebuild sci-physics/root/root-6.28.10.ebuild sci-physics/root/root-6.30.02-r1.ebuild sci-physics/root/root-6.30.02.ebuild sci-physics/root/root-6.30.9999.ebuild sci-physics/root/root-9999.ebuild X-VCS-Directories: sci-physics/root/ X-VCS-Committer: amadio X-VCS-Committer-Name: Guilherme Amadio X-VCS-Revision: 62416df0db8bdd34182c6ef5d626ba33e7b91a97 X-VCS-Branch: master Date: Tue, 5 Dec 2023 12:16:34 +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: 5d118d41-b2f8-4e46-83a1-9adda9e0045c X-Archives-Hash: 87c170eb5c063de031f4d8badd1865f2 commit: 62416df0db8bdd34182c6ef5d626ba33e7b91a97 Author: Guilherme Amadio gentoo org> AuthorDate: Thu Nov 30 12:56:25 2023 +0000 Commit: Guilherme Amadio gentoo org> CommitDate: Tue Dec 5 12:16:25 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62416df0 sci-physics/root: drop USE flags for C++ standard ROOT 6.30/00 and above no longer support C++14, and now uses the compiler default (i.e. C++17 for GCC 11 and above), so we can drop these USE flags entirely, as they create unnecessary trouble for ROOT's dependencies and other related packages. The recommended way to set the C++ standard different than the compiler default from now on should be using MYCMAKEARGS in a portage environment. Signed-off-by: Guilherme Amadio gentoo.org> sci-physics/root/metadata.xml | 2 -- .../root/{root-6.28.10.ebuild => root-6.28.10-r1.ebuild} | 12 +++++------- .../root/{root-6.30.02.ebuild => root-6.30.02-r1.ebuild} | 12 +++++------- sci-physics/root/root-6.30.9999.ebuild | 12 +++++------- sci-physics/root/root-9999.ebuild | 12 +++++------- 5 files changed, 20 insertions(+), 30 deletions(-) diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml index 0ce5b7e0cb6a..1d44dde0a37c 100644 --- a/sci-physics/root/metadata.xml +++ b/sci-physics/root/metadata.xml @@ -24,8 +24,6 @@ Enable support for media-libs/libafterimage - Build using the C++14 standard - Build using the C++17 standard Enable support for nVidia CUDA Enable support for nVidia cuDNN library Enable support for DAVIX Data Management Client (https://cern.ch/davix) diff --git a/sci-physics/root/root-6.28.10.ebuild b/sci-physics/root/root-6.28.10-r1.ebuild similarity index 95% rename from sci-physics/root/root-6.28.10.ebuild rename to sci-physics/root/root-6.28.10-r1.ebuild index 32012c31e7b4..831e28f81da0 100644 --- a/sci-physics/root/root-6.28.10.ebuild +++ b/sci-physics/root/root-6.28.10-r1.ebuild @@ -13,10 +13,11 @@ inherit cmake cuda fortran-2 python-single-r1 toolchain-funcs DESCRIPTION="C++ data analysis framework and interpreter from CERN" HOMEPAGE="https://root.cern" -IUSE="+X aqua +asimage c++14 +c++17 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 sqlite +ssl +tbb test +tmva +unuran uring vc +xml xrootd" +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 + sqlite +ssl +tbb test +tmva +unuran uring vc +xml xrootd" + RESTRICT="test" PROPERTIES="test_network" @@ -38,7 +39,6 @@ fi LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" REQUIRED_USE=" - ^^ ( c++14 c++17 ) cuda? ( tmva ) cudnn? ( cuda ) !X? ( !asimage !opengl !qt5 ) @@ -47,7 +47,6 @@ REQUIRED_USE=" python? ( ${PYTHON_REQUIRED_USE} ) qt5? ( root7 ) roofit? ( minuit ) - root7? ( || ( c++17 ) ) tmva? ( gsl python ) uring? ( root7 ) " @@ -175,7 +174,6 @@ src_configure() { -DCMAKE_CUDA_HOST_COMPILER="$(tc-getCXX)" -DCMAKE_C_FLAGS="${CFLAGS}" -DCMAKE_CXX_FLAGS="${CXXFLAGS}" - -DCMAKE_CXX_STANDARD=$( (usev c++14 || usev c++17) | cut -c4-) # set build type flags to empty to avoid overriding CXXFLAGS -UCMAKE_C_FLAGS_RELEASE -UCMAKE_C_FLAGS_RELWITHDEBINFO diff --git a/sci-physics/root/root-6.30.02.ebuild b/sci-physics/root/root-6.30.02-r1.ebuild similarity index 95% rename from sci-physics/root/root-6.30.02.ebuild rename to sci-physics/root/root-6.30.02-r1.ebuild index 32012c31e7b4..831e28f81da0 100644 --- a/sci-physics/root/root-6.30.02.ebuild +++ b/sci-physics/root/root-6.30.02-r1.ebuild @@ -13,10 +13,11 @@ inherit cmake cuda fortran-2 python-single-r1 toolchain-funcs DESCRIPTION="C++ data analysis framework and interpreter from CERN" HOMEPAGE="https://root.cern" -IUSE="+X aqua +asimage c++14 +c++17 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 sqlite +ssl +tbb test +tmva +unuran uring vc +xml xrootd" +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 + sqlite +ssl +tbb test +tmva +unuran uring vc +xml xrootd" + RESTRICT="test" PROPERTIES="test_network" @@ -38,7 +39,6 @@ fi LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" REQUIRED_USE=" - ^^ ( c++14 c++17 ) cuda? ( tmva ) cudnn? ( cuda ) !X? ( !asimage !opengl !qt5 ) @@ -47,7 +47,6 @@ REQUIRED_USE=" python? ( ${PYTHON_REQUIRED_USE} ) qt5? ( root7 ) roofit? ( minuit ) - root7? ( || ( c++17 ) ) tmva? ( gsl python ) uring? ( root7 ) " @@ -175,7 +174,6 @@ src_configure() { -DCMAKE_CUDA_HOST_COMPILER="$(tc-getCXX)" -DCMAKE_C_FLAGS="${CFLAGS}" -DCMAKE_CXX_FLAGS="${CXXFLAGS}" - -DCMAKE_CXX_STANDARD=$( (usev c++14 || usev c++17) | cut -c4-) # set build type flags to empty to avoid overriding CXXFLAGS -UCMAKE_C_FLAGS_RELEASE -UCMAKE_C_FLAGS_RELWITHDEBINFO diff --git a/sci-physics/root/root-6.30.9999.ebuild b/sci-physics/root/root-6.30.9999.ebuild index 32012c31e7b4..831e28f81da0 100644 --- a/sci-physics/root/root-6.30.9999.ebuild +++ b/sci-physics/root/root-6.30.9999.ebuild @@ -13,10 +13,11 @@ inherit cmake cuda fortran-2 python-single-r1 toolchain-funcs DESCRIPTION="C++ data analysis framework and interpreter from CERN" HOMEPAGE="https://root.cern" -IUSE="+X aqua +asimage c++14 +c++17 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 sqlite +ssl +tbb test +tmva +unuran uring vc +xml xrootd" +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 + sqlite +ssl +tbb test +tmva +unuran uring vc +xml xrootd" + RESTRICT="test" PROPERTIES="test_network" @@ -38,7 +39,6 @@ fi LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" REQUIRED_USE=" - ^^ ( c++14 c++17 ) cuda? ( tmva ) cudnn? ( cuda ) !X? ( !asimage !opengl !qt5 ) @@ -47,7 +47,6 @@ REQUIRED_USE=" python? ( ${PYTHON_REQUIRED_USE} ) qt5? ( root7 ) roofit? ( minuit ) - root7? ( || ( c++17 ) ) tmva? ( gsl python ) uring? ( root7 ) " @@ -175,7 +174,6 @@ src_configure() { -DCMAKE_CUDA_HOST_COMPILER="$(tc-getCXX)" -DCMAKE_C_FLAGS="${CFLAGS}" -DCMAKE_CXX_FLAGS="${CXXFLAGS}" - -DCMAKE_CXX_STANDARD=$( (usev c++14 || usev c++17) | cut -c4-) # set build type flags to empty to avoid overriding CXXFLAGS -UCMAKE_C_FLAGS_RELEASE -UCMAKE_C_FLAGS_RELWITHDEBINFO diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild index 32012c31e7b4..831e28f81da0 100644 --- a/sci-physics/root/root-9999.ebuild +++ b/sci-physics/root/root-9999.ebuild @@ -13,10 +13,11 @@ inherit cmake cuda fortran-2 python-single-r1 toolchain-funcs DESCRIPTION="C++ data analysis framework and interpreter from CERN" HOMEPAGE="https://root.cern" -IUSE="+X aqua +asimage c++14 +c++17 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 sqlite +ssl +tbb test +tmva +unuran uring vc +xml xrootd" +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 + sqlite +ssl +tbb test +tmva +unuran uring vc +xml xrootd" + RESTRICT="test" PROPERTIES="test_network" @@ -38,7 +39,6 @@ fi LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" REQUIRED_USE=" - ^^ ( c++14 c++17 ) cuda? ( tmva ) cudnn? ( cuda ) !X? ( !asimage !opengl !qt5 ) @@ -47,7 +47,6 @@ REQUIRED_USE=" python? ( ${PYTHON_REQUIRED_USE} ) qt5? ( root7 ) roofit? ( minuit ) - root7? ( || ( c++17 ) ) tmva? ( gsl python ) uring? ( root7 ) " @@ -175,7 +174,6 @@ src_configure() { -DCMAKE_CUDA_HOST_COMPILER="$(tc-getCXX)" -DCMAKE_C_FLAGS="${CFLAGS}" -DCMAKE_CXX_FLAGS="${CXXFLAGS}" - -DCMAKE_CXX_STANDARD=$( (usev c++14 || usev c++17) | cut -c4-) # set build type flags to empty to avoid overriding CXXFLAGS -UCMAKE_C_FLAGS_RELEASE -UCMAKE_C_FLAGS_RELWITHDEBINFO