diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
| commit | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch) | |
| tree | 356496503d52354aa6d9f2d36126302fed5f3a73 /sci-physics | |
| parent | fcc5224904648a8e6eb528d7603154160a20022f (diff) | |
gentoo resync : 20.03.2022
Diffstat (limited to 'sci-physics')
31 files changed, 688 insertions, 136 deletions
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz Binary files differindex fdc9a9eef8ea..7ccec248d586 100644 --- a/sci-physics/Manifest.gz +++ b/sci-physics/Manifest.gz diff --git a/sci-physics/bullet/Manifest b/sci-physics/bullet/Manifest index 9a016a905ab1..fab0580c6889 100644 --- a/sci-physics/bullet/Manifest +++ b/sci-physics/bullet/Manifest @@ -2,7 +2,9 @@ AUX bullet-2.85-soversion.patch 1094 BLAKE2B 8dc035b80d812b3c2382067796f1626a932 DIST bullet-3.07.tar.gz 148413637 BLAKE2B 776cd7651d11d865095ea000d353860bea09c6ff4ec8dd8e43282a78373e2830f6ce1ce2b87ed25a67be7bded297b3a6320b2872a71dfd3849e7b197c6d2c936 SHA512 31fc7cb4ed8b939abc9eeb0a8f6fff3a454ea4ebcffd797fd35a2320fe3ab222fcd315569809ea148d0efff47267f5eec9f4bf7aaf07730a06aa9babd2abc9a6 DIST bullet-3.08.tar.gz 129282084 BLAKE2B daa5b6719575af28c6f6359ef51c7a9b8ca9cde2e5b4ea1b00c2991fc4d6b13175d034c7a694eaf36e8ff3ab343457027f57bb511639b3701341ad4551f1a6ca SHA512 4177c2b2f3b007691102973e7a3d4337b8de559d20058db75a2d25eab35b9be62fa14e3362435ef6f7ea2f6b8cf02a78770cc49c17e979adf3a2b41f19ee702a DIST bullet-3.17.tar.gz 131995187 BLAKE2B 38996c299eb900f867367966c90c7511d4f5c727671249665a073f86390a4514f7c8193577fd73502b49d467eaeb6e7b195426089065ce3bda3238ee76e237b3 SHA512 a5105bf5f1dd365a64a350755c7d2c97942f74897a18dcdb3651e6732fd55cc1030a096f5808cf50575281f05e3ac09aa50a48d271a47b94cd61f5167a72b7cc +DIST bullet-3.21.tar.gz 133046747 BLAKE2B 7bbc51027f19502e4d72bb33ad698817d87d559b60a3eb1067aebc8e25dbf746fd99753cfe6839a2be649318ce7c7563f63409818dc1bdd210a5ed56fe38b5bd SHA512 dfe2e091d2ea42301e131b010769b5a3c5204693f40d46e4f2a8cba94117d19058b8c9873e6a1ce8dff11a249498e65540566ef1a2ff7866546289958965fda4 EBUILD bullet-3.07-r1.ebuild 1941 BLAKE2B 9c00b272c034d6fdcc17e4aa405c01f5f3b250730f5a1fd01032ef5b8e837383673e9febccdbad37fb8b6e262d3f851e8ab68c6f304c772d0363b6041c545c00 SHA512 6c4dbeed8a710fdb0b0e11bf70268a392fe0027a409c5070bdb3196b5d611fd217f205bb8590ea37ef9b7064744eb5c64b1df933e6957ae9e2340a9a19f800bb EBUILD bullet-3.08-r1.ebuild 1943 BLAKE2B 16c07ca3a3bfa16e2d1c99fceb4ea4f0386b7fe528752052fe178f9c3ac28e1867e104b93afcd824110900156758fc314c255c1166ec8543c43f61ef35fbc7b4 SHA512 82ea0f51a8d25ea2feaa208e96f88d86646beee7c50968feb616fdad58769714554cda5fceed3200e9c79e714ead4f73ced463c1d481797733a676e308dd2f5b -EBUILD bullet-3.17-r1.ebuild 2052 BLAKE2B 43d921c7c54f74491e1fdf672057247ba7a91e4cb63a0969cc745ba79281a06cb080ce59ada999819d8b0f6551092d0e2c5c3a18e432fe130dc6adc82cf952c8 SHA512 ffe9b50b8369db27164f87667f79f209f6bada28f8a397dd9f3decbf61a7b37b927ec00752af65b110cdb37e22d951d6c505c18115be6f1ffaa2497d11402d56 +EBUILD bullet-3.17-r1.ebuild 2050 BLAKE2B c1d92afbc4dcbbb8ab547f4e4f2d4ec897666ab7a717c71104658e845e041c5ab85a92f00245268a4a72049bee1667c3dc5ecc63cf72292fee4c24d4c6f36154 SHA512 339ac9eaa2fe976bcf7391a3f662dd8f2d5ed62cb7e8281cf58d66e8895a1105ba25f783e731e7572cd039ff661f5ec44d54b95bfba9e8755dae3f2227b4f29b +EBUILD bullet-3.21.ebuild 2052 BLAKE2B cd8dede99e3108d2b0e817d065ef8b6ffe12f4e7e5864c2af91f6b4a4deb1f5efe1778b99b97d12061994e80a56a1a485c42a2f5f5323c2672e36676a0b919d2 SHA512 f3da97de638d01432bac1338aec34963c5b23744cec234b4494f029c639fa49593c63b271c734c84a8d1b4a106fa87cdd5c06ea1dcafd1f5f7e32e395e9d705e MISC metadata.xml 1162 BLAKE2B 6d72e78aab8b03ee623c694c66876514496b5e8591d17e722771af51e7b7115bdc17c4920c21713bd272eee04da11212676f0092a70d58fc32fd373b77a788f3 SHA512 98348211222b5798b9312f86438cf404e1aeeab75ddd39605e41ee4301bc25111b59b8d0f14ef06df80ab4e88dbd0bc28556b281e58159efb2f945d57306cf22 diff --git a/sci-physics/bullet/bullet-3.17-r1.ebuild b/sci-physics/bullet/bullet-3.17-r1.ebuild index 5c1db84f1499..84913e382446 100644 --- a/sci-physics/bullet/bullet-3.17-r1.ebuild +++ b/sci-physics/bullet/bullet-3.17-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/bulletphysics/bullet3/archive/${PV}.tar.gz -> ${P}.t LICENSE="ZLIB" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" IUSE="doc double-precision examples extras openmp tbb test +threads" REQUIRED_USE=" diff --git a/sci-physics/bullet/bullet-3.21.ebuild b/sci-physics/bullet/bullet-3.21.ebuild new file mode 100644 index 000000000000..9c107c131d61 --- /dev/null +++ b/sci-physics/bullet/bullet-3.21.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake toolchain-funcs + +DESCRIPTION="Continuous Collision Detection and Physics Library" +HOMEPAGE="https://www.bulletphysics.com/" +SRC_URI="https://github.com/bulletphysics/bullet3/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="ZLIB" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +IUSE="doc double-precision examples extras openmp tbb test +threads" + +REQUIRED_USE=" + openmp? ( threads ) + tbb? ( threads ) +" + +RDEPEND=" + virtual/opengl + media-libs/freeglut + tbb? ( <dev-cpp/tbb-2021.4.0:= ) +" +DEPEND="${RDEPEND}" +BDEPEND="doc? ( app-doc/doxygen[dot] )" + +PATCHES=( "${FILESDIR}"/${PN}-2.85-soversion.patch ) + +DOCS=( AUTHORS.txt LICENSE.txt README.md ) + +# Building / linking of third Party library BussIK does not work out of the box +RESTRICT="test" + +S="${WORKDIR}/${PN}3-${PV}" + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + cmake_src_prepare + + # allow to generate docs + sed -i -e 's/GENERATE_HTMLHELP.*//g' Doxyfile || die +} + +src_configure() { + local mycmakeargs=( + -DBUILD_CPU_DEMOS=OFF + -DBUILD_OPENGL3_DEMOS=OFF + -DBUILD_BULLET2_DEMOS=OFF + -DUSE_GRAPHICAL_BENCHMARK=OFF + -DINSTALL_LIBS=ON + -DBUILD_BULLET3=ON + -DBUILD_BULLET_ROBOTICS_GUI_EXTRA=OFF # This module depends on example libraries + -DBUILD_EXTRAS=$(usex extras) + -DUSE_DOUBLE_PRECISION=$(usex double-precision) + -DBUILD_UNIT_TESTS=$(usex test) + -DBULLET2_MULTITHREADING=$(usex threads) + -DBULLET2_USE_OPEN_MP_MULTITHREADING=$(usex openmp) + -DBULLET2_USE_TBB_MULTITHREADING=$(usex tbb) + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + if use doc; then + doxygen || die + HTML_DOCS+=( html/. ) + DOCS+=( docs/*.pdf ) + fi + + if use examples; then + # throws QA warnings + rm examples/ThirdPartyLibs/openvr/*/linux*/libopenvr_api.so || die + DOCS+=( examples ) + fi +} diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest index d5062673c46d..dc43bc5aac11 100644 --- a/sci-physics/geant/Manifest +++ b/sci-physics/geant/Manifest @@ -1,5 +1,7 @@ DIST geant4-v11.0.0.tar.gz 35605817 BLAKE2B c34ded976b88946973a5ea9e81d91e0510318ae25f29c631f46b0ee60a9a97d682375ba18e429773930b1ba7808989b9b7ef6affb8f2f1f220ec1c7bd069590c SHA512 52631043e4f1bce6cb33d822bedca5a384c4c7c8997473a548b4df4f3b1702d45fe6ef64647225e573995c63518e4ba39f82afb645b7daa89591a3127799498a +DIST geant4-v11.0.1.tar.gz 35643646 BLAKE2B 52af009440d70aa1547d07e4367266a4e02561d0d5d509399db94ce8dcf41d491085b8de908efee7fbe3e7324963f57c9e36e1beeed9a6cef42d327b2f2201a0 SHA512 d189e6aca04dfa6a7a371f2273105d7fb80719c9e1cade7c170ff350d22db5cb33cbfece4c1f8c4d5a374a048bb95f6e9fcd37b03a3a7c2d946e046c4ea608fa DIST geant4.10.07.p03.tar.gz 35756099 BLAKE2B 9e510d17173d280a24d2540d0e0f25f7337a410858c30e9281b937a8402cbc0acd022cc6f41cc3b88fec28b53fa8a266d79e90bfb6545f4ecffe0724e36183da SHA512 174e4f37ca977eff89bbd8f72f18ef5534db72d966665b9a837ed26acffa527d45741fd38fde460f0719c8962dc2ee33db1f3dfe065a7d0e74c148e4582c095c EBUILD geant-4.10.7.3.ebuild 2976 BLAKE2B 987a3ba8c35136cb8932663110f8d5fd9c1d9be3fc0a2372c86f9addf65734663c83b64b1a454330bd9104117e705ba4ac2fda3047033323db7d5bccd7408255 SHA512 ae85cffa6ea7eb9437cf8c50ed3c24dc7b2765128dc9755f04dadf2934e27ae39e2611fa5dbf37460675718a0a04d8c7ce70a9abb07350ff411c193d5f9d15d0 EBUILD geant-4.11.0.0.ebuild 3484 BLAKE2B 529a246976d45c71364f70805e49ac2f1e8efc2b0d75872dbd5dd3de8a78e9ee9ae5be39831995f17c8425b483c292881298efaebedb7ba698ac5ba024af8ddb SHA512 90182ca371145e27dfc75f6d5e7ae7a6a613bd8771702ce07bb87257364b643cc50abf78f6b506f2add37bfab804f660010f13c632ee5f1355d6c53fb75f3495 +EBUILD geant-4.11.0.1.ebuild 3412 BLAKE2B bf5101fbd5d6375aa4ebc33e5e053b3b8a4d7e001894f467472edd62d4ab3742dfdde98263c7160e2b4b878f3315ad4ff4b036dad0d646990748376f6c2adf41 SHA512 83e45c0b3a38b8c79911bd5479d3e3d46489dc55aeb77ce12a8b4f8b295c081980d58b1947498ad1b67102139dfb75f6b20a0abe7ff4eaf2eec6ad5b856b31f7 MISC metadata.xml 1765 BLAKE2B 70ee66225468abedfaebb6faec123c5d0c1748088080a483c9378654e93190d9436abc0c781e4a5909283fb63541c3ae4450e5bb43fa720dfcfb928023079064 SHA512 5ccca521e3249cdf0d1f9d0dabae8fea73ac03a564be7d7c5f19a85fafb16f4078ea39bf7b55d7c45e4b5575e0b809fd251cc18e28d2e5bba993f71f5056fd4d diff --git a/sci-physics/geant/geant-4.11.0.1.ebuild b/sci-physics/geant/geant-4.11.0.1.ebuild new file mode 100644 index 000000000000..1ea83a6f144f --- /dev/null +++ b/sci-physics/geant/geant-4.11.0.1.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit cmake python-single-r1 + +MY_P=${PN}$(ver_cut 1)-v$(ver_cut 2-4) + +case ${PV} in +*_beta*) + DOCS="ReleaseNotes/Beta.$(ver_cut 2-3)-*.txt" + ;; +*) + if [[ $(ver_cut 4) -gt 0 ]]; then + DOCS="ReleaseNotes/Patch.$(ver_cut 2-3)-*.txt" + fi + HTML_DOCS="ReleaseNotes/ReleaseNotes.$(ver_cut 2-3).html" + ;; +esac + +DESCRIPTION="Toolkit for simulation of passage of particles through matter" +HOMEPAGE="https://geant4.web.cern.ch/" +SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz" + +LICENSE="geant4" +SLOT="4" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="+c++17 c++20 +data debug doc examples freetype gdml geant3 hdf5 inventor motif opengl + python qt5 raytracerx static-libs tbb threads vtk" + +REQUIRED_USE=" + ^^ ( c++17 c++20 ) + inventor? ( opengl ) + motif? ( opengl ) + python? ( ${PYTHON_REQUIRED_USE} ) + qt5? ( opengl ) + tbb? ( threads ) + vtk? ( qt5 ) +" + +RDEPEND=" + dev-libs/expat + >=sci-physics/clhep-2.4.5.1:2=[threads?] + data? ( ~sci-physics/geant-data-4.11.0.0 ) + doc? ( app-doc/geant-docs ) + gdml? ( dev-libs/xerces-c ) + hdf5? ( sci-libs/hdf5[threads?] ) + inventor? ( media-libs/SoXt ) + motif? ( x11-libs/motif:0 ) + opengl? ( virtual/opengl ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-libs/boost:=[${PYTHON_USEDEP}] + ') + ) + qt5? ( + dev-qt/qt3d:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + opengl? ( dev-qt/qtopengl:5 ) + ) + raytracerx? ( + x11-libs/libX11 + x11-libs/libXmu + ) + vtk? ( + sci-libs/vtk:=[qt5] + )" + +S="${WORKDIR}/${MY_P}" + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4" + -DCMAKE_CXX_STANDARD=$((usev c++17 || usev c++20) | cut -c4-) + -DGEANT4_BUILD_BUILTIN_BACKTRACE=$(usex debug) + -DGEANT4_BUILD_MULTITHREADED=$(usex threads) + -DGEANT4_BUILD_STORE_TRAJECTORY=OFF + -DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec) + -DGEANT4_BUILD_VERBOSE_CODE=$(usex debug) + -DGEANT4_INSTALL_DATA=OFF + -DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data" + -DGEANT4_INSTALL_EXAMPLES=$(usex examples) + -DGEANT4_INSTALL_PACKAGE_CACHE=OFF + -DGEANT4_USE_FREETYPE=$(usex freetype) + -DGEANT4_USE_G3TOG4=$(usex geant3) + -DGEANT4_USE_GDML=$(usex gdml) + -DGEANT4_USE_HDF5=$(usex hdf5) + -DGEANT4_USE_INVENTOR=$(usex inventor) + -DGEANT4_USE_OPENGL_X11=$(usex opengl) + -DGEANT4_USE_PYTHON=$(usex python) + -DGEANT4_USE_QT=$(usex qt5) + -DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx) + -DGEANT4_USE_SYSTEM_CLHEP=ON + -DGEANT4_USE_SYSTEM_EXPAT=ON + -DGEANT4_USE_SYSTEM_ZLIB=ON + -DGEANT4_USE_TBB=$(usex tbb) + -DGEANT4_USE_XM=$(usex motif) + -DGEANT4_USE_VTK=$(usex vtk) + -DBUILD_STATIC_LIBS=$(usex static-libs) + ) + + if use python; then + mycmakeargs+=( + -DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}" + -DCMAKE_INSTALL_PYTHONDIR="${EPREFIX}/usr/lib/${EPYTHON}/site-packages" + ) + fi + + [ -v EXTRA_ECONF ] && mycmakeargs+=( ${EXTRA_ECONF} ) + + cmake_src_configure +} + +src_install() { + # adjust clhep linking flags for system clhep + # binmake.gmk is only useful for legacy build systems + sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die + cmake_src_install + use python && python_optimize + rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts" + + einstalldocs +} diff --git a/sci-physics/geant4_vmc/Manifest b/sci-physics/geant4_vmc/Manifest index 532a4554dfd6..ddb98c8d6b9c 100644 --- a/sci-physics/geant4_vmc/Manifest +++ b/sci-physics/geant4_vmc/Manifest @@ -1,6 +1,10 @@ -DIST geant4_vmc-5.3.tar.gz 7411643 BLAKE2B 31a486aa32f879093753aab09798eabf1a936f0aa246bb97c7f055eefb789c9c5a5097c14ce47b05a99f3cc2b46bea6edeba2af80ee362bb8fee039ee711eddc SHA512 918ce3ca4a4fb329f00000fce00dae3d4a4c9f348553f31bf474f727c1e67242b5ff28fe7dc5d3ab12d1174663b1dd96b654b5baf7edfa662ab3f66687792e94 +AUX geant4_vmc-6.0-cmake-g4root-tests.patch 1054 BLAKE2B 3e77d8fe80de29047ac2c14d7ac10d8620e5b52b3664611eb2d5aef27613ff32f51205db4b2a3a56c0d2c0acd07711f007cc41da91e1f9b0bcbc983b4fa75536 SHA512 361688506e7d72b96316146e5fdab2e748cb4d8e5c5167602a1e5d01deadcc8e5f4d16ab58d42a5e39ccb4b9c8a2e0fb3f712b2429070620a8e3d6a8d29078c6 +AUX geant4_vmc-6.0-geant-4.11.0.1-fix.patch 1062 BLAKE2B c70947f3ee19da576744ba5ee60b9f8b20b79e778046cbf5182c6eef098a9c4813344aff39fc72925bb0fdd734792950368420152caf06d37b1c041200e0c5f0 SHA512 b8b20c34ce2d86ca54829e7d3aa0ffe62ef90434a9a3978f6d483b7af1223263f9d1f7715ec7839f3bdff6ceacb9e1e1188b22bae64ad8491ae87b323e8271ee DIST geant4_vmc-5.4.tar.gz 7363185 BLAKE2B 3f1738a6d99d7cad1df1249a086b5257ff1d9c5c23657e12720b2d75ed61a96d6e45f2c964c471ba093d1c70fffb5b3df5a0d15fd7bdd54ab78a8f225649f0a1 SHA512 26b53c4b3a10943b9a5aa970dfc8c09b4086a385c6fea2a914bf8b020044032f9b73df7fd054185eba86f66ba50cd86372d0e874c0642bb3e357fba499fd7675 -EBUILD geant4_vmc-5.3-r1.ebuild 1849 BLAKE2B f99eea3c215cb4cd86b91ff9f3e20b84c367be1219cbfb7a085e77520ad0dd03716b2dd723fd28dc8eacfc0dbf4e5e6292e05640ecd16fd0ed0a8f4273dcacc9 SHA512 4a850e5fce757a424cb409a499b8ad1e494fc2be5435c05e146e774b15044a4751a498657a2957e10e02d891ab3e9c11a2a35597e8e55d2ff914e3fcd151d50c -EBUILD geant4_vmc-5.4.ebuild 1849 BLAKE2B b4a43efb08a94d8c0cd4b90de666b3a5355d5b7e0fab9e5aa2d429f53fefdb76e30721bcc74a4e61a49a8c993831301d259af31ea248d39f5dfb3285481c39f4 SHA512 116da0c54218575bf79432b8d6daf76d9bfe7656925ba11524da79c730a136ea74fe96e7dd2f94bbdb58b5e1d05d99d11bf87f739fe43ae966087e1fdfc2293e -EBUILD geant4_vmc-9999.ebuild 1843 BLAKE2B 5e67f677e7eb458fbe63af58b3ebd426a516f781d15f5bbda79ddf7bad1d3981c1a18fe11f821917394c8591eb1c392355a5594fcf38485475555e92a1374d41 SHA512 e108df6228804a64d600b01ab484e839a6f6087d1dd9dbdeec2f98d89632ca8c395b50e64dd240c11f16147433f289386c9180cd6471ac500ae80f95e6946493 +DIST geant4_vmc-6.0.tar.gz 5649857 BLAKE2B 905ee76a579e25ee6259aafe978b0f202313ae6ce7f62e424c663e5a22f3c77e9a2eb3a4d807515267087c9e95aebb962927728da8110248136d69bcb8b1fc56 SHA512 ee21ec2d493d4ef227b294818ca0e6940c437e069197009f4bfab0fa1c282b4ad0dc5744157077ccb3b8953c4a167492571a56f68def2152730bcb79892f56fc +DIST geant4_vmc-6.1.tar.gz 5604048 BLAKE2B 74d8e7fd20f9abd0205ccb3913180380b8862fef604b563ffde036a27f387887e1bf9ddf1c33fcb530e328c0dc5db42c51eac16097d94861326ec1a4c4ad3eed SHA512 6a9fd1c2b74e57ca5552c2bdb02a568916568da662eba29947f746c27c07a779e69b24315afd9cb9e8eda83b14eb53d351f3494cbe6fefb951eaf85888b0b1be +EBUILD geant4_vmc-5.4.ebuild 1857 BLAKE2B 246d31602f6c40c9dfe13d123f699b7e7c4f2f49dd24d229f4bcd92dd176b8af207b14237040eb4393ea69554017d0458a99db4c5466bd49da9af45e6c848af2 SHA512 1e5bf979f2a656b9ef89e6ebbfa057db62000049011e3e93593cc903b9b1b0e0ac8f5955d36df531999d1c37d860bab1daa1826aed0846468a6681dc66775598 +EBUILD geant4_vmc-6.0-r1.ebuild 1972 BLAKE2B f6cdd1ff34adc0294022a82081f681ef92453fa85a0b63865d51fb97e07c1532e57fddee8398bd4332be7078408e4ba306d1de28bf754b295b13c1d82103f306 SHA512 048160090c08e3fc391e5963b797557d5dea89f75d0b9a82e41eeb94c625554c436ce4f67b5d32f6e13561bd1539a7cd5d0e9167b1da6f5108e3617c04efad59 +EBUILD geant4_vmc-6.1.ebuild 1813 BLAKE2B ca05d3b7c257195753a7d85e9b60e24968e5106a5ec27cb131a645555461af37143321dd01b33ceb054b10de179201cc71cc1ddcbf1aa8fba6ddb903c106786b SHA512 38c326e0ebe6fe32c9980ad35c0077ac984b23f02f812f6a3a708107ac94dc60064c60ee5c03033cded0cd738c7f1c6c239d55eed1b2e536114ae59c4ab535a3 +EBUILD geant4_vmc-9999.ebuild 1800 BLAKE2B d29a4ed94fe75ddb161922fab6d52e3cab7421e1904fef95f4aece519e89abea0d524b746a95ebf3e18a84d1d4b696abb1c1ac70fced838fb8b15f56094f6f0e SHA512 cad267d8cee1f431e4b93808914ae46535ca6e01cd5c7afcf8b6140d7d435071a062c0698eb4b1a4479f7bc34ddb221445bd90574c114720a462993722987ac9 MISC metadata.xml 1006 BLAKE2B 65038f11d71140809618866bdeb25849b005969de9c5dafbab594d3c6d3e2025339f97a7dcc7969677bceaaa346f02800427c6cf84f3f78519c149ec92bd85ef SHA512 1e4fe2fcc62983553b86b45fcfa2d0d5ac65d8939ed3b650ac494b22db197f7c04e7967ec7f3502a0c007271b497c6700cc2a62bbe600724fae71ad5d94efaf5 diff --git a/sci-physics/geant4_vmc/files/geant4_vmc-6.0-cmake-g4root-tests.patch b/sci-physics/geant4_vmc/files/geant4_vmc-6.0-cmake-g4root-tests.patch new file mode 100644 index 000000000000..5f561dc64c88 --- /dev/null +++ b/sci-physics/geant4_vmc/files/geant4_vmc-6.0-cmake-g4root-tests.patch @@ -0,0 +1,31 @@ +From 5d25b7fd6d53b620b25bed3a72d739d1644b5731 Mon Sep 17 00:00:00 2001 +From: Oliver Freyermuth <o.freyermuth@googlemail.com> +Date: Fri, 11 Feb 2022 17:22:13 +0100 +Subject: [PATCH] CMake: Fix G4Root_BUILD_TEST option in main CMakeLists. + +The option was not correctly inherited for use by the g4root +subdirectory. Fixed by: +- Setting it before add_subdirectory(). +- Storing the value in CACHE (otherwise, not seen in subdirectory). + +Pull Request: https://github.com/vmc-project/geant4_vmc/pull/28 +Bug: https://bugs.gentoo.org/833126 +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -60,8 +60,8 @@ include(VMCInstallLibDir) + #--- Add the packages sources -------------------------------------------------- + # + if(Geant4VMC_BUILD_G4Root) ++ set(G4Root_BUILD_TEST ${Geant4VMC_BUILD_G4Root_TEST} CACHE BOOL "Build G4Root test") + add_subdirectory(g4root) +- set(G4Root_BUILD_TEST ${Geant4VMC_BUILD_G4Root_TEST}) + endif(Geant4VMC_BUILD_G4Root) + + if(Geant4VMC_BUILD_Geant4VMC) +-- +2.34.1 + diff --git a/sci-physics/geant4_vmc/files/geant4_vmc-6.0-geant-4.11.0.1-fix.patch b/sci-physics/geant4_vmc/files/geant4_vmc-6.0-geant-4.11.0.1-fix.patch new file mode 100644 index 000000000000..64e55fccc186 --- /dev/null +++ b/sci-physics/geant4_vmc/files/geant4_vmc-6.0-geant-4.11.0.1-fix.patch @@ -0,0 +1,33 @@ +From fad0699c25b864e1ce2466c3c683007af5c350ad Mon Sep 17 00:00:00 2001 +From: Ivana Hrivnacova <Ivana.Hrivnacova@cern.ch> +Date: Wed, 9 Mar 2022 18:03:18 +0100 +Subject: [PATCH] Fix compilation with Geant4 11.0.p1: (#30) + +Added missing test for G4VERSION_NUMBER in TG4RunManager.cxx +--- + source/run/src/TG4RunManager.cxx | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/source/run/src/TG4RunManager.cxx b/source/run/src/TG4RunManager.cxx +index 64a45f0e0..5190172b0 100644 +--- a/source/run/src/TG4RunManager.cxx ++++ b/source/run/src/TG4RunManager.cxx +@@ -47,6 +47,7 @@ + #include <G4UIExecutive.hh> + #include <G4UImanager.hh> + #include <G4UIsession.hh> ++#include <G4Version.hh> + #include <Randomize.hh> + + #ifdef USE_G4ROOT +@@ -405,8 +406,10 @@ void TG4RunManager::Initialize() + // create G4RunManager + // ConfigureRunManager(); + ++#if G4VERSION_NUMBER == 1100 + // Temporary work-around for bug in Cerenkov in Geant4 11.0 + TG4PhysicsManager::Instance()->StoreCerenkovMaxBetaChangeValue(); ++#endif + + // initialize Geant4 + fRunManager->Initialize(); diff --git a/sci-physics/geant4_vmc/geant4_vmc-5.4.ebuild b/sci-physics/geant4_vmc/geant4_vmc-5.4.ebuild index db6fc22f8e35..a86aa91a1e02 100644 --- a/sci-physics/geant4_vmc/geant4_vmc-5.4.ebuild +++ b/sci-physics/geant4_vmc/geant4_vmc-5.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -24,8 +24,8 @@ IUSE="doc examples geant3 +g4root +mtroot vgm test" RDEPEND=" <sci-physics/geant-4.11[c++17,opengl,geant3?] - sci-physics/root:=[c++17,-vmc] - sci-physics/vmc:=[c++17] + sci-physics/root:=[c++17,-vmc(-)] + <sci-physics/vmc-2.0:=[c++17] vgm? ( sci-physics/vgm:= )" DEPEND="${RDEPEND}" BDEPEND="doc? ( app-doc/doxygen[dot] )" diff --git a/sci-physics/geant4_vmc/geant4_vmc-6.0-r1.ebuild b/sci-physics/geant4_vmc/geant4_vmc-6.0-r1.ebuild new file mode 100644 index 000000000000..b26b9b111f8a --- /dev/null +++ b/sci-physics/geant4_vmc/geant4_vmc-6.0-r1.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git" +else + MY_PV=$(ver_rs 1- -) + SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${MY_PV}" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Virtual Monte Carlo Geant4 implementation" +HOMEPAGE="https://github.com/vmc-project/geant4_vmc" + +LICENSE="GPL-3" +SLOT="4" +IUSE="doc examples geant3 +g4root vgm test" + +RDEPEND=" + >=sci-physics/geant-4.11[c++17,opengl,geant3?] + sci-physics/root:=[c++17,-vmc(-)] + >=sci-physics/vmc-2.0:=[c++17] + vgm? ( sci-physics/vgm:= )" +DEPEND="${RDEPEND} + test? ( >=sci-physics/geant-4.11[gdml] )" +BDEPEND="doc? ( app-doc/doxygen[dot] )" +RESTRICT=" + !examples? ( test ) + !geant3? ( test ) + !g4root? ( test ) + !test? ( test ) + !vgm? ( test )" + +DOCS=(history README.md) + +PATCHES=( + "${FILESDIR}"/${PN}-6.0-cmake-g4root-tests.patch + "${FILESDIR}"/${PN}-6.0-geant-4.11.0.1-fix.patch +) + +src_configure() { + local mycmakeargs=( + -DGeant4VMC_USE_VGM="$(usex vgm)" + -DGeant4VMC_USE_GEANT4_G3TOG4="$(usex geant3)" + -DGeant4VMC_USE_G4Root="$(usex g4root)" + -DGeant4VMC_BUILD_EXAMPLES="$(usex test)" + -DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)" + -DGeant4VMC_BUILD_G4Root_TEST="$(usex test)" + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + if use doc ; then + local dirs=( + source + $(usev g4root) + $(usev examples) + ) + local d + for d in "${dirs[@]}"; do + pushd "${d}" > /dev/null || die + doxygen || die + popd > /dev/null || die + done + fi +} + +src_test() { + cd examples || die + ./test_suite.sh --debug --g3=off --garfield=off --builddir="${BUILD_DIR}" || die + ./test_suite_exe.sh --g3=off --garfield=off --garfield=off --builddir="${BUILD_DIR}" || die +} + +src_install() { + cmake_src_install + use doc && local HTML_DOCS=(doc/.) + einstalldocs +} diff --git a/sci-physics/geant4_vmc/geant4_vmc-5.3-r1.ebuild b/sci-physics/geant4_vmc/geant4_vmc-6.1.ebuild index 0fe08fe74864..99ae522be943 100644 --- a/sci-physics/geant4_vmc/geant4_vmc-5.3-r1.ebuild +++ b/sci-physics/geant4_vmc/geant4_vmc-6.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -20,20 +20,20 @@ HOMEPAGE="https://github.com/vmc-project/geant4_vmc" LICENSE="GPL-3" SLOT="4" -IUSE="doc examples geant3 +g4root +mtroot vgm test" +IUSE="doc examples geant3 +g4root vgm test" RDEPEND=" - <sci-physics/geant-4.11[c++17,opengl,geant3?] - sci-physics/root:=[c++17,-vmc] - sci-physics/vmc:=[c++17] + >=sci-physics/geant-4.11[c++17,opengl,geant3?] + sci-physics/root:=[c++17,-vmc(-)] + >=sci-physics/vmc-2.0:=[c++17] vgm? ( sci-physics/vgm:= )" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + test? ( >=sci-physics/geant-4.11[gdml] )" BDEPEND="doc? ( app-doc/doxygen[dot] )" RESTRICT=" !examples? ( test ) !geant3? ( test ) !g4root? ( test ) - !mtroot? ( test ) !test? ( test ) !vgm? ( test )" @@ -44,9 +44,9 @@ src_configure() { -DGeant4VMC_USE_VGM="$(usex vgm)" -DGeant4VMC_USE_GEANT4_G3TOG4="$(usex geant3)" -DGeant4VMC_USE_G4Root="$(usex g4root)" - -DGeant4VMC_BUILD_MTRoot="$(usex mtroot)" -DGeant4VMC_BUILD_EXAMPLES="$(usex test)" -DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)" + -DGeant4VMC_BUILD_G4Root_TEST="$(usex test)" ) cmake_src_configure } @@ -57,14 +57,11 @@ src_compile() { local dirs=( source $(usev g4root) - $(usev mtroot) $(usev examples) ) local d for d in "${dirs[@]}"; do - pushd "${d}" > /dev/null || die - doxygen || die - popd > /dev/null || die + doxygen "${d}"/Doxyfile || die done fi } diff --git a/sci-physics/geant4_vmc/geant4_vmc-9999.ebuild b/sci-physics/geant4_vmc/geant4_vmc-9999.ebuild index 9ad9d152375f..13017563cf1f 100644 --- a/sci-physics/geant4_vmc/geant4_vmc-9999.ebuild +++ b/sci-physics/geant4_vmc/geant4_vmc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,20 +20,20 @@ HOMEPAGE="https://github.com/vmc-project/geant4_vmc" LICENSE="GPL-3" SLOT="4" -IUSE="doc examples geant3 +g4root +mtroot vgm test" +IUSE="doc examples geant3 +g4root vgm test" RDEPEND=" sci-physics/geant[c++17,opengl,geant3?] - sci-physics/root:=[c++17,-vmc] + sci-physics/root:=[c++17,-vmc(-)] sci-physics/vmc:=[c++17] vgm? ( sci-physics/vgm:= )" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + test? ( >=sci-physics/geant-4.11[gdml] )" BDEPEND="doc? ( app-doc/doxygen[dot] )" RESTRICT=" !examples? ( test ) !geant3? ( test ) !g4root? ( test ) - !mtroot? ( test ) !test? ( test ) !vgm? ( test )" @@ -44,9 +44,9 @@ src_configure() { -DGeant4VMC_USE_VGM="$(usex vgm)" -DGeant4VMC_USE_GEANT4_G3TOG4="$(usex geant3)" -DGeant4VMC_USE_G4Root="$(usex g4root)" - -DGeant4VMC_BUILD_MTRoot="$(usex mtroot)" -DGeant4VMC_BUILD_EXAMPLES="$(usex test)" -DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)" + -DGeant4VMC_BUILD_G4Root_TEST="$(usex test)" ) cmake_src_configure } @@ -57,14 +57,11 @@ src_compile() { local dirs=( source $(usev g4root) - $(usev mtroot) $(usev examples) ) local d for d in "${dirs[@]}"; do - pushd "${d}" > /dev/null || die - doxygen || die - popd > /dev/null || die + doxygen "${d}"/Doxyfile || die done fi } diff --git a/sci-physics/hepmc/Manifest b/sci-physics/hepmc/Manifest index 39780112468a..417240d0fbdb 100644 --- a/sci-physics/hepmc/Manifest +++ b/sci-physics/hepmc/Manifest @@ -1,3 +1,3 @@ DIST HepMC-2.06.09.tar.gz 4612637 BLAKE2B 6bbf1a6a8410b6717ddff29fc3643247582f7a61a05fd9e52a0b09f78bf75de587c1c55525f6a1367b306a26a4687ce55b64908c049d91bdb2db3d40467af62b SHA512 1030f31ad9d19d8ae184145a693c4a3092131f485e2ed89598b7172992a825ad9aa46fb44a9199a00c4a6bd7e163daead9452e9bc4fe32cb3b97351cf22906c4 -EBUILD hepmc-2.06.09-r1.ebuild 2050 BLAKE2B d5cca53267e511861f5b085bf105cb7720fe2b46a83c756baf2b0d6039aa653752c5f1fce649f00cdfa44194c3adba066c7aa88aacbc0f2c225e73138b167cd5 SHA512 b0bcff52f6d8e1cca09e7c2bc83d726eb77b11c9daf68cf18b02e12715a4dfdafbe1c56a627f641e770fbdeaa71853f95f9a309ce9fc74fc985414a60a00ae92 +EBUILD hepmc-2.06.09-r2.ebuild 1944 BLAKE2B 9c768aae3cb4bcc0d4c6953e7577e0bff407ec61ef1efb9ec34b60944ac8880e832a196c04cb1adcf1539488807af3729db35282cc71383ae560f22473dfca70 SHA512 0c45e436498dea65ea1b801a44b8b4c6e232305dbb7d002656a0f11feb4fb2a0d23cf6a63f0bfd7c711bff6fba60f69367ca7f173a6af0bac54c664bbd0b2cb6 MISC metadata.xml 1387 BLAKE2B fea7ce2a6373cb4c3dcc91f5cc9f7ddee03e12ae9f35769d949115e8d21e70bca4f2304cb6384d708b447e0e4a5b4bb5713d0abad011e10bacab84b601648b12 SHA512 c82cab58777d4e1ca0fe563e5625cba2cb99edfe27f477c191f5ef0afba40ff62f5d1834e8472294958e6c36f17af10b8da0c91fcb3b147bb3bd8dfda37a79fe diff --git a/sci-physics/hepmc/hepmc-2.06.09-r1.ebuild b/sci-physics/hepmc/hepmc-2.06.09-r2.ebuild index e8453c9991df..8a0b2af2611b 100644 --- a/sci-physics/hepmc/hepmc-2.06.09-r1.ebuild +++ b/sci-physics/hepmc/hepmc-2.06.09-r2.ebuild @@ -1,24 +1,24 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit cmake-utils +inherit cmake MYP=HepMC-${PV} DESCRIPTION="Event Record for Monte Carlo Generators" HOMEPAGE="https://hepmc.web.cern.ch/hepmc/" SRC_URI="http://lcgapp.cern.ch/project/simu/HepMC/download/${MYP}.tar.gz" +S="${WORKDIR}/${MYP}" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="cm doc examples gev static-libs test" +IUSE="cm doc examples gev test" RESTRICT="!test? ( test )" -RDEPEND="" -DEPEND="${RDEPEND} +BDEPEND=" doc? ( app-doc/doxygen dev-texlive/texlive-latex @@ -26,12 +26,8 @@ DEPEND="${RDEPEND} dev-texlive/texlive-latexrecommended )" -S="${WORKDIR}/${MYP}" - -DOCS=( ChangeLog AUTHORS ) - src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare sed -i -e '/add_subdirectory(doc)/d' CMakeLists.txt || die # CMake doc building broken @@ -62,12 +58,12 @@ src_prepare() { if ! use test; then sed -i -e '/add_subdirectory(test)/d' CMakeLists.txt || die fi - if ! use static-libs; then - sed -i \ - -e '/(HepMC\(fio\|\)S/d' \ - -e '/TARGETS/s/HepMC\(fio\|\)S//' \ - {src,fio}/CMakeLists.txt || die - fi + + # remove static libs + sed -i \ + -e '/(HepMC\(fio\|\)S/d' \ + -e '/TARGETS/s/HepMC\(fio\|\)S//' \ + {src,fio}/CMakeLists.txt || die } src_configure() { @@ -76,20 +72,21 @@ src_configure() { -Dlength=$(usex cm CM MM) -Dmomentum=$(usex gev GEV MEV) ) - cmake-utils_src_configure + cmake_src_configure } src_compile() { - cmake-utils_src_compile + cmake_src_compile + if use doc; then - cd doc + cd doc || die ./buildDoc.sh || die ./buildDoxygen.sh || die + HTML_DOCS=( doc/html/. ) fi } src_install() { - use doc && HTML_DOCS=( doc/html/. ) + cmake_src_install use doc && dodoc doc/*.pdf - cmake-utils_src_install } diff --git a/sci-physics/lammps/Manifest b/sci-physics/lammps/Manifest index a284bbe98347..a01e46c0ba73 100644 --- a/sci-physics/lammps/Manifest +++ b/sci-physics/lammps/Manifest @@ -1,4 +1,6 @@ +DIST lammps-17Feb2022.tar.gz 170036241 BLAKE2B 74d370657bff17847dce0bbe082134721722574b298832ea37d319968123b12d37ecdfea5560b2776e846c32d05a98f722710327d8da46f80869f75a36f6c255 SHA512 f2df65847906ca5890aae98efed5712eb6dd694f2b85dc062084a02b9bf43412ecd075f54df2947bff71d3b6313c1ec39c437e02497920da795e9ba0cd5dc068 DIST lammps-stable_3Mar2020.tar.gz 126001870 BLAKE2B 35ed6ff208fd6dcc8eae50b8e0562a6a0771aa6419c0225353f648d95512ca64b22250ad4a3f9b836b9a25a6838e24e070a1d190fdc02b896dc1ed9838648f01 SHA512 6608cd9f6ea18d8acb55d611a560cb4b329043b41aca23fafd91fac0dfbde5a5286e1a6563bd16b2414bb3bf95929e3a2f270a0b023ce5ede515eb3353d56f04 DIST lammps-testing-stable_3Mar2020.tar.gz 55729550 BLAKE2B d0de8efa83342b4a350f17a43d3fe96011534b3f410beb295e396a45200ea56298c14664b290b2e30ab4f2fd70b92c01c73927b2878e8171a166dedee8ecf379 SHA512 e3dc592ce57ae625eb66ddd9ca80d7bbaca57c47a07166a7196dcc3074b574a497e706da8baf93b5deacdf588702ceb141014533ac2aaccdd011836fb34943b9 -EBUILD lammps-20200303-r2.ebuild 3063 BLAKE2B 3e468e225bae4ca64a9441a8de4133e6a50c482c6e8ce6879f1443d16aeb101aa8c855a82fc0b653b7756d2de038f43e47af4fd66544316c2ad0f85fe3f46357 SHA512 958f4a7e6b893c31fbd6a06a43002a483554d89df715f8c2ce351d04978344a6a459dcbc4410168807e4a18803cd4ea608c93201b3d21b02e2adffdd330510b0 -MISC metadata.xml 1401 BLAKE2B 2e20264031bcd2178c2accee5ac4abbfdfbaf53c00822ec2c2e6ef23fd0320525bd6126f6cd13c022b8b9ea8e314546f7cda63b675ec4f4a3c04af48206411dc SHA512 c2936835e7b3966469cf699d59f1c81060129f4e8851989ba5b3a93e02f7c0c8e9dc600866dd1e995c08c6af8d69829f76375eb10458fdcbd85150556508eb90 +EBUILD lammps-20200303-r2.ebuild 2990 BLAKE2B e97e893244cdb72d3501697d694f46bc7e8810033fda65d9132cbf819763f78c4ed94032a49096f71187a80354544afd70fe4c068eaa220703eeb94a131b5283 SHA512 53c4e651fd22a5d9471ac3f81ca8105fbf0b9685671acbb28ace3bd7c872e1a938f7586be923afc5e92c12a45a153481b4332559f156a24c6f4474a62718fde4 +EBUILD lammps-20220217.ebuild 3303 BLAKE2B 2e0d4558a1e6eb2157d7f9a3f1b1d56563f88180c27b7c2ec44d94c89d51bf40594d1c0d3299871b103b0718fb21713338d380d93fabd1bec3790c701e7c7282 SHA512 89a7ed27243e842b10274d6dbecc792098b5c6077c47c85f9b27c0894ededa971127ede73c193c96bb1cc692095024a82f2d188bd1ccab9e6264c6c480f95425 +MISC metadata.xml 1535 BLAKE2B 32405b37fe2b07f10d904bb9ecd5a7d645c776ca210839d5f2cd4f1abff4188bb47d72a7ef2a149299422373289a88c6f048891743a7a0b97736c7c9c38ef6b0 SHA512 af7aa377d87a09eb2551ae2214b0ba8b2435682d5a7189da2d97adacccd2ac5763c724b516df730d1fd151e5b7c584b80448c30fd16f77495b6788246d37054e diff --git a/sci-physics/lammps/lammps-20200303-r2.ebuild b/sci-physics/lammps/lammps-20200303-r2.ebuild index b58daf2ca70a..539c056cf969 100644 --- a/sci-physics/lammps/lammps-20200303-r2.ebuild +++ b/sci-physics/lammps/lammps-20200303-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -24,7 +24,7 @@ SRC_URI="https://github.com/lammps/lammps/archive/${MY_PV}.tar.gz -> ${MY_P}.tar LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" -IUSE="cuda examples gzip kokkos lammps-memalign mpi netcdf python test" +IUSE="cuda examples gzip lammps-memalign mpi netcdf python test" RESTRICT="!test? ( test )" DEPEND=" @@ -42,7 +42,6 @@ DEPEND=" sci-libs/fftw:3.0= netcdf? ( sci-libs/netcdf:= ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) - kokkos? ( =dev-cpp/kokkos-3.0* ) dev-cpp/eigen:3 " RDEPEND="${DEPEND}" @@ -71,8 +70,8 @@ src_configure() { -DPKG_GRANULAR=ON -DPKG_KSPACE=ON -DFFT=FFTW3 - -DPKG_KOKKOS=$(usex kokkos) - $(use kokkos && echo -DEXTERNAL_KOKKOS=ON) + # requires kokkos 3.0 + -DPKG_KOKKOS=OFF -DPKG_MANYBODY=ON -DPKG_MC=ON -DPKG_MEAM=ON diff --git a/sci-physics/lammps/lammps-20220217.ebuild b/sci-physics/lammps/lammps-20220217.ebuild new file mode 100644 index 000000000000..4f65d7d2fdca --- /dev/null +++ b/sci-physics/lammps/lammps-20220217.ebuild @@ -0,0 +1,164 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +DISTUTILS_OPTIONAL=1 +CMAKE_MAKEFILE_GENERATOR=emake +# Doc building insists on fetching mathjax +# DOCS_BUILDER="doxygen" +# DOCS_DEPEND=" +# media-gfx/graphviz +# dev-libs/mathjax +# " + +inherit cmake fortran-2 distutils-r1 # docs + +convert_month() { + local months=( "" Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec ) + echo ${months[${1#0}]} +} + +MY_PV="$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:0:4}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator" +HOMEPAGE="https://lammps.sandia.gov/" +SRC_URI="https://download.lammps.org/tars/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}/cmake" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cuda examples gzip hip lammps-memalign mpi opencl python test" +# Requires write access to /dev/dri/renderD... +RESTRICT="test" + +RDEPEND=" + app-arch/gzip + media-libs/libpng:0 + sys-libs/zlib + mpi? ( + virtual/mpi + sci-libs/hdf5:=[mpi] + ) + python? ( ${PYTHON_DEPS} ) + sci-libs/voro++ + virtual/blas + virtual/lapack + sci-libs/fftw:3.0= + sci-libs/netcdf:= + cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) + opencl? ( virtual/opencl ) + hip? ( dev-util/hip:= ) + dev-cpp/eigen:3 + " + # Kokkos-3.5 not in tree atm + # kokkos? ( dev-cpp/kokkos-3.5.* ) +DEPEND="${RDEPEND} + test? ( + dev-cpp/gtest + ) +" + +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + ?? ( cuda opencl hip ) +" + +src_prepare() { + cmake_src_prepare + if use python; then + pushd ../python || die + distutils-r1_src_prepare + popd + fi +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" + -DBUILD_SHARED_LIBS=ON + -DBUILD_MPI=$(usex mpi) + -DBUILD_DOC=OFF + #-DBUILD_DOC=$(usex doc) + -DENABLE_TESTING=$(usex test) + -DPKG_ASPHERE=ON + -DPKG_BODY=ON + -DPKG_CLASS2=ON + -DPKG_COLLOID=ON + -DPKG_COMPRESS=ON + -DPKG_CORESHELL=ON + -DPKG_DIPOLE=ON + -DPKG_GRANULAR=ON + -DPKG_KSPACE=ON + -DFFT=FFTW3 + -DPKG_KOKKOS=OFF + #-DPKG_KOKKOS=$(usex kokkos) + #$(use kokkos && echo -DEXTERNAL_KOKKOS=ON) + -DPKG_MANYBODY=ON + -DPKG_MC=ON + -DPKG_MEAM=ON + -DPKG_MISC=ON + -DPKG_MOLECULE=ON + -DPKG_PERI=ON + -DPKG_QEQ=ON + -DPKG_REPLICA=ON + -DPKG_RIGID=ON + -DPKG_SHOCK=ON + -DPKG_SRD=ON + -DPKG_PYTHON=$(usex python) + -DPKG_MPIIO=$(usex mpi) + -DPKG_VORONOI=ON + ) + if use cuda || use opencl || use hip; then + mycmakeargs+=( -DPKG_GPU=ON ) + use cuda && mycmakeargs+=( -DGPU_API=cuda ) + use opencl && mycmakeargs+=( -DGPU_API=opencl -DUSE_STATIC_OPENCL_LOADER=OFF ) + use hip && mycmakeargs+=( -DGPU_API=hip ) + else + mycmakeargs+=( -DPKG_GPU=OFF ) + fi + cmake_src_configure + if use python; then + pushd ../python || die + distutils-r1_src_configure + popd + fi +} + +src_compile() { + cmake_src_compile + if use python; then + pushd ../python || die + distutils-r1_src_compile + popd + fi +} + +src_test() { + cmake_src_test + if use python; then + pushd ../python || die + distutils-r1_src_test + popd + fi +} + +src_install() { + cmake_src_install + if use python; then + pushd ../python || die + distutils-r1_src_install + popd + fi + + if use examples; then + for d in examples bench; do + local LAMMPS_EXAMPLES="/usr/share/${PN}/${d}" + insinto "${LAMMPS_EXAMPLES}" + doins -r "${S}"/../${d}/* + done + fi +} diff --git a/sci-physics/lammps/metadata.xml b/sci-physics/lammps/metadata.xml index 8b13daf09171..8ac470d0f10e 100644 --- a/sci-physics/lammps/metadata.xml +++ b/sci-physics/lammps/metadata.xml @@ -19,8 +19,10 @@ <flag name="lammps-memalign">Enables the use of the posix_memalign() call instead of malloc() when large chunks or memory are allocated by LAMMPS. Aliengnment is on 16 byte boundaries.</flag> - <flag name="cuda">Enable cuda non-bonded kernels</flag> - <flag name="kokkos">Enable kokkos non-bonded kernels</flag> + <flag name="cuda">Enable cuda gpu computing support</flag> + <flag name="opencl">Enable opencl gpu computing support</flag> + <flag name="hip">Enable hip gpu computing support</flag> + <!--<flag name="kokkos">Enable kokkos non-bonded kernels</flag>--> </use> <maintainer type="person"> <email>nicolasbock@gentoo.org</email> diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest index ce6424e9d2c4..53bf45ed2e8b 100644 --- a/sci-physics/root/Manifest +++ b/sci-physics/root/Manifest @@ -1,8 +1,8 @@ AUX root-6.12.06_cling-runtime-sysroot.patch 989 BLAKE2B 8202cc8f2bf72cc25642d0a03ba26c3969069b291a6a22188879dbedbf0c3c496149f79f671d0eb51d81d0ee36565660d136b4741f5d018c2b05325ff08381f0 SHA512 c96dee9843da1051c54bd6870ef0a04714944ffe1f86800c9a51b8eb8ef84107d3315d3a708dcc0b651248af4bec362c7f31695514505045aeda9c793d40dc58 -DIST root_v6.22.08.source.tar.gz 173079716 BLAKE2B 0b3c15dfedd0215334dcd59db133aa9097709996e0e9cc20a1ae96f954ee607cad314291148f78a31f24ba78dee84204e617e17a6ed8a390503b068e8120e9f3 SHA512 2355e20b8c4d7ad747c31956a3ad0f6e7b70039f3e6613182bd7c53d0e8776267ee85fc1d8aad9ed0d942e28f4124ad79a7dc1082bb1ea7974be2cb6a8a85b39 DIST root_v6.24.06.source.tar.gz 185205236 BLAKE2B 6b3343ad8d86373de3abd328480eaa89825bca46ebb5ccc16ddcb8c1060fa023eeb8be3d1832e3ce2ad0beaafe66334f20ed8344ffb6df72d89c6622aa1c947a SHA512 356d6287df2900de9e831347d9513f444bf7cbd29c39fbb5841051ae877dac1e22dc255c64166cd3925b82aac860ae67ef6ce171732c16fd23d7919a47e7cb5a -EBUILD root-6.22.08-r4.ebuild 7560 BLAKE2B 41d21fd17273fc98c246cfbc51b18c590d8b7accf4627ac22b48483a81fc10f7e77efa165f592879c613a97f059e8d4a2b91081b18195fda91d45745fc6c8328 SHA512 69148874a4bbf7f81947a74f8af111a2cee633df48a55b2fa031c70466a313c8151c4f68c0570849a60fa584cdece2c19e4f247a404a71c1643ced77f88f5a85 +DIST root_v6.26.00.source.tar.gz 193685534 BLAKE2B 22e2845308362ceefd85e7ae567f1593a387e24e6ac779c6a681b8b9b9354686ba42db81f9a0c7c033d046c374bc4ba7b74cf8979e9b2a49e5231201c1765204 SHA512 78428de6b7ba546263aed51df2e23f9493a8dc8112a320142a8e5187a88ed4d0c0402e453cec2dc79063da15ad28cb89ec154085aed2579f87c6657c77362f45 EBUILD root-6.24.06-r2.ebuild 7801 BLAKE2B dcc1ebd5c871c71f942bd7d3e65bd997a18ec17cee1519e82eef06f7926609b58112db98202b695f55c23cd799eda797a43c3ad3bbb225d08d7fb9dcb5be1f66 SHA512 d3270cd5f207d9905037aa12690aa5b2b87e4c0cce720dc1782861994eaeec14da479b59f1803c5058d9ccbb1d56b10da47ca38124b93bd1386643976816971b -EBUILD root-6.24.9999.ebuild 8272 BLAKE2B 8b41c7f88de1ff01a30094c755697421b03ed41bb92f2dbd5e49ef13ec0c18b79cb6ac84643d50d4f389c28f62280f00366abe5a5468f861739696b9dcd12cf8 SHA512 4e26795eaa705cc814e67829aecb2c9809c7deb1db7a67255afafd6aa272ef69236e9a752d66502fffab74cc6f095346e537166bdc71035bd23dcb1b16ae618a -EBUILD root-9999.ebuild 8272 BLAKE2B 8b41c7f88de1ff01a30094c755697421b03ed41bb92f2dbd5e49ef13ec0c18b79cb6ac84643d50d4f389c28f62280f00366abe5a5468f861739696b9dcd12cf8 SHA512 4e26795eaa705cc814e67829aecb2c9809c7deb1db7a67255afafd6aa272ef69236e9a752d66502fffab74cc6f095346e537166bdc71035bd23dcb1b16ae618a +EBUILD root-6.26.00.ebuild 7839 BLAKE2B ecc161551a259789faf8665e9c1fadf6e3a996b96bf764ac470e0cf8de058b2c28e3740d68338728e9f9b4dbc1b0fa7d12bd80c53d637ded49d1de059d5e6d0f SHA512 9dd30e96c547161da2318aa5a4181136c2d9b89fe8ed7ff1b135222f2204b7e54dc574272f40a2176d53d5df88ad6369996fa13563c1d3686188eb3c3c090ceb +EBUILD root-6.26.9999.ebuild 8181 BLAKE2B 428944930fd8cdc2ceb83d7c1351dceaf6be54903ca27b65d4fb4df128715252f9a379fa267ce4d60604c670b62b2b3c12b1cffe310136b32dcfd017d8f38df9 SHA512 eee3875db54207ba2dbbb92cb02b0ae2dba50db00b48008f9734cbd2ec933314635f26ee5415322259be5d037d826234d30680aab468f828010beb5b1189d3ca +EBUILD root-9999.ebuild 8406 BLAKE2B 425a8cb4955c01d381b115c92f97b8678b2d24f6a8f1adeb099e64c95c64dcced48c74a18908249691d2a09ddd07de001ccf304f3c4335092d75a3748c54f833 SHA512 dc45cfbb0531fd7de8c259d8c696f496bffd6e6177aed549f81f8a2e7de8d3b3b9c2a56f92aaadf358800637472ed2b270aee14e8d6b6d6f98d0656813b54ab7 MISC metadata.xml 3150 BLAKE2B eb4fbf007e655d2a0bc80d8ef608f0ba19324ddea1af595dfa4ff5115e8d62409be4bfbf262cd1e3d9a400bd4f658224aac40690bdae072a870f8e1739e481d3 SHA512 3f3ff439a879e22319e4b97dfbbd01fe62e36904a8152507553ead043833218d59b6ecf87c5ebed339fb36af6573e6a171469e8158364db1f2b92cca97dedff3 diff --git a/sci-physics/root/root-6.22.08-r4.ebuild b/sci-physics/root/root-6.26.00.ebuild index ff49aae7cc47..43196c9075de 100644 --- a/sci-physics/root/root-6.22.08-r4.ebuild +++ b/sci-physics/root/root-6.26.00.ebuild @@ -6,19 +6,19 @@ EAPI=7 # ninja does not work due to fortran CMAKE_MAKEFILE_GENERATOR=emake FORTRAN_NEEDED="fortran" -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8,9,10} ) -inherit cmake cuda elisp-common fortran-2 prefix python-single-r1 toolchain-funcs +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++11 c++14 +c++17 cuda cudnn +davix debug emacs +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 prefix pythia6 pythia8 +python - qt5 R +roofit +root7 shadow sqlite +ssl +tbb test +tmva +unuran vc - vmc +xml xrootd" + 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 )" SLOT="$(ver_cut 1-2)/$(ver_cut 3)" @@ -26,15 +26,16 @@ LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" KEYWORDS="~amd64 ~x86" REQUIRED_USE=" - ^^ ( c++11 c++14 c++17 ) + ^^ ( c++14 c++17 ) cuda? ( tmva ) cudnn? ( cuda ) !X? ( !asimage !opengl !qt5 ) davix? ( ssl xml ) python? ( ${PYTHON_REQUIRED_USE} ) qt5? ( root7 ) - root7? ( || ( c++14 c++17 ) ) + root7? ( || ( c++17 ) ) tmva? ( gsl ) + uring? ( root7 ) " CDEPEND=" @@ -42,6 +43,7 @@ CDEPEND=" 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 @@ -98,12 +100,13 @@ CDEPEND=" shadow? ( sys-apps/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) - tbb? ( >=dev-cpp/tbb-2018:= ) + tbb? ( dev-cpp/tbb:= ) tmva? ( $(python_gen_cond_dep ' dev-python/numpy[${PYTHON_USEDEP}] ') ) + uring? ( sys-libs/liburing:= ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) @@ -154,13 +157,15 @@ src_configure() { -DCMAKE_CUDA_HOST_COMPILER=$(tc-getCXX) -DCMAKE_C_FLAGS="${CFLAGS}" -DCMAKE_CXX_FLAGS="${CXXFLAGS}" - -DCMAKE_CXX_STANDARD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-) + -DCMAKE_CXX_STANDARD=$((usev c++14 || usev c++17) | cut -c4-) -DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}" -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)" -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)/share/man" -DCMAKE_INSTALL_LIBDIR="lib" -DDEFAULT_SYSROOT="${EPREFIX}" -DCLING_BUILD_PLUGINS=OFF + -Dasserts=OFF + -Ddev=OFF -Dexceptions=ON -Dfail-on-missing=ON -Dgnuinstall=OFF @@ -168,8 +173,11 @@ src_configure() { -Dsoversion=ON -Dbuiltin_llvm=ON -Dbuiltin_clang=ON + -Dbuiltin_cling=ON + -Dbuiltin_openui5=ON -Dbuiltin_afterimage=OFF -Dbuiltin_cfitsio=OFF + -Dbuiltin_cppzmq=OFF -Dbuiltin_davix=OFF -Dbuiltin_fftw3=OFF -Dbuiltin_freetype=OFF @@ -179,6 +187,7 @@ src_configure() { -Dbuiltin_gsl=OFF -Dbuiltin_lz4=OFF -Dbuiltin_lzma=OFF + -Dbuiltin_nlohmannjson=OFF -Dbuiltin_openssl=OFF -Dbuiltin_pcre=OFF -Dbuiltin_tbb=OFF @@ -188,6 +197,7 @@ src_configure() { -Dbuiltin_veccore=OFF -Dbuiltin_xrootd=OFF -Dbuiltin_xxhash=OFF + -Dbuiltin_zeromq=OFF -Dbuiltin_zlib=OFF -Dbuiltin_zstd=OFF -Dalien=OFF @@ -203,6 +213,7 @@ src_configure() { -Ddataframe=ON -Ddavix=$(usex davix) -Ddcache=OFF + -Ddistcc=OFF -Dfcgi=$(usex http) -Dfftw3=$(usex fftw) -Dfitsio=$(usex fits) @@ -216,7 +227,6 @@ src_configure() { -Dimt=$(usex tbb) -Dlibcxx=$(usex libcxx) -Dmathmore=$(usex gsl) - -Dmemstat=OFF # deprecated -Dminimal=OFF -Dminuit2=$(usex minuit) -Dminuit=$(usex minuit) @@ -233,8 +243,10 @@ src_configure() { -Dpythia6=$(usex pythia6) -Dpythia8=$(usex pythia8) -Dqt5web=$(usex qt5) + -Dqt6web=OFF -Dr=$(usex R) -Droofit=$(usex roofit) + -Droofit_multiprocess=OFF -Droot7=$(usex root7) -Drootbench=OFF -Droottest=OFF @@ -245,18 +257,21 @@ src_configure() { -Dsqlite=$(usex sqlite) -Dssl=$(usex ssl) -Dtcmalloc=OFF + -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 - -Dvmc=$(usex vmc) -Dx11=$(usex X) -Dxml=$(usex xml) -Dxrootd=$(usex xrootd) diff --git a/sci-physics/root/root-6.24.9999.ebuild b/sci-physics/root/root-6.26.9999.ebuild index 821f43c2d80e..2dda688768c6 100644 --- a/sci-physics/root/root-6.24.9999.ebuild +++ b/sci-physics/root/root-6.26.9999.ebuild @@ -6,18 +6,18 @@ EAPI=7 # ninja does not work due to fortran CMAKE_MAKEFILE_GENERATOR=emake FORTRAN_NEEDED="fortran" -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8,9,10} ) -inherit cmake cuda elisp-common fortran-2 prefix python-single-r1 toolchain-funcs +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" -IUSE="+X aqua +asimage c++11 c++14 +c++17 cuda cudnn +davix debug emacs +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 prefix pythia6 pythia8 +python + mpi mysql odbc +opengl oracle postgres pythia6 pythia8 +python qt5 R +roofit +root7 shadow sqlite +ssl +tbb test +tmva +unuran uring - vc vmc +xml xrootd" + vc +xml xrootd" RESTRICT="!test? ( test )" if [[ ${PV} =~ "9999" ]] ; then @@ -37,14 +37,14 @@ fi LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" REQUIRED_USE=" - ^^ ( c++11 c++14 c++17 ) + ^^ ( c++14 c++17 ) cuda? ( tmva ) cudnn? ( cuda ) !X? ( !asimage !opengl !qt5 ) davix? ( ssl xml ) python? ( ${PYTHON_REQUIRED_USE} ) qt5? ( root7 ) - root7? ( || ( c++14 c++17 ) ) + root7? ( || ( c++17 ) ) tmva? ( gsl ) uring? ( root7 ) " @@ -168,7 +168,7 @@ src_configure() { -DCMAKE_CUDA_HOST_COMPILER=$(tc-getCXX) -DCMAKE_C_FLAGS="${CFLAGS}" -DCMAKE_CXX_FLAGS="${CXXFLAGS}" - -DCMAKE_CXX_STANDARD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-) + -DCMAKE_CXX_STANDARD=$((usev c++14 || usev c++17) | cut -c4-) -DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}" -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)" -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)/share/man" @@ -188,6 +188,7 @@ src_configure() { -Dbuiltin_openui5=ON -Dbuiltin_afterimage=OFF -Dbuiltin_cfitsio=OFF + -Dbuiltin_cppzmq=OFF -Dbuiltin_davix=OFF -Dbuiltin_fftw3=OFF -Dbuiltin_freetype=OFF @@ -207,6 +208,7 @@ src_configure() { -Dbuiltin_veccore=OFF -Dbuiltin_xrootd=OFF -Dbuiltin_xxhash=OFF + -Dbuiltin_zeromq=OFF -Dbuiltin_zlib=OFF -Dbuiltin_zstd=OFF -Dalien=OFF @@ -236,7 +238,6 @@ src_configure() { -Dimt=$(usex tbb) -Dlibcxx=$(usex libcxx) -Dmathmore=$(usex gsl) - -Dmemstat=OFF # deprecated -Dminimal=OFF -Dminuit2=$(usex minuit) -Dminuit=$(usex minuit) @@ -248,14 +249,15 @@ src_configure() { -Dopengl=$(usex opengl) -Doracle=$(usex oracle) -Dpgsql=$(usex postgres) - -Dpythia6=$(usex pythia6) -Dpyroot=$(usex python) # python was renamed to pyroot - #-Dpyroot_legacy=OFF # set to ON to use legacy PyROOT (6.22 and later) - #-Dpyroot_experimental=OFF # set to ON to use new PyROOT (6.20 and earlier) + -Dpyroot_legacy=OFF + -Dpythia6=$(usex pythia6) -Dpythia8=$(usex pythia8) -Dqt5web=$(usex qt5) + -Dqt6web=OFF -Dr=$(usex R) -Droofit=$(usex roofit) + -Droofit_multiprocess=OFF -Droot7=$(usex root7) -Drootbench=OFF -Droottest=OFF @@ -266,6 +268,7 @@ src_configure() { -Dsqlite=$(usex sqlite) -Dssl=$(usex ssl) -Dtcmalloc=OFF + -Dtest_distrdf_dask=OFF -Dtest_distrdf_pyspark=OFF -Dtesting=$(usex test) -Dtmva=$(usex tmva) @@ -273,13 +276,13 @@ src_configure() { -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 - -Dvmc=$(usex vmc) -Dx11=$(usex X) -Dxml=$(usex xml) -Dxrootd=$(usex xrootd) diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild index 821f43c2d80e..17abcfdfccb2 100644 --- a/sci-physics/root/root-9999.ebuild +++ b/sci-physics/root/root-9999.ebuild @@ -188,6 +188,7 @@ src_configure() { -Dbuiltin_openui5=ON -Dbuiltin_afterimage=OFF -Dbuiltin_cfitsio=OFF + -Dbuiltin_cppzmq=OFF -Dbuiltin_davix=OFF -Dbuiltin_fftw3=OFF -Dbuiltin_freetype=OFF @@ -207,6 +208,7 @@ src_configure() { -Dbuiltin_veccore=OFF -Dbuiltin_xrootd=OFF -Dbuiltin_xxhash=OFF + -Dbuiltin_zeromq=OFF -Dbuiltin_zlib=OFF -Dbuiltin_zstd=OFF -Dalien=OFF @@ -254,8 +256,10 @@ src_configure() { #-Dpyroot_experimental=OFF # set to ON to use new PyROOT (6.20 and earlier) -Dpythia8=$(usex pythia8) -Dqt5web=$(usex qt5) + -Dqt6web=OFF -Dr=$(usex R) -Droofit=$(usex roofit) + -Droofit_multiprocess=OFF -Droot7=$(usex root7) -Drootbench=OFF -Droottest=OFF @@ -266,6 +270,7 @@ src_configure() { -Dsqlite=$(usex sqlite) -Dssl=$(usex ssl) -Dtcmalloc=OFF + -Dtest_distrdf_dask=OFF -Dtest_distrdf_pyspark=OFF -Dtesting=$(usex test) -Dtmva=$(usex tmva) @@ -273,6 +278,7 @@ src_configure() { -Dtmva-gpu=$(usex cuda) -Dtmva-pymva=$(usex tmva) -Dtmva-rmva=$(usex R) + -Dtmva-sofie=OFF -Dunuran=$(usex unuran) -During=$(usex uring) -Dvc=$(usex vc) diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest index f5a86b9e16a4..25c67711ed29 100644 --- a/sci-physics/vgm/Manifest +++ b/sci-physics/vgm/Manifest @@ -1,7 +1,7 @@ AUX vgm-copy-test-seed.patch 341 BLAKE2B 0a3fdc57a76e5ee27ccea0221acd3742e4f00d6e9592d73a0f7083c172b6a4ce822eb6f78f45d9b0be756ba12950d446828cbbe896f32279b9979ff656cc7e7f SHA512 26a6df0823495a86322b32d55fde0b25d471687425d69fc48f4937e3bb7546f7c15b24373c324aa168cb764ce79ad16bc8b16eae6a587c58fe7088d71bddd957 -DIST vgm-4.8.tar.gz 3661965 BLAKE2B 29f878fb6716e261c27d60b2c9081d66313591a053d80f78501973f131aff88bbcee743ff9767836883dcb28d3ce5aeee3759a5890d7c8811a6a61503417284f SHA512 8b7cabc5796649c4014ccbdf1c6d209d2e7c2b4b06258716a72cadd997a9f6f51c4f9cb5870fd10abfd1ee133766876523c84441a69c7242bc2002687ca0ce58 DIST vgm-4.9.tar.gz 3881029 BLAKE2B 596a8df12f0dcd813a0d84e8c33eaa92dd2d332d9accf2fc38992f385748a2bd3579fee2af6cc00b878fe5491af4996d80775aa630120507ccc665f102f63b11 SHA512 90845d75a7ff0022f5fba15b7f621efd588251060c0d8e715fcc2e28bb6b4b01ddd83420dbd233cc0dd437ee6b8b5390bb1f84571ed12e696ee8c1dfc4bd8fd9 -EBUILD vgm-4.8-r1.ebuild 1641 BLAKE2B 5e166637d935346aee91539347c1c7c4f7dc2cd825d6b580e5ee079cc1a091c90c49a38b99fa80b91a1d18e28f7ff4cc4f486b77fe92d9b6fa8617340ce96cbf SHA512 3bd300bf45cb16c7906f98f39c15fca9a8b3622f9148039749a44ae6bcfc360f95b68bd4a976f6676c0f2ede25cc4f3a48816cf160e599d0345301b3e908bddd +DIST vgm-5.0.tar.gz 3862583 BLAKE2B 7a1643b329f6f6b019e1b68ce691ed45a32d343925c59451d6e218469606a7a352334d4f1e330873fa1cbc4e1182b4557dc396f52ce7d35e26df81e79121cd60 SHA512 771c2e013c052ea1785fb79ba317b48482428ddf703e263eaf1c9840fbae66dd280d73aee99de30e1c3d70e46a5eb63affc92dfc5ba19298e2d4487b9e302588 EBUILD vgm-4.9-r1.ebuild 1870 BLAKE2B cb8d6b19e229b6461cfb44eee7b99bc55222883547c79c6086a89f9e6d3f4c431fa4c6030caad64098220b9b2496a006a14b37026c6c6110df21e9f018002ea2 SHA512 581d83f287a7c690808aa25edae631c5cb441c1c27d335d9d85c35293ec2bb7fa2e5ad2e5922afe26f87daf37c2f3c3f1ee7fa573c8aa8781707ec994a4a9bb5 -EBUILD vgm-9999.ebuild 1802 BLAKE2B 7f00f8349c0147db8994d0f0a973901f87fbaca97d9f3b79349d9f2b5dec8b6512ccf63fbd91e4a7a20ed221cebe1b4aa485660dcafa0c040de638458c22bf67 SHA512 88db98999c0fc50bd14fefbaedc3419a831acdfafd7ec8324273d3ba99cdfca93291a01c5b49048648fd4fb8a1e12e32a854f1e9a0f71d2d9a7590d2306e5b55 +EBUILD vgm-5.0.ebuild 1784 BLAKE2B c1cc7617013417f3450f35291ad4641736309c250f899786ce5c2409baa8da2ed922e4bd10b9570bc2699cfd829d64e76cffa4e7b039ecd8cd5d815af0326035 SHA512 9bd28cc72c729528e337eab49f643884e06418689d6c539d1e9948c2bd72724ed077f6f46c100c2848c11744cb2a4e4b1441ed28fbd50576de610040c7c43e15 +EBUILD vgm-9999.ebuild 1770 BLAKE2B 985a3dc2387110c228a6d58d1754b7a22d6b4bd26bf144f52f7dd821c9a00a4027a68a6af864de7a95e9f994716682a5106422a916fc05b51718c747bd5dd220 SHA512 02739f111eea2a76e3fc67bbade81ba0a01e2c92824aff8eec7550279f9b54b855ada79ebd3b41886f854a9423d6b51cd06b76f7e39d831659c84cb7ac2bd7a6 MISC metadata.xml 819 BLAKE2B 04ac719d56f70b20157b47d72551ef2867807589f1bfa577bb8a7e12954fa039a531a07384fac09555dbead90d8609cf6bf96a075f992492fd04166fb5711d3d SHA512 bda8c954d6cdd776af7fdc781de5f2b07566777a29d4fe99bbe596ead476481a0352ef28a8978b0625051310de458fb77fb00f6c3e9d20f27f727f8b39d954dc diff --git a/sci-physics/vgm/vgm-4.8-r1.ebuild b/sci-physics/vgm/vgm-5.0.ebuild index 6fb28e08553c..d58370b67b04 100644 --- a/sci-physics/vgm/vgm-4.8-r1.ebuild +++ b/sci-physics/vgm/vgm-5.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -24,25 +24,24 @@ IUSE="doc examples +geant4 +root test" RDEPEND=" sci-physics/clhep:= - geant4? ( <sci-physics/geant-4.11[c++17] ) + geant4? ( >=sci-physics/geant-4.11[c++17] ) root? ( sci-physics/root:=[c++17] )" DEPEND="${RDEPEND} doc? ( app-doc/doxygen[dot] ) test? ( - <sci-physics/geant-4.11[gdml] + >=sci-physics/geant-4.11[gdml] sci-physics/geant4_vmc[g4root] )" RESTRICT=" !geant4? ( test ) !root? ( test ) - !test? ( test )" + !test? ( test ) + !examples? ( test )" DOCS=( doc/README - doc/todo.txt doc/VGMhistory.txt - doc/VGM.html - doc/VGMversions.html + doc/todo.txt ) src_configure() { @@ -65,14 +64,15 @@ src_configure() { src_compile() { cmake_src_compile if use doc; then - cd packages - doxygen || die + doxygen packages/Doxyfile || die fi } src_test() { cd "${BUILD_DIR}"/test || die - ./test_suite.sh || die + # See upstream issue: https://github.com/vmc-project/vgm/issues/5 + sed -i 's/ ScaledSolids / /' test3_suite.sh || die + PATH="${BUILD_DIR}"/test:${PATH} ./test_suite.sh || die } src_install() { diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild index a2b21203209d..fdf095918a01 100644 --- a/sci-physics/vgm/vgm-9999.ebuild +++ b/sci-physics/vgm/vgm-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -40,10 +40,8 @@ RESTRICT=" DOCS=( doc/README - doc/todo.txt doc/VGMhistory.txt - doc/VGM.html - doc/VGMversions.html + doc/todo.txt ) src_configure() { @@ -66,8 +64,7 @@ src_configure() { src_compile() { cmake_src_compile if use doc; then - cd packages - doxygen || die + doxygen packages/Doxyfile || die fi } diff --git a/sci-physics/vmc/Manifest b/sci-physics/vmc/Manifest index 397b7813eff6..212d973ff6c5 100644 --- a/sci-physics/vmc/Manifest +++ b/sci-physics/vmc/Manifest @@ -1,6 +1,6 @@ -DIST vmc-1.0_p3.tar.gz 91476 BLAKE2B 3005e0575a5835b832175e6a272d4e3c328990e28ac998aca60a42c4ddd03faba4d1b761867d8af597ca2468cf3072c49bb007852b5ec892c215df37297656dc SHA512 621c0cb3f2846f9401e3e4fff6fa47ab2afbff7c4dca5c19869abb1806ec19d4a221e5741aad9b3929a4e8b8207ee6008a9bf06ec8bf03ed73771cb29fda1b8d DIST vmc-1.1_p1.tar.gz 91722 BLAKE2B 6849b52c95dd33393f75d24eb184571bfbc3b711e6bba7c33853493e97ad63fbdfa4c49c61f664b911d7e047229bcde08303b48a345f1a0b9bfffee3f078e275 SHA512 407d8a6d3c3375e448273750aaffe43e9f4a63cc2f4a4ec41d1cd9b3c830b836cbef8d4e9cb37e5a0595f54a22989b7e1dd62dda0606a84f5732d1d3f6eaaee8 -EBUILD vmc-1.0_p3-r1.ebuild 1049 BLAKE2B 7d6b4299045feb097ee95b50c7725b7a399f0f3e4e7713c710a146bec4d748b0f2b8fd01eaf4ed13bbfd330a24f8f48c24c1fadbd6214bc6a9211dd4d9842888 SHA512 8e223b212a002e315c48d9fbcb20096e104f2fc9110ced735c46d84b0bfb58f260c7cdf303bf61eaf0b91e625fb326739a7207d3817e942f4132e8d3622ee29f -EBUILD vmc-1.1_p1.ebuild 1049 BLAKE2B 893aa0989593045a10c004bbc215dc4225e8007294b083014c4dc2bd15b8457b86133ced5f08ddd294a0340555c5af02b18deb3e3a6fb5e224e662a9204e29fb SHA512 1077c4d05b35945093f07f4071917852cfb57f600e9dbfbf1853fa7d460279b4088039f3cf655ec1f8e1ef19857c50e1c6dc8bd1f5114bcc8184b64bb87d2424 -EBUILD vmc-9999.ebuild 1056 BLAKE2B 725e469ee27f60c40ac30d12434bd1759b3e36c80a17f3555b3815abdee778947d175ca4e05f3145328cb5bbc0851f2d1e103df470802a3b0742eb557edd2d5d SHA512 ffb517df94713bdf4f8d442b347b1bed1cb0c2d0c8422f460d56931cf8f62719973549e94e4131324aba46d8e363e5c58befe3e100b31fb270f452429a33c5fe -MISC metadata.xml 820 BLAKE2B 8e38db0fed449e0c53c192289563c982ff9c2d4e801dfd40630bd9a18b49d86c372d5396bc1255a6937ca86c8cbcf7e4b59860a6295563060a872199e958841d SHA512 b930db816ee3885b0e414c8e33058a182da977510fe6f6106233bdb9154726d136fc663847d4a1940f13d66bf0100a1194129bd05dc45bf72d89ad4b3e38129b +DIST vmc-2.0.tar.gz 96865 BLAKE2B 487ad5888389e10ba79364f4701ab4caec33d88b940ee277a8039a401fd624d3a9f7ae62bd4a50be770ac924703256325bf118e243bfe700ed8e390104f4e3d5 SHA512 3f0a88bf2bcf3daaa1327125a1aebb05452dabce3d5f274797c05cbd15cdd1c9d4fdfeebdef70a70ce5d575f19c2856330be18683e7bf241113881e11a022a89 +EBUILD vmc-1.1_p1.ebuild 1033 BLAKE2B 458b8e5afe0c598283ee03918c9c0d499f1a1c6d3299d2cdf49f9026270716a011cef69805079523b691565c0e3518681b7716813d0d6d0fee6e229915038755 SHA512 732aa15de49506f3ffa82a0f045db0559e2dd8aa29cf961139cdca3391a332e73ed007557e6c0e7cacfc5f0674da448f68236fd58cc2d3786184324d62ce14f5 +EBUILD vmc-2.0.ebuild 1033 BLAKE2B 458b8e5afe0c598283ee03918c9c0d499f1a1c6d3299d2cdf49f9026270716a011cef69805079523b691565c0e3518681b7716813d0d6d0fee6e229915038755 SHA512 732aa15de49506f3ffa82a0f045db0559e2dd8aa29cf961139cdca3391a332e73ed007557e6c0e7cacfc5f0674da448f68236fd58cc2d3786184324d62ce14f5 +EBUILD vmc-9999.ebuild 953 BLAKE2B 9ab0441d4e4618ff5d29f70820a65cb8b4d8771fd7bf6c4114c31b72117300dcf63737fc6dd444b4ea77cfd91082048304d7320963af7402647e5c76b25d42b3 SHA512 e86cfcbeff962fd6a854dc54fe8d4ccafd03fd5b69d3b5a3003d3fe385d0824f4ec66ff29295161d5cb2b53f06fb309eb33b2bbd1d25087253686b32633dafdb +MISC metadata.xml 759 BLAKE2B 788f419034c59dbb0c685ec957452c48655a85193456494474e0f36d342c07ed2d5cabe38352c8fb5627319279a623a3ec328acd06be1fa95fdb279b70a0d07a SHA512 42ce917b3392ad4910016aaca17d079c5af220ce7b851866e1b73ae6e6061679196b470258fc8dee81a7687e7bcee027356206b4dd413977cbeed7977aa6134f diff --git a/sci-physics/vmc/metadata.xml b/sci-physics/vmc/metadata.xml index 4b0be037bb7f..e83a4cd24ef5 100644 --- a/sci-physics/vmc/metadata.xml +++ b/sci-physics/vmc/metadata.xml @@ -14,7 +14,6 @@ <name>Proxy Maintainers</name> </maintainer> <use> - <flag name="c++11">Build using the C++11 standard</flag> <flag name="c++14">Build using the C++14 standard</flag> <flag name="c++17">Build using the C++17 standard</flag> </use> diff --git a/sci-physics/vmc/vmc-1.1_p1.ebuild b/sci-physics/vmc/vmc-1.1_p1.ebuild index 548f95349c9c..a92dc7f26a5a 100644 --- a/sci-physics/vmc/vmc-1.1_p1.ebuild +++ b/sci-physics/vmc/vmc-1.1_p1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,11 +20,11 @@ HOMEPAGE="https://vmc-project.github.io/ https://github.com/vmc-project/vmc" LICENSE="GPL-3" SLOT="0" -IUSE="c++11 c++14 +c++17 doc" +IUSE="c++14 +c++17 doc" -REQUIRED_USE="^^ ( c++11 c++14 c++17 )" +REQUIRED_USE="^^ ( c++14 c++17 )" -RDEPEND="sci-physics/root:=[c++11?,c++14?,c++17?,-vmc]" +RDEPEND="sci-physics/root:=[c++14?,c++17?,-vmc(-)]" DEPEND="${RDEPEND}" BDEPEND="doc? ( app-doc/doxygen[dot] )" diff --git a/sci-physics/vmc/vmc-1.0_p3-r1.ebuild b/sci-physics/vmc/vmc-2.0.ebuild index 69bb6483d9f7..a92dc7f26a5a 100644 --- a/sci-physics/vmc/vmc-1.0_p3-r1.ebuild +++ b/sci-physics/vmc/vmc-2.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -20,11 +20,11 @@ HOMEPAGE="https://vmc-project.github.io/ https://github.com/vmc-project/vmc" LICENSE="GPL-3" SLOT="0" -IUSE="c++11 c++14 +c++17 doc" +IUSE="c++14 +c++17 doc" -REQUIRED_USE="^^ ( c++11 c++14 c++17 )" +REQUIRED_USE="^^ ( c++14 c++17 )" -RDEPEND="sci-physics/root:=[c++11?,c++14?,c++17?,-vmc]" +RDEPEND="sci-physics/root:=[c++14?,c++17?,-vmc(-)]" DEPEND="${RDEPEND}" BDEPEND="doc? ( app-doc/doxygen[dot] )" diff --git a/sci-physics/vmc/vmc-9999.ebuild b/sci-physics/vmc/vmc-9999.ebuild index 3598fb0ec8c0..cf26fb07595b 100644 --- a/sci-physics/vmc/vmc-9999.ebuild +++ b/sci-physics/vmc/vmc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,11 +20,11 @@ HOMEPAGE="https://vmc-project.github.io/ https://github.com/vmc-project/vmc" LICENSE="GPL-3" SLOT="0" -IUSE="c++11 c++14 +c++17 doc" +IUSE="c++14 +c++17 doc" -REQUIRED_USE="^^ ( c++11 c++14 c++17 )" +REQUIRED_USE="^^ ( c++14 c++17 )" -RDEPEND=">=sci-physics/root-6.18:=[c++11?,c++14?,c++17?,-vmc]" +RDEPEND="sci-physics/root:=[c++14?,c++17?,-vmc(-)]" DEPEND="${RDEPEND}" BDEPEND="doc? ( app-doc/doxygen[dot] )" @@ -33,8 +33,7 @@ DOCS=(README.md History) src_compile() { cmake_src_compile if use doc; then - # TRAVIS_BUILD_DIR hardcoded in Doxyfile by upstream. - TRAVIS_BUILD_DIR="${S}" doxygen doc/doxygen/Doxyfile || die + doxygen doc/doxygen/Doxyfile || die fi } |