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 1545B158020 for ; Fri, 14 Oct 2022 12:48:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 53D4FE07D3; Fri, 14 Oct 2022 12:48:10 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 37A71E07D3 for ; Fri, 14 Oct 2022 12:48:10 +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 731D73410F4 for ; Fri, 14 Oct 2022 12:48:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 11B4A5F6 for ; Fri, 14 Oct 2022 12:48:08 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1665751680.849abfa7462eb192c4466bf1b3968e70d0f8c54f.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-physics/root/root-6.26.06.ebuild sci-physics/root/root-6.26.9999.ebuild sci-physics/root/root-9999.ebuild X-VCS-Directories: sci-physics/root/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 849abfa7462eb192c4466bf1b3968e70d0f8c54f X-VCS-Branch: master Date: Fri, 14 Oct 2022 12:48:08 +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: 101f4896-30a6-4ddb-a221-f0d2a499b958 X-Archives-Hash: 48ef2fb245005918a3fd25afceb4d4c0 commit: 849abfa7462eb192c4466bf1b3968e70d0f8c54f Author: Andrew Ammerlaan gentoo org> AuthorDate: Fri Oct 14 12:47:06 2022 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Fri Oct 14 12:48:00 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=849abfa7 sci-physics/root: sync live ebuilds Tested python3_11, did not work :( Signed-off-by: Andrew Ammerlaan gentoo.org> sci-physics/root/root-6.26.06.ebuild | 42 +++++++++++++++++++++++++--------- sci-physics/root/root-6.26.9999.ebuild | 8 ++++--- sci-physics/root/root-9999.ebuild | 8 ++++--- 3 files changed, 41 insertions(+), 17 deletions(-) diff --git a/sci-physics/root/root-6.26.06.ebuild b/sci-physics/root/root-6.26.06.ebuild index 76dd06ff9af8..32cd50caca05 100644 --- a/sci-physics/root/root-6.26.06.ebuild +++ b/sci-physics/root/root-6.26.06.ebuild @@ -6,24 +6,37 @@ EAPI=8 # ninja does not work due to fortran CMAKE_MAKEFILE_GENERATOR=emake FORTRAN_NEEDED="fortran" -PYTHON_COMPAT=( python3_{8,9,10} ) +PYTHON_COMPAT=( python3_{8..10} ) # python3_11 fails to compile inherit cmake cuda elisp-common fortran-2 python-single-r1 toolchain-funcs DESCRIPTION="C++ data analysis framework and interpreter from CERN" HOMEPAGE="https://root.cern" -SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz" IUSE="+X aqua +asimage c++14 +c++17 cuda cudnn +davix debug emacs +examples fits fftw fortran +gdml graphviz +gsl http 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? ( test )" +RESTRICT="test" +PROPERTIES="test_network" + +if [[ ${PV} =~ "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/root-project/root.git" + if [[ ${PV} == "9999" ]]; then + SLOT="0" + else + SLOT="$(ver_cut 1-2)/$(ver_cut 3)" + EGIT_BRANCH="v$(ver_cut 1)-$(ver_cut 2)-00-patches" + fi +else + SLOT="$(ver_cut 1-2)/$(ver_cut 3)" + KEYWORDS="~amd64 ~x86" + SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz" +fi -SLOT="$(ver_cut 1-2)/$(ver_cut 3)" LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" -KEYWORDS="~amd64 ~x86" REQUIRED_USE=" ^^ ( c++14 c++17 ) @@ -209,7 +222,7 @@ src_configure() { -Dcocoa=$(usex aqua) -Dcuda=$(usex cuda) -Dcudnn=$(usex cudnn) - -Dcxxmodules=OFF + -Dcxxmodules=OFF # requires clang, unstable -Ddataframe=ON -Ddavix=$(usex davix) -Ddcache=OFF @@ -286,7 +299,12 @@ src_install() { cmake_src_install ROOTSYS=${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2) - ROOTENV="$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)" + + if [[ ${PV} == "9999" ]]; then + ROOTENV="9900${PN}-git" + else + ROOTENV="$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)-git" + fi cat > ${ROOTENV} <<- EOF || die MANPATH="${ROOTSYS}/share/man" @@ -314,8 +332,10 @@ src_install() { fi # create versioned symlinks for binaries - cd bin; - for exe in *; do - dosym "${exe}" "/usr/lib/${PN}/$(ver_cut 1-2)/bin/${exe}-$(ver_cut 1-2)" - done + if [[ ! ${PV} == "9999" ]]; then + cd bin; + for exe in *; do + dosym "${exe}" "/usr/lib/${PN}/$(ver_cut 1-2)/bin/${exe}-$(ver_cut 1-2)" + done + fi } diff --git a/sci-physics/root/root-6.26.9999.ebuild b/sci-physics/root/root-6.26.9999.ebuild index 246be36df972..c1dddda91e80 100644 --- a/sci-physics/root/root-6.26.9999.ebuild +++ b/sci-physics/root/root-6.26.9999.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 # ninja does not work due to fortran CMAKE_MAKEFILE_GENERATOR=emake FORTRAN_NEEDED="fortran" -PYTHON_COMPAT=( python3_{8,9,10} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit cmake cuda elisp-common fortran-2 python-single-r1 toolchain-funcs @@ -18,7 +18,8 @@ IUSE="+X aqua +asimage c++14 +c++17 cuda cudnn +davix debug emacs 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? ( test )" +RESTRICT="test" +PROPERTIES="test_network" if [[ ${PV} =~ "9999" ]] ; then inherit git-r3 @@ -30,6 +31,7 @@ if [[ ${PV} =~ "9999" ]] ; then EGIT_BRANCH="v$(ver_cut 1)-$(ver_cut 2)-00-patches" fi else + SLOT="$(ver_cut 1-2)/$(ver_cut 3)" KEYWORDS="~amd64 ~x86" SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz" fi diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild index 295ee5f051f2..daec368e8ab8 100644 --- a/sci-physics/root/root-9999.ebuild +++ b/sci-physics/root/root-9999.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 # ninja does not work due to fortran CMAKE_MAKEFILE_GENERATOR=emake FORTRAN_NEEDED="fortran" -PYTHON_COMPAT=( python3_{8,9,10} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit cmake cuda elisp-common fortran-2 python-single-r1 toolchain-funcs @@ -18,7 +18,8 @@ IUSE="+X aqua +asimage c++11 c++14 +c++17 cuda cudnn +davix debug emacs mpi mysql odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt5 R +roofit +root7 shadow sqlite +ssl +tbb test +tmva +unuran uring vc vmc +xml xrootd" -RESTRICT="!test? ( test )" +RESTRICT="test" +PROPERTIES="test_network" if [[ ${PV} =~ "9999" ]] ; then inherit git-r3 @@ -30,6 +31,7 @@ if [[ ${PV} =~ "9999" ]] ; then EGIT_BRANCH="v$(ver_cut 1)-$(ver_cut 2)-00-patches" fi else + SLOT="$(ver_cut 1-2)/$(ver_cut 3)" KEYWORDS="~amd64 ~x86" SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz" fi