diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
| commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
| tree | 0625f358789b5e015e49db139cc1dbc9be00428f /sci-physics | |
| parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) | |
gentoo resync : 25.11.2020
Diffstat (limited to 'sci-physics')
39 files changed, 292 insertions, 1440 deletions
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz Binary files differindex 64e39bd7b2d3..b2f3e6c105c9 100644 --- a/sci-physics/Manifest.gz +++ b/sci-physics/Manifest.gz diff --git a/sci-physics/bullet/Manifest b/sci-physics/bullet/Manifest index 4ed9bc48ee50..c32fc3e67cd9 100644 --- a/sci-physics/bullet/Manifest +++ b/sci-physics/bullet/Manifest @@ -2,6 +2,8 @@ AUX bullet-2.85-soversion.patch 1094 BLAKE2B 8dc035b80d812b3c2382067796f1626a932 AUX bullet-2.89-no-dangling-pointer.patch 842 BLAKE2B 5d66875b52f696b839daccfbfea4a238ea32c6fc31fc6cd441cf5d053569bced474b6c8b7620a1b3eb67d69b73ced3d0d1a2beb8ec5479e64f581d66f630d5fc SHA512 a463da3288d21b3d6b0dad1bc81fcc3b95ce1bd2e53c107b597d3a6beed0b0fbafffab9d38c2394ed125802e0fb073c74f125bed9fac7898f3a3dd23930a6dfd DIST bullet-2.86.tar.gz 25806558 BLAKE2B a8576d8dacd67b9789d32d7b1acc6c4025df3c15427c60d66f98b1906eee8b2b94e5b0108b9a8c00ca6261510ccaf57ba5c02c72fee8f528d4f723b304166731 SHA512 af8a6b282ab606437d7975a59cd8a9c2bf273c83b0e79f0c4c1de6fa51695ba6d5f3c853dce2fdba9cb55e7572214e15089e54db51afc465ca26f502cbd5a4f9 DIST bullet-2.89.tar.gz 135742506 BLAKE2B 3725533bb50f3cf4783e21c57a5e3596f280d9aa3caa5b7a44925d4785206cc86514ff89c2cc1e33f8a14af7c8a5165190bb0515a6931fc4c7ec2e2b9aef3dd8 SHA512 3c4ba6a3b3623ef44dd4a23e0bc2e90dec1f2b7af463edcb886e110feac1dfb4a91945f0ed640052cac228318539e275976d37238102fb10a0f78aef065a730b +DIST bullet-3.05.tar.gz 142858358 BLAKE2B d7ef2e68c0740e5bd2a728c576bcd3f07fff3680d8f604d7fd89bb6d7eb8c38f6205aea3bae300d70c2ec4e362c14e0567e3af3aabc893f8e33d979ffe8b3521 SHA512 4cb67547b466e01f6c2258b1f350fdfac0f2dc73a7962b6e196491e6722e1cd22cdfe80d7b2f4e1e92a90f91e277bff5cabfd0f55ef55010f9a4d7286843cecd EBUILD bullet-2.86.ebuild 1565 BLAKE2B 2bcb10a03caa592484f69870e951796f56b8a771e39fe023ec3fa1b517cb6e381e1a35cc4c951ded82aa9d5b5c8fea2cab3c034c26fddff62a962f5b2db512ad SHA512 41f68eaf06d5d300f8f6fb6b2a89cb0d3273c27dc9c7b397aaafd7cef9fd6a6f39a4bbef67ef42f0cf89754c1aa8006ce9e542f2c624e2ae7c9d0b570023817e EBUILD bullet-2.89.ebuild 2050 BLAKE2B a9cb3d8cde1385146d1db5b5dfc46734ceb01d56c05e02db3b461d3b7b564ce9dcd34686c67bda7143622ca2fc05c5d6a04a50ddf3d8b74867148350f407ff32 SHA512 f778ac777ec9954c8a2ae56f3ad22d04ceff29e57ad119fed92daf535954e31ab5c7d68d49588dc4ed20f894ccdedd0f5099a366d80ae7bc2fa290b8d40ad620 -MISC metadata.xml 1188 BLAKE2B 9234b2083390248796bc38581d85dedecc7befe06b1b3d15a11c46fe0b468a0e831d20ad411d3386bc0f1ae9fc8cb119d4fe6a0a229276627f6349f373d29993 SHA512 84301ff0c87edee5c6704adb6e3a2a7b7ec1594a178a95a680c27acd2e0244742741ad02c4505da788a0c160253433c72c3daafaca95021ecc4709bd0e8571e3 +EBUILD bullet-3.05.ebuild 1931 BLAKE2B 9f61757bdd5679d8309590ef9a89365754a1186e6c0e0d38df54edd465ec4ad4f357da63fa60a7645b823c7c802bb8b5044d4582257e534b42aa089cdfa111f5 SHA512 a9903774f42726ce0f62442c07430c0dbeca5a8743c5e3e775c666b9027f001791c62d3437172d8a895bae066926b9c599c0844e40bca77fe5507556418c1f82 +MISC metadata.xml 1304 BLAKE2B 63dafd8147fbd42a491f15f9ea4db7cb79581925f438fb45465db642f1f915a88d630a45d2ce1111a98df615610d61b640ebfc389595573b26148c24d266f166 SHA512 4f914ed4e849fc29f506e9fa5359f7e6d470636ff2223b3aadbee88a93a037bc7a36a79d9ce37cbecc682854a4abc20d803e42e44805d5df384392f9d3abb280 diff --git a/sci-physics/bullet/bullet-3.05.ebuild b/sci-physics/bullet/bullet-3.05.ebuild new file mode 100644 index 000000000000..0ba0a2d387cd --- /dev/null +++ b/sci-physics/bullet/bullet-3.05.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc double-precision examples openmp tbb test threads" + +REQUIRED_USE=" + openmp? ( threads ) + tbb? ( threads ) +" + +RDEPEND=" + virtual/opengl + media-libs/freeglut + tbb? ( dev-cpp/tbb ) +" +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_EXTRAS=OFF + -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/bullet/metadata.xml b/sci-physics/bullet/metadata.xml index 8dc1b6e634b1..3eb822b267c4 100644 --- a/sci-physics/bullet/metadata.xml +++ b/sci-physics/bullet/metadata.xml @@ -19,10 +19,10 @@ for games and animation. </longdescription> <use> - <flag name="bullet3">Build Bullet 3</flag> - <flag name="double-precision">Build libraries in double precision</flag> - <flag name="extras">Build additional libraries</flag> - <flag restrict=">=sci-physics/bullet-2.89" name="tbb">Enable multithreading with the Intel Threads Building Block dev-cpp/tbb</flag> + <flag restrict="<=sci-physics/bullet-2.89" name="bullet3">Build Bullet 3</flag> + <flag restrict="<=sci-physics/bullet-2.89" name="double-precision">Build libraries in double precision</flag> + <flag restrict="<=sci-physics/bullet-2.89" name="extras">Build additional libraries</flag> + <flag restrict="=sci-physics/bullet-2.89" name="tbb">Enable multithreading with the Intel Threads Building Block dev-cpp/tbb</flag> </use> <upstream> <remote-id type="google-code">bullet</remote-id> diff --git a/sci-physics/clhep/Manifest b/sci-physics/clhep/Manifest index 337a17a3c3c8..530955554c96 100644 --- a/sci-physics/clhep/Manifest +++ b/sci-physics/clhep/Manifest @@ -1,9 +1,7 @@ -DIST clhep-2.2.0.5.tgz 1847046 BLAKE2B 8dddc6b9acbf41abdd849ef1aa1087d93f48fc83937ee67e687e28c421d290683e5381c2b9f8034e2651e3ccec2fd2e0ba8bee73dc55618e22c0e4df7ce3a378 SHA512 07d9359604196344fe3b13cc103727693fd70818c22849e54507530221812843a943cb8ed66eea421e498edcc9c0f584826823ea7939cbf53b90b17d412aed1a -DIST clhep-2.4.0.4.tgz 1536520 BLAKE2B 7ab58aeab685950393c8059f77e95cbbf7bf61f04e8113c6fd7b09200cce497716d5a0e023143dde395db895f48848a78e579e38968d9f27a50769034003e11e SHA512 349c1225713a3bc91fe94e27f938e919b434e6466df94dcde915c7e8ed313b9b2e7186e67a9b580ede21aec0050507a070c279920590148ebbec0ac5733fb008 -DIST clhep-2.4.1.2.tgz 1537636 BLAKE2B ad6cc94e1147747d2875c3f630155527fc428cf2b6dc3236824c0f70712eea9416006b127ff0dbb5c4f0c853618cc2c3f6f8e57e5a833d7d6e1e4328d161212b SHA512 e79139682f9955ff4cb79846cca5823c70b6710e7b8e227218346c05205a346d9dfee9f03736f8d1833379ba880239babdb3398cde776318550451d284269974 +AUX clhep-fix-testThreaded.patch 3044 BLAKE2B 7465888366bcb5d8dcec5dcbe9b81ec2e812a601d53f5e97b5a6874fe495cfa2687a7d17d07899cef1eacb77a3020f01a8823b97f70edfedd7cb2a1e0d89d57f SHA512 a6bb6da8ce3ec7b2b0a20ec98ee9b2c280aaa5f79c9e79828285cfb42fe0f202400071252cb323c48829e6781042b795a001ece62257e2e454a686710a95c84c +AUX clhep-modulemap.patch 883 BLAKE2B 174bd4827da32982b77052ab09f36d84e3035c7a0916add4fc8aebde819468c36e7f2e6236fdf1109d2a7fab3349c3e6deb17302c8593e9a3666afc7648ce33e SHA512 d616d25c187baeb19f46419698e92760e762454f85f50248f93aecb02b059ec2bee336e160f0f9519a0e4920a89fb54511272699bea8731cb0f8d073ebaa382a DIST clhep-2.4.1.3.tgz 1537908 BLAKE2B 92fd1fcc415b01d8efa44be67c3bf9e58af2b4d18b6e7ee2161fbc20312428a6f17eacc09150ccff7fefb1686161518042f5c2f7558ff00b4d5696d002432ece SHA512 f7a52b353dc2c6d30cb7d307af71a028838ec674af2a50fe0199335d0b0f7fb4b84489ccfd12f21ecb7b1327acbc87065e7e87363308fd0caad5748a657aac13 -EBUILD clhep-2.2.0.5.ebuild 1347 BLAKE2B 90a2000635f4be1d1aaceecc9abe05e5e3c0da3b1ec41e09e08685f7eaf01a1738b38bde6eeab5c6aa15f67e31fca89deddd68e2d7be888d93d97bca4665a05f SHA512 8e8818288544e5f36487ef4903f8dbd5c95e32d9b7266250e7f7ba05b4e7a2c3d29898b654d0ee9a6801b79d8dd8899deffa1042ee543df3923e569fe98d6c3b -EBUILD clhep-2.4.0.4.ebuild 1286 BLAKE2B eefcd15e6d91547411fce7a35f45902bb82237141487f30763f1e58e8572ca0e71e12991a5cba98a550e5769ecc47d43c377e3b307725b7d88100b100a3c720c SHA512 526c396df82466dd0f18043e38f00cc79e85a9bbc5fe66181fb2c0f2922a0f1340eb9d1513720a815caf85786edc4e317656aa39d05ce760d1339b20e2817fb0 -EBUILD clhep-2.4.1.2.ebuild 1271 BLAKE2B 94ccb40d51b6b377180cda403282dfbfa81cbc2b16b51d97240fe93bf43f902f987e3a454a24d37fa5bb3854824dee4ff4c61af80004edbb513b91f86b298d02 SHA512 a6e7c5a80a1b9a3f21a6de83e435788289a1cf16155b4402315b206a7db9bf9abde4464dd483f935b8e2a97ed77328406488e53bdf20928b54ecb207d0a33667 -EBUILD clhep-2.4.1.3-r1.ebuild 1235 BLAKE2B f5ca0f478ccbf511a40e23c62ab3fde5bc611936c47a7cc40e3740b8e178b01dffbb1072c48f89db4b639dd74d0278eea8189af4d033ad25adf0cdae96bb47ae SHA512 37496d7cdaacfc75107583567132eb7721e2d5434c15cb71c19d9ebe3f4edc6f7c6d053ddde41e18f52856dd6d13bbe738d4fcdc5837ea29ad6f27ea4f60532d +DIST clhep-2.4.4.0.tgz 1541722 BLAKE2B 077048ea3ce94de88f08a1ae51ab9af892385d6747ed9f875e13b5aacc725e85f723031d42f526ca53050c07dad621053008c71d0f255f32893724f3e8189e52 SHA512 3ae88c8f31877c6e2cac7f7612946e9989186876c66015e6bfeab19260814c8a8bfb21fa28dd251cd2c43e4e3f63f336249c430c984f84810441603e949ecb5d +EBUILD clhep-2.4.1.3-r2.ebuild 1271 BLAKE2B d070515ebe0baa80f4e9c4d190b937d325edf7cc48dcdc8cf3c2accad7b4e179ed49a92cc31903fe4e210242bb3570b3e853f96eeccb4f78cec80e2ab80e7a7b SHA512 834fd313a28ebd154edf8a75e091a32971370f7ad3e4edc1a04872802701d87d5ee4224754740870607da8f53ff6943ffedba380ad173a613c555e4043c19481 +EBUILD clhep-2.4.4.0.ebuild 1311 BLAKE2B 4586f30adbfcf26f05b29d69db5b0001100d6a94b4a2c935311819b153f4d3daa37487d0e167447bb26227bac5629a3d35d7d98d69884e45d54e776e34789ef8 SHA512 506a79ed3e549a857e037f60fbe4b2e8ab5e4364f642e1c736c3882fafb4108f2d7c30f92d3f597662a563e5e1b9dc2d3b5063b12549e5308cfe020aaf994651 MISC metadata.xml 496 BLAKE2B 60254470fbb21294249dd75b34aebb0d29d090aba3a41f75e02950ccd77fe1ca0043eec460844f2de4b2a9b4bd4e34f2faa6c00b81daf8e615b78d92f503ade3 SHA512 768aeefc23a2ea89eb63b0eb6fd084c253243b6d67b822702dffc8f49a7170d30e55ebc08875ff238e618639882f93fe6e1390e3d8456f3850d75d5a98bf3b96 diff --git a/sci-physics/clhep/clhep-2.2.0.5.ebuild b/sci-physics/clhep/clhep-2.2.0.5.ebuild deleted file mode 100644 index 2c12b7fa1861..000000000000 --- a/sci-physics/clhep/clhep-2.2.0.5.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils - -DESCRIPTION="High Energy Physics C++ library" -HOMEPAGE="http://proj-clhep.web.cern.ch/proj-clhep/" -SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/${P}.tgz" -LICENSE="GPL-3 LGPL-3" -SLOT="2/${PV}" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos" - -IUSE="doc static-libs test" -RESTRICT="!test? ( test )" - -BDEPEND="doc? ( virtual/latex-base )" - -S="${WORKDIR}/${PV}/CLHEP" - -src_prepare() { - cmake-utils_src_prepare - - # respect flags - sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die - # no batch mode to allow parallel building (bug #437482) - sed -i \ - -e 's:-interaction=batchmode::g' \ - cmake/Modules/ClhepBuildTex.cmake || die - # gentoo doc directory - sed -i \ - -e "/DESTINATION/s:doc:share/doc/${PF}:" \ - cmake/Modules/ClhepBuildTex.cmake */doc/CMakeLists.txt || die - # dont build test if not asked - if ! use test; then - sed -i \ - -e '/add_subdirectory(test)/d' \ - */CMakeLists.txt || die - fi -} - -src_configure() { - local mycmakeargs=( - -DCLHEP_BUILD_DOCS=$(usex doc) - ) - DESTDIR="${ED}" cmake-utils_src_configure - use doc && MAKEOPTS+=" -j1" -} - -src_install() { - cmake-utils_src_install - if ! use static-libs; then - rm "${ED}"/usr/$(get_libdir)/*.a || die - fi -} diff --git a/sci-physics/clhep/clhep-2.4.0.4.ebuild b/sci-physics/clhep/clhep-2.4.0.4.ebuild deleted file mode 100644 index b72155c7a620..000000000000 --- a/sci-physics/clhep/clhep-2.4.0.4.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils - -DESCRIPTION="High Energy Physics C++ library" -HOMEPAGE="http://proj-clhep.web.cern.ch/proj-clhep/" -SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/${P}.tgz" -LICENSE="GPL-3 LGPL-3" -SLOT="2/${PV}" -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" - -IUSE="doc test threads" -RESTRICT="!test? ( test )" - -BDEPEND=" - doc? ( - app-doc/doxygen - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) -" - -S="${WORKDIR}/${PV}/CLHEP" - -src_prepare() { - cmake-utils_src_prepare - - # respect flags - sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die - # dont build test if not asked - if ! use test; then - sed -i \ - -e '/add_subdirectory(test)/d' \ - */CMakeLists.txt || die - fi - # gentoo doc directory - if use doc; then - grep -rl 'share/doc/CLHEP' | - xargs sed -i \ - -e "s:share/doc/CLHEP:share/doc/${PF}:" \ - {.,*}/CMakeLists.txt || die - fi -} - -src_configure() { - local mycmakeargs=( - -DCLHEP_BUILD_DOCS=$(usex doc) - -DCLHEP_SINGLE_THREAD=$(usex threads no yes) - ) - DESTDIR="${ED}" cmake-utils_src_configure -} diff --git a/sci-physics/clhep/clhep-2.4.1.2.ebuild b/sci-physics/clhep/clhep-2.4.1.3-r2.ebuild index d1e22595d8af..d2ec26241032 100644 --- a/sci-physics/clhep/clhep-2.4.1.2.ebuild +++ b/sci-physics/clhep/clhep-2.4.1.3-r2.ebuild @@ -3,14 +3,14 @@ EAPI=7 -inherit cmake-utils +inherit cmake DESCRIPTION="High Energy Physics C++ library" HOMEPAGE="http://proj-clhep.web.cern.ch/proj-clhep/" SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/dist1/${P}.tgz" LICENSE="GPL-3 LGPL-3" SLOT="2/${PV}" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="doc test threads" RESTRICT="!test? ( test )" @@ -26,18 +26,18 @@ BDEPEND=" ) " +PATCHES=( "${FILESDIR}"/clhep-fix-testThreaded.patch ) + S="${WORKDIR}/${PV}/CLHEP" src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare # respect flags sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die # dont build test if not asked if ! use test; then - sed -i \ - -e '/add_subdirectory(test)/d' \ - */CMakeLists.txt || die + cmake_comment_add_subdirectory test fi # gentoo doc directory if use doc; then @@ -53,5 +53,5 @@ src_configure() { -DCLHEP_BUILD_DOCS=$(usex doc) -DCLHEP_SINGLE_THREAD=$(usex threads no yes) ) - DESTDIR="${ED}" cmake-utils_src_configure + DESTDIR="${ED}" cmake_src_configure } diff --git a/sci-physics/clhep/clhep-2.4.1.3-r1.ebuild b/sci-physics/clhep/clhep-2.4.4.0.ebuild index 817da604300f..1938b34ce53a 100644 --- a/sci-physics/clhep/clhep-2.4.1.3-r1.ebuild +++ b/sci-physics/clhep/clhep-2.4.4.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils +inherit cmake DESCRIPTION="High Energy Physics C++ library" HOMEPAGE="http://proj-clhep.web.cern.ch/proj-clhep/" @@ -26,10 +26,15 @@ BDEPEND=" ) " +PATCHES=( + "${FILESDIR}"/clhep-fix-testThreaded.patch + "${FILESDIR}"/clhep-modulemap.patch +) + S="${WORKDIR}/${PV}/CLHEP" src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare # respect flags sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die @@ -51,5 +56,5 @@ src_configure() { -DCLHEP_BUILD_DOCS=$(usex doc) -DCLHEP_SINGLE_THREAD=$(usex threads no yes) ) - DESTDIR="${ED}" cmake-utils_src_configure + DESTDIR="${ED}" cmake_src_configure } diff --git a/sci-physics/clhep/files/clhep-fix-testThreaded.patch b/sci-physics/clhep/files/clhep-fix-testThreaded.patch new file mode 100644 index 000000000000..58010dc726da --- /dev/null +++ b/sci-physics/clhep/files/clhep-fix-testThreaded.patch @@ -0,0 +1,90 @@ +From 849f0250076ac3cce672e925c232bd6b96a018e0 Mon Sep 17 00:00:00 2001 +From: Guilherme Amadio <amadio@cern.ch> +Date: Wed, 18 Nov 2020 17:33:17 +0100 +Subject: [PATCH] Fix testThreaded on x86 + +--- + Random/test/testThreaded.cc | 53 ++++++++++++++++++++++++++----------- + 1 file changed, 38 insertions(+), 15 deletions(-) + +diff --git a/Random/test/testThreaded.cc b/Random/test/testThreaded.cc +index a835ce19..0a6352c3 100644 +--- a/Random/test/testThreaded.cc ++++ b/Random/test/testThreaded.cc +@@ -65,23 +65,38 @@ void testRandGauss(std::vector<double> const& reference, bool& result) { + + result = true; + ++ std::vector<double> v; ++ v.push_back(dist.fire()); ++ v.push_back(dist.fire()); ++ v.push_back(dist.fire()); ++ v.push_back(dist.fire()); ++ v.push_back(dist.fire()); ++ + // Just a sanity check first. The fire method reproduces + // itself. +- if (reference[0] != dist.fire() || +- reference[1] != dist.fire() || +- reference[2] != dist.fire() || +- reference[3] != dist.fire() || +- reference[4] != dist.fire()) { ++ if (reference[0] != v[0] || ++ reference[1] != v[1] || ++ reference[2] != v[2] || ++ reference[3] != v[3] || ++ reference[4] != v[4]) { + result = false; + } + + // check the shoot method where we pass in an engine + CLHEP::HepJamesRandom engine1(seedL1); +- if (reference[0] != CLHEP::RandGauss::shoot(&engine1) || +- reference[1] != CLHEP::RandGauss::shoot(&engine1) || +- reference[2] != CLHEP::RandGauss::shoot(&engine1) || +- reference[3] != CLHEP::RandGauss::shoot(&engine1) || +- reference[4] != CLHEP::RandGauss::shoot(&engine1)) { ++ ++ v.clear(); ++ v.push_back(CLHEP::RandGauss::shoot(&engine1)); ++ v.push_back(CLHEP::RandGauss::shoot(&engine1)); ++ v.push_back(CLHEP::RandGauss::shoot(&engine1)); ++ v.push_back(CLHEP::RandGauss::shoot(&engine1)); ++ v.push_back(CLHEP::RandGauss::shoot(&engine1)); ++ ++ if (reference[0] != v[0] || ++ reference[1] != v[1] || ++ reference[2] != v[2] || ++ reference[3] != v[3] || ++ reference[4] != v[4]) { + result = false; + } + +@@ -93,11 +108,19 @@ void testRandGauss(std::vector<double> const& reference, bool& result) { + // setFlag causes it to not use the cached value + // and generate a new pair of random numbers + CLHEP::RandGauss::setFlag(false); +- if (reference[0] != CLHEP::RandGauss::shoot() || +- reference[1] != CLHEP::RandGauss::shoot() || +- reference[2] != CLHEP::RandGauss::shoot() || +- reference[3] != CLHEP::RandGauss::shoot() || +- reference[4] != CLHEP::RandGauss::shoot()) { ++ ++ v.clear(); ++ v.push_back(CLHEP::RandGauss::shoot()); ++ v.push_back(CLHEP::RandGauss::shoot()); ++ v.push_back(CLHEP::RandGauss::shoot()); ++ v.push_back(CLHEP::RandGauss::shoot()); ++ v.push_back(CLHEP::RandGauss::shoot()); ++ ++ if (reference[0] != v[0] || ++ reference[1] != v[1] || ++ reference[2] != v[2] || ++ reference[3] != v[3] || ++ reference[4] != v[4]) { + result = false; + } + CLHEP::HepRandom::setTheEngine(savedEngine); +-- +2.29.2 + diff --git a/sci-physics/clhep/files/clhep-modulemap.patch b/sci-physics/clhep/files/clhep-modulemap.patch new file mode 100644 index 000000000000..31b1eda620a7 --- /dev/null +++ b/sci-physics/clhep/files/clhep-modulemap.patch @@ -0,0 +1,24 @@ +From ade5d82b54d2c72660b6b2c478323ac741ea7c01 Mon Sep 17 00:00:00 2001 +From: Guilherme Amadio <amadio@cern.ch> +Date: Thu, 19 Nov 2020 09:55:12 +0100 +Subject: [PATCH] Install modulemap along with other header files + +--- + cmake/Modules/ClhepCopyHeaders.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/Modules/ClhepCopyHeaders.cmake b/cmake/Modules/ClhepCopyHeaders.cmake +index bd38b8a2..c6483c3a 100644 +--- a/cmake/Modules/ClhepCopyHeaders.cmake ++++ b/cmake/Modules/ClhepCopyHeaders.cmake +@@ -49,6 +49,6 @@ macro (clhep_copy_headers ) + # handle the module.modulemap file + CONFIGURE_FILE( ${CLHEP_SOURCE_DIR}/module.modulemap ${CLHEP_BINARY_DIR}/module.modulemap COPYONLY ) + INSTALL (FILES ${CLHEP_BINARY_DIR}/module.modulemap +- DESTINATION include ) ++ DESTINATION include/CLHEP ) + + endmacro (clhep_copy_headers) +-- +2.29.2 + diff --git a/sci-physics/geant-data/Manifest b/sci-physics/geant-data/Manifest index 790d07e53ce9..f1fdeff23b2e 100644 --- a/sci-physics/geant-data/Manifest +++ b/sci-physics/geant-data/Manifest @@ -1,24 +1,17 @@ DIST G4ABLA.3.1.tar.gz 107286 BLAKE2B ff60665b01dcdb85a76028af472e6f71068b8132187701c46e5c4e8509125d34853d3c574561be22f34cc5f35503ec0808f2964888cd19259392de8054f19647 SHA512 4178870783ca015dade0b07006afc27fed095ff195251c672a0812f9c8e13908b5dfa9a127e8f3ec473f242bf7faf6d49a3371a75e669a06245722924b7c4278 -DIST G4EMLOW.7.7.tar.gz 107307909 BLAKE2B dc97ecadc6f17e789e781e90531e09131641e9d2e4cfa06adcf9913ec9720f92d23b18871d06bd090cf036e35af7b0d1a80fb41e816ebb41cc23d8c18d0ba647 SHA512 de8b942cfe009ebd614a1c0824ab889183b319bd3fb835d1f0fd98076e50f1372bb318ede30a7a936d9c64ba039231be5fcb74b4ca6c813691e9d5ceb862fdb0 DIST G4EMLOW.7.9.1.tar.gz 119756769 BLAKE2B 67be0b7ac34beb995ad4132883927fb99a78f93e7c99390c93fe897b4208a94a3ea5faaab1d04def5c248151c82d46431b411cb22303ffe941c6fe8a57d30423 SHA512 7f52ad5a3935323b60e5ea5196a64a2209337ca3d208109bceb648b95a5a3b0aa33f9a46f878884cb398e49302733c6f5b6316254261d350d038af8ec412952f DIST G4EMLOW.7.9.tar.gz 118027817 BLAKE2B 3456d07a0d87accbdf90049626e653488bb592f113e898e364638924259ce889940a20b7c84e40f16e654ca3fbb9e892050ce7e66a62a9e267706c5750bcd313 SHA512 6c5ae214915b273d20bec1483267279d53a015a13ed30ba1de325d489b5b34e65b227f8fd6caeb5fef28c2a582b7285002338e866f32c7f151fb1508ee55c54d DIST G4ENSDFSTATE.2.2.tar.gz 290632 BLAKE2B aff44d0b6512e4a227fa61a33045023652699843f80d1e90e236d491afd90be828a7bb393a4bb5b224b296d6e3f899a11027340b9e1ebffe705d08708af283fa SHA512 4feaa4229ac520d0e81ab0e31691ee899fa1f10b1a57f66b986fbe19729f7548000b8bac3519d09e91a1f7e116aa7a5bfeae5a3f5b6c3364168b51f4b5bb88c3 DIST G4INCL.1.0.tar.gz 95840 BLAKE2B 2c264b7563620cdbdb8a5e529f21766a5b5ea3e2e51047362518714d01854de8d9ca2ca2a0183ab672cc2f8a4d951327b0e1a7298799695fd48233fa5e529686 SHA512 9d769566d1728674bd6d1e59fc05882943cd240d2f0a9e47dff37fa64fe27720b20b66f6dea6d300c3c9082a22f7f71bb416df8c7d2b5bae87251c4a0113f49b -DIST G4NDL.4.5.tar.gz 421710294 BLAKE2B dab13b4c4ad9406e91172e1f8ec343a9be7c6c64f82e6a3b42a6fb19dec3d52b07a7a4848136af29e0cc82daff0ff02aa9e252d57e667c1a1e1a050039fff2fd SHA512 166d0189693f14c08fa9c48e4212c1cb275a848fdf0be3dfc4240bd01d1d4816f3ec3c85149995192e7055b58fd56c7e078e9d6819e01fdeafc13457bfa90470 DIST G4NDL.4.6.tar.gz 599862135 BLAKE2B 78e30dd0f02f3b7d7fce12a3a4dcb83e1405ba45f19ed2a743ee7e72be426e09a31cedb521a62a116a8a580a39c83987d4e39ab621b73e0d7a41e7dab8f36d41 SHA512 29b7d933d3e691b03cf45db0c4a9335c03f34ce57149a37b66a0f85e41d500d985f86bc8becc206d85202f129f60ea9fb1ef16bc4a9eef48cde593ffd5a85f24 -DIST G4PARTICLEXS.1.1.tar.gz 3388648 BLAKE2B ed179d003a84007dc26319f2b3e7349586f8e1ef58de8acb8e8560867195ada039cb62b763afc58e5e234425db39297a9f586a0249c59bca5199e78d5f219861 SHA512 feaf86d0382c199f7a443bffd4d083e635ab3e9c535b535b426c447a8e25f2ddbaac39965038eb1b9cac12132a9c19c7b86c5670863dc4e93d3aa1f4ecebf369 -DIST G4PARTICLEXS.2.0.tar.gz 4597118 BLAKE2B bc93da5bd9d8384c84056092ff404b93d5f28c88777365e514b6e8f17504a836036e98a469fe5e56123ea34f2846351b9441a01e9711ceef4f392438011bf4c3 SHA512 c3bff7f60f9ed7b0ebfecfc71a2415980b94b924827c5bbc964257d522318743765ebe826e9ab4d41cc856c65ceb7be6e2033a5d47bac036b50a21b51f7e8416 DIST G4PARTICLEXS.2.1.tar.gz 4600435 BLAKE2B 7132411824d9d3f47b5a4b1fced0a4099baed6a91596661d74ba540b91b5d12e475eb5bb364b8be7457592136fe2c629c98a9f8015a7b6fbd380c8c720078cd5 SHA512 b96c62a4cfd654381cf57eddcff10902ce42327a500eee007dc01ce4fbda6da44905d00ed9731740f6ff2ad2177194d7098b675bb7b72deba16394add81028c1 DIST G4PII.1.3.tar.gz 4293607 BLAKE2B 1ddf90c0e49ea51129b08bf6eb3cdf62f88abe19325e8aec76f156da32602c0498ddee36d1598035fa21df95f9d86b99137f9a6f49d7c9ef2b8eb6081db233b1 SHA512 dc458f5845948f54315477886d28fd51ea2d45f3675f45d42e8352cc5961705d920d200097dc9b55ad826ff426a655258b970ddd5a96867f706eb14e9ebbfd1a -DIST G4PhotonEvaporation.5.3.tar.gz 9877289 BLAKE2B a7c76c2b85f1006f2336b37d743f76fb8eaa1730d3d1f34b15ee34a7af09b4811c0a57cd661ad4a627f0424edb94b6126cdc7ef63dc4beb2ad3ea0f24b096de6 SHA512 19038cc64eaa07a996f5ae2a73b82cb3b02996880ae3b72a0d24c2b9058a53683b99b4ed1f265fd1d4d37fe9e72329d0fbe08e40f7b9d007b69aa68a3b6eb719 DIST G4PhotonEvaporation.5.5.tar.gz 10087354 BLAKE2B c336b015c0fe8471e899b95d66c3feb3a1b9aeac01010bd840a9d9bf88b7e91924c9f2d17e5626451be8841f5b95ddf10540e05305269a97608b339d6cd5cf78 SHA512 50c27edbcc271e5af353addc08132470df9b5efdeeece8c980d8d449adea6996109b880cd9cac0abab6e0a65e8c3f5c32ac7dc998a7760196bc862ccfc87f0bd -DIST G4RadioactiveDecay.5.3.tar.gz 1022013 BLAKE2B a9470e3cf1eb50c0e79d5c136e88b94c83123a1ed7f88da7eada669a7c3497ab54a647f6a4b84a11904ffcfb4194503bd6fa660127351c958f3b18dcd2919a29 SHA512 a11169de1044eae15e4f5ca43ec25e917aa31b901ab1bdc3055cb999281124f4b98a8c20e53043c012f1e7572172467209ec306c21770f66e7039f7199cffc5a DIST G4RadioactiveDecay.5.4.tar.gz 1059968 BLAKE2B 5093ca0c7e529c1f1ddb732f6d2ddb24b7533d266a325601271a73fff23fe05b57a591a5ca229e1c479c5d85dfe3a40aa00869231976e9ecf2976679030a8027 SHA512 2462c8f1503a4dde96c62d9644155a5c7de4430251c06f76b8e3dd35df98d96e34687c77cc11a9be198b918ad64585a10a81a0fef4ff26d63f0737b5b1254f17 DIST G4RealSurface.2.1.1.tar.gz 133386050 BLAKE2B 68fb3ebadabe0c04a34279c9ff3a15545cfcf05ea18324d0fa776f4616feaeea2cd26af61d0078204c95c819d247963b416326433fda1e96a2918f23d4b2ff02 SHA512 f7755b41e30f8728710cf878d8783df9ac07d5394d0cf3358d9f4f6f4f73b9563c22657bdd9cf4ee7bebb9823fa530d86a64d2e0acbca77a80a411786c6b7202 DIST G4SAIDDATA.2.0.tar.gz 38502 BLAKE2B 349608f8f8f57b091579b4892f1547c25f0c730fe8b22de3a7355f45ea08232c3ab12af64583cf4d48528b54489d0c71c724066715592766a2a51a1a6d4eb745 SHA512 cb192c10cc9805ab8d57d5f6dca595f85ac628ccac5b975b5d8ff965ed3841b9b01071ffa76469c9a03f9ca564267f5c4a300f13d8df5056b43cd71c669bd35c DIST G4TENDL.1.3.2.tar.gz 585100935 BLAKE2B f58bc9e4f6741d7df84559bb41542ecd4de3891b3f79d8194d3f8174de6aed6e87f8d2d648315dac988b6daf6106780b6f88398da2040e67608da8614fb2cf42 SHA512 635707dc421354d8cd596398d69745b6038a80c44b7284951a3e0966829c08ac731bd42f7321adfab75d06d868f99e466c6f1425685770568f44ec6c1035903f -EBUILD geant-data-4.10.05.ebuild 1147 BLAKE2B c0e238f637366de8523e5b2b525d7bdacf8a0227bae36525b24b01bd92afe6158ea55be4be24b2cc518427befac15b24c379ebc4e90982bc7313de8b0cae55e4 SHA512 3ca51ece5a9b7389c362001e5036ad598e63bc80267b5e41298ee1ee0a202dd67361f2eabf097bac1da365b0ea3218008456866ed6d89166c1d1ba67e7ee573c -EBUILD geant-data-4.10.6-r1.ebuild 1524 BLAKE2B b881fe0ee0717a49debe85fac7ed04513817875cfcd967f2eceb28079480cd188496891704cbfff2952e141102b2ab8e10dafb5c5da4d5feef5301a07352ddc9 SHA512 dca660fe493429143c1daecde3d1478a1179e7059d4809eae21b85fbdb29e3a8790fd689736cbe613e2573ddfaf002f9d1ccc52ec6a6b53301c66f393c60ea8a -EBUILD geant-data-4.10.6_beta1-r1.ebuild 1524 BLAKE2B 4963cba3d80c82727bcd98f1465865a8155153c67d3bdd1406c4ad084bc8977cbb5bca4f1c290132f15441dbb4e5dad5abd71d99e136ee8f3d6bd64f35b3f2d8 SHA512 e2c20e0ac7a4cc4be97785a0a7274acf815a4a32a91327a89c57644cff6092faf6968c9f0df5f89b2fd628522192d24ba6fd2756d9e608308803e3da59136e28 -EBUILD geant-data-4.10.6_p1-r1.ebuild 1526 BLAKE2B 16f555622770b9df68360cafc9bb4272744cf9a36fd9695eb5f0e6b294d34dc69a598db5e26da78f95476fb8ab44607a41b1e9a2639626e6de6ce8c83f630d37 SHA512 cbc4a91ae6f9ca918692c2cb714ed971affc74e07c7a2987bd77ca397cc0fa5fb64dabc593afbfe59a83230e840497f0d6bce0ad828b1c4cdd8aa1e87ab233ab -MISC metadata.xml 534 BLAKE2B 84abce35bec7069db8e962a0f053de5f317d01df153a07bf93cf519b390336514da9e9c5bee2ae17637f5d93c5e7d04f748d0d04c0b0f3d566907cba7cc0426f SHA512 734a46e3c0bcb4ce52498a85d45a7fd3d8ee3507296aa36ec578e8f346a29aa93f56e4b0a3f68311531b383a6aa499a890e0483328013d9a7d208686d2cd47ff +EBUILD geant-data-4.10.6-r1.ebuild 1522 BLAKE2B 292a733b2260e761f860ff58be747322bc014633f697067ead497bdefdfa3276c3cdc0058c952a333a24608316872156f288e9b6e6a4684d1181d8bd0efc0dc0 SHA512 0faf4eaffd8932d4befd644ba6d9986e221132fdbc216944879732adb0b0156e46ad99818cd6cafad41b5c4c99412cf36d7c282a77e6f11967a21e55983f3a1e +EBUILD geant-data-4.10.6.3.ebuild 1524 BLAKE2B e218d267d9420738f133f5da9a0ad510b951caf7db1da87cb4d278376aa14d51a5b8cd9c41ec176a0e69d036bc358c189a7475561b1b12eb7fe9cd10ceb22a8f SHA512 e6f0331490693059dec660ae4eac07bc92fd4ff59f04f690a3d0d78b0edd24cbcc1e8a03830b441790d253d4b932eac1e869e2725fac9ccd5a9e39bd588b668a +EBUILD geant-data-4.10.6_p1-r1.ebuild 1524 BLAKE2B e218d267d9420738f133f5da9a0ad510b951caf7db1da87cb4d278376aa14d51a5b8cd9c41ec176a0e69d036bc358c189a7475561b1b12eb7fe9cd10ceb22a8f SHA512 e6f0331490693059dec660ae4eac07bc92fd4ff59f04f690a3d0d78b0edd24cbcc1e8a03830b441790d253d4b932eac1e869e2725fac9ccd5a9e39bd588b668a +MISC metadata.xml 552 BLAKE2B e4704390fb18f3e4fef4a5de5feb818eb195b649203b37589ab1f2c35b8aa05e25e619034678c90a99bac8155dbd30220407190cb2c25d4006de20807ecb4fe4 SHA512 6c954effed4acc545b110c202ed645930904fd179aa2fb0ef971c7bc38cc419ddc696e06f0d080f358890171467cf311919c2fe0143acadfec9cd77bf748c55e diff --git a/sci-physics/geant-data/geant-data-4.10.05.ebuild b/sci-physics/geant-data/geant-data-4.10.05.ebuild deleted file mode 100644 index df59a575cc3f..000000000000 --- a/sci-physics/geant-data/geant-data-4.10.05.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Data files for Geant4 physical processes" -HOMEPAGE="http://geant4.cern.ch/" - -GEANT4_DATA=" - G4NDL.4.5 - G4EMLOW.7.7 - G4PhotonEvaporation.5.3 - G4RadioactiveDecay.5.3 - G4SAIDDATA.2.0 - G4PARTICLEXS.1.1 - G4ABLA.3.1 - G4INCL.1.0 - G4PII.1.3 - G4ENSDFSTATE.2.2 - G4RealSurface.2.1.1 - G4TENDL.1.3.2" - -SRC_COM="http://geant4.cern.ch/support/source" -for d in ${GEANT4_DATA}; do - SRC_URI="${SRC_URI} ${SRC_COM}/${d}.tar.gz" -done -unset d - -LICENSE="geant4" -SLOT="4" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=">=sci-physics/geant-${PV}:4" -DEPEND="${RDEPEND}" - -S="${WORKDIR}" - -src_unpack() { - # unpack in destination only to avoid copy - return -} - -src_install() { - sed -n "s,export \(G4.\+DATA=\"\).*\(/share/Geant.\+/data/.\+\) > /dev/null ; pwd\`,\1${EPREFIX}/usr\2,p" \ - "${EPREFIX}/usr/bin/geant4.sh" > 99geant-data || die - doenvd 99geant-data - local g4dir=/usr/$(sed -n 's|.*/\(share/Geant4.*/data\).*|\1|p' "${EPREFIX}/usr/bin/geant4.sh" | tail -n 1) - dodir ${g4dir} - cd "${ED%/}/${g4dir}" || die - unpack ${A} -} diff --git a/sci-physics/geant-data/geant-data-4.10.6-r1.ebuild b/sci-physics/geant-data/geant-data-4.10.6-r1.ebuild index 7ad85c9daf0b..807a0dc104e8 100644 --- a/sci-physics/geant-data/geant-data-4.10.6-r1.ebuild +++ b/sci-physics/geant-data/geant-data-4.10.6-r1.ebuild @@ -32,7 +32,7 @@ unset DATASET FILENAME VERSION ENVVAR LICENSE="geant4" SLOT="4" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" IUSE="" S="${WORKDIR}" diff --git a/sci-physics/geant-data/geant-data-4.10.6_beta1-r1.ebuild b/sci-physics/geant-data/geant-data-4.10.6.3.ebuild index ae4afb781774..ae7c1d2b919d 100644 --- a/sci-physics/geant-data/geant-data-4.10.6_beta1-r1.ebuild +++ b/sci-physics/geant-data/geant-data-4.10.6.3.ebuild @@ -10,11 +10,11 @@ SRC_DATA="https://geant4-data.web.cern.ch/geant4-data/datasets" declare -A DATASETS DATASETS=( - [G4NDL]="G4NDL 4.5 G4NEUTRONHPDATA" - [G4EMLOW]="G4EMLOW 7.7 G4LEDATA" - [PhotonEvaporation]="G4PhotonEvaporation 5.3 G4LEVELGAMMADATA" - [RadioactiveDecay]="G4RadioactiveDecay 5.3 G4RADIOACTIVEDATA" - [G4PARTICLEXS]="G4PARTICLEXS 2.0 G4PARTICLEXSDATA" + [G4NDL]="G4NDL 4.6 G4NEUTRONHPDATA" + [G4EMLOW]="G4EMLOW 7.9.1 G4LEDATA" + [PhotonEvaporation]="G4PhotonEvaporation 5.5 G4LEVELGAMMADATA" + [RadioactiveDecay]="G4RadioactiveDecay 5.4 G4RADIOACTIVEDATA" + [G4PARTICLEXS]="G4PARTICLEXS 2.1 G4PARTICLEXSDATA" [G4PII]="G4PII 1.3 G4PIIDATA" [RealSurface]="G4RealSurface 2.1.1 G4REALSURFACEDATA" [G4SAIDDATA]="G4SAIDDATA 2.0 G4SAIDXSDATA" @@ -32,7 +32,7 @@ unset DATASET FILENAME VERSION ENVVAR LICENSE="geant4" SLOT="4" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" IUSE="" S="${WORKDIR}" diff --git a/sci-physics/geant-data/geant-data-4.10.6_p1-r1.ebuild b/sci-physics/geant-data/geant-data-4.10.6_p1-r1.ebuild index 23e22d50b309..ae7c1d2b919d 100644 --- a/sci-physics/geant-data/geant-data-4.10.6_p1-r1.ebuild +++ b/sci-physics/geant-data/geant-data-4.10.6_p1-r1.ebuild @@ -32,7 +32,7 @@ unset DATASET FILENAME VERSION ENVVAR LICENSE="geant4" SLOT="4" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" IUSE="" S="${WORKDIR}" diff --git a/sci-physics/geant-data/metadata.xml b/sci-physics/geant-data/metadata.xml index 511a1b08ef9e..9d7f4b218bef 100644 --- a/sci-physics/geant-data/metadata.xml +++ b/sci-physics/geant-data/metadata.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>amadio@gentoo.org</email> - <name>Guilherme Amadio</name> - </maintainer> - <maintainer type="project"> - <email>sci-physics@gentoo.org</email> - <name>Gentoo Physics Project</name> - </maintainer> - <longdescription lang="en"> - For specific, optional physics processes, Geant4 uses extra data - which are being installed with this package. - </longdescription> + <maintainer type="person"> + <email>amadio@gentoo.org</email> + <name>Guilherme Amadio</name> + </maintainer> + <maintainer type="project"> + <email>sci-physics@gentoo.org</email> + <name>Gentoo Physics Project</name> + </maintainer> + <longdescription lang="en"> + For specific, optional physics processes, Geant4 uses extra data + which are being installed with this package. + </longdescription> </pkgmetadata> diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest index 0f81060cb15a..4116026b89e8 100644 --- a/sci-physics/geant/Manifest +++ b/sci-physics/geant/Manifest @@ -1,12 +1,10 @@ AUX geant-4.10.6-datadir.patch 6571 BLAKE2B 2047655af7cdbf4c63a077c22ccda9eb8f0042291d5afcaf0b67614c7797afed36645ffc6ecddd6797b614c7f412412c4ebcd33c064ef648175b40a3c7e46537 SHA512 48569a7ea8f285e4e261f8b24f2910b7022899f5276f61fa86b27e993e36cebbb8f96f14ba94c0d7174355ec15aa6e415d8ba28d54b2b0efa9366c85644f10d8 -DIST geant4.10.05.p01.tar.gz 34413415 BLAKE2B d98a9308e37f166dccf8f9640a54ee74ab2b1d07275609666aec6d929b0193269a18075762cebaa154abcad5c8359a128b6629ff973cb6cdc8f54535151997a3 SHA512 ace2097251ee4cdda3511c3dd8191c97e1001f73d421797e3cd517ed41fa5adc73efcddfb2c8b6fb75231e5af8ddb4bd63a402ccb99b40ce2c140588d328b582 -DIST geant4.10.06.b01.tar.gz 34511064 BLAKE2B d20bd338ea0ac47b11464b581aa0dec3725da56902dbaab233fcaad28ba6b3ce302a8d7e2c27f4532bed2db991467b4bde837675f3837f066c9e7e3d78c7acd6 SHA512 3916a0ad13891fc5a189c0be6c2e57abe29281696c9d16c0c54fd11940146586feb550a61403ab6451e6575d2ad1f4349590d9c564d7b5d7fc5ab9e9b2356ccb DIST geant4.10.06.p01.tar.gz 34869969 BLAKE2B 0a27f34df213a0dcc2d87c6001c100269be7496519c614fa5b51cd6502d98232d09de0f3c44216c34b6788ec8a1f626d22a53cb7329027006c614a10777b6896 SHA512 d9bca66b086a309a577dcf018c0ca52f5d786b1ebe5ce9d30c29c579c342399816c34efbcb34af60871145b6713cb8151f5517c5a0aa9d24d00e4257a5c1c6c0 DIST geant4.10.06.p02.tar.gz 34833550 BLAKE2B c1a3b51cf5fc135edd8f547e5a88c80f8f6ed991be92439e161225afa0447473b67c0ef0757011e1e3a22a370f43ad9b14c9fe9cb3d5f5f0a78a762c86e0dd80 SHA512 bcfbea05c88a6021898e361ffa0c8e28637631e65b2f9ae2d694deae36a67c6af78785569c5971d1c63a4692a3dfbfc082cf14d7af209cb9f36efff9bec9bc20 +DIST geant4.10.06.p03.tar.gz 35099426 BLAKE2B 75668b87eb3f1d8be00c46dc3e6e2131707ad89f4d077d2c55b7c985803709da565dbddd2ebd6ee7b6a3f4d58dc84a41bcded3b1db926127b480fb8e9fab2765 SHA512 844769991e20f4397a336a8e94bb82434b4ce44c84c956935659d2407ebf29b388b672650466f9683d3c99f9c7fa4f2c81e3f27075427f1613d825f38a74df69 DIST geant4.10.06.tar.gz 34834510 BLAKE2B 48f50c734186e444f5ef2fd02b013565db7f404b7fbaeb3127d7dd67ede76196fd5fa4512a5482cceb7696305eb72dbe819fe43fa26ac63ded49259d804f5ccf SHA512 e03d69cb66947ddc71d20b9065fd5db384dfc8b2b8e905ddab9ebb992c642dc33f369d7eba5f2338487da5d9d28f20f3078917f222d187c65e5af1a0112ee044 -EBUILD geant-4.10.05_p01.ebuild 2646 BLAKE2B 571209a14d118cb9c0b53df20daf4daad8fadef791b8b5dc74ba977e5299b5dacae581f0cb50cc3a20147ae499b250468f019b05c0fe56ac6c3880f228d69003 SHA512 00c02e6368875ef758e8e7278b1f7efcf32e887304e95a4b9617478cab40bc3aa37076bf85bd9527cca0f2103a4d34f7d1f4429a110dd6e83e6c3ddce6f6a443 EBUILD geant-4.10.6-r1.ebuild 3074 BLAKE2B 510a8c15faa1ad4140823c3c9551a69e10ce13a4305dabb066dfde64b701dde40be609942e7dadeacd7e4b5f586888c05c5705cfb423b752109b6421a3aba9a6 SHA512 38c2a9759e0a510eae076acd0ac11abc093ae2ecefb91333302a62fb8940efc9094af02ea2acfe316b835b00f3511f7fe62805e4c67c631337d19fdcec1823f8 -EBUILD geant-4.10.6_beta1-r1.ebuild 3074 BLAKE2B 510a8c15faa1ad4140823c3c9551a69e10ce13a4305dabb066dfde64b701dde40be609942e7dadeacd7e4b5f586888c05c5705cfb423b752109b6421a3aba9a6 SHA512 38c2a9759e0a510eae076acd0ac11abc093ae2ecefb91333302a62fb8940efc9094af02ea2acfe316b835b00f3511f7fe62805e4c67c631337d19fdcec1823f8 +EBUILD geant-4.10.6.3.ebuild 3085 BLAKE2B ced700560b67afd9ca9c0e2f88b436282757f6cc565a6f5106cef83ee1592761773270c965c19c46d3a2bf3f97772f4e2c9d43a627e9dae362e749f0b10f8a4b SHA512 346ab86748e49ecc20dede19768b399ad645eb8dc264d198e75c069c538b5d353e79f12f1f16df7428d17a2a6ae7ed76ca53749917063683b04a0e611ebfa5c3 EBUILD geant-4.10.6_p1-r1.ebuild 3074 BLAKE2B 510a8c15faa1ad4140823c3c9551a69e10ce13a4305dabb066dfde64b701dde40be609942e7dadeacd7e4b5f586888c05c5705cfb423b752109b6421a3aba9a6 SHA512 38c2a9759e0a510eae076acd0ac11abc093ae2ecefb91333302a62fb8940efc9094af02ea2acfe316b835b00f3511f7fe62805e4c67c631337d19fdcec1823f8 EBUILD geant-4.10.6_p2.ebuild 3024 BLAKE2B 1716d3eeb1092286b0d166488c38bd44206790e5a9b5937b542019960001f5d954de57c7bff709f8359b7cedbdfb4af76121cff22c8bbf8bb331105ad035809e SHA512 713ac726c201f589d1c4b42b1bafe2c8144e3eba46d12dd53b413f48bcecba9c5789ce10a0bd0384d40c1f7854bdd057253a47d2df0f66b0e90f15e66cef5785 MISC metadata.xml 1683 BLAKE2B a0eb481dd6e784064dce6265b9361b51c24fa845f7af7ec238a1ffef215ef16dba7c02b795d8ea50dddb255c513c1a3941761bb99f813664d3ef012377aca174 SHA512 7631f3f6fbc0a5a730fb260476c9d514b05c71c4967c5f0059523cbae99415e5e48a416a8a4b481de5c2c484484489b4260f8ceacdeca4b0ee0e670dc7293985 diff --git a/sci-physics/geant/geant-4.10.05_p01.ebuild b/sci-physics/geant/geant-4.10.05_p01.ebuild deleted file mode 100644 index b8111ecf55c6..000000000000 --- a/sci-physics/geant/geant-4.10.05_p01.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils eapi7-ver - -MY_P=${PN}${PV/_/.} -SPV="$(ver_cut 1-2).$(printf %1d $(ver_cut 3))" - -DESCRIPTION="Toolkit for simulation of passage of particles through matter" -HOMEPAGE="http://geant4.web.cern.ch/" -SRC_URI="http://geant4.cern.ch/support/source/${MY_P}.tar.gz" - -LICENSE="geant4" -SLOT="4" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="+data dawn doc examples gdml geant3 inventor motif opengl - qt5 raytracerx static-libs threads vrml zlib" - -RDEPEND=" - dev-libs/expat - >=sci-physics/clhep-2.3.3.0:2= - dawn? ( media-gfx/dawn ) - gdml? ( dev-libs/xerces-c ) - inventor? ( media-libs/SoXt ) - motif? ( x11-libs/motif:0 ) - opengl? ( virtual/opengl ) - qt5? ( - 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 - ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND} prefix? ( app-shells/tcsh )" -PDEPEND=" - data? ( ~sci-physics/geant-data-${PV/_p*/} ) - doc? ( ~app-doc/geant-docs-${PV/_p*/} )" - -HTML_DOCS=( ReleaseNotes/ReleaseNotes${SPV}.html ) - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - cmake-utils_src_prepare - - if ! use examples; then - sed -i '/install(DIRECTORY examples/,/)/d' CMakeLists.txt || die - fi -} - -src_configure() { - local mycmakeargs=( - -DGEANT4_USE_SYSTEM_CLHEP=ON - -DGEANT4_INSTALL_DATA=OFF - -DGEANT4_BUILD_MULTITHREADED=$(usex threads) - -DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec) - -DGEANT4_USE_NETWORKDAWN=$(usex dawn) - -DGEANT4_USE_GDML=$(usex gdml) - -DGEANT4_USE_G3TOG4=$(usex geant3) - -DGEANT4_USE_XM=$(usex motif) - -DGEANT4_USE_OPENGL_X11=$(usex opengl) - -DGEANT4_USE_INVENTOR=$(usex inventor) - -DGEANT4_USE_QT=$(usex qt5) - -DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx) - -DGEANT4_USE_NETWORKVRML=$(usex vrml) - -DGEANT4_USE_SYSTEM_ZLIB=$(usex zlib) - -DBUILD_STATIC_LIBS=$(usex static-libs) - ) - if use inventor; then - mycmakeargs+=( - -DINVENTOR_INCLUDE_DIR="$(coin-config --includedir)" - -DINVENTOR_SOXT_INCLUDE_DIR="$(coin-config --includedir)" - ) - fi - cmake-utils_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-utils_src_install - [[ -f ReleaseNotes/Patch${SPV}-1.txt ]] && DOCS+=( ReleaseNotes/Patch${SPV}-*.txt ) - einstalldocs -} - -pkg_postinst() { - elog "The following scripts are provided for backward compatibility:" - elog "$(ls -1 ${EROOT%/}/usr/share/${PN^}${SPV}.*/geant4make/*sh)" -} diff --git a/sci-physics/geant/geant-4.10.6_beta1-r1.ebuild b/sci-physics/geant/geant-4.10.6.3.ebuild index 59fedc8d7cc8..2f580bb7015f 100644 --- a/sci-physics/geant/geant-4.10.6_beta1-r1.ebuild +++ b/sci-physics/geant/geant-4.10.6.3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils +inherit cmake MY_P=${PN}$(ver_cut 1-2).$(printf %02d $(ver_cut 3)) @@ -12,12 +12,11 @@ case ${PV} in MY_P+=.b$(printf %02d $(ver_cut 5)) DOCS="ReleaseNotes/Beta$(ver_cut 1-3)-*.txt" ;; -*_p*) - MY_P+=.p$(printf %02d $(ver_cut 5)) - DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt" - HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html" - ;; *) + if [[ $(ver_cut 4) -gt 0 ]]; then + MY_P+=.p$(printf %02d $(ver_cut 4)) + DOCS="ReleaseNotes/Patch$(ver_cut 1-3)-*.txt" + fi HTML_DOCS="ReleaseNotes/ReleaseNotes$(ver_cut 1-3).html" ;; esac @@ -39,7 +38,7 @@ RDEPEND=" >=sci-physics/clhep-2.4.1.3:2=[threads?] data? ( ~sci-physics/geant-data-${PV} ) dawn? ( media-gfx/dawn ) - doc? ( ~app-doc/geant-docs-$(ver_cut 1-3) ) + doc? ( =app-doc/geant-docs-$(ver_cut 1-3)* ) gdml? ( dev-libs/xerces-c ) hdf5? ( sci-libs/hdf5[threads?] ) inventor? ( media-libs/SoXt ) @@ -57,8 +56,6 @@ RDEPEND=" x11-libs/libXmu )" -PATCHES=( "${FILESDIR}"/geant-4.10.6-datadir.patch ) - S="${WORKDIR}/${MY_P}" src_configure() { @@ -66,10 +63,13 @@ src_configure() { -DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4" -DGEANT4_BUILD_CXXSTD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-) -DGEANT4_BUILD_MULTITHREADED=$(usex threads) + -DGEANT4_BUILD_STORE_TRAJECTORY=OFF -DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec) + -DGEANT4_BUILD_VERBOSE_CODE=OFF -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) @@ -94,14 +94,14 @@ src_configure() { -DINVENTOR_SOXT_INCLUDE_DIR="$(coin-config --includedir)" ) fi - cmake-utils_src_configure + 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-utils_src_install + cmake_src_install rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts" einstalldocs diff --git a/sci-physics/h2o-gtk/Manifest b/sci-physics/h2o-gtk/Manifest deleted file mode 100644 index 592877f99253..000000000000 --- a/sci-physics/h2o-gtk/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST h2o-gtk-0.1.tar.bz2 69851 BLAKE2B f097b36e1c7950bae3fa058667a3f8597cd87f59de4c6035d155cdc43e6b089c9bcc5ae1e9805447d0c295f7af49f1f41d74e8bb8c25fc467ce1763f10ea9d86 SHA512 58f376f53fc108be620d5a792227ee65e7464581c45b68e94d7bb19b90862f3b008b172d3a2f2376fee5f30fd19f6bb0f5ec74cb49f1224245f8c6ae68cc9b04 -EBUILD h2o-gtk-0.1-r1.ebuild 524 BLAKE2B 89de50c34c1772eb35b707d843c312e0523385a2c52f3b7988dac2530419f4523d52cc212bb81166ee711e759433122fb802c3b3661db7ef3c92e0ca3b4aaa5f SHA512 5f9828b8c1325292ff312fa91d2b2c8735b9df85f9f710134c92179e1a452cd377d883f864b22189b0d60ecc34f0500d7c41f03bf4f356ae4924eb62359787ee -MISC metadata.xml 503 BLAKE2B b5d08a6d52f89bf89b14942cba4e4492e5c970788116d19cd4a891f84dda109914edb1d6f8c67690bf3d837c6142b5fa790c8d8666c68219ab5dc977c90d550b SHA512 a69f2ac7caa9022d4b91ec06b5e1479bc60d96a15a5f77f86545292abe816f2be16941a2e5525a5f978fca347fe4ce284de709c607948c429a6f32c0223a0a65 diff --git a/sci-physics/h2o-gtk/h2o-gtk-0.1-r1.ebuild b/sci-physics/h2o-gtk/h2o-gtk-0.1-r1.ebuild deleted file mode 100644 index ec3885a327dc..000000000000 --- a/sci-physics/h2o-gtk/h2o-gtk-0.1-r1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="GTK+ UI for libh2o -- water & steam properties" -HOMEPAGE="https://github.com/mgorny/h2o-gtk/" -SRC_URI="https://github.com/mgorny/h2o-gtk/releases/download/${P}/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-cpp/gtkmm:2.4= - sci-libs/libh2oxx:0= - sci-libs/plotmm:0=" -DEPEND="${RDEPEND}" - -src_configure() { - local -x CXXFLAGS="${CXXFLAGS} -std=c++11" - default -} diff --git a/sci-physics/h2o-gtk/metadata.xml b/sci-physics/h2o-gtk/metadata.xml deleted file mode 100644 index 9cd05826817f..000000000000 --- a/sci-physics/h2o-gtk/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>mgorny@gentoo.org</email> - <name>Michał Górny</name> - </maintainer> - <upstream> - <maintainer status="active"> - <email>mgorny@gentoo.org</email> - <name>Michał Górny</name> - </maintainer> - <bugs-to>https://github.com/mgorny/h2o-gtk/issues/</bugs-to> - <remote-id type="github">mgorny/h2o-gtk</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-physics/lhapdf/Manifest b/sci-physics/lhapdf/Manifest index 61a1f0cdc80f..843795f455be 100644 --- a/sci-physics/lhapdf/Manifest +++ b/sci-physics/lhapdf/Manifest @@ -1,3 +1,3 @@ DIST LHAPDF-6.2.3.tar.gz 750659 BLAKE2B a16f67c69f41e96cdb5434cc53658c6b085b94c9ad06443fdfb49aa1de50eeb2a59aa41442a032c29b361bad4f749cef42499f3d16f2774efb0b399f889576e4 SHA512 167064a141f46e5c834d950690a989330b940acec62377b8b4c40e14665503cf7b4ddb79e05c71ebe1f801231192d951e294bec3944ec37b2bca484b2e5ce894 -EBUILD lhapdf-6.2.3.ebuild 1603 BLAKE2B a10b72c02b6f9ea491908d1520bebdf4a6073c7ed61c64e8379e1db7e042a42e00317060e70fbf7e529cb9c48374022eb15786fbd06a80124a055fdab7d1d701 SHA512 f9be54595fe9e98fcc2bcef349edf651e40b30f8ab6d0dce0422747a0154e77bcfe619619e10a8506a801936744268c64eea6d57db91c54f309262f7ab0ed127 +EBUILD lhapdf-6.2.3.ebuild 1635 BLAKE2B 2cfce80f7f3727dd8fc124add0e278153c81a1a1f524bda1f6cd41dd4cbc1848d566e52f1fd9b3195f246653d66d5d9a7b144b3bf7fb2d0c0d9988ebfa84dd8d SHA512 1f3a4462298cd4f8b7cf0577a69c094b557d301a50bd5b9d7a66524d03772d7f27f0e2e3b26972b5c7f6e9d42273ebd14aab069c3f7cbae308915ef85dd9a3e0 MISC metadata.xml 996 BLAKE2B 97df1e778a0e4fdd20faeffcc992c5c76d203c35f9916a15c823bd10d8914cea7b2b6c7b58cca1e6af50ff4a134db8c5cf40db345520cd6f4d16a58d02fda822 SHA512 0c5f089f8428dfbf3e6151f2d9052409dbf7dc64af40fe28664df3e6ba014c8ec4c3e6ae2958c0f0b13ee7edc59f038dab14272622119cc5cb5d6f7fc43637cc diff --git a/sci-physics/lhapdf/lhapdf-6.2.3.ebuild b/sci-physics/lhapdf/lhapdf-6.2.3.ebuild index 4b3de592bb3f..602bad369360 100644 --- a/sci-physics/lhapdf/lhapdf-6.2.3.ebuild +++ b/sci-physics/lhapdf/lhapdf-6.2.3.ebuild @@ -3,8 +3,7 @@ EAPI=7 -AUTOTOOLS_IN_SOURCE_BUILD=yes -PYTHON_COMPAT=( python{3_6,3_7} ) +PYTHON_COMPAT=( python3_{6,7} ) inherit distutils-r1 @@ -18,14 +17,14 @@ SRC_URI="http://www.hepforge.org/archive/lhapdf/${MY_PF}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" - -IUSE="doc examples python static-libs" +IUSE="doc examples python" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" dev-libs/boost:0= python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" doc? ( app-doc/doxygen dev-texlive/texlive-bibtexextra @@ -33,13 +32,15 @@ DEPEND="${RDEPEND} dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra - ) -" + )" S="${WORKDIR}/${MY_PF}" src_configure() { - econf $(use_enable python) + econf \ + --disable-static \ + $(use_enable python) + if use python; then cd "${S}/wrappers/python" && distutils-r1_src_prepare fi @@ -47,6 +48,7 @@ src_configure() { src_compile() { emake all $(use doc && echo doxy) + if use python; then cd "${S}/wrappers/python" && distutils-r1_src_compile fi @@ -64,8 +66,9 @@ src_install() { doins examples/*.cc fi if use python; then - cd "${S}/wrappers/python" && distutils-r1_src_install + cd "${S}/wrappers/python" && distutils-r1_src_install fi + find "${ED}" -name '*.la' -delete || die } pkg_postinst() { diff --git a/sci-physics/rivet/Manifest b/sci-physics/rivet/Manifest deleted file mode 100644 index d8af0654ef90..000000000000 --- a/sci-physics/rivet/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST Rivet-2.6.0.tar.bz2 3527799 BLAKE2B a0ffe7a73ed1120cd3944d3c845ed9387528e7645554c589fda0bfcac694e36f24ee78914e916c51f3a978659933b4e8934e0373f26e4a3ba7597714fc9a939f SHA512 49c381d88075715e23942bb02066b189305077581cd64b708ccaf79436202fe1c9d7989fc1f35dfeffdc643adb39283710fdf33fc87407cfb7ddd3e9d2297feb -DIST refs.bib 16907 BLAKE2B 70c11f86c8ebf6386615b3e900280d1a2677dc82d99f944ac670f52320e05355352dd4017a48ae2af52dfd6f46a92a0d2d65bde4c271589ba4e66b3e7b68982c SHA512 64755e6aeaa1f0b3fb76a33ffdf226bcd42ee597a78a8d458b728f0e6f576d4dafbb276a0498c3b573d23054ccbf54ada6f6c12faf52dbfbeef2372094d01181 -EBUILD rivet-2.6.0-r2.ebuild 2072 BLAKE2B 000281770d68dd8b8fcf79d183010ac7b792a161035edc65dbea1a6bdd8eb5a01129cc798fa1a1fcb4d65806eaf8ec6c9c92ac9c798594697a2b1a36b1815b8e SHA512 4037d80a27a2eb8111dc08463d9200306a886be79ee3e45af21f43f14fec482e5cd7c33f31d59cfd6801bb454dc607f0551c781adc4b450899576be7b46c9a1d -MISC metadata.xml 836 BLAKE2B ab971f916f23c3c3d70e54440e8f2303918084d25ba5a5ca7ed50142606f88e25019dac7781f20df717e4a552fc3ca642439bf0c37476aa378969f82abbab1c3 SHA512 21245268e114d41e0fe10cf6d265b3db7a0e220e1f6d545df4782839f6f5f284c9ddd6f89d20c74497e394e23bf93c96013dcde5c3685e4f1c112c73156f8db0 diff --git a/sci-physics/rivet/metadata.xml b/sci-physics/rivet/metadata.xml deleted file mode 100644 index 78b51d05a6f8..000000000000 --- a/sci-physics/rivet/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci-physics@gentoo.org</email> - <name>Gentoo Physics Project</name> - </maintainer> - <longdescription> - The Rivet project (Robust Independent Validation of Experiment and - Theory) is a toolkit for validation of Monte Carlo event - generators. It provides a large (and ever growing) set of - experimental analyses useful for MC generator development, - validation, and tuning, as well as a convenient infrastructure for - adding your own analyses. Rivet is the most widespread way by which - analysis code from the LHC and other high-energy collider - experiments is preserved for comparison to and development of future - theory models. - </longdescription> -</pkgmetadata> diff --git a/sci-physics/rivet/rivet-2.6.0-r2.ebuild b/sci-physics/rivet/rivet-2.6.0-r2.ebuild deleted file mode 100644 index 3bd00b427282..000000000000 --- a/sci-physics/rivet/rivet-2.6.0-r2.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit autotools bash-completion-r1 python-single-r1 - -DESCRIPTION="Toolkit for validation of Monte Carlo HEP event generators" -HOMEPAGE="http://rivet.hepforge.org/" - -SRC_URI="http://www.hepforge.org/archive/${PN}/${P^}.tar.bz2 - doc? ( https://rivet.hepforge.org/trac/export/8a05acecd26c18f368f4b748da2d5aa2db46be6c/doc/refs.bib )" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc python static-libs" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - dev-libs/boost:= - sci-libs/gsl:= - sci-physics/fastjet[plugins] - sci-physics/hepmc - sci-physics/yoda:=[python] - python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} - doc? ( - app-doc/doxygen[dot] - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) - python? ( - $(python_gen_cond_dep ' - dev-python/cython[${PYTHON_MULTI_USEDEP}] - ') - )" - -S="${WORKDIR}/${P^}" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_unpack() { - unpack "${P^}.tar.bz2" - - if use doc; then - # refs.bib is missing in tarball (reported upstream) - cp "${DISTDIR}"/refs.bib "${S}"/doc || die - fi -} - -src_prepare() { - default - - # Install rivet-manual.pdf to docdir intead of pkgdatadir - sed -i '/pkgdata_DATA = $(DOCS)/s/pkgdata/doc/' doc/Makefile.am || die - # Adjust shebangs of Python scripts - sed -i "s@^#! /usr/bin/env python@#!${EPREFIX}/usr/bin/python2@" bin/* || die - eautoreconf -} - -src_configure() { - econf \ - $(use_enable python pyext) \ - $(use_enable static-libs static) \ - $(use_enable doc doxygen) \ - $(use_enable doc pdfmanual) -} - -src_compile() { - use doc && export VARTEXFONTS="${T}/fonts" - default - - if use doc; then - doxygen Doxyfile || die - HTML_DOCS+=( doxy/html/. ) - fi -} - -src_install() { - default - newbashcomp "${ED%/}"/usr/share/Rivet/rivet-completion rivet - rm -f "${ED%/}"/usr/share/Rivet/rivet-completion || die -} diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest index 28ee74d0677c..0efd1bf200ba 100644 --- a/sci-physics/root/Manifest +++ b/sci-physics/root/Manifest @@ -1,14 +1,8 @@ AUX root-6.12.06_cling-runtime-sysroot.patch 989 BLAKE2B 8202cc8f2bf72cc25642d0a03ba26c3969069b291a6a22188879dbedbf0c3c496149f79f671d0eb51d81d0ee36565660d136b4741f5d018c2b05325ff08381f0 SHA512 c96dee9843da1051c54bd6870ef0a04714944ffe1f86800c9a51b8eb8ef84107d3315d3a708dcc0b651248af4bec362c7f31695514505045aeda9c793d40dc58 AUX root-6.22.00-rlogger.patch 1284 BLAKE2B 4eb69454d83abbf4d29f6c117b1df60aac171c6f8d5a1e085bef67d3f17234bb662f8ede7435564516a3789634721d56e190fe00b37a9e226a7c979634451ef9 SHA512 271aa94d272fd7c668c90af624adb086b28283d6b27d2ae2be84e2ed523dfa2085b83b2941ce6b4975fcc47b7cc566374b91b6f70a3045130857df96c147f911 -DIST root_v6.18.04.source.tar.gz 165938450 BLAKE2B d6545dfa95817940f2bb6b5b49252eca1958df518a4bc05c4857df60a015a39d0df09ea077465533e6ebc815d04e1742da19d18b7af02b5446f9e73dc92e3c16 SHA512 cfcbdd2db4edf55845a7cd1e6ec0cdf714a7ceacb039fa6fb627d7300d6f849b3b462bab724e33b1d6b08eb22ba42c43b7d64c0c6c47dc8a3bb652f86979f2c6 -DIST root_v6.20.06.source.tar.gz 168216335 BLAKE2B a0a51f11e6dcc3a6ba657a8b946507bb857088bce3102f5330a0df455fec468ee4228f5394795f3e3b1ee3434b7ddda85f08039bf603a531154c28b335ff803c SHA512 232fd5253e83eb02ad33d03941c7c83d39d5f6b0162bd42594e44a0c1c08deade42ae5793e571db767ce4fa0a582aa332b9d1869e621b825d1eb1162819c98c6 DIST root_v6.20.08.source.tar.gz 168218062 BLAKE2B 79b1eb89f1003c140a60d47e9d447576ad215e66321a265ed047b069d05f008cf8f0d23df99ed35a8ee5a802e5de5a42122e8f1c075b01ef74eb11926a1b31d7 SHA512 205d5ae94a6c1b6e1a479a8631d5a9bab4a9f76c396cf3ed2c23a26c767a5a892a087b872a69853ada0f84e60a6015f732342c5f48acc696cb626528748f81fe -DIST root_v6.22.00.source.tar.gz 173014392 BLAKE2B a59071ee5b13466505323fca30fe656668a243006239e7f9ebc71bb21a7fe244cafe6d33ff4579b67920c9102eb36344f20415079bb627834fb8a57d9117476d SHA512 9e3c54bbc146b0abb0a2d960af380255ec59d0b3a11a4a97a2a25cb7ac567b07280c4eb48dddf99c1fa2e692881f6396a842ce125d3a253037e52f719739f01e -DIST root_v6.22.02.source.tar.gz 173033408 BLAKE2B c7e3719b612093386fddecbfd098c428345d3562537c2dc546e12b9da62fa6f2cc776a5314ae1257eeaaa498af29236520931ea3f6dd5ad3e03095bc117da125 SHA512 0a0ffbcee2ef971bebf32bc38a247ea981f56721314bc2eab69cfe66ae86eafb00568c475b41b2ae7db7ad25f0c8b0953e10f1841316a49cf62fbad664ccee17 -EBUILD root-6.18.04-r3.ebuild 7596 BLAKE2B 5c3a2643421e56bf0db49961982433d9d9e7cd12f0c0f83cfedb814356db303ac64f2327de2ab0a665ac7ab2ad4afd0f9f0e7fcdbfabff41efea7209ddd960d8 SHA512 2491495d3508c51c39c4cec4796e98f24297195b162aa70ccb24a98ca59d67af50162179eaf3bba8e617bd9decf6bf2f29030b1777c3f0fe0bc4c77878b638b4 -EBUILD root-6.20.06.ebuild 7564 BLAKE2B 9d9a0358d7d460292a4f30252f3cbf52598d3d78d5cc7567511437e0a213648c064eff3c1efde7d3d165971aeae56a285185e9aa5fa4ef21a0da0df07cba0bdc SHA512 1300e869b64cd8d720bf5fb201c886e8c130f0237d9d5d3ec8db8649c6b56e259d0f6834043d39ac3f80f941a1536b622fdcc4b17bcd078a6ab8cb933bf08149 +DIST root_v6.22.04.source.tar.gz 173070733 BLAKE2B 7f2f2c2c01c4144656c517186b64479ad3ac2a8262da3e55ad8c3f446677d3ce00165d182dec33a744351c666fedc9adb87c0fa0f7165eba3400a40d80214bda SHA512 aad5901f0c621fd0fa3865da93348420545c86f75bef5459240d6de63bf3312906a329537bc93c35d58a20d1bb90205bb6fff2d88e8c83ff61a30209fd77416b EBUILD root-6.20.08.ebuild 7564 BLAKE2B 9d9a0358d7d460292a4f30252f3cbf52598d3d78d5cc7567511437e0a213648c064eff3c1efde7d3d165971aeae56a285185e9aa5fa4ef21a0da0df07cba0bdc SHA512 1300e869b64cd8d720bf5fb201c886e8c130f0237d9d5d3ec8db8649c6b56e259d0f6834043d39ac3f80f941a1536b622fdcc4b17bcd078a6ab8cb933bf08149 -EBUILD root-6.22.00.ebuild 7571 BLAKE2B 972aba34e3aafad50d826df54a7e41c5451d6acb26d2979693d71070def13db3156b9cf981c7a6a17951fdace0aa2873b5e940afc3fab5a162e79bd11bb795f5 SHA512 949cc22fe4243c165b7a90aae2a7b157f908f2e627dfe7f8848287be8dccb4679448819d36314910ea51d7bc6c198ac5cec29a409da4a06a5613f3a2354ca443 -EBUILD root-6.22.02-r1.ebuild 7528 BLAKE2B 5516e826268e67aeb5976fca05b9e40effef89b17bae140378894ee419010e0cd38e18597fc84b34cacfb05a08cfc45b6100d3daa9bbb9d7cd222ad8ce3c35a8 SHA512 dc6704bd78b962eef0d46cc6d7075bb83315e0d7f7766445bb33d93acee6eb32c76e0863884dc1f245393487b12d582c0820d65717f4557c92117195328a5533 +EBUILD root-6.22.04.ebuild 7527 BLAKE2B c84e1e42d02ef0959ac682887b17d19f7bb2355e092ecd7000217826ffe30aa8323ec70f7e670a1af0281945a8fc2925f611d4b2f3293ef22fdfd8ece48ab0f4 SHA512 c526a459a47a93635c33e12ca71a4b05a9090d94228489a71a9168e1092afaa639b02c945a75eab1980034ceccf5188a90ce910bc3f65fec0c19d68bc1a1dac2 EBUILD root-9999.ebuild 8009 BLAKE2B 5088efe7a52842b5813d579d5b1337e9eb8e081e5454cc02a237ecf6a67bafcdda1c13a2ece53a1c1479a2fabc3469eae1722093c6a65d48abe511b57b8a00f5 SHA512 9bb8e99f069d4ba7151810486b54552a65435c41780f792387684ced10e794163f44a6baa1e29afe28cb7ff869f3561aed7da4ac900344ba8969f2d10548f35f -MISC metadata.xml 3227 BLAKE2B d4c07ae082584a652a0f56735fa4d6556f0c917c949ade4663b3347e4ca371b2508e370f2040d70482ca5c1c128fc903412b9acba05014a7aca784fb65d0fbb3 SHA512 c7589407ef19ddf5c48b2d91a83c913862d1384fc2b125286d71097e698462849c720f10f57a5c5be7e026537e961dc3dab61c256438313e3d6cf73ea0108b79 +MISC metadata.xml 3060 BLAKE2B a08c5d2c54daba2c05984d23d1a912929ab94e40e0b72b17a804b442f7c5b2a2a1039485d529d14953c25261c7a8179d67c6790dab733cc7cee6c1ce0fb0d509 SHA512 6ca7f1940a92053a2c12412882a6b4e478758af94fae422e1ace6cc55cc25dea8117cb042f034a98db6993afba3726d4f4d9d983513ada940c14bc9d988abc26 diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml index 85a5b09bdff4..453df091a133 100644 --- a/sci-physics/root/metadata.xml +++ b/sci-physics/root/metadata.xml @@ -32,9 +32,7 @@ <flag name="gdml">Enable GDML writer and reader</flag> <flag name="http">Enable http server support including but not limited to fastcgi support</flag> <flag name="libcxx">Build ROOT against <pkg>sys-libs/libcxx</pkg></flag> - <flag name="memstat">Build memory statistics library, helps to detect memory leaks</flag> <flag name="minuit">Build ROOT's internal versions of minuit (fortran) and minuit2 (C++)</flag> - <flag name="nosplash">Disable ROOT's splash screen by default</flag> <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag> <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag> <flag name="R">Enable support for <pkg>dev-lang/R</pkg></flag> diff --git a/sci-physics/root/root-6.18.04-r3.ebuild b/sci-physics/root/root-6.18.04-r3.ebuild deleted file mode 100644 index 45eb62c6d7da..000000000000 --- a/sci-physics/root/root-6.18.04-r3.ebuild +++ /dev/null @@ -1,304 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# ninja does not work due to fortran -CMAKE_MAKEFILE_GENERATOR=emake -FORTRAN_NEEDED="fortran" -PYTHON_COMPAT=( python3_{6,7} ) - -inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \ - prefix 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 +davix debug emacs - +examples fits fftw fortran +gdml graphviz +gsl http jemalloc - libcxx memstat +minuit mysql nosplash odbc +opengl oracle postgres - prefix pythia6 pythia8 +python qt5 R +roofit root7 shadow sqlite - +ssl +tbb test +threads +tiff +tmva +unuran vc +vmc +xml xrootd" -RESTRICT="!test? ( test )" - -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++11 c++14 c++17 ) - cuda? ( tmva !c++17 ) - !X? ( !asimage !opengl !qt5 !tiff ) - davix? ( ssl xml ) - python? ( ${PYTHON_REQUIRED_USE} ) - qt5? ( root7 ) - root7? ( || ( c++14 c++17 ) ) - tmva? ( gsl ) -" - -CDEPEND=" - app-arch/lz4 - app-arch/xz-utils - fortran? ( dev-lang/cfortran ) - dev-libs/libpcre:3 - dev-libs/xxhash - media-fonts/dejavu - media-libs/freetype:2 - media-libs/libpng:0= - 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/qtgui:5 - dev-qt/qtwebengine:5[widgets] - ) - ) - asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] ) - cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) - davix? ( net-libs/davix ) - emacs? ( >=app-editors/emacs-23.1:* ) - fftw? ( sci-libs/fftw:3.0= ) - fits? ( sci-libs/cfitsio:0= ) - graphviz? ( media-gfx/graphviz ) - gsl? ( sci-libs/gsl:= ) - http? ( dev-libs/fcgi:0= ) - jemalloc? ( dev-libs/jemalloc ) - libcxx? ( sys-libs/libcxx ) - unuran? ( sci-mathematics/unuran:0= ) - minuit? ( !sci-libs/minuit ) - mysql? ( dev-db/mysql-connector-c ) - odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) - oracle? ( dev-db/oracle-instantclient-basic ) - postgres? ( dev-db/postgresql:= ) - pythia6? ( sci-physics/pythia:6 ) - 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-2018 ) - tmva? ( - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_MULTI_USEDEP}] - ') - ) - vc? ( dev-libs/vc:= ) - xml? ( dev-libs/libxml2:2= ) - xrootd? ( <net-libs/xrootd-5:0= ) -" - -DEPEND="${CDEPEND} - virtual/pkgconfig" - -RDEPEND="${CDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-6.12.06_cling-runtime-sysroot.patch -) - -pkg_setup() { - use fortran && fortran-2_pkg_setup - use python && python-single-r1_pkg_setup - - elog "There are extra options on packages not available in Gentoo." - elog "You can use the environment variable EXTRA_ECONF to enable" - elog "these packages. For example, for Vdt you would set:" - elog "EXTRA_ECONF=\"-Dbuiltin_vdt=ON -Dvdt=ON\"" -} - -src_prepare() { - use cuda && cuda_src_prepare - - cmake-utils_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" - - if use nosplash; then - sed -i -e '/bool gNoLogo/s@false@true@' rootx/src/rootx.cxx - fi -} - -# Note: ROOT uses bundled clang because it is patched and API-incompatible -# with vanilla clang. The patches enable the C++ interpreter to work. -# Since ROOT installs many files into /etc (>100MB in total) that don't -# really belong there, we install it into another directory to avoid -# making /etc too big. - -src_configure() { - local mycmakeargs=( - -DCMAKE_C_FLAGS="${CFLAGS}" - -DCMAKE_CXX_FLAGS="${CXXFLAGS}" - -DCMAKE_CXX_STANDARD=$((usev c++11 || 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 - -Dexplicitlink=ON - -Dexceptions=ON - -Dfail-on-missing=ON - -Dgnuinstall=OFF - -Dshared=ON - -Dsoversion=ON - -Dbuiltin_llvm=ON - -Dbuiltin_clang=ON - -Dbuiltin_afterimage=OFF - -Dbuiltin_cfitsio=OFF - -Dbuiltin_davix=OFF - -Dbuiltin_fftw3=OFF - -Dbuiltin_freetype=OFF - -Dbuiltin_ftgl=OFF - -Dbuiltin_gl2ps=OFF - -Dbuiltin_glew=OFF - -Dbuiltin_gsl=OFF - -Dbuiltin_lz4=OFF - -Dbuiltin_lzma=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_zlib=OFF - -Dx11=$(usex X) - -Dxft=$(usex X) - -Dalien=OFF - -Darrow=OFF - -Dasimage=$(usex asimage) - -Dastiff=$(usex tiff) - -Dlibcxx=$(usex libcxx) - -Dccache=OFF # use ccache via portage - -Dcefweb=OFF - -Dchirp=OFF - -Dclad=OFF - -Dcling=ON # cling=OFF is broken - -Dcocoa=$(usex aqua) - -Dcuda=$(usex cuda) - -Dcxxmodules=OFF # requires clang, unstable - -Ddavix=$(usex davix) - -Ddcache=OFF - -Dfftw3=$(usex fftw) - -Dfitsio=$(usex fits) - -Dfortran=$(usex fortran) - -Dftgl=$(usex opengl) - -Dgdml=$(usex gdml) - -Dgenvector=ON # genvector=OFF ignored - -Dgeocad=OFF - -Dgfal=OFF - -Dgl2ps=$(usex opengl) - -Dgminimal=OFF - -Dgsl_shared=$(usex gsl) - -Dgviz=$(usex graphviz) - -Dhttp=$(usex http) - -Dimt=$(usex tbb) - -Djemalloc=$(usex jemalloc) - -Dmathmore=$(usex gsl) - -Dmemstat=$(usex memstat) - -Dminimal=OFF - -Dminuit2=$(usex minuit) - -Dminuit=$(usex minuit) - -Dmonalisa=OFF - -Dmysql=$(usex mysql) - -Dodbc=$(usex odbc) - -Dopengl=$(usex opengl) - -Doracle=$(usex oracle) - -Dpch=ON # pch=OFF is broken - -Dpgsql=$(usex postgres) - -Dpythia6=$(usex pythia6) - -Dpythia8=$(usex pythia8) - -Dpython=$(usex python) - -Dqt5web=$(usex qt5) - -Droofit=$(usex roofit) - -Droot7=$(usex root7) - -Drootbench=OFF - -Droottest=OFF - -Drpath=OFF - -Druntime_cxxmodules=OFF # does not work yet - -Dr=$(usex R) - -Dshadowpw=$(usex shadow) - -Dsqlite=$(usex sqlite) - -Dssl=$(usex ssl) - -Dtcmalloc=OFF - -Dtesting=$(usex test) - -Dthread=$(usex threads) - -Dtmva=$(usex tmva) - -Dtmva-cpu=$(usex tmva) - -Dtmva-gpu=$(usex cuda) - -Dunuran=$(usex unuran) - -Dvc=$(usex vc) - -Dvmc=$(usex vmc) - -Dvdt=OFF - -Dveccore=OFF - -Dxml=$(usex xml) - -Dxrootd=$(usex xrootd) - ${EXTRA_ECONF} - ) - - CMAKE_BUILD_TYPE=$(usex debug Debug Release) \ - cmake-utils_src_configure -} - -src_compile() { - # needed for hsimple.root - addwrite /dev/random - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - - ROOTSYS=${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2) - ROOTENV=$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2) - - cat > ${ROOTENV} <<- EOF || die - MANPATH="${ROOTSYS}/share/man" - PATH="${ROOTSYS}/bin" - ROOTPATH="${ROOTSYS}/bin" - LDPATH="${ROOTSYS}/lib" - EOF - - if use python; then - echo "PYTHONPATH=\"${ROOTSYS}/lib\"" >> ${ROOTENV} || die - fi - - doenvd ${ROOTENV} - - if use emacs; then - elisp-install ${PN}-$(ver_cut 1-2) "${BUILD_DIR}"/root-help.el - fi - - pushd "${D}/${ROOTSYS}" > /dev/null - - rm -r emacs bin/*.{csh,sh,fish} || die - - if ! use examples; then - rm -r tutorials || die - 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 -} diff --git a/sci-physics/root/root-6.20.06.ebuild b/sci-physics/root/root-6.20.06.ebuild deleted file mode 100644 index b87d8f13f490..000000000000 --- a/sci-physics/root/root-6.20.06.ebuild +++ /dev/null @@ -1,306 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# ninja does not work due to fortran -CMAKE_MAKEFILE_GENERATOR=emake -FORTRAN_NEEDED="fortran" -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit cmake cuda elisp-common fortran-2 prefix 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 - +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" -RESTRICT="!test? ( test )" - -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++11 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 ) ) - tmva? ( gsl ) -" - -CDEPEND=" - app-arch/lz4 - app-arch/zstd - app-arch/xz-utils - fortran? ( dev-lang/cfortran ) - dev-libs/libpcre:3 - dev-libs/xxhash - media-fonts/dejavu - media-libs/freetype:2 - media-libs/libpng:0= - 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/qtgui:5 - dev-qt/qtwebengine:5[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 ) - emacs? ( >=app-editors/emacs-23.1:* ) - 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 ) - mysql? ( dev-db/mysql-connector-c ) - odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) - oracle? ( dev-db/oracle-instantclient-basic ) - postgres? ( dev-db/postgresql:= ) - pythia6? ( sci-physics/pythia:6 ) - 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-2018 ) - tmva? ( - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_MULTI_USEDEP}] - ') - ) - vc? ( dev-libs/vc:= ) - xml? ( dev-libs/libxml2:2= ) - xrootd? ( <net-libs/xrootd-5:0= ) -" - -DEPEND="${CDEPEND} - virtual/pkgconfig" - -RDEPEND="${CDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-6.12.06_cling-runtime-sysroot.patch -) - -pkg_setup() { - use fortran && fortran-2_pkg_setup - use python && python-single-r1_pkg_setup - - elog "There are extra options on packages not available in Gentoo." - elog "You can use the environment variable EXTRA_ECONF to enable" - elog "these packages. For example, for Vdt you would set:" - elog "EXTRA_ECONF=\"-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. -# Since ROOT installs many files into /etc (>100MB in total) that don't -# really belong there, we install it into another directory to avoid -# making /etc too big. - -src_configure() { - 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}" - -DCMAKE_CXX_STANDARD=$((usev c++11 || 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 - -Dexceptions=ON - -Dfail-on-missing=ON - -Dgnuinstall=OFF - -Dshared=ON - -Dsoversion=ON - -Dbuiltin_llvm=ON - -Dbuiltin_clang=ON - -Dbuiltin_afterimage=OFF - -Dbuiltin_cfitsio=OFF - -Dbuiltin_davix=OFF - -Dbuiltin_fftw3=OFF - -Dbuiltin_freetype=OFF - -Dbuiltin_ftgl=OFF - -Dbuiltin_gl2ps=OFF - -Dbuiltin_glew=OFF - -Dbuiltin_gsl=OFF - -Dbuiltin_lz4=OFF - -Dbuiltin_lzma=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_zlib=OFF - -Dbuiltin_zstd=OFF - -Dalien=OFF - -Darrow=OFF - -Dasimage=$(usex asimage) - -Dccache=OFF # use ccache via portage - -Dcefweb=OFF - -Dclad=OFF - -Dcocoa=$(usex aqua) - -Dcuda=$(usex cuda) - -Dcudnn=$(usex cudnn) - -Dcxxmodules=OFF # requires clang, unstable - -Ddataframe=ON - -Ddavix=$(usex davix) - -Ddcache=OFF - -Dfcgi=$(usex http) - -Dfftw3=$(usex fftw) - -Dfitsio=$(usex fits) - -Dfortran=$(usex fortran) - -Dgdml=$(usex gdml) - -Dgfal=OFF - -Dgminimal=OFF - -Dgsl_shared=$(usex gsl) - -Dgviz=$(usex graphviz) - -Dhttp=$(usex http) - -Dimt=$(usex tbb) - -Dlibcxx=$(usex libcxx) - -Dmathmore=$(usex gsl) - -Dmemstat=OFF # deprecated - -Dminimal=OFF - -Dminuit2=$(usex minuit) - -Dminuit=$(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_experimental=OFF # use standard PyROOT for now - -Dpythia6=$(usex pythia6) - -Dpythia8=$(usex pythia8) - -Dqt5web=$(usex qt5) - -Dr=$(usex R) - -Droofit=$(usex roofit) - -Droot7=$(usex root7) - -Drootbench=OFF - -Droottest=OFF - -Drpath=OFF - -Druntime_cxxmodules=OFF - -Dshadowpw=$(usex shadow) - -Dspectrum=ON - -Dsqlite=$(usex sqlite) - -Dssl=$(usex ssl) - -Dtcmalloc=OFF - -Dtesting=$(usex test) - -Dtmva=$(usex tmva) - -Dtmva-cpu=$(usex tmva) - -Dtmva-gpu=$(usex cuda) - -Dtmva-pymva=$(usex tmva) - -Dtmva-rmva=$(usex R) - -Dunuran=$(usex unuran) - -Dvc=$(usex vc) - -Dvdt=OFF - -Dveccore=OFF - -Dvecgeom=OFF - -Dvmc=$(usex vmc) - -Dx11=$(usex X) - -Dxml=$(usex xml) - -Dxrootd=$(usex xrootd) - ${EXTRA_ECONF} - ) - - CMAKE_BUILD_TYPE=$(usex debug Debug Release) \ - cmake_src_configure -} - -src_compile() { - # needed for hsimple.root - addwrite /dev/random - cmake_src_compile -} - -src_install() { - cmake_src_install - - ROOTSYS=${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2) - ROOTENV="$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)" - - cat > ${ROOTENV} <<- EOF || die - MANPATH="${ROOTSYS}/share/man" - PATH="${ROOTSYS}/bin" - ROOTPATH="${ROOTSYS}/bin" - LDPATH="${ROOTSYS}/lib" - EOF - - if use python; then - echo "PYTHONPATH=\"${ROOTSYS}/lib\"" >> ${ROOTENV} || die - fi - - doenvd ${ROOTENV} - - if use emacs; then - elisp-install ${PN}-$(ver_cut 1-2) "${BUILD_DIR}"/root-help.el - fi - - pushd "${D}/${ROOTSYS}" > /dev/null - - rm -r emacs bin/*.{csh,sh,fish} || die - - if ! use examples; then - rm -r tutorials || die - 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 -} diff --git a/sci-physics/root/root-6.22.00.ebuild b/sci-physics/root/root-6.22.00.ebuild deleted file mode 100644 index 6d38269415d8..000000000000 --- a/sci-physics/root/root-6.22.00.ebuild +++ /dev/null @@ -1,307 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# ninja does not work due to fortran -CMAKE_MAKEFILE_GENERATOR=emake -FORTRAN_NEEDED="fortran" -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit cmake cuda elisp-common fortran-2 prefix 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 - +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" -RESTRICT="!test? ( test )" - -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++11 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 ) ) - tmva? ( gsl ) -" - -CDEPEND=" - app-arch/lz4 - app-arch/zstd - app-arch/xz-utils - fortran? ( dev-lang/cfortran ) - dev-libs/libpcre:3 - dev-libs/xxhash - media-fonts/dejavu - media-libs/freetype:2 - media-libs/libpng:0= - 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/qtgui:5 - dev-qt/qtwebengine:5[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 ) - emacs? ( >=app-editors/emacs-23.1:* ) - 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 ) - mysql? ( dev-db/mysql-connector-c ) - odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) - oracle? ( dev-db/oracle-instantclient-basic ) - postgres? ( dev-db/postgresql:= ) - pythia6? ( sci-physics/pythia:6 ) - 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-2018 ) - tmva? ( - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_MULTI_USEDEP}] - ') - ) - vc? ( dev-libs/vc:= ) - xml? ( dev-libs/libxml2:2= ) - xrootd? ( <net-libs/xrootd-5:0= ) -" - -DEPEND="${CDEPEND} - virtual/pkgconfig" - -RDEPEND="${CDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-6.12.06_cling-runtime-sysroot.patch - "${FILESDIR}"/${PN}-6.22.00-rlogger.patch -) - -pkg_setup() { - use fortran && fortran-2_pkg_setup - use python && python-single-r1_pkg_setup - - elog "There are extra options on packages not available in Gentoo." - elog "You can use the environment variable EXTRA_ECONF to enable" - elog "these packages. For example, for Vdt you would set:" - elog "EXTRA_ECONF=\"-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. -# Since ROOT installs many files into /etc (>100MB in total) that don't -# really belong there, we install it into another directory to avoid -# making /etc too big. - -src_configure() { - 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}" - -DCMAKE_CXX_STANDARD=$((usev c++11 || 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 - -Dexceptions=ON - -Dfail-on-missing=ON - -Dgnuinstall=OFF - -Dshared=ON - -Dsoversion=ON - -Dbuiltin_llvm=ON - -Dbuiltin_clang=ON - -Dbuiltin_afterimage=OFF - -Dbuiltin_cfitsio=OFF - -Dbuiltin_davix=OFF - -Dbuiltin_fftw3=OFF - -Dbuiltin_freetype=OFF - -Dbuiltin_ftgl=OFF - -Dbuiltin_gl2ps=OFF - -Dbuiltin_glew=OFF - -Dbuiltin_gsl=OFF - -Dbuiltin_lz4=OFF - -Dbuiltin_lzma=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_zlib=OFF - -Dbuiltin_zstd=OFF - -Dalien=OFF - -Darrow=OFF - -Dasimage=$(usex asimage) - -Dccache=OFF # use ccache via portage - -Dcefweb=OFF - -Dclad=OFF - -Dcocoa=$(usex aqua) - -Dcuda=$(usex cuda) - -Dcudnn=$(usex cudnn) - -Dcxxmodules=OFF # requires clang, unstable - -Ddataframe=ON - -Ddavix=$(usex davix) - -Ddcache=OFF - -Dfcgi=$(usex http) - -Dfftw3=$(usex fftw) - -Dfitsio=$(usex fits) - -Dfortran=$(usex fortran) - -Dgdml=$(usex gdml) - -Dgfal=OFF - -Dgminimal=OFF - -Dgsl_shared=$(usex gsl) - -Dgviz=$(usex graphviz) - -Dhttp=$(usex http) - -Dimt=$(usex tbb) - -Dlibcxx=$(usex libcxx) - -Dmathmore=$(usex gsl) - -Dmemstat=OFF # deprecated - -Dminimal=OFF - -Dminuit2=$(usex minuit) - -Dminuit=$(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) - -Dr=$(usex R) - -Droofit=$(usex roofit) - -Droot7=$(usex root7) - -Drootbench=OFF - -Droottest=OFF - -Drpath=OFF - -Druntime_cxxmodules=OFF - -Dshadowpw=$(usex shadow) - -Dspectrum=ON - -Dsqlite=$(usex sqlite) - -Dssl=$(usex ssl) - -Dtcmalloc=OFF - -Dtesting=$(usex test) - -Dtmva=$(usex tmva) - -Dtmva-cpu=$(usex tmva) - -Dtmva-gpu=$(usex cuda) - -Dtmva-pymva=$(usex tmva) - -Dtmva-rmva=$(usex R) - -Dunuran=$(usex unuran) - -Dvc=$(usex vc) - -Dvdt=OFF - -Dveccore=OFF - -Dvecgeom=OFF - -Dvmc=$(usex vmc) - -Dx11=$(usex X) - -Dxml=$(usex xml) - -Dxrootd=$(usex xrootd) - ${EXTRA_ECONF} - ) - - CMAKE_BUILD_TYPE=$(usex debug Debug Release) \ - cmake_src_configure -} - -src_compile() { - # needed for hsimple.root - addwrite /dev/random - cmake_src_compile -} - -src_install() { - cmake_src_install - - ROOTSYS=${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2) - ROOTENV="$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)" - - cat > ${ROOTENV} <<- EOF || die - MANPATH="${ROOTSYS}/share/man" - PATH="${ROOTSYS}/bin" - ROOTPATH="${ROOTSYS}/bin" - LDPATH="${ROOTSYS}/lib" - EOF - - if use python; then - echo "PYTHONPATH=\"${ROOTSYS}/lib\"" >> ${ROOTENV} || die - fi - - doenvd ${ROOTENV} - - if use emacs; then - elisp-install ${PN}-$(ver_cut 1-2) "${BUILD_DIR}"/root-help.el - fi - - pushd "${D}/${ROOTSYS}" > /dev/null - - rm -r emacs bin/*.{csh,sh,fish} || die - - if ! use examples; then - rm -r tutorials || die - 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 -} diff --git a/sci-physics/root/root-6.22.02-r1.ebuild b/sci-physics/root/root-6.22.04.ebuild index 0e959e9f8eb6..ecc426ffdc88 100644 --- a/sci-physics/root/root-6.22.02-r1.ebuild +++ b/sci-physics/root/root-6.22.04.ebuild @@ -6,7 +6,7 @@ EAPI=7 # ninja does not work due to fortran CMAKE_MAKEFILE_GENERATOR=emake FORTRAN_NEEDED="fortran" -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit cmake cuda elisp-common fortran-2 prefix python-single-r1 toolchain-funcs @@ -100,7 +100,7 @@ CDEPEND=" ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) - xrootd? ( <net-libs/xrootd-5:0= ) + xrootd? ( net-libs/xrootd:0= ) " DEPEND="${CDEPEND} diff --git a/sci-physics/thepeg/Manifest b/sci-physics/thepeg/Manifest index bc6091542f66..08b71bd4391c 100644 --- a/sci-physics/thepeg/Manifest +++ b/sci-physics/thepeg/Manifest @@ -7,7 +7,7 @@ DIST ThePEG-2.0.0.tar.bz2 1938251 BLAKE2B 8f9403a7f442da6b3bf753f3b45fbddfe339eb DIST ThePEG-2.0.4.tar.bz2 1921082 BLAKE2B f27dd81b51c28eac547351a7c732969d79abd6c1885a2e52319b6e5807bb4c1824e35e303e3d23b80b7da07a3c7c9e9f5470d538728362a4398bb66e42a00325 SHA512 5c037033daa89748267691df644209f62f46ccdff6865cfeceeda6909cff3de0c474c5ced067db6c5659ba6ebe5a51fc9b8fee46a36886278f8d29e13de2a81c DIST cteq5l.LHgrid 134797 BLAKE2B 1e222631ff00979abf64e95ffa3133d29eacd819325fcdf9d4065a1ce85db5704f0a43c646f9a9a3ee7b1905603e9060fc279405435d412bf06ee14ba9121f32 SHA512 1ba41fd773104a933af6f37745dcb6f8422e1aece74ba2b1e15a5fb69fdaf694336c0ec1dc6fbc964d2cf3fe363d17ca0c01a6c2ba6def0afa4389cb4083f34b DIST cteq6ll.LHpdf 1461 BLAKE2B 66a8ebd404849a14c1240ff1c7b06e758a78ae47cc4e7818b8b7fcb6faecbb17fd8810279e54c70623a048f78e6f89706bcecca4d4b8174468ff52481da37640 SHA512 b89a87d1c1c7cc910aa4af53abc3cc6550670a5a6332989232d33c7da1ba01ce49bbbf9f3bb454e673312fb5bc1679f86eea18f95a1443d1c80d3a622e2b8728 -EBUILD thepeg-1.9.2.ebuild 2382 BLAKE2B 84b5f2cd6ef51c7b3072027d1cc209af8723ef45be25f63464c24d0add45c9c38e1aada9aafdfca0b13b82abd5adf9da1211e11b1f5c649307918e5a5094ef0c SHA512 4c6cd6830cb66941a605faea7b9d3bce57a43256407835070987270c682e1e17813c9860ef312c127b219d26ef21f9dbb2118dabc765fecaf3a53c749750c166 -EBUILD thepeg-2.0.0.ebuild 2382 BLAKE2B 9ccc67ba13977a9d9e866f22bbaec8e63f7667253a4e86afca248be858d1d30ed8f8926487a18b83a2aa3af885a3e47e7536feec9a1f9e5bf16e4b278378ee11 SHA512 d2f1dd486adcd7841632d1ce7fa66d29e9257a0a08b43849252cbd1fde9f150d2c7382ce28e9fc2680a8dca49879d52e3d01f397e1a043c8a8c6a5e49f513e30 -EBUILD thepeg-2.0.4.ebuild 2303 BLAKE2B 044efd53dce100f361875fec18456644a1989a4ac0499bc18fde3f8e9db85773d47972a1f7c2ab76ff425caaeb7a39b5d042d599b40ee0c04f6b3771a31b238e SHA512 1c679c9030091fa3fa0dd877cc508e41743095552748633f0320360ccb89dcc297e7307c768c408feee6906b0ab2773d25a649cfac6640cb3f4cc66a1f0be3f1 -MISC metadata.xml 1066 BLAKE2B 26afbd997fe3ec808f19c1d0acbb39f4992501ec15a3bb6595f1ff7219016072d6cf3a64636df943f9b5478fb98952f7f998eab7073bb411ebe9d7274ab76686 SHA512 f42af9eb2e0cb212ed9c374b9da6775f4857435c5cb418ebef15f39b061b0a2ddb85269aff102e40cc499a9834cb16d24e44d3b3de9de3a26078edfc7162eac5 +EBUILD thepeg-1.9.2.ebuild 2318 BLAKE2B ff23549389bfbec09217448d6a3d802965291e25a3251d4316049d0b19e8070434dcd5935ec5bb85fca44ffa8ae2dee6b542ffe44700e2ec7ddb7020a18b7edb SHA512 3e82f3c7cac0ba6e84883ae909ab37fc10db688ee842ece8b7a7125b25c43c1234f45710a843e8fd61db92090d0fd2872608a48a6c9e991c47db571de270e53b +EBUILD thepeg-2.0.0.ebuild 2318 BLAKE2B 6a3c5df9bb82afcd0ee0beb063a5e37aae6f1ab50e923fb4cfc3befc87f2ee71105db578e90d81ad350bc25b3c25407e7536821364c7e71b7dd6a14d8be781cb SHA512 5950b51024e40b4b0a3908792b5fddd2cad4ddfbc7347f38faaeb21a159b63429137f8c4cb8a481addc0ee81df17a161fcaae6832549491bb2de45ba516c992a +EBUILD thepeg-2.0.4.ebuild 2239 BLAKE2B e52748a673196c5b1415a0fe1d0ea05a89c11e13a867f5ff01004d6e9fd5350e27a8af77a628d8c0ffa4c00605b48053d15e87ad0f75f5e282495b451a6449fe SHA512 a52226c1d7a4c2170048f783470fb9bc1c8107eb21816540a52ec9a581ce3179e209828cf53243c8dd1e4b69f6fa9713ebf5f9d5c8f520498136a90db82dfe48 +MISC metadata.xml 992 BLAKE2B 2c3d61f64d4f24d1cf68d1663ac9ab75fd711de6f851d462226aed95551a6daa4b19287dc4ccef303178a085e756dd9ce5cf2555d965260d8b7b86a4d771ddb5 SHA512 c6412d6cc97da21ba7774d03f4bbc69d53d9bc82fab4d45940f61a318fb67bb58dc4e4668e831b4e2b18efac5d19898229a4e5ce515cd7722372e5aa18685e01 diff --git a/sci-physics/thepeg/metadata.xml b/sci-physics/thepeg/metadata.xml index b98a9450c6f2..4f8dcee86a89 100644 --- a/sci-physics/thepeg/metadata.xml +++ b/sci-physics/thepeg/metadata.xml @@ -19,6 +19,5 @@ <flag name="hepmc">Adds support for High Energy Physics Monte Carlo Generators <pkg>sci-physics/hepmc</pkg></flag> <flag name="lhapdf">Adds support for <pkg>sci-physics/lhapdf</pkg></flag> - <flag name="rivet">Adds support for <pkg>sci-physics/rivet</pkg></flag> </use> </pkgmetadata> diff --git a/sci-physics/thepeg/thepeg-1.9.2.ebuild b/sci-physics/thepeg/thepeg-1.9.2.ebuild index 1f333ed8402a..dfe097cf8ca0 100644 --- a/sci-physics/thepeg/thepeg-1.9.2.ebuild +++ b/sci-physics/thepeg/thepeg-1.9.2.ebuild @@ -24,7 +24,7 @@ LICENSE="GPL-2" SLOT="0/18" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="c++11 emacs fastjet hepmc java lhapdf rivet static-libs test zlib" +IUSE="c++11 emacs fastjet hepmc java lhapdf static-libs test zlib" RESTRICT="!test? ( test )" RDEPEND=" @@ -34,7 +34,6 @@ RDEPEND=" hepmc? ( sci-physics/hepmc:0= ) java? ( >=virtual/jre-1.5:* ) lhapdf? ( sci-physics/lhapdf:0= ) - rivet? ( sci-physics/rivet:0= ) zlib? ( sys-libs/zlib:0= )" DEPEND="${RDEPEND} test? ( sys-process/time )" @@ -62,7 +61,7 @@ src_configure() { $(use_with hepmc hepmc "${EPREFIX}"/usr) $(use_with java javagui) $(use_with lhapdf lhapdf "${EPREFIX}"/usr) - $(use_with rivet rivet "${EPREFIX}"/usr) + --without-rivet $(use_with zlib zlib "${EPREFIX}"/usr) ) autotools-utils_src_configure diff --git a/sci-physics/thepeg/thepeg-2.0.0.ebuild b/sci-physics/thepeg/thepeg-2.0.0.ebuild index 6d4e9927f49d..22c553e8f5dd 100644 --- a/sci-physics/thepeg/thepeg-2.0.0.ebuild +++ b/sci-physics/thepeg/thepeg-2.0.0.ebuild @@ -24,7 +24,7 @@ LICENSE="GPL-2" SLOT="0/20" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="c++11 emacs fastjet hepmc java lhapdf rivet static-libs test zlib" +IUSE="c++11 emacs fastjet hepmc java lhapdf static-libs test zlib" RESTRICT="!test? ( test )" RDEPEND=" @@ -34,7 +34,6 @@ RDEPEND=" hepmc? ( sci-physics/hepmc:0= ) java? ( >=virtual/jre-1.5:* ) lhapdf? ( sci-physics/lhapdf:0= ) - rivet? ( sci-physics/rivet:0= ) zlib? ( sys-libs/zlib:0= )" DEPEND="${RDEPEND} test? ( sys-process/time )" @@ -62,7 +61,7 @@ src_configure() { $(use_with hepmc hepmc "${EPREFIX}"/usr) $(use_with java javagui) $(use_with lhapdf lhapdf "${EPREFIX}"/usr) - $(use_with rivet rivet "${EPREFIX}"/usr) + --without-rivet $(use_with zlib zlib "${EPREFIX}"/usr) ) autotools-utils_src_configure diff --git a/sci-physics/thepeg/thepeg-2.0.4.ebuild b/sci-physics/thepeg/thepeg-2.0.4.ebuild index 93ed41abb780..69fd55af01e8 100644 --- a/sci-physics/thepeg/thepeg-2.0.4.ebuild +++ b/sci-physics/thepeg/thepeg-2.0.4.ebuild @@ -21,7 +21,7 @@ LICENSE="GPL-2" SLOT="0/20" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="c++11 emacs fastjet hepmc java lhapdf rivet static-libs test zlib" +IUSE="c++11 emacs fastjet hepmc java lhapdf static-libs test zlib" RESTRICT="!test? ( test )" RDEPEND=" @@ -31,7 +31,6 @@ RDEPEND=" hepmc? ( sci-physics/hepmc:0= ) java? ( >=virtual/jre-1.5:* ) lhapdf? ( >=sci-physics/lhapdf-6.0:0= ) - rivet? ( sci-physics/rivet:0= ) zlib? ( sys-libs/zlib:0= )" DEPEND="${RDEPEND} test? ( sys-process/time )" @@ -64,7 +63,7 @@ src_configure() { $(use_with hepmc hepmc "${EPREFIX}"/usr) \ $(use_with java javagui) \ $(use_with lhapdf lhapdf "${EPREFIX}"/usr) \ - $(use_with rivet rivet "${EPREFIX}"/usr) \ + --without-rivet \ $(use_with zlib zlib "${EPREFIX}"/usr) } |