From 1551fe56fd6ba43a94509cffc61b6bf854b7ac9f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 1 Jun 2024 00:07:06 +0100 Subject: gentoo auto-resync : 01:06:2024 - 00:07:06 --- sci-physics/Manifest.gz | Bin 4355 -> 4365 bytes sci-physics/geant4_vmc/Manifest | 8 +- sci-physics/geant4_vmc/geant4_vmc-6.3_p2-r1.ebuild | 2 +- sci-physics/geant4_vmc/geant4_vmc-6.5.ebuild | 2 +- sci-physics/geant4_vmc/geant4_vmc-6.6_p1.ebuild | 2 +- sci-physics/geant4_vmc/geant4_vmc-9999.ebuild | 2 +- sci-physics/root/Manifest | 4 +- sci-physics/root/root-6.32.00.ebuild | 332 +++++++++++++++++++++ sci-physics/root/root-9999.ebuild | 17 +- sci-physics/vgm/Manifest | 3 +- .../vgm-5.2-r1-root-6.32-TesselatedSolid.patch | 31 ++ sci-physics/vgm/vgm-5.2-r1.ebuild | 4 + 12 files changed, 382 insertions(+), 25 deletions(-) create mode 100644 sci-physics/root/root-6.32.00.ebuild create mode 100644 sci-physics/vgm/files/vgm-5.2-r1-root-6.32-TesselatedSolid.patch (limited to 'sci-physics') diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz index b56ad1336bc4..9f328125bb74 100644 Binary files a/sci-physics/Manifest.gz and b/sci-physics/Manifest.gz differ diff --git a/sci-physics/geant4_vmc/Manifest b/sci-physics/geant4_vmc/Manifest index ff1e9df7deb6..ed03020f060c 100644 --- a/sci-physics/geant4_vmc/Manifest +++ b/sci-physics/geant4_vmc/Manifest @@ -2,8 +2,8 @@ AUX geant4_vmc-6.6-fix-preinstall-tests.patch 881 BLAKE2B 51685a16bab32be8b1ee6f DIST geant4_vmc-6.3_p2.tar.gz 5737615 BLAKE2B db6b27e2ff81d37f61c75f39b4bdc775fa2eeded4916b82de7a6e717b206f9648eb295058547d0eaf8bc30bb8f28dddd1b00dea334aeccf6c2cb53da25cee90a SHA512 d9994a291fd195737b94101cafeadbb18aa14a71046cf8c637ea42c8560f290edd7fa524056c472b164fbff8f07afe01b4f5c6b86eeecfa1cfd564e55839052f DIST geant4_vmc-6.5.tar.gz 5933744 BLAKE2B 8d797eb770a0627f11860c0c6f7544b2bbfd93de1d6cb1b7ad8ca0888e81ec01a8f07067f810d45a86546f08c08136221c425e4b82039b8e74d24ea01da558a7 SHA512 d81b38eab84fa8d6bcf66b9a755970e4aa79b8c212e528a1e91f4d8692a89180f9f16cefcd049ffc63894a29b258d04dfcd217f0b82cfbe7e5e911ce16b2184f DIST geant4_vmc-6.6_p1.tar.gz 5936947 BLAKE2B 7a44077314951bd33cc19615247b48a88df13f911603e631d818e97029a8de272cecd2ad6efe8aef2b622bd000385f25940e5cb744356b1e72f5312c6af616cd SHA512 244287a0412d00219a2838ae30f325a5f4b90b594973b4f61c5189e8e78a3585c8b4898c9bae574de871a8e0aaf4b7f25163a830489898279d7c4498422df29e -EBUILD geant4_vmc-6.3_p2-r1.ebuild 1843 BLAKE2B e185060312327554583bd9f5fe366f0c98a5e07d63502e99eb7ccc9c152c1488ee5e2e6cbcffc8c9ba88b31446d817f829abc15ade6845dd379d64d03beaac36 SHA512 75ecd381ab47ebb17d3fc5a1acb252d1d34fab6cc3a90aae3a59635b623794246a24594c2aa3deb006979e6ca7ae995e59c469eae18d2744abf88cd7dee2e0be -EBUILD geant4_vmc-6.5.ebuild 1843 BLAKE2B e185060312327554583bd9f5fe366f0c98a5e07d63502e99eb7ccc9c152c1488ee5e2e6cbcffc8c9ba88b31446d817f829abc15ade6845dd379d64d03beaac36 SHA512 75ecd381ab47ebb17d3fc5a1acb252d1d34fab6cc3a90aae3a59635b623794246a24594c2aa3deb006979e6ca7ae995e59c469eae18d2744abf88cd7dee2e0be -EBUILD geant4_vmc-6.6_p1.ebuild 1909 BLAKE2B 8828031b2ff0627560ef8886a4fcafcb3abe572d97b7d20d2ba60c0f0524889aa379dbacc1021d5805b181e29b28262b8f7c1df986590bbb9697475a8122eaad SHA512 7b6b9a758a02a549ad7762603397a09771630c74442aa9668008217714af428a87955283a237d4d3afe5f6c5111952c75ef033e689964dd343379877bf222f48 -EBUILD geant4_vmc-9999.ebuild 1813 BLAKE2B 4ccae04cce7be7e3f1a10ad3a4e06aa745861186b12bcf3ad83e425f7f640e1d5cfdddbf24847adbf2ae2558f83cf1a28b0313e46362c6ba950800409efad4d8 SHA512 195161d4566937130fdc4a107b266e35876a451a1512d3e66acf17c5bf5c973ab33ff8ed16a0a42b24512695f0d066688771d23bda28f037637eb6b37af80caf +EBUILD geant4_vmc-6.3_p2-r1.ebuild 1856 BLAKE2B c6bacb57587a9392640d21bae1c7de8d8914440c9043a50c8ab0916fd3d48d681a32e345b949f90b3fe70ad1176119e809bc2d3a096b6d8125523bc1547ba7a6 SHA512 b741ab855de9ae29e53c4b52f059b1f9cc6c4570e5899300ccef466200cc521f26e52a39f84d77957a446705a8ffdfaabede8107b9ae1db35a6f8b41fa10e835 +EBUILD geant4_vmc-6.5.ebuild 1856 BLAKE2B c6bacb57587a9392640d21bae1c7de8d8914440c9043a50c8ab0916fd3d48d681a32e345b949f90b3fe70ad1176119e809bc2d3a096b6d8125523bc1547ba7a6 SHA512 b741ab855de9ae29e53c4b52f059b1f9cc6c4570e5899300ccef466200cc521f26e52a39f84d77957a446705a8ffdfaabede8107b9ae1db35a6f8b41fa10e835 +EBUILD geant4_vmc-6.6_p1.ebuild 1922 BLAKE2B a9a5e1ae6f196d696adf2f2972e027bb8b091ddd00e0caa401a1740a16e4a3b1d61f56c460d2806b909734b3d451238241c7d77a2f2aabf439ede7688a92a13b SHA512 388ab70c8e99326344dfe8635071b75bffb31e63ee342c2a2f330ce31317e168db4b83abec04f9921c7c51915f1742ef66a8f96fdf219ac0ecd6ead9f570a637 +EBUILD geant4_vmc-9999.ebuild 1826 BLAKE2B adfcba483530fac69a17f9a75c78515add3f09477296315cf4abce2698d118d7dd4f2d0cc078f7b79453cec9cd4cbcb4f7293670be45d36386bbf8682b351673 SHA512 15372cb33a528f02dc87a22e496442a4c19e047b8429c688fdb7ffc2fbb854d90df2975974f79a3b1a3488963024f9af96183debb06f15d537ce3f57d4f183d7 MISC metadata.xml 898 BLAKE2B d938774267f72be00ef3ce6e483d5c1c2f84b20cc3ee46129cefc8677cbd7725760d7289863a5cb2ebb44a43e375831fa581597f75c2c4a1218acbd97872d181 SHA512 f2c0b0b9e6440975f0a322f57943c9eb40b244081927971377f355f4913d2db678cc6e65e49be6b7a67457440974c101fbe3a4ae3dbfb49c27f16175cd16dd6c diff --git a/sci-physics/geant4_vmc/geant4_vmc-6.3_p2-r1.ebuild b/sci-physics/geant4_vmc/geant4_vmc-6.3_p2-r1.ebuild index aa30ec7126ab..f4dbca031918 100644 --- a/sci-physics/geant4_vmc/geant4_vmc-6.3_p2-r1.ebuild +++ b/sci-physics/geant4_vmc/geant4_vmc-6.3_p2-r1.ebuild @@ -27,7 +27,7 @@ RDEPEND=" >=sci-physics/geant-4.11.1:=[opengl,geant3?] sci-physics/root:= >=sci-physics/vmc-2.0:= - vgm? ( >=sci-physics/vgm-5.1:= )" + vgm? ( >=sci-physics/vgm-5.1:=[geant4,root] )" DEPEND="${RDEPEND} test? ( >=sci-physics/geant-4.11.1:=[gdml] )" BDEPEND="doc? ( app-text/doxygen[dot] )" diff --git a/sci-physics/geant4_vmc/geant4_vmc-6.5.ebuild b/sci-physics/geant4_vmc/geant4_vmc-6.5.ebuild index aa30ec7126ab..f4dbca031918 100644 --- a/sci-physics/geant4_vmc/geant4_vmc-6.5.ebuild +++ b/sci-physics/geant4_vmc/geant4_vmc-6.5.ebuild @@ -27,7 +27,7 @@ RDEPEND=" >=sci-physics/geant-4.11.1:=[opengl,geant3?] sci-physics/root:= >=sci-physics/vmc-2.0:= - vgm? ( >=sci-physics/vgm-5.1:= )" + vgm? ( >=sci-physics/vgm-5.1:=[geant4,root] )" DEPEND="${RDEPEND} test? ( >=sci-physics/geant-4.11.1:=[gdml] )" BDEPEND="doc? ( app-text/doxygen[dot] )" diff --git a/sci-physics/geant4_vmc/geant4_vmc-6.6_p1.ebuild b/sci-physics/geant4_vmc/geant4_vmc-6.6_p1.ebuild index bd0afea138b9..a55c3bef5369 100644 --- a/sci-physics/geant4_vmc/geant4_vmc-6.6_p1.ebuild +++ b/sci-physics/geant4_vmc/geant4_vmc-6.6_p1.ebuild @@ -27,7 +27,7 @@ RDEPEND=" >=sci-physics/geant-4.11.1:=[opengl,geant3?] sci-physics/root:= >=sci-physics/vmc-2.0:= - vgm? ( >=sci-physics/vgm-5.1:= )" + vgm? ( >=sci-physics/vgm-5.1:=[geant4,root] )" DEPEND="${RDEPEND} test? ( >=sci-physics/geant-4.11.1:=[gdml] )" BDEPEND="doc? ( app-text/doxygen[dot] )" diff --git a/sci-physics/geant4_vmc/geant4_vmc-9999.ebuild b/sci-physics/geant4_vmc/geant4_vmc-9999.ebuild index 34671a5023e8..a89d55af53cd 100644 --- a/sci-physics/geant4_vmc/geant4_vmc-9999.ebuild +++ b/sci-physics/geant4_vmc/geant4_vmc-9999.ebuild @@ -27,7 +27,7 @@ RDEPEND=" sci-physics/geant:=[opengl,geant3?] sci-physics/root:= sci-physics/vmc:= - vgm? ( sci-physics/vgm:= )" + vgm? ( sci-physics/vgm:=[geant4,root] )" DEPEND="${RDEPEND} test? ( sci-physics/geant:=[gdml] )" BDEPEND="doc? ( app-text/doxygen[dot] )" diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest index 16844b1b1c0d..13c19c31fe7a 100644 --- a/sci-physics/root/Manifest +++ b/sci-physics/root/Manifest @@ -1,8 +1,10 @@ AUX root-6.12.06_cling-runtime-sysroot.patch 989 BLAKE2B 8202cc8f2bf72cc25642d0a03ba26c3969069b291a6a22188879dbedbf0c3c496149f79f671d0eb51d81d0ee36565660d136b4741f5d018c2b05325ff08381f0 SHA512 c96dee9843da1051c54bd6870ef0a04714944ffe1f86800c9a51b8eb8ef84107d3315d3a708dcc0b651248af4bec362c7f31695514505045aeda9c793d40dc58 DIST root_v6.28.12.source.tar.gz 185351881 BLAKE2B 623897580edaf91870be8f894df1a36582f9d0e066dcf025fa9143ee9e30100b8b1bc952659f44f87af78b0815cb1cef602c8620a61d5abad015eb74ac3b62fb SHA512 b8b3d918245340ef4657c96580227a74d11042c2f2ed58e33946b8b42ed7d1acae9ff3ec8f537c725bd527adf7e386bbeab40be1b535bb3008a3cad3f8d56cfc DIST root_v6.30.06.source.tar.gz 184791201 BLAKE2B 02830a683971fd55578dad6daf513e947ff9630af919c5f95af33959c9e99bcb01d9db3c589e037b7af56c2689f3085ca69e4353e9ea2a4648d98fa12145ccea SHA512 4ebdb1bd610b3611e2c9bdb776dce2efdb243c41558bde42961548eea751df85aad66f30f7c1e99d97024bf581b727d75710a67b6e5e630131fc3fdc4bdfb3bf +DIST root_v6.32.00.source.tar.gz 192888872 BLAKE2B 504638aa1ec824280b8661f0f163995c902c4ae8ef149a3fe6d9887239dfeb56b59868d443fa4834d943c0528d3ad6250d9017c8fec5ae446513191596571d75 SHA512 04e40a7ce0d92758aecdc9249b5349faed79c0d41337abc2229a5cc081cfc1b90f879ffd427f586dc7e23b025755f7bf1388a3f7d5ad3bbceef77e91b48b68ea EBUILD root-6.28.12-r1.ebuild 8387 BLAKE2B 1fb608568c18af69bc61df28fd5c44b8e8efb090da61de5de0e2d43db73181167e3e5d08dea38c67d3d63a0f93680de218d909c5aa73c6df8fe972c9e31b532d SHA512 9c9baceac643ede3c4da527282761e4cd3d4fa672720f23248be9766f34aef554429f1e8a8d206b56c6dbfe1fddbff705b6073cb1d16a124c73b03ffbe77c626 EBUILD root-6.30.06.ebuild 8387 BLAKE2B 1fb608568c18af69bc61df28fd5c44b8e8efb090da61de5de0e2d43db73181167e3e5d08dea38c67d3d63a0f93680de218d909c5aa73c6df8fe972c9e31b532d SHA512 9c9baceac643ede3c4da527282761e4cd3d4fa672720f23248be9766f34aef554429f1e8a8d206b56c6dbfe1fddbff705b6073cb1d16a124c73b03ffbe77c626 EBUILD root-6.30.9999.ebuild 8387 BLAKE2B 1fb608568c18af69bc61df28fd5c44b8e8efb090da61de5de0e2d43db73181167e3e5d08dea38c67d3d63a0f93680de218d909c5aa73c6df8fe972c9e31b532d SHA512 9c9baceac643ede3c4da527282761e4cd3d4fa672720f23248be9766f34aef554429f1e8a8d206b56c6dbfe1fddbff705b6073cb1d16a124c73b03ffbe77c626 -EBUILD root-9999.ebuild 8387 BLAKE2B 1fb608568c18af69bc61df28fd5c44b8e8efb090da61de5de0e2d43db73181167e3e5d08dea38c67d3d63a0f93680de218d909c5aa73c6df8fe972c9e31b532d SHA512 9c9baceac643ede3c4da527282761e4cd3d4fa672720f23248be9766f34aef554429f1e8a8d206b56c6dbfe1fddbff705b6073cb1d16a124c73b03ffbe77c626 +EBUILD root-6.32.00.ebuild 8021 BLAKE2B 3c6fbc903d22e839e3f919b5b6c25dd8416771c8ee90ab00f0bdbf2bdd56120f3bfe584d7933c67f27cc0cec911ef4fe3e326e306a452d08cf5603b107484c7e SHA512 7ba6f910520e581d9d7be195f9951a21ee20bd761938b0df0518d097befab48e7856c0e89c422a2784d70b3f09e2f8754634bf6f80fcee19ef752323050ce8fd +EBUILD root-9999.ebuild 8021 BLAKE2B 3c6fbc903d22e839e3f919b5b6c25dd8416771c8ee90ab00f0bdbf2bdd56120f3bfe584d7933c67f27cc0cec911ef4fe3e326e306a452d08cf5603b107484c7e SHA512 7ba6f910520e581d9d7be195f9951a21ee20bd761938b0df0518d097befab48e7856c0e89c422a2784d70b3f09e2f8754634bf6f80fcee19ef752323050ce8fd MISC metadata.xml 3029 BLAKE2B 9c87d6eb0c9779c7254b2f42cb4b0a557427c864da9c7b67517e30a6f4eb9d2f514dc02fb74735ea9bd6e6bb579977245cb776252c0c5ccb01e1602feca4959b SHA512 04464a018cd47d33f01c3f0b7676e3e7db725944c1917dd29d140f74e27b9d623ff6fed8704a4d5efb31d3f61a6aeb0c9839b6726e7d6a0f5d4f6d7c3febafcf diff --git a/sci-physics/root/root-6.32.00.ebuild b/sci-physics/root/root-6.32.00.ebuild new file mode 100644 index 000000000000..fa797d38a0aa --- /dev/null +++ b/sci-physics/root/root-6.32.00.ebuild @@ -0,0 +1,332 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ninja does not work due to fortran +CMAKE_MAKEFILE_GENERATOR=emake +FORTRAN_NEEDED="fortran" +PYTHON_COMPAT=( python3_{9..12} ) + +inherit cmake cuda flag-o-matic fortran-2 python-single-r1 toolchain-funcs + +DESCRIPTION="C++ data analysis framework and interpreter from CERN" +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 + postgres pythia8 +python qt5 qt6 R +roofit +root7 shadow sqlite +ssl + +tbb test +tmva +unuran uring vc +xml xrootd" + +if [[ ${PV} =~ "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/root-project/root.git" + if [[ ${PV} == "9999" ]]; then + SLOT="6/9999" + else + SLOT="6/$(ver_cut 1-3)" + EGIT_BRANCH="v$(ver_cut 1)-$(ver_cut 2)-00-patches" + fi +else + SLOT="6/$(ver_cut 1-3)" + KEYWORDS="~amd64 ~x86" + SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz" +fi + +RESTRICT="test" +PROPERTIES="test_network" + +REQUIRED_USE=" + cuda? ( tmva ) + cudnn? ( cuda ) + !X? ( !asimage !opengl !qt5 !qt6 ) + davix? ( ssl xml ) + jupyter? ( python ) + python? ( ${PYTHON_REQUIRED_USE} ) + qt5? ( root7 http ) + qt6? ( root7 http ) + roofit? ( minuit ) + tmva? ( gsl python ) + uring? ( root7 ) +" + +CDEPEND=" + app-arch/lz4 + app-arch/zstd + app-arch/xz-utils + fortran? ( dev-lang/cfortran ) + dev-cpp/nlohmann_json + dev-libs/libpcre:3 + dev-libs/xxhash + media-fonts/dejavu + media-libs/freetype:2 + media-libs/libpng:0= + virtual/libcrypt:= + sys-libs/ncurses:= + sys-libs/zlib + X? ( + x11-libs/libX11:0 + x11-libs/libXext:0 + x11-libs/libXft:0 + x11-libs/libXpm:0 + opengl? ( + media-libs/ftgl:0= + media-libs/glew:0= + virtual/opengl + virtual/glu + x11-libs/gl2ps:0= + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtwebengine:5[widgets] + ) + qt6? ( + dev-qt/qtbase:6 + dev-qt/qtwebengine:6[widgets] + ) + ) + cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) + cudnn? ( dev-libs/cudnn ) + davix? ( net-libs/davix ) + fftw? ( sci-libs/fftw:3.0= ) + fits? ( sci-libs/cfitsio:0= ) + graphviz? ( media-gfx/graphviz ) + gsl? ( sci-libs/gsl:= ) + http? ( dev-libs/fcgi:0= ) + libcxx? ( sys-libs/libcxx ) + unuran? ( sci-mathematics/unuran:0= ) + minuit? ( !sci-libs/minuit ) + mpi? ( virtual/mpi[fortran?] ) + mysql? ( dev-db/mysql-connector-c ) + odbc? ( + || ( + dev-db/libiodbc + dev-db/unixODBC + ) + ) + postgres? ( dev-db/postgresql:= ) + pythia8? ( sci-physics/pythia:8 ) + python? ( ${PYTHON_DEPS} ) + R? ( dev-lang/R ) + shadow? ( sys-apps/shadow ) + sqlite? ( dev-db/sqlite:3 ) + ssl? ( dev-libs/openssl:0= ) + tbb? ( dev-cpp/tbb:= ) + tmva? ( + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + ') + ) + uring? ( sys-libs/liburing:= ) + vc? ( >=dev-libs/vc-1.4.4:= ) + xml? ( dev-libs/libxml2:2= ) + xrootd? ( net-libs/xrootd:0= ) +" + +DEPEND="${CDEPEND} + virtual/pkgconfig" + +RDEPEND="${CDEPEND} + jupyter? ( + $(python_gen_cond_dep ' + dev-python/jupyter[${PYTHON_USEDEP}] + dev-python/notebook[${PYTHON_USEDEP}] + dev-python/metakernel[${PYTHON_USEDEP}] + ') + ) +" + +BDEPEND="${PYTHON_DEPS}" + +PATCHES=( + "${FILESDIR}"/${PN}-6.12.06_cling-runtime-sysroot.patch +) + +pkg_setup() { + use fortran && fortran-2_pkg_setup + python-single-r1_pkg_setup + + elog "There are extra options on packages not available in Gentoo." + elog "You can use the environment variable MYCMAKEARGS to enable" + elog "these packages. For example, for Vdt you would set:" + elog "MYCMAKEARGS=\"-Dbuiltin_vdt=ON -Dvdt=ON\"" +} + +src_prepare() { + use cuda && cuda_src_prepare + + cmake_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 +} + +# Note: ROOT uses bundled clang because it is patched and API-incompatible +# with vanilla clang. The patches enable the C++ interpreter to work. + +src_configure() { + + filter-lto # https://bugs.gentoo.org/879323 + + local mycmakeargs=( + -DCMAKE_C_COMPILER="$(tc-getCC)" + -DCMAKE_CXX_COMPILER="$(tc-getCXX)" + -DCMAKE_CUDA_HOST_COMPILER="$(tc-getCXX)" + -DCMAKE_C_FLAGS="${CFLAGS}" + -DCMAKE_CXX_FLAGS="${CXXFLAGS}" + # set build type flags to empty to avoid overriding CXXFLAGS + -UCMAKE_C_FLAGS_RELEASE + -UCMAKE_C_FLAGS_RELWITHDEBINFO + -UCMAKE_CXX_FLAGS_RELEASE + -UCMAKE_CXX_FLAGS_RELWITHDEBINFO + # enable debug info in LLVM as well with USE=debug + -DLLVM_BUILD_TYPE=$(usex debug RelWithDebInfo Release) + -DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}" + -DDEFAULT_SYSROOT="${EPREFIX}" + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" + -DCMAKE_INSTALL_CMAKEDIR="$(get_libdir)/cmake/ROOT" + -DCMAKE_INSTALL_DATADIR="share/root" + -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" + -DCMAKE_INSTALL_FONTDIR="share/fonts/root" + -DCMAKE_INSTALL_INCLUDEDIR="include/root" + -DCMAKE_INSTALL_LIBDIR="$(get_libdir)/root" + -DCMAKE_INSTALL_PYTHONDIR="${EPREFIX}/usr/lib/${EPYTHON}/site-packages" + -DCMAKE_INSTALL_SRCDIR="${EPREFIX}/usr/src/debug/${CATEGORY}/${PF}" + -DCMAKE_INSTALL_SYSCONFDIR="share/root" + -DCMAKE_INSTALL_TUTDIR="share/root/tutorials" + -DCLING_BUILD_PLUGINS=OFF + -Dasan=OFF + -Dasserts=$(usex debug) + -Dccache=OFF # use ccache via portage + -Dcoverage=OFF + -Ddev=OFF + -Ddistcc=OFF + -Dfail-on-missing=ON + -Dgnuinstall=ON + -Dgminimal=OFF + -Dshared=ON + -Dsoversion=ON + -Dbuiltin_llvm=ON + -Dbuiltin_clang=ON + -Dbuiltin_cling=ON + -Dbuiltin_openui5=ON + -Dbuiltin_cfitsio=OFF + -Dbuiltin_cppzmq=OFF + -Dbuiltin_davix=OFF + -Dbuiltin_fftw3=OFF + -Dbuiltin_freetype=OFF + -Dbuiltin_ftgl=OFF + -Dbuiltin_gl2ps=OFF + -Dbuiltin_glew=OFF + -Dbuiltin_gsl=OFF + -Dbuiltin_gtest=OFF + -Dbuiltin_lz4=OFF + -Dbuiltin_lzma=OFF + -Dbuiltin_nlohmannjson=OFF + -Dbuiltin_openssl=OFF + -Dbuiltin_pcre=OFF + -Dbuiltin_tbb=OFF + -Dbuiltin_unuran=OFF + -Dbuiltin_vc=OFF + -Dbuiltin_vdt=OFF + -Dbuiltin_veccore=OFF + -Dbuiltin_xrootd=OFF + -Dbuiltin_xxhash=OFF + -Dbuiltin_zeromq=OFF + -Dbuiltin_zlib=OFF + -Dbuiltin_zstd=OFF + -Darrow=OFF + -Dasimage=$(usex asimage) + -Dcefweb=OFF + -Dclad=OFF + -Dcocoa=$(usex aqua) + -Dcuda=$(usex cuda) + -Dcudnn=$(usex cudnn) + -Dcxxmodules=OFF # requires clang, unstable + -Ddaos=OFF # not in gentoo + -Ddataframe=ON + -Ddavix=$(usex davix) + -Ddcache=OFF + -Dfcgi=$(usex http) + -Dfftw3=$(usex fftw) + -Dfitsio=$(usex fits) + -Dfortran=$(usex fortran) + -Dgdml=$(usex gdml) + -Dgviz=$(usex graphviz) + -Dhttp=$(usex http) + -Dimt=$(usex tbb) + -Dlibcxx=$(usex libcxx) + -Dmathmore=$(usex gsl) + -Dminuit=$(usex minuit) + -Dmlp=$(usex tmva) + -Dmpi=$(usex mpi) + -Dmysql=$(usex mysql) + -Dodbc=$(usex odbc) + -Dopengl=$(usex opengl) + -Dpgsql=$(usex postgres) + -Dpyroot=$(usex python) # python was renamed to pyroot + -Dpythia8=$(usex pythia8) + -Dqt5web=$(usex qt5) + -Dqt6web=$(usex qt6) + -Dr=$(usex R) + -Droofit=$(usex roofit) + -Droofit_multiprocess=OFF + -Droofit_hs3_ryml=OFF + -Droot7=$(usex root7) + -Drootbench=OFF + -Droottest=OFF + -Drpath=OFF + -Druntime_cxxmodules=ON + -Dshadowpw=$(usex shadow) + -Dspectrum=ON + -Dsqlite=$(usex sqlite) + -Dssl=$(usex ssl) + -Dtest_distrdf_dask=OFF + -Dtest_distrdf_pyspark=OFF + -Dtesting=$(usex test) + -Dtmva=$(usex tmva) + -Dtmva-cpu=$(usex tmva) + -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 + -Dwebgui=$(usex http) + -Dx11=$(usex X) + -Dxml=$(usex xml) + -Dxrootd=$(usex xrootd) + ) + + # Needs to be here, otherwise gets overriden by cmake.eclass + DCMAKE_BUILD_TYPE=$(usex debug RelWithDebInfo Release) cmake_src_configure +} + +src_install() { + cmake_src_install + + newenvd - 99root <<- EOF || die + LDPATH="${EPREFIX}/usr/$(get_libdir)/root" + EOF + + pushd "${ED}/usr" > /dev/null + + rm bin/*.{csh,sh,fish} || die + + if ! use examples; then + rm -r share/root/tutorials || die + fi + + popd + + use python && python_optimize +} diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild index 1c6e78d4b623..fa797d38a0aa 100644 --- a/sci-physics/root/root-9999.ebuild +++ b/sci-physics/root/root-9999.ebuild @@ -16,8 +16,8 @@ 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 qt6 R +roofit +root7 shadow - sqlite +ssl +tbb test +tmva +unuran uring vc +xml xrootd" + postgres pythia8 +python qt5 qt6 R +roofit +root7 shadow sqlite +ssl + +tbb test +tmva +unuran uring vc +xml xrootd" if [[ ${PV} =~ "9999" ]] ; then inherit git-r3 @@ -86,7 +86,6 @@ CDEPEND=" dev-qt/qtwebengine:6[widgets] ) ) - asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) cudnn? ( dev-libs/cudnn ) davix? ( net-libs/davix ) @@ -106,9 +105,7 @@ CDEPEND=" dev-db/unixODBC ) ) - oracle? ( dev-db/oracle-instantclient[sdk] ) postgres? ( dev-db/postgresql:= ) - pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( ${PYTHON_DEPS} ) R? ( dev-lang/R ) @@ -209,7 +206,6 @@ src_configure() { -Dcoverage=OFF -Ddev=OFF -Ddistcc=OFF - -Dexceptions=ON -Dfail-on-missing=ON -Dgnuinstall=ON -Dgminimal=OFF @@ -219,7 +215,6 @@ src_configure() { -Dbuiltin_clang=ON -Dbuiltin_cling=ON -Dbuiltin_openui5=ON - -Dbuiltin_afterimage=OFF -Dbuiltin_cfitsio=OFF -Dbuiltin_cppzmq=OFF -Dbuiltin_davix=OFF @@ -262,26 +257,19 @@ src_configure() { -Dfitsio=$(usex fits) -Dfortran=$(usex fortran) -Dgdml=$(usex gdml) - -Dgfal=OFF -Dgviz=$(usex graphviz) -Dhttp=$(usex http) -Dimt=$(usex tbb) - -Djemalloc=OFF -Dlibcxx=$(usex libcxx) -Dmathmore=$(usex gsl) -Dminuit=$(usex minuit) - -Dminuit2=$(usex minuit) -Dmlp=$(usex tmva) - -Dmonalisa=OFF -Dmpi=$(usex mpi) -Dmysql=$(usex mysql) -Dodbc=$(usex odbc) -Dopengl=$(usex opengl) - -Doracle=$(usex oracle) -Dpgsql=$(usex postgres) -Dpyroot=$(usex python) # python was renamed to pyroot - -Dpyroot_legacy=OFF - -Dpythia6=$(usex pythia6) -Dpythia8=$(usex pythia8) -Dqt5web=$(usex qt5) -Dqt6web=$(usex qt6) @@ -298,7 +286,6 @@ src_configure() { -Dspectrum=ON -Dsqlite=$(usex sqlite) -Dssl=$(usex ssl) - -Dtcmalloc=OFF -Dtest_distrdf_dask=OFF -Dtest_distrdf_pyspark=OFF -Dtesting=$(usex test) diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest index f334e9194a73..f1a16721a377 100644 --- a/sci-physics/vgm/Manifest +++ b/sci-physics/vgm/Manifest @@ -1,4 +1,5 @@ +AUX vgm-5.2-r1-root-6.32-TesselatedSolid.patch 1252 BLAKE2B 113a2b9cb046e0beb2114ac620b74251b87b71312fd8ee170464a2ea08056b35d291365bc3a91f575222d5e597aeb2b88f04276c1729fe554ed757044b663ba1 SHA512 6f402cb30e4aba97e87b9c246bc2cc7856feafabf3c3e8bb5cae8231d60d113d8b42f30a73f015ac5330e34fd40c01dc3da1632a821957d88c3c8945f5313c7f DIST vgm-5.2.tar.gz 3963607 BLAKE2B 6b82f0ac8fa345e4a736d38c2e961f04836c943445fa2dbe52e48dcc378826a4aa7e1ea1af74ae097288121e52549d599e434da30bfd2b46c35b177ef42dae14 SHA512 f141215bf67684d41acb3ae3551e0c8b643033fca841d924030eedc18136e94d75efd8940b43eaca2640470c78331fff36957173e98c7f8a1cccc6325abbf870 -EBUILD vgm-5.2-r1.ebuild 1654 BLAKE2B 8e684ba6216c8912d62d6ac8050513d9681b4b7fea5ecf6854fb0570e29b66995fead8a72e78958769963c42671cd907a5d1c13c7dcde76e9bab25a2214667eb SHA512 f8f56c9b0c40bbbc7c0417a47edb813528f46d8ad393489d34e08c38f32dd2527a2a75004252190b35ead74bacb9bdecb552cb16b0009f5dad074b6d259d5c4d +EBUILD vgm-5.2-r1.ebuild 1727 BLAKE2B cdea698c15713a7fb0e5b26a78f54150343eda84942598ae9d99fedc6e85f4f97b71338859464dc9ab97469b3917eb73f3231ec5c9c3d3e27bf126ec435aa072 SHA512 e3ecd096d27950a665ebe39f8784c85c4e70dcca245c1a83312af31a3995311e96eadf85d2f93ea70b67770d49847f6dc13a125b00afb5fc1aeb197fc38e2769 EBUILD vgm-9999.ebuild 1640 BLAKE2B 67a697401c54c6525a69f3b501f70829ffe1d9c50cf37a9e831911fe5d45c1fb1ce0e34e10b28958942e24c44bb443a4c4969c04aec9b5ecf7f0a9bfd2134803 SHA512 728c256c28853805602f04b3137d2853d43a7eef06bfb1a54df6feae54f7da85d9a3b6ae1bbbc38f234c14944f3d424a81e28e50c1df1feccb032115cf2a66d4 MISC metadata.xml 819 BLAKE2B 04ac719d56f70b20157b47d72551ef2867807589f1bfa577bb8a7e12954fa039a531a07384fac09555dbead90d8609cf6bf96a075f992492fd04166fb5711d3d SHA512 bda8c954d6cdd776af7fdc781de5f2b07566777a29d4fe99bbe596ead476481a0352ef28a8978b0625051310de458fb77fb00f6c3e9d20f27f727f8b39d954dc diff --git a/sci-physics/vgm/files/vgm-5.2-r1-root-6.32-TesselatedSolid.patch b/sci-physics/vgm/files/vgm-5.2-r1-root-6.32-TesselatedSolid.patch new file mode 100644 index 000000000000..2c1bfc92a349 --- /dev/null +++ b/sci-physics/vgm/files/vgm-5.2-r1-root-6.32-TesselatedSolid.patch @@ -0,0 +1,31 @@ +adapt RootGM::TessellatedSolid for ROOT 6.32.00 + +Bug: https://github.com/vmc-project/vgm/pull/16 +--- + packages/RootGM/source/solids/TessellatedSolid.cxx | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +--- a/packages/RootGM/source/solids/TessellatedSolid.cxx ++++ b/packages/RootGM/source/solids/TessellatedSolid.cxx +@@ -178,13 +178,16 @@ VGM::ThreeVector RootGM::TessellatedSolid::Vertex(int ifacet, int index) const + { + CheckVertexIndex(ifacet, index); + +- const TGeoFacet& facet = fTessellated->GetFacet(ifacet); ++#if ROOT_VERSION_CODE > ROOT_VERSION(6, 30, 4) ++ const auto& rvertex = fTessellated->GetVertex((fTessellated->GetFacet(ifacet))[index]); ++#else ++ const auto& rvertex = fTessellated->GetFacet(ifacet).GetVertex(index); ++#endif + + VGM::ThreeVector vertex; +- vertex.push_back(facet.GetVertex(index).fVec[0] * RootGM::Units::Length()); +- vertex.push_back(facet.GetVertex(index).fVec[1] * RootGM::Units::Length()); +- vertex.push_back(facet.GetVertex(index).fVec[2] * RootGM::Units::Length()); ++ vertex.push_back(rvertex.fVec[0] * RootGM::Units::Length()); ++ vertex.push_back(rvertex.fVec[1] * RootGM::Units::Length()); ++ vertex.push_back(rvertex.fVec[2] * RootGM::Units::Length()); + + return vertex; + } +- diff --git a/sci-physics/vgm/vgm-5.2-r1.ebuild b/sci-physics/vgm/vgm-5.2-r1.ebuild index 6e5f9a755e9c..ff3c18921bb1 100644 --- a/sci-physics/vgm/vgm-5.2-r1.ebuild +++ b/sci-physics/vgm/vgm-5.2-r1.ebuild @@ -45,6 +45,10 @@ DOCS=( doc/VGMhistory.txt ) +PATCHES=( + "${FILESDIR}"/${PN}-5.2-r1-root-6.32-TesselatedSolid.patch +) + src_configure() { local mycmakeargs=( -DCLHEP_DIR="${EPREFIX}/usr" -- cgit v1.2.3