From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- sci-physics/Manifest.gz | Bin 4023 -> 4020 bytes sci-physics/bullet/Manifest | 2 +- sci-physics/bullet/metadata.xml | 8 - sci-physics/clhep/Manifest | 12 +- sci-physics/clhep/clhep-2.4.1.3-r2.ebuild | 57 ---- sci-physics/clhep/clhep-2.4.4.0.ebuild | 60 ---- sci-physics/clhep/clhep-2.4.4.2.ebuild | 55 ---- sci-physics/clhep/clhep-2.4.5.1.ebuild | 4 +- sci-physics/clhep/clhep-2.4.5.3.ebuild | 55 ++++ .../clhep/files/clhep-fix-testThreaded.patch | 90 ------ sci-physics/clhep/files/clhep-modulemap.patch | 24 -- sci-physics/geant-data/Manifest | 2 +- sci-physics/geant-data/geant-data-4.11.0.0.ebuild | 4 +- sci-physics/geant/Manifest | 8 +- sci-physics/geant/geant-4.10.7.3.ebuild | 4 +- sci-physics/geant/geant-4.11.0.0.ebuild | 132 --------- sci-physics/geant/geant-4.11.0.1.ebuild | 4 +- sci-physics/geant/geant-4.11.0.2.ebuild | 130 ++++++++ sci-physics/pythia/Manifest | 2 +- .../pythia/files/pythia-6.4.28-fno-common.patch | 44 +-- sci-physics/root/Manifest | 10 +- sci-physics/root/root-6.24.06-r2.ebuild | 2 +- sci-physics/root/root-6.26.02.ebuild | 327 --------------------- sci-physics/root/root-6.26.04.ebuild | 321 ++++++++++++++++++++ sci-physics/root/root-6.26.9999.ebuild | 2 +- sci-physics/root/root-9999.ebuild | 2 +- 26 files changed, 554 insertions(+), 807 deletions(-) delete mode 100644 sci-physics/clhep/clhep-2.4.1.3-r2.ebuild delete mode 100644 sci-physics/clhep/clhep-2.4.4.0.ebuild delete mode 100644 sci-physics/clhep/clhep-2.4.4.2.ebuild create mode 100644 sci-physics/clhep/clhep-2.4.5.3.ebuild delete mode 100644 sci-physics/clhep/files/clhep-fix-testThreaded.patch delete mode 100644 sci-physics/clhep/files/clhep-modulemap.patch delete mode 100644 sci-physics/geant/geant-4.11.0.0.ebuild create mode 100644 sci-physics/geant/geant-4.11.0.2.ebuild delete mode 100644 sci-physics/root/root-6.26.02.ebuild create mode 100644 sci-physics/root/root-6.26.04.ebuild (limited to 'sci-physics') diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz index 5a48ed8324dd..b6fecca9c43d 100644 Binary files a/sci-physics/Manifest.gz and b/sci-physics/Manifest.gz differ diff --git a/sci-physics/bullet/Manifest b/sci-physics/bullet/Manifest index ee38f3d735b9..84f0e1330c53 100644 --- a/sci-physics/bullet/Manifest +++ b/sci-physics/bullet/Manifest @@ -9,4 +9,4 @@ EBUILD bullet-3.08-r1.ebuild 1943 BLAKE2B 16c07ca3a3bfa16e2d1c99fceb4ea4f0386b7f EBUILD bullet-3.17-r1.ebuild 2050 BLAKE2B c1d92afbc4dcbbb8ab547f4e4f2d4ec897666ab7a717c71104658e845e041c5ab85a92f00245268a4a72049bee1667c3dc5ecc63cf72292fee4c24d4c6f36154 SHA512 339ac9eaa2fe976bcf7391a3f662dd8f2d5ed62cb7e8281cf58d66e8895a1105ba25f783e731e7572cd039ff661f5ec44d54b95bfba9e8755dae3f2227b4f29b EBUILD bullet-3.21.ebuild 2050 BLAKE2B 91036460e81531717543e48e05e8d08b5cf7857061b181eaff1e5d4237c8ea26b9e246158576b85f259b7a2485c3850880ebfd14063512f269171815b6923d6e SHA512 e1059e59ef9a47555bd99f0cc5d59e290745e746c094015329395e7519c4fae011ffce5b64b711966161c958c16cdff94ff1eccc51cfd3d9b9d07b1a3364de22 EBUILD bullet-3.22b.ebuild 2052 BLAKE2B e595345cf8964a6c5868570f38468254ec16fdde8ec744567706cff97b90523f083fd69066ed5a3b58c9b5defcaf68e4aa54b4f800db124d3d2800f610780c29 SHA512 f00875c2cc797a464cc233cecd1972e00c3918c0029469dc80b7b9dc3fa3676e967557c1653d5b3921440c248c22c7590d0e18132984a46cf52eb9dfe6d31a46 -MISC metadata.xml 1162 BLAKE2B 6d72e78aab8b03ee623c694c66876514496b5e8591d17e722771af51e7b7115bdc17c4920c21713bd272eee04da11212676f0092a70d58fc32fd373b77a788f3 SHA512 98348211222b5798b9312f86438cf404e1aeeab75ddd39605e41ee4301bc25111b59b8d0f14ef06df80ab4e88dbd0bc28556b281e58159efb2f945d57306cf22 +MISC metadata.xml 881 BLAKE2B b1b0a3bdbe22571e787038e190fe0f6e53d08cfccf864e83a35705ddd4d617a7f53641c9439b7b8562330e2e9553cf77d62593d4eb9b6137de032fa03fce6f2c SHA512 d5e532685450e44d2f1d42e2047c3d7d50ee67ccd45fcc3df1dfb5aad3fe63d1ccbdc31a09fd04ed17fd45a41d3f7a536c124d70d9f96bf7efd37e5d721ed527 diff --git a/sci-physics/bullet/metadata.xml b/sci-physics/bullet/metadata.xml index b2d956d4f58e..9ab60278b74d 100644 --- a/sci-physics/bullet/metadata.xml +++ b/sci-physics/bullet/metadata.xml @@ -1,14 +1,6 @@ - - rossbridger.cc@gmail.com - Ross Charles Campbell - - - proxy-maint@gentoo.org - Proxy Maintainers - sci-physics@gentoo.org Gentoo Physics Project diff --git a/sci-physics/clhep/Manifest b/sci-physics/clhep/Manifest index 95d05a2f6602..473d37eb92d4 100644 --- a/sci-physics/clhep/Manifest +++ b/sci-physics/clhep/Manifest @@ -1,11 +1,5 @@ -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 -DIST clhep-2.4.4.0.tgz 1541722 BLAKE2B 077048ea3ce94de88f08a1ae51ab9af892385d6747ed9f875e13b5aacc725e85f723031d42f526ca53050c07dad621053008c71d0f255f32893724f3e8189e52 SHA512 3ae88c8f31877c6e2cac7f7612946e9989186876c66015e6bfeab19260814c8a8bfb21fa28dd251cd2c43e4e3f63f336249c430c984f84810441603e949ecb5d -DIST clhep-2.4.4.2.tgz 1541867 BLAKE2B 69f23c298db57fbd23a505facd993725f4f21b410463069570e98826dc96d54f309b010df27a5fe910c756bfb1dcdffdb9b47452ef5ddadd5a91ed81a1d9566e SHA512 c267e113111c139f4048db774c81167e53a70d4911f8106c3fabf5980935dfc9b451108385e9d8b8dccace99b4732a21ec0ea2fb86004bb85d04c02cfa54a619 DIST clhep-2.4.5.1.tgz 1551358 BLAKE2B e428946163dd525291643e9cdb4921dea64feacf4281aaa4b1466bed021e123ac29fa654e115efa3bb1d154869b4c04196f562850b5e6e162e98001a3d901727 SHA512 68612004a92c6dc036471f440bc00605b611a6f2f9f46ab7343c1f83357498bb7518c4dd2e44d0aef754188d5efbc3ac9187c2371bc6bd46ca076ab4ff13afae -EBUILD clhep-2.4.1.3-r2.ebuild 1255 BLAKE2B 3a0fa1d273defe2175fbb959b86b0ad9412c249a99eab148305c80e6385c7120166ef9e1d3e62f0f92626ec1127ac74da05e2904d57fdc8499457b18152ac113 SHA512 2dd80b6afd922e83f4cdaf3813aded58347d91e50e21480d727cb0d6e22b271357ae18d083a85a9a80b2f413bf6056a3045853e928bbdd95aa93475b97a4392a -EBUILD clhep-2.4.4.0.ebuild 1293 BLAKE2B bd9ecf7d692afd6dde230d5dc93f5eeecfd987c6c1f5f5dfa049d577ef6d694618f77d4b2b7f0c439142bb2443ffbeae1b1a8894e3dd4785d903d4fe5590c985 SHA512 d19bca83b3567dc009482c819d27930f2fc66e3ec776e79c10f6a136bd0242c6b08922d99b5632ddeaa5446677fbf1e62fff1a13485085a28e63af518362deb1 -EBUILD clhep-2.4.4.2.ebuild 1201 BLAKE2B 6c160820ebaecdb9b0be25a0ee4ee623d6a3e3167f6da24efe9507771d5b2388eb1662a0dec9dea410176c5f96b6dd06d91f45c14a77f2595c287e857397c2a0 SHA512 9dcda8ed96899c2cf8e88d3b1bc1cb355fb5480a67b54d0b746cd919e2e0d41c44f1c66b1a3b18f29639e05d88bbbde654db57a32b239ee1750ac0cfd9c10331 -EBUILD clhep-2.4.5.1.ebuild 1201 BLAKE2B 6c160820ebaecdb9b0be25a0ee4ee623d6a3e3167f6da24efe9507771d5b2388eb1662a0dec9dea410176c5f96b6dd06d91f45c14a77f2595c287e857397c2a0 SHA512 9dcda8ed96899c2cf8e88d3b1bc1cb355fb5480a67b54d0b746cd919e2e0d41c44f1c66b1a3b18f29639e05d88bbbde654db57a32b239ee1750ac0cfd9c10331 +DIST clhep-2.4.5.3.tgz 1552597 BLAKE2B a2edcbe133af98c817982f9d9f787fbbc76a1e8a10a29c890cbdd223670ee2e9d6dec872de80880e5d286790ee0168501cd3270bdbed04f9781554ee35f6eb1a SHA512 f677c93bb53047167fe0f22cbf1f5d97f27476b64566817a799240bfce8e9fe7fd658a168c25fad76a35c6eb92e1e42ec7b88960facb6632279367f0606282c8 +EBUILD clhep-2.4.5.1.ebuild 1199 BLAKE2B f665541db0eb7c9ee4228e50ffe58377791c4e562904a46f2b48aa83c58a328e5aad2131433b5b19d5ca072c6f635c0ddd9cd57b91c178fc6feb4a7a10482b5d SHA512 c93e9ab497162f6b53fe4220a5cc6adb90aba2a3061126681f88265e2a739b24b5b27381c52fce8ffbd889e8a7d8c483227ed2115c3293ef74f3ecdc37ceea5b +EBUILD clhep-2.4.5.3.ebuild 1201 BLAKE2B 8eb32e23a223bfcdb1f0df4579552a34880f37874e1669fbb148dc672d0ad97d5da366831a5fa3472a4577ca60974042d9a20d52bec628096054dc52f54638c8 SHA512 f9f12db370d94fd0698ce060d60141d439405ba3010e85ff169af16a49a0b80f02db58278315baddeb5a1b2fc6522b0e72c13e2de3c047db9e5620928ce29c61 MISC metadata.xml 497 BLAKE2B 9f68cecc9a1a96ebbc0f8408a2124a47414e987bf458f979548b458676ad45644d9fa3c690200be93aa01ef1d205e5bc3e7596b18d48a1b8a85455e2fc84fe8a SHA512 9ef1d630cfd0214dc7fb0c8021560d974cebf717c3eecd27f7abc7ee634edcaf2cc128a808b21a8676fc7bed2bf93d927cd682d4b37ef9f9c34041b0c8a06a2d diff --git a/sci-physics/clhep/clhep-2.4.1.3-r2.ebuild b/sci-physics/clhep/clhep-2.4.1.3-r2.ebuild deleted file mode 100644 index ea1591ede033..000000000000 --- a/sci-physics/clhep/clhep-2.4.1.3-r2.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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" - -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 - ) -" - -PATCHES=( "${FILESDIR}"/clhep-fix-testThreaded.patch ) - -S="${WORKDIR}/${PV}/CLHEP" - -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 - cmake_comment_add_subdirectory test - 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) - ) - cmake_src_configure -} diff --git a/sci-physics/clhep/clhep-2.4.4.0.ebuild b/sci-physics/clhep/clhep-2.4.4.0.ebuild deleted file mode 100644 index 770db67ea689..000000000000 --- a/sci-physics/clhep/clhep-2.4.4.0.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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" - -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 - ) -" - -PATCHES=( - "${FILESDIR}"/clhep-fix-testThreaded.patch - "${FILESDIR}"/clhep-modulemap.patch -) - -S="${WORKDIR}/${PV}/CLHEP" - -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 - cmake_comment_add_subdirectory test - 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) - ) - cmake_src_configure -} diff --git a/sci-physics/clhep/clhep-2.4.4.2.ebuild b/sci-physics/clhep/clhep-2.4.4.2.ebuild deleted file mode 100644 index ab61250e0377..000000000000 --- a/sci-physics/clhep/clhep-2.4.4.2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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" - -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_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 - cmake_comment_add_subdirectory test - 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) - ) - cmake_src_configure -} diff --git a/sci-physics/clhep/clhep-2.4.5.1.ebuild b/sci-physics/clhep/clhep-2.4.5.1.ebuild index ab61250e0377..bae7df5849e2 100644 --- a/sci-physics/clhep/clhep-2.4.5.1.ebuild +++ b/sci-physics/clhep/clhep-2.4.5.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ 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 )" diff --git a/sci-physics/clhep/clhep-2.4.5.3.ebuild b/sci-physics/clhep/clhep-2.4.5.3.ebuild new file mode 100644 index 000000000000..57eb9a57fa2c --- /dev/null +++ b/sci-physics/clhep/clhep-2.4.5.3.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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" + +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_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 + cmake_comment_add_subdirectory test + 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) + ) + cmake_src_configure +} diff --git a/sci-physics/clhep/files/clhep-fix-testThreaded.patch b/sci-physics/clhep/files/clhep-fix-testThreaded.patch deleted file mode 100644 index 58010dc726da..000000000000 --- a/sci-physics/clhep/files/clhep-fix-testThreaded.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 849f0250076ac3cce672e925c232bd6b96a018e0 Mon Sep 17 00:00:00 2001 -From: Guilherme Amadio -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 const& reference, bool& result) { - - result = true; - -+ std::vector 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 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 deleted file mode 100644 index 31b1eda620a7..000000000000 --- a/sci-physics/clhep/files/clhep-modulemap.patch +++ /dev/null @@ -1,24 +0,0 @@ -From ade5d82b54d2c72660b6b2c478323ac741ea7c01 Mon Sep 17 00:00:00 2001 -From: Guilherme Amadio -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 3368e6ad07c1..a892f64852fd 100644 --- a/sci-physics/geant-data/Manifest +++ b/sci-physics/geant-data/Manifest @@ -14,5 +14,5 @@ DIST G4SAIDDATA.2.0.tar.gz 38502 BLAKE2B 349608f8f8f57b091579b4892f1547c25f0c730 DIST G4TENDL.1.3.2.tar.gz 585100935 BLAKE2B f58bc9e4f6741d7df84559bb41542ecd4de3891b3f79d8194d3f8174de6aed6e87f8d2d648315dac988b6daf6106780b6f88398da2040e67608da8614fb2cf42 SHA512 635707dc421354d8cd596398d69745b6038a80c44b7284951a3e0966829c08ac731bd42f7321adfab75d06d868f99e466c6f1425685770568f44ec6c1035903f DIST G4TENDL.1.4.tar.gz 912261874 BLAKE2B 9ed05676ed52ca8341007cade3620b655fcf56eea3d3bda01814ae7133ec04bd2ef84b1c34ee5cd76114407bd6977bd4392322decebea1e1ed7e6377a482e1e8 SHA512 6fb1e5fc8daad9ef8391ff04793f10394cfc28cab0967bba0d9c91a69b92a7af7406e543275d9c1d9ff76d3dfec2c9f653bcff40040e17edbb765fb21012cae8 EBUILD geant-data-4.10.7.1.ebuild 1523 BLAKE2B 1191449beb2f1ca99c936808e6e1e71ff33b5d08f23b813cbe998375134900c7d8aa252c1a5c144ed168856082078ee57e942fe84cf6042ffad21385726a6db6 SHA512 1cb9a0005d2c036134711bd16f33f4e2080ca7701c6be0924caabefaa1875f93575b5fe629cc85c3780273487b29a5529a463918cc6fa0be23a41518ad6db009 -EBUILD geant-data-4.11.0.0.ebuild 1520 BLAKE2B 79b35c36468e46a38b8b8a5f6de8e301fe0c26866533c96695f01950d2d98c0918c841c1088ba9c96c78975a6d26752ff5cd376273b844158c0e7263770c9f00 SHA512 be4affb4efd9699825d80e9a000882ceeda55d2cc00d69a0afd4fcd7c4b2b0ab98079275da06d48eae47920f314f482d56ae93036d44bc6c0f3737e06d7df692 +EBUILD geant-data-4.11.0.0.ebuild 1518 BLAKE2B a1a5ae7191bc4de3d2b7ba7163da2d752afec812e496807e654a69564dfbedfe66c61bcc7eebd25e36820e5caee46077ca2bc15620952a8ec62dcfa92e8e712a SHA512 895c41448c41752f390d4a8a48aa7eb8c55fcd0847845d2dbf92e885679f88acd4575b1032ddb026c399c940b9a300875d9f4822eb95c09d1c9e21c5c5282071 MISC metadata.xml 425 BLAKE2B 9c0c8f8f3e0e16f4f7a567778027c58efe973849c46e2d50df71751a7e661199fa786a57bc62b1bd89b720a8444707ef65bf58425d23ecb46cd4a6d90dc50612 SHA512 6b0d4f5b10a443188474552fe06c3abf4fff696804ccc6dfdd328b152321769ac0e566573bd047221df7609de045d3238df7a5a6c14d60dfb3d7072b89298664 diff --git a/sci-physics/geant-data/geant-data-4.11.0.0.ebuild b/sci-physics/geant-data/geant-data-4.11.0.0.ebuild index 268325241188..7c666b0b491c 100644 --- a/sci-physics/geant-data/geant-data-4.11.0.0.ebuild +++ b/sci-physics/geant-data/geant-data-4.11.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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/Manifest b/sci-physics/geant/Manifest index dc43bc5aac11..0636a12ca8e4 100644 --- a/sci-physics/geant/Manifest +++ b/sci-physics/geant/Manifest @@ -1,7 +1,7 @@ -DIST geant4-v11.0.0.tar.gz 35605817 BLAKE2B c34ded976b88946973a5ea9e81d91e0510318ae25f29c631f46b0ee60a9a97d682375ba18e429773930b1ba7808989b9b7ef6affb8f2f1f220ec1c7bd069590c SHA512 52631043e4f1bce6cb33d822bedca5a384c4c7c8997473a548b4df4f3b1702d45fe6ef64647225e573995c63518e4ba39f82afb645b7daa89591a3127799498a DIST geant4-v11.0.1.tar.gz 35643646 BLAKE2B 52af009440d70aa1547d07e4367266a4e02561d0d5d509399db94ce8dcf41d491085b8de908efee7fbe3e7324963f57c9e36e1beeed9a6cef42d327b2f2201a0 SHA512 d189e6aca04dfa6a7a371f2273105d7fb80719c9e1cade7c170ff350d22db5cb33cbfece4c1f8c4d5a374a048bb95f6e9fcd37b03a3a7c2d946e046c4ea608fa +DIST geant4-v11.0.2.tar.gz 35636883 BLAKE2B f22c68cf4c4c9d68d24c98251198804d5790b500ed9077a06ffe5fcc7d84447befc15c93e57f725e68915ff97e7ce022c7f7f5678ceea593aacb231294affa3e SHA512 e7e98242787d1e37303dac54c763e659682adf5c86d30dcefb6c22a7360ba837591c11fb5787a56219461913db786e408f4a344e7ace8ca39cbb8b65b1e23ede DIST geant4.10.07.p03.tar.gz 35756099 BLAKE2B 9e510d17173d280a24d2540d0e0f25f7337a410858c30e9281b937a8402cbc0acd022cc6f41cc3b88fec28b53fa8a266d79e90bfb6545f4ecffe0724e36183da SHA512 174e4f37ca977eff89bbd8f72f18ef5534db72d966665b9a837ed26acffa527d45741fd38fde460f0719c8962dc2ee33db1f3dfe065a7d0e74c148e4582c095c -EBUILD geant-4.10.7.3.ebuild 2976 BLAKE2B 987a3ba8c35136cb8932663110f8d5fd9c1d9be3fc0a2372c86f9addf65734663c83b64b1a454330bd9104117e705ba4ac2fda3047033323db7d5bccd7408255 SHA512 ae85cffa6ea7eb9437cf8c50ed3c24dc7b2765128dc9755f04dadf2934e27ae39e2611fa5dbf37460675718a0a04d8c7ce70a9abb07350ff411c193d5f9d15d0 -EBUILD geant-4.11.0.0.ebuild 3484 BLAKE2B 529a246976d45c71364f70805e49ac2f1e8efc2b0d75872dbd5dd3de8a78e9ee9ae5be39831995f17c8425b483c292881298efaebedb7ba698ac5ba024af8ddb SHA512 90182ca371145e27dfc75f6d5e7ae7a6a613bd8771702ce07bb87257364b643cc50abf78f6b506f2add37bfab804f660010f13c632ee5f1355d6c53fb75f3495 -EBUILD geant-4.11.0.1.ebuild 3412 BLAKE2B bf5101fbd5d6375aa4ebc33e5e053b3b8a4d7e001894f467472edd62d4ab3742dfdde98263c7160e2b4b878f3315ad4ff4b036dad0d646990748376f6c2adf41 SHA512 83e45c0b3a38b8c79911bd5479d3e3d46489dc55aeb77ce12a8b4f8b295c081980d58b1947498ad1b67102139dfb75f6b20a0abe7ff4eaf2eec6ad5b856b31f7 +EBUILD geant-4.10.7.3.ebuild 2977 BLAKE2B 9cc044c0122abe4817069e694dd2e5d9a097047a7953243b6f3a5c4fc42fdc02c1d744b273df7763bee6c9751825c0e99fe89f932359902acf8d6a69fd72ee76 SHA512 ebe32fedd0fb593ec393861ea277bf77a9f49d50fa432b2e3191a35ce213108ec2bd2105a5aa9fb2add7c6dbf01dc2c048e8515676d3aef031970afe1978f6eb +EBUILD geant-4.11.0.1.ebuild 3412 BLAKE2B c2cc06d5f90c4ab3442f341901dd88ba4bdf4c6905bf524e7b1067d255011861abac8b00642b56c911e1647132332568f6e2a58eb6364eb25634d81a88939633 SHA512 ebc0912da59b5803b37647dace006d7e38b9df56d58551ae8a94ed52e00909754baf0440a7c5a25d023c218767ea75dec3d1e91934bd496ffdd48047af65fc23 +EBUILD geant-4.11.0.2.ebuild 3413 BLAKE2B bdb0dfbda23694d1d8e1736d49c98860f05ca532589b27226273a0befca64f0b9564ff7e12f8f6191d2439948881dc4db82936a5fbe520eef62d8c9dba9d1189 SHA512 04bbd424a2377f954a174d0590aea5ea3b554b51fac50d5716d6590c339fcce2915355c1b31e819d7421ff02ac67d46bf826e5e85282ac29e65a887bd81671fb MISC metadata.xml 1765 BLAKE2B 70ee66225468abedfaebb6faec123c5d0c1748088080a483c9378654e93190d9436abc0c781e4a5909283fb63541c3ae4450e5bb43fa720dfcfb928023079064 SHA512 5ccca521e3249cdf0d1f9d0dabae8fea73ac03a564be7d7c5f19a85fafb16f4078ea39bf7b55d7c45e4b5575e0b809fd251cc18e28d2e5bba993f71f5056fd4d diff --git a/sci-physics/geant/geant-4.10.7.3.ebuild b/sci-physics/geant/geant-4.10.7.3.ebuild index b25e1a0f55d8..fe10d40f4664 100644 --- a/sci-physics/geant/geant-4.10.7.3.ebuild +++ b/sci-physics/geant/geant-4.10.7.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -67,7 +67,7 @@ S="${WORKDIR}/${MY_P}" src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4" - -DGEANT4_BUILD_CXXSTD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-) + -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) diff --git a/sci-physics/geant/geant-4.11.0.0.ebuild b/sci-physics/geant/geant-4.11.0.0.ebuild deleted file mode 100644 index 589a2cd089b5..000000000000 --- a/sci-physics/geant/geant-4.11.0.0.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit cmake python-single-r1 - -MY_P=${PN}$(ver_cut 1)-v$(ver_cut 2-4) - -case ${PV} in -*_beta*) - MY_P+=.b$(printf %02d $(ver_cut 5)) - DOCS="ReleaseNotes/Beta.$(ver_cut 2-3)-*.txt" - ;; -*) - if [[ $(ver_cut 4) -gt 0 ]]; then - MY_P+=.p$(printf %02d $(ver_cut 4)) - DOCS="ReleaseNotes/Patch.$(ver_cut 2-3)-*.txt" - fi - HTML_DOCS="ReleaseNotes/ReleaseNotes.$(ver_cut 2-3).html" - ;; -esac - -DESCRIPTION="Toolkit for simulation of passage of particles through matter" -HOMEPAGE="https://geant4.web.cern.ch/" -SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz" - -LICENSE="geant4" -SLOT="4" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="+c++17 c++20 +data debug doc examples freetype gdml geant3 hdf5 inventor motif opengl - python qt5 raytracerx static-libs tbb threads vtk" - -REQUIRED_USE=" - ^^ ( c++17 c++20 ) - inventor? ( opengl ) - motif? ( opengl ) - python? ( ${PYTHON_REQUIRED_USE} ) - qt5? ( opengl ) - tbb? ( threads ) - vtk? ( qt5 ) -" - -RDEPEND=" - dev-libs/expat - >=sci-physics/clhep-2.4.5.1:2=[threads?] - data? ( ~sci-physics/geant-data-${PV} ) - doc? ( app-doc/geant-docs ) - gdml? ( dev-libs/xerces-c ) - hdf5? ( sci-libs/hdf5[threads?] ) - inventor? ( media-libs/SoXt ) - motif? ( x11-libs/motif:0 ) - opengl? ( virtual/opengl ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-libs/boost:=[${PYTHON_USEDEP}] - ') - ) - qt5? ( - dev-qt/qt3d:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - opengl? ( dev-qt/qtopengl:5 ) - ) - raytracerx? ( - x11-libs/libX11 - x11-libs/libXmu - ) - vtk? ( - sci-libs/vtk:=[qt5] - )" - -S="${WORKDIR}/${MY_P}" - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4" - -DCMAKE_CXX_STANDARD=$((usev c++17 || usev c++20) | cut -c4-) - -DGEANT4_BUILD_BUILTIN_BACKTRACE=$(usex debug) - -DGEANT4_BUILD_MULTITHREADED=$(usex threads) - -DGEANT4_BUILD_STORE_TRAJECTORY=OFF - -DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec) - -DGEANT4_BUILD_VERBOSE_CODE=$(usex debug) - -DGEANT4_INSTALL_DATA=OFF - -DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data" - -DGEANT4_INSTALL_EXAMPLES=$(usex examples) - -DGEANT4_INSTALL_PACKAGE_CACHE=OFF - -DGEANT4_USE_FREETYPE=$(usex freetype) - -DGEANT4_USE_G3TOG4=$(usex geant3) - -DGEANT4_USE_GDML=$(usex gdml) - -DGEANT4_USE_HDF5=$(usex hdf5) - -DGEANT4_USE_INVENTOR=$(usex inventor) - -DGEANT4_USE_OPENGL_X11=$(usex opengl) - -DGEANT4_USE_PYTHON=$(usex python) - -DGEANT4_USE_QT=$(usex qt5) - -DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx) - -DGEANT4_USE_SYSTEM_CLHEP=ON - -DGEANT4_USE_SYSTEM_EXPAT=ON - -DGEANT4_USE_SYSTEM_ZLIB=ON - -DGEANT4_USE_TBB=$(usex tbb) - -DGEANT4_USE_XM=$(usex motif) - -DGEANT4_USE_VTK=$(usex vtk) - -DBUILD_STATIC_LIBS=$(usex static-libs) - ) - - if use python; then - mycmakeargs+=( - -DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}" - -DCMAKE_INSTALL_PYTHONDIR="${EPREFIX}/usr/lib/${EPYTHON}/site-packages" - ) - fi - - [ -v EXTRA_ECONF ] && mycmakeargs+=( ${EXTRA_ECONF} ) - - cmake_src_configure -} - -src_install() { - # adjust clhep linking flags for system clhep - # binmake.gmk is only useful for legacy build systems - sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die - cmake_src_install - use python && python_optimize - rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts" - - einstalldocs -} diff --git a/sci-physics/geant/geant-4.11.0.1.ebuild b/sci-physics/geant/geant-4.11.0.1.ebuild index 1ea83a6f144f..12f878c3c26b 100644 --- a/sci-physics/geant/geant-4.11.0.1.ebuild +++ b/sci-physics/geant/geant-4.11.0.1.ebuild @@ -27,7 +27,7 @@ SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz" LICENSE="geant4" SLOT="4" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="+c++17 c++20 +data debug doc examples freetype gdml geant3 hdf5 inventor motif opengl python qt5 raytracerx static-libs tbb threads vtk" @@ -78,7 +78,7 @@ S="${WORKDIR}/${MY_P}" src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4" - -DCMAKE_CXX_STANDARD=$((usev c++17 || usev c++20) | cut -c4-) + -DCMAKE_CXX_STANDARD=$( (usev c++17 || usev c++20) | cut -c4-) -DGEANT4_BUILD_BUILTIN_BACKTRACE=$(usex debug) -DGEANT4_BUILD_MULTITHREADED=$(usex threads) -DGEANT4_BUILD_STORE_TRAJECTORY=OFF diff --git a/sci-physics/geant/geant-4.11.0.2.ebuild b/sci-physics/geant/geant-4.11.0.2.ebuild new file mode 100644 index 000000000000..cc96439dc51c --- /dev/null +++ b/sci-physics/geant/geant-4.11.0.2.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit cmake python-single-r1 + +MY_P=${PN}$(ver_cut 1)-v$(ver_cut 2-4) + +case ${PV} in +*_beta*) + DOCS="ReleaseNotes/Beta.$(ver_cut 2-3)-*.txt" + ;; +*) + if [[ $(ver_cut 4) -gt 0 ]]; then + DOCS="ReleaseNotes/Patch.$(ver_cut 2-3)-*.txt" + fi + HTML_DOCS="ReleaseNotes/ReleaseNotes.$(ver_cut 2-3).html" + ;; +esac + +DESCRIPTION="Toolkit for simulation of passage of particles through matter" +HOMEPAGE="https://geant4.web.cern.ch/" +SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz" + +LICENSE="geant4" +SLOT="4" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="+c++17 c++20 +data debug doc examples freetype gdml geant3 hdf5 inventor motif opengl + python qt5 raytracerx static-libs tbb threads vtk" + +REQUIRED_USE=" + ^^ ( c++17 c++20 ) + inventor? ( opengl ) + motif? ( opengl ) + python? ( ${PYTHON_REQUIRED_USE} ) + qt5? ( opengl ) + tbb? ( threads ) + vtk? ( qt5 ) +" + +RDEPEND=" + dev-libs/expat + >=sci-physics/clhep-2.4.5.1:2=[threads?] + data? ( ~sci-physics/geant-data-4.11.0.0 ) + doc? ( app-doc/geant-docs ) + gdml? ( dev-libs/xerces-c ) + hdf5? ( sci-libs/hdf5[threads?] ) + inventor? ( media-libs/SoXt ) + motif? ( x11-libs/motif:0 ) + opengl? ( virtual/opengl ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-libs/boost:=[${PYTHON_USEDEP}] + ') + ) + qt5? ( + dev-qt/qt3d:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + opengl? ( dev-qt/qtopengl:5 ) + ) + raytracerx? ( + x11-libs/libX11 + x11-libs/libXmu + ) + vtk? ( + sci-libs/vtk:=[qt5] + )" + +S="${WORKDIR}/${MY_P}" + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4" + -DCMAKE_CXX_STANDARD=$( (usev c++17 || usev c++20) | cut -c4-) + -DGEANT4_BUILD_BUILTIN_BACKTRACE=$(usex debug) + -DGEANT4_BUILD_MULTITHREADED=$(usex threads) + -DGEANT4_BUILD_STORE_TRAJECTORY=OFF + -DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec) + -DGEANT4_BUILD_VERBOSE_CODE=$(usex debug) + -DGEANT4_INSTALL_DATA=OFF + -DGEANT4_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4/data" + -DGEANT4_INSTALL_EXAMPLES=$(usex examples) + -DGEANT4_INSTALL_PACKAGE_CACHE=OFF + -DGEANT4_USE_FREETYPE=$(usex freetype) + -DGEANT4_USE_G3TOG4=$(usex geant3) + -DGEANT4_USE_GDML=$(usex gdml) + -DGEANT4_USE_HDF5=$(usex hdf5) + -DGEANT4_USE_INVENTOR=$(usex inventor) + -DGEANT4_USE_OPENGL_X11=$(usex opengl) + -DGEANT4_USE_PYTHON=$(usex python) + -DGEANT4_USE_QT=$(usex qt5) + -DGEANT4_USE_RAYTRACER_X11=$(usex raytracerx) + -DGEANT4_USE_SYSTEM_CLHEP=ON + -DGEANT4_USE_SYSTEM_EXPAT=ON + -DGEANT4_USE_SYSTEM_ZLIB=ON + -DGEANT4_USE_TBB=$(usex tbb) + -DGEANT4_USE_XM=$(usex motif) + -DGEANT4_USE_VTK=$(usex vtk) + -DBUILD_STATIC_LIBS=$(usex static-libs) + ) + + if use python; then + mycmakeargs+=( + -DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}" + -DCMAKE_INSTALL_PYTHONDIR="${EPREFIX}/usr/lib/${EPYTHON}/site-packages" + ) + fi + + [ -v EXTRA_ECONF ] && mycmakeargs+=( ${EXTRA_ECONF} ) + + cmake_src_configure +} + +src_install() { + # adjust clhep linking flags for system clhep + # binmake.gmk is only useful for legacy build systems + sed -i -e 's/-lG4clhep/-lCLHEP/' config/binmake.gmk || die + cmake_src_install + use python && python_optimize + rm "${ED}"/usr/bin/*.{sh,csh} || die "failed to remove obsolete shell scripts" + + einstalldocs +} diff --git a/sci-physics/pythia/Manifest b/sci-physics/pythia/Manifest index 7d2c45366e5d..d97c39500236 100644 --- a/sci-physics/pythia/Manifest +++ b/sci-physics/pythia/Manifest @@ -1,4 +1,4 @@ -AUX pythia-6.4.28-fno-common.patch 1899 BLAKE2B b05c2f147ec34fa334b830c1105d682dd45ba80f824ed706de12cf2bf5767808a1ac698f57d6a9ea78e6cbcb39ab4fc25a8d5c1e3f7ccc50ac54d81bb1faa678 SHA512 41005cfdc1766541c1336c1d0c2e1acb606496feb4fbd75fc3ef38d5ccb2010d095c927e615d6e33b7533dbe02a876608a7d789e58bcc03de59b233efcbfe814 +AUX pythia-6.4.28-fno-common.patch 1899 BLAKE2B 6904054b67a61773972a85569e6738d11e3abec8e5a77577506790c9fa38d4a5cee285128746b59fbb1c43e4b3b74ae7f82c563415c980b8c9b417b08bcf0f25 SHA512 f4ab204c5c9a73a828b95b74f1315f98789280576d6574a6f938deb214f4716b3ac11db4dc4b449ab1f6ed608ab59d6fc125b93d8c36f820e047af25458d4a45 AUX pythia8209-root-noninteractive.patch 500 BLAKE2B 7af9e7375cac38d87ae8935e712ac9b2a5109984a4c7111c59033adf46f0d133b94eb8dccb663683302ff0529e56b819c9f667e2d1253e4b4f1c585dcd1a4eff SHA512 9dad44ee084b5edea6560ba639e562c6ddc56cd7170ec21628176aeaec11d535de2813599b9c45b49511ad3d0ad9cb0540d9052179c9e9907d10d81ea55bdea2 DIST CT10.tar.gz 10246366 BLAKE2B f0daf0a3ca6cd2f178f993944cdc29de5deb1f441d197e47c8b1c285a56abc0fdb1cd53ec5a8e7736e200397bea9ec9cf4d04420ce206e5c396b85b63f695d00 SHA512 90406bd102ab54b683fa3e6f3fc759febea2454a0b96c6a8d373cdec297f5d652097057a015c7d87241792ed9b5d9ac658a33155cdd7362f59110f8f06ecce73 DIST MRST2004qed.tar.gz 185079 BLAKE2B 62e0371de965698100755b14b0c282095b84b40800a58cd6776c458b03982f032f3b2464eb76174084dd22de9fd962e202a4896327b0a00579c3a632dac24ccc SHA512 404aacf0e241f572cc42ad4cf963deef1acd3d365fa68cfa3518878f921858046377ea39caf663fdced2cdde07af2f6ce695737f7fea229489df3d3f38283c95 diff --git a/sci-physics/pythia/files/pythia-6.4.28-fno-common.patch b/sci-physics/pythia/files/pythia-6.4.28-fno-common.patch index 3ee9bc7c0f7a..45cbe3ea57d6 100644 --- a/sci-physics/pythia/files/pythia-6.4.28-fno-common.patch +++ b/sci-physics/pythia/files/pythia-6.4.28-fno-common.patch @@ -27,28 +27,28 @@ https://bugs.gentoo.org/766306 -int pyssmt[2*4*4+2*2*2+2*2*2+2*4+2*2+2*4*16+2*4*4+2*2*2+2*2*2]; -int pyints[2*20]; -int pybins[4+1000+2*20000]; -+extern int pyjets[2+5*4000+2*2*5*4000]; -+extern int pydat1[200+2*200+200+2*200]; -+extern int pydat2[4*500+2*4*500+2*2000+2*4*4]; -+extern int pydat3[3*500+2*8000+2*8000+5*8000]; /* KNDCAY=8000 */ -+extern char pydat4[2*500*16]; -+extern int pydatr[6+2*100]; -+extern int pysubs[2+500+81*2+2*200]; -+extern int pypars[200+2*200+200+2*200]; -+extern int pyint1[400+2*400]; -+extern int pyint2[500+2*500+2*20*500+2*4*40]; -+extern int pyint3[2*81*2+3*1000+2*1000]; -+extern int pyint4[500+2*5*500]; -+extern int pyint5[1+3*501+2*3*501]; -+extern char pyint6[501*28]; -+extern int pyint7[2*6*7*7]; -+extern int pyint8[2*5*13]; -+extern int pyint9[2*4*13]; -+extern int pyuppr[1+7*20+1+2*10+2*5*20+2*11]; /* PYUPPR DOES NOT EXIST IN PYTHIA6 AT ALL!!! */ -+extern int pymssm[100+2*100]; -+extern int pyssmt[2*4*4+2*2*2+2*2*2+2*4+2*2+2*4*16+2*4*4+2*2*2+2*2*2]; -+extern int pyints[2*20]; -+extern int pybins[4+1000+2*20000]; ++static int pyjets[2+5*4000+2*2*5*4000]; ++static int pydat1[200+2*200+200+2*200]; ++static int pydat2[4*500+2*4*500+2*2000+2*4*4]; ++static int pydat3[3*500+2*8000+2*8000+5*8000]; /* KNDCAY=8000 */ ++static char pydat4[2*500*16]; ++static int pydatr[6+2*100]; ++static int pysubs[2+500+81*2+2*200]; ++static int pypars[200+2*200+200+2*200]; ++static int pyint1[400+2*400]; ++static int pyint2[500+2*500+2*20*500+2*4*40]; ++static int pyint3[2*81*2+3*1000+2*1000]; ++static int pyint4[500+2*5*500]; ++static int pyint5[1+3*501+2*3*501]; ++static char pyint6[501*28]; ++static int pyint7[2*6*7*7]; ++static int pyint8[2*5*13]; ++static int pyint9[2*4*13]; ++static int pyuppr[1+7*20+1+2*10+2*5*20+2*11]; /* PYUPPR DOES NOT EXIST IN PYTHIA6 AT ALL!!! */ ++static int pymssm[100+2*100]; ++static int pyssmt[2*4*4+2*2*2+2*2*2+2*4+2*2+2*4*16+2*4*4+2*2*2+2*2*2]; ++static int pyints[2*20]; ++static int pybins[4+1000+2*20000]; void *pythia6_common_address(const char* name) { if (!strcmp(name,"PYJETS")) return pyjets; diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest index d22f650f5291..675956bfd4bc 100644 --- a/sci-physics/root/Manifest +++ b/sci-physics/root/Manifest @@ -1,8 +1,8 @@ AUX root-6.12.06_cling-runtime-sysroot.patch 989 BLAKE2B 8202cc8f2bf72cc25642d0a03ba26c3969069b291a6a22188879dbedbf0c3c496149f79f671d0eb51d81d0ee36565660d136b4741f5d018c2b05325ff08381f0 SHA512 c96dee9843da1051c54bd6870ef0a04714944ffe1f86800c9a51b8eb8ef84107d3315d3a708dcc0b651248af4bec362c7f31695514505045aeda9c793d40dc58 DIST root_v6.24.06.source.tar.gz 185205236 BLAKE2B 6b3343ad8d86373de3abd328480eaa89825bca46ebb5ccc16ddcb8c1060fa023eeb8be3d1832e3ce2ad0beaafe66334f20ed8344ffb6df72d89c6622aa1c947a SHA512 356d6287df2900de9e831347d9513f444bf7cbd29c39fbb5841051ae877dac1e22dc255c64166cd3925b82aac860ae67ef6ce171732c16fd23d7919a47e7cb5a -DIST root_v6.26.02.source.tar.gz 193704724 BLAKE2B 31d8e1068b29cac32b45066f487f570f07ccf657d6f45e5750e6c914804444eafea65aec13b40363db0125765a71e29703a9a13a685c658539ceb26319b966a5 SHA512 593022ecac14dc057f69ca18ebffef610f5c6064d6c4a7b658cffd26110110f66da2f11cc935b03eca5e557f18cded43f43bdee984660b4f4db1dbe1787bba9f -EBUILD root-6.24.06-r2.ebuild 7800 BLAKE2B 1081b503f007f8f0aa475f5de041919d4816db5f4d91a438cd4474ff9825d4ab7ccac3cb9df3276de59e9b5842d2918cda50b387ad05dfd0222d6cea1802c1fa SHA512 192e70526f774654cbecc3a2441076bd6cf2650185938859be258a9fc5dfca52f38766759c0d0f15e2a690d52e53a45927a625fea0cae42b99692ee866b83b3d -EBUILD root-6.26.02.ebuild 7845 BLAKE2B f7ef5a5f28d7fef5e49161093aa8b55cd0ef5cb3b7292e88aa25e2d1eaee35edd26e83b0a525dc549ddae77c06e3b98774ece35c9d27bff4e1b07aefa84161aa SHA512 506b85b90715357f362860323b996b35861c09ccce07234a29c2a6a97cf518c9aaa049fe4fad8105e13e599aa2a086048c7357261c025469c4cb17a798f1b1ba -EBUILD root-6.26.9999.ebuild 8187 BLAKE2B 52f41a4ca6bcc1f07a6d7eddb727783e25ff07744f0d1982fae1eea4686929d39f325b1b9928e6dfd1547ed74ff6d99a2258b9c2ca3bb7c214d97358b00f2029 SHA512 b29f2c75f7b957e7b419bbed6690cf131c45d38e5b3c7a542d906e89fba696c283f2aae5c6a3dc25e86f731e961fc48a93788a5b7c23975b5bda175945493d17 -EBUILD root-9999.ebuild 8408 BLAKE2B 99a43e0355b76c380c13223de48621c86eb537e0797febe0c577beb83207967e91a5cfb9d831c1b8d8b249f4b32054f1a513fb3843f8613780b917304d093b99 SHA512 ff61f9c854398b9e543b025c3a4567129b9b228001552f2aa58cb97f0ea0ab358a46bc8f74bff55992cb65366c76898364792e2b1fd142d15abd7ba58621212e +DIST root_v6.26.04.source.tar.gz 193717639 BLAKE2B ea8372221a2498c57cef8a23356bff06bae722c105d3ae926fefb6abd09c1d58b070f8784feaa5ad425affea553759ebdb8760dc7ad2a7de655a145a2cd098cb SHA512 d1088f7a6c4f6c00efc3fa57add1e12eb45784934520a1be1aa76442cf526a6d9cb5f69e7fe17b7193c89ff829136842568c00389aa3b9ed9e5638451689ca38 +EBUILD root-6.24.06-r2.ebuild 7801 BLAKE2B 810d00aa2862896170dbca30ac1ecd9a92b5244bb0ea8c22c6f5c1d8964e0d666e9331a3fea764cb20f004a68b3511e012cf466b4374b097d0152e5df3daaf31 SHA512 6925e3bd8ecdd2fb5f9280d7cb38818fc4901c8b7cec42a4f8f2c4068de04d730d313f01cbc1cbbf8517f67ac26c5e400622f818aa416808662de73cce072594 +EBUILD root-6.26.04.ebuild 7732 BLAKE2B dd7ad97a53cd74e282a57eb63b7923803cdf9378ff0b51abea87052e4cf93ebaf0501d16411b92aa27076ecf9d4e634080a771fed1d3b0300cd3af0bc4e20e81 SHA512 bf7d492cbf6d533e834440eee4312b6b59c262d2f16d2266211e808ee2a8c21e98a6ac4c543d0f75d730074aea5a3823fe9f2339dd1e46ece53cf526a45f216b +EBUILD root-6.26.9999.ebuild 8188 BLAKE2B a727863c9ee30617419a52fdfa6e9b1eceb5283ac47e17c6728f928839c40530897f8a0b788f81e73cca7e584856c3ac78211f03b4aa2b6b887232d7e404ccdf SHA512 a205e43a613412632aa2297a0305bd8f5735eb3b1bcac8e07801e022603c4399d612ca0a5546b1073568ce7f221c77b7b5b8563372c3e0805b5b7660a40c1793 +EBUILD root-9999.ebuild 8409 BLAKE2B 6f3bb60c84a2ba60552365203a8232b1c54f849d1dbf48ff9ab8a6682ddb3f3ea557d84077b6147457d19bab5d72c0e3e927f99e053e3f7792dad5bd707cda63 SHA512 e9791d6e4eeb351bd576757f2d77745901ec39e064cbb6daa4c842c969089efa5821be4f3fcf4faffac8365780b587ec463268eb9afff9f93739871f938519ab MISC metadata.xml 3150 BLAKE2B eb4fbf007e655d2a0bc80d8ef608f0ba19324ddea1af595dfa4ff5115e8d62409be4bfbf262cd1e3d9a400bd4f658224aac40690bdae072a870f8e1739e481d3 SHA512 3f3ff439a879e22319e4b97dfbbd01fe62e36904a8152507553ead043833218d59b6ecf87c5ebed339fb36af6573e6a171469e8158364db1f2b92cca97dedff3 diff --git a/sci-physics/root/root-6.24.06-r2.ebuild b/sci-physics/root/root-6.24.06-r2.ebuild index 8da6d265fdfe..521449068ccb 100644 --- a/sci-physics/root/root-6.24.06-r2.ebuild +++ b/sci-physics/root/root-6.24.06-r2.ebuild @@ -157,7 +157,7 @@ src_configure() { -DCMAKE_CUDA_HOST_COMPILER="$(tc-getCXX)" -DCMAKE_C_FLAGS="${CFLAGS}" -DCMAKE_CXX_FLAGS="${CXXFLAGS}" - -DCMAKE_CXX_STANDARD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-) + -DCMAKE_CXX_STANDARD=$( (usev c++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" diff --git a/sci-physics/root/root-6.26.02.ebuild b/sci-physics/root/root-6.26.02.ebuild deleted file mode 100644 index fc9568849f88..000000000000 --- a/sci-physics/root/root-6.26.02.ebuild +++ /dev/null @@ -1,327 +0,0 @@ -# Copyright 1999-2022 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_{8,9,10} ) - -inherit cmake cuda elisp-common fortran-2 python-single-r1 toolchain-funcs - -DESCRIPTION="C++ data analysis framework and interpreter from CERN" -HOMEPAGE="https://root.cern" -SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz" - -IUSE="+X aqua +asimage c++14 +c++17 cuda cudnn +davix debug emacs - +examples fits fftw fortran +gdml graphviz +gsl http libcxx +minuit - mpi mysql odbc +opengl oracle postgres pythia6 pythia8 +python - qt5 R +roofit +root7 shadow sqlite +ssl +tbb test +tmva +unuran uring - vc +xml xrootd" -RESTRICT="!test? ( test )" - -SLOT="$(ver_cut 1-2)/$(ver_cut 3)" -LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" -KEYWORDS="~amd64 ~x86" - -REQUIRED_USE=" - ^^ ( c++14 c++17 ) - cuda? ( tmva ) - cudnn? ( cuda ) - !X? ( !asimage !opengl !qt5 ) - davix? ( ssl xml ) - python? ( ${PYTHON_REQUIRED_USE} ) - qt5? ( root7 ) - root7? ( || ( c++17 ) ) - tmva? ( gsl ) - uring? ( root7 ) -" - -CDEPEND=" - app-arch/lz4 - app-arch/zstd - app-arch/xz-utils - fortran? ( dev-lang/cfortran ) - dev-cpp/nlohmann_json - dev-libs/libpcre:3 - dev-libs/xxhash - media-fonts/dejavu - media-libs/freetype:2 - media-libs/libpng:0= - virtual/libcrypt:= - sys-libs/ncurses:= - sys-libs/zlib - X? ( - x11-libs/libX11:0 - x11-libs/libXext:0 - x11-libs/libXft:0 - x11-libs/libXpm:0 - opengl? ( - media-libs/ftgl:0= - media-libs/glew:0= - virtual/opengl - virtual/glu - x11-libs/gl2ps:0= - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/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[fortran?] ) - mysql? ( dev-db/mysql-connector-c ) - odbc? ( - || ( - dev-db/libiodbc - dev-db/unixODBC - ) - ) - oracle? ( dev-db/oracle-instantclient[sdk] ) - postgres? ( dev-db/postgresql:= ) - pythia6? ( sci-physics/pythia:6 ) - pythia8? ( sci-physics/pythia:8 ) - python? ( ${PYTHON_DEPS} ) - R? ( dev-lang/R ) - shadow? ( sys-apps/shadow ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( dev-libs/openssl:0= ) - tbb? ( dev-cpp/tbb:= ) - tmva? ( - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - ') - ) - uring? ( sys-libs/liburing:= ) - vc? ( dev-libs/vc:= ) - xml? ( dev-libs/libxml2:2= ) - xrootd? ( net-libs/xrootd: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++14 || usev c++17) | cut -c4-) - -DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)" - -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)/share/man" - -DCMAKE_INSTALL_LIBDIR="lib" - -DDEFAULT_SYSROOT="${EPREFIX}" - -DCLING_BUILD_PLUGINS=OFF - -Dasserts=OFF - -Ddev=OFF - -Dexceptions=ON - -Dfail-on-missing=ON - -Dgnuinstall=OFF - -Dshared=ON - -Dsoversion=ON - -Dbuiltin_llvm=ON - -Dbuiltin_clang=ON - -Dbuiltin_cling=ON - -Dbuiltin_openui5=ON - -Dbuiltin_afterimage=OFF - -Dbuiltin_cfitsio=OFF - -Dbuiltin_cppzmq=OFF - -Dbuiltin_davix=OFF - -Dbuiltin_fftw3=OFF - -Dbuiltin_freetype=OFF - -Dbuiltin_ftgl=OFF - -Dbuiltin_gl2ps=OFF - -Dbuiltin_glew=OFF - -Dbuiltin_gsl=OFF - -Dbuiltin_lz4=OFF - -Dbuiltin_lzma=OFF - -Dbuiltin_nlohmannjson=OFF - -Dbuiltin_openssl=OFF - -Dbuiltin_pcre=OFF - -Dbuiltin_tbb=OFF - -Dbuiltin_unuran=OFF - -Dbuiltin_vc=OFF - -Dbuiltin_vdt=OFF - -Dbuiltin_veccore=OFF - -Dbuiltin_xrootd=OFF - -Dbuiltin_xxhash=OFF - -Dbuiltin_zeromq=OFF - -Dbuiltin_zlib=OFF - -Dbuiltin_zstd=OFF - -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 - -Ddistcc=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) - -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) - -Dqt6web=OFF - -Dr=$(usex R) - -Droofit=$(usex roofit) - -Droofit_multiprocess=OFF - -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 - -Dtest_distrdf_dask=OFF - -Dtest_distrdf_pyspark=OFF - -Dtesting=$(usex test) - -Dtmva=$(usex tmva) - -Dtmva-cpu=$(usex tmva) - -Dtmva-gpu=$(usex cuda) - -Dtmva-pymva=$(usex tmva) - -Dtmva-rmva=$(usex R) - -Dtmva-sofie=OFF - -Dunuran=$(usex unuran) - -During=$(usex uring) - -Dvc=$(usex vc) - -Dvdt=OFF - -Dveccore=OFF - -Dvecgeom=OFF - -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.26.04.ebuild b/sci-physics/root/root-6.26.04.ebuild new file mode 100644 index 000000000000..52029f018115 --- /dev/null +++ b/sci-physics/root/root-6.26.04.ebuild @@ -0,0 +1,321 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ninja does not work due to fortran +CMAKE_MAKEFILE_GENERATOR=emake +FORTRAN_NEEDED="fortran" +PYTHON_COMPAT=( python3_{8,9,10} ) + +inherit cmake cuda elisp-common fortran-2 python-single-r1 toolchain-funcs + +DESCRIPTION="C++ data analysis framework and interpreter from CERN" +HOMEPAGE="https://root.cern" +SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz" + +IUSE="+X aqua +asimage c++14 +c++17 cuda cudnn +davix debug emacs + +examples fits fftw fortran +gdml graphviz +gsl http libcxx +minuit + mpi mysql odbc +opengl oracle postgres pythia6 pythia8 +python + qt5 R +roofit +root7 shadow sqlite +ssl +tbb test +tmva +unuran uring + vc +xml xrootd" +RESTRICT="!test? ( test )" + +SLOT="$(ver_cut 1-2)/$(ver_cut 3)" +LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" +KEYWORDS="~amd64 ~x86" + +REQUIRED_USE=" + ^^ ( c++14 c++17 ) + cuda? ( tmva ) + cudnn? ( cuda ) + !X? ( !asimage !opengl !qt5 ) + davix? ( ssl xml ) + python? ( ${PYTHON_REQUIRED_USE} ) + qt5? ( root7 ) + root7? ( || ( c++17 ) ) + tmva? ( gsl ) + uring? ( root7 ) +" + +CDEPEND=" + app-arch/lz4 + app-arch/zstd + app-arch/xz-utils + fortran? ( dev-lang/cfortran ) + dev-cpp/nlohmann_json + dev-libs/libpcre:3 + dev-libs/xxhash + media-fonts/dejavu + media-libs/freetype:2 + media-libs/libpng:0= + virtual/libcrypt:= + sys-libs/ncurses:= + sys-libs/zlib + X? ( + x11-libs/libX11:0 + x11-libs/libXext:0 + x11-libs/libXft:0 + x11-libs/libXpm:0 + opengl? ( + media-libs/ftgl:0= + media-libs/glew:0= + virtual/opengl + virtual/glu + x11-libs/gl2ps:0= + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/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[fortran?] ) + mysql? ( dev-db/mysql-connector-c ) + odbc? ( + || ( + dev-db/libiodbc + dev-db/unixODBC + ) + ) + oracle? ( dev-db/oracle-instantclient[sdk] ) + postgres? ( dev-db/postgresql:= ) + pythia6? ( sci-physics/pythia:6 ) + pythia8? ( sci-physics/pythia:8 ) + python? ( ${PYTHON_DEPS} ) + R? ( dev-lang/R ) + shadow? ( sys-apps/shadow ) + sqlite? ( dev-db/sqlite:3 ) + ssl? ( dev-libs/openssl:0= ) + tbb? ( dev-cpp/tbb:= ) + tmva? ( + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + ') + ) + uring? ( sys-libs/liburing:= ) + vc? ( dev-libs/vc:= ) + xml? ( dev-libs/libxml2:2= ) + xrootd? ( net-libs/xrootd: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++14 || usev c++17) | cut -c4-) + -DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}" + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)" + -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)/share/man" + -DCMAKE_INSTALL_LIBDIR="lib" + -DDEFAULT_SYSROOT="${EPREFIX}" + -DCLING_BUILD_PLUGINS=OFF + -Dasserts=OFF + -Ddev=OFF + -Dexceptions=ON + -Dfail-on-missing=ON + -Dgnuinstall=OFF + -Dshared=ON + -Dsoversion=ON + -Dbuiltin_llvm=ON + -Dbuiltin_clang=ON + -Dbuiltin_cling=ON + -Dbuiltin_openui5=ON + -Dbuiltin_afterimage=OFF + -Dbuiltin_cfitsio=OFF + -Dbuiltin_cppzmq=OFF + -Dbuiltin_davix=OFF + -Dbuiltin_fftw3=OFF + -Dbuiltin_freetype=OFF + -Dbuiltin_ftgl=OFF + -Dbuiltin_gl2ps=OFF + -Dbuiltin_glew=OFF + -Dbuiltin_gsl=OFF + -Dbuiltin_lz4=OFF + -Dbuiltin_lzma=OFF + -Dbuiltin_nlohmannjson=OFF + -Dbuiltin_openssl=OFF + -Dbuiltin_pcre=OFF + -Dbuiltin_tbb=OFF + -Dbuiltin_unuran=OFF + -Dbuiltin_vc=OFF + -Dbuiltin_vdt=OFF + -Dbuiltin_veccore=OFF + -Dbuiltin_xrootd=OFF + -Dbuiltin_xxhash=OFF + -Dbuiltin_zeromq=OFF + -Dbuiltin_zlib=OFF + -Dbuiltin_zstd=OFF + -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 + -Ddataframe=ON + -Ddavix=$(usex davix) + -Ddcache=OFF + -Ddistcc=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) + -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) + -Dqt6web=OFF + -Dr=$(usex R) + -Droofit=$(usex roofit) + -Droofit_multiprocess=OFF + -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 + -Dtest_distrdf_dask=OFF + -Dtest_distrdf_pyspark=OFF + -Dtesting=$(usex test) + -Dtmva=$(usex tmva) + -Dtmva-cpu=$(usex tmva) + -Dtmva-gpu=$(usex cuda) + -Dtmva-pymva=$(usex tmva) + -Dtmva-rmva=$(usex R) + -Dtmva-sofie=OFF + -Dunuran=$(usex unuran) + -During=$(usex uring) + -Dvc=$(usex vc) + -Dvdt=OFF + -Dveccore=OFF + -Dvecgeom=OFF + -Dx11=$(usex X) + -Dxml=$(usex xml) + -Dxrootd=$(usex xrootd) + ${EXTRA_ECONF} + ) + + CMAKE_BUILD_TYPE=$(usex debug Debug Release) \ + cmake_src_configure +} + +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.26.9999.ebuild b/sci-physics/root/root-6.26.9999.ebuild index 9089f78b2f9a..246be36df972 100644 --- a/sci-physics/root/root-6.26.9999.ebuild +++ b/sci-physics/root/root-6.26.9999.ebuild @@ -168,7 +168,7 @@ src_configure() { -DCMAKE_CUDA_HOST_COMPILER="$(tc-getCXX)" -DCMAKE_C_FLAGS="${CFLAGS}" -DCMAKE_CXX_FLAGS="${CXXFLAGS}" - -DCMAKE_CXX_STANDARD=$((usev c++14 || usev c++17) | cut -c4-) + -DCMAKE_CXX_STANDARD=$( (usev c++14 || usev c++17) | cut -c4-) -DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}" -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)" -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)/share/man" diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild index 2459437b34a4..295ee5f051f2 100644 --- a/sci-physics/root/root-9999.ebuild +++ b/sci-physics/root/root-9999.ebuild @@ -168,7 +168,7 @@ src_configure() { -DCMAKE_CUDA_HOST_COMPILER="$(tc-getCXX)" -DCMAKE_C_FLAGS="${CFLAGS}" -DCMAKE_CXX_FLAGS="${CXXFLAGS}" - -DCMAKE_CXX_STANDARD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-) + -DCMAKE_CXX_STANDARD=$( (usev c++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" -- cgit v1.2.3